Changeset 3404 for trunk/src/pkcs11/slot.c

Timestamp:

03/06/08 15:04:29 (10 months ago)

Author:

alonbl

Message:

Convert constant SC_PKCS11_MAX_VIRTUAL_SLOTS to configuration option.

Files:

• trunk/src/pkcs11/slot.c (modified) (5 diffs)

trunk/src/pkcs11/slot.c

@@ -64 +64 @@
                 avail = sc_pkcs11_conf.num_slots;
 
-        if (first_free_slot + avail > SC_PKCS11_MAX_VIRTUAL_SLOTS)
-                avail = SC_PKCS11_MAX_VIRTUAL_SLOTS - first_free_slot;
+        if (first_free_slot + avail > sc_pkcs11_conf.pkcs11_max_virtual_slots)
+                avail = sc_pkcs11_conf.pkcs11_max_virtual_slots - first_free_slot;
         card->first_slot = first_free_slot;
         card->max_slots = avail;
@@ -166 +166 @@
                 CK_SLOT_ID id;
 
-                for (id = 0; id < SC_PKCS11_MAX_VIRTUAL_SLOTS; id++)
+                for (id = 0; id < sc_pkcs11_conf.pkcs11_max_virtual_slots; id++)
                         virtual_slots[id].events = 0;
         }
@@ -185 +185 @@
         sc_debug(context, "%d: smart card removed\n", reader);
 
-        for (i=0; i<SC_PKCS11_MAX_VIRTUAL_SLOTS; i++) {
+        for (i=0; i<sc_pkcs11_conf.pkcs11_max_virtual_slots; i++) {
                 if (virtual_slots[i].card &&
                     virtual_slots[i].card->reader == reader)
@@ -246 +246 @@
                 return CKR_CRYPTOKI_NOT_INITIALIZED;
 
-        if (id < 0 || id >= SC_PKCS11_MAX_VIRTUAL_SLOTS)
+        if (id < 0 || id >= sc_pkcs11_conf.pkcs11_max_virtual_slots)
                 return CKR_SLOT_ID_INVALID;
                 
@@ -325 +325 @@
 
         card_detect_all();
-        for (id = 0; id < SC_PKCS11_MAX_VIRTUAL_SLOTS; id++) {
+        for (id = 0; id < sc_pkcs11_conf.pkcs11_max_virtual_slots; id++) {
                 slot = &virtual_slots[id];
                 if ((slot->events & SC_EVENT_CARD_INSERTED)