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

[alsa-devel] [PATCH] opti-miro: remove snd_card pointer from snd_miro structure
by Krzysztof Helt 21 Nov '09

21 Nov '09

From: Krzysztof Helt <krzysztof.h1(a)wp.pl> Remove the snd_card pointer from the snd_miro structure and do some small code improvements. Also, move Opti chipset detection before detection of the ACI mixer, so the mci_base value is set in one place only. Signed-off-by: Krzysztof Helt <krzysztof.h1(a)wp.pl> --- sound/isa/opti9xx/miro.c | 55 ++++++++++++++++++++-------------------------- 1 files changed, 24 insertions(+), 31 deletions(-) diff --git a/sound/isa/opti9xx/miro.c b/sound/isa/opti9xx/miro.c index b8170ad..db4a4fb 100644 --- a/sound/isa/opti9xx/miro.c +++ b/sound/isa/opti9xx/miro.c @@ -110,7 +110,6 @@ struct snd_miro { unsigned long pwd_reg; spinlock_t lock; - struct snd_card *card; struct snd_pcm *pcm; long wss_base; @@ -132,8 +131,6 @@ struct snd_miro { struct mutex aci_mutex; }; -static void snd_miro_proc_init(struct snd_miro * miro); - static char * snd_opti9xx_names[] = { "unkown", "82C928", "82C929", @@ -457,11 +454,9 @@ static int snd_miro_put_double(struct snd_kcontrol *kcontrol, right = ucontrol->value.integer.value[1]; setreg_right = (kcontrol->private_value >> 8) & 0xff; - if (setreg_right == ACI_SET_MASTER) { - setreg_left = setreg_right + 1; - } else { - setreg_left = setreg_right + 8; - } + setreg_left = setreg_right + 8; + if (setreg_right == ACI_SET_MASTER) + setreg_left -= 7; getreg_right = kcontrol->private_value & 0xff; getreg_left = getreg_right + 1; @@ -667,17 +662,15 @@ static int __devinit snd_set_aci_init_values(struct snd_miro *miro) return 0; } -static int __devinit snd_miro_mixer(struct snd_miro *miro) +static int __devinit snd_miro_mixer(struct snd_card *card, + struct snd_miro *miro) { - struct snd_card *card; unsigned int idx; int err; - if (snd_BUG_ON(!miro || !miro->card)) + if (snd_BUG_ON(!miro || !card)) return -EINVAL; - card = miro->card; - switch (miro->hardware) { case OPTi9XX_HW_82C924: strcpy(card->mixername, "ACI & OPTi924"); @@ -950,11 +943,12 @@ static void snd_miro_proc_read(struct snd_info_entry * entry, snd_iprintf(buffer, " preamp : 0x%x\n", miro->aci_preamp); } -static void __devinit snd_miro_proc_init(struct snd_miro * miro) +static void __devinit snd_miro_proc_init(struct snd_card *card, + struct snd_miro *miro) { struct snd_info_entry *entry; - if (! snd_card_proc_new(miro->card, "miro", &entry)) + if (!snd_card_proc_new(card, "miro", &entry)) snd_info_set_text_ops(entry, miro, snd_miro_proc_read); } @@ -971,20 +965,18 @@ static int __devinit snd_miro_configure(struct snd_miro *chip) unsigned char mpu_irq_bits; unsigned long flags; + snd_miro_write_mask(chip, OPTi9XX_MC_REG(1), 0x80, 0x80); + snd_miro_write_mask(chip, OPTi9XX_MC_REG(2), 0x20, 0x20); /* OPL4 */ + snd_miro_write_mask(chip, OPTi9XX_MC_REG(5), 0x02, 0x02); + switch (chip->hardware) { case OPTi9XX_HW_82C924: snd_miro_write_mask(chip, OPTi9XX_MC_REG(6), 0x02, 0x02); - snd_miro_write_mask(chip, OPTi9XX_MC_REG(1), 0x80, 0x80); - snd_miro_write_mask(chip, OPTi9XX_MC_REG(2), 0x20, 0x20); /* OPL4 */ snd_miro_write_mask(chip, OPTi9XX_MC_REG(3), 0xf0, 0xff); - snd_miro_write_mask(chip, OPTi9XX_MC_REG(5), 0x02, 0x02); break; case OPTi9XX_HW_82C929: /* untested init commands for OPTi929 */ - snd_miro_write_mask(chip, OPTi9XX_MC_REG(1), 0x80, 0x80); - snd_miro_write_mask(chip, OPTi9XX_MC_REG(2), 0x20, 0x20); /* OPL4 */ snd_miro_write_mask(chip, OPTi9XX_MC_REG(4), 0x00, 0x0c); - snd_miro_write_mask(chip, OPTi9XX_MC_REG(5), 0x02, 0x02); break; default: snd_printk(KERN_ERR "chip %d not supported\n", chip->hardware); @@ -1156,7 +1148,6 @@ static int __devinit snd_card_miro_aci_detect(struct snd_card *card, /* get ACI port from OPTi9xx MC 4 */ - miro->mc_base = 0xf8c; regval=inb(miro->mc_base + 4); miro->aci_port = (regval & 0x10) ? 0x344: 0x354; @@ -1232,7 +1223,13 @@ static int __devinit snd_miro_probe(struct device *devptr, unsigned int n) card->private_free = snd_card_miro_free; miro = card->private_data; - miro->card = card; + + error = snd_card_miro_detect(card, miro); + if (error < 0) { + snd_card_free(card); + snd_printk(KERN_ERR "unable to detect OPTi9xx chip\n"); + return -ENODEV; + } if ((error = snd_card_miro_aci_detect(card, miro)) < 0) { snd_card_free(card); @@ -1241,13 +1238,8 @@ static int __devinit snd_miro_probe(struct device *devptr, unsigned int n) } /* init proc interface */ - snd_miro_proc_init(miro); + snd_miro_proc_init(card, miro); - if ((error = snd_card_miro_detect(card, miro)) < 0) { - snd_card_free(card); - snd_printk(KERN_ERR "unable to detect OPTi9xx chip\n"); - return -ENODEV; - } if (! miro->res_mc_base && (miro->res_mc_base = request_region(miro->mc_base, miro->mc_base_size, @@ -1341,7 +1333,8 @@ static int __devinit snd_miro_probe(struct device *devptr, unsigned int n) miro->pcm = pcm; - if ((error = snd_miro_mixer(miro)) < 0) { + error = snd_miro_mixer(card, miro); + if (error < 0) { snd_card_free(card); return error; } -- 1.6.4 ---------------------------------------------------------------------- Wygraj pobyt w Alpach dla ca�ej rodziny Kliknij >>> http://link.interia.pl/f2446

2 1

[alsa-devel] McBSP troubles
by Sergey Lapin 21 Nov '09

21 Nov '09

Hi, all! I have problems making any sound with current linux-omap master. ASoC repository did not change anything either. I use slightly modified (removed all GPIOs/jacks and different clock names because we use OMAP3 instead of OMAP2 n810 uses) sound/soc/omap/n810.c, with McBSP2. Codec is tlv320aic32 and it is well supplied with 13 MHz clock, so should work happily. Old 2.6.28-omap1 kernel + modifications works well with this, but it lacks some fundamental features recently added to mainline and linux-omap kernels, so we considered upgrading. Almost all stuff on custom board works, except for sound, which I fight for several weeks already, so I look for any help with this. I use OMAP3525 SoC. Debugging output of mcbsp driver is the following: gnome5:~# aplay -c 2 -f S16_LE /dev/urandom [ 4593.488159] disabling LINE_OUT [ 4593.491302] disabling DMIC [ 4593.494018] Disabling ASSYM pin Playing raw data '/dev/urandom' : Signed 16 bit Little Endian, Rate 8000 Hz, Stereo [ 4593.620086] omap-mcbsp omap-mcbsp.2: Configuring McBSP2 phys_base: 0x49022000 [ 4593.678375] gnome5_jack_event [ 4593.735015] omap-mcbsp omap-mcbsp.2: **** McBSP2 regs **** [ 4593.740539] omap-mcbsp omap-mcbsp.2: DRR2: 0xd907da5a [ 4593.745697] omap-mcbsp omap-mcbsp.2: DRR1: 0x0000 [ 4593.750518] omap-mcbsp omap-mcbsp.2: DXR2: 0x0000 [ 4593.755340] omap-mcbsp omap-mcbsp.2: DXR1: 0x0000 [ 4593.760162] omap-mcbsp omap-mcbsp.2: SPCR2: 0x02f5 [ 4593.764984] omap-mcbsp omap-mcbsp.2: SPCR1: 0x0030 [ 4593.769805] omap-mcbsp omap-mcbsp.2: RCR2: 0x8041 [ 4593.774627] omap-mcbsp omap-mcbsp.2: RCR1: 0x0040 [ 4593.779449] omap-mcbsp omap-mcbsp.2: XCR2: 0x8041 [ 4593.784271] omap-mcbsp omap-mcbsp.2: XCR1: 0x0040 [ 4593.789093] omap-mcbsp omap-mcbsp.2: SRGR2: 0x001f [ 4593.793884] omap-mcbsp omap-mcbsp.2: SRGR1: 0x0f00 [ 4593.798706] omap-mcbsp omap-mcbsp.2: PCR0: 0x000f [ 4593.803527] omap-mcbsp omap-mcbsp.2: *********************** [ 4603.811187] ALSA sound/core/pcm_lib.c:1708: playback write error (DMA or IRQ trouble?) [ 4614.818878] ALSA sound/core/pcm_lib.c:1708: playback write error (DMA or IRQ trouble?) aplay: pcm_write:1442: write error: And no sound at all. Codec is supplied properly with clock, and programmed normally, so I think that's McBSP trouble, but I might be wrong. Clock is supplied properly. So, what is changed and needs updating? Is it McBSP or codec? I see no signals using oscilloscope on _FSX and _CLKX. Any ideas? S.

1 1

[alsa-devel] Sigmatel STAC 9228
by Alonso Quiroz H. 21 Nov '09

21 Nov '09

Hey guys!, this is my first mail to the list. Excuse me if this is not the better way to send my request. I have a Dell XPS M1530 laptop, with a Sigmatel soundcard... well, read it for yourselves: http://pastebin.ca/1679794 By default (in Ubuntu 9.10) the card doesn't work in 5.1 mode, and that is my problem... by default it doesn't show the option "Surround 5.1" I have tried a lot of combinations of model=XXXXX in /etc/modprobe.d/alsa-base.conf, starting by the ones in /usr/share/doc/alsa-base/driver/HD-Audio-Models.txt. The better result is with "3stack": It 's possible to select the 5.1 option, but I don't get sound at all. The weird thing is that de volume control of Pulse shows bars moving. Thanks in advance. Sorry about my english. Alonso Quiroz H.

1 0

[alsa-devel] RFC: ice1712 virtual devices
by Arno Schuring 21 Nov '09

21 Nov '09

Hello list, This is basically a resend of http://thread.gmane.org/gmane.linux.alsa.devel/59481/focus=59672 , which fixed the front: device of ice1712 cards to accept two-channel input. Currently, the front: device is exposed through the route plugin, which requires all clients to mmap all 10 channels, even though the front device is supposed to be a stereo device. This patch changes the front: device definition such that it matches the definition of iec958 in the same file. Additionally, I'm tempted to remove the surround* definitions because the chip does not really offer surround-style multichannel: it basically just offers multiple stereo channels, and does not provide any channel mapping beyond stereo. Finally, I'm also experimenting with the dshare plugin to allow applications to access the iec958: and front: devices simultaneously. Can anyone point me to a working example for this? From reading the alsa-lib documentation, it is not clear to me how I should nest the different plugins. Many thanks, Arno Schuring -- diff --git a/src/conf/cards/ICE1712.conf b/src/conf/cards/ICE1712.conf index 01e50d2..d7acb81 100644 --- a/src/conf/cards/ICE1712.conf +++ b/src/conf/cards/ICE1712.conf @@ -32,12 +32,28 @@ ICE1712.pcm.front.0 { @args.CARD { type string } - type route - ttable.0.0 1 - ttable.1.1 1 - slave.pcm { - type hw - card $CARD + type asym + playback.pcm { + type route + ttable.0.0 1 + ttable.1.1 1 + slave.pcm { + type hw + card $CARD + } + slave.format S32_LE + slave.channels 10 + } + capture.pcm { + type route + ttable.0.0 1 + ttable.1.1 1 + slave.pcm { + type hw + card $CARD + } + slave.format S32_LE + slave.channels 12 } }

4 7

[alsa-devel] opti-miro: fix missing semicolon
by Krzysztof Helt 20 Nov '09

20 Nov '09

From: Krzysztof Helt <krzysztof.h1(a)wp.pl> Fix the mistake introduced by me earlier patch. Signed-off-by: Krzysztof Helt <krzysztof.h1(a)wp.pl> --- I have borrowed the Miro PCM20 card. I can test the driver while making patches. diff --git a/sound/isa/opti9xx/miro.c b/sound/isa/opti9xx/miro.c index b8170ad..1776103 100644 --- a/sound/isa/opti9xx/miro.c +++ b/sound/isa/opti9xx/miro.c @@ -1277,7 +1277,7 @@ static int __devinit snd_miro_probe(struct device *devptr, unsigned int n) if (mpu_port < 0) { snd_card_free(card); snd_printk(KERN_ERR "unable to find a free MPU401 port\n"); - return -EBUSY + return -EBUSY; } } if (miro->irq == SNDRV_AUTO_IRQ) { ---------------------------------------------------------------------- KONKURS! Kliknij i wygraj luksusowe auto na weekend lub jedn� z 650 innych nagr�d od L’Oreal Men Expert!! >> http://link.interia.pl/f2428

2 1

[alsa-devel] ALSA: hda - add possibility to choose speakers configuration for 4930g
by Łukasz Wojniłowicz 20 Nov '09

20 Nov '09

As in wrote title patch adds possibility to choose speakers configuration for 4930g. This feature was available in ALSA 1.0.19 (or even 1.0.20) but disappeared in 1.0.21

2 1

[alsa-devel] Testers wanted: New SB X-Fi driver
by Insaen 20 Nov '09

20 Nov '09

I own a SB x-fi fatality incl. the midi input box witch i realy would like to use for my bass guitar and use the record options, i run the card on ubuntu 9.04 and its running well but can't realy set the jack system right for software like rosegarden or lmms or any other music editing software. I know it's got something to do with my alsa config?? is there a forum about this toppick?Simon says have a nice day..2-;

1 0

[alsa-devel] ALSA: hda - 4930g switch lfe with side in mixer
by Łukasz Wojniłowicz 20 Nov '09

20 Nov '09

Built-in sub-woofer can now be controlled by lfe slider instead of side slider on Acer Aspire 5930g

1 0

[alsa-devel] [PATCH] sound: usbmidi: Use hweight16
by Akinobu Mita 20 Nov '09

20 Nov '09

Use hweight16 instead of Brian Kernighan's/Peter Wegner's method Signed-off-by: Akinobu Mita <akinobu.mita(a)gmail.com> Cc: Jaroslav Kysela <perex(a)perex.cz> Cc: Takashi Iwai <tiwai(a)suse.de> Cc: alsa-devel(a)alsa-project.org Cc: Clemens Ladisch <clemens(a)ladisch.de> --- sound/usb/usbmidi.c | 13 ++----------- 1 files changed, 2 insertions(+), 11 deletions(-) diff --git a/sound/usb/usbmidi.c b/sound/usb/usbmidi.c index 0eff19c..e5b0689 100644 --- a/sound/usb/usbmidi.c +++ b/sound/usb/usbmidi.c @@ -1062,15 +1062,6 @@ static int snd_usbmidi_in_endpoint_create(struct snd_usb_midi* umidi, return 0; } -static unsigned int snd_usbmidi_count_bits(unsigned int x) -{ - unsigned int bits; - - for (bits = 0; x; ++bits) - x &= x - 1; - return bits; -} - /* * Frees an output endpoint. * May be called when ep hasn't been initialized completely. @@ -1914,8 +1905,8 @@ int snd_usb_create_midi_interface(struct snd_usb_audio* chip, out_ports = 0; in_ports = 0; for (i = 0; i < MIDI_MAX_ENDPOINTS; ++i) { - out_ports += snd_usbmidi_count_bits(endpoints[i].out_cables); - in_ports += snd_usbmidi_count_bits(endpoints[i].in_cables); + out_ports += hweight16(endpoints[i].out_cables); + in_ports += hweight16(endpoints[i].in_cables); } err = snd_usbmidi_create_rawmidi(umidi, out_ports, in_ports); if (err < 0) { -- 1.6.5.1

2 1

[alsa-devel] Mute lfe and side for 4930g when pluging in headphones
by Łukasz Wojniłowicz 20 Nov '09

20 Nov '09

Sorry that I'm not sending this patch by git but it takes for me too long to clone alsa-kernel.git repository at 15 KB download rate. Thanks for your understanding

2 1