Changeset 615 for GPL/branches/uniaud32-next/lib32/ossidc.c

Timestamp:

Jan 1, 2021, 5:31:48 AM (5 years ago)

Author:

Paul Smedley

Message:

Add source for uniaud32 based on code from linux kernel 5.4.86

Location:

GPL/branches/uniaud32-next

Files:

• . (copied) (copied from GPL/branches/uniaud32-linux-3.2.102 )
• lib32/ossidc.c (modified) (4 diffs)

GPL/branches/uniaud32-next/lib32/ossidc.c

@@ -66 +66 @@
 
 cardcalls_t cardcalls[CARDS_NUM] = {
-        { CARD_ICH,              &name_module_init(alsa_card_intel8x0_init),    &name_module_exit(alsa_card_intel8x0_exit)        },
-        { CARD_VIA82XX,  &name_module_init(alsa_card_via82xx_init),             &name_module_exit(alsa_card_via82xx_exit)         },
-        { CARD_SBLIVE,   &name_module_init(alsa_card_emu10k1_init),             &name_module_exit(alsa_card_emu10k1_exit)         },
-        { CARD_CMEDIA,   &name_module_init(alsa_card_cmipci_init),              &name_module_exit(alsa_card_cmipci_exit)          },
-        { CARD_ALS4000,  &name_module_init(alsa_card_als4000_init),             &name_module_exit(alsa_card_als4000_exit)         },
-        { CARD_CS4281,   &name_module_init(alsa_card_cs4281_init),              &name_module_exit(alsa_card_cs4281_exit)          },
-        { CARD_CS46XX,   &name_module_init(alsa_card_cs46xx_init),              &name_module_exit(alsa_card_cs46xx_exit)          },
-        { 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_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)          },
-        { CARD_MAESTRO3, &name_module_init(alsa_card_m3_init),                  &name_module_exit(alsa_card_m3_exit)              },
-        { CARD_ALI5451,  &name_module_init(alsa_card_ali_init),                 &name_module_exit(alsa_card_ali_exit)             },
-        { CARD_TRIDENT,  &name_module_init(alsa_card_trident_init),             &name_module_exit(alsa_card_trident_exit)         },
+        { CARD_ICH,              &name_module_init(intel8x0_driver_init),       &name_module_exit(intel8x0_driver_exit)   },
+        { CARD_VIA82XX,  &name_module_init(via82xx_driver_init),                &name_module_exit(via82xx_driver_exit)    },
+        { CARD_SBLIVE,   &name_module_init(emu10k1_driver_init),                &name_module_exit(emu10k1_driver_exit)    },
+        { CARD_CMEDIA,   &name_module_init(cmipci_driver_init),         &name_module_exit(cmipci_driver_exit)     },
+        { CARD_ALS4000,  &name_module_init(als4000_driver_init),                &name_module_exit(als4000_driver_exit)    },
+        { CARD_CS4281,   &name_module_init(cs4281_driver_init),         &name_module_exit(cs4281_driver_exit)     },
+        { CARD_CS46XX,   &name_module_init(cs46xx_driver_init),         &name_module_exit(cs46xx_driver_exit)     },
+        { CARD_CS5535,   &name_module_init(cs5535audio_driver_init),    &name_module_exit(cs5535audio_driver_exit) },
+        { CARD_ESS1938,  &name_module_init(es1938_driver_init),         &name_module_exit(es1938_driver_exit)     },
+        { CARD_ENSONIQ0, &name_module_init(ens137x_driver_init),                &name_module_exit(ens137x_driver_exit)    },
+        { CARD_ENSONIQ1, NULL,          NULL },
+        { CARD_YAMAHA,   &name_module_init(ymfpci_driver_init),         &name_module_exit(ymfpci_driver_exit)     },
+        { CARD_MAESTRO,  &name_module_init(es1968_driver_init),         &name_module_exit(es1968_driver_exit)     },
+        { CARD_MAESTRO3, &name_module_init(m3_driver_init),                     &name_module_exit(m3_driver_exit)                 },
+        { CARD_ALI5451,  &name_module_init(ali5451_driver_init),                        &name_module_exit(ali5451_driver_exit)            },
+        { CARD_TRIDENT,  &name_module_init(trident_driver_init),                &name_module_exit(trident_driver_exit)    },
 #ifdef VORTEX
