CHG: libcurses

[proxmark3-svn] / armsrc / legicrf.c

diff --git a/armsrc/legicrf.c b/armsrc/legicrf.c
index b1c6b1964103bd92666414bdcbf4c4703d44a1f9..1b068404296892aee0eb1fd74cef54cb4af326d3 100644 (file)
--- a/armsrc/legicrf.c
+++ b/armsrc/legicrf.c
@@ -279,13 +279,8 @@ static void frame_receiveAsReader(struct legic_frame * const f, uint8_t 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 );
-//     }
+       // its about 9+9 ticks delay from end-send to here.
+       WaitTicks( 477 );
 
        next_bit_at = GET_TICKS + TAG_BIT_PERIOD;
 
@@ -324,7 +319,7 @@ 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);   
+       WaitUS(5000);   
        
        ResetTicks();
        
@@ -370,7 +365,7 @@ static void LegicCommonInit(void) {
        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);
+       cardmem = BigBuf_get_EM_addr();
        memset(cardmem, 0x00, LEGIC_CARD_MEMSIZE);
 
        clear_trace();
@@ -400,9 +395,10 @@ int legic_read_byte( uint16_t index, uint8_t cmd_sz) {
        uint8_t byte, crc, calcCrc = 0;
        uint32_t cmd = (index << 1) | LEGIC_READ;
 
-       //WaitTicks(366); 
-       WaitTicks(330); 
-       //WaitTicks(50);
+       //WaitTicks(330); // (4)
+       WaitTicks(240); // (3)
+       //WaitTicks(230); //(2)
+       //WaitTicks(60); //(1)
        
        frame_sendAsReader(cmd, cmd_sz);
        frame_receiveAsReader(&current_frame, 12);
@@ -417,7 +413,7 @@ int legic_read_byte( uint16_t index, uint8_t cmd_sz) {
                return -1;
        }
 
-       legic_prng_forward(4);
+       legic_prng_forward(3);
        return byte;
 }
 
@@ -438,11 +434,11 @@ int legic_write_byte(uint8_t byte, uint16_t addr, uint8_t addr_sz) {
        crc_update(&legic_crc, addr, addr_sz);
        crc_update(&legic_crc, byte, 8);
        uint32_t crc = crc_finish(&legic_crc);
-
        uint32_t crc2 = legic4Crc(LEGIC_WRITE, addr, byte, addr_sz+1);
-       if ( crc != crc2 ) 
+       if ( crc != crc2 ) {
                Dbprintf("crc is missmatch");
-       
+               return 1;
+       }
        // send write command
        uint32_t cmd = ((crc     <<(addr_sz+1+8)) //CRC
                    |(byte    <<(addr_sz+1))   //Data
@@ -453,11 +449,10 @@ int legic_write_byte(uint8_t byte, uint16_t addr, uint8_t addr_sz) {
 
     legic_prng_forward(2); /* we wait anyways */
        
-       WaitUS(TAG_FRAME_WAIT);
+       WaitTicks(330);
        
        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;
 
@@ -471,13 +466,13 @@ int legic_write_byte(uint8_t byte, uint16_t addr, uint8_t addr_sz) {
         edges = 0;
                next_bit_at += TAG_BIT_PERIOD;
         while(timer->TC_CV < next_bit_at) {
-            int level = (AT91C_BASE_PIOA->PIO_PDSR & GPIO_SSC_DIN);
+            volatile uint32_t level = (AT91C_BASE_PIOA->PIO_PDSR & GPIO_SSC_DIN);
             if(level != old_level)
                 edges++;
 
             old_level = level;
         }
-        if(edges > 20 && edges < 60) { /* expected are 42 edges */
+        if(edges > 20 ) { /* expected are 42 edges */
                        int t = timer->TC_CV;
                        int c = t / TAG_BIT_PERIOD;
                        
@@ -493,8 +488,6 @@ int legic_write_byte(uint8_t byte, uint16_t addr, uint8_t addr_sz) {
 
 int LegicRfReader(uint16_t offset, uint16_t len, uint8_t iv) {
        
-       len &= 0x3FF;
-
        uint16_t i = 0;
        uint8_t isOK = 1;
        legic_card_select_t card;
@@ -530,7 +523,7 @@ OUT:
        WDT_HIT();
        switch_off_tag_rwd();
        LEDsoff();
-       cmd_send(CMD_ACK,isOK,len,0,cardmem,len);
+       cmd_send(CMD_ACK, isOK, len, 0, cardmem, len);
     return 0;
 }
 
@@ -618,6 +611,7 @@ void LegicRfWriter(uint16_t offset, uint16_t bytes, uint8_t iv) {
 
     LED_B_ON();
        setup_phase_reader(iv);
+       
        int r = 0;
        while(byte_index < bytes) {