replaced obsolete config options with current

[proxmark3-svn] / armsrc / legicrf.c

diff --git a/armsrc/legicrf.c b/armsrc/legicrf.c
index a8c0cd114b39c447bb825ec8af10e62370984dec..86c0c3604f1b6074e1f07f0aaf74d367b12910b7 100644 (file)
--- a/armsrc/legicrf.c
+++ b/armsrc/legicrf.c
@@ -40,45 +40,6 @@ 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)))
 

-static const struct legic_frame queries[] = {
-               {7, 0x55}, /* 1010 101 */
-};
-
-static const struct legic_frame responses[] = {
-               {6, 0x3b}, /* 1101 11 */
-};
-
-/* 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)
-{
-#if 0
-       /* Use the SSC to send a response. 8-bit transfers, LSBit first, 100us per bit */
-#else 
-       /* 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;
-       
-       /* Wait for the frame start */
-       while(timer->TC_CV < TAG_TIME_WAIT) ;
-       
-       int i;
-       for(i=0; i<bits; i++) {
-               int nextbit = timer->TC_CV + TAG_TIME_BIT;
-               int bit = response & 1;
-               response = 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) ;
-       }
-       AT91C_BASE_PIOA->PIO_CODR = GPIO_SSC_DOUT;
-#endif
-}
-

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


@@ -119,6 +80,7 @@ static void frame_send_rwd(uint16_t data, int bits)
        
        /* Reset the timer, to measure time until the start of the tag frame */
        timer->TC_CCR = AT91C_TC_SWTRG;
        
        /* 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 */

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


@@ -179,56 +141,10 @@ static void frame_receive_rwd(struct legic_frame * const f, int bits)
        
        f->data = data;
        f->bits = bits;
        
        f->data = data;
        f->bits = bits;

-}
-
-/* Figure out a response to a frame in tag mode */
-static void frame_respond_tag(struct legic_frame const * const f)
-{
-       LED_D_ON();
-       int i, r_size;
-       uint16_t r_data;

        
        

-       for(i=0; i<sizeof(queries)/sizeof(queries[0]); i++) {
-               if(f->bits == queries[i].bits && f->data == queries[i].data) {
-                       r_data = responses[i].data;
-                       r_size = responses[i].bits;
-                       break;
-               }
-       }
-       
-       if(r_size != 0) {
-               frame_send_tag(r_data, r_size);
-               LED_A_ON();
-       } else {
-               LED_A_OFF();
-       }
-       
-       LED_D_OFF();
-}
-
-static void frame_append_bit(struct legic_frame * const f, int bit)
-{
-       if(f->bits >= 15)
-               return; /* Overflow, won't happen */
-       f->data |= (bit<<f->bits);
-       f->bits++;
-}
-
-static int frame_is_empty(struct legic_frame const * const f)
-{
-       return( f->bits <= 4 );
-}
-
-/* Handle (whether to respond) a frame in tag mode */
-static void frame_handle_tag(struct legic_frame const * const f)
-{
-       if(f->bits == 6) {
-               /* Short path */
-               return;
-       }
-       if( !frame_is_empty(f) ) {
-               frame_respond_tag(f);
-       }
+       /* 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 */

 }
 
 static void frame_clean(struct legic_frame * const f)
 }
 
 static void frame_clean(struct legic_frame * const f)


@@ -237,90 +153,29 @@ static void frame_clean(struct legic_frame * const f)
        f->bits = 0;
 }
 
        f->bits = 0;
 }
 

