Added enios dirthreshold command, patch from http://www.proxmark.org/forum/viewtopic...

[proxmark3-svn] / armsrc / appmain.c

diff --git a/armsrc/appmain.c b/armsrc/appmain.c
index e5415010e3005817363ecfb5c1642da6d0392b02..b6c3220084dc2c3aaf8d898fd496206c2108b69c 100644 (file)
--- a/armsrc/appmain.c
+++ b/armsrc/appmain.c
@@ -1,25 +1,33 @@
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------

-// The main application code. This is the first thing called after start.c
-// executes.

 // Jonathan Westhues, Mar 2006
 // Edits by Gerhard de Koning Gans, Sep 2007 (##)
 // Jonathan Westhues, Mar 2006
 // Edits by Gerhard de Koning Gans, Sep 2007 (##)

+//
+// This code is licensed to you under the terms of the GNU GPL, version 2 or,
+// at your option, any later version. See the LICENSE.txt file for the text of
+// the license.

 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------

+// The main application code. This is the first thing called after start.c
+// executes.
+//-----------------------------------------------------------------------------
+
+#include "usb_cdc.h"
+#include "cmd.h"

 
 

-#include <proxmark3.h>
+#include "proxmark3.h"

 #include "apps.h"
 #include "apps.h"

+#include "util.h"
+#include "printf.h"
+#include "string.h"
+
+#include <stdarg.h>
+

 #include "legicrf.h"
 #include "legicrf.h"

+#include <hitag2.h>
+

 #ifdef WITH_LCD
 #ifdef WITH_LCD

-#include "fonts.h"
-#include "LCD.h"
+ #include "LCD.h"

 #endif
 
 #endif
 

-#define va_list __builtin_va_list
-#define va_start __builtin_va_start
-#define va_arg __builtin_va_arg
-#define va_end __builtin_va_end
-int kvsprintf(char const *fmt, void *arg, int radix, va_list ap);
-       
-

 #define abs(x) ( ((x)<0) ? -(x) : (x) )
 
 //=============================================================================
 #define abs(x) ( ((x)<0) ? -(x) : (x) )
 
 //=============================================================================


@@ -28,7 +36,7 @@ int kvsprintf(char const *fmt, void *arg, int radix, va_list ap);
 // is the order in which they go out on the wire.
 //=============================================================================
 
 // is the order in which they go out on the wire.
 //=============================================================================
 

-BYTE ToSend[512];
+uint8_t ToSend[512];

 int ToSendMax;
 static int ToSendBit;
 struct common_area common_area __attribute__((section(".commonarea")));
 int ToSendMax;
 static int ToSendBit;
 struct common_area common_area __attribute__((section(".commonarea")));


@@ -71,39 +79,42 @@ void ToSendStuffBit(int b)
 
 void DbpString(char *str)
 {
 
 void DbpString(char *str)
 {

-       /* this holds up stuff unless we're connected to usb */
-       if (!UsbConnected())
-               return;
-
-       UsbCommand c;
-       c.cmd = CMD_DEBUG_PRINT_STRING;
-       c.arg[0] = strlen(str);
-       if(c.arg[0] > sizeof(c.d.asBytes)) {
-               c.arg[0] = sizeof(c.d.asBytes);
-       }
-       memcpy(c.d.asBytes, str, c.arg[0]);
-
-       UsbSendPacket((BYTE *)&c, sizeof(c));
-       // TODO fix USB so stupid things like this aren't req'd
-       SpinDelay(50);
+  byte_t len = strlen(str);
+  cmd_send(CMD_DEBUG_PRINT_STRING,len,0,0,(byte_t*)str,len);
+//     /* this holds up stuff unless we're connected to usb */
+//     if (!UsbConnected())
+//             return;
+//
+//     UsbCommand c;
+//     c.cmd = CMD_DEBUG_PRINT_STRING;
+//     c.arg[0] = strlen(str);
+//     if(c.arg[0] > sizeof(c.d.asBytes)) {
+//             c.arg[0] = sizeof(c.d.asBytes);
+//     }
+//     memcpy(c.d.asBytes, str, c.arg[0]);
+//
+//     UsbSendPacket((uint8_t *)&c, sizeof(c));
+//     // TODO fix USB so stupid things like this aren't req'd
+//     SpinDelay(50);

 }
 
 #if 0
 void DbpIntegers(int x1, int x2, int x3)
 {
 }
 
 #if 0
 void DbpIntegers(int x1, int x2, int x3)
 {

-       /* this holds up stuff unless we're connected to usb */
-       if (!UsbConnected())
-               return;
-
-       UsbCommand c;
-       c.cmd = CMD_DEBUG_PRINT_INTEGERS;
-       c.arg[0] = x1;
-       c.arg[1] = x2;
-       c.arg[2] = x3;
-
-       UsbSendPacket((BYTE *)&c, sizeof(c));
-       // XXX
-       SpinDelay(50);
+  cmd_send(CMD_DEBUG_PRINT_INTEGERS,x1,x2,x3,0,0);
+//     /* this holds up stuff unless we're connected to usb */
+//     if (!UsbConnected())
+//             return;
+//
+//     UsbCommand c;
+//     c.cmd = CMD_DEBUG_PRINT_INTEGERS;
+//     c.arg[0] = x1;
+//     c.arg[1] = x2;
+//     c.arg[2] = x3;
+//
+//     UsbSendPacket((uint8_t *)&c, sizeof(c));
+//     // XXX
+//     SpinDelay(50);

 }
 #endif
 
 }
 #endif
 


