[Pcsclite-cvs-commit] Drivers/ccid/src ccid_serial.c,1.24,1.25 ccid_usb.c,1.33,1.34
rousseau@haydn.debian.org
rousseau@haydn.debian.org
Update of /cvsroot/pcsclite/Drivers/ccid/src
In directory haydn:/tmp/cvs-serv1461/src
Modified Files:
ccid_serial.c ccid_usb.c
Log Message:
initialise bMaxSlotIndex and ccid.bCurrentSlotIndex fields
Index: ccid_serial.c
===================================================================
RCS file: /cvsroot/pcsclite/Drivers/ccid/src/ccid_serial.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- ccid_serial.c 16 Jul 2004 06:53:25 -0000 1.24
+++ ccid_serial.c 21 Jul 2004 08:59:28 -0000 1.25
@@ -556,6 +556,8 @@
serialDevice[reader].ccid.bPINSupport = 0x0;
serialDevice[reader].ccid.dwDefaultClock = 4000;
serialDevice[reader].ccid.dwMaxDataRate = 344086;
+ serialDevice[reader].ccid.bMaxSlotIndex = 0;
+ serialDevice[reader].ccid.bCurrentSlotIndex = 0;
serialDevice[reader].buffer_offset = 0;
serialDevice[reader].buffer_offset_last = 0;
Index: ccid_usb.c
===================================================================
RCS file: /cvsroot/pcsclite/Drivers/ccid/src/ccid_usb.c,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- ccid_usb.c 16 Jul 2004 09:07:26 -0000 1.33
+++ ccid_usb.c 21 Jul 2004 08:59:28 -0000 1.34
@@ -350,6 +350,8 @@
usbDevice[reader].ccid.dwMaxIFSD = dw2i(usb_interface->altsetting->extra, 28);
usbDevice[reader].ccid.dwDefaultClock = dw2i(usb_interface->altsetting->extra, 10);
usbDevice[reader].ccid.dwMaxDataRate = dw2i(usb_interface->altsetting->extra, 23);
+ usbDevice[reader].ccid.bMaxSlotIndex = usb_interface->altsetting->extra[4];
+ usbDevice[reader].ccid.bCurrentSlotIndex = 0;
goto end;
}