[Pcsclite-cvs-commit] PCSC/src hotplug_libusb.c,1.14,1.15
sauveron-guest@quantz.debian.org
sauveron-guest@quantz.debian.org
Mon, 20 Oct 2003 18:45:09 +0200
Update of /cvsroot/pcsclite/PCSC/src
In directory quantz:/tmp/cvs-serv19759/src
Modified Files:
hotplug_libusb.c
Log Message:
Correct with the goods concepts constants
Index: hotplug_libusb.c
===================================================================
RCS file: /cvsroot/pcsclite/PCSC/src/hotplug_libusb.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- hotplug_libusb.c 18 Oct 2003 17:19:36 -0000 1.14
+++ hotplug_libusb.c 20 Oct 2003 16:45:07 -0000 1.15
@@ -39,7 +39,7 @@
#define PCSCLITE_NAMEKEY_NAME "ifdFriendlyName"
#define PCSCLITE_LIBRKEY_NAME "CFBundleExecutable"
-/* PCSCLITE_MAX_READERS is defined in pcsclite.h */
+/* PCSCLITE_MAX_READERS_CONTEXTS is defined in pcsclite.h */
#define PCSCLITE_MAX_DRIVERS 16
#define BUS_DEVICE_STRSIZE 256
#define PCSCLITE_HP_BASE_PORT 0x200000
@@ -73,7 +73,7 @@
} driverTracker[PCSCLITE_MAX_DRIVERS];
/*
- * keep track of PCSCLITE_MAX_READERS simultaneous readers
+ * keep track of PCSCLITE_MAX_READERS_CONTEXTS simultaneous readers
*/
static struct _readerTracker
{
@@ -81,7 +81,7 @@
char bus_device[BUS_DEVICE_STRSIZE]; /* device name */
struct _driverTracker *driver; /* driver for this reader */
-} readerTracker[PCSCLITE_MAX_READERS];
+} readerTracker[PCSCLITE_MAX_READERS_CONTEXTS];
LONG HPReadBundleValues(void);
LONG HPAddHotPluggable(struct usb_device *dev, const char bus_device[],
@@ -194,7 +194,7 @@
usb_find_busses();
usb_find_devices();
- for (i=0; i < PCSCLITE_MAX_READERS; i++)
+ for (i=0; i < PCSCLITE_MAX_READERS_CONTEXTS; i++)
/* clear rollcall */
readerTracker[i].status = READER_ABSENT;
@@ -223,7 +223,7 @@
newreader = TRUE;
/* Check if the reader is a new one */
- for (j=0; j<PCSCLITE_MAX_READERS; j++)
+ for (j=0; j<PCSCLITE_MAX_READERS_CONTEXTS; j++)
{
if (strncmp(readerTracker[j].bus_device,
bus_device, BUS_DEVICE_STRSIZE) == 0)
@@ -250,7 +250,7 @@
/*
* check if all the previously found readers are still present
*/
- for (i=0; i<PCSCLITE_MAX_READERS; i++)
+ for (i=0; i<PCSCLITE_MAX_READERS_CONTEXTS; i++)
{
#if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__OpenBSD__)
int fd;
@@ -317,7 +317,7 @@
driverTracker[i].readerName = NULL;
}
- for (i=0; i<PCSCLITE_MAX_READERS; i++)
+ for (i=0; i<PCSCLITE_MAX_READERS_CONTEXTS; i++)
{
readerTracker[i].driver = NULL;
readerTracker[i].status = READER_ABSENT;
@@ -342,13 +342,13 @@
DebugLogB("Adding USB device: %s", bus_device);
/* find a free entry */
- for (i=0; i<PCSCLITE_MAX_READERS; i++)
+ for (i=0; i<PCSCLITE_MAX_READERS_CONTEXTS; i++)
{
if (readerTracker[i].driver == NULL)
break;
}
- if (i==PCSCLITE_MAX_READERS)
+ if (i==PCSCLITE_MAX_READERS_CONTEXTS)
{
DebugLogB("Not enough reader entries. Already found %d readers", i);
return 0;