crewID/libnfc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Oops, revert wrong file commit

Browse source
This commit is contained in:
Romuald Conty 2011-01-06 14:06:01 +00:00
parent 556918b298
commit 88c14f5d4b
1 changed files with 3 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
libnfc/buses/uart_posix.c
View file

@ -221,8 +221,6 @@ uart_receive (serial_port sp, byte_t * pbtRx, size_t * pszRx)
.tv_usec = uiTimeoutStatic + (uiTimeoutPerByte * iExpectedByteCount), .tv_usec = uiTimeoutStatic + (uiTimeoutPerByte * iExpectedByteCount),
}; };
struct timeval tv = tvTimeout; struct timeval tv = tvTimeout;
DBG("Expected bytes count: %d", iExpectedByteCount);
// if(iExpectedByteCount>250) { abort(); };
// Reset the output count // Reset the output count
*pszRx = 0; *pszRx = 0;
@ -241,7 +239,7 @@ uart_receive (serial_port sp, byte_t * pbtRx, size_t * pszRx)
if (res == 0) { if (res == 0) {
if (*pszRx == 0) { if (*pszRx == 0) {
// Error, we received no data // Error, we received no data
DBG ("RX time-out (%lu µs), buffer empty.", tvTimeout.tv_usec); // DBG ("RX time-out (%lu µs), buffer empty.", tvTimeout.tv_usec);
return DETIMEOUT; return DETIMEOUT;
} else { } else {
// We received some data, but nothing more is available // We received some data, but nothing more is available
@ -263,12 +261,10 @@ uart_receive (serial_port sp, byte_t * pbtRx, size_t * pszRx)
} }
*pszRx += res; *pszRx += res;
tv.tv_usec = uiTimeoutPerByte * MIN( iExpectedByteCount, 16 ); tv.tv_usec = uiTimeoutPerByte * MIN( iExpectedByteCount, 16 ); // Reload timeout with a low value to prevent from waiting too long on slow devices (16x is enought to took at least 1 byte)
DBG("Timeout reloaded at: %d µs", tv.tv_usec); // DBG("Timeout reloaded at: %d µs", tv.tv_usec);
} while (byteCount && (iExpectedByteCount > 0)); } while (byteCount && (iExpectedByteCount > 0));
DBG("Remaining expected bytes count: %d", iExpectedByteCount);
return 0; return 0;
} }