Changeset 1131

Timestamp:

02/02/09 18:31:19 (3 years ago)

Author:

alonbl

Message:

USB fix went into stable

Location:

trunk

Files:

• etc/openct.conf.in (modified) (1 diff)
• src/ifd/ifd-cm4000.c (modified) (2 diffs)
• src/ifd/pcmcia.c (modified) (2 diffs)

trunk/etc/openct.conf.in

@@ -11 +11 @@
         #
         # Safe to disable force_poll:
-        #  =linux-2.6.28 with CONFIG_USB_DEVICEFS
-        # >=linux-2.6.29
-        #
-        # Also safe if you use only ccid driver.
+        #  >=linux-2.6.27.14
+        #  >=linux-2.6.28.3
         #
         force_poll      = 1;

trunk/src/ifd/ifd-cm4000.c

@@ -147 +147 @@
 }
 
+static int cm_get_eventfd(ifd_reader_t * reader)
+{
+        ifd_debug(1, "called.");
+
+        return ifd_device_get_eventfd(reader->device);
+}
+
+static int cm_event(ifd_reader_t * reader, int *status, size_t status_size)
+{
+        (void)reader;
+        (void)status;
+        (void)status_size;
+
+        ifd_debug(1, "called.");
+
+        return IFD_ERROR_DEVICE_DISCONNECTED;
+}
+
+static int cm_error(ifd_reader_t * reader)
+{
+        (void)reader;
+
+        ifd_debug(1, "called.");
+
+        return IFD_ERROR_DEVICE_DISCONNECTED;
+}
+
 /*
  * Driver operations
@@ -164 +191 @@
         cm4000_driver.send = cm_send;
         cm4000_driver.recv = cm_recv;
+        cm4000_driver.get_eventfd = cm_get_eventfd;
+        cm4000_driver.event = cm_event;
+        cm4000_driver.error = cm_error;
 
         ifd_driver_register("cm4000", &cm4000_driver);

trunk/src/ifd/pcmcia.c

@@ -110 +110 @@
 }
 
+static int ifd_pcmcia_get_eventfd(ifd_device_t * dev)
+{
+        int rc;
+
+        return dev->fd;
+}
+
 static struct ifd_device_ops ifd_pcmcia_ops;
 
@@ -129 +136 @@
         ifd_pcmcia_ops.set_params = ifd_pcmcia_set_params;
         ifd_pcmcia_ops.close = ifd_pcmcia_close;
+        ifd_pcmcia_ops.get_eventfd = ifd_pcmcia_get_eventfd;
 
         dev = ifd_device_new(name, &ifd_pcmcia_ops, sizeof(*dev));