FIX: the acknowledgement response in setup phase now deals with MIN22, MIN256, MIN10...

[proxmark3-svn] / armsrc / legicrf.c

diff --git a/armsrc/legicrf.c b/armsrc/legicrf.c
index a725c0bc596aac7e45b80d7f7f9388f10cf61742..1596c50c08011719c410df816543bf832d83bb84 100644 (file)
--- a/armsrc/legicrf.c
+++ b/armsrc/legicrf.c
@@ -8,14 +8,7 @@
 // LEGIC RF simulation code
 //-----------------------------------------------------------------------------
 
 // LEGIC RF simulation code
 //-----------------------------------------------------------------------------
 

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

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

-#include "legic_prng.h"
-#include "crc.h"

 
 static struct legic_frame {
        int bits;
 
 static struct legic_frame {
        int bits;


@@ -37,11 +30,12 @@ static int      legic_phase_drift;
 static int      legic_frame_drift;
 static int      legic_reqresp_drift;
 
 static int      legic_frame_drift;
 static int      legic_reqresp_drift;
 

+int timestamp;
+

 AT91PS_TC timer;
 AT91PS_TC prng_timer;
 
 AT91PS_TC timer;
 AT91PS_TC prng_timer;
 

-static void setup_timer(void)
-{
+static void setup_timer(void) {

        /* Set up Timer 1 to use for measuring time between pulses. Since we're bit-banging
         * this it won't be terribly accurate but should be good enough.
         */
        /* Set up Timer 1 to use for measuring time between pulses. Since we're bit-banging
         * this it won't be terribly accurate but should be good enough.
         */


@@ -68,7 +62,7 @@ static void setup_timer(void)
 #define RWD_TIME_PAUSE 30  /* 20us */
 #define RWD_TIME_FUZZ 20   /* rather generous 13us, since the peak detector + hysteresis fuzz quite a bit */
 #define TAG_TIME_BIT 150   /* 100us for every bit */
 #define RWD_TIME_PAUSE 30  /* 20us */
 #define RWD_TIME_FUZZ 20   /* rather generous 13us, since the peak detector + hysteresis fuzz quite a bit */
 #define TAG_TIME_BIT 150   /* 100us for every bit */

-#define TAG_TIME_WAIT 490  /* time from RWD frame end to tag frame start, experimentally determined */
+#define TAG_TIME_WAIT 490  /* 490 time from RWD frame end to tag frame start, experimentally determined */

 
 #define SIM_DIVISOR  586   /* prng_time/SIM_DIVISOR count prng needs to be forwared */
 #define SIM_SHIFT    900   /* prng_time+SIM_SHIFT shift of delayed start */
 
 #define SIM_DIVISOR  586   /* prng_time/SIM_DIVISOR count prng needs to be forwared */
 #define SIM_SHIFT    900   /* prng_time+SIM_SHIFT shift of delayed start */


@@ -78,35 +72,59 @@ static void setup_timer(void)
 
 #define FUZZ_EQUAL(value, target, fuzz) ((value) > ((target)-(fuzz)) && (value) < ((target)+(fuzz)))
 
 
 #define FUZZ_EQUAL(value, target, fuzz) ((value) > ((target)-(fuzz)) && (value) < ((target)+(fuzz)))
 

+// ~ 258us + 100us*delay
+#define WAIT_387       WAIT(387)
+#define WAIT(delay)    while(timer->TC_CV < (delay) );
+
+
+// ToDo: define a meaningful maximum size for auth_table. The bigger this is, the lower will be the available memory for traces. 
+// Historically it used to be FREE_BUFFER_SIZE, which was 2744.
+#define LEGIC_CARD_MEMSIZE 1024
+static uint8_t* cardmem;
+
+/*
+The new tracelog..
+       // Traceformat:
+       // 32 bits timestamp (little endian)
+       // 16 bits duration (little endian)
+       // 16 bits data length (little endian, Highest Bit used as readerToTag flag)
+       // y Bytes data
+       // x Bytes parity (one byte per 8 bytes data)
+*/
+ 

 /* Generate Keystream */
 static uint32_t get_key_stream(int skip, int count)
 {
 /* Generate Keystream */
 static uint32_t get_key_stream(int skip, int count)
 {

-       uint32_t key=0; int i;
+       uint32_t key = 0;
+       int i;

 
 

-       /* Use int to enlarge timer tc to 32bit */
+       // Use int to enlarge timer tc to 32bit

        legic_prng_bc += prng_timer->TC_CV;
        legic_prng_bc += prng_timer->TC_CV;

+
+       // reset the prng timer.

        prng_timer->TC_CCR = AT91C_TC_SWTRG;
        prng_timer->TC_CCR = AT91C_TC_SWTRG;

+       while(prng_timer->TC_CV > 1) ;

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

-               i  = (legic_prng_bc+SIM_SHIFT)/SIM_DIVISOR; /* Calculate Cycles based on timer */
+               i  = (legic_prng_bc + SIM_SHIFT)/SIM_DIVISOR; /* Calculate Cycles based on timer */

                i -= legic_prng_count(); /* substract cycles of finished frames */
                i -= legic_prng_count(); /* substract cycles of finished frames */

-               i -= count; /* substract current frame length, rewidn to bedinning */
+               i -= count; /* substract current frame length, rewind to beginning */

                legic_prng_forward(i);
        } else {
                legic_prng_forward(skip);
        }
 
                legic_prng_forward(i);
        } else {
                legic_prng_forward(skip);
        }
 

-       /* Write Time Data into LOG */
-       uint8_t *BigBuf = BigBuf_get_addr();

        i = (count == 6) ? -1 : legic_read_count;
 
        i = (count == 6) ? -1 : legic_read_count;
 

-       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;
+       /* 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 */
        for(i=0; i<count; i++) {
 
        /* Generate KeyStream */
        for(i=0; i<count; i++) {


@@ -129,75 +147,95 @@ static void frame_send_tag(uint16_t response, int bits, int crypt)
    /* Use time to crypt frame */
    if(crypt) {
       legic_prng_forward(2); /* TAG_TIME_WAIT -> shift by 2 */
    /* Use time to crypt frame */
    if(crypt) {
       legic_prng_forward(2); /* TAG_TIME_WAIT -> shift by 2 */

-      int i; int key = 0;
-      for(i=0; i<bits; i++) {
+      int key = 0;
+      for(int i = 0; i < bits; i++) {

          key |= legic_prng_get_bit() << i;
          legic_prng_forward(1);
       }
          key |= legic_prng_get_bit() << i;
          legic_prng_forward(1);
       }

-      //Dbprintf("key = 0x%x", key);

       response = response ^ key;
    }
 
    /* Wait for the frame start */
       response = response ^ key;
    }
 
    /* Wait for the frame start */

-   while(timer->TC_CV < (TAG_TIME_WAIT - 30)) ;
-       
-   int i;
-   for(i=0; i<bits; i++) {
+   //while(timer->TC_CV < (TAG_TIME_WAIT - 30)) ;
+   WAIT( TAG_TIME_WAIT - 30)
+
+   uint8_t bit = 0;
+   for(int i = 0; i < bits; i++) {

       int nextbit = timer->TC_CV + TAG_TIME_BIT;
       int nextbit = timer->TC_CV + TAG_TIME_BIT;

-      int bit = response & 1;
-      response = response >> 1;
-      if(bit)
+      bit = response & 1;
+      response >>= 1;
+         
+      if (bit)

          AT91C_BASE_PIOA->PIO_SODR = GPIO_SSC_DOUT;
       else
          AT91C_BASE_PIOA->PIO_CODR = GPIO_SSC_DOUT;
       
          AT91C_BASE_PIOA->PIO_SODR = GPIO_SSC_DOUT;
       else
          AT91C_BASE_PIOA->PIO_CODR = GPIO_SSC_DOUT;
       

-      while(timer->TC_CV < nextbit) ;
+      //while(timer->TC_CV < nextbit) ;
+         WAIT(nextbit)

    }
    AT91C_BASE_PIOA->PIO_CODR = GPIO_SSC_DOUT;
 }
 
    }
    AT91C_BASE_PIOA->PIO_CODR = GPIO_SSC_DOUT;
 }
 

+// Starts Clock and waits until its reset
+static void ResetClock(void){
+       timer->TC_CCR = AT91C_TC_CLKEN | AT91C_TC_SWTRG;
+       while(timer->TC_CV > 1) ;
+}
+

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

-static void frame_send_rwd(uint32_t data, int bits)
-{
-       /* Start clock */
-       timer->TC_CCR = AT91C_TC_CLKEN | AT91C_TC_SWTRG;
-       while(timer->TC_CV > 1) ; /* Wait till the clock has reset */
+static void frame_send_rwd(uint32_t data, uint8_t bits){

 
 

-       int i;
-       for(i=0; i<bits; i++) {
-               int starttime = timer->TC_CV;
-               int pause_end = starttime + RWD_TIME_PAUSE, bit_end;
-               int bit = data & 1;
-               data = data >> 1;
+       uint8_t bit = 0;        
+       uint32_t starttime = 0, pause_end = 0, bit_end = 0, temp = data;
+       ResetClock();
+       
+       for(int i = 0; i < bits; i++) {
+
+               starttime = timer->TC_CV;               
+               pause_end = starttime + RWD_TIME_PAUSE;
+               bit = temp & 1;
+               temp >>= 1;

 
                if(bit ^ legic_prng_get_bit())
                        bit_end = starttime + RWD_TIME_1;
                else
                        bit_end = starttime + RWD_TIME_0;
                
 
                if(bit ^ legic_prng_get_bit())
                        bit_end = starttime + RWD_TIME_1;
                else
                        bit_end = starttime + RWD_TIME_0;
                

-

                /* RWD_TIME_PAUSE time off, then some time on, so that the complete bit time is
                 * RWD_TIME_x, where x is the bit to be transmitted */
                AT91C_BASE_PIOA->PIO_CODR = GPIO_SSC_DOUT;
                /* RWD_TIME_PAUSE time off, then some time on, so that the complete bit time is
                 * RWD_TIME_x, where x is the bit to be transmitted */
                AT91C_BASE_PIOA->PIO_CODR = GPIO_SSC_DOUT;

-               while(timer->TC_CV < pause_end) ;
+
+               WAIT( pause_end )
+               

                AT91C_BASE_PIOA->PIO_SODR = GPIO_SSC_DOUT;
                AT91C_BASE_PIOA->PIO_SODR = GPIO_SSC_DOUT;

-               legic_prng_forward(1); /* bit duration is longest. use this time to forward the lfsr */

 
 

-               while(timer->TC_CV < bit_end);
+               // bit duration is longest. use this time to forward the lfsr
+               legic_prng_forward(1); 
+
+               WAIT( bit_end )

        }
 
        }
 

-       /* One final pause to mark the end of the frame */
-       int pause_end = timer->TC_CV + RWD_TIME_PAUSE;
+       // One final pause to mark the end of the frame
+       pause_end = timer->TC_CV + RWD_TIME_PAUSE;
+       

        AT91C_BASE_PIOA->PIO_CODR = GPIO_SSC_DOUT;
        AT91C_BASE_PIOA->PIO_CODR = GPIO_SSC_DOUT;

-       while(timer->TC_CV < pause_end) ;
+       
+       WAIT(pause_end)
+       

        AT91C_BASE_PIOA->PIO_SODR = GPIO_SSC_DOUT;
 
        AT91C_BASE_PIOA->PIO_SODR = GPIO_SSC_DOUT;
 

-
+       // log
+       uint8_t cmdbytes[2] = { (data & 0xFF), 0 };
+       if ( bits > 8 ) {
+               cmdbytes[1] = (data >> 8 ) & 0xFF;
+               LogTrace(cmdbytes, 2, 0, timer->TC_CV, NULL, TRUE);
+       } else {
+               LogTrace(cmdbytes, 1, 0, timer->TC_CV, NULL, TRUE);
+       }

        /* Reset the timer, to measure time until the start of the tag frame */
        /* Reset the timer, to measure time until the start of the tag frame */

-       timer->TC_CCR = AT91C_TC_SWTRG;
-       while(timer->TC_CV > 1) ; /* Wait till the clock has reset */
+       ResetClock();

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


@@ -223,14 +261,15 @@ static void frame_send_rwd(uint32_t data, int bits)
  */
 static void frame_receive_rwd(struct legic_frame * const f, int bits, int crypt)
 {
  */
 static void frame_receive_rwd(struct legic_frame * const f, int bits, int crypt)
 {

-       uint32_t the_bit = 1;  /* Use a bitmask to save on shifts */
-       uint32_t data=0;
-       int i, old_level=0, edges=0;
+       uint32_t starttime = timer->TC_CV;
+       
+       uint32_t the_bit = 1;  
+       uint32_t data = 0;/* Use a bitmask to save on shifts */
+       int i, old_level = 0, edges = 0;

        int next_bit_at = TAG_TIME_WAIT;
        int next_bit_at = TAG_TIME_WAIT;

+       int level = 0;

        
        

-       if(bits > 32) {
-               bits = 32;
-    }
+       if(bits > 32) bits = 32;

 
        AT91C_BASE_PIOA->PIO_ODR = GPIO_SSC_DIN;
        AT91C_BASE_PIOA->PIO_PER = GPIO_SSC_DIN;
 
        AT91C_BASE_PIOA->PIO_ODR = GPIO_SSC_DIN;
        AT91C_BASE_PIOA->PIO_PER = GPIO_SSC_DIN;


@@ -246,21 +285,23 @@ static void frame_receive_rwd(struct legic_frame * const f, int bits, int crypt)
                }
        }
 
                }
        }
 

-       while(timer->TC_CV < next_bit_at) ;
+       // QUESTION: how long did those extra calls to logtrace take?
+       WAIT(next_bit_at)

 
        next_bit_at += TAG_TIME_BIT;
 
        for(i=0; i<bits; i++) {
                edges = 0;
                while(timer->TC_CV < next_bit_at) {
 
        next_bit_at += TAG_TIME_BIT;
 
        for(i=0; i<bits; i++) {
                edges = 0;
                while(timer->TC_CV < next_bit_at) {

-                       int level = (AT91C_BASE_PIOA->PIO_PDSR & GPIO_SSC_DIN);
+                       level = (AT91C_BASE_PIOA->PIO_PDSR & GPIO_SSC_DIN);

                        if(level != old_level)
                                edges++;
                        old_level = level;
                }
                next_bit_at += TAG_TIME_BIT;
                
                        if(level != old_level)
                                edges++;
                        old_level = level;
                }
                next_bit_at += TAG_TIME_BIT;
                

-               if(edges > 20 && edges < 60) { /* expected are 42 edges */
+               // We expect 42 edges 
+               if(edges > 20 && edges < 60) { 

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


@@ -268,48 +309,65 @@ static void frame_receive_rwd(struct legic_frame * const f, int bits, int crypt)
 
        f->data = data;
        f->bits = bits;
 
        f->data = data;
        f->bits = bits;

-
-       /* Reset the timer, to synchronize the next frame */
-       timer->TC_CCR = AT91C_TC_SWTRG;
-       while(timer->TC_CV > 1) ; /* Wait till the clock has reset */
+               
+       // log
+       uint8_t cmdbytes[] = { (data & 0xFF), (data >> 8) & 0xFF };
+       LogTrace(cmdbytes, 2, starttime, timer->TC_CV, NULL, FALSE);
+       
+       // Reset the timer, to synchronize the next frame
+       ResetClock();

 }
 
 }
 

-static void frame_append_bit(struct legic_frame * const f, int bit)
-{
-   if (f->bits >= 31)
-       return; /* Overflow, won't happen */
+static void frame_append_bit(struct legic_frame * const f, int bit) {
+       // Overflow, won't happen
+   if (f->bits >= 31) return;

   
    f->data |= (bit << f->bits);
    f->bits++;
 }
 
   
    f->data |= (bit << f->bits);
    f->bits++;
 }
 

-static void frame_clean(struct legic_frame * const f)
-{
+static void frame_clean(struct legic_frame * const f) {

        f->data = 0;
        f->bits = 0;
 }
 
        f->data = 0;
        f->bits = 0;
 }
 

-static uint32_t perform_setup_phase_rwd(int iv)
-{
+// Setup pm3 as a Legic Reader
+static uint32_t perform_setup_phase_rwd(uint8_t iv) {

 
 

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

        AT91C_BASE_PIOA->PIO_SODR = GPIO_SSC_DOUT;
        AT91C_BASE_PIOA->PIO_SODR = GPIO_SSC_DOUT;

-       SpinDelay(1);
+       SpinDelay(20);  // was 1ms before. 
+
+       // no keystream yet
+       legic_prng_init(0);

 
 

-       legic_prng_init(0); /* no keystream yet */

        frame_send_rwd(iv, 7);
        frame_send_rwd(iv, 7);

+       

        legic_prng_init(iv);
 
        frame_clean(&current_frame);
        legic_prng_init(iv);
 
        frame_clean(&current_frame);

+       

        frame_receive_rwd(&current_frame, 6, 1);
        frame_receive_rwd(&current_frame, 6, 1);

-       legic_prng_forward(1); /* we wait anyways */
-       while(timer->TC_CV < 387) ; /* ~ 258us */
-       frame_send_rwd(0x19, 6);
+
+        // we wait anyways
+       legic_prng_forward(3);
+       
+       WAIT(387)
+
+       // Send obsfuscated acknowledgment frame.
+       // 0x19 = MIM22
+       // 0x39 = MIM256, MIM1024
+       if ( current_frame.data == 0x0D ){
+               frame_send_rwd(0x19, 6);
+       }else{
+               frame_send_rwd(0x39, 6);
+       }

 
        return current_frame.data;
 }
 
 static void LegicCommonInit(void) {
 
        return current_frame.data;
 }
 
 static void LegicCommonInit(void) {

+       

        FpgaDownloadAndGo(FPGA_BITSTREAM_HF);
        SetAdcMuxFor(GPIO_MUXSEL_HIPKD);
        FpgaSetupSsc();
        FpgaDownloadAndGo(FPGA_BITSTREAM_HF);
        SetAdcMuxFor(GPIO_MUXSEL_HIPKD);
        FpgaSetupSsc();


@@ -320,88 +378,110 @@ static void LegicCommonInit(void) {
        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;
 

+       // 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);
+
+       clear_trace();
+       set_tracing(TRUE);
+       

        setup_timer();
 
        crc_init(&legic_crc, 4, 0x19 >> 1, 0x5, 0);
 }
 
 /* Switch off carrier, make sure tag is reset */
        setup_timer();
 
        crc_init(&legic_crc, 4, 0x19 >> 1, 0x5, 0);
 }
 
 /* Switch off carrier, make sure tag is reset */

-static void switch_off_tag_rwd(void)
-{
+static void switch_off_tag_rwd(void) {

        AT91C_BASE_PIOA->PIO_CODR = GPIO_SSC_DOUT;
        SpinDelay(10);
        WDT_HIT();
 }
        AT91C_BASE_PIOA->PIO_CODR = GPIO_SSC_DOUT;
        SpinDelay(10);
        WDT_HIT();
 }

-/* calculate crc for a legic command */
-static int LegicCRC(int byte_index, int value, int cmd_sz) {
+
+// calculate crc4 for a legic READ command 
+// 5,8,10 address size.
+static int LegicCRC(uint16_t byte_index, uint8_t value, uint8_t cmd_sz) {

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

-       crc_update(&legic_crc, 1, 1); /* CMD_READ */
+       crc_update(&legic_crc, LEGIC_READ, 1);

        crc_update(&legic_crc, byte_index, cmd_sz-1);
        crc_update(&legic_crc, value, 8);
        return crc_finish(&legic_crc);
 }
 
        crc_update(&legic_crc, byte_index, cmd_sz-1);
        crc_update(&legic_crc, value, 8);
        return crc_finish(&legic_crc);
 }
 

+#define LEGIC_READ 0x01
+#define LEGIC_WRITE 0x00
+

 int legic_read_byte(int byte_index, int cmd_sz) {
 int legic_read_byte(int byte_index, int cmd_sz) {

-       int byte;

 
 

-       legic_prng_forward(4); /* we wait anyways */
-       while(timer->TC_CV < 387) ; /* ~ 258us + 100us*delay */
+       int calcCrc = 0, crc = 0;
+       uint8_t byte = 0;
+       uint32_t cmd = (byte_index << 1) | LEGIC_READ;
+
+       WAIT_387
+
+       // send read command
+       frame_send_rwd(cmd, cmd_sz);

 
 

-       frame_send_rwd(1 | (byte_index << 1), cmd_sz);

        frame_clean(&current_frame);
 
        frame_clean(&current_frame);
 

+       // receive

        frame_receive_rwd(&current_frame, 12, 1);
 
        byte = current_frame.data & 0xff;
        frame_receive_rwd(&current_frame, 12, 1);
 
        byte = current_frame.data & 0xff;

+       calcCrc = LegicCRC(byte_index, byte, cmd_sz);
+       crc = (current_frame.data >> 8);

 
 

-       if( LegicCRC(byte_index, byte, cmd_sz) != (current_frame.data >> 8) ) {
-               Dbprintf("!!! crc mismatch: expected %x but got %x !!!", 
-                       LegicCRC(byte_index, current_frame.data & 0xff, cmd_sz),
-                       current_frame.data >> 8);
+       if( calcCrc != crc ) {
+               Dbprintf("!!! crc mismatch: expected %x but got %x !!!",  calcCrc, crc);

                return -1;
        }
 
                return -1;
        }
 

+       // we wait anyways
+       legic_prng_forward(4); 

        return byte;
 }
 
        return byte;
 }
 

-/* legic_write_byte() is not included, however it's trivial to implement
- * and here are some hints on what remains to be done:
- *
- *  * assemble a write_cmd_frame with crc and send it
- *  * wait until the tag sends back an ACK ('1' bit unencrypted)
- *  * forward the prng based on the timing
+/* 
+ * - assemble a write_cmd_frame with crc and send it
+ * - 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(int byte, int addr, int addr_sz) {
  */
 //int legic_write_byte(int byte, int addr, int addr_sz, int PrngCorrection) {
 int legic_write_byte(int byte, int addr, int addr_sz) {

-    //do not write UID, CRC
-       if(addr <= 0x04) { 
-               return 0;
-               }
-       //== send write command ==============================
+
+    //do not write UID, CRC at offset 0-4.
+       if(addr <= 0x04) 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);
        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 crc = crc_finish(&legic_crc);

+
+       // send write command

        uint32_t cmd = ((crc     <<(addr_sz+1+8)) //CRC
                    |(byte    <<(addr_sz+1))   //Data
                    |(addr    <<1)             //Address
                    |(0x00    <<0));           //CMD = W
     uint32_t cmd_sz = addr_sz+1+8+4;          //crc+data+cmd
 
        uint32_t cmd = ((crc     <<(addr_sz+1+8)) //CRC
                    |(byte    <<(addr_sz+1))   //Data
                    |(addr    <<1)             //Address
                    |(0x00    <<0));           //CMD = W
     uint32_t cmd_sz = addr_sz+1+8+4;          //crc+data+cmd
 

-    legic_prng_forward(4); /* we wait anyways */
+    legic_prng_forward(2); /* we wait anyways */
+       

     while(timer->TC_CV < 387) ; /* ~ 258us */
     while(timer->TC_CV < 387) ; /* ~ 258us */

+       

        frame_send_rwd(cmd, cmd_sz);
        frame_send_rwd(cmd, cmd_sz);

+  
+// wllm-rbnt doesnt have these
+//     AT91C_BASE_PIOA->PIO_ODR = GPIO_SSC_DIN;
+//     AT91C_BASE_PIOA->PIO_PER = GPIO_SSC_DIN;

 
 

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

 
 

-       //== wait for ack ====================================
-    int t, old_level=0, edges=0;
-    int next_bit_at =0;

        while(timer->TC_CV < 387) ; /* ~ 258us */
        while(timer->TC_CV < 387) ; /* ~ 258us */

-    for(t=0; t<80; t++) {
+
+    for( t = 0; t < 80; t++) {

         edges = 0;
                next_bit_at += TAG_TIME_BIT;
         while(timer->TC_CV < next_bit_at) {
         edges = 0;
                next_bit_at += TAG_TIME_BIT;
         while(timer->TC_CV < next_bit_at) {


@@ -413,86 +493,87 @@ int legic_write_byte(int byte, int addr, int addr_sz) {
         }
         if(edges > 20 && edges < 60) { /* expected are 42 edges */
                        int t = timer->TC_CV;
         }
         if(edges > 20 && edges < 60) { /* expected are 42 edges */
                        int t = timer->TC_CV;

-                       int c = t/TAG_TIME_BIT;
-                       timer->TC_CCR = AT91C_TC_SWTRG;
-                       while(timer->TC_CV > 1) ; /* Wait till the clock has reset */
-                       legic_prng_forward(c-1);
+                       int c = t / TAG_TIME_BIT;
+                       
+                       ResetClock();
+                       legic_prng_forward(c);

                return 0;
         }
     }
                return 0;
         }
     }

-    timer->TC_CCR = AT91C_TC_SWTRG;
-    while(timer->TC_CV > 1) ; /* Wait till the clock has reset */
+
+       ResetClock();

        return -1;
 }
 
        return -1;
 }
 

-int LegicRfReader(int offset, int bytes) {
+int LegicRfReader(int offset, int bytes, int iv) {

        
        // ice_legic_setup();
        // ice_legic_select_card();
        // return 0;
        
        // ice_legic_setup();
        // ice_legic_select_card();
        // return 0;

-       
-       int byte_index=0, cmd_sz=0, card_sz=0;
+       int byte_index = 0, cmd_sz = 0, card_sz = 0;                                                               

 
        LegicCommonInit();
 
 
        LegicCommonInit();
 

-       uint8_t *BigBuf = BigBuf_get_addr();
-       memset(BigBuf, 0, 1024);
+       if ( MF_DBGLEVEL >= 2) DbpString("setting up legic card");
+
+       uint32_t tag_type = perform_setup_phase_rwd(iv);
+
+        //we lose to mutch time with dprintf
+       switch_off_tag_rwd();

 
 

-       DbpString("setting up legic card");
-       uint32_t tag_type = perform_setup_phase_rwd(SESSION_IV);
-       switch_off_tag_rwd(); //we lose to mutch time with dprintf

        switch(tag_type) {
                case 0x0d:
        switch(tag_type) {
                case 0x0d:

-                       DbpString("MIM22 card found, reading card ...");
+                       if ( MF_DBGLEVEL >= 2) DbpString("MIM22 card found, reading card ...");

             cmd_sz = 6;
                        card_sz = 22;
                        break;
                case 0x1d:
             cmd_sz = 6;
                        card_sz = 22;
                        break;
                case 0x1d:

-                       DbpString("MIM256 card found, reading card ...");
+                       if ( MF_DBGLEVEL >= 2) DbpString("MIM256 card found, reading card ...");

             cmd_sz = 9;
                        card_sz = 256;
                        break;
                case 0x3d:
             cmd_sz = 9;
                        card_sz = 256;
                        break;
                case 0x3d:

-                       DbpString("MIM1024 card found, reading card ...");
+                       if ( MF_DBGLEVEL >= 2) DbpString("MIM1024 card found, reading card ...");

             cmd_sz = 11;
                        card_sz = 1024;
                        break;
                default:
             cmd_sz = 11;
                        card_sz = 1024;
                        break;
                default:

-                       Dbprintf("Unknown card format: %x",tag_type);
+                       if ( MF_DBGLEVEL >= 1) Dbprintf("Unknown card format: %x",tag_type);

                        return -1;
        }
        if(bytes == -1)
                bytes = card_sz;
 
        if(bytes+offset >= card_sz)
                        return -1;
        }
        if(bytes == -1)
                bytes = card_sz;
 
        if(bytes+offset >= card_sz)

-               bytes = card_sz-offset;
+               bytes = card_sz - offset;

 
 

-       perform_setup_phase_rwd(SESSION_IV);
+       perform_setup_phase_rwd(iv);
+
+       legic_prng_forward(2);

 
        LED_B_ON();
        while(byte_index < bytes) {
                int r = legic_read_byte(byte_index+offset, cmd_sz);
 
        LED_B_ON();
        while(byte_index < bytes) {
                int r = legic_read_byte(byte_index+offset, cmd_sz);

-               if(r == -1 ||BUTTON_PRESS()) {
-               DbpString("operation aborted");
-                       switch_off_tag_rwd();
-               LED_B_OFF();
-                       LED_C_OFF();
-               return -1;
+               if(r == -1 || BUTTON_PRESS()) {                 
+               switch_off_tag_rwd();
+               LEDsoff();
+               if ( MF_DBGLEVEL >= 2) DbpString("operation aborted");
+                       return -1;

                }
                }

-               BigBuf[byte_index] = r;
+               cardmem[byte_index] = r;

         WDT_HIT();
         WDT_HIT();

-               byte_index++;
-               if (byte_index & 0x10) LED_C_ON(); else LED_C_OFF();
+               byte_index++;           

        }
        }

-       LED_B_OFF();
-    LED_C_OFF();
+

        switch_off_tag_rwd();
        switch_off_tag_rwd();

-       Dbprintf("Card read, use 'hf legic decode' or");
-    Dbprintf("'data hexsamples %d' to view results", (bytes+7) & ~7);
+       LEDsoff();
+       
+       if ( MF_DBGLEVEL >= 1) Dbprintf("Card read, use 'hf legic decode' or");
+    if ( MF_DBGLEVEL >= 1) Dbprintf("'data hexsamples %d' to view results", (bytes+7) & ~7);

     return 0;
 }
 
     return 0;
 }
 

-/*int _LegicRfWriter(int bytes, int offset, int addr_sz, uint8_t *BigBuf, int RoundBruteforceValue) {
+/*int _LegicRfWriter(int offset, int bytes, int addr_sz, uint8_t *BigBuf, int RoundBruteforceValue) {

        int byte_index=0;
 
     LED_B_ON();
        int byte_index=0;
 
     LED_B_ON();


@@ -533,15 +614,20 @@ int LegicRfReader(int offset, int bytes) {
     return 0;
 }*/
 
     return 0;
 }*/
 

-void LegicRfWriter(int bytes, int offset) {
-       int byte_index=0, addr_sz=0;
-       uint8_t *BigBuf = BigBuf_get_addr();
+void LegicRfWriter(int offset, int bytes, int iv) {
+
+       int byte_index = 0, addr_sz = 0;
+       
+       iv = (iv <=0 ) ? SESSION_IV : iv;                                                                                 

 
        LegicCommonInit();
        
 
        LegicCommonInit();
        

-       DbpString("setting up legic card");
-       uint32_t tag_type = perform_setup_phase_rwd(SESSION_IV);
+       if ( MF_DBGLEVEL >= 2)  DbpString("setting up legic card");
+       
+       uint32_t tag_type = perform_setup_phase_rwd(iv);
+       

        switch_off_tag_rwd();
        switch_off_tag_rwd();

+       

        switch(tag_type) {
                case 0x0d:
                        if(offset+bytes > 22) {
        switch(tag_type) {
                case 0x0d:
                        if(offset+bytes > 22) {


@@ -549,7 +635,7 @@ void LegicRfWriter(int bytes, int offset) {
                                return;
                        }
                        addr_sz = 5;
                                return;
                        }
                        addr_sz = 5;

-                       Dbprintf("MIM22 card found, writing 0x%02.2x - 0x%02.2x ...", offset, offset+bytes);
+                       if ( MF_DBGLEVEL >= 2) Dbprintf("MIM22 card found, writing 0x%02.2x - 0x%02.2x ...", offset, offset+bytes);

                        break;
                case 0x1d:
                        if(offset+bytes > 0x100) {
                        break;
                case 0x1d:
                        if(offset+bytes > 0x100) {


@@ -557,7 +643,7 @@ void LegicRfWriter(int bytes, int offset) {
                                return;
                        }
                        addr_sz = 8;
                                return;
                        }
                        addr_sz = 8;

-                       Dbprintf("MIM256 card found, writing 0x%02.2x - 0x%02.2x ...", offset, offset+bytes);
+                       if ( MF_DBGLEVEL >= 2) Dbprintf("MIM256 card found, writing 0x%02.2x - 0x%02.2x ...", offset, offset+bytes);

                        break;
                case 0x3d:
                        if(offset+bytes > 0x400) {
                        break;
                case 0x3d:
                        if(offset+bytes > 0x400) {


@@ -565,132 +651,125 @@ void LegicRfWriter(int bytes, int offset) {
                        return;
                }
                        addr_sz = 10;
                        return;
                }
                        addr_sz = 10;

-                       Dbprintf("MIM1024 card found, writing 0x%03.3x - 0x%03.3x ...", offset, offset+bytes);
+                       if ( MF_DBGLEVEL >= 2) Dbprintf("MIM1024 card found, writing 0x%03.3x - 0x%03.3x ...", offset, offset+bytes);

                        break;
                default:
                        Dbprintf("No or unknown card found, aborting");
             return;
        }
 
                        break;
                default:
                        Dbprintf("No or unknown card found, aborting");
             return;
        }
 

-#if 1

     LED_B_ON();
     LED_B_ON();

-       perform_setup_phase_rwd(SESSION_IV);
-
+       perform_setup_phase_rwd(iv);

        while(byte_index < bytes) {
                int r;
 
                //check if the DCF should be changed
                if ( ((byte_index+offset) == 0x05) && (bytes >= 0x02) ) {
                        //write DCF in reverse order (addr 0x06 before 0x05)
        while(byte_index < bytes) {
                int r;
 
                //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(BigBuf[(0x06-byte_index)], (0x06-byte_index), addr_sz);
+                       r = legic_write_byte(cardmem[(0x06-byte_index)], (0x06-byte_index), addr_sz);

 
                        // write second byte on success...
                        if(r == 0) {
                                byte_index++;
 
                        // write second byte on success...
                        if(r == 0) {
                                byte_index++;

-                               r = legic_write_byte(BigBuf[(0x06-byte_index)], (0x06-byte_index), addr_sz);
+                               r = legic_write_byte(cardmem[(0x06-byte_index)], (0x06-byte_index), addr_sz);

                        }
                }
                else {
                        }
                }
                else {

-                       r = legic_write_byte(BigBuf[byte_index+offset], byte_index+offset, addr_sz);
+                       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();
                if((r != 0) || BUTTON_PRESS()) {
                        Dbprintf("operation aborted @ 0x%03.3x", byte_index);
                        switch_off_tag_rwd();

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

                        return;
                }
 
         WDT_HIT();
                byte_index++;
                        return;
                }
 
         WDT_HIT();
                byte_index++;

-        if(byte_index & 0x10) LED_C_ON(); else LED_C_OFF();

        }
        }

-    LED_B_OFF();
-    LED_C_OFF();
-    DbpString("write successful");
-#else
-       for(byte_index = -2; byte_index < 200; byte_index++)
-       {
-               Dbprintf("+ Try RndValue %d...", byte_index);
-               if(_LegicRfWriter(bytes, offset, addr_sz, BigBuf, byte_index) == 0)
-                       break;
-       }
-#endif
-
+       LEDsoff();
+    if ( MF_DBGLEVEL >= 1) DbpString("write successful");

 }
 
 }
 

-void LegicRfRawWriter(int offset, int byte) {
-       int byte_index=0, addr_sz=0;
+void LegicRfRawWriter(int address, int byte, int iv) {
+
+       int byte_index = 0, addr_sz = 0;
+                                                                                                 
+       iv = (iv <= 0) ? SESSION_IV : iv;

        
        LegicCommonInit();
        
        
        LegicCommonInit();
        

-       DbpString("setting up legic card");
-       uint32_t tag_type = perform_setup_phase_rwd(SESSION_IV);
+       if ( MF_DBGLEVEL >= 2) DbpString("setting up legic card");
+       
+       uint32_t tag_type = perform_setup_phase_rwd(iv);
+       

        switch_off_tag_rwd();
        switch_off_tag_rwd();

+       

        switch(tag_type) {
                case 0x0d:
        switch(tag_type) {
                case 0x0d:

-                       if(offset > 22) {
-                               Dbprintf("Error: can not write to 0x%03.3x on MIM22", offset);
+                       if(address > 22) {
+                               Dbprintf("Error: can not write to 0x%03.3x on MIM22", address);

                                return;
                        }
                        addr_sz = 5;
                                return;
                        }
                        addr_sz = 5;

-                       Dbprintf("MIM22 card found, writing at addr 0x%02.2x - value 0x%02.2x ...", offset, byte);
+                       if ( MF_DBGLEVEL >= 2) Dbprintf("MIM22 card found, writing at addr 0x%02.2x - value 0x%02.2x ...", address, byte);

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

-                       if(offset > 0x100) {
-                               Dbprintf("Error: can not write to 0x%03.3x on MIM256", offset);
+                       if(address > 0x100) {
+                               Dbprintf("Error: can not write to 0x%03.3x on MIM256", address);

                                return;
                        }
                        addr_sz = 8;
                                return;
                        }
                        addr_sz = 8;

-                       Dbprintf("MIM256 card found, writing at addr 0x%02.2x - value 0x%02.2x ...", offset, byte);
+                       if ( MF_DBGLEVEL >= 2) Dbprintf("MIM256 card found, writing at addr 0x%02.2x - value 0x%02.2x ...", address, byte);

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

-                       if(offset > 0x400) {
-                       Dbprintf("Error: can not write to 0x%03.3x on MIM1024", offset);
+                       if(address > 0x400) {
+                       Dbprintf("Error: can not write to 0x%03.3x on MIM1024", address);

                        return;
                }
                        addr_sz = 10;
                        return;
                }
                        addr_sz = 10;

-                       Dbprintf("MIM1024 card found, writing at addr 0x%03.3x - value 0x%03.3x ...", offset, byte);
+                       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;
        }
                        break;
                default:
                        Dbprintf("No or unknown card found, aborting");
             return;
        }

-       Dbprintf("integer value: %d offset: %d  addr_sz: %d", byte, offset, addr_sz);
+       
+       Dbprintf("integer value: %d address: %d  addr_sz: %d", byte, address, addr_sz);

     LED_B_ON();
     LED_B_ON();

-       perform_setup_phase_rwd(SESSION_IV);
+       
+       perform_setup_phase_rwd(iv);

     //legic_prng_forward(2);
                
     //legic_prng_forward(2);
                

-       int r = legic_write_byte(byte, offset, addr_sz);
+       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();
                
        if((r != 0) || BUTTON_PRESS()) {
                Dbprintf("operation aborted @ 0x%03.3x (%1d)", byte_index, r);
                switch_off_tag_rwd();

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

                return;
                return;

-                       
-        WDT_HIT();
-               byte_index++;
-        if(byte_index & 0x10) LED_C_ON(); else LED_C_OFF();

        }
        }

-    LED_B_OFF();
-    LED_C_OFF();
-    DbpString("write successful");
-}

 
 

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

 
 

-/* Handle (whether to respond) a frame in tag mode */
+/* Handle (whether to respond) a frame in tag mode
+ * Only called when simulating a tag.
+ */

 static void frame_handle_tag(struct legic_frame const * const f)
 {
        uint8_t *BigBuf = BigBuf_get_addr();
 
    /* First Part of Handshake (IV) */
    if(f->bits == 7) {
 static void frame_handle_tag(struct legic_frame const * const f)
 {
        uint8_t *BigBuf = BigBuf_get_addr();
 
    /* First Part of Handshake (IV) */
    if(f->bits == 7) {

-     if(f->data == SESSION_IV) {
+

         LED_C_ON();
         LED_C_ON();

-        prng_timer->TC_CCR = AT91C_TC_SWTRG;
+        
+               prng_timer->TC_CCR = AT91C_TC_SWTRG;
+               while(prng_timer->TC_CV > 1) ;
+               

         legic_prng_init(f->data);
         frame_send_tag(0x3d, 6, 1); /* 0x3d^0x26 = 0x1b */
         legic_state = STATE_IV;
         legic_prng_init(f->data);
         frame_send_tag(0x3d, 6, 1); /* 0x3d^0x26 = 0x1b */
         legic_state = STATE_IV;


@@ -699,32 +778,31 @@ static void frame_handle_tag(struct legic_frame const * const f)
         legic_prng_iv = f->data;
  
         /* TIMEOUT */
         legic_prng_iv = f->data;
  
         /* TIMEOUT */

-        timer->TC_CCR = AT91C_TC_SWTRG;
-        while(timer->TC_CV > 1);
-        while(timer->TC_CV < 280);
-        return;
-      } else if((prng_timer->TC_CV % 50) > 40) {
-        legic_prng_init(f->data);
-        frame_send_tag(0x3d, 6, 1);
-        SpinDelay(20);
+               ResetClock();
+               
+        //while(timer->TC_CV < 280);
+               WAIT(280)

         return;
         return;

-     }

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

-      if((f->bits == 6) && (f->data == (0x19 ^ get_key_stream(1, 6)))) {
+      int local_key = get_key_stream(3, 6);
+      int xored = 0x39 ^ local_key;
+      if((f->bits == 6) && (f->data == xored)) {

          legic_state = STATE_CON;
 
          /* TIMEOUT */
          legic_state = STATE_CON;
 
          /* TIMEOUT */

-         timer->TC_CCR = AT91C_TC_SWTRG;
-         while(timer->TC_CV > 1);
-         while(timer->TC_CV < 200);
+                ResetClock();
+                
+         //while(timer->TC_CV < 200);
+                WAIT(200)
+                

          return;
       } else {
          legic_state = STATE_DISCON;
          LED_C_OFF();
          return;
       } else {
          legic_state = STATE_DISCON;
          LED_C_OFF();

-         Dbprintf("0x19 - Frame: %03.3x", f->data);
+         Dbprintf("iv: %02x frame: %02x key: %02x xored: %02x", legic_prng_iv, f->data, local_key, xored);

          return;
       }
    }
          return;
       }
    }


@@ -732,7 +810,7 @@ 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(-1, 11); //legic_phase_drift, 11);
+         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 = LegicCRC(addr, data, 11) << 8;
          int addr  = f->data ^ key; addr = addr >> 1;
          int data = BigBuf[addr];
          int hash = LegicCRC(addr, data, 11) << 8;


@@ -744,11 +822,13 @@ static void frame_handle_tag(struct legic_frame const * const f)
 
          frame_send_tag(hash | data, 12, 1);
 
 
          frame_send_tag(hash | data, 12, 1);
 

-         /* SHORT TIMEOUT */
-         timer->TC_CCR = AT91C_TC_SWTRG;
-         while(timer->TC_CV > 1);
-         legic_prng_forward(legic_frame_drift);
-         while(timer->TC_CV < 180);
+         /* TIMEOUT */
+                ResetClock();
+                
+         legic_prng_forward(2);
+         //while(timer->TC_CV < 180);
+                WAIT(180)
+                

          return;
       }
    }
          return;
       }
    }


@@ -797,21 +877,25 @@ static void frame_handle_tag(struct legic_frame const * const f)
 /* Read bit by bit untill full frame is received
  * Call to process frame end answer
  */
 /* Read bit by bit untill full frame is received
  * Call to process frame end answer
  */

-static void emit(int bit)
-{
-  if(bit == -1) {
-     if(current_frame.bits <= 4) {
-        frame_clean(&current_frame);
-     } else {
-        frame_handle_tag(&current_frame);
-        frame_clean(&current_frame);
-     }
-     WDT_HIT();
-  } else if(bit == 0) {
-    frame_append_bit(&current_frame, 0);
-  } else if(bit == 1) {
-    frame_append_bit(&current_frame, 1);
-  }
+static void emit(int bit) {
+
+       switch (bit) {
+               case 1:
+                       frame_append_bit(&current_frame, 1);
+                       break;                  
+               case 0:
+                       frame_append_bit(&current_frame, 0);
+                       break;
+               default: 
+                       if(current_frame.bits <= 4) {
+                               frame_clean(&current_frame);
+                       } else {
+                               frame_handle_tag(&current_frame);
+                               frame_clean(&current_frame);
+                       }
+                       WDT_HIT();
+                       break;
+       } 

 }
 
 void LegicRfSimulate(int phase, int frame, int reqresp)
 }
 
 void LegicRfSimulate(int phase, int frame, int reqresp)


@@ -827,83 +911,73 @@ void LegicRfSimulate(int phase, int frame, int reqresp)
    * seems to be 300us-ish.
    */
 
    * seems to be 300us-ish.
    */
 

-   if(phase < 0) {
-      int i;
-      for(i=0; i<=reqresp; i++) {
-         legic_prng_init(SESSION_IV);
-         Dbprintf("i=%u, key 0x%3.3x", i, get_key_stream(i, frame));
-      }
-      return;
-   }
+       legic_phase_drift = phase;
+       legic_frame_drift = frame;
+       legic_reqresp_drift = reqresp;
+
+       FpgaDownloadAndGo(FPGA_BITSTREAM_HF);
+       SetAdcMuxFor(GPIO_MUXSEL_HIPKD);
+       FpgaSetupSsc();
+       FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_SIMULATOR | FPGA_HF_SIMULATOR_MODULATE_212K);

 
 

-   legic_phase_drift = phase;
-   legic_frame_drift = frame;
-   legic_reqresp_drift = reqresp;
+       /* Bitbang the receiver */
+       AT91C_BASE_PIOA->PIO_ODR = GPIO_SSC_DIN;
+       AT91C_BASE_PIOA->PIO_PER = GPIO_SSC_DIN;

 
 

-   FpgaDownloadAndGo(FPGA_BITSTREAM_HF);
-   SetAdcMuxFor(GPIO_MUXSEL_HIPKD);
-   FpgaSetupSsc();
-   FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_SIMULATOR | FPGA_HF_SIMULATOR_MODULATE_212K);
-   
-   /* Bitbang the receiver */
-   AT91C_BASE_PIOA->PIO_ODR = GPIO_SSC_DIN;
-   AT91C_BASE_PIOA->PIO_PER = GPIO_SSC_DIN;
-   
-   setup_timer();
-   crc_init(&legic_crc, 4, 0x19 >> 1, 0x5, 0);
+       setup_timer();
+       crc_init(&legic_crc, 4, 0x19 >> 1, 0x5, 0);
+
+       int old_level = 0;
+       int active = 0;
+       legic_state = STATE_DISCON;
+
+       LED_B_ON();
+       DbpString("Starting Legic emulator, press button to end");

    
    

-   int old_level = 0;
-   int active = 0;
-   legic_state = STATE_DISCON;
-
-   LED_B_ON();
-   DbpString("Starting Legic emulator, press button to end");
-   while(!BUTTON_PRESS() && !usb_poll_validate_length()) {
-      int level = !!(AT91C_BASE_PIOA->PIO_PDSR & GPIO_SSC_DIN);
-      int time = timer->TC_CV;
-                
-      if(level != old_level) {
-         if(level == 1) {
-            timer->TC_CCR = AT91C_TC_CLKEN | AT91C_TC_SWTRG;
-            if(FUZZ_EQUAL(time, RWD_TIME_1, RWD_TIME_FUZZ)) {
-               /* 1 bit */
-               emit(1);
-               active = 1;
-               LED_A_ON();
-            } else if(FUZZ_EQUAL(time, RWD_TIME_0, RWD_TIME_FUZZ)) {
-               /* 0 bit */
-               emit(0);
-               active = 1;
-               LED_A_ON();
-            } else if(active) {
-               /* invalid */
-               emit(-1);
-               active = 0;
-               LED_A_OFF();
-            }
-         }
-      }
+       while(!BUTTON_PRESS() && !usb_poll_validate_length()) {
+               int level = !!(AT91C_BASE_PIOA->PIO_PDSR & GPIO_SSC_DIN);
+               int time = timer->TC_CV;

 
 

-      if(time >= (RWD_TIME_1+RWD_TIME_FUZZ) && active) {
-         /* Frame end */
-         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;
-      }
-                
-      old_level = level;
-      WDT_HIT();
-   }
-   DbpString("Stopped");
-   LED_B_OFF();
-   LED_A_OFF();
-   LED_C_OFF();
-}
+               if(level != old_level) {
+                       if(level == 1) {
+                               timer->TC_CCR = AT91C_TC_CLKEN | AT91C_TC_SWTRG;
+                               
+                               if (FUZZ_EQUAL(time, RWD_TIME_1, RWD_TIME_FUZZ)) {
+                                       /* 1 bit */
+                                       emit(1);
+                                       active = 1;
+                                       LED_A_ON();
+                               } else if (FUZZ_EQUAL(time, RWD_TIME_0, RWD_TIME_FUZZ)) {
+                                       /* 0 bit */
+                                       emit(0);
+                                       active = 1;
+                                       LED_A_ON();
+                               } else if (active) {
+                                       /* invalid */
+                                       emit(-1);
+                                       active = 0;
+                                       LED_A_OFF();
+                               }
+                       }
+               }

 
 

+               /* Frame end */
+               if(time >= (RWD_TIME_1+RWD_TIME_FUZZ) && active) {
+                       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;
+               }
+
+               old_level = level;
+               WDT_HIT();
+       }
+       if ( MF_DBGLEVEL >= 1) DbpString("Stopped");
+       LEDsoff();
+}

 
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------


@@ -1141,18 +1215,16 @@ static struct {
 // }
 
 
 // }
 
 

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

        Uart.state = STATE_UNSYNCD;
        Uart.byteCnt = 0;
        Uart.bitCnt = 0;
        Uart.posCnt = 0;
        Uart.state = STATE_UNSYNCD;
        Uart.byteCnt = 0;
        Uart.bitCnt = 0;
        Uart.posCnt = 0;

-       memset(Uart.output, 0x00, MAX_FRAME_SIZE);
+       memset(Uart.output, 0x00, 3);

 }
 
 }
 

-// static void UartInit(uint8_t *data)
-// {
+// static void UartInit(uint8_t *data) {

        // Uart.output = data;
        // UartReset();
 // }
        // Uart.output = data;
        // UartReset();
 // }


@@ -1388,7 +1460,7 @@ static void DemodReset() {
        Demod.bitCount = 0;
        Demod.thisBit = 0;
        Demod.shiftReg = 0;
        Demod.bitCount = 0;
        Demod.thisBit = 0;
        Demod.shiftReg = 0;

-       memset(Demod.output, 0x00, MAX_FRAME_SIZE);
+       memset(Demod.output, 0x00, 3);

 }
 
 static void DemodInit(uint8_t *data) {
 }
 
 static void DemodInit(uint8_t *data) {


@@ -1531,7 +1603,7 @@ static void TransmitForLegic(void)
 // 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, int bits)
+static void CodeLegicBitsAsReader(const uint8_t *cmd, uint8_t cmdlen, int bits)

 {
        int i, j;
        uint8_t b;
 {
        int i, j;
        uint8_t b;


@@ -1539,17 +1611,17 @@ static void CodeLegicBitsAsReader(const uint8_t *cmd, int bits)
        ToSendReset();
 
        // Send SOF
        ToSendReset();
 
        // Send SOF

-       for(i = 0; i < 7; i++) {
+       for(i = 0; i < 7; i++)

                ToSendStuffBit(1);
                ToSendStuffBit(1);

-       }

 
 

-       for(i = 0; i < bits; i++) {
+
+       for(i = 0; i < cmdlen; i++) {

                // Start bit
                ToSendStuffBit(0);
 
                // Data bits
                b = cmd[i];
                // Start bit
                ToSendStuffBit(0);
 
                // Data bits
                b = cmd[i];

-               for(j = 0; j < 8; j++) {
+               for(j = 0; j < bits; j++) {

                        if(b & 1) {
                                ToSendStuffBit(1);
                        } else {
                        if(b & 1) {
                                ToSendStuffBit(1);
                        } else {


@@ -1566,26 +1638,26 @@ static void CodeLegicBitsAsReader(const uint8_t *cmd, int bits)
 /**
   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, int bits)
+static void CodeAndTransmitLegicAsReader(const uint8_t *cmd, uint8_t cmdlen, int bits)

 {
 {

-       CodeLegicBitsAsReader(cmd, bits);
+       CodeLegicBitsAsReader(cmd, cmdlen, bits);

        TransmitForLegic();
        if (tracing) {
                uint8_t parity[1] = {0x00};
        TransmitForLegic();
        if (tracing) {
                uint8_t parity[1] = {0x00};

-               LogTrace(cmd, bits, 0, 0, parity, TRUE);
+               LogTrace(cmd, cmdlen, 0, 0, parity, TRUE);

        }
 }
 
 int ice_legic_select_card()
 {
        //int cmd_size=0, card_size=0;
        }
 }
 
 int ice_legic_select_card()
 {
        //int cmd_size=0, card_size=0;

-       uint8_t wakeup[] = { 0x7F};
+       uint8_t wakeup[] = { 0x7F };

        uint8_t getid[] = {0x19};
 
        legic_prng_init(SESSION_IV);
 
        // first, wake up the tag, 7bits
        uint8_t getid[] = {0x19};
 
        legic_prng_init(SESSION_IV);
 
        // first, wake up the tag, 7bits

-       CodeAndTransmitLegicAsReader(wakeup, 7);
+       CodeAndTransmitLegicAsReader(wakeup, sizeof(wakeup), 7);

 
        GetSamplesForLegicDemod(1000, TRUE);
 
 
        GetSamplesForLegicDemod(1000, TRUE);
 


@@ -1596,7 +1668,7 @@ int ice_legic_select_card()
        
        //while(timer->TC_CV < 387) ; /* ~ 258us */
        //frame_send_rwd(0x19, 6);
        
        //while(timer->TC_CV < 387) ; /* ~ 258us */
        //frame_send_rwd(0x19, 6);

-       CodeAndTransmitLegicAsReader(getid, sizeof(getid));
+       CodeAndTransmitLegicAsReader(getid, sizeof(getid), 8);

        GetSamplesForLegicDemod(1000, TRUE);
 
        //if (Demod.len < 14) return 2; 
        GetSamplesForLegicDemod(1000, TRUE);
 
        //if (Demod.len < 14) return 2; 


@@ -1648,7 +1720,7 @@ void ice_legic_setup() {
        // Signal field is on with the appropriate LED
     LED_D_ON();
        FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_READER_TX | FPGA_HF_READER_TX_SHALLOW_MOD);
        // Signal field is on with the appropriate LED
     LED_D_ON();
        FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_READER_TX | FPGA_HF_READER_TX_SHALLOW_MOD);

-       SpinDelay(200);
+       SpinDelay(20);

        // Start the timer
        //StartCountSspClk();
        
        // Start the timer
        //StartCountSspClk();