X-Git-Url: http://cvs.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/9b255608898be5d43e958c8041127dfc399538c7..6c5ad038603d132d10802eecbef5c2f2547d94ae:/client/command.c?ds=sidebyside diff --git a/client/command.c b/client/command.c index 3370748e..a5c561a9 100644 --- a/client/command.c +++ b/client/command.c @@ -132,6 +132,12 @@ static void CmdHi14areader(char *str) SendCommand(&c); } +static void CmdHi14amifare(char *str) +{ + UsbCommand c={CMD_READER_MIFARE, {strtol(str, NULL, 0), 0, 0}}; + SendCommand(&c); +} + static void CmdHi15reader(char *str) { UsbCommand c={CMD_READER_ISO_15693, {strtol(str, NULL, 0), 0, 0}}; @@ -202,12 +208,6 @@ static void CmdHi14asnoop(char *str) SendCommand(&c); } -static void CmdLegicRfSim(char *str) -{ - UsbCommand c={CMD_SIMULATE_TAG_LEGIC_RF}; - SendCommand(&c); -} - static void CmdLegicRfRead(char *str) { UsbCommand c={CMD_READER_LEGIC_RF}; @@ -2821,6 +2821,7 @@ static struct { {"grid", CmdGrid, 1, " -- overlay grid on graph window, use zero value to turn off either"}, {"hexsamples", CmdHexsamples, 0, " -- Dump big buffer as hex bytes"}, {"hi14alist", CmdHi14alist, 0, "List ISO 14443a history"}, + {"hi14amifare", CmdHi14amifare, 0, "Read out sector 0 parity error messages"}, {"hi14areader", CmdHi14areader, 0, "Act like an ISO14443 Type A reader"}, {"hi14asim", CmdHi14asim, 0, " -- Fake ISO 14443a tag"}, {"hi14asnoop", CmdHi14asnoop, 0, "Eavesdrop ISO 14443 Type A"}, @@ -2846,7 +2847,6 @@ static struct { {"indalademod", CmdIndalademod, 0, "['224'] -- Demodulate samples for Indala 64 bit UID (option '224' for 224 bit)"}, {"lcd", CmdLcd, 0, " -- Send command/data to LCD"}, {"lcdreset", CmdLcdReset, 0, "Hardware reset LCD"}, - {"legicrfsim", CmdLegicRfSim, 0, "Start the LEGIC RF tag simulator"}, {"legicrfread", CmdLegicRfRead, 0, "Start the LEGIC RF reader"}, {"load", CmdLoad, 1, " -- Load trace (to graph window"}, {"locomread", CmdLoCommandRead, 0, " <'0' period> <'1' period> ['h'] -- Modulate LF reader field to send command before read (all periods in microseconds) (option 'h' for 134)"}, @@ -3007,7 +3007,6 @@ void UsbCommandReceived(UsbCommand *c) if (c->cmd != CMD_DOWNLOADED_RAW_ADC_SAMPLES_125K) goto unexpected_response; int i; for(i=0; i<48; i++) sample_buf[i] = c->d.asBytes[i]; - printf("stored 48 samples\n"); received_command = c->cmd; return; default: