CHG: "hf legic restore" - added a filesize and cardsize check

[proxmark3-svn] / armsrc / appmain.c

diff --git a/armsrc/appmain.c b/armsrc/appmain.c
index ebfd822897cf58e38b3b9cd3560cc85c759af760..4d6a5fdfbd73313b08af7d6659c2bf7185116a41 100644 (file)
--- a/armsrc/appmain.c
+++ b/armsrc/appmain.c
@@ -9,24 +9,22 @@
 // The main application code. This is the first thing called after start.c
 // executes.
 //-----------------------------------------------------------------------------
 // The main application code. This is the first thing called after start.c
 // executes.
 //-----------------------------------------------------------------------------

-

 #include "usb_cdc.h"
 #include "usb_cdc.h"

-#include "cmd.h"
-
+//#include "cmd.h"

 #include "proxmark3.h"
 #include "apps.h"
 #include "util.h"
 #include "printf.h"
 #include "string.h"
 #include "proxmark3.h"
 #include "apps.h"
 #include "util.h"
 #include "printf.h"
 #include "string.h"

-

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

-

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

-#include <hitag2.h>
+#include "hitag2.h"
+#include "hitagS.h"

 #include "lfsampling.h"
 #include "BigBuf.h"
 #include "mifareutil.h"
 #include "pcf7931.h"
 #include "lfsampling.h"
 #include "BigBuf.h"
 #include "mifareutil.h"
 #include "pcf7931.h"

+

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


@@ -37,8 +35,6 @@
  #include "protocols.h"
 #endif
 
  #include "protocols.h"
 #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
 //=============================================================================
 // 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


@@ -75,20 +71,40 @@ void ToSendStuffBit(int b) {
        }
 }
 
        }
 }
 

+void PrintToSendBuffer(void){
+       DbpString("Printing ToSendBuffer:");
+       Dbhexdump(ToSendMax, ToSend, 0);
+}
+

 //=============================================================================
 // Debug print functions, to go out over USB, to the usual PC-side client.
 //=============================================================================
 
 //=============================================================================
 // Debug print functions, to go out over USB, to the usual PC-side client.
 //=============================================================================
 

+void DbpStringEx(char *str, uint32_t cmd){
+       byte_t len = strlen(str);
+       cmd_send(CMD_DEBUG_PRINT_STRING,len, cmd,0,(byte_t*)str,len);
+}
+

 void DbpString(char *str) {
 void DbpString(char *str) {

-  byte_t len = strlen(str);
-  cmd_send(CMD_DEBUG_PRINT_STRING,len,0,0,(byte_t*)str,len);
+       DbpStringEx(str, 0);

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

-  cmd_send(CMD_DEBUG_PRINT_INTEGERS,x1,x2,x3,0,0);
+       cmd_send(CMD_DEBUG_PRINT_INTEGERS,x1,x2,x3,0,0);

 }
 #endif
 }
 #endif

+void DbprintfEx(uint32_t cmd, const char *fmt, ...) {
+       // should probably limit size here; oh well, let's just use a big buffer
+       char output_string[128] = {0x00};
+       va_list ap;
+
+       va_start(ap, fmt);
+       kvsprintf(fmt, output_string, 10, ap);
+       va_end(ap);
+
+       DbpStringEx(output_string, cmd);
+}

 
 void Dbprintf(const char *fmt, ...) {
        // should probably limit size here; oh well, let's just use a big buffer
 
 void Dbprintf(const char *fmt, ...) {
        // should probably limit size here; oh well, let's just use a big buffer


@@ -175,11 +191,14 @@ int AvgAdc(int ch) // was static - merlok
        return (a + 15) >> 5;
 }
 
        return (a + 15) >> 5;
 }
 

