Add generic CRC calculation code

[proxmark3-svn] / armsrc / appmain.c

diff --git a/armsrc/appmain.c b/armsrc/appmain.c
index e86cad8c35ca9227edf72e1f3218fcf49c1b2800..81ef407a04d3e94f5caafe94e34143a9d2fabe10 100644 (file)
--- a/armsrc/appmain.c
+++ b/armsrc/appmain.c
@@ -267,7 +267,7 @@ void SendVersion(void)
        DbpString(temp);\r
 }\r
 \r
        DbpString(temp);\r
 }\r
 \r

-#ifdef DWITH_LF\r
+#ifdef WITH_LF\r

 // samy's sniff and repeat routine\r
 void SamyRun()\r
 {\r
 // samy's sniff and repeat routine\r
 void SamyRun()\r
 {\r


@@ -534,13 +534,13 @@ void UsbPacketReceived(BYTE *packet, int len)
        UsbCommand *c = (UsbCommand *)packet;\r
 \r
        switch(c->cmd) {\r
        UsbCommand *c = (UsbCommand *)packet;\r
 \r
        switch(c->cmd) {\r

-#ifdef DWITH_LF\r
+#ifdef WITH_LF\r

                case CMD_ACQUIRE_RAW_ADC_SAMPLES_125K:\r
                        AcquireRawAdcSamples125k(c->ext1);\r
                        break;\r
 #endif\r
 \r
                case CMD_ACQUIRE_RAW_ADC_SAMPLES_125K:\r
                        AcquireRawAdcSamples125k(c->ext1);\r
                        break;\r
 #endif\r
 \r

-#ifdef DWITH_LF\r
+#ifdef WITH_LF\r

                case CMD_MOD_THEN_ACQUIRE_RAW_ADC_SAMPLES_125K:\r
                        ModThenAcquireRawAdcSamples125k(c->ext1,c->ext2,c->ext3,c->d.asBytes);\r
                        break;\r
                case CMD_MOD_THEN_ACQUIRE_RAW_ADC_SAMPLES_125K:\r
                        ModThenAcquireRawAdcSamples125k(c->ext1,c->ext2,c->ext3,c->d.asBytes);\r
                        break;\r


@@ -582,6 +582,9 @@ void UsbPacketReceived(BYTE *packet, int len)
                case CMD_READ_SRI512_TAG:\r
                        ReadSRI512Iso14443(c->ext1);\r
                        break;\r
                case CMD_READ_SRI512_TAG:\r
                        ReadSRI512Iso14443(c->ext1);\r
                        break;\r

+               case CMD_READ_SRIX4K_TAG:
+                       ReadSRIX4KIso14443(c->ext1);
+                       break;

 #endif\r
 \r
 #ifdef WITH_ISO14443a\r
 #endif\r
 \r
 #ifdef WITH_ISO14443a\r


@@ -630,13 +633,13 @@ void UsbPacketReceived(BYTE *packet, int len)
                        ListenReaderField(c->ext1);\r
                        break;\r
 \r
                        ListenReaderField(c->ext1);\r
                        break;\r
 \r

-#ifdef DWITH_LF\r
+#ifdef WITH_LF\r

                case CMD_HID_DEMOD_FSK:\r
                        CmdHIDdemodFSK(0, 0, 0, 1);                             // Demodulate HID tag\r
                        break;\r
 #endif\r
 \r
                case CMD_HID_DEMOD_FSK:\r
                        CmdHIDdemodFSK(0, 0, 0, 1);                             // Demodulate HID tag\r
                        break;\r
 #endif\r
 \r

-#ifdef DWITH_LF\r
+#ifdef WITH_LF\r

                case CMD_HID_SIM_TAG:\r
                        CmdHIDsimTAG(c->ext1, c->ext2, 1);                                      // Simulate HID tag by ID\r
                        break;\r
                case CMD_HID_SIM_TAG:\r
                        CmdHIDsimTAG(c->ext1, c->ext2, 1);                                      // Simulate HID tag by ID\r
                        break;\r


@@ -648,13 +651,13 @@ void UsbPacketReceived(BYTE *packet, int len)
                        LED_D_OFF(); // LED D indicates field ON or OFF\r
                        break;\r
 \r
                        LED_D_OFF(); // LED D indicates field ON or OFF\r
                        break;\r
 \r

-#ifdef DWITH_LF\r
+#ifdef WITH_LF\r

                case CMD_READ_TI_TYPE:\r
                        ReadTItag();\r
                        break;\r
 #endif\r
 \r
                case CMD_READ_TI_TYPE:\r
                        ReadTItag();\r
                        break;\r
 #endif\r
 \r

-#ifdef DWITH_LF\r
+#ifdef WITH_LF\r

                case CMD_WRITE_TI_TYPE:\r
                        WriteTItag(c->ext1,c->ext2,c->ext3);\r
                        break;\r
                case CMD_WRITE_TI_TYPE:\r
                        WriteTItag(c->ext1,c->ext2,c->ext3);\r
                        break;\r


@@ -679,7 +682,7 @@ void UsbPacketReceived(BYTE *packet, int len)
                        break;\r
                }\r
 \r
                        break;\r
                }\r
 \r

-#ifdef DWITH_LF\r
+#ifdef WITH_LF\r

                case CMD_SIMULATE_TAG_125K:\r
                        LED_A_ON();\r
                        SimulateTagLowFrequency(c->ext1, 1);\r
                case CMD_SIMULATE_TAG_125K:\r
                        LED_A_ON();\r
                        SimulateTagLowFrequency(c->ext1, 1);\r


@@ -708,7 +711,7 @@ void UsbPacketReceived(BYTE *packet, int len)
                        SendVersion();\r
                        break;\r
 \r
                        SendVersion();\r
                        break;\r
 \r

-#ifdef DWITH_LF\r
+#ifdef WITH_LF\r

                case CMD_LF_SIMULATE_BIDIR:\r
                        SimulateTagLowFrequencyBidir(c->ext1, c->ext2);\r
                        break;\r
                case CMD_LF_SIMULATE_BIDIR:\r
                        SimulateTagLowFrequencyBidir(c->ext1, c->ext2);\r
                        break;\r


@@ -823,7 +826,7 @@ void  __attribute__((noreturn)) AppMain(void)
                UsbPoll(FALSE);\r
                WDT_HIT();\r
 \r
                UsbPoll(FALSE);\r
                WDT_HIT();\r
 \r

-#ifdef DWITH_LF\r
+#ifdef WITH_LF\r

                if (BUTTON_HELD(1000) > 0)\r
                        SamyRun();\r
 #endif\r
                if (BUTTON_HELD(1000) > 0)\r
                        SamyRun();\r
 #endif\r