[Pcsclite-cvs-commit] CVS Drivers/ccid/src

[CVS User rousseau]

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

Modified Files:
	ifdhandler.c 
Log Message:
mask bStatus to get the ICC state since bSatus may also indicate 
an error in b6-b7


--- /cvsroot/pcsclite/Drivers/ccid/src/ifdhandler.c	2004/09/03 19:42:37	1.53
+++ /cvsroot/pcsclite/Drivers/ccid/src/ifdhandler.c	2004/09/30 14:12:20	1.54
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
 
-/* $Id: ifdhandler.c,v 1.53 2004/09/03 19:42:37 rousseau Exp $ */
+/* $Id: ifdhandler.c,v 1.54 2004/09/30 14:12:20 rousseau Exp $ */
 
 #include <stdio.h>
 #include <string.h>
@@ -905,15 +905,15 @@
 		return IFD_COMMUNICATION_ERROR;
 
 	return_value = IFD_COMMUNICATION_ERROR;
-	switch (pcbuffer[7])	/* bStatus */
+	switch (pcbuffer[7] & CCID_ICC_STATUS_MASK)	/* bStatus */
 	{
-		case 0x00:
-		case 0x01:
+		case CCID_ICC_PRESENT_ACTIVE:
+		case CCID_ICC_PRESENT_INACTIVE:
 			return_value = IFD_ICC_PRESENT;
 			/* use default slot */
 			break;
 
-		case 0x02:
+		case CCID_ICC_ABSENT:
 			/* Reset ATR buffer */
 			CcidSlots[reader_index].nATRLength = 0;
 			*CcidSlots[reader_index].pcATRBuffer = '\0';