[Pcsclite-cvs-commit] Drivers/ccid/src ccid_ifdhandler.h,1.10,1.11 ccid_serial.c,1.23,1.24 ccid_usb.c,1.31,1.32 ifdhandler.c,1.38,1.39 parse.c,1.15,1.16 utils.c,1.4,1.5
rousseau@haydn.debian.org
rousseau@haydn.debian.org
Update of /cvsroot/pcsclite/Drivers/ccid/src
In directory haydn:/tmp/cvs-serv32568/src
Modified Files:
ccid_ifdhandler.h ccid_serial.c ccid_usb.c ifdhandler.c
parse.c utils.c
Log Message:
rename PCSCLITE_MAX_READERS in CCID_DRIVER_MAX_READERS
This value is not defined by pcsc-lite but is internal to the CCID
driver. By default pcsc-lite supports the same number of readers (16).
Index: ccid_ifdhandler.h
===================================================================
RCS file: /cvsroot/pcsclite/Drivers/ccid/src/ccid_ifdhandler.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- ccid_ifdhandler.h 9 Jul 2004 07:10:17 -0000 1.10
+++ ccid_ifdhandler.h 16 Jul 2004 06:53:25 -0000 1.11
@@ -39,8 +39,11 @@
/*
* Maximum number of CCID readers supported simultaneously
+ *
+ * The maximum number of readers is also limited in pcsc-lite (16 by default)
+ * see the definition of PCSCLITE_MAX_READERS_CONTEXTS in src/PCSC/pcsclite.h
*/
-#define PCSCLITE_MAX_READERS 16
+#define CCID_DRIVER_MAX_READERS 16
/*
* CCID driver specific functions
Index: ccid_serial.c
===================================================================
RCS file: /cvsroot/pcsclite/Drivers/ccid/src/ccid_serial.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- ccid_serial.c 9 Jul 2004 13:23:37 -0000 1.23
+++ ccid_serial.c 16 Jul 2004 06:53:25 -0000 1.24
@@ -135,7 +135,7 @@
#include "ccid_serial.h"
/* no need to initialize to 0 since it is static */
-static _serialDevice serialDevice[PCSCLITE_MAX_READERS];
+static _serialDevice serialDevice[CCID_DRIVER_MAX_READERS];
/* unexported functions */
static int ReadChunk(unsigned int lun, unsigned char *buffer, int buffer_length,
@@ -486,7 +486,7 @@
DEBUG_COMM3("Lun: %X, Device: %d", lun, dev_name);
/* check if the same channel is not already used */
- for (i=0; i<PCSCLITE_MAX_READERS; i++)
+ for (i=0; i<CCID_DRIVER_MAX_READERS; i++)
{
if (serialDevice[i].device &&
strcmp(serialDevice[i].device, dev_name) == 0)
Index: ccid_usb.c
===================================================================
RCS file: /cvsroot/pcsclite/Drivers/ccid/src/ccid_usb.c,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- ccid_usb.c 9 Jul 2004 13:23:37 -0000 1.31
+++ ccid_usb.c 16 Jul 2004 06:53:25 -0000 1.32
@@ -84,7 +84,7 @@
static int get_end_points(struct usb_device *dev, _usbDevice *usb_device);
/* ne need to initialize to 0 since it is static */
-static _usbDevice usbDevice[PCSCLITE_MAX_READERS];
+static _usbDevice usbDevice[CCID_DRIVER_MAX_READERS];
#define PCSCLITE_MANUKEY_NAME "ifdVendorID"
#define PCSCLITE_PRODKEY_NAME "ifdProductID"
@@ -263,7 +263,7 @@
/* is it already opened? */
already_used = FALSE;
- for (r=0; r<PCSCLITE_MAX_READERS; r++)
+ for (r=0; r<CCID_DRIVER_MAX_READERS; r++)
{
if (usbDevice[r].dev)
{
@@ -491,7 +491,7 @@
int get_desc(int channel, usb_dev_handle **handle, struct
usb_device **dev)
{
- if (channel < 0 || channel > PCSCLITE_MAX_READERS)
+ if (channel < 0 || channel > CCID_DRIVER_MAX_READERS)
return 1;
*handle = usbDevice[channel].handle;
Index: ifdhandler.c
===================================================================
RCS file: /cvsroot/pcsclite/Drivers/ccid/src/ifdhandler.c,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -d -r1.38 -r1.39
--- ifdhandler.c 9 Jul 2004 14:08:28 -0000 1.38
+++ ifdhandler.c 16 Jul 2004 06:53:25 -0000 1.39
@@ -41,7 +41,7 @@
#endif
/* Array of structures to hold the ATR and other state value of each slot */
-static CcidDesc CcidSlots[PCSCLITE_MAX_READERS];
+static CcidDesc CcidSlots[CCID_DRIVER_MAX_READERS];
/* global mutex */
#ifdef HAVE_PTHREAD
@@ -250,7 +250,7 @@
if (*Length >= 1)
{
*Length = 1;
- *Value = PCSCLITE_MAX_READERS;
+ *Value = CCID_DRIVER_MAX_READERS;
}
break;
Index: parse.c
===================================================================
RCS file: /cvsroot/pcsclite/Drivers/ccid/src/parse.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- parse.c 9 Jul 2004 14:08:28 -0000 1.15
+++ parse.c 16 Jul 2004 06:53:25 -0000 1.16
@@ -52,7 +52,7 @@
status_t res;
unsigned int channel;
- for (channel=0; channel<PCSCLITE_MAX_READERS; channel++)
+ for (channel=0; channel<CCID_DRIVER_MAX_READERS; channel++)
{
res = OpenUSB(channel<<16, channel);
if (res != STATUS_SUCCESS)
Index: utils.c
===================================================================
RCS file: /cvsroot/pcsclite/Drivers/ccid/src/utils.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- utils.c 30 Jun 2004 13:30:45 -0000 1.4
+++ utils.c 16 Jul 2004 06:53:25 -0000 1.5
@@ -32,7 +32,7 @@
* returns TRUE in case of error */
int CheckLun(DWORD Lun)
{
- if ((LunToReaderIndex(Lun) >= PCSCLITE_MAX_READERS) ||
+ if ((LunToReaderIndex(Lun) >= CCID_DRIVER_MAX_READERS) ||
LunToReaderIndex(Lun) < 0)
return TRUE;