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

[alsa-devel] ASoC updates for 2.6.30
by Mark Brown 02 Feb '09

02 Feb '09

The following changes since commit 7393958f630ac91e591e62058f2bdb61523ec60c: Peter Ujfalusi (1): ASoC: TWL4030: Add analog loopback support are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound-2.6.git for-2.6.30 Eero Nurkkala (1): OMAP: ASoC: Fix spinlock misuse in omap-pcm.c Grazvydas Ignotas (1): ASoC: Update OMAP3 pandora board file Mark Brown (1): Merge branch 'for-2.6.29' into for-2.6.30 Timur Tabi (2): ASoC: fix initialization order of the CS4270 codec driver ASoC: fix documentation in CS4270 codec driver sound/soc/codecs/cs4270.c | 332 ++++++++++++++++++++++++----------------- sound/soc/omap/omap-pcm.c | 5 +- sound/soc/omap/omap3pandora.c | 49 ++++--- 3 files changed, 230 insertions(+), 156 deletions(-)

2 1

[alsa-devel] ASoC update for 2.6.29
by Mark Brown 02 Feb '09

02 Feb '09

The following changes since commit ef390c0b6e3f4d2d2d43f53f4bd35e1884571a14: Misael Lopez Cruz (1): ASoC: OMAP: Initialize XCCR and RCCR registers in McBSP DAI driver are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound-2.6.git for-2.6.29 Eero Nurkkala (1): OMAP: ASoC: Fix spinlock misuse in omap-pcm.c sound/soc/omap/omap-pcm.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-)

2 1

[alsa-devel] [PATCH] msnd: add module description and license for the snd-msnd-lib
by Krzysztof Helt 02 Feb '09

02 Feb '09

From: Krzysztof Helt <krzysztof.h1(a)wp.pl> The missing module license generates warning during module loading. Signed-off-by: Krzysztof Helt <krzysztof.h1(a)wp.pl> --- sound/isa/msnd/msnd.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/sound/isa/msnd/msnd.c b/sound/isa/msnd/msnd.c index 264e082..9064544 100644 --- a/sound/isa/msnd/msnd.c +++ b/sound/isa/msnd/msnd.c @@ -700,3 +700,6 @@ int snd_msnd_pcm(struct snd_card *card, int device, } EXPORT_SYMBOL(snd_msnd_pcm); +MODULE_DESCRIPTION("Common routines for Turtle Beach Multisound drivers"); +MODULE_LICENSE("GPL"); + -- 1.5.2.2 ---------------------------------------------------------------------- Konkurs Walentynkowy! Wybierz nagrode i wygraj! Sprawdz >> http://link.interia.pl/f2039

2 1

[alsa-devel] [PATCH] sscape: drop redundant fields from soundscape struct
by Krzysztof Helt 02 Feb '09

02 Feb '09

