Changeset 1115 for trunk/src/ifd

Timestamp:

01/03/09 11:35:45 (3 years ago)

Author:

alonbl

Message:

Modify ccid driver to use the event interface

File:

• trunk/src/ifd/ifd-ccid.c (modified) (8 diffs)

trunk/src/ifd/ifd-ccid.c

@@ -218 +218 @@
         size_t slen[OPENCT_MAX_SLOTS];
         unsigned char seq;
+        int support_events;
+        int events_active;
+        ifd_usb_capture_t *event_cap;
 } ccid_status_t;
 
@@ -486 +489 @@
         unsigned char *_class;
         unsigned char *p;
+        int support_events = 0;
 
         if (ifd_usb_get_device(dev, &de)) {
@@ -538 +542 @@
                                         params.usb.ep_intr = 0;
                                         ok |= 4;
+                                }
+                                if (intf->bNumEndpoints == 3) {
+                                        support_events = 1;
                                 }
                                 for (i = 0; i < intf->bNumEndpoints; i++) {
@@ -759 +766 @@
                 st->proto_support |= SUPPORT_ESCAPE;
         }
-        ifd_debug(3, "Accepted %04x:%04x with features 0x%x and protocols 0x%x", de.idVendor, de.idProduct, ccid.dwFeatures, ccid.dwProtocols);
+
+        st->support_events = support_events;
+
+        ifd_debug(3, "Accepted %04x:%04x with features 0x%x and protocols 0x%x events=%d", de.idVendor, de.idProduct, ccid.dwFeatures, ccid.dwProtocols, st->support_events);
         return 0;
 }
@@ -809 +819 @@
                 return -1;
         }
+}
+
+/*
+ * Close the device
+ */
+static int ccid_close(ifd_reader_t * reader)
+{
+        ccid_status_t *st = (ccid_status_t *) reader->driver_data;
+        
+        ifd_debug(1, "called.");
+
+        if (st->event_cap != NULL) {
+                ifd_usb_end_capture(reader->device, st->event_cap);
+                st->event_cap = NULL;
+        }
+
+        return 0;
 }
 
@@ -1297 +1324 @@
 }
 
+static int ccid_before_command(ifd_reader_t * reader)
+{
+        ccid_status_t *st = (ccid_status_t *) reader->driver_data;
+        int rc;
+
+        ifd_debug(1, "called.");
+
+        if (!st->events_active) {
+                return 0;
+        }
+
+        if (st->event_cap == NULL) {
+                return 0;
+        }
+
+        rc = ifd_usb_end_capture(reader->device, st->event_cap);
+        st->event_cap = NULL;
+
+        return rc;
+}
+
+static int ccid_after_command(ifd_reader_t * reader)
+{
+        ccid_status_t *st = (ccid_status_t *) reader->driver_data;
+
+        ifd_debug(1, "called.");
+
+        if (!st->events_active) {
+                return 0;
+        }
+
+        if (st->event_cap != NULL) {
+                return 0;
+        }
+
+        return ifd_usb_begin_capture(
+                reader->device,
+                IFD_USB_URB_TYPE_INTERRUPT,
+                reader->device->settings.usb.ep_intr,
+                8, &st->event_cap
+        );
+}
+
+static int ccid_get_eventfd(ifd_reader_t * reader)
+{
+        ccid_status_t *st = (ccid_status_t *) reader->driver_data;
+        int fd;
+
+        ifd_debug(1, "called.");
+
+        if (!st->support_events) {
+                return -1;
+        }
+
+        fd = ifd_device_get_eventfd(reader->device);
+
+        if (fd != -1) {
+                st->events_active = 1;
+        }
+
+        return fd;
+}
+
+static int ccid_event(ifd_reader_t * reader, int *status, size_t status_size)
+{
+        ccid_status_t *st = (ccid_status_t *) reader->driver_data;
+        unsigned char ret[20];
+        int bytes;
+
+        ifd_debug(1, "called.");
+
+        if (status_size < reader->nslots) {
+                return IFD_ERROR_BUFFER_TOO_SMALL;
+        }
+
+        bytes = ifd_usb_capture_event(reader->device, st->event_cap, ret, 8);
+        if (bytes < 0) {
+                return bytes;
+        }
+
+        if (bytes > 0 && ret[0] == 0x50) {
+                int slot;
+                ifd_debug(3, "status received:%s", ct_hexdump(ret, bytes));
+                for (slot=0;slot<reader->nslots;slot++) {
+                        if (1 + (slot / 4) < bytes) {
+                                int bits = (ret[1 + (slot / 4)] >> (2 * (slot % 4))) & 0x3;
+                                if (bits & 2)
+                                        status[slot] |= IFD_CARD_STATUS_CHANGED;
+                                if (bits & 1)
+                                        status[slot] |= IFD_CARD_PRESENT;
+                                else
+                                        status[slot] &= ~IFD_CARD_PRESENT;
+
+                                ifd_debug(1, "slot %d event result: %08x", slot, status[slot]);
+                                st->icc_present[slot] = status[slot] & IFD_CARD_PRESENT;
+                        }
+                }
+        }
+
+        return 0;
+}
+
+static int ccid_error(ifd_reader_t * reader)
+{
+        (void)reader;
+
+        ifd_debug(1, "called.");
+
+        return IFD_ERROR_DEVICE_DISCONNECTED;
+}
+
 /*
  * Driver operations
@@ -1308 +1446 @@
 {
         ccid_driver.open = ccid_open;
+        ccid_driver.close = ccid_close;
         ccid_driver.activate = ccid_activate;
         ccid_driver.deactivate = ccid_deactivate;
@@ -1317 +1456 @@
         ccid_driver.recv = ccid_recv;
         ccid_driver.escape = ccid_escape;
+        ccid_driver.before_command = ccid_before_command;
+        ccid_driver.after_command = ccid_after_command;
+        ccid_driver.get_eventfd = ccid_get_eventfd;
+        ccid_driver.event = ccid_event;
+        ccid_driver.error = ccid_error;
 
         ifd_driver_register("ccid", &ccid_driver);