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

[alsa-devel] [PATCH 1/2] ac97: YMF743 missing controls support
by Keita Maehara 18 Sep '07

18 Sep '07

From: Keita Maehara <maehara(a)debian.org> These patches enable some YMF743 controls (Tone/3D/IEC958) that won't be detected with the current version of ALSA. Signed-off-by: Keita Maehara <maehara(a)debian.org> --- The first one contains only cosmetic changes to share a few YMF753-specific symbols with YMF743. diff -r 4a3f9f77e676 include/ac97_codec.h --- a/include/ac97_codec.h Mon Sep 17 16:26:16 2007 +0200 +++ b/include/ac97_codec.h Tue Sep 18 00:27:24 2007 +0900 @@ -345,9 +345,9 @@ #define AC97_ALC650_GPIO_STATUS 0x78 #define AC97_ALC650_CLOCK 0x7a -/* specific - Yamaha YMF753 */ -#define AC97_YMF753_DIT_CTRL2 0x66 /* DIT Control 2 */ -#define AC97_YMF753_3D_MODE_SEL 0x68 /* 3D Mode Select */ +/* specific - Yamaha YMF7x3 */ +#define AC97_YMF7X3_DIT_CTRL 0x66 /* DIT Control (YMF743) / 2 (YMF753) */ +#define AC97_YMF7X3_3D_MODE_SEL 0x68 /* 3D Mode Select */ /* specific - C-Media */ #define AC97_CM9738_VENDOR_CTRL 0x5a diff -r 4a3f9f77e676 pci/ac97/ac97_patch.c --- a/pci/ac97/ac97_patch.c Mon Sep 17 16:26:16 2007 +0200 +++ b/pci/ac97/ac97_patch.c Tue Sep 18 00:27:24 2007 +0900 @@ -205,8 +205,8 @@ static inline int is_shared_micin(struct /* The following snd_ac97_ymf753_... items added by David Shust (dshust(a)shustring.com) */ -/* It is possible to indicate to the Yamaha YMF753 the type of speakers being used. */ -static int snd_ac97_ymf753_info_speaker(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo) +/* It is possible to indicate to the Yamaha YMF7x3 the type of speakers being used. */ +static int snd_ac97_ymf7x3_info_speaker(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo) { static char *texts[3] = { "Standard", "Small", "Smaller" @@ -221,12 +221,12 @@ static int snd_ac97_ymf753_info_speaker( return 0; } -static int snd_ac97_ymf753_get_speaker(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol) +static int snd_ac97_ymf7x3_get_speaker(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol) { struct snd_ac97 *ac97 = snd_kcontrol_chip(kcontrol); unsigned short val; - val = ac97->regs[AC97_YMF753_3D_MODE_SEL]; + val = ac97->regs[AC97_YMF7X3_3D_MODE_SEL]; val = (val >> 10) & 3; if (val > 0) /* 0 = invalid */ val--; @@ -234,7 +234,7 @@ static int snd_ac97_ymf753_get_speaker(s return 0; } -static int snd_ac97_ymf753_put_speaker(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol) +static int snd_ac97_ymf7x3_put_speaker(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol) { struct snd_ac97 *ac97 = snd_kcontrol_chip(kcontrol); unsigned short val; @@ -242,20 +242,20 @@ static int snd_ac97_ymf753_put_speaker(s if (ucontrol->value.enumerated.item[0] > 2) return -EINVAL; val = (ucontrol->value.enumerated.item[0] + 1) << 10; - return snd_ac97_update(ac97, AC97_YMF753_3D_MODE_SEL, val); -} - -static const struct snd_kcontrol_new snd_ac97_ymf753_controls_speaker = + return snd_ac97_update(ac97, AC97_YMF7X3_3D_MODE_SEL, val); +} + +static const struct snd_kcontrol_new snd_ac97_ymf7x3_controls_speaker = { .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = "3D Control - Speaker", - .info = snd_ac97_ymf753_info_speaker, - .get = snd_ac97_ymf753_get_speaker, - .put = snd_ac97_ymf753_put_speaker, -}; - -/* It is possible to indicate to the Yamaha YMF753 the source to direct to the S/PDIF output. */ -static int snd_ac97_ymf753_spdif_source_info(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo) + .info = snd_ac97_ymf7x3_info_speaker, + .get = snd_ac97_ymf7x3_get_speaker, + .put = snd_ac97_ymf7x3_put_speaker, +}; + +/* It is possible to indicate to the Yamaha YMF7x3 the source to direct to the S/PDIF output. */ +static int snd_ac97_ymf7x3_spdif_source_info(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo) { static char *texts[2] = { "AC-Link", "A/D Converter" }; @@ -268,17 +268,17 @@ static int snd_ac97_ymf753_spdif_source_ return 0; } -static int snd_ac97_ymf753_spdif_source_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol) +static int snd_ac97_ymf7x3_spdif_source_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol) { struct snd_ac97 *ac97 = snd_kcontrol_chip(kcontrol); unsigned short val; - val = ac97->regs[AC97_YMF753_DIT_CTRL2]; + val = ac97->regs[AC97_YMF7X3_DIT_CTRL]; ucontrol->value.enumerated.item[0] = (val >> 1) & 1; return 0; } -static int snd_ac97_ymf753_spdif_source_put(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol) +static int snd_ac97_ymf7x3_spdif_source_put(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol) { struct snd_ac97 *ac97 = snd_kcontrol_chip(kcontrol); unsigned short val; @@ -286,7 +286,7 @@ static int snd_ac97_ymf753_spdif_source_ if (ucontrol->value.enumerated.item[0] > 1) return -EINVAL; val = ucontrol->value.enumerated.item[0] << 1; - return snd_ac97_update_bits(ac97, AC97_YMF753_DIT_CTRL2, 0x0002, val); + return snd_ac97_update_bits(ac97, AC97_YMF7X3_DIT_CTRL, 0x0002, val); } /* The AC'97 spec states that the S/PDIF signal is to be output at pin 48. @@ -311,7 +311,7 @@ static int snd_ac97_ymf753_spdif_output_ struct snd_ac97 *ac97 = snd_kcontrol_chip(kcontrol); unsigned short val; - val = ac97->regs[AC97_YMF753_DIT_CTRL2]; + val = ac97->regs[AC97_YMF7X3_DIT_CTRL]; ucontrol->value.enumerated.item[0] = (val & 0x0008) ? 2 : (val & 0x0020) ? 1 : 0; return 0; } @@ -325,7 +325,7 @@ static int snd_ac97_ymf753_spdif_output_ return -EINVAL; val = (ucontrol->value.enumerated.item[0] == 2) ? 0x0008 : (ucontrol->value.enumerated.item[0] == 1) ? 0x0020 : 0; - return snd_ac97_update_bits(ac97, AC97_YMF753_DIT_CTRL2, 0x0028, val); + return snd_ac97_update_bits(ac97, AC97_YMF7X3_DIT_CTRL, 0x0028, val); /* The following can be used to direct S/PDIF output to pin 47 (EAPD). snd_ac97_write_cache(ac97, 0x62, snd_ac97_read(ac97, 0x62) | 0x0008); */ } @@ -334,9 +334,9 @@ static const struct snd_kcontrol_new snd { .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = SNDRV_CTL_NAME_IEC958("",PLAYBACK,NONE) "Source", - .info = snd_ac97_ymf753_spdif_source_info, - .get = snd_ac97_ymf753_spdif_source_get, - .put = snd_ac97_ymf753_spdif_source_put, + .info = snd_ac97_ymf7x3_spdif_source_info, + .get = snd_ac97_ymf7x3_spdif_source_get, + .put = snd_ac97_ymf7x3_spdif_source_put, }, { .iface = SNDRV_CTL_ELEM_IFACE_MIXER, @@ -345,10 +345,10 @@ static const struct snd_kcontrol_new snd .get = snd_ac97_ymf753_spdif_output_pin_get, .put = snd_ac97_ymf753_spdif_output_pin_put, }, - AC97_SINGLE(SNDRV_CTL_NAME_IEC958("",NONE,NONE) "Mute", AC97_YMF753_DIT_CTRL2, 2, 1, 1) -}; - -static int patch_yamaha_ymf753_3d(struct snd_ac97 * ac97) + AC97_SINGLE(SNDRV_CTL_NAME_IEC958("",NONE,NONE) "Mute", AC97_YMF7X3_DIT_CTRL, 2, 1, 1) +}; + +static int patch_yamaha_ymf7x3_3d(struct snd_ac97 * ac97) { struct snd_kcontrol *kctl; int err; @@ -358,9 +358,9 @@ static int patch_yamaha_ymf753_3d(struct strcpy(kctl->id.name, "3D Control - Wide"); kctl->private_value = AC97_SINGLE_VALUE(AC97_3D_CONTROL, 9, 7, 0); snd_ac97_write_cache(ac97, AC97_3D_CONTROL, 0x0000); - if ((err = snd_ctl_add(ac97->bus->card, snd_ac97_cnew(&snd_ac97_ymf753_controls_speaker, ac97))) < 0) + if ((err = snd_ctl_add(ac97->bus->card, snd_ac97_cnew(&snd_ac97_ymf7x3_controls_speaker, ac97))) < 0) return err; - snd_ac97_write_cache(ac97, AC97_YMF753_3D_MODE_SEL, 0x0c00); + snd_ac97_write_cache(ac97, AC97_YMF7X3_3D_MODE_SEL, 0x0c00); return 0; } @@ -374,7 +374,7 @@ static int patch_yamaha_ymf753_post_spdi } static struct snd_ac97_build_ops patch_yamaha_ymf753_ops = { - .build_3d = patch_yamaha_ymf753_3d, + .build_3d = patch_yamaha_ymf7x3_3d, .build_post_spdif = patch_yamaha_ymf753_post_spdif };