-        { CARD_VORTEX,   &name_module_init(alsa_card_vortex_init),              &name_module_exit(alsa_card_vortex_exit)          },
+        { CARD_VORTEX,   &name_module_init(vortex_driver_init),         &name_module_exit(vortex_driver_exit)     },
 #else
         { CARD_VORTEX,   NULL,          NULL },
 #endif
-        { CARD_NEOMAGIC, &name_module_init(alsa_card_nm256_init),               &name_module_exit(alsa_card_nm256_exit)           },
-        { CARD_FM801,    &name_module_init(alsa_card_fm801_init),               &name_module_exit(alsa_card_fm801_exit)           },
-        { CARD_ATIIXP,   &name_module_init(alsa_card_atiixp_init),              &name_module_exit(alsa_card_atiixp_exit)          },
-        { CARD_AUDIGYLS, &name_module_init(alsa_card_ca0106_init),              &name_module_exit(alsa_card_ca0106_exit)          },
-        { CARD_AZX,              &name_module_init(alsa_card_azx_init),                 &name_module_exit(alsa_card_azx_exit)             },
+        { CARD_NEOMAGIC, &name_module_init(nm256_driver_init),          &name_module_exit(nm256_driver_exit)              },
+        { CARD_FM801,    &name_module_init(fm801_driver_init),          &name_module_exit(fm801_driver_exit)              },
+        { CARD_ATIIXP,   &name_module_init(atiixp_driver_init),         &name_module_exit(atiixp_driver_exit)     },
+        { CARD_AUDIGYLS, &name_module_init(ca0106_driver_init),         &name_module_exit(ca0106_driver_exit)     },
+        { CARD_AZX,              &name_module_init(azx_driver_init),                    &name_module_exit(azx_driver_exit)                },
         { CARD_BT87X,    &name_module_init(alsa_card_bt87x_init),               &name_module_exit(alsa_card_bt87x_exit)           },
 };
@@ -116 +116 @@
 
         if(call_module_init(alsa_sound_init) != 0)               return OSSERR_INIT_FAILED;
+        if(call_module_init(alsa_seq_device_init) != 0)          return OSSERR_INIT_FAILED;
         dprintf(("OSS32_Initialize1: Start address: %X", OffsetBeginCS32));
         if(call_module_init(alsa_pcm_init) != 0)                 return OSSERR_INIT_FAILED;
@@ -123 +124 @@
         if(call_module_init(alsa_rawmidi_init) != 0)     return OSSERR_INIT_FAILED;
         if(call_module_init(alsa_seq_init) != 0)                 return OSSERR_INIT_FAILED;
-        if(call_module_init(alsa_opl3_init) != 0)                return OSSERR_INIT_FAILED;
-        if(call_module_init(alsa_opl3_seq_init) != 0)    return OSSERR_INIT_FAILED;
-
-        if(call_module_init(alsa_mpu401_uart_init) != 0) return OSSERR_INIT_FAILED;
-
+//      if(call_module_init(alsa_opl3_init) != 0)                return OSSERR_INIT_FAILED;
+//      if(call_module_init(alsa_mpu401_uart_init) != 0) return OSSERR_INIT_FAILED;
+        call_module_init(opl3_seq_driver_init);  
+//      call_module_init(ac97_bus_init);
+        call_module_init(regmap_initcall);
+#if 1
         /* 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);
-
+        call_module_init(hda_bus_init);
+        call_module_init(generic_driver_init);
+        call_module_init(analog_driver_init);
+        //call_module_init(atihdmi_driver_init);
+        call_module_init(cmedia_driver_init);
+        call_module_init(conexant_driver_init);
+        call_module_init(realtek_driver_init);
+        call_module_init(sigmatel_driver_init);
+        call_module_init(via_driver_init);
+#endif
         //dprintf(("OSS32_Initialize: ForceCard=%d", ForceCard));
 
@@ -178 +182 @@
         }
 
-        call_module_exit(alsa_mpu401_uart_exit);
-        call_module_exit(alsa_opl3_seq_exit);
-        call_module_exit(alsa_opl3_exit);
+//      call_module_exit(alsa_mpu401_uart_exit);
+        call_module_exit(opl3_seq_driver_exit);
+//      call_module_exit(alsa_opl3_exit);
         call_module_exit(alsa_seq_exit);
         call_module_exit(alsa_rawmidi_exit);