diff options
| author | laforge <laforge@e0336214-984f-0b4b-a45f-81c69e1f0ede> | 2006-12-01 13:29:00 +0000 |
|---|---|---|
| committer | laforge <laforge@e0336214-984f-0b4b-a45f-81c69e1f0ede> | 2006-12-01 13:29:00 +0000 |
| commit | f0a3a3f8c4f39dfacf2d370bd23b27cd5b3358bf (patch) | |
| tree | 9980bd638b3df4f71088adc3f191dd4cbc392de5 /src/rfid_layer2_iso14443a.c | |
| parent | 8b39e78b9d52a6c87ef0a4ab8402d7188f94e788 (diff) | |
- add size detection for mifare classic / ultralight
- add possibility to obtain ATQA via getopt
- fix default -EINVAL return of tcl getopt
git-svn-id: https://svn.gnumonks.org/trunk/librfid@1930 e0336214-984f-0b4b-a45f-81c69e1f0ede
Diffstat (limited to 'src/rfid_layer2_iso14443a.c')
| -rw-r--r-- | src/rfid_layer2_iso14443a.c | 35 |
1 files changed, 27 insertions, 8 deletions
diff --git a/src/rfid_layer2_iso14443a.c b/src/rfid_layer2_iso14443a.c index 2ee7eb0..429577c 100644 --- a/src/rfid_layer2_iso14443a.c +++ b/src/rfid_layer2_iso14443a.c @@ -100,22 +100,22 @@ iso14443a_anticol(struct rfid_layer2_handle *handle) int ret; unsigned int uid_size; struct iso14443a_handle *h = &handle->priv.iso14443a; - struct iso14443a_atqa atqa; + struct iso14443a_atqa *atqa = &h->atqa; struct iso14443a_anticol_cmd acf; unsigned int bit_of_col; unsigned char sak[3]; unsigned int rx_len = sizeof(sak); - char *aqptr = (char *) &atqa; + char *aqptr = (char *) atqa; memset(handle->uid, 0, sizeof(handle->uid)); memset(sak, 0, sizeof(sak)); - memset(&atqa, 0, sizeof(atqa)); + memset(atqa, 0, sizeof(&atqa)); memset(&acf, 0, sizeof(acf)); if (handle->flags & RFID_OPT_LAYER2_WUP) - ret = iso14443a_transceive_sf(handle, ISO14443A_SF_CMD_WUPA, &atqa); + ret = iso14443a_transceive_sf(handle, ISO14443A_SF_CMD_WUPA, atqa); else - ret = iso14443a_transceive_sf(handle, ISO14443A_SF_CMD_REQA, &atqa); + ret = iso14443a_transceive_sf(handle, ISO14443A_SF_CMD_REQA, atqa); if (ret < 0) { h->state = ISO14443A_STATE_REQA_SENT; DEBUGP("error during transceive_sf: %d\n", ret); @@ -125,15 +125,15 @@ iso14443a_anticol(struct rfid_layer2_handle *handle) DEBUGP("ATQA: 0x%02x 0x%02x\n", *aqptr, *(aqptr+1)); - if (!atqa.bf_anticol) { + if (!atqa->bf_anticol) { h->state = ISO14443A_STATE_NO_BITFRAME_ANTICOL; DEBUGP("no bitframe anticollission bits set, aborting\n"); return -1; } - if (atqa.uid_size == 2 || atqa.uid_size == 3) + if (atqa->uid_size == 2 || atqa->uid_size == 3) uid_size = 3; - else if (atqa.uid_size == 1) + else if (atqa->uid_size == 1) uid_size = 2; else uid_size = 1; @@ -285,6 +285,24 @@ iso14443a_setopt(struct rfid_layer2_handle *handle, int optname, return ret; } +static int +iso14443a_getopt(struct rfid_layer2_handle *handle, int optname, + void *optval, unsigned int optlen) +{ + int ret = -EINVAL; + struct iso14443a_handle *h = &handle->priv.iso14443a; + struct iso14443a_atqa *atqa = optval; + + switch (optname) { + case RFID_OPT_14443A_ATQA: + *atqa = h->atqa; + ret = 0; + break; + }; + + return ret; +} + static struct rfid_layer2_handle * iso14443a_init(struct rfid_reader_handle *rh) @@ -328,6 +346,7 @@ const struct rfid_layer2 rfid_layer2_iso14443a = { .close = &iso14443a_hlta, .fini = &iso14443a_fini, .setopt = &iso14443a_setopt, + .getopt = &iso14443a_getopt, }, }; |