[Pcsclite-cvs-commit] r4646 - /trunk/PCSC/src/readerfactory.c

[rousseau at users.alioth.debian.org]

Author: rousseau
Date: Fri Jan  8 15:04:05 2010
New Revision: 4646

URL: http://svn.debian.org/wsvn/pcsclite/?sc=1&rev=4646
Log:
RFInitializeReader(): do not dynamically load the driver if
PCSCLITE_STATIC_DRIVER is defined

Modified:
    trunk/PCSC/src/readerfactory.c

Modified: trunk/PCSC/src/readerfactory.c
URL: http://svn.debian.org/wsvn/pcsclite/trunk/PCSC/src/readerfactory.c?rev=4646&op=diff
==============================================================================
--- trunk/PCSC/src/readerfactory.c (original)
+++ trunk/PCSC/src/readerfactory.c Fri Jan  8 15:04:05 2010
@@ -993,6 +993,7 @@
 	Log3(PCSC_LOG_INFO, "Attempting startup of %s using %s",
 		rContext->lpcReader, rContext->lpcLibrary);
 
+#ifndef PCSCLITE_STATIC_DRIVER
 	/* loads the library */
 	rv = RFLoadReader(rContext);
 	if (rv != SCARD_S_SUCCESS)
@@ -1010,6 +1011,10 @@
 		(void)RFUnloadReader(rContext);
 		return rv;
 	}
+#else
+	/* define a fake vHandle. Can be any value except NULL */
+	rContext->vHandle = RFInitializeReader;
+#endif
 
 	/* tries to open the port */
 	rv = IFDOpenIFD(rContext);