diff options
| author | laforge <laforge@e0336214-984f-0b4b-a45f-81c69e1f0ede> | 2008-01-22 15:45:50 +0000 |
|---|---|---|
| committer | laforge <laforge@e0336214-984f-0b4b-a45f-81c69e1f0ede> | 2008-01-22 15:45:50 +0000 |
| commit | 237c7f9e9d0aad3a9830498a9bdb5fe5dd94df9e (patch) | |
| tree | 1227af9867c9667020c05df81c93c87a89369a6f /src | |
| parent | bb01e0f8534a785beeb64f01960b29b69b0227c5 (diff) | |
Fix bitfields for big endian platforms (Jeremy Lainé)
git-svn-id: https://svn.gnumonks.org/trunk/librfid@2038 e0336214-984f-0b4b-a45f-81c69e1f0ede
Diffstat (limited to 'src')
| -rw-r--r-- | src/rfid_proto_mifare_classic.c | 9 | ||||
| -rw-r--r-- | src/rfid_proto_mifare_ul.c | 16 |
2 files changed, 7 insertions, 18 deletions
diff --git a/src/rfid_proto_mifare_classic.c b/src/rfid_proto_mifare_classic.c index e98dc28..004e002 100644 --- a/src/rfid_proto_mifare_classic.c +++ b/src/rfid_proto_mifare_classic.c @@ -79,7 +79,6 @@ static int mfcl_write(struct rfid_protocol_handle *ph, unsigned int page, unsigned char *tx_data, unsigned int tx_len) { - unsigned int i; unsigned char tx[18]; unsigned char rx[1]; unsigned int rx_len = sizeof(rx); @@ -145,7 +144,7 @@ mfcl_getopt(struct rfid_protocol_handle *ph, int optname, void *optval, unsigned int *optlen) { int ret = -EINVAL; - u_int16_t atqa; + u_int8_t atqa[2]; unsigned int atqa_size = sizeof(atqa); unsigned int *size = optval; @@ -156,10 +155,10 @@ mfcl_getopt(struct rfid_protocol_handle *ph, int optname, void *optval, *optlen = sizeof(*size); ret = 0; rfid_layer2_getopt(ph->l2h, RFID_OPT_14443A_ATQA, - (void *) &atqa, &atqa_size); - if (atqa == 0x0004) + atqa, &atqa_size); + if (atqa[0] == 0x04 && atqa[1] == 0x00) *size = 1024; - else if (atqa == 0x0002) + else if (atqa[0] == 0x02 && atqa[1] == 0x00) *size = 4096; else ret = -EIO; diff --git a/src/rfid_proto_mifare_ul.c b/src/rfid_proto_mifare_ul.c index 7243c89..e1fe3b9 100644 --- a/src/rfid_proto_mifare_ul.c +++ b/src/rfid_proto_mifare_ul.c @@ -99,21 +99,11 @@ mful_write(struct rfid_protocol_handle *ph, unsigned int page, return ret; } -static int -mful_transceive(struct rfid_protocol_handle *ph, - const unsigned char *tx_data, unsigned int tx_len, - unsigned char *rx_data, unsigned int *rx_len, - unsigned int timeout, unsigned int flags) -{ - return -EINVAL; -} - static int mful_getopt(struct rfid_protocol_handle *ph, int optname, void *optval, unsigned int *optlen) { int ret = -EINVAL; - u_int16_t atqa; unsigned int *size = optval; switch (optname) { @@ -131,7 +121,7 @@ static struct rfid_protocol_handle * mful_init(struct rfid_layer2_handle *l2h) { struct rfid_protocol_handle *ph; - u_int16_t atqa; + u_int8_t atqa[2]; unsigned int atqa_len = sizeof(atqa); if (l2h->l2->id != RFID_LAYER2_ISO14443A) @@ -139,8 +129,8 @@ mful_init(struct rfid_layer2_handle *l2h) /* According to "Type Identification Procedure Rev. 1.3" */ rfid_layer2_getopt(l2h, RFID_OPT_14443A_ATQA, - &atqa, &atqa_len); - if (atqa != 0x0044) + atqa, &atqa_len); + if (atqa[0] != 0x44 || atqa[1] != 0x00) return NULL; /* according to "Functional Specification Rev. 3.0 */ |