@@ -115,10 +126,37 @@ void Dbprintf(const char *fmt, ...) {
        va_start(ap, fmt);
        kvsprintf(fmt, output_string, 10, ap);
        va_end(ap);
        va_start(ap, fmt);
        kvsprintf(fmt, output_string, 10, ap);
        va_end(ap);

- 
+

        DbpString(output_string);
 }
 
        DbpString(output_string);
 }
 

+// prints HEX & ASCII
+void Dbhexdump(int len, uint8_t *d, bool bAsci) {
+       int l=0,i;
+       char ascii[9];
+    
+       while (len>0) {
+               if (len>8) l=8;
+               else l=len;
+               
+               memcpy(ascii,d,l);
+               ascii[l]=0;
+               
+               // filter safe ascii
+               for (i=0;i<l;i++)
+                       if (ascii[i]<32 || ascii[i]>126) ascii[i]='.';
+        
+               if (bAsci) {
+                       Dbprintf("%-8s %*D",ascii,l,d," ");
+               } else {
+                       Dbprintf("%*D",l,d," ");
+               }
+        
+               len-=8;
+               d+=8;           
+       }
+}
+

 //-----------------------------------------------------------------------------
 // Read an ADC channel and block till it completes, then return the result
 // in ADC units (0 to 1023). Also a routine to average 32 samples and
 //-----------------------------------------------------------------------------
 // Read an ADC channel and block till it completes, then return the result
 // in ADC units (0 to 1023). Also a routine to average 32 samples and


@@ -126,7 +164,7 @@ void Dbprintf(const char *fmt, ...) {
 //-----------------------------------------------------------------------------
 static int ReadAdc(int ch)
 {
 //-----------------------------------------------------------------------------
 static int ReadAdc(int ch)
 {

-       DWORD d;
+       uint32_t d;

 
        AT91C_BASE_ADC->ADC_CR = AT91C_ADC_SWRST;
        AT91C_BASE_ADC->ADC_MR =
 
        AT91C_BASE_ADC->ADC_CR = AT91C_ADC_SWRST;
        AT91C_BASE_ADC->ADC_MR =


@@ -143,7 +181,7 @@ static int ReadAdc(int ch)
        return d;
 }
 
        return d;
 }
 

-static int AvgAdc(int ch)
+int AvgAdc(int ch) // was static - merlok

 {
        int i;
        int a = 0;
 {
        int i;
        int a = 0;


@@ -157,14 +195,15 @@ static int AvgAdc(int ch)
 
 void MeasureAntennaTuning(void)
 {
 
 void MeasureAntennaTuning(void)
 {

-       BYTE *dest = (BYTE *)BigBuf;
-       int i, ptr = 0, adcval = 0, peak = 0, peakv = 0, peakf = 0;;
+       uint8_t *dest = (uint8_t *)BigBuf+FREE_BUFFER_OFFSET;
+       int i, adcval = 0, peak = 0, peakv = 0, peakf = 0; //ptr = 0 

        int vLf125 = 0, vLf134 = 0, vHf = 0;    // in mV
 
        int vLf125 = 0, vLf134 = 0, vHf = 0;    // in mV
 

-       UsbCommand c;
+//     UsbCommand c;

 
 

-       DbpString("Measuring antenna characteristics, please wait.");
-       memset(BigBuf,0,sizeof(BigBuf));
+  LED_B_ON();
+       DbpString("Measuring antenna characteristics, please wait...");
+       memset(dest,0,sizeof(FREE_BUFFER_SIZE));

 
 /*
  * Sweeps the useful LF range of the proxmark from
 
 /*
  * Sweeps the useful LF range of the proxmark from


@@ -174,8 +213,10 @@ void MeasureAntennaTuning(void)
  * the resonating frequency of your LF antenna
  * ( hopefully around 95 if it is tuned to 125kHz!)
  */
  * the resonating frequency of your LF antenna
  * ( hopefully around 95 if it is tuned to 125kHz!)
  */

+  

        FpgaWriteConfWord(FPGA_MAJOR_MODE_LF_READER);
        for (i=255; i>19; i--) {
        FpgaWriteConfWord(FPGA_MAJOR_MODE_LF_READER);
        for (i=255; i>19; i--) {

+    WDT_HIT();

                FpgaSendCommand(FPGA_CMD_SET_DIVISOR, i);
                SpinDelay(20);
                // Vref = 3.3V, and a 10000:240 voltage divider on the input
                FpgaSendCommand(FPGA_CMD_SET_DIVISOR, i);
                SpinDelay(20);
                // Vref = 3.3V, and a 10000:240 voltage divider on the input


@@ -189,10 +230,11 @@ void MeasureAntennaTuning(void)
                        peakv = adcval;
                        peak = dest[i];
                        peakf = i;
                        peakv = adcval;
                        peak = dest[i];
                        peakf = i;

-                       ptr = i;
+                       //ptr = i;

                }
        }
 
                }
        }
 

+  LED_A_ON();

        // Let the FPGA drive the high-frequency antenna around 13.56 MHz.
        FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_READER_RX_XCORR);
        SpinDelay(20);
        // Let the FPGA drive the high-frequency antenna around 13.56 MHz.
        FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_READER_RX_XCORR);
        SpinDelay(20);


@@ -200,11 +242,18 @@ void MeasureAntennaTuning(void)
        // can measure voltages up to 33000 mV
        vHf = (33000 * AvgAdc(ADC_CHAN_HF)) >> 10;
 
        // can measure voltages up to 33000 mV
        vHf = (33000 * AvgAdc(ADC_CHAN_HF)) >> 10;
 

-       c.cmd = CMD_MEASURED_ANTENNA_TUNING;
-       c.arg[0] = (vLf125 << 0) | (vLf134 << 16);
-       c.arg[1] = vHf;
-       c.arg[2] = peakf | (peakv << 16);
-       UsbSendPacket((BYTE *)&c, sizeof(c));
+//     c.cmd = CMD_MEASURED_ANTENNA_TUNING;
+//     c.arg[0] = (vLf125 << 0) | (vLf134 << 16);
+//     c.arg[1] = vHf;
+//     c.arg[2] = peakf | (peakv << 16);
+
+  DbpString("Measuring complete, sending report back to host");
+  cmd_send(CMD_MEASURED_ANTENNA_TUNING,vLf125|(vLf134<<16),vHf,peakf|(peakv<<16),0,0);
+//     UsbSendPacket((uint8_t *)&c, sizeof(c));
+       FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
+  LED_A_OFF();
+  LED_B_OFF();
+  return;

 }
 
 void MeasureAntennaTuningHf(void)
 }
 
 void MeasureAntennaTuningHf(void)


