projects
/
librfid
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fixed ISO 14443A anticollision
[librfid]
/
src
/
rfid_asic_rc632.c
diff --git
a/src/rfid_asic_rc632.c
b/src/rfid_asic_rc632.c
index
f8a8483
..
0560d09
100644
(file)
--- a/
src/rfid_asic_rc632.c
+++ b/
src/rfid_asic_rc632.c
@@
-38,7
+38,7
@@
//#include "rc632_14443a.h"
//#include "rc632_14443a.h"
-#define RC632_TMO_AUTH1 140
00
+#define RC632_TMO_AUTH1 140
#define ENTER() DEBUGP("entering\n")
const struct rfid_asic rc632;
#define ENTER() DEBUGP("entering\n")
const struct rfid_asic rc632;
@@
-402,7
+402,7
@@
rc632_transceive(struct rfid_asic_handle *handle,
return ret;
cur_tx_len = 64 - fifo_fill;
return ret;
cur_tx_len = 64 - fifo_fill;
- printf("refilling tx fifo with %u bytes\n", cur_tx_len);
+
//
printf("refilling tx fifo with %u bytes\n", cur_tx_len);
} else
cur_tx_len = 0;
} else
cur_tx_len = 0;
@@
-420,9
+420,9
@@
rc632_transceive(struct rfid_asic_handle *handle,
if (ret < 0)
return ret;
if (ret < 0)
return ret;
- if (rx_avail > *rx_len)
- printf("rx_avail(%d) > rx_len(%d), JFYI\n", rx_avail, *rx_len);
- else if (*rx_len > rx_avail)
+ if (rx_avail > *rx_len)
{
+
//
printf("rx_avail(%d) > rx_len(%d), JFYI\n", rx_avail, *rx_len);
+
}
else if (*rx_len > rx_avail)
*rx_len = rx_avail;
if (rx_avail == 0) {
*rx_len = rx_avail;
if (rx_avail == 0) {
@@
-566,6
+566,13
@@
rc632_init(struct rfid_asic_handle *ah)
if (ret < 0)
return ret;
if (ret < 0)
return ret;
+ /* switch off rf */
+ ret = rc632_turn_off_rf(ah);
+ if (ret < 0)
+ return ret;
+
+ usleep(100000);
+
/* switch on rf */
ret = rc632_turn_on_rf(ah);
if (ret < 0)
/* switch on rf */
ret = rc632_turn_on_rf(ah);
if (ret < 0)
@@
-639,7
+646,8
@@
rc632_iso14443a_init(struct rfid_asic_handle *handle)
// FIXME: some fifo work (drain fifo?)
/* flush fifo (our way) */
// FIXME: some fifo work (drain fifo?)
/* flush fifo (our way) */
- ret = rc632_reg_write(handle, RC632_REG_CONTROL, 0x01);
+ ret = rc632_reg_write(handle, RC632_REG_CONTROL,
+ RC632_CONTROL_FIFO_FLUSH);
ret = rc632_reg_write(handle, RC632_REG_TX_CONTROL,
(RC632_TXCTRL_TX1_RF_EN |
ret = rc632_reg_write(handle, RC632_REG_TX_CONTROL,
(RC632_TXCTRL_TX1_RF_EN |
@@
-867,7
+875,7
@@
rc632_iso14443a_transceive_acf(struct rfid_asic_handle *handle,
int ret;
u_int8_t rx_buf[64];
u_int8_t rx_len = sizeof(rx_buf);
int ret;
u_int8_t rx_buf[64];
u_int8_t rx_len = sizeof(rx_buf);
- u_int8_t rx_align = 0, tx_last_bits, tx_bytes;
+ u_int8_t rx_align = 0, tx_last_bits, tx_bytes
, tx_bytes_total
;
u_int8_t boc;
u_int8_t error_flag;
*bit_of_col = ISO14443A_BITOFCOL_NONE;
u_int8_t boc;
u_int8_t error_flag;
*bit_of_col = ISO14443A_BITOFCOL_NONE;
@@
-891,14
+899,14
@@
rc632_iso14443a_transceive_acf(struct rfid_asic_handle *handle,
if (ret < 0)
return ret;
if (ret < 0)
return ret;
- tx_last_bits = acf->nvb & 0x0
f
; /* lower nibble indicates bits */
- tx_bytes =
acf->nvb >> 4
;
+ tx_last_bits = acf->nvb & 0x0
7
; /* lower nibble indicates bits */
+ tx_bytes =
( acf->nvb >> 4 ) & 0x07
;
if (tx_last_bits) {
if (tx_last_bits) {
- tx_bytes
++
;
- rx_align =
(tx_last_bits+1) % 8;
/* rx frame complements tx */
+ tx_bytes
_total = tx_bytes+1
;
+ rx_align =
tx_last_bits & 0x07;
/* rx frame complements tx */
}
}
-
- //rx_align = 8 - tx_last_bits;/* rx frame complements tx */
+ else
+ tx_bytes_total = tx_bytes;
/* set RxAlign and TxLastBits*/
ret = rc632_reg_write(handle, RC632_REG_BIT_FRAMING,
/* set RxAlign and TxLastBits*/
ret = rc632_reg_write(handle, RC632_REG_BIT_FRAMING,
@@
-906,7
+914,7
@@
rc632_iso14443a_transceive_acf(struct rfid_asic_handle *handle,
if (ret < 0)
return ret;
if (ret < 0)
return ret;
- ret = rc632_transceive(handle, (u_int8_t *)acf, tx_bytes,
+ ret = rc632_transceive(handle, (u_int8_t *)acf, tx_bytes
_total
,
rx_buf, &rx_len, 0x32, 0);
if (ret < 0)
return ret;
rx_buf, &rx_len, 0x32, 0);
if (ret < 0)
return ret;
@@
-915,8
+923,10
@@
rc632_iso14443a_transceive_acf(struct rfid_asic_handle *handle,
acf->uid_bits[tx_bytes-2] = (
(acf->uid_bits[tx_bytes-2] & (0xff >> (8-tx_last_bits)))
| rx_buf[0]);
acf->uid_bits[tx_bytes-2] = (
(acf->uid_bits[tx_bytes-2] & (0xff >> (8-tx_last_bits)))
| rx_buf[0]);
+
/* copy the rest */
/* copy the rest */
- memcpy(&acf->uid_bits[tx_bytes+1-2], &rx_buf[1], rx_len-1);
+ if(rx_len)
+ memcpy(&acf->uid_bits[tx_bytes-1], &rx_buf[1], rx_len-1);
/* determine whether there was a collission */
ret = rc632_reg_read(handle, RC632_REG_ERROR_FLAG, &error_flag);
/* determine whether there was a collission */
ret = rc632_reg_read(handle, RC632_REG_ERROR_FLAG, &error_flag);
@@
-1065,7
+1075,8
@@
static int rc632_iso14443b_init(struct rfid_asic_handle *handle)
// FIXME: some FIFO work
/* flush fifo (our way) */
// FIXME: some FIFO work
/* flush fifo (our way) */
- ret = rc632_reg_write(handle, RC632_REG_CONTROL, 0x01);
+ ret = rc632_reg_write(handle, RC632_REG_CONTROL,
+ RC632_CONTROL_FIFO_FLUSH);
if (ret < 0)
return ret;
if (ret < 0)
return ret;
@@
-1453,6
+1464,11
@@
rc632_mifare_set_key(struct rfid_asic_handle *h, const u_int8_t *key)
if (ret < 0)
return ret;
if (ret < 0)
return ret;
+ /* Terminate probably running command */
+ ret = rc632_reg_write(h, RC632_REG_COMMAND, RC632_CMD_IDLE);
+ if (ret < 0)
+ return ret;
+
ret = rc632_fifo_write(h, RFID_MIFARE_KEY_CODED_LEN, coded_key, 0x03);
if (ret < 0)
return ret;
ret = rc632_fifo_write(h, RFID_MIFARE_KEY_CODED_LEN, coded_key, 0x03);
if (ret < 0)
return ret;
@@
-1483,8
+1499,10
@@
rc632_mifare_auth(struct rfid_asic_handle *h, u_int8_t cmd, u_int32_t serno,
struct mifare_authcmd acmd;
u_int8_t reg;
struct mifare_authcmd acmd;
u_int8_t reg;
- if (cmd != RFID_CMD_MIFARE_AUTH1A && cmd != RFID_CMD_MIFARE_AUTH1B)
+ if (cmd != RFID_CMD_MIFARE_AUTH1A && cmd != RFID_CMD_MIFARE_AUTH1B) {
+ DEBUGP("invalid auth command\n");
return -EINVAL;
return -EINVAL;
+ }
/* Initialize acmd */
acmd.block_address = block & 0xff;
/* Initialize acmd */
acmd.block_address = block & 0xff;
@@
-1492,9
+1510,16
@@
rc632_mifare_auth(struct rfid_asic_handle *h, u_int8_t cmd, u_int32_t serno,
//acmd.serno = htonl(serno);
acmd.serno = serno;
//acmd.serno = htonl(serno);
acmd.serno = serno;
+#if 1
/* Clear Rx CRC */
ret = rc632_clear_bits(h, RC632_REG_CHANNEL_REDUNDANCY,
RC632_CR_RX_CRC_ENABLE);
/* Clear Rx CRC */
ret = rc632_clear_bits(h, RC632_REG_CHANNEL_REDUNDANCY,
RC632_CR_RX_CRC_ENABLE);
+#else
+ /* Clear Rx CRC, Set Tx CRC and Odd Parity */
+ ret = rc632_reg_write(h, RC632_REG_CHANNEL_REDUNDANCY,
+ RC632_CR_TX_CRC_ENABLE | RC632_CR_PARITY_ODD |
+ RC632_CR_PARITY_ENABLE);
+#endif
if (ret < 0)
return ret;
if (ret < 0)
return ret;
@@
-1504,8
+1529,10
@@
rc632_mifare_auth(struct rfid_asic_handle *h, u_int8_t cmd, u_int32_t serno,
return ret;
ret = rc632_reg_write(h, RC632_REG_COMMAND, RC632_CMD_AUTHENT1);
return ret;
ret = rc632_reg_write(h, RC632_REG_COMMAND, RC632_CMD_AUTHENT1);
- if (ret < 0)
+ if (ret < 0) {
+ DEBUGP("error during AUTHENT1");
return ret;
return ret;
+ }
/* Wait until transmitter is idle */
ret = rc632_wait_idle(h, RC632_TMO_AUTH1);
/* Wait until transmitter is idle */
ret = rc632_wait_idle(h, RC632_TMO_AUTH1);
@@
-1515,8
+1542,10
@@
rc632_mifare_auth(struct rfid_asic_handle *h, u_int8_t cmd, u_int32_t serno,
ret = rc632_reg_read(h, RC632_REG_SECONDARY_STATUS, ®);
if (ret < 0)
return ret;
ret = rc632_reg_read(h, RC632_REG_SECONDARY_STATUS, ®);
if (ret < 0)
return ret;
- if (reg & 0x07)
+ if (reg & 0x07) {
+ DEBUGP("bitframe?");
return -EIO;
return -EIO;
+ }
/* Clear Tx CRC */
ret = rc632_clear_bits(h, RC632_REG_CHANNEL_REDUNDANCY,
/* Clear Tx CRC */
ret = rc632_clear_bits(h, RC632_REG_CHANNEL_REDUNDANCY,
@@
-1539,11
+1568,12
@@
rc632_mifare_auth(struct rfid_asic_handle *h, u_int8_t cmd, u_int32_t serno,
if (ret < 0)
return ret;
if (ret < 0)
return ret;
- if (!(reg & RC632_CONTROL_CRYPTO1_ON))
+ if (!(reg & RC632_CONTROL_CRYPTO1_ON)) {
+ DEBUGP("authentication not successful");
return -EACCES;
return -EACCES;
+ }
return 0;
return 0;
-
}
/* transceive regular frame */
}
/* transceive regular frame */