]> git.zerfleddert.de Git - proxmark3-svn/blobdiff - armsrc/legicrf.c
CHG: removed some debug data
[proxmark3-svn] / armsrc / legicrf.c
index 7a156f69fc8bc9803524beea1c7c8428e48649a7..65e4b3e66d9442792d9932377be577afbab7415c 100644 (file)
@@ -10,7 +10,7 @@
 #include "legicrf.h"
 
 static struct legic_frame {
-       int bits;
+       uint8_t bits;
        uint32_t data;
 } current_frame;
 
@@ -68,15 +68,11 @@ static void setup_timer(void) {
 */
 
 // At TIMER_CLOCK3 (MCK/32)
-//#define RWD_TIME_1 150     /* RWD_TIME_PAUSE off, 80us on = 100us */
-//#define RWD_TIME_0 90      /* RWD_TIME_PAUSE off, 40us on = 60us */
-//#define RWD_TIME_PAUSE 30  /* 20us */
-
 // testing calculating in (us) microseconds.
 #define        RWD_TIME_1 120          // READER_TIME_PAUSE 20us off, 80us on = 100us  80 * 1.5 == 120ticks
 #define RWD_TIME_0 60          // READER_TIME_PAUSE 20us off, 40us on = 60us   40 * 1.5 == 60ticks 
 #define RWD_TIME_PAUSE 30      // 20us == 20 * 1.5 == 30ticks */
-#define TAG_BIT_PERIOD 150     // 100us == 100 * 1.5 == 150ticks
+#define TAG_BIT_PERIOD 143     // 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
@@ -225,7 +221,6 @@ void frame_sendAsReader(uint32_t data, uint8_t bits){
 
        uint32_t starttime = GET_TICKS, send = 0;
        uint16_t mask = 1;
-       uint8_t prngstart = legic_prng_count() ;
        
        // xor lsfr onto data.
        send = data ^ legic_prng_get_bits(bits);
@@ -247,9 +242,7 @@ void frame_sendAsReader(uint32_t data, uint8_t bits){
                BYTEx(data, 0), 
                BYTEx(data, 1),
                BYTEx(send, 0), 
-               BYTEx(send, 1),
-               prngstart,
-               legic_prng_count()
+               BYTEx(send, 1)
        };
        LogTrace(cmdbytes, sizeof(cmdbytes), starttime, sendFrameStop, NULL, TRUE);
 }
@@ -282,7 +275,7 @@ static void frame_receiveAsReader(struct legic_frame * const f, uint8_t bits) {
        
        uint8_t i = bits, edges = 0;    
        uint16_t lsfr = 0;
-       uint32_t the_bit = 1, next_bit_at = 0, data;
+       uint32_t the_bit = 1, next_bit_at = 0, data = 0;
        
        int old_level = 0, level = 0;
        
@@ -290,26 +283,16 @@ static void frame_receiveAsReader(struct legic_frame * const f, uint8_t bits) {
        AT91C_BASE_PIOA->PIO_PER = GPIO_SSC_DIN;
        
        // calibrate the prng.
-       // 
        legic_prng_forward(2);
-       
-       // precompute the cipher
-       uint8_t prngstart =  legic_prng_count() ;
-
        data = lsfr = legic_prng_get_bits(bits);
        
        //FIXED time between sending frame and now listening frame. 330us
-       // 387 = 0x19  0001 1001
-       // 480 = 0x19
-       // 500 = 0x1C  0001 1100
        uint32_t starttime = GET_TICKS;
        //uint16_t mywait =  TAG_FRAME_WAIT - (starttime - sendFrameStop);
-       //uint16_t mywait =  495 - (starttime - sendFrameStop);
        if ( bits == 6) {
-               //Dbprintf("6 WAIT %d", 495 - 9 - 9 );
-               WaitTicks( 495 - 9 - 9 );
+               //WaitTicks( 495 - 9 - 9 );
+               WaitTicks( 475 );
        } else {
-               //Dbprintf("x WAIT %d", mywait );
                //WaitTicks( mywait );
                WaitTicks( 450 );
        }
@@ -318,7 +301,6 @@ static void frame_receiveAsReader(struct legic_frame * const f, uint8_t bits) {
 
        while ( i-- ){
                edges = 0;
-               uint8_t adjust = 0;
                while  ( GET_TICKS < next_bit_at) {
 
                        level = (AT91C_BASE_PIOA->PIO_PDSR & GPIO_SSC_DIN);
@@ -327,17 +309,11 @@ static void frame_receiveAsReader(struct legic_frame * const f, uint8_t bits) {
                                ++edges;
                        
                        old_level = level;
-                       
-                       if(edges > 20 && adjust == 0) {
-                               next_bit_at -= 15;
-                               adjust = 1;
-                       }
                }               
 
                next_bit_at += TAG_BIT_PERIOD;
                
                // We expect 42 edges  == ONE
-               //if (edges > 20 && edges < 64)
                if ( edges > 20 )
                        data ^= the_bit;
 
@@ -348,15 +324,8 @@ static void frame_receiveAsReader(struct legic_frame * const f, uint8_t bits) {
        f->data = data;
        f->bits = bits;
        
-       uint8_t cmdbytes[] = {
-               bits,
-               BYTEx(data,0),
-               BYTEx(data,1),
-               BYTEx(data, 0) ^ BYTEx(lsfr,0),
-               BYTEx(data, 1) ^ BYTEx(lsfr,1),
-               prngstart,
-               legic_prng_count()
-       };
+       //log
+       uint8_t cmdbytes[] = {bits,     BYTEx(data, 0), BYTEx(data, 1)};
        LogTrace(cmdbytes, sizeof(cmdbytes), starttime, GET_TICKS, NULL, FALSE);
 }
 
@@ -380,9 +349,10 @@ static uint32_t setup_phase_reader(uint8_t iv) {
 
        frame_receiveAsReader(&current_frame, 6);
 
-       // fixed delay before sending ack.
-       WaitTicks(366);  // 244us
-       legic_prng_forward(1);  //240us / 100 == 2.4 iterations
+       // 292us (438t) - fixed delay before sending ack.
+       // minus log and stuff 100tick?
+       WaitTicks(338);
+       legic_prng_forward(3); 
        
        // Send obsfuscated acknowledgment frame.
        // 0x19 = 0x18 MIM22, 0x01 LSB READCMD 
@@ -393,6 +363,8 @@ static uint32_t setup_phase_reader(uint8_t iv) {
                case 0x3D: frame_sendAsReader(0x39, 6); break;
                default: break;
        }
+
+       legic_prng_forward(2);
        return current_frame.data;
 }
 
@@ -423,18 +395,13 @@ static void switch_off_tag_rwd(void) {
        LOW(GPIO_SSC_DOUT);
        WaitUS(20);
        WDT_HIT();
-       set_tracing(FALSE);
 }
 
 // calculate crc4 for a legic READ command 
-// 5,8,10 address size.
 static uint32_t legic4Crc(uint8_t legicCmd, uint16_t byte_index, uint8_t value, uint8_t cmd_sz) {
        crc_clear(&legic_crc);  
-       //uint32_t temp =  (value << cmd_sz) | (byte_index << 1) | legicCmd;
-       //crc_update(&legic_crc, temp, cmd_sz + 8 );
-       crc_update(&legic_crc, 1, 1); /* CMD_READ */
-       crc_update(&legic_crc, byte_index, cmd_sz-1);
-       crc_update(&legic_crc, value, 8);
+       uint32_t temp =  (value << cmd_sz) | (byte_index << 1) | legicCmd;
+       crc_update(&legic_crc, temp, cmd_sz + 8 );
        return crc_finish(&legic_crc);
 }
 
@@ -442,20 +409,14 @@ int legic_read_byte(int byte_index, int cmd_sz) {
 
        uint8_t byte = 0, crc = 0, calcCrc = 0;
        uint32_t cmd = (byte_index << 1) | LEGIC_READ;
-       
-       // (us)| ticks
-       // -------------
-       // 330 | 495
-       // 460 | 690
-       // 258 | 387
-       // 244 | 366
-       WaitTicks(387); 
-       legic_prng_forward(4); // 460 / 100 = 4.6  iterations
+
+       WaitTicks(366); 
        
        frame_sendAsReader(cmd, cmd_sz);
        frame_receiveAsReader(&current_frame, 12);
 
        byte = BYTEx(current_frame.data, 0);
+
        calcCrc = legic4Crc(LEGIC_READ, byte_index, byte, cmd_sz);
        crc = BYTEx(current_frame.data, 1);
 
@@ -463,6 +424,9 @@ int legic_read_byte(int byte_index, int cmd_sz) {
                Dbprintf("!!! crc mismatch: expected %x but got %x !!!",  calcCrc, crc);
                return -1;
        }
+
+       legic_prng_forward(4);
+       WaitTicks(40);
        return byte;
 }
 
@@ -539,56 +503,37 @@ int legic_write_byte(uint8_t byte, uint16_t addr, uint8_t addr_sz) {
 int LegicRfReader(int offset, int bytes, int iv) {
        
        uint16_t byte_index = 0;
-       uint8_t cmd_sz = 0, isOK = 1;
-       int card_sz = 0;
-
-       LegicCommonInit();
-
-       uint32_t tag_type = setup_phase_reader(iv);
+       uint8_t isOK = 1;
+       legic_card_select_t card;
        
-       switch_off_tag_rwd();
+       LegicCommonInit();
        
-       switch(tag_type) {
-               case 0x0d:
-                       if ( MF_DBGLEVEL >= 2) DbpString("MIM22 card found, reading card");
-            cmd_sz = 6;
-                       card_sz = 22;
-                       break;
-               case 0x1d:
-                       if ( MF_DBGLEVEL >= 2) DbpString("MIM256 card found, reading card");
-            cmd_sz = 9;
-                       card_sz = 256;
-                       break;
-               case 0x3d:
-                       if ( MF_DBGLEVEL >= 2) DbpString("MIM1024 card found, reading card");
-            cmd_sz = 11;
-                       card_sz = 1024;
-                       break;
-               default:
-                       if ( MF_DBGLEVEL >= 1) Dbprintf("Unknown card format: %x", tag_type);
-                       isOK = 0;
-                       goto OUT;
-                       break;
+       if ( legic_select_card(&card) ) {
+               isOK = 0;
+               goto OUT;
        }
+
+       switch_off_tag_rwd();
+
        if (bytes == -1)
-               bytes = card_sz;
+               bytes = card.cardsize;
 
-       if (bytes + offset >= card_sz)
-               bytes = card_sz - offset;
+       if (bytes + offset >= card.cardsize)
+               bytes = card.cardsize - offset;
 
        // Start setup and read bytes.
        setup_phase_reader(iv);
-       
+               
        LED_B_ON();
        while (byte_index < bytes) {
-               int r = legic_read_byte(byte_index + offset, cmd_sz);
+               int r = legic_read_byte(byte_index + offset, card.cmdsize);
                
                if (r == -1 || BUTTON_PRESS()) {                        
                if ( MF_DBGLEVEL >= 3) DbpString("operation aborted");
                        isOK = 0;
                        goto OUT;
                }
-               cardmem[++byte_index] = r;
+               cardmem[byte_index++] = r;
         WDT_HIT();
        }
 
@@ -778,47 +723,61 @@ void LegicRfRawWriter(int address, int byte, int iv) {
     if ( MF_DBGLEVEL >= 1) DbpString("write successful");
 }
 
-void LegicRfInfo(void){
+int legic_select_card(legic_card_select_t *p_card){
 
-       LegicCommonInit();
-       uint32_t tag_type = setup_phase_reader(0x55);
-       uint8_t cmd_sz = 0;
-       uint16_t card_sz = 0;
+       if ( p_card == NULL ) return 1;
        
-       switch(tag_type) {
+       p_card->tagtype = setup_phase_reader(0x1);
+       
+       switch(p_card->tagtype) {
                case 0x0d:
-            cmd_sz = 6;
-                       card_sz = 22;
+            p_card->cmdsize = 6;
+                       p_card->cardsize = 22;
                        break;
                case 0x1d:
-                       cmd_sz = 9;
-                       card_sz = 256;
+                       p_card->cmdsize = 9;
+                       p_card->cardsize = 256;
                        break;
                case 0x3d:
-            cmd_sz = 11;
-                       card_sz = 1024;
+            p_card->cmdsize = 11;
+                       p_card->cardsize = 1024;
                        break;
                default: 
-                       cmd_send(CMD_ACK,0,0,0,0,0);
-                       goto OUT;
+                   p_card->cmdsize = 0;
+                       p_card->cardsize = 0;
+                       return 2;
+                       break;
+       }
+       return 0;
+}
+
+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.
-       uint8_t uid[] = {0,0,0,0};
-       for ( uint8_t i = 0; i < sizeof(uid); ++i) {
-               int r = legic_read_byte(i, cmd_sz);
+       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;
                }
-               uid[i] = r & 0xFF;
+               card->uid[i] = r & 0xFF;
        }
 
-       cmd_send(CMD_ACK,1,card_sz,0,uid,sizeof(uid));
-out:   
+       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
@@ -1127,6 +1086,7 @@ void LegicRfSimulate(int phase, int frame, int reqresp)
 // The software UART that receives commands from the reader, and its state
 // variables.
 //-----------------------------------------------------------------------------
+/*
 static struct {
        enum {
                STATE_UNSYNCD,
@@ -1141,7 +1101,7 @@ static struct {
        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).
@@ -1266,7 +1226,7 @@ static struct {
 
        // return FALSE;
 // }
-
+/*
 
 static void UartReset() {
        Uart.byteCntMax = 3;
@@ -1276,7 +1236,7 @@ static void UartReset() {
        Uart.posCnt = 0;
        memset(Uart.output, 0x00, 3);
 }
-
+*/
 // static void UartInit(uint8_t *data) {
        // Uart.output = data;
        // UartReset();
@@ -1288,7 +1248,7 @@ static void UartReset() {
 // tag's response, which we leave in the buffer to be demodulated on the
 // PC side.
 //=============================================================================
-
+/*
 static struct {
        enum {
                DEMOD_UNSYNCD,
@@ -1307,7 +1267,7 @@ static struct {
        int     sumI;
        int     sumQ;
 } Demod;
-
+*/
 /*
  * Handles reception of a bit from the tag
  *
@@ -1322,32 +1282,8 @@ static struct {
  *          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;
@@ -1502,7 +1438,8 @@ static RAMFUNC int HandleLegicSamplesDemod(int ci, int cq)
        }
        return FALSE;
 }
-
+*/
+/*
 // Clear out the state of the "UART" that receives from the tag.
 static void DemodReset() {
        Demod.len = 0;
@@ -1520,13 +1457,17 @@ 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
  */
+ /*
  #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;
@@ -1601,9 +1542,13 @@ static void GetSamplesForLegicDemod(int n, bool quiet)
                LogTrace(Demod.output, Demod.len, 0, 0, parity, FALSE);
        }
 }
+
+*/
+
 //-----------------------------------------------------------------------------
 // Transmit the command (to the tag) that was placed in ToSend[].
 //-----------------------------------------------------------------------------
+/*
 static void TransmitForLegic(void)
 {
        int c;
@@ -1650,12 +1595,13 @@ static void TransmitForLegic(void)
        }
        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().
 //-----------------------------------------------------------------------------
+/*
 static void CodeLegicBitsAsReader(const uint8_t *cmd, uint8_t cmdlen, int bits)
 {
        int i, j;
@@ -1687,11 +1633,12 @@ static void CodeLegicBitsAsReader(const uint8_t *cmd, uint8_t cmdlen, int bits)
        // Convert from last character reference to length
        ++ToSendMax;
 }
-
+*/
 /**
   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();
@@ -1701,8 +1648,9 @@ static void CodeAndTransmitLegicAsReader(const uint8_t *cmd, uint8_t cmdlen, int
        }
 }
 
-
+*/
 // Set up LEGIC communication
+/*
 void ice_legic_setup() {
 
        // standard things.
@@ -1731,4 +1679,5 @@ void ice_legic_setup() {
 
        // initalize prng
        legic_prng_init(0);
-}
\ No newline at end of file
+}
+*/
\ No newline at end of file
Impressum, Datenschutz