Removed dupicate symbols

[proxmark3-svn] / armsrc / appmain.c

diff --git a/armsrc/appmain.c b/armsrc/appmain.c
index 23046b4d03b644e618976adfecef0e06fa4c6cea..947c12ccdb9d474d349c5f2feac1bdc676a4546d 100644 (file)
--- a/armsrc/appmain.c
+++ b/armsrc/appmain.c
@@ -1,25 +1,42 @@
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------

-// 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 <proxmark3.h>
-#include <stdlib.h>
+#include "usb_cdc.h"
+#include "cmd.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 <hitag2.h>
+

 #ifdef WITH_LCD
 #ifdef WITH_LCD

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

 #endif
 
 #endif
 

+#define abs(x) ( ((x)<0) ? -(x) : (x) )
+

 //=============================================================================
 // A buffer where we can queue things up to be sent through the FPGA, for
 // any purpose (fake tag, as reader, whatever). We go MSB first, since that
 // is the order in which they go out on the wire.
 //=============================================================================
 
 //=============================================================================
 // A buffer where we can queue things up to be sent through the FPGA, for
 // any purpose (fake tag, as reader, whatever). We go MSB first, since that
 // is the order in which they go out on the wire.
 //=============================================================================
 

-BYTE ToSend[256];
+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")));


@@ -27,7 +44,7 @@ struct common_area common_area __attribute__((section(".commonarea")));
 void BufferClear(void)
 {
        memset(BigBuf,0,sizeof(BigBuf));
 void BufferClear(void)
 {
        memset(BigBuf,0,sizeof(BigBuf));

-       DbpString("Buffer cleared");
+       Dbprintf("Buffer cleared (%i bytes)",sizeof(BigBuf));

 }
 
 void ToSendReset(void)
 }
 
 void ToSendReset(void)


@@ -62,35 +79,82 @@ 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.ext1 = strlen(str);
-       memcpy(c.d.asBytes, str, c.ext1);
-
-       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)
 {
 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.ext1 = x1;
-       c.ext2 = x2;
-       c.ext3 = 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
+
+void Dbprintf(const char *fmt, ...) {
+// should probably limit size here; oh well, let's just use a big buffer
+       char output_string[128];
+       va_list ap;
+
+       va_start(ap, fmt);
+       kvsprintf(fmt, output_string, 10, ap);
+       va_end(ap);
+
+       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;           
+       }

 }
 
 //-----------------------------------------------------------------------------
 }
 
 //-----------------------------------------------------------------------------


@@ -100,22 +164,24 @@ void DbpIntegers(int x1, int x2, int x3)
 //-----------------------------------------------------------------------------
 static int ReadAdc(int ch)
 {
 //-----------------------------------------------------------------------------
 static int ReadAdc(int ch)
 {

-       DWORD d;
+       uint32_t d;

 
 

-       ADC_CONTROL = ADC_CONTROL_RESET;
-       ADC_MODE = ADC_MODE_PRESCALE(32) | ADC_MODE_STARTUP_TIME(16) |
+       AT91C_BASE_ADC->ADC_CR = AT91C_ADC_SWRST;
+       AT91C_BASE_ADC->ADC_MR =
+               ADC_MODE_PRESCALE(32) |
+               ADC_MODE_STARTUP_TIME(16) |

                ADC_MODE_SAMPLE_HOLD_TIME(8);
                ADC_MODE_SAMPLE_HOLD_TIME(8);

-       ADC_CHANNEL_ENABLE = ADC_CHANNEL(ch);
+       AT91C_BASE_ADC->ADC_CHER = ADC_CHANNEL(ch);

 
 

-       ADC_CONTROL = ADC_CONTROL_START;
-       while(!(ADC_STATUS & ADC_END_OF_CONVERSION(ch)))
+       AT91C_BASE_ADC->ADC_CR = AT91C_ADC_START;
+       while(!(AT91C_BASE_ADC->ADC_SR & ADC_END_OF_CONVERSION(ch)))

                ;
                ;

-       d = ADC_CHANNEL_DATA(ch);
+       d = AT91C_BASE_ADC->ADC_CDR[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;


@@ -129,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


@@ -146,8 +213,11 @@ 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);
+  
+       FpgaDownloadAndGo(FPGA_BITSTREAM_LF);
+       FpgaWriteConfWord(FPGA_MAJOR_MODE_LF_ADC | FPGA_LF_ADC_READER_FIELD);

        for (i=255; i>19; i--) {
        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


@@ -161,34 +231,65 @@ 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.
        // Let the FPGA drive the high-frequency antenna around 13.56 MHz.

+       FpgaDownloadAndGo(FPGA_BITSTREAM_HF);

        FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_READER_RX_XCORR);
        SpinDelay(20);
        // 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;
 
        FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_READER_RX_XCORR);
        SpinDelay(20);
        // 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;
 

-       c.cmd = CMD_MEASURED_ANTENNA_TUNING;
-       c.ext1 = (vLf125 << 0) | (vLf134 << 16);
-       c.ext2 = vHf;
-       c.ext3 = 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)
+{
+       int vHf = 0;    // in mV
+
+       DbpString("Measuring HF antenna, press button to exit");
+
+       for (;;) {
+               // Let the FPGA drive the high-frequency antenna around 13.56 MHz.
+               FpgaDownloadAndGo(FPGA_BITSTREAM_HF);
+               FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_READER_RX_XCORR);
+               SpinDelay(20);
+               // 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;
+       }
+       DbpString("cancelled");
+}
+
+

 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;
 
        // We're using this mode just so that I can test it out; the simulated
        // tag mode would work just as well and be simpler.
        int i;
        int p = 0;
 
        // We're using this mode just so that I can test it out; the simulated
        // tag mode would work just as well and be simpler.

