CHG: fixes to match the new arguments to the darkside attack (keytype A|B and blockn...

[proxmark3-svn] / armsrc / appmain.c

diff --git a/armsrc/appmain.c b/armsrc/appmain.c
index 7654c9e37ff0be7a70a994887b9c93b7284ed56e..14ecf28f8d15643fb7c73b491762d8cd631c5c36 100644 (file)
--- a/armsrc/appmain.c
+++ b/armsrc/appmain.c
@@ -71,6 +71,11 @@ void ToSendStuffBit(int b) {
        }
 }
 
+void PrintToSendBuffer(void){
+       DbpString("Printing ToSendBuffer:");
+       Dbhexdump(ToSendMax, ToSend, 0);
+}
+
 //=============================================================================
 // Debug print functions, to go out over USB, to the usual PC-side client.
 //=============================================================================
@@ -905,7 +910,7 @@ void UsbPacketReceived(uint8_t *packet, int len)
                        cmd_send(CMD_ACK, SampleLF(c->arg[0]),0,0,0,0);
                        break;
                case CMD_MOD_THEN_ACQUIRE_RAW_ADC_SAMPLES_125K:
-                       ModThenAcquireRawAdcSamples125k(c->arg[0],c->arg[1],c->arg[2],c->d.asBytes);
+                       ModThenAcquireRawAdcSamples125k(c->arg[0], c->arg[1], c->arg[2], c->d.asBytes);
                        break;
                case CMD_LF_SNOOP_RAW_ADC_SAMPLES:
                        cmd_send(CMD_ACK,SnoopLF(),0,0,0,0);
@@ -1053,6 +1058,10 @@ void UsbPacketReceived(uint8_t *packet, int len)
                        LegicRfWriter(c->arg[1], c->arg[0]);
                        break;
 
+               case CMD_RAW_WRITER_LEGIC_RF:
+                       LegicRfRawWriter(c->arg[0], c->arg[1]);
+                       break;
+
                case CMD_READER_LEGIC_RF:
                        LegicRfReader(c->arg[0], c->arg[1]);
                        break;
@@ -1066,7 +1075,7 @@ void UsbPacketReceived(uint8_t *packet, int len)
                        SnoopIso14443b();
                        break;
                case CMD_SIMULATE_TAG_ISO_14443B:
-                       SimulateIso14443bTag();
+                       SimulateIso14443bTag(c->arg[0]);
                        break;
                case CMD_ISO_14443B_COMMAND:
                        //SendRawCommand14443B(c->arg[0],c->arg[1],c->arg[2],c->d.asBytes);
@@ -1091,7 +1100,7 @@ void UsbPacketReceived(uint8_t *packet, int len)
                        EPA_PACE_Replay(c);
                        break;
                case CMD_READER_MIFARE:
-            ReaderMifare(c->arg[0], c->arg[1]);
+            ReaderMifare(c->arg[0], c->arg[1], c->arg[2]);
                        break;
                case CMD_MIFARE_READBL:
                        MifareReadBlock(c->arg[0], c->arg[1], c->arg[2], c->d.asBytes);