1 0

[alsa-devel] alsa-tools -> usx2yloader
by Elimar Riesebieter 18 Sep '07

18 Sep '07

Hi all, according to Debian #436502 I am asking herefore if there are plans to port asx2yloader from the old hotplug to udev? Debian lenny/sid relies on udev only, though. Thanks in advance Elimar -- It's a good thing we don't get all the government we pay for.

4 9

[alsa-devel] snd_mixart_send_msg / snd_mixart_send_msg_wait_notif
by Rene Herman 18 Sep '07

18 Sep '07

Hi. While looking through ALSA for schedule_timeout() calls, I ran into: int snd_mixart_send_msg(...) { [ ... ] set_current_state(TASK_UNINTERRUPTIBLE); add_wait_queue(&mgr->msg_sleep, &wait); spin_unlock_irq(&mgr->msg_lock); timeout = schedule_timeout(MSG_TIMEOUT_JIFFIES); remove_wait_queue(&mgr->msg_sleep, &wait); if (! timeout) { /* error - no ack */ mutex_unlock(&mgr->msg_mutex); snd_printk(KERN_ERR "error: no reponse on msg %x\n", msg_frame); return -EIO; } [ ... ] } and the same in snd_mixart_send_msg_wait_notif(). I believe there to be something wrong with this code. A schedule_timeout() in TASK_UNINTERRUPTIBLE is always going to return 0. Didn't you intend to use a wait_event_timeout() or something like that? Puzzled, since you err out on !timeout, and it seems every run through this would end up there. Rene.