@@ -220,7 +269,7 @@ void MeasureAntennaTuningHf(void)
                // Vref = 3300mV, and an 10:1 voltage divider on the input
                // can measure voltages up to 33000 mV
                vHf = (33000 * AvgAdc(ADC_CHAN_HF)) >> 10;
                // Vref = 3300mV, and an 10:1 voltage divider on the input
                // can measure voltages up to 33000 mV
                vHf = (33000 * AvgAdc(ADC_CHAN_HF)) >> 10;

-       
+

                Dbprintf("%d mV",vHf);
                if (BUTTON_PRESS()) break;
        }
                Dbprintf("%d mV",vHf);
                if (BUTTON_PRESS()) break;
        }


@@ -230,9 +279,8 @@ void MeasureAntennaTuningHf(void)
 
 void SimulateTagHfListen(void)
 {
 
 void SimulateTagHfListen(void)
 {

-       BYTE *dest = (BYTE *)BigBuf;
-       int n = sizeof(BigBuf);
-       BYTE v = 0;
+       uint8_t *dest = (uint8_t *)BigBuf+FREE_BUFFER_OFFSET;
+       uint8_t v = 0;

        int i;
        int p = 0;
 
        int i;
        int p = 0;
 


@@ -251,7 +299,7 @@ void SimulateTagHfListen(void)
                        AT91C_BASE_SSC->SSC_THR = 0xff;
                }
                if(AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_RXRDY)) {
                        AT91C_BASE_SSC->SSC_THR = 0xff;
                }
                if(AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_RXRDY)) {

-                       BYTE r = (BYTE)AT91C_BASE_SSC->SSC_RHR;
+                       uint8_t r = (uint8_t)AT91C_BASE_SSC->SSC_RHR;

 
                        v <<= 1;
                        if(r & 1) {
 
                        v <<= 1;
                        if(r & 1) {


@@ -265,7 +313,7 @@ void SimulateTagHfListen(void)
                                p = 0;
                                i++;
 
                                p = 0;
                                i++;
 

-                               if(i >= n) {
+                               if(i >= FREE_BUFFER_SIZE) {

                                        break;
                                }
                        }
                                        break;
                                }
                        }


@@ -276,7 +324,7 @@ void SimulateTagHfListen(void)
 
 void ReadMem(int addr)
 {
 
 void ReadMem(int addr)
 {

-       const BYTE *data = ((BYTE *)addr);
+       const uint8_t *data = ((uint8_t *)addr);

 
        Dbprintf("%x: %02x %02x %02x %02x %02x %02x %02x %02x",
                addr, data[0], data[1], data[2], data[3], data[4], data[5], data[6], data[7]);
 
        Dbprintf("%x: %02x %02x %02x %02x %02x %02x %02x %02x",
                addr, data[0], data[1], data[2], data[3], data[4], data[5], data[6], data[7]);


@@ -288,10 +336,10 @@ 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[48]; /* Limited data payload in USB packets */
+       char temp[256]; /* Limited data payload in USB packets */

        DbpString("Prox/RFID mark3 RFID instrument");
        DbpString("Prox/RFID mark3 RFID instrument");

-       
-       /* Try to find the bootrom version information. Expect to find a pointer at 
+
+       /* Try to find the bootrom version information. Expect to find a pointer at

         * symbol _bootphase1_version_pointer, perform slight sanity checks on the
         * pointer, then use it.
         */
         * symbol _bootphase1_version_pointer, perform slight sanity checks on the
         * pointer, then use it.
         */


@@ -302,12 +350,14 @@ void SendVersion(void)
                FormatVersionInformation(temp, sizeof(temp), "bootrom: ", bootrom_version);
                DbpString(temp);
        }
                FormatVersionInformation(temp, sizeof(temp), "bootrom: ", bootrom_version);
                DbpString(temp);
        }

-       
+

        FormatVersionInformation(temp, sizeof(temp), "os: ", &version_information);
        DbpString(temp);
        FormatVersionInformation(temp, sizeof(temp), "os: ", &version_information);
        DbpString(temp);

-       
+

        FpgaGatherVersion(temp, sizeof(temp));
        DbpString(temp);
        FpgaGatherVersion(temp, sizeof(temp));
        DbpString(temp);

+       // Send Chip ID
+       cmd_send(CMD_ACK,*(AT91C_DBGU_CIDR),0,0,NULL,0);

 }
 
 #ifdef WITH_LF
 }
 
 #ifdef WITH_LF


