Update lfops.c

[proxmark3-svn] / armsrc / appmain.c

diff --git a/armsrc/appmain.c b/armsrc/appmain.c
index c5c17867d708df5306739389327af9aad08cdfc2..5169383ee20112af9f9e3d93a83f3188a7abde72 100644 (file)
--- a/armsrc/appmain.c
+++ b/armsrc/appmain.c
@@ -24,15 +24,21 @@
 #include "legicrfsim.h"
 #include "hitag2.h"
 #include "hitagS.h"
 #include "legicrfsim.h"
 #include "hitag2.h"
 #include "hitagS.h"

+#include "iso14443b.h"
+#include "iso15693.h"

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

+#include "mifaresim.h"

 #include "pcf7931.h"
 #include "i2c.h"
 #include "pcf7931.h"
 #include "i2c.h"

+#include "hfsnoop.h"
+#include "fpgaloader.h"

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

+static uint32_t hw_capabilities;

 
 // Craig Young - 14a stand-alone code
 #ifdef WITH_ISO14443a
 
 // Craig Young - 14a stand-alone code
 #ifdef WITH_ISO14443a


@@ -239,7 +245,7 @@ void MeasureAntennaTuningHfOnly(int *vHf)
        // Let the FPGA drive the high-frequency antenna around 13.56 MHz.
        LED_A_ON();
        FpgaDownloadAndGo(FPGA_BITSTREAM_HF);
        // Let the FPGA drive the high-frequency antenna around 13.56 MHz.
        LED_A_ON();
        FpgaDownloadAndGo(FPGA_BITSTREAM_HF);

-       FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_READER_RX_XCORR);
+       FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_READER);

        SpinDelay(20);
        *vHf = AvgAdc_Voltage_HF();
        LED_A_OFF();
        SpinDelay(20);
        *vHf = AvgAdc_Voltage_HF();
        LED_A_OFF();


@@ -281,7 +287,7 @@ void MeasureAntennaTuningHf(void)
 
        // Let the FPGA drive the high-frequency antenna around 13.56 MHz.
        FpgaDownloadAndGo(FPGA_BITSTREAM_HF);
 
        // Let the FPGA drive the high-frequency antenna around 13.56 MHz.
        FpgaDownloadAndGo(FPGA_BITSTREAM_HF);

