[Pcsclite-cvs-commit] r6682 - trunk/Drivers/ccid/src
ludovic.rousseau at free.fr
ludovic.rousseau at free.fr
Sun Jul 28 09:30:21 UTC 2013
Author: rousseau
Date: 2013-07-01 08:56:09 +0000 (Mon, 01 Jul 2013)
New Revision: 6682
Modified:
trunk/Drivers/ccid/src/ccid_usb.c
Log:
Code factorisation
Modified: trunk/Drivers/ccid/src/ccid_usb.c
===================================================================
--- trunk/Drivers/ccid/src/ccid_usb.c 2013-07-01 08:54:13 UTC (rev 6681)
+++ trunk/Drivers/ccid/src/ccid_usb.c 2013-07-01 08:56:09 UTC (rev 6682)
@@ -386,9 +386,7 @@
int interface;
int num = 0;
const unsigned char *device_descriptor;
-#if defined(USE_COMPOSITE_AS_MULTISLOT) || defined(__APPLE__)
int readerID = (vendorID << 16) + productID;
-#endif
#ifdef USE_COMPOSITE_AS_MULTISLOT
static int static_interface = 1;
@@ -450,8 +448,8 @@
* and the reader is multi-slot */
usbDevice[reader_index] = usbDevice[previous_reader_index];
/* the other slots do not have the same data rates */
- if ((GEMCOREPOSPRO == usbDevice[reader_index].ccid.readerID)
- || (GEMCORESIMPRO == usbDevice[reader_index].ccid.readerID))
+ if ((GEMCOREPOSPRO == readerID)
+ || (GEMCORESIMPRO == readerID))
{
usbDevice[reader_index].ccid.arrayOfSupportedDataRates = SerialCustomDataRates;
usbDevice[reader_index].ccid.dwMaxDataRate = 125000;
More information about the Pcsclite-cvs-commit
mailing list