chg: trying to configure MAC OS as a builing environment for Travis CI

[proxmark3-svn] / client / uart.c

diff --git a/client/uart.c b/client/uart.c
index 041186c7e9d195b817766dba7e1b80adffe2117c..e538499bf6ea3a6bf933796a9ce4a58f37dac8dd 100644 (file)
--- a/client/uart.c
+++ b/client/uart.c
@@ -73,6 +73,7 @@ serial_port uart_open(const char* pcPortName)
   // Does the system allows us to place a lock on this file descriptor
   if (fcntl(sp->fd, F_SETLK, &fl) == -1) {
     // A conflicting lock is held by another process
   // Does the system allows us to place a lock on this file descriptor
   if (fcntl(sp->fd, F_SETLK, &fl) == -1) {
     // A conflicting lock is held by another process

+    free(sp);

     return CLAIMED_SERIAL_PORT;
   }
 
     return CLAIMED_SERIAL_PORT;
   }
 


@@ -118,7 +119,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);
 }


@@ -266,7 +272,7 @@ bool uart_receive(const serial_port sp, byte_t* pbtRx, size_t* pszRxLen) {
     if (res < 0) {
       return false;
     }
     if (res < 0) {
       return false;
     }

-    
+ 

     // Read time-out
     if (res == 0) {
       if (*pszRxLen == 0) {
     // Read time-out
     if (res == 0) {
       if (*pszRxLen == 0) {


@@ -277,21 +283,24 @@ bool uart_receive(const serial_port sp, byte_t* pbtRx, size_t* pszRxLen) {
         return true;
       }
     }
         return true;
       }
     }

-    
+ 

     // Retrieve the count of the incoming bytes
     res = ioctl(((serial_port_unix*)sp)->fd, FIONREAD, &byteCount);
     if (res < 0) return false;
     // Retrieve the count of the incoming bytes
     res = ioctl(((serial_port_unix*)sp)->fd, FIONREAD, &byteCount);
     if (res < 0) return false;

-    
+

     // There is something available, read the data
     res = read(((serial_port_unix*)sp)->fd,pbtRx+(*pszRxLen),byteCount);
     // There is something available, read the data
     res = read(((serial_port_unix*)sp)->fd,pbtRx+(*pszRxLen),byteCount);

-    
+

     // Stop if the OS has some troubles reading the data
     if (res <= 0) return false;
     // Stop if the OS has some troubles reading the data
     if (res <= 0) return false;

-    
+ 

     *pszRxLen += res;
     *pszRxLen += res;

+
+    if(res==byteCount)
+        return true;

     
   } while (byteCount);
     
   } while (byteCount);

-  
+

   return true;
 }
 
   return true;
 }
 


@@ -365,10 +374,10 @@ 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)) {
-    uart_close(sp);
-    return INVALID_SERIAL_PORT;
-  }
+  if(!BuildCommDCBA("baud=115200 parity=N data=8 stop=1",&sp->dcb)) {
+               uart_close(sp);
+               return INVALID_SERIAL_PORT;
+       }

   
   // Update the active serial port
   if(!SetCommState(sp->hPort,&sp->dcb)) {
   
   // Update the active serial port
   if(!SetCommState(sp->hPort,&sp->dcb)) {