diff options
author | laforge <laforge@e0336214-984f-0b4b-a45f-81c69e1f0ede> | 2008-01-29 16:29:21 +0000 |
---|---|---|
committer | laforge <laforge@e0336214-984f-0b4b-a45f-81c69e1f0ede> | 2008-01-29 16:29:21 +0000 |
commit | da4aa962e17978a70bf1cf4fc3d1b46b620bc3bf (patch) | |
tree | ce482cb98a3318224d0fd40f951688cfd6bf1140 /include/librfid/rfid_asic_rc632.h | |
parent | 2b0914e033eb2644fe576b7b4c03309830abd2ec (diff) |
* implement rfid_reader_{get,set}opt()
* move get/set environment and get firmware api version to reader_{get,set}opt()
* merge rc632 power_up and power_down functions in new power function
* merge rc632 layer 2 protocol init functions into one
* rename parameters of rfid_layer2_{get,set}opt()
* move rf_power() function of reader to new setopt() interface
* merge reader layer 2 protocol init functiosn into one
* move most of the iso15693 anticol implementation from asic into layer2 code
* make most iso15693 parameters configurable via layer2_{get,set}opt()
* implement AFI for iso15693 inventory request
* introduce new generic 'rc632 asic based reader' functions
* use those functions from openpcd, cm5121 and spidev readers
* use new register initialization script data structure for rc632 init functions
* TODO update
git-svn-id: https://svn.gnumonks.org/trunk/librfid@2064 e0336214-984f-0b4b-a45f-81c69e1f0ede
Diffstat (limited to 'include/librfid/rfid_asic_rc632.h')
-rw-r--r-- | include/librfid/rfid_asic_rc632.h | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/include/librfid/rfid_asic_rc632.h b/include/librfid/rfid_asic_rc632.h index 0602cd9..529b48c 100644 --- a/include/librfid/rfid_asic_rc632.h +++ b/include/librfid/rfid_asic_rc632.h @@ -5,6 +5,7 @@ struct rfid_asic_transport_handle; #include <librfid/rfid.h> #include <librfid/rfid_asic.h> +#include <librfid/rfid_layer2.h> struct rfid_asic_rc632_transport { struct { @@ -32,9 +33,9 @@ struct iso15693_anticol_cmd; struct rfid_asic_rc632 { struct { - int (*power_up)(struct rfid_asic_handle *h); - int (*power_down)(struct rfid_asic_handle *h); + int (*power)(struct rfid_asic_handle *h, int on); int (*rf_power)(struct rfid_asic_handle *h, int on); + int (*init)(struct rfid_asic_handle *h, enum rfid_layer2_id); int (*transceive)(struct rfid_asic_handle *h, enum rfid_frametype, const u_int8_t *tx_buf, @@ -44,7 +45,6 @@ struct rfid_asic_rc632 { u_int64_t timeout, unsigned int flags); struct { - int (*init)(struct rfid_asic_handle *h); int (*transceive_sf)(struct rfid_asic_handle *h, u_int8_t cmd, struct iso14443a_atqa *atqa); @@ -56,14 +56,11 @@ struct rfid_asic_rc632 { unsigned int speed); } iso14443a; struct { - int (*init)(struct rfid_asic_handle *h); - } iso14443b; - struct { - int (*init)(struct rfid_asic_handle *h); int (*transceive_ac)(struct rfid_asic_handle *h, - struct iso15693_anticol_cmd *acf, - unsigned char *uuid, - char *bit_of_col); + const struct iso15693_anticol_cmd *acf, + unsigned int acf_len, + struct iso15693_anticol_resp *resp, + unsigned int *rx_len, char *bit_of_col); } iso15693; struct { int (*setkey)(struct rfid_asic_handle *h, |