Changeset 430

Timestamp:

May 17, 2009, 11:21:01 AM (16 years ago)

Author:

Paul Smedley

Message:

Run HDA init modules from OSS32_Initialize - fixes lack of mixer controls since ALSA 1.0.19 HDA update

Location:

GPL/trunk/lib32

Files:

• initcall.h (modified) (1 diff)
• ossidc.cpp (modified) (2 diffs)

GPL/trunk/lib32/initcall.h

@@ -104 +104 @@
 extern_module_init(alsa_card_azx_init)
 extern_module_exit(alsa_card_azx_exit)
+extern_module_init(patch_analog_init)
+extern_module_exit(patch_analog_exit)
+extern_module_init(patch_atihdmi_init)
+extern_module_exit(patch_atihdmi_init)
+extern_module_init(patch_cmedia_init)
+extern_module_exit(patch_cmedia_exit)
+extern_module_init(patch_conexant_init)
+extern_module_exit(patch_conexant_exit)
+extern_module_init(patch_realtek_init)
+extern_module_exit(patch_realtek_exit)
+extern_module_init(patch_sigmatel_init)
+extern_module_exit(patch_sigmatel_exit)
+extern_module_init(patch_via_init)
+extern_module_exit(patch_via_exit)
 
 

GPL/trunk/lib32/ossidc.cpp

@@ -126 +126 @@
 
     if(call_module_init(alsa_mpu401_uart_init) != 0) return OSSERR_INIT_FAILED;
+
+    /* Init functions for HDA audio */
+    call_module_init(patch_analog_init);
+    call_module_init(patch_atihdmi_init);
+    call_module_init(patch_cmedia_init);
+    call_module_init(patch_conexant_init);
+    call_module_init(patch_realtek_init);
+    call_module_init(patch_sigmatel_init);
+    call_module_init(patch_via_init);
 #if 0
     int i;
@@ -256 +265 @@
     }
     if((ForceCard == CARD_NONE || ForceCard == CARD_AZX) &&
-       nrCardsDetected < (OSS32_MAX_AUDIOCARDS-1) && call_module_init(alsa_card_azx_init) == 0)
+       nrCardsDetected < (OSS32_MAX_AUDIOCARDS-1) && call_module_init(alsa_card_azx_init) == 0) 
     {
         fnCardExitCall[nrCardsDetected] = name_module_exit(alsa_card_azx_exit);