fix more compiler warnings, based on a patch by Rainer Keller
[librfid] / src / rfid_reader_openpcd.c
index 500428d..67b73b6 100644 (file)
@@ -1,9 +1,10 @@
-/* OpenPC specific RC632 transport layer 
+/* OpenPCD specific RC632 transport layer 
  *
  * (C) 2006 by Harald Welte <laforge@gnumonks.org>
  *
  * The OpenPCD is an Atmel AT91SAM7Sxx based USB RFID reader.
- * It's CL RC632 is connected via SPI.
+ * It's CL RC632 is connected via SPI.  OpenPCD has multiple firmware
+ * images.  This driver is for the "main_dumbreader" firmware.
  *
  * TODO:
  * - put hdl from static variable into asic transport or reader handle 
@@ -21,7 +22,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>
 #include <string.h>
 #include <errno.h>
 
-#include <usb.h>
-
 #include <librfid/rfid.h>
 #include <librfid/rfid_reader.h>
 #include <librfid/rfid_asic.h>
 #include <librfid/rfid_asic_rc632.h>
 #include <librfid/rfid_reader_openpcd.h>
+#include <librfid/rfid_layer2.h>
+#include <librfid/rfid_protocol.h>
 
 /* FIXME */
 #include "rc632.h"
 
-
-#define SENDBUF_LEN    (256+7+10) /* 256bytes max FSD/FSC, plus 7 bytes header,
+#define SENDBUF_LEN    (256+4+10) /* 256bytes max FSD/FSC, plus 4 bytes header,
                                    plus 10 bytes reserve */
 #define RECVBUF_LEN    SENDBUF_LEN
 
@@ -50,6 +50,13 @@ static char rcv_buf[RECVBUF_LEN];
 static struct openpcd_hdr *snd_hdr;
 static struct openpcd_hdr *rcv_hdr;
 
+#ifndef LIBRFID_FIRMWARE
+
+#ifdef  __MINGW32__
+#include "libusb_dyn.h"
+#else /*__MINGW32__*/
+#include <usb.h>
+#endif/*__MINGW32__*/
 
 static struct usb_device *dev;
 static struct usb_dev_handle *hdl;
@@ -63,13 +70,13 @@ static int openpcd_send_command(u_int8_t cmd, u_int8_t reg, u_int8_t val,
        snd_hdr->cmd = cmd;
        snd_hdr->reg = reg;
        snd_hdr->val = val;
-       snd_hdr->len = len;
+       snd_hdr->flags = OPENPCD_FLAG_RESPOND;
        if (data && len)
                memcpy(snd_hdr->data, data, len);
 
        cur = sizeof(*snd_hdr) + len;
 
-       return usb_bulk_write(hdl, OPENPCD_OUT_EP, snd_hdr, cur, 0);
+       return usb_bulk_write(hdl, OPENPCD_OUT_EP, (char *)snd_hdr, cur, 1000);
 }
 
 static int openpcd_recv_reply(void)
@@ -80,27 +87,52 @@ static int openpcd_recv_reply(void)
 
        return ret;
 }
