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

[alsa-devel] hda-codec: Add two new systems to ALC883
by Tobin Davis 17 Sep '07

17 Sep '07

This patch adds support for the Asus M2A-VM HDMI and Abit IP35-PRO motherboards. Signed off by Tobin Davis <tdavis(a)dsl-only.net>

2 1

[alsa-devel] hda-codec: Add 4 channel support for Realtek ALC883
by Tobin Davis 17 Sep '07

17 Sep '07

I had a request for a 4 channel mode. This should implement front and surround outputs, leaving the 3rd plug for mic input. Signed off by Tobin Davis <tdavis(a)dsl-only.net>

2 1

[alsa-devel] [PATCH] ad1848_lib: waiting loops done after cs4231_lib
by Krzysztof Helt 17 Sep '07

17 Sep '07

From: Krzysztof Helt <krzysztof.h1(a)wp.pl> This patch fixes ad1848_lib waiting loops to be the same as in the cs4231_lib. Signed-off-by: Krzysztof Helt <krzysztof.h1(a)wp.pl> ---

3 2

[alsa-devel] HP Pavilion dv5000 ATIIXP / AC97 fixes?
by Craig Shelley 17 Sep '07

17 Sep '07

Hi, I am not on this list, so please cc me on replies... With kernel version 2.6.22.3 I found 2 issues with the audio that were solved by applying the patches below. Please note that this is most likely not the correct fix for these issues. To make the mute LED work on the mute button: diff -Nru a/sound/pci/atiixp.c b/sound/pci/atiixp.c --- a/sound/pci/atiixp.c 2007-09-14 15:21:32.000000000 +0100 +++ b/sound/pci/atiixp.c 2007-09-14 20:56:27.000000000 +0100 @@ -1389,6 +1389,12 @@ .name = "HP nx6125", .type = AC97_TUNE_MUTE_LED }, + { + .subvendor = 0x103c, + .subdevice = 0x30a4, + .name = "HP Pavilion dv5000", + .type = AC97_TUNE_HP_MUTE_LED + }, { } /* terminator */ }; To stop the loud pop/click sound on suspend/resume: diff -Nru a/sound/pci/ac97/ac97_codec.c b/sound/pci/ac97/ac97_codec.c --- a/sound/pci/ac97/ac97_codec.c 2007-08-15 17:25:39.000000000 +0100 +++ b/sound/pci/ac97/ac97_codec.c 2007-09-14 21:08:40.000000000 +0100 @@ -2287,7 +2287,7 @@ power |= AC97_PD_PR0 | AC97_PD_PR1; /* ADC & DAC powerdown */ snd_ac97_write(ac97, AC97_POWERDOWN, power); udelay(100); - power |= AC97_PD_PR2 | AC97_PD_PR3; /* Analog Mixer powerdown */ + power |= AC97_PD_PR2; /* Analog Mixer powerdown */ snd_ac97_write(ac97, AC97_POWERDOWN, power); if (ac97_is_power_save_mode(ac97)) { udelay(100); The loud pop/click sound appeared after upgrading from kernel 2.6.16.2 to 2.6.22.3, and the critical difference between these versions is: 2.6.16.2: (ac97_codec.c line 2135) power |= 0x0400; /* Analog Mixer powerdown (Vref on) */ 2.6.22.3: (ac97_codec.c line 2290) power |= AC97_PD_PR2 | AC97_PD_PR3; /* Analog Mixer powerdown */ Where: #define AC97_PD_PR2 0x0400 /* Power down Mixer (Vref still on) */ #define AC97_PD_PR3 0x0800 /* Power down Mixer (Vref off) */ My guess is that this loud click may be caused by some kind of DC offset because an equivalent noise occurs while rebooting after hibernating using hibernate -r regards, -- Craig Shelley EMail: craig(a)microtron.org.uk Jabber: shell(a)jabber.earth.li

2 1

[alsa-devel] [PATCH] hda: More subsystem id BIOS changes
by Matthew Ranostay 17 Sep '07

17 Sep '07

More laptop BIOS changes the subsystem id for STAC9205 cards if the microphone is toggled on/off in the settings. --- Signed-off-by: Matthew Ranostay <mranostay(a)embeddedalley.com> diff -r 9fe2d7b6498b pci/hda/patch_sigmatel.c --- a/pci/hda/patch_sigmatel.c Wed Sep 12 13:31:47 2007 +0200 +++ b/pci/hda/patch_sigmatel.c Thu Sep 13 17:09:17 2007 -0400 @@ -1183,6 +1183,8 @@ static struct snd_pci_quirk stac9205_cfg "unknown Dell", STAC_9205_DELL_M42), SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x01f8, "Dell Precision", STAC_9205_M43xx), + SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x021c, + "Dell Precision", STAC_9205_M43xx), SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x01f9, "Dell Precision", STAC_9205_DELL_M43), SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x021b,