From: Krzysztof Helt <krzysztof.h1(a)wp.pl> The wss_base is disguised parameter for one function. It is converted to a function parameter. The code_type is only set but never read. It is removed. The midi_vol is set only to 0 so it does not work as detection of change in midi volume. It is removed. The xport variable is alias to the port[dev]. Use the port[dev] directly to increase readability. Signed-off-by: Krzysztof Helt <krzysztof.h1(a)wp.pl> --- sound/isa/sscape.c | 42 ++++++++++++++---------------------------- 1 files changed, 14 insertions(+), 28 deletions(-) diff --git a/sound/isa/sscape.c b/sound/isa/sscape.c index 681e223..c6a90f0 100644 --- a/sound/isa/sscape.c +++ b/sound/isa/sscape.c @@ -135,8 +135,6 @@ enum card_type { struct soundscape { spinlock_t lock; unsigned io_base; - unsigned wss_base; - int codec_type; int ic_type; enum card_type type; struct resource *io_res; @@ -152,7 +150,6 @@ struct soundscape { spinlock_t fwlock; int hw_in_use; unsigned long midi_usage; - unsigned char midi_vol; }; #define INVALID_IRQ ((unsigned)-1) @@ -760,14 +757,9 @@ static int sscape_midi_put(struct snd_kcontrol *kctl, * and then perform another volume-related command. Perhaps the * first command is an "open" and the second command is a "close"? */ - if (s->midi_vol == ((unsigned char) uctl->value.integer. value[0] & 127)) { - change = 0; - goto __skip_change; - } change = (host_write_ctrl_unsafe(s->io_base, CMD_SET_MIDI_VOL, 100) && host_write_ctrl_unsafe(s->io_base, ((unsigned char) uctl->value.integer. value[0]) & 127, 100) && host_write_ctrl_unsafe(s->io_base, CMD_XXX_MIDI_VOL, 100)); - __skip_change: /* * Take the board out of HOST mode and back into MIDI mode ... @@ -809,12 +801,11 @@ static unsigned __devinit get_irq_config(int irq) * Perform certain arcane port-checks to see whether there * is a SoundScape board lurking behind the given ports. */ -static int __devinit detect_sscape(struct soundscape *s) +static int __devinit detect_sscape(struct soundscape *s, long wss_io) { unsigned long flags; unsigned d; int retval = 0; - int codec = s->wss_base; spin_lock_irqsave(&s->lock, flags); @@ -830,13 +821,11 @@ static int __devinit detect_sscape(struct soundscape *s) if ((d & 0x80) != 0) goto _done; - if (d == 0) { - s->codec_type = 1; + if (d == 0) s->ic_type = IC_ODIE; - } else if ((d & 0x60) != 0) { - s->codec_type = 2; + else if ((d & 0x60) != 0) s->ic_type = IC_OPUS; - } else + else goto _done; outb(0xfa, ODIE_ADDR_IO(s->io_base)); @@ -856,10 +845,10 @@ static int __devinit detect_sscape(struct soundscape *s) sscape_write_unsafe(s->io_base, GA_HMCTL_REG, d | 0xc0); if (s->type == SSCAPE_VIVO) - codec += 4; + wss_io += 4; /* wait for WSS codec */ for (d = 0; d < 500; d++) { - if ((inb(codec) & 0x80) == 0) + if ((inb(wss_io) & 0x80) == 0) break; spin_unlock_irqrestore(&s->lock, flags); msleep(1); @@ -1057,7 +1046,6 @@ static int __devinit create_sscape(int dev, struct snd_card *card) unsigned dma_cfg; unsigned irq_cfg; unsigned mpu_irq_cfg; - unsigned xport; struct resource *io_res; struct resource *wss_res; unsigned long flags; @@ -1077,15 +1065,15 @@ static int __devinit create_sscape(int dev, struct snd_card *card) printk(KERN_ERR "sscape: Invalid IRQ %d\n", mpu_irq[dev]); return -ENXIO; } - xport = port[dev]; /* * Grab IO ports that we will need to probe so that we * can detect and control this hardware ... */ - io_res = request_region(xport, 8, "SoundScape"); + io_res = request_region(port[dev], 8, "SoundScape"); if (!io_res) { - snd_printk(KERN_ERR "sscape: can't grab port 0x%x\n", xport); + snd_printk(KERN_ERR + "sscape: can't grab port 0x%lx\n", port[dev]); return -EBUSY; } wss_res = NULL; @@ -1112,10 +1100,9 @@ static int __devinit create_sscape(int dev, struct snd_card *card) spin_lock_init(&sscape->fwlock); sscape->io_res = io_res; sscape->wss_res = wss_res; - sscape->io_base = xport; - sscape->wss_base = wss_port[dev]; + sscape->io_base = port[dev]; - if (!detect_sscape(sscape)) { + if (!detect_sscape(sscape, wss_port[dev])) { printk(KERN_ERR "sscape: hardware not detected at 0x%x\n", sscape->io_base); err = -ENODEV; goto _release_dma; @@ -1188,11 +1175,11 @@ static int __devinit create_sscape(int dev, struct snd_card *card) } #define MIDI_DEVNUM 0 if (sscape->type != SSCAPE_VIVO) { - err = create_mpu401(card, MIDI_DEVNUM, xport, mpu_irq[dev]); + err = create_mpu401(card, MIDI_DEVNUM, port[dev], mpu_irq[dev]); if (err < 0) { printk(KERN_ERR "sscape: Failed to create " - "MPU-401 device at 0x%x\n", - xport); + "MPU-401 device at 0x%lx\n", + port[dev]); goto _release_dma; } @@ -1204,7 +1191,6 @@ static int __devinit create_sscape(int dev, struct snd_card *card) /* * Initialize mixer */ - sscape->midi_vol = 0; host_write_ctrl_unsafe(sscape->io_base, CMD_SET_MIDI_VOL, 100); host_write_ctrl_unsafe(sscape->io_base, 0, 100); host_write_ctrl_unsafe(sscape->io_base, CMD_XXX_MIDI_VOL, 100); -- 1.5.2.2 ---------------------------------------------------------------------- Doladuj telefon! Sprawdz >> http://link.interia.pl/f2047

2 1

[alsa-devel] Recalcitrant input pin on ALC262
by Tony Vroon 02 Feb '09

02 Feb '09

Good evening, Currently I am implementing full support for the Tyan Thunder n6650W and have noticed a pin complex that advertises input, but can't seem to be set to it: Node 0x1c [Pin Complex] wcaps 0x400001: Stereo Pincap 0x00000020: IN Pin Default 0x411111f0: [N/A] Speaker at Ext Rear Conn = 1/8, Color = Black DefAssociation = 0xf, Sequence = 0x0 Misc = NO_PRESENCE Pin-ctls: 0x00: As you can see the pin capabilities reflect input. However, even after issuing this in the model-specific verbs: {0x1c, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN}, the pin-ctls firmly remains 0x00. Even the python-based hda-analyzer appears unable to flip the pin-ctls over to 0x20 and reports no error messages in the GUI or in the terminal. What am I missing please? Slightly related, is it considered acceptable to modify pin defaults if they are blatantly wrong? (Reported colour, N/A vs Fixed, etc) Regards, Tony V.

2 1

[alsa-devel] [PATCH 2/2] [EXPERIMENTAL] Add support for the latest IndigoIOx and IndigoDJx cards
by Giuliano Pochini 02 Feb '09

02 Feb '09

This patch adds to alsa-firmware the firmware needed by the IndigoIOx and IndigoDJx cards. It's too long to post here inline. Please download the compressed patch at this url: http://www.webalice.it/g_pochini/alsa-firmware_indigox.patch.bz2 The patch contains two c-coded blobs and the following patch: diff -duNrp alsa-firmware__orig/echoaudio/Makefile.am alsa-firmware/echoaudio/Makefile.am --- alsa-firmware__orig/echoaudio/Makefile.am 2008-06-07 22:18:23.000000000 +0200 +++ alsa-firmware/echoaudio/Makefile.am 2009-02-01 22:15:02.000000000 +0100 @@ -26,7 +26,9 @@ firmware_files = \ 3g_asic.fw \ indigo_dsp.fw \ indigo_io_dsp.fw \ - indigo_dj_dsp.fw + indigo_iox_dsp.fw \ + indigo_dj_dsp.fw \ + indigo_djx_dsp.fw noinst_PROGRAMS = fw_writer fw_writer_SOURCES = fw_writer.c @@ -57,7 +59,9 @@ EXTRA_DIST = DSP/LoaderDSP.c \ ASIC/3G_ASIC.c \ DSP/IndigoDSP.c \ DSP/IndigoIODSP.c \ + DSP/IndigoIOxDSP.c \ DSP/IndigoDJDSP.c \ + DSP/IndigoDJxDSP.c \ fw_writer.c CLEANFILES = $(firmware_files) fw_writer @@ -97,4 +101,6 @@ $(firmware_files): fw_writer ./fw_writer ASIC/3G_ASIC.c 3g_asic.fw ./fw_writer DSP/IndigoDSP.c indigo_dsp.fw ./fw_writer DSP/IndigoIODSP.c indigo_io_dsp.fw + ./fw_writer DSP/IndigoIOxDSP.c indigo_iox_dsp.fw ./fw_writer DSP/IndigoDJDSP.c indigo_dj_dsp.fw + ./fw_writer DSP/IndigoDJxDSP.c indigo_djx_dsp.fw -- Giuliano.

1 0

[alsa-devel] work in progress: USB driver for Behringer BCD 2000
by Frank van de Pol 01 Feb '09

01 Feb '09

I'm currently working on Alsa support for the Behringer BCD 2000, a DJ control surface (http://www.behringer.com/EN/Products/BCD2000.aspx). Unfortunate this device does not act as a standard class device. Since proper technical documentation from Behringer is non-existent my work is based on analysis of the USB data stream. Current status: - driver supports midi input data for all controls/buttons that are able to send midi data (some of tje controls do not send out data but are hardwired to the analogue circuitry, eg. headphone volume etc.) still todo: - get the midi-output working to allow control of the LEDs on the control surface. - cleanup of the code (mostly remove debugging stuff) - documentation The unit has also a 4 channel 24-bit audio interface; at the moment I have little interest in trying to get this audio interface operational. If anyone else on this list has a similar device and would like to test it please let me know so I can send patches. Regards, Frank.

1 0

[alsa-devel] [PATCH] pcxhr: fix trivial typo
by Tim Blechmann 31 Jan '09

31 Jan '09

Signed-off-by: Tim Blechmann <tim(a)klingt.org> --- sound/pci/pcxhr/pcxhr_core.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/sound/pci/pcxhr/pcxhr_core.h b/sound/pci/pcxhr/pcxhr_core.h index bbbd66d..be01737 100644 --- a/sound/pci/pcxhr/pcxhr_core.h +++ b/sound/pci/pcxhr/pcxhr_core.h @@ -1,7 +1,7 @@ /* * Driver for Digigram pcxhr compatible soundcards * - * low level interface with interrupt ans message handling + * low level interface with interrupt and message handling * * Copyright (c) 2004 by Digigram <alsa(a)digigram.com> * -- 1.5.6.3

2 1

[alsa-devel] [PATCH] ASoC: Update OMAP3 pandora board file
by Grazvydas Ignotas 31 Jan '09

31 Jan '09

Update pandora board file for recent TWL4030 codec changes. Also move output related snd_soc_dapm_nc_pin() calls to omap3pandora_out_init(), where they belong. Signed-off-by: Grazvydas Ignotas <notasas(a)gmail.com> --- sound/soc/omap/omap3pandora.c | 49 ++++++++++++++++++++++++---------------- 1 files changed, 29 insertions(+), 20 deletions(-) diff --git a/sound/soc/omap/omap3pandora.c b/sound/soc/omap/omap3pandora.c index fcc2f5d..fe282d4 100644 --- a/sound/soc/omap/omap3pandora.c +++ b/sound/soc/omap/omap3pandora.c @@ -143,7 +143,7 @@ static const struct snd_soc_dapm_widget omap3pandora_out_dapm_widgets[] = { }; static const struct snd_soc_dapm_widget omap3pandora_in_dapm_widgets[] = { - SND_SOC_DAPM_MIC("Mic (Internal)", NULL), + SND_SOC_DAPM_MIC("Mic (internal)", NULL), SND_SOC_DAPM_MIC("Mic (external)", NULL), SND_SOC_DAPM_LINE("Line In", NULL), }; @@ -155,16 +155,33 @@ static const struct snd_soc_dapm_route omap3pandora_out_map[] = { }; static const struct snd_soc_dapm_route omap3pandora_in_map[] = { - {"INL", NULL, "Line In"}, - {"INR", NULL, "Line In"}, - {"INL", NULL, "Mic (Internal)"}, - {"INR", NULL, "Mic (external)"}, + {"AUXL", NULL, "Line In"}, + {"AUXR", NULL, "Line In"}, + + {"MAINMIC", NULL, "Mic Bias 1"}, + {"Mic Bias 1", NULL, "Mic (internal)"}, + + {"SUBMIC", NULL, "Mic Bias 2"}, + {"Mic Bias 2", NULL, "Mic (external)"}, }; static int omap3pandora_out_init(struct snd_soc_codec *codec) { int ret; + /* All TWL4030 output pins are floating */ + snd_soc_dapm_nc_pin(codec, "OUTL"); + snd_soc_dapm_nc_pin(codec, "OUTR"); + snd_soc_dapm_nc_pin(codec, "EARPIECE"); + snd_soc_dapm_nc_pin(codec, "PREDRIVEL"); + snd_soc_dapm_nc_pin(codec, "PREDRIVER"); + snd_soc_dapm_nc_pin(codec, "HSOL"); + snd_soc_dapm_nc_pin(codec, "HSOR"); + snd_soc_dapm_nc_pin(codec, "CARKITL"); + snd_soc_dapm_nc_pin(codec, "CARKITR"); + snd_soc_dapm_nc_pin(codec, "HFL"); + snd_soc_dapm_nc_pin(codec, "HFR"); + ret = snd_soc_dapm_new_controls(codec, omap3pandora_out_dapm_widgets, ARRAY_SIZE(omap3pandora_out_dapm_widgets)); if (ret < 0) @@ -180,18 +197,11 @@ static int omap3pandora_in_init(struct snd_soc_codec *codec) { int ret; - /* All TWL4030 output pins are floating */ - snd_soc_dapm_nc_pin(codec, "OUTL"), - snd_soc_dapm_nc_pin(codec, "OUTR"), - snd_soc_dapm_nc_pin(codec, "EARPIECE"), - snd_soc_dapm_nc_pin(codec, "PREDRIVEL"), - snd_soc_dapm_nc_pin(codec, "PREDRIVER"), - snd_soc_dapm_nc_pin(codec, "HSOL"), - snd_soc_dapm_nc_pin(codec, "HSOR"), - snd_soc_dapm_nc_pin(codec, "CARKITL"), - snd_soc_dapm_nc_pin(codec, "CARKITR"), - snd_soc_dapm_nc_pin(codec, "HFL"), - snd_soc_dapm_nc_pin(codec, "HFR"), + /* Not comnnected */ + snd_soc_dapm_nc_pin(codec, "HSMIC"); + snd_soc_dapm_nc_pin(codec, "CARKITMIC"); + snd_soc_dapm_nc_pin(codec, "DIGIMIC0"); + snd_soc_dapm_nc_pin(codec, "DIGIMIC1"); ret = snd_soc_dapm_new_controls(codec, omap3pandora_in_dapm_widgets, ARRAY_SIZE(omap3pandora_in_dapm_widgets)); @@ -251,10 +261,9 @@ static int __init omap3pandora_soc_init(void) { int ret; - if (!machine_is_omap3_pandora()) { - pr_debug(PREFIX "Not OMAP3 Pandora\n"); + if (!machine_is_omap3_pandora()) return -ENODEV; - } + pr_info("OMAP3 Pandora SoC init\n"); ret = gpio_request(OMAP3_PANDORA_DAC_POWER_GPIO, "dac_power"); -- 1.5.6.3

2 1

[alsa-devel] [PATCH] ess1688: fix OPL3 port setting
by Krzysztof Helt 30 Jan '09

30 Jan '09

From: Krzysztof Helt <krzysztof.h1(a)wp.pl> The ess1688 driver uses the same port for PCM audio (SB compatible) and OPL3 synthesis. It is wrong so allow to choose a correct port for OPL3 synthesis. Signed-off-by: Krzysztof Helt <krzysztof.h1(a)wp.pl> --- The bug was entered as issue #282 and closed due to lack of response. However, the code is plainly wrong as MS Win95 driver reserves two separate IO areas starting from 0x220 and 0x388 for ess688 and the third 0x300 for ess1688. I have no card to test as I cut my es1688 to reuse its audio jacks few months ago. sound/isa/es1688/es1688.c | 20 +++++++++++++------- 1 files changed, 13 insertions(+), 7 deletions(-) diff --git a/sound/isa/es1688/es1688.c b/sound/isa/es1688/es1688.c index b463771..5e4d766 100644 --- a/sound/isa/es1688/es1688.c +++ b/sound/isa/es1688/es1688.c @@ -49,6 +49,7 @@ static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX; /* Index 0-MAX */ static char *id[SNDRV_CARDS] = SNDRV_DEFAULT_STR; /* ID for this card */ static int enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE; /* Enable this card */ static long port[SNDRV_CARDS] = SNDRV_DEFAULT_PORT; /* 0x220,0x240,0x260 */ +static long fm_port[SNDRV_CARDS] = SNDRV_DEFAULT_PORT; /* Usually 0x388 */ static long mpu_port[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS - 1)] = -1}; static int irq[SNDRV_CARDS] = SNDRV_DEFAULT_IRQ; /* 5,7,9,10 */ static int mpu_irq[SNDRV_CARDS] = SNDRV_DEFAULT_IRQ; /* 5,7,9,10 */ @@ -65,6 +66,8 @@ MODULE_PARM_DESC(port, "Port # for " CRD_NAME " driver."); module_param_array(mpu_port, long, NULL, 0444); MODULE_PARM_DESC(mpu_port, "MPU-401 port # for " CRD_NAME " driver."); module_param_array(irq, int, NULL, 0444); +module_param_array(fm_port, long, NULL, 0444); +MODULE_PARM_DESC(fm_port, "FM port # for ES1688 driver."); MODULE_PARM_DESC(irq, "IRQ # for " CRD_NAME " driver."); module_param_array(mpu_irq, int, NULL, 0444); MODULE_PARM_DESC(mpu_irq, "MPU-401 IRQ # for " CRD_NAME " driver."); @@ -143,13 +146,16 @@ static int __devinit snd_es1688_probe(struct device *dev, unsigned int n) sprintf(card->longname, "%s at 0x%lx, irq %i, dma %i", pcm->name, chip->port, chip->irq, chip->dma8); - if (snd_opl3_create(card, chip->port, chip->port + 2, - OPL3_HW_OPL3, 0, &opl3) < 0) - dev_warn(dev, "opl3 not detected at 0x%lx\n", chip->port); - else { - error = snd_opl3_hwdep_new(opl3, 0, 1, NULL); - if (error < 0) - goto out; + if (fm_port[n] > 0 && fm_port[n] != SNDRV_AUTO_PORT) { + if (snd_opl3_create(card, fm_port[n], fm_port[n] + 2, + OPL3_HW_OPL3, 0, &opl3) < 0) + dev_warn(dev, + "opl3 not detected at 0x%lx\n", fm_port[n]); + else { + error = snd_opl3_hwdep_new(opl3, 0, 1, NULL); + if (error < 0) + goto out; + } } if (mpu_irq[n] >= 0 && mpu_irq[n] != SNDRV_AUTO_IRQ && -- 1.5.2.2 ----------------------------------------------------------------------- Promocja w Speak Up. Kwartal angielskiego za darmo. 3 miesiace nauki gratis. Sprawdz teraz! >> http://link.interia.pl/f2019

3 8