[Pcsclite-cvs-commit] r2166 - trunk/Drivers/ccid/src

[Ludovic Rousseau]

Author: rousseau
Date: 2006-09-20 13:40:19 +0000 (Wed, 20 Sep 2006)
New Revision: 2166

Modified:
   trunk/Drivers/ccid/src/Makefile.am
   trunk/Drivers/ccid/src/ifdhandler.c
Log:
add support for SCARD_ATTR_VENDOR_IFD_VERSION tag used by
SCardGetAttrib()


Modified: trunk/Drivers/ccid/src/Makefile.am
===================================================================
--- trunk/Drivers/ccid/src/Makefile.am	2006-09-20 13:39:23 UTC (rev 2165)
+++ trunk/Drivers/ccid/src/Makefile.am	2006-09-20 13:40:19 UTC (rev 2166)
@@ -4,6 +4,8 @@
 CCID_LIB = libccid.$(DYN_LIB_EXT)
 CCIDTWIN_LIB = libccidtwin.$(DYN_LIB_EXT)
 
+CCID_VERSION=CCID_VERSION=`./convert_version.pl $(PACKAGE_VERSION)`
+
 lib_LTLIBRARIES = libccid.la
 LIBS_TO_INSTALL = install_ccid
 if WITH_TWIN_SERIAL
@@ -48,12 +50,12 @@
 libccid_la_LIBADD = $(LIBDL) $(LEXLIB) $(COREFOUNDATION) $(IOKIT) \
 	$(LIBUSB_LIBS) $(PTHREAD_LIBS)
 libccid_la_CFLAGS = $(PCSC_CFLAGS) $(LIBUSB_CFLAGS) $(PTHREAD_CFLAGS) \
-	$(SYMBOL_VISIBILITY)
+	$(SYMBOL_VISIBILITY) -D$(CCID_VERSION)
 
 libccidtwin_la_SOURCES = $(COMMON) $(SERIAL) $(TOKEN_PARSER) \
 	$(PROVIDED_BY_PCSC) $(T1)
 libccidtwin_la_CFLAGS = $(PCSC_CFLAGS) $(PTHREAD_CFLAGS) $(SYMBOL_VISIBILITY) \
-	-DTWIN_SERIAL
+	-DTWIN_SERIAL -D$(CCID_VERSION)
 libccidtwin_la_LIBADD = $(PTHREAD_LIBS)
 
 parse_SOURCES = parse.c debug.c

Modified: trunk/Drivers/ccid/src/ifdhandler.c
===================================================================
--- trunk/Drivers/ccid/src/ifdhandler.c	2006-09-20 13:39:23 UTC (rev 2165)
+++ trunk/Drivers/ccid/src/ifdhandler.c	2006-09-20 13:40:19 UTC (rev 2166)
@@ -322,6 +322,15 @@
 			}
 			break;
 
+		case SCARD_ATTR_VENDOR_IFD_VERSION:
+			/* Vendor-supplied interface device version (DWORD in the form
+			 * 0xMMmmbbbb where MM = major version, mm = minor version, and
+			 * bbbb = build number). */
+			*Length = sizeof(DWORD);
+			if (Value)
+				*(DWORD *)Value = CCID_VERSION;
+			break;
+
 		default:
 			return IFD_ERROR_TAG;
 	}