ADD: the option to simulate tnp3xxx inthe command "hf mf sim"

[proxmark3-svn] / armsrc / appmain.c

diff --git a/armsrc/appmain.c b/armsrc/appmain.c
index 9e4b32cd3ef3575d567ef29e968448b5a29e1c28..09acf41fb2f2e58ef0ee8ee7988c388afd4d6db6 100644 (file)
--- a/armsrc/appmain.c
+++ b/armsrc/appmain.c
@@ -18,12 +18,13 @@
 #include "util.h"
 #include "printf.h"
 #include "string.h"
 #include "util.h"
 #include "printf.h"
 #include "string.h"

-

 #include <stdarg.h>
 
 #include <stdarg.h>
 

+

 #include "legicrf.h"
 #include "../include/hitag2.h"
 
 #include "legicrf.h"
 #include "../include/hitag2.h"
 

+

 #ifdef WITH_LCD
  #include "LCD.h"
 #endif
 #ifdef WITH_LCD
  #include "LCD.h"
 #endif


@@ -310,7 +311,7 @@ extern struct version_information version_information;
 extern char *_bootphase1_version_pointer, _flash_start, _flash_end;
 void SendVersion(void)
 {
 extern char *_bootphase1_version_pointer, _flash_start, _flash_end;
 void SendVersion(void)
 {

-       char temp[256]; /* Limited data payload in USB packets */
+       char temp[512]; /* Limited data payload in USB packets */

        DbpString("Prox/RFID mark3 RFID instrument");
 
        /* Try to find the bootrom version information. Expect to find a pointer at
        DbpString("Prox/RFID mark3 RFID instrument");
 
        /* Try to find the bootrom version information. Expect to find a pointer at


@@ -359,22 +360,22 @@ void SamyRun()
 
        int selected = 0;
        int playing = 0;
 
        int selected = 0;
        int playing = 0;

+       int cardRead = 0;

 
        // Turn on selected LED
        LED(selected + 1, 0);
 
        for (;;)
        {
 
        // Turn on selected LED
        LED(selected + 1, 0);
 
        for (;;)
        {

-//             UsbPoll(FALSE);

                usb_poll();
                usb_poll();

-    WDT_HIT();
+               WDT_HIT();

 
                // Was our button held down or pressed?
                int button_pressed = BUTTON_HELD(1000);
                SpinDelay(300);
 
                // Button was held for a second, begin recording
 
                // Was our button held down or pressed?
                int button_pressed = BUTTON_HELD(1000);
                SpinDelay(300);
 
                // Button was held for a second, begin recording

-               if (button_pressed > 0)
+               if (button_pressed > 0 && cardRead == 0)

                {
                        LEDsoff();
                        LED(selected + 1, 0);
                {
                        LEDsoff();
                        LED(selected + 1, 0);


@@ -400,6 +401,40 @@ void SamyRun()
                        // If we were previously playing, set playing off
                        // so next button push begins playing what we recorded
                        playing = 0;
                        // If we were previously playing, set playing off
                        // so next button push begins playing what we recorded
                        playing = 0;

+                       
+                       cardRead = 1;
+       
+               }
+
+               else if (button_pressed > 0 && cardRead == 1)
+               {
+                                       LEDsoff();
+                                       LED(selected + 1, 0);
+                                       LED(LED_ORANGE, 0);
+
+                                       // record
+                                       Dbprintf("Cloning %x %x %x", selected, high[selected], low[selected]);
+
+                                       // wait for button to be released
+                                       while(BUTTON_PRESS())
+                                               WDT_HIT();
+
+                                       /* need this delay to prevent catching some weird data */
+                                       SpinDelay(500);
+
+                                       CopyHIDtoT55x7(high[selected], low[selected], 0, 0);
+                                       Dbprintf("Cloned %x %x %x", selected, high[selected], low[selected]);
+
+                                       LEDsoff();
+                                       LED(selected + 1, 0);
+                                       // Finished recording
+
+                                       // If we were previously playing, set playing off
+                                       // so next button push begins playing what we recorded
+                                       playing = 0;
+                                       
+                                       cardRead = 0;
+                       

                }
 
                // Change where to record (or begin playing)
                }
 
                // Change where to record (or begin playing)


