Changeset 305 for GPL/branches/uniaud-2.0/lib32/ossidc.cpp

Timestamp:

Mar 24, 2008, 2:43:42 AM (17 years ago)

Author:

Paul Smedley

Message:

Update source to ALSA 1.0.16 level

File:

• GPL/branches/uniaud-2.0/lib32/ossidc.cpp (modified) (6 diffs)

GPL/branches/uniaud-2.0/lib32/ossidc.cpp

@@ -165 +165 @@
     }
 
+#if 0
     if((ForceCard == CARD_NONE || ForceCard == CARD_SBLIVE) &&
        nrCardsDetected < (OSS32_MAX_AUDIOCARDS-1) && call_module_init(alsa_card_emu10k1_init) == 0)
@@ -170 +171 @@
         fnCardExitCall[nrCardsDetected] = name_module_exit(alsa_card_emu10k1_exit);
     }
-
+#endif
+#if 0
     if((ForceCard == CARD_NONE || ForceCard == CARD_CMEDIA) &&
        nrCardsDetected < (OSS32_MAX_AUDIOCARDS-1) && call_module_init(alsa_card_cmipci_init) == 0)
@@ -181 +183 @@
         fnCardExitCall[nrCardsDetected] = name_module_exit(alsa_card_als4000_exit);
     }
+#endif
     if((ForceCard == CARD_NONE || ForceCard == CARD_CS4281) &&
        nrCardsDetected < (OSS32_MAX_AUDIOCARDS-1) && call_module_init(alsa_card_cs4281_init) == 0)
@@ -226 +229 @@
         fnCardExitCall[nrCardsDetected] = name_module_exit(alsa_card_trident_exit);
     }
-
 #ifdef VORTEX
     if((ForceCard == CARD_NONE || ForceCard == CARD_VORTEX) &&
@@ -259 +261 @@
         fnCardExitCall[nrCardsDetected] = name_module_exit(alsa_card_azx_exit);
     }
+#if 0
     if((ForceCard == CARD_NONE || ForceCard == CARD_BT87X) &&
        nrCardsDetected < (OSS32_MAX_AUDIOCARDS-1) && call_module_init(alsa_card_bt87x_init) == 0)
@@ -264 +267 @@
         fnCardExitCall[nrCardsDetected] = name_module_exit(alsa_card_bt87x_exit);
     }
-
+#endif
 #endif
     fStrategyInit = FALSE;
 
     if(nrCardsDetected != 0) {
-        dprintf(("OSS32_Initialize2"));
         pcm_info();
-        dprintf(("OSS32_Initialize3"));
         for(int i=0;i<nrCardsDetected;i++) {
-            dprintf(("OSS32_Initialize4 start: %d",i));
             FillCaps(i);
-            dprintf(("OSS32_Initialize4 end: %d",i));
         }
         dprintf(("OSS32_Initialize: SUCCESS. nr. of cards: %d",nrCardsDetected));