mifare usb update

[proxmark3-svn] / client / command.c

diff --git a/client/command.c b/client/command.c
index 3370748ef198457a8e6dd8ddf0ecff2de86f30bd..a5c561a9ef785a44347708f707e62b5fc10dba14 100644 (file)
--- a/client/command.c
+++ b/client/command.c
@@ -132,6 +132,12 @@ static void CmdHi14areader(char *str)
        SendCommand(&c);\r
 }\r
 \r
        SendCommand(&c);\r
 }\r
 \r

+static void CmdHi14amifare(char *str)\r
+{\r
+       UsbCommand c={CMD_READER_MIFARE, {strtol(str, NULL, 0), 0, 0}};\r
+       SendCommand(&c);\r
+}\r
+\r

 static void CmdHi15reader(char *str)\r
 {\r
        UsbCommand c={CMD_READER_ISO_15693, {strtol(str, NULL, 0), 0, 0}};\r
 static void CmdHi15reader(char *str)\r
 {\r
        UsbCommand c={CMD_READER_ISO_15693, {strtol(str, NULL, 0), 0, 0}};\r


@@ -202,12 +208,6 @@ static void CmdHi14asnoop(char *str)
        SendCommand(&c);\r
 }\r
 \r
        SendCommand(&c);\r
 }\r
 \r

-static void CmdLegicRfSim(char *str)\r
-{\r
-       UsbCommand c={CMD_SIMULATE_TAG_LEGIC_RF};\r
-       SendCommand(&c);\r
-}\r
-\r

 static void CmdLegicRfRead(char *str)\r
 {\r
        UsbCommand c={CMD_READER_LEGIC_RF};\r
 static void CmdLegicRfRead(char *str)\r
 {\r
        UsbCommand c={CMD_READER_LEGIC_RF};\r


@@ -2821,6 +2821,7 @@ static struct {
        {"grid",                CmdGrid,                1, "<x> <y> -- overlay grid on graph window, use zero value to turn off either"},\r
        {"hexsamples",          CmdHexsamples,          0, "<blocks> -- Dump big buffer as hex bytes"},\r
        {"hi14alist",           CmdHi14alist,           0, "List ISO 14443a history"},\r
        {"grid",                CmdGrid,                1, "<x> <y> -- overlay grid on graph window, use zero value to turn off either"},\r
        {"hexsamples",          CmdHexsamples,          0, "<blocks> -- Dump big buffer as hex bytes"},\r
        {"hi14alist",           CmdHi14alist,           0, "List ISO 14443a history"},\r

+       {"hi14amifare",         CmdHi14amifare, 0, "Read out sector 0 parity error messages"},\r

        {"hi14areader",         CmdHi14areader,         0, "Act like an ISO14443 Type A reader"},\r
        {"hi14asim",            CmdHi14asim,            0, "<UID> -- Fake ISO 14443a tag"},\r
        {"hi14asnoop",          CmdHi14asnoop,          0, "Eavesdrop ISO 14443 Type A"},\r
        {"hi14areader",         CmdHi14areader,         0, "Act like an ISO14443 Type A reader"},\r
        {"hi14asim",            CmdHi14asim,            0, "<UID> -- Fake ISO 14443a tag"},\r
        {"hi14asnoop",          CmdHi14asnoop,          0, "Eavesdrop ISO 14443 Type A"},\r


@@ -2846,7 +2847,6 @@ static struct {
        {"indalademod",         CmdIndalademod,         0, "['224'] -- Demodulate samples for Indala 64 bit UID (option '224' for 224 bit)"},\r
        {"lcd",                 CmdLcd,                 0, "<HEX command> <count> -- Send command/data to LCD"},\r
        {"lcdreset",            CmdLcdReset,            0, "Hardware reset LCD"},\r
        {"indalademod",         CmdIndalademod,         0, "['224'] -- Demodulate samples for Indala 64 bit UID (option '224' for 224 bit)"},\r
        {"lcd",                 CmdLcd,                 0, "<HEX command> <count> -- Send command/data to LCD"},\r
        {"lcdreset",            CmdLcdReset,            0, "Hardware reset LCD"},\r

-       {"legicrfsim",          CmdLegicRfSim,          0, "Start the LEGIC RF tag simulator"},\r

        {"legicrfread",         CmdLegicRfRead,         0, "Start the LEGIC RF reader"},\r
        {"load",                CmdLoad,                1, "<filename> -- Load trace (to graph window"},\r
        {"locomread",           CmdLoCommandRead,       0, "<off period> <'0' period> <'1' period> <command> ['h'] -- Modulate LF reader field to send command before read (all periods in microseconds) (option 'h' for 134)"},\r
        {"legicrfread",         CmdLegicRfRead,         0, "Start the LEGIC RF reader"},\r
        {"load",                CmdLoad,                1, "<filename> -- Load trace (to graph window"},\r
        {"locomread",           CmdLoCommandRead,       0, "<off period> <'0' period> <'1' period> <command> ['h'] -- Modulate LF reader field to send command before read (all periods in microseconds) (option 'h' for 134)"},\r


@@ -3007,7 +3007,6 @@ void UsbCommandReceived(UsbCommand *c)
                if (c->cmd != CMD_DOWNLOADED_RAW_ADC_SAMPLES_125K) goto unexpected_response;\r
                int i;\r
                for(i=0; i<48; i++) sample_buf[i] = c->d.asBytes[i];\r
                if (c->cmd != CMD_DOWNLOADED_RAW_ADC_SAMPLES_125K) goto unexpected_response;\r
                int i;\r
                for(i=0; i<48; i++) sample_buf[i] = c->d.asBytes[i];\r

-               printf("stored 48 samples\n");\r

                received_command = c->cmd;\r
                return;\r
        default:\r
                received_command = c->cmd;\r
                return;\r
        default:\r