[Pcsclite-cvs-commit] r5027 - /trunk/Drivers/ccid/src/ccid_usb.c

[rousseau at users.alioth.debian.org]

Author: rousseau
Date: Tue Jun 22 09:18:00 2010
New Revision: 5027

URL: http://svn.debian.org/wsvn/pcsclite/?sc=1&rev=5027
Log:
Use ctx instead of NULL to keep the information that this parameter is
the libusb context.

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=5027&op=diff
==============================================================================
--- trunk/Drivers/ccid/src/ccid_usb.c (original)
+++ trunk/Drivers/ccid/src/ccid_usb.c Tue Jun 22 09:18:00 2010
@@ -56,6 +56,9 @@
 #define ALLOW_PROPRIETARY_CLASS
 
 #define BUS_DEVICE_STRSIZE 32
+
+/* we use the default libusb context */
+#define ctx NULL
 
 typedef struct
 {
@@ -266,9 +269,9 @@
 	for (; vendorID--;)
 		alias ^= keyValue[vendorID];
 
-	libusb_init(NULL);
-
-	cnt = libusb_get_device_list(NULL, &devs);
+	libusb_init(ctx);
+
+	cnt = libusb_get_device_list(ctx, &devs);
 	if (cnt < 0)
 	{
 		(void)printf("libusb_get_device_list() failed\n");
@@ -559,7 +562,7 @@
 end:
 	if (usbDevice[reader_index].dev_handle == NULL)
 	{
-		libusb_exit(NULL);
+		libusb_exit(ctx);
 		return STATUS_NO_SUCH_DEVICE;
 	}
 
@@ -706,7 +709,7 @@
 			usbDevice[reader_index].interface);
 		(void)libusb_close(usbDevice[reader_index].dev_handle);
 
-		libusb_exit(NULL);
+		libusb_exit(ctx);
 	}
 
 	/* mark the resource unused */