- add mifare classic support

[librfid] / include / rfid / rfid_protocol.h

diff --git a/include/rfid/rfid_protocol.h b/include/rfid/rfid_protocol.h
index 93b89c3..1403e83 100644 (file)
--- a/include/rfid/rfid_protocol.h
+++ b/include/rfid/rfid_protocol.h
@@ -3,10 +3,11 @@
 
 #include <rfid/rfid_layer2.h>
 
-#include <rfid/rfid_protocol_tcl.h>
-
 struct rfid_protocol_handle;
 
+#include <rfid/rfid_protocol_tcl.h>
+#include <rfid/rfid_protocol_mifare_ul.h>
+
 struct rfid_protocol {
        struct rfid_protocol *next;
        unsigned int id;
@@ -16,6 +17,7 @@ struct rfid_protocol {
                int (*open)(struct rfid_protocol_handle *ph);
                int (*close)(struct rfid_protocol_handle *ph);
                int (*fini)(struct rfid_protocol_handle *ph);
+               /* transcieve for session based transport protocols */
                int (*transcieve)(struct rfid_protocol_handle *ph,
                                  const unsigned char *tx_buf,
                                  unsigned int tx_len,
@@ -23,15 +25,27 @@ struct rfid_protocol {
                                  unsigned int *rx_len,
                                  unsigned int timeout,
                                  unsigned int flags);
+               /* read/write for synchronous memory cards */
+               int (*read)(struct rfid_protocol_handle *ph,
+                           unsigned int page,
+                           unsigned char *rx_data,
+                           unsigned int *rx_len);
+               int (*write)(struct rfid_protocol_handle *ph,
+                            unsigned int page,
+                            unsigned char *tx_data,
+                            unsigned int tx_len);
        } fn;
 };
 
 struct rfid_protocol_handle {
        struct rfid_layer2_handle *l2h;
+       struct rfid_protocol *proto;
        union {
                struct tcl_handle tcl;
-       } priv;
-       struct rfid_protocol *proto;
+       } priv;                         /* priv has to be last, since
+                                        * it could contain additional
+                                        * private data over the end of
+                                        * sizeof(priv). */
 };
 
 struct rfid_protocol_handle *
@@ -41,6 +55,18 @@ int rfid_protocol_transcieve(struct rfid_protocol_handle *ph,
                             const unsigned char *tx_buf, unsigned int tx_len,
                             unsigned char *rx_buf, unsigned int *rx_len,
                             unsigned int timeout, unsigned int flags);
+int
+rfid_protocol_read(struct rfid_protocol_handle *ph,
+                  unsigned int page,
+                  unsigned char *rx_data,
+                  unsigned int *rx_len);
+
+int
+rfid_protocol_write(struct rfid_protocol_handle *ph,
+                  unsigned int page,
+                  unsigned char *tx_data,
+                  unsigned int tx_len);
+
 int rfid_protocol_fini(struct rfid_protocol_handle *ph);
 int rfid_protocol_close(struct rfid_protocol_handle *ph);
 
@@ -49,5 +75,7 @@ int rfid_protocol_register(struct rfid_protocol *p);
 enum rfid_protocol_id {
        RFID_PROTOCOL_UNKNOWN,
        RFID_PROTOCOL_TCL,
+       RFID_PROTOCOL_MIFARE_UL,
+       RFID_PROTOCOL_MIFARE_CLASSIC,
 };
 #endif