2 1

[alsa-devel] [PATCH] dbri: conversion to OpenFirmware framework
by Krzysztof Helt 17 Sep '07

17 Sep '07

From: Krzysztof Helt <krzysztof.h1(a)wp.pl> This patch converts the dbri driver to use OF framework. Signed-off-by: Krzysztof Helt <krzysztof.h1(a)wp.pl> --- This patch requires the previous dbri patch with more code improvements posted yesterday. Dave, please let this patch go through the ALSA tree for merging. --- old/sound/sparc/dbri.c 2007-09-01 22:48:24.000000000 +0200 +++ new/sound/sparc/dbri.c 2007-09-02 09:21:11.491872881 +0200 @@ -66,6 +66,7 @@ #include <sound/control.h> #include <sound/initval.h> +#include <asm/prom.h> #include <asm/sbus.h> #include <asm/atomic.h> @@ -296,8 +297,6 @@ struct dbri_streaminfo { /* This structure holds the information for both chips (DBRI & CS4215) */ struct snd_dbri { - struct snd_card *card; /* ALSA card */ - int regs_size, irq; /* Needed for unload */ struct sbus_dev *sdev; /* SBUS device info */ spinlock_t lock; @@ -318,8 +317,6 @@ struct snd_dbri { struct cs4215 mm; /* mmcodec special info */ /* per stream (playback/record) info */ struct dbri_streaminfo stream_info[DBRI_NO_STREAMS]; - - struct snd_dbri *next; }; #define DBRI_MAX_VOLUME 63 /* Output volume */ @@ -571,8 +568,6 @@ struct snd_dbri { #define DBRI_STREAM(dbri, substream) \ &dbri->stream_info[DBRI_STREAMNO(substream)] -static struct snd_dbri *dbri_list; /* All DBRI devices */ - /* * Short data pipes transmit LSB first. The CS4215 receives MSB first. Grrr. * So we have to reverse the bits. Note: not all bit lengths are supported @@ -2216,12 +2211,12 @@ static struct snd_pcm_ops snd_dbri_ops = .pointer = snd_dbri_pointer, }; -static int __devinit snd_dbri_pcm(struct snd_dbri *dbri) +static int __devinit snd_dbri_pcm(struct snd_card *card) { struct snd_pcm *pcm; int err; - if ((err = snd_pcm_new(dbri->card, + if ((err = snd_pcm_new(card, /* ID */ "sun_dbri", /* device */ 0, /* playback count */ 1, @@ -2232,9 +2227,9 @@ static int __devinit snd_dbri_pcm(struct snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_PLAYBACK, &snd_dbri_ops); snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_CAPTURE, &snd_dbri_ops); - pcm->private_data = dbri; + pcm->private_data = card->private_data; pcm->info_flags = 0; - strcpy(pcm->name, dbri->card->shortname); + strcpy(pcm->name, card->shortname); if ((err = snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_CONTINUOUS, @@ -2420,20 +2415,22 @@ static struct snd_kcontrol_new dbri_cont CS4215_SINGLE("Mic boost", 4, 4, 1, 1) }; -static int __init snd_dbri_mixer(struct snd_dbri *dbri) +static int __devinit snd_dbri_mixer(struct snd_card *card) { - struct snd_card *card; int idx, err; + struct snd_dbri *dbri; - snd_assert(dbri != NULL && dbri->card != NULL, return -EINVAL); + snd_assert(card != NULL && card->private_data != NULL, return -EINVAL); + dbri = card->private_data; - card = dbri->card; strcpy(card->mixername, card->shortname); - for (idx = 0; idx < ARRAY_SIZE(dbri_controls); idx++) - if ((err = snd_ctl_add(card, - snd_ctl_new1(&dbri_controls[idx], dbri))) < 0) + for (idx = 0; idx < ARRAY_SIZE(dbri_controls); idx++) { + err = snd_ctl_add(card, + snd_ctl_new1(&dbri_controls[idx], dbri)); + if (err < 0) return err; + } for (idx = DBRI_REC; idx < DBRI_NO_STREAMS; idx++) { dbri->stream_info[idx].left_gain = 0; @@ -2480,15 +2477,16 @@ static void dbri_debug_read(struct snd_i } #endif -void snd_dbri_proc(struct snd_dbri *dbri) +void __devinit snd_dbri_proc(struct snd_card *card) { + struct snd_dbri *dbri = card->private_data; struct snd_info_entry *entry; - if (!snd_card_proc_new(dbri->card, "regs", &entry)) + if (!snd_card_proc_new(card, "regs", &entry)) snd_info_set_text_ops(entry, dbri, dbri_regs_read); #ifdef DBRI_DEBUG - if (!snd_card_proc_new(dbri->card, "debug", &entry)) { + if (!snd_card_proc_new(card, "debug", &entry)) { snd_info_set_text_ops(entry, dbri, dbri_debug_read); entry->mode = S_IFREG | S_IRUGO; /* Readable only. */ } @@ -2502,17 +2500,16 @@ void snd_dbri_proc(struct snd_dbri *dbri */ static void snd_dbri_free(struct snd_dbri *dbri); -static int __init snd_dbri_create(struct snd_card *card, +static int __devinit snd_dbri_create(struct snd_card *card, struct sbus_dev *sdev, - struct linux_prom_irqs *irq, int dev) + int irq, int dev) { struct snd_dbri *dbri = card->private_data; int err; spin_lock_init(&dbri->lock); - dbri->card = card; dbri->sdev = sdev; - dbri->irq = irq->pri; + dbri->irq = irq; dbri->dma = sbus_alloc_consistent(sdev, sizeof(struct dbri_dma), &dbri->dma_dvma); @@ -2550,9 +2547,6 @@ static int __init snd_dbri_create(struct return err; } - dbri->next = dbri_list; - dbri_list = dbri; - return 0; } @@ -2572,20 +2566,19 @@ static void snd_dbri_free(struct snd_dbr (void *)dbri->dma, dbri->dma_dvma); } -static int __init dbri_attach(int prom_node, struct sbus_dev *sdev) +static int __devinit dbri_probe(struct of_device *of_dev, + const struct of_device_id *match) { + struct sbus_dev *sdev = to_sbus_device(&of_dev->dev); struct snd_dbri *dbri; - struct linux_prom_irqs irq; + int irq; struct resource *rp; struct snd_card *card; static int dev = 0; int err; - if (sdev->prom_name[9] < 'e') { - printk(KERN_ERR "DBRI: unsupported chip version %c found.\n", - sdev->prom_name[9]); - return -EIO; - } + dprintk(D_GEN, "DBRI: Found %s in SBUS slot %d\n", + sdev->prom_name, sdev->slot); if (dev >= SNDRV_CARDS) return -ENODEV; @@ -2594,10 +2587,9 @@ static int __init dbri_attach(int prom_n return -ENOENT; } - err = prom_getproperty(prom_node, "intr", (char *)&irq, sizeof(irq)); - if (err < 0) { - printk(KERN_ERR "DBRI-%d: Firmware node lacks IRQ property.\n", - dev); + irq = sdev->irqs[0]; + if (irq <= 0) { + printk(KERN_ERR "DBRI-%d: No IRQ.\n", dev); return -ENODEV; } @@ -2611,22 +2603,23 @@ static int __init dbri_attach(int prom_n rp = &sdev->resource[0]; sprintf(card->longname, "%s at 0x%02lx:0x%016Lx, irq %d", card->shortname, - rp->flags & 0xffL, (unsigned long long)rp->start, irq.pri); + rp->flags & 0xffL, (unsigned long long)rp->start, irq); - if ((err = snd_dbri_create(card, sdev, &irq, dev)) < 0) { + if ((err = snd_dbri_create(card, sdev, irq, dev)) < 0) { snd_card_free(card); return err; } dbri = card->private_data; - if ((err = snd_dbri_pcm(dbri)) < 0) + if ((err = snd_dbri_pcm(card)) < 0) goto _err; - if ((err = snd_dbri_mixer(dbri)) < 0) + if ((err = snd_dbri_mixer(card)) < 0) goto _err; /* /proc file handling */ - snd_dbri_proc(dbri); + snd_dbri_proc(card); + dev_set_drvdata(&of_dev->dev, card); err = snd_card_register(card); if (err < 0) @@ -2645,42 +2638,46 @@ _err: return err; } -/* Probe for the dbri chip and then attach the driver. */ -static int __init dbri_init(void) +static int __devexit dbri_remove(struct of_device *dev) { - struct sbus_bus *sbus; - struct sbus_dev *sdev; - int found = 0; - - /* Probe each SBUS for the DBRI chip(s). */ - for_all_sbusdev(sdev, sbus) - /* - * The version is coded in the last character - */ - if (!strncmp(sdev->prom_name, "SUNW,DBRI", 9)) { - dprintk(D_GEN, "DBRI: Found %s in SBUS slot %d\n", - sdev->prom_name, sdev->slot); + struct snd_card *card = dev_get_drvdata(&dev->dev); - if (dbri_attach(sdev->prom_node, sdev) == 0) - found++; - } + snd_dbri_free(card->private_data); + snd_card_free(card); + + dev_set_drvdata(&dev->dev, NULL); - return (found > 0) ? 0 : -EIO; + return 0; } -static void __exit dbri_exit(void) -{ - struct snd_dbri *this = dbri_list; +static struct of_device_id dbri_match[] = { + { + .name = "SUNW,DBRIe", + }, + { + .name = "SUNW,DBRIf", + }, + {}, +}; - while (this != NULL) { - struct snd_dbri *next = this->next; - struct snd_card *card = this->card; +MODULE_DEVICE_TABLE(of, dbri_match); - snd_dbri_free(this); - snd_card_free(card); - this = next; - } - dbri_list = NULL; +static struct of_platform_driver dbri_sbus_driver = { + .name = "dbri", + .match_table = dbri_match, + .probe = dbri_probe, + .remove = __devexit_p(dbri_remove), +}; + +/* Probe for the dbri chip and then attach the driver. */ +static int __init dbri_init(void) +{ + return of_register_driver(&dbri_sbus_driver, &sbus_bus_type); +} + +static void __exit dbri_exit(void) +{ + of_unregister_driver(&dbri_sbus_driver); } module_init(dbri_init);

