Changeset 1164 for trunk

Timestamp:

08/18/09 08:21:19 (3 years ago)

Author:

aj

Message:

Apply fix by Emmanuel Dreyfus (Enhanced to limit the loop to 5 tries)

Location:

trunk

Files:

• NEWS (modified) (1 diff)
• src/ifd/sys-bsd.c (modified) (2 diffs)

trunk/NEWS

@@ -1 +1 @@
 NEWS for OpenCT -- History of user visible changes
 
-New in 0.6.17, 2009-07-29; Andreas Jellinghaus
+New in 0.6.18; 
+* USB code for BSD fixed by Emmanuel Dreyfus
+
+New in 0.6.17; 2009-07-29; Andreas Jellinghaus
 * add support for Rutoken ECP (ccid driver)
 * small bugfixes
 
-New in 0.6.16, 2009-05-04; Andreas Jellinghaus
+New in 0.6.16; 2009-05-04; Andreas Jellinghaus
 * For ccid, etoken* drivers remove polling loop, review the force_poll
   configuration option, this reduces power consumption and CPU load.

trunk/src/ifd/sys-bsd.c

@@ -318 +318 @@
 #else
         struct usb_ctl_request ctrl;
+        int retries;
 
         ifd_debug(1, "BSD: ifd_sysdep_usb_control(0x%x)", request);
@@ -345 +346 @@
         }
 
-        if ((rc = ioctl(dev->fd, USB_DO_REQUEST, &ctrl)) < 0) {
+        retries = 5;
+        while ((rc = ioctl(dev->fd, USB_DO_REQUEST, &ctrl)) < 0 && retries > 0) {
                 ifd_debug(1, "USB_DO_REQUEST failed: %d", rc);
                 ct_error("usb_do_request failed: %s (%d)",
                          strerror(errno), errno);
-                return IFD_ERROR_COMM_ERROR;
+                retries--;
         }