added support for recv/send of larger data chunks (>default_os_buffer)

This commit is contained in:
Roel Verdult 2009-11-13 21:12:51 +00:00
parent fabdf4214a
commit 365d60ce4a

View file

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