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

[alsa-devel] capture line-out
by Tomas Carnecky 27 Mar '07

27 Mar '07

Is it possible to capture/record line-out (or simply 'what the user hears')? I'm writing 'fraps for linux' and so far I have video capturing implemented and that works great, but users are also requesting sound-capturing and I'm looking into how that could be done. thanks tom

2 10

[alsa-devel] [3/5] 2.6.21-rc5: known regressions
by Adrian Bunk 27 Mar '07

27 Mar '07

This email lists some known regressions in Linus' tree compared to 2.6.20. If you find your name in the Cc header, you are either submitter of one of the bugs, maintainer of an affectected subsystem or driver, a patch of you caused a breakage or I'm considering you in any other way possibly involved with one or more of these issues. Due to the huge amount of recipients, please trim the Cc when answering. Subject : Oops when changing DVB-T adapter References : http://lkml.org/lkml/2007/3/9/212 Submitter : CIJOML <cijoml(a)volny.cz> Status : unknown Subject : snd_intel8x0: divide error: 0000 References : http://lkml.org/lkml/2007/3/5/252 Submitter : Michal Piotrowski <michal.k.k.piotrowski(a)gmail.com> Status : unknown Subject : USB: iPod doesn't work (CONFIG_USB_SUSPEND) References : http://lkml.org/lkml/2007/3/21/320 Submitter : Tino Keitel <tino.keitel(a)gmx.de> Caused-By : Marcelo Tosatti <marcelo(a)kvack.org> commit 1d619f128ba911cd3e6d6ad3475f146eb92f5c27 Handled-By : Oliver Neukum <oneukum(a)suse.de> Status : problem is being debuggged

1 0

Re: [alsa-devel] [Alsa-devel] [RFC][RFT] Adding support for Jazz16 based sound cards
by Rask Ingemann Lambertsen 27 Mar '07

27 Mar '07

On Mon, Mar 12, 2007 at 12:28:00PM +0100, Takashi Iwai wrote: > At Mon, 12 Mar 2007 00:24:36 +0100, > Rask Ingemann Lambertsen wrote: > > > I tried to include u-law support, but it doesn't sound right and playback > > speed is about one third of what it should be. I could really use some > > documentation here. I'll remove it before submitting a final patch if I > > don't get it to work. > > OK. I never got u-law or a-law to work. I tried various ADPCM formats which gave correct playback speed, but much noise. There seems to be a Media Vision ADPCM format, which is probably what the Jazz16 wants, but I have no information about that format. FWIW, the playback_format/capture_format values I've tried are: #define SB_DSP_ALAW_OUTPUT_AUTO 0x1F #define SB_DSP_ALAW_INPUT_AUTO 0x2F #define SB_DSP_ULAW_OUTPUT_AUTO 0x7f #define SB_DSP_ULAW_INPUT_AUTO 0x8f #define SB_DSP_ADPCM_OUTPUT_AUTO 0x7C+1 #define SB_DSP_ADPCM_INPUT_AUTO 0x8C+1 > > Setting the irq of the MPU-401 port requires the SB part to be active and > > even worse, DSP commands need to be sent. Would it be better to just use the > > MPU-401 port without an irq and avoid the complexity? > > Isn't SB part already active? It's fine with non-irq version (which > uses timer) if the code gets too complicated, of course. It turned out that I can't disable just the MPU port. -- Rask Ingemann Lambertsen

1 0

[alsa-devel] [PATCH] PnP: Protocol for Media Vision Jazz16 sound cards
by Rask Ingemann Lambertsen 26 Mar '07

26 Mar '07

