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

add: potential fix for OSX uses, by @piwi

Browse source 
chg:  adapting fix to support iceman forks extended commands.
This commit is contained in:
iceman1001 2018-05-02 08:11:29 +02:00
commit 207fa2b574
39 changed files with 160 additions and 129 deletions
Download patch file Download diff file Expand all files Collapse all files

6
client/cmdtrace.c
View file

@ -487,8 +487,7 @@ int CmdTraceList(const char *Cmd) {
if ( isOnline ) {
// Query for the size of the trace, downloading USB_CMD_DATA_SIZE
UsbCommand response;
GetFromBigBuf(trace, USB_CMD_DATA_SIZE, 0);
if ( !WaitForResponseTimeout(CMD_ACK, &response, 4000) ) {
if ( !GetFromBigBuf(trace, USB_CMD_DATA_SIZE, 0, &response, 4000, true)) {
PrintAndLogEx(WARNING, "timeout while waiting for reply.");
return 1;
}
@ -502,8 +501,7 @@ int CmdTraceList(const char *Cmd) {
return 2;
}
trace = p;
GetFromBigBuf(trace, traceLen, 0);
if ( !WaitForResponseTimeout(CMD_ACK, NULL, 2500) ) {
if ( !GetFromBigBuf(trace, traceLen, 0, NULL, 2500, false)) {
PrintAndLogEx(WARNING, "command execution time out");
free(trace);
return 3;