CHG: finally, the ticks timer does what it is supposed to do. 32bits and working.

[proxmark3-svn] / armsrc / legicrf.c

diff --git a/armsrc/legicrf.c b/armsrc/legicrf.c
index 5ee4d667c926beed5c5ce05ab9289372152012cd..b1c6b1964103bd92666414bdcbf4c4703d44a1f9 100644 (file)
--- a/armsrc/legicrf.c
+++ b/armsrc/legicrf.c
@@ -7,11 +7,10 @@
 //-----------------------------------------------------------------------------
 // LEGIC RF simulation code
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 // LEGIC RF simulation code
 //-----------------------------------------------------------------------------

-

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


@@ -30,25 +29,24 @@ 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.
+       //

        AT91C_BASE_PMC->PMC_PCER = (1 << AT91C_ID_TC1);
        timer = AT91C_BASE_TC1;
        timer->TC_CCR = AT91C_TC_CLKDIS;
        timer->TC_CMR = AT91C_TC_CLKS_TIMER_DIV3_CLOCK;
        timer->TC_CCR = AT91C_TC_CLKEN | AT91C_TC_SWTRG;
 
        AT91C_BASE_PMC->PMC_PCER = (1 << AT91C_ID_TC1);
        timer = AT91C_BASE_TC1;
        timer->TC_CCR = AT91C_TC_CLKDIS;
        timer->TC_CMR = AT91C_TC_CLKS_TIMER_DIV3_CLOCK;
        timer->TC_CCR = AT91C_TC_CLKEN | AT91C_TC_SWTRG;
 

-       /* 
-     * Set up Timer 2 to use for measuring time between frames in 
-     * tag simulation mode. Runs 4x faster as Timer 1
-        */
+       // 
+    // Set up Timer 2 to use for measuring time between frames in 
+    // tag simulation mode. Runs 4x faster as Timer 1
+       //

     AT91C_BASE_PMC->PMC_PCER = (1 << AT91C_ID_TC2);
     prng_timer = AT91C_BASE_TC2;
     prng_timer->TC_CCR = AT91C_TC_CLKDIS;
     AT91C_BASE_PMC->PMC_PCER = (1 << AT91C_ID_TC2);
     prng_timer = AT91C_BASE_TC2;
     prng_timer->TC_CCR = AT91C_TC_CLKDIS;


@@ -56,45 +54,92 @@ static void setup_timer(void) {
     prng_timer->TC_CCR = AT91C_TC_CLKEN | AT91C_TC_SWTRG;
 }
 
     prng_timer->TC_CCR = AT91C_TC_CLKEN | AT91C_TC_SWTRG;
 }
 

-/* 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 */
-#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 */
+       AT91C_BASE_PMC->PMC_PCER |= (0x1 << 12) | (0x1 << 13) | (0x1 << 14);
+       AT91C_BASE_TCB->TCB_BMR = AT91C_TCB_TC0XC0S_NONE | AT91C_TCB_TC1XC1S_TIOA0 | AT91C_TCB_TC2XC2S_NONE;
+
+       // fast clock
+       AT91C_BASE_TC0->TC_CCR = AT91C_TC_CLKDIS; // timer disable
+       AT91C_BASE_TC0->TC_CMR = AT91C_TC_CLKS_TIMER_DIV3_CLOCK | // MCK(48MHz)/32 -- tick=1.5mks
+                                                               AT91C_TC_WAVE | AT91C_TC_WAVESEL_UP_AUTO | AT91C_TC_ACPA_CLEAR |
+                                                               AT91C_TC_ACPC_SET | AT91C_TC_ASWTRG_SET;
+       AT91C_BASE_TC0->TC_RA = 1;
+       AT91C_BASE_TC0->TC_RC = 0xBFFF + 1; // 0xC000
+       
+*/
+
+// At TIMER_CLOCK3 (MCK/32)
+// testing calculating in (us) microseconds.
+#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 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 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 */
 

-#define SESSION_IV 0x55

 #define OFFSET_LOG 1024
 
 #define FUZZ_EQUAL(value, target, fuzz) ((value) > ((target)-(fuzz)) && (value) < ((target)+(fuzz)))
 
 #define OFFSET_LOG 1024
 
 #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) );
+#ifndef SHORT_COIL
+# define SHORT_COIL    LOW(GPIO_SSC_DOUT);
+#endif
+#ifndef OPEN_COIL
+# define OPEN_COIL     HIGH(GPIO_SSC_DOUT);
+#endif

 
 

