ADD: T55XX_WRITE_TIMEOUT to make sure all WaitForResponseTimeout for t55xx behaves...

[proxmark3-svn] / armsrc / legicrf.c

diff --git a/armsrc/legicrf.c b/armsrc/legicrf.c
index e8a2e1aab0616f2b9dcb485ebefa85f4a6025fd7..f58cb44267f82cda314c7194628af02173eeabf9 100644 (file)
--- a/armsrc/legicrf.c
+++ b/armsrc/legicrf.c
@@ -1,5 +1,6 @@
 //-----------------------------------------------------------------------------
 // (c) 2009 Henryk Plötz <henryk@ploetzli.ch>
 //-----------------------------------------------------------------------------
 // (c) 2009 Henryk Plötz <henryk@ploetzli.ch>

+//     2016 Iceman

 //
 // 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
 //
 // 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


@@ -10,7 +11,7 @@
 #include "legicrf.h"
 
 static struct legic_frame {
 #include "legicrf.h"
 
 static struct legic_frame {

-       int bits;
+       uint8_t bits;

        uint32_t data;
 } current_frame;
 
        uint32_t data;
 } current_frame;
 


@@ -68,15 +69,11 @@ static void setup_timer(void) {
 */
 
 // At TIMER_CLOCK3 (MCK/32)
 */
 
 // At TIMER_CLOCK3 (MCK/32)

-//#define RWD_TIME_1 150     /* RWD_TIME_PAUSE off, 80us on = 100us */
-//#define RWD_TIME_0 90      /* RWD_TIME_PAUSE off, 40us on = 60us */
-//#define RWD_TIME_PAUSE 30  /* 20us */
-
-// testing calculating in (us) microseconds.
+// testing calculating in ticks. 1.5ticks = 1us 

 #define        RWD_TIME_1 120          // READER_TIME_PAUSE 20us off, 80us on = 100us  80 * 1.5 == 120ticks
 #define RWD_TIME_0 60          // READER_TIME_PAUSE 20us off, 40us on = 60us   40 * 1.5 == 60ticks 
 #define RWD_TIME_PAUSE 30      // 20us == 20 * 1.5 == 30ticks */
 #define        RWD_TIME_1 120          // READER_TIME_PAUSE 20us off, 80us on = 100us  80 * 1.5 == 120ticks
 #define RWD_TIME_0 60          // READER_TIME_PAUSE 20us off, 40us on = 60us   40 * 1.5 == 60ticks 
 #define RWD_TIME_PAUSE 30      // 20us == 20 * 1.5 == 30ticks */

-#define TAG_BIT_PERIOD 150     // 100us == 100 * 1.5 == 150ticks
+#define TAG_BIT_PERIOD 142     // 100us == 100 * 1.5 == 150ticks

 #define TAG_FRAME_WAIT 495  // 330us from READER frame end to TAG frame start. 330 * 1.5 == 495
 
 #define RWD_TIME_FUZZ 20   // rather generous 13us, since the peak detector + hysteresis fuzz quite a bit
 #define TAG_FRAME_WAIT 495  // 330us from READER frame end to TAG frame start. 330 * 1.5 == 495
 
 #define RWD_TIME_FUZZ 20   // rather generous 13us, since the peak detector + hysteresis fuzz quite a bit


@@ -89,27 +86,26 @@ static void setup_timer(void) {
 #define FUZZ_EQUAL(value, target, fuzz) ((value) > ((target)-(fuzz)) && (value) < ((target)+(fuzz)))
 
 #ifndef SHORT_COIL
 #define FUZZ_EQUAL(value, target, fuzz) ((value) > ((target)-(fuzz)) && (value) < ((target)+(fuzz)))
 
 #ifndef SHORT_COIL

-//#define LOW(x)        AT91C_BASE_PIOA->PIO_CODR = (x)
-# define SHORT_COIL    LOW(GPIO_SSC_DOUT);
+# define SHORT_COIL     LOW(GPIO_SSC_DOUT);

 #endif
 #ifndef OPEN_COIL
 #endif
 #ifndef OPEN_COIL

-//#define HIGH(x)       AT91C_BASE_PIOA->PIO_SODR = (x)

 # define OPEN_COIL     HIGH(GPIO_SSC_DOUT);
 #endif
 # define OPEN_COIL     HIGH(GPIO_SSC_DOUT);
 #endif

-
-uint32_t sendFrameStop = 0;
-
+#ifndef LINE_IN
+# define LINE_IN  AT91C_BASE_PIOA->PIO_PER = GPIO_SSC_DIN;
+#endif

 // Pause pulse,  off in 20us / 30ticks,
 // ONE / ZERO bit pulse,  
 //    one == 80us / 120ticks
 //    zero == 40us / 60ticks
 #ifndef COIL_PULSE
 // Pause pulse,  off in 20us / 30ticks,
 // ONE / ZERO bit pulse,  
 //    one == 80us / 120ticks
 //    zero == 40us / 60ticks
 #ifndef COIL_PULSE

-# define COIL_PULSE(x)  { \
+# define COIL_PULSE(x) \
+       do { \

                SHORT_COIL; \
                SHORT_COIL; \

-               WaitTicks(RWD_TIME_PAUSE); \
+               WaitTicks( (RWD_TIME_PAUSE) ); \

                OPEN_COIL; \
                WaitTicks((x)); \
                OPEN_COIL; \
                WaitTicks((x)); \

-       }
+       } while (0); 

 #endif
 
 // ToDo: define a meaningful maximum size for auth_table. The bigger this is, the lower will be the available memory for traces. 
 #endif
 
 // ToDo: define a meaningful maximum size for auth_table. The bigger this is, the lower will be the available memory for traces. 


@@ -117,7 +113,7 @@ uint32_t sendFrameStop = 0;
 #define LEGIC_CARD_MEMSIZE 1024
 static uint8_t* cardmem;
 
 #define LEGIC_CARD_MEMSIZE 1024
 static uint8_t* cardmem;
 

-static void frame_append_bit(struct legic_frame * const f, int bit) {
+static void frame_append_bit(struct legic_frame * const f, uint8_t bit) {

        // Overflow, won't happen
    if (f->bits >= 31) return;
   
        // Overflow, won't happen
    if (f->bits >= 31) return;
   


@@ -147,14 +143,13 @@ static void frame_clean(struct legic_frame * const f) {
 
 /* Generate Keystream */
 uint32_t get_key_stream(int skip, int count) {
 
 /* Generate Keystream */
 uint32_t get_key_stream(int skip, int count) {

-       uint32_t key = 0;
+

        int i;
 
        // Use int to enlarge timer tc to 32bit
        legic_prng_bc += prng_timer->TC_CV;
 
        // reset the prng timer.
        int i;
 
        // Use int to enlarge timer tc to 32bit
        legic_prng_bc += prng_timer->TC_CV;
 
        // reset the prng timer.

-       ResetTimer(prng_timer);

 
        /* If skip == -1, forward prng time based */
        if(skip == -1) {
 
        /* If skip == -1, forward prng time based */
        if(skip == -1) {


@@ -168,55 +163,37 @@ uint32_t get_key_stream(int skip, int count) {
 
        i = (count == 6) ? -1 : legic_read_count;
 
 
        i = (count == 6) ? -1 : legic_read_count;
 

-       /* Write Time Data into LOG */
-       // uint8_t *BigBuf = BigBuf_get_addr();
-       // BigBuf[OFFSET_LOG+128+i] = legic_prng_count();
-       // BigBuf[OFFSET_LOG+256+i*4]   = (legic_prng_bc >> 0) & 0xff;
-       // BigBuf[OFFSET_LOG+256+i*4+1] = (legic_prng_bc >> 8) & 0xff;
-       // BigBuf[OFFSET_LOG+256+i*4+2] = (legic_prng_bc >>16) & 0xff;
-       // BigBuf[OFFSET_LOG+256+i*4+3] = (legic_prng_bc >>24) & 0xff;
-       // BigBuf[OFFSET_LOG+384+i] = count;
-

        /* Generate KeyStream */
        /* Generate KeyStream */

-       for(i=0; i<count; i++) {
-               key |= legic_prng_get_bit() << i;
-               legic_prng_forward(1);
-       }
-       return key;
+       return legic_prng_get_bits(count);

 }
 
 /* Send a frame in tag mode, the FPGA must have been set up by
  * LegicRfSimulate
  */
 }
 
 /* Send a frame in tag mode, the FPGA must have been set up by
  * LegicRfSimulate
  */

-void frame_send_tag(uint16_t response, uint8_t bits, uint8_t crypt) {
+void frame_send_tag(uint16_t response, uint8_t bits) {
+
+       uint16_t mask = 1;
+       

        /* Bitbang the response */
        /* Bitbang the response */

-       LOW(GPIO_SSC_DOUT);
+       SHORT_COIL;

        AT91C_BASE_PIOA->PIO_OER = GPIO_SSC_DOUT;
        AT91C_BASE_PIOA->PIO_PER = GPIO_SSC_DOUT;
 
        AT91C_BASE_PIOA->PIO_OER = GPIO_SSC_DOUT;
        AT91C_BASE_PIOA->PIO_PER = GPIO_SSC_DOUT;
 

-       /* Use time to crypt frame */
-       if(crypt) {
-               legic_prng_forward(2); /* TAG_FRAME_WAIT -> shift by 2 */
-               response ^= legic_prng_get_bits(bits);
-       }
+        /* TAG_FRAME_WAIT -> shift by 2 */
+       legic_prng_forward(3);
+       response ^= legic_prng_get_bits(bits);

 
        /* Wait for the frame start */
 
        /* Wait for the frame start */

-       WaitUS( TAG_FRAME_WAIT );
-
-       uint8_t bit = 0;
-       for(int i = 0; i < bits; i++) {
-
-               bit = response & 1;
-               response >>= 1;
+       WaitTicks( TAG_FRAME_WAIT );

 
 

-               if (bit)
-                       HIGH(GPIO_SSC_DOUT);
+       for (; mask < BITMASK(bits); mask <<= 1) {      
+               if (response & mask)
+                       OPEN_COIL

                else
                else

-                       LOW(GPIO_SSC_DOUT);
-                 
-               WaitUS(100);
+                       SHORT_COIL
+               WaitTicks(TAG_BIT_PERIOD);

    }
    }

-   LOW(GPIO_SSC_DOUT);
+   SHORT_COIL;

 }
 
 /* Send a frame in reader mode, the FPGA must have been set up by
 }
 
 /* Send a frame in reader mode, the FPGA must have been set up by


@@ -224,33 +201,24 @@ void frame_send_tag(uint16_t response, uint8_t bits, uint8_t crypt) {
  */
 void frame_sendAsReader(uint32_t data, uint8_t bits){
 
  */
 void frame_sendAsReader(uint32_t data, uint8_t bits){
 

-       uint32_t starttime = GET_TICKS, send = 0;
-       uint16_t mask = 1;
-       uint8_t prng1 = legic_prng_count() ;
+       uint32_t starttime = GET_TICKS, send = 0, mask = 1;

        
        // xor lsfr onto data.
        send = data ^ legic_prng_get_bits(bits);
                                
        for (; mask < BITMASK(bits); mask <<= 1) {      
        
        // xor lsfr onto data.
        send = data ^ legic_prng_get_bits(bits);
                                
        for (; mask < BITMASK(bits); mask <<= 1) {      

-               if (send & mask) {
-                       COIL_PULSE(RWD_TIME_1);
-               } else {
-                       COIL_PULSE(RWD_TIME_0);
-               }
+               if (send & mask)
+                       COIL_PULSE(RWD_TIME_1)
+               else
+                       COIL_PULSE(RWD_TIME_0)

        }
 
        // Final pause to mark the end of the frame
        COIL_PULSE(0);
        
        }
 
        // Final pause to mark the end of the frame
        COIL_PULSE(0);
        

-       sendFrameStop = GET_TICKS;
-       uint8_t cmdbytes[] = {
-               BYTEx(data, 0), 
-               BYTEx(data, 1),
-               bits,
-               prng1,
-               legic_prng_count()
-       };
-       LogTrace(cmdbytes, sizeof(cmdbytes), starttime, sendFrameStop, NULL, TRUE);
+       // log
+       uint8_t cmdbytes[] = {bits, BYTEx(data,0), BYTEx(data,1), BYTEx(data,2), BYTEx(send,0), BYTEx(send,1), BYTEx(send,2)};
+       LogTrace(cmdbytes, sizeof(cmdbytes), starttime, GET_TICKS, NULL, TRUE);

 }
 
 /* Receive a frame from the card in reader emulation mode, the FPGA and
 }
 
 /* Receive a frame from the card in reader emulation mode, the FPGA and


@@ -276,35 +244,26 @@ void frame_sendAsReader(uint32_t data, uint8_t bits){
  */
 static void frame_receiveAsReader(struct legic_frame * const f, uint8_t bits) {
 
  */
 static void frame_receiveAsReader(struct legic_frame * const f, uint8_t bits) {
 

-       frame_clean(f);

        if ( bits > 32 ) return;
        
        uint8_t i = bits, edges = 0;    
        if ( bits > 32 ) return;
        
        uint8_t i = bits, edges = 0;    

-       uint16_t lsfr = 0;
-       uint32_t the_bit = 1, next_bit_at = 0, data;
-       int old_level = 0, level = 0;
-
-       AT91C_BASE_PIOA->PIO_ODR = GPIO_SSC_DIN;
-       AT91C_BASE_PIOA->PIO_PER = GPIO_SSC_DIN;
+       uint32_t the_bit = 1, next_bit_at = 0, data = 0;
+       uint32_t old_level = 0;
+       volatile uint32_t level = 0;

        
        

-       // calibrate the prng.  
-       legic_prng_forward(2);
+       frame_clean(f);

        
        

-       // precompute the cipher
-       uint8_t prng_before =  legic_prng_count() ;
-
-       lsfr = legic_prng_get_bits(bits);
-
-       data = lsfr;
+       // calibrate the prng.
+       legic_prng_forward(2);
+       data = legic_prng_get_bits(bits);

        
        //FIXED time between sending frame and now listening frame. 330us
        
        //FIXED time between sending frame and now listening frame. 330us

-       //WaitTicks( GET_TICKS - sendFrameStop - TAG_FRAME_WAIT);
-       WaitTicks( 490 );
-

        uint32_t starttime = GET_TICKS;
        uint32_t starttime = GET_TICKS;

-       
-       next_bit_at =  GET_TICKS + TAG_BIT_PERIOD;
-       
+       // its about 9+9 ticks delay from end-send to here.
+       WaitTicks( 477 );
+
+       next_bit_at = GET_TICKS + TAG_BIT_PERIOD;
+

        while ( i-- ){
                edges = 0;
                while  ( GET_TICKS < next_bit_at) {
        while ( i-- ){
                edges = 0;
                while  ( GET_TICKS < next_bit_at) {


@@ -315,11 +274,12 @@ static void frame_receiveAsReader(struct legic_frame * const f, uint8_t bits) {
                                ++edges;
                        
                        old_level = level;
                                ++edges;
                        
                        old_level = level;

-               }
+               }               
+

                next_bit_at += TAG_BIT_PERIOD;
                
                next_bit_at += TAG_BIT_PERIOD;
                

-               // We expect 42 edges  == ONE
-               if(edges > 30 && edges < 64)
+               // We expect 42 edges (ONE)
+               if ( edges > 20 )

                        data ^= the_bit;
 
                the_bit <<= 1;  
                        data ^= the_bit;
 
                the_bit <<= 1;  


@@ -328,47 +288,35 @@ static void frame_receiveAsReader(struct legic_frame * const f, uint8_t bits) {
        // output
        f->data = data;
        f->bits = bits;
        // output
        f->data = data;
        f->bits = bits;

-               
-       // log
-       sendFrameStop = GET_TICKS;

        
        

-       uint8_t cmdbytes[] = { 
-               BYTEx(data,0),
-               BYTEx(data,1),
-               bits,
-               BYTEx(lsfr,0),
-               BYTEx(lsfr,1),
-               BYTEx(data, 0) ^ BYTEx(lsfr,0),
-               BYTEx(data, 1) ^ BYTEx(lsfr,1),
-               prng_before,
-               legic_prng_count()
-       };
-       LogTrace(cmdbytes, sizeof(cmdbytes), starttime, sendFrameStop, NULL, FALSE);
+       // log
+       uint8_t cmdbytes[] = {bits,     BYTEx(data, 0), BYTEx(data, 1)};
+       LogTrace(cmdbytes, sizeof(cmdbytes), starttime, GET_TICKS, NULL, FALSE);

 }
 
 // Setup pm3 as a Legic Reader
 static uint32_t setup_phase_reader(uint8_t iv) {
        
 }
 
 // Setup pm3 as a Legic Reader
 static uint32_t setup_phase_reader(uint8_t iv) {
        

-       // Switch on carrier and let the tag charge for 1ms
+       // Switch on carrier and let the tag charge for 5ms

        HIGH(GPIO_SSC_DOUT);
        HIGH(GPIO_SSC_DOUT);

-       WaitUS(300);    
+       WaitUS(5000);

        
        ResetTicks();
        
        
        ResetTicks();
        

-       // no keystream yet

        legic_prng_init(0);
        
        // send IV handshake
        frame_sendAsReader(iv, 7);
 
        legic_prng_init(0);
        
        // send IV handshake
        frame_sendAsReader(iv, 7);
 

-       // Now both tag and reader has same IV. Prng can start.
+       // tag and reader has same IV.

        legic_prng_init(iv);
 
        frame_receiveAsReader(&current_frame, 6);
 
        legic_prng_init(iv);
 
        frame_receiveAsReader(&current_frame, 6);
 

-       // fixed delay before sending ack.
-       WaitTicks(387);  // 244us
-       legic_prng_forward(3);  //240us / 100 == 2.4 iterations
+       // 292us (438t) - fixed delay before sending ack.
+       // minus log and stuff 100tick?
+       WaitTicks(338);
+       legic_prng_forward(3); 

        
        // Send obsfuscated acknowledgment frame.
        // 0x19 = 0x18 MIM22, 0x01 LSB READCMD 
        
        // Send obsfuscated acknowledgment frame.
        // 0x19 = 0x18 MIM22, 0x01 LSB READCMD 


@@ -379,23 +327,27 @@ static uint32_t setup_phase_reader(uint8_t iv) {
                case 0x3D: frame_sendAsReader(0x39, 6); break;
                default: break;
        }
                case 0x3D: frame_sendAsReader(0x39, 6); break;
                default: break;
        }

+
+       legic_prng_forward(2);

        return current_frame.data;
 }
 
        return current_frame.data;
 }
 

-static void LegicCommonInit(void) {
+void LegicCommonInit(bool clear_mem) {

 
        FpgaDownloadAndGo(FPGA_BITSTREAM_HF);
        FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_READER_TX);
        SetAdcMuxFor(GPIO_MUXSEL_HIPKD);
 
        /* Bitbang the transmitter */
 
        FpgaDownloadAndGo(FPGA_BITSTREAM_HF);
        FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_READER_TX);
        SetAdcMuxFor(GPIO_MUXSEL_HIPKD);
 
        /* Bitbang the transmitter */

-       LOW(GPIO_SSC_DOUT);
+       SHORT_COIL;

        AT91C_BASE_PIOA->PIO_OER = GPIO_SSC_DOUT;
        AT91C_BASE_PIOA->PIO_PER = GPIO_SSC_DOUT;
        AT91C_BASE_PIOA->PIO_OER = GPIO_SSC_DOUT;
        AT91C_BASE_PIOA->PIO_PER = GPIO_SSC_DOUT;

-
+       AT91C_BASE_PIOA->PIO_ODR = GPIO_SSC_DIN;
+       

        // reserve a cardmem,  meaning we can use the tracelog function in bigbuff easier.
        // reserve a cardmem,  meaning we can use the tracelog function in bigbuff easier.

-       cardmem = BigBuf_malloc(LEGIC_CARD_MEMSIZE);
-       memset(cardmem, 0x00, LEGIC_CARD_MEMSIZE);
+       cardmem = BigBuf_get_EM_addr();
+       if ( clear_mem )
+               memset(cardmem, 0x00, LEGIC_CARD_MEMSIZE);

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


@@ -406,52 +358,42 @@ static void LegicCommonInit(void) {
 
 // Switch off carrier, make sure tag is reset
 static void switch_off_tag_rwd(void) {
 
 // Switch off carrier, make sure tag is reset
 static void switch_off_tag_rwd(void) {

-       LOW(GPIO_SSC_DOUT);
-       WaitUS(200);
+       SHORT_COIL;
+       WaitUS(20);

        WDT_HIT();
        WDT_HIT();

-       Dbprintf("Exit Switch_off_tag_rwd");

 }
 
 // calculate crc4 for a legic READ command 
 }
 
 // calculate crc4 for a legic READ command 

-// 5,8,10 address size.
-static uint32_t legic4Crc(uint8_t legicCmd, uint16_t byte_index, uint8_t value, uint8_t cmd_sz) {
+static uint32_t legic4Crc(uint8_t cmd, uint16_t byte_index, uint8_t value, uint8_t cmd_sz) {

        crc_clear(&legic_crc);  
        crc_clear(&legic_crc);  

-       //uint32_t temp =  (value << cmd_sz) | (byte_index << 1) | legicCmd;
-       //crc_update(&legic_crc, temp, cmd_sz + 8 );
-       crc_update(&legic_crc, 1, 1); /* CMD_READ */
-       crc_update(&legic_crc, byte_index, cmd_sz-1);
-       crc_update(&legic_crc, value, 8);
+       uint32_t temp =  (value << cmd_sz) | (byte_index << 1) | cmd;
+       crc_update(&legic_crc, temp, cmd_sz + 8 );

        return crc_finish(&legic_crc);
 }
 
        return crc_finish(&legic_crc);
 }
 

-int legic_read_byte(int byte_index, int cmd_sz) {
-
-       // (us)| ticks
-       // -------------
-       // 330 | 495
-       // 460 | 690
-       // 258 | 387
-       // 244 | 366
-       WaitTicks(332); 
-       legic_prng_forward(2); // 460 / 100 = 4.6  iterations
-
-       uint8_t byte = 0, crc = 0, calcCrc = 0;
-       uint32_t cmd = (byte_index << 1) | LEGIC_READ;
+int legic_read_byte( uint16_t index, uint8_t cmd_sz) {

 
 

+       uint8_t byte, crc, calcCrc = 0;
+       uint32_t cmd = (index << 1) | LEGIC_READ;
+       
+       // 90ticks = 60us (should be 100us but crc calc takes time.)
+       //WaitTicks(330); // 330ticks prng(4) - works
+       WaitTicks(240); // 240ticks prng(3) - works
+       

        frame_sendAsReader(cmd, cmd_sz);
        frame_receiveAsReader(&current_frame, 12);
 
        frame_sendAsReader(cmd, cmd_sz);
        frame_receiveAsReader(&current_frame, 12);
 

+       // CRC check. 

        byte = BYTEx(current_frame.data, 0);
        byte = BYTEx(current_frame.data, 0);

-       calcCrc = legic4Crc(LEGIC_READ, byte_index, byte, cmd_sz);

        crc = BYTEx(current_frame.data, 1);
        crc = BYTEx(current_frame.data, 1);

+       calcCrc = legic4Crc(LEGIC_READ, index, byte, cmd_sz);

 
        if( calcCrc != crc ) {
 
        if( calcCrc != crc ) {

-               Dbprintf("!!! crc mismatch: expected %x but got %x !!!",  calcCrc, crc);
+               Dbprintf("!!! crc mismatch: %x != %x !!!",  calcCrc, crc);

                return -1;
        }
 
                return -1;
        }
 

-
-//     legic_prng_forward(2); // 460 / 100 = 4.6  iterations
+       legic_prng_forward(3);

        return byte;
 }
 
        return byte;
 }
 


@@ -460,316 +402,248 @@ int legic_read_byte(int byte_index, int cmd_sz) {
  * - wait until the tag sends back an ACK ('1' bit unencrypted)
  * - forward the prng based on the timing
  */
  * - wait until the tag sends back an ACK ('1' bit unencrypted)
  * - forward the prng based on the timing
  */

-//int legic_write_byte(int byte, int addr, int addr_sz, int PrngCorrection) {
-int legic_write_byte(uint8_t byte, uint16_t addr, uint8_t addr_sz) {
-
-    //do not write UID, CRC at offset 0-4.
-       if (addr <= 4) return 0;
-
-       // crc
-       crc_clear(&legic_crc);
-       crc_update(&legic_crc, 0, 1); /* CMD_WRITE */
-       crc_update(&legic_crc, addr, addr_sz);
-       crc_update(&legic_crc, byte, 8);
-       uint32_t crc = crc_finish(&legic_crc);
-
-       uint32_t crc2 = legic4Crc(LEGIC_WRITE, addr, byte, addr_sz+1);
-       if ( crc != crc2 ) 
-               Dbprintf("crc is missmatch");
-       
+bool legic_write_byte(uint16_t index, uint8_t byte, uint8_t addr_sz) {
+
+       bool isOK = false;
+       int8_t i = 40;
+       uint8_t edges = 0;
+       uint8_t cmd_sz = addr_sz+1+8+4; //crc+data+cmd;
+       uint32_t steps = 0, next_bit_at, start, crc, old_level = 0;
+
+       crc = legic4Crc(LEGIC_WRITE, index, byte, addr_sz+1);
+

        // send write command
        // send write command

-       uint32_t cmd = ((crc     <<(addr_sz+1+8)) //CRC
-                   |(byte    <<(addr_sz+1))   //Data
-                   |(addr    <<1)             //Address
-                   | LEGIC_WRITE);             //CMD = Write
-                                  
-    uint32_t cmd_sz = addr_sz+1+8+4;          //crc+data+cmd
-
-    legic_prng_forward(2); /* we wait anyways */
+       uint32_t cmd = LEGIC_WRITE;
+       cmd |= index << 1;                        // index
+       cmd |= byte  << (addr_sz+1);  // Data   
+       cmd     |= (crc & 0xF ) << (addr_sz+1+8);       // CRC

        
        

-       WaitUS(TAG_FRAME_WAIT);
+       WaitTicks(240);

        
        frame_sendAsReader(cmd, cmd_sz);
        
        frame_sendAsReader(cmd, cmd_sz);

-  
-       // wllm-rbnt doesnt have these
-       AT91C_BASE_PIOA->PIO_ODR = GPIO_SSC_DIN;
-       AT91C_BASE_PIOA->PIO_PER = GPIO_SSC_DIN;
-
-       // wait for ack
-    int t, old_level = 0, edges = 0;
-    int next_bit_at = 0;
+       
+       LINE_IN;

 
 

-       WaitUS(TAG_FRAME_WAIT);
+       start = GET_TICKS;

 
 

-    for( t = 0; t < 80; ++t) {
+       // ACK,  - one single "1" bit after 3.6ms
+       // 3.6ms = 3600us * 1.5 = 5400ticks.
+       WaitTicks(5400);
+       
+       next_bit_at = GET_TICKS + TAG_BIT_PERIOD;
+       
+    while ( i-- ) {
+               WDT_HIT();

         edges = 0;
         edges = 0;

-               next_bit_at += TAG_BIT_PERIOD;
-        while(timer->TC_CV < next_bit_at) {
-            int level = (AT91C_BASE_PIOA->PIO_PDSR & GPIO_SSC_DIN);
-            if(level != old_level)
-                edges++;
+        while ( GET_TICKS < next_bit_at) {
+                       
+            volatile uint32_t level = (AT91C_BASE_PIOA->PIO_PDSR & GPIO_SSC_DIN);
+            
+                       if (level != old_level)
+                ++edges;

 
             old_level = level;
         }
 
             old_level = level;
         }

-        if(edges > 20 && edges < 60) { /* expected are 42 edges */
-                       int t = timer->TC_CV;
-                       int c = t / TAG_BIT_PERIOD;
-                       
-                       ResetTimer(timer);
-                       legic_prng_forward(c);
-               return 0;
+               
+               next_bit_at += TAG_BIT_PERIOD;
+               
+               // We expect 42 edges (ONE)
+        if(edges > 20 ) {
+                       steps = ( (GET_TICKS - start) / TAG_BIT_PERIOD);                        
+                       legic_prng_forward(steps);
+               isOK = true;
+                       goto OUT;

         }
     }
         }
     }

-
-       ResetTimer(timer);
-       return -1;
+               
+OUT: ;
+       legic_prng_forward(1);
+       
+       uint8_t cmdbytes[] = {1, isOK, BYTEx(steps, 0), BYTEx(steps, 1) };
+       LogTrace(cmdbytes, sizeof(cmdbytes), start, GET_TICKS, NULL, FALSE);
+       return isOK;

 }
 
 }
 

-int LegicRfReader(int offset, int bytes, int iv) {
+int LegicRfReader(uint16_t offset, uint16_t len, uint8_t iv) {

        
        

-       uint16_t byte_index = 0;
-       uint8_t cmd_sz = 0;
-       int card_sz = 0;                                                                   
+       uint16_t i = 0;

        uint8_t isOK = 1;
        uint8_t isOK = 1;

+       legic_card_select_t card;

        
        

-       if ( MF_DBGLEVEL >= 2)
-               Dbprintf("setting up legic card,  IV = 0x%02x", iv);
+       LegicCommonInit(TRUE);

        
        

-       LegicCommonInit();
-
-       uint32_t tag_type = setup_phase_reader(iv);
-
-        //we lose to mutch time with dprintf
-       switch_off_tag_rwd();
-       
-       switch(tag_type) {
-               case 0x0d:
-                       if ( MF_DBGLEVEL >= 2) DbpString("MIM22 card found, reading card");
-            cmd_sz = 6;
-                       card_sz = 22;
-                       break;
-               case 0x1d:
-                       if ( MF_DBGLEVEL >= 2) DbpString("MIM256 card found, reading card");
-            cmd_sz = 9;
-                       card_sz = 256;
-                       break;
-               case 0x3d:
-                       if ( MF_DBGLEVEL >= 2) DbpString("MIM1024 card found, reading card");
-            cmd_sz = 11;
-                       card_sz = 1024;
-                       break;
-               default:
-                       if ( MF_DBGLEVEL >= 1) Dbprintf("Unknown card format: %x", tag_type);
-                       isOK = 0;
-                       goto OUT;
-                       break;
+       if ( legic_select_card_iv(&card, iv) ) {
+               isOK = 0;
+               goto OUT;

        }
        }

-       if (bytes == -1)
-               bytes = card_sz;

 
 

-       if (bytes + offset >= card_sz)
-               bytes = card_sz - offset;
+       if (len + offset > card.cardsize)
+               len = card.cardsize - offset;

 
 

-       // Start setup and read bytes.
-       setup_phase_reader(iv);
-       

        LED_B_ON();
        LED_B_ON();

-       while (byte_index < bytes) {
-               int r = legic_read_byte(byte_index + offset, cmd_sz);
+       while (i < len) {
+               int r = legic_read_byte(offset + i, card.cmdsize);

                
                if (r == -1 || BUTTON_PRESS()) {                        
                if ( MF_DBGLEVEL >= 2) DbpString("operation aborted");
                        isOK = 0;
                        goto OUT;
                }
                
                if (r == -1 || BUTTON_PRESS()) {                        
                if ( MF_DBGLEVEL >= 2) DbpString("operation aborted");
                        isOK = 0;
                        goto OUT;
                }

-               cardmem[++byte_index] = r;
-               //byte_index++;
+               cardmem[i++] = r;

         WDT_HIT();
        }
 
 OUT:   
         WDT_HIT();
        }
 
 OUT:   

+       WDT_HIT();

        switch_off_tag_rwd();
        LEDsoff();
        switch_off_tag_rwd();
        LEDsoff();

-       uint8_t len = (bytes & 0x3FF);
-       cmd_send(CMD_ACK,isOK,len,0,cardmem,len);
+       cmd_send(CMD_ACK, isOK, len, 0, cardmem, len);

     return 0;
 }
 
     return 0;
 }
 

-/*int _LegicRfWriter(int offset, int bytes, int addr_sz, uint8_t *BigBuf, int RoundBruteforceValue) {
-       int byte_index=0;
-
-    LED_B_ON();
-       setup_phase_reader(iv);
-    //legic_prng_forward(2);
-       while(byte_index < bytes) {
-               int r;
-
-               //check if the DCF should be changed
-               if ( (offset == 0x05) && (bytes == 0x02) ) {
-                       //write DCF in reverse order (addr 0x06 before 0x05)
-                       r = legic_write_byte(BigBuf[(0x06-byte_index)], (0x06-byte_index), addr_sz, RoundBruteforceValue);
-                       //legic_prng_forward(1);
-                       if(r == 0) {
-                               byte_index++;
-                               r = legic_write_byte(BigBuf[(0x06-byte_index)], (0x06-byte_index), addr_sz, RoundBruteforceValue);
-                       }
-                       //legic_prng_forward(1);
-               }
-               else {
-                       r = legic_write_byte(BigBuf[byte_index+offset], byte_index+offset, addr_sz, RoundBruteforceValue);
-               }
-               if((r != 0) || BUTTON_PRESS()) {
-                       Dbprintf("operation aborted @ 0x%03.3x", byte_index);
-       switch_off_tag_rwd();
-                       LED_B_OFF();
-                       LED_C_OFF();
-                       return -1;
-               }
+void LegicRfWriter(uint16_t offset, uint16_t len, uint8_t iv, uint8_t *data) {

 
 

-        WDT_HIT();
-               byte_index++;
-        if(byte_index & 0x10) LED_C_ON(); else LED_C_OFF();
+       #define LOWERLIMIT 4
+       uint8_t isOK = 1, msg = 0;
+       legic_card_select_t card;
+       
+       // uid NOT is writeable.
+       if ( offset <= LOWERLIMIT ) {
+               isOK = 0;
+               goto OUT;

        }
        }

-    LED_B_OFF();
-    LED_C_OFF();
-    DbpString("write successful");
-    return 0;
-}*/
-
-void LegicRfWriter(int offset, int bytes, int iv) {
-
-       int byte_index = 0, addr_sz = 0;                                                                  
-
-       LegicCommonInit();

        
        

-       if ( MF_DBGLEVEL >= 2)  DbpString("setting up legic card");
+       LegicCommonInit(TRUE);

        
        

-       uint32_t tag_type = setup_phase_reader(iv);
+       if ( legic_select_card_iv(&card, iv) ) {
+               isOK = 0;
+               msg = 1;
+               goto OUT;
+       }

        
        

+       if ( len + offset > card.cardsize)
+               len = card.cardsize - offset;
+
+    LED_B_ON();        
+       while( len > 0 ) {
+               --len;          
+               if ( !legic_write_byte( len + offset, data[len], card.addrsize) ) {
+                       Dbprintf("operation failed | %02X | %02X | %02X", len + offset, len, data[len] );
+                       isOK = 0;
+                       goto OUT;
+               }
+               WDT_HIT();
+       }
+OUT:
+       cmd_send(CMD_ACK, isOK, msg,0,0,0);

        switch_off_tag_rwd();
        switch_off_tag_rwd();

+       LEDsoff();      
+}
+
+int legic_select_card_iv(legic_card_select_t *p_card, uint8_t iv){
+
+       if ( p_card == NULL ) return 1;
+       
+       p_card->tagtype = setup_phase_reader(iv);

        
        

-       switch(tag_type) {
+       switch(p_card->tagtype) {

                case 0x0d:
                case 0x0d:

-                       if(offset+bytes > 22) {
-                               Dbprintf("Error: can not write to 0x%03.3x on MIM22", offset + bytes);
-                               return;
-                       }
-                       addr_sz = 5;
-                       if ( MF_DBGLEVEL >= 2) Dbprintf("MIM22 card found, writing 0x%02.2x - 0x%02.2x ...", offset, offset + bytes);
+            p_card->cmdsize = 6;
+                       p_card->addrsize = 5;
+                       p_card->cardsize = 22;

                        break;
                case 0x1d:
                        break;
                case 0x1d:

-                       if(offset+bytes > 0x100) {
-                               Dbprintf("Error: can not write to 0x%03.3x on MIM256", offset + bytes);
-                               return;
-                       }
-                       addr_sz = 8;
-                       if ( MF_DBGLEVEL >= 2) Dbprintf("MIM256 card found, writing 0x%02.2x - 0x%02.2x ...", offset, offset + bytes);
+                       p_card->cmdsize = 9;
+                       p_card->addrsize = 8;
+                       p_card->cardsize = 256;

                        break;
                case 0x3d:
                        break;
                case 0x3d:

-                       if(offset+bytes > 0x400) {
-                       Dbprintf("Error: can not write to 0x%03.3x on MIM1024", offset + bytes);
-                       return;
-               }
-                       addr_sz = 10;
-                       if ( MF_DBGLEVEL >= 2) Dbprintf("MIM1024 card found, writing 0x%03.3x - 0x%03.3x ...", offset, offset + bytes);
+            p_card->cmdsize = 11;
+                       p_card->addrsize = 10;
+                       p_card->cardsize = 1024;

                        break;
                        break;

-               default:
-                       Dbprintf("No or unknown card found, aborting");
-            return;
+               default: 
+                   p_card->cmdsize = 0;
+                       p_card->addrsize = 0;
+                       p_card->cardsize = 0;
+                       return 2;

        }
        }

+       return 0;
+}
+int legic_select_card(legic_card_select_t *p_card){
+       return legic_select_card_iv(p_card, 0x01);
+}

 
 

-    LED_B_ON();
-       setup_phase_reader(iv);
-       int r = 0;
-       while(byte_index < bytes) {
+//-----------------------------------------------------------------------------
+// Work with emulator memory
+// 
+// Note: we call FpgaDownloadAndGo(FPGA_BITSTREAM_HF) here although FPGA is not
+// involved in dealing with emulator memory. But if it is called later, it might
+// destroy the Emulator Memory.
+//-----------------------------------------------------------------------------
+// arg0 = offset
+// arg1 = num of bytes
+void LegicEMemSet(uint32_t arg0, uint32_t arg1, uint8_t *data) {
+       FpgaDownloadAndGo(FPGA_BITSTREAM_HF);
+       legic_emlset_mem(data, arg0, arg1);
+}
+// arg0 = offset
+// arg1 = num of bytes
+void LegicEMemGet(uint32_t arg0, uint32_t arg1) {
+       FpgaDownloadAndGo(FPGA_BITSTREAM_HF);
+       uint8_t buf[USB_CMD_DATA_SIZE] = {0x00};
+       legic_emlget_mem(buf, arg0, arg1);
+       LED_B_ON();
+       cmd_send(CMD_ACK, arg0, arg1, 0, buf, USB_CMD_DATA_SIZE);
+       LED_B_OFF();
+}
+void legic_emlset_mem(uint8_t *data, int offset, int numofbytes) {
+       cardmem = BigBuf_get_EM_addr();
+       memcpy(cardmem + offset, data, numofbytes);
+}
+void legic_emlget_mem(uint8_t *data, int offset, int numofbytes) {
+       cardmem = BigBuf_get_EM_addr();
+       memcpy(data, cardmem + offset, numofbytes);
+}

 
 

-               //check if the DCF should be changed
-               if ( ((byte_index+offset) == 0x05) && (bytes >= 0x02) ) {
-                       //write DCF in reverse order (addr 0x06 before 0x05)
-                       r = legic_write_byte(cardmem[(0x06-byte_index)], (0x06-byte_index), addr_sz);
+void LegicRfInfo(void){

 
 

-                       // write second byte on success...
-                       if(r == 0) {
-                               byte_index++;
-                               r = legic_write_byte(cardmem[(0x06-byte_index)], (0x06-byte_index), addr_sz);
-                       }
-               }
-               else {
-                       r = legic_write_byte(cardmem[byte_index+offset], byte_index+offset, addr_sz);
-               }
-               
-               if ((r != 0) || BUTTON_PRESS()) {
-                       Dbprintf("operation aborted @ 0x%03.3x", byte_index);
-                       switch_off_tag_rwd();
-                       LEDsoff();
-                       return;
-               }
+       int r;
+       
+       uint8_t buf[sizeof(legic_card_select_t)] = {0x00};
+       legic_card_select_t *card = (legic_card_select_t*) buf;
+       
+       LegicCommonInit(FALSE);

 
 

-        WDT_HIT();
-               byte_index++;
+       if ( legic_select_card(card) ) {
+               cmd_send(CMD_ACK,0,0,0,0,0);
+               goto OUT;

        }
        }

-       LEDsoff();
-    if ( MF_DBGLEVEL >= 1) DbpString("write successful");
-}

 
 

-void LegicRfRawWriter(int address, int byte, int iv) {
+       // read UID bytes
+       for ( uint8_t i = 0; i < sizeof(card->uid); ++i) {
+               r = legic_read_byte(i, card->cmdsize);
+               if ( r == -1 ) {
+                       cmd_send(CMD_ACK,0,0,0,0,0);
+                       goto OUT;
+               }
+               card->uid[i] = r & 0xFF;
+       }

 
 

-       int byte_index = 0, addr_sz = 0;
-       
-       LegicCommonInit();
-       
-       if ( MF_DBGLEVEL >= 2) DbpString("setting up legic card");
-       
-       uint32_t tag_type = setup_phase_reader(iv);
-       
-       switch_off_tag_rwd();
-       
-       switch(tag_type) {
-               case 0x0d:
-                       if(address > 22) {
-                               Dbprintf("Error: can not write to 0x%03.3x on MIM22", address);
-                               return;
-                       }
-                       addr_sz = 5;
-                       if ( MF_DBGLEVEL >= 2) Dbprintf("MIM22 card found, writing at addr 0x%02.2x - value 0x%02.2x ...", address, byte);
-                       break;
-               case 0x1d:
-                       if(address > 0x100) {
-                               Dbprintf("Error: can not write to 0x%03.3x on MIM256", address);
-                               return;
-                       }
-                       addr_sz = 8;
-                       if ( MF_DBGLEVEL >= 2) Dbprintf("MIM256 card found, writing at addr 0x%02.2x - value 0x%02.2x ...", address, byte);
-                       break;
-               case 0x3d:
-                       if(address > 0x400) {
-                       Dbprintf("Error: can not write to 0x%03.3x on MIM1024", address);
-                       return;
-               }
-                       addr_sz = 10;
-                       if ( MF_DBGLEVEL >= 2) Dbprintf("MIM1024 card found, writing at addr 0x%03.3x - value 0x%03.3x ...", address, byte);
-                       break;
-               default:
-                       Dbprintf("No or unknown card found, aborting");
-            return;
+       // MCC byte.
+       r = legic_read_byte(4, card->cmdsize);
+       uint32_t calc_mcc =  CRC8Legic(card->uid, 4);;
+       if ( r != calc_mcc) {
+               cmd_send(CMD_ACK,0,0,0,0,0);
+               goto OUT;

        }
        
        }
        

-       Dbprintf("integer value: %d address: %d  addr_sz: %d", byte, address, addr_sz);
-    LED_B_ON();
-       
-       setup_phase_reader(iv);
-               
-       int r = legic_write_byte(byte, address, addr_sz);
-               
-       if((r != 0) || BUTTON_PRESS()) {
-               Dbprintf("operation aborted @ 0x%03.3x (%1d)", byte_index, r);
-               switch_off_tag_rwd();
-               LEDsoff();
-               return;
-       }
+       // OK
+       cmd_send(CMD_ACK, 1, 0, 0, buf, sizeof(legic_card_select_t));

 
 

-    LEDsoff();
-    if ( MF_DBGLEVEL >= 1) DbpString("write successful");
+OUT:
+       switch_off_tag_rwd();
+       LEDsoff();

 }
 
 /* Handle (whether to respond) a frame in tag mode
 }
 
 /* Handle (whether to respond) a frame in tag mode


@@ -777,38 +651,50 @@ void LegicRfRawWriter(int address, int byte, int iv) {
  */
 static void frame_handle_tag(struct legic_frame const * const f)
 {
  */
 static void frame_handle_tag(struct legic_frame const * const f)
 {

-       uint8_t *BigBuf = BigBuf_get_addr();
+       // log
+       //uint8_t cmdbytes[] = {bits,   BYTEx(data, 0), BYTEx(data, 1)};
+       //LogTrace(cmdbytes, sizeof(cmdbytes), starttime, GET_TICKS, NULL, FALSE);
+       //Dbprintf("ICE: enter frame_handle_tag: %02x ", f->bits);
+               
+       /* First Part of Handshake (IV) */
+       if(f->bits == 7) {

 
 

-   /* First Part of Handshake (IV) */
-   if(f->bits == 7) {
+               LED_C_ON();

 
 

-        LED_C_ON();
-        

                // Reset prng timer
                // Reset prng timer

-               ResetTimer(prng_timer);
+               //ResetTimer(prng_timer);
+               ResetTicks();
+
+               // IV from reader.
+               legic_prng_init(f->data);

                
                

-        legic_prng_init(f->data);
-        frame_send_tag(0x3d, 6, 1); /* 0x3d^0x26 = 0x1B */
-        legic_state = STATE_IV;
-        legic_read_count = 0;
-        legic_prng_bc = 0;
-        legic_prng_iv = f->data;
- 
- 
-               ResetTimer(timer);
-               WaitUS(280);
-        return;
-   }
+               Dbprintf("ICE: IV: %02x ", f->data);
+               
+               // We should have three tagtypes with three different answers.
+               legic_prng_forward(2);
+               //frame_send_tag(0x3d, 6); /* MIM1024 0x3d^0x26 = 0x1B */
+               frame_send_tag(0x1d, 6); // MIM256
+               
+               legic_state = STATE_IV;
+               legic_read_count = 0;
+               legic_prng_bc = 0;
+               legic_prng_iv = f->data;
+
+               //ResetTimer(timer);
+               //WaitUS(280);
+               WaitTicks(388);
+               return;
+       }

 
    /* 0x19==??? */
    if(legic_state == STATE_IV) {
 
    /* 0x19==??? */
    if(legic_state == STATE_IV) {

-      int local_key = get_key_stream(3, 6);
+      uint32_t local_key = get_key_stream(3, 6);

       int xored = 0x39 ^ local_key;
       if((f->bits == 6) && (f->data == xored)) {
          legic_state = STATE_CON;
 
                 ResetTimer(timer);
       int xored = 0x39 ^ local_key;
       if((f->bits == 6) && (f->data == xored)) {
          legic_state = STATE_CON;
 
                 ResetTimer(timer);

-                WaitUS(200);
+                WaitTicks(300);

          return;
 
         } else {
          return;
 
         } else {


@@ -822,64 +708,53 @@ static void frame_handle_tag(struct legic_frame const * const f)
    /* Read */
    if(f->bits == 11) {
       if(legic_state == STATE_CON) {
    /* Read */
    if(f->bits == 11) {
       if(legic_state == STATE_CON) {

-         int key   = get_key_stream(2, 11); //legic_phase_drift, 11);
-         int addr  = f->data ^ key; addr = addr >> 1;
-         int data = BigBuf[addr];
-         int hash = legic4Crc(LEGIC_READ, addr, data, 11) << 8;
-         BigBuf[OFFSET_LOG+legic_read_count] = (uint8_t)addr;
-         legic_read_count++;
-
-         //Dbprintf("Data:%03.3x, key:%03.3x, addr: %03.3x, read_c:%u", f->data, key, addr, read_c);
-         legic_prng_forward(legic_reqresp_drift);
-
-         frame_send_tag(hash | data, 12, 1);
-
-                ResetTimer(timer);
+         uint32_t key = get_key_stream(2, 11); //legic_phase_drift, 11);
+         uint16_t addr = f->data ^ key; 
+                addr >>= 1;
+         uint8_t data = cardmem[addr];
+                
+         uint32_t crc = legic4Crc(LEGIC_READ, addr, data, 11) << 8;
+
+         //legic_read_count++;
+         //legic_prng_forward(legic_reqresp_drift);
+
+         frame_send_tag(crc | data, 12);
+                //ResetTimer(timer);

          legic_prng_forward(2);
          legic_prng_forward(2);

-                WaitUS(180);
+                WaitTicks(330);

          return;
       }
    }
 
    /* Write */
          return;
       }
    }
 
    /* Write */

-   if(f->bits == 23) {
-      int key   = get_key_stream(-1, 23); //legic_frame_drift, 23);
-      int addr  = f->data ^ key; addr = addr >> 1; addr = addr & 0x3ff;
-      int data  = f->data ^ key; data = data >> 11; data = data & 0xff;
-
+   if (f->bits == 23 || f->bits == 21 ) {
+      uint32_t key  = get_key_stream(-1, 23); //legic_frame_drift, 23);
+      uint16_t addr = f->data ^ key; 
+         addr >>= 1; 
+         addr &= 0x3ff;
+      uint32_t data = f->data ^ key; 
+         data >>= 11; 
+         data &= 0xff;
+
+         cardmem[addr] = data;

       /* write command */
       legic_state = STATE_DISCON;
       LED_C_OFF();
       Dbprintf("write - addr: %x, data: %x", addr, data);
       /* write command */
       legic_state = STATE_DISCON;
       LED_C_OFF();
       Dbprintf("write - addr: %x, data: %x", addr, data);

+         // should send a ACK after 3.6ms 

       return;
    }
 
    if(legic_state != STATE_DISCON) {
       Dbprintf("Unexpected: sz:%u, Data:%03.3x, State:%u, Count:%u", f->bits, f->data, legic_state, legic_read_count);
       return;
    }
 
    if(legic_state != STATE_DISCON) {
       Dbprintf("Unexpected: sz:%u, Data:%03.3x, State:%u, Count:%u", f->bits, f->data, legic_state, legic_read_count);

-      int i;

       Dbprintf("IV: %03.3x", legic_prng_iv);
       Dbprintf("IV: %03.3x", legic_prng_iv);

-      for(i = 0; i<legic_read_count; i++) {
-         Dbprintf("Read Nb: %u, Addr: %u", i, BigBuf[OFFSET_LOG+i]);
-      }
-
-      for(i = -1; i<legic_read_count; i++) {
-         uint32_t t;
-         t  = BigBuf[OFFSET_LOG+256+i*4];
-         t |= BigBuf[OFFSET_LOG+256+i*4+1] << 8;
-         t |= BigBuf[OFFSET_LOG+256+i*4+2] <<16;
-         t |= BigBuf[OFFSET_LOG+256+i*4+3] <<24;
-
-         Dbprintf("Cycles: %u, Frame Length: %u, Time: %u", 
-            BigBuf[OFFSET_LOG+128+i],
-            BigBuf[OFFSET_LOG+384+i],
-            t);
-      }

    }
    }

-   legic_state = STATE_DISCON; 
-   legic_read_count = 0;
-   SpinDelay(10);
-   LED_C_OFF();
-   return; 
+
+       legic_state = STATE_DISCON; 
+       legic_read_count = 0;
+       WaitMS(10);
+       LED_C_OFF();
+       return; 

 }
 
 /* Read bit by bit untill full frame is received
 }
 
 /* Read bit by bit untill full frame is received


@@ -916,52 +791,112 @@ void LegicRfSimulate(int phase, int frame, int reqresp)
    * measure the time between two rising edges on DIN, and no encoding on the
    * subcarrier from card to reader, so we'll just shift out our verbatim data
    * on DOUT, 1 bit is 100us. The time from reader to card frame is still unclear,
    * measure the time between two rising edges on DIN, and no encoding on the
    * subcarrier from card to reader, so we'll just shift out our verbatim data
    * on DOUT, 1 bit is 100us. The time from reader to card frame is still unclear,

-   * seems to be 300us-ish.
+   * seems to be 330us.

    */
    */

-
+               
+       int old_level = 0, active = 0;
+       volatile int32_t level = 0;
+       
+       legic_state = STATE_DISCON;

        legic_phase_drift = phase;
        legic_frame_drift = frame;
        legic_reqresp_drift = reqresp;
 
        legic_phase_drift = phase;
        legic_frame_drift = frame;
        legic_reqresp_drift = reqresp;
 

+
+       /* to get the stream of bits from FPGA in sim mode.*/

        FpgaDownloadAndGo(FPGA_BITSTREAM_HF);
        FpgaDownloadAndGo(FPGA_BITSTREAM_HF);

+       // Set up the synchronous serial port
+       //FpgaSetupSsc();
+       // connect Demodulated Signal to ADC:

        SetAdcMuxFor(GPIO_MUXSEL_HIPKD);
        SetAdcMuxFor(GPIO_MUXSEL_HIPKD);

-       FpgaSetupSsc();

        FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_SIMULATOR | FPGA_HF_SIMULATOR_MODULATE_212K);
        FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_SIMULATOR | FPGA_HF_SIMULATOR_MODULATE_212K);

+       //FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_SIMULATOR | FPGA_HF_SIMULATOR_NO_MODULATION);
+
+       #define LEGIC_DMA_BUFFER 256
+       // The DMA buffer, used to stream samples from the FPGA
+       //uint8_t *dmaBuf = BigBuf_malloc(LEGIC_DMA_BUFFER);
+       //uint8_t *data = dmaBuf;
+       // Setup and start DMA.
+       // if ( !FpgaSetupSscDma((uint8_t*) dmaBuf, LEGIC_DMA_BUFFER) ){
+               // if (MF_DBGLEVEL > 1) Dbprintf("FpgaSetupSscDma failed. Exiting"); 
+               // return;
+       // }

 
 

+       //StartCountSspClk();

        /* Bitbang the receiver */
        AT91C_BASE_PIOA->PIO_ODR = GPIO_SSC_DIN;
        AT91C_BASE_PIOA->PIO_PER = GPIO_SSC_DIN;
 
        /* Bitbang the receiver */
        AT91C_BASE_PIOA->PIO_ODR = GPIO_SSC_DIN;
        AT91C_BASE_PIOA->PIO_PER = GPIO_SSC_DIN;
 

-       //setup_timer();
+       // need a way to determine which tagtype we are simulating
+       
+       // hook up emulator memory  
+       cardmem = BigBuf_get_EM_addr();
+       
+       clear_trace();
+       set_tracing(TRUE);
+

        crc_init(&legic_crc, 4, 0x19 >> 1, 0x5, 0);
 
        crc_init(&legic_crc, 4, 0x19 >> 1, 0x5, 0);
 

-       int old_level = 0;
-       int active = 0;
-       legic_state = STATE_DISCON;
+       StartTicks();

 
        LED_B_ON();
        DbpString("Starting Legic emulator, press button to end");
 
        LED_B_ON();
        DbpString("Starting Legic emulator, press button to end");

-   
+       
+       /*
+        * The mode FPGA_HF_SIMULATOR_MODULATE_212K works like this.
+        * - A 1-bit input to the FPGA becomes 8 pulses on 212kHz (fc/64) (18.88us).
+        * - A 0-bit input to the FPGA becomes an unmodulated time of 18.88us
+        *
+        * In this mode the SOF can be written as 00011101 = 0x1D
+        * The EOF can be written as 10111000 = 0xb8
+        * A logic 1 is 01
+        * A logic 0 is 10
+       volatile uint8_t b;
+       uint8_t i = 0;
+       while( !BUTTON_PRESS() ) {
+               WDT_HIT();
+
+               // not sending anything.
+        if(AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_TXRDY)) {
+            AT91C_BASE_SSC->SSC_THR = 0x00;
+        }
+
+               // receive
+               if ( AT91C_BASE_SSC->SSC_SR & AT91C_SSC_RXRDY ) {
+                       b = (uint8_t) AT91C_BASE_SSC->SSC_RHR;
+                       bd[i] = b;
+                       ++i;
+       //              if(OutOfNDecoding(b & 0x0f))
+       //                              *len = Uart.byteCnt;
+                       }
+               
+       }
+        */
+

        while(!BUTTON_PRESS() && !usb_poll_validate_length()) {
        while(!BUTTON_PRESS() && !usb_poll_validate_length()) {

-               int level = !!(AT91C_BASE_PIOA->PIO_PDSR & GPIO_SSC_DIN);
-               int time = timer->TC_CV;
+               
+               level = !!(AT91C_BASE_PIOA->PIO_PDSR & GPIO_SSC_DIN);

 
 

-               if(level != old_level) {
-                       if(level == 1) {
-                               timer->TC_CCR = AT91C_TC_CLKEN | AT91C_TC_SWTRG;
-                               
+               uint32_t time = GET_TICKS;
+
+               if (level != old_level) {
+                       if (level == 1) {
+
+                               //Dbprintf("start, %u ", time);
+                               StartTicks();
+                               // did we get a signal 

                                if (FUZZ_EQUAL(time, RWD_TIME_1, RWD_TIME_FUZZ)) {
                                if (FUZZ_EQUAL(time, RWD_TIME_1, RWD_TIME_FUZZ)) {

-                                       /* 1 bit */
+                                       // 1 bit 

                                        emit(1);
                                        active = 1;
                                        LED_A_ON();
                                } else if (FUZZ_EQUAL(time, RWD_TIME_0, RWD_TIME_FUZZ)) {
                                        emit(1);
                                        active = 1;
                                        LED_A_ON();
                                } else if (FUZZ_EQUAL(time, RWD_TIME_0, RWD_TIME_FUZZ)) {

-                                       /* 0 bit */
+                                       // 0 bit 

                                        emit(0);
                                        active = 1;
                                        LED_A_ON();
                                } else if (active) {
                                        emit(0);
                                        active = 1;
                                        LED_A_ON();
                                } else if (active) {

-                                       /* invalid */
+                                       // invalid 

                                        emit(-1);
                                        active = 0;
                                        LED_A_OFF();
                                        emit(-1);
                                        active = 0;
                                        LED_A_OFF();


@@ -969,24 +904,36 @@ void LegicRfSimulate(int phase, int frame, int reqresp)
                        }
                }
 
                        }
                }
 

+       

                /* Frame end */
                /* Frame end */

-               if(time >= (RWD_TIME_1+RWD_TIME_FUZZ) && active) {
+               if(time >= (RWD_TIME_1 + RWD_TIME_FUZZ) && active) {

                        emit(-1);
                        active = 0;
                        LED_A_OFF();
                }
 
                        emit(-1);
                        active = 0;
                        LED_A_OFF();
                }
 

-               if(time >= (20*RWD_TIME_1) && (timer->TC_SR & AT91C_TC_CLKSTA)) {
-                       timer->TC_CCR = AT91C_TC_CLKDIS;
-               }
+               /*
+               * Disable the counter, Then wait for the clock to acknowledge the
+               * shutdown in its status register. Reading the SR has the
+               * side-effect of clearing any pending state in there.
+               */
+               //if(time >= (20*RWD_TIME_1) && (timer->TC_SR & AT91C_TC_CLKSTA))
+               if(time >= (20 * RWD_TIME_1) )
+                       StopTicks();

 
                old_level = level;
                WDT_HIT();
 
                old_level = level;
                WDT_HIT();

-       }
-       if ( MF_DBGLEVEL >= 1) DbpString("Stopped");
+}
+
+       WDT_HIT();
+       DbpString("LEGIC Prime emulator stopped");
+       switch_off_tag_rwd();
+       FpgaDisableSscDma();

        LEDsoff();
        LEDsoff();

+       cmd_send(CMD_ACK, 1, 0, 0, 0, 0);

 }
 
 }
 

+

 //-----------------------------------------------------------------------------
 // Code up a string of octets at layer 2 (including CRC, we don't generate
 // that here) so that they can be transmitted to the reader. Doesn't transmit
 //-----------------------------------------------------------------------------
 // Code up a string of octets at layer 2 (including CRC, we don't generate
 // that here) so that they can be transmitted to the reader. Doesn't transmit


@@ -1078,6 +1025,7 @@ void LegicRfSimulate(int phase, int frame, int reqresp)
 // The software UART that receives commands from the reader, and its state
 // variables.
 //-----------------------------------------------------------------------------
 // The software UART that receives commands from the reader, and its state
 // variables.
 //-----------------------------------------------------------------------------

+/*

 static struct {
        enum {
                STATE_UNSYNCD,
 static struct {
        enum {
                STATE_UNSYNCD,


@@ -1092,7 +1040,7 @@ static struct {
        int     posCnt;
        uint8_t *output;
 } Uart;
        int     posCnt;
        uint8_t *output;
 } Uart;

-
+*/

 /* Receive & handle a bit coming from the reader.
  *
  * This function is called 4 times per bit (every 2 subcarrier cycles).
 /* Receive & handle a bit coming from the reader.
  *
  * This function is called 4 times per bit (every 2 subcarrier cycles).


@@ -1217,7 +1165,7 @@ static struct {
 
        // return FALSE;
 // }
 
        // return FALSE;
 // }

-
+/*

 
 static void UartReset() {
        Uart.byteCntMax = 3;
 
 static void UartReset() {
        Uart.byteCntMax = 3;


@@ -1227,7 +1175,7 @@ static void UartReset() {
        Uart.posCnt = 0;
        memset(Uart.output, 0x00, 3);
 }
        Uart.posCnt = 0;
        memset(Uart.output, 0x00, 3);
 }

-
+*/

 // static void UartInit(uint8_t *data) {
        // Uart.output = data;
        // UartReset();
 // static void UartInit(uint8_t *data) {
        // Uart.output = data;
        // UartReset();


@@ -1239,7 +1187,7 @@ static void UartReset() {
 // tag's response, which we leave in the buffer to be demodulated on the
 // PC side.
 //=============================================================================
 // tag's response, which we leave in the buffer to be demodulated on the
 // PC side.
 //=============================================================================

-
+/*

 static struct {
        enum {
                DEMOD_UNSYNCD,
 static struct {
        enum {
                DEMOD_UNSYNCD,


@@ -1258,7 +1206,7 @@ static struct {
        int     sumI;
        int     sumQ;
 } Demod;
        int     sumI;
        int     sumQ;
 } Demod;

-
+*/

 /*
  * Handles reception of a bit from the tag
  *
 /*
  * Handles reception of a bit from the tag
  *


@@ -1273,32 +1221,8 @@ static struct {
  *          false if we are still waiting for some more
  *
  */
  *          false if we are still waiting for some more
  *
  */

-
- #ifndef SUBCARRIER_DETECT_THRESHOLD
- # define SUBCARRIER_DETECT_THRESHOLD  8
- #endif

  
  

- // Subcarrier amplitude v = sqrt(ci^2 + cq^2), approximated here by max(abs(ci),abs(cq)) + 1/2*min(abs(ci),abs(cq)))
-#ifndef CHECK_FOR_SUBCARRIER
-# define CHECK_FOR_SUBCARRIER() { v = MAX(ai, aq) + MIN(halfci, halfcq); }
-#endif
-
-// The soft decision on the bit uses an estimate of just the
-// quadrant of the reference angle, not the exact angle.
-// Subcarrier amplitude v = sqrt(ci^2 + cq^2), approximated here by max(abs(ci),abs(cq)) + 1/2*min(abs(ci),abs(cq)))
-#define MAKE_SOFT_DECISION() { \
-               if(Demod.sumI > 0) \
-                       v = ci; \
-               else \
-                       v = -ci; \
-               \
-               if(Demod.sumQ > 0) \
-                       v += cq; \
-               else \
-                       v -= cq; \
-               \
-       }
-
+/*

 static RAMFUNC int HandleLegicSamplesDemod(int ci, int cq)
 {
        int v = 0;
 static RAMFUNC int HandleLegicSamplesDemod(int ci, int cq)
 {
        int v = 0;


@@ -1453,7 +1377,8 @@ static RAMFUNC int HandleLegicSamplesDemod(int ci, int cq)
        }
        return FALSE;
 }
        }
        return FALSE;
 }

-
+*/
+/*

 // Clear out the state of the "UART" that receives from the tag.
 static void DemodReset() {
        Demod.len = 0;
 // Clear out the state of the "UART" that receives from the tag.
 static void DemodReset() {
        Demod.len = 0;


@@ -1471,13 +1396,17 @@ static void DemodInit(uint8_t *data) {
        Demod.output = data;
        DemodReset();
 }
        Demod.output = data;
        DemodReset();
 }

+*/

 
 /*
  *  Demodulate the samples we received from the tag, also log to tracebuffer
  *  quiet: set to 'TRUE' to disable debug output
  */
 
 /*
  *  Demodulate the samples we received from the tag, also log to tracebuffer
  *  quiet: set to 'TRUE' to disable debug output
  */

+ 
+ /*

  #define LEGIC_DMA_BUFFER_SIZE 256
  #define LEGIC_DMA_BUFFER_SIZE 256

-static void GetSamplesForLegicDemod(int n, bool quiet)
+
+ static void GetSamplesForLegicDemod(int n, bool quiet)

 {
        int max = 0;
        bool gotFrame = FALSE;
 {
        int max = 0;
        bool gotFrame = FALSE;


@@ -1552,9 +1481,13 @@ static void GetSamplesForLegicDemod(int n, bool quiet)
                LogTrace(Demod.output, Demod.len, 0, 0, parity, FALSE);
        }
 }
                LogTrace(Demod.output, Demod.len, 0, 0, parity, FALSE);
        }
 }

+
+*/
+

 //-----------------------------------------------------------------------------
 // Transmit the command (to the tag) that was placed in ToSend[].
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 // Transmit the command (to the tag) that was placed in ToSend[].
 //-----------------------------------------------------------------------------

+/*

 static void TransmitForLegic(void)
 {
        int c;
 static void TransmitForLegic(void)
 {
        int c;


@@ -1601,12 +1534,13 @@ static void TransmitForLegic(void)
        }
        LED_B_OFF();
 }
        }
        LED_B_OFF();
 }

-
+*/

 
 //-----------------------------------------------------------------------------
 // Code a layer 2 command (string of octets, including CRC) into ToSend[],
 // so that it is ready to transmit to the tag using TransmitForLegic().
 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------
 // Code a layer 2 command (string of octets, including CRC) into ToSend[],
 // so that it is ready to transmit to the tag using TransmitForLegic().
 //-----------------------------------------------------------------------------

+/*

 static void CodeLegicBitsAsReader(const uint8_t *cmd, uint8_t cmdlen, int bits)
 {
        int i, j;
 static void CodeLegicBitsAsReader(const uint8_t *cmd, uint8_t cmdlen, int bits)
 {
        int i, j;


@@ -1638,11 +1572,12 @@ static void CodeLegicBitsAsReader(const uint8_t *cmd, uint8_t cmdlen, int bits)
        // Convert from last character reference to length
        ++ToSendMax;
 }
        // Convert from last character reference to length
        ++ToSendMax;
 }

-
+*/

 /**
   Convenience function to encode, transmit and trace Legic comms
   **/
 /**
   Convenience function to encode, transmit and trace Legic comms
   **/

-static void CodeAndTransmitLegicAsReader(const uint8_t *cmd, uint8_t cmdlen, int bits)
+/*
+  static void CodeAndTransmitLegicAsReader(const uint8_t *cmd, uint8_t cmdlen, int bits)

 {
        CodeLegicBitsAsReader(cmd, cmdlen, bits);
        TransmitForLegic();
 {
        CodeLegicBitsAsReader(cmd, cmdlen, bits);
        TransmitForLegic();


@@ -1652,58 +1587,9 @@ static void CodeAndTransmitLegicAsReader(const uint8_t *cmd, uint8_t cmdlen, int
        }
 }
 
        }
 }
 

-int ice_legic_select_card()
-{
-       //int cmd_size=0, card_size=0;
-       uint8_t wakeup[] = { 0x7F };
-       uint8_t getid[] = {0x19};
-
-       //legic_prng_init(SESSION_IV);
-
-       // first, wake up the tag, 7bits
-       CodeAndTransmitLegicAsReader(wakeup, sizeof(wakeup), 7);
-
-       GetSamplesForLegicDemod(1000, TRUE);
-
-       //frame_receiveAsReader(&current_frame, 6, 1);
-
-       legic_prng_forward(1); /* we wait anyways */
-       
-       //while(timer->TC_CV < 387) ; /* ~ 258us */
-       //frame_sendAsReader(0x19, 6);
-       CodeAndTransmitLegicAsReader(getid, sizeof(getid), 8);
-       GetSamplesForLegicDemod(1000, TRUE);
-
-       //if (Demod.len < 14) return 2; 
-       Dbprintf("CARD TYPE: %02x  LEN: %d", Demod.output[0], Demod.len);
-
-       switch(Demod.output[0]) {
-               case 0x1d:
-                       DbpString("MIM 256 card found");
-            // cmd_size = 9;
-                       // card_size = 256;
-                       break;
-               case 0x3d:
-                       DbpString("MIM 1024 card found");
-            // cmd_size = 11;
-                       // card_size = 1024;
-                       break;
-               default:
-                       return -1;
-       }
-       
-       // if(bytes == -1)
-               // bytes = card_size;
-
-       // if(bytes + offset >= card_size)
-               // bytes = card_size - offset;  
-       
-       FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
-       set_tracing(FALSE);
-       return 1;
-}
-
+*/

 // Set up LEGIC communication
 // Set up LEGIC communication

+/*

 void ice_legic_setup() {
 
        // standard things.
 void ice_legic_setup() {
 
        // standard things.


@@ -1732,4 +1618,5 @@ void ice_legic_setup() {
 
        // initalize prng
        legic_prng_init(0);
 
        // initalize prng
        legic_prng_init(0);

-}
\ No newline at end of file
+}
+*/
\ No newline at end of file