Changeset 679 for GPL/trunk/lib32/ossidc.c
- Timestamp:
- Mar 18, 2021, 8:57:36 PM (4 years ago)
- Location:
- GPL/trunk
- Files:
-
- 2 edited
-
. (modified) (1 prop)
-
lib32/ossidc.c (modified) (7 diffs)
Legend:
- Unmodified
- Added
- Removed
-
GPL/trunk
- Property svn:mergeinfo changed
/GPL/branches/uniaud32-linux-3.2.102 (added) merged: 611-614 /GPL/branches/uniaud32-next (added) merged: 615-678
- Property svn:mergeinfo changed
-
GPL/trunk/lib32/ossidc.c
r607 r679 32 32 #include <unicard.h> 33 33 #include <version.h> 34 #ifdef KEE35 #include <kee.h>36 #endif37 34 #include "initcall.h" 35 #include <u32ioctl.h> 38 36 39 37 extern DWORD TimerHandler16; //drv32\strategy.asm … … 66 64 67 65 cardcalls_t cardcalls[CARDS_NUM] = { 68 { CARD_ICH, &name_module_init(alsa_card_intel8x0_init), &name_module_exit(alsa_card_intel8x0_exit) },69 { CARD_VIA82XX, &name_module_init( alsa_card_via82xx_init), &name_module_exit(alsa_card_via82xx_exit) },70 { CARD_SBLIVE, &name_module_init( alsa_card_emu10k1_init), &name_module_exit(alsa_card_emu10k1_exit) },71 { CARD_CMEDIA, &name_module_init( alsa_card_cmipci_init), &name_module_exit(alsa_card_cmipci_exit) },72 { CARD_ALS4000, &name_module_init(als a_card_als4000_init), &name_module_exit(alsa_card_als4000_exit) },73 { CARD_CS4281, &name_module_init( alsa_card_cs4281_init), &name_module_exit(alsa_card_cs4281_exit) },74 { CARD_CS46XX, &name_module_init( alsa_card_cs46xx_init), &name_module_exit(alsa_card_cs46xx_exit) },75 { CARD_CS5535, &name_module_init( alsa_card_cs5535audio_init), &name_module_exit(alsa_card_cs5535audio_exit) },76 { CARD_ESS1938, &name_module_init( alsa_card_es1938_init), &name_module_exit(alsa_card_es1938_exit) },77 { CARD_ENSONIQ0, &name_module_init( alsa_card_ens1370_init), &name_module_exit(alsa_card_ens1370_exit) },78 { CARD_ENSONIQ1, &name_module_init(alsa_card_ens1371_init), &name_module_exit(alsa_card_ens1371_exit)},79 { CARD_YAMAHA, &name_module_init( alsa_card_ymfpci_init), &name_module_exit(alsa_card_ymfpci_exit) },80 { CARD_MAESTRO, &name_module_init( alsa_card_es1968_init), &name_module_exit(alsa_card_es1968_exit) },81 { CARD_MAESTRO3, &name_module_init( alsa_card_m3_init), &name_module_exit(alsa_card_m3_exit)},82 { CARD_ALI5451, &name_module_init(al sa_card_ali_init), &name_module_exit(alsa_card_ali_exit)},83 { CARD_TRIDENT, &name_module_init( alsa_card_trident_init), &name_module_exit(alsa_card_trident_exit) },66 { CARD_ICH, &name_module_init(intel8x0_driver_init), &name_module_exit(intel8x0_driver_exit) }, 67 { CARD_VIA82XX, &name_module_init(via82xx_driver_init), &name_module_exit(via82xx_driver_exit) }, 68 { CARD_SBLIVE, &name_module_init(emu10k1_driver_init), &name_module_exit(emu10k1_driver_exit) }, 69 { CARD_CMEDIA, &name_module_init(cmipci_driver_init), &name_module_exit(cmipci_driver_exit) }, 70 { CARD_ALS4000, &name_module_init(als4000_driver_init), &name_module_exit(als4000_driver_exit) }, 71 { CARD_CS4281, &name_module_init(cs4281_driver_init), &name_module_exit(cs4281_driver_exit) }, 72 { CARD_CS46XX, &name_module_init(cs46xx_driver_init), &name_module_exit(cs46xx_driver_exit) }, 73 { CARD_CS5535, &name_module_init(cs5535audio_driver_init), &name_module_exit(cs5535audio_driver_exit) }, 74 { CARD_ESS1938, &name_module_init(es1938_driver_init), &name_module_exit(es1938_driver_exit) }, 75 { CARD_ENSONIQ0, &name_module_init(ens137x_driver_init), &name_module_exit(ens137x_driver_exit) }, 76 { CARD_ENSONIQ1, NULL, NULL }, 77 { CARD_YAMAHA, &name_module_init(ymfpci_driver_init), &name_module_exit(ymfpci_driver_exit) }, 78 { CARD_MAESTRO, &name_module_init(es1968_driver_init), &name_module_exit(es1968_driver_exit) }, 79 { CARD_MAESTRO3, &name_module_init(m3_driver_init), &name_module_exit(m3_driver_exit) }, 80 { CARD_ALI5451, &name_module_init(ali5451_driver_init), &name_module_exit(ali5451_driver_exit) }, 81 { CARD_TRIDENT, &name_module_init(trident_driver_init), &name_module_exit(trident_driver_exit) }, 84 82 #ifdef VORTEX 85 { CARD_VORTEX, &name_module_init( alsa_card_vortex_init), &name_module_exit(alsa_card_vortex_exit) },83 { CARD_VORTEX, &name_module_init(vortex_driver_init), &name_module_exit(vortex_driver_exit) }, 86 84 #else 87 { CARD_VORTEX, NULL, NULL},85 { CARD_VORTEX, NULL, NULL }, 88 86 #endif 89 { CARD_NEOMAGIC, &name_module_init( alsa_card_nm256_init), &name_module_exit(alsa_card_nm256_exit)},90 { CARD_FM801, &name_module_init( alsa_card_fm801_init), &name_module_exit(alsa_card_fm801_exit)},91 { CARD_ATIIXP, &name_module_init(a lsa_card_atiixp_init), &name_module_exit(alsa_card_atiixp_exit) },92 { CARD_AUDIGYLS, &name_module_init( alsa_card_ca0106_init), &name_module_exit(alsa_card_ca0106_exit) },93 { CARD_AZX, &name_module_init(alsa_card_azx_init), &name_module_exit(alsa_card_azx_exit)},94 { CARD_BT87X, &name_module_init(alsa_card_bt87x_init), &name_module_exit(alsa_card_bt87x_exit)},87 { CARD_NEOMAGIC, &name_module_init(nm256_driver_init), &name_module_exit(nm256_driver_exit) }, 88 { CARD_FM801, &name_module_init(fm801_driver_init), &name_module_exit(fm801_driver_exit) }, 89 { CARD_ATIIXP, &name_module_init(atiixp_driver_init), &name_module_exit(atiixp_driver_exit) }, 90 { CARD_AUDIGYLS, &name_module_init(ca0106_driver_init), &name_module_exit(ca0106_driver_exit) }, 91 { CARD_AZX, &name_module_init(azx_driver_init), &name_module_exit(azx_driver_exit) }, 92 { CARD_BT87X, &name_module_init(alsa_card_bt87x_init), &name_module_exit(alsa_card_bt87x_exit) }, 95 93 }; 96 94 … … 98 96 int fStrategyInit = FALSE; 99 97 void pcm_info(void); 100 void FillCaps(ULONG deviceid);101 98 102 99 //****************************************************************************** … … 115 112 dprintf(("OSS32_Initialize: Start address: %X", OffsetBeginCS32)); 116 113 117 if(call_module_init(alsa_sound_init) != 0) return OSSERR_INIT_FAILED; 114 if(call_module_init(alsa_sound_init) != 0) return OSSERR_INIT_FAILED; 115 if(call_module_init(alsa_seq_device_init) != 0) return OSSERR_INIT_FAILED; 118 116 dprintf(("OSS32_Initialize1: Start address: %X", OffsetBeginCS32)); 119 if(call_module_init(alsa_pcm_init) != 0) return OSSERR_INIT_FAILED; 120 if(call_module_init(alsa_hwdep_init) != 0) return OSSERR_INIT_FAILED; 121 if(call_module_init(alsa_timer_init) != 0) return OSSERR_INIT_FAILED; 122 123 if(call_module_init(alsa_rawmidi_init) != 0) return OSSERR_INIT_FAILED; 124 if(call_module_init(alsa_seq_init) != 0) return OSSERR_INIT_FAILED; 125 if(call_module_init(alsa_opl3_init) != 0) return OSSERR_INIT_FAILED; 126 if(call_module_init(alsa_opl3_seq_init) != 0) return OSSERR_INIT_FAILED; 127 128 if(call_module_init(alsa_mpu401_uart_init) != 0) return OSSERR_INIT_FAILED; 117 if(call_module_init(alsa_pcm_init) != 0) return OSSERR_INIT_FAILED; 118 if(call_module_init(alsa_hwdep_init) != 0) return OSSERR_INIT_FAILED; 119 if(call_module_init(alsa_timer_init) != 0) return OSSERR_INIT_FAILED; 120 121 if(call_module_init(alsa_rawmidi_init) != 0) return OSSERR_INIT_FAILED; 122 if(call_module_init(alsa_seq_init) != 0) return OSSERR_INIT_FAILED; 123 call_module_init(opl3_seq_driver_init); 124 call_module_init(regmap_initcall); 129 125 130 126 /* Init functions for HDA audio */ 131 call_module_init(patch_analog_init); 132 //call_module_init(patch_atihdmi_init); 133 call_module_init(patch_cmedia_init); 134 call_module_init(patch_conexant_init); 135 call_module_init(patch_realtek_init); 136 call_module_init(patch_sigmatel_init); 137 call_module_init(patch_via_init); 127 call_module_init(hda_bus_init); 128 call_module_init(generic_driver_init); 129 call_module_init(analog_driver_init); 130 call_module_init(ca0110_driver_init); 131 call_module_init(cirrus_driver_init); 132 call_module_init(cmedia_driver_init); 133 call_module_init(conexant_driver_init); 134 // call_module_init(hdmi_driver_init); 135 call_module_init(realtek_driver_init); 136 call_module_init(sigmatel_driver_init); 137 call_module_init(via_driver_init); 138 138 139 139 //dprintf(("OSS32_Initialize: ForceCard=%d", ForceCard)); … … 178 178 } 179 179 180 call_module_exit(alsa_mpu401_uart_exit); 181 call_module_exit(alsa_opl3_seq_exit); 182 call_module_exit(alsa_opl3_exit); 180 call_module_exit(opl3_seq_driver_exit); 183 181 call_module_exit(alsa_seq_exit); 184 182 call_module_exit(alsa_rawmidi_exit); … … 186 184 call_module_exit(alsa_hwdep_exit); 187 185 call_module_exit(alsa_pcm_exit); 186 call_module_exit(alsa_seq_device_exit); 188 187 call_module_exit(alsa_sound_exit); 189 188 … … 208 207 209 208 //****************************************************************************** 210 int MyDevBlock(ULONG id, ULONG tout, char flag)211 {212 return DevBlock(id,tout, flag);213 }214 209 215 210 int OSS32_DebugString(char *buffer, ULONG size)
Note:
See TracChangeset
for help on using the changeset viewer.
