Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

disable channels before installing the handler

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@25592 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Jérôme Duval 2008-05-21 20:52:59 +00:00
parent d68d2bb1da
commit dd07c0feb8
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/add-ons/kernel/drivers/audio/ac97/auich/auich.c
View File

@ -452,8 +452,7 @@ auich_int(void *arg)
auich_reg_write_32(&card->config, AUICH_REG_GLOB_STA, sta);
}
} else {
TRACE(("interrupt masked %lx, ", card->interrupt_mask));
TRACE(("sta %lx\n", sta));
dprintf("interrupt masked %lx, sta %lx\n", card->interrupt_mask, sta);
}
if (gotone)
@ -697,6 +696,11 @@ auich_setup(auich_dev * card)
PRINT(("codec vendor id = %#08lx\n", card->config.ac97->codec_id));
PRINT(("codec description = %s\n", card->config.ac97->codec_info));
PRINT(("codec 3d enhancement = %s\n", card->config.ac97->codec_3d_stereo_enhancement));
// disable channels
auich_reg_write_8(&card->config, AUICH_REG_PO_BASE + AUICH_REG_X_CR, 0);
auich_reg_write_8(&card->config, AUICH_REG_PI_BASE + AUICH_REG_X_CR, 0);
auich_reg_write_8(&card->config, AUICH_REG_MC_BASE + AUICH_REG_X_CR, 0);
if (current_settings.use_thread) {
int_thread_id = spawn_kernel_thread(auich_int_thread, "auich interrupt poller", B_REAL_TIME_PRIORITY, card);

4
src/add-ons/kernel/drivers/audio/ac97/auich/io.c
View File

@ -122,7 +122,7 @@ auich_codec_read(device_config *config, uint8 regno)
{
ASSERT(regno >= 0);
ASSERT(((config->type & TYPE_ICH4) != 0 && regno <= 511) || regno <= 255);
if(auich_codec_wait(config)!=B_OK) {
if (auich_codec_wait(config)!=B_OK) {
PRINT(("codec busy (2)\n"));
return -1;
}
@ -138,7 +138,7 @@ auich_codec_write(device_config *config, uint8 regno, uint16 value)
{
ASSERT(regno >= 0);
ASSERT(((config->type & TYPE_ICH4) != 0 && regno <= 511) || regno <= 255);
if(auich_codec_wait(config)!=B_OK) {
if (auich_codec_wait(config)!=B_OK) {
PRINT(("codec busy (4)\n"));
return;
}