dash/proxmark3
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

CHG: reverted back from a time-outed usb receive function

Browse Source
This commit is contained in:
iceman1001
2017-10-10 15:02:06 +02:00
parent 4e728dc0f9
commit dd3da571e2
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
uart/uart_posix.c
View File

@@ -128,7 +128,6 @@ serial_port uart_open(const char* pcPortName)
} }
void uart_close(const serial_port sp) { void uart_close(const serial_port sp) {
if (!sp) return;
if (sp == INVALID_SERIAL_PORT) return; if (sp == INVALID_SERIAL_PORT) return;
if (sp == CLAIMED_SERIAL_PORT) return; if (sp == CLAIMED_SERIAL_PORT) return;
@@ -162,7 +161,7 @@ bool uart_receive(const serial_port sp, byte_t* pbtRx, size_t pszMaxRxLen, size_
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; //uint64_t timeout_at = msclock() + RECV_TOTAL_TIMEOUT_MS;
// Reset the output count // Reset the output count
*pszRxLen = 0; *pszRxLen = 0;
@@ -212,8 +211,8 @@ bool uart_receive(const serial_port sp, byte_t* pbtRx, size_t pszMaxRxLen, size_
return true; return true;
} }
// } while (byteCount); } while (byteCount);
} while (msclock() < timeout_at); // } while (msclock() < timeout_at);
return true; return true;
} }