diff options
Diffstat (limited to 'openpicc/application/iso14443_layer3a.h')
| -rw-r--r-- | openpicc/application/iso14443_layer3a.h | 88 |
1 files changed, 1 insertions, 87 deletions
diff --git a/openpicc/application/iso14443_layer3a.h b/openpicc/application/iso14443_layer3a.h index 1eb94b4..ff4b1c0 100644 --- a/openpicc/application/iso14443_layer3a.h +++ b/openpicc/application/iso14443_layer3a.h @@ -15,76 +15,11 @@ enum ISO14443_STATES { ERROR, /* Some unrecoverable error has occured */ }; -/******************** RX ************************************/ -#ifdef FOUR_TIMES_OVERSAMPLING -/* definitions for four-times oversampling */ -#define ISO14443A_SAMPLE_LEN 4 -/* Sample values for the REQA and WUPA short frames */ -#define REQA 0x10410441 -#define WUPA 0x04041041 - -/* Start of frame sample for SSC compare 0 */ -#define ISO14443A_SOF_SAMPLE 0x01 -#define ISO14443A_SOF_LEN 4 -/* Length in samples of a short frame */ -#define ISO14443A_SHORT_LEN 32 -/* This is wrong: a short frame is 1 start bit, 7 data bits, 1 stop bit - * followed by no modulation for one bit period. The start bit is 'eaten' in - * SSC Compare 0, but the remaining 7+1+1 bit durations must be sampled and - * compared. At four times oversampling this would be 9*4=36 samples, which is - * more than one SSC transfer. You'd have to use two transfers of 18 samples - * each and modify the comparison code accordingly. - * Since four times oversampling doesn't work reliably anyway (every second - * sample is near an edge and might sample 0 or 1) this doesn't matter for now.*/ -#error Four times oversampling is broken, see comments in code - -#else -/* definitions for two-times oversampling */ -#define ISO14443A_SAMPLE_LEN 2 - -/* For SSC_MODE_ISO14443A_SHORT */ -#define ISO14443A_SHORT_LEN 18 -#define REQA 0x4929 -#define WUPA 0x2249 - -#define ISO14443A_SOF_SAMPLE 0x01 -#define ISO14443A_SOF_LEN 2 - -#define ISO14443A_EOF_SAMPLE 0x00 -#define ISO14443A_EOF_LEN 5 - -/* For SSC_MODE_ISO14443A */ -#define ISO14443A_SHORT_FRAME_COMPARE_LENGTH 2 -#define _ISO14443A_SHORT_FRAME_REQA { 0x29, 0x49 } -#define _ISO14443A_SHORT_FRAME_WUPA { 0x49, 0x22 } -// FIXME not correct. This should be compare_length == 3 (which is 9 at 4 per compare), but this -// needs enhanced ssc irq code to transfer the last read (incomplete) data from the ssc holding -// register to the buffer - -#endif +#include "iso14443.h" extern const u_int8_t ISO14443A_SHORT_FRAME_REQA[ISO14443A_SHORT_FRAME_COMPARE_LENGTH]; extern const u_int8_t ISO14443A_SHORT_FRAME_WUPA[ISO14443A_SHORT_FRAME_COMPARE_LENGTH]; -/* A short frame should be received in one single SSC transfer */ -#if (ISO14443A_SHORT_LEN <= 8) -/* SSC transfer size in bits */ -#define ISO14443A_SHORT_TRANSFER_SIZE 8 -#define ISO14443A_SHORT_TYPE u_int8_t - -#elif (ISO14443A_SHORT_LEN <= 16) -#define ISO14443A_SHORT_TRANSFER_SIZE 16 -#define ISO14443A_SHORT_TYPE u_int16_t - -#elif (ISO14443A_SHORT_LEN <= 32) -#define ISO14443A_SHORT_TRANSFER_SIZE 32 -#define ISO14443A_SHORT_TYPE u_int32_t - -#else -#error ISO14443A_SHORT_LEN defined too big -#endif - -#define ISO14443A_MAX_RX_FRAME_SIZE_IN_BITS (256*9 +2) /******************** TX ************************************/ /* Magic delay, don't know where it comes from */ //#define MAGIC_OFFSET -32 @@ -102,27 +37,6 @@ extern volatile int fdt_offset; #define ISO14443A_FDT_SHORT_1 (ISO14443A_FDT_SLOTLEN*9 + ISO14443A_FDT_OFFSET_1 +fdt_offset +MAGIC_OFFSET -DETECTION_DELAY) #define ISO14443A_FDT_SHORT_0 (ISO14443A_FDT_SLOTLEN*9 + ISO14443A_FDT_OFFSET_0 +fdt_offset +MAGIC_OFFSET -DETECTION_DELAY) -/* in bytes, not counting parity */ -#define MAXIMUM_FRAME_SIZE 256 - -typedef struct { - enum { TYPE_A, TYPE_B } type; - union { - struct { - enum { SHORT_FRAME, STANDARD_FRAME, AC_FRAME } format; - enum { PARITY, /* Calculate parity on the fly, ignore the parity field below */ - GIVEN_PARITY, /* Use the parity bits from the parity field below */ - NO_PARITY, /* Don't send any parity */ - } parity; - enum { ISO14443A_LAST_BIT_0 = 0, ISO14443A_LAST_BIT_1 = 1, ISO14443A_LAST_BIT_NONE } last_bit; - } a; - } parameters; - u_int32_t numbytes; - u_int8_t numbits, bit_offset; - u_int8_t data[MAXIMUM_FRAME_SIZE]; - u_int8_t parity[MAXIMUM_FRAME_SIZE/8+1]; /* parity bit for data[x] is in parity[x/8] & (1<<(x%8)) */ -} iso14443_frame; - extern const iso14443_frame ATQA_FRAME; #endif /*ISO14443_LAYER3A_H_*/ |