+       FpgaDownloadAndGo(FPGA_BITSTREAM_HF);

        FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_READER_RX_XCORR | FPGA_HF_READER_RX_XCORR_848_KHZ | FPGA_HF_READER_RX_XCORR_SNOOP);
 
        // We need to listen to the high-frequency, peak-detected path.
        FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_READER_RX_XCORR | FPGA_HF_READER_RX_XCORR_848_KHZ | FPGA_HF_READER_RX_XCORR_SNOOP);
 
        // We need to listen to the high-frequency, peak-detected path.


@@ -198,11 +299,11 @@ void SimulateTagHfListen(void)
 
        i = 0;
        for(;;) {
 
        i = 0;
        for(;;) {

-               if(SSC_STATUS & (SSC_STATUS_TX_READY)) {
-                       SSC_TRANSMIT_HOLDING = 0xff;
+               if(AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_TXRDY)) {
+                       AT91C_BASE_SSC->SSC_THR = 0xff;

                }
                }

-               if(SSC_STATUS & (SSC_STATUS_RX_READY)) {
-                       BYTE r = (BYTE)SSC_RECEIVE_HOLDING;
+               if(AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_RXRDY)) {
+                       uint8_t r = (uint8_t)AT91C_BASE_SSC->SSC_RHR;

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


@@ -216,7 +317,7 @@ void SimulateTagHfListen(void)
                                p = 0;
                                i++;
 
                                p = 0;
                                i++;
 

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

                                        break;
                                }
                        }
                                        break;
                                }
                        }


@@ -227,13 +328,10 @@ void SimulateTagHfListen(void)
 
 void ReadMem(int addr)
 {
 
 void ReadMem(int addr)
 {

-       const DWORD *data = ((DWORD *)addr);
-       int i;
+       const uint8_t *data = ((uint8_t *)addr);

 
 

-       DbpString("Reading memory at address");
-       DbpIntegers(0, 0, addr);
-       for (i = 0; i < 8; i+= 2)
-               DbpIntegers(0, data[i], data[i+1]);
+       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]);

 }
 
 /* osimage version information is linked in */
 }
 
 /* osimage version information is linked in */


@@ -242,10 +340,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.
         */


