RfidResearchGroup/proxmark3
1
1
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2025-03-17 18:50:32 +08:00
Code Issues Projects Releases Packages Wiki Activity

chg: might fix timing issues between threads.

Browse source
This commit is contained in:
iceman1001 2018-04-26 12:13:03 +02:00
parent 4f1e2f80c5
commit e4bf5d3c66
1 changed files with 19 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
client/cmdmain.c
View file

@ -97,8 +97,7 @@ void clearCommandBuffer() {
void storeCommand(UsbCommand *command) { void storeCommand(UsbCommand *command) {
pthread_mutex_lock(&cmdBufferMutex); pthread_mutex_lock(&cmdBufferMutex);
if( ( cmd_head+1) % CMD_BUFFER_SIZE == cmd_tail) if ( ( cmd_head+1) % CMD_BUFFER_SIZE == cmd_tail) {
{
//If these two are equal, we're about to overwrite in the //If these two are equal, we're about to overwrite in the
// circular buffer. // circular buffer.
PrintAndLogEx(FAILED, "WARNING: Command buffer about to overwrite command! This needs to be fixed!"); PrintAndLogEx(FAILED, "WARNING: Command buffer about to overwrite command! This needs to be fixed!");
@ -107,7 +106,8 @@ void storeCommand(UsbCommand *command) {
UsbCommand* destination = &cmdBuffer[cmd_head]; UsbCommand* destination = &cmdBuffer[cmd_head];
memcpy(destination, command, sizeof(UsbCommand)); memcpy(destination, command, sizeof(UsbCommand));
cmd_head = (cmd_head +1) % CMD_BUFFER_SIZE; //increment head and wrap //increment head and wrap
cmd_head = (cmd_head +1) % CMD_BUFFER_SIZE;
pthread_mutex_unlock(&cmdBufferMutex); pthread_mutex_unlock(&cmdBufferMutex);
} }
/** /**
@ -193,26 +193,33 @@ int CommandReceived(char *Cmd) {
// Entry point into our code: called whenever we received a packet over USB // Entry point into our code: called whenever we received a packet over USB
// that we weren't necessarily expecting, for example a debug print. // that we weren't necessarily expecting, for example a debug print.
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
void UsbCommandReceived(UsbCommand *c) { void UsbCommandReceived(UsbCommand* _ch) {
//UsbCommand *c = malloc(sizeof(UsbCommand));
//memset(cp, 0x00, sizeof(*cp));
pthread_mutex_lock(&cmdBufferMutex);
UsbCommand* c = _ch;
pthread_mutex_unlock(&cmdBufferMutex);
switch(c->cmd) { switch(c->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]; char s[USB_CMD_DATA_SIZE+1];
memset(s, 0x00, sizeof(s)); memset(s, 0x00, sizeof(s));
size_t len = MIN(c->arg[0],USB_CMD_DATA_SIZE); size_t len = MIN(c->arg[0],USB_CMD_DATA_SIZE);
memcpy(s, c->d.asBytes, len); memcpy(s, c->d.asBytes, len);
// test // print debug line on same row. escape seq \r
if ( c->arg[1] == CMD_MEASURE_ANTENNA_TUNING_HF) { if ( c->arg[1] == CMD_MEASURE_ANTENNA_TUNING_HF) {
PrintAndLogEx(NORMAL, "\r#db# %s", s); PrintAndLogEx(NORMAL, "\r#db# %s", s);
fflush(stdout); //fflush(stdout);
} } else {
else {
PrintAndLogEx(NORMAL, "#db# %s", s); PrintAndLogEx(NORMAL, "#db# %s", s);
} }
return; break;
} break; }
case CMD_DEBUG_PRINT_INTEGERS: { case CMD_DEBUG_PRINT_INTEGERS: {
PrintAndLogEx(NORMAL, "#db# %08x, %08x, %08x", c->arg[0], c->arg[1], c->arg[2]); PrintAndLogEx(NORMAL, "#db# %08x, %08x, %08x", c->arg[0], c->arg[1], c->arg[2]);
break; break;
@ -220,6 +227,7 @@ void UsbCommandReceived(UsbCommand *c) {
case CMD_DOWNLOADED_FLASHMEM: case CMD_DOWNLOADED_FLASHMEM:
case CMD_DOWNLOADED_RAW_ADC_SAMPLES_125K: case CMD_DOWNLOADED_RAW_ADC_SAMPLES_125K:
case CMD_DOWNLOADED_EML_BIGBUF: { case CMD_DOWNLOADED_EML_BIGBUF: {
// sample_buf is a array pointer, located in data.c // sample_buf is a array pointer, located in data.c
// arg0 = offset in transfer. Startindex of this chunk // arg0 = offset in transfer. Startindex of this chunk
// arg1 = length bytes to transfer // arg1 = length bytes to transfer