+// Pause pulse,  off in 20us / 30ticks,
+// ONE / ZERO bit pulse,  
+//    one == 80us / 120ticks
+//    zero == 40us / 60ticks
+#ifndef COIL_PULSE
+# define COIL_PULSE(x) \
+       do { \
+               SHORT_COIL; \
+               WaitTicks( (RWD_TIME_PAUSE) ); \
+               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. 
 // Historically it used to be FREE_BUFFER_SIZE, which was 2744.
 #define LEGIC_CARD_MEMSIZE 1024
 static uint8_t* cardmem;
 
 
 // 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)
+static void frame_append_bit(struct legic_frame * const f, uint8_t bit) {
+       // Overflow, won't happen
+   if (f->bits >= 31) return;
+  
+   f->data |= (bit << f->bits);
+   f->bits++;
+}
+
+static void frame_clean(struct legic_frame * const f) {
+       f->data = 0;
+       f->bits = 0;
+}
+
+// Prng works when waiting in 99.1us cycles.
+// and while sending/receiving in bit frames (100, 60)
+/*static void CalibratePrng( uint32_t time){
+       // Calculate Cycles based on timer 100us
+       uint32_t i =  (time - sendFrameStop) / 100 ;
+
+       // substract cycles of finished frames
+       int k =  i - legic_prng_count()+1; 
+
+       // substract current frame length, rewind to beginning
+       if ( k > 0 )
+               legic_prng_forward(k);
+}

 */
 */

- 
+

 /* Generate Keystream */
 /* Generate Keystream */

-static uint32_t get_key_stream(int skip, int count)
-{
+uint32_t get_key_stream(int skip, int count) {

        uint32_t key = 0;
        int i;
 
        uint32_t key = 0;
        int i;
 


@@ -102,8 +147,7 @@ static uint32_t get_key_stream(int skip, int count)
        legic_prng_bc += prng_timer->TC_CV;
 
        // reset the prng timer.
        legic_prng_bc += prng_timer->TC_CV;
 
        // reset the prng timer.

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

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


@@ -137,100 +181,65 @@ static uint32_t get_key_stream(int skip, int 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
  */

-static void frame_send_tag(uint16_t response, int bits, int crypt)
-{
-   /* Bitbang the response */
-   AT91C_BASE_PIOA->PIO_CODR = 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_TIME_WAIT -> shift by 2 */
-      int key = 0;
-      for(int i = 0; i < bits; i++) {
-         key |= legic_prng_get_bit() << i;
-         legic_prng_forward(1);
-      }
-      response = response ^ key;
-   }
+void frame_send_tag(uint16_t response, uint8_t bits, uint8_t crypt) {
+       /* Bitbang the response */
+       LOW(GPIO_SSC_DOUT);
+       AT91C_BASE_PIOA->PIO_OER = GPIO_SSC_DOUT;
+       AT91C_BASE_PIOA->PIO_PER = GPIO_SSC_DOUT;

 
 

-   /* Wait for the frame start */
-   //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;
-      bit = response & 1;
-      response >>= 1;
-         
-      if (bit)
-         AT91C_BASE_PIOA->PIO_SODR = GPIO_SSC_DOUT;
-      else
-         AT91C_BASE_PIOA->PIO_CODR = GPIO_SSC_DOUT;
-      
-      //while(timer->TC_CV < nextbit) ;
-         WAIT(nextbit)
-   }
-   AT91C_BASE_PIOA->PIO_CODR = 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);
+       }

 
 

-// 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) ;
+       /* 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;
+
+               if (bit)
+                       HIGH(GPIO_SSC_DOUT);
+               else
+                       LOW(GPIO_SSC_DOUT);
+                 
+               WaitUS(100);
+   }
+   LOW(GPIO_SSC_DOUT);

 }
 
 /* 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){
+void frame_sendAsReader(uint32_t data, uint8_t bits){

 
 

-       ResetClock();
-       int starttime = 0, pause_end = 0, bit = 0, bit_end = 0;
+       uint32_t starttime = GET_TICKS, send = 0;
+       uint16_t mask = 1;

        
        

-       for(int i = 0; i<bits; i++) {
-
-               starttime = timer->TC_CV;               
-               pause_end = starttime + RWD_TIME_PAUSE;
-               bit = data & 1;
-               data >>= 1;
-
-               if(bit ^ legic_prng_get_bit())
-                       bit_end = starttime + RWD_TIME_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
                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;
-
-               WAIT( pause_end )
-               
-               AT91C_BASE_PIOA->PIO_SODR = GPIO_SSC_DOUT;
-
-               legic_prng_forward(1); /* bit duration is longest. use this time to forward the lfsr */
-
-               WAIT( bit_end )
+                       COIL_PULSE(RWD_TIME_0);

        }
 
        }
 

