github/RRG-Proxmark3
1
0
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2025-07-10 15:22:57 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

chg: cleanup from offical repo

Browse source
This commit is contained in:
iceman1001 2018-04-18 20:17:00 +02:00
parent 646ff0ce68
commit 2e6699273e
6 changed files with 5 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

7
client/cmdmain.c
View file

@ -30,8 +30,6 @@
#include "cmdcrc.h"
#include "cmdanalyse.h"
unsigned int current_command = CMD_UNKNOWN;
static int CmdHelp(const char *Cmd);
static int CmdQuit(const char *Cmd);
static int CmdRev(const char *Cmd);
@ -140,7 +138,7 @@ int getCommand(UsbCommand* response) {
* Waits for a certain response type. This method waits for a maximum of
* ms_timeout milliseconds for a specified response command.
*@brief WaitForResponseTimeout
* @param cmd command to wait for
* @param cmd command to wait for, or CMD_UNKNOWN to take any command.
* @param response struct to copy received command into.
* @param ms_timeout
* @return true if command was returned, otherwise false
@ -158,7 +156,7 @@ bool WaitForResponseTimeoutW(uint32_t cmd, UsbCommand* response, size_t ms_timeo
while (true) {
while ( getCommand(response) ) {
if (response->cmd == cmd)
if (cmd == CMD_UNKNOWN || response->cmd == cmd)
return true;
}
@ -166,6 +164,7 @@ bool WaitForResponseTimeoutW(uint32_t cmd, UsbCommand* response, size_t ms_timeo
break;
if (msclock() - start_time > 3000 && show_warning) {
// 3 seconds elapsed (but this doesn't mean the timeout was exceeded)
PrintAndLogEx(NORMAL, "Waiting for a response from the proxmark...");
PrintAndLogEx(NORMAL, "You can cancel this operation by pressing the pm3 button");
show_warning = false;