implement and test baud rates of up to 848k

[librfid] / include / rfid / rfid_layer2.h

diff --git a/include/rfid/rfid_layer2.h b/include/rfid/rfid_layer2.h
index 40b9bff..54c3c46 100644 (file)
--- a/include/rfid/rfid_layer2.h
+++ b/include/rfid/rfid_layer2.h
@@ -1,12 +1,39 @@
 #ifndef _RFID_LAYER2_H
 #define _RFID_LAYER2_H
 
+#include <sys/types.h>
+#include <rfid/rfid.h>
+
 struct rfid_layer2_handle;
 struct rfid_reader_handle;
 
+enum rfid_layer2_id {
+       RFID_LAYER2_NONE,
+       RFID_LAYER2_ISO14443A,
+       RFID_LAYER2_ISO14443B,
+       RFID_LAYER2_ISO15693,
+};
+
+struct rfid_layer2_handle *rfid_layer2_init(struct rfid_reader_handle *rh,
+                                           unsigned int id);
+int rfid_layer2_open(struct rfid_layer2_handle *l2h);
+int rfid_layer2_transcieve(struct rfid_layer2_handle *l2h,
+                          enum rfid_frametype frametype,
+                          const unsigned char *tx_buf, unsigned int tx_len,
+                          unsigned char *rx_buf, unsigned int *rx_len,
+                          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);
+int rfid_layer2_getopt(struct rfid_layer2_handle *ph, int optname,
+                       void *optval, unsigned int *optlen);
+int rfid_layer2_setopt(struct rfid_layer2_handle *ph, int optname,
+                       const void *optval, unsigned int optlen);
+
+#ifdef __LIBRFID__
+
 #include <rfid/rfid_layer2_iso14443a.h>
 #include <rfid/rfid_layer2_iso14443b.h>
-
+#include <rfid/rfid_layer2_iso15693.h>
 
 struct rfid_layer2 {
        unsigned int id;
@@ -16,41 +43,34 @@ struct rfid_layer2 {
                struct rfid_layer2_handle *(*init)(struct rfid_reader_handle *h);
                int (*open)(struct rfid_layer2_handle *h);
                int (*transcieve)(struct rfid_layer2_handle *h,
+                                 enum rfid_frametype frametype,
                                  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);
+               int (*getopt)(struct rfid_layer2_handle *h,
+                             int optname, void *optval, unsigned int *optlen);
+               int (*setopt)(struct rfid_layer2_handle *h,
+                             int optname, const void *optval,
+                             unsigned int optlen);
        } fn;
        struct rfid_layer2 *next;
 };
 
 struct rfid_layer2_handle {
        struct rfid_reader_handle *rh;
+       unsigned char uid[10];  /* triple size 14443a id is 10 bytes */
+       unsigned int uid_len;
        union {
                struct iso14443a_handle iso14443a;
                struct iso14443b_handle iso14443b;
-               //struct iso15693_handle iso15693;
+               struct iso15693_handle iso15693;
        } priv;
        struct rfid_layer2 *l2;
 };
 
-enum rfid_layer2_id {
-       RFID_LAYER2_NONE,
-       RFID_LAYER2_ISO14443A,
-       RFID_LAYER2_ISO14443B,
-       RFID_LAYER2_ISO15693,
-};
-
-struct rfid_layer2_handle *rfid_layer2_init(struct rfid_reader_handle *rh,
-                                           unsigned int id);
-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);
-int rfid_layer2_close(struct rfid_layer2_handle *l2h);
-int rfid_layer2_fini(struct rfid_layer2_handle *l2h);
+#endif /* __LIBRFID__ */
 
 #endif