- Alsa-devel - mailman.alsa-project.org

[alsa-devel] [PATCH] revo51: add headphone output
by Alexander Beregalov 21 Aug '08

21 Aug '08

It is ALSA bug #1754. D6 bit in 02 register is PW4. Signed-off-by: Alexander Beregalov <a.beregalov(a)gmail.com> --- sound/i2c/other/ak4xxx-adda.c | 4 ++-- sound/pci/ice1712/revo.c | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/sound/i2c/other/ak4xxx-adda.c b/sound/i2c/other/ak4xxx-adda.c index 288926d..4c94458 100644 --- a/sound/i2c/other/ak4xxx-adda.c +++ b/sound/i2c/other/ak4xxx-adda.c @@ -233,8 +233,8 @@ void snd_akm4xxx_init(struct snd_akm4xxx *ak) 0x01, 0x02, /* 1: reset and soft-mute */ 0x00, 0x06, /* 0: mode3(i2s), disable auto-clock detect, * disable DZF, sharp roll-off, RSTN#=0 */ - 0x02, 0x0e, /* 2: DA's power up, normal speed, RSTN#=0 */ - // 0x02, 0x2e, /* quad speed */ + 0x02, 0x4e, /* 2: DA's power up, normal speed, RSTN#=0 */ + // 0x02, 0x6e, /* quad speed */ 0x03, 0x01, /* 3: de-emphasis off */ 0x04, 0x00, /* 4: LOUT1 volume muted */ 0x05, 0x00, /* 5: ROUT1 volume muted */ diff --git a/sound/pci/ice1712/revo.c b/sound/pci/ice1712/revo.c index 4d26314..30b5e83 100644 --- a/sound/pci/ice1712/revo.c +++ b/sound/pci/ice1712/revo.c @@ -216,6 +216,7 @@ static const struct snd_akm4xxx_dac_channel revo51_dac[] = { AK_DAC("PCM Center Playback Volume", 1), AK_DAC("PCM LFE Playback Volume", 1), AK_DAC("PCM Rear Playback Volume", 2), + AK_DAC("PCM Headphone Volume", 2), }; static const char *revo51_adc_input_names[] = { @@ -279,7 +280,7 @@ static struct snd_ak4xxx_private akm_revo_surround_priv __devinitdata = { static struct snd_akm4xxx akm_revo51 __devinitdata = { .type = SND_AK4358, - .num_dacs = 6, + .num_dacs = 8, .ops = { .set_rate_val = revo_set_rate_val }, @@ -508,7 +509,7 @@ static int __devinit revo_init(struct snd_ice1712 *ice) ice->gpio.i2s_mclk_changed = revo_i2s_mclk_changed; break; case VT1724_SUBDEVICE_REVOLUTION51: - ice->num_total_dacs = 6; + ice->num_total_dacs = 8; ice->num_total_adcs = 2; break; case VT1724_SUBDEVICE_AUDIOPHILE192:

3 4

[alsa-devel] [PATCH - asihpi 1/3] Fix format in portable way.
by linux＠audioscience.com 21 Aug '08

21 Aug '08

