merge with trunk r183:184.

src/lib/buses/uart.c

@@ -42,9 +42,9 @@ typedef struct {
 } serial_port_unix;
 
 // Set time-out on 30 miliseconds
-struct timeval tv = { 
+const struct timeval timeout = { 
-  .tv_sec = 0,      // 0 second
+  .tv_sec  =     0, // 0 second
-  .tv_usec = 30000 // 30,000 micro seconds
+  .tv_usec = 30000  // 30000 micro seconds
 };
 
 // Work-around to claim uart interface using the c_iflag (software input processing) from the termios struct
@@ -178,49 +178,92 @@ bool uart_cts(const serial_port sp)
 
 bool uart_receive(const serial_port sp, byte_t* pbtRx, size_t* pszRxLen)
 {
-  int iResult;
+  int res;
   int byteCount;
   fd_set rfds;
+  struct timeval tv;
 
-  // Reset file descriptor
+  // Reset the output count  
-  FD_ZERO(&rfds);
+  *pszRxLen = 0;
-  FD_SET(((serial_port_unix*)sp)->fd,&rfds);
-  iResult = select(((serial_port_unix*)sp)->fd+1, &rfds, NULL, NULL, &tv);
 
-  // Read error
+  do {
-  if (iResult < 0) {
+    // Reset file descriptor
-    DBG("RX error.");
+    FD_ZERO(&rfds);
-    *pszRxLen = 0;
+    FD_SET(((serial_port_unix*)sp)->fd,&rfds);
-    return false;
+    tv = timeout;
-  }
+    res = select(((serial_port_unix*)sp)->fd+1, &rfds, NULL, NULL, &tv);
-  // Read time-out
-  if (iResult == 0) {
-    DBG("RX time-out.");
-    *pszRxLen = 0;
-    return false;
-  }
 
-  // Number of bytes in the input buffer
+    // Read error
-  ioctl(((serial_port_unix*)sp)->fd, FIONREAD, &byteCount);
+    if (res < 0) {
+      DBG("RX error.");
+      return false;
+    }
 
-  // Empty buffer
+    // Read time-out
-  if (byteCount == 0) {
+    if (res == 0) {
-    DBG("RX empty buffer.");
+      if (*pszRxLen == 0) {
-    *pszRxLen = 0;
+        // Error, we received no data
-    return false;
+        DBG("RX time-out, buffer empty.");
-  }
+        return false;
+      } else {
+        // We received some data, but nothing more is available
+        return true;
+      }
+    }
 
-  // There is something available, read the data
+    // Retrieve the count of the incoming bytes
-  *pszRxLen = read(((serial_port_unix*)sp)->fd,pbtRx,byteCount);
+    res = ioctl(((serial_port_unix*)sp)->fd, FIONREAD, &byteCount);
+    if (res < 0) return false;
 
-  return (*pszRxLen > 0);
+    // 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;
+
+  } while (byteCount);
+
+  return true;
 }
 
 bool uart_send(const serial_port sp, const byte_t* pbtTx, const size_t szTxLen)
 {
-  int iResult;
+  int32_t res;
-  iResult = write(((serial_port_unix*)sp)->fd,pbtTx,szTxLen);
+  size_t szPos = 0;
-  return (iResult >= 0);
+  fd_set rfds;
+  struct timeval tv;
+
+  while (szPos < szTxLen)
+  {
+    // Reset file descriptor
+    FD_ZERO(&rfds);
+    FD_SET(((serial_port_unix*)sp)->fd,&rfds);
+    tv = timeout;
+    res = select(((serial_port_unix*)sp)->fd+1, NULL, &rfds, NULL, &tv);
+
+    // Write error
+    if (res < 0) {
+      DBG("TX error.");
+      return false;
+    }
+
+    // Write time-out
+    if (res == 0) {
+      DBG("TX time-out.");
+      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
+    if (res <= 0) return false;
+
+    szPos += res;
+  }
+  return true;
 }
 
 #else