2 3

[alsa-devel] [PATCH] cs4231: remove two auto-calibrations during chip initialization
by Krzysztof Helt 18 Sep '07

18 Sep '07

From: Krzysztof Helt <krzysztof.h1(a)wp.pl> The initialization function did auto-calibration after each register setting. This patch merges more register changes before auto-calibration is done. Signed-off-by: Krzysztof Helt <krzysztof.h1(a)wp.pl> --- This is in the init() function so it is called just once. The patch is about cutting fat from cs4231 drivers as this change does not affect how they operate in any major way. diff -urp alsa-driver-1.0.15rc2/sound/isa/cs423x/cs4231_lib.c linux-2.6.23/sound/isa/cs423x/cs4231_lib.c --- alsa-driver-1.0.15rc2/sound/isa/cs423x/cs4231_lib.c 2007-09-12 13:33:51.000000000 +0200 +++ linux-2.6.23/sound/isa/cs423x/cs4231_lib.c 2007-09-18 08:37:08.000000000 +0200 @@ -652,15 +652,7 @@ static void snd_cs4231_init(struct snd_c CS4231_CALIB_MODE); chip->image[CS4231_IFACE_CTRL] |= CS4231_AUTOCALIB; snd_cs4231_out(chip, CS4231_IFACE_CTRL, chip->image[CS4231_IFACE_CTRL]); - spin_unlock_irqrestore(&chip->reg_lock, flags); - snd_cs4231_mce_down(chip); - -#ifdef SNDRV_DEBUG_MCE - snd_printk("init: (2)\n"); -#endif - snd_cs4231_mce_up(chip); - spin_lock_irqsave(&chip->reg_lock, flags); snd_cs4231_out(chip, CS4231_ALT_FEATURE_1, chip->image[CS4231_ALT_FEATURE_1]); spin_unlock_irqrestore(&chip->reg_lock, flags); snd_cs4231_mce_down(chip); @@ -676,15 +668,6 @@ static void snd_cs4231_init(struct snd_c snd_cs4231_mce_up(chip); spin_lock_irqsave(&chip->reg_lock, flags); snd_cs4231_out(chip, CS4231_PLAYBK_FORMAT, chip->image[CS4231_PLAYBK_FORMAT]); - spin_unlock_irqrestore(&chip->reg_lock, flags); - snd_cs4231_mce_down(chip); - -#ifdef SNDRV_DEBUG_MCE - snd_printk("init: (4)\n"); -#endif - - snd_cs4231_mce_up(chip); - spin_lock_irqsave(&chip->reg_lock, flags); snd_cs4231_out(chip, CS4231_REC_FORMAT, chip->image[CS4231_REC_FORMAT]); spin_unlock_irqrestore(&chip->reg_lock, flags); snd_cs4231_mce_down(chip); diff -urp linux-2.6.23.ref/sound/sparc/cs4231.c linux-2.6.23/sound/sparc/cs4231.c --- linux-2.6.23.ref/sound/sparc/cs4231.c 2007-09-18 09:26:12.000000000 +0200 +++ linux-2.6.23/sound/sparc/cs4231.c 2007-09-18 09:26:54.000000000 +0200 @@ -733,15 +733,6 @@ static void __init snd_cs4231_init(struc CS4231_CALIB_MODE); chip->image[CS4231_IFACE_CTRL] |= CS4231_AUTOCALIB; snd_cs4231_out(chip, CS4231_IFACE_CTRL, chip->image[CS4231_IFACE_CTRL]); - spin_unlock_irqrestore(&chip->lock, flags); - snd_cs4231_mce_down(chip); - -#ifdef SNDRV_DEBUG_MCE - snd_printdd("init: (2)\n"); -#endif - - snd_cs4231_mce_up(chip); - spin_lock_irqsave(&chip->lock, flags); snd_cs4231_out(chip, CS4231_ALT_FEATURE_1, chip->image[CS4231_ALT_FEATURE_1]); spin_unlock_irqrestore(&chip->lock, flags); snd_cs4231_mce_down(chip); @@ -757,15 +748,6 @@ static void __init snd_cs4231_init(struc snd_cs4231_mce_up(chip); spin_lock_irqsave(&chip->lock, flags); snd_cs4231_out(chip, CS4231_PLAYBK_FORMAT, chip->image[CS4231_PLAYBK_FORMAT]); - spin_unlock_irqrestore(&chip->lock, flags); - snd_cs4231_mce_down(chip); - -#ifdef SNDRV_DEBUG_MCE - snd_printdd("init: (4)\n"); -#endif - - snd_cs4231_mce_up(chip); - spin_lock_irqsave(&chip->lock, flags); snd_cs4231_out(chip, CS4231_REC_FORMAT, chip->image[CS4231_REC_FORMAT]); spin_unlock_irqrestore(&chip->lock, flags); snd_cs4231_mce_down(chip);

