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

[alsa-devel] [PATCH] s3c2443-ac97: compilation fix
by Krzysztof Helt 18 Oct '07

18 Oct '07

From: Krzysztof Helt <krzysztof.h1(a)wp.pl> The Samsung S3C24xx uses new architecture file layout in the post 2.6.23 kernel. This patch fixes include path for the s3c2443-ac97.c. Signed-off-by: Krzysztof Helt <krzysztof.h1(a)wp.pl> --- The patch was done against the 2.6.23-git13 kernel. diff -urp linux-ref/sound/soc/s3c24xx/s3c2443-ac97.c linux-new/sound/soc/s3c24xx/s3c2443-ac97.c --- linux-ref/sound/soc/s3c24xx/s3c2443-ac97.c 2007-10-09 22:31:38.000000000 +0200 +++ linux-new/sound/soc/s3c24xx/s3c2443-ac97.c 2007-10-18 22:27:43.547470033 +0200 @@ -32,7 +32,7 @@ #include <asm/hardware.h> #include <asm/io.h> -#include <asm/arch/regs-ac97.h> +#include <asm/plat-s3c/regs-ac97.h> #include <asm/arch/regs-gpio.h> #include <asm/arch/regs-clock.h> #include <asm/arch/audio.h> ---------------------------------------------------------------------- Jaros�aw Drob, Przyjdziemy i Spie***ymy - poznaj kandydata! Kliknij >>> http://link.interia.pl/f1bef

1 0

[alsa-devel] Kernel hierarchy
by Adrian McMenamin 18 Oct '07

18 Oct '07

Why are sound drivers in /sound and not /drivers/sound? Ok, not the world's most pressing problem, but enquiring minds want to know! Adrian

2 1

[alsa-devel] [PATCH] hda: STAC9228 DMIC Support
by Matthew Ranostay 18 Oct '07

18 Oct '07

