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

syntax suger

Browse source 
chg:  added clearCommandBuffer(); before calls to sendcommand.
This commit is contained in:
iceman1001 2016-08-09 09:12:16 +02:00
commit 3d4207f3b6
1 changed files with 60 additions and 58 deletions
Download patch file Download diff file Expand all files Collapse all files

32
client/cmdhw.c
View file

@ -320,6 +320,7 @@ int CmdDetectReader(const char *Cmd)
PrintAndLog("use 'detectreader' or 'detectreader l' or 'detectreader h'");
return 0;
}
clearCommandBuffer();
SendCommand(&c);
return 0;
}
@ -328,6 +329,7 @@ int CmdDetectReader(const char *Cmd)
int CmdFPGAOff(const char *Cmd)
{
UsbCommand c = {CMD_FPGA_MAJOR_MODE_OFF};
clearCommandBuffer();
SendCommand(&c);
return 0;
}
@ -340,6 +342,7 @@ int CmdLCD(const char *Cmd)
sscanf(Cmd, "%x %d", &i, &j);
while (j--) {
c.arg[0] = i & 0x1ff;
clearCommandBuffer();
SendCommand(&c);
}
return 0;
@ -348,6 +351,7 @@ int CmdLCD(const char *Cmd)
int CmdLCDReset(const char *Cmd)
{
UsbCommand c = {CMD_LCD_RESET, {strtol(Cmd, NULL, 0), 0, 0}};
clearCommandBuffer();
SendCommand(&c);
return 0;
}
@ -355,6 +359,7 @@ int CmdLCDReset(const char *Cmd)
int CmdReadmem(const char *Cmd)
{
UsbCommand c = {CMD_READ_MEM, {strtol(Cmd, NULL, 0), 0, 0}};
clearCommandBuffer();
SendCommand(&c);
return 0;
}
@ -362,6 +367,7 @@ int CmdReadmem(const char *Cmd)
int CmdReset(const char *Cmd)
{
UsbCommand c = {CMD_HARDWARE_RESET};
clearCommandBuffer();
SendCommand(&c);
return 0;
}
@ -373,27 +379,26 @@ int CmdReset(const char *Cmd)
int CmdSetDivisor(const char *Cmd)
{
UsbCommand c = {CMD_SET_LF_DIVISOR, {strtol(Cmd, NULL, 0), 0, 0}};
if (c.arg[0] < 19 || c.arg[0] > 255) {
PrintAndLog("divisor must be between 19 and 255");
} else {
return 1;
}
clearCommandBuffer();
SendCommand(&c);
PrintAndLog("Divisor set, expected freq=%dHz", 12000000 / (c.arg[0]+1));
}
return 0;
}
int CmdSetMux(const char *Cmd)
{
UsbCommand c = {CMD_SET_ADC_MUX};
if (strcmp(Cmd, "lopkd") == 0) {
c.arg[0] = 0;
} else if (strcmp(Cmd, "loraw") == 0) {
c.arg[0] = 1;
} else if (strcmp(Cmd, "hipkd") == 0) {
c.arg[0] = 2;
} else if (strcmp(Cmd, "hiraw") == 0) {
c.arg[0] = 3;
}
if (strcmp(Cmd, "lopkd") == 0) c.arg[0] = 0;
else if (strcmp(Cmd, "loraw") == 0) c.arg[0] = 1;
else if (strcmp(Cmd, "hipkd") == 0) c.arg[0] = 2;
else if (strcmp(Cmd, "hiraw") == 0) c.arg[0] = 3;
clearCommandBuffer();
SendCommand(&c);
return 0;
}
@ -405,7 +410,6 @@ int CmdTune(const char *Cmd)
int CmdVersion(const char *Cmd)
{
clearCommandBuffer();
UsbCommand c = {CMD_VERSION};
static UsbCommand resp = {0, {0, 0, 0}};
@ -431,13 +435,11 @@ int CmdStatus(const char *Cmd)
{
uint8_t speed_test_buffer[USB_CMD_DATA_SIZE];
sample_buf = speed_test_buffer;
clearCommandBuffer();
UsbCommand c = {CMD_STATUS};
SendCommand(&c);
if (!WaitForResponseTimeout(CMD_ACK,&c,1900)) {
if (!WaitForResponseTimeout(CMD_ACK, &c, 1900))
PrintAndLog("Status command failed. USB Speed Test timed out");
}
return 0;
}