diff options
| author | laforge <laforge@e0336214-984f-0b4b-a45f-81c69e1f0ede> | 2008-01-26 21:51:52 +0000 |
|---|---|---|
| committer | laforge <laforge@e0336214-984f-0b4b-a45f-81c69e1f0ede> | 2008-01-26 21:51:52 +0000 |
| commit | 6b2db45060b26cc4e42ca6130f236596f9a02c82 (patch) | |
| tree | 147013472566da5cbafff4f2a0ce17cd84494c77 | |
| parent | 20e918a3b8ad6e149f160bffaa9865a28e50c89c (diff) | |
cosmetic coding style fixes
git-svn-id: https://svn.gnumonks.org/trunk/librfid@2055 e0336214-984f-0b4b-a45f-81c69e1f0ede
| -rw-r--r-- | src/rfid_layer2_iso14443a.c | 35 | ||||
| -rw-r--r-- | src/rfid_reader_cm5121.c | 4 |
2 files changed, 20 insertions, 19 deletions
diff --git a/src/rfid_layer2_iso14443a.c b/src/rfid_layer2_iso14443a.c index cdd6b23..9bdd25a 100644 --- a/src/rfid_layer2_iso14443a.c +++ b/src/rfid_layer2_iso14443a.c @@ -85,35 +85,34 @@ iso14443a_code_nvb_bits(unsigned char *nvb, unsigned int bits) return 0; } -int random_bit(void) +static int random_bit(void) { - unsigned long e; + unsigned long e; - e = randctx[0]; - randctx[0]=randctx[1]; - randctx[1]=(randctx[2]<<19) + (randctx[2]>>13) + randctx[3]; - randctx[2]=randctx[3] ^ randctx[0]; - randctx[3]=e+randctx[1]; + e = randctx[0]; + randctx[0] = randctx[1]; + randctx[1] = (randctx[2]<<19) + (randctx[2]>>13) + randctx[3]; + randctx[2] = randctx[3] ^ randctx[0]; + randctx[3] = e+randctx[1]; - return randctx[1]&1; + return randctx[1]&1; } /* first bit is '1', second bit '2' */ static void rnd_toggle_bit_in_field(unsigned char *bitfield, unsigned int size, unsigned int bit) { - unsigned int byte,rnd; + unsigned int byte,rnd; - if(bit && (bit <= (size*8)) ) - { - rnd=random_bit(); + if (bit && (bit <= (size*8))) { + rnd = random_bit(); - DEBUGP("xor'ing bit %u with %u\n",bit,rnd); - bit--; - byte=bit/8; - bit=rnd<<(bit%8); - bitfield[byte] ^= bit; - } + DEBUGP("xor'ing bit %u with %u\n",bit,rnd); + bit--; + byte = bit/8; + bit = rnd << (bit % 8); + bitfield[byte] ^= bit; + } } diff --git a/src/rfid_reader_cm5121.c b/src/rfid_reader_cm5121.c index f2ddf94..383fba2 100644 --- a/src/rfid_reader_cm5121.c +++ b/src/rfid_reader_cm5121.c @@ -31,10 +31,12 @@ #include <string.h> #include <errno.h> +#define DEBUG_LIBRFID #include <librfid/rfid.h> #ifndef LIBRFID_FIRMWARE + #include <librfid/rfid_reader.h> #include <librfid/rfid_asic.h> #include <librfid/rfid_asic_rc632.h> @@ -51,7 +53,7 @@ plus 10 bytes reserve */ #define RECVBUF_LEN SENDBUF_LEN -//#define DEBUG_REGISTER +#define DEBUG_REGISTER #ifdef DEBUG_REGISTER #define DEBUGRC DEBUGPC |