Added DMIC support for STAC9228 cards, as well as adding terminators to other hda_nid DMIC arrays, and added a new Vendor ID tag. --- Signed-off-by: Matthew Ranostay <mranostay(a)embeddedalley.com> diff -r e91f57f8127a pci/hda/hda_codec.c --- a/pci/hda/hda_codec.c Tue Oct 09 11:58:41 2007 +0200 +++ b/pci/hda/hda_codec.c Wed Oct 17 11:59:47 2007 -0400 @@ -55,6 +55,7 @@ static struct hda_vendor_id hda_vendor_i { 0x10ec, "Realtek" }, { 0x1057, "Motorola" }, { 0x1106, "VIA" }, + { 0x111d, "IDT" }, { 0x11d4, "Analog Devices" }, { 0x13f6, "C-Media" }, { 0x14f1, "Conexant" }, diff -r e91f57f8127a pci/hda/patch_sigmatel.c --- a/pci/hda/patch_sigmatel.c Tue Oct 09 11:58:41 2007 +0200 +++ b/pci/hda/patch_sigmatel.c Wed Oct 17 13:06:58 2007 -0400 @@ -182,8 +182,9 @@ static hda_nid_t stac925x_dac_nids[1] = 0x02, }; -static hda_nid_t stac925x_dmic_nids[1] = { - 0x15, +static hda_nid_t stac925x_dmic_nids[2] = { + 0x15, + 0x00, /* terminator */ }; static hda_nid_t stac922x_adc_nids[2] = { @@ -202,6 +203,11 @@ static hda_nid_t stac927x_mux_nids[3] = 0x15, 0x16, 0x17 }; +static hda_nid_t stac927x_dmic_nids[3] = { + 0x13, 0x14, + 0x00, /* terminator */ +}; + static hda_nid_t stac9205_adc_nids[2] = { 0x12, 0x13 }; @@ -210,8 +216,9 @@ static hda_nid_t stac9205_mux_nids[2] = 0x19, 0x1a }; -static hda_nid_t stac9205_dmic_nids[2] = { +static hda_nid_t stac9205_dmic_nids[3] = { 0x17, 0x18, + 0x00, /* terminator */ }; static hda_nid_t stac9200_pin_nids[8] = { @@ -2716,7 +2723,6 @@ static int patch_stac927x(struct hda_cod spec->mux_nids = stac927x_mux_nids; spec->num_muxes = ARRAY_SIZE(stac927x_mux_nids); spec->num_adcs = ARRAY_SIZE(stac927x_adc_nids); - spec->num_dmics = 0; spec->init = d965_core_init; spec->mixer = stac927x_mixer; break; @@ -2725,7 +2731,6 @@ static int patch_stac927x(struct hda_cod spec->mux_nids = stac927x_mux_nids; spec->num_muxes = ARRAY_SIZE(stac927x_mux_nids); spec->num_adcs = ARRAY_SIZE(stac927x_adc_nids); - spec->num_dmics = 0; spec->init = d965_core_init; spec->mixer = stac927x_mixer; break; @@ -2734,9 +2739,18 @@ static int patch_stac927x(struct hda_cod spec->mux_nids = stac927x_mux_nids; spec->num_muxes = ARRAY_SIZE(stac927x_mux_nids); spec->num_adcs = ARRAY_SIZE(stac927x_adc_nids); - spec->num_dmics = 0; spec->init = stac927x_core_init; spec->mixer = stac927x_mixer; + } + + switch (codec->subsystem_id) { + case 0x1028020A: /* STAC 9228 */ + case 0x10280209: /* STAC 9228 */ + spec->dmic_nids = stac927x_dmic_nids; + spec->num_dmics = 2; + break; + default: + spec->num_dmics = 0; } spec->multiout.dac_nids = spec->dac_nids; @@ -2798,7 +2812,7 @@ static int patch_stac9205(struct hda_cod spec->mux_nids = stac9205_mux_nids; spec->num_muxes = ARRAY_SIZE(stac9205_mux_nids); spec->dmic_nids = stac9205_dmic_nids; - spec->num_dmics = ARRAY_SIZE(stac9205_dmic_nids); + spec->num_dmics = 2; spec->dmux_nid = 0x1d; spec->init = stac9205_core_init;

2 3

[alsa-devel] alsa-driver-1.0.15rc2 build issues on RHEL4/CentOS4
by James Pearson 18 Oct '07

18 Oct '07

alsa-driver-1.0.15rc2 won't build cleanly on RHEL4/CentOS4 (2.6.9 based kernel). I've included the relevant errors below after running: configure --with-redhat make -i The problem with misc/ac97_bus.c, I've already reported at: <http://mailman.alsa-project.org/pipermail/alsa-devel/2007-September/003119.…> James Pearson Build errors: CC [M] /tmp/alsa-driver-1.0.15rc2/misc/ac97_bus.o In file included from /tmp/alsa-driver-1.0.15rc2/misc/ac97_bus.c:3: /tmp/alsa-driver-1.0.15rc2/misc/../alsa-kernel/ac97_bus.c: In function `ac97_bus_suspend': /tmp/alsa-driver-1.0.15rc2/misc/../alsa-kernel/ac97_bus.c:35: error: too few arguments to function /tmp/alsa-driver-1.0.15rc2/misc/../alsa-kernel/ac97_bus.c: In function `ac97_bus_resume': /tmp/alsa-driver-1.0.15rc2/misc/../alsa-kernel/ac97_bus.c:45: error: too few arguments to function make[4]: [/tmp/alsa-driver-1.0.15rc2/misc/ac97_bus.o] Error 1 (ignored) CC [M] /tmp/alsa-driver-1.0.15rc2/pci/cs5535audio/cs5535audio_pm.o In file included from /tmp/alsa-driver-1.0.15rc2/pci/cs5535audio/cs5535audio_pm.c:2: /tmp/alsa-driver-1.0.15rc2/pci/cs5535audio/../../alsa-kernel/pci/cs5535audio/cs5535audio_pm.c: In function `snd_cs5535audio_suspend': /tmp/alsa-driver-1.0.15rc2/pci/cs5535audio/../../alsa-kernel/pci/cs5535audio/cs5535audio_pm.c:77: error: void value not ignored as it ought to be /tmp/alsa-driver-1.0.15rc2/pci/cs5535audio/../../alsa-kernel/pci/cs5535audio/cs5535audio_pm.c: In function `snd_cs5535audio_resume': /tmp/alsa-driver-1.0.15rc2/pci/cs5535audio/../../alsa-kernel/pci/cs5535audio/cs5535audio_pm.c:95: error: void value not ignored as it ought to be make[5]: [/tmp/alsa-driver-1.0.15rc2/pci/cs5535audio/cs5535audio_pm.o] Error 1 (ignored) LD [M] /tmp/alsa-driver-1.0.15rc2/pci/cs5535audio/snd-cs5535audio.o ld: /tmp/alsa-driver-1.0.15rc2/pci/cs5535audio/cs5535audio_pm.o: No such file: No such file or directory make[5]: [/tmp/alsa-driver-1.0.15rc2/pci/cs5535audio/snd-cs5535audio.o] Error 1 (ignored) Building modules, stage 2. MODPOST *** Warning: "class_device_destroy" [/tmp/alsa-driver-1.0.15rc2/pci/asihpi/snd-asihpi.ko] undefined! *** Warning: "ac97_bus_type" [/tmp/alsa-driver-1.0.15rc2/pci/ac97/snd-ac97-codec.ko] undefined! *** Warning: "platform_device_alloc" [/tmp/alsa-driver-1.0.15rc2/drivers/snd-portman2x4.ko] undefined! *** Warning: "platform_device_add" [/tmp/alsa-driver-1.0.15rc2/drivers/snd-portman2x4.ko] undefined! *** Warning: "platform_device_put" [/tmp/alsa-driver-1.0.15rc2/drivers/snd-portman2x4.ko] undefined! *** Warning: "platform_device_alloc" [/tmp/alsa-driver-1.0.15rc2/drivers/snd-mts64.ko] undefined! *** Warning: "platform_device_add" [/tmp/alsa-driver-1.0.15rc2/drivers/snd-mts64.ko] undefined! *** Warning: "platform_device_put" [/tmp/alsa-driver-1.0.15rc2/drivers/snd-mts64.ko] undefined!

2 9

[alsa-devel] [patch] snd_pcm_dmix_close: raise semaphore if unable to discard
by Mike Gorse 18 Oct '07

18 Oct '07

This patch causes snd_pcm_dmix_close() to up a semaphore after downing it if it is unable to discard it. It prevents some deadlock that I am getting when a couple of applications interact and one of them closes the device and later re-opens it. -- --- src/pcm/pcm_dmix.c.orig 2007-10-17 20:19:47.000000000 -0400 +++ src/pcm/pcm_dmix.c 2007-10-17 20:50:46.000000000 -0400 @@ -652,8 +652,11 @@ if (dmix->client) snd_pcm_direct_client_discard(dmix); shm_sum_discard(dmix); - if (snd_pcm_direct_shm_discard(dmix)) - snd_pcm_direct_semaphore_discard(dmix); + if (snd_pcm_direct_shm_discard(dmix)) { + if (snd_pcm_direct_semaphore_discard(dmix)) { + snd_pcm_direct_semaphore_up(dmix, DIRECT_IPC_SEM_CLIENT); + } + } else snd_pcm_direct_semaphore_up(dmix, DIRECT_IPC_SEM_CLIENT); free(dmix->bindings);

2 1

[alsa-devel] [patch] Fix bug with bt87x driver's load_all option
by Trent Piepho 18 Oct '07

18 Oct '07

snd-bt87x: Make the load_all option work correctly If the load_all option was turned on all cards would be treated as unknown, even those which are in the database. Of course, if the card is in the database there is no reason to use the load_all option. It's there to force loading when the card isn't in the database. But there are out of date wikis that say to do this and some distros might turn this option on by default. So, we keep the load_all option from turning known cards into unknown cards. Signed-off-by: Trent Piepho <xyzzy(a)speakeasy.org> diff --git a/pci/bt87x.c b/pci/bt87x.c --- a/pci/bt87x.c +++ b/pci/bt87x.c @@ -1021,7 +1021,7 @@ static int __devinit snd_bt87x_detect_ca int i; const struct pci_device_id *supported; - supported = pci_match_device(&driver, pci); + supported = pci_match_id(snd_bt87x_ids, pci); if (supported && supported->driver_data > 0) return supported->driver_data;

2 1

[alsa-devel] [PATCH] ALSA - protect Dreamcast PCM driver (AICA) from G2 bus effects
by Adrian McMenamin 18 Oct '07

18 Oct '07

The G2 bus on the SEGA Dreamcast connects both the maple peripheral bus and the AICA sound memory. DMA requests on one can cause the other to timeout on memory operations. This patch prevents maple interrupts from causing hiccoughs in the AICA sound (maple bus code will land in 2.6.24). There are other cleanups for this (AICA) code - but this is in effect a regression fix rather than a cleanup. Signed-off-by: Adrian McMenamin <adrian(a)mcmen.demon.co.uk> diff --git a/sound/sh/aica.c b/sound/sh/aica.c index 7397865..407981d 100644 --- a/sound/sh/aica.c +++ b/sound/sh/aica.c @@ -106,11 +106,14 @@ static void spu_write_wait(void) static void spu_memset(u32 toi, u32 what, int length) { int i; + unsigned long flags; snd_assert(length % 4 == 0, return); for (i = 0; i < length; i++) { if (!(i % 8)) spu_write_wait(); + local_irq_save(flags); writel(what, toi + SPU_MEMORY_BASE); + local_irq_restore(flags); toi++; } } @@ -118,6 +121,7 @@ static void spu_memset(u32 toi, u32 what, int length) /* spu_memload - write to SPU address space */ static void spu_memload(u32 toi, void *from, int length) { + unsigned long flags; u32 *froml = from; u32 __iomem *to = (u32 __iomem *) (SPU_MEMORY_BASE + toi); int i; @@ -128,7 +132,9 @@ static void spu_memload(u32 toi, void *from, int length) if (!(i % 8)) spu_write_wait(); val = *froml; + local_irq_save(flags); writel(val, to); + local_irq_restore(flags); froml++; to++; } @@ -138,28 +144,36 @@ static void spu_memload(u32 toi, void *from, int length) static void spu_disable(void) { int i; + unsigned long flags; u32 regval; spu_write_wait(); regval = readl(ARM_RESET_REGISTER); regval |= 1; spu_write_wait(); + local_irq_save(flags); writel(regval, ARM_RESET_REGISTER); + local_irq_restore(flags); for (i = 0; i < 64; i++) { spu_write_wait(); regval = readl(SPU_REGISTER_BASE + (i * 0x80)); regval = (regval & ~0x4000) | 0x8000; spu_write_wait(); + local_irq_save(flags); writel(regval, SPU_REGISTER_BASE + (i * 0x80)); + local_irq_restore(flags); } } /* spu_enable - set spu registers to enable sound output */ static void spu_enable(void) { + unsigned long flags; u32 regval = readl(ARM_RESET_REGISTER); regval &= ~1; spu_write_wait(); + local_irq_save(flags); writel(regval, ARM_RESET_REGISTER); + local_irq_restore(flags); } /* @@ -168,25 +182,34 @@ static void spu_enable(void) */ static void spu_reset(void) { + unsigned long flags; spu_disable(); spu_memset(0, 0, 0x200000 / 4); /* Put ARM7 in endless loop */ + local_irq_save(flags); ctrl_outl(0xea000002, SPU_MEMORY_BASE); + local_irq_restore(flags); spu_enable(); } /* aica_chn_start - write to spu to start playback */ static void aica_chn_start(void) { + unsigned long flags; spu_write_wait(); + local_irq_save(flags); writel(AICA_CMD_KICK | AICA_CMD_START, (u32 *) AICA_CONTROL_POINT); + local_irq_restore(flags); } /* aica_chn_halt - write to spu to halt playback */ static void aica_chn_halt(void) { + unsigned long flags; spu_write_wait(); + local_irq_save(flags); writel(AICA_CMD_KICK | AICA_CMD_STOP, (u32 *) AICA_CONTROL_POINT); + local_irq_restore(flags); } /* ALSA code below */ @@ -213,12 +236,13 @@ static int aica_dma_transfer(int channels, int buffer_size, int q, err, period_offset; struct snd_card_aica *dreamcastcard; struct snd_pcm_runtime *runtime; - err = 0; + unsigned long flags; dreamcastcard = substream->pcm->private_data; period_offset = dreamcastcard->clicks; period_offset %= (AICA_PERIOD_NUMBER / channels); runtime = substream->runtime; for (q = 0; q < channels; q++) { + local_irq_save(flags); err = dma_xfer(AICA_DMA_CHANNEL, (unsigned long) (runtime->dma_area + (AICA_BUFFER_SIZE * q) / @@ -228,9 +252,12 @@ static int aica_dma_transfer(int channels, int buffer_size, AICA_CHANNEL0_OFFSET + q * CHANNEL_OFFSET + AICA_PERIOD_SIZE * period_offset, buffer_size / channels, AICA_DMA_MODE); - if (unlikely(err < 0)) + if (unlikely(err < 0)) { + local_irq_restore(flags); break; + } dma_wait_for_completion(AICA_DMA_CHANNEL); + local_irq_restore(flags); } return err; }

2 1

[alsa-devel] RME HDSP driver enhancements for HDSPe cards
by Ptitjes 18 Oct '07

18 Oct '07

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Hello, First, sorry for the cross-post, but as i did not know where to start, i wanted to ask to both lists. I bought a RME HDSPe PCI card. I should receive it in the following days. My plan is to: 1) Determine whether the current driver works as is with the HDSPe cards and make my report to both lists. 2) Enhance the current driver in order to take profit of the new feature (32bit float format) However, i am new to Alsa, Jack and HDSP driver internal code structure. So i wanted to collect informations and hints as where to start from and be the most efficient in starting the work as i can. Could you please give me links as to: - - General Alsa driver structure and data flow - - Work done by Alsa HDSP driver and work done by Jack (I ever thought most of the work is done by Jack as my current HDSP PCCard do not work with Alsa only) - - Parts of the Alsa HDSP driver that would a priori need changes. - - Parts of Jack that would a priori need changes. Thank you very much for your help. I hope i did not bother everyone with my newbie questions. Best regards, Didier. -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.7 (GNU/Linux) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org iD8DBQFHFdRLVE1mALQL3JsRAvp1AKCV7L7DdX1doenajmXFX8vnYkbbqQCgkbuS GZgsAKdtGyiwfP4vNYYdZb4= =vvgU -----END PGP SIGNATURE-----

2 1

[alsa-devel] 1.0.15rc3 patch_analog.s bug + fix
by Peter Skensved 17 Oct '07

17 Oct '07

Hi, I've come across a problem with the 1.0.15rc3 alsa driver on my Lenovo 3000 N100 laptop using the auto mute feature - it appears to work backwards ! Plugging in the headphones unmutes the external speakers and unplugging the heaphones mutes them ... Changing the if statement in line ~600 in patch_analog.c in ad1986a_update_hp to if (!spec->jack_preset) makes it work the intended way. ( spec->jack_present changes state _before_ the call to ad1986a_hp_automute ) peter ---- Peter Skensved Email : peter(a)SNO.Phy.QueensU.CA Dept. of Physics, Queen's University, Kingston, Ontario, Canada

5 13

[alsa-devel] Recent ALSA version needs special configuration for Terratec Phase 26 USB
by Janne Himanka 17 Oct '07

17 Oct '07

Hello, I run Debian unstable on my Athlon XP1800 machine, and updating libasound2 package from version 1.0.13-2 to 1.0.14 (and later) made my Terratec Phase 26 USB soundcard useless. Whenever I tried to play something, the program would crash with a segmentation fault. When I downgraded to 1.0.13, everything would work again. It took a lot of head scratching and experimentation to find out that adding cards.USB-Audio.pcm.use_dmix."USB2448" no to my .asoundrc (it is otherwise empty) is needed for it to work. After adding that, it seems to work as it did before. The string in hyphens varies according to the mode one selects from the Terratec front panel. There are four modes with different word length and bitrates. The Phase 26 is adaptive; it doesn't need converting for a specific format. Bitrates from 32 KHz to 96 KHz and word lengths from 16 to 32 bits just work. I'm writing you this because a comment in USB-Audio.conf says: # If your device requires such a definition to work correctly, please report it # to <alsa-devel(a)alsa-project.org>. If you need any additional info, I'll be glad to help. Regards, Janne Himanka

2 1