@@ -256,18 +354,22 @@ 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

 // samy's sniff and repeat routine
 void SamyRun()
 {
        DbpString("Stand-alone mode! No PC necessary.");
 // samy's sniff and repeat routine
 void SamyRun()
 {
        DbpString("Stand-alone mode! No PC necessary.");

+       FpgaDownloadAndGo(FPGA_BITSTREAM_LF);

 
        // 3 possible options? no just 2 for now
 #define OPTS 2
 
        // 3 possible options? no just 2 for now
 #define OPTS 2


@@ -293,8 +395,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);


@@ -318,8 +421,7 @@ void SamyRun()
                        SpinDelay(500);
 
                        CmdHIDdemodFSK(1, &high[selected], &low[selected], 0);
                        SpinDelay(500);
 
                        CmdHIDdemodFSK(1, &high[selected], &low[selected], 0);

-                       DbpString("Recorded");
-                       DbpIntegers(selected, high[selected], low[selected]);
+                       Dbprintf("Recorded %x %x %x", selected, high[selected], low[selected]);

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


@@ -349,7 +451,7 @@ void SamyRun()
                                // wait for button to be released
                                while(BUTTON_PRESS())
                                        WDT_HIT();
                                // wait for button to be released
                                while(BUTTON_PRESS())
                                        WDT_HIT();

-                               DbpIntegers(selected, high[selected], low[selected]);
+                               Dbprintf("%x %x %x", selected, high[selected], low[selected]);

                                CmdHIDsimTAG(high[selected], low[selected], 0);
                                DbpString("Done playing");
                                if (BUTTON_HELD(1000) > 0)
                                CmdHIDsimTAG(high[selected], low[selected], 0);
                                DbpString("Done playing");
                                if (BUTTON_HELD(1000) > 0)


@@ -374,7 +476,7 @@ void SamyRun()
                }
        }
 }
                }
        }
 }