-       /* One final pause to mark the end of the frame */
-       pause_end = timer->TC_CV + RWD_TIME_PAUSE;
+       // Final pause to mark the end of the frame
+       COIL_PULSE(0);

        
        

-       AT91C_BASE_PIOA->PIO_CODR = GPIO_SSC_DOUT;
-       
-       WAIT(pause_end)
-       
-       AT91C_BASE_PIOA->PIO_SODR = GPIO_SSC_DOUT;
-
-       /* Reset the timer, to measure time until the start of the tag frame */
-       ResetClock();
+       // log
+       uint8_t cmdbytes[] = {bits,     BYTEx(data, 0), BYTEx(data, 1), BYTEx(send, 0), BYTEx(send, 1)};
+       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

- * timer must have been set up by LegicRfReader and frame_send_rwd.
+ * timer must have been set up by LegicRfReader and frame_sendAsReader.

  *
  * The LEGIC RF protocol from card to reader does not include explicit
  * frame start/stop information or length information. The reader must
  *
  * The LEGIC RF protocol from card to reader does not include explicit
  * frame start/stop information or length information. The reader must


@@ -243,112 +252,120 @@ static void frame_send_rwd(uint32_t data, int bits){
  * for edges. Count the edges in each bit interval. If they are approximately
  * 0 this was a 0-bit, if they are approximately equal to the number of edges
  * expected for a 212kHz subcarrier, this was a 1-bit. For timing we use the
  * for edges. Count the edges in each bit interval. If they are approximately
  * 0 this was a 0-bit, if they are approximately equal to the number of edges
  * expected for a 212kHz subcarrier, this was a 1-bit. For timing we use the

- * timer that's still running from frame_send_rwd in order to get a synchronization
+ * timer that's still running from frame_sendAsReader in order to get a synchronization

  * with the frame that we just sent.
  *
  * FIXME: Because we're relying on the hysteresis to just do the right thing
  * the range is severely reduced (and you'll probably also need a good antenna).
  * So this should be fixed some time in the future for a proper receiver.
  */
  * with the frame that we just sent.
  *
  * FIXME: Because we're relying on the hysteresis to just do the right thing
  * the range is severely reduced (and you'll probably also need a good antenna).
  * So this should be fixed some time in the future for a proper receiver.
  */

-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;
-       int next_bit_at = TAG_TIME_WAIT;
-       
-       if(bits > 32) bits = 32;
+static void frame_receiveAsReader(struct legic_frame * const f, uint8_t bits) {

 
 

+       if ( bits > 32 ) return;
+       
+       uint8_t i = bits, edges = 0;    
+       uint32_t the_bit = 1, next_bit_at = 0, data = 0;
+       uint32_t old_level = 0;
+       volatile uint32_t level = 0;
+       
+       frame_clean(f);
+               

        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;

-
-       /* we have some time now, precompute the cipher
-     * since we cannot compute it on the fly while reading */
+       
+       // calibrate the prng.

        legic_prng_forward(2);
        legic_prng_forward(2);

-
-       if(crypt) {
-               for(i=0; i<bits; i++) {
-                       data |= legic_prng_get_bit() << i;
-                       legic_prng_forward(1);
-               }
-       }
-
-       WAIT(next_bit_at)
-
-       next_bit_at += TAG_TIME_BIT;
-
-       for(i=0; i<bits; i++) {
+       data = legic_prng_get_bits(bits);
+       
+       //FIXED time between sending frame and now listening frame. 330us
+       uint32_t starttime = GET_TICKS;
+       //if ( bits == 6 || bits == 7) {
+               // its about 9+9 ticks delay from end-send to here.
+               //WaitTicks( 495 - 9 - 9 );             
+               WaitTicks( 477 );
+       //} else {
+//             WaitTicks( 477 );
+//     }
+
+       next_bit_at = GET_TICKS + TAG_BIT_PERIOD;
+
+       while ( i-- ){

                edges = 0;
                edges = 0;

-               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) {
+
+                       level = (AT91C_BASE_PIOA->PIO_PDSR & GPIO_SSC_DIN);
+                       
+                       if (level != old_level)
+                               ++edges;
+                       

                        old_level = level;
                        old_level = level;

-               }
-               next_bit_at += TAG_TIME_BIT;
+               }               
+
+               next_bit_at += TAG_BIT_PERIOD;

                
                

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

                        data ^= the_bit;
                        data ^= the_bit;

-               }
-               the_bit <<= 1;
+
+               the_bit <<= 1;  

        }
 
        }
 

+       // output

        f->data = data;
        f->bits = bits;
        f->data = data;
        f->bits = bits;

-
-       // Reset the timer, to synchronize the next frame
-       ResetClock();
-}
-
-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++;
-}
-
-static void frame_clean(struct legic_frame * const f) {
-       f->data = 0;
-       f->bits = 0;
+       
+       // 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
 }
 
 // Setup pm3 as a Legic Reader