From: Rask Ingemann Lambertsen <rask(a)sygehus.dk> - Add code to detect and PnP protocol to manage Media Vision Jazz16 sound cards. Tested with a Jazz16 based sound card and Linux 2.6.20. Signed-off-by: Rask Ingemann Lambertsen <rask(a)sygehus.dk> --- This patch depends on the patch "ALSA: Support Media Vision Jazz16 chips" because the patched include/sound/sb.h is needed. drivers/pnp/Kconfig | 12 drivers/pnp/Makefile | 1 drivers/pnp/jazz16pnp.c | 555 ++++++++++++++++++++++++++++++++++++++ 3 files changed, 568 insertions(+) --- linux-2.6.20/drivers/pnp/Makefile-orig 2007-02-19 23:24:22.000000000 +0100 +++ linux-2.6.20/drivers/pnp/Makefile 2007-02-19 23:24:22.000000000 +0100 @@ -8,3 +8,4 @@ obj-$(CONFIG_PNPACPI) += pnpacpi/ obj-$(CONFIG_PNPACPI) += pnpacpi/ obj-$(CONFIG_PNPBIOS) += pnpbios/ obj-$(CONFIG_ISAPNP) += isapnp/ +obj-$(CONFIG_JAZZ16PNP) += jazz16pnp.o --- linux-2.6.20/drivers/pnp/jazz16pnp.c-orig 2007-03-11 22:11:58.000000000 +0100 +++ linux-2.6.20/drivers/pnp/jazz16pnp.c 2007-03-25 21:27:18.000000000 +0200 @@ -0,0 +1,555 @@ +/* + * Media Vision Jazz16 Plug & Play support. + * + * Copyright (c) 2007 Rask Ingemann Lambertsen <rask(a)sygehus.dk> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + * This driver manages two devices: + * + * Device 0: The game port. + * Device 1: The SoundBlaster look-alike part. + * + * Sources: + * sound/oss/sb_common.c + * sys/dev/isa/sbdsp.c (OpenBSD) + */ + +#include <linux/types.h> +#include <linux/module.h> +#include <linux/moduleparam.h> +#include <linux/kernel.h> +#include <linux/errno.h> +#include <linux/slab.h> +#include <linux/init.h> +#include <linux/pnp.h> +#include <linux/ioport.h> +#include <asm/io.h> +#include <linux/delay.h> +#include <sound/driver.h> +#include <sound/core.h> +#include <sound/sb.h> + +MODULE_AUTHOR("Rask Ingemann Lambertsen <rask(a)sygehus.dk>"); +MODULE_DESCRIPTION("Jazz16 Plug & Play support"); +MODULE_LICENSE("GPL"); + +int jazz16pnp_disable = false; /* Disable Jazz16 PnP. */ +module_param_named(disable, jazz16pnp_disable, bool, false); +MODULE_PARM_DESC(disable, "Jazz16 Plug & Play disable switch"); + +int jazz16pnp_verbose = false; /* Verbosity level. */ +module_param_named(verbose, jazz16pnp_verbose, bool, false); +MODULE_PARM_DESC(verbose, "Jazz16 Plug & Play verbosity level"); + +#define PFX "jazz16pnp: " +#define PFX_DEBUG KERN_DEBUG PFX +#define PFX_INFO KERN_INFO PFX +#define PFX_WARN KERN_WARNING PFX + +/* Jazz16 configuration. */ +#define SB_JAZZ16_CONFIG_PORT 0x201 +#define SB_JAZZ16_WAKEUP 0xaf +#define SB_JAZZ16_SET_PORTS 0x50 +#define SB_JAZZ16_SET_DMAINTR 0xFB + +extern void *pnp_alloc(long size); +extern void pnp_free_option(struct pnp_option *option); + +static struct pnp_dev *jazz16_gameport_dev = NULL; +static struct pnp_dev *jazz16_sb_dev = NULL; +static struct resource *jazz16pnp_fm_res = NULL; + +static uint jazz16_sb_port = 0, jazz16_sb_irq = 0; +static uint jazz16_sb_dma1 = 0, jazz16_sb_dma2 = 0; +static uint jazz16_mpu401_port = 0, jazz16_mpu401_irq = 0; + +static uint jazz16pnp_count = 0; + +static struct pnp_protocol jazz16pnp_protocol; + +static bool __init jazz16pnp_easy_option(struct pnp_dev *dev, uint pri, + struct pnp_port *port, uint nports, + struct pnp_irq *irq, uint nirqs, + struct pnp_dma *dma, uint ndmas) +{ + struct pnp_option *opt; + struct pnp_port *new_port; + struct pnp_irq *new_irq; + struct pnp_dma *new_dma; + uint i; + + switch (pri) { + case PNP_RES_PRIORITY_PREFERRED: + case PNP_RES_PRIORITY_ACCEPTABLE: + case PNP_RES_PRIORITY_FUNCTIONAL: + opt = pnp_register_dependent_option(dev, pri); + break; + + default: + opt = pnp_register_independent_option(dev); + break; + } + if (!opt) + return false; + + for (i = 0; i < nports; i ++) { + new_port = pnp_alloc(sizeof(*new_port)); + if (!new_port) + goto out_no_mem; + memcpy(new_port, &port[i], sizeof(*new_port)); + pnp_register_port_resource(opt, new_port); + } + for (i = 0; i < nirqs; i ++) { + new_irq = pnp_alloc(sizeof(*new_irq)); + if (!new_irq) + goto out_no_mem; + memcpy(new_irq, &irq[i], sizeof(*new_irq)); + pnp_register_irq_resource(opt, new_irq); + } + for (i = 0; i < ndmas; i ++) { + new_dma = pnp_alloc(sizeof(*new_dma)); + if (!new_dma) + goto out_no_mem; + memcpy(new_dma, &dma[i], sizeof(*new_dma)); + pnp_register_dma_resource(opt, new_dma); + } + return true; + +out_no_mem: + return false; +} + +static struct pnp_port jazz16pnp_game_ports[1] __initdata = { + { .min = SB_JAZZ16_CONFIG_PORT, + .max = SB_JAZZ16_CONFIG_PORT, + .size = 1, .align = 0, + .flags = PNP_PORT_FLAG_FIXED, }, +}; + +static int __init jazz16pnp_add_gameport(void) +{ + struct pnp_dev *dev; + struct pnp_id *dev_id; + + if (!(dev = pnp_alloc(sizeof(*dev)))) + goto out_no_dev; + if (!(dev_id = pnp_alloc(sizeof(*dev_id)))) + goto out_no_id; + if (!jazz16pnp_easy_option(dev, PNP_RES_PRIORITY_INVALID, + jazz16pnp_game_ports, 1, + NULL, 0, NULL, 0)) + goto out_no_option; + + dev->protocol = &jazz16pnp_protocol; + dev->capabilities = PNP_READ; + dev->active = 1; + dev->number = 0; + + pnp_init_resource_table(&dev->res); + dev->res.port_resource[0].start = SB_JAZZ16_CONFIG_PORT; + dev->res.port_resource[0].end = SB_JAZZ16_CONFIG_PORT; + dev->res.port_resource[0].flags = IORESOURCE_IO; + + memcpy(dev_id->id, "PNPb02f", PNP_ID_LEN); + pnp_add_id(dev_id, dev); + + jazz16_gameport_dev = dev; + pnp_add_device(dev); + return 0; + +out_no_option: + if (dev->independent) + pnp_free_option(dev->independent); + kfree(dev_id); +out_no_id: + kfree(dev); +out_no_dev: + return -ENOMEM; +}; + +static struct pnp_port jazz16pnp_ports[2] __initdata = { + { .min = 0x220, .max = 0x260, .align = 0x20, .size = 0x10 }, + { .min = 0x300, .max = 0x330, .align = 0x10, .size = 0x02 }, +}; + +static struct pnp_irq jazz16pnp_irqs[2] __initdata = { + { .map[0] = (1 << 3) | (1 << 5) | (1 << 7) | + (1 << 9) | (1 << 10) | (1 << 15), + .flags = IORESOURCE_IRQ_HIGHEDGE }, + { .map[0] = (1 << 3) | (1 << 5) | (1 << 7) | + (1 << 9) | (1 << 10) | (1 << 15), + .flags = IORESOURCE_IRQ_HIGHEDGE }, +}; + +static struct pnp_dma jazz16pnp_dmas[2] __initdata = { + { .map = (1 << 1) | (1 << 3), .flags = IORESOURCE_DMA_8BIT, }, + { .map = (1 << 5) | (1 << 7), .flags = IORESOURCE_DMA_16BIT, }, +}; + +static int __init jazz16pnp_add_sb(void) +{ + struct pnp_dev *sbdev; + struct pnp_id *sbid; + + if (!(sbdev = pnp_alloc(sizeof(*sbdev)))) + goto out_no_sbdev; + if (!(sbid = pnp_alloc(sizeof(*sbid)))) + goto out_no_sbid; + + if (!jazz16pnp_easy_option(sbdev, PNP_RES_PRIORITY_PREFERRED, + jazz16pnp_ports, 2, + jazz16pnp_irqs, 2, + jazz16pnp_dmas, 2)) + goto out_no_sboption; + if (!jazz16pnp_easy_option(sbdev, PNP_RES_PRIORITY_ACCEPTABLE, + jazz16pnp_ports, 2, + jazz16pnp_irqs, 1, + jazz16pnp_dmas, 2)) + goto out_no_sboption; + memcpy(sbid->id, "PNPb00f", PNP_ID_LEN); + pnp_add_id(sbid, sbdev); + + pnp_init_resource_table(&sbdev->res); + sbdev->capabilities = PNP_READ | PNP_WRITE | PNP_CONFIGURABLE | PNP_DISABLE; + sbdev->protocol = &jazz16pnp_protocol; + sbdev->number = 1; + + jazz16_sb_dev = sbdev; + pnp_add_device(sbdev); + return 0; + +out_no_sboption: + if (sbdev->dependent) + pnp_free_option(sbdev->dependent); + kfree(sbid); +out_no_sbid: + kfree(sbdev); +out_no_sbdev: + return -ENOMEM; +} + +/* Configure the SB and MPU ports. Passing 0 for sbport disables the Jazz16. */ +static void jazz16_port_setup(const uint sbport, const uint mpuport) +{ + u8 config; + + switch (sbport) { + case 0x220: + case 0x240: + case 0x260: + config = sbport & 0x70; + jazz16_sb_port = sbport; + break; + + default: + config = 0; + jazz16_sb_port = 0; + break; + } + + switch (mpuport) { + case 0x300: + case 0x310: + case 0x320: + case 0x330: + config |= (mpuport >> 4) & 0x07; + jazz16_mpu401_port = mpuport; + break; + + default: + if (jazz16_sb_port) + BUG(); + } + if (jazz16pnp_verbose) + printk(PFX_DEBUG "Setting SB port = 0x%x, MPU port = 0x%x.\n", + jazz16_sb_port, jazz16_mpu401_port); + outb(SB_JAZZ16_WAKEUP, SB_JAZZ16_CONFIG_PORT); + outb(SB_JAZZ16_SET_PORTS, SB_JAZZ16_CONFIG_PORT); + outb(config, SB_JAZZ16_CONFIG_PORT); +} + +static u8 jazz16_irq_config(uint irq) +{ + switch (irq) { + case 3: return 3; + case 5: return 1; + case 7: return 4; + case 9: return 2; + case 10: return 5; + case 15: return 6; + default: return 0; + } +} + +static u8 jazz16_dma_config(uint dma) +{ + switch (dma) { + case 1: return 1; + case 3: return 2; + case 5: return 3; + case 7: return 4; + default: return 0; + } +} + +/* The my_sbdsp_xxx functions were ripped from sound/isa/sb/sb_common.c. */ +#define BUSY_LOOPS 100000 + +static int my_sbdsp_command(unsigned int base, unsigned char val) +{ + int i; + for (i = BUSY_LOOPS; i; i--) + if ((inb(SBP1(base, STATUS)) & 0x80) == 0) { + outb(val, SBP1(base, COMMAND)); + return 1; + } + return 0; +} + +static int my_sbdsp_get_byte(unsigned int base) +{ + int val; + int i; + for (i = BUSY_LOOPS; i; i--) { + if (inb(SBP1(base, DATA_AVAIL)) & 0x80) { + val = inb(SBP1(base, READ)); + return val; + } + } + return -ENODEV; +} + +static int my_sbdsp_reset(unsigned int base) +{ + int i; + + outb(1, SBP1(base, RESET)); + udelay(10); + outb(0, SBP1(base, RESET)); + udelay(30); + for (i = BUSY_LOOPS; i; i--) + if (inb(SBP1(base, DATA_AVAIL)) & 0x80) { + if (inb(SBP1(base, READ)) == 0xaa) + return 0; + else + break; + } + return -ENODEV; +} + +static int jazz16_irq_dma_setup(unsigned int base, uint sbirq, uint mpuirq, uint dma8, uint dma16) +{ + u8 dma_config, irq_config; + + if (jazz16pnp_verbose) + printk(PFX_DEBUG "Setting SB irq %u, dma %u&%u, MPU irq %u.\n", + sbirq, dma8, dma16, mpuirq); + irq_config = jazz16_irq_config(sbirq) | jazz16_irq_config(mpuirq) << 4; + dma_config = jazz16_dma_config(dma8) | jazz16_dma_config(dma16) << 4; + if (!my_sbdsp_command(base, SB_JAZZ16_SET_DMAINTR)) + return 0; + + if (!my_sbdsp_command(base, dma_config)) + return 0; + jazz16_sb_dma1 = dma8; + jazz16_sb_dma2 = dma16; + + if (!my_sbdsp_command(base, irq_config)) + return 0; + jazz16_sb_irq = sbirq; + jazz16_mpu401_irq = mpuirq; + return 1; +} + +static int jazz16pnp_get_resources(struct pnp_dev *dev, struct pnp_resource_table *res) +{ + pnp_init_resource_table(res); + if (dev == jazz16_gameport_dev) { + res->port_resource[0].start = res->port_resource[0].end = SB_JAZZ16_CONFIG_PORT; + res->port_resource[0].flags = IORESOURCE_IO; + } + else if (dev == jazz16_sb_dev) { + if (!jazz16_sb_port) + return 0; + res->port_resource[0].start = jazz16_sb_port; + res->port_resource[0].end = jazz16_sb_port + 0x10 - 1; + res->port_resource[0].flags = IORESOURCE_IO; + + res->irq_resource[0].start = res->irq_resource[0].end = jazz16_sb_irq; + res->irq_resource[0].flags = IORESOURCE_IRQ; + + res->dma_resource[0].start = res->dma_resource[0].end = jazz16_sb_dma1; + res->dma_resource[0].flags = IORESOURCE_DMA; + res->dma_resource[1].start = res->dma_resource[1].end = jazz16_sb_dma2; + res->dma_resource[1].flags = IORESOURCE_DMA; + + res->port_resource[1].start = jazz16_mpu401_port; + res->port_resource[1].end = jazz16_mpu401_port + 2 - 1; + res->port_resource[1].flags = IORESOURCE_IO; + + if (!jazz16_mpu401_irq) + return 0; + res->irq_resource[1].start = res->irq_resource[0].end = jazz16_mpu401_irq; + res->irq_resource[1].flags = IORESOURCE_IRQ; + } + else + return -EINVAL; + return 0; +} + +static int jazz16pnp_set_resources(struct pnp_dev *dev, struct pnp_resource_table *res) +{ + unsigned int sbirq, mpuirq, dma1, dma2; + + if (dev == jazz16_gameport_dev) + return -ENOSYS; + + else if (dev == jazz16_sb_dev) { + if ((res->port_resource[0].flags & (IORESOURCE_IO | IORESOURCE_UNSET)) == IORESOURCE_IO) + jazz16_port_setup(res->port_resource[0].start, jazz16_mpu401_port); + if ((res->port_resource[1].flags & (IORESOURCE_IO | IORESOURCE_UNSET)) == IORESOURCE_IO) + jazz16_port_setup(jazz16_sb_port, res->port_resource[1].start); + if ((res->dma_resource[0].flags & (IORESOURCE_DMA | IORESOURCE_UNSET)) == IORESOURCE_DMA) + dma1 = res->dma_resource[0].start; + else + dma1 = jazz16_sb_dma1; + if ((res->dma_resource[1].flags & (IORESOURCE_DMA | IORESOURCE_UNSET)) == IORESOURCE_DMA) + dma2 = res->dma_resource[1].start; + else + dma2 = jazz16_sb_dma2; + if ((res->irq_resource[0].flags & (IORESOURCE_IRQ | IORESOURCE_UNSET)) == IORESOURCE_IRQ) + sbirq = res->irq_resource[0].start; + else + sbirq = jazz16_sb_irq; + if ((res->irq_resource[1].flags & (IORESOURCE_IRQ | IORESOURCE_UNSET)) == IORESOURCE_IRQ) + mpuirq = res->irq_resource[1].start; + else + mpuirq = jazz16_mpu401_irq; + if (jazz16_sb_port) { + /* Block the OPL3 alias to avoid conflicts. */ + jazz16pnp_fm_res = request_region(0x388, 4, "SoundBlaster FM"); + jazz16_irq_dma_setup(jazz16_sb_port, sbirq, mpuirq, dma1, dma2); + } else + return -EBUSY; + dev->active = true; + return 0; + } + else + return -EINVAL; +} + +static int jazz16pnp_disable_resources(struct pnp_dev *dev) +{ + if (dev == jazz16_gameport_dev) { + return -ENOSYS; + } + else if (dev == jazz16_sb_dev) { + jazz16_irq_dma_setup(jazz16_sb_port, 0, 0, 0, 0); + jazz16_port_setup(0, 0); + if (jazz16pnp_fm_res) { + release_resource(jazz16pnp_fm_res); + jazz16pnp_fm_res = NULL; + } + dev->active = false; + return 0; + } + else { + return -EINVAL; + } +} + +static struct pnp_protocol jazz16pnp_protocol = { + .name = "Jazz16 PnP", + .get = jazz16pnp_get_resources, + .set = jazz16pnp_set_resources, + .disable = jazz16pnp_disable_resources, +}; + +static uint __init jazz16_check(unsigned int base) +{ + if (my_sbdsp_reset(base)) + return 0; + if (!(my_sbdsp_command(base, SB_DSP_GET_JAZZ_VERSION))) + return 0; + return SB_VERSION_IS_JAZZ16(my_sbdsp_get_byte(base)); +} + +static int __init jazz16pnp_init(void) +{ + int err = 0; + unsigned int base, mpubase; + + if (jazz16pnp_disable == 1) { + printk(PFX_INFO "Jazz16 Plug & Play support disabled.\n"); + return 0; + } + if (!request_region(SB_JAZZ16_CONFIG_PORT, 1, "Jazz16 PnP probe")) + return -EBUSY; + + for (mpubase = 0x330; mpubase >= 0x300; mpubase -= 0x10) + if (request_region(mpubase, 2, "Jazz16 PnP probe")) + break; + if (mpubase < 0x300) + goto out_no_mpubase; + + if (jazz16pnp_verbose) + printk(PFX_DEBUG "Scanning for Jazz16 cards...\n"); + + for (base = 0x260; base >= 0x220; base -= 0x20) { + if (!request_region(base, 16, "Jazz16 PnP probe")) + continue; + if (jazz16pnp_verbose) + printk(PFX_DEBUG "Probing at 0x%x.\n", base); + jazz16_port_setup(base, mpubase); + if (jazz16_check(base)) + jazz16pnp_count++; + jazz16_irq_dma_setup(base, 0, 0, 0, 0); + jazz16_port_setup(0, 0); + release_region(base, 16); + if (jazz16pnp_count) + break; + } + if (base < 0x220) + goto out_no_sbbase; + if (!jazz16pnp_count) { + err = -ENODEV; + goto out_no_devices; + } + if (pnp_register_protocol(&jazz16pnp_protocol) < 0) + err = -ENOMEM; + else { + if (jazz16pnp_add_gameport()) + printk(PFX_WARN "Failed to add game port.\n"); + if (jazz16pnp_add_sb()) + printk(PFX_WARN "Failed to add SB port.\n"); + err = 0; + } +out_no_devices: + printk(PFX_INFO "%u Jazz16 card%s detected.\n", jazz16pnp_count, + jazz16pnp_count == 1 ? "" : "s"); +out_no_sbbase: + release_region(mpubase, 2); +out_no_mpubase: + release_region(SB_JAZZ16_CONFIG_PORT, 1); + return err; +} +module_init(jazz16pnp_init); + +static void __exit jazz16pnp_exit(void) +{ + pnp_unregister_protocol(&jazz16pnp_protocol); +} +module_exit(jazz16pnp_exit); --- linux-2.6.20/drivers/pnp/Kconfig-orig 2007-02-19 23:23:26.000000000 +0100 +++ linux-2.6.20/drivers/pnp/Kconfig 2007-03-25 21:44:48.000000000 +0200 @@ -39,5 +39,17 @@ source "drivers/pnp/pnpacpi/Kconfig" source "drivers/pnp/pnpacpi/Kconfig" +# +# Jazz16 Plug and Play configuration +# +config JAZZ16PNP + bool "Jazz16 sound card Plug and Play support" + depends on PNP && ISA + help + Say Y here if you would like support for automatic configuration + of I/O ports, DMA channels and IRQ lines of Jazz16 sound cards. + + Say Y if you have such a card. Otherwise, say N. + endmenu -- Rask Ingemann Lambertsen

