From da4aa962e17978a70bf1cf4fc3d1b46b620bc3bf Mon Sep 17 00:00:00 2001 From: laforge Date: Tue, 29 Jan 2008 16:29:21 +0000 Subject: * implement rfid_reader_{get,set}opt() * move get/set environment and get firmware api version to reader_{get,set}opt() * merge rc632 power_up and power_down functions in new power function * merge rc632 layer 2 protocol init functions into one * rename parameters of rfid_layer2_{get,set}opt() * move rf_power() function of reader to new setopt() interface * merge reader layer 2 protocol init functiosn into one * move most of the iso15693 anticol implementation from asic into layer2 code * make most iso15693 parameters configurable via layer2_{get,set}opt() * implement AFI for iso15693 inventory request * introduce new generic 'rc632 asic based reader' functions * use those functions from openpcd, cm5121 and spidev readers * use new register initialization script data structure for rc632 init functions * TODO update git-svn-id: https://svn.gnumonks.org/trunk/librfid@2064 e0336214-984f-0b4b-a45f-81c69e1f0ede --- src/rfid.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/rfid.c') diff --git a/src/rfid.c b/src/rfid.c index 4fd1f68..fb5b9c3 100644 --- a/src/rfid.c +++ b/src/rfid.c @@ -59,9 +59,8 @@ int rfid_setopt(struct rfid_handle *rh, unsigned int level, const void *opt, unsigned int *optlen) { switch (level) { - case RFID_LEVEL_ASIC: case RFID_LEVEL_READER: - return -EINVAL; + return rfid_reader_setopt(optname, opt, optlen); break; case RFID_LEVEL_LAYER2: return rfid_layer2_setopt(optname, opt, optlen); @@ -69,6 +68,7 @@ int rfid_setopt(struct rfid_handle *rh, unsigned int level, case RFID_LEVEL_LAYER3: return rfid_layer3_setopt(optname, opt, optlen); break; + case RFID_LEVEL_ASIC: default: return -EINVAL; break; @@ -82,9 +82,8 @@ int rfid_getopt(struct rfid_handle *rh, unsigned int level, void *opt, unsigned int *optlen) { switch (level) { - case RFID_LEVEL_ASIC: case RFID_LEVEL_READER: - return -EINVAL; + return rfid_reader_getopt(optname, opt, optlen); break; case RFID_LEVEL_LAYER2: return rfid_layer2_getopt(optname, opt, optlen); @@ -92,6 +91,7 @@ int rfid_getopt(struct rfid_handle *rh, unsigned int level, case RFID_LEVEL_LAYER3: return rfid_layer3_getopt(optname, opt, optlen); break; + case RFID_LEVEL_ASIC: default: return -EINVAL; break; -- cgit v1.2.3