@@ -340,8 +390,9 @@ void SamyRun()
 
        for (;;)
        {
 
        for (;;)
        {

-               UsbPoll(FALSE);
-               WDT_HIT();
+//             UsbPoll(FALSE);
+               usb_poll();
+    WDT_HIT();

 
                // Was our button held down or pressed?
                int button_pressed = BUTTON_HELD(1000);
 
                // Was our button held down or pressed?
                int button_pressed = BUTTON_HELD(1000);


@@ -507,7 +558,7 @@ void ListenReaderField(int limit)
                                if (abs(lf_av - lf_baseline) > 10) LED_D_ON();
                                else                               LED_D_OFF();
                        }
                                if (abs(lf_av - lf_baseline) > 10) LED_D_ON();
                                else                               LED_D_OFF();
                        }

-                       
+

                        ++lf_count;
                        lf_av_new= ReadAdc(ADC_CHAN_LF);
                        // see if there's a significant change
                        ++lf_count;
                        lf_av_new= ReadAdc(ADC_CHAN_LF);
                        // see if there's a significant change


@@ -525,7 +576,7 @@ void ListenReaderField(int limit)
                                if (abs(hf_av - hf_baseline) > 10) LED_B_ON();
                                else                               LED_B_OFF();
                        }
                                if (abs(hf_av - hf_baseline) > 10) LED_B_ON();
                                else                               LED_B_OFF();
                        }

-                       
+

                        ++hf_count;
                        hf_av_new= ReadAdc(ADC_CHAN_HF);
                        // see if there's a significant change
                        ++hf_count;
                        hf_av_new= ReadAdc(ADC_CHAN_HF);
                        // see if there's a significant change


@@ -537,7 +588,7 @@ void ListenReaderField(int limit)
                                hf_count= 0;
                        }
                }
                                hf_count= 0;
                        }
                }

-               
+

                if(mode == 2) {
                        if (limit == LF_ONLY) {
                                display_val = lf_av;
                if(mode == 2) {
                        if (limit == LF_ONLY) {
                                display_val = lf_av;


@@ -567,49 +618,132 @@ void ListenReaderField(int limit)
        }
 }
 
        }
 }
 

