X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=src%2Frfid.c;h=fb5b9c376d412cad1784e2139dfd9ad4693ef7f5;hb=a7c201deb99239d6d98a45b3cc642d8554231a22;hp=a38171f63dac9bfb2087f8c2778c49cf03b51087;hpb=5b2eeb3086613eea8be93ac00535140a4153bbea;p=librfid

diff --git a/src/rfid.c b/src/rfid.c
index a38171f..fb5b9c3 100644
--- a/src/rfid.c
+++ b/src/rfid.c
@@ -12,7 +12,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 <stdio.h>
 #include <string.h>
@@ -33,7 +33,6 @@ struct rfid_reader_handle rfid_rh;
 #endif
 
 #ifndef LIBRFID_FIRMWARE
-#ifdef  DEBUG_LIBRFID
 const char *
 rfid_hexdump(const void *data, unsigned int len)
 {
@@ -50,7 +49,6 @@ rfid_hexdump(const void *data, unsigned int len)
 	}
 	return string;
 }
-#endif/*DEBUG_LIBRFID*/
 #else
 #define rfid_hexdump(x, y) hexdump(x, y)
 #endif
@@ -61,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);
@@ -71,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;
@@ -84,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);
@@ -94,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;