3 2

[alsa-devel] [PATCH] echoaudio, about changeset 5389
by Giuliano Pochini 16 Sep '07

16 Sep '07

About changeset 5389: Remove superfluous volatile prefix. It's fine, except for the struct comm_page.handshake which is polled by echoaudio_dsp.c::wait_handshake(). Without volatile we need another way to prevent the compiler from moving the read outside of the loop. If I overlooked something, please let me know. Short descr.: This patch adds a barrier() to prevent the compiler from moving the read outside of the loop. It also fixes a comment. Signed-off-by: Giuliano Pochini <pochini(a)shiny.it> --- alsa-kernel/pci/echoaudio/echoaudio_dsp.c__orig 2007-09-16 22:33:37.000000000 +0200 +++ alsa-kernel/pci/echoaudio/echoaudio_dsp.c 2007-09-16 22:39:58.000000000 +0200 @@ -43,11 +43,11 @@ static int wait_handshake(struct echoaud { int i; - /* Wait up to 10ms for the handshake from the DSP */ + /* Wait up to 20ms for the handshake from the DSP */ for (i = 0; i < HANDSHAKE_TIMEOUT; i++) { /* Look for the handshake value */ + barrier(); if (chip->comm_page->handshake) { - /*if (i) DE_ACT(("Handshake time: %d\n", i));*/ return 0; } udelay(1); -- Giuliano.