3 3

[alsa-devel] [PATCH] ad1848: remove redundant autocalibration
by Krzysztof Helt 18 Sep '07

18 Sep '07

From: Krzysztof Helt <krzysztof.h1(a)wp.pl> This patch removes redundant auto-calibration (mce up/down sequence) from snd_ad1848_open(). Signed-off-by: Krzysztof Helt <krzysztof.h1(a)wp.pl> --- The docs says that changing the Interface Configuration register and the Format/Clock register requires the MCE bit set. However, the docs do not say that additional auto-calibration is required after setting one register and before setting the other. Now, both registers are set at once. Tested on SC-6000. This should reduce opening latency by one auto-calibration period. diff -urp linux-2.6.22.old/sound/isa/ad1848/ad1848_lib.c linux-2.6.23/sound/isa/ad1848/ad1848_lib.c --- linux-2.6.22.old/sound/isa/ad1848/ad1848_lib.c 2007-09-12 13:33:51.000000000 +0200 +++ linux-2.6.23/sound/isa/ad1848/ad1848_lib.c 2007-09-18 00:36:33.000000000 +0200 @@ -408,17 +408,8 @@ static int snd_ad1848_open(struct snd_ad AD1848_CALIB_MODE); chip->image[AD1848_IFACE_CTRL] |= AD1848_AUTOCALIB; snd_ad1848_out(chip, AD1848_IFACE_CTRL, chip->image[AD1848_IFACE_CTRL]); - spin_unlock_irqrestore(&chip->reg_lock, flags); - snd_ad1848_mce_down(chip); - -#ifdef SNDRV_DEBUG_MCE - snd_printk("open: (2)\n"); -#endif snd_ad1848_set_data_format(chip, NULL); - - snd_ad1848_mce_up(chip); - spin_lock_irqsave(&chip->reg_lock, flags); snd_ad1848_out(chip, AD1848_DATA_FORMAT, chip->image[AD1848_DATA_FORMAT]); spin_unlock_irqrestore(&chip->reg_lock, flags); snd_ad1848_mce_down(chip);

