- add svn:ignore property to make 'svn st' output more realistic

- remove old copy+paste+edit port of parts of librfid
- add ability to directly link librfid.a from mainline librfid
- make usb string descriptors optional again (config.h)
- fix TC_CDIV to reset correctly on swtrig (For OpenPICC)
- temporarily re-implement ep0_send_data() in pcd_enumerate.c
- make UDP_PUPv4 switching conditional to PCD
- introduce DEBUG_UNBUFFERED define in dbgu.c
- fix some signed/unsigned/typecast related compiler warnings
- remove dead code from src/os/led.c
- implement a 'mdelay' and 'usleep' stub function (FIXME!)
- rename rc632_... functions into opcd_rc632_... to avoid confusion
- introduce new 'main_librfid' TARGET
- make main_{reqa,analog} work with librfid rather than old code
- introduce mroe debugging options for FIQ handler code in Cstartup_app
- lots of PICC work that doesn't need comments now


git-svn-id: https://svn.openpcd.org:2342/trunk@266 6dc7ffe9-61d6-0310-9af1-9938baff3ed1

1 files changed, 0 insertions, 76 deletions

diff --git a/firmware/include/librfid/rfid_layer2.h b/firmware/include/librfid/rfid_layer2.h
deleted file mode 100644
index 3dd54a2..0000000
--- a/firmware/include/librfid/rfid_layer2.h
+++ /dev/null
@@ -1,76 +0,0 @@
-#ifndef _RFID_LAYER2_H
-#define _RFID_LAYER2_H
-
-#include <sys/types.h>
-#include <librfid/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_transceive(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 <librfid/rfid_layer2_iso14443a.h>
-#include <librfid/rfid_layer2_iso14443b.h>
-#include <librfid/rfid_layer2_iso15693.h>
-
-struct rfid_layer2 {
-	unsigned int id;
-	char *name;
-
-	struct {
-		struct rfid_layer2_handle *(*init)(struct rfid_reader_handle *h);
-		int (*open)(struct rfid_layer2_handle *h);
-		int (*transceive)(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, 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;
-	} priv;
-	struct rfid_layer2 *l2;
-};
-
-#endif /* __LIBRFID__ */
-
-#endif