1 0

[alsa-devel] simple ALSA source code?
by william estrada 16 Sep '07

16 Sep '07

Hi guys, I am looking for a 'simple' C player program that uses ALSA. I found this link "http://www.linuxjournal.com/article/6735/print" which has sample code but it is old and does not work. The player produces noise from a file created with arecord. I am looking for a set of simple programs for creating and playing wav files. Something I could modify for my needs. I want command line interface type not a GUI. Thanks for your time. -- William Estrada MrUmunhum(a)popdial.com Mt-Umunhum-Wireless.net ( http://Mt-Umunhum-Wireless.net ) Ymessenger: MrUmunhum

2 1

[alsa-devel] MAYA44 PCI ALSA driver for 300$
by Piotr Makowski 16 Sep '07

16 Sep '07

Hi all, I have just created the project "ESI MAYA44 PCI ALSA Driver" on getacoder.com. http://www.getacoder.com/projects/esi_maya_pci_alsa_driver_59542.html If anybody is interested in MAYA44 case, please bid or watch the post. -- Regards, Piotr Makowski

1 0

[alsa-devel] Per option CFLAGS?
by Rene Herman 15 Sep '07

15 Sep '07

Hi Kai, Sam. I have a single file foo.c that I want to generate two (ALSA) modules from, snd-foo2000.ko and snd-foo2001.ko, by compiling with either FOO2000 or FOO2001 defined. I can do this, and ALSA does this a few times, by providing dummy foo2000.c and foo2001.c files, like: === foo2000.c #define FOO2000 #include "foo.c" === and a regular Makefile === foo2000-objs := foo2000.o foo2001-objs := foo2001.o obj-$(CONFIG_SND_FOO2000) += snd-foo2000.o obj-$(CONFIG_SND_F002001) += snd-foo2001.o === That #include is a little lame though. Is there a nicer way? I noticed the per-file CFLAGS, but given that it's one source file for both, that doesn't fit. Rene.

4 7