summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorlaforge <laforge@e0336214-984f-0b4b-a45f-81c69e1f0ede>2008-01-26 21:48:44 +0000
committerlaforge <laforge@e0336214-984f-0b4b-a45f-81c69e1f0ede>2008-01-26 21:48:44 +0000
commit20e918a3b8ad6e149f160bffaa9865a28e50c89c (patch)
tree0cb4899caf3a5fd631fd1beedf68e05a590bb064 /src
parentf0c3847bc7122e055936f5c3460b93312ca4910a (diff)
coding style fixes
git-svn-id: https://svn.gnumonks.org/trunk/librfid@2054 e0336214-984f-0b4b-a45f-81c69e1f0ede
Diffstat (limited to 'src')
-rw-r--r--src/rfid_asic_rc632.c17
1 files changed, 7 insertions, 10 deletions
diff --git a/src/rfid_asic_rc632.c b/src/rfid_asic_rc632.c
index 0ba4dc5..61af0ac 100644
--- a/src/rfid_asic_rc632.c
+++ b/src/rfid_asic_rc632.c
@@ -512,17 +512,14 @@ rc632_calc_crc16_from(struct rfid_asic_handle *handle)
int
rc632_register_dump(struct rfid_asic_handle *handle, u_int8_t *buf)
{
- int ret;
+ int ret = 0;
u_int8_t i;
- for (i = 0; i <= 0x3f; i++) {
- ret = rc632_reg_read(handle, i, &buf[i]);
- // do we want error checks?
- }
- return 0;
-}
-
+ for (i = 0; i <= 0x3f; i++)
+ ret |= rc632_reg_read(handle, i, &buf[i]);
+ return ret;
+}
/* generic FIFO access functions (if no more efficient ones provided by
* transport driver) */
@@ -927,8 +924,8 @@ rc632_iso14443a_transceive_acf(struct rfid_asic_handle *handle,
| rx_buf[0]);
/* copy the rest */
- if(rx_len)
- memcpy(&acf->uid_bits[tx_bytes-1], &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);
personal git repositories of Harald Welte. Your mileage may vary