Proxmark/proxmark3
1
1
Fork 0
mirror of https://github.com/Proxmark/proxmark3.git synced 2024-09-21 15:26:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

Simplify data types, now that I believe that 'frames' will always be rather short

Browse source
This commit is contained in:
henryk@ploetzli.ch 2009-10-23 21:40:17 +00:00
parent ec81f90ec3
commit ccedd6ae6b
1 changed files with 30 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

63
armsrc/legicrf.c
View file

@ -8,21 +8,23 @@
#include "apps.h" #include "apps.h"
#include "legicrf.h" #include "legicrf.h"
#include "unistd.h"
#include "stdint.h"
static struct legic_frame { static struct legic_frame {
int num_bytes; int bits;
int num_bits; uint16_t data;
char data[10];
} current_frame; } current_frame;
static char queries[][4] = { static struct legic_frame queries[] = {
{7, 0x55}, /* 1010 101 */ {7, 0x55}, /* 1010 101 */
}; };
static char responses[][4] = {
static struct legic_frame responses[] = {
{6, 0x3b}, /* 1101 11 */ {6, 0x3b}, /* 1101 11 */
}; };
static void frame_send(char *response, int num_bytes, int num_bits) static void frame_send(uint16_t response, int bits)
{ {
#if 0 #if 0
/* Use the SSC to send a response. 8-bit transfers, LSBit first, 100us per bit */ /* Use the SSC to send a response. 8-bit transfers, LSBit first, 100us per bit */
@ -36,9 +38,10 @@ static void frame_send(char *response, int num_bytes, int num_bits)
while(AT91C_BASE_TC1->TC_CV < 490) ; while(AT91C_BASE_TC1->TC_CV < 490) ;
int i; int i;
for(i=0; i<(num_bytes*8+num_bits); i++) { for(i=0; i<bits; i++) {
int nextbit = AT91C_BASE_TC1->TC_CV + 150; int nextbit = AT91C_BASE_TC1->TC_CV + 150;
int bit = response[i/8] & (1<<(i%8)); int bit = response & 1;
response = response >> 1;
if(bit) if(bit)
AT91C_BASE_PIOA->PIO_SODR = GPIO_SSC_DOUT; AT91C_BASE_PIOA->PIO_SODR = GPIO_SSC_DOUT;
else else
@ -49,20 +52,21 @@ static void frame_send(char *response, int num_bytes, int num_bits)
#endif #endif
} }
static void frame_respond(struct legic_frame *f) static void frame_respond(struct legic_frame const * const f)
{ {
LED_D_ON(); LED_D_ON();
int bitcount = f->num_bytes*8+f->num_bits; int i;
int i, r=-1; struct legic_frame *r = NULL;
for(i=0; i<sizeof(queries)/sizeof(queries[0]); i++) { for(i=0; i<sizeof(queries)/sizeof(queries[0]); i++) {
if(bitcount == queries[i][0] && f->data[0] == queries[i][1] && f->data[1] == queries[i][2]) { if(f->bits == queries[i].bits && f->data == queries[i].data) {
r = i; r = &responses[i];
break; break;
} }
} }
if(r != -1) { if(r != NULL) {
frame_send(&responses[r][1], responses[r][0]/8, responses[r][0]%8); frame_send(r->data, r->bits);
LED_A_ON(); LED_A_ON();
} else { } else {
LED_A_OFF(); LED_A_OFF();
@ -71,26 +75,22 @@ static void frame_respond(struct legic_frame *f)
LED_D_OFF(); LED_D_OFF();
} }
static void frame_append_bit(struct legic_frame *f, int bit) static void frame_append_bit(struct legic_frame * const f, int bit)
{ {
if(f->num_bytes >= (int)sizeof(f->data)) if(f->bits >= 15)
return; /* Overflow, won't happen */ return; /* Overflow, won't happen */
f->data[f->num_bytes] |= (bit<<f->num_bits); f->data |= (bit<<f->bits);
f->num_bits++; f->bits++;
if(f->num_bits > 7) {
f->num_bits = 0;
f->num_bytes++;
}
} }
static int frame_is_empty(struct legic_frame *f) static int frame_is_empty(struct legic_frame const * const f)
{ {
return( (f->num_bytes*8 + f->num_bits) <= 4 ); return( f->bits <= 4 );
} }
static void frame_handle(struct legic_frame *f) static void frame_handle(struct legic_frame const * const f)
{ {
if(f->num_bytes == 0 && f->num_bits == 6) { if(f->bits == 6) {
/* Short path */ /* Short path */
return; return;
} }
@ -99,13 +99,10 @@ static void frame_handle(struct legic_frame *f)
} }
} }
static void frame_clean(struct legic_frame *f) static void frame_clean(struct legic_frame * const f)
{ {
if(!frame_is_empty(f)) f->data = 0;
/* memset(f->data, 0, sizeof(f->data)); */ f->bits = 0;
f->data[0] = f->data[1] = 0;
f->num_bits = 0;
f->num_bytes = 0;
} }
static void emit(int bit) static void emit(int bit)