syntax sugar

[proxmark3-svn] / client / uart.c

diff --git a/client/uart.c b/client/uart.c
index e3a6a57b7b68f16e77fb095ee3a79d2ee64fec5b..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;
 }
 


@@ -119,7 +124,12 @@ void uart_close(const serial_port sp) {
   fl.l_start  = 0;
   fl.l_len    = 0;
   fl.l_pid    = getpid();
   fl.l_start  = 0;
   fl.l_len    = 0;
   fl.l_pid    = getpid();

-  fcntl(spu->fd, F_SETLK, &fl);
+
+  // Does the system allows us to place a lock on this file descriptor
+  int err = fcntl(spu->fd, F_SETLK, &fl);
+  if ( err == -1) {
+     //perror("fcntl");
+  }  

   close(spu->fd);
   free(sp);
 }
   close(spu->fd);
   free(sp);
 }


@@ -314,19 +324,24 @@ bool uart_send(const serial_port sp, const byte_t* pbtTx, const size_t szTxLen)
     
     // Write error
     if (res < 0) {
     
     // Write error
     if (res < 0) {

-      return false;
+               printf("write error\n");
+               return false;

     }
     
     // Write time-out
     if (res == 0) {
     }
     
     // Write time-out
     if (res == 0) {

-      return false;
+               printf("write time-out\n");
+               return false;

     }
     
     // Send away the bytes
     res = write(((serial_port_unix*)sp)->fd,pbtTx+szPos,szTxLen-szPos);
     
     // Stop if the OS has some troubles sending the data
     }
     
     // Send away the bytes
     res = write(((serial_port_unix*)sp)->fd,pbtTx+szPos,szTxLen-szPos);
     
     // Stop if the OS has some troubles sending the data

-    if (res <= 0) return false;
+    if (res <= 0) {
+               printf("os troubles\n");
+               return false;
+       }

     
     szPos += res;
   }
     
     szPos += res;
   }


@@ -369,7 +384,7 @@ serial_port uart_open(const char* pcPortName) {
   // Prepare the device control
   memset(&sp->dcb, 0, sizeof(DCB));
   sp->dcb.DCBlength = sizeof(DCB);
   // Prepare the device control
   memset(&sp->dcb, 0, sizeof(DCB));
   sp->dcb.DCBlength = sizeof(DCB);

-  if(!BuildCommDCBA("baud=9600 data=8 parity=N stop=1",&sp->dcb)) {
+  if(!BuildCommDCBA("baud=115200 parity=N data=8 stop=1",&sp->dcb)) {

                uart_close(sp);
                return INVALID_SERIAL_PORT;
        }
                uart_close(sp);
                return INVALID_SERIAL_PORT;
        }


@@ -379,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         = 0;
-  sp->ct.ReadTotalTimeoutMultiplier  = 0;
+  // 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 = 0;
+  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)) {


@@ -393,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;
 }
 


@@ -423,7 +442,7 @@ bool uart_receive(const serial_port sp, byte_t* pbtRx, size_t* pszRxLen) {
 
 bool uart_send(const serial_port sp, const byte_t* pbtTx, const size_t szTxLen) {
   DWORD dwTxLen = 0;
 
 bool uart_send(const serial_port sp, const byte_t* pbtTx, const size_t szTxLen) {
   DWORD dwTxLen = 0;

-  return WriteFile(((serial_port_windows*)sp)->hPort,pbtTx,szTxLen,&dwTxLen,NULL);
+  return WriteFile(((serial_port_windows*)sp)->hPort, pbtTx, szTxLen, &dwTxLen, NULL);

   return (dwTxLen != 0);
 }
 
   return (dwTxLen != 0);
 }