@@ -597,7 +632,7 @@ void UsbPacketReceived(uint8_t *packet, int len)
 {
        UsbCommand *c = (UsbCommand *)packet;
 
 {
        UsbCommand *c = (UsbCommand *)packet;
 

-//  Dbprintf("received %d bytes, with command: 0x%04x and args: %d %d %d",len,c->cmd,c->arg[0],c->arg[1],c->arg[2]);
+  //Dbprintf("received %d bytes, with command: 0x%04x and args: %d %d %d",len,c->cmd,c->arg[0],c->arg[1],c->arg[2]);

   
        switch(c->cmd) {
 #ifdef WITH_LF
   
        switch(c->cmd) {
 #ifdef WITH_LF


@@ -638,7 +673,7 @@ void UsbPacketReceived(uint8_t *packet, int len)
                        break;
                case CMD_SIMULATE_TAG_125K:
                        LED_A_ON();
                        break;
                case CMD_SIMULATE_TAG_125K:
                        LED_A_ON();

-                       SimulateTagLowFrequency(c->arg[0], c->arg[1], 1);
+                       SimulateTagLowFrequency(c->arg[0], c->arg[1], 0);

                        LED_A_OFF();
                        break;
                case CMD_LF_SIMULATE_BIDIR:
                        LED_A_OFF();
                        break;
                case CMD_LF_SIMULATE_BIDIR:


@@ -707,7 +742,7 @@ void UsbPacketReceived(uint8_t *packet, int len)
                        ReaderIso15693(c->arg[0]);
                        break;
                case CMD_SIMTAG_ISO_15693:
                        ReaderIso15693(c->arg[0]);
                        break;
                case CMD_SIMTAG_ISO_15693:

-                       SimTagIso15693(c->arg[0]);
+                       SimTagIso15693(c->arg[0], c->d.asBytes);

                        break;
 #endif
 
                        break;
 #endif
 


@@ -756,10 +791,15 @@ void UsbPacketReceived(uint8_t *packet, int len)
                case CMD_SIMULATE_TAG_ISO_14443a:
                        SimulateIso14443aTag(c->arg[0], c->arg[1], c->arg[2], c->d.asBytes);  // ## Simulate iso14443a tag - pass tag type & UID
                        break;
                case CMD_SIMULATE_TAG_ISO_14443a:
                        SimulateIso14443aTag(c->arg[0], c->arg[1], c->arg[2], c->d.asBytes);  // ## Simulate iso14443a tag - pass tag type & UID
                        break;

+                       

                case CMD_EPA_PACE_COLLECT_NONCE:
                        EPA_PACE_Collect_Nonce(c);
                        break;
                        
                case CMD_EPA_PACE_COLLECT_NONCE:
                        EPA_PACE_Collect_Nonce(c);
                        break;
                        

+               // case CMD_EPA_:
+               //      EpaFoo(c);
+               // break;
+                       

                case CMD_READER_MIFARE:
             ReaderMifare(c->arg[0]);
                        break;
                case CMD_READER_MIFARE:
             ReaderMifare(c->arg[0]);
                        break;


@@ -842,14 +882,18 @@ void UsbPacketReceived(uint8_t *packet, int len)
                        MifareDES_Auth1(c->arg[0], c->arg[1], c->arg[2], c->d.asBytes);
                        break;
                case CMD_MIFARE_DESFIRE_AUTH2:
                        MifareDES_Auth1(c->arg[0], c->arg[1], c->arg[2], c->d.asBytes);
                        break;
                case CMD_MIFARE_DESFIRE_AUTH2:

-                       MifareDES_Auth2(c->arg[0],c->d.asBytes);
+                       //MifareDES_Auth2(c->arg[0],c->d.asBytes);

                        break;
                // case CMD_MIFARE_DES_READER:
                        // ReaderMifareDES(c->arg[0], c->arg[1], c->d.asBytes);
                        break;
                // case CMD_MIFARE_DES_READER:
                        // ReaderMifareDES(c->arg[0], c->arg[1], c->d.asBytes);

-                       break;
+                       //break;

                case CMD_MIFARE_DESFIRE_INFO:
                        MifareDesfireGetInformation();
                        break;
                case CMD_MIFARE_DESFIRE_INFO:
                        MifareDesfireGetInformation();
                        break;

+               case CMD_MIFARE_DESFIRE:
+                       MifareSendCommand(c->arg[0], c->arg[1], c->d.asBytes);
+                       break;
+

 #endif
 
 #ifdef WITH_ICLASS
 #endif
 
 #ifdef WITH_ICLASS


@@ -908,8 +952,7 @@ void UsbPacketReceived(uint8_t *packet, int len)
 
                case CMD_DOWNLOADED_SIM_SAMPLES_125K: {
                        uint8_t *b = (uint8_t *)BigBuf;
 
                case CMD_DOWNLOADED_SIM_SAMPLES_125K: {
                        uint8_t *b = (uint8_t *)BigBuf;

-                       memcpy(b+c->arg[0], c->d.asBytes, 48);
-                       //Dbprintf("copied 48 bytes to %i",b+c->arg[0]);
+                       memcpy(b+c->arg[0], c->d.asBytes, USB_CMD_DATA_SIZE);

                        cmd_send(CMD_ACK,0,0,0,0,0);
                        break;
                }       
                        cmd_send(CMD_ACK,0,0,0,0,0);
                        break;
                }       


@@ -994,7 +1037,7 @@ void  __attribute__((noreturn)) AppMain(void)
        LED_A_OFF();
 
        // Init USB device
        LED_A_OFF();
 
        // Init USB device

-  usb_enable();
+       usb_enable();

 
        // The FPGA gets its clock from us from PCK0 output, so set that up.
        AT91C_BASE_PIOA->PIO_BSR = GPIO_PCK0;
 
        // The FPGA gets its clock from us from PCK0 output, so set that up.
        AT91C_BASE_PIOA->PIO_BSR = GPIO_PCK0;


@@ -1024,12 +1067,12 @@ void  __attribute__((noreturn)) AppMain(void)
        size_t rx_len;
   
        for(;;) {
        size_t rx_len;
   
        for(;;) {

-    if (usb_poll()) {
-      rx_len = usb_read(rx,sizeof(UsbCommand));
-      if (rx_len) {
-        UsbPacketReceived(rx,rx_len);
-      }
-    }
+               if (usb_poll()) {
+                       rx_len = usb_read(rx,sizeof(UsbCommand));
+                       if (rx_len) {
+                               UsbPacketReceived(rx,rx_len);
+                       }
+               }

                WDT_HIT();
 
 #ifdef WITH_LF
                WDT_HIT();
 
 #ifdef WITH_LF