[Pcsclite-cvs-commit] Drivers/ccid/src ifdhandler.c,1.24,1.25

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


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

Modified Files:
	ifdhandler.c 
Log Message:
add SCARD_ATTR_ATR_STRING in addition to TAG_IFD_ATR in IFDHGetCapabilities()


Index: ifdhandler.c
===================================================================
RCS file: /cvsroot/pcsclite/Drivers/ccid/src/ifdhandler.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- ifdhandler.c	16 Apr 2004 15:22:02 -0000	1.24
+++ ifdhandler.c	19 Apr 2004 16:09:24 -0000	1.25
@@ -35,6 +35,7 @@
 #include "protocol_t1/pps.h"
 #include "protocol_t1/protocol_t1.h"
 #include "parser.h"
+#include "winsmcrd.h"
 
 #ifdef HAVE_PTHREAD
 #include <pthread.h>
@@ -223,7 +224,7 @@
 	 * IFD_SUCCESS IFD_ERROR_TAG
 	 */
 
-	DEBUG_INFO3("lun: %X, tag: %02X", Lun, Tag);
+	DEBUG_INFO3("lun: %X, tag: 0x%X", Lun, Tag);
 
 	if (CheckLun(Lun))
 		return IFD_COMMUNICATION_ERROR;
@@ -231,13 +232,12 @@
 	switch (Tag)
 	{
 		case TAG_IFD_ATR:
+		case SCARD_ATTR_ATR_STRING:
 			/* If Length is not zero, powerICC has been performed.
 			 * Otherwise, return NULL pointer
 			 * Buffer size is stored in *Length */
-			*Length = (*Length < CcidSlots[LunToReaderIndex(Lun)]
-				.nATRLength) ?
-				*Length : CcidSlots[LunToReaderIndex(Lun)]
-				.nATRLength;
+			*Length = (*Length < CcidSlots[LunToReaderIndex(Lun)].nATRLength) ?
+				*Length : CcidSlots[LunToReaderIndex(Lun)].nATRLength;
 
 			if (*Length)
 				memcpy(Value, CcidSlots[LunToReaderIndex(Lun)]
@@ -300,7 +300,7 @@
 
 	/* By default, say it worked */
 
-	DEBUG_PERIODIC2("lun: %X", Lun);
+	DEBUG_INFO3("lun: %X, tag: 0x%X", Lun, Tag);
 
 	/* if (CheckLun(Lun))
 		return IFD_COMMUNICATION_ERROR; */