Changeset 3481 for branches/alonbl/pnp/src/libopensc/ctx.c

Timestamp:

04/20/08 09:59:23 (9 months ago)

Author:

alonbl

Message:

Initial Plug&Play support

Add detect_readers() to reader opts.
Add sc_ctx_detect_readers() that calls readers' detect_readers().
Allow context to be created without readers.
Call sc_ctx_detect_readers() from PKCS#11 C_GetSlotList with NULL_PTR.

Since I broke ABI, I updated the external module version requirement
to match OpenSC version. In the future a separate version should be
maintaind for each interface, this should be unrelated to the package
version.

Files:

• branches/alonbl/pnp/src/libopensc/ctx.c (modified) (3 diffs)

branches/alonbl/pnp/src/libopensc/ctx.c

@@ -355 +355 @@
         /* verify module version */
         version = modversion();
-        if (version == NULL || strncmp(version, "0.9.", strlen("0.9.")) > 0) {
+        /* XXX: We really need to have ABI version for each interface */
+        if (version == NULL || strncmp(version, PACKAGE_VERSION, strlen(PACKAGE_VERSION)) != 0) {
                 sc_error(ctx,"dynamic library '%s': invalid module version\n",libname);
                 lt_dlclose(handle);
@@ -638 +639 @@
 }
 
+int sc_ctx_detect_readers(sc_context_t *ctx)
+{
+        int i;
+
+        sc_mutex_lock(ctx, ctx->mutex);
+
+        for (i = 0; ctx->reader_drivers[i] != NULL; i++) {
+                const struct sc_reader_driver *drv = ctx->reader_drivers[i];
+
+                if (drv->ops->detect_readers != NULL)
+                        drv->ops->detect_readers(ctx, ctx->reader_drv_data[i]);
+        }
+
+        sc_mutex_unlock(ctx, ctx->mutex);
+
+        /* XXX: Do not ignore erros? */
+        return SC_SUCCESS;
+}
+
 sc_reader_t *sc_ctx_get_reader(sc_context_t *ctx, unsigned int i)
 {
@@ -725 +745 @@
         del_drvs(&opts, 0);
         del_drvs(&opts, 1);
-        if (ctx->reader_count == 0) {
-                sc_release_context(ctx);
-                return SC_ERROR_NO_READERS_FOUND;
-        }
+        sc_ctx_detect_readers(ctx);
         *ctx_out = ctx;
         return SC_SUCCESS;