From 13f96b477cf352ae8af91f4dcd5e4e6ee45feb37 Mon Sep 17 00:00:00 2001 From: beveloper Date: Sat, 10 May 2003 22:23:26 +0000 Subject: [PATCH] Verified some codec IDs git-svn-id: file:///srv/svn/repos/haiku/trunk/current@3191 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- .../kernel/drivers/audio/ac97/ich/ac97.c | 21 ++++++++++++++++--- .../kernel/drivers/audio/ac97/ich/ac97.h | 17 ++++++++------- 2 files changed, 28 insertions(+), 10 deletions(-) diff --git a/src/add-ons/kernel/drivers/audio/ac97/ich/ac97.c b/src/add-ons/kernel/drivers/audio/ac97/ich/ac97.c index e227ab76c1..dc4d510c07 100644 --- a/src/add-ons/kernel/drivers/audio/ac97/ich/ac97.c +++ b/src/add-ons/kernel/drivers/audio/ac97/ich/ac97.c @@ -101,6 +101,19 @@ typedef struct codec_table codecs[] = { + + CODEC_ID_AD1819 = 0x41445303, // ok, AD1819A, AD1819B + CODEC_ID_AD1881 = 0x41445340, // ok, AD1881 + CODEC_ID_AD1881A = 0x41445348, // ok, AD1881A + CODEC_ID_AD1885 = 0x41445360, // ok, AD1885 + CODEC_ID_AD1886 = 0x41445361, // ok, AD1886 + CODEC_ID_AD1886A = 0x41445363, // ok, AD1886A + CODEC_ID_AD1887 = 0x41445362, // ok, AD1887 + CODEC_ID_AD1980 = 0x41445370, // ok, AD1980 + CODEC_ID_AD1981B = 0x41445374, // ok, AD1981B + CODEC_ID_AD1985 = 0x41445375, // ok, AD1985 + + { CODEC_ID_AD1819, 0xffffffff, ad1819_init, "Analog Devices AD1819B SoundPort"B_UTF8_REGISTERED }, { CODEC_ID_AD1881, 0xffffffff, ad1881_init, "Analog Devices AD1881 SoundMAX"B_UTF8_REGISTERED }, { CODEC_ID_AD1881A, 0xffffffff, ad1881_init, "Analog Devices AD1881A SoundMAX"B_UTF8_REGISTERED }, @@ -108,7 +121,9 @@ codec_table codecs[] = { CODEC_ID_AD1886, 0xffffffff, ad1886_init, "Analog Devices AD1886 SoundMAX"B_UTF8_REGISTERED }, { CODEC_ID_AD1886A, 0xffffffff, ad1881_init, "Analog Devices AD1886A SoundMAX"B_UTF8_REGISTERED }, { CODEC_ID_AD1887, 0xffffffff, ad1881_init, "Analog Devices AD1887 SoundMAX"B_UTF8_REGISTERED }, - { 0x41445370, 0xffffffff, ad1980_init, "Analog Devices 0x41445370 (???)" }, + { CODEC_ID_AD1980, 0xffffffff, ad1980_init, "Analog Devices AD1980 SoundMAX"B_UTF8_REGISTERED }, + { CODEC_ID_AD1981B, 0xffffffff, default_init, "Analog Devices AD1981B SoundMAX"B_UTF8_REGISTERED }, + { CODEC_ID_AD1985, 0xffffffff, default_init, "Analog Devices AD1985 SoundMAX"B_UTF8_REGISTERED }, { 0x41445371, 0xffffffff, default_init, "Analog Devices 0x41445371 (???)" }, { 0x41445372, 0xffffffff, ad1881_init, "Analog Devices AD1981A SoundMAX"B_UTF8_REGISTERED }, { CODEC_ID_AK4540, 0xffffffff, default_init, "Asahi Kasei AK4540" }, @@ -216,10 +231,10 @@ ac97_attach(ac97_dev **_dev, codec_reg_read reg_read, codec_reg_write reg_write, /* set mixer defaults, enabled Line-out sources are PCM-out, CD-in, Line-in */ ac97_reg_update(dev, AC97_CENTER_LFE_VOLUME, 0x0000); /* set LFE & center volume 0dB */ - ac97_reg_update(dev, AC97_SURR_VOLUME, 0x0000); /* set surround volume 0dB */ + ac97_reg_update(dev, AC97_SURR_VOLUME, 0x0000); /* set surround volume 0dB */ ac97_reg_update(dev, AC97_MASTER_VOLUME, 0x0000); /* set master output 0dB */ ac97_reg_update(dev, AC97_AUX_OUT_VOLUME, 0x0000); /* set aux output 0dB */ - ac97_reg_update(dev, AC97_MONO_VOLUME, 0x0000); /* set mono output 0dB */ + ac97_reg_update(dev, AC97_MONO_VOLUME, 0x0000); /* set mono output 0dB */ ac97_reg_update(dev, AC97_PCM_OUT_VOLUME, 0x0808); /* enable pcm-out */ ac97_reg_update(dev, AC97_CD_VOLUME, 0x0808); /* enable cd-in */ ac97_reg_update(dev, AC97_LINE_IN_VOLUME, 0x0808); /* enable line-in */ diff --git a/src/add-ons/kernel/drivers/audio/ac97/ich/ac97.h b/src/add-ons/kernel/drivers/audio/ac97/ich/ac97.h index 39a5e5265d..b90917319c 100644 --- a/src/add-ons/kernel/drivers/audio/ac97/ich/ac97.h +++ b/src/add-ons/kernel/drivers/audio/ac97/ich/ac97.h @@ -104,13 +104,16 @@ enum { CODEC_ID_ALC201A = 0x414c4710, CODEC_ID_AK4540 = 0x414b4d00, CODEC_ID_AK4542 = 0x414b4d01, - CODEC_ID_AD1819 = 0x41445303, - CODEC_ID_AD1881 = 0x41445340, - CODEC_ID_AD1881A = 0x41445348, - CODEC_ID_AD1885 = 0x41445360, - CODEC_ID_AD1886 = 0x41445361, - CODEC_ID_AD1886A = 0x41445363, - CODEC_ID_AD1887 = 0x41445362, + CODEC_ID_AD1819 = 0x41445303, // ok, AD1819A, AD1819B + CODEC_ID_AD1881 = 0x41445340, // ok, AD1881 + CODEC_ID_AD1881A = 0x41445348, // ok, AD1881A + CODEC_ID_AD1885 = 0x41445360, // ok, AD1885 + CODEC_ID_AD1886 = 0x41445361, // ok, AD1886 + CODEC_ID_AD1886A = 0x41445363, // ok, AD1886A + CODEC_ID_AD1887 = 0x41445362, // ok, AD1887 + CODEC_ID_AD1980 = 0x41445370, // ok, AD1980 + CODEC_ID_AD1981B = 0x41445374, // ok, AD1981B + CODEC_ID_AD1985 = 0x41445375, // ok, AD1985 CODEC_ID_CS4299A = 0x43525931, CODEC_ID_CS4299C = 0x43525933, CODEC_ID_CS4299D = 0x43525934,