diff options
| author | laforge <laforge@e0336214-984f-0b4b-a45f-81c69e1f0ede> | 2006-09-30 13:26:32 +0000 |
|---|---|---|
| committer | laforge <laforge@e0336214-984f-0b4b-a45f-81c69e1f0ede> | 2006-09-30 13:26:32 +0000 |
| commit | 7829a04b91731b5bca6f878bf8ee3347559717ff (patch) | |
| tree | 61e24305b189a628ac0ab198fd0f5bb137c610dc /include | |
| parent | a38aca0474a8c2b5739f3dac1b5028fc19ab7700 (diff) | |
fix various compile warnings. code cleanup
git-svn-id: https://svn.gnumonks.org/trunk/librfid@1891 e0336214-984f-0b4b-a45f-81c69e1f0ede
Diffstat (limited to 'include')
| -rw-r--r-- | include/librfid/rfid_asic_rc632.h | 11 | ||||
| -rw-r--r-- | include/librfid/rfid_reader.h | 4 |
2 files changed, 9 insertions, 6 deletions
diff --git a/include/librfid/rfid_asic_rc632.h b/include/librfid/rfid_asic_rc632.h index ec9b4e4..642c940 100644 --- a/include/librfid/rfid_asic_rc632.h +++ b/include/librfid/rfid_asic_rc632.h @@ -37,16 +37,16 @@ struct rfid_asic_rc632 { int (*turn_off_rf)(struct rfid_asic_handle *h); int (*transceive)(struct rfid_asic_handle *h, enum rfid_frametype, - const u_int32_t *tx_buf, + const u_int8_t *tx_buf, unsigned int tx_len, - u_int32_t *rx_buf, + u_int8_t *rx_buf, unsigned int *rx_len, u_int64_t timeout, unsigned int flags); struct { int (*init)(struct rfid_asic_handle *h); int (*transceive_sf)(struct rfid_asic_handle *h, - u_int32_t cmd, + u_int8_t cmd, struct iso14443a_atqa *atqa); int (*transceive_acf)(struct rfid_asic_handle *h, struct iso14443a_anticol_cmd *cmd, @@ -151,10 +151,11 @@ int rc632_register_dump(struct rfid_asic_handle *handle, u_int32_t *buf); -struct rfid_asic_handle * rc632_open(struct rfid_asic_transport_handle *th); - extern struct rfid_asic rc632; #endif +extern struct rfid_asic_handle * rc632_open(struct rfid_asic_transport_handle *th); +extern void rc632_close(struct rfid_asic_handle *h); + #endif diff --git a/include/librfid/rfid_reader.h b/include/librfid/rfid_reader.h index f604852..ce29981 100644 --- a/include/librfid/rfid_reader.h +++ b/include/librfid/rfid_reader.h @@ -38,7 +38,7 @@ struct rfid_reader { int (*init)(struct rfid_reader_handle *rh); } iso15693; struct rfid_mifare_classic_reader { - int (*setkey)(struct rfid_reader_handle *h, unsigned char *key); + int (*setkey)(struct rfid_reader_handle *h, const unsigned char *key); int (*auth)(struct rfid_reader_handle *h, u_int8_t cmd, u_int32_t serno, u_int8_t block); } mifare_classic; @@ -61,6 +61,8 @@ struct rfid_reader_handle { }; +extern int rfid_reader_register(struct rfid_reader *r); + extern struct rfid_reader_handle * rfid_reader_open(void *data, unsigned int id); |