1 0

[alsa-devel] Can't subscribe to the list
by Ed Wright 26 Mar '07

26 Mar '07

Hi, I've tried 3 times over the last week or so to subscribe to this list with no success. I can't believe I'm doing anything wrong (how hard is it?), but I don't see any posts (in the archives) indicating any problems subscribing, so I'm at a loss. Any suggestions? Or can you subscribe me manually? Thanks, Ed

2 2

[alsa-devel] Support for Compal EL81 (Intel HDA/Realtek alc883)
by Carlo E. Prelz 26 Mar '07

26 Mar '07

Good evening. I am the lucky owner of a nice Compal EL80 laptop, sporting an Intel HDA audio controller with realtek alc883. Here is what I get with lspci -vvv: 00:1b.0 Audio device [0403]: Intel Corporation 82801G (ICH7 Family) High Definition Audio Controller [8086:27d8] (rev 02) Subsystem: COMPAL Electronics Inc Unknown device [14c0:0017] Control: I/O- Mem+ BusMaster+ SpecCycle- MemWINV- VGASnoop- ParErr- Stepping- SERR- FastB2B- Status: Cap+ 66MHz- UDF- FastB2B- ParErr- DEVSEL=fast >TAbort- <TAbort- <MAbort- >SERR- <PERR- Latency: 0, Cache Line Size: 64 bytes Interrupt: pin A routed to IRQ 22 Region 0: Memory at d2500000 (64-bit, non-prefetchable) [size=16K] Capabilities: [50] Power Management version 2 Flags: PMEClk- DSI- D1- D2- AuxCurrent=55mA PME(D0+,D1-,D2-,D3hot+,D3cold+) Status: D0 PME-Enable- DSel=0 DScale=0 PME- Capabilities: [60] Message Signalled Interrupts: Mask- 64bit+ Queue=0/0 Enable- Address: 0000000000000000 Data: 0000 Capabilities: [70] Express Unknown type IRQ 0 Device: Supported: MaxPayload 128 bytes, PhantFunc 0, ExtTag- Device: Latency L0s <64ns, L1 <1us Device: Errors: Correctable- Non-Fatal- Fatal- Unsupported- Device: RlxdOrd- ExtTag- PhantFunc- AuxPwr- NoSnoop+ Device: MaxPayload 128 bytes, MaxReadReq 128 bytes Link: Supported Speed unknown, Width x0, ASPM unknown, Port 0 Link: Latency L0s <64ns, L1 <1us Link: ASPM Disabled CommClk- ExtSynch- Link: Speed unknown, Width x0 Capabilities: [100] Virtual Channel Capabilities: [130] Unknown (5) I had very elementary operativity, but missed much, including for example microphone boost. I applied the following patch: --8<-----8<----8<----8<----8<----8<----8<----8<----8<----8<---8<-- --- /usr/src/alsa/alsa-kernel/pci/hda/patch_realtek.c 2007-02-15 20:00:04.000000000 +0100 +++ ./patch_realtek.c 2007-03-15 08:36:30.000000000 +0100 @@ -141,6 +141,7 @@ ALC883_ACER, ALC883_MEDION, ALC883_LAPTOP_EAPD, + ALC883_LAPTOP_COMPAL, ALC883_AUTO, ALC883_MODEL_LAST, }; @@ -5582,6 +5583,7 @@ [ALC883_ACER] = "acer", [ALC883_MEDION] = "medion", [ALC883_LAPTOP_EAPD] = "laptop-eapd", + [ALC883_LAPTOP_COMPAL] = "laptop-compal", [ALC883_AUTO] = "auto", }; @@ -5607,6 +5609,7 @@ SND_PCI_QUIRK(0x161f, 0x2054, "Medion laptop", ALC883_MEDION), SND_PCI_QUIRK(0x1071, 0x8258, "Evesham Voyaeger", ALC883_LAPTOP_EAPD), SND_PCI_QUIRK(0x8086, 0xd601, "D102GGC", ALC883_3ST_6ch), + SND_PCI_QUIRK(0x14c0, 0x0017, "Compal EL80", ALC883_LAPTOP_COMPAL), {} }; @@ -5747,6 +5750,76 @@ .channel_mode = alc883_3ST_2ch_modes, .input_mux = &alc883_capture_source, }, +#if 1 + [ALC883_LAPTOP_COMPAL] = { + .mixers = { alc883_base_mixer, + alc883_chmode_mixer }, + .init_verbs = { alc883_init_verbs, alc882_eapd_verbs }, + .num_dacs = ARRAY_SIZE(alc883_dac_nids), + .dac_nids = alc883_dac_nids, + .num_adc_nids = ARRAY_SIZE(alc883_adc_nids), + .adc_nids = alc883_adc_nids, + .num_channel_mode = ARRAY_SIZE(alc883_3ST_2ch_modes), + .channel_mode = alc883_3ST_2ch_modes, + .input_mux = &alc883_capture_source, + }, +#else + [ALC883_LAPTOP_COMPAL] = { + .mixers = { alc883_fivestack_mixer, --- /usr/src/alsa/alsa-kernel/pci/hda/patch_realtek.c 2007-02-15 20:00:04.000000000 +0100 +++ ./patch_realtek.c 2007-03-15 08:36:30.000000000 +0100 @@ -141,6 +141,7 @@ ALC883_ACER, ALC883_MEDION, ALC883_LAPTOP_EAPD, + ALC883_LAPTOP_COMPAL, ALC883_AUTO, ALC883_MODEL_LAST, }; @@ -5582,6 +5583,7 @@ [ALC883_ACER] = "acer", [ALC883_MEDION] = "medion", [ALC883_LAPTOP_EAPD] = "laptop-eapd", + [ALC883_LAPTOP_COMPAL] = "laptop-compal", [ALC883_AUTO] = "auto", }; @@ -5607,6 +5609,7 @@ SND_PCI_QUIRK(0x161f, 0x2054, "Medion laptop", ALC883_MEDION), SND_PCI_QUIRK(0x1071, 0x8258, "Evesham Voyaeger", ALC883_LAPTOP_EAPD), SND_PCI_QUIRK(0x8086, 0xd601, "D102GGC", ALC883_3ST_6ch), + SND_PCI_QUIRK(0x14c0, 0x0017, "Compal EL80", ALC883_LAPTOP_COMPAL), {} }; @@ -5747,6 +5750,76 @@ .channel_mode = alc883_3ST_2ch_modes, .input_mux = &alc883_capture_source, }, +#if 1 + [ALC883_LAPTOP_COMPAL] = { + .mixers = { alc883_base_mixer, + alc883_chmode_mixer }, + .init_verbs = { alc883_init_verbs, alc882_eapd_verbs }, + .num_dacs = ARRAY_SIZE(alc883_dac_nids), + .dac_nids = alc883_dac_nids, + .num_adc_nids = ARRAY_SIZE(alc883_adc_nids), + .adc_nids = alc883_adc_nids, + .num_channel_mode = ARRAY_SIZE(alc883_3ST_2ch_modes), + .channel_mode = alc883_3ST_2ch_modes, + .input_mux = &alc883_capture_source, + }, +#else + [ALC883_LAPTOP_COMPAL] = { + .mixers = { alc883_fivestack_mixer, + alc883_chmode_mixer }, + .init_verbs = { alc883_init_verbs, + alc883_medion_eapd_verbs }, + .num_dacs = ARRAY_SIZE(alc883_dac_nids), + .dac_nids = alc883_dac_nids, + .num_adc_nids = ARRAY_SIZE(alc883_adc_nids), + .adc_nids = alc883_adc_nids, + .num_channel_mode = ARRAY_SIZE(alc883_sixstack_modes), + .channel_mode = alc883_sixstack_modes, + .input_mux = &alc883_capture_source, + }, + [ALC883_LAPTOP_COMPAL] = { + .mixers = { alc883_3ST_2ch_mixer }, + .init_verbs = { alc883_init_verbs }, + .num_dacs = ARRAY_SIZE(alc883_dac_nids), + .dac_nids = alc883_dac_nids, + .dig_out_nid = ALC883_DIGOUT_NID, + .num_adc_nids = ARRAY_SIZE(alc883_adc_nids), + .adc_nids = alc883_adc_nids, + .dig_in_nid = ALC883_DIGIN_NID, + .num_channel_mode = ARRAY_SIZE(alc883_3ST_2ch_modes), + .channel_mode = alc883_3ST_2ch_modes, + .input_mux = &alc883_capture_source, + }, + [ALC883_LAPTOP_COMPAL] = { + .mixers = { alc883_3ST_6ch_mixer, alc883_chmode_mixer }, + .init_verbs = { alc883_init_verbs }, + .num_dacs = ARRAY_SIZE(alc883_dac_nids), + .dac_nids = alc883_dac_nids, + .dig_out_nid = ALC883_DIGOUT_NID, + .num_adc_nids = ARRAY_SIZE(alc883_adc_nids), + .adc_nids = alc883_adc_nids, + .dig_in_nid = ALC883_DIGIN_NID, + .num_channel_mode = ARRAY_SIZE(alc883_3ST_6ch_modes), + .channel_mode = alc883_3ST_6ch_modes, + .need_dac_fix = 1, + .input_mux = &alc883_capture_source, + }, + [ALC883_LAPTOP_COMPAL] = { + .mixers = { alc883_tagra_mixer, alc883_chmode_mixer }, + .init_verbs = { alc883_init_verbs, alc883_tagra_verbs}, + .num_dacs = ARRAY_SIZE(alc883_dac_nids), + .dac_nids = alc883_dac_nids, + .dig_out_nid = ALC883_DIGOUT_NID, + .num_adc_nids = ARRAY_SIZE(alc883_adc_nids), + .adc_nids = alc883_adc_nids, + .num_channel_mode = ARRAY_SIZE(alc883_3ST_6ch_modes), + .channel_mode = alc883_3ST_6ch_modes, + .need_dac_fix = 1, + .input_mux = &alc883_capture_source, + .unsol_event = alc883_tagra_unsol_event, + .init_hook = alc883_tagra_automute, + }, +#endif }; --8<-----8<----8<----8<----8<----8<----8<----8<----8<----8<---8<-- As you can see, I did various tests with possible 'alc_config_preset' structures. I could only copy from other existing examples, since I have no idea how you would obtain the correct values to insert there. With the first example, the only one that is commented in (copied from LAPTOP_EAPD), I could obtain a working microphone boost. The thing is far from perfect, though. Suffice to say that I find the main volume in the cursor labeled 'Surround' in alsamixer. Is there any instruction about how to obtain the right information to configure this laptop of mine? Can you help? In this case, what other information may I provide? Thanks in advance Carlo - Den Haag, NL -- * Se la Strada e la sua Virtu' non fossero state messe da parte, * K * Carlo E. Prelz - fluido(a)fluido.as che bisogno ci sarebbe * di parlare tanto di amore e di rettitudine? (Chuang-Tzu)