-static uint32_t perform_setup_phase_rwd(int iv) {
-       /* Switch on carrier and let the tag charge for 1ms */
-       AT91C_BASE_PIOA->PIO_SODR = GPIO_SSC_DOUT;
-       SpinDelay(20);  // was 1ms before. 
-
-       /* no keystream yet */
+static uint32_t setup_phase_reader(uint8_t iv) {
+       
+       // Switch on carrier and let the tag charge for 1ms
+       HIGH(GPIO_SSC_DOUT);
+       WaitUS(1000);   
+       
+       ResetTicks();
+       
+       // no keystream yet

        legic_prng_init(0);
        legic_prng_init(0);

+       
+       // send IV handshake
+       frame_sendAsReader(iv, 7);

 
 

-       // IV
-       frame_send_rwd(iv, 7);
+       // Now both tag and reader has same IV. Prng can start.

        legic_prng_init(iv);
 
        legic_prng_init(iv);
 

-       frame_clean(&current_frame);
-       frame_receive_rwd(&current_frame, 6, 1);
+       frame_receiveAsReader(&current_frame, 6);

 
 

-        // we wait anyways
-       legic_prng_forward(3);
+       // 292us (438t) - fixed delay before sending ack.
+       // minus log and stuff 100tick?
+       WaitTicks(338);
+       legic_prng_forward(3); 

        
        

-       WAIT_387
-
-       frame_send_rwd(0x39, 6);
+       // Send obsfuscated acknowledgment frame.
+       // 0x19 = 0x18 MIM22, 0x01 LSB READCMD 
+       // 0x39 = 0x38 MIM256, MIM1024 0x01 LSB READCMD 
+       switch ( current_frame.data  ) {
+               case 0x0D: frame_sendAsReader(0x19, 6); break;
+               case 0x1D: 
+               case 0x3D: frame_sendAsReader(0x39, 6); break;
+               default: break;
+       }

 
 

+       legic_prng_forward(2);

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

-       
+

        FpgaDownloadAndGo(FPGA_BITSTREAM_HF);
        FpgaDownloadAndGo(FPGA_BITSTREAM_HF);

-       SetAdcMuxFor(GPIO_MUXSEL_HIPKD);
-       FpgaSetupSsc();

        FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_READER_TX);
        FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_READER_TX);

+       SetAdcMuxFor(GPIO_MUXSEL_HIPKD);

 
        /* Bitbang the transmitter */
 
        /* Bitbang the transmitter */

-       AT91C_BASE_PIOA->PIO_CODR = GPIO_SSC_DOUT;
+       LOW(GPIO_SSC_DOUT);

        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;
 


@@ -358,70 +375,49 @@ static void LegicCommonInit(void) {
 
        clear_trace();
        set_tracing(TRUE);
 
        clear_trace();
        set_tracing(TRUE);

-       
-       setup_timer();
-

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

+       
+       StartTicks();

 }
 
 }
 

-/* Switch off carrier, make sure tag is reset */
+// 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);
+       LOW(GPIO_SSC_DOUT);
+       WaitUS(20);

        WDT_HIT();
 }
 
        WDT_HIT();
 }
 