+

 void MeasureAntennaTuning(void) {
 void MeasureAntennaTuning(void) {

+

        uint8_t LF_Results[256];
        uint8_t LF_Results[256];

-       int i, adcval = 0, peak = 0, peakv = 0, peakf = 0; //ptr = 0 
+       int i, adcval = 0, peak = 0, peakv = 0, peakf = 0;

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

+       memset(LF_Results, 0, sizeof(LF_Results));

        LED_B_ON();
 
 /*
        LED_B_ON();
 
 /*


@@ -193,8 +212,8 @@ void MeasureAntennaTuning(void) {
   
        FpgaDownloadAndGo(FPGA_BITSTREAM_LF);
        FpgaWriteConfWord(FPGA_MAJOR_MODE_LF_ADC | FPGA_LF_ADC_READER_FIELD);
   
        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);
                WDT_HIT();
                FpgaSendCommand(FPGA_CMD_SET_DIVISOR, i);
                SpinDelay(20);


@@ -202,17 +221,14 @@ void MeasureAntennaTuning(void) {
                if (i==95)      vLf125 = adcval; // voltage at 125Khz
                if (i==89)      vLf134 = adcval; // voltage at 134Khz
 
                if (i==95)      vLf125 = adcval; // voltage at 125Khz
                if (i==89)      vLf134 = adcval; // voltage at 134Khz
 

-               LF_Results[i] = adcval>>8; // scale int to fit in byte for graphing purposes
+               LF_Results[i] = adcval >> 8; // scale int to fit in byte for graphing purposes

                if(LF_Results[i] > peak) {
                        peakv = adcval;
                        peak = LF_Results[i];
                        peakf = i;
                if(LF_Results[i] > peak) {
                        peakv = adcval;
                        peak = LF_Results[i];
                        peakf = i;

-                       //ptr = i;

                }
        }
 
                }
        }
 

-       for (i=18; i >= 0; i--) LF_Results[i] = 0;
-       

        LED_A_ON();
        // Let the FPGA drive the high-frequency antenna around 13.56 MHz.
        FpgaDownloadAndGo(FPGA_BITSTREAM_HF);
        LED_A_ON();
        // Let the FPGA drive the high-frequency antenna around 13.56 MHz.
        FpgaDownloadAndGo(FPGA_BITSTREAM_HF);


@@ -220,31 +236,25 @@ void MeasureAntennaTuning(void) {
        SpinDelay(20);
        vHf = (MAX_ADC_HF_VOLTAGE * AvgAdc(ADC_CHAN_HF)) >> 10;
 
        SpinDelay(20);
        vHf = (MAX_ADC_HF_VOLTAGE * AvgAdc(ADC_CHAN_HF)) >> 10;
 

-       cmd_send(CMD_MEASURED_ANTENNA_TUNING, vLf125 | (vLf134<<16), vHf, peakf | (peakv<<16), LF_Results, 256);
+       cmd_send(CMD_MEASURED_ANTENNA_TUNING, vLf125 | (vLf134 << 16), vHf, peakf | (peakv << 16), LF_Results, 256);

        FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
        FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);

-

        LEDsoff();
 }
 
 void MeasureAntennaTuningHf(void) {
        int vHf = 0;    // in mV
        LEDsoff();
 }
 
 void MeasureAntennaTuningHf(void) {
        int vHf = 0;    // in mV

-
-       DbpString("Measuring HF antenna, press button to exit");
-

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

-       for (;;) {
+       while ( !BUTTON_PRESS() ){

                SpinDelay(20);
                vHf = (MAX_ADC_HF_VOLTAGE * AvgAdc(ADC_CHAN_HF)) >> 10;
                SpinDelay(20);
                vHf = (MAX_ADC_HF_VOLTAGE * AvgAdc(ADC_CHAN_HF)) >> 10;

-
-               Dbprintf("%d mV",vHf);
-               if (BUTTON_PRESS()) break;
+               //Dbprintf("%d mV",vHf);
+               DbprintfEx(CMD_MEASURE_ANTENNA_TUNING_HF, "%d mV",vHf);

        }
        }

-       
-       DbpString("cancelled");

        FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
        FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);

+       DbpString("cancelled");

 }
 
 
 }
 
 


@@ -821,7 +831,7 @@ void ListenReaderField(int limit) {
 
                if (limit != HF_ONLY) {
                        if(mode == 1) {
 
                if (limit != HF_ONLY) {
                        if(mode == 1) {

-                               if (abs(lf_av - lf_baseline) > REPORT_CHANGE) 
+                               if (ABS(lf_av - lf_baseline) > REPORT_CHANGE) 

                                        LED_D_ON();
                                else
                                        LED_D_OFF();
                                        LED_D_ON();
                                else
                                        LED_D_OFF();


@@ -829,7 +839,7 @@ void ListenReaderField(int limit) {
 
                        lf_av_new = AvgAdc(ADC_CHAN_LF);
                        // see if there's a significant change
 
                        lf_av_new = AvgAdc(ADC_CHAN_LF);
                        // see if there's a significant change

-                       if(abs(lf_av - lf_av_new) > REPORT_CHANGE) {
+                       if(ABS(lf_av - lf_av_new) > REPORT_CHANGE) {

                                Dbprintf("LF 125/134kHz Field Change: %5dmV", (MAX_ADC_LF_VOLTAGE * lf_av_new) >> 10);
                                lf_av = lf_av_new;
                                if (lf_av > lf_max)
                                Dbprintf("LF 125/134kHz Field Change: %5dmV", (MAX_ADC_LF_VOLTAGE * lf_av_new) >> 10);
                                lf_av = lf_av_new;
                                if (lf_av > lf_max)


@@ -839,7 +849,7 @@ void ListenReaderField(int limit) {
 
                if (limit != LF_ONLY) {
                        if (mode == 1){
 
                if (limit != LF_ONLY) {
                        if (mode == 1){

-                               if (abs(hf_av - hf_baseline) > REPORT_CHANGE)   
+                               if (ABS(hf_av - hf_baseline) > REPORT_CHANGE)   

                                        LED_B_ON();
                                else
                                        LED_B_OFF();
                                        LED_B_ON();
                                else
                                        LED_B_OFF();


@@ -847,7 +857,7 @@ void ListenReaderField(int limit) {
 
                        hf_av_new = AvgAdc(ADC_CHAN_HF);
                        // see if there's a significant change
 
                        hf_av_new = AvgAdc(ADC_CHAN_HF);
                        // see if there's a significant change

-                       if(abs(hf_av - hf_av_new) > REPORT_CHANGE) {
+                       if(ABS(hf_av - hf_av_new) > REPORT_CHANGE) {

                                Dbprintf("HF 13.56MHz Field Change: %5dmV", (MAX_ADC_HF_VOLTAGE * hf_av_new) >> 10);
                                hf_av = hf_av_new;
                                if (hf_av > hf_max)
                                Dbprintf("HF 13.56MHz Field Change: %5dmV", (MAX_ADC_HF_VOLTAGE * hf_av_new) >> 10);
                                hf_av = hf_av_new;
                                if (hf_av > hf_max)


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

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

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


@@ -899,7 +909,7 @@ void UsbPacketReceived(uint8_t *packet, int len)
                        cmd_send(CMD_ACK, SampleLF(c->arg[0]),0,0,0,0);
                        break;
                case CMD_MOD_THEN_ACQUIRE_RAW_ADC_SAMPLES_125K:
                        cmd_send(CMD_ACK, SampleLF(c->arg[0]),0,0,0,0);
                        break;
                case CMD_MOD_THEN_ACQUIRE_RAW_ADC_SAMPLES_125K:

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

                        break;
                case CMD_LF_SNOOP_RAW_ADC_SAMPLES:
                        cmd_send(CMD_ACK,SnoopLF(),0,0,0,0);
                        break;
                case CMD_LF_SNOOP_RAW_ADC_SAMPLES:
                        cmd_send(CMD_ACK,SnoopLF(),0,0,0,0);


@@ -941,7 +951,7 @@ void UsbPacketReceived(uint8_t *packet, int len)
                        WriteTItag(c->arg[0],c->arg[1],c->arg[2]);
                        break;
                case CMD_SIMULATE_TAG_125K:
                        WriteTItag(c->arg[0],c->arg[1],c->arg[2]);
                        break;
                case CMD_SIMULATE_TAG_125K:

-                       LED_A_ON();
+                       LED_A_ON();             

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


@@ -996,6 +1006,18 @@ void UsbPacketReceived(uint8_t *packet, int len)
                case CMD_READER_HITAG: // Reader for Hitag tags, args = type and function
                        ReaderHitag((hitag_function)c->arg[0],(hitag_data*)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;

+               case CMD_SIMULATE_HITAG_S:// Simulate Hitag s tag, args = memory content
+                       SimulateHitagSTag((bool)c->arg[0],(byte_t*)c->d.asBytes);
+                       break;
+               case CMD_TEST_HITAGS_TRACES:// Tests every challenge within the given file
+                       check_challenges((bool)c->arg[0],(byte_t*)c->d.asBytes);
+                       break;
+               case CMD_READ_HITAG_S: //Reader for only Hitag S tags, args = key or challenge
+                       ReadHitagS((hitag_function)c->arg[0],(hitag_data*)c->d.asBytes);
+                       break;
+               case CMD_WR_HITAG_S: //writer for Hitag tags args=data to write,page and key or challenge
+                       WritePageHitagS((hitag_function)c->arg[0],(hitag_data*)c->d.asBytes,c->arg[2]);
+                       break;

 #endif
 
 #ifdef WITH_ISO15693
 #endif
 
 #ifdef WITH_ISO15693


@@ -1030,31 +1052,33 @@ void UsbPacketReceived(uint8_t *packet, int len)
                case CMD_SIMULATE_TAG_LEGIC_RF:
                        LegicRfSimulate(c->arg[0], c->arg[1], c->arg[2]);
                        break;
                case CMD_SIMULATE_TAG_LEGIC_RF:
                        LegicRfSimulate(c->arg[0], c->arg[1], c->arg[2]);
                        break;

-

                case CMD_WRITER_LEGIC_RF:
                case CMD_WRITER_LEGIC_RF:

-                       LegicRfWriter(c->arg[1], c->arg[0]);
+                       LegicRfWriter( c->arg[0], c->arg[1], c->arg[2], c->d.asBytes);

                        break;
                        break;

-

                case CMD_READER_LEGIC_RF:
                case CMD_READER_LEGIC_RF:

-                       LegicRfReader(c->arg[0], c->arg[1]);
+                       LegicRfReader(c->arg[0], c->arg[1], c->arg[2]);
+                       break;                  
+               case CMD_LEGIC_INFO:
+                       LegicRfInfo();
+                       break;
+               case CMD_LEGIC_ESET:
+                       LegicEMemSet(c->arg[0], c->arg[1], c->d.asBytes);

                        break;
 #endif
 
 #ifdef WITH_ISO14443b
                        break;
 #endif
 
 #ifdef WITH_ISO14443b

-               case CMD_READ_SRI512_TAG:
-                       ReadSTMemoryIso14443b(0x0F);
-                       break;
-               case CMD_READ_SRIX4K_TAG:
-                       ReadSTMemoryIso14443b(0x7F);
+               case CMD_READ_SRI_TAG:
+                       ReadSTMemoryIso14443b(c->arg[0]);

                        break;
                case CMD_SNOOP_ISO_14443B:
                        SnoopIso14443b();
                        break;
                case CMD_SIMULATE_TAG_ISO_14443B:
                        break;
                case CMD_SNOOP_ISO_14443B:
                        SnoopIso14443b();
                        break;
                case CMD_SIMULATE_TAG_ISO_14443B:

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

                        break;
                case CMD_ISO_14443B_COMMAND:
                        break;
                case CMD_ISO_14443B_COMMAND:

-                       SendRawCommand14443B(c->arg[0],c->arg[1],c->arg[2],c->d.asBytes);
+                       //SendRawCommand14443B(c->arg[0],c->arg[1],c->arg[2],c->d.asBytes);
+                       SendRawCommand14443B_Ex(c);

                        break;
 #endif
 
                        break;
 #endif
 


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

-                       

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

-                       

                case CMD_READER_MIFARE:
                case CMD_READER_MIFARE:

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

                        break;
                case CMD_MIFARE_READBL:
                        MifareReadBlock(c->arg[0], c->arg[1], c->arg[2], c->d.asBytes);
                        break;
                case CMD_MIFARE_READBL:
                        MifareReadBlock(c->arg[0], c->arg[1], c->arg[2], c->d.asBytes);


@@ -1170,7 +1192,6 @@ void UsbPacketReceived(uint8_t *packet, int len)
                case CMD_MIFARE_DESFIRE:
                        MifareSendCommand(c->arg[0], c->arg[1], c->d.asBytes);
                        break;
                case CMD_MIFARE_DESFIRE:
                        MifareSendCommand(c->arg[0], c->arg[1], c->d.asBytes);
                        break;

-

                case CMD_MIFARE_COLLECT_NONCES:
                        break;
 #endif
                case CMD_MIFARE_COLLECT_NONCES:
                        break;
 #endif


@@ -1201,7 +1222,7 @@ void UsbPacketReceived(uint8_t *packet, int len)
                case CMD_READER_ICLASS_REPLAY:
                    ReaderIClass_Replay(c->arg[0], c->d.asBytes);
                        break;
                case CMD_READER_ICLASS_REPLAY:
                    ReaderIClass_Replay(c->arg[0], c->d.asBytes);
                        break;

-       case CMD_ICLASS_EML_MEMSET:
+               case CMD_ICLASS_EML_MEMSET:

                        emlSet(c->d.asBytes,c->arg[0], c->arg[1]);
                        break;
                case CMD_ICLASS_WRITEBLOCK:
                        emlSet(c->d.asBytes,c->arg[0], c->arg[1]);
                        break;
                case CMD_ICLASS_WRITEBLOCK:


@@ -1251,8 +1272,7 @@ void UsbPacketReceived(uint8_t *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_DOWNLOAD_RAW_ADC_SAMPLES_125K:
-
+               case CMD_DOWNLOAD_RAW_ADC_SAMPLES_125K: {

                        LED_B_ON();
                        uint8_t *BigBuf = BigBuf_get_addr();
                        size_t len = 0;
                        LED_B_ON();
                        uint8_t *BigBuf = BigBuf_get_addr();
                        size_t len = 0;


@@ -1264,13 +1284,26 @@ void UsbPacketReceived(uint8_t *packet, int len)
                        cmd_send(CMD_ACK,1,0,BigBuf_get_traceLen(),getSamplingConfig(),sizeof(sample_config));
                        LED_B_OFF();
                        break;
                        cmd_send(CMD_ACK,1,0,BigBuf_get_traceLen(),getSamplingConfig(),sizeof(sample_config));
                        LED_B_OFF();
                        break;

-
+               }

                case CMD_DOWNLOADED_SIM_SAMPLES_125K: {
                        uint8_t *b = BigBuf_get_addr();
                case CMD_DOWNLOADED_SIM_SAMPLES_125K: {
                        uint8_t *b = BigBuf_get_addr();

-                       memcpy(b+c->arg[0], c->d.asBytes, USB_CMD_DATA_SIZE);
+                       memcpy( b + c->arg[0], c->d.asBytes, USB_CMD_DATA_SIZE);

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

-               }       
+               }
+               case CMD_DOWNLOAD_EML_BIGBUF: {
+                       LED_B_ON();
+                       uint8_t *cardmem = BigBuf_get_EM_addr();
+                       size_t len = 0;
+                       for(size_t i=0; i < c->arg[1]; i += USB_CMD_DATA_SIZE) {
+                               len = MIN((c->arg[1] - i), USB_CMD_DATA_SIZE);
+                               cmd_send(CMD_DOWNLOADED_EML_BIGBUF, i, len, CARD_MEMORY_SIZE, cardmem + c->arg[0] + i, len);
+                       }
+                       // Trigger a finish downloading signal with an ACK frame
+                       cmd_send(CMD_ACK, 1, 0, CARD_MEMORY_SIZE, 0, 0);
+                       LED_B_OFF();
+                       break;
+               }

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


@@ -1350,10 +1383,7 @@ void  __attribute__((noreturn)) AppMain(void)
        }
        common_area.flags.osimage_present = 1;
 
        }
        common_area.flags.osimage_present = 1;
 

-       LED_D_OFF();
-       LED_C_OFF();
-       LED_B_OFF();
-       LED_A_OFF();
+       LEDsoff();

 
        // Init USB device
        usb_enable();
 
        // Init USB device
        usb_enable();


@@ -1363,8 +1393,7 @@ void  __attribute__((noreturn)) AppMain(void)
        AT91C_BASE_PIOA->PIO_PDR = GPIO_PCK0;
        AT91C_BASE_PMC->PMC_SCER = AT91C_PMC_PCK0;
        // PCK0 is PLL clock / 4 = 96Mhz / 4 = 24Mhz
        AT91C_BASE_PIOA->PIO_PDR = GPIO_PCK0;
        AT91C_BASE_PMC->PMC_SCER = AT91C_PMC_PCK0;
        // PCK0 is PLL clock / 4 = 96Mhz / 4 = 24Mhz

-       AT91C_BASE_PMC->PMC_PCKR[0] = AT91C_PMC_CSS_PLL_CLK |
-               AT91C_PMC_PRES_CLK_4; //  4 for 24Mhz pck0, 2 for 48 MHZ pck0
+       AT91C_BASE_PMC->PMC_PCKR[0] = AT91C_PMC_CSS_PLL_CLK | AT91C_PMC_PRES_CLK_4; //  4 for 24Mhz pck0, 2 for 48 MHZ pck0

        AT91C_BASE_PIOA->PIO_OER = GPIO_PCK0;
 
        // Reset SPI
        AT91C_BASE_PIOA->PIO_OER = GPIO_PCK0;
 
        // Reset SPI


@@ -1386,10 +1415,11 @@ void  __attribute__((noreturn)) AppMain(void)
        size_t rx_len;
   
        for(;;) {
        size_t rx_len;
   
        for(;;) {

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

                        if (rx_len)
                        if (rx_len)

-                               UsbPacketReceived(rx,rx_len);
+                               UsbPacketReceived(rx, rx_len);

                }
                WDT_HIT();
 
                }
                WDT_HIT();