ADD: @pwpivi 's latest fixes for bigbuff

ADD:  @marshmellow 14b changes.

fix:  fixes to the timing inside iso14443b.c  sniff/sending.  Between TX & RX there should be a 151us pause.

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5a162d4ae17c0d959caae699711384f93ca2a0ab..5b3735b4ec5a4cf7a6e7f133bf375f3617641cf1 100644 (file)
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,7 +4,14 @@ This project uses the changelog in accordance with [keepchangelog](http://keepac
 
 ## [Unreleased][unreleased]
 
 
 ## [Unreleased][unreleased]
 

+### Changed
+- Changed lf config's `threshold` to a graph (signed) metric and it will trigger on + or - value set to. (example: set to 50 and recording would begin at first graphed value of >= 50 or <= -50) (marshmellow)
+- Changed `hf 14b write` to `hf 14b sriwrite` as it only applied to sri tags (marshmellow)
+- Added `hf 14b reader` to `hf search` (marshmellow)
+

 ### Added
 ### Added

+- Add `hf 14b reader` to find and print general info about known 14b tags (marshmellow)
+- Add `hf 14b info` to find and print full info about std 14b tags and sri tags (using 14b raw commands in the client)  (marshmellow)

 - Add PACE replay functionality (frederikmoellers)
 
 ### Fixed 
 - Add PACE replay functionality (frederikmoellers)
 
 ### Fixed 

diff --git a/armsrc/BigBuf.c b/armsrc/BigBuf.c
index 51fafdebc22b3b872a8a6b1cba3a9f34bfc2567e..e8cf8028e9551e5716e6b19c22dee4ac9b4964d0 100644 (file)
--- a/armsrc/BigBuf.c
+++ b/armsrc/BigBuf.c
@@ -96,9 +96,6 @@ uint16_t BigBuf_max_traceLen(void)
 }
 
 void clear_trace() {
 }
 
 void clear_trace() {

-       uint8_t *trace = BigBuf_get_addr();
-       uint16_t max_traceLen = BigBuf_max_traceLen();
-       memset(trace, 0x44, max_traceLen);

        traceLen = 0;
 }
 
        traceLen = 0;
 }
 


@@ -171,12 +168,8 @@ bool RAMFUNC LogTrace(const uint8_t *btBytes, uint16_t iLen, uint32_t timestamp_
        traceLen += iLen;
 
        // parity bytes
        traceLen += iLen;
 
        // parity bytes

-       if (iLen != 0) {
-               if (parity != NULL) {
+       if (parity != NULL && iLen != 0) {

                        memcpy(trace + traceLen, parity, num_paritybytes);
                        memcpy(trace + traceLen, parity, num_paritybytes);

-               } else {
-                       memset(trace + traceLen, 0x00, num_paritybytes);
-               }

        }
        traceLen += num_paritybytes;
 
        }
        traceLen += num_paritybytes;
 


@@ -225,8 +218,6 @@ int LogTraceHitag(const uint8_t * btBytes, int iBits, int iSamples, uint32_t dwP
 
        return TRUE;
 }
 
        return TRUE;
 }

-
-

 // Emulator memory
 uint8_t emlSet(uint8_t *data, uint32_t offset, uint32_t length){
        uint8_t* mem = BigBuf_get_EM_addr();
 // Emulator memory
 uint8_t emlSet(uint8_t *data, uint32_t offset, uint32_t length){
        uint8_t* mem = BigBuf_get_EM_addr();

diff --git a/armsrc/fpgaloader.c b/armsrc/fpgaloader.c
index 16fed7c52469b857437a3d58474a1dd4d892f4b4..f85065507e69c7de0463ee7e65fe27fe7e45be52 100644 (file)
--- a/armsrc/fpgaloader.c
+++ b/armsrc/fpgaloader.c
@@ -436,6 +436,8 @@ void FpgaDownloadAndGo(int bitstream_version)
        }
 
        inflateEnd(&compressed_fpga_stream);
        }
 
        inflateEnd(&compressed_fpga_stream);

+       
+       BigBuf_free();

 }      
 
 
 }      
 
 

diff --git a/armsrc/hitag2.c b/armsrc/hitag2.c
index 2d0645658c2dc2d2b68cf35f8f295308cf364925..7998d491ee602284efd1ef71c00a06e2f1e2e12a 100644 (file)
--- a/armsrc/hitag2.c
+++ b/armsrc/hitag2.c
@@ -16,10 +16,10 @@
 // (c) 2012 Roel Verdult
 //-----------------------------------------------------------------------------
 
 // (c) 2012 Roel Verdult
 //-----------------------------------------------------------------------------
 

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

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

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

 #include "string.h"
 #include "BigBuf.h"
 
 #include "string.h"
 #include "BigBuf.h"
 