-/* calculate crc for a legic command */
-static int LegicCRC(int byte_index, int value, int cmd_sz) {
-       crc_clear(&legic_crc);
-       crc_update(&legic_crc, 1, 1); /* CMD_READ */
-       crc_update(&legic_crc, byte_index, cmd_sz-1);
-       crc_update(&legic_crc, value, 8);
+// calculate crc4 for a legic READ command 
+static uint32_t legic4Crc(uint8_t cmd, uint16_t byte_index, uint8_t value, uint8_t cmd_sz) {
+       crc_clear(&legic_crc);  
+       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) {
+int legic_read_byte( uint16_t index, uint8_t cmd_sz) {

 
 

-       int byte = 0, calcCrc = 0, crc = 0;
-       int cmd = 1 | (byte_index << 1);
+       uint8_t byte, crc, calcCrc = 0;
+       uint32_t cmd = (index << 1) | LEGIC_READ;

 
 

-       uint8_t cmdbytes[2] = {cmd && 0xff, (cmd >> 8 ) & 0xFF};
-       uint32_t starttime = timer->TC_CV, endtime = 0;
-
-       WAIT_387
-
-       // send
-       frame_send_rwd(cmd, cmd_sz);
-
-       // log
-       endtime = timer->TC_CV;
-       LogTrace(cmdbytes, 2, starttime, endtime, NULL, TRUE);
+       //WaitTicks(366); 
+       WaitTicks(330); 
+       //WaitTicks(50);

        
        

-       // clean
-       frame_clean(&current_frame);
-       
-       starttime = timer->TC_CV;
-       
-       // read
-       frame_receive_rwd(&current_frame, 12, 1);
+       frame_sendAsReader(cmd, cmd_sz);
+       frame_receiveAsReader(&current_frame, 12);

 
 

-       // log
-       endtime = timer->TC_CV;  
-       cmdbytes[0] = current_frame.data & 0xff; 
-       cmdbytes[1] = (current_frame.data >> 8) & 0xFF;
-       LogTrace(cmdbytes, 2, starttime, endtime, NULL, FALSE);
-       
-       byte = current_frame.data & 0xff;
-       calcCrc = LegicCRC(byte_index, byte, cmd_sz);
-       crc = (current_frame.data >> 8);
+       // CRC check. 
+       byte = BYTEx(current_frame.data, 0);
+       crc = BYTEx(current_frame.data, 1);
+       calcCrc = legic4Crc(LEGIC_READ, index, byte, cmd_sz);

 
        if( calcCrc != crc ) {
                Dbprintf("!!! crc mismatch: expected %x but got %x !!!",  calcCrc, crc);
                return -1;
        }
 
 
        if( calcCrc != crc ) {
                Dbprintf("!!! crc mismatch: expected %x but got %x !!!",  calcCrc, crc);
                return -1;
        }
 

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

        return byte;
 }
 
        return byte;
 }
 


@@ -431,10 +427,10 @@ int legic_read_byte(int byte_index, int cmd_sz) {
  * - forward the prng based on the timing
  */
 //int legic_write_byte(int byte, int addr, int addr_sz, int PrngCorrection) {
  * - 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(uint8_t byte, uint16_t addr, uint8_t addr_sz) {

 
     //do not write UID, CRC at offset 0-4.
 
     //do not write UID, CRC at offset 0-4.

-       if(addr <= 0x04) return 0;
+       if (addr <= 4) return 0;

 
        // crc
        crc_clear(&legic_crc);
 
        // crc
        crc_clear(&legic_crc);


@@ -443,121 +439,98 @@ int legic_write_byte(int byte, int addr, int addr_sz) {
        crc_update(&legic_crc, byte, 8);
        uint32_t crc = crc_finish(&legic_crc);
 
        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");
+       

        // send write command
        uint32_t cmd = ((crc     <<(addr_sz+1+8)) //CRC
                    |(byte    <<(addr_sz+1))   //Data
                    |(addr    <<1)             //Address
        // send write command
        uint32_t cmd = ((crc     <<(addr_sz+1+8)) //CRC
                    |(byte    <<(addr_sz+1))   //Data
                    |(addr    <<1)             //Address

-                   |(0x00    <<0));           //CMD = W
+                   | 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_sz = addr_sz+1+8+4;          //crc+data+cmd
 
     legic_prng_forward(2); /* we wait anyways */
        

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

        
        

-       frame_send_rwd(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;
+       // 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;
 
 
        // wait for ack
     int t, old_level = 0, edges = 0;
     int next_bit_at = 0;
 

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

 
 

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

         edges = 0;
         edges = 0;

-               next_bit_at += TAG_TIME_BIT;
+               next_bit_at += TAG_BIT_PERIOD;

         while(timer->TC_CV < next_bit_at) {
             int level = (AT91C_BASE_PIOA->PIO_PDSR & GPIO_SSC_DIN);
         while(timer->TC_CV < next_bit_at) {
             int level = (AT91C_BASE_PIOA->PIO_PDSR & GPIO_SSC_DIN);

-            if(level != old_level) {
+            if(level != old_level)

                 edges++;
                 edges++;

-                       }
+

             old_level = level;
         }
         if(edges > 20 && edges < 60) { /* expected are 42 edges */
                        int t = timer->TC_CV;
             old_level = level;
         }
         if(edges > 20 && edges < 60) { /* expected are 42 edges */
                        int t = timer->TC_CV;

-                       int c = t / TAG_TIME_BIT;
+                       int c = t / TAG_BIT_PERIOD;

                        
                        

-                       ResetClock();
+                       ResetTimer(timer);

                        legic_prng_forward(c);
                return 0;
         }
     }
 
                        legic_prng_forward(c);
                return 0;
         }
     }
 

-       ResetClock();
+       ResetTimer(timer);

        return -1;
 }
 
        return -1;
 }
 

-int LegicRfReader(int offset, int bytes, int iv) {
-       
-       // ice_legic_setup();
-       // ice_legic_select_card();
-       // return 0;
+int LegicRfReader(uint16_t offset, uint16_t len, uint8_t iv) {

        
        

-       int byte_index = 0, cmd_sz = 0, card_sz = 0;
-
-       iv = (iv <= 0 ) ? SESSION_IV : iv;                                                                                                         
+       len &= 0x3FF;

 
 

+       uint16_t i = 0;
+       uint8_t isOK = 1;
+       legic_card_select_t card;
+       

        LegicCommonInit();
        LegicCommonInit();

-
-       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();
-
-       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);
-                       return -1;
+       
+       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;

 
 

-       perform_setup_phase_rwd(iv);
+       switch_off_tag_rwd();

 
 

-       legic_prng_forward(2);
+       if (len + offset >= card.cardsize)
+               len = card.cardsize - offset;

 
 

+       setup_phase_reader(iv);
+               

        LED_B_ON();
        LED_B_ON();

-       while(byte_index < bytes) {
-               int r = legic_read_byte(byte_index+offset, cmd_sz);
-               if(r == -1 || BUTTON_PRESS()) {                 
-               switch_off_tag_rwd();
-               LEDsoff();
+       while (i < len) {
+               int r = legic_read_byte(offset + i, card.cmdsize);
+               
+               if (r == -1 || BUTTON_PRESS()) {                        

                if ( MF_DBGLEVEL >= 2) DbpString("operation aborted");
                if ( MF_DBGLEVEL >= 2) DbpString("operation aborted");

-                       return -1;
+                       isOK = 0;
+                       goto OUT;

                }
                }

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

         WDT_HIT();
         WDT_HIT();

-               byte_index++;           

        }
 
        }
 

+OUT:   
+       WDT_HIT();

        switch_off_tag_rwd();
        LEDsoff();
        switch_off_tag_rwd();
        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);
+       cmd_send(CMD_ACK,isOK,len,0,cardmem,len);

     return 0;
 }
 
     return 0;
 }
 