+
+static int openpcd_xcv(u_int8_t cmd, u_int8_t reg, u_int8_t val,
+                       u_int16_t len, const unsigned char *data)
+{
+       int ret;
        
+       ret = openpcd_send_command(cmd, reg, val, len, data);
+       if (ret < 0)
+               return ret;
+       if (ret < sizeof(struct openpcd_hdr))
+               return -EINVAL;
+
+       return openpcd_recv_reply();
+}
+
+struct usb_id {
+       u_int16_t vid;
+       u_int16_t pid;
+};
+
+static const struct usb_id opcd_usb_ids[] = {
+       { .vid = 0x2342, .pid = 0x0001 },       /* prototypes */
+       { .vid = 0x16c0, .pid = 0x076b },       /* first official device id */
+};
+
 static struct usb_device *find_opcd_device(void)
 {
        struct usb_bus *bus;
 
-       for (bus = usb_busses; bus; bus = bus->next) {
+       for (bus = usb_get_busses(); bus; bus = bus->next) {
                struct usb_device *dev;
                for (dev = bus->devices; dev; dev = dev->next) {
-                       if (dev->descriptor.idVendor == OPENPCD_VENDOR_ID
-                           && dev->descriptor.idProduct == OPENPCD_PRODUCT_ID
-                           && dev->descriptor.iManufacturer == 0
-                           && dev->descriptor.iProduct == 0
-                           && dev->descriptor.bNumConfigurations == 1
-                           && dev->config->bNumInterfaces == 1
-                           && dev->config->iConfiguration == 0)
-                               return dev;
+                       int i;
+                       for (i = 0; i < ARRAY_SIZE(opcd_usb_ids); i++) {
+                               const struct usb_id *id = &opcd_usb_ids[i];
+                               if (dev->descriptor.idVendor == id->vid &&
+                                   dev->descriptor.idProduct == id->pid)
+                                       return dev;
+                       }
                }
        }
        return NULL;
 }
 
+/* RC632 access primitives for librfid inside reader firmware */
+
 static int openpcd_reg_write(struct rfid_asic_transport_handle *rath,
                             unsigned char reg, unsigned char value)
 {
@@ -108,15 +140,9 @@ static int openpcd_reg_write(struct rfid_asic_transport_handle *rath,
 
        DEBUGP("reg=0x%02x, val=%02x: ", reg, value);
 
-       ret = openpcd_send_command(OPENPCD_CMD_WRITE_REG, reg, value, 0, NULL);
-       if (ret < 0)
-               DEBUGPC("ERROR\n");
-       else
-               DEBUGPC("OK\n");
-
-       ret = openpcd_recv_reply();
+       ret = openpcd_xcv(OPENPCD_CMD_WRITE_REG, reg, value, 0, NULL);
        if (ret < 0)
-               DEBUGPC("ERROR\n");
+               DEBUGPC("ERROR sending command\n");
        else
                DEBUGPC("OK\n");
 
@@ -131,15 +157,14 @@ static int openpcd_reg_read(struct rfid_asic_transport_handle *rath,
 
        DEBUGP("reg=0x%02x, ", reg);
 
-       ret = openpcd_send_command(OPENPCD_CMD_READ_REG, reg, 0, 0, NULL);
+       ret = openpcd_xcv(OPENPCD_CMD_READ_REG, reg, 0, 0, NULL);
        if (ret < 0) {
-               DEBUGPC("ERROR\n");
+               DEBUGPC("ERROR sending command\n");
                return ret;
        }
 
-       ret = openpcd_recv_reply();
-       if (ret < 0) {
-               DEBUGPC("ERROR\n");
+       if (ret < sizeof(struct openpcd_hdr)) {
+               DEBUGPC("ERROR: short packet\n");
                return ret;
        }
 
@@ -157,34 +182,167 @@ static int openpcd_fifo_read(struct rfid_asic_transport_handle *rath,
 
        DEBUGP(" ");
 
-       ret = openpcd_send_command(OPENPCD_CMD_READ_FIFO, 0x00, num_bytes, 0, NULL);
+       ret = openpcd_xcv(OPENPCD_CMD_READ_FIFO, 0x00, num_bytes, 0, NULL);
        if (ret < 0) {
-               DEBUGPC("ERROR\n");
+               DEBUGPC("ERROR sending command\n");
                return ret;
        }
+       DEBUGPC("ret = %d\n", ret);
+
+       memcpy(buf, rcv_hdr->data, ret - sizeof(struct openpcd_hdr));
+       DEBUGPC("len=%d val=%s: OK\n", ret - sizeof(struct openpcd_hdr),
+               rfid_hexdump(rcv_hdr->data, ret - sizeof(struct openpcd_hdr)));
+
+       return ret;
+}
+
+static int openpcd_fifo_write(struct rfid_asic_transport_handle *rath,
+                            unsigned char len,
+                            const unsigned char *bytes,
+                            unsigned char flags)
+{
+       int ret;
+
+       DEBUGP("len=%u, data=%s\n", len, rfid_hexdump(bytes, len));
+       ret = openpcd_xcv(OPENPCD_CMD_WRITE_FIFO, 0, 0, len, bytes);
 
-       ret = openpcd_recv_reply();
+       return ret;
+}
+
+const struct rfid_asic_transport openpcd_rat = {
+       .name = "OpenPCD Dumb USB Protocol",
+       .priv.rc632 = {
+               .fn = {
+                       .reg_write      = &openpcd_reg_write,
+                       .reg_read       = &openpcd_reg_read,
+                       .fifo_write     = &openpcd_fifo_write,
+                       .fifo_read      = &openpcd_fifo_read,
+               },
+       },
+};
+
+static int openpcd_get_api_version(struct rfid_reader_handle *rh, u_int8_t *version)
+{
+       int ret;
+       
+       // preset version result to zero
+       rcv_hdr->val=0;
+    
+       ret = openpcd_xcv(OPENPCD_CMD_GET_API_VERSION, 0, 0, 0, NULL);
        if (ret < 0) {
-               DEBUGPC("ERROR\n");
+               DEBUGPC("ERROR sending command [%i]\n", ret);
                return ret;
        }
 
-       memcpy(buf, rcv_hdr->data, rcv_hdr->len);
+       if (ret < sizeof(struct openpcd_hdr)) {
+               DEBUGPC("ERROR: short packet [%i]\n", ret);
+               return -EINVAL;
+       }
 
+       *version = rcv_hdr->val;
+       
        return ret;
 }
 
+static int openpcd_get_environment(
+    struct rfid_reader_handle *rh,
+    unsigned char num_bytes,
+    unsigned char *buf)
+{
+       int ret;
+
+       DEBUGP(" ");
+
+       ret = openpcd_xcv(OPENPCD_CMD_GET_ENVIRONMENT, 0x00, num_bytes, 0, NULL);
+       if (ret < 0) {
+               DEBUGPC("ERROR sending command [%i]\n",ret);
+               return ret;
+       }
+       DEBUGPC("ret = %d\n", ret);
+
+       memcpy(buf, rcv_hdr->data, ret - sizeof(struct openpcd_hdr));
+       DEBUGPC("len=%d val=%s: OK\n", ret - sizeof(struct openpcd_hdr),
+               rfid_hexdump(rcv_hdr->data, ret - sizeof(struct openpcd_hdr)));
+
+       return ret;
+}
+
+static int openpcd_set_environment(
+    struct rfid_reader_handle *rh, 
+    unsigned char num_bytes,
+    const unsigned char *buf)
+{
+       int ret;
+       
+       ret = openpcd_xcv(OPENPCD_CMD_SET_ENVIRONMENT, 0, 0, num_bytes, buf);
+       if (ret < 0) {
+               DEBUGPC("ERROR sending command [%i]\n",ret);
+               return ret;
+       }
+
+       if (ret < sizeof(struct openpcd_hdr)) {
+               DEBUGPC("ERROR: short packet [%i]\n", ret);
+               return -EINVAL;
+       }
+
+       return rcv_hdr->val;
+}
+
+static int openpcd_reset(struct rfid_reader_handle *rh)
+{
+       int ret;
+
+       DEBUGP("reset ");
+       ret = openpcd_xcv(OPENPCD_CMD_RESET, 0, 0, 0, 0);
+
+       return ret;
+}
+
+#else
+/* RC632 access primitives for librfid inside reader firmware */
+
+static int openpcd_reg_write(struct rfid_asic_transport_handle *rath,
+                            unsigned char reg, unsigned char value)
+{
+       return opcd_rc632_reg_write(rath, reg, value);
+}
+
+static int openpcd_reg_read(struct rfid_asic_transport_handle *rath,
+                           unsigned char reg,
+                           unsigned char *value)
+{
+       return opcd_rc632_reg_read(rath, reg, value);
+}
+
+
+static int openpcd_fifo_read(struct rfid_asic_transport_handle *rath,
+                            unsigned char num_bytes,
+                            unsigned char *buf)
+{
+       return opcd_rc632_fifo_read(rath, num_bytes, buf);
+}
+
 static int openpcd_fifo_write(struct rfid_asic_transport_handle *rath,
                             unsigned char len,
                             const unsigned char *bytes,
                             unsigned char flags)
 {
-       int ret;
+       return opcd_rc632_fifo_write(rath, len, bytes, flags);
+}
 
-       ret = openpcd_send_command(OPENPCD_CMD_WRITE_FIFO, 0, 0, len, bytes);
+const struct rfid_asic_transport openpcd_rat = {
+       .name = "OpenPCD Firmware RC632 Access",
+       .priv.rc632 = {
+               .fn = {
+                       .reg_write      = &openpcd_reg_write,
+                       .reg_read       = &openpcd_reg_read,
+                       .fifo_write     = &openpcd_fifo_write,
+                       .fifo_read      = &openpcd_fifo_read,
+               },
+       },
+};
 
-       return ret;
-}
+#endif /* LIBRFID_FIRMWARE */
 
 static int openpcd_transceive(struct rfid_reader_handle *rh,
                             enum rfid_frametype frametype,
@@ -193,8 +351,9 @@ static int openpcd_transceive(struct rfid_reader_handle *rh,
                             u_int64_t timeout, unsigned int flags)
 {
        return rh->ah->asic->priv.rc632.fn.transceive(rh->ah, frametype,
-                                               tx_data, tx_len, rx_data,
-                                               rx_len, timeout, flags);
+                                                     tx_data, tx_len, 
+                                                     rx_data, rx_len,
+                                                     timeout, flags);
 }
 
 static int openpcd_transceive_sf(struct rfid_reader_handle *rh,
@@ -239,7 +398,7 @@ openpcd_14443a_set_speed(struct rfid_reader_handle *rh,
                break;
        case RFID_14443A_SPEED_424K:
                rate = 0x02;
-               DEBUGPC("424K\n");
+               DEBUGPC("424K\n");
                break;
        case RFID_14443A_SPEED_848K:
                rate = 0x03;
@@ -279,18 +438,6 @@ openpcd_mifare_auth(struct rfid_reader_handle *rh, u_int8_t cmd,
                                                        cmd, serno, block);
 }
 
-struct rfid_asic_transport openpcd_ccid = {
-       .name = "OpenPCD Dumb USB Protocol",
-       .priv.rc632 = {
-               .fn = {
-                       .reg_write      = &openpcd_reg_write,
-                       .reg_read       = &openpcd_reg_read,
-                       .fifo_write     = &openpcd_fifo_write,
-                       .fifo_read      = &openpcd_fifo_read,
-               },
-       },
-};
-
 static struct rfid_reader_handle *
 openpcd_open(void *data)
 {
@@ -300,36 +447,50 @@ openpcd_open(void *data)
        snd_hdr = (struct openpcd_hdr *)snd_buf;
        rcv_hdr = (struct openpcd_hdr *)rcv_buf;
 
+#ifndef LIBRFID_FIRMWARE
        usb_init();
-       if (!usb_find_busses())
+       if (usb_find_busses() < 0)
                return NULL;
-       if (!usb_find_devices())
+       if (usb_find_devices() < 0) 
                return NULL;
        
        dev = find_opcd_device();
-       if (!dev)
+       if (!dev) {
+               DEBUGP("No matching USB device found\n");
                return NULL;
+       }
 
        hdl = usb_open(dev);
-       if (!hdl)
+       if (!hdl) {
+               DEBUGP("Can't open USB device\n");
                return NULL;
+       }
 
+        if(usb_set_configuration(hdl, 1 ) < 0)
+        {
+            DEBUGP("setting config failed\n");
+            usb_close( hdl );
+            return NULL;
+        }
+                                                                       
        if (usb_claim_interface(hdl, 0) < 0) {
+               DEBUGP("Can't claim interface\n");
                usb_close(hdl);
                return NULL;
        }
+#endif
 
-       rh = malloc(sizeof(*rh));
+       rh = malloc_reader_handle(sizeof(*rh));
        if (!rh)
                return NULL;
        memset(rh, 0, sizeof(*rh));
 
-       rath = malloc(sizeof(*rath));
+       rath = malloc_rat_handle(sizeof(*rath));
        if (!rath)
                goto out_rh;
        memset(rath, 0, sizeof(*rath));
 
-       rath->rat = &openpcd_ccid;
+       rath->rat = &openpcd_rat;
        rh->reader = &rfid_reader_openpcd;
 
        rh->ah = rc632_open(rath);
@@ -340,9 +501,9 @@ openpcd_open(void *data)
        return rh;
 
 out_rath:
-       free(rath);
+       free_rat_handle(rath);
 out_rh:
-       free(rh);
+       free_reader_handle(rh);
 
        return NULL;
 }
@@ -352,19 +513,35 @@ openpcd_close(struct rfid_reader_handle *rh)
 {
        struct rfid_asic_transport_handle *rath = rh->ah->rath;
 
-       usb_close(hdl);
-
        rc632_close(rh->ah);
-       free(rath);
-       free(rh);
+       free_rat_handle(rath);
+       free_reader_handle(rh);
+
+#ifndef LIBRFID_FIRMWARE
+       usb_close(hdl);
+#endif
 }
 
-struct rfid_reader rfid_reader_openpcd = {
+const struct rfid_reader rfid_reader_openpcd = {
        .name   = "OpenPCD RFID Reader",
        .id = RFID_READER_OPENPCD,
        .open = &openpcd_open,
        .close = &openpcd_close,
+       
+#ifndef LIBRFID_FIRMWARE
+        .get_api_version = &openpcd_get_api_version,
+       .get_environment = &openpcd_get_environment,
+       .set_environment = &openpcd_set_environment,
+        .reset = &openpcd_reset,
+#endif
+                                       
        .transceive = &openpcd_transceive,
+       .l2_supported = (1 << RFID_LAYER2_ISO14443A) |
+                       (1 << RFID_LAYER2_ISO14443B) |
+                       (1 << RFID_LAYER2_ISO15693),
+       .proto_supported = (1 << RFID_PROTOCOL_TCL) |
+                       (1 << RFID_PROTOCOL_MIFARE_UL) |
+                       (1 << RFID_PROTOCOL_MIFARE_CLASSIC),
        .iso14443a = {
                .init = &openpcd_14443a_init,
                .transceive_sf = &openpcd_transceive_sf,
@@ -376,10 +553,11 @@ struct rfid_reader rfid_reader_openpcd = {
        .iso14443b = {
                .init = &openpcd_14443b_init,
        },
+       .iso15693 = {
+               .init = &openpcd_15693_init,
+       },
        .mifare_classic = {
                .setkey = &openpcd_mifare_setkey,
                .auth = &openpcd_mifare_auth,
        },
 };
-
-