- fix multiple include of rfid_protocol_mifare_classic.h problem

- add some more layer2 {get,set}opt()s
- add rfid_protocol_{get,set}opt()
- export functions for l2/proto scanning, not just for combined scanning
- add support for sending WUPA instead of REQA in iso14443a


git-svn-id: https://svn.gnumonks.org/trunk/librfid@1910 e0336214-984f-0b4b-a45f-81c69e1f0ede

1 files changed, 42 insertions, 1 deletions

diff --git a/src/rfid_protocol.c b/src/rfid_protocol.c
index 1a4262a..99fc8b1 100644
--- a/src/rfid_protocol.c
+++ b/src/rfid_protocol.c
@@ -1,4 +1,4 @@
-/* librfid - layer 3 protocol handler 
+/* librfid - layer 4 protocol handler 
  * (C) 2005-2006 by Harald Welte <laforge@gnumonks.org>
  */
 
@@ -106,6 +106,47 @@ rfid_protocol_close(struct rfid_protocol_handle *ph)
 	return 0;
 }
 
+int
+rfid_protocol_getopt(struct rfid_protocol_handle *ph, int optname,
+		     void *optval, unsigned int *optlen)
+{
+	if (optname >> 16 == 0) {
+		unsigned char *optchar = optval;
+
+		switch (optname) {
+			break;
+		default:
+			return -EINVAL;
+			break;
+		}
+	} else {
+		if (!ph->proto->fn.getopt)
+			return -EINVAL;
+
+		return ph->proto->fn.getopt(ph, optname, optval, optlen);
+	}
+	return 0;
+}
+
+int
+rfid_protocol_setopt(struct rfid_protocol_handle *ph, int optname,
+		     const void *optval, unsigned int optlen)
+{
+	if (optname >> 16 == 0) {
+		switch (optname) {
+		default:
+			return -EINVAL;
+			break;
+		}
+	} else {
+		if (!ph->proto->fn.setopt)
+			return -EINVAL;
+
+		return ph->proto->fn.setopt(ph, optname, optval, optlen);
+	}
+	return 0;
+}
+
 char *rfid_protocol_name(struct rfid_protocol_handle *ph)
 {
 	return ph->proto->name;