X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=src%2Frfid_protocol.c;h=71c52ff6efe383c0ff4d4a04ff1d95acec4a280d;hb=refs%2Fheads%2Fmaster;hp=c401a2cd58a8147690294c1a66e35915f2d91748;hpb=1fcc35aad699f3d40ca786b99c7255cf8aa55892;p=librfid

diff --git a/src/rfid_protocol.c b/src/rfid_protocol.c
index c401a2c..71c52ff 100644
--- a/src/rfid_protocol.c
+++ b/src/rfid_protocol.c
@@ -1,5 +1,5 @@
-/* librfid - layer 3 protocol handler 
- * (C) 2005 by Harald Welte <laforge@gnumonks.org>
+/* librfid - layer 4 protocol handler 
+ * (C) 2005-2006 by Harald Welte <laforge@gnumonks.org>
  */
 
 /*
@@ -14,7 +14,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
 #include <stdlib.h>
@@ -24,21 +24,25 @@
 #include <librfid/rfid_layer2.h>
 #include <librfid/rfid_protocol.h>
 
-static struct rfid_protocol *rfid_protocol_list;
+static const struct rfid_protocol *rfid_protocols[] = {
+	[RFID_PROTOCOL_MIFARE_CLASSIC]	= &rfid_protocol_mfcl,
+	[RFID_PROTOCOL_MIFARE_UL] 	= &rfid_protocol_mful,
+	[RFID_PROTOCOL_TCL]		= &rfid_protocol_tcl,
+	[RFID_PROTOCOL_TAGIT]		= &rfid_protocol_tagit,
+};
 
 struct rfid_protocol_handle *
 rfid_protocol_init(struct rfid_layer2_handle *l2h, unsigned int id)
 {
-	struct rfid_protocol *p;
+	const struct rfid_protocol *p;
 	struct rfid_protocol_handle *ph = NULL;
 
-	for (p = rfid_protocol_list; p; p = p->next) {
-		if (p->id == id) {
-			ph = p->fn.init(l2h);
-			break;
-		}
-	}
+	if (id >= ARRAY_SIZE(rfid_protocols))
+		return NULL;
+
+	p = rfid_protocols[id];
 
+	ph = p->fn.init(l2h);
 	if (!ph)
 		return NULL;
 
@@ -57,12 +61,12 @@ rfid_protocol_open(struct rfid_protocol_handle *ph)
 }
 
 int
-rfid_protocol_transcieve(struct rfid_protocol_handle *ph,
+rfid_protocol_transceive(struct rfid_protocol_handle *ph,
 			 const unsigned char *tx_buf, unsigned int len,
 			 unsigned char *rx_buf, unsigned int *rx_len,
 			 unsigned int timeout, unsigned int flags)
 {
-	return ph->proto->fn.transcieve(ph, tx_buf, len, rx_buf, rx_len,
+	return ph->proto->fn.transceive(ph, tx_buf, len, rx_buf, rx_len,
 					timeout, flags);
 }
 
@@ -104,10 +108,46 @@ rfid_protocol_close(struct rfid_protocol_handle *ph)
 }
 
 int
-rfid_protocol_register(struct rfid_protocol *p)
+rfid_protocol_getopt(struct rfid_protocol_handle *ph, int optname,
+		     void *optval, unsigned int *optlen)
 {
-	p->next = rfid_protocol_list;
-	rfid_protocol_list = p;
+	if (optname >> 16 == 0) {
+		unsigned char *optchar = optval;
 
+		switch (optname) {
+		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;
+}