CHG: removed CLOCK2, since its not used in the code.

[proxmark3-svn] / armsrc / appmain.c

diff --git a/armsrc/appmain.c b/armsrc/appmain.c
index b069fb4becc65f79f2cc0b28c4e341c6b61952e4..f8d12da155809e3088510e13a1f7870c26eb2227 100644 (file)
--- a/armsrc/appmain.c
+++ b/armsrc/appmain.c
@@ -10,7 +10,7 @@
 // executes.
 //-----------------------------------------------------------------------------
 #include "usb_cdc.h"
-#include "cmd.h"
+//#include "cmd.h"
 #include "proxmark3.h"
 #include "apps.h"
 #include "util.h"
@@ -182,20 +182,21 @@ static int ReadAdc(int ch)
 
 int AvgAdc(int ch) // was static - merlok
 {
-       int i;
-       int a = 0;
-
+       int i, a = 0;
        for(i = 0; i < 32; ++i)
                a += ReadAdc(ch);
 
        return (a + 15) >> 5;
 }
 
+
 void MeasureAntennaTuning(void) {
+
        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
 
+       memset(LF_Results, 0, sizeof(LF_Results));
        LED_B_ON();
 
 /*
@@ -209,8 +210,8 @@ void MeasureAntennaTuning(void) {
   
        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);
@@ -218,17 +219,14 @@ void MeasureAntennaTuning(void) {
                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;
-                       //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);
@@ -236,9 +234,8 @@ void MeasureAntennaTuning(void) {
        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);
-
        LEDsoff();
 }
 
@@ -899,7 +896,7 @@ void UsbPacketReceived(uint8_t *packet, int len)
 {
        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
@@ -952,7 +949,7 @@ void UsbPacketReceived(uint8_t *packet, int len)
                        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;
@@ -1053,17 +1050,17 @@ 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_WRITER_LEGIC_RF:
-                       LegicRfWriter(c->arg[1], c->arg[0]);
+                       LegicRfWriter( c->arg[0], c->arg[1], c->arg[2], c->d.asBytes);
                        break;
-
-               case CMD_RAW_WRITER_LEGIC_RF:
-                       LegicRfRawWriter(c->arg[0], c->arg[1]);
-                       break;
-
                case CMD_READER_LEGIC_RF:
-                       LegicRfReader(c->arg[0], c->arg[1]);
+                       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
 
@@ -1100,7 +1097,7 @@ void UsbPacketReceived(uint8_t *packet, int len)
                        EPA_PACE_Replay(c);
                        break;
                case CMD_READER_MIFARE:
-            ReaderMifare(c->arg[0], c->arg[1]);
+            ReaderMifare(c->arg[0], c->arg[1], c->arg[2]);
                        break;
                case CMD_MIFARE_READBL:
                        MifareReadBlock(c->arg[0], c->arg[1], c->arg[2], c->d.asBytes);
@@ -1193,7 +1190,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_COLLECT_NONCES:
                        break;
 #endif
@@ -1224,7 +1220,7 @@ void UsbPacketReceived(uint8_t *packet, int len)
                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:
@@ -1385,10 +1381,7 @@ void  __attribute__((noreturn)) AppMain(void)
        }
        common_area.flags.osimage_present = 1;
 
-       LED_D_OFF();
-       LED_C_OFF();
-       LED_B_OFF();
-       LED_A_OFF();
+       LEDsoff();
 
        // Init USB device
        usb_enable();
@@ -1398,8 +1391,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_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
@@ -1421,10 +1413,11 @@ void  __attribute__((noreturn)) AppMain(void)
        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)
-                               UsbPacketReceived(rx,rx_len);
+                               UsbPacketReceived(rx, rx_len);
                }
                WDT_HIT();