-
+#endif

 
 /*
 OBJECTIVE
 
 /*
 OBJECTIVE


@@ -427,17 +529,15 @@ void ListenReaderField(int limit)
        lf_av=lf_max=ReadAdc(ADC_CHAN_LF);
 
        if(limit != HF_ONLY) {
        lf_av=lf_max=ReadAdc(ADC_CHAN_LF);
 
        if(limit != HF_ONLY) {

-               DbpString("LF 125/134 Baseline:");
-               DbpIntegers(lf_av,0,0);
-               lf_baseline= lf_av;
+               Dbprintf("LF 125/134 Baseline: %d", lf_av);
+               lf_baseline = lf_av;

        }
 
        hf_av=hf_max=ReadAdc(ADC_CHAN_HF);
 
        if (limit != LF_ONLY) {
        }
 
        hf_av=hf_max=ReadAdc(ADC_CHAN_HF);
 
        if (limit != LF_ONLY) {

-               DbpString("HF 13.56 Baseline:");
-               DbpIntegers(hf_av,0,0);
-               hf_baseline= hf_av;
+               Dbprintf("HF 13.56 Baseline: %d", hf_av);
+               hf_baseline = hf_av;

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


@@ -463,14 +563,13 @@ 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
                        if(abs(lf_av - lf_av_new) > 10) {
                        ++lf_count;
                        lf_av_new= ReadAdc(ADC_CHAN_LF);
                        // see if there's a significant change
                        if(abs(lf_av - lf_av_new) > 10) {

-                               DbpString("LF 125/134 Field Change:");
-                               DbpIntegers(lf_av,lf_av_new,lf_count);
-                               lf_av= lf_av_new;
+                               Dbprintf("LF 125/134 Field Change: %x %x %x", lf_av, lf_av_new, lf_count);
+                               lf_av = lf_av_new;

                                if (lf_av > lf_max)
                                        lf_max = lf_av;
                                lf_count= 0;
                                if (lf_av > lf_max)
                                        lf_max = lf_av;
                                lf_count= 0;


@@ -482,20 +581,19 @@ 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
                        if(abs(hf_av - hf_av_new) > 10) {
                        ++hf_count;
                        hf_av_new= ReadAdc(ADC_CHAN_HF);
                        // see if there's a significant change
                        if(abs(hf_av - hf_av_new) > 10) {

-                               DbpString("HF 13.56 Field Change:");
-                               DbpIntegers(hf_av,hf_av_new,hf_count);
-                               hf_av= hf_av_new;
+                               Dbprintf("HF 13.56 Field Change: %x %x %x", hf_av, hf_av_new, hf_count);
+                               hf_av = hf_av_new;

                                if (hf_av > hf_max)
                                        hf_max = hf_av;
                                hf_count= 0;
                        }
                }
                                if (hf_av > hf_max)
                                        hf_max = hf_av;
                                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;


@@ -525,81 +623,290 @@ 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;
 

+//  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) {
        switch(c->cmd) {

+#ifdef WITH_LF

                case CMD_ACQUIRE_RAW_ADC_SAMPLES_125K:
                case CMD_ACQUIRE_RAW_ADC_SAMPLES_125K:

-                       AcquireRawAdcSamples125k(c->ext1);
+                       AcquireRawAdcSamples125k(c->arg[0]);
+                       cmd_send(CMD_ACK,0,0,0,0,0);

                        break;
                        break;

-

                case CMD_MOD_THEN_ACQUIRE_RAW_ADC_SAMPLES_125K:
                case CMD_MOD_THEN_ACQUIRE_RAW_ADC_SAMPLES_125K:

-                       ModThenAcquireRawAdcSamples125k(c->ext1,c->ext2,c->ext3,c->d.asBytes);
+                       ModThenAcquireRawAdcSamples125k(c->arg[0],c->arg[1],c->arg[2],c->d.asBytes);

                        break;
                        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;
+               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

 
 

+#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;
                case CMD_ACQUIRE_RAW_ADC_SAMPLES_ISO_15693:
                        AcquireRawAdcSamplesIso15693();
                        break;

-
-               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;
 
                case CMD_READER_ISO_15693:
                        break;
 
                case CMD_READER_ISO_15693:

-                       ReaderIso15693(c->ext1);
+                       ReaderIso15693(c->arg[0]);

                        break;
                        break;

-

                case CMD_SIMTAG_ISO_15693:
                case CMD_SIMTAG_ISO_15693:

-                       SimTagIso15693(c->ext1);
+                       SimTagIso15693(c->arg[0]);

                        break;
                        break;

+#endif

 
 

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

                        break;
 
                        break;
 

-               case CMD_READ_SRI512_TAG:
-                       ReadSRI512Iso14443(c->ext1);
+               case CMD_WRITER_LEGIC_RF:
+                       LegicRfWriter(c->arg[1], c->arg[0]);

                        break;
 
                        break;
 

-               case CMD_READER_ISO_14443a:
-                       ReaderIso14443a(c->ext1);
+               case CMD_READER_LEGIC_RF:
+                       LegicRfReader(c->arg[0], c->arg[1]);

                        break;
                        break;

+#endif

 
 

+#ifdef WITH_ISO14443b
+               case CMD_ACQUIRE_RAW_ADC_SAMPLES_ISO_14443:
+                       AcquireRawAdcSamplesIso14443(c->arg[0]);
+                       break;
+               case CMD_READ_SRI512_TAG:
+                       ReadSTMemoryIso14443(0x0F);
+                       break;
+               case CMD_READ_SRIX4K_TAG:
+                       ReadSTMemoryIso14443(0x7F);
+                       break;

                case CMD_SNOOP_ISO_14443:
                        SnoopIso14443();
                        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;
+#endif

 
 

+#ifdef WITH_ISO14443a

                case CMD_SNOOP_ISO_14443a:
                case CMD_SNOOP_ISO_14443a:

-                       SnoopIso14443a();
+                       SnoopIso14443a(c->arg[0]);
+                       break;
+               case CMD_READER_ISO_14443a:
+                       ReaderIso14443a(c);
+                       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_READER_MIFARE:
+            ReaderMifare(c->arg[0]);
+                       break;
+               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->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);
+                       break;
+               case CMD_MIFARE_WRITEBL:
+                       MifareWriteBlock(c->arg[0], c->arg[1], c->arg[2], c->d.asBytes);

                        break;
                        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;
+               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);
+                       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

 
 

-               case CMD_SIMULATE_TAG_HF_LISTEN:
-                       SimulateTagHfListen();
+#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;
                        break;

+               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_ISO_14443:
-                       SimulateIso14443Tag();
+               case CMD_SIMULATE_TAG_HF_LISTEN:
+                       SimulateTagHfListen();

                        break;
 
                        break;
 

-               case CMD_SIMULATE_TAG_ISO_14443a:
-                       SimulateIso14443aTag(c->ext1, c->ext2);  // ## Simulate iso14443a tag - pass tag type & UID
+               case CMD_BUFF_CLEAR:
+                       BufferClear();

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

-               case CMD_LISTEN_READER_FIELD:
-                       ListenReaderField(c->ext1);
+               case CMD_MEASURE_ANTENNA_TUNING_HF:
+                       MeasureAntennaTuningHf();

                        break;
 
                        break;
 

-               case CMD_HID_DEMOD_FSK:
-                       CmdHIDdemodFSK(0, 0, 0, 1);                             // Demodulate HID tag
-                       break;
-
-               case CMD_HID_SIM_TAG:
-                       CmdHIDsimTAG(c->ext1, c->ext2, 1);                                      // Simulate HID tag by ID
+               case CMD_LISTEN_READER_FIELD:
+                       ListenReaderField(c->arg[0]);

                        break;
 
                case CMD_FPGA_MAJOR_MODE_OFF:           // ## FPGA Control
                        break;
 
                case CMD_FPGA_MAJOR_MODE_OFF:           // ## FPGA Control


@@ -608,86 +915,98 @@ void UsbPacketReceived(BYTE *packet, int len)
                        LED_D_OFF(); // LED D indicates field ON or OFF
                        break;
 
                        LED_D_OFF(); // LED D indicates field ON or OFF
                        break;
 

-               case CMD_READ_TI_TYPE:
-                       ReadTItag();
-                       break;
-
-               case CMD_WRITE_TI_TYPE:
-                       WriteTItag(c->ext1,c->ext2,c->ext3);
-                       break;
-
-               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.ext1 = c->ext1;
-                       memcpy(n.d.asDwords, BigBuf+c->ext1, 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;
-                       memcpy(b+c->ext1, c->d.asBytes, 48);
-                       break;
-               }
-               case CMD_SIMULATE_TAG_125K:
-                       LED_A_ON();
-                       SimulateTagLowFrequency(c->ext1, 1);
-                       LED_A_OFF();
+                       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]);
+//                     UsbSendPacket((uint8_t*)&ack, sizeof(ack));
+                       cmd_send(CMD_ACK,0,0,0,0,0);

                        break;
                        break;

+               }       

                case CMD_READ_MEM:
                case CMD_READ_MEM:

-                       ReadMem(c->ext1);
+                       ReadMem(c->arg[0]);

                        break;
                        break;

+

                case CMD_SET_LF_DIVISOR:
                case CMD_SET_LF_DIVISOR:

-                       FpgaSendCommand(FPGA_CMD_SET_DIVISOR, c->ext1);
+                       FpgaDownloadAndGo(FPGA_BITSTREAM_LF);
+                       FpgaSendCommand(FPGA_CMD_SET_DIVISOR, c->arg[0]);

                        break;
                        break;

+
+               case CMD_SET_ADC_MUX:
+                       switch(c->arg[0]) {
+                               case 0: SetAdcMuxFor(GPIO_MUXSEL_LOPKD); break;
+                               case 1: SetAdcMuxFor(GPIO_MUXSEL_LORAW); break;
+                               case 2: SetAdcMuxFor(GPIO_MUXSEL_HIPKD); break;
+                               case 3: SetAdcMuxFor(GPIO_MUXSEL_HIRAW); break;
+                       }
+                       break;
+

                case CMD_VERSION:
                        SendVersion();
                        break;
                case CMD_VERSION:
                        SendVersion();
                        break;

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

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

-                       LCDSend(c->ext1);
+                       LCDSend(c->arg[0]);

                        break;
 #endif
                case CMD_SETUP_WRITE:
                case CMD_FINISH_WRITE:
                case CMD_HARDWARE_RESET:
                        break;
 #endif
                case CMD_SETUP_WRITE:
                case CMD_FINISH_WRITE:
                case CMD_HARDWARE_RESET:

-                       USB_D_PLUS_PULLUP_OFF();
+                       usb_disable();

                        SpinDelay(1000);
                        SpinDelay(1000);
                        SpinDelay(1000);
                        SpinDelay(1000);

-                       RSTC_CONTROL = RST_CONTROL_KEY | RST_CONTROL_PROCESSOR_RESET;
+                       AT91C_BASE_RSTC->RSTC_RCR = RST_CONTROL_KEY | AT91C_RSTC_PROCRST;

                        for(;;) {
                                // We're going to reset, and the bootrom will take control.
                        }
                        break;
                        for(;;) {
                                // We're going to reset, and the bootrom will take control.
                        }
                        break;

+

                case CMD_START_FLASH:
                        if(common_area.flags.bootrom_present) {
                                common_area.command = COMMON_AREA_COMMAND_ENTER_FLASH_MODE;
                        }
                case CMD_START_FLASH:
                        if(common_area.flags.bootrom_present) {
                                common_area.command = COMMON_AREA_COMMAND_ENTER_FLASH_MODE;
                        }

-                       USB_D_PLUS_PULLUP_OFF();
-                       RSTC_CONTROL = RST_CONTROL_KEY | RST_CONTROL_PROCESSOR_RESET;
+                       usb_disable();
+                       AT91C_BASE_RSTC->RSTC_RCR = RST_CONTROL_KEY | AT91C_RSTC_PROCRST;

                        for(;;);
                        break;
                        for(;;);
                        break;

-                       
+

                case CMD_DEVICE_INFO: {
                case CMD_DEVICE_INFO: {

-                       UsbCommand c;
-                       c.cmd = CMD_DEVICE_INFO;
-                       c.ext1 = DEVICE_INFO_FLAG_OSIMAGE_PRESENT | DEVICE_INFO_FLAG_CURRENT_MODE_OS;
-                       if(common_area.flags.bootrom_present) c.ext1 |= 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:
                default:

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

                        break;
        }
 }
                        break;
        }
 }


@@ -695,7 +1014,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));


@@ -709,56 +1028,51 @@ 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.
 
        // The FPGA gets its clock from us from PCK0 output, so set that up.

-       PIO_PERIPHERAL_B_SEL = (1 << GPIO_PCK0);
-       PIO_DISABLE = (1 << GPIO_PCK0);
-       PMC_SYS_CLK_ENABLE = PMC_SYS_CLK_PROGRAMMABLE_CLK_0;
+       AT91C_BASE_PIOA->PIO_BSR = GPIO_PCK0;
+       AT91C_BASE_PIOA->PIO_PDR = GPIO_PCK0;
+       AT91C_BASE_PMC->PMC_SCER = AT91C_PMC_PCK0;

        // PCK0 is PLL clock / 4 = 96Mhz / 4 = 24Mhz
        // PCK0 is PLL clock / 4 = 96Mhz / 4 = 24Mhz

-       PMC_PROGRAMMABLE_CLK_0 = PMC_CLK_SELECTION_PLL_CLOCK |
-               PMC_CLK_PRESCALE_DIV_4;
-       PIO_OUTPUT_ENABLE = (1 << GPIO_PCK0);
+       AT91C_BASE_PMC->PMC_PCKR[0] = AT91C_PMC_CSS_PLL_CLK |
+               AT91C_PMC_PRES_CLK_4;
+       AT91C_BASE_PIOA->PIO_OER = GPIO_PCK0;

 
        // Reset SPI
 
        // Reset SPI

-       SPI_CONTROL = SPI_CONTROL_RESET;
+       AT91C_BASE_SPI->SPI_CR = AT91C_SPI_SWRST;

        // Reset SSC
        // Reset SSC

-       SSC_CONTROL = SSC_CONTROL_RESET;
+       AT91C_BASE_SSC->SSC_CR = AT91C_SSC_SWRST;

 
        // Load the FPGA image, which we have stored in our flash.
 
        // Load the FPGA image, which we have stored in our flash.

-       FpgaDownloadAndGo();
+       // (the HF version by default)
+       FpgaDownloadAndGo(FPGA_BITSTREAM_HF);

 
 

+       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();
 
                WDT_HIT();
 

+#ifdef WITH_LF

                if (BUTTON_HELD(1000) > 0)
                        SamyRun();
                if (BUTTON_HELD(1000) > 0)
                        SamyRun();

+#endif

        }
 }
        }
 }