-/* 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
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+//#define DEBUG
+
#include <stdlib.h>
#include <unistd.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
static struct openpcd_hdr *rcv_hdr;
+#ifndef LIBRFID_FIRMWARE
+
+#include <usb.h>
static struct usb_device *dev;
static struct usb_dev_handle *hdl;
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, 0);
}
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) {
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)
{
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");
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;
}
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);
- ret = openpcd_recv_reply();
- if (ret < 0) {
- DEBUGPC("ERROR\n");
- return ret;
- }
-
- memcpy(buf, rcv_hdr->data, rcv_hdr->len);
+ 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;
}
{
int ret;
- ret = openpcd_send_command(OPENPCD_CMD_WRITE_FIFO, 0, 0, len, bytes);
+ DEBUGP("len=%u, data=%s\n", len, rfid_hexdump(bytes, len));
+ ret = openpcd_xcv(OPENPCD_CMD_WRITE_FIFO, 0, 0, len, bytes);
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,
+ },
+ },
+};
+
+#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)
+{
+ return opcd_rc632_fifo_write(rath, len, bytes, flags);
+}
+
+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,
+ },
+ },
+};
+
+#endif /* LIBRFID_FIRMWARE */
+
static int openpcd_transceive(struct rfid_reader_handle *rh,
enum rfid_frametype frametype,
const unsigned char *tx_data, unsigned int tx_len,
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,
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)
{
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_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);
return rh;
out_rath:
- free(rath);
+ free_rat_handle(rath);
out_rh:
- free(rh);
+ free_reader_handle(rh);
return NULL;
}
{
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,
.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,
.iso14443b = {
.init = &openpcd_14443b_init,
},
+ .iso15693 = {
+ .init = &openpcd_15693_init,
+ },
.mifare_classic = {
.setkey = &openpcd_mifare_setkey,
.auth = &openpcd_mifare_auth,
},
};
-
-