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

9
client/cmddata.c
View file

@ -805,8 +805,7 @@ int CmdBitsamples(const char *Cmd)
int cnt = 0;
uint8_t got[12288];
GetFromBigBuf(got, sizeof(got), 0);
if ( !WaitForResponseTimeout(CMD_ACK, NULL, 2500) ) {
if (!GetFromBigBuf(got, sizeof(got), 0, NULL, 2500 , false)) {
PrintAndLogEx(WARNING, "command execution time out");
return false;
}
@ -1338,8 +1337,7 @@ int CmdHexsamples(const char *Cmd)
return 0;
}
GetFromBigBuf(got, requested, offset);
if ( !WaitForResponseTimeout(CMD_ACK, NULL, 2500) ) {
if ( !GetFromBigBuf(got, requested, offset, NULL, 2500, false)) {
PrintAndLogEx(WARNING, "command execution time out");
return false;
}
@ -1416,10 +1414,9 @@ int getSamples(int n, bool silent) {
n = sizeof(got);
if (!silent) PrintAndLogEx(NORMAL, "Reading %d bytes from device memory\n", n);
GetFromBigBuf(got, n, 0);
UsbCommand response;
if ( !WaitForResponseTimeout(CMD_ACK, &response, 10000) ) {
if ( !GetFromBigBuf(got, n, 0, &response, 10000, true) ) {
PrintAndLogEx(WARNING, "timeout while waiting for reply.");
return 1;
}