2 2

[alsa-devel] ftp.alsa-project.org
by Rene Herman 26 Mar '07

26 Mar '07

Hi Jaroslav. When you currently want to download a complete new release from ftp.alsa-project.org you have to scrounge around all the directories manually. Would it be easy to automate to have a /pub/alsa/<version>/ directory containing links to all the relevant packages? Ie: /pub/alsa/1.0.13/alsa-driver-1.0.13.tar.bz2 -> ../../driver/alsa-driver-1.13.tar.bz2 and same: alsa-lib-1.0.13.tar.bz2 -> ../../lib/alsa-lib-1.13.tar.bz2 alsa-plugins-1.0.13.tar.bz2 -> ../../plugins/alsa-plugins-1.13.tar.bz2 alsa-utils-1.0.13.tar.bz2 -> ../../utils/alsa-utils-1.13.tar.bz2 alsa-tools-1.0.13.tar.bz2 -> ../../tools/alsa-tools-1.13.tar.bz2 alsa-firmware-1.0.13.tar.bz2 -> .../firmware/alsa-firmware-1.13.tar.bz2 alsa-oss-lib-1.0.12.tar.bz2 -> ../../oss-lib/alsa-oss-lib-1.12.tar.bz2 with probably links /pub/alsa/stable -> 1.0.13 and /pub/alsa/devel -> 1.14rc3 and stuff like that. (by the way, as far as I'm concerned, the /pub/alsa locations wouldn't need to be links but could just as well be the main locations but if you want to keep the current layout in place...) Would make it a bit nicer to download a new release... Rene.

