Changeset 1112 for trunk/src/ifd

Timestamp:

01/03/09 11:11:16 (3 years ago)

Author:

alonbl

Message:

Avoid changing the altsetting if there is only one
In this state it somewhat safe to skip.
If altsetting is changed the ifdhandler cannot communicate with the reader
next time it executes unless usb reset is issued.

By Chaskiel Grundman.

File:

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

trunk/src/ifd/ifd-ccid.c

@@ -477 +477 @@
         ccid_status_t *st;
         ifd_device_params_t params;
-        int r, i, c, ifc, alt;
+        int r, i, c, ifc, alt, num_alt;
         struct ifd_usb_device_descriptor de;
         struct ifd_usb_config_descriptor conf;
@@ -515 +515 @@
 
                 for (ifc = 0; ifc < conf.bNumInterfaces; ifc++) {
-                        for (alt = 0; alt < conf.interface[ifc].num_altsetting;
-                             alt++) {
+                        num_alt = conf.interface[ifc].num_altsetting;
+                        for (alt = 0; alt < num_alt; alt++) {
                                 int typeok = 0;
                                 int ok = 0;
@@ -642 +642 @@
 
         params.usb.interface = intf->bInterfaceNumber;
-        params.usb.altsetting = intf->bAlternateSetting;
+        if (num_alt > 1 || intf->bAlternateSetting > 0)
+                params.usb.altsetting = intf->bAlternateSetting;
+        else
+                params.usb.altsetting = -1;
 
         r = ccid_parse_descriptor(&ccid, p, r - i);