[Pcsclite-cvs-commit] Drivers/ccid/src ccid_usb.h,1.4,1.5 parse.c,1.6,1.7

[rousseau@quantz.debian.org]

Update of /cvsroot/pcsclite/Drivers/ccid/src
In directory quantz:/tmp/cvs-serv27779

Modified Files:
	ccid_usb.h parse.c 
Log Message:
remore *device_name[] argument from get_desc()


Index: ccid_usb.h
===================================================================
RCS file: /cvsroot/pcsclite/Drivers/ccid/src/ccid_usb.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- ccid_usb.h	27 Jan 2004 13:39:47 -0000	1.4
+++ ccid_usb.h	29 Jan 2004 10:32:20 -0000	1.5
@@ -28,8 +28,7 @@
 status_t CloseUSB(int lun);
 
 #ifdef __USB_H__
-int get_desc(int channel, char *device_name[], usb_dev_handle **handle,
-	struct usb_device **dev);
+int get_desc(int channel, usb_dev_handle **handle, struct usb_device **dev);
 #endif
 #ifdef __CCID_USB__
 int get_end_points(struct usb_device *dev, _usbDevice *usb_device);

Index: parse.c
===================================================================
RCS file: /cvsroot/pcsclite/Drivers/ccid/src/parse.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- parse.c	5 Jan 2004 20:53:59 -0000	1.6
+++ parse.c	29 Jan 2004 10:32:20 -0000	1.7
@@ -34,7 +34,7 @@
 #define FALSE 0
 #endif
 
-int ccid_parse_interface_descriptor(char device_name[], usb_dev_handle *handle,
+int ccid_parse_interface_descriptor(usb_dev_handle *handle,
 	struct usb_device *dev);
 
 
@@ -58,12 +58,11 @@
 		}
 		else
 		{
-			char *device_name;
 			usb_dev_handle *handle;
 			struct usb_device *dev;
 
-			get_desc(channel, &device_name, &handle, &dev);
-			res = ccid_parse_interface_descriptor(device_name, handle, dev);
+			get_desc(channel, &handle, &dev);
+			res = ccid_parse_interface_descriptor(handle, dev);
 		}
 	}
 
@@ -82,7 +81,7 @@
  *					Parse a CCID USB Descriptor
  *
  ****************************************************************************/
-int ccid_parse_interface_descriptor(char device_name[], usb_dev_handle *handle,
+int ccid_parse_interface_descriptor(usb_dev_handle *handle,
 	struct usb_device *dev)
 {
 	struct usb_interface_descriptor *usb_interface;
@@ -92,7 +91,8 @@
 	/*
 	 * Interface Descriptor
 	 */
-	printf("Parsing Interface Descriptor for device: %s\n", device_name);
+	printf("Parsing Interface Descriptor for device: %s/%s\n",
+		dev->bus->dirname, dev->filename);
 
 	/*
 	 * Vendor/model name