-void UsbPacketReceived(BYTE *packet, int len)
+void UsbPacketReceived(uint8_t *packet, int len)

 {
        UsbCommand *c = (UsbCommand *)packet;
 {
        UsbCommand *c = (UsbCommand *)packet;

-       UsbCommand ack;
-       ack.cmd = CMD_ACK;

 
 

+//  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
                case CMD_ACQUIRE_RAW_ADC_SAMPLES_125K:
                        AcquireRawAdcSamples125k(c->arg[0]);
        switch(c->cmd) {
 #ifdef WITH_LF
                case CMD_ACQUIRE_RAW_ADC_SAMPLES_125K:
                        AcquireRawAdcSamples125k(c->arg[0]);

-                       UsbSendPacket((BYTE*)&ack, sizeof(ack));
+                       cmd_send(CMD_ACK,0,0,0,0,0);

                        break;
                        break;

-#endif
-
-#ifdef WITH_LF

                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_MOD_THEN_ACQUIRE_RAW_ADC_SAMPLES_125K:
                        ModThenAcquireRawAdcSamples125k(c->arg[0],c->arg[1],c->arg[2],c->d.asBytes);
                        break;

+               case CMD_HID_DEMOD_FSK:
+                       CmdHIDdemodFSK(0, 0, 0, 1);                                     // Demodulate HID tag
+                       break;
+               case CMD_HID_SIM_TAG:
+                       CmdHIDsimTAG(c->arg[0], c->arg[1], 1);                                  // Simulate HID tag by ID
+                       break;
+               case CMD_HID_CLONE_TAG: // Clone HID tag by ID to T55x7
+                       CopyHIDtoT55x7(c->arg[0], c->arg[1], c->arg[2], c->d.asBytes[0]);
+                       break;
+               case CMD_IO_DEMOD_FSK:
+                       CmdIOdemodFSK(1, 0, 0, 1);                                      // Demodulate IO tag
+                       break;
+               case CMD_IO_CLONE_TAG: // Clone IO tag by ID to T55x7
+                       CopyIOtoT55x7(c->arg[0], c->arg[1], c->d.asBytes[0]);
+                       break;
+               case CMD_EM410X_WRITE_TAG:
+                       WriteEM410x(c->arg[0], c->arg[1], c->arg[2]);
+                       break;
+               case CMD_READ_TI_TYPE:
+                       ReadTItag();
+                       break;
+               case CMD_WRITE_TI_TYPE:
+                       WriteTItag(c->arg[0],c->arg[1],c->arg[2]);
+                       break;
+               case CMD_SIMULATE_TAG_125K:
+                       LED_A_ON();
+                       SimulateTagLowFrequency(c->arg[0], c->arg[1], 1);
+                       LED_A_OFF();
+                       break;
+               case CMD_LF_SIMULATE_BIDIR:
+                       SimulateTagLowFrequencyBidir(c->arg[0], c->arg[1]);
+                       break;
+               case CMD_INDALA_CLONE_TAG:                                      // Clone Indala 64-bit tag by UID to T55x7
+                       CopyIndala64toT55x7(c->arg[0], c->arg[1]);                                      
+                       break;
+               case CMD_INDALA_CLONE_TAG_L:                                    // Clone Indala 224-bit tag by UID to T55x7
+                       CopyIndala224toT55x7(c->d.asDwords[0], c->d.asDwords[1], c->d.asDwords[2], c->d.asDwords[3], c->d.asDwords[4], c->d.asDwords[5], c->d.asDwords[6]);
+                       break;
+               case CMD_T55XX_READ_BLOCK:
+                       T55xxReadBlock(c->arg[1], c->arg[2],c->d.asBytes[0]);
+                       break;
+               case CMD_T55XX_WRITE_BLOCK:
+                       T55xxWriteBlock(c->arg[0], c->arg[1], c->arg[2], c->d.asBytes[0]);
+                       break;
+               case CMD_T55XX_READ_TRACE: // Clone HID tag by ID to T55x7
+                       T55xxReadTrace();
+                       break;
+               case CMD_PCF7931_READ: // Read PCF7931 tag
+                       ReadPCF7931();
+                       cmd_send(CMD_ACK,0,0,0,0,0);
+//             UsbSendPacket((uint8_t*)&ack, sizeof(ack));
+                       break;
+               case CMD_EM4X_READ_WORD:
+                       EM4xReadWord(c->arg[1], c->arg[2],c->d.asBytes[0]);
+                       break;
+               case CMD_EM4X_WRITE_WORD:
+                       EM4xWriteWord(c->arg[0], c->arg[1], c->arg[2], c->d.asBytes[0]);
+                       break;

 #endif
 
 #endif
 

+#ifdef WITH_HITAG
+               case CMD_SNOOP_HITAG: // Eavesdrop Hitag tag, args = type
+                       SnoopHitag(c->arg[0]);
+                       break;
+               case CMD_SIMULATE_HITAG: // Simulate Hitag tag, args = memory content
+                       SimulateHitagTag((bool)c->arg[0],(byte_t*)c->d.asBytes);
+                       break;
+               case CMD_READER_HITAG: // Reader for Hitag tags, args = type and function
+                       ReaderHitag((hitag_function)c->arg[0],(hitag_data*)c->d.asBytes);
+                       break;
+#endif
+            

 #ifdef WITH_ISO15693
                case CMD_ACQUIRE_RAW_ADC_SAMPLES_ISO_15693:
                        AcquireRawAdcSamplesIso15693();
                        break;
 #ifdef WITH_ISO15693
                case CMD_ACQUIRE_RAW_ADC_SAMPLES_ISO_15693:
                        AcquireRawAdcSamplesIso15693();
                        break;

-#endif
-
-               case CMD_BUFF_CLEAR:
-                       BufferClear();
+               case CMD_RECORD_RAW_ADC_SAMPLES_ISO_15693:
+                       RecordRawAdcSamplesIso15693();
+                       break;
+                       
+               case CMD_ISO_15693_COMMAND:
+                       DirectTag15693Command(c->arg[0],c->arg[1],c->arg[2],c->d.asBytes);
+                       break;
+                                       
+               case CMD_ISO_15693_FIND_AFI:
+                       BruteforceIso15693Afi(c->arg[0]);
+                       break;  
+                       
+               case CMD_ISO_15693_DEBUG:
+                       SetDebugIso15693(c->arg[0]);

                        break;
 
                        break;
 

-#ifdef WITH_ISO15693

                case CMD_READER_ISO_15693:
                        ReaderIso15693(c->arg[0]);
                        break;
                case CMD_READER_ISO_15693:
                        ReaderIso15693(c->arg[0]);
                        break;

+               case CMD_SIMTAG_ISO_15693:
+                       SimTagIso15693(c->arg[0]);
+                       break;

 #endif
 
 #endif
 

-               case CMD_READER_LEGIC_RF:
-                       LegicRfReader(c->arg[0], c->arg[1]);
+#ifdef WITH_LEGICRF
+               case CMD_SIMULATE_TAG_LEGIC_RF:
+                       LegicRfSimulate(c->arg[0], c->arg[1], c->arg[2]);

                        break;
 
                        break;
 

-#ifdef WITH_ISO15693
-               case CMD_SIMTAG_ISO_15693:
-                       SimTagIso15693(c->arg[0]);
+               case CMD_WRITER_LEGIC_RF:
+                       LegicRfWriter(c->arg[1], c->arg[0]);
+                       break;
+
+               case CMD_READER_LEGIC_RF:
+                       LegicRfReader(c->arg[0], c->arg[1]);

                        break;
 #endif
 
                        break;
 #endif
 


@@ -617,38 +751,112 @@ void UsbPacketReceived(BYTE *packet, int len)
                case CMD_ACQUIRE_RAW_ADC_SAMPLES_ISO_14443:
                        AcquireRawAdcSamplesIso14443(c->arg[0]);
                        break;
                case CMD_ACQUIRE_RAW_ADC_SAMPLES_ISO_14443:
                        AcquireRawAdcSamplesIso14443(c->arg[0]);
                        break;

-#endif
-
-#ifdef WITH_ISO14443b

                case CMD_READ_SRI512_TAG:
                case CMD_READ_SRI512_TAG:

-                       ReadSRI512Iso14443(c->arg[0]);
+                       ReadSTMemoryIso14443(0x0F);
+                       break;
+               case CMD_READ_SRIX4K_TAG:
+                       ReadSTMemoryIso14443(0x7F);
+                       break;
+               case CMD_SNOOP_ISO_14443:
+                       SnoopIso14443();
+                       break;
+               case CMD_SIMULATE_TAG_ISO_14443:
+                       SimulateIso14443Tag();
+                       break;
+               case CMD_ISO_14443B_COMMAND:
+                       SendRawCommand14443B(c->arg[0],c->arg[1],c->arg[2],c->d.asBytes);

                        break;
                        break;

-               case CMD_READ_SRIX4K_TAG:
-                       ReadSRIX4KIso14443(c->arg[0]);
-                       break;

 #endif
 
 #ifdef WITH_ISO14443a
 #endif
 
 #ifdef WITH_ISO14443a

+               case CMD_SNOOP_ISO_14443a:
+                       SnoopIso14443a(c->arg[0]);
+                       break;

                case CMD_READER_ISO_14443a:
                case CMD_READER_ISO_14443a:

-                       ReaderIso14443a(c->arg[0]);
+                       ReaderIso14443a(c);

                        break;
                        break;

-#endif
-
-#ifdef WITH_ISO14443a
+               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_READER_MIFARE:
                case CMD_READER_MIFARE:

-                       ReaderMifare(c->arg[0]);
+            ReaderMifare(c->arg[0]);

                        break;
                        break;

-#endif
-      
-#ifdef WITH_ISO14443b
-               case CMD_SNOOP_ISO_14443:
-                       SnoopIso14443();
+               case CMD_MIFARE_READBL:
+                       MifareReadBlock(c->arg[0], c->arg[1], c->arg[2], c->d.asBytes);
+                       break;
+               case CMD_MIFAREU_READBL:
+                       MifareUReadBlock(c->arg[0],c->d.asBytes);
+                       break;
+               case CMD_MIFAREU_READCARD:
+                       MifareUReadCard(c->arg[0],c->d.asBytes);
+                        break;
+               case CMD_MIFARE_READSC:
+                       MifareReadSector(c->arg[0], c->arg[1], c->arg[2], c->d.asBytes);
+                       break;
+               case CMD_MIFARE_WRITEBL:
+                       MifareWriteBlock(c->arg[0], c->arg[1], c->arg[2], c->d.asBytes);
+                       break;
+               case CMD_MIFAREU_WRITEBL_COMPAT:
+                       MifareUWriteBlock(c->arg[0], c->d.asBytes);
+                        break;
+               case CMD_MIFAREU_WRITEBL:
+                        MifareUWriteBlock_Special(c->arg[0], c->d.asBytes);
+                        break;
+               case CMD_MIFARE_NESTED:
+                       MifareNested(c->arg[0], c->arg[1], c->arg[2], c->d.asBytes);
+                       break;
+               case CMD_MIFARE_CHKKEYS:
+                       MifareChkKeys(c->arg[0], c->arg[1], c->arg[2], c->d.asBytes);
+                       break;
+               case CMD_SIMULATE_MIFARE_CARD:
+                       Mifare1ksim(c->arg[0], c->arg[1], c->arg[2], c->d.asBytes);
+                       break;
+               
+               // emulator
+               case CMD_MIFARE_SET_DBGMODE:
+                       MifareSetDbgLvl(c->arg[0], c->arg[1], c->arg[2], c->d.asBytes);
+                       break;
+               case CMD_MIFARE_EML_MEMCLR:
+                       MifareEMemClr(c->arg[0], c->arg[1], c->arg[2], c->d.asBytes);
+                       break;
+               case CMD_MIFARE_EML_MEMSET:
+                       MifareEMemSet(c->arg[0], c->arg[1], c->arg[2], c->d.asBytes);
+                       break;
+               case CMD_MIFARE_EML_MEMGET:
+                       MifareEMemGet(c->arg[0], c->arg[1], c->arg[2], c->d.asBytes);
+                       break;
+               case CMD_MIFARE_EML_CARDLOAD:
+                       MifareECardLoad(c->arg[0], c->arg[1], c->arg[2], c->d.asBytes);
+                       break;
+                       
+               // Work with "magic Chinese" card
+               case CMD_MIFARE_EML_CSETBLOCK:
+                       MifareCSetBlock(c->arg[0], c->arg[1], c->arg[2], c->d.asBytes);
+                       break;
+               case CMD_MIFARE_EML_CGETBLOCK:
+                       MifareCGetBlock(c->arg[0], c->arg[1], c->arg[2], c->d.asBytes);
+                       break;
+                       
+               // mifare sniffer
+               case CMD_MIFARE_SNIFFER:
+                       SniffMifare(c->arg[0]);

                        break;
 #endif
 
                        break;
 #endif
 

-#ifdef WITH_ISO14443a
-               case CMD_SNOOP_ISO_14443a:
-                       SnoopIso14443a();
+#ifdef WITH_ICLASS
+               // Makes use of ISO14443a FPGA Firmware
+               case CMD_SNOOP_ICLASS:
+                       SnoopIClass();
+                       break;
+               case CMD_SIMULATE_TAG_ICLASS:
+                       SimulateIClass(c->arg[0], c->d.asBytes);
+                       break;
+               case CMD_READER_ICLASS:
+                       ReaderIClass(c->arg[0]);

                        break;
 #endif
 
                        break;
 #endif
 


@@ -656,17 +864,9 @@ void UsbPacketReceived(BYTE *packet, int len)
                        SimulateTagHfListen();
                        break;
 
                        SimulateTagHfListen();
                        break;
 

-#ifdef WITH_ISO14443b
-               case CMD_SIMULATE_TAG_ISO_14443:
-                       SimulateIso14443Tag();
-                       break;
-#endif
-               
-#ifdef WITH_ISO14443a
-               case CMD_SIMULATE_TAG_ISO_14443a:
-                       SimulateIso14443aTag(c->arg[0], c->arg[1]);  // ## Simulate iso14443a tag - pass tag type & UID
+               case CMD_BUFF_CLEAR:
+                       BufferClear();

                        break;
                        break;

-#endif

 
                case CMD_MEASURE_ANTENNA_TUNING:
                        MeasureAntennaTuning();
 
                case CMD_MEASURE_ANTENNA_TUNING:
                        MeasureAntennaTuning();


@@ -680,65 +880,44 @@ void UsbPacketReceived(BYTE *packet, int len)
                        ListenReaderField(c->arg[0]);
                        break;
 
                        ListenReaderField(c->arg[0]);
                        break;
 

-#ifdef WITH_LF
-               case CMD_HID_DEMOD_FSK:
-                       CmdHIDdemodFSK(0, 0, 0, 1);                             // Demodulate HID tag
-                       break;
-#endif
-
-#ifdef WITH_LF
-               case CMD_HID_SIM_TAG:
-                       CmdHIDsimTAG(c->arg[0], c->arg[1], 1);                                  // Simulate HID tag by ID
-                       break;
-#endif
-

                case CMD_FPGA_MAJOR_MODE_OFF:           // ## FPGA Control
                        FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
                        SpinDelay(200);
                        LED_D_OFF(); // LED D indicates field ON or OFF
                        break;
 
                case CMD_FPGA_MAJOR_MODE_OFF:           // ## FPGA Control
                        FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
                        SpinDelay(200);
                        LED_D_OFF(); // LED D indicates field ON or OFF
                        break;
 

-#ifdef WITH_LF
-               case CMD_READ_TI_TYPE:
-                       ReadTItag();
-                       break;
-#endif
-
-#ifdef WITH_LF
-               case CMD_WRITE_TI_TYPE:
-                       WriteTItag(c->arg[0],c->arg[1],c->arg[2]);
-                       break;
-#endif
-
-               case CMD_DOWNLOAD_RAW_ADC_SAMPLES_125K: {
-                       UsbCommand n;
-                       if(c->cmd == CMD_DOWNLOAD_RAW_ADC_SAMPLES_125K) {
-                               n.cmd = CMD_DOWNLOADED_RAW_ADC_SAMPLES_125K;
-                       } else {
-                               n.cmd = CMD_DOWNLOADED_RAW_BITS_TI_TYPE;
+               case CMD_DOWNLOAD_RAW_ADC_SAMPLES_125K:
+//                     UsbCommand n;
+//                     if(c->cmd == CMD_DOWNLOAD_RAW_ADC_SAMPLES_125K) {
+//                             n.cmd = CMD_DOWNLOADED_RAW_ADC_SAMPLES_125K;
+//                     } else {
+//                             n.cmd = CMD_DOWNLOADED_RAW_BITS_TI_TYPE;
+//                     }
+//                     n.arg[0] = c->arg[0];
+      //                       memcpy(n.d.asBytes, BigBuf+c->arg[0], 48); // 12*sizeof(uint32_t)
+      //                       LED_B_ON();
+      //      usb_write((uint8_t *)&n, sizeof(n));
+      //                       UsbSendPacket((uint8_t *)&n, sizeof(n));
+      //                       LED_B_OFF();
+
+                       LED_B_ON();
+                       for(size_t i=0; i<c->arg[1]; i += USB_CMD_DATA_SIZE) {
+                               size_t len = MIN((c->arg[1] - i),USB_CMD_DATA_SIZE);
+                               cmd_send(CMD_DOWNLOADED_RAW_ADC_SAMPLES_125K,i,len,0,((byte_t*)BigBuf)+c->arg[0]+i,len);

                        }
                        }

-                       n.arg[0] = c->arg[0];
-                       memcpy(n.d.asDwords, BigBuf+c->arg[0], 12*sizeof(DWORD));
-                       UsbSendPacket((BYTE *)&n, sizeof(n));
+                       // Trigger a finish downloading signal with an ACK frame
+                       cmd_send(CMD_ACK,0,0,0,0,0);
+                       LED_B_OFF();

                        break;
                        break;

-               }

 
                case CMD_DOWNLOADED_SIM_SAMPLES_125K: {
 
                case CMD_DOWNLOADED_SIM_SAMPLES_125K: {

-                       BYTE *b = (BYTE *)BigBuf;
+                       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, 48);
                        //Dbprintf("copied 48 bytes to %i",b+c->arg[0]);

-                       UsbSendPacket((BYTE*)&ack, sizeof(ack));
-                       break;
-               }
-
-#ifdef WITH_LF
-               case CMD_SIMULATE_TAG_125K:
-                       LED_A_ON();
-                       SimulateTagLowFrequency(c->arg[0], c->arg[1], 1);
-                       LED_A_OFF();
+//                     UsbSendPacket((uint8_t*)&ack, sizeof(ack));
+                       cmd_send(CMD_ACK,0,0,0,0,0);

                        break;
                        break;

-#endif
-
+               }       

                case CMD_READ_MEM:
                        ReadMem(c->arg[0]);
                        break;
                case CMD_READ_MEM:
                        ReadMem(c->arg[0]);
                        break;


@@ -760,12 +939,6 @@ void UsbPacketReceived(BYTE *packet, int len)
                        SendVersion();
                        break;
 
                        SendVersion();
                        break;
 

-#ifdef WITH_LF
-               case CMD_LF_SIMULATE_BIDIR:
-                       SimulateTagLowFrequencyBidir(c->arg[0], c->arg[1]);
-                       break;
-#endif
-

 #ifdef WITH_LCD
                case CMD_LCD_RESET:
                        LCDReset();
 #ifdef WITH_LCD
                case CMD_LCD_RESET:
                        LCDReset();


@@ -777,7 +950,7 @@ void UsbPacketReceived(BYTE *packet, int len)
                case CMD_SETUP_WRITE:
                case CMD_FINISH_WRITE:
                case CMD_HARDWARE_RESET:
                case CMD_SETUP_WRITE:
                case CMD_FINISH_WRITE:
                case CMD_HARDWARE_RESET:

-                       USB_D_PLUS_PULLUP_OFF();
+                       usb_disable();

                        SpinDelay(1000);
                        SpinDelay(1000);
                        AT91C_BASE_RSTC->RSTC_RCR = RST_CONTROL_KEY | AT91C_RSTC_PROCRST;
                        SpinDelay(1000);
                        SpinDelay(1000);
                        AT91C_BASE_RSTC->RSTC_RCR = RST_CONTROL_KEY | AT91C_RSTC_PROCRST;


@@ -790,19 +963,18 @@ void UsbPacketReceived(BYTE *packet, int len)
                        if(common_area.flags.bootrom_present) {
                                common_area.command = COMMON_AREA_COMMAND_ENTER_FLASH_MODE;
                        }
                        if(common_area.flags.bootrom_present) {
                                common_area.command = COMMON_AREA_COMMAND_ENTER_FLASH_MODE;
                        }

-                       USB_D_PLUS_PULLUP_OFF();
+                       usb_disable();

                        AT91C_BASE_RSTC->RSTC_RCR = RST_CONTROL_KEY | AT91C_RSTC_PROCRST;
                        for(;;);
                        break;
                        AT91C_BASE_RSTC->RSTC_RCR = RST_CONTROL_KEY | AT91C_RSTC_PROCRST;
                        for(;;);
                        break;

-                       
+

                case CMD_DEVICE_INFO: {
                case CMD_DEVICE_INFO: {

-                       UsbCommand c;
-                       c.cmd = CMD_DEVICE_INFO;
-                       c.arg[0] = DEVICE_INFO_FLAG_OSIMAGE_PRESENT | DEVICE_INFO_FLAG_CURRENT_MODE_OS;
-                       if(common_area.flags.bootrom_present) c.arg[0] |= DEVICE_INFO_FLAG_BOOTROM_PRESENT;
-                       UsbSendPacket((BYTE*)&c, sizeof(c));
-               }
+                       uint32_t dev_info = DEVICE_INFO_FLAG_OSIMAGE_PRESENT | DEVICE_INFO_FLAG_CURRENT_MODE_OS;
+                       if(common_area.flags.bootrom_present) dev_info |= DEVICE_INFO_FLAG_BOOTROM_PRESENT;
+//                     UsbSendPacket((uint8_t*)&c, sizeof(c));
+                       cmd_send(CMD_DEVICE_INFO,dev_info,0,0,0,0);     

                        break;
                        break;

+               }

                default:
                        Dbprintf("%s: 0x%04x","unknown command:",c->cmd);
                        break;
                default:
                        Dbprintf("%s: 0x%04x","unknown command:",c->cmd);
                        break;


@@ -812,7 +984,7 @@ void UsbPacketReceived(BYTE *packet, int len)
 void  __attribute__((noreturn)) AppMain(void)
 {
        SpinDelay(100);
 void  __attribute__((noreturn)) AppMain(void)
 {
        SpinDelay(100);

-       
+

        if(common_area.magic != COMMON_AREA_MAGIC || common_area.version != 1) {
                /* Initialize common area */
                memset(&common_area, 0, sizeof(common_area));
        if(common_area.magic != COMMON_AREA_MAGIC || common_area.version != 1) {
                /* Initialize common area */
                memset(&common_area, 0, sizeof(common_area));


@@ -826,7 +998,9 @@ void  __attribute__((noreturn)) AppMain(void)
        LED_B_OFF();
        LED_A_OFF();
 
        LED_B_OFF();
        LED_A_OFF();
 

-       UsbStart();
+  // Init USB device`
+  usb_enable();
+//     UsbStart();

 
        // 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;


@@ -845,34 +1019,24 @@ void  __attribute__((noreturn)) AppMain(void)
        // Load the FPGA image, which we have stored in our flash.
        FpgaDownloadAndGo();
 
        // Load the FPGA image, which we have stored in our flash.
        FpgaDownloadAndGo();
 

+       StartTickCount();
+       

 #ifdef WITH_LCD
 #ifdef WITH_LCD

-

        LCDInit();
        LCDInit();

-
-       // test text on different colored backgrounds
-       LCDString(" The quick brown fox  ",     (char *)&FONT6x8,1,1+8*0,WHITE  ,BLACK );
-       LCDString("  jumped over the     ",     (char *)&FONT6x8,1,1+8*1,BLACK  ,WHITE );
-       LCDString("     lazy dog.        ",     (char *)&FONT6x8,1,1+8*2,YELLOW ,RED   );
-       LCDString(" AaBbCcDdEeFfGgHhIiJj ",     (char *)&FONT6x8,1,1+8*3,RED    ,GREEN );
-       LCDString(" KkLlMmNnOoPpQqRrSsTt ",     (char *)&FONT6x8,1,1+8*4,MAGENTA,BLUE  );
-       LCDString("UuVvWwXxYyZz0123456789",     (char *)&FONT6x8,1,1+8*5,BLUE   ,YELLOW);
-       LCDString("`-=[]_;',./~!@#$%^&*()",     (char *)&FONT6x8,1,1+8*6,BLACK  ,CYAN  );
-       LCDString("     _+{}|:\\\"<>?     ",(char *)&FONT6x8,1,1+8*7,BLUE  ,MAGENTA);
-
-       // color bands
-       LCDFill(0, 1+8* 8, 132, 8, BLACK);
-       LCDFill(0, 1+8* 9, 132, 8, WHITE);
-       LCDFill(0, 1+8*10, 132, 8, RED);
-       LCDFill(0, 1+8*11, 132, 8, GREEN);
-       LCDFill(0, 1+8*12, 132, 8, BLUE);
-       LCDFill(0, 1+8*13, 132, 8, YELLOW);
-       LCDFill(0, 1+8*14, 132, 8, CYAN);
-       LCDFill(0, 1+8*15, 132, 8, MAGENTA);
-

 #endif
 
 #endif
 

+  byte_t rx[sizeof(UsbCommand)];
+       size_t rx_len;
+  

        for(;;) {
        for(;;) {

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

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