-enum emit_mode { 
-       EMIT_RWD, /* Emit in tag simulation mode, e.g. the source is the RWD */
-       EMIT_TAG  /* Emit in reader simulation mode, e.g. the source is the TAG */
-}; 
-static void emit(enum emit_mode mode, int bit)
-{
-       if(bit == -1) {
-               if(mode == EMIT_RWD) {
-                       frame_handle_tag(&current_frame);
-               }
-               frame_clean(&current_frame);
-       } else if(bit == 0) {
-               frame_append_bit(&current_frame, 0);
-       } else if(bit == 1) {
-               frame_append_bit(&current_frame, 1);
-       }
-}
-
-void LegicRfSimulate(void)
+static uint16_t perform_setup_phase_rwd(void)

 {
 {

-       /* ADC path high-frequency peak detector, FPGA in high-frequency simulator mode, 
-        * modulation mode set to 212kHz subcarrier. We are getting the incoming raw
-        * envelope waveform on DIN and should send our response on DOUT.
-        * 
-        * The LEGIC RF protocol is pulse-pause-encoding from reader to card, so we'll
-        * measure the time between two rising edges on DIN, and no encoding on the
-        * subcarrier from card to reader, so we'll just shift out our verbatim data
-        * on DOUT, 1 bit is 100us. The time from reader to card frame is still unclear,
-        * seems to be 300us-ish.
-        */
-       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;
+       /* Switch on carrier and let the tag charge for 1ms */
+       AT91C_BASE_PIOA->PIO_SODR = GPIO_SSC_DOUT;
+       SpinDelay(1);

        
        

-       setup_timer();
+       frame_send_rwd(0x55, 7);
+       frame_clean(&current_frame);
+       frame_receive_rwd(&current_frame, 6);
+       while(timer->TC_CV < 387) ; /* ~ 258us */
+       frame_send_rwd(0x019, 6);

        
        

-       int old_level = 0;
-       int active = 0;
+       return current_frame.data ^ 0x26;
+}
+
+static void switch_off_tag_rwd(void)
+{
+       /* Switch off carrier, make sure tag is reset */
+       AT91C_BASE_PIOA->PIO_CODR = GPIO_SSC_DOUT;
+       SpinDelay(10);

        
        

-       while(!BUTTON_PRESS()) {
-               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(EMIT_RWD, 1);
-                                       active = 1;
-                                       LED_B_ON();
-                               } else if(FUZZ_EQUAL(time, RWD_TIME_0, RWD_TIME_FUZZ)) {
-                                       /* 0 bit */
-                                       emit(EMIT_RWD, 0);
-                                       active = 1;
-                                       LED_B_ON();
-                               } else if(active) {
-                                       /* invalid */
-                                       emit(EMIT_RWD, -1);
-                                       active = 0;
-                                       LED_B_OFF();
-                               }
-                       }
-               }
-               
-               if(time >= (RWD_TIME_1+RWD_TIME_FUZZ) && active) {
-                       /* Frame end */
-                       emit(EMIT_RWD, -1);
-                       active = 0;
-                       LED_B_OFF();
-               }
-               
-               if(time >= (20*RWD_TIME_1) && (timer->TC_SR & AT91C_TC_CLKSTA)) {
-                       timer->TC_CCR = AT91C_TC_CLKDIS;
-               }
-               
-               
-               old_level = level;
-               WDT_HIT();
-       }
+       WDT_HIT();

 }
 
 void LegicRfReader(void)
 }
 
 void LegicRfReader(void)


@@ -336,25 +191,62 @@ void LegicRfReader(void)
        
        setup_timer();
        
        
        setup_timer();
        

-       while(!BUTTON_PRESS()) {
-               /* Switch on carrier and let the tag charge for 1ms */
-               AT91C_BASE_PIOA->PIO_SODR = GPIO_SSC_DOUT;
-               SpinDelay(1);
-               
-               LED_A_ON();
-               frame_send_rwd(queries[0].data, queries[0].bits);
-               LED_A_OFF();
+       memset(BigBuf, 0, 1024);
+       
+       int byte_index = 0, card_size = 0, command_size = 0;
+       uint16_t command_obfuscation = 0x57, response_obfuscation = 0;
+       uint16_t tag_type = perform_setup_phase_rwd();
+       switch_off_tag_rwd();
+       
+       int error = 0;
+       switch(tag_type) {
+       case 0x1d:
+               DbpString("MIM 256 card found, reading card ...");
+               command_size = 9;
+               card_size = 256;
+               response_obfuscation = 0x52;
+               break;
+       case 0x3d:
+               DbpString("MIM 1024 card found, reading card ...");
+               command_size = 11;
+               card_size = 1024;
+               response_obfuscation = 0xd4;
+               break;
+       default:
+               DbpString("No or unknown card found, aborting");
+               error = 1;
+               break;
+       }
+       
+       LED_B_ON();
+       while(!BUTTON_PRESS() && (byte_index<card_size)) {
+               if(perform_setup_phase_rwd() != tag_type) {
+                       DbpString("Card removed, aborting");
+                       switch_off_tag_rwd();
+                       error=1;
+                       break;
+               }

                
                

+               while(timer->TC_CV < 387) ; /* ~ 258us */
+               frame_send_rwd(command_obfuscation ^ (byte_index<<1), command_size);

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

-               LED_B_ON();
-               frame_receive_rwd(&current_frame, responses[0].bits);
-               LED_B_OFF();
+               frame_receive_rwd(&current_frame, 8);
+               ((uint8_t*)BigBuf)[byte_index] = (current_frame.data ^ response_obfuscation) & 0xff;

                
                

-               /* Switch off carrier, make sure tag is reset */
-               AT91C_BASE_PIOA->PIO_CODR = GPIO_SSC_DOUT;
-               SpinDelay(10);
+               switch_off_tag_rwd();

                
                WDT_HIT();
                
                WDT_HIT();

+               byte_index++;
+               if(byte_index & 0x04) LED_C_ON(); else LED_C_OFF();
+       }
+       LED_B_OFF();
+       LED_C_OFF();
+       
+       if(!error) {
+               if(card_size == 256) {
+                       DbpString("Card read, use hexsamples 256 to view results");
+               } else if(card_size == 1024) {
+                       DbpString("Card read, use hexsamples 1024 to view results");
+               }

        }
        }

-       

 }
 }