Changeset 1128 for trunk

Timestamp:

01/29/09 15:10:29 (3 years ago)

Author:

alonbl

Message:

Rutoken now support event interface, by Aktiv Co. Aleksey Samsonov

File:

• trunk/src/ifd/ifd-rutoken.c (modified) (12 diffs)

trunk/src/ifd/ifd-rutoken.c

@@ -33 +33 @@
 
         ifd_debug(1, "rutoken_open - %s", device_name);
-        ifd_debug(1, "%s:%d rutoken_open()", __FILE__, __LINE__);
-
-        reader->name = "ruToken driver";
+
+        reader->name = "Rutoken S driver";
         reader->nslots = 1;
         if (!(dev = ifd_device_open(device_name)))
@@ -41 +40 @@
 
         if (ifd_device_type(dev) != IFD_DEVICE_TYPE_USB) {
-                ct_error("ruToken driver: device %s is not a USB device", device_name);
+                ct_error("Rutoken: device %s is not a USB device", device_name);
                 ifd_device_close(dev);
                 return -1;
@@ -49 +48 @@
         params.usb.interface = 0;
         if (ifd_device_set_parameters(dev, &params) < 0) {
-                ct_error("ruToken driver: setting parameters failed", device_name);
+                ct_error("Rutoken: setting parameters failed", device_name);
                 ifd_device_close(dev);
                 return -1;
@@ -57 +56 @@
         dev->timeout = 1000;
 
-        ifd_debug(1, "%s:%d Checkpoint", __FILE__, __LINE__);
+        ifd_debug(1, "rutoken_open - %s - successful", device_name);
         return 0;
 }
@@ -63 +62 @@
 static int rutoken_activate(ifd_reader_t * reader)
 {
-        ifd_debug(1, "%s:%d rutoken_activate()", __FILE__, __LINE__);
+        ifd_debug(1, "called.");
         return 0;
 }
@@ -69 +68 @@
 static int rutoken_deactivate(ifd_reader_t * reader)
 {
-        ifd_debug(1, "%s:%d rutoken_deactivate()", __FILE__, __LINE__);
+        ifd_debug(1, "called.");
         return -1;
 }
@@ -75 +74 @@
 static int rutoken_getstatus(ifd_reader_t * reader, unsigned char *status)
 {
-        //ifd_debug(1, "");
         if(ifd_usb_control(reader->device, 0xc1, USB_ICC_GET_STATUS, 
                                 0, 0, status, 1, 1000) < 0 )
@@ -103 +101 @@
                 size_t atr_len)
 {
-        ifd_debug(1, "%s:%d rutoken_card_reset()", __FILE__, __LINE__);
-
         int nLen = 0, i;
         ifd_debug(1, "rutoken_card_reset, slot = %X", slot);
@@ -151 +147 @@
 static int rutoken_set_protocol(ifd_reader_t * reader, int nslot, int proto)
 {
-        ifd_debug(1, "set protocol: {%d}", proto);
-
         ifd_slot_t *slot;
         ifd_protocol_t *p;
@@ -179 +173 @@
                 int *status)
 {
-        //ifd_debug(1, "");
         *status = IFD_CARD_PRESENT;
         return 0;
@@ -398 +391 @@
 }
 
+static int rutoken_get_eventfd(ifd_reader_t * reader)
+{
+        ifd_debug(1, "called.");
+
+        return ifd_device_get_eventfd(reader->device);
+}
+
+static int rutoken_event(ifd_reader_t * reader, int *status, size_t status_size)
+{
+        (void)reader;
+        (void)status;
+        (void)status_size;
+
+        ifd_debug(1, "called.");
+
+        return 0;
+}
+
+static int rutoken_error(ifd_reader_t * reader)
+{
+        (void)reader;
+
+        ifd_debug(1, "called.");
+
+        return IFD_ERROR_DEVICE_DISCONNECTED;
+}
+
 static struct ifd_driver_ops rutoken_driver;
 
@@ -409 +429 @@
         rutoken_driver.set_protocol = rutoken_set_protocol;
         rutoken_driver.transparent = rutoken_transparent;
+        rutoken_driver.get_eventfd = rutoken_get_eventfd;
+        rutoken_driver.event = rutoken_event;
+        rutoken_driver.error = rutoken_error;
 
         ifd_driver_register("rutoken", &rutoken_driver);