summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorlaforge <laforge@e0336214-984f-0b4b-a45f-81c69e1f0ede>2005-09-11 19:59:58 +0000
committerlaforge <laforge@e0336214-984f-0b4b-a45f-81c69e1f0ede>2005-09-11 19:59:58 +0000
commit098ef26c87b27ddac5eb41f1317fe552fe16e3a7 (patch)
tree20af129bed33a3c942ea7d38eda0cc432e09ba67 /include
parenta740a7a578cb8a3f53b1b12b2e0833c8dbf4dcff (diff)
use 64bit timeout values throughout the code, since some timeouts exceeds 4.8 billion microseconds (seconds).
git-svn-id: https://svn.gnumonks.org/trunk/librfid@1426 e0336214-984f-0b4b-a45f-81c69e1f0ede
Diffstat (limited to 'include')
-rw-r--r--include/rfid/rfid_asic_rc632.h6
-rw-r--r--include/rfid/rfid_layer2.h4
-rw-r--r--include/rfid/rfid_reader.h4
3 files changed, 7 insertions, 7 deletions
diff --git a/include/rfid/rfid_asic_rc632.h b/include/rfid/rfid_asic_rc632.h
index 94345eb..13279a8 100644
--- a/include/rfid/rfid_asic_rc632.h
+++ b/include/rfid/rfid_asic_rc632.h
@@ -37,7 +37,7 @@ struct rfid_asic_rc632 {
unsigned int tx_len,
unsigned char *rx_buf,
unsigned int *rx_len,
- unsigned int timeout,
+ u_int64_t timeout,
unsigned int flags);
struct {
int (*init)(struct rfid_asic_handle *h);
@@ -109,13 +109,13 @@ rc632_power_down(struct rfid_asic_handle *handle);
int
-rc632_wait_idle(struct rfid_asic_handle *handle, unsigned int time);
+rc632_wait_idle(struct rfid_asic_handle *handle, u_int64_t time);
int
rc632_transmit(struct rfid_asic_handle *handle,
const unsigned char *buf,
unsigned char len,
- unsigned int timeout);
+ u_int64_t timeout);
int
rc632_transcieve(struct rfid_asic_handle *handle,
diff --git a/include/rfid/rfid_layer2.h b/include/rfid/rfid_layer2.h
index 975022a..fb296a2 100644
--- a/include/rfid/rfid_layer2.h
+++ b/include/rfid/rfid_layer2.h
@@ -19,7 +19,7 @@ struct rfid_layer2 {
int (*transcieve)(struct rfid_layer2_handle *h,
const unsigned char *tx_buf,
unsigned int tx_len, unsigned char *rx_buf,
- unsigned int *rx_len, unsigned int timeout,
+ unsigned int *rx_len, u_int64_t timeout,
unsigned int flags);
int (*close)(struct rfid_layer2_handle *h);
int (*fini)(struct rfid_layer2_handle *h);
@@ -50,7 +50,7 @@ int rfid_layer2_open(struct rfid_layer2_handle *l2h);
int rfid_layer2_transcieve(struct rfid_layer2_handle *l2h,
const unsigned char *tx_buf, unsigned int tx_len,
unsigned char *rx_buf, unsigned int *rx_len,
- unsigned int timeout, unsigned int flags);
+ u_int64_t timeout, unsigned int flags);
int rfid_layer2_close(struct rfid_layer2_handle *l2h);
int rfid_layer2_fini(struct rfid_layer2_handle *l2h);
diff --git a/include/rfid/rfid_reader.h b/include/rfid/rfid_reader.h
index 5f6c314..98c03a1 100644
--- a/include/rfid/rfid_reader.h
+++ b/include/rfid/rfid_reader.h
@@ -12,9 +12,9 @@ struct rfid_reader {
int (*transcieve)(struct rfid_reader_handle *h,
const unsigned char *tx_buf, unsigned int tx_len,
unsigned char *rx_buf, unsigned int *rx_len,
- unsigned int timeout, unsigned int flags);
+ u_int64_t timeout, unsigned int flags);
struct rfid_reader_handle * (*open)(void *data);
- int (*close)(void *data);
+ void (*close)(struct rfid_reader_handle *h);
struct rfid_14443a_reader {
int (*init)(struct rfid_reader_handle *h);
personal git repositories of Harald Welte. Your mileage may vary