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

added untested support for Audigy 2 Value

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/trunk/current@11117 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Jérôme Duval 2005-01-29 12:30:06 +00:00
parent efbea3a07a
commit df3f0f30a8
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/add-ons/kernel/drivers/audio/emuxki/emuxki.c
View File

@ -2036,7 +2036,7 @@ emuxki_setup(emuxki_dev * card)
card->config.type = 0;
if(card->info.device_id == CREATIVELABS_AUDIGY_DEVICE_ID)
card->config.type |= TYPE_AUDIGY;
if(IS_AUDIGY(&card->config) && card->info.revision == 4)
if(IS_AUDIGY(&card->config) && (card->info.revision == 4 || card->info.revision == 8))
card->config.type |= TYPE_AUDIGY2;
PRINT(("%s deviceid = %#04x chiprev = %x model = %x enhanced at %x\n", card->name, card->info.device_id,
@ -2646,9 +2646,14 @@ emuxki_init(emuxki_dev * card)
emuxki_reg_write_32(&card->config, EMU_A2_PTR, EMU_A2_SRCSEL);
emuxki_reg_write_32(&card->config, EMU_A2_DATA,
EMU_A2_SRCSEL_ENABLE_SPDIF | EMU_A2_SRCSEL_ENABLE_SRCMULTI);
emuxki_reg_write_32(&card->config, EMU_A2_PTR, EMU_A2_SRCMULTI);
emuxki_reg_write_32(&card->config, EMU_A2_DATA, EMU_A2_SRCMULTI_ENABLE_INPUT);
if (card->info.revision == 4) {
emuxki_reg_write_32(&card->config, EMU_A2_PTR, EMU_A2_SRCMULTI);
emuxki_reg_write_32(&card->config, EMU_A2_DATA, EMU_A2_SRCMULTI_ENABLE_INPUT);
} else {
emuxki_reg_write_32(&card->config, EMU_A2_PTR, EMU_A2_SRCMULTI2);
emuxki_reg_write_32(&card->config, EMU_A2_DATA, EMU_A2_SRCMULTI2_ENABLE_INPUT);
}
}
/* Let's play with sound processor */

3
src/add-ons/kernel/drivers/audio/emuxki/emuxkireg.h
View File

@ -195,7 +195,8 @@
#define EMU_A2_SRCSEL_ENABLE_SRCMULTI 0x00000010
#define EMU_A2_SRCMULTI 0x6e0000
#define EMU_A2_SRCMULTI_ENABLE_INPUT 0xff00ff00
#define EMU_A2_SRCMULTI2 0x7b0000
#define EMU_A2_SRCMULTI2_ENABLE_INPUT 0xff000000
/* -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- */