@@ -710,22 +710,24 @@ void SnoopHitag(uint32_t type) {
        byte_t rx[HITAG_FRAME_LEN];
        size_t rxlen=0;
        
        byte_t rx[HITAG_FRAME_LEN];
        size_t rxlen=0;
        

+       FpgaDownloadAndGo(FPGA_BITSTREAM_LF);
+
+       // Clean up trace and prepare it for storing frames
+       set_tracing(TRUE);
+       clear_trace();
+       

        auth_table_len = 0;
        auth_table_pos = 0;
        auth_table_len = 0;
        auth_table_pos = 0;

+

        BigBuf_free();
     auth_table = (byte_t *)BigBuf_malloc(AUTH_TABLE_LENGTH);
        memset(auth_table, 0x00, AUTH_TABLE_LENGTH);
        BigBuf_free();
     auth_table = (byte_t *)BigBuf_malloc(AUTH_TABLE_LENGTH);
        memset(auth_table, 0x00, AUTH_TABLE_LENGTH);

-
-       // Clean up trace and prepare it for storing frames
-       set_tracing(TRUE);
-       clear_trace();

        
        DbpString("Starting Hitag2 snoop");
        LED_D_ON();
        
        // Set up eavesdropping mode, frequency divisor which will drive the FPGA
        // and analog mux selection.
        
        DbpString("Starting Hitag2 snoop");
        LED_D_ON();
        
        // Set up eavesdropping mode, frequency divisor which will drive the FPGA
        // and analog mux selection.

-       FpgaDownloadAndGo(FPGA_BITSTREAM_LF);

        FpgaWriteConfWord(FPGA_MAJOR_MODE_LF_EDGE_DETECT  | FPGA_LF_EDGE_DETECT_TOGGLE_MODE);
        FpgaSendCommand(FPGA_CMD_SET_DIVISOR, 95); //125Khz
        SetAdcMuxFor(GPIO_MUXSEL_LOPKD);
        FpgaWriteConfWord(FPGA_MAJOR_MODE_LF_EDGE_DETECT  | FPGA_LF_EDGE_DETECT_TOGGLE_MODE);
        FpgaSendCommand(FPGA_CMD_SET_DIVISOR, 95); //125Khz
        SetAdcMuxFor(GPIO_MUXSEL_LOPKD);


@@ -922,6 +924,12 @@ void SimulateHitagTag(bool tag_mem_supplied, byte_t* data) {
        bool bQuitTraceFull = false;
        bQuiet = false;
        
        bool bQuitTraceFull = false;
        bQuiet = false;
        

+       FpgaDownloadAndGo(FPGA_BITSTREAM_LF);
+
+       // Clean up trace and prepare it for storing frames
+       set_tracing(TRUE);
+       clear_trace();
+

        auth_table_len = 0;
        auth_table_pos = 0;
     byte_t* auth_table;
        auth_table_len = 0;
        auth_table_pos = 0;
     byte_t* auth_table;


@@ -929,10 +937,6 @@ void SimulateHitagTag(bool tag_mem_supplied, byte_t* data) {
     auth_table = (byte_t *)BigBuf_malloc(AUTH_TABLE_LENGTH);
        memset(auth_table, 0x00, AUTH_TABLE_LENGTH);
 
     auth_table = (byte_t *)BigBuf_malloc(AUTH_TABLE_LENGTH);
        memset(auth_table, 0x00, AUTH_TABLE_LENGTH);
 

-       // Clean up trace and prepare it for storing frames
-       set_tracing(TRUE);
-       clear_trace();
-

        DbpString("Starting Hitag2 simulation");
        LED_D_ON();
        hitag2_init();
        DbpString("Starting Hitag2 simulation");
        LED_D_ON();
        hitag2_init();


@@ -953,7 +957,6 @@ void SimulateHitagTag(bool tag_mem_supplied, byte_t* data) {
        
        // Set up simulator mode, frequency divisor which will drive the FPGA
        // and analog mux selection.
        
        // Set up simulator mode, frequency divisor which will drive the FPGA
        // and analog mux selection.

-       FpgaDownloadAndGo(FPGA_BITSTREAM_LF);

        FpgaWriteConfWord(FPGA_MAJOR_MODE_LF_EDGE_DETECT | FPGA_LF_EDGE_DETECT_READER_FIELD);
        FpgaSendCommand(FPGA_CMD_SET_DIVISOR, 95); //125Khz
        SetAdcMuxFor(GPIO_MUXSEL_LOPKD);
        FpgaWriteConfWord(FPGA_MAJOR_MODE_LF_EDGE_DETECT | FPGA_LF_EDGE_DETECT_READER_FIELD);
        FpgaSendCommand(FPGA_CMD_SET_DIVISOR, 95); //125Khz
        SetAdcMuxFor(GPIO_MUXSEL_LOPKD);

diff --git a/armsrc/iclass.c b/armsrc/iclass.c
index 51a9011f100c058fe8d5c7cdb741ea3d255010af..38b525338a403c47f2cbe2172598114d685ca1c4 100644 (file)
--- a/armsrc/iclass.c
+++ b/armsrc/iclass.c
@@ -36,7 +36,7 @@
 //
 //-----------------------------------------------------------------------------
 
 //
 //-----------------------------------------------------------------------------
 

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

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


@@ -45,9 +45,8 @@
 // Needed for CRC in emulation mode;
 // same construction as in ISO 14443;
 // different initial value (CRC_ICLASS)
 // Needed for CRC in emulation mode;
 // same construction as in ISO 14443;
 // different initial value (CRC_ICLASS)

-#include "../common/iso14443crc.h"
-#include "../common/iso15693tools.h"
-//#include "iso15693tools.h"
+#include "iso14443crc.h"
+#include "iso15693tools.h"

 #include "protocols.h"
 #include "optimized_cipher.h"
 
 #include "protocols.h"
 #include "optimized_cipher.h"
 


@@ -633,6 +632,8 @@ static RAMFUNC int ManchesterDecoding(int v)
 //-----------------------------------------------------------------------------
 void RAMFUNC SnoopIClass(void)
 {
 //-----------------------------------------------------------------------------
 void RAMFUNC SnoopIClass(void)
 {

+
+

     // We won't start recording the frames that we acquire until we trigger;
     // a good trigger condition to get started is probably when we see a
     // response from the tag.
     // We won't start recording the frames that we acquire until we trigger;
     // a good trigger condition to get started is probably when we see a
     // response from the tag.


@@ -1124,7 +1125,6 @@ int doIClassSimulation( int simulationMode, uint8_t *reader_mac_buf)
        int resp_cc_len;
 
        uint8_t *receivedCmd = BigBuf_malloc(MAX_FRAME_SIZE);
        int resp_cc_len;
 
        uint8_t *receivedCmd = BigBuf_malloc(MAX_FRAME_SIZE);

-       memset(receivedCmd, 0x44, MAX_FRAME_SIZE);

        int len;
 
        // Prepare card messages
        int len;
 
        // Prepare card messages


@@ -1335,7 +1335,6 @@ int doIClassSimulation( int simulationMode, uint8_t *reader_mac_buf)
                        }
 
                }
                        }
 
                }

-               memset(receivedCmd, 0x44, MAX_FRAME_SIZE);

        }
 
        //Dbprintf("%x", cmdsRecvd);
        }
 
        //Dbprintf("%x", cmdsRecvd);

