[Pcsclite-cvs-commit] PCSC/src eventhandler.c,1.22,1.23

[rousseau@haydn.debian.org]

Update of /cvsroot/pcsclite/PCSC/src
In directory haydn:/tmp/cvs-serv31816

Modified Files:
	eventhandler.c 
Log Message:
use ..->cardProtocol = SCARD_PROTOCOL_UNSET instead of ..->cardProtocol = 0


Index: eventhandler.c
===================================================================
RCS file: /cvsroot/pcsclite/PCSC/src/eventhandler.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- eventhandler.c	18 Jun 2004 08:44:31 -0000	1.22
+++ eventhandler.c	2 Aug 2004 18:13:49 -0000	1.23
@@ -88,7 +88,7 @@
 		(readerStates[i])->lockState = 0;
 		(readerStates[i])->readerSharing = 0;
 		(readerStates[i])->cardAtrLength = 0;
-		(readerStates[i])->cardProtocol = 0;
+		(readerStates[i])->cardProtocol = SCARD_PROTOCOL_UNSET;
 	}
 
 	return SCARD_S_SUCCESS;
@@ -131,7 +131,7 @@
 	rContext->readerState->lockState = 0;
 	rContext->readerState->readerSharing = 0;
 	rContext->readerState->cardAtrLength = 0;
-	rContext->readerState->cardProtocol = 0;
+	rContext->readerState->cardProtocol = SCARD_PROTOCOL_UNSET;
 
 	/* Zero the thread */
 	rContext->pthThread = 0;
@@ -178,7 +178,7 @@
 	rContext->readerState->readerState = dwStatus;
 	rContext->readerState->readerSharing = rContext->dwContexts;
 	rContext->readerState->cardAtrLength = dwAtrLen;
-	rContext->readerState->cardProtocol = 0;
+	rContext->readerState->cardProtocol = SCARD_PROTOCOL_UNSET;
 
 	rv = SYS_ThreadCreate(&rContext->pthThread, NULL,
 		(PCSCLITE_THREAD_FUNCTION( ))EHStatusHandlerThread, (LPVOID) rContext);
@@ -262,7 +262,7 @@
 		dwStatus &= ~SCARD_SWALLOWED;
 		dwStatus &= ~SCARD_UNKNOWN;
 		rContext->readerState->cardAtrLength = 0;
-		rContext->readerState->cardProtocol = 0;
+		rContext->readerState->cardProtocol = SCARD_PROTOCOL_UNSET;
 
 		dwCurrentState = SCARD_ABSENT;
 	}
@@ -300,7 +300,7 @@
 			rContext->readerState->readerState &= ~SCARD_SWALLOWED;
 			rContext->readerState->readerState |= SCARD_UNKNOWN;
 			rContext->readerState->cardAtrLength = 0;
-			rContext->readerState->cardProtocol = 0;
+			rContext->readerState->cardProtocol = SCARD_PROTOCOL_UNSET;
 
 			dwCurrentState = SCARD_UNKNOWN;
 
@@ -342,7 +342,7 @@
 				RFSetReaderEventState(rContext, SCARD_REMOVED);
 
 				rContext->readerState->cardAtrLength = 0;
-				rContext->readerState->cardProtocol = 0;
+				rContext->readerState->cardProtocol = SCARD_PROTOCOL_UNSET;
 				rContext->readerState->readerState |= SCARD_ABSENT;
 				rContext->readerState->readerState &= ~SCARD_UNKNOWN;
 				rContext->readerState->readerState &= ~SCARD_PRESENT;
@@ -399,7 +399,7 @@
 					rContext->readerState->readerState &= ~SCARD_SPECIFIC;
 					rContext->readerState->readerState &= ~SCARD_UNKNOWN;
 					rContext->readerState->cardAtrLength = 0;
-					rContext->readerState->cardProtocol = 0;
+					rContext->readerState->cardProtocol = SCARD_PROTOCOL_UNSET;
 				}
 
 				dwCurrentState = SCARD_PRESENT;