1 0

[alsa-devel] E-MU 0404/0202 USB implementation
by James Courtier-Dutton 18 Sep '07

18 Sep '07

Hi, I am looking to implement support for the E-Mu USB cards. The card is basically following a mix of USB 1.0 and USB 2.0 descriptors. The bInterfaceClass field of the standard interface descriptors for the Audio Control, Audio Streaming, and MIDI Streaming interfaces are set to 0xFF (vendor-specific) instead of 0x01 (USB Audio). Can I put in a quirk into the snd-usb-audio driver to handle this? The card also has customised controls. Can one add those to snd-usb-audio, or would it be better to add those to a totally new driver? Kind Regards James

2 1

[alsa-devel] Current ad1848/cs4231 mce_down code
by Rene Herman 18 Sep '07

18 Sep '07

By the way, while looking at the current mce_down code: http://hg.alsa-project.org/alsa-kernel/file/0028e39ead78/isa/ad1848/ad1848_… http://hg.alsa-project.org/alsa-kernel/file/0028e39ead78/isa/cs423x/cs4231_… we have the ad1848 loops doing: end_time = jiffies + msecs_to_jiffies(250); while (snd_ad1848_in(chip, AD1848_TEST_INIT) & AD1848_CALIB_IN_PROGRESS) { spin_unlock_irqrestore(&chip->reg_lock, flags); (---) if (time_after(jiffies, end_time)) { snd_printk(KERN_ERR " [ timeout ] ") return; } msleep(1); spin_lock_irqsave(&chip->reg_lock, flags); } At (---) we are no longer atomic, so imagine being pre-empted there. When we get back, we may/will well be past end_time and although by now calibration has long finished, we bail out believing we've timed out. Should it rather be this (probably with a "goto eror" type of setup, but as far as the logic is concerned)? end_time = jiffies + msecs_to_jiffies(250); while (snd_ad1848_in(chip, AD1848_TEST_INIT) & AD1848_CALIB_IN_PROGRESS) { if (time_after(jiffies, end_time)) { spin_unlock_irqrestore(&chip->reg_lock, flags); snd_printk(KERN_ERR " [ timeout ] ") return; } spin_unlock_irqrestore(&chip->reg_lock, flags); msleep(1); spin_lock_irqsave(&chip->reg_lock, flags); } Moreover, we aren't under lock at all in the cs4231 version (which also means that msleep(1) thing is in fact fine there). Can't we do that for ad1848 as well? (but as said, minimal fix for now is the msleep(1) under lock fix in ad1848) Rene.