diff --git a/armsrc/iso14443a.c b/armsrc/iso14443a.c
index 354b829c94b041c090ebfed7611d0507db91c21d..9b7efaf6834bb5e4e98b4ca72be5470348c35607 100644 (file)
--- a/armsrc/iso14443a.c
+++ b/armsrc/iso14443a.c
@@ -568,11 +568,8 @@ void RAMFUNC SniffIso14443a(uint8_t param) {
        
        LEDsoff();
 
        
        LEDsoff();
 

-       // We won't start recording the frames that we acquire until we trigger;
-       // a good trigger condition to get started is probably when we see a
-       // response from the tag.
-       // triggered == FALSE -- to wait first for card
-       bool triggered = !(param & 0x03); 
+
+       iso14443a_setup(FPGA_HF_ISO14443A_SNIFFER);

        
        // Allocate memory from BigBuf for some buffers
        // free all previous allocations first
        
        // Allocate memory from BigBuf for some buffers
        // free all previous allocations first


@@ -600,8 +597,6 @@ void RAMFUNC SniffIso14443a(uint8_t param) {
        bool TagIsActive = FALSE;
        bool ReaderIsActive = FALSE;
        
        bool TagIsActive = FALSE;
        bool ReaderIsActive = FALSE;
        

-       iso14443a_setup(FPGA_HF_ISO14443A_SNIFFER);
-

        // Set up the demodulator for tag -> reader responses.
        DemodInit(receivedResponse, receivedResponsePar);
        
        // Set up the demodulator for tag -> reader responses.
        DemodInit(receivedResponse, receivedResponsePar);
        


@@ -611,6 +606,12 @@ void RAMFUNC SniffIso14443a(uint8_t param) {
        // Setup and start DMA.
        FpgaSetupSscDma((uint8_t *)dmaBuf, DMA_BUFFER_SIZE);
        
        // Setup and start DMA.
        FpgaSetupSscDma((uint8_t *)dmaBuf, DMA_BUFFER_SIZE);
        

+       // We won't start recording the frames that we acquire until we trigger;
+       // a good trigger condition to get started is probably when we see a
+       // response from the tag.
+       // triggered == FALSE -- to wait first for card
+       bool triggered = !(param & 0x03); 
+       

        // And now we loop, receiving samples.
        for(uint32_t rsamples = 0; TRUE; ) {
 
        // And now we loop, receiving samples.
        for(uint32_t rsamples = 0; TRUE; ) {
 


@@ -673,7 +674,6 @@ void RAMFUNC SniffIso14443a(uint8_t param) {
                                        }
                                        /* And ready to receive another command. */
                                        UartReset();
                                        }
                                        /* And ready to receive another command. */
                                        UartReset();

-                                       //UartInit(receivedCmd, receivedCmdPar);

                                        /* And also reset the demod code, which might have been */
                                        /* false-triggered by the commands from the reader. */
                                        DemodReset();
                                        /* And also reset the demod code, which might have been */
                                        /* false-triggered by the commands from the reader. */
                                        DemodReset();


@@ -1092,6 +1092,9 @@ void SimulateIso14443aTag(int tagType, int flags, int uid_2nd, byte_t* data)
                .modulation_n = 0
        };
   
                .modulation_n = 0
        };
   

+       // We need to listen to the high-frequency, peak-detected path.
+       iso14443a_setup(FPGA_HF_ISO14443A_TAGSIM_LISTEN);
+

        BigBuf_free_keep_EM();
 
        // allocate buffers:
        BigBuf_free_keep_EM();
 
        // allocate buffers:


@@ -1120,9 +1123,6 @@ void SimulateIso14443aTag(int tagType, int flags, int uid_2nd, byte_t* data)
        int happened2 = 0;
        int cmdsRecvd = 0;
 
        int happened2 = 0;
        int cmdsRecvd = 0;
 

-       // We need to listen to the high-frequency, peak-detected path.
-       iso14443a_setup(FPGA_HF_ISO14443A_TAGSIM_LISTEN);
-

        cmdsRecvd = 0;
        tag_response_info_t* p_response;
 
        cmdsRecvd = 0;
        tag_response_info_t* p_response;
 


@@ -2210,6 +2210,10 @@ void ReaderMifare(bool first_try)
        uint8_t receivedAnswer[MAX_MIFARE_FRAME_SIZE];
        uint8_t receivedAnswerPar[MAX_MIFARE_PARITY_SIZE];
 
        uint8_t receivedAnswer[MAX_MIFARE_FRAME_SIZE];
        uint8_t receivedAnswerPar[MAX_MIFARE_PARITY_SIZE];
 

+       if (first_try) { 
+               iso14443a_setup(FPGA_HF_ISO14443A_READER_MOD);
+       }
+       

        // free eventually allocated BigBuf memory. We want all for tracing.
        BigBuf_free();
        
        // free eventually allocated BigBuf memory. We want all for tracing.
        BigBuf_free();
        


@@ -2238,7 +2242,6 @@ void ReaderMifare(bool first_try)
 
        if (first_try) { 
                mf_nr_ar3 = 0;
 
        if (first_try) { 
                mf_nr_ar3 = 0;

-               iso14443a_setup(FPGA_HF_ISO14443A_READER_MOD);

                sync_time = GetCountSspClk() & 0xfffffff8;
                sync_cycles = 65536;                                                                    // theory: Mifare Classic's random generator repeats every 2^16 cycles (and so do the nonces).
                nt_attacked = 0;
                sync_time = GetCountSspClk() & 0xfffffff8;
                sync_cycles = 65536;                                                                    // theory: Mifare Classic's random generator repeats every 2^16 cycles (and so do the nonces).
                nt_attacked = 0;


@@ -2397,9 +2400,11 @@ void ReaderMifare(bool first_try)
                
        cmd_send(CMD_ACK,isOK,0,0,buf,28);
 
                
        cmd_send(CMD_ACK,isOK,0,0,buf,28);
 

-       set_tracing(FALSE);
+       // Thats it...

        FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
        LEDsoff();
        FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
        LEDsoff();

+
+       set_tracing(FALSE);

 }
 
 
 }
 
 


@@ -2456,13 +2461,6 @@ void Mifare1ksim(uint8_t flags, uint8_t exitAfterNReads, uint8_t arg2, uint8_t *
        uint32_t ar_nr_responses[] = {0,0,0,0,0,0,0,0,0,0};
        uint8_t ar_nr_collected = 0;
 
        uint32_t ar_nr_responses[] = {0,0,0,0,0,0,0,0,0,0};
        uint8_t ar_nr_collected = 0;
 

-       // free eventually allocated BigBuf memory but keep Emulator Memory
-       BigBuf_free_keep_EM();
-
-       // clear trace
-       clear_trace();
-       set_tracing(TRUE);
-

        // Authenticate response - nonce
        uint32_t nonce = bytes_to_num(rAUTH_NT, 4);
        
        // Authenticate response - nonce
        uint32_t nonce = bytes_to_num(rAUTH_NT, 4);
        


@@ -2509,10 +2507,6 @@ void Mifare1ksim(uint8_t flags, uint8_t exitAfterNReads, uint8_t arg2, uint8_t *
                rUIDBCC2[4] = rUIDBCC2[0] ^ rUIDBCC2[1] ^ rUIDBCC2[2] ^ rUIDBCC2[3];
        }
 
                rUIDBCC2[4] = rUIDBCC2[0] ^ rUIDBCC2[1] ^ rUIDBCC2[2] ^ rUIDBCC2[3];
        }
 

-       // We need to listen to the high-frequency, peak-detected path.
-       iso14443a_setup(FPGA_HF_ISO14443A_TAGSIM_LISTEN);
-
-

        if (MF_DBGLEVEL >= 1)   {
                if (!_7BUID) {
                        Dbprintf("4B UID: %02x%02x%02x%02x", 
        if (MF_DBGLEVEL >= 1)   {
                if (!_7BUID) {
                        Dbprintf("4B UID: %02x%02x%02x%02x", 


@@ -2524,6 +2518,17 @@ void Mifare1ksim(uint8_t flags, uint8_t exitAfterNReads, uint8_t arg2, uint8_t *
                }
        }
 
                }
        }
 

+       // We need to listen to the high-frequency, peak-detected path.
+       iso14443a_setup(FPGA_HF_ISO14443A_TAGSIM_LISTEN);
+
+       // free eventually allocated BigBuf memory but keep Emulator Memory
+       BigBuf_free_keep_EM();
+
+       // clear trace
+       clear_trace();
+       set_tracing(TRUE);
+
+

        bool finished = FALSE;
        while (!BUTTON_PRESS() && !finished) {
                WDT_HIT();
        bool finished = FALSE;
        while (!BUTTON_PRESS() && !finished) {
                WDT_HIT();


@@ -2935,9 +2940,6 @@ void RAMFUNC SniffMifare(uint8_t param) {
        // bit 0 - trigger from first card answer
        // bit 1 - trigger from first reader 7-bit request
 
        // bit 0 - trigger from first card answer
        // bit 1 - trigger from first reader 7-bit request
 

-       // free eventually allocated BigBuf memory
-       BigBuf_free();
-       

        // C(red) A(yellow) B(green)
        LEDsoff();
        // init trace buffer
        // C(red) A(yellow) B(green)
        LEDsoff();
        // init trace buffer


@@ -2953,6 +2955,10 @@ void RAMFUNC SniffMifare(uint8_t param) {
        uint8_t receivedResponse[MAX_MIFARE_FRAME_SIZE];
        uint8_t receivedResponsePar[MAX_MIFARE_PARITY_SIZE];
 
        uint8_t receivedResponse[MAX_MIFARE_FRAME_SIZE];
        uint8_t receivedResponsePar[MAX_MIFARE_PARITY_SIZE];
 

+       iso14443a_setup(FPGA_HF_ISO14443A_SNIFFER);
+
+       // free eventually allocated BigBuf memory
+       BigBuf_free();

        // allocate the DMA buffer, used to stream samples from the FPGA
        uint8_t *dmaBuf = BigBuf_malloc(DMA_BUFFER_SIZE);
        uint8_t *data = dmaBuf;
        // allocate the DMA buffer, used to stream samples from the FPGA
        uint8_t *dmaBuf = BigBuf_malloc(DMA_BUFFER_SIZE);
        uint8_t *data = dmaBuf;


@@ -2962,8 +2968,6 @@ void RAMFUNC SniffMifare(uint8_t param) {
        bool ReaderIsActive = FALSE;
        bool TagIsActive = FALSE;
 
        bool ReaderIsActive = FALSE;
        bool TagIsActive = FALSE;
 

-       iso14443a_setup(FPGA_HF_ISO14443A_SNIFFER);
-

        // Set up the demodulator for tag -> reader responses.
        DemodInit(receivedResponse, receivedResponsePar);
 
        // Set up the demodulator for tag -> reader responses.
        DemodInit(receivedResponse, receivedResponsePar);
 


@@ -3043,7 +3047,6 @@ void RAMFUNC SniffMifare(uint8_t param) {
                                        if (MfSniffLogic(receivedCmd, Uart.len, Uart.parity, Uart.bitCount, TRUE)) break;
 
                                        /* And ready to receive another command. */
                                        if (MfSniffLogic(receivedCmd, Uart.len, Uart.parity, Uart.bitCount, TRUE)) break;
 
                                        /* And ready to receive another command. */

-                                       //UartInit(receivedCmd, receivedCmdPar);

                                        UartReset();
                                        
                                        /* And also reset the demod code */
                                        UartReset();
                                        
                                        /* And also reset the demod code */

diff --git a/armsrc/iso14443b.c b/armsrc/iso14443b.c
index a8a6460932d32f223bb3076c30b0defbab66a718..ee7f18f2927506a177e0ba500b1536594c927034 100644 (file)
--- a/armsrc/iso14443b.c
+++ b/armsrc/iso14443b.c
@@ -321,9 +321,6 @@ static int GetIso14443bCommandFromReader(uint8_t *received, uint16_t *len)
 //-----------------------------------------------------------------------------
 void SimulateIso14443bTag(void)
 {
 //-----------------------------------------------------------------------------
 void SimulateIso14443bTag(void)
 {

-       FpgaDownloadAndGo(FPGA_BITSTREAM_HF);
-       BigBuf_free();
-       

        // the only commands we understand is REQB, AFI=0, Select All, N=0:
        static const uint8_t cmd1[] = { 0x05, 0x00, 0x08, 0x39, 0x73 };
        // ... and REQB, AFI=0, Normal Request, N=0:
        // the only commands we understand is REQB, AFI=0, Select All, N=0:
        static const uint8_t cmd1[] = { 0x05, 0x00, 0x08, 0x39, 0x73 };
        // ... and REQB, AFI=0, Normal Request, N=0:


@@ -337,22 +334,26 @@ void SimulateIso14443bTag(void)
                0x00, 0x21, 0x85, 0x5e, 0xd7
        };
 
                0x00, 0x21, 0x85, 0x5e, 0xd7
        };
 

+       uint8_t parity[MAX_PARITY_SIZE];
+                               
+       FpgaDownloadAndGo(FPGA_BITSTREAM_HF);
+

        clear_trace();
        set_tracing(TRUE);
 
        const uint8_t *resp;
        uint8_t *respCode;
        uint16_t respLen, respCodeLen;
        clear_trace();
        set_tracing(TRUE);
 
        const uint8_t *resp;
        uint8_t *respCode;
        uint16_t respLen, respCodeLen;

-       uint16_t len;
-       uint16_t cmdsRecvd = 0;
-

 
        // allocate command receive buffer
 
        // allocate command receive buffer

+       BigBuf_free();

        uint8_t *receivedCmd = BigBuf_malloc(MAX_FRAME_SIZE);
 
        uint8_t *receivedCmd = BigBuf_malloc(MAX_FRAME_SIZE);
 

+       uint16_t len;
+       uint16_t cmdsRecvd = 0;
+

        // prepare the (only one) tag answer:
        CodeIso14443bAsTag(response1, sizeof(response1));
        // prepare the (only one) tag answer:
        CodeIso14443bAsTag(response1, sizeof(response1));

-

        uint8_t *resp1Code = BigBuf_malloc(ToSendMax);
        memcpy(resp1Code, ToSend, ToSendMax); 
        uint16_t resp1CodeLen = ToSendMax;
        uint8_t *resp1Code = BigBuf_malloc(ToSendMax);
        memcpy(resp1Code, ToSend, ToSendMax); 
        uint16_t resp1CodeLen = ToSendMax;


@@ -371,7 +372,6 @@ void SimulateIso14443bTag(void)
                }
 
                if (tracing) {
                }
 
                if (tracing) {

-                       uint8_t parity[MAX_PARITY_SIZE];

                        LogTrace(receivedCmd, len, 0, 0, parity, TRUE);
                }
 
                        LogTrace(receivedCmd, len, 0, 0, parity, TRUE);
                }
 


@@ -444,12 +444,9 @@ void SimulateIso14443bTag(void)
                }
                
                // trace the response:
                }
                
                // trace the response:

-               if (tracing) {
-                       uint8_t parity[MAX_PARITY_SIZE];
-                       LogTrace(resp, respLen, 0, 0, parity, FALSE);
-               }
-                       
+               if (tracing) LogTrace(resp, respLen, 0, 0, parity, FALSE);                      

        }
        }

+       //FpgaDisableSscDma();

 }
 
 //=============================================================================
 }
 
 //=============================================================================


@@ -728,13 +725,13 @@ static void GetSamplesFor14443bDemod(int n, bool quiet)
        BigBuf_free();
        
        // The response (tag -> reader) that we're receiving.
        BigBuf_free();
        
        // The response (tag -> reader) that we're receiving.

-       uint8_t *receivedResponse = BigBuf_malloc(MAX_FRAME_SIZE);
+       uint8_t *resp = BigBuf_malloc(MAX_FRAME_SIZE);

        
        // The DMA buffer, used to stream samples from the FPGA
        int8_t *dmaBuf = (int8_t*) BigBuf_malloc(ISO14443B_DMA_BUFFER_SIZE);
 
        // Set up the demodulator for tag -> reader responses.
        
        // The DMA buffer, used to stream samples from the FPGA
        int8_t *dmaBuf = (int8_t*) BigBuf_malloc(ISO14443B_DMA_BUFFER_SIZE);
 
        // Set up the demodulator for tag -> reader responses.

-       DemodInit(receivedResponse);
+       DemodInit(resp);

 
        // Setup and start DMA.
        FpgaSetupSscDma((uint8_t*) dmaBuf, ISO14443B_DMA_BUFFER_SIZE);
 
        // Setup and start DMA.
        FpgaSetupSscDma((uint8_t*) dmaBuf, ISO14443B_DMA_BUFFER_SIZE);


@@ -746,6 +743,7 @@ static void GetSamplesFor14443bDemod(int n, bool quiet)
        LED_D_ON();
        // And put the FPGA in the appropriate mode
        FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_READER_RX_XCORR | FPGA_HF_READER_RX_XCORR_848_KHZ);
        LED_D_ON();
        // And put the FPGA in the appropriate mode
        FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_READER_RX_XCORR | FPGA_HF_READER_RX_XCORR_848_KHZ);

+       SpinDelayUs(151); // T0 time between reader send,  tag answer.  151us.

 
        for(;;) {
                int behindBy = lastRxCounter - AT91C_BASE_PDC_SSC->PDC_RCR;
 
        for(;;) {
                int behindBy = lastRxCounter - AT91C_BASE_PDC_SSC->PDC_RCR;


@@ -922,7 +920,8 @@ static void CodeAndTransmit14443bAsReader(const uint8_t *cmd, int len)
 void ReadSTMemoryIso14443b(uint32_t dwLast)
 {
        FpgaDownloadAndGo(FPGA_BITSTREAM_HF);
 void ReadSTMemoryIso14443b(uint32_t dwLast)
 {
        FpgaDownloadAndGo(FPGA_BITSTREAM_HF);

-       
+       BigBuf_free();
+

        clear_trace();
        set_tracing(TRUE);
 
        clear_trace();
        set_tracing(TRUE);
 


@@ -932,6 +931,8 @@ void ReadSTMemoryIso14443b(uint32_t dwLast)
        // confusing things will happen if we don't reset them between reads.
        LED_D_OFF();
        FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
        // confusing things will happen if we don't reset them between reads.
        LED_D_OFF();
        FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);

+       SpinDelay(200);
+

        SetAdcMuxFor(GPIO_MUXSEL_HIPKD);
        FpgaSetupSsc();
 
        SetAdcMuxFor(GPIO_MUXSEL_HIPKD);
        FpgaSetupSsc();
 


@@ -1169,8 +1170,8 @@ void RAMFUNC SnoopIso14443b(void)
                        //Use samples as a time measurement
                        if(tracing)
                        {
                        //Use samples as a time measurement
                        if(tracing)
                        {

-                               uint8_t parity[MAX_PARITY_SIZE];
-                                       LogTrace(Demod.output, Demod.len, samples, samples, parity, FALSE);
+                               //uint8_t parity[MAX_PARITY_SIZE];
+                               LogTrace(Demod.output, Demod.len, samples, samples, parity, FALSE);

                        }
                        triggered = TRUE;
 
                        }
                        triggered = TRUE;
 


@@ -1213,9 +1214,12 @@ void SendRawCommand14443B(uint32_t datalen, uint32_t recv, uint8_t powerfield, u
        SetAdcMuxFor(GPIO_MUXSEL_HIPKD);
        FpgaSetupSsc();
 
        SetAdcMuxFor(GPIO_MUXSEL_HIPKD);
        FpgaSetupSsc();
 

-       set_tracing(TRUE);
-       
-       CodeAndTransmit14443bAsReader(data, datalen);
+       if ( datalen == 0 && recv == 0 && powerfield == 0){
+               clear_trace();
+       } else {
+               set_tracing(TRUE);
+               CodeAndTransmit14443bAsReader(data, datalen);
+       }

 
        if(recv) {
                GetSamplesFor14443bDemod(RECEIVE_SAMPLES_TIMEOUT, TRUE);
 
        if(recv) {
                GetSamplesFor14443bDemod(RECEIVE_SAMPLES_TIMEOUT, TRUE);


@@ -1227,5 +1231,7 @@ void SendRawCommand14443B(uint32_t datalen, uint32_t recv, uint8_t powerfield, u
                FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
                LED_D_OFF();
        }
                FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
                LED_D_OFF();
        }

+       
+       FpgaDisableSscDma();

 }
 
 }
 

diff --git a/armsrc/iso15693.c b/armsrc/iso15693.c
index 94040a85796a36eb38b7e5976b2339123845234f..aa4a57fc5aa43d4eda3679a0f72667a28da701eb 100644 (file)
--- a/armsrc/iso15693.c
+++ b/armsrc/iso15693.c
@@ -877,12 +877,12 @@ int SendDataTag(uint8_t *send, int sendlen, int init, int speed, uint8_t **recv)
        LED_C_OFF();
        LED_D_OFF();
        
        LED_C_OFF();
        LED_D_OFF();
        

+       if (init) Iso15693InitReader();
+

        int answerLen=0;
        uint8_t *answer = BigBuf_get_addr() + 3660;
        if (recv != NULL) memset(answer, 0, 100);
 
        int answerLen=0;
        uint8_t *answer = BigBuf_get_addr() + 3660;
        if (recv != NULL) memset(answer, 0, 100);
 

-       if (init) Iso15693InitReader();
-       

        if (!speed) {
                // low speed (1 out of 256)
                CodeIso15693AsReader256(send, sendlen);
        if (!speed) {
                // low speed (1 out of 256)
                CodeIso15693AsReader256(send, sendlen);


@@ -999,10 +999,6 @@ void ReaderIso15693(uint32_t parameter)
        LED_C_OFF();
        LED_D_OFF();
 
        LED_C_OFF();
        LED_D_OFF();
 

-       uint8_t *answer1 = BigBuf_get_addr() + 3660;
-       uint8_t *answer2 = BigBuf_get_addr() + 3760;
-       uint8_t *answer3 = BigBuf_get_addr() + 3860;
-

        int answerLen1 = 0;
        int answerLen2 = 0;
        int answerLen3 = 0;
        int answerLen1 = 0;
        int answerLen2 = 0;
        int answerLen3 = 0;


@@ -1013,12 +1009,14 @@ void ReaderIso15693(uint32_t parameter)
        int elapsed = 0;
        uint8_t TagUID[8] = {0x00};
 
        int elapsed = 0;
        uint8_t TagUID[8] = {0x00};
 

+       FpgaDownloadAndGo(FPGA_BITSTREAM_HF);

 
 

+       uint8_t *answer1 = BigBuf_get_addr() + 3660;
+       uint8_t *answer2 = BigBuf_get_addr() + 3760;
+       uint8_t *answer3 = BigBuf_get_addr() + 3860;

        // Blank arrays
        memset(answer1, 0x00, 300);
 
        // Blank arrays
        memset(answer1, 0x00, 300);
 

-       FpgaDownloadAndGo(FPGA_BITSTREAM_HF);
-

        SetAdcMuxFor(GPIO_MUXSEL_HIPKD);
        // Setup SSC
        FpgaSetupSsc();
        SetAdcMuxFor(GPIO_MUXSEL_HIPKD);
        // Setup SSC
        FpgaSetupSsc();


@@ -1111,20 +1109,18 @@ void SimTagIso15693(uint32_t parameter, uint8_t *uid)
        LED_C_OFF();
        LED_D_OFF();
 
        LED_C_OFF();
        LED_D_OFF();
 

-       uint8_t *buf = BigBuf_get_addr() + 3660;
-       

        int answerLen1 = 0;
        int samples = 0;
        int tsamples = 0;
        int wait = 0;
        int elapsed = 0;
 
        int answerLen1 = 0;
        int samples = 0;
        int tsamples = 0;
        int wait = 0;
        int elapsed = 0;
 

-       memset(buf, 0x00, 100);
-

        FpgaDownloadAndGo(FPGA_BITSTREAM_HF);
 
        FpgaDownloadAndGo(FPGA_BITSTREAM_HF);
 

-       SetAdcMuxFor(GPIO_MUXSEL_HIPKD);
+       uint8_t *buf = BigBuf_get_addr() + 3660;
+       memset(buf, 0x00, 100);

 
 

+       SetAdcMuxFor(GPIO_MUXSEL_HIPKD);

        FpgaSetupSsc();
 
        // Start from off (no field generated)
        FpgaSetupSsc();
 
        // Start from off (no field generated)

diff --git a/armsrc/lfsampling.c b/armsrc/lfsampling.c
index 120c0801de6ccecc3e7e558e10c078e3b187c980..f858dc1c4e00eb7bc5a209af632c886b7412f9c3 100644 (file)
--- a/armsrc/lfsampling.c
+++ b/armsrc/lfsampling.c
@@ -119,7 +119,6 @@ void LFSetupFPGAForADC(int divisor, bool lf_field)
  * @param silent - is true, now outputs are made. If false, dbprints the status
  * @return the number of bits occupied by the samples.
  */
  * @param silent - is true, now outputs are made. If false, dbprints the status
  * @return the number of bits occupied by the samples.
  */

-

 uint32_t DoAcquisition(uint8_t decimation, uint32_t bits_per_sample, bool averaging, int trigger_threshold,bool silent)
 {
        //.
 uint32_t DoAcquisition(uint8_t decimation, uint32_t bits_per_sample, bool averaging, int trigger_threshold,bool silent)
 {
        //.


@@ -151,7 +150,8 @@ uint32_t DoAcquisition(uint8_t decimation, uint32_t bits_per_sample, bool averag
                if (AT91C_BASE_SSC->SSC_SR & AT91C_SSC_RXRDY) {
                        sample = (uint8_t)AT91C_BASE_SSC->SSC_RHR;
                        LED_D_OFF();
                if (AT91C_BASE_SSC->SSC_SR & AT91C_SSC_RXRDY) {
                        sample = (uint8_t)AT91C_BASE_SSC->SSC_RHR;
                        LED_D_OFF();

-                       if (trigger_threshold > 0 && sample < trigger_threshold)
+                       // threshold either high or low values 128 = center 0.  if trigger = 178 
+                       if ((trigger_threshold > 0) && (sample < (trigger_threshold+128)) && (sample > (128-trigger_threshold))) // 

                                continue;
 
                        trigger_threshold = 0;
                                continue;
 
                        trigger_threshold = 0;

diff --git a/armsrc/mifarecmd.c b/armsrc/mifarecmd.c
index b9f8e81efe49a587617c961b6aab741c0260fee1..102887e45b3dcbfa2ccf59f205d1a05612ac0e3a 100644 (file)
--- a/armsrc/mifarecmd.c
+++ b/armsrc/mifarecmd.c
@@ -39,10 +39,10 @@ void MifareReadBlock(uint8_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain)
        struct Crypto1State *pcs;\r
        pcs = &mpcs;\r
 \r
        struct Crypto1State *pcs;\r
        pcs = &mpcs;\r
 \r

-       // clear trace\r
-       clear_trace();\r

        iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);\r
 \r
        iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);\r
 \r

+       clear_trace();\r
+\r

        LED_A_ON();\r
        LED_B_OFF();\r
        LED_C_OFF();\r
        LED_A_ON();\r
        LED_B_OFF();\r
        LED_C_OFF();\r


@@ -90,9 +90,11 @@ void MifareUC_Auth(uint8_t arg0, uint8_t *keybytes){
        bool turnOffField = (arg0 == 1);\r
 \r
        LED_A_ON(); LED_B_OFF(); LED_C_OFF();\r
        bool turnOffField = (arg0 == 1);\r
 \r
        LED_A_ON(); LED_B_OFF(); LED_C_OFF();\r

-       clear_trace();\r
+\r

        iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);\r
 \r
        iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);\r
 \r

+       clear_trace();\r
+\r

        if(!iso14443a_select_card(NULL, NULL, NULL)) {\r
                if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Can't select card");\r
                OnError(0);\r
        if(!iso14443a_select_card(NULL, NULL, NULL)) {\r
                if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Can't select card");\r
                OnError(0);\r


@@ -124,9 +126,10 @@ void MifareUReadBlock(uint8_t arg0, uint8_t arg1, uint8_t *datain)
 \r
        LEDsoff();\r
        LED_A_ON();\r
 \r
        LEDsoff();\r
        LED_A_ON();\r

-       clear_trace();\r

        iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);\r
 \r
        iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);\r
 \r

+       clear_trace();\r
+\r

        int len = iso14443a_select_card(NULL, NULL, NULL);\r
        if(!len) {\r
                if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Can't select card (RC:%02X)",len);\r
        int len = iso14443a_select_card(NULL, NULL, NULL);\r
        if(!len) {\r
                if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Can't select card (RC:%02X)",len);\r


@@ -194,11 +197,10 @@ void MifareReadSector(uint8_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain)
        struct Crypto1State *pcs;\r
        pcs = &mpcs;\r
 \r
        struct Crypto1State *pcs;\r
        pcs = &mpcs;\r
 \r

-       // clear trace\r
-       clear_trace();\r
-\r

        iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);\r
 \r
        iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);\r
 \r

+       clear_trace();\r
+\r

        LED_A_ON();\r
        LED_B_OFF();\r
        LED_C_OFF();\r
        LED_A_ON();\r
        LED_B_OFF();\r
        LED_C_OFF();\r


@@ -247,6 +249,10 @@ void MifareReadSector(uint8_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain)
 // datain = KEY bytes\r
 void MifareUReadCard(uint8_t arg0, uint16_t arg1, uint8_t arg2, uint8_t *datain)\r
 {\r
 // datain = KEY bytes\r
 void MifareUReadCard(uint8_t arg0, uint16_t arg1, uint8_t arg2, uint8_t *datain)\r
 {\r

+       LEDsoff();\r
+       LED_A_ON();\r
+       iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);\r
+\r

        // free eventually allocated BigBuf memory\r
        BigBuf_free();\r
        clear_trace();\r
        // free eventually allocated BigBuf memory\r
        BigBuf_free();\r
        clear_trace();\r


@@ -264,10 +270,6 @@ void MifareUReadCard(uint8_t arg0, uint16_t arg1, uint8_t arg2, uint8_t *datain)
                return;\r
        }\r
 \r
                return;\r
        }\r
 \r

-       LEDsoff();\r
-       LED_A_ON();\r
-       iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);\r
-\r

        int len = iso14443a_select_card(NULL, NULL, NULL);\r
        if (!len) {\r
                if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Can't select card (RC:%d)",len);\r
        int len = iso14443a_select_card(NULL, NULL, NULL);\r
        if (!len) {\r
                if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Can't select card (RC:%d)",len);\r


@@ -361,11 +363,10 @@ void MifareWriteBlock(uint8_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain)
        struct Crypto1State *pcs;\r
        pcs = &mpcs;\r
 \r
        struct Crypto1State *pcs;\r
        pcs = &mpcs;\r
 \r

-       // clear trace\r
-       clear_trace();\r
-\r

        iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);\r
 \r
        iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);\r
 \r

+       clear_trace();\r
+\r

        LED_A_ON();\r
        LED_B_OFF();\r
        LED_C_OFF();\r
        LED_A_ON();\r
        LED_B_OFF();\r
        LED_C_OFF();\r


@@ -467,9 +468,10 @@ void MifareUWriteBlock(uint8_t arg0, uint8_t arg1, uint8_t *datain)
        \r
        LEDsoff();\r
        LED_A_ON();\r
        \r
        LEDsoff();\r
        LED_A_ON();\r

-       clear_trace();\r

        iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);\r
 \r
        iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);\r
 \r

+       clear_trace();\r
+\r

        if(!iso14443a_select_card(NULL, NULL, NULL)) {\r
                if (MF_DBGLEVEL >= 1) Dbprintf("Can't select card");\r
                OnError(0);\r
        if(!iso14443a_select_card(NULL, NULL, NULL)) {\r
                if (MF_DBGLEVEL >= 1) Dbprintf("Can't select card");\r
                OnError(0);\r


@@ -525,9 +527,10 @@ void MifareUSetPwd(uint8_t arg0, uint8_t *datain){
        memcpy(pwd, datain, 16);\r
        \r
        LED_A_ON(); LED_B_OFF(); LED_C_OFF();\r
        memcpy(pwd, datain, 16);\r
        \r
        LED_A_ON(); LED_B_OFF(); LED_C_OFF();\r

-       clear_trace();\r

        iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);\r
 \r
        iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);\r
 \r

+       clear_trace();\r
+\r

        if(!iso14443a_select_card(NULL, NULL, NULL)) {\r
                if (MF_DBGLEVEL >= 1) Dbprintf("Can't select card");\r
                OnError(0);\r
        if(!iso14443a_select_card(NULL, NULL, NULL)) {\r
                if (MF_DBGLEVEL >= 1) Dbprintf("Can't select card");\r
                OnError(0);\r


@@ -627,17 +630,15 @@ void MifareNested(uint32_t arg0, uint32_t arg1, uint32_t calibrate, uint8_t *dat
        uint32_t auth1_time, auth2_time;\r
        static uint16_t delta_time;\r
 \r
        uint32_t auth1_time, auth2_time;\r
        static uint16_t delta_time;\r
 \r

+       LED_A_ON();\r
+       LED_C_OFF();\r
+       iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);\r
+\r

        // free eventually allocated BigBuf memory\r
        BigBuf_free();\r
        // free eventually allocated BigBuf memory\r
        BigBuf_free();\r

-       // clear trace\r
+\r

        clear_trace();\r
        set_tracing(false);\r
        clear_trace();\r
        set_tracing(false);\r

-       \r
-       iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);\r
-\r
-       LED_A_ON();\r
-       LED_C_OFF();\r
-\r

 \r
        // statistics on nonce distance\r
        int16_t isOK = 0;\r
 \r
        // statistics on nonce distance\r
        int16_t isOK = 0;\r


@@ -842,15 +843,13 @@ void MifareChkKeys(uint8_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain)
        int OLD_MF_DBGLEVEL = MF_DBGLEVEL;      \r
        MF_DBGLEVEL = MF_DBG_NONE;\r
        \r
        int OLD_MF_DBGLEVEL = MF_DBGLEVEL;      \r
        MF_DBGLEVEL = MF_DBG_NONE;\r
        \r

-       // clear trace\r
-       clear_trace();\r
-       set_tracing(TRUE);\r
-\r
-       iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);\r
-\r

        LED_A_ON();\r
        LED_B_OFF();\r
        LED_C_OFF();\r
        LED_A_ON();\r
        LED_B_OFF();\r
        LED_C_OFF();\r

+       iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);\r
+\r
+       clear_trace();\r
+       set_tracing(TRUE);\r

 \r
        for (i = 0; i < keyCount; i++) {\r
                if(mifare_classic_halt(pcs, cuid)) {\r
 \r
        for (i = 0; i < keyCount; i++) {\r
                if(mifare_classic_halt(pcs, cuid)) {\r


@@ -897,16 +896,23 @@ void MifareSetDbgLvl(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datai
 //-----------------------------------------------------------------------------\r
 // Work with emulator memory\r
 // \r
 //-----------------------------------------------------------------------------\r
 // Work with emulator memory\r
 // \r

+// Note: we call FpgaDownloadAndGo(FPGA_BITSTREAM_HF) here although FPGA is not\r
+// involved in dealing with emulator memory. But if it is called later, it might\r
+// destroy the Emulator Memory.\r

 //-----------------------------------------------------------------------------\r
 //-----------------------------------------------------------------------------\r

+\r

 void MifareEMemClr(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datain){\r
 void MifareEMemClr(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datain){\r

+       FpgaDownloadAndGo(FPGA_BITSTREAM_HF);\r

        emlClearMem();\r
 }\r
 \r
 void MifareEMemSet(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datain){\r
        emlClearMem();\r
 }\r
 \r
 void MifareEMemSet(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datain){\r

+       FpgaDownloadAndGo(FPGA_BITSTREAM_HF);\r

        emlSetMem(datain, arg0, arg1); // data, block num, blocks count\r
 }\r
 \r
 void MifareEMemGet(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datain){\r
        emlSetMem(datain, arg0, arg1); // data, block num, blocks count\r
 }\r
 \r
 void MifareEMemGet(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datain){\r

+       FpgaDownloadAndGo(FPGA_BITSTREAM_HF);\r

        byte_t buf[USB_CMD_DATA_SIZE];\r
        emlGetMem(buf, arg0, arg1); // data, block num, blocks count (max 4)\r
 \r
        byte_t buf[USB_CMD_DATA_SIZE];\r
        emlGetMem(buf, arg0, arg1); // data, block num, blocks count (max 4)\r
 \r


@@ -933,15 +939,13 @@ void MifareECardLoad(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datai
        byte_t dataoutbuf2[16];\r
        uint8_t uid[10];\r
 \r
        byte_t dataoutbuf2[16];\r
        uint8_t uid[10];\r
 \r

-       // clear trace\r
-       clear_trace();\r
-       set_tracing(false);\r
-       \r
-       iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);\r
-\r

        LED_A_ON();\r
        LED_B_OFF();\r
        LED_C_OFF();\r
        LED_A_ON();\r
        LED_B_OFF();\r
        LED_C_OFF();\r

+       iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);\r
+       \r
+       clear_trace();\r
+       set_tracing(false);\r

        \r
        bool isOK = true;\r
 \r
        \r
        bool isOK = true;\r
 \r


@@ -1035,10 +1039,10 @@ void MifareCSetBlock(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datai
                LED_A_ON();\r
                LED_B_OFF();\r
                LED_C_OFF();\r
                LED_A_ON();\r
                LED_B_OFF();\r
                LED_C_OFF();\r

+               iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);\r

        \r
                clear_trace();\r
                set_tracing(TRUE);\r
        \r
                clear_trace();\r
                set_tracing(TRUE);\r

-               iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);\r

        }\r
 \r
        while (true) {\r
        }\r
 \r
        while (true) {\r


@@ -1153,10 +1157,10 @@ void MifareCGetBlock(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datai
                LED_A_ON();\r
                LED_B_OFF();\r
                LED_C_OFF();\r
                LED_A_ON();\r
                LED_B_OFF();\r
                LED_C_OFF();\r

+               iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);\r

        \r
                clear_trace();\r
                set_tracing(TRUE);\r
        \r
                clear_trace();\r
                set_tracing(TRUE);\r

-               iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);\r

        }\r
 \r
        while (true) {\r
        }\r
 \r
        while (true) {\r


@@ -1249,10 +1253,11 @@ void MifareCollectNonces(uint32_t arg0, uint32_t arg1){
        LED_A_ON();\r
        LED_B_OFF();\r
        LED_C_OFF();\r
        LED_A_ON();\r
        LED_B_OFF();\r
        LED_C_OFF();\r

-\r
+       \r
+iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);\r

        clear_trace();\r
        set_tracing(TRUE);\r
        clear_trace();\r
        set_tracing(TRUE);\r

-       iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);\r
+       \r

        \r
        for (int i = 0; i < iterations; i++) {\r
                                                \r
        \r
        for (int i = 0; i < iterations; i++) {\r
                                                \r


@@ -1308,8 +1313,8 @@ void Mifare_DES_Auth1(uint8_t arg0, uint8_t *datain){
        uint8_t uid[10] = {0x00};\r
        uint32_t cuid = 0x00;\r
     \r
        uint8_t uid[10] = {0x00};\r
        uint32_t cuid = 0x00;\r
     \r

-       clear_trace();\r

        iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);\r
        iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);\r

+       clear_trace();\r

 \r
        int len = iso14443a_select_card(uid, NULL, &cuid);\r
        if(!len) {\r
 \r
        int len = iso14443a_select_card(uid, NULL, &cuid);\r
        if(!len) {\r

diff --git a/armsrc/mifaredesfire.c b/armsrc/mifaredesfire.c
index fb48647762b62035147fa71153651cc7c769be5e..9ab9b66bea1750fce2ecaaf16f98c70470d06004 100644 (file)
--- a/armsrc/mifaredesfire.c
+++ b/armsrc/mifaredesfire.c
@@ -19,13 +19,12 @@ static  uint8_t deselect_cmd[] = {0xc2,0xe0,0xb4};
 //static uint8_t __res[MAX_FRAME_SIZE];
 
 bool InitDesfireCard(){
 //static uint8_t __res[MAX_FRAME_SIZE];
 
 bool InitDesfireCard(){

-       
-       byte_t cardbuf[USB_CMD_DATA_SIZE] = {0x00};

 
 

-       iso14a_card_select_t *card = (iso14a_card_select_t*)cardbuf;
-       
-       set_tracing(TRUE);

        iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);
        iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);

+       set_tracing(TRUE);
+
+       byte_t cardbuf[USB_CMD_DATA_SIZE] = {0x00};
+       iso14a_card_select_t *card = (iso14a_card_select_t*)cardbuf;

        
        int len = iso14443a_select_card(NULL,card,NULL);
 
        
        int len = iso14443a_select_card(NULL,card,NULL);
 

diff --git a/armsrc/optimized_cipher.c b/armsrc/optimized_cipher.c
index 2356262114da1123395e534fab0e30da579743b9..bfaf5088fa4ae7cba28e2cc58a489c81b16c3180 100644 (file)
--- a/armsrc/optimized_cipher.c
+++ b/armsrc/optimized_cipher.c
@@ -65,7 +65,6 @@
 #include <string.h>
 #include <stdbool.h>
 #include <stdint.h>
 #include <string.h>
 #include <stdbool.h>
 #include <stdint.h>

-#include <time.h>

 
 
 #define opt_T(s) (0x1 & ((s->t >> 15) ^ (s->t >> 14)^ (s->t >> 10)^ (s->t >> 8)^ (s->t >> 5)^ (s->t >> 4)^ (s->t >> 1)^ s->t))
 
 
 #define opt_T(s) (0x1 & ((s->t >> 15) ^ (s->t >> 14)^ (s->t >> 10)^ (s->t >> 8)^ (s->t >> 5)^ (s->t >> 4)^ (s->t >> 1)^ s->t))