CHG: testing to set 460800 baudrate as default, if it fails, go to 115200 baudrate...

diff --git a/armsrc/Makefile b/armsrc/Makefile
index 5081e21fedda1dca97842d0e3fe5402af40e1a0c..220c21fcb753aa35140baccd525f6c2cb7e7e3bb 100644 (file)
--- a/armsrc/Makefile
+++ b/armsrc/Makefile
@@ -70,10 +70,7 @@ THUMBSRC = start.c \
        string.c \
        BigBuf.c \
        ticks.c \
        string.c \
        BigBuf.c \
        ticks.c \

-       usb_cdc.c \
-       parity.c \

        random.c \
        random.c \

-       cmd.c \

        hfsnoop.c
 
 # These are to be compiled in ARM mode
        hfsnoop.c
 
 # These are to be compiled in ARM mode


@@ -83,7 +80,10 @@ ARMSRC = fpgaloader.c \
        $(SRC_CRAPTO1) \
        $(SRC_CRC) \
        $(SRC_ICLASS) \
        $(SRC_CRAPTO1) \
        $(SRC_CRC) \
        $(SRC_ICLASS) \

-       $(SRC_EMV)
+       $(SRC_EMV) \
+       parity.c \
+       usb_cdc.c \
+       cmd.c

 
 # Do not move this inclusion before the definition of {THUMB,ASM,ARM}SRC
 include ../common/Makefile.common
 
 # Do not move this inclusion before the definition of {THUMB,ASM,ARM}SRC
 include ../common/Makefile.common

diff --git a/client/uart.c b/client/uart.c
index 1411386f59686e19dcce135c037f2cc51d1ab1ad..119bf130e3e06258bb04d5498177e3714891b98f 100644 (file)
--- a/client/uart.c
+++ b/client/uart.c
@@ -106,6 +106,11 @@ serial_port uart_open(const char* pcPortName)
   // Flush all lingering data that may exist
   tcflush(sp->fd, TCIOFLUSH);
 
   // Flush all lingering data that may exist
   tcflush(sp->fd, TCIOFLUSH);
 

+  // set speed, works for UBUNTU 14.04
+  bool err = uart_set_speed(sp, 460800);
+  if (!err)
+         uart_set_speed(sp, 115200);
+  

   return sp;
 }
 
   return sp;
 }
 


@@ -389,11 +394,11 @@ serial_port uart_open(const char* pcPortName) {
     uart_close(sp);
     return INVALID_SERIAL_PORT;
   }
     uart_close(sp);
     return INVALID_SERIAL_PORT;
   }

-  
-  sp->ct.ReadIntervalTimeout         = 1;
-  sp->ct.ReadTotalTimeoutMultiplier  = 1;
+  // all zero's configure: no timeout for read/write used.
+  sp->ct.ReadIntervalTimeout         = 0;//1;
+  sp->ct.ReadTotalTimeoutMultiplier  = 0;//1;

   sp->ct.ReadTotalTimeoutConstant    = 30;
   sp->ct.ReadTotalTimeoutConstant    = 30;

-  sp->ct.WriteTotalTimeoutMultiplier = 1;
+  sp->ct.WriteTotalTimeoutMultiplier = 0;//1;

   sp->ct.WriteTotalTimeoutConstant   = 30;
   
   if(!SetCommTimeouts(sp->hPort,&sp->ct)) {
   sp->ct.WriteTotalTimeoutConstant   = 30;
   
   if(!SetCommTimeouts(sp->hPort,&sp->ct)) {


@@ -403,6 +408,10 @@ serial_port uart_open(const char* pcPortName) {
   
   PurgeComm(sp->hPort, PURGE_RXABORT | PURGE_RXCLEAR);
   
   
   PurgeComm(sp->hPort, PURGE_RXABORT | PURGE_RXCLEAR);
   

+  bool err = uart_set_speed(sp, 460800);
+  if (!err)
+         uart_set_speed(sp, 115200);
+  

   return sp;
 }
 
   return sp;
 }