2 2

[alsa-devel] Fwd: [PATCH] Dreamcast AICA sound driver G2 bus handling
by Adrian McMenamin 18 Sep '07

18 Sep '07

Resending this as I typed the wrong address for alsa-devel last night. A general clean up as well as some changes to interrupt handling. This patch handles instability on the Dreamcast G2 bus while PIO or DMA is underway on the System -> AICA channel. Without the suspension of interrupts when PIO or DMA is underway the G2 bus is prone to timeouts leading to seemingly random crashes. This is particularly visible in cases such as maple bus (see http://lkml.org/lkml/2007/9/15/181) hotplugging but the patch is good for all conditions. 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..54aed1d 100644 --- a/sound/sh/aica.c +++ b/sound/sh/aica.c @@ -35,6 +35,7 @@ #include <linux/timer.h> #include <linux/delay.h> #include <linux/workqueue.h> +#include <linux/maple.h> #include <sound/driver.h> #include <sound/core.h> #include <sound/control.h> @@ -43,7 +44,8 @@ #include <sound/info.h> #include <asm/io.h> #include <asm/dma.h> -#include <asm/dreamcast/sysasic.h> +#include <asm/mach/sysasic.h> +#include <asm/mach/maple.h> #include "aica.h" MODULE_AUTHOR("Adrian McMenamin <adrian(a)mcmen.demon.co.uk>"); @@ -106,11 +108,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 +123,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 +134,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 +146,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); } /* @@ -178,15 +194,21 @@ static void spu_reset(void) /* 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 */ @@ -211,6 +233,7 @@ static int aica_dma_transfer(int channels, int buffer_size, struct snd_pcm_substream *substream) { int q, err, period_offset; + unsigned long flags; struct snd_card_aica *dreamcastcard; struct snd_pcm_runtime *runtime; err = 0; @@ -218,6 +241,7 @@ static int aica_dma_transfer(int channels, int buffer_size, period_offset = dreamcastcard->clicks; period_offset %= (AICA_PERIOD_NUMBER / channels); runtime = substream->runtime; + local_irq_save(flags); for (q = 0; q < channels; q++) { err = dma_xfer(AICA_DMA_CHANNEL, (unsigned long) (runtime->dma_area + @@ -232,6 +256,7 @@ static int aica_dma_transfer(int channels, int buffer_size, break; dma_wait_for_completion(AICA_DMA_CHANNEL); } + local_irq_restore(flags); return err; } @@ -277,18 +302,21 @@ static void aica_period_elapsed(unsigned long timer_var) { /*timer function - so cannot sleep */ int play_period; + unsigned long flags; struct snd_pcm_runtime *runtime; struct snd_pcm_substream *substream; struct snd_card_aica *dreamcastcard; substream = (struct snd_pcm_substream *) timer_var; runtime = substream->runtime; dreamcastcard = substream->pcm->private_data; - /* Have we played out an additional period? */ + local_irq_save(flags); + /* now check if additional period has been played */ play_period = frames_to_bytes(runtime, readl (AICA_CONTROL_CHANNEL_SAMPLE_NUMBER)) / AICA_PERIOD_SIZE; + local_irq_restore(flags); if (play_period == dreamcastcard->current_period) { /* reschedule the timer */ mod_timer(&(dreamcastcard->timer), jiffies + 1); @@ -433,7 +461,7 @@ static int __init snd_aicapcmchip(struct snd_card_aica err = snd_pcm_new(dreamcastcard->card, "AICA PCM", pcm_index, 1, 0, &pcm); - if (unlikely(err < 0)) + if (err < 0) return err; pcm->private_data = dreamcastcard; strcpy(pcm->name, "AICA PCM"); @@ -493,7 +521,7 @@ static int aica_pcmvolume_get(struct snd_kcontrol *kcontrol, { struct snd_card_aica *dreamcastcard; dreamcastcard = kcontrol->private_data; - if (unlikely(!dreamcastcard->channel)) + if (!dreamcastcard->channel) return -ETXTBSY; /* we've not yet been set up */ ucontrol->value.integer.value[0] = dreamcastcard->channel->vol; return 0; @@ -504,10 +532,10 @@ static int aica_pcmvolume_put(struct snd_kcontrol *kcontrol, { struct snd_card_aica *dreamcastcard; dreamcastcard = kcontrol->private_data; - if (unlikely(!dreamcastcard->channel)) + if (!dreamcastcard->channel) return -ETXTBSY; - if (unlikely(dreamcastcard->channel->vol == - ucontrol->value.integer.value[0])) + if (dreamcastcard->channel->vol == + ucontrol->value.integer.value[0]) return 0; dreamcastcard->channel->vol = ucontrol->value.integer.value[0]; dreamcastcard->master_volume = ucontrol->value.integer.value[0]; @@ -537,15 +565,18 @@ static struct snd_kcontrol_new snd_aica_pcmvolume_control __devinitdata = { static int load_aica_firmware(void) { int err; + unsigned long flags; const struct firmware *fw_entry; spu_reset(); err = request_firmware(&fw_entry, "aica_firmware.bin", &pd->dev); - if (unlikely(err)) + if (err) return err; /* write firware into memory */ + local_irq_save(flags); spu_disable(); spu_memload(0, fw_entry->data, fw_entry->size); spu_enable(); + local_irq_restore(flags); release_firmware(fw_entry); return err; } @@ -557,12 +588,12 @@ static int __devinit add_aicamixer_controls(struct snd_card_aica err = snd_ctl_add (dreamcastcard->card, snd_ctl_new1(&snd_aica_pcmvolume_control, dreamcastcard)); - if (unlikely(err < 0)) + if (err < 0) return err; err = snd_ctl_add (dreamcastcard->card, snd_ctl_new1(&snd_aica_pcmswitch_control, dreamcastcard)); - if (unlikely(err < 0)) + if (err < 0) return err; return 0; } @@ -571,7 +602,7 @@ static int snd_aica_remove(struct platform_device *devptr) { struct snd_card_aica *dreamcastcard; dreamcastcard = platform_get_drvdata(devptr); - if (unlikely(!dreamcastcard)) + if (!dreamcastcard) return -ENODEV; snd_card_free(dreamcastcard->card); kfree(dreamcastcard); @@ -584,11 +615,11 @@ static int __init snd_aica_probe(struct platform_device *devptr) int err; struct snd_card_aica *dreamcastcard; dreamcastcard = kmalloc(sizeof(struct snd_card_aica), GFP_KERNEL); - if (unlikely(!dreamcastcard)) + if (!dreamcastcard) return -ENOMEM; dreamcastcard->card = snd_card_new(index, SND_AICA_DRIVER, THIS_MODULE, 0); - if (unlikely(!dreamcastcard->card)) { + if (!dreamcastcard->card) { kfree(dreamcastcard); return -ENODEV; } @@ -600,27 +631,28 @@ static int __init snd_aica_probe(struct platform_device *devptr) INIT_WORK(&(dreamcastcard->spu_dma_work), run_spu_dma); /* Load the PCM 'chip' */ err = snd_aicapcmchip(dreamcastcard, 0); - if (unlikely(err < 0)) + if (err < 0) goto freedreamcast; snd_card_set_dev(dreamcastcard->card, &devptr->dev); dreamcastcard->timer.data = 0; dreamcastcard->channel = NULL; /* Add basic controls */ err = add_aicamixer_controls(dreamcastcard); - if (unlikely(err < 0)) + if (err < 0) goto freedreamcast; /* Register the card with ALSA subsystem */ err = snd_card_register(dreamcastcard->card); - if (unlikely(err < 0)) + if (err < 0) goto freedreamcast; platform_set_drvdata(devptr, dreamcastcard); aica_queue = create_workqueue(CARD_NAME); - if (unlikely(!aica_queue)) + if (!aica_queue) goto freedreamcast; snd_printk ("ALSA Driver for Yamaha AICA Super Intelligent Sound Processor\n"); return 0; - freedreamcast: + +freedreamcast: snd_card_free(dreamcastcard->card); kfree(dreamcastcard); return err; @@ -637,11 +669,11 @@ static int __init aica_init(void) { int err; err = platform_driver_register(&snd_aica_driver); - if (unlikely(err < 0)) + if (err < 0) return err; pd = platform_device_register_simple(SND_AICA_DRIVER, -1, aica_memory_space, 2); - if (unlikely(IS_ERR(pd))) { + if (IS_ERR(pd)) { platform_driver_unregister(&snd_aica_driver); return PTR_ERR(pd); } @@ -653,7 +685,7 @@ static void __exit aica_exit(void) { /* Destroy the aica kernel thread * * being extra cautious to check if it exists*/ - if (likely(aica_queue)) + if (aica_queue) destroy_workqueue(aica_queue); platform_device_unregister(pd); platform_driver_unregister(&snd_aica_driver);

2 2

[alsa-devel] [PATCH] opti931: additional check for OPL3 device
by Krzysztof Helt 18 Sep '07

18 Sep '07

From: Krzysztof Helt <krzysztof.h1(a)wp.pl> This patch adds additional check for OPL3 device. I found that PNP region returned by the card is 0x380 - 0x38f but the OPL3 device is located at 0x388 (standard FM device address). The driver checks start of the range (0x380) which is incorrect. Signed-off-by: Krzysztof Helt <krzysztof.h1(a)wp.pl> --- The same problem appears on two cards I have with Opti chipset: opti931 and opti933. If someone can test if the opti92x PnP has the same problem I would be grateful. Regards, Krzysztof

4 13

[alsa-devel] How to capture audio stream written on devices
by Marco Bnà 18 Sep '07

18 Sep '07

Hi. I would like to capture the audio stream that is written on a device. For example in OSS I will have to redefine ioctl() and some others functions. What I have to do to capture audio streams using ALSA? And for example sending them via a socket while capturing? I have to specify that I cannot use JACK, I have to capture audio before it is written on dev/abc. Best regards, Marco

1 0