Added the changes to armsrc for milfare ultralight C and Desfire commands

[proxmark3-svn] / armsrc / appmain.c

diff --git a/armsrc/appmain.c b/armsrc/appmain.c
index b7bc87e70c631fe8be5c7901e0c96462f7292d32..947c12ccdb9d474d349c5f2feac1bdc676a4546d 100644 (file)
--- a/armsrc/appmain.c
+++ b/armsrc/appmain.c
@@ -215,7 +215,7 @@ void MeasureAntennaTuning(void)
  */
   
        FpgaDownloadAndGo(FPGA_BITSTREAM_LF);
-       FpgaWriteConfWord(FPGA_MAJOR_MODE_LF_READER);
+       FpgaWriteConfWord(FPGA_MAJOR_MODE_LF_ADC | FPGA_LF_ADC_READER_FIELD);
        for (i=255; i>19; i--) {
     WDT_HIT();
                FpgaSendCommand(FPGA_CMD_SET_DIVISOR, i);
@@ -638,6 +638,10 @@ void UsbPacketReceived(uint8_t *packet, int len)
                case CMD_MOD_THEN_ACQUIRE_RAW_ADC_SAMPLES_125K:
                        ModThenAcquireRawAdcSamples125k(c->arg[0],c->arg[1],c->arg[2],c->d.asBytes);
                        break;
+               case CMD_LF_SNOOP_RAW_ADC_SAMPLES:
+                       SnoopLFRawAdcSamples(c->arg[0], c->arg[1]);
+                       cmd_send(CMD_ACK,0,0,0,0,0);
+                       break;
                case CMD_HID_DEMOD_FSK:
                        CmdHIDdemodFSK(0, 0, 0, 1);                                     // Demodulate HID tag
                        break;
@@ -797,7 +801,16 @@ void UsbPacketReceived(uint8_t *packet, int len)
                        MifareUReadBlock(c->arg[0],c->d.asBytes);
                        break;
                case CMD_MIFAREU_READCARD:
-                       MifareUReadCard(c->arg[0],c->d.asBytes);
+                        MifareUReadCard(c->arg[0],c->arg[1],c->d.asBytes);
+                        break;
+                case CMD_MIFAREUC_READCARD:
+                        MifareUReadCard(c->arg[0],c->arg[1],c->d.asBytes);
+                        break;
+                case CMD_MIFAREUC_AUTH1:
+                        MifareUC_Auth1(c->arg[0],c->d.asBytes);
+                        break;
+                case CMD_MIFAREUC_AUTH2:
+                        MifareUC_Auth2(c->arg[0],c->d.asBytes);
                         break;
                case CMD_MIFARE_READSC:
                        MifareReadSector(c->arg[0], c->arg[1], c->arg[2], c->d.asBytes);
@@ -820,7 +833,12 @@ void UsbPacketReceived(uint8_t *packet, int len)
                case CMD_SIMULATE_MIFARE_CARD:
                        Mifare1ksim(c->arg[0], c->arg[1], c->arg[2], c->d.asBytes);
                        break;
-               
+               case CMD_MIFARE_DES_AUTH1:
+                        Mifare_DES_Auth1(c->arg[0],c->d.asBytes);
+                        break;
+                case CMD_MIFARE_DES_AUTH2:
+                        Mifare_DES_Auth2(c->arg[0],c->d.asBytes);
+                        break;         
                // emulator
                case CMD_MIFARE_SET_DBGMODE:
                        MifareSetDbgLvl(c->arg[0], c->arg[1], c->arg[2], c->d.asBytes);
@@ -863,6 +881,12 @@ void UsbPacketReceived(uint8_t *packet, int len)
                case CMD_READER_ICLASS:
                        ReaderIClass(c->arg[0]);
                        break;
+               case CMD_READER_ICLASS_REPLAY:
+                   ReaderIClass_Replay(c->arg[0], c->d.asBytes);
+                       break;
+               case CMD_ICLASS_ISO14443A_GETPUBLIC:
+                   IClass_iso14443A_GetPublic(c->arg[0]);
+                   break;
 #endif
 
                case CMD_SIMULATE_TAG_HF_LISTEN: