X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=src%2Frfid_layer2.c;h=2bbd037e5a018d950fad663135cc729b65f34fb9;hb=237c7f9e9d0aad3a9830498a9bdb5fe5dd94df9e;hp=c1ab6a66f98e37ceb576578ecbc962d7e73acdb6;hpb=05c7e304271bcf88901da3782fcd3f28a0c7c9cf;p=librfid

diff --git a/src/rfid_layer2.c b/src/rfid_layer2.c
index c1ab6a6..2bbd037 100644
--- a/src/rfid_layer2.c
+++ b/src/rfid_layer2.c
@@ -1,5 +1,5 @@
 /* librfid - layer 2 protocol handler 
- * (C) 2005 by Harald Welte <laforge@gnumonks.org>
+ * (C) 2005-2006 by Harald Welte <laforge@gnumonks.org>
  */
 
 /*
@@ -19,58 +19,118 @@
 
 #include <stdlib.h>
 #include <stdio.h>
+#include <errno.h>
+#include <string.h> /* for memcpy */
 
-#include <rfid/rfid.h>
-#include <rfid/rfid_layer2.h>
+#include <librfid/rfid.h>
+#include <librfid/rfid_layer2.h>
 
-static struct rfid_layer2 *rfid_layer2_list;
+static const struct rfid_layer2 *rfid_layer2s[] = {
+	[RFID_LAYER2_ISO14443A]	= &rfid_layer2_iso14443a,
+	[RFID_LAYER2_ISO14443B]	= &rfid_layer2_iso14443b,
+	[RFID_LAYER2_ISO15693]	= &rfid_layer2_iso15693,
+};
 
 struct rfid_layer2_handle *
 rfid_layer2_init(struct rfid_reader_handle *rh, unsigned int id)
 {
 	struct rfid_layer2 *p;
 
-	for (p = rfid_layer2_list; p; p = p->next)
-		if (p->id == id)
-			return p->fn.init(rh);
+	if (id >= ARRAY_SIZE(rfid_layer2s)) {
+		DEBUGP("unable to find matching layer2 protocol\n");
+		return NULL;
+	}
 
-	DEBUGP("unable to find matching layer2 protocol\n");
-	return NULL;
+	p = rfid_layer2s[id];
+	return p->fn.init(rh);
 }
 
 int
 rfid_layer2_open(struct rfid_layer2_handle *ph)
 {
+	if (!ph->l2->fn.open)
+		return 0;
+
 	return ph->l2->fn.open(ph);
 }
 
 int
-rfid_layer2_transcieve(struct rfid_layer2_handle *ph,
+rfid_layer2_transceive(struct rfid_layer2_handle *ph,
 			enum rfid_frametype frametype,
 			 const unsigned char *tx_buf, unsigned int len,
 			 unsigned char *rx_buf, unsigned int *rx_len,
 			 u_int64_t timeout, unsigned int flags)
 {
-	return ph->l2->fn.transcieve(ph, frametype, tx_buf, len, rx_buf,
+	if (!ph->l2->fn.transceive)
+		return -EIO;
+
+	return ph->l2->fn.transceive(ph, frametype, tx_buf, len, rx_buf,
 				     rx_len, timeout, flags);
 }
 
 int rfid_layer2_fini(struct rfid_layer2_handle *ph)
 {
+	if (!ph->l2->fn.fini)
+		return 0;
+
 	return ph->l2->fn.fini(ph);
 }
 
 int
 rfid_layer2_close(struct rfid_layer2_handle *ph)
 {
+	if (!ph->l2->fn.close)
+		return 0;
+
 	return ph->l2->fn.close(ph);
 }
 
 int
-rfid_layer2_register(struct rfid_layer2 *p)
+rfid_layer2_getopt(struct rfid_layer2_handle *ph, int optname,
+		   void *optval, unsigned int *optlen)
+{
+	if (optname >> 16 == 0) {
+		unsigned char *optchar = optval;
+
+		switch (optname) {
+		case RFID_OPT_LAYER2_UID:
+			if (ph->uid_len < *optlen)
+				*optlen = ph->uid_len;
+			memcpy(optchar, ph->uid, *optlen);
+			break;
+		default:
+			return -EINVAL;
+			break;
+		}
+	} else {
+		if (!ph->l2->fn.getopt)
+			return -EINVAL;
+
+		return ph->l2->fn.getopt(ph, optname, optval, optlen);
+	}
+	return 0;
+}
+
+int
+rfid_layer2_setopt(struct rfid_layer2_handle *ph, int optname,
+		   const void *optval, unsigned int optlen)
 {
-	p->next = rfid_layer2_list;
-	rfid_layer2_list = p;
+	if (optname >> 16 == 0) {
+		switch (optname) {
+		default:
+			return -EINVAL;
+			break;
+		}
+	} else {
+		if (!ph->l2->fn.setopt)
+			return -EINVAL;
 
+		return ph->l2->fn.setopt(ph, optname, optval, optlen);
+	}
 	return 0;
 }
+
+char *rfid_layer2_name(struct rfid_layer2_handle *l2h)
+{
+	return l2h->l2->name;
+}