1 0

[alsa-devel] Patch to p5vdc-x motherboard's sound
by sergiodaniel＠inf.ufg.br 26 Mar '07

26 Mar '07

This is a description to correct the problem of p5vdc-x motherboard's. In file hda_codec.c the line 1727 is: if (codec->bus->modelname && models) { the variable codec->bus->modelname not is reconized for asus pc5vdc-x motherboards. Your ship is "Analog Devices AD1986A" i correct this add the lines in the funcion static int patch_ad1986a(struct hda_codec *codec) . . . default: spec->num_mixers = 2; spec->mixers[1] = ad1986a_3st_mixers; spec->num_init_verbs = 3; spec->init_verbs[1] = ad1986a_3st_init_verbs; spec->init_verbs[2] = ad1986a_ch2_init; spec->channel_mode = ad1986a_modes; spec->num_channel_mode = ARRAY_SIZE(ad1986a_modes); spec->need_dac_fix = 1; spec->multiout.max_channels = 2; spec->multiout.num_dacs = 1; break; } The complete code is in www.inf.ufg.br/~sergiodaniel/alsa-driver-1.0.14_PATCH_rc3-p5vdc-x.tar.gz thank's.. Sérgio Daniel ---------------------------------------------------------------- This message was sent using IMP, the Internet Messaging Program.

