github/RRG-Proxmark3
1
0
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2025-08-21 05:43:48 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

chg: reverting tests

Browse source
This commit is contained in:
iceman1001 2017-10-11 13:01:16 +02:00
commit 85eb7c2cc6
2 changed files with 6 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

23
uart/uart_posix.c
View file

@ -61,9 +61,6 @@ const struct timeval timeout = {
.tv_usec = 30000 // 30000 micro seconds .tv_usec = 30000 // 30000 micro seconds
}; };
// Overall timeout for receives -- 300ms
#define RECV_TOTAL_TIMEOUT_MS 300
serial_port uart_open(const char* pcPortName) serial_port uart_open(const char* pcPortName)
{ {
serial_port_unix* sp = malloc(sizeof(serial_port_unix)); serial_port_unix* sp = malloc(sizeof(serial_port_unix));
@ -128,8 +125,8 @@ serial_port uart_open(const char* pcPortName)
} }
void uart_close(const serial_port sp) { void uart_close(const serial_port sp) {
if (sp == INVALID_SERIAL_PORT) return; // if (sp == INVALID_SERIAL_PORT) return;
if (sp == CLAIMED_SERIAL_PORT) return; // if (sp == CLAIMED_SERIAL_PORT) return;
serial_port_unix* spu = (serial_port_unix*)sp; serial_port_unix* spu = (serial_port_unix*)sp;
tcflush(spu->fd, TCIOFLUSH); tcflush(spu->fd, TCIOFLUSH);
@ -150,18 +147,11 @@ void uart_close(const serial_port sp) {
free(sp); free(sp);
} }
bool uart_cts(const serial_port sp) {
char status;
if (ioctl(((serial_port_unix*)sp)->fd,TIOCMGET,&status) < 0) return false;
return (status & TIOCM_CTS);
}
bool uart_receive(const serial_port sp, byte_t* pbtRx, size_t pszMaxRxLen, size_t* pszRxLen) { bool uart_receive(const serial_port sp, byte_t* pbtRx, size_t pszMaxRxLen, size_t* pszRxLen) {
int res; int res;
int byteCount; int byteCount;
fd_set rfds; fd_set rfds;
struct timeval tv; struct timeval tv;
//uint64_t timeout_at = msclock() + RECV_TOTAL_TIMEOUT_MS;
// Reset the output count // Reset the output count
*pszRxLen = 0; *pszRxLen = 0;
@ -212,7 +202,7 @@ bool uart_receive(const serial_port sp, byte_t* pbtRx, size_t pszMaxRxLen, size_
} }
} while (byteCount); } while (byteCount);
// } while (msclock() < timeout_at);
return true; return true;
} }
@ -221,14 +211,13 @@ bool uart_send(const serial_port sp, const byte_t* pbtTx, const size_t szTxLen)
size_t szPos = 0; size_t szPos = 0;
fd_set rfds; fd_set rfds;
struct timeval tv; struct timeval tv;
const serial_port_unix* spu = (serial_port_unix*)sp;
while (szPos < szTxLen) { while (szPos < szTxLen) {
// Reset file descriptor // Reset file descriptor
FD_ZERO(&rfds); FD_ZERO(&rfds);
FD_SET(spu->fd, &rfds); FD_SET(((serial_port_unix*)sp)->fd,&rfds);
tv = timeout; tv = timeout;
res = select(spu->fd + 1, NULL, &rfds, NULL, &tv); res = select(((serial_port_unix*)sp)->fd+1, NULL, &rfds, NULL, &tv);
// Write error // Write error
if (res < 0) { if (res < 0) {
@ -243,7 +232,7 @@ bool uart_send(const serial_port sp, const byte_t* pbtTx, const size_t szTxLen)
} }
// Send away the bytes // Send away the bytes
res = write(spu->fd, pbtTx + szPos, szTxLen-szPos); res = write(((serial_port_unix*)sp)->fd,pbtTx+szPos,szTxLen-szPos);
// Stop if the OS has some troubles sending the data // Stop if the OS has some troubles sending the data
if (res <= 0) { if (res <= 0) {

23
uart/uart_win32.c
View file

@ -122,29 +122,6 @@ void uart_close(const serial_port sp) {
bool uart_receive(const serial_port sp, byte_t* pbtRx, size_t pszMaxRxLen, size_t* pszRxLen) { bool uart_receive(const serial_port sp, byte_t* pbtRx, size_t pszMaxRxLen, size_t* pszRxLen) {
ReadFile(((serial_port_windows*)sp)->hPort, pbtRx, pszMaxRxLen, (LPDWORD)pszRxLen, NULL); ReadFile(((serial_port_windows*)sp)->hPort, pbtRx, pszMaxRxLen, (LPDWORD)pszRxLen, NULL);
return (*pszRxLen != 0); return (*pszRxLen != 0);
/*
DWORD dwBytesToGet = (DWORD)pszMaxRxLen;
DWORD dwBytesReceived = 0;
DWORD dwTotalBytesReceived = 0;
BOOL res;
do {
res = ReadFile(((serial_port_windows *) sp)->hPort, pbtRx + dwTotalBytesReceived, dwBytesToGet, &dwBytesReceived, NULL);
dwTotalBytesReceived += dwBytesReceived;
if (!res)
return false;
else if (dwBytesReceived == 0)
return false;
if (((DWORD)pszMaxRxLen) > dwTotalBytesReceived)
dwBytesToGet -= dwBytesReceived;
} while (((DWORD)pszMaxRxLen) > dwTotalBytesReceived);
return (dwTotalBytesReceived == (DWORD) pszMaxRxLen);
*/
} }
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) {