@@ -565,7 +538,7 @@ int LegicRfReader(int offset, int bytes, int iv) {
        int byte_index=0;
 
     LED_B_ON();
        int byte_index=0;
 
     LED_B_ON();

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

     //legic_prng_forward(2);
        while(byte_index < bytes) {
                int r;
     //legic_prng_forward(2);
        while(byte_index < bytes) {
                int r;


@@ -602,95 +575,92 @@ int LegicRfReader(int offset, int bytes, int iv) {
     return 0;
 }*/
 
     return 0;
 }*/
 

-void LegicRfWriter(int offset, int bytes, int iv) {
+void LegicRfWriter(uint16_t offset, uint16_t bytes, uint8_t iv) {

 
 

-       int byte_index = 0, addr_sz = 0;
+       int byte_index = 0;  
+       uint8_t isOK = 1;
+       legic_card_select_t card;

        
        

-       iv = (iv <=0 ) ? SESSION_IV : iv;                                                                                 
-

        LegicCommonInit();
        
        LegicCommonInit();
        

-       if ( MF_DBGLEVEL >= 2)  DbpString("setting up legic card");
-       
-       uint32_t tag_type = perform_setup_phase_rwd(iv);
+       if ( legic_select_card_iv(&card, iv) ) {
+               isOK = 0;
+               goto OUT;
+       }

        
        switch_off_tag_rwd();
        
        
        switch_off_tag_rwd();
        

-       switch(tag_type) {
+       switch(card.tagtype) {

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

-                               Dbprintf("Error: can not write to 0x%03.3x on MIM22", offset+bytes);
+                               Dbprintf("Error: can not write to 0x%03.3x on MIM22", offset + bytes);

                                return;
                        }
                                return;
                        }

-                       addr_sz = 5;
-                       if ( MF_DBGLEVEL >= 2) 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) {

-                               Dbprintf("Error: can not write to 0x%03.3x on MIM256", offset+bytes);
+                               Dbprintf("Error: can not write to 0x%03.3x on MIM256", offset + bytes);

                                return;
                        }
                                return;
                        }

-                       addr_sz = 8;
-                       if ( MF_DBGLEVEL >= 2) 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) {

-                       Dbprintf("Error: can not write to 0x%03.3x on MIM1024", offset+bytes);
+                       Dbprintf("Error: can not write to 0x%03.3x on MIM1024", offset + bytes);

                        return;
                }
                        return;
                }

