X-Git-Url: http://cvs.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/62ee4fedd54fcfbc62676da90384cbc2b48ebed7..bc7846f4376472abdc9ced23436dfe3b6dd20e7f:/client/uart.c

diff --git a/client/uart.c b/client/uart.c
index 041186c7..e538499b 100644
--- 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
+    free(sp);
     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();
-  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);
 }
@@ -266,7 +272,7 @@ bool uart_receive(const serial_port sp, byte_t* pbtRx, size_t* pszRxLen) {
     if (res < 0) {
       return false;
     }
-    
+ 
     // 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;
       }
     }
-    
+ 
     // 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);
-    
+
     // Stop if the OS has some troubles reading the data
     if (res <= 0) return false;
-    
+ 
     *pszRxLen += res;
+
+    if(res==byteCount)
+        return true;
     
   } while (byteCount);
-  
+
   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);
-  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)) {