From 1d99b0df4a0c1a2f42fe23ae32cc8f3d090bc985 Mon Sep 17 00:00:00 2001 From: "henryk@ploetzli.ch" Date: Mon, 28 Dec 2009 18:18:25 +0000 Subject: [PATCH] Remove LEGIC RF tag emulation code since it's useless without keystream generator --- armsrc/appmain.c | 4 -- armsrc/legicrf.c | 175 ----------------------------------------------- client/command.c | 8 --- 3 files changed, 187 deletions(-) diff --git a/armsrc/appmain.c b/armsrc/appmain.c index 84b0954e..9026f721 100644 --- a/armsrc/appmain.c +++ b/armsrc/appmain.c @@ -621,10 +621,6 @@ void UsbPacketReceived(BYTE *packet, int len) break; #endif - case CMD_SIMULATE_TAG_LEGIC_RF: - LegicRfSimulate(); - break; - case CMD_MEASURE_ANTENNA_TUNING: MeasureAntennaTuning(); break; diff --git a/armsrc/legicrf.c b/armsrc/legicrf.c index bb0badb0..7c3460af 100644 --- 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))) -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; iTC_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 */ @@ -181,148 +142,12 @@ static void frame_receive_rwd(struct legic_frame * const f, int bits) 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=0; - uint16_t r_data=0; - - for(i=0; ibits == 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<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); - } -} - static void frame_clean(struct legic_frame * const f) { f->data = 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(¤t_frame); - } - frame_clean(¤t_frame); - } else if(bit == 0) { - frame_append_bit(¤t_frame, 0); - } else if(bit == 1) { - frame_append_bit(¤t_frame, 1); - } -} - -void LegicRfSimulate(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; - - setup_timer(); - - int old_level = 0; - int active = 0; - - 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(); - } -} - void LegicRfReader(void) { SetAdcMuxFor(GPIO_MUXSEL_HIPKD); diff --git a/client/command.c b/client/command.c index 3370748e..3b4c147f 100644 --- a/client/command.c +++ b/client/command.c @@ -202,12 +202,6 @@ static void CmdHi14asnoop(char *str) SendCommand(&c); } -static void CmdLegicRfSim(char *str) -{ - UsbCommand c={CMD_SIMULATE_TAG_LEGIC_RF}; - SendCommand(&c); -} - static void CmdLegicRfRead(char *str) { UsbCommand c={CMD_READER_LEGIC_RF}; @@ -2846,7 +2840,6 @@ static struct { {"indalademod", CmdIndalademod, 0, "['224'] -- Demodulate samples for Indala 64 bit UID (option '224' for 224 bit)"}, {"lcd", CmdLcd, 0, " -- Send command/data to LCD"}, {"lcdreset", CmdLcdReset, 0, "Hardware reset LCD"}, - {"legicrfsim", CmdLegicRfSim, 0, "Start the LEGIC RF tag simulator"}, {"legicrfread", CmdLegicRfRead, 0, "Start the LEGIC RF reader"}, {"load", CmdLoad, 1, " -- Load trace (to graph window"}, {"locomread", CmdLoCommandRead, 0, " <'0' period> <'1' period> ['h'] -- Modulate LF reader field to send command before read (all periods in microseconds) (option 'h' for 134)"}, @@ -3007,7 +3000,6 @@ void UsbCommandReceived(UsbCommand *c) if (c->cmd != CMD_DOWNLOADED_RAW_ADC_SAMPLES_125K) goto unexpected_response; int i; for(i=0; i<48; i++) sample_buf[i] = c->d.asBytes[i]; - printf("stored 48 samples\n"); received_command = c->cmd; return; default: -- 2.39.2