-                       addr_sz = 10;
-                       if ( MF_DBGLEVEL >= 2) 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:
                        break;
                default:

-                       Dbprintf("No or unknown card found, aborting");

             return;
        }
 
     LED_B_ON();
             return;
        }
 
     LED_B_ON();

-       perform_setup_phase_rwd(iv);
+       setup_phase_reader(iv);
+       int r = 0;

        while(byte_index < bytes) {
        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)
 
                //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);
+                       r = legic_write_byte(cardmem[(0x06-byte_index)], (0x06-byte_index), card.addrsize);

 
 

-                       // write second byte on success...
+                       // write second byte on success

                        if(r == 0) {
                                byte_index++;
                        if(r == 0) {
                                byte_index++;

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

                        }
                }
                else {
                        }
                }
                else {

-                       r = legic_write_byte(cardmem[byte_index+offset], byte_index+offset, addr_sz);
+                       r = legic_write_byte(cardmem[byte_index+offset], byte_index+offset, card.addrsize);

                }
                
                }
                

-               if((r != 0) || BUTTON_PRESS()) {
+               if ((r != 0) || BUTTON_PRESS()) {

                        Dbprintf("operation aborted @ 0x%03.3x", byte_index);
                        Dbprintf("operation aborted @ 0x%03.3x", byte_index);

-                       switch_off_tag_rwd();
-                       LEDsoff();
-                       return;
+                       isOK = 0;
+                       goto OUT;

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

-       LEDsoff();
-    if ( MF_DBGLEVEL >= 1) DbpString("write successful");
+
+OUT:
+       cmd_send(CMD_ACK, isOK, 0,0,0,0);
+       switch_off_tag_rwd();
+       LEDsoff();      

 }
 
 }
 

