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

[alsa-devel] [RESEND] opti92x: use PnP data to select Master Control port
by Krzysztof Helt 03 Mar '10

03 Mar '10

From: Krzysztof Helt <krzysztof.h1(a)wp.pl> The Master Control port (MC) is available as the last PnP resource (OPT005). Use this value instead fo guessing. Also, add some comments to the code. Signed-off-by: Krzysztof Helt <krzysztof.h1(a)wp.pl> --- sound/isa/opti9xx/miro.c | 2 +- sound/isa/opti9xx/opti92x-ad1848.c | 120 +++++++++++++++++++++++------------- 2 files changed, 79 insertions(+), 43 deletions(-) diff --git a/sound/isa/opti9xx/miro.c b/sound/isa/opti9xx/miro.c index b865e45..5913717 100644 --- a/sound/isa/opti9xx/miro.c +++ b/sound/isa/opti9xx/miro.c @@ -1558,7 +1558,7 @@ static int __devinit snd_card_miro_pnp(struct snd_miro *chip, err = pnp_activate_dev(devmc); if (err < 0) { - snd_printk(KERN_ERR "OPL syntg pnp configure failure: %d\n", + snd_printk(KERN_ERR "MC pnp configure failure: %d\n", err); return err; } diff --git a/sound/isa/opti9xx/opti92x-ad1848.c b/sound/isa/opti9xx/opti92x-ad1848.c index a4af53b..becd90d 100644 --- a/sound/isa/opti9xx/opti92x-ad1848.c +++ b/sound/isa/opti9xx/opti92x-ad1848.c @@ -144,12 +144,8 @@ struct snd_opti9xx { spinlock_t lock; + long wss_base; int irq; - -#ifdef CONFIG_PNP - struct pnp_dev *dev; - struct pnp_dev *devmpu; -#endif /* CONFIG_PNP */ }; static int snd_opti9xx_pnp_is_probed; @@ -159,12 +155,17 @@ static int snd_opti9xx_pnp_is_probed; static struct pnp_card_device_id snd_opti9xx_pnpids[] = { #ifndef OPTi93X /* OPTi 82C924 */ - { .id = "OPT0924", .devs = { { "OPT0000" }, { "OPT0002" } }, .driver_data = 0x0924 }, + { .id = "OPT0924", + .devs = { { "OPT0000" }, { "OPT0002" }, { "OPT0005" } }, + .driver_data = 0x0924 }, /* OPTi 82C925 */ - { .id = "OPT0925", .devs = { { "OPT9250" }, { "OPT0002" } }, .driver_data = 0x0925 }, + { .id = "OPT0925", + .devs = { { "OPT9250" }, { "OPT0002" }, { "OPT0005" } }, + .driver_data = 0x0925 }, #else /* OPTi 82C931/3 */ - { .id = "OPT0931", .devs = { { "OPT9310" }, { "OPT0002" } }, .driver_data = 0x0931 }, + { .id = "OPT0931", .devs = { { "OPT9310" }, { "OPT0002" } }, + .driver_data = 0x0931 }, #endif /* OPTi93X */ { .id = "" } }; @@ -207,24 +208,34 @@ static int __devinit snd_opti9xx_init(struct snd_opti9xx *chip, chip->hardware = hardware; strcpy(chip->name, snd_opti9xx_names[hardware]); - chip->mc_base_size = opti9xx_mc_size[hardware]; - spin_lock_init(&chip->lock); chip->irq = -1; +#ifndef OPTi93X +#ifdef CONFIG_PNP + if (isapnp && chip->mc_base) + /* PnP resource gives the least 10 bits */ + chip->mc_base |= 0xc00; +#endif /* CONFIG_PNP */ + else { + chip->mc_base = 0xf8c; + chip->mc_base_size = opti9xx_mc_size[hardware]; + } +#else + chip->mc_base_size = opti9xx_mc_size[hardware]; +#endif + switch (hardware) { #ifndef OPTi93X case OPTi9XX_HW_82C928: case OPTi9XX_HW_82C929: - chip->mc_base = 0xf8c; chip->password = (hardware == OPTi9XX_HW_82C928) ? 0xe2 : 0xe3; chip->pwd_reg = 3; break; case OPTi9XX_HW_82C924: case OPTi9XX_HW_82C925: - chip->mc_base = 0xf8c; chip->password = 0xe5; chip->pwd_reg = 3; break; @@ -292,7 +303,7 @@ static unsigned char snd_opti9xx_read(struct snd_opti9xx *chip, spin_unlock_irqrestore(&chip->lock, flags); return retval; } - + static void snd_opti9xx_write(struct snd_opti9xx *chip, unsigned char reg, unsigned char value) { @@ -341,7 +352,7 @@ static void snd_opti9xx_write(struct snd_opti9xx *chip, unsigned char reg, static int __devinit snd_opti9xx_configure(struct snd_opti9xx *chip, - long wss_base, + long port, int irq, int dma1, int dma2, long mpu_port, int mpu_irq) { @@ -354,16 +365,23 @@ static int __devinit snd_opti9xx_configure(struct snd_opti9xx *chip, switch (chip->hardware) { #ifndef OPTi93X case OPTi9XX_HW_82C924: + /* opti 929 mode (?), OPL3 clock output, audio enable */ snd_opti9xx_write_mask(chip, OPTi9XX_MC_REG(4), 0xf0, 0xfc); + /* enable wave audio */ snd_opti9xx_write_mask(chip, OPTi9XX_MC_REG(6), 0x02, 0x02); case OPTi9XX_HW_82C925: + /* enable WSS mode */ snd_opti9xx_write_mask(chip, OPTi9XX_MC_REG(1), 0x80, 0x80); + /* OPL3 FM synthesis */ snd_opti9xx_write_mask(chip, OPTi9XX_MC_REG(2), 0x00, 0x20); + /* disable Sound Blaster IRQ and DMA */ snd_opti9xx_write_mask(chip, OPTi9XX_MC_REG(3), 0xf0, 0xff); #ifdef CS4231 + /* cs4231/4248 fix enabled */ snd_opti9xx_write_mask(chip, OPTi9XX_MC_REG(5), 0x02, 0x02); #else + /* cs4231/4248 fix disabled */ snd_opti9xx_write_mask(chip, OPTi9XX_MC_REG(5), 0x00, 0x02); #endif /* CS4231 */ break; @@ -411,21 +429,26 @@ static int __devinit snd_opti9xx_configure(struct snd_opti9xx *chip, return -EINVAL; } - switch (wss_base) { - case 0x530: + /* PnP resource says it decodes only 10 bits of address */ + switch (port & 0x3ff) { + case 0x130: + chip->wss_base = 0x530; wss_base_bits = 0x00; break; - case 0x604: + case 0x204: + chip->wss_base = 0x604; wss_base_bits = 0x03; break; - case 0xe80: + case 0x280: + chip->wss_base = 0xe80; wss_base_bits = 0x01; break; - case 0xf40: + case 0x340: + chip->wss_base = 0xf40; wss_base_bits = 0x02; break; default: - snd_printk(KERN_WARNING "WSS port 0x%lx not valid\n", wss_base); + snd_printk(KERN_WARNING "WSS port 0x%lx not valid\n", port); goto __skip_base; } snd_opti9xx_write_mask(chip, OPTi9XX_MC_REG(1), wss_base_bits << 4, 0x30); @@ -487,7 +510,7 @@ __skip_base: #endif /* CS4231 || OPTi93X */ #ifndef OPTi93X - outb(irq_bits << 3 | dma_bits, wss_base); + outb(irq_bits << 3 | dma_bits, chip->wss_base); #else /* OPTi93X */ snd_opti9xx_write(chip, OPTi9XX_MC_REG(3), (irq_bits << 3 | dma_bits)); #endif /* OPTi93X */ @@ -729,15 +752,15 @@ static int __devinit snd_card_opti9xx_pnp(struct snd_opti9xx *chip, { struct pnp_dev *pdev; int err; + struct pnp_dev *devmpu; +#ifndef OPTi93X + struct pnp_dev *devmc; +#endif - chip->dev = pnp_request_card_device(card, pid->devs[0].id, NULL); - if (chip->dev == NULL) + pdev = pnp_request_card_device(card, pid->devs[0].id, NULL); + if (pdev == NULL) return -EBUSY; - chip->devmpu = pnp_request_card_device(card, pid->devs[1].id, NULL); - - pdev = chip->dev; - err = pnp_activate_dev(pdev); if (err < 0) { snd_printk(KERN_ERR "AUDIO pnp configure failure: %d\n", err); @@ -750,9 +773,24 @@ static int __devinit snd_card_opti9xx_pnp(struct snd_opti9xx *chip, chip->mc_indir_index = pnp_port_start(pdev, 3) + 2; chip->mc_indir_size = pnp_port_len(pdev, 3) - 2; #else - if (pid->driver_data != 0x0924) - port = pnp_port_start(pdev, 1); + devmc = pnp_request_card_device(card, pid->devs[2].id, NULL); + if (devmc == NULL) + return -EBUSY; + + err = pnp_activate_dev(devmc); + if (err < 0) { + snd_printk(KERN_ERR "MC pnp configure failure: %d\n", err); + return err; + } + + port = pnp_port_start(pdev, 1); fm_port = pnp_port_start(pdev, 2) + 8; + /* + * The MC(0) is never accessed and card does not + * include it in the PnP resource range. OPTI93x include it. + */ + chip->mc_base = pnp_port_start(devmc, 0) - 1; + chip->mc_base_size = pnp_port_len(devmc, 0) + 1; #endif /* OPTi93X */ irq = pnp_irq(pdev, 0); dma1 = pnp_dma(pdev, 0); @@ -760,16 +798,16 @@ static int __devinit snd_card_opti9xx_pnp(struct snd_opti9xx *chip, dma2 = pnp_dma(pdev, 1); #endif /* CS4231 || OPTi93X */ - pdev = chip->devmpu; - if (pdev && mpu_port > 0) { - err = pnp_activate_dev(pdev); + devmpu = pnp_request_card_device(card, pid->devs[1].id, NULL); + + if (devmpu && mpu_port > 0) { + err = pnp_activate_dev(devmpu); if (err < 0) { - snd_printk(KERN_ERR "AUDIO pnp configure failure\n"); + snd_printk(KERN_ERR "MPU401 pnp configure failure\n"); mpu_port = -1; - chip->devmpu = NULL; } else { - mpu_port = pnp_port_start(pdev, 0); - mpu_irq = pnp_irq(pdev, 0); + mpu_port = pnp_port_start(devmpu, 0); + mpu_irq = pnp_irq(devmpu, 0); } } return pid->driver_data; @@ -824,7 +862,7 @@ static int __devinit snd_opti9xx_probe(struct snd_card *card) if (error) return error; - error = snd_wss_create(card, port + 4, -1, irq, dma1, xdma2, + error = snd_wss_create(card, chip->wss_base + 4, -1, irq, dma1, xdma2, #ifdef OPTi93X WSS_HW_OPTI93X, WSS_HWSHARE_IRQ, #else @@ -865,10 +903,11 @@ static int __devinit snd_opti9xx_probe(struct snd_card *card) sprintf(card->shortname, "OPTi %s", card->driver); #if defined(CS4231) || defined(OPTi93X) sprintf(card->longname, "%s, %s at 0x%lx, irq %d, dma %d&%d", - card->shortname, pcm->name, port + 4, irq, dma1, xdma2); + card->shortname, pcm->name, + chip->wss_base + 4, irq, dma1, xdma2); #else sprintf(card->longname, "%s, %s at 0x%lx, irq %d, dma %d", - card->shortname, pcm->name, port + 4, irq, dma1); + card->shortname, pcm->name, chip->wss_base + 4, irq, dma1); #endif /* CS4231 || OPTi93X */ if (mpu_port <= 0 || mpu_port == SNDRV_AUTO_PORT) @@ -1062,9 +1101,6 @@ static int __devinit snd_opti9xx_pnp_probe(struct pnp_card_link *pcard, snd_card_free(card); return error; } - if (hw <= OPTi9XX_HW_82C930) - chip->mc_base -= 0x80; - error = snd_opti9xx_read_check(chip); if (error) { snd_printk(KERN_ERR "OPTI chip not found\n"); -- 1.6.4 ---------------------------------------------------------------------- Wygraj z armia wampirow! Kliknij >>> http://link.interia.pl/f23a0

2 1

[alsa-devel] [patch] riptide: clean up while loop
by Dan Carpenter 03 Mar '10

03 Mar '10

If getpaths() returned an odd number this would be a buffer under-run and an endless loop. It turns out that getpaths() can only return even numbers, but let's make it easy for people auditing code. With the new code you don't need to look at getpaths(). This silences a smatch warning. Signed-off-by: Dan Carpenter <error27(a)gmail.com> diff --git a/sound/pci/riptide/riptide.c b/sound/pci/riptide/riptide.c index e66ef2b..a5924af 100644 --- a/sound/pci/riptide/riptide.c +++ b/sound/pci/riptide/riptide.c @@ -1974,9 +1974,9 @@ snd_riptide_proc_read(struct snd_info_entry *entry, } snd_iprintf(buffer, "Paths:\n"); i = getpaths(cif, p); - while (i--) { - snd_iprintf(buffer, "%x->%x ", p[i - 1], p[i]); - i--; + while (i >= 2) { + i -= 2; + snd_iprintf(buffer, "%x->%x ", p[i], p[i + 1]); } snd_iprintf(buffer, "\n"); }

2 1

[alsa-devel] [PATCH] ALSA: ASoC: fix ak4104 register array access
by Daniel Mack 03 Mar '10

03 Mar '10

Don't touch the variable 'reg' to construct the value for the actual SPI transport. This variable is again used to access the driver's register cache, and so random memory is overwritten. Compute the value in-place instead. Signed-off-by: Daniel Mack <daniel(a)caiaq.de> Cc: Mark Brown <broonie(a)opensource.wolfsonmicro.com> Cc: stable(a)kernel.org --- sound/soc/codecs/ak4104.c | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/sound/soc/codecs/ak4104.c b/sound/soc/codecs/ak4104.c index b9ef7e4..b68d99f 100644 --- a/sound/soc/codecs/ak4104.c +++ b/sound/soc/codecs/ak4104.c @@ -90,12 +90,10 @@ static int ak4104_spi_write(struct snd_soc_codec *codec, unsigned int reg, if (reg >= codec->reg_cache_size) return -EINVAL; - reg &= AK4104_REG_MASK; - reg |= AK4104_WRITE; - /* only write to the hardware if value has changed */ if (cache[reg] != value) { - u8 tmp[2] = { reg, value }; + u8 tmp[2] = { (reg & AK4104_REG_MASK) | AK4104_WRITE, value }; + if (spi_write(spi, tmp, sizeof(tmp))) { dev_err(&spi->dev, "SPI write failed\n"); return -EIO; -- 1.6.3.3

2 1

[alsa-devel] snd_pcm_drop causing lockup with DMix
by John Lindgren 03 Mar '10

03 Mar '10

Hi, A couple of weeks ago I reported a rather serious bug #4914 that can cause a multi-threaded using ALSA to lock up so that it can only be ended with SIGKILL. I maintain the ALSA output part of Audacious, and I need to be able to play audio in one thread of the program and then signal that thread to stop from another. The way to do this in ALSA, if I understand correctly, is to interrupt the thread that is sending audio with a call to snd_pcm_drop. But using DMix makes the first thread hang up in a snd_pcm_wait call with a timeout of -1. Is anyone working on this bug? Is there any more help I can provide? John Lindgren

2 9

[alsa-devel] ASoC: SAMSUNG: About I2S_v4 support
by jassi brar 03 Mar '10

03 Mar '10

Hello, Could we please reach some agreement about the support of I2Sv4 block of S3C64XX and newer SoCs? Kindly express your opinion. Otherwise, I am planning to re-factor(as and if needed) s3c-i2s-v2.c, s3c2412-i2s.c and s3c64xx-i2s.c and add a new s3c-i2s-v4.c to handle I2S_v4 controllers. Kindly ACK/NAK this idea if you are busy with other stuff and I am to start working on the issue. Thanks.

2 4

[alsa-devel] [patch] oxygen: change || to &&
by Dan Carpenter 03 Mar '10

03 Mar '10

In the original code the condition was always true (hopefully) because WM8776_HPLVOL is zero. Signed-off-by: Dan Carpenter <error27(a)gmail.com> diff --git a/sound/pci/oxygen/xonar_wm87x6.c b/sound/pci/oxygen/xonar_wm87x6.c index 7754db1..dbc4b89 100644 --- a/sound/pci/oxygen/xonar_wm87x6.c +++ b/sound/pci/oxygen/xonar_wm87x6.c @@ -68,7 +68,7 @@ static void wm8776_write(struct oxygen *chip, OXYGEN_SPI_CEN_LATCH_CLOCK_LO, (reg << 9) | value); if (reg < ARRAY_SIZE(data->wm8776_regs)) { - if (reg >= WM8776_HPLVOL || reg <= WM8776_DACMASTER) + if (reg >= WM8776_HPLVOL && reg <= WM8776_DACMASTER) value &= ~WM8776_UPDATE; data->wm8776_regs[reg] = value; }

2 1

[alsa-devel] alsa needs updating for stable kernel 2.6.33+, and compile error
by VDR User 02 Mar '10

02 Mar '10

First, linux/utsrelease.h was moved to generated/utsrelease.h so that needs to be fixed. Also, when will hdmi audio support for GT220 cards be included? And any ideas why this compile is failing?: test:/usrc/alsa/alsa-driver-1.0.22.1$ ./configure --with-cards=hda-intel --with-card-options=hda-hwdep,hda-reconfig,hda-codec-realtek,hda-codec-nvhdmi --with-isapnp=no --with-sequencer=no --with-oss=no --with-pcm-oss-plugins=no checking for gcc... gcc checking for C compiler default output file name... a.out checking whether the C compiler works... yes checking whether we are cross compiling... no checking for suffix of executables... checking for suffix of object files... o checking whether we are using the GNU C compiler... yes checking whether gcc accepts -g... yes checking for gcc option to accept ISO C89... none needed checking for ranlib... ranlib checking for a BSD-compatible install... /usr/bin/install -c checking how to run the C preprocessor... gcc -E checking for grep that handles long lines and -e... /bin/grep checking for egrep... /bin/grep -E checking for ANSI C header files... yes checking for an ANSI C-conforming const... yes checking for inline... inline checking whether time.h and sys/time.h may both be included... yes checking whether gcc needs -traditional... no checking for current directory... /usr/local/src/alsa/alsa-driver-1.0.22.1 checking cross compile... checking for directory with ALSA kernel sources... ./configure: line 5107: cd: ../alsa-kmirror: No such file or directory ../alsa-kmirror checking for directory with kernel source... /lib/modules/2.6.33.amd64-x2.030210.1/source checking for directory with kernel build... /lib/modules/2.6.33.amd64-x2.030210.1/build checking for kernel linux/version.h... yes checking for kernel linux/autoconf.h... yes checking for kernel version... 2.6.33.amd64-x2.030210.1 checking for GCC version... ./configure: eval: line 5495: syntax error near unexpected token `)' ./configure: eval: line 5495: `my_compiler_version=4.4.2-9)' ./configure: line 5495: warning: syntax errors in . or eval will cause future versions of the shell to abort as Posix requires Kernel compiler: Used compiler: gcc (Debian 4.4.2-9) 4.4.3 20100108 (prerelease) *** NO PREDEFINED KERNEL COMPILER IS DETECTED *** Assuming the same compiler is used with the current system compiler. *** Please make sure that the same compiler version was used for building kernel. checking for built-in ALSA... no checking for existing ALSA module... yes checking for Red Hat kernel... auto checking for Red Hat kernel... no checking for SUSE kernel... auto checking for SUSE kernel... no checking for updating alsa-kernel version.h... yes checking for CONFIG_EXPERIMENTAL... yes checking for directory to store kernel modules... /lib/modules/2.6.33.amd64-x2.030210.1/kernel/sound checking for verbose procfs... on checking for verbose printk... on checking for debug level... none checking for ISA support in kernel... no checking for processor type... k8 checking for ISA DMA API... yes checking for kernel linux/config.h... no Creating <linux/config.h>... checking for deprecated linux/config.h... checking to modify of kernel linux/kmod.h... no checking for kernel linux/utsrelease.h... yes checking for kernel linux/compiler.h... yes checking for kernel linux/pm.h... yes checking for kernel linux/spinlock.h... yes checking for kernel linux/irq.h... yes checking for kernel linux/threads.h... yes checking for kernel linux/rwsem.h... yes checking for kernel linux/gameport.h... yes checking for kernel media/v4l2-dev.h... yes checking for kernel linux/devfs_fs_kernel.h... no Creating a dummy <linux/devfs_fs_kernel.h>... checking for kernel linux/highmem.h... yes checking for kernel linux/workqueue.h... yes checking for kernel linux/dma-mapping.h... yes checking for kernel asm/hw_irq.h... yes checking for kernel linux/device.h... yes checking for kernel linux/platform_device.h... yes checking for kernel linux/isa.h... yes checking for kernel linux/jiffies.h... yes checking for kernel linux/compat.h... yes checking for kernel linux/log2.h... yes checking for kernel linux/adb.h... yes checking for kernel linux/cuda.h... yes checking for kernel linux/pmu.h... yes checking for kernel linux/io.h... yes checking for kernel linux/moduleparam.h... yes checking for kernel linux/syscalls.h... yes checking for kernel linux/firmware.h... yes checking for kernel linux/err.h... yes checking for kernel linux/bitmap.h... yes checking for kernel linux/mutex.h... yes checking for kernel linux/pm_qos_params.h... yes checking for kernel linux/kthread.h... yes checking for kernel asm/irq_regs.h... yes checking for kernel linux/seq_file.h... yes checking for kernel linux/debugfs.h... yes checking for kernel linux/gpio.h... yes checking for kernel linux/bug.h... yes checking for kernel linux/math64.h... yes checking for kernel linux/regulator/consumer.h... yes checking for kernel linux/dmi.h... yes checking for kernel linux/bitrev.h... yes checking for kernel linux/hrtimer.h... yes checking for kernel linux/gcd.h... yes checking for kernel module symbol versions... no checking for has ioport support... yes checking for PCI support in kernel... yes checking for I2C driver in kernel... yes checking for I2C_POWERMAC in kernel... unknown checking for firmware loader... yes checking for input subsystem in kernel... yes checking for pc-speaker platform in kernel... yes checking for SMP... yes checking for Video device support in kernel... no checking for ISA PnP driver in kernel... yes checking for PnP driver in kernel... yes checking for Kernel ISA-PnP support... no checking for Kernel ISA-PnP module support... no checking for strlcpy... yes checking for snprintf... yes checking for vsnprintf... yes checking for scnprintf... yes checking for sscanf... yes checking for vmalloc_to_page... yes checking for old kmod... no checking for PDE... yes checking for pci_set_consistent_dma_mask... yes checking for pci_dev_present... yes checking for msleep... yes checking for msleep_interrupt... yes checking for msecs_to_jiffies... yes checking for tty->count is the atomic type... yes checking for io_remap_pfn_range... yes checking for kcalloc... yes checking for kstrdup... yes checking for kstrndup... yes checking for kzalloc... yes checking for create_workqueue with flags... no checking for pci_ioremap_bar... yes checking for saved_config_space in pci_dev... yes checking for new pci_save_state... yes checking for register_sound_special_device... yes checking for driver extra-version... checking for driver version... 1.0.22.1 checking for dynamic minor numbers... no checking for sequencer support... no checking for OSS/Free emulation... no checking for RTC support... yes checking for HPET support... no checking for Procfs support... yes checking for USB support... yes checking for class_simple... no checking for old driver suspend/resume callbacks... no checking for removal of page-reservation for nopage/mmap... no checking for nested class_device... no checking for new IRQ handler... yes checking for gfp_t... yes checking for GFP_DMA32... yes checking for page_to_pfn... yes checking for PnP suspend/resume... yes checking for device_create_drvdata... no checking for new unlocked/compat_ioctl... yes checking for builtin _Bool support... yes checking for x86-compatible PC... no checking for High-Res timers... yes checking for kernel PCMCIA checking for PCMCIA support... no checking for PCMCIA module support... no checking for PC9800 support in kernel... no checking for parallel port support... no checking for parallel port module support... no checking for power management... yes checking for CONFIG_HAS_DMA... yes checking for cards to compile driver for... hda-intel checking for additonal options to compile driver for... hda-hwdep hda-reconfig hda-codec-realtek hda-codec-nvhdmi configure: creating ./config.status config.status: creating version config.status: creating Makefile.conf config.status: WARNING: Makefile.conf.in seems to ignore the --datarootdir setting config.status: creating snddevices config.status: creating utils/alsa-driver.spec config.status: creating utils/buildrpm config.status: creating toplevel.config config.status: creating utils/alsasound config.status: creating utils/alsasound.posix config.status: creating include/pci_ids_compat.h config.status: creating include/i2c-id_compat.h config.status: creating include/config.h config.status: creating include/config1.h config.status: creating include/version.h config.status: include/version.h is unchanged config.status: creating include/autoconf-extra.h config.status: include/autoconf-extra.h is unchanged Hacking autoconf.h... test:/usrc/alsa/alsa-driver-1.0.22.1$ make make -C /lib/modules/2.6.33.amd64-x2.030210.1/source SUBDIRS=/usr/local/src/alsa/alsa-driver-1.0.22.1 CPP="gcc -E" CC="gcc" modules make[1]: Entering directory `/usr/src/linux-2.6.33' CC [M] /usr/local/src/alsa/alsa-driver-1.0.22.1/acore/hwdep.o CC [M] /usr/local/src/alsa/alsa-driver-1.0.22.1/acore/memory_wrapper.o CC [M] /usr/local/src/alsa/alsa-driver-1.0.22.1/acore/memalloc.o CC [M] /usr/local/src/alsa/alsa-driver-1.0.22.1/acore/sgbuf.o CC [M] /usr/local/src/alsa/alsa-driver-1.0.22.1/acore/pcm.o CC [M] /usr/local/src/alsa/alsa-driver-1.0.22.1/acore/pcm_native.o CC [M] /usr/local/src/alsa/alsa-driver-1.0.22.1/acore/pcm_lib.o CC [M] /usr/local/src/alsa/alsa-driver-1.0.22.1/acore/pcm_timer.o CC [M] /usr/local/src/alsa/alsa-driver-1.0.22.1/acore/pcm_misc.o CC [M] /usr/local/src/alsa/alsa-driver-1.0.22.1/acore/pcm_memory.o CC [M] /usr/local/src/alsa/alsa-driver-1.0.22.1/acore/timer.o CC [M] /usr/local/src/alsa/alsa-driver-1.0.22.1/acore/wrappers.o CC [M] /usr/local/src/alsa/alsa-driver-1.0.22.1/acore/misc_driver.o CC [M] /usr/local/src/alsa/alsa-driver-1.0.22.1/acore/sound.o CC [M] /usr/local/src/alsa/alsa-driver-1.0.22.1/acore/init.o CC [M] /usr/local/src/alsa/alsa-driver-1.0.22.1/acore/memory.o CC [M] /usr/local/src/alsa/alsa-driver-1.0.22.1/acore/info.o CC [M] /usr/local/src/alsa/alsa-driver-1.0.22.1/acore/control.o CC [M] /usr/local/src/alsa/alsa-driver-1.0.22.1/acore/misc.o CC [M] /usr/local/src/alsa/alsa-driver-1.0.22.1/acore/device.o CC [M] /usr/local/src/alsa/alsa-driver-1.0.22.1/acore/isadma.o CC [M] /usr/local/src/alsa/alsa-driver-1.0.22.1/acore/vmaster.o LD [M] /usr/local/src/alsa/alsa-driver-1.0.22.1/acore/snd.o LD [M] /usr/local/src/alsa/alsa-driver-1.0.22.1/acore/snd-hwdep.o LD [M] /usr/local/src/alsa/alsa-driver-1.0.22.1/acore/snd-timer.o LD [M] /usr/local/src/alsa/alsa-driver-1.0.22.1/acore/snd-pcm.o LD [M] /usr/local/src/alsa/alsa-driver-1.0.22.1/acore/snd-page-alloc.o CC [M] /usr/local/src/alsa/alsa-driver-1.0.22.1/pci/hda/patch_nvhdmi.o In file included from /usr/local/src/alsa/alsa-driver-1.0.22.1/pci/hda/patch_nvhdmi.c:3: /usr/local/src/alsa/alsa-driver-1.0.22.1/pci/hda/../../alsa-kernel/pci/hda/patch_nvhdmi.c:219:1: warning: "AC_VERB_GET_CVT_CHAN_COUNT" redefined In file included from /usr/local/src/alsa/alsa-driver-1.0.22.1/pci/hda/../../alsa-kernel/pci/hda/patch_nvhdmi.c:29, from /usr/local/src/alsa/alsa-driver-1.0.22.1/pci/hda/patch_nvhdmi.c:3: /usr/local/src/alsa/alsa-driver-1.0.22.1/pci/hda/../../alsa-kernel/pci/hda/hda_codec.h:93:1: warning: this is the location of the previous definition In file included from /usr/local/src/alsa/alsa-driver-1.0.22.1/pci/hda/patch_nvhdmi.c:3: /usr/local/src/alsa/alsa-driver-1.0.22.1/pci/hda/../../alsa-kernel/pci/hda/patch_nvhdmi.c:220:1: warning: "AC_VERB_GET_HDMI_DIP_DATA" redefined In file included from /usr/local/src/alsa/alsa-driver-1.0.22.1/pci/hda/../../alsa-kernel/pci/hda/patch_nvhdmi.c:29, from /usr/local/src/alsa/alsa-driver-1.0.22.1/pci/hda/patch_nvhdmi.c:3: /usr/local/src/alsa/alsa-driver-1.0.22.1/pci/hda/../../alsa-kernel/pci/hda/hda_codec.h:97:1: warning: this is the location of the previous definition In file included from /usr/local/src/alsa/alsa-driver-1.0.22.1/pci/hda/patch_nvhdmi.c:3: /usr/local/src/alsa/alsa-driver-1.0.22.1/pci/hda/../../alsa-kernel/pci/hda/patch_nvhdmi.c:221:1: warning: "AC_VERB_GET_HDMI_DIP_XMIT" redefined In file included from /usr/local/src/alsa/alsa-driver-1.0.22.1/pci/hda/../../alsa-kernel/pci/hda/patch_nvhdmi.c:29, from /usr/local/src/alsa/alsa-driver-1.0.22.1/pci/hda/patch_nvhdmi.c:3: /usr/local/src/alsa/alsa-driver-1.0.22.1/pci/hda/../../alsa-kernel/pci/hda/hda_codec.h:98:1: warning: this is the location of the previous definition In file included from /usr/local/src/alsa/alsa-driver-1.0.22.1/pci/hda/patch_nvhdmi.c:3: /usr/local/src/alsa/alsa-driver-1.0.22.1/pci/hda/../../alsa-kernel/pci/hda/patch_nvhdmi.c: In function âhdmi_checksum_audio_infoframeâ: /usr/local/src/alsa/alsa-driver-1.0.22.1/pci/hda/../../alsa-kernel/pci/hda/patch_nvhdmi.c:334: warning: unused variable âbytesâ /usr/local/src/alsa/alsa-driver-1.0.22.1/pci/hda/../../alsa-kernel/pci/hda/patch_nvhdmi.c: In function âhdmi_setup_channel_allocationâ: /usr/local/src/alsa/alsa-driver-1.0.22.1/pci/hda/../../alsa-kernel/pci/hda/patch_nvhdmi.c:397: warning: unused variable âspk_maskâ /usr/local/src/alsa/alsa-driver-1.0.22.1/pci/hda/../../alsa-kernel/pci/hda/patch_nvhdmi.c:396: warning: unused variable âiâ /usr/local/src/alsa/alsa-driver-1.0.22.1/pci/hda/../../alsa-kernel/pci/hda/patch_nvhdmi.c:395: warning: unused variable âeldâ /usr/local/src/alsa/alsa-driver-1.0.22.1/pci/hda/../../alsa-kernel/pci/hda/patch_nvhdmi.c:394: warning: unused variable âspecâ /usr/local/src/alsa/alsa-driver-1.0.22.1/pci/hda/../../alsa-kernel/pci/hda/patch_nvhdmi.c: In function âhdmi_setup_audio_infoframeâ: /usr/local/src/alsa/alsa-driver-1.0.22.1/pci/hda/../../alsa-kernel/pci/hda/patch_nvhdmi.c:545: warning: unused variable âiâ /usr/local/src/alsa/alsa-driver-1.0.22.1/pci/hda/../../alsa-kernel/pci/hda/patch_nvhdmi.c:543: warning: unused variable âspecâ /usr/local/src/alsa/alsa-driver-1.0.22.1/pci/hda/patch_nvhdmi.c: At top level: /usr/local/src/alsa/alsa-driver-1.0.22.1/pci/hda/../../alsa-kernel/pci/hda/patch_nvhdmi.c:89: warning: âeld_speaker_allocation_bitsâ defined but not used /usr/local/src/alsa/alsa-driver-1.0.22.1/pci/hda/../../alsa-kernel/pci/hda/patch_nvhdmi.c:285: warning: âhdmi_enable_outputâ defined but not used /usr/local/src/alsa/alsa-driver-1.0.22.1/pci/hda/../../alsa-kernel/pci/hda/patch_nvhdmi.c:366: warning: âinit_channel_allocationsâ defined but not used CC [M] /usr/local/src/alsa/alsa-driver-1.0.22.1/pci/hda/patch_realtek.o CC [M] /usr/local/src/alsa/alsa-driver-1.0.22.1/pci/hda/hda_codec.o CC [M] /usr/local/src/alsa/alsa-driver-1.0.22.1/pci/hda/hda_proc.o CC [M] /usr/local/src/alsa/alsa-driver-1.0.22.1/pci/hda/hda_hwdep.o make[4]: *** No rule to make target `/usr/local/src/alsa/alsa-driver-1.0.22.1/pci/hda/hda_intel.o', needed by `/usr/local/src/alsa/alsa-driver-1.0.22.1/pci/hda/snd-hda-codec.o'. Stop. make[3]: *** [/usr/local/src/alsa/alsa-driver-1.0.22.1/pci/hda] Error 2 make[2]: *** [/usr/local/src/alsa/alsa-driver-1.0.22.1/pci] Error 2 make[1]: *** [_module_/usr/local/src/alsa/alsa-driver-1.0.22.1] Error 2 make[1]: Leaving directory `/usr/src/linux-2.6.33' make: *** [compile] Error 2 test:/usrc/alsa/alsa-driver-1.0.22.1$

1 0

[alsa-devel] No CD mixer on Intel G35 (Asus P5E-V(M))
by Mario 'BitKoenig' Holbe 02 Mar '10

02 Mar '10

Hello, on my Asus P5E-V HDMI and my Asus P5E-VM HDMI (both Intel G35) alsamixer shows no CD mixer. Both boards have a CD audio connector and the CD-drive connected to it. holbe@darkside:/home/holbe% uname -a Linux darkside 2.6.32-3-686-bigmem #1 SMP Thu Feb 25 06:54:30 UTC 2010 i686 GNU/Linux holbe@darkside:/home/holbe% cat /proc/asound/cards 0 [Intel ]: HDA-Intel - HDA Intel HDA Intel at 0xfe5f4000 irq 22 1 [Bt878 ]: Bt87x - Brooktree Bt878 Brooktree Bt878 at 0xfdfff000, irq 16 alsamixer says: Card: HDA Intel Chip: Silicon Image SiI1392 HDMI Same with 2.6.33. On my P5Q-EM (Intel G45) the CD mixer appears in alsamixer. I have no idea how to dig deeper in this, if you need more information, please just tell me. Thanks for your work & regards Mario -- Do I contradict myself? Very well, then I contradict myself, I am large, I contain multitudes. -- Walt Whitman

2 2

[alsa-devel] [PATCH 22/66] sound/oss/v_midi.h: Checkpatch cleanup
by Andrea Gelmini 02 Mar '10

02 Mar '10

sound/oss/v_midi.h:5: ERROR: code indent should use tabs where possible sound/oss/v_midi.h:7: ERROR: trailing whitespace Signed-off-by: Andrea Gelmini <andrea.gelmini(a)gelma.net> --- sound/oss/v_midi.h | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/sound/oss/v_midi.h b/sound/oss/v_midi.h index 1b86cb4..08e2185 100644 --- a/sound/oss/v_midi.h +++ b/sound/oss/v_midi.h @@ -2,9 +2,9 @@ typedef struct vmidi_devc { int dev; /* State variables */ - int opened; + int opened; spinlock_t lock; - + /* MIDI fields */ int my_mididev; int pair_mididev; @@ -12,4 +12,3 @@ typedef struct vmidi_devc { int intr_active; void (*midi_input_intr) (int dev, unsigned char data); } vmidi_devc; - -- 1.7.0.90.g251a4

2 2

Re: [alsa-devel] [Fwd: Re: [Regression] With the new 2.6.33 when I plug headphones, the speaker doen't get off anymore]
by Takashi Iwai 02 Mar '10

02 Mar '10

At Mon, 01 Mar 2010 14:46:10 +0100, Guillaume De Nayer wrote: > > Takashi Iwai a écrit : > > At Sun, 28 Feb 2010 15:29:25 +0100, > > giggz wrote: > >> giggz a écrit : > >>> giggzounet a écrit : > >>>> Hi, > >>>> > >>>> I have installed debian stable lenny + backports on an eeepc 1201n. With > >>>> the 2.6.30 or 2.6.32 from lenny-backport I don't have problem with sound > >>>> : when I plug the headphones, speakers get off. > >>>> > >>>> I have tested with 2.6.33 and when I plug headphones, speakers don't get > >>>> off anymore. so I have sound in headphones and speakers. > >>>> > >>>> 22:42 giggz@baal ~ % cat /proc/asound/card0/codec#* | grep Codec > >>>> Codec: Realtek ALC269 > >>>> Codec: Nvidia MCP7A HDMI > >>>> > >>>> I attach the output of alsa-info with the 2.6.32.9 and the 2.6.33 (I'm > >>>> in a Uni Campus and it's quite difficult to have internet on a external > >>>> laptop...so I attach them at this mail and I don't upload them on pastbin). > >>>> > >>>> I have opened a bug on the kernel bugzilla (bug 15399). Should I provide > >>>> anything more ? > >>>> > >>> Following the advice of Paul Menzel I did a "diff" of the sources of the > >>> 2.6.32.9 kernel and of the 2.6.33. In patch_realtek.c, we see that there > >>> is an new snd_hda_jack_detect funtion with 2 arguments. I have noticed > >>> that the second argument is "normaly" the second argument of > >>> snd_hda_codec_read. In the alc269_speaker_automute function there is > >>> this new snd_hda_jack_detect function, but the second argument is "nid". > >>> But in the old alc269_speaker_automute of the 2.6.32.9 the second > >>> argument of snd_hda_codec_read is 0x15. So I think there is perhaps a > >>> bug here...But I hesitate to modify the source...so I'm waiting the > >>> anwser of the dev. > >>> > >>> --- patch_realtek.c 2010-02-27 14:58:06.000000000 +0100 > >>> +++ patch_realtek_modif.c 2010-02-27 14:58:54.000000000 +0100 > >>> @@ -13381,7 +13381,7 @@ > >>> unsigned int present; > >>> unsigned char bits; > >>> > >>> - present = snd_hda_jack_detect(codec, nid); > >>> + present = snd_hda_jack_detect(codec, 0x15); > >>> bits = present ? AMP_IN_MUTE(0) : 0; > >>> snd_hda_codec_amp_stereo(codec, 0x0c, HDA_INPUT, 0, > >>> AMP_IN_MUTE(0), bits); > >>> > >> I tested it. And with this modif in the kernel, after recompilation and > >> reboot, my problem is headphones and speaker is gone. > > > > It implies that the setup of the headphone pin is wrong. This doesn't > > mean a bug of the driver, though. It might have uncovered the BIOS > > bug. > > > > ok. I don't have any knowledge in C or in bios...so you're problably > right :) > > but it seems strange that for all the new line with snd_hda_jack_detect > the second argument is always the second argument of snd_hda_codec_read > except for the alc269. > > > Could you provide alsa-info.sh without your patch to check the setup? > > > > > > In attachment of the first post on alsa-devel or on the kernel bugzilla > http://bugzilla.kernel.org/show_bug.cgi?id=15399, there are the output > of alsa-info.sh with the 2.6.32.9 (no problem) and the output of > alsa-info.sh with the 2.6.33 without any patch (problem occurs). OK, thanks. This looks actually like a bug :) But, the easiest (and probably better) fix is to use model=auto for your device. Just pass model=auto option. I guess everything should work with that. Takashi

2 1