2 1

Re: [alsa-devel] [PATCH] azt3328.c: small cleanup patch
by Takashi Iwai 26 Mar '07

26 Mar '07

At Sun, 25 Mar 2007 21:06:56 +0200, Andreas Mohr wrote: > > Hi, > > - change "PCM" mixer control (pre/post 3D) to "PCM Output Route" > - improve snd_azf3328_debug_show_ports > - less aggressive module init message > - document Bass/Treble non-bug (prompted by user report - Thank You!!) > - add some items to card description > - add some I/O register documentation > - enhance copyright > > Patch done and hardware-tested on 2.6.21-rc4-mm1, hopefully applies cleanly > to current ALSA. > > Signed-off-by: Andreas Mohr <andi(a)lisas.de> Thanks, applied to HG tree now. (BTW, the address of alsa-devel ML was changed to alsa-devel(a)alsa-project.org) Takashi

1 0

[alsa-devel] [PATCH -mm] sound/pci/au88x0/au88x0_a3d.c remove unused code
by Michal Piotrowski 26 Mar '07

26 Mar '07

This patch is against the latest -mm snapshot. Regards, Michal -- Michal K. K. Piotrowski LTG - Linux Testers Group (PL) (http://www.stardust.webpages.pl/ltg/) LTG - Linux Testers Group (EN) (http://www.stardust.webpages.pl/linux_testers_group_en/) Signed-off-by: Michal Piotrowski <michal.k.k.piotrowski(a)gmail.com> --- linux-work5/sound/pci/au88x0/au88x0_a3d.c 2007-02-04 19:44:54.000000000 +0100 +++ linux-work3/sound/pci/au88x0/au88x0_a3d.c 2007-03-25 16:23:46.000000000 +0200 @@ -44,15 +44,6 @@ a3dsrc_SetTimeConsts(a3dsrc_t * a, short a3d_addrA(a->slice, a->source, A3D_A_CoeffTrackTC), CTrack); } -#if 0 -static void -a3dsrc_GetTimeConsts(a3dsrc_t * a, short *HrtfTrack, short *ItdTrack, - short *GTrack, short *CTrack) -{ - // stub! -} - -#endif /* Atmospheric absorbtion. */ static void @@ -95,41 +86,6 @@ a3dsrc_SetAtmosState(a3dsrc_t * a, short hwwrite(vortex->mmio, a3d_addrA(a->slice, a->source, A3D_A_y2), y2); } -#if 0 -static void -a3dsrc_GetAtmosTarget(a3dsrc_t * a, short *aa, short *b, short *c, - short *d, short *e) -{ -} -static void -a3dsrc_GetAtmosCurrent(a3dsrc_t * a, short *bb01, short *ab01, short *b2, - short *aa12, short *ba12) -{ - vortex_t *vortex = (vortex_t *) (a->vortex); - *aa12 = - hwread(vortex->mmio, - a3d_addrA(a->slice, a->source, A3D_A_A12Current)); - *ba12 = - hwread(vortex->mmio, - a3d_addrB(a->slice, a->source, A3D_B_A12Current)); - *ab01 = - hwread(vortex->mmio, - a3d_addrA(a->slice, a->source, A3D_A_B01Current)); - *bb01 = - hwread(vortex->mmio, - a3d_addrB(a->slice, a->source, A3D_B_B01Current)); - *b2 = - hwread(vortex->mmio, - a3d_addrA(a->slice, a->source, A3D_A_B2Current)); -} - -static void -a3dsrc_GetAtmosState(a3dsrc_t * a, short *x1, short *x2, short *y1, short *y2) -{ - -} - -#endif /* HRTF */ static void @@ -180,71 +136,6 @@ static void a3dsrc_SetHrtfOutput(a3dsrc_ a3d_addrA(a->slice, a->source, A3D_A_HrtfOutR), right); } -#if 0 -static void a3dsrc_GetHrtfTarget(a3dsrc_t * a, a3d_Hrtf_t aa, a3d_Hrtf_t b) -{ - vortex_t *vortex = (vortex_t *) (a->vortex); - int i; - - for (i = 0; i < HRTF_SZ; i++) - aa[i] = - hwread(vortex->mmio, - a3d_addrA(a->slice, a->source, - A3D_A_HrtfTarget + (i << 2))); - for (i = 0; i < HRTF_SZ; i++) - b[i] = - hwread(vortex->mmio, - a3d_addrB(a->slice, a->source, - A3D_B_HrtfTarget + (i << 2))); -} - -static void a3dsrc_GetHrtfCurrent(a3dsrc_t * a, a3d_Hrtf_t aa, a3d_Hrtf_t b) -{ - vortex_t *vortex = (vortex_t *) (a->vortex); - int i; - - for (i = 0; i < HRTF_SZ; i++) - aa[i] = - hwread(vortex->mmio, - a3d_addrA(a->slice, a->source, - A3D_A_HrtfCurrent + (i << 2))); - for (i = 0; i < HRTF_SZ; i++) - b[i] = - hwread(vortex->mmio, - a3d_addrB(a->slice, a->source, - A3D_B_HrtfCurrent + (i << 2))); -} - -static void a3dsrc_GetHrtfState(a3dsrc_t * a, a3d_Hrtf_t aa, a3d_Hrtf_t b) -{ - vortex_t *vortex = (vortex_t *) (a->vortex); - int i; - // FIXME: verify this! - for (i = 0; i < HRTF_SZ; i++) - aa[i] = - hwread(vortex->mmio, - a3d_addrA(a->slice, a->source, - A3D_A_HrtfDelayLine + (i << 2))); - for (i = 0; i < HRTF_SZ; i++) - b[i] = - hwread(vortex->mmio, - a3d_addrB(a->slice, a->source, - A3D_B_HrtfDelayLine + (i << 2))); -} - -static void a3dsrc_GetHrtfOutput(a3dsrc_t * a, short *left, short *right) -{ - vortex_t *vortex = (vortex_t *) (a->vortex); - *left = - hwread(vortex->mmio, - a3d_addrA(a->slice, a->source, A3D_A_HrtfOutL)); - *right = - hwread(vortex->mmio, - a3d_addrA(a->slice, a->source, A3D_A_HrtfOutR)); -} - -#endif - /* Interaural Time Difference. * "The other main clue that humans use to locate sounds, is called * Interaural Time Difference (ITD). The differences in distance from @@ -297,43 +188,6 @@ static void a3dsrc_SetItdDline(a3dsrc_t A3D_A_ITDDelayLine) + (i << 2), dline[i]); } -#if 0 -static void a3dsrc_GetItdTarget(a3dsrc_t * a, short *litd, short *ritd) -{ - vortex_t *vortex = (vortex_t *) (a->vortex); - *ritd = - hwread(vortex->mmio, - a3d_addrA(a->slice, a->source, A3D_A_ITDTarget)); - *litd = - hwread(vortex->mmio, - a3d_addrB(a->slice, a->source, A3D_B_ITDTarget)); -} - -static void a3dsrc_GetItdCurrent(a3dsrc_t * a, short *litd, short *ritd) -{ - vortex_t *vortex = (vortex_t *) (a->vortex); - - *ritd = - hwread(vortex->mmio, - a3d_addrA(a->slice, a->source, A3D_A_ITDCurrent)); - *litd = - hwread(vortex->mmio, - a3d_addrB(a->slice, a->source, A3D_B_ITDCurrent)); -} - -static void a3dsrc_GetItdDline(a3dsrc_t * a, a3d_ItdDline_t dline) -{ - vortex_t *vortex = (vortex_t *) (a->vortex); - int i; - - for (i = 0; i < DLINE_SZ; i++) - dline[i] = - hwread(vortex->mmio, - a3d_addrA(a->slice, a->source, - A3D_A_ITDDelayLine + (i << 2))); -} - -#endif /* This is may be used for ILD Interaural Level Difference. */ static void a3dsrc_SetGainTarget(a3dsrc_t * a, short left, short right) @@ -352,37 +206,6 @@ static void a3dsrc_SetGainCurrent(a3dsrc (right << 0x10) | left); } -#if 0 -static void a3dsrc_GetGainTarget(a3dsrc_t * a, short *left, short *right) -{ - vortex_t *vortex = (vortex_t *) (a->vortex); - *right = - hwread(vortex->mmio, - a3d_addrA(a->slice, a->source, A3D_A_GainTarget)); - *left = - hwread(vortex->mmio, - a3d_addrB(a->slice, a->source, A3D_B_GainTarget)); -} - -static void a3dsrc_GetGainCurrent(a3dsrc_t * a, short *left, short *right) -{ - vortex_t *vortex = (vortex_t *) (a->vortex); - *right = - hwread(vortex->mmio, - a3d_addrA(a->slice, a->source, A3D_A_GainCurrent)); - *left = - hwread(vortex->mmio, - a3d_addrB(a->slice, a->source, A3D_B_GainCurrent)); -} - -/* CA3dIO this func seems to be inlined all over this place. */ -static void CA3dIO_WriteReg(a3dsrc_t * a, unsigned long addr, short aa, short b) -{ - vortex_t *vortex = (vortex_t *) (a->vortex); - hwwrite(vortex->mmio, addr, (aa << 0x10) | b); -} - -#endif /* Generic A3D stuff */ static void a3dsrc_SetA3DSampleRate(a3dsrc_t * a, int sr) @@ -422,28 +245,6 @@ static void a3dsrc_SetA3DPointerReg(a3ds hwwrite(vortex->mmio, A3D_SLICE_Pointers + ((a->slice) << 0xd), ptr); } -#if 0 -static void a3dsrc_GetA3DSampleRate(a3dsrc_t * a, int *sr) -{ - vortex_t *vortex = (vortex_t *) (a->vortex); - *sr = ((hwread(vortex->mmio, A3D_SLICE_Control + (a->slice << 0xd)) - >> 3) & 0x1f); - //*sr = ((hwread(vortex->mmio, 0x19C38 + (this08<<0xd))>>3)&0x1f); -} - -static void a3dsrc_GetA3DControlReg(a3dsrc_t * a, unsigned long *ctrl) -{ - vortex_t *vortex = (vortex_t *) (a->vortex); - *ctrl = hwread(vortex->mmio, A3D_SLICE_Control + ((a->slice) << 0xd)); -} - -static void a3dsrc_GetA3DPointerReg(a3dsrc_t * a, unsigned long *ptr) -{ - vortex_t *vortex = (vortex_t *) (a->vortex); - *ptr = hwread(vortex->mmio, A3D_SLICE_Pointers + ((a->slice) << 0xd)); -} - -#endif static void a3dsrc_ZeroSliceIO(a3dsrc_t * a) { vortex_t *vortex = (vortex_t *) (a->vortex); @@ -528,25 +329,6 @@ static void a3dsrc_ProgramPipe(a3dsrc_t //a3dsrc_SetHrtfTarget(a, A3dHrirSatTest, A3dHrirSatTest); } -/* VDB = Vortex audio Dataflow Bus */ -#if 0 -static void a3dsrc_ClearVDBData(a3dsrc_t * a, unsigned long aa) -{ - vortex_t *vortex = (vortex_t *) (a->vortex); - - // ((aa >> 2) << 8) - (aa >> 2) - hwwrite(vortex->mmio, - a3d_addrS(a->slice, A3D_SLICE_VDBDest) + (a->source << 2), 0); - hwwrite(vortex->mmio, - a3d_addrS(a->slice, - A3D_SLICE_VDBDest + 4) + (a->source << 2), 0); - /* - hwwrite(vortex->mmio, 0x19c00 + (((aa>>2)*255*4)+aa)*8, 0); - hwwrite(vortex->mmio, 0x19c04 + (((aa>>2)*255*4)+aa)*8, 0); - */ -} -#endif - /* A3D HwSource stuff. */ static void vortex_A3dSourceHw_Initialize(vortex_t * v, int source, int slice) @@ -622,7 +404,6 @@ static void vortex_Vort3D_connect(vortex return; #endif -#if 1 /* Alloc Xtalk mixin resources */ v->mixxtlk[0] = vortex_adb_checkinout(v, v->fixed_res, en, VORTEX_RESOURCE_MIXIN); @@ -638,7 +419,6 @@ static void vortex_Vort3D_connect(vortex ("vortex: vortex_Vort3D: ERROR: not enough free mixer resources.\n"); return; } -#endif /* Connect A3D -> XTALK */ for (i = 0; i < 4; i++) { @@ -646,10 +426,7 @@ static void vortex_Vort3D_connect(vortex vortex_route(v, en, 0x11, ADB_A3DOUT(i * 2), ADB_XTALKIN(i)); vortex_route(v, en, 0x11, ADB_A3DOUT(i * 2) + 1, ADB_XTALKIN(5 + i)); } -#if 0 - vortex_route(v, en, 0x11, ADB_XTALKOUT(0), ADB_EQIN(2)); - vortex_route(v, en, 0x11, ADB_XTALKOUT(1), ADB_EQIN(3)); -#else + /* Connect XTalk -> mixer */ vortex_route(v, en, 0x11, ADB_XTALKOUT(0), ADB_MIXIN(v->mixxtlk[0])); vortex_route(v, en, 0x11, ADB_XTALKOUT(1), ADB_MIXIN(v->mixxtlk[1])); @@ -671,7 +448,6 @@ static void vortex_Vort3D_connect(vortex v->mixxtlk[1], en ? MIX_DEFIGAIN : VOL_MIN); } -#endif } /* Initialize one single A3D source. */

4 5