-void LegicRfRawWriter(int address, int byte, int iv) {
+void LegicRfRawWriter(int address, int byte, uint8_t iv) {

 
        int byte_index = 0, addr_sz = 0;
 
        int byte_index = 0, addr_sz = 0;

-                                                                                                 
-       iv = (iv <= 0) ? SESSION_IV : iv;

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

-       uint32_t tag_type = perform_setup_phase_rwd(iv);
+       uint32_t tag_type = setup_phase_reader(iv);

        
        switch_off_tag_rwd();
        
        
        switch_off_tag_rwd();
        


@@ -727,9 +697,8 @@ void LegicRfRawWriter(int address, int byte, int iv) {
        Dbprintf("integer value: %d address: %d  addr_sz: %d", byte, address, addr_sz);
     LED_B_ON();
        
        Dbprintf("integer value: %d address: %d  addr_sz: %d", byte, address, addr_sz);
     LED_B_ON();
        

-       perform_setup_phase_rwd(iv);
-    //legic_prng_forward(2);
-               
+       setup_phase_reader(iv);
+               

        int r = legic_write_byte(byte, address, addr_sz);
                
        if((r != 0) || BUTTON_PRESS()) {
        int r = legic_write_byte(byte, address, addr_sz);
                
        if((r != 0) || BUTTON_PRESS()) {


@@ -743,6 +712,69 @@ void LegicRfRawWriter(int address, int byte, int iv) {
     if ( MF_DBGLEVEL >= 1) DbpString("write successful");
 }
 
     if ( MF_DBGLEVEL >= 1) DbpString("write successful");
 }
 

+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(p_card->tagtype) {
+               case 0x0d:
+            p_card->cmdsize = 6;
+                       p_card->addrsize = 5;
+                       p_card->cardsize = 22;
+                       break;
+               case 0x1d:
+                       p_card->cmdsize = 9;
+                       p_card->addrsize = 8;
+                       p_card->cardsize = 256;
+                       break;
+               case 0x3d:
+            p_card->cmdsize = 11;
+                       p_card->addrsize = 10;
+                       p_card->cardsize = 1024;
+                       break;
+               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);
+}
+
+void LegicRfInfo(void){
+
+       uint8_t buf[sizeof(legic_card_select_t)] = {0x00};
+       legic_card_select_t *card = (legic_card_select_t*) buf;
+       
+       LegicCommonInit();
+
+       if ( legic_select_card(card) ) {
+               cmd_send(CMD_ACK,0,0,0,0,0);
+               goto OUT;
+       }
+
+       // read UID bytes
+       for ( uint8_t i = 0; i < sizeof(card->uid); ++i) {
+               int 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;
+       }
+
+       cmd_send(CMD_ACK, 1, 0, 0, buf, sizeof(legic_card_select_t));
+       
+OUT:
+       switch_off_tag_rwd();
+       LEDsoff();
+}
+

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


@@ -755,21 +787,19 @@ static void frame_handle_tag(struct legic_frame const * const f)
 
         LED_C_ON();
         
 
         LED_C_ON();
         

-               prng_timer->TC_CCR = AT91C_TC_SWTRG;
-               while(prng_timer->TC_CV > 1) ;
+               // Reset prng timer
+               ResetTimer(prng_timer);

                
         legic_prng_init(f->data);
                
         legic_prng_init(f->data);

-        frame_send_tag(0x3d, 6, 1); /* 0x3d^0x26 = 0x1b */
+        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;
  
         legic_state = STATE_IV;
         legic_read_count = 0;
         legic_prng_bc = 0;
         legic_prng_iv = f->data;
  

-        /* TIMEOUT */
-               ResetClock();
-               
-        //while(timer->TC_CV < 280);
-               WAIT(280)
+ 
+               ResetTimer(timer);
+               WaitUS(280);

         return;
    }
 
         return;
    }
 


@@ -780,14 +810,11 @@ static void frame_handle_tag(struct legic_frame const * const f)
       if((f->bits == 6) && (f->data == xored)) {
          legic_state = STATE_CON;
 
       if((f->bits == 6) && (f->data == xored)) {
          legic_state = STATE_CON;
 

-         /* TIMEOUT */
-                ResetClock();
-                
-         //while(timer->TC_CV < 200);
-                WAIT(200)
-                
+                ResetTimer(timer);
+                WaitUS(200);

          return;
          return;

-      } else {
+
+        } else {

          legic_state = STATE_DISCON;
          LED_C_OFF();
          Dbprintf("iv: %02x frame: %02x key: %02x xored: %02x", legic_prng_iv, f->data, local_key, xored);
          legic_state = STATE_DISCON;
          LED_C_OFF();
          Dbprintf("iv: %02x frame: %02x key: %02x xored: %02x", legic_prng_iv, f->data, local_key, xored);


@@ -801,7 +828,7 @@ static void frame_handle_tag(struct legic_frame const * const f)
          int key   = get_key_stream(2, 11); //legic_phase_drift, 11);
          int addr  = f->data ^ key; addr = addr >> 1;
          int data = BigBuf[addr];
          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 hash = legic4Crc(LEGIC_READ, addr, data, 11) << 8;

          BigBuf[OFFSET_LOG+legic_read_count] = (uint8_t)addr;
          legic_read_count++;
 
          BigBuf[OFFSET_LOG+legic_read_count] = (uint8_t)addr;
          legic_read_count++;
 


@@ -810,13 +837,9 @@ 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);
 

-         /* TIMEOUT */
-                ResetClock();
-                
+                ResetTimer(timer);

          legic_prng_forward(2);
          legic_prng_forward(2);

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

          return;
       }
    }
          return;
       }
    }


@@ -912,7 +935,7 @@ void LegicRfSimulate(int phase, int frame, int reqresp)
        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;
 

-       setup_timer();
+       //setup_timer();

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


@@ -967,10 +990,6 @@ void LegicRfSimulate(int phase, int frame, int reqresp)
        LEDsoff();
 }
 
        LEDsoff();
 }
 

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

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


@@ -1062,6 +1081,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,


@@ -1076,7 +1096,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).


@@ -1201,20 +1221,18 @@ static struct {
 
        // return FALSE;
 // }
 
        // return FALSE;
 // }

+/*

 
 

-
-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();
 // }


@@ -1225,7 +1243,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,


@@ -1244,7 +1262,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
  *


@@ -1259,32 +1277,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;


@@ -1439,7 +1433,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;


@@ -1450,20 +1445,24 @@ 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) {
        Demod.output = data;
        DemodReset();
 }
 }
 
 static void DemodInit(uint8_t *data) {
        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;


@@ -1538,9 +1537,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;


@@ -1587,12 +1590,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;


@@ -1624,11 +1628,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();


@@ -1638,59 +1643,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_clean(&current_frame);
-       //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);
-       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.


@@ -1710,7 +1665,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();
        


@@ -1719,4 +1674,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