[Pcsclite-cvs-commit] r5738 - /trunk/Drivers/ccid/src/ccid_usb.c
rousseau at users.alioth.debian.org
rousseau at users.alioth.debian.org
Thu May 12 12:52:53 UTC 2011
Author: rousseau
Date: Thu May 12 12:52:51 2011
New Revision: 5738
URL: http://svn.debian.org/wsvn/pcsclite/?sc=1&rev=5738
Log:
OpenUSBByName(): remove a (useless) { } block level
Modified:
trunk/Drivers/ccid/src/ccid_usb.c
Modified: trunk/Drivers/ccid/src/ccid_usb.c
URL: http://svn.debian.org/wsvn/pcsclite/trunk/Drivers/ccid/src/ccid_usb.c?rev=5738&op=diff
==============================================================================
--- trunk/Drivers/ccid/src/ccid_usb.c (original)
+++ trunk/Drivers/ccid/src/ccid_usb.c Thu May 12 12:52:51 2011
@@ -325,36 +325,34 @@
#ifdef USE_COMPOSITE_AS_MULTISLOT
static int static_interface = 1;
+ /* simulate a composite device as when libudev is used */
+ int readerID = (vendorID << 16) + productID;
+
+ if ((GEMALTOPROXDU == readerID)
+ || (GEMALTOPROXSU == readerID))
{
- /* simulate a composite device as when libudev is used */
- int readerID = (vendorID << 16) + productID;
-
- if ((GEMALTOPROXDU == readerID)
- || (GEMALTOPROXSU == readerID))
- {
- /*
- * We can't talk to the two CCID interfaces
- * at the same time (the reader enters a
- * dead lock). So we simulate a multi slot
- * reader. By default multi slot readers
- * can't use the slots at the same time. See
- * TAG_IFD_SLOT_THREAD_SAFE
- *
- * One side effect is that the two readers
- * are seen by pcscd as one reader so the
- * interface name is the same for the two.
- *
- * So we have:
- * 0: Gemalto Prox-DU [Prox-DU Contact_09A00795] (09A00795) 00 00
- * 1: Gemalto Prox-DU [Prox-DU Contact_09A00795] (09A00795) 00 01
- * instead of
- * 0: Gemalto Prox-DU [Prox-DU Contact_09A00795] (09A00795) 00 00
- * 1: Gemalto Prox-DU [Prox-DU Contactless_09A00795] (09A00795) 01 00
- */
-
- /* the CCID interfaces are 1 and 2 */
- interface_number = static_interface;
- }
+ /*
+ * We can't talk to the two CCID interfaces
+ * at the same time (the reader enters a
+ * dead lock). So we simulate a multi slot
+ * reader. By default multi slot readers
+ * can't use the slots at the same time. See
+ * TAG_IFD_SLOT_THREAD_SAFE
+ *
+ * One side effect is that the two readers
+ * are seen by pcscd as one reader so the
+ * interface name is the same for the two.
+ *
+ * So we have:
+ * 0: Gemalto Prox-DU [Prox-DU Contact_09A00795] (09A00795) 00 00
+ * 1: Gemalto Prox-DU [Prox-DU Contact_09A00795] (09A00795) 00 01
+ * instead of
+ * 0: Gemalto Prox-DU [Prox-DU Contact_09A00795] (09A00795) 00 00
+ * 1: Gemalto Prox-DU [Prox-DU Contactless_09A00795] (09A00795) 01 00
+ */
+
+ /* the CCID interfaces are 1 and 2 */
+ interface_number = static_interface;
}
#endif
/* is it already opened? */
More information about the Pcsclite-cvs-commit
mailing list