Changeset 607 for GPL/trunk/lib32/ossidc.c

Timestamp:

Nov 17, 2018, 4:23:38 AM (7 years ago)

Author:

David Azarewicz

Message:

Removed broken/unusable forcecard option.
Fixed Ensoniq driver selection.

File:

• GPL/trunk/lib32/ossidc.c (modified) (2 diffs)

GPL/trunk/lib32/ossidc.c

@@ -75 +75 @@
         { CARD_CS5535,   &name_module_init(alsa_card_cs5535audio_init), &name_module_exit(alsa_card_cs5535audio_exit) },
         { CARD_ESS1938,  &name_module_init(alsa_card_es1938_init),              &name_module_exit(alsa_card_es1938_exit)          },
-        { CARD_ENSONIQ,  &name_module_init(alsa_card_ens137x_init),             &name_module_exit(alsa_card_ens137x_exit)         },
+        { CARD_ENSONIQ0, &name_module_init(alsa_card_ens1370_init),             &name_module_exit(alsa_card_ens1370_exit)         },
+        { CARD_ENSONIQ1, &name_module_init(alsa_card_ens1371_init),             &name_module_exit(alsa_card_ens1371_exit)         },
         { CARD_YAMAHA,   &name_module_init(alsa_card_ymfpci_init),              &name_module_exit(alsa_card_ymfpci_exit)          },
         { CARD_MAESTRO,  &name_module_init(alsa_card_es1968_init),              &name_module_exit(alsa_card_es1968_exit)          },
@@ -136 +137 @@
         call_module_init(patch_via_init);
 
-        dprintf(("OSS32_Initialize: ForceCard=%d", ForceCard));
+        //dprintf(("OSS32_Initialize: ForceCard=%d", ForceCard));
 
         for (sI=0; sI<CARDS_NUM; sI++) {
-                if ((ForceCard != CARD_NONE) && (ForceCard != cardcalls[sI].card_id)) continue;
+                //if ((ForceCard != CARD_NONE) && (ForceCard != cardcalls[sI].card_id)) continue;
                 //dprintf(("calling: %x at %x", cardcalls[sI].card_id, cardcalls[sI].cinitcall));
                 if (cardcalls[sI].cinitcall == NULL) continue;