-       FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_READER_RX_XCORR);
+       FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_READER);

 
        for (;;) {
                SpinDelay(500);
 
        for (;;) {
                SpinDelay(500);


@@ -311,8 +317,22 @@ extern struct version_information version_information;
 extern char *_bootphase1_version_pointer, _flash_start, _flash_end, _bootrom_start, _bootrom_end, __data_src_start__;
 
 
 extern char *_bootphase1_version_pointer, _flash_start, _flash_end, _bootrom_start, _bootrom_end, __data_src_start__;
 
 

+void set_hw_capabilities(void)
+{
+       if (I2C_is_available()) {
+               hw_capabilities |= HAS_SMARTCARD_SLOT;
+       }
+       
+       if (false) { // TODO: implement a test
+               hw_capabilities |= HAS_EXTRA_FLASH_MEM;
+       }
+}      
+
+

 void SendVersion(void)
 {
 void SendVersion(void)
 {

+       set_hw_capabilities();
+       

        char temp[USB_CMD_DATA_SIZE]; /* Limited data payload in USB packets */
        char VersionString[USB_CMD_DATA_SIZE] = { '\0' };
 
        char temp[USB_CMD_DATA_SIZE]; /* Limited data payload in USB packets */
        char VersionString[USB_CMD_DATA_SIZE] = { '\0' };
 


@@ -346,7 +366,7 @@ void SendVersion(void)
        // Send Chip ID and used flash memory
        uint32_t text_and_rodata_section_size = (uint32_t)&__data_src_start__ - (uint32_t)&_flash_start;
        uint32_t compressed_data_section_size = common_area.arg1;
        // Send Chip ID and used flash memory
        uint32_t text_and_rodata_section_size = (uint32_t)&__data_src_start__ - (uint32_t)&_flash_start;
        uint32_t compressed_data_section_size = common_area.arg1;

-       cmd_send(CMD_ACK, *(AT91C_DBGU_CIDR), text_and_rodata_section_size + compressed_data_section_size, 0, VersionString, strlen(VersionString));
+       cmd_send(CMD_ACK, *(AT91C_DBGU_CIDR), text_and_rodata_section_size + compressed_data_section_size, hw_capabilities, VersionString, strlen(VersionString));

 }
 
 // measure the USB Speed by sending SpeedTestBufferSize bytes to client and measuring the elapsed time.
 }
 
 // measure the USB Speed by sending SpeedTestBufferSize bytes to client and measuring the elapsed time.


@@ -1059,12 +1079,18 @@ void UsbPacketReceived(uint8_t *packet, int len)
                case CMD_PCF7931_WRITE:
                        WritePCF7931(c->d.asBytes[0],c->d.asBytes[1],c->d.asBytes[2],c->d.asBytes[3],c->d.asBytes[4],c->d.asBytes[5],c->d.asBytes[6], c->d.asBytes[9], c->d.asBytes[7]-128,c->d.asBytes[8]-128, c->arg[0], c->arg[1], c->arg[2]);
                        break;
                case CMD_PCF7931_WRITE:
                        WritePCF7931(c->d.asBytes[0],c->d.asBytes[1],c->d.asBytes[2],c->d.asBytes[3],c->d.asBytes[4],c->d.asBytes[5],c->d.asBytes[6], c->d.asBytes[9], c->d.asBytes[7]-128,c->d.asBytes[8]-128, c->arg[0], c->arg[1], c->arg[2]);
                        break;

+               case CMD_PCF7931_BRUTEFORCE:
+                       BruteForcePCF7931(c->arg[0], (c->arg[1] & 0xFF), c->d.asBytes[9], c->d.asBytes[7]-128,c->d.asBytes[8]-128);
+                       break;

                case CMD_EM4X_READ_WORD:
                        EM4xReadWord(c->arg[0], c->arg[1],c->arg[2]);
                        break;
                case CMD_EM4X_WRITE_WORD:
                        EM4xWriteWord(c->arg[0], c->arg[1], c->arg[2]);
                        break;
                case CMD_EM4X_READ_WORD:
                        EM4xReadWord(c->arg[0], c->arg[1],c->arg[2]);
                        break;
                case CMD_EM4X_WRITE_WORD:
                        EM4xWriteWord(c->arg[0], c->arg[1], c->arg[2]);
                        break;

+               case CMD_EM4X_PROTECT:
+                       EM4xProtect(c->arg[0], c->arg[1], c->arg[2]);
+                       break;

                case CMD_AWID_DEMOD_FSK: // Set realtime AWID demodulation
                        CmdAWIDdemodFSK(c->arg[0], 0, 0, 1);
                        break;
                case CMD_AWID_DEMOD_FSK: // Set realtime AWID demodulation
                        CmdAWIDdemodFSK(c->arg[0], 0, 0, 1);
                        break;


@@ -1112,8 +1138,9 @@ void UsbPacketReceived(uint8_t *packet, int len)
                case CMD_ACQUIRE_RAW_ADC_SAMPLES_ISO_15693:
                        AcquireRawAdcSamplesIso15693();
                        break;
                case CMD_ACQUIRE_RAW_ADC_SAMPLES_ISO_15693:
                        AcquireRawAdcSamplesIso15693();
                        break;

-               case CMD_RECORD_RAW_ADC_SAMPLES_ISO_15693:
-                       RecordRawAdcSamplesIso15693();
+                       
+               case CMD_SNOOP_ISO_15693:
+                       SnoopIso15693();

                        break;
                        
                case CMD_ISO_15693_COMMAND:
                        break;
                        
                case CMD_ISO_15693_COMMAND:


@@ -1226,7 +1253,7 @@ void UsbPacketReceived(uint8_t *packet, int len)
                        MifareChkKeys(c->arg[0], c->arg[1], c->arg[2], c->d.asBytes);
                        break;
                case CMD_SIMULATE_MIFARE_CARD:
                        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);
+                       MifareSim(c->arg[0], c->arg[1], c->arg[2], c->d.asBytes);

                        break;
                
                // emulator
                        break;
                
                // emulator


@@ -1303,11 +1330,16 @@ void UsbPacketReceived(uint8_t *packet, int len)
                        iClass_Clone(c->arg[0], c->arg[1], c->d.asBytes);
                        break;
 #endif
                        iClass_Clone(c->arg[0], c->arg[1], c->d.asBytes);
                        break;
 #endif

+

 #ifdef WITH_HFSNOOP
                case CMD_HF_SNIFFER:
                        HfSnoop(c->arg[0], c->arg[1]);
                        break;
 #ifdef WITH_HFSNOOP
                case CMD_HF_SNIFFER:
                        HfSnoop(c->arg[0], c->arg[1]);
                        break;

+               case CMD_HF_PLOT:
+                       HfPlot();
+                       break;

 #endif
 #endif

+

 #ifdef WITH_SMARTCARD
                case CMD_SMART_ATR: {
                        SmartCardAtr();
 #ifdef WITH_SMARTCARD
                case CMD_SMART_ATR: {
                        SmartCardAtr();


@@ -1357,7 +1389,6 @@ void UsbPacketReceived(uint8_t *packet, int len)
                        break;
 
                case CMD_DOWNLOAD_RAW_ADC_SAMPLES_125K:
                        break;
 
                case CMD_DOWNLOAD_RAW_ADC_SAMPLES_125K:

-

                        LED_B_ON();
                        uint8_t *BigBuf = BigBuf_get_addr();
                        for(size_t i=0; i<c->arg[1]; i += USB_CMD_DATA_SIZE) {
                        LED_B_ON();
                        uint8_t *BigBuf = BigBuf_get_addr();
                        for(size_t i=0; i<c->arg[1]; i += USB_CMD_DATA_SIZE) {


@@ -1464,11 +1495,8 @@ 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();