[Pcsclite-cvs-commit] r4614 - in /trunk/Drivers/ccid: examples/scardcontrol.c src/ccid_ifdhandler.h src/ifdhandler.c

rousseau at users.alioth.debian.org rousseau at users.alioth.debian.org
Tue Dec 15 09:18:39 UTC 2009


Author: rousseau
Date: Tue Dec 15 09:18:39 2009
New Revision: 4614

URL: http://svn.debian.org/wsvn/pcsclite/?sc=1&rev=4614
Log:
rename FEATURE_MCT_READERDIRECT in FEATURE_MCT_READER_DIRECT

Modified:
    trunk/Drivers/ccid/examples/scardcontrol.c
    trunk/Drivers/ccid/src/ccid_ifdhandler.h
    trunk/Drivers/ccid/src/ifdhandler.c

Modified: trunk/Drivers/ccid/examples/scardcontrol.c
URL: http://svn.debian.org/wsvn/pcsclite/trunk/Drivers/ccid/examples/scardcontrol.c?rev=4614&op=diff
==============================================================================
--- trunk/Drivers/ccid/examples/scardcontrol.c (original)
+++ trunk/Drivers/ccid/examples/scardcontrol.c Tue Dec 15 09:18:39 2009
@@ -240,8 +240,8 @@
 				printf("Reader supports FEATURE_IFD_PIN_PROPERTIES\n");
 				pin_properties_ioctl = ntohl(pcsc_tlv[i].value);
 				break;
-			case FEATURE_MCT_READERDIRECT:
-				printf("Reader supports FEATURE_MCT_READERDIRECT\n");
+			case FEATURE_MCT_READER_DIRECT:
+				printf("Reader supports FEATURE_MCT_READER_DIRECT\n");
 				mct_readerdirect_ioctl = ntohl(pcsc_tlv[i].value);
 				break;
 			default:
@@ -254,9 +254,9 @@
 	{
 		rv = SCardControl(hCard, mct_readerdirect_ioctl, secoder_info,
 			sizeof(secoder_info), bRecvBuffer, sizeof(bRecvBuffer), &length);
-		PCSC_ERROR_CONT(rv, "SCardControl(MCT_READERDIRECT)")
-
-		printf("MCT_READERDIRECT (%ld): ", length);
+		PCSC_ERROR_CONT(rv, "SCardControl(MCT_READER_DIRECT)")
+
+		printf("MCT_READER_DIRECT (%ld): ", length);
 		for (i=0; i<length; i++)
 			printf("%02X ", bRecvBuffer[i]);
 		printf("\n");

Modified: trunk/Drivers/ccid/src/ccid_ifdhandler.h
URL: http://svn.debian.org/wsvn/pcsclite/trunk/Drivers/ccid/src/ccid_ifdhandler.h?rev=4614&op=diff
==============================================================================
--- trunk/Drivers/ccid/src/ccid_ifdhandler.h (original)
+++ trunk/Drivers/ccid/src/ccid_ifdhandler.h Tue Dec 15 09:18:39 2009
@@ -31,8 +31,8 @@
 	SCARD_CTL_CODE(FEATURE_VERIFY_PIN_DIRECT + CLASS2_IOCTL_MAGIC)
 #define IOCTL_FEATURE_MODIFY_PIN_DIRECT \
 	SCARD_CTL_CODE(FEATURE_MODIFY_PIN_DIRECT + CLASS2_IOCTL_MAGIC)
-#define IOCTL_FEATURE_MCT_READERDIRECT \
-	SCARD_CTL_CODE(FEATURE_MCT_READERDIRECT + CLASS2_IOCTL_MAGIC)
+#define IOCTL_FEATURE_MCT_READER_DIRECT \
+	SCARD_CTL_CODE(FEATURE_MCT_READER_DIRECT + CLASS2_IOCTL_MAGIC)
 #define IOCTL_FEATURE_IFD_PIN_PROPERTIES \
 	SCARD_CTL_CODE(FEATURE_IFD_PIN_PROPERTIES + CLASS2_IOCTL_MAGIC)
 

Modified: trunk/Drivers/ccid/src/ifdhandler.c
URL: http://svn.debian.org/wsvn/pcsclite/trunk/Drivers/ccid/src/ifdhandler.c?rev=4614&op=diff
==============================================================================
--- trunk/Drivers/ccid/src/ifdhandler.c (original)
+++ trunk/Drivers/ccid/src/ifdhandler.c Tue Dec 15 09:18:39 2009
@@ -1342,9 +1342,9 @@
 
 		if (KOBIL_TRIBANK == get_ccid_descriptor(reader_index) -> readerID)
 		{
-			pcsc_tlv -> tag = FEATURE_MCT_READERDIRECT;
+			pcsc_tlv -> tag = FEATURE_MCT_READER_DIRECT;
 			pcsc_tlv -> length = 0x04; /* always 0x04 */
-			pcsc_tlv -> value = htonl(IOCTL_FEATURE_MCT_READERDIRECT);
+			pcsc_tlv -> value = htonl(IOCTL_FEATURE_MCT_READER_DIRECT);
 
 			pcsc_tlv++;
 			iBytesReturned += sizeof(PCSC_TLV_STRUCTURE);
@@ -1394,7 +1394,7 @@
 	}
 
 	/* MCT: Multifunctional Card Terminal */
-	if (IOCTL_FEATURE_MCT_READERDIRECT == dwControlCode)
+	if (IOCTL_FEATURE_MCT_READER_DIRECT == dwControlCode)
 	{
 		if ( (TxBuffer[0] != 0x20)	/* CLA */
 			|| ((TxBuffer[1] & 0xF0) != 0x70)	/* INS */




More information about the Pcsclite-cvs-commit mailing list