[Pcsclite-cvs-commit] Drivers/ccid/src ccid_serial.c,1.19,1.20 ccid_usb.c,1.27,1.28

rousseau@haydn.debian.org rousseau@haydn.debian.org


Update of /cvsroot/pcsclite/Drivers/ccid/src
In directory haydn:/tmp/cvs-serv20166

Modified Files:
	ccid_serial.c ccid_usb.c 
Log Message:
lun is (unsigned int) so reader = LunToReaderIndex(lun) is also (unsigned int)


Index: ccid_serial.c
===================================================================
RCS file: /cvsroot/pcsclite/Drivers/ccid/src/ccid_serial.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- ccid_serial.c	9 Jul 2004 08:25:51 -0000	1.19
+++ ccid_serial.c	9 Jul 2004 08:28:44 -0000	1.20
@@ -472,7 +472,7 @@
 {
 	struct termios current_termios;
 	int i;
-	int reader = LunToReaderIndex(lun);
+	unsigned int reader = LunToReaderIndex(lun);
 
 	DEBUG_COMM3("Lun: %X, Device: %d", lun, dev_name);
 
@@ -580,7 +580,7 @@
  *****************************************************************************/
 status_t CloseSerial(unsigned int lun)
 {
-	int reader = LunToReaderIndex(lun);
+	unsigned int reader = LunToReaderIndex(lun);
 
 	close(serialDevice[reader].fd);
 	serialDevice[reader].fd = -1;

Index: ccid_usb.c
===================================================================
RCS file: /cvsroot/pcsclite/Drivers/ccid/src/ccid_usb.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- ccid_usb.c	9 Jul 2004 07:10:17 -0000	1.27
+++ ccid_usb.c	9 Jul 2004 08:28:44 -0000	1.28
@@ -107,7 +107,7 @@
 status_t OpenUSBByName(unsigned int lun, char *device)
 {
 	static struct usb_bus *busses = NULL;
-	int reader = LunToReaderIndex(lun);
+	unsigned int reader = LunToReaderIndex(lun);
 	int alias = 0;
 	struct usb_bus *bus;
 	struct usb_dev_handle *dev_handle;
@@ -369,7 +369,7 @@
 status_t WriteUSB(unsigned int lun, unsigned int length, unsigned char *buffer)
 {
 	int rv;
-	int reader = LunToReaderIndex(lun);
+	unsigned int reader = LunToReaderIndex(lun);
 #ifdef DEBUG_LEVEL_COMM
 	char debug_header[] = "-> 121234 ";
 
@@ -403,7 +403,7 @@
 status_t ReadUSB(unsigned int lun, unsigned int * length, unsigned char *buffer)
 {
 	int rv;
-	int reader = LunToReaderIndex(lun);
+	unsigned int reader = LunToReaderIndex(lun);
 #ifdef DEBUG_LEVEL_COMM
 	char debug_header[] = "<- 121234 ";
 
@@ -441,7 +441,7 @@
 {
 	struct usb_interface *usb_interface;
 	int interface;
-	int reader = LunToReaderIndex(lun);
+	unsigned int reader = LunToReaderIndex(lun);
 
 	/* device not opened */
 	if (usbDevice[reader].dev == NULL)