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

[alsa-devel] 1.0.16 final time plan & mainstream sync
by Jaroslav Kysela 30 Jan '08

30 Jan '08

Hi all, I would like to release 1.0.16 final on Tuesday next week. Please, push only short fixes or compilation fixes to HG now. No big changes, please. Also, GIT update is prepared for next 2.6.25 mainstream sync (#linus branch). I will send a sync request to Linus probably tomorrow. Jaroslav ----- Jaroslav Kysela <perex(a)perex.cz> Linux Kernel Sound Maintainer ALSA Project, Red Hat, Inc.

2 1

[alsa-devel] [PATCH] asihpi version 3.09.09
by Eliot Blennerhassett 30 Jan '08

30 Jan '08

Howdy Takashi, Code: http://audioscience.com/internet/download/beta/alsa_driver3507_asihpi30909.… Firmware: http://audioscience.com/internet/download/beta/dspbins30909.tar.bz2 here is an update to the asihpi driver, please apply to alsa Hg if you see fit. (BTW the previous version was only meant to be commented on, not committed!) Main changes in this set: * Redo comment formatting so block comments are properly indented with code (bulk of changes) hpifunc.c: * Remove HPI_UNUSED macro from hpifunc * Remove error->string translation, hence strcpy hpios_linux_kernel.* * Remove use of slab cache for DMA memory allocation tracking hpicmn.*: * Rename some functions to give Hpi prefix, made others static hpimod.c * Replace semaphore with mutex * Make driver cleanup more 'normal' hpi6205.c hpi6000.c hpimsgx.c * Pull some error handling up into hpimsgx.c Relevant DSP code changes (for alsa-firmware) add record format check for supported format. ASI6500/6500 - fix issue arising from back-to-back- adapter sample rate changes. ASI6000 - fix rare MP3 decode bug. ASI6585 - add support for clock source Livewire. ASI6416 - re-order control creation. Signed-off-by: Eliot Blennerhassett <eblennerhassett(a)audioscience.com> regards -- Eliot Blennerhassett www.audioscience.com

1 0

[alsa-devel] HDA-Intel - Add support for Intel SCH
by Tobin Davis 30 Jan '08

30 Jan '08

This patch adds support for Intel's SCH mobile chipset. Signed off by Tobin Davis <tdavis(a)dsl-only.net>

2 1

[alsa-devel] ASOC v2 driver structure
by Jon Smirl 29 Jan '08

29 Jan '08

I'm trying to write an asoc v2 driver for my powerpc based SOC (mpc5200) hardware. We have two audio devices on the board, a WM8580 and a TAS5504. How do you do this with asoc v2? The card is created in snd_soc_machine_create(); there seems to be an assumption of a single card per machine. Or are you supposed to mix the different devices into a single pcm driver? What would happen in pxa2xx-pcm.c if more than one of these were defined? static int pxa2xx_pcm_probe(struct device *dev) { struct snd_soc_platform *platform = to_snd_soc_platform(dev); int ret; platform->pcm_ops = &pxa2xx_pcm_ops; platform->pcm_new = pxa2xx_pcm_new, platform->pcm_free = pxa2xx_pcm_free_dma_buffers, #if defined(CONFIG_SND_PXA2XX_SOC_I2S) ret = snd_soc_platform_add_dai(platform, &pxa2xx_i2s, 1); if (ret < 0) return ret; #endif #if defined(CONFIG_SND_PXA2XX_SOC_AC97) ret = snd_soc_platform_add_dai(platform, pxa2xx_ac97, 3); if (ret < 0) return ret; #endif #if defined(CONFIG_SND_PXA2XX_SOC_SSP) ret = snd_soc_platform_add_dai(platform, pxa2xx_ssp, 3); if (ret < 0) return ret; #endif ret = snd_soc_register_platform(platform); return ret; } -- Jon Smirl jonsmirl(a)gmail.com

4 6

[alsa-devel] [PATCH] hda: Add GPIO mute support to STAC9205
by Matthew Ranostay 29 Jan '08

29 Jan '08

Support added for detecting HP jack presence via GPIO on several laptop docks. Signed-off-by: Matthew Ranostay <mranostay(a)embeddedalley.com> --- diff -r b0d97ac73e0f pci/hda/patch_sigmatel.c --- a/pci/hda/patch_sigmatel.c Fri Jan 25 15:24:50 2008 +0100 +++ b/pci/hda/patch_sigmatel.c Mon Jan 28 09:34:16 2008 -0500 @@ -122,7 +122,9 @@ struct sigmatel_spec { unsigned int alt_switch: 1; unsigned int hp_detect: 1; - unsigned int gpio_mask, gpio_data; + unsigned int gpio_en_mask, gpio_dir_mask; + unsigned int gpio_data; + unsigned int gpio_mute; unsigned char aloopback_mask; unsigned char aloopback_shift; @@ -2801,22 +2803,22 @@ static int stac9200_parse_auto_config(st * funky external mute control using GPIO pins. */ -static void stac_gpio_set(struct hda_codec *codec, unsigned int mask, - unsigned int data) +static void stac_gpio_set(struct hda_codec *codec, unsigned int en_mask, + unsigned int dir_mask, unsigned int data) { unsigned int gpiostate, gpiomask, gpiodir; gpiostate = snd_hda_codec_read(codec, codec->afg, 0, AC_VERB_GET_GPIO_DATA, 0); - gpiostate = (gpiostate & ~mask) | (data & mask); + gpiostate = (gpiostate & ~dir_mask) | (data & dir_mask); gpiomask = snd_hda_codec_read(codec, codec->afg, 0, AC_VERB_GET_GPIO_MASK, 0); - gpiomask |= mask; + gpiomask |= en_mask; gpiodir = snd_hda_codec_read(codec, codec->afg, 0, AC_VERB_GET_GPIO_DIRECTION, 0); - gpiodir |= mask; + gpiodir |= dir_mask; /* Configure GPIOx as CMOS */ snd_hda_codec_write(codec, codec->afg, 0, 0x7e7, 0); @@ -2911,7 +2913,8 @@ static int stac92xx_init(struct hda_code stac92xx_auto_set_pinctl(codec, cfg->dig_in_pin, AC_PINCTL_IN_EN); - stac_gpio_set(codec, spec->gpio_mask, spec->gpio_data); + stac_gpio_set(codec, spec->gpio_en_mask, + spec->gpio_dir_mask, spec->gpio_data); return 0; } @@ -3001,10 +3004,14 @@ static void stac92xx_hp_detect(struct hd int i, presence; presence = 0; + if (spec->gpio_mute) + presence = !(snd_hda_codec_read(codec, codec->afg, 0, + AC_VERB_GET_GPIO_DATA, 0) & spec->gpio_mute); + for (i = 0; i < cfg->hp_outs; i++) { - presence = get_hp_pin_presence(codec, cfg->hp_pins[i]); if (presence) break; + presence = get_hp_pin_presence(codec, cfg->hp_pins[i]); } if (presence) { @@ -3067,7 +3074,8 @@ static int stac92xx_resume(struct hda_co stac92xx_set_config_regs(codec); snd_hda_sequence_write(codec, spec->init); - stac_gpio_set(codec, spec->gpio_mask, spec->gpio_data); + stac_gpio_set(codec, spec->gpio_en_mask, + spec->gpio_dir_mask, spec->gpio_data); snd_hda_codec_resume_amp(codec); snd_hda_codec_resume_cache(codec); /* invoke unsolicited event to reset the HP state */ @@ -3301,7 +3309,8 @@ again: spec->num_dmuxes = ARRAY_SIZE(stac92hd73xx_dmux_nids); spec->dinput_mux = &stac92hd73xx_dmux; /* GPIO0 High = Enable EAPD */ - spec->gpio_mask = spec->gpio_data = 0x000001; + spec->gpio_en_mask = spec->gpio_dir_mask = 0x1; + spec->gpio_data = 0x01; spec->num_pwrs = ARRAY_SIZE(stac92hd73xx_pwr_nids); spec->pwr_nids = stac92hd73xx_pwr_nids; @@ -3375,7 +3384,8 @@ again: spec->aloopback_mask = 0x20; spec->aloopback_shift = 0; - spec->gpio_mask = spec->gpio_data = 0x00000001; /* GPIO0 High = EAPD */ + /* GPIO0 High = EAPD */ + spec->gpio_en_mask = spec->gpio_dir_mask = spec->gpio_data = 0x1; spec->mux_nids = stac92hd71bxx_mux_nids; spec->adc_nids = stac92hd71bxx_adc_nids; @@ -3431,7 +3441,8 @@ static int patch_stac922x(struct hda_cod stac922x_models, stac922x_cfg_tbl); if (spec->board_config == STAC_INTEL_MAC_V3) { - spec->gpio_mask = spec->gpio_data = 0x03; + spec->gpio_en_mask = spec->gpio_dir_mask = 0x03; + spec->gpio_data = 0x03; /* Intel Macs have all same PCI SSID, so we need to check * codec SSID to distinguish the exact models */ @@ -3559,7 +3570,8 @@ static int patch_stac927x(struct hda_cod case STAC_D965_3ST: case STAC_D965_5ST: /* GPIO0 High = Enable EAPD */ - spec->gpio_mask = spec->gpio_data = 0x00000001; + spec->gpio_en_mask = spec->gpio_dir_mask = 0x01; + spec->gpio_data = 0x01; spec->num_dmics = 0; spec->init = d965_core_init; @@ -3573,7 +3585,8 @@ static int patch_stac927x(struct hda_cod /* fallthru */ case STAC_DELL_3ST: /* GPIO2 High = Enable EAPD */ - spec->gpio_mask = spec->gpio_data = 0x00000004; + spec->gpio_en_mask = spec->gpio_dir_mask = 0x04; + spec->gpio_data = 0x04; spec->dmic_nids = stac927x_dmic_nids; spec->num_dmics = STAC927X_NUM_DMICS; @@ -3584,7 +3597,8 @@ static int patch_stac927x(struct hda_cod break; default: /* GPIO0 High = Enable EAPD */ - spec->gpio_mask = spec->gpio_data = 0x00000001; + spec->gpio_en_mask = spec->gpio_dir_mask = 0x1; + spec->gpio_data = 0x01; spec->num_dmics = 0; spec->init = stac927x_core_init; @@ -3679,15 +3693,25 @@ static int patch_stac9205(struct hda_cod stac92xx_set_config_reg(codec, 0x1f, 0x01441030); stac92xx_set_config_reg(codec, 0x20, 0x1c410030); - spec->gpio_mask = 0x0000000b; + /* Enable unsol response for GPIO4/Dock HP connection */ + snd_hda_codec_write(codec, codec->afg, 0, + AC_VERB_SET_GPIO_UNSOLICITED_RSP_MASK, 0x10); + snd_hda_codec_write_cache(codec, codec->afg, 0, + AC_VERB_SET_UNSOLICITED_ENABLE, + (AC_USRSP_EN | STAC_HP_EVENT)); + + spec->gpio_dir_mask = 0x0b; + spec->gpio_en_mask = 0x1b; + spec->gpio_mute = 0x10; /* GPIO0 High = EAPD, GPIO1 Low = Headphone Mute, - * GPIO3 High = DRM + * GPIO3 Low = DRM */ - spec->gpio_data = 0x00000009; + spec->gpio_data = 0x01; break; default: /* GPIO0 High = EAPD */ - spec->gpio_mask = spec->gpio_data = 0x00000001; + spec->gpio_en_mask = spec->gpio_dir_mask = 0x1; + spec->gpio_data = 0x01; break; }

2 3

[alsa-devel] [PATCH 2.6.24] hda_intel: ALSA HD Audio patch for Intel ICH10 DeviceID's
by Jason Gaston 29 Jan '08

29 Jan '08

This patch adds the Intel ICH10 HD Audio Controller DeviceID's. Signed-off-by: Jason Gaston <jason.d.gaston(a)intel.com> --- linux-2.6.24/sound/pci/hda/hda_intel.c.orig 2008-01-24 14:58:37.000000000 -0800 +++ linux-2.6.24/sound/pci/hda/hda_intel.c 2008-01-28 14:58:22.000000000 -0800 @@ -98,6 +98,7 @@ "{Intel, ESB2}," "{Intel, ICH8}," "{Intel, ICH9}," + "{Intel, ICH10}," "{ATI, SB450}," "{ATI, SB600}," "{ATI, RS600}," @@ -1936,6 +1937,8 @@ { 0x8086, 0x284b, PCI_ANY_ID, PCI_ANY_ID, 0, 0, AZX_DRIVER_ICH }, /* ICH8 */ { 0x8086, 0x293e, PCI_ANY_ID, PCI_ANY_ID, 0, 0, AZX_DRIVER_ICH }, /* ICH9 */ { 0x8086, 0x293f, PCI_ANY_ID, PCI_ANY_ID, 0, 0, AZX_DRIVER_ICH }, /* ICH9 */ + { 0x8086, 0x3a3e, PCI_ANY_ID, PCI_ANY_ID, 0, 0, AZX_DRIVER_ICH }, /* ICH10 */ + { 0x8086, 0x3a6e, PCI_ANY_ID, PCI_ANY_ID, 0, 0, AZX_DRIVER_ICH }, /* ICH10 */ { 0x1002, 0x437b, PCI_ANY_ID, PCI_ANY_ID, 0, 0, AZX_DRIVER_ATI }, /* ATI SB450 */ { 0x1002, 0x4383, PCI_ANY_ID, PCI_ANY_ID, 0, 0, AZX_DRIVER_ATI }, /* ATI SB600 */ { 0x1002, 0x793b, PCI_ANY_ID, PCI_ANY_ID, 0, 0, AZX_DRIVER_ATIHDMI }, /* ATI RS600 HDMI */

2 1

Re: [alsa-devel] [REPOST] opti93x: conversion to use cs4231 library
by krzysztof.h1＠poczta.fm 29 Jan '08

29 Jan '08

Takashi Iwai napisał(a): > At Sat, 26 Jan 2008 10:44:11 +0100, > Krzysztof Helt wrote: > > > > From: Krzysztof Helt >krzysztof.h1(a)wp.pl> > > > > This patch converts the Opti93x driver to use > > the cs4231 library instead of just duplicating the code. > > > > Signed-off-by: Krzysztof Helt >krzysztof.h1(a)wp.pl> > > This causes a compile error for snd-opti92x-cs4231. Also has some > coding style issues. > I am sorry for compilation error. I was sure I have tested compilation of all opti versions but obviously not. > The fixed patch is below. Please let me know this and previous > patches work so that I can push them to the upstream. > I don't have previous patches but I have few patches which depends on these two I posted (e.g. 3d control for opti 933, more coding style fixes). I will post them after these two are merged to have stable reference for diffs. Regards, Krzysztof ---------------------------------------------------------------------- Sprawdz, ktore komorki sa najmodniejsze! Kliknij >>> http://link.interia.pl/f1cd4

1 0

[alsa-devel] Migrating old application using ALSA v0.5.0 to use current ALSA v1.0.15
by Shaun Shirey 28 Jan '08

28 Jan '08

Good Afternoon, I am currently working on migrating an old application using an older version of ALSA v0.5.0 to a newer version v1.0.15. I have noticed that many functions have been removed entirely and the library itself has been completely re-structured. The problem is that I can't seem to find any documentation on the older library (the program also has little to no comments). I was wondering if anyone has any links to documentation or advice on porting ? Any help would be greatly appreciated.

1 0

[alsa-devel] Archive alsa versions
by Alan Horstmann 28 Jan '08

28 Jan '08

Are historic versions of ALSA available anywhere? I have been unable to locate any. It might be useful for me tracking down a bug to see the source code for alsa-driver-1.0.1 !! Alan

4 4

[alsa-devel] [REPOST] cs4231-lib: add support for Opti93x codec
by Krzysztof Helt 28 Jan '08

28 Jan '08

From: Krzysztof Helt <krzysztof.h1(a)wp.pl> This patch adds support for WSS compatible Opti93x codec to the cs4231-lib. Signed-off-by: Krzysztof Helt <krzysztof.h1(a)wp.pl> --- This is the patch against the current alsa hg tree (which is the same as 2.6.24-rc8-mm1 kernel regarding files affected by the patch). It should apply to older kernels (2.6.24 final or -rcX) but not cleanly (shift by one line). diff -urp linux-mm-ref/include/sound/cs4231-regs.h linux-mm/include/sound/cs4231-regs.h --- linux-mm-ref/include/sound/cs4231-regs.h 2008-01-26 08:18:04.000000000 +0100 +++ linux-mm/include/sound/cs4231-regs.h 2008-01-26 08:45:44.312453695 +0100 @@ -177,4 +177,12 @@ #define CS4236_RIGHT_WAVE 0x1c /* right wavetable serial port volume */ #define CS4236_VERSION 0x9c /* chip version and ID */ +/* definitions for extended registers - OPTI93X */ +#define OPTi931_AUX_LEFT_INPUT 0x10 +#define OPTi931_AUX_RIGHT_INPUT 0x11 +#define OPTi93X_MIC_LEFT_INPUT 0x14 +#define OPTi93X_MIC_RIGHT_INPUT 0x15 +#define OPTi93X_OUT_LEFT 0x16 +#define OPTi93X_OUT_RIGHT 0x17 + #endif /* __SOUND_CS4231_REGS_H */ diff -urp linux-mm-ref/include/sound/cs4231.h linux-mm/include/sound/cs4231.h --- linux-mm-ref/include/sound/cs4231.h 2008-01-26 08:18:04.000000000 +0100 +++ linux-mm/include/sound/cs4231.h 2008-01-26 08:49:44.157843596 +0100 @@ -58,6 +58,7 @@ /* compatible, but clones */ #define CS4231_HW_INTERWAVE 0x1000 /* InterWave chip */ #define CS4231_HW_OPL3SA2 0x1101 /* OPL3-SA2 chip, similar to cs4231 */ +#define CS4231_HW_OPTI93X 0x1102 /* Opti 930/931/933 */ /* defines for codec.hwshare */ #define CS4231_HWSHARE_IRQ (1<<0) @@ -120,6 +121,8 @@ unsigned char snd_cs4236_ext_in(struct s void snd_cs4231_mce_up(struct snd_cs4231 *chip); void snd_cs4231_mce_down(struct snd_cs4231 *chip); +void snd_cs4231_overrange(struct snd_cs4231 *chip); + irqreturn_t snd_cs4231_interrupt(int irq, void *dev_id); const char *snd_cs4231_chip_id(struct snd_cs4231 *chip); diff -urp linux-mm-ref/sound/isa/cs423x/cs4231_lib.c linux-mm/sound/isa/cs423x/cs4231_lib.c --- linux-mm-ref/sound/isa/cs423x/cs4231_lib.c 2008-01-26 08:18:04.000000000 +0100 +++ linux-mm/sound/isa/cs423x/cs4231_lib.c 2008-01-26 08:45:44.324456487 +0100 @@ -119,6 +119,42 @@ static unsigned char snd_cs4231_original 0x00, /* 1f/31 - cbrl */ }; +static unsigned char snd_opti93x_original_image[32] = +{ + 0x00, /* 00/00 - l_mixout_outctrl */ + 0x00, /* 01/01 - r_mixout_outctrl */ + 0x88, /* 02/02 - l_cd_inctrl */ + 0x88, /* 03/03 - r_cd_inctrl */ + 0x88, /* 04/04 - l_a1/fm_inctrl */ + 0x88, /* 05/05 - r_a1/fm_inctrl */ + 0x80, /* 06/06 - l_dac_inctrl */ + 0x80, /* 07/07 - r_dac_inctrl */ + 0x00, /* 08/08 - ply_dataform_reg */ + 0x00, /* 09/09 - if_conf */ + 0x00, /* 0a/10 - pin_ctrl */ + 0x00, /* 0b/11 - err_init_reg */ + 0x0a, /* 0c/12 - id_reg */ + 0x00, /* 0d/13 - reserved */ + 0x00, /* 0e/14 - ply_upcount_reg */ + 0x00, /* 0f/15 - ply_lowcount_reg */ + 0x88, /* 10/16 - reserved/l_a1_inctrl */ + 0x88, /* 11/17 - reserved/r_a1_inctrl */ + 0x88, /* 12/18 - l_line_inctrl */ + 0x88, /* 13/19 - r_line_inctrl */ + 0x88, /* 14/20 - l_mic_inctrl */ + 0x88, /* 15/21 - r_mic_inctrl */ + 0x80, /* 16/22 - l_out_outctrl */ + 0x80, /* 17/23 - r_out_outctrl */ + 0x00, /* 18/24 - reserved */ + 0x00, /* 19/25 - reserved */ + 0x00, /* 1a/26 - reserved */ + 0x00, /* 1b/27 - reserved */ + 0x00, /* 1c/28 - cap_dataform_reg */ + 0x00, /* 1d/29 - reserved */ + 0x00, /* 1e/30 - cap_upcount_reg */ + 0x00 /* 1f/31 - cap_lowcount_reg */ +}; + /* * Basic I/O functions */ @@ -895,7 +931,7 @@ static int snd_cs4231_capture_prepare(st return 0; } -static void snd_cs4231_overrange(struct snd_cs4231 *chip) +void snd_cs4231_overrange(struct snd_cs4231 *chip) { unsigned long flags; unsigned char res; @@ -1054,8 +1090,11 @@ static int snd_cs4231_probe(struct snd_c chip->image[CS4231_IFACE_CTRL] = (chip->image[CS4231_IFACE_CTRL] & ~CS4231_SINGLE_DMA) | (chip->single_dma ? CS4231_SINGLE_DMA : 0); - chip->image[CS4231_ALT_FEATURE_1] = 0x80; - chip->image[CS4231_ALT_FEATURE_2] = chip->hardware == CS4231_HW_INTERWAVE ? 0xc2 : 0x01; + if (chip->hardware != CS4231_HW_OPTI93X) { + chip->image[CS4231_ALT_FEATURE_1] = 0x80; + chip->image[CS4231_ALT_FEATURE_2] = + chip->hardware == CS4231_HW_INTERWAVE ? 0xc2 : 0x01; + } ptr = (unsigned char *) &chip->image; snd_cs4231_mce_down(chip); spin_lock_irqsave(&chip->reg_lock, flags); @@ -1376,6 +1415,7 @@ const char *snd_cs4231_chip_id(struct sn case CS4231_HW_INTERWAVE: return "AMD InterWave"; case CS4231_HW_OPL3SA2: return chip->card->shortname; case CS4231_HW_AD1845: return "AD1845"; + case CS4231_HW_OPTI93X: return "OPTi 93x"; default: return "???"; } } @@ -1401,7 +1441,12 @@ static int snd_cs4231_new(struct snd_car chip->rate_constraint = snd_cs4231_xrate; chip->set_playback_format = snd_cs4231_playback_format; chip->set_capture_format = snd_cs4231_capture_format; - memcpy(&chip->image, &snd_cs4231_original_image, sizeof(snd_cs4231_original_image)); + if (chip->hardware == CS4231_HW_OPTI93X) + memcpy(&chip->image, &snd_opti93x_original_image, + sizeof(snd_opti93x_original_image)); + else + memcpy(&chip->image, &snd_cs4231_original_image, + sizeof(snd_cs4231_original_image)); *rchip = chip; return 0; @@ -1790,6 +1835,32 @@ CS4231_SINGLE("Loopback Capture Switch", CS4231_SINGLE("Loopback Capture Volume", 0, CS4231_LOOPBACK, 2, 63, 1) }; +static struct snd_kcontrol_new snd_opti93x_controls[] __devinitdata = { +CS4231_DOUBLE("Master Playback Switch", 0, OPTi93X_OUT_LEFT, OPTi93X_OUT_RIGHT, 7, 7, 1, 1), +CS4231_DOUBLE("Master Playback Volume", 0, OPTi93X_OUT_LEFT, OPTi93X_OUT_RIGHT, 1, 1, 31, 1), +CS4231_DOUBLE("PCM Playback Switch", 0, CS4231_LEFT_OUTPUT, CS4231_RIGHT_OUTPUT, 7, 7, 1, 1), +CS4231_DOUBLE("PCM Playback Volume", 0, CS4231_LEFT_OUTPUT, CS4231_RIGHT_OUTPUT, 0, 0, 31, 1), +CS4231_DOUBLE("FM Playback Switch", 0, CS4231_AUX2_LEFT_INPUT, CS4231_AUX2_RIGHT_INPUT, 7, 7, 1, 1), +CS4231_DOUBLE("FM Playback Volume", 0, CS4231_AUX2_LEFT_INPUT, CS4231_AUX2_RIGHT_INPUT, 1, 1, 15, 1), +CS4231_DOUBLE("Line Playback Switch", 0, CS4231_LEFT_LINE_IN, CS4231_RIGHT_LINE_IN, 7, 7, 1, 1), +CS4231_DOUBLE("Line Playback Volume", 0, CS4231_LEFT_LINE_IN, CS4231_RIGHT_LINE_IN, 0, 0, 15, 1), +CS4231_DOUBLE("Mic Playback Switch", 0, OPTi93X_MIC_LEFT_INPUT, OPTi93X_MIC_RIGHT_INPUT, 7, 7, 1, 1), +CS4231_DOUBLE("Mic Playback Volume", 0, OPTi93X_MIC_LEFT_INPUT, OPTi93X_MIC_RIGHT_INPUT, 1, 1, 15, 1), +CS4231_DOUBLE("Mic Boost", 0, CS4231_LEFT_INPUT, CS4231_RIGHT_INPUT, 5, 5, 1, 0), +CS4231_DOUBLE("CD Playback Switch", 0, CS4231_AUX1_LEFT_INPUT, CS4231_AUX1_RIGHT_INPUT, 7, 7, 1, 1), +CS4231_DOUBLE("CD Playback Volume", 0, CS4231_AUX1_LEFT_INPUT, CS4231_AUX1_RIGHT_INPUT, 1, 1, 15, 1), +CS4231_DOUBLE("Aux Playback Switch", 0, OPTi931_AUX_LEFT_INPUT, OPTi931_AUX_RIGHT_INPUT, 7, 7, 1, 1), +CS4231_DOUBLE("Aux Playback Volume", 0, OPTi931_AUX_LEFT_INPUT, OPTi931_AUX_RIGHT_INPUT, 1, 1, 15, 1), +CS4231_DOUBLE("Capture Volume", 0, CS4231_LEFT_INPUT, CS4231_RIGHT_INPUT, 0, 0, 15, 0), +{ + .iface = SNDRV_CTL_ELEM_IFACE_MIXER, + .name = "Capture Source", + .info = snd_cs4231_info_mux, + .get = snd_cs4231_get_mux, + .put = snd_cs4231_put_mux, +} +}; + int snd_cs4231_mixer(struct snd_cs4231 *chip) { struct snd_card *card; @@ -1802,10 +1873,22 @@ int snd_cs4231_mixer(struct snd_cs4231 * strcpy(card->mixername, chip->pcm->name); - for (idx = 0; idx < ARRAY_SIZE(snd_cs4231_controls); idx++) { - if ((err = snd_ctl_add(card, snd_ctl_new1(&snd_cs4231_controls[idx], chip))) < 0) - return err; - } + if (chip->hardware == CS4231_HW_OPTI93X) + for (idx = 0; idx < ARRAY_SIZE(snd_opti93x_controls); idx++) { + err = snd_ctl_add(card, + snd_ctl_new1(&snd_opti93x_controls[idx], + chip)); + if (err < 0) + return err; + } + else + for (idx = 0; idx < ARRAY_SIZE(snd_cs4231_controls); idx++) { + err = snd_ctl_add(card, + snd_ctl_new1(&snd_cs4231_controls[idx], + chip)); + if (err < 0) + return err; + } return 0; } @@ -1815,6 +1898,7 @@ EXPORT_SYMBOL(snd_cs4236_ext_out); EXPORT_SYMBOL(snd_cs4236_ext_in); EXPORT_SYMBOL(snd_cs4231_mce_up); EXPORT_SYMBOL(snd_cs4231_mce_down); +EXPORT_SYMBOL(snd_cs4231_overrange); EXPORT_SYMBOL(snd_cs4231_interrupt); EXPORT_SYMBOL(snd_cs4231_chip_id); EXPORT_SYMBOL(snd_cs4231_create); ---------------------------------------------------------------------- Lezac w wannie skorzystala z ... Kliknij >>> http://link.interia.pl/f1ce9

2 1