X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;ds=sidebyside;f=include%2Flibrfid%2Frfid_asic_rc632.h;h=529b48c897e7c271f434fde0d4118c7e6636a558;hb=a7c201deb99239d6d98a45b3cc642d8554231a22;hp=0602cd92aeec8aa023c77701251094896dedecf0;hpb=3f9cbc44090f34a24d1d466a95805d7dc594515a;p=librfid

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,