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

rousseau at users.alioth.debian.org rousseau at users.alioth.debian.org
Mon Jun 14 14:02:26 UTC 2010


Author: rousseau
Date: Mon Jun 14 14:02:24 2010
New Revision: 4993

URL: http://svn.debian.org/wsvn/pcsclite/?sc=1&rev=4993
Log:
use libusb-1.0/libusb.h instead of usb.h (from libusb-0.1)

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=4993&op=diff
==============================================================================
--- trunk/Drivers/ccid/src/ccid_usb.c (original)
+++ trunk/Drivers/ccid/src/ccid_usb.c Mon Jun 14 14:02:24 2010
@@ -29,7 +29,8 @@
 # ifdef S_SPLINT_S
 # include <sys/types.h>
 # endif
-#include <usb.h>
+#include <libusb-1.0/libusb.h>
+#include <stdlib.h>
 #include <ifdhandler.h>
 
 #include "misc.h"
@@ -742,21 +743,27 @@
 	for (i=0; i<usb_interface->altsetting->bNumEndpoints; i++)
 	{
 		/* interrupt end point (if available) */
-		if (usb_interface->altsetting->endpoint[i].bmAttributes == USB_ENDPOINT_TYPE_INTERRUPT)
+		if (usb_interface->altsetting->endpoint[i].bmAttributes
+			== LIBUSB_TRANSFER_TYPE_INTERRUPT)
 		{
-			usbdevice->interrupt = usb_interface->altsetting->endpoint[i].bEndpointAddress;
+			usbdevice->interrupt =
+				usb_interface->altsetting->endpoint[i].bEndpointAddress;
 			continue;
 		}
 
-		if (usb_interface->altsetting->endpoint[i].bmAttributes != USB_ENDPOINT_TYPE_BULK)
+		if (usb_interface->altsetting->endpoint[i].bmAttributes
+			!= LIBUSB_TRANSFER_TYPE_BULK)
 			continue;
 
-		bEndpointAddress = usb_interface->altsetting->endpoint[i].bEndpointAddress;
-
-		if ((bEndpointAddress & USB_ENDPOINT_DIR_MASK) == USB_ENDPOINT_IN)
+		bEndpointAddress =
+			usb_interface->altsetting->endpoint[i].bEndpointAddress;
+
+		if ((bEndpointAddress & LIBUSB_TRANSFER_TYPE_MASK)
+			== LIBUSB_ENDPOINT_IN)
 			usbdevice->bulk_in = bEndpointAddress;
 
-		if ((bEndpointAddress & USB_ENDPOINT_DIR_MASK) == USB_ENDPOINT_OUT)
+		if ((bEndpointAddress & LIBUSB_TRANSFER_TYPE_MASK)
+			== LIBUSB_ENDPOINT_OUT)
 			usbdevice->bulk_out = bEndpointAddress;
 	}
 




More information about the Pcsclite-cvs-commit mailing list