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

[rousseau at users.alioth.debian.org]

Author: rousseau
Date: Thu Oct  8 08:46:02 2009
New Revision: 4450

URL: http://svn.debian.org/wsvn/pcsclite/?sc=1&rev=4450
Log:
IFDHControl(): do not check if FEATURE_IFD_PIN_PROPERTIES is defined
since we now require pcsc-lite >= 1.5.6 (with FEATURE_IFD_PIN_PROPERTIES
defined) 

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

Modified: trunk/Drivers/ccid/src/ccid_ifdhandler.h
URL: http://svn.debian.org/wsvn/pcsclite/trunk/Drivers/ccid/src/ccid_ifdhandler.h?rev=4450&op=diff
==============================================================================
--- trunk/Drivers/ccid/src/ccid_ifdhandler.h (original)
+++ trunk/Drivers/ccid/src/ccid_ifdhandler.h Thu Oct  8 08:46:02 2009
@@ -33,11 +33,8 @@
 	SCARD_CTL_CODE(FEATURE_MODIFY_PIN_DIRECT + CLASS2_IOCTL_MAGIC)
 #define IOCTL_FEATURE_MCT_READERDIRECT \
 	SCARD_CTL_CODE(FEATURE_MCT_READERDIRECT + CLASS2_IOCTL_MAGIC)
-
-#ifdef FEATURE_IFD_PIN_PROPERTIES
 #define IOCTL_FEATURE_IFD_PIN_PROPERTIES \
 	SCARD_CTL_CODE(FEATURE_IFD_PIN_PROPERTIES + CLASS2_IOCTL_MAGIC)
-#endif
 
 #define DRIVER_OPTION_CCID_EXCHANGE_AUTHORIZED 1
 #define DRIVER_OPTION_GEMPC_TWIN_KEY_APDU 2

Modified: trunk/Drivers/ccid/src/ifdhandler.c
URL: http://svn.debian.org/wsvn/pcsclite/trunk/Drivers/ccid/src/ifdhandler.c?rev=4450&op=diff
==============================================================================
--- trunk/Drivers/ccid/src/ifdhandler.c (original)
+++ trunk/Drivers/ccid/src/ifdhandler.c Thu Oct  8 08:46:02 2009
@@ -1305,7 +1305,6 @@
 			iBytesReturned += sizeof(PCSC_TLV_STRUCTURE);
 		}
 
-#ifdef FEATURE_IFD_PIN_PROPERTIES
 		/* We can always forward wLcdLayout */
 		pcsc_tlv -> tag = FEATURE_IFD_PIN_PROPERTIES;
 		pcsc_tlv -> length = 0x04; /* always 0x04 */
@@ -1313,7 +1312,6 @@
 
 		pcsc_tlv++;
 		iBytesReturned += sizeof(PCSC_TLV_STRUCTURE);
-#endif
 
 		if (KOBIL_TRIBANK == get_ccid_descriptor(reader_index) -> readerID)
 		{
@@ -1329,7 +1327,6 @@
 		return_value = IFD_SUCCESS;
 	}
 
-#ifdef FEATURE_IFD_PIN_PROPERTIES
 	/* Get PIN handling capabilities */
 	if (IOCTL_FEATURE_IFD_PIN_PROPERTIES == dwControlCode)
 	{
@@ -1346,7 +1343,6 @@
 		*pdwBytesReturned = sizeof(*caps);
 		return_value = IFD_SUCCESS;
 	}
-#endif
 
 	/* Verify a PIN, plain CCID */
 	if (IOCTL_FEATURE_VERIFY_PIN_DIRECT == dwControlCode)