i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

moved some more code to avoid crash, thanks to sergei

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/trunk/current@11135 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Jérôme Duval
2005-01-29 19:45:50 +00:00
parent 9d9ef27273
commit 7ec14ccea4
1 changed files with 12 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/kernel/drivers/audio/emuxki/emuxki.c
+12 -13
View File
@@ -2075,18 +2075,6 @@ emuxki_setup(emuxki_dev * card)
PRINT(("codec description = %s\n",ac97_get_vendor_id_description(&card->config))); PRINT(("codec description = %s\n",ac97_get_vendor_id_description(&card->config)));
PRINT(("codec 3d enhancement = %s\n",ac97_get_3d_stereo_enhancement(&card->config))); PRINT(("codec 3d enhancement = %s\n",ac97_get_3d_stereo_enhancement(&card->config)));
if(IS_AUDIGY2(&card->config)) {
emuxki_reg_write_32(&card->config, EMU_HCFG, EMU_HCFG_AUDIOENABLE |
EMU_HCFG_AC3ENABLE_CDSPDIF | EMU_HCFG_AC3ENABLE_GPSPDIF|
EMU_HCFG_JOYENABLE | EMU_HCFG_AUTOMUTE);
} else if(IS_AUDIGY(&card->config)) {
emuxki_reg_write_32(&card->config, EMU_HCFG, EMU_HCFG_AUDIOENABLE |
EMU_HCFG_JOYENABLE | EMU_HCFG_AUTOMUTE);
} else {
emuxki_reg_write_32(&card->config, EMU_HCFG, EMU_HCFG_AUDIOENABLE |
EMU_HCFG_LOCKTANKCACHE_MASK | EMU_HCFG_JOYENABLE | EMU_HCFG_AUTOMUTE);
}
if(IS_AUDIGY2(&card->config)) { if(IS_AUDIGY2(&card->config)) {
emuxki_reg_write_32(&card->config, EMU_A_IOCFG, emuxki_reg_write_32(&card->config, EMU_A_IOCFG,
EMU_A_IOCFG_GPOUT0 | emuxki_reg_read_32(&card->config, EMU_A_IOCFG)); EMU_A_IOCFG_GPOUT0 | emuxki_reg_read_32(&card->config, EMU_A_IOCFG));
@@ -2163,6 +2151,17 @@ emuxki_setup(emuxki_dev * card)
emuxki_inte_enable(&card->config, EMU_INTE_VOLINCRENABLE | EMU_INTE_VOLDECRENABLE emuxki_inte_enable(&card->config, EMU_INTE_VOLINCRENABLE | EMU_INTE_VOLDECRENABLE
| EMU_INTE_MUTEENABLE | EMU_INTE_FXDSPENABLE); | EMU_INTE_MUTEENABLE | EMU_INTE_FXDSPENABLE);
if(IS_AUDIGY2(&card->config)) {
emuxki_reg_write_32(&card->config, EMU_HCFG, EMU_HCFG_AUDIOENABLE |
EMU_HCFG_AC3ENABLE_CDSPDIF | EMU_HCFG_AC3ENABLE_GPSPDIF|
EMU_HCFG_JOYENABLE | EMU_HCFG_AUTOMUTE);
} else if(IS_AUDIGY(&card->config)) {
emuxki_reg_write_32(&card->config, EMU_HCFG, EMU_HCFG_AUDIOENABLE |
EMU_HCFG_JOYENABLE | EMU_HCFG_AUTOMUTE);
} else {
emuxki_reg_write_32(&card->config, EMU_HCFG, EMU_HCFG_AUDIOENABLE |
EMU_HCFG_LOCKTANKCACHE_MASK | EMU_HCFG_JOYENABLE | EMU_HCFG_AUTOMUTE);
}
PRINT(("init_driver done\n")); PRINT(("init_driver done\n"));
@@ -2846,7 +2845,6 @@ void
uninit_driver(void) uninit_driver(void)
{ {
int ix, cnt = num_cards; int ix, cnt = num_cards;
num_cards = 0;
PRINT(("uninit_driver()\n")); PRINT(("uninit_driver()\n"));
@@ -2856,6 +2854,7 @@ uninit_driver(void)
memset(&cards, 0, sizeof(cards)); memset(&cards, 0, sizeof(cards));
put_module(mpu401_name); put_module(mpu401_name);
put_module(pci_name); put_module(pci_name);
num_cards = 0;
} }