summaryrefslogtreecommitdiff
path: root/src/rfid.c
diff options
context:
space:
mode:
authorlaforge <laforge@e0336214-984f-0b4b-a45f-81c69e1f0ede>2008-01-29 16:29:21 +0000
committerlaforge <laforge@e0336214-984f-0b4b-a45f-81c69e1f0ede>2008-01-29 16:29:21 +0000
commitda4aa962e17978a70bf1cf4fc3d1b46b620bc3bf (patch)
treece482cb98a3318224d0fd40f951688cfd6bf1140 /src/rfid.c
parent2b0914e033eb2644fe576b7b4c03309830abd2ec (diff)
* 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
Diffstat (limited to 'src/rfid.c')
-rw-r--r--src/rfid.c8
1 files changed, 4 insertions, 4 deletions
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;
personal git repositories of Harald Welte. Your mileage may vary