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

ac97 functions fixed

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/trunk/current@4358 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Jérôme Duval
2003-08-21 09:23:41 +00:00
parent 0163e36659
commit e9ac8260a6
6 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/kernel/drivers/audio/ac97/auvia/ac97.c
+2 -2
View File
@@ -196,9 +196,9 @@ ac97_get_3d_stereo_enhancement(device_config *config)
} }
const char * const char *
ac97_get_vendor_id_description() ac97_get_vendor_id_description(device_config *config)
{ {
uint32 id = ac97_get_vendor_id(); uint32 id = ac97_get_vendor_id(config);
codec_table *codec = find_codec_table(id); codec_table *codec = find_codec_table(id);
char f = (id >> 24) & 0xff; char f = (id >> 24) & 0xff;
char s = (id >> 16) & 0xff; char s = (id >> 16) & 0xff;
src/add-ons/kernel/drivers/audio/ac97/auvia/ac97.h
+4 -4
View File
@@ -68,10 +68,10 @@ enum AC97_REGISTER {
AC97_VENDOR_ID2 = 0x7E AC97_VENDOR_ID2 = 0x7E
}; };
const char * ac97_get_3d_stereo_enhancement(); const char * ac97_get_3d_stereo_enhancement(device_config *config);
const char * ac97_get_vendor_id_description(); const char * ac97_get_vendor_id_description(device_config *config);
uint32 ac97_get_vendor_id(); uint32 ac97_get_vendor_id(device_config *config);
void ac97_init(); void ac97_init(device_config *config);
void ac97_amp_enable(device_config *config, bool yesno); void ac97_amp_enable(device_config *config, bool yesno);
src/add-ons/kernel/drivers/audio/ac97/auvia/auvia.c
+3 -3
View File
@@ -514,9 +514,9 @@ auvia_setup(auvia_dev * card)
ac97_init(&card->config); ac97_init(&card->config);
ac97_amp_enable(&card->config, true); ac97_amp_enable(&card->config, true);
PRINT(("codec vendor id = %#08x\n",ac97_get_vendor_id())); PRINT(("codec vendor id = %#08x\n",ac97_get_vendor_id(&card->config)));
PRINT(("codec description = %s\n",ac97_get_vendor_id_description())); PRINT(("codec description = %s\n",ac97_get_vendor_id_description(&card->config)));
PRINT(("codec 3d enhancement = %s\n",ac97_get_3d_stereo_enhancement())); PRINT(("codec 3d enhancement = %s\n",ac97_get_3d_stereo_enhancement(&card->config)));
PRINT(("installing interrupt : %x\n", card->config.irq)); PRINT(("installing interrupt : %x\n", card->config.irq));
install_io_interrupt_handler(card->config.irq, auvia_int, card, 0); install_io_interrupt_handler(card->config.irq, auvia_int, card, 0);
src/add-ons/kernel/drivers/audio/emuxki/ac97.c
+2 -2
View File
@@ -196,9 +196,9 @@ ac97_get_3d_stereo_enhancement(device_config *config)
} }
const char * const char *
ac97_get_vendor_id_description() ac97_get_vendor_id_description(device_config *config)
{ {
uint32 id = ac97_get_vendor_id(); uint32 id = ac97_get_vendor_id(config);
codec_table *codec = find_codec_table(id); codec_table *codec = find_codec_table(id);
char f = (id >> 24) & 0xff; char f = (id >> 24) & 0xff;
char s = (id >> 16) & 0xff; char s = (id >> 16) & 0xff;
src/add-ons/kernel/drivers/audio/emuxki/ac97.h
+4 -4
View File
@@ -68,10 +68,10 @@ enum AC97_REGISTER {
AC97_VENDOR_ID2 = 0x7E AC97_VENDOR_ID2 = 0x7E
}; };
const char * ac97_get_3d_stereo_enhancement(); const char * ac97_get_3d_stereo_enhancement(device_config *config);
const char * ac97_get_vendor_id_description(); const char * ac97_get_vendor_id_description(device_config *config);
uint32 ac97_get_vendor_id(); uint32 ac97_get_vendor_id(device_config *config);
void ac97_init(); void ac97_init(device_config *config);
void ac97_amp_enable(device_config *config, bool yesno); void ac97_amp_enable(device_config *config, bool yesno);
src/add-ons/kernel/drivers/audio/emuxki/emuxki.c
+3 -3
View File
@@ -2073,9 +2073,9 @@ emuxki_setup(emuxki_dev * card)
ac97_init(&card->config); ac97_init(&card->config);
ac97_amp_enable(&card->config, true); ac97_amp_enable(&card->config, true);
PRINT(("codec vendor id = %#08x\n",ac97_get_vendor_id())); PRINT(("codec vendor id = %#08x\n",ac97_get_vendor_id(&card->config)));
PRINT(("codec description = %s\n",ac97_get_vendor_id_description())); PRINT(("codec description = %s\n",ac97_get_vendor_id_description(&card->config)));
PRINT(("codec 3d enhancement = %s\n",ac97_get_3d_stereo_enhancement())); PRINT(("codec 3d enhancement = %s\n",ac97_get_3d_stereo_enhancement(&card->config)));
if(IS_AUDIGY2(&card->config)) { if(IS_AUDIGY2(&card->config)) {
emuxki_reg_write_32(&card->config, EMU_HCFG, EMU_HCFG_AUDIOENABLE | emuxki_reg_write_32(&card->config, EMU_HCFG, EMU_HCFG_AUDIOENABLE |