redesign autoconf/automake infrastructure to support
[librfid] / src / rfid_reader_openpcd.c
index dc9db10..9397cb0 100644 (file)
@@ -32,7 +32,6 @@
 #include <string.h>
 #include <errno.h>
 
-#include <usb.h>
 
 #include <librfid/rfid.h>
 #include <librfid/rfid_reader.h>
@@ -57,6 +56,7 @@ static struct openpcd_hdr *rcv_hdr;
 
 #ifndef LIBRFID_FIRMWARE
 
+#include <usb.h>
 static struct usb_device *dev;
 static struct usb_dev_handle *hdl;
 
@@ -233,7 +233,7 @@ static int openpcd_reg_read(struct rfid_asic_transport_handle *rath,
                            unsigned char reg,
                            unsigned char *value)
 {
-       return rc632_reg_write(rath, reg, value);
+       return rc632_reg_read(rath, reg, value);
 }
 
 
@@ -241,7 +241,7 @@ static int openpcd_fifo_read(struct rfid_asic_transport_handle *rath,
                             unsigned char num_bytes,
                             unsigned char *buf)
 {
-       return rc632_reg_write(rath, num_bytes, buf);
+       return rc632_fifo_read(rath, num_bytes, buf);
 }
 
 static int openpcd_fifo_write(struct rfid_asic_transport_handle *rath,