From: Eliot Blennerhassett <eliot(a)zaphod.(none)> Signed-off-by: Eliot Blennerhassett <eblennerhassett(a)audioscience.com> diff --git a/pci/asihpi/hpicmn.c b/pci/asihpi/hpicmn.c index 12bc6ad..c56e60d 100644 --- a/pci/asihpi/hpicmn.c +++ b/pci/asihpi/hpicmn.c @@ -288,8 +288,8 @@ short HpiCheckBufferMapping( sizeof(((struct hpi_control_cache_pad *)(NULL))->m) } struct pad_ofs_size { - size_t offset; - size_t field_size; + unsigned int offset; + unsigned int field_size; }; static struct pad_ofs_size aPadDesc[] = { @@ -441,10 +441,10 @@ short HpiCheckControlCache( else { unsigned int index = HPI_CTL_ATTR_INDEX(phm->u.c.wAttribute) - 1; - size_t offset = phm->u.c.dwParam1; - size_t pad_string_len, field_size; + unsigned int offset = phm->u.c.dwParam1; + unsigned int pad_string_len, field_size; char *pad_string; - size_t tocopy; + unsigned int tocopy; HPI_DEBUG_LOG(VERBOSE, "PADS HPI_PADS_ %d\n", phm->u.c.wAttribute); @@ -472,7 +472,7 @@ short HpiCheckControlCache( tocopy = sizeof(phr->u.cu.chars8.szData); HPI_DEBUG_LOG(VERBOSE, - "PADS memcpy(%zd), offset %zd \n", tocopy, + "PADS memcpy(%d), offset %d \n", tocopy, offset); memcpy(phr->u.cu.chars8.szData, &pad_string[offset], tocopy); -- 1.5.4.3

2 3

[alsa-devel] sound-problems with ALC262
by Tobias Kaefer 21 Aug '08

21 Aug '08

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Hi! I posted a message at alsa-user list just yesterday about my problem with the on-board ALC262 on my workstation, see mailings lists archive: http://www.mail-archive.com/alsa-user@lists.sourceforge.net/msg23236.html Quote from my initial post: | I just got a new workstation. It's an Fujitsu-Siemens Esprimo P5625 | with an on-board ALC262 sound chip. I'm running a Kubuntu 8.04.1 on | that system. | | The sound I get from that chip is really horrible. There are | cracks and some kind of a reverberation in there. | | I compiled the recent version of alsa (1.0.17) and I tried all the | model-options for /etc/modprobe.d/alsa-base. "stan" told me to use this script http://www.alsa-project.org/alsa-info.sh to create more information about my system. Here is the pastebin link of the output of that script: http://pastebin.ca/1169153 Maybe I can help evolve the snd-hda-intel by being a tester. Unfortunately my kernel-hacking skills are as rusty as my C skills - because of being a Java developer for some years now. Greets Tobias - -- Mit freundlichen Gruessen / with kind regards Tobias S. Käfer Tobias S. Kaefer * Portal-Development ABAS Software AG, Suedendstrasse 42, 76135 Karlsruhe, GERMANY Fon: +49 721 967 23 0, Fax: +49 721 967 23 100 Managing board / Vorstand: Werner Strub (CEO, Vorsitzender), Peter Walser Chairman supervisory board / Aufsichtsratsvorsitzender: Thomas Frank Company Register / Handelsregister: HRB 107644 Amtsgericht Mannheim please visit our homepage / Bitte besuchen Sie unsere Homepage: http://www.abas.de -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.6 (GNU/Linux) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org iD8DBQFIonopdJJ1JNEzpd0RAhCIAJ4lvvOwzQAhV3vtA2u7ilwtlBQPlQCgupns 63R7vjvwbY6O3QUEeNwdEO0= =Fxwe -----END PGP SIGNATURE-----

2 2

[alsa-devel] Small problem with VIA8237/ALC655 onboard
by Vaclav Peroutka 21 Aug '08

21 Aug '08

Hello all, I started experimenting with Software Defined Radio and currently using onboard sound VIA8237/ALC655 rev.0 I found funny behaviour of card inputs. Left channel is OK. But right channel is not routed to the connector and is very noisy. If I switch the input mixer to MIC input, both channels show me the same data - right channel is always connected to microphone input.. So it looks that there is a bug in mixer driver. I must confess that I have a little bit older Alsa. But before upgrade, is there any change log or bugfix log for snd-via82xx module ? Or does anybody remember that such bug was solved ? I am glad that sound works now. And I don't want to "destroy" the sound subsystem by upgrading Alsa... Thank you in advance, Vaclav

1 0

[alsa-devel] PATCH - vt1618 7.1 Audio
by John L. Utz III 21 Aug '08

21 Aug '08

Signed-off-by: John L. Utz III john.utz(a)dmx.com diff --git a/pci/ac97/ac97_codec.c b/pci/ac97/ac97_codec.c index d0023e9..a34f1ea 100644 --- a/pci/ac97/ac97_codec.c +++ b/pci/ac97/ac97_codec.c @@ -168,7 +168,7 @@ static const struct ac97_codec_id snd_ac97_codec_ids[] = { { 0x54584e20, 0xffffffff, "TLC320AD9xC", NULL, NULL }, { 0x56494161, 0xffffffff, "VIA1612A", NULL, NULL }, // modified ICE1232 with S/PDIF { 0x56494170, 0xffffffff, "VIA1617A", patch_vt1617a, NULL }, // modified VT1616 with S/PDIF -{ 0x56494182, 0xffffffff, "VIA1618", NULL, NULL }, +{ 0x56494182, 0xffffffff, "VIA1618", patch_vt1618, NULL }, // clean sheet of crinkled paper { 0x57454301, 0xffffffff, "W83971D", NULL, NULL }, { 0x574d4c00, 0xffffffff, "WM9701,WM9701A", NULL, NULL }, { 0x574d4C03, 0xffffffff, "WM9703,WM9707,WM9708,WM9717", patch_wolfson03, NULL}, @@ -609,7 +609,6 @@ AC97_SINGLE("PC Speaker Playback Volume", AC97_PC_BEEP, 1, 15, 1) static const struct snd_kcontrol_new snd_ac97_controls_mic_boost = AC97_SINGLE("Mic Boost (+20dB)", AC97_MIC, 6, 1, 0); - static const char* std_rec_sel[] = {"Mic", "CD", "Video", "Aux", "Line", "Mix", "Mix Mono", "Phone"}; static const char* std_3d_path[] = {"pre 3D", "post 3D"}; static const char* std_mix[] = {"Mix", "Mic"}; diff --git a/pci/ac97/ac97_patch.c b/pci/ac97/ac97_patch.c index bb028f8..2042415 100644 --- a/pci/ac97/ac97_patch.c +++ b/pci/ac97/ac97_patch.c @@ -3465,7 +3465,7 @@ static int patch_vt1616(struct snd_ac97 * ac97) /* * unfortunately, the vt1617a stashes the twiddlers required for - * nooding the i/o jacks on 2 different regs. * thameans that we cant + * nooding the i/o jacks on 2 different regs. that means that we cant * use the easy way provided by AC97_ENUM_DOUBLE() we have to write * are own funcs. * @@ -3576,6 +3576,413 @@ int patch_vt1617a(struct snd_ac97 * ac97) return err; } + +/* use these alot in the 1618 code but i cant find a better place to put them */ + +static const char* std_enable[] = {"Enabled", "Disabled"}; +static const char* std_disable[] = {"Disabled","Enabled"}; + +/* disable enable c/lfe exchange */ + +static int snd_ac97_vt1618_clex_info(struct snd_kcontrol *kcontrol, + struct snd_ctl_elem_info *uinfo) +{ + return ac97_enum_text_info(kcontrol, uinfo, std_disable, 2); +} + +static int snd_ac97_vt1618_clex_get(struct snd_kcontrol *kcontrol, + struct snd_ctl_elem_value *ucontrol) +{ + struct snd_ac97 *pac97 = snd_kcontrol_chip(kcontrol); + + ucontrol->value.enumerated.item[0] = (snd_ac97_read(pac97, 0x5a) & + 0x0100) >> 8; + return 0; +} + +static int snd_ac97_vt1618_clex_put(struct snd_kcontrol *kcontrol, + struct snd_ctl_elem_value *ucontrol) +{ + struct snd_ac97 *pac97 = snd_kcontrol_chip(kcontrol); + + /* notice relationship between mask and shift! */ + + return snd_ac97_update_bits(pac97, 0x5a, 0x0100, + ucontrol->value.enumerated.item[0] << 8); +} + + +/* disable enable dc offset */ + +static int snd_ac97_vt1618_dcof_info(struct snd_kcontrol *kcontrol, + struct snd_ctl_elem_info *uinfo) +{ + return ac97_enum_text_info(kcontrol, uinfo, std_disable, 2); +} + +static int snd_ac97_vt1618_dcof_get(struct snd_kcontrol *kcontrol, + struct snd_ctl_elem_value *ucontrol) +{ + struct snd_ac97 *pac97 = snd_kcontrol_chip(kcontrol); + + ucontrol->value.enumerated.item[0] = (snd_ac97_read(pac97, 0x5a) & + 0x0400) >> 10; + return 0; +} + +static int snd_ac97_vt1618_dcof_put(struct snd_kcontrol *kcontrol, + struct snd_ctl_elem_value *ucontrol) +{ + struct snd_ac97 *pac97 = snd_kcontrol_chip(kcontrol); + + /* notice relationship between mask and shift! */ + + return snd_ac97_update_bits(pac97, 0x5a, 0x0400, + ucontrol->value.enumerated.item[0] << 10); +} + + +/* enable disable headphone amp */ + +static int snd_ac97_vt1618_hamp_info(struct snd_kcontrol *kcontrol, + struct snd_ctl_elem_info *uinfo) +{ + return ac97_enum_text_info(kcontrol, uinfo, std_enable, 2); +} + +static int snd_ac97_vt1618_hamp_get(struct snd_kcontrol *kcontrol, + struct snd_ctl_elem_value *ucontrol) +{ + struct snd_ac97 *pac97 = snd_kcontrol_chip(kcontrol); + + ucontrol->value.enumerated.item[0] = (snd_ac97_read(pac97, 0x5c) & + 0x0020) >> 5; + return 0; +} + +static int snd_ac97_vt1618_hamp_put(struct snd_kcontrol *kcontrol, + struct snd_ctl_elem_value *ucontrol) +{ + struct snd_ac97 *pac97 = snd_kcontrol_chip(kcontrol); + + /* notice relationship between mask and shift! */ + + return snd_ac97_update_bits(pac97, 0x5c, 0x0020, + ucontrol->value.enumerated.item[0] << 5); +} + + +/* enable disable surround back channel */ + +static int snd_ac97_vt1618_srbk_info(struct snd_kcontrol *kcontrol, + struct snd_ctl_elem_info *uinfo) +{ + return ac97_enum_text_info(kcontrol, uinfo, std_enable, 2); +} + +static int snd_ac97_vt1618_srbk_get(struct snd_kcontrol *kcontrol, + struct snd_ctl_elem_value *ucontrol) +{ + struct snd_ac97 *pac97 = snd_kcontrol_chip(kcontrol); + + ucontrol->value.enumerated.item[0] = (snd_ac97_read(pac97, 0x5c) & + 0x0008) >> 3; + return 0; +} + +static int snd_ac97_vt1618_srbk_put(struct snd_kcontrol *kcontrol, + struct snd_ctl_elem_value *ucontrol) +{ + struct snd_ac97 *pac97 = snd_kcontrol_chip(kcontrol); + + /* notice relationship between mask and shift! */ + + return snd_ac97_update_bits(pac97, 0x5c, 0x0008, + ucontrol->value.enumerated.item[0] << 3); +} + + +/* enable disable soft mute */ + +static int snd_ac97_vt1618_smute_info(struct snd_kcontrol *kcontrol, + struct snd_ctl_elem_info *uinfo) +{ + return ac97_enum_text_info(kcontrol, uinfo, std_enable, 2); +} + +static int snd_ac97_vt1618_smute_get(struct snd_kcontrol *kcontrol, + struct snd_ctl_elem_value *ucontrol) +{ + struct snd_ac97 *pac97 = snd_kcontrol_chip(kcontrol); + + ucontrol->value.enumerated.item[0] = (snd_ac97_read(pac97, 0x5c) & + 0x0001); + return 0; +} + +static int snd_ac97_vt1618_smute_put(struct snd_kcontrol *kcontrol, + struct snd_ctl_elem_value *ucontrol) +{ + struct snd_ac97 *pac97 = snd_kcontrol_chip(kcontrol); + + /* notice relationship between mask and shift! */ + + return snd_ac97_update_bits(pac97, 0x5c, 0x0001, + ucontrol->value.enumerated.item[0]); +} + + +/* config aux in jack - not found on 3 jack motherboards or soundcards */ + +static int snd_ac97_vt1618_auxin_info(struct snd_kcontrol *kcontrol, + struct snd_ctl_elem_info *uinfo) +{ + static const char* texts[] = {"Aux In", "Surround Back Out"}; + return ac97_enum_text_info(kcontrol, uinfo, texts, 2); +} + +static int snd_ac97_vt1618_auxin_get(struct snd_kcontrol *kcontrol, + struct snd_ctl_elem_value *ucontrol) +{ + struct snd_ac97 *pac97 = snd_kcontrol_chip(kcontrol); + + ucontrol->value.enumerated.item[0] = (snd_ac97_read(pac97, 0x76) & + 0x0008) >> 3; + + return 0; +} + +static int snd_ac97_vt1618_auxin_put(struct snd_kcontrol *kcontrol, + struct snd_ctl_elem_value *ucontrol) +{ + struct snd_ac97 *pac97 = snd_kcontrol_chip(kcontrol); + + /* notice relationship between mask and shift! */ + + return snd_ac97_update_bits(pac97, 0x76, 0x0008, + ucontrol->value.enumerated.item[0] << 3); +} + + +/* + * VIA implements 'Smart 5.1' completely differently on the 1618 than + * it does on the 1617a. awesome! They seem to have sourced this + * particular revision of the technology from somebody else, it's + * called Universal Audio Jack, it shows up on some other folk's chips + * as well. + * + * ordering in this list reflects vt1618 docs for Reg 60h and + * the block diagram, DACs are as follows: + * + * OUT_O -> Front, + * OUT_1 -> Surround, + * OUT_2 -> C/LFE + * + * Unlike the 1617a, each OUT has a consistent set of mappings + * for all bitpatterns other than 00: + * + * 01 Unmixed Output + * 10 Line In + * 11 Mic In + * + * Special Case of 00: + * + * OUT_0 Mixed Output + * OUT_1 Reserved + * OUT_2 Reserved + * + * I have no idea what the hell Reserved does, but on an MSI + * CN700T, i have to set it to get surround output - YMMV, bad + * shit may happen. + * + * If other chips use Universal Audio Jack, then this code might be + * applicable to them. + */ + +/* copied from ac97_surround_jack_mode_info() ordering in this list + * reflects vt1618 docs for Vendor Defined Register 0x60 */ + +static int snd_ac97_vt1618_UAJ0_info(struct snd_kcontrol *kcontrol, + struct snd_ctl_elem_info *uinfo) +{ + static const char* texts[] = { "Speaker Out", "DAC Unmixed Out", "Line In", "Mic In"}; + return ac97_enum_text_info(kcontrol, uinfo, texts, 4); +} + +/* UAJ1 and UAJ2 are not supposed to have 00 written to them?? i + * dunno, because thats something that i have to do to get 5.1 out to + * work. */ + +static int snd_ac97_vt1618_UAJ1_info(struct snd_kcontrol *kcontrol, + struct snd_ctl_elem_info *uinfo) +{ + static const char* texts[] = { "Surround Out", "DAC Unmixed Out", "Line In", "Mic In"}; + return ac97_enum_text_info(kcontrol, uinfo, texts, 4); +} + +static int snd_ac97_vt1618_UAJ2_info(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo) +{ + static const char* texts[] = { "Center/LowFre Out", "DAC Unmixed Out", "Line In", "Mic In"}; + return ac97_enum_text_info(kcontrol, uinfo, texts, 4); +} + +/* All of the vt1618 Universal Audio Jack twiddlers are on + Vendor Defined Register 0x60, page 0. The bits, and thus + the mask, are the only thing that changes */ + +static int snd_ac97_vt1618_UAJ_get(struct snd_kcontrol *kcontrol, + struct snd_ctl_elem_value *ucontrol, unsigned short mask) +{ + struct snd_ac97 *pac97; + ushort usDatPag, usUAJ, usShift = 0; // 0 is a possible value + + if(0x000C == mask) usShift = 2; + if(0x0030 == mask) usShift = 4; + + pac97 = snd_kcontrol_chip(kcontrol); + + mutex_lock(&pac97->page_mutex); + + usDatPag = snd_ac97_read(pac97, AC97_INT_PAGING) & AC97_PAGE_MASK; + snd_ac97_update_bits(pac97, AC97_INT_PAGING, AC97_PAGE_MASK, 0); + + usUAJ = snd_ac97_read(pac97, 0x60) & mask; + + snd_ac97_update_bits(pac97, AC97_INT_PAGING, AC97_PAGE_MASK, usDatPag); + mutex_unlock(&pac97->page_mutex); // unlock paging + + ucontrol->value.enumerated.item[0] = usUAJ >> usShift; + + return 0; +} + +static int snd_ac97_vt1618_UAJ_put(struct snd_kcontrol *kcontrol, + struct snd_ctl_elem_value *ucontrol, + unsigned short mask) +{ + struct snd_ac97 *pac97; + ushort usUAJ, usShift = 0; /* 0 is a possible value */ + + if(0x000C == mask) usShift = 2; + if(0x0030 == mask) usShift = 4; + + pac97 = snd_kcontrol_chip(kcontrol); + + usUAJ = ucontrol->value.enumerated.item[0] << usShift; + + return ac97_update_bits_page(pac97, 0x60, mask, usUAJ, 0); +} + +static int snd_ac97_vt1618_UAJ0_get(struct snd_kcontrol *kcontrol, + struct snd_ctl_elem_value *ucontrol) +{ + return snd_ac97_vt1618_UAJ_get(kcontrol, ucontrol, 0x0003); +} + +static int snd_ac97_vt1618_UAJ1_get(struct snd_kcontrol *kcontrol, + struct snd_ctl_elem_value *ucontrol) +{ + return snd_ac97_vt1618_UAJ_get(kcontrol, ucontrol, 0x000C); +} + +static int snd_ac97_vt1618_UAJ2_get(struct snd_kcontrol *kcontrol, + struct snd_ctl_elem_value *ucontrol) +{ + return snd_ac97_vt1618_UAJ_get(kcontrol, ucontrol, 0x0030); +} + +static int snd_ac97_vt1618_UAJ0_put(struct snd_kcontrol *kcontrol, + struct snd_ctl_elem_value *ucontrol) +{ + return snd_ac97_vt1618_UAJ_put(kcontrol, ucontrol, 0x0003); +} + +static int snd_ac97_vt1618_UAJ1_put(struct snd_kcontrol *kcontrol, + struct snd_ctl_elem_value *ucontrol) +{ + return snd_ac97_vt1618_UAJ_put(kcontrol, ucontrol, 0x000C); +} + +static int snd_ac97_vt1618_UAJ2_put(struct snd_kcontrol *kcontrol, + struct snd_ctl_elem_value *ucontrol) +{ + return snd_ac97_vt1618_UAJ_put(kcontrol, ucontrol, 0x0030); +} + +static const struct snd_kcontrol_new snd_ac97_controls_vt1618[] = { + + { + .iface = SNDRV_CTL_ELEM_IFACE_MIXER, + .name = "Center LFE Exchange", + .info = snd_ac97_vt1618_clex_info, + .get = snd_ac97_vt1618_clex_get, + .put = snd_ac97_vt1618_clex_put + }, + { + .iface = SNDRV_CTL_ELEM_IFACE_MIXER, + .name = "DC Offset", + .info = snd_ac97_vt1618_dcof_info, + .get = snd_ac97_vt1618_dcof_get, + .put = snd_ac97_vt1618_dcof_put + },diff --git a/pci/ac97/ac97_codec.c b/pci/ac97/ac97_codec.c index d0023e9..a34f1ea 100644 --- a/pci/ac97/ac97_codec.c +++ b/pci/ac97/ac97_codec.c @@ -168,7 +168,7 @@ static const struct ac97_codec_id snd_ac97_codec_ids[] = { { 0x54584e20, 0xffffffff, "TLC320AD9xC", NULL, NULL }, { 0x56494161, 0xffffffff, "VIA1612A", NULL, NULL }, // modified ICE1232 with S/PDIF { 0x56494170, 0xffffffff, "VIA1617A", patch_vt1617a, NULL }, // modified VT1616 with S/PDIF -{ 0x56494182, 0xffffffff, "VIA1618", NULL, NULL }, +{ 0x56494182, 0xffffffff, "VIA1618", patch_vt1618, NULL }, // clean sheet of crinkled paper { 0x57454301, 0xffffffff, "W83971D", NULL, NULL }, { 0x574d4c00, 0xffffffff, "WM9701,WM9701A", NULL, NULL }, { 0x574d4C03, 0xffffffff, "WM9703,WM9707,WM9708,WM9717", patch_wolfson03, NULL}, @@ -609,7 +609,6 @@ AC97_SINGLE("PC Speaker Playback Volume", AC97_PC_BEEP, 1, 15, 1) static const struct snd_kcontrol_new snd_ac97_controls_mic_boost = AC97_SINGLE("Mic Boost (+20dB)", AC97_MIC, 6, 1, 0); - static const char* std_rec_sel[] = {"Mic", "CD", "Video", "Aux", "Line", "Mix", "Mix Mono", "Phone"}; static const char* std_3d_path[] = {"pre 3D", "post 3D"}; static const char* std_mix[] = {"Mix", "Mic"}; diff --git a/pci/ac97/ac97_patch.c b/pci/ac97/ac97_patch.c index bb028f8..2042415 100644 --- a/pci/ac97/ac97_patch.c +++ b/pci/ac97/ac97_patch.c @@ -3465,7 +3465,7 @@ static int patch_vt1616(struct snd_ac97 * ac97) /* * unfortunately, the vt1617a stashes the twiddlers required for - * nooding the i/o jacks on 2 different regs. * thameans that we cant + * nooding the i/o jacks on 2 different regs. that means that we cant * use the easy way provided by AC97_ENUM_DOUBLE() we have to write * are own funcs. * @@ -3576,6 +3576,413 @@ int patch_vt1617a(struct snd_ac97 * ac97) return err; } + +/* use these alot in the 1618 code but i cant find a better place to put them */ + +static const char* std_enable[] = {"Enabled", "Disabled"}; +static const char* std_disable[] = {"Disabled","Enabled"}; + +/* disable enable c/lfe exchange */ + +static int snd_ac97_vt1618_clex_info(struct snd_kcontrol *kcontrol, + struct snd_ctl_elem_info *uinfo) +{ + return ac97_enum_text_info(kcontrol, uinfo, std_disable, 2); +} + +static int snd_ac97_vt1618_clex_get(struct snd_kcontrol *kcontrol, + struct snd_ctl_elem_value *ucontrol) +{ + struct snd_ac97 *pac97 = snd_kcontrol_chip(kcontrol); + + ucontrol->value.enumerated.item[0] = (snd_ac97_read(pac97, 0x5a) & + 0x0100) >> 8; + return 0; +} + +static int snd_ac97_vt1618_clex_put(struct snd_kcontrol *kcontrol, + struct snd_ctl_elem_value *ucontrol) +{ + struct snd_ac97 *pac97 = snd_kcontrol_chip(kcontrol); + + /* notice relationship between mask and shift! */ + + return snd_ac97_update_bits(pac97, 0x5a, 0x0100, + ucontrol->value.enumerated.item[0] << 8); +} + + +/* disable enable dc offset */ + +static int snd_ac97_vt1618_dcof_info(struct snd_kcontrol *kcontrol, + struct snd_ctl_elem_info *uinfo) +{ + return ac97_enum_text_info(kcontrol, uinfo, std_disable, 2); +} + +static int snd_ac97_vt1618_dcof_get(struct snd_kcontrol *kcontrol, + struct snd_ctl_elem_value *ucontrol) +{ + struct snd_ac97 *pac97 = snd_kcontrol_chip(kcontrol); + + ucontrol->value.enumerated.item[0] = (snd_ac97_read(pac97, 0x5a) & + 0x0400) >> 10; + return 0; +} + +static int snd_ac97_vt1618_dcof_put(struct snd_kcontrol *kcontrol, + struct snd_ctl_elem_value *ucontrol) +{ + struct snd_ac97 *pac97 = snd_kcontrol_chip(kcontrol); + + /* notice relationship between mask and shift! */ + + return snd_ac97_update_bits(pac97, 0x5a, 0x0400, + ucontrol->value.enumerated.item[0] << 10); +} + + +/* enable disable headphone amp */ + +static int snd_ac97_vt1618_hamp_info(struct snd_kcontrol *kcontrol, + struct snd_ctl_elem_info *uinfo) +{ + return ac97_enum_text_info(kcontrol, uinfo, std_enable, 2); +} + +static int snd_ac97_vt1618_hamp_get(struct snd_kcontrol *kcontrol, + struct snd_ctl_elem_value *ucontrol) +{ + struct snd_ac97 *pac97 = snd_kcontrol_chip(kcontrol); + + ucontrol->value.enumerated.item[0] = (snd_ac97_read(pac97, 0x5c) & + 0x0020) >> 5; + return 0; +} + +static int snd_ac97_vt1618_hamp_put(struct snd_kcontrol *kcontrol, + struct snd_ctl_elem_value *ucontrol) +{ + struct snd_ac97 *pac97 = snd_kcontrol_chip(kcontrol); + + /* notice relationship between mask and shift! */ + + return snd_ac97_update_bits(pac97, 0x5c, 0x0020, + ucontrol->value.enumerated.item[0] << 5); +} + + +/* enable disable surround back channel */ + +static int snd_ac97_vt1618_srbk_info(struct snd_kcontrol *kcontrol, + struct snd_ctl_elem_info *uinfo) +{ + return ac97_enum_text_info(kcontrol, uinfo, std_enable, 2); +} + +static int snd_ac97_vt1618_srbk_get(struct snd_kcontrol *kcontrol, + struct snd_ctl_elem_value *ucontrol) +{ + struct snd_ac97 *pac97 = snd_kcontrol_chip(kcontrol); + + ucontrol->value.enumerated.item[0] = (snd_ac97_read(pac97, 0x5c) & + 0x0008) >> 3; + return 0; +} + +static int snd_ac97_vt1618_srbk_put(struct snd_kcontrol *kcontrol, + struct snd_ctl_elem_value *ucontrol) +{ + struct snd_ac97 *pac97 = snd_kcontrol_chip(kcontrol); + + /* notice relationship between mask and shift! */ + + return snd_ac97_update_bits(pac97, 0x5c, 0x0008, + ucontrol->value.enumerated.item[0] << 3); +} + + +/* enable disable soft mute */ + +static int snd_ac97_vt1618_smute_info(struct snd_kcontrol *kcontrol, + struct snd_ctl_elem_info *uinfo) +{ + return ac97_enum_text_info(kcontrol, uinfo, std_enable, 2); +} + +static int snd_ac97_vt1618_smute_get(struct snd_kcontrol *kcontrol, + struct snd_ctl_elem_value *ucontrol) +{ + struct snd_ac97 *pac97 = snd_kcontrol_chip(kcontrol); + + ucontrol->value.enumerated.item[0] = (snd_ac97_read(pac97, 0x5c) & + 0x0001); + return 0; +} + +static int snd_ac97_vt1618_smute_put(struct snd_kcontrol *kcontrol, + struct snd_ctl_elem_value *ucontrol) +{ + struct snd_ac97 *pac97 = snd_kcontrol_chip(kcontrol); + + /* notice relationship between mask and shift! */ + + return snd_ac97_update_bits(pac97, 0x5c, 0x0001, + ucontrol->value.enumerated.item[0]); +} + + +/* config aux in jack - not found on 3 jack motherboards or soundcards */ + +static int snd_ac97_vt1618_auxin_info(struct snd_kcontrol *kcontrol, + struct snd_ctl_elem_info *uinfo) +{ + static const char* texts[] = {"Aux In", "Surround Back Out"}; + return ac97_enum_text_info(kcontrol, uinfo, texts, 2); +} + +static int snd_ac97_vt1618_auxin_get(struct snd_kcontrol *kcontrol, + struct snd_ctl_elem_value *ucontrol) +{ + struct snd_ac97 *pac97 = snd_kcontrol_chip(kcontrol); + + ucontrol->value.enumerated.item[0] = (snd_ac97_read(pac97, 0x76) & + 0x0008) >> 3; + + return 0; +} + +static int snd_ac97_vt1618_auxin_put(struct snd_kcontrol *kcontrol, + struct snd_ctl_elem_value *ucontrol) +{ + struct snd_ac97 *pac97 = snd_kcontrol_chip(kcontrol); + + /* notice relationship between mask and shift! */ + + return snd_ac97_update_bits(pac97, 0x76, 0x0008, + ucontrol->value.enumerated.item[0] << 3); +} + + +/* + * VIA implements 'Smart 5.1' completely differently on the 1618 than + * it does on the 1617a. awesome! They seem to have sourced this + * particular revision of the technology from somebody else, it's + * called Universal Audio Jack, it shows up on some other folk's chips + * as well. + * + * ordering in this list reflects vt1618 docs for Reg 60h and + * the block diagram, DACs are as follows: + * + * OUT_O -> Front, + * OUT_1 -> Surround, + * OUT_2 -> C/LFE + * + * Unlike the 1617a, each OUT has a consistent set of mappings + * for all bitpatterns other than 00: + * + * 01 Unmixed Output + * 10 Line In + * 11 Mic In + * + * Special Case of 00: + * + * OUT_0 Mixed Output + * OUT_1 Reserved + * OUT_2 Reserved + * + * I have no idea what the hell Reserved does, but on an MSI + * CN700T, i have to set it to get surround output - YMMV, bad + * shit may happen. + * + * If other chips use Universal Audio Jack, then this code might be + * applicable to them. + */ + +/* copied from ac97_surround_jack_mode_info() ordering in this list + * reflects vt1618 docs for Vendor Defined Register 0x60 */ + +static int snd_ac97_vt1618_UAJ0_info(struct snd_kcontrol *kcontrol, + struct snd_ctl_elem_info *uinfo) +{ + static const char* texts[] = { "Speaker Out", "DAC Unmixed Out", "Line In", "Mic In"}; + return ac97_enum_text_info(kcontrol, uinfo, texts, 4); +} + +/* UAJ1 and UAJ2 are not supposed to have 00 written to them?? i + * dunno, because thats something that i have to do to get 5.1 out to + * work. */ + +static int snd_ac97_vt1618_UAJ1_info(struct snd_kcontrol *kcontrol, + struct snd_ctl_elem_info *uinfo) +{ + static const char* texts[] = { "Surround Out", "DAC Unmixed Out", "Line In", "Mic In"}; + return ac97_enum_text_info(kcontrol, uinfo, texts, 4); +} + +static int snd_ac97_vt1618_UAJ2_info(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo) +{ + static const char* texts[] = { "Center/LowFre Out", "DAC Unmixed Out", "Line In", "Mic In"}; + return ac97_enum_text_info(kcontrol, uinfo, texts, 4); +} + +/* All of the vt1618 Universal Audio Jack twiddlers are on + Vendor Defined Register 0x60, page 0. The bits, and thus + the mask, are the only thing that changes */ + +static int snd_ac97_vt1618_UAJ_get(struct snd_kcontrol *kcontrol, + struct snd_ctl_elem_value *ucontrol, unsigned short mask) +{ + struct snd_ac97 *pac97; + ushort usDatPag, usUAJ, usShift = 0; // 0 is a possible value + + if(0x000C == mask) usShift = 2; + if(0x0030 == mask) usShift = 4; + + pac97 = snd_kcontrol_chip(kcontrol); + + mutex_lock(&pac97->page_mutex); + + usDatPag = snd_ac97_read(pac97, AC97_INT_PAGING) & AC97_PAGE_MASK; + snd_ac97_update_bits(pac97, AC97_INT_PAGING, AC97_PAGE_MASK, 0); + + usUAJ = snd_ac97_read(pac97, 0x60) & mask; + + snd_ac97_update_bits(pac97, AC97_INT_PAGING, AC97_PAGE_MASK, usDatPag); + mutex_unlock(&pac97->page_mutex); // unlock paging + + ucontrol->value.enumerated.item[0] = usUAJ >> usShift; + + return 0; +} + +static int snd_ac97_vt1618_UAJ_put(struct snd_kcontrol *kcontrol, + struct snd_ctl_elem_value *ucontrol, + unsigned short mask) +{ + struct snd_ac97 *pac97; + ushort usUAJ, usShift = 0; /* 0 is a possible value */ + + if(0x000C == mask) usShift = 2; + if(0x0030 == mask) usShift = 4; + + pac97 = snd_kcontrol_chip(kcontrol); + + usUAJ = ucontrol->value.enumerated.item[0] << usShift; + + return ac97_update_bits_page(pac97, 0x60, mask, usUAJ, 0); +} + +static int snd_ac97_vt1618_UAJ0_get(struct snd_kcontrol *kcontrol, + struct snd_ctl_elem_value *ucontrol) +{ + return snd_ac97_vt1618_UAJ_get(kcontrol, ucontrol, 0x0003); +} + +static int snd_ac97_vt1618_UAJ1_get(struct snd_kcontrol *kcontrol, + struct snd_ctl_elem_value *ucontrol) +{ + return snd_ac97_vt1618_UAJ_get(kcontrol, ucontrol, 0x000C); +} + +static int snd_ac97_vt1618_UAJ2_get(struct snd_kcontrol *kcontrol, + struct snd_ctl_elem_value *ucontrol) +{ + return snd_ac97_vt1618_UAJ_get(kcontrol, ucontrol, 0x0030); +} + +static int snd_ac97_vt1618_UAJ0_put(struct snd_kcontrol *kcontrol, + struct snd_ctl_elem_value *ucontrol) +{ + return snd_ac97_vt1618_UAJ_put(kcontrol, ucontrol, 0x0003); +} + +static int snd_ac97_vt1618_UAJ1_put(struct snd_kcontrol *kcontrol, + struct snd_ctl_elem_value *ucontrol) +{ + return snd_ac97_vt1618_UAJ_put(kcontrol, ucontrol, 0x000C); +} + +static int snd_ac97_vt1618_UAJ2_put(struct snd_kcontrol *kcontrol, + struct snd_ctl_elem_value *ucontrol) +{ + return snd_ac97_vt1618_UAJ_put(kcontrol, ucontrol, 0x0030); +} + +static const struct snd_kcontrol_new snd_ac97_controls_vt1618[] = { + + { + .iface = SNDRV_CTL_ELEM_IFACE_MIXER, + .name = "Center LFE Exchange", + .info = snd_ac97_vt1618_clex_info, + .get = snd_ac97_vt1618_clex_get, + .put = snd_ac97_vt1618_clex_put + }, + { + .iface = SNDRV_CTL_ELEM_IFACE_MIXER, + .name = "DC Offset", + .info = snd_ac97_vt1618_dcof_info, + .get = snd_ac97_vt1618_dcof_get, + .put = snd_ac97_vt1618_dcof_diff --git a/pci/ac97/ac97_codec.c b/pci/ac97/ac97_codec.c index d0023e9..a34f1ea 100644 --- a/pci/ac97/ac97_codec.c +++ b/pci/ac97/ac97_codec.c @@ -168,7 +168,7 @@ static const struct ac97_codec_id snd_ac97_codec_ids[] = { { 0x54584e20, 0xffffffff, "TLC320AD9xC", NULL, NULL }, { 0x56494161, 0xffffffff, "VIA1612A", NULL, NULL }, // modified ICE1232 with S/PDIF { 0x56494170, 0xffffffff, "VIA1617A", patch_vt1617a, NULL }, // modified VT1616 with S/PDIF -{ 0x56494182, 0xffffffff, "VIA1618", NULL, NULL }, +{ 0x56494182, 0xffffffff, "VIA1618", patch_vt1618, NULL }, // clean sheet of crinkled paper { 0x57454301, 0xffffffff, "W83971D", NULL, NULL }, { 0x574d4c00, 0xffffffff, "WM9701,WM9701A", NULL, NULL }, { 0x574d4C03, 0xffffffff, "WM9703,WM9707,WM9708,WM9717", patch_wolfson03, NULL}, @@ -609,7 +609,6 @@ AC97_SINGLE("PC Speaker Playback Volume", AC97_PC_BEEP, 1, 15, 1) static const struct snd_kcontrol_new snd_ac97_controls_mic_boost = AC97_SINGLE("Mic Boost (+20dB)", AC97_MIC, 6, 1, 0); - static const char* std_rec_sel[] = {"Mic", "CD", "Video", "Aux", "Line", "Mix", "Mix Mono", "Phone"}; static const char* std_3d_path[] = {"pre 3D", "post 3D"}; static const char* std_mix[] = {"Mix", "Mic"}; diff --git a/pci/ac97/ac97_patch.c b/pci/ac97/ac97_patch.c index bb028f8..2042415 100644 --- a/pci/ac97/ac97_patch.c +++ b/pci/ac97/ac97_patch.c @@ -3465,7 +3465,7 @@ static int patch_vt1616(struct snd_ac97 * ac97) /* * unfortunately, the vt1617a stashes the twiddlers required for - * nooding the i/o jacks on 2 different regs. * thameans that we cant + * nooding the i/o jacks on 2 different regs. that means that we cant * use the easy way provided by AC97_ENUM_DOUBLE() we have to write * are own funcs. * @@ -3576,6 +3576,413 @@ int patch_vt1617a(struct snd_ac97 * ac97) return err; } + +/* use these alot in the 1618 code but i cant find a better place to put them */ + +static const char* std_enable[] = {"Enabled", "Disabled"}; +static const char* std_disable[] = {"Disabled","Enabled"}; + +/* disable enable c/lfe exchange */ + +static int snd_ac97_vt1618_clex_info(struct snd_kcontrol *kcontrol, + struct snd_ctl_elem_info *uinfo) +{ + return ac97_enum_text_info(kcontrol, uinfo, std_disable, 2); +} + +static int snd_ac97_vt1618_clex_get(struct snd_kcontrol *kcontrol, + struct snd_ctl_elem_value *ucontrol) +{ + struct snd_ac97 *pac97 = snd_kcontrol_chip(kcontrol); + + ucontrol->value.enumerated.item[0] = (snd_ac97_read(pac97, 0x5a) & + 0x0100) >> 8; + return 0; +} + +static int snd_ac97_vt1618_clex_put(struct snd_kcontrol *kcontrol, + struct snd_ctl_elem_value *ucontrol) +{ + struct snd_ac97 *pac97 = snd_kcontrol_chip(kcontrol); + + /* notice relationship between mask and shift! */ + + return snd_ac97_update_bits(pac97, 0x5a, 0x0100, + ucontrol->value.enumerated.item[0] << 8); +} + + +/* disable enable dc offset */ + +static int snd_ac97_vt1618_dcof_info(struct snd_kcontrol *kcontrol, + struct snd_ctl_elem_info *uinfo) +{ + return ac97_enum_text_info(kcontrol, uinfo, std_disable, 2); +} + +static int snd_ac97_vt1618_dcof_get(struct snd_kcontrol *kcontrol, + struct snd_ctl_elem_value *ucontrol) +{ + struct snd_ac97 *pac97 = snd_kcontrol_chip(kcontrol); + + ucontrol->value.enumerated.item[0] = (snd_ac97_read(pac97, 0x5a) & + 0x0400) >> 10; + return 0; +} + +static int snd_ac97_vt1618_dcof_put(struct snd_kcontrol *kcontrol, + struct snd_ctl_elem_value *ucontrol) +{ + struct snd_ac97 *pac97 = snd_kcontrol_chip(kcontrol); + + /* notice relationship between mask and shift! */ + + return snd_ac97_update_bits(pac97, 0x5a, 0x0400, + ucontrol->value.enumerated.item[0] << 10); +} + + +/* enable disable headphone amp */ + +static int snd_ac97_vt1618_hamp_info(struct snd_kcontrol *kcontrol, + struct snd_ctl_elem_info *uinfo) +{ + return ac97_enum_text_info(kcontrol, uinfo, std_enable, 2); +} + +static int snd_ac97_vt1618_hamp_get(struct snd_kcontrol *kcontrol, + struct snd_ctl_elem_value *ucontrol) +{ + struct snd_ac97 *pac97 = snd_kcontrol_chip(kcontrol); + + ucontrol->value.enumerated.item[0] = (snd_ac97_read(pac97, 0x5c) & + 0x0020) >> 5; + return 0; +} + +static int snd_ac97_vt1618_hamp_put(struct snd_kcontrol *kcontrol, + struct snd_ctl_elem_value *ucontrol) +{ + struct snd_ac97 *pac97 = snd_kcontrol_chip(kcontrol); + + /* notice relationship between mask and shift! */ + + return snd_ac97_update_bits(pac97, 0x5c, 0x0020, + ucontrol->value.enumerated.item[0] << 5); +} + + +/* enable disable surround back channel */ + +static int snd_ac97_vt1618_srbk_info(struct snd_kcontrol *kcontrol, + struct snd_ctl_elem_info *uinfo) +{ + return ac97_enum_text_info(kcontrol, uinfo, std_enable, 2); +} + +static int snd_ac97_vt1618_srbk_get(struct snd_kcontrol *kcontrol, + struct snd_ctl_elem_value *ucontrol) +{ + struct snd_ac97 *pac97 = snd_kcontrol_chip(kcontrol); + + ucontrol->value.enumerated.item[0] = (snd_ac97_read(pac97, 0x5c) & + 0x0008) >> 3; + return 0; +} + +static int snd_ac97_vt1618_srbk_put(struct snd_kcontrol *kcontrol, + struct snd_ctl_elem_value *ucontrol) +{ + struct snd_ac97 *pac97 = snd_kcontrol_chip(kcontrol); + + /* notice relationship between mask and shift! */ + + return snd_ac97_update_bits(pac97, 0x5c, 0x0008, + ucontrol->value.enumerated.item[0] << 3); +} + + +/* enable disable soft mute */ + +static int snd_ac97_vt1618_smute_info(struct snd_kcontrol *kcontrol, + struct snd_ctl_elem_info *uinfo) +{ + return ac97_enum_text_info(kcontrol, uinfo, std_enable, 2); +} + +static int snd_ac97_vt1618_smute_get(struct snd_kcontrol *kcontrol, + struct snd_ctl_elem_value *ucontrol) +{ + struct snd_ac97 *pac97 = snd_kcontrol_chip(kcontrol); + + ucontrol->value.enumerated.item[0] = (snd_ac97_read(pac97, 0x5c) & + 0x0001); + return 0; +} + +static int snd_ac97_vt1618_smute_put(struct snd_kcontrol *kcontrol, + struct snd_ctl_elem_value *ucontrol) +{ + struct snd_ac97 *pac97 = snd_kcontrol_chip(kcontrol); + + /* notice relationship between mask and shift! */ + + return snd_ac97_update_bits(pac97, 0x5c, 0x0001, + ucontrol->value.enumerated.item[0]); +} + + +/* config aux in jack - not found on 3 jack motherboards or soundcards */ + +static int snd_ac97_vt1618_auxin_info(struct snd_kcontrol *kcontrol, + struct snd_ctl_elem_info *uinfo) +{ + static const char* texts[] = {"Aux In", "Surround Back Out"}; + return ac97_enum_text_info(kcontrol, uinfo, texts, 2); +} + +static int snd_ac97_vt1618_auxin_get(struct snd_kcontrol *kcontrol, + struct snd_ctl_elem_value *ucontrol) +{ + struct snd_ac97 *pac97 = snd_kcontrol_chip(kcontrol); + + ucontrol->value.enumerated.item[0] = (snd_ac97_read(pac97, 0x76) & + 0x0008) >> 3; + + return 0; +} + +static int snd_ac97_vt1618_auxin_put(struct snd_kcontrol *kcontrol, + struct snd_ctl_elem_value *ucontrol) +{ + struct snd_ac97 *pac97 = snd_kcontrol_chip(kcontrol); + + /* notice relationship between mask and shift! */ + + return snd_ac97_update_bits(pac97, 0x76, 0x0008, + ucontrol->value.enumerated.item[0] << 3); +} + + +/* + * VIA implements 'Smart 5.1' completely differently on the 1618 than + * it does on the 1617a. awesome! They seem to have sourced this + * particular revision of the technology from somebody else, it's + * called Universal Audio Jack, it shows up on some other folk's chips + * as well. + * + * ordering in this list reflects vt1618 docs for Reg 60h and + * the block diagram, DACs are as follows: + * + * OUT_O -> Front, + * OUT_1 -> Surround, + * OUT_2 -> C/LFE + * + * Unlike the 1617a, each OUT has a consistent set of mappings + * for all bitpatterns other than 00: + * + * 01 Unmixed Output + * 10 Line In + * 11 Mic In + * + * Special Case of 00: + * + * OUT_0 Mixed Output + * OUT_1 Reserved + * OUT_2 Reserved + * + * I have no idea what the hell Reserved does, but on an MSI + * CN700T, i have to set it to get surround output - YMMV, bad + * shit may happen. + * + * If other chips use Universal Audio Jack, then this code might be + * applicable to them. + */ + +/* copied from ac97_surround_jack_mode_info() ordering in this list + * reflects vt1618 docs for Vendor Defined Register 0x60 */ + +static int snd_ac97_vt1618_UAJ0_info(struct snd_kcontrol *kcontrol, + struct snd_ctl_elem_info *uinfo) +{ + static const char* texts[] = { "Speaker Out", "DAC Unmixed Out", "Line In", "Mic In"}; + return ac97_enum_text_info(kcontrol, uinfo, texts, 4); +} + +/* UAJ1 and UAJ2 are not supposed to have 00 written to them?? i + * dunno, because thats something that i have to do to get 5.1 out to + * work. */ + +static int snd_ac97_vt1618_UAJ1_info(struct snd_kcontrol *kcontrol, + struct snd_ctl_elem_info *uinfo) +{ + static const char* texts[] = { "Surround Out", "DAC Unmixed Out", "Line In", "Mic In"}; + return ac97_enum_text_info(kcontrol, uinfo, texts, 4); +} + +static int snd_ac97_vt1618_UAJ2_info(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo) +{ + static const char* texts[] = { "Center/LowFre Out", "DAC Unmixed Out", "Line In", "Mic In"}; + return ac97_enum_text_info(kcontrol, uinfo, texts, 4); +} + +/* All of the vt1618 Universal Audio Jack twiddlers are on + Vendor Defined Register 0x60, page 0. The bits, and thus + the mask, are the only thing that changes */ + +static int snd_ac97_vt1618_UAJ_get(struct snd_kcontrol *kcontrol, + struct snd_ctl_elem_value *ucontrol, unsigned short mask) +{ + struct snd_ac97 *pac97; + ushort usDatPag, usUAJ, usShift = 0; // 0 is a possible value + + if(0x000C == mask) usShift = 2; + if(0x0030 == mask) usShift = 4; + + pac97 = snd_kcontrol_chip(kcontrol); + + mutex_lock(&pac97->page_mutex); + + usDatPag = snd_ac97_read(pac97, AC97_INT_PAGING) & AC97_PAGE_MASK; + snd_ac97_update_bits(pac97, AC97_INT_PAGING, AC97_PAGE_MASK, 0); + + usUAJ = snd_ac97_read(pac97, 0x60) & mask; + + snd_ac97_update_bits(pac97, AC97_INT_PAGING, AC97_PAGE_MASK, usDatPag); + mutex_unlock(&pac97->page_mutex); // unlock paging + + ucontrol->value.enumerated.item[0] = usUAJ >> usShift; + + return 0; +} + +static int snd_ac97_vt1618_UAJ_put(struct snd_kcontrol *kcontrol, + struct snd_ctl_elem_value *ucontrol, + unsigned short mask) +{ + struct snd_ac97 *pac97; + ushort usUAJ, usShift = 0; /* 0 is a possible value */ + + if(0x000C == mask) usShift = 2; + if(0x0030 == mask) usShift = 4; + + pac97 = snd_kcontrol_chip(kcontrol); + + usUAJ = ucontrol->value.enumerated.item[0] << usShift; + + return ac97_update_bits_page(pac97, 0x60, mask, usUAJ, 0); +} + +static int snd_ac97_vt1618_UAJ0_get(struct snd_kcontrol *kcontrol, + struct snd_ctl_elem_value *ucontrol) +{ + return snd_ac97_vt1618_UAJ_get(kcontrol, ucontrol, 0x0003); +} + +static int snd_ac97_vt1618_UAJ1_get(struct snd_kcontrol *kcontrol, + struct snd_ctl_elem_value *ucontrol) +{ + return snd_ac97_vt1618_UAJ_get(kcontrol, ucontrol, 0x000C); +} + +static int snd_ac97_vt1618_UAJ2_get(struct snd_kcontrol *kcontrol, + struct snd_ctl_elem_value *ucontrol) +{ + return snd_ac97_vt1618_UAJ_get(kcontrol, ucontrol, 0x0030); +} + +static int snd_ac97_vt1618_UAJ0_put(struct snd_kcontrol *kcontrol, + struct snd_ctl_elem_value *ucontrol) +{ + return snd_ac97_vt1618_UAJ_put(kcontrol, ucontrol, 0x0003); +} + +static int snd_ac97_vt1618_UAJ1_put(struct snd_kcontrol *kcontrol, + struct snd_ctl_elem_value *ucontrol) +{ + return snd_ac97_vt1618_UAJ_put(kcontrol, ucontrol, 0x000C); +} + +static int snd_ac97_vt1618_UAJ2_put(struct snd_kcontrol *kcontrol, + struct snd_ctl_elem_value *ucontrol) +{ + return snd_ac97_vt1618_UAJ_put(kcontrol, ucontrol, 0x0030); +} + +static const struct snd_kcontrol_new snd_ac97_controls_vt1618[] = { + + { + .iface = SNDRV_CTL_ELEM_IFACE_MIXER, + .name = "Center LFE Exchange", + .info = snd_ac97_vt1618_clex_info, + .get = snd_ac97_vt1618_clex_get, + .put = snd_ac97_vt1618_clex_put + }, + { + .iface = SNDRV_CTL_ELEM_IFACE_MIXER, + .name = "DC Offset", + .info = snd_ac97_vt1618_dcof_info, + .get = snd_ac97_vt1618_dcof_get, + .put = snd_ac97_vt1618_dcof_put + }, + { + .iface = SNDRV_CTL_ELEM_IFACE_MIXER, + .name = "Headphone Amp", + .info = snd_ac97_vt1618_hamp_info, + .get = snd_ac97_vt1618_hamp_get, + .put = snd_ac97_vt1618_hamp_put + }, + { + .iface = SNDRV_CTL_ELEM_IFACE_MIXER, + .name = "Surround Back", + .info = snd_ac97_vt1618_srbk_info, + .get = snd_ac97_vt1618_srbk_get, + .put = snd_ac97_vt1618_srbk_put + }, + { + .iface = SNDRV_CTL_ELEM_IFACE_MIXER, + .name = "Soft Mute", + .info = snd_ac97_vt1618_smute_info, + .get = snd_ac97_vt1618_smute_get, + .put = snd_ac97_vt1618_smute_put + }, + { + .iface = SNDRV_CTL_ELEM_IFACE_MIXER, + .name = "Aux In Jack", + .info = snd_ac97_vt1618_auxin_info, + .get = snd_ac97_vt1618_auxin_get, + .put = snd_ac97_vt1618_auxin_put + }, + { + .iface = SNDRV_CTL_ELEM_IFACE_MIXER, + .name = "Speaker Jack", + .info = snd_ac97_vt1618_UAJ0_info, + .get = snd_ac97_vt1618_UAJ0_get, + .put = snd_ac97_vt1618_UAJ0_put + }, + { + .iface = SNDRV_CTL_ELEM_IFACE_MIXER, + .name = "Line In Jack", + .info = snd_ac97_vt1618_UAJ1_info, + .get = snd_ac97_vt1618_UAJ1_get, + .put = snd_ac97_vt1618_UAJ1_put + }, + { + .iface = SNDRV_CTL_ELEM_IFACE_MIXER, + .name = "Mic In Jack", + .info = snd_ac97_vt1618_UAJ2_info, + .get = snd_ac97_vt1618_UAJ2_get, + .put = snd_ac97_vt1618_UAJ2_put + } +}; + +int patch_vt1618(struct snd_ac97 *ac97) +{ + return patch_build_controls(ac97, snd_ac97_controls_vt1618, + ARRAY_SIZE(snd_ac97_controls_vt1618)); +} + + /* */ static void it2646_update_jacks(struct snd_ac97 *ac97) put + }, + { + .iface = SNDRV_CTL_ELEM_IFACE_MIXER, + .name = "Headphone Amp", + .info = snd_ac97_vt1618_hamp_info, + .get = snd_ac97_vt1618_hamp_get, + .put = snd_ac97_vt1618_hamp_put + }, + { + .iface = SNDRV_CTL_ELEM_IFACE_MIXER, + .name = "Surround Back", + .info = snd_ac97_vt1618_srbk_info, + .get = snd_ac97_vt1618_srbk_get, + .put = snd_ac97_vt1618_srbk_put + }, + { + .iface = SNDRV_CTL_ELEM_IFACE_MIXER, + .name = "Soft Mute", + .info = snd_ac97_vt1618_smute_info, + .get = snd_ac97_vt1618_smute_get, + .put = snd_ac97_vt1618_smute_put + }, + { + .iface = SNDRV_CTL_ELEM_IFACE_MIXER, + .name = "Aux In Jack", + .info = snd_ac97_vt1618_auxin_info, + .get = snd_ac97_vt1618_auxin_get, + .put = snd_ac97_vt1618_auxin_put + }, + { + .iface = SNDRV_CTL_ELEM_IFACE_MIXER, + .name = "Speaker Jack", + .info = snd_ac97_vt1618_UAJ0_info, + .get = snd_ac97_vt1618_UAJ0_get, + .put = snd_ac97_vt1618_UAJ0_put + }, + { + .iface = SNDRV_CTL_ELEM_IFACE_MIXER, + .name = "Line In Jack", + .info = snd_ac97_vt1618_UAJ1_info, + .get = snd_ac97_vt1618_UAJ1_get, + .put = snd_ac97_vt1618_UAJ1_put + }, + { + .iface = SNDRV_CTL_ELEM_IFACE_MIXER, + .name = "Mic In Jack", + .info = snd_ac97_vt1618_UAJ2_info, + .get = snd_ac97_vt1618_UAJ2_get, + .put = snd_ac97_vt1618_UAJ2_put + } +}; + +int patch_vt1618(struct snd_ac97 *ac97) +{ + return patch_build_controls(ac97, snd_ac97_controls_vt1618, + ARRAY_SIZE(snd_ac97_controls_vt1618)); +} + + /* */ static void it2646_update_jacks(struct snd_ac97 *ac97) + { + .iface = SNDRV_CTL_ELEM_IFACE_MIXER, + .name = "Headphone Amp", + .info = snd_ac97_vt1618_hamp_info, + .get = snd_ac97_vt1618_hamp_get, + .put = snd_ac97_vt1618_hamp_put + }, + { + .iface = SNDRV_CTL_ELEM_IFACE_MIXER, + .name = "Surround Back", + .info = snd_ac97_vt1618_srbk_info, + .get = snd_ac97_vt1618_srbk_get, + .put = snd_ac97_vt1618_srbk_put + }, + { + .iface = SNDRV_CTL_ELEM_IFACE_MIXER, + .name = "Soft Mute", + .info = snd_ac97_vt1618_smute_info, + .get = snd_ac97_vt1618_smute_get, + .put = snd_ac97_vt1618_smute_put + }, + { + .iface = SNDRV_CTL_ELEM_IFACE_MIXER, + .name = "Aux In Jack", + .info = snd_ac97_vt1618_auxin_info, + .get = snd_ac97_vt1618_auxin_get, + .put = snd_ac97_vt1618_auxin_put + }, + { + .iface = SNDRV_CTL_ELEM_IFACE_MIXER, + .name = "Speaker Jack", + .info = snd_ac97_vt1618_UAJ0_info, + .get = snd_ac97_vt1618_UAJ0_get, + .put = snd_ac97_vt1618_UAJ0_put + }, + { + .iface = SNDRV_CTL_ELEM_IFACE_MIXER, + .name = "Line In Jack", + .info = snd_ac97_vt1618_UAJ1_info, + .get = snd_ac97_vt1618_UAJ1_get, + .put = snd_ac97_vt1618_UAJ1_put + }, + { + .iface = SNDRV_CTL_ELEM_IFACE_MIXER, + .name = "Mic In Jack", + .info = snd_ac97_vt1618_UAJ2_info, + .get = snd_ac97_vt1618_UAJ2_get, + .put = snd_ac97_vt1618_UAJ2_put + } +}; + +int patch_vt1618(struct snd_ac97 *ac97) +{ + return patch_build_controls(ac97, snd_ac97_controls_vt1618, + ARRAY_SIZE(snd_ac97_controls_vt1618)); +} + + /* */ static void it2646_update_jacks(struct snd_ac97 *ac97)

4 8

Re: [alsa-devel] maestro3 & es1988: mic range too low
by Takashi Iwai 20 Aug '08

20 Aug '08

At Mon, 18 Aug 2008 15:28:00 +0300, Ilkka Tengvall wrote: > > >> the reasoning for the original patch sounds reasonable. The > >> mic volume is tunable, only at the very low range. I recall the laptop > >> came with Win98, and there was no problem then with the sound -> not a > >> HW problem. I have never got this laptop mic working with linux, so > >> this is not anything that broke recently. I see there is > >> check_volume_resolution function which tries to guess some of the > >> register ranges, but maybe it get's it wrong with this HW. > > > > Maybe, maybe not. You should check rather ac97 registers in > > /proc/asound/card0/codec97#0/ac97#0-0+regs. If build with > > CONFIG_SND_DEBUG=y, you can write to the register directly, too. > > See Documentaiton[/sound/alsa]/Procfile.txt. > > > > I checked this file. It seems it gets the regs right for the mic > (range 0x1f). The capture range is 0xf. I don't have the specs to > compare it against, so I assume there is nothing to do more here. Which registers, exactly? > It seems mic value decreases while going up to full, where as capture > increases. I guess the former one is the mic loopback volume (attenuation), so no wonder it behaves so. > Another difference is maybe stereo / mono related, the > capture changes both bytes whereas mic only the other one. Also one > thing, should the mic level be around 0x40 - 0x5f, not 0x0 - 0x1f. The bit 0x40 indicates the mic boost +20dB. Takashi

2 3

Re: [alsa-devel] [PATCH v2] duplicate SNDRV_PCM_FMTBIT_S{16,24}_BE
by Takashi Iwai 20 Aug '08

20 Aug '08

At Tue, 19 Aug 2008 11:53:54 -0400, roel kluin wrote: > > Takashi Iwai wrote: > > At Tue, 19 Aug 2008 08:15:05 +0200 (CEST), > > Johannes Berg wrote: > >> roel kluin wrote: > >>> untested, is it correct? > >> not a clue, do you know how long ago that was? :) > >> does the driver check endianness anywhere? > > > > AFAIK snd-aoa supports only bit-endian formats (at least in > > sound/aoa/soundbus/i2sbus-pcm.c), so this addition makes little > > sense. > > > > Better to drop the duplicated words there. > > Thanks Johannes and Takashi, > > FWIW this removes the duplicates. > --- > Remove duplicate assignment of SNDRV_PCM_FMTBIT_S{16,24}_BE bits > > Signed-off-by: Roel Kluin <roel.kluin(a)gmail.com> Thanks, applied this one now. Takashi > --- > diff --git a/sound/aoa/codecs/snd-aoa-codec-tas.c b/sound/aoa/codecs/snd-aoa-codec-tas.c > index 7a16a33..6c515b2 100644 > --- a/sound/aoa/codecs/snd-aoa-codec-tas.c > +++ b/sound/aoa/codecs/snd-aoa-codec-tas.c > @@ -654,15 +654,13 @@ static struct snd_kcontrol_new bass_control = { > static struct transfer_info tas_transfers[] = { > { > /* input */ > - .formats = SNDRV_PCM_FMTBIT_S16_BE | SNDRV_PCM_FMTBIT_S16_BE | > - SNDRV_PCM_FMTBIT_S24_BE | SNDRV_PCM_FMTBIT_S24_BE, > + .formats = SNDRV_PCM_FMTBIT_S16_BE | SNDRV_PCM_FMTBIT_S24_BE, > .rates = SNDRV_PCM_RATE_32000 | SNDRV_PCM_RATE_44100 | SNDRV_PCM_RATE_48000, > .transfer_in = 1, > }, > { > /* output */ > - .formats = SNDRV_PCM_FMTBIT_S16_BE | SNDRV_PCM_FMTBIT_S16_BE | > - SNDRV_PCM_FMTBIT_S24_BE | SNDRV_PCM_FMTBIT_S24_BE, > + .formats = SNDRV_PCM_FMTBIT_S16_BE | SNDRV_PCM_FMTBIT_S24_BE, > .rates = SNDRV_PCM_RATE_32000 | SNDRV_PCM_RATE_44100 | SNDRV_PCM_RATE_48000, > .transfer_in = 0, > }, >

1 0

[alsa-devel] [PATCH] opl3sa2: replace nd_opl3sa2_info_xxx() with snd_wss_info_xxx()
by Krzysztof Helt 20 Aug '08

20 Aug '08

From: Krzysztof Helt <krzysztof.h1(a)wp.pl> Replace snd_opl3sa2_info_xxx() with snd_wss_info_xxx(). Drop check of card->private_data which cannot be NULL if card is not NULL (spotted by Rene Herman). Signed-off-by: Krzysztof Helt <krzysztof.h1(a)wp.pl> --- diff -urp linux-ref/sound/isa/opl3sa2.c linux-2.6/sound/isa/opl3sa2.c --- linux-ref/sound/isa/opl3sa2.c 2008-08-20 21:19:04.000000000 +0200 +++ linux-2.6/sound/isa/opl3sa2.c 2008-08-20 21:19:29.000000000 +0200 @@ -300,7 +300,7 @@ static irqreturn_t snd_opl3sa2_interrupt struct snd_opl3sa2 *chip; int handled = 0; - if (card == NULL || card->private_data == NULL) + if (card == NULL) return IRQ_NONE; chip = card->private_data; @@ -338,29 +338,18 @@ static irqreturn_t snd_opl3sa2_interrupt #define OPL3SA2_SINGLE(xname, xindex, reg, shift, mask, invert) \ { .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, .index = xindex, \ - .info = snd_opl3sa2_info_single, \ + .info = snd_wss_info_single, \ .get = snd_opl3sa2_get_single, .put = snd_opl3sa2_put_single, \ .private_value = reg | (shift << 8) | (mask << 16) | (invert << 24) } #define OPL3SA2_SINGLE_TLV(xname, xindex, reg, shift, mask, invert, xtlv) \ { .iface = SNDRV_CTL_ELEM_IFACE_MIXER, \ .access = SNDRV_CTL_ELEM_ACCESS_READWRITE | SNDRV_CTL_ELEM_ACCESS_TLV_READ, \ .name = xname, .index = xindex, \ - .info = snd_opl3sa2_info_single, \ + .info = snd_wss_info_single, \ .get = snd_opl3sa2_get_single, .put = snd_opl3sa2_put_single, \ .private_value = reg | (shift << 8) | (mask << 16) | (invert << 24), \ .tlv = { .p = (xtlv) } } -static int snd_opl3sa2_info_single(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo) -{ - int mask = (kcontrol->private_value >> 16) & 0xff; - - uinfo->type = mask == 1 ? SNDRV_CTL_ELEM_TYPE_BOOLEAN : SNDRV_CTL_ELEM_TYPE_INTEGER; - uinfo->count = 1; - uinfo->value.integer.min = 0; - uinfo->value.integer.max = mask; - return 0; -} - static int snd_opl3sa2_get_single(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol) { struct snd_opl3sa2 *chip = snd_kcontrol_chip(kcontrol); @@ -404,29 +393,18 @@ static int snd_opl3sa2_put_single(struct #define OPL3SA2_DOUBLE(xname, xindex, left_reg, right_reg, shift_left, shift_right, mask, invert) \ { .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, .index = xindex, \ - .info = snd_opl3sa2_info_double, \ + .info = snd_wss_info_double, \ .get = snd_opl3sa2_get_double, .put = snd_opl3sa2_put_double, \ .private_value = left_reg | (right_reg << 8) | (shift_left << 16) | (shift_right << 19) | (mask << 24) | (invert << 22) } #define OPL3SA2_DOUBLE_TLV(xname, xindex, left_reg, right_reg, shift_left, shift_right, mask, invert, xtlv) \ { .iface = SNDRV_CTL_ELEM_IFACE_MIXER, \ .access = SNDRV_CTL_ELEM_ACCESS_READWRITE | SNDRV_CTL_ELEM_ACCESS_TLV_READ, \ .name = xname, .index = xindex, \ - .info = snd_opl3sa2_info_double, \ + .info = snd_wss_info_double, \ .get = snd_opl3sa2_get_double, .put = snd_opl3sa2_put_double, \ .private_value = left_reg | (right_reg << 8) | (shift_left << 16) | (shift_right << 19) | (mask << 24) | (invert << 22), \ .tlv = { .p = (xtlv) } } -static int snd_opl3sa2_info_double(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo) -{ - int mask = (kcontrol->private_value >> 24) & 0xff; - - uinfo->type = mask == 1 ? SNDRV_CTL_ELEM_TYPE_BOOLEAN : SNDRV_CTL_ELEM_TYPE_INTEGER; - uinfo->count = 2; - uinfo->value.integer.min = 0; - uinfo->value.integer.max = mask; - return 0; -} - static int snd_opl3sa2_get_double(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol) { struct snd_opl3sa2 *chip = snd_kcontrol_chip(kcontrol); ---------------------------------------------------------------------- Igrzyska na Dzikim Zachodzie! Sprawdz >> http://link.interia.pl/f1edc

3 2

[alsa-devel] [PATCH] Try to make our poor little ALS4000 driver worthy of its copious public specs (first step)
by Andreas Mohr 20 Aug '08

20 Aug '08

[with not-quite-so-unintentional CCs added] Hi, there you have it: Linux developers are hypocrites ;) Never omitting any opportunity to complain about missing vendor cooperation, but what do they do once people actually do publish ample specs? - yeah, you got that right: NOTHING!! Let's try to change that, at least one bit at a time. ;) ChangeLog: - use specs-derived register name enums instead of open-coded numeric values, for better understanding of things - fix naming confusion ("gcr" was _NOT_ the GCR register stuff, but instead the io _base_ which has multiplexed _access_ to GCR config space, at _sub_ registers 0x08 and 0x0c) - add FIXME comments about a race condition and MPU401 features Oh, and I chose an abbreviated "ALS4K" prefix since I would have gotten finger cramps otherwise. Patch created on 2.6.27-rc1-git4 (no als4000.c changes up to -rc3, verified), pushed through checkpatch.pl, verified on my ALS4000 card. More work to follow... e.g. would be nice to get audio wakeup things to work, since this would probably be the first (if admittedly crappy) sound card/driver combo on Linux to support such features, thus a nice broadening of Linux capabilities. Thanks! Signed-off-by: Andreas Mohr <andi(a)lisas.de> --- sound/pci/als4000.c.org 2008-08-18 21:15:37.000000000 +0200 +++ sound/pci/als4000.c 2008-08-18 22:12:27.000000000 +0200 @@ -60,6 +60,7 @@ * * ToDo: * - Proper shared IRQ handling? + * - by default, don't enable legacy game and use PCI game I/O * - power management? (card can do voice wakeup according to datasheet!!) */ @@ -107,7 +108,7 @@ struct snd_card_als4000 { /* most frequent access first */ - unsigned long gcr; + unsigned long iobase; struct pci_dev *pci; struct snd_sb *chip; #ifdef SUPPORT_JOYSTICK @@ -122,24 +123,89 @@ MODULE_DEVICE_TABLE(pci, snd_als4000_ids); -static inline void snd_als4000_gcr_write_addr(unsigned long port, u32 reg, u32 val) +enum als4k_iobase_t { + /* IOx: B == Byte, W = Word, D = DWord */ + ALS4K_IOD_00_AC97_ACCESS = 0x00, + ALS4K_IOW_04_AC97_READ = 0x04, + ALS4K_IOB_06_AC97_STATUS = 0x06, + ALS4K_IOB_07_IRQSTATUS = 0x07, + ALS4K_IOD_08_GCR_DATA = 0x08, + ALS4K_IOB_0C_GCR_INDEX = 0x0c, + ALS4K_IOB_0E_SB_MPU_IRQ = 0x0e, + ALS4K_IOB_10_ADLIB_ADDR0 = 0x10, + ALS4K_IOB_11_ADLIB_ADDR1 = 0x11, + ALS4K_IOB_12_ADLIB_ADDR2 = 0x12, + ALS4K_IOB_13_ADLIB_ADDR3 = 0x13, + ALS4K_IOB_14_MIXER_INDEX = 0x14, + ALS4K_IOB_15_MIXER_DATA = 0x15, + ALS4K_IOB_16_ESP_RST_PORT = 0x16, + ALS4K_IOB_16_CR1E_ACK_PORT = 0x16, /* 2nd function */ + ALS4K_IOB_18_OPL_ADDR0 = 0x18, + ALS4K_IOB_19_OPL_ADDR1 = 0x19, + ALS4K_IOB_1A_ESP_RD_DATA = 0x1a, + ALS4K_IOB_1C_ESP_CMD_DATA = 0x1c, + ALS4K_IOB_1C_ESP_WR_STATUS = 0x1c, /* 2nd function */ + ALS4K_IOB_1E_ESP_RD_STATUS8 = 0x1e, + ALS4K_IOB_1F_ESP_RD_STATUS16 = 0x1f, + ALS4K_IOB_20_ESP_GAMEPORT_200 = 0x20, + ALS4K_IOB_21_ESP_GAMEPORT_201 = 0x21, + ALS4K_IOB_30_MIDI_DATA = 0x30, + ALS4K_IOB_31_MIDI_STATUS = 0x31, + ALS4K_IOB_31_MIDI_COMMAND = 0x31, /* 2nd function */ +}; + +enum als4k_gcr_t { + /* all registers 32bit wide */ + ALS4K_GCR_8C_MISC_CTRL = 0x8c, + ALS4K_GCR_90_TEST_MODE_REG = 0x90, + ALS4K_GCR_91_DMA0_ADDR = 0x91, + ALS4K_GCR_92_DMA0_MODE_COUNT = 0x92, + ALS4K_GCR_93_DMA1_ADDR = 0x93, + ALS4K_GCR_94_DMA1_MODE_COUNT = 0x94, + ALS4K_GCR_95_DMA3_ADDR = 0x95, + ALS4K_GCR_96_DMA3_MODE_COUNT = 0x96, + ALS4K_GCR_99_DMA_EMULATION_CTRL = 0x99, + ALS4K_GCR_A0_FIFO1_CURRENT_ADDR = 0xa0, + ALS4K_GCR_A1_FIFO1_STATUS_BYTECOUNT = 0xa1, + ALS4K_GCR_A2_FIFO2_PCIADDR = 0xa2, + ALS4K_GCR_A3_FIFO2_COUNT = 0xa3, + ALS4K_GCR_A4_FIFO2_CURRENT_ADDR = 0xa4, + ALS4K_GCR_A5_FIFO1_STATUS_BYTECOUNT = 0xa5, + ALS4K_GCR_A6_PM_CTRL = 0xa6, + ALS4K_GCR_A7_PCI_ACCESS_STORAGE = 0xa7, + ALS4K_GCR_A8_LEGACY_CFG1 = 0xa8, + ALS4K_GCR_A9_LEGACY_CFG2 = 0xa9, + ALS4K_GCR_FF_DUMMY_SCRATCH = 0xff, +}; + +enum als4k_gcr_8c_t { + ALS4K_GCR_8C_IRQ_MASK_CTRL_ENABLE = 0x8000, + ALS4K_GCR_8C_CHIP_REV_MASK = 0xf0000 +}; + +static inline void snd_als4000_gcr_write_addr(unsigned long iobase, + enum als4k_gcr_t reg, + u32 val) { - outb(reg, port+0x0c); - outl(val, port+0x08); + outb(reg, iobase + ALS4K_IOB_0C_GCR_INDEX); + outl(val, iobase + ALS4K_IOD_08_GCR_DATA); } -static inline void snd_als4000_gcr_write(struct snd_sb *sb, u32 reg, u32 val) +static inline void snd_als4000_gcr_write(struct snd_sb *sb, + enum als4k_gcr_t reg, + u32 val) { snd_als4000_gcr_write_addr(sb->alt_port, reg, val); } -static inline u32 snd_als4000_gcr_read_addr(unsigned long port, u32 reg) +static inline u32 snd_als4000_gcr_read_addr(unsigned long iobase, + enum als4k_gcr_t reg) { - outb(reg, port+0x0c); - return inl(port+0x08); + outb(reg, iobase + ALS4K_IOB_0C_GCR_INDEX); + return inl(iobase + ALS4K_IOD_08_GCR_DATA); } -static inline u32 snd_als4000_gcr_read(struct snd_sb *sb, u32 reg) +static inline u32 snd_als4000_gcr_read(struct snd_sb *sb, enum als4k_gcr_t reg) { return snd_als4000_gcr_read_addr(sb->alt_port, reg); } @@ -156,15 +222,17 @@ static inline void snd_als4000_set_capture_dma(struct snd_sb *chip, dma_addr_t addr, unsigned size) { - snd_als4000_gcr_write(chip, 0xa2, addr); - snd_als4000_gcr_write(chip, 0xa3, (size-1)); + snd_als4000_gcr_write(chip, ALS4K_GCR_A2_FIFO2_PCIADDR, addr); + snd_als4000_gcr_write(chip, ALS4K_GCR_A3_FIFO2_COUNT, (size-1)); } static inline void snd_als4000_set_playback_dma(struct snd_sb *chip, - dma_addr_t addr, unsigned size) + dma_addr_t addr, + unsigned size) { - snd_als4000_gcr_write(chip, 0x91, addr); - snd_als4000_gcr_write(chip, 0x92, (size-1)|0x180000); + snd_als4000_gcr_write(chip, ALS4K_GCR_91_DMA0_ADDR, addr); + snd_als4000_gcr_write(chip, ALS4K_GCR_92_DMA0_MODE_COUNT, + (size-1)|0x180000); } #define ALS4000_FORMAT_SIGNED (1<<0) @@ -305,6 +373,12 @@ struct snd_sb *chip = snd_pcm_substream_chip(substream); int result = 0; + /* FIXME race condition in here!!! + chip->mode non-atomic update gets consistently protected + by reg_lock always, _except_ for this place!! + Probably need to take reg_lock as outer (or inner??) lock, too. + (or serialize both lock operations? probably not, though... - racy?) + */ spin_lock(&chip->mixer_lock); switch (cmd) { case SNDRV_PCM_TRIGGER_START: @@ -356,7 +430,8 @@ unsigned int result; spin_lock(&chip->reg_lock); - result = snd_als4000_gcr_read(chip, 0xa4) & 0xffff; + result = snd_als4000_gcr_read(chip, ALS4K_GCR_A4_FIFO2_CURRENT_ADDR); + result &= 0xffff; spin_unlock(&chip->reg_lock); return bytes_to_frames( substream->runtime, result ); } @@ -367,7 +442,8 @@ unsigned result; spin_lock(&chip->reg_lock); - result = snd_als4000_gcr_read(chip, 0xa0) & 0xffff; + result = snd_als4000_gcr_read(chip, ALS4K_GCR_A0_FIFO1_CURRENT_ADDR); + result &= 0xffff; spin_unlock(&chip->reg_lock); return bytes_to_frames( substream->runtime, result ); } @@ -376,12 +452,13 @@ * return IRQ_HANDLED no matter whether we actually had an IRQ flag or not). * ALS4000a.PDF writes that while ACKing IRQ in PCI block will *not* ACK * the IRQ in the SB core, ACKing IRQ in SB block *will* ACK the PCI IRQ - * register (alt_port + 0x0e). Probably something could be optimized here to - * query/write one register only... + * register (alt_port + ALS4K_IOB_0E_SB_MPU_IRQ). Probably something + * could be optimized here to query/write one register only... * And even if both registers need to be queried, then there's still the * question of whether it's actually correct to ACK PCI IRQ before reading * SB IRQ like we do now, since ALS4000a.PDF mentions that PCI IRQ will *clear* * SB IRQ status. + * (hmm, page 38 mentions it the other way around!) * And do we *really* need the lock here for *reading* SB_DSP4_IRQSTATUS?? * */ static irqreturn_t snd_als4000_interrupt(int irq, void *dev_id) @@ -391,7 +468,7 @@ unsigned sb_status; /* find out which bit of the ALS4000 produced the interrupt */ - gcr_status = inb(chip->alt_port + 0xe); + gcr_status = inb(chip->alt_port + ALS4K_IOB_0E_SB_MPU_IRQ); if ((gcr_status & 0x80) && (chip->playback_substream)) /* playback */ snd_pcm_period_elapsed(chip->playback_substream); @@ -400,7 +477,7 @@ if ((gcr_status & 0x10) && (chip->rmidi)) /* MPU401 interrupt */ snd_mpu401_uart_interrupt(irq, chip->rmidi->private_data); /* release the gcr */ - outb(gcr_status, chip->alt_port + 0xe); + outb(gcr_status, chip->alt_port + ALS4K_IOB_0E_SB_MPU_IRQ); spin_lock(&chip->mixer_lock); sb_status = snd_sbmixer_read(chip, SB_DSP4_IRQSTATUS); @@ -543,25 +620,25 @@ /******************************************************************/ -static void snd_als4000_set_addr(unsigned long gcr, - unsigned int sb, - unsigned int mpu, - unsigned int opl, - unsigned int game) -{ - u32 confA = 0; - u32 confB = 0; - - if (mpu > 0) - confB |= (mpu | 1) << 16; - if (sb > 0) - confB |= (sb | 1); - if (game > 0) - confA |= (game | 1) << 16; - if (opl > 0) - confA |= (opl | 1); - snd_als4000_gcr_write_addr(gcr, 0xa8, confA); - snd_als4000_gcr_write_addr(gcr, 0xa9, confB); +static void snd_als4000_set_addr(unsigned long iobase, + unsigned int sb_io, + unsigned int mpu_io, + unsigned int opl_io, + unsigned int game_io) +{ + u32 cfg1 = 0; + u32 cfg2 = 0; + + if (mpu_io > 0) + cfg2 |= (mpu_io | 1) << 16; + if (sb_io > 0) + cfg2 |= (sb_io | 1); + if (game_io > 0) + cfg1 |= (game_io | 1) << 16; + if (opl_io > 0) + cfg1 |= (opl_io | 1); + snd_als4000_gcr_write_addr(iobase, ALS4K_GCR_A8_LEGACY_CFG1, cfg1); + snd_als4000_gcr_write_addr(iobase, ALS4K_GCR_A9_LEGACY_CFG2, cfg2); } static void snd_als4000_configure(struct snd_sb *chip) @@ -579,12 +656,15 @@ spin_unlock_irq(&chip->mixer_lock); spin_lock_irq(&chip->reg_lock); - /* magic number. Enables interrupts(?) */ - snd_als4000_gcr_write(chip, 0x8c, 0x28000); - for(i = 0x91; i <= 0x96; ++i) + /* enable interrupts */ + snd_als4000_gcr_write(chip, ALS4K_GCR_8C_MISC_CTRL, + ALS4K_GCR_8C_IRQ_MASK_CTRL_ENABLE); + + for (i = ALS4K_GCR_91_DMA0_ADDR; i <= ALS4K_GCR_96_DMA3_MODE_COUNT; ++i) snd_als4000_gcr_write(chip, i, 0); - snd_als4000_gcr_write(chip, 0x99, snd_als4000_gcr_read(chip, 0x99)); + snd_als4000_gcr_write(chip, ALS4K_GCR_99_DMA_EMULATION_CTRL, + snd_als4000_gcr_read(chip, ALS4K_GCR_99_DMA_EMULATION_CTRL)); spin_unlock_irq(&chip->reg_lock); } @@ -628,7 +708,7 @@ gameport_set_port_data(gp, r); /* Enable legacy joystick port */ - snd_als4000_set_addr(acard->gcr, 0, 0, 0, 1); + snd_als4000_set_addr(acard->iobase, 0, 0, 0, 1); gameport_register_port(acard->gameport); @@ -643,7 +723,9 @@ gameport_unregister_port(acard->gameport); acard->gameport = NULL; - snd_als4000_set_addr(acard->gcr, 0, 0, 0, 0); /* disable joystick */ + /* disable joystick */ + snd_als4000_set_addr(acard->iobase, 0, 0, 0, 0); + release_and_free_resource(r); } } @@ -654,10 +736,10 @@ static void snd_card_als4000_free( struct snd_card *card ) { - struct snd_card_als4000 * acard = (struct snd_card_als4000 *)card->private_data; + struct snd_card_als4000 *acard = card->private_data; /* make sure that interrupts are disabled */ - snd_als4000_gcr_write_addr( acard->gcr, 0x8c, 0); + snd_als4000_gcr_write_addr(acard->iobase, ALS4K_GCR_8C_MISC_CTRL, 0); /* free resources */ snd_als4000_free_gameport(acard); pci_release_regions(acard->pci); @@ -670,7 +752,7 @@ static int dev; struct snd_card *card; struct snd_card_als4000 *acard; - unsigned long gcr; + unsigned long iobase; struct snd_sb *chip; struct snd_opl3 *opl3; unsigned short word; @@ -699,7 +781,7 @@ pci_disable_device(pci); return err; } - gcr = pci_resource_start(pci, 0); + iobase = pci_resource_start(pci, 0); pci_read_config_word(pci, PCI_COMMAND, &word); pci_write_config_word(pci, PCI_COMMAND, word | PCI_COMMAND_IO); @@ -713,16 +795,16 @@ return -ENOMEM; } - acard = (struct snd_card_als4000 *)card->private_data; + acard = card->private_data; acard->pci = pci; - acard->gcr = gcr; + acard->iobase = iobase; card->private_free = snd_card_als4000_free; /* disable all legacy ISA stuff */ - snd_als4000_set_addr(acard->gcr, 0, 0, 0, 0); + snd_als4000_set_addr(acard->iobase, 0, 0, 0, 0); if ((err = snd_sbdsp_create(card, - gcr + 0x10, + iobase + ALS4K_IOB_10_ADLIB_ADDR0, pci->irq, snd_als4000_interrupt, -1, @@ -734,7 +816,7 @@ acard->chip = chip; chip->pci = pci; - chip->alt_port = gcr; + chip->alt_port = iobase; snd_card_set_dev(card, &pci->dev); snd_als4000_configure(chip); @@ -745,11 +827,16 @@ card->shortname, chip->alt_port, chip->irq); if ((err = snd_mpu401_uart_new( card, 0, MPU401_HW_ALS4000, - gcr+0x30, MPU401_INFO_INTEGRATED, + iobase + ALS4K_IOB_30_MIDI_DATA, + MPU401_INFO_INTEGRATED, pci->irq, 0, &chip->rmidi)) < 0) { - printk(KERN_ERR "als4000: no MPU-401 device at 0x%lx?\n", gcr+0x30); + printk(KERN_ERR "als4000: no MPU-401 device at 0x%lx?\n", + iobase + ALS4K_IOB_30_MIDI_DATA); goto out_err; } + /* FIXME: ALS4000 has interesting MPU401 configuration features + * at CR 0x1A (pass-thru / UART switching, fast MIDI clock, etc.), + * however there doesn't seem to be an ALSA API for this... */ if ((err = snd_als4000_pcm(chip, 0)) < 0) { goto out_err; @@ -758,10 +845,13 @@ goto out_err; } - if (snd_opl3_create(card, gcr+0x10, gcr+0x12, + if (snd_opl3_create(card, + iobase + ALS4K_IOB_10_ADLIB_ADDR0, + iobase + ALS4K_IOB_12_ADLIB_ADDR2, OPL3_HW_AUTO, 1, &opl3) < 0) { printk(KERN_ERR "als4000: no OPL device at 0x%lx-0x%lx?\n", - gcr+0x10, gcr+0x12 ); + iobase + ALS4K_IOB_10_ADLIB_ADDR0, + iobase + ALS4K_IOB_12_ADLIB_ADDR2); } else { if ((err = snd_opl3_hwdep_new(opl3, 0, 1, NULL)) < 0) { goto out_err; @@ -831,13 +921,13 @@ #ifdef SUPPORT_JOYSTICK if (acard->gameport) - snd_als4000_set_addr(acard->gcr, 0, 0, 0, 1); + snd_als4000_set_addr(acard->iobase, 0, 0, 0, 1); #endif snd_power_change_state(card, SNDRV_CTL_POWER_D0); return 0; } -#endif +#endif /* CONFIG_PM */ static struct pci_driver driver = {

4 4

[alsa-devel] pcm write from posix threads
by Brian Rhodes 20 Aug '08

20 Aug '08

When calling snd_pcm_write* from a thread how do you safely cancel the thread? I've tried masking the signals which are used in alsa lib, yet I am getting a segfault on pthread_exit(). My thread is looping doing the following. testcancel snd_pcm_wait snd_pcm_avail snd_pcm_writei I am checking return values to handle those functions being woken up by pthread cancel and attempting to exit. In testing the process it performs fine until I start actually writing data. Once I write some data, a pthread_exit will segfault. My cancellation routine is calling snd_pcm_drop, then doing a cancel followed by join.

2 2