RfidResearchGroup/proxmark3
1
1
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2025-04-07 21:10:18 +08:00
Code Issues Projects Releases Packages Wiki Activity

chg: what?

Browse source
This commit is contained in:
iceman 2016-02-10 13:22:48 +01:00
parent 847f7404ff
commit 719b2377be
1 changed files with 15 additions and 17 deletions

32
client/cmdmain.c
View file

@ -120,6 +120,7 @@ int getCommand(UsbCommand* response)
//Pick out the next unread command //Pick out the next unread command
UsbCommand* last_unread = &cmdBuffer[cmd_tail]; UsbCommand* last_unread = &cmdBuffer[cmd_tail];
memcpy(response, last_unread, sizeof(UsbCommand)); memcpy(response, last_unread, sizeof(UsbCommand));
//Increment tail - this is a circular buffer, so modulo buffer size //Increment tail - this is a circular buffer, so modulo buffer size
cmd_tail = (cmd_tail +1 ) % CMD_BUFFER_SIZE; cmd_tail = (cmd_tail +1 ) % CMD_BUFFER_SIZE;
@ -146,10 +147,10 @@ bool WaitForResponseTimeout(uint32_t cmd, UsbCommand* response, size_t ms_timeou
for ( size_t dm_seconds = 0; dm_seconds < ms_timeout/10; dm_seconds++ ) { for ( size_t dm_seconds = 0; dm_seconds < ms_timeout/10; dm_seconds++ ) {
while( getCommand(response) ) { while( getCommand(response) ) {
if(response->cmd == cmd){ if(response->cmd == cmd)
return true; return true;
}
} }
msleep(10); // XXX ugh msleep(10); // XXX ugh
if (dm_seconds == 200) { // Two seconds elapsed if (dm_seconds == 200) { // Two seconds elapsed
PrintAndLog("Waiting for a response from the proxmark..."); PrintAndLog("Waiting for a response from the proxmark...");
@ -180,28 +181,25 @@ void UsbCommandReceived(UsbCommand *UC)
switch(UC->cmd) { switch(UC->cmd) {
// First check if we are handling a debug message // First check if we are handling a debug message
case CMD_DEBUG_PRINT_STRING: { case CMD_DEBUG_PRINT_STRING: {
char s[USB_CMD_DATA_SIZE+1] = {0x00}; char s[USB_CMD_DATA_SIZE+1];
size_t len = MIN(UC->arg[0],USB_CMD_DATA_SIZE); memset(s, 0x00, sizeof(s));
memcpy(s,UC->d.asBytes,len); size_t len = MIN(UC->arg[0], USB_CMD_DATA_SIZE);
PrintAndLog("#db# %s ", s); memcpy(s, UC->d.asBytes, len);
return; PrintAndLog("#db# %s", s);
} break; } break;
case CMD_DEBUG_PRINT_INTEGERS: { case CMD_DEBUG_PRINT_INTEGERS:
PrintAndLog("#db# %08x, %08x, %08x \r\n", UC->arg[0], UC->arg[1], UC->arg[2]); PrintAndLog("#db# %08x, %08x, %08x", UC->arg[0], UC->arg[1], UC->arg[2]);
return; break;
} break;
case CMD_DOWNLOADED_RAW_ADC_SAMPLES_125K: { case CMD_DOWNLOADED_RAW_ADC_SAMPLES_125K:
memcpy(sample_buf+(UC->arg[0]),UC->d.asBytes,UC->arg[1]); memcpy( sample_buf + (UC->arg[0]), UC->d.asBytes, UC->arg[1]);
return; break;
} break;
default: { default: {
storeCommand(UC); storeCommand(UC);
break; break;
} }
} }
} }