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

[PATCH] Revert sound/pci/*.[ch] to 2.6.39
by Michal Hocko 10 Jun '11

10 Jun '11

Takashi has suggested to revert these files to 2.6.39 to test auto mute breakage in 3.0.0-rc[12] --- sound/pci/es1968.c | 78 ---------- sound/pci/fm801.c | 378 +++++++++++++++++++++++++++++++++++++----------- sound/pci/intel8x0m.c | 4 +- 3 files changed, 293 insertions(+), 167 deletions(-) diff --git a/sound/pci/es1968.c b/sound/pci/es1968.c index ab0a615..7c17f45 100644 --- a/sound/pci/es1968.c +++ b/sound/pci/es1968.c @@ -112,10 +112,6 @@ #include <sound/ac97_codec.h> #include <sound/initval.h> -#ifdef CONFIG_SND_ES1968_RADIO -#include <sound/tea575x-tuner.h> -#endif - #define CARD_NAME "ESS Maestro1/2" #define DRIVER_NAME "ES1968" @@ -557,10 +553,6 @@ struct es1968 { spinlock_t ac97_lock; struct tasklet_struct hwvol_tq; #endif - -#ifdef CONFIG_SND_ES1968_RADIO - struct snd_tea575x tea; -#endif }; static irqreturn_t snd_es1968_interrupt(int irq, void *dev_id); @@ -2579,63 +2571,6 @@ static int __devinit snd_es1968_input_register(struct es1968 *chip) } #endif /* CONFIG_SND_ES1968_INPUT */ -#ifdef CONFIG_SND_ES1968_RADIO -#define GPIO_DATA 0x60 -#define IO_MASK 4 /* mask register offset from GPIO_DATA - bits 1=unmask write to given bit */ -#define IO_DIR 8 /* direction register offset from GPIO_DATA - bits 0/1=read/write direction */ -/* mask bits for GPIO lines */ -#define STR_DATA 0x0040 /* GPIO6 */ -#define STR_CLK 0x0080 /* GPIO7 */ -#define STR_WREN 0x0100 /* GPIO8 */ -#define STR_MOST 0x0200 /* GPIO9 */ - -static void snd_es1968_tea575x_set_pins(struct snd_tea575x *tea, u8 pins) -{ - struct es1968 *chip = tea->private_data; - unsigned long io = chip->io_port + GPIO_DATA; - u16 val = 0; - - val |= (pins & TEA575X_DATA) ? STR_DATA : 0; - val |= (pins & TEA575X_CLK) ? STR_CLK : 0; - val |= (pins & TEA575X_WREN) ? STR_WREN : 0; - - outw(val, io); -} - -static u8 snd_es1968_tea575x_get_pins(struct snd_tea575x *tea) -{ - struct es1968 *chip = tea->private_data; - unsigned long io = chip->io_port + GPIO_DATA; - u16 val = inw(io); - - return (val & STR_DATA) ? TEA575X_DATA : 0 | - (val & STR_MOST) ? TEA575X_MOST : 0; -} - -static void snd_es1968_tea575x_set_direction(struct snd_tea575x *tea, bool output) -{ - struct es1968 *chip = tea->private_data; - unsigned long io = chip->io_port + GPIO_DATA; - u16 odir = inw(io + IO_DIR); - - if (output) { - outw(~(STR_DATA | STR_CLK | STR_WREN), io + IO_MASK); - outw(odir | STR_DATA | STR_CLK | STR_WREN, io + IO_DIR); - } else { - outw(~(STR_CLK | STR_WREN | STR_DATA | STR_MOST), io + IO_MASK); - outw((odir & ~(STR_DATA | STR_MOST)) | STR_CLK | STR_WREN, io + IO_DIR); - } -} - -static struct snd_tea575x_ops snd_es1968_tea_ops = { - .set_pins = snd_es1968_tea575x_set_pins, - .get_pins = snd_es1968_tea575x_get_pins, - .set_direction = snd_es1968_tea575x_set_direction, -}; -#endif - static int snd_es1968_free(struct es1968 *chip) { #ifdef CONFIG_SND_ES1968_INPUT @@ -2650,10 +2585,6 @@ static int snd_es1968_free(struct es1968 *chip) outw(0, chip->io_port + ESM_PORT_HOST_IRQ); /* disable IRQ */ } -#ifdef CONFIG_SND_ES1968_RADIO - snd_tea575x_exit(&chip->tea); -#endif - if (chip->irq >= 0) free_irq(chip->irq, chip); snd_es1968_free_gameport(chip); @@ -2792,15 +2723,6 @@ static int __devinit snd_es1968_create(struct snd_card *card, snd_card_set_dev(card, &pci->dev); -#ifdef CONFIG_SND_ES1968_RADIO - chip->tea.private_data = chip; - chip->tea.ops = &snd_es1968_tea_ops; - strlcpy(chip->tea.card, "SF64-PCE2", sizeof(chip->tea.card)); - sprintf(chip->tea.bus_info, "PCI:%s", pci_name(pci)); - if (!snd_tea575x_init(&chip->tea)) - printk(KERN_INFO "es1968: detected TEA575x radio\n"); -#endif - *chip_ret = chip; return 0; diff --git a/sound/pci/fm801.c b/sound/pci/fm801.c index a7ec703..e1baad7 100644 --- a/sound/pci/fm801.c +++ b/sound/pci/fm801.c @@ -38,6 +38,7 @@ #ifdef CONFIG_SND_FM801_TEA575X_BOOL #include <sound/tea575x-tuner.h> +#define TEA575X_RADIO 1 #endif MODULE_AUTHOR("Jaroslav Kysela <perex(a)perex.cz>"); @@ -52,7 +53,7 @@ static int enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP; /* Enable this card * /* * Enable TEA575x tuner * 1 = MediaForte 256-PCS - * 2 = MediaForte 256-PCP + * 2 = MediaForte 256-PCPR * 3 = MediaForte 64-PCR * 16 = setup tuner only (this is additional bit), i.e. SF64-PCR FM card * High 16-bits are video (radio) device number + 1 @@ -66,7 +67,7 @@ MODULE_PARM_DESC(id, "ID string for the FM801 soundcard."); module_param_array(enable, bool, NULL, 0444); MODULE_PARM_DESC(enable, "Enable FM801 soundcard."); module_param_array(tea575x_tuner, int, NULL, 0444); -MODULE_PARM_DESC(tea575x_tuner, "TEA575x tuner access method (0 = auto, 1 = SF256-PCS, 2=SF256-PCP, 3=SF64-PCR, 8=disable, +16=tuner-only)."); +MODULE_PARM_DESC(tea575x_tuner, "TEA575x tuner access method (1 = SF256-PCS, 2=SF256-PCPR, 3=SF64-PCR, +16=tuner-only)."); #define TUNER_ONLY (1<<4) #define TUNER_TYPE_MASK (~TUNER_ONLY & 0xFFFF) @@ -195,7 +196,7 @@ struct fm801 { spinlock_t reg_lock; struct snd_info_entry *proc_entry; -#ifdef CONFIG_SND_FM801_TEA575X_BOOL +#ifdef TEA575X_RADIO struct snd_tea575x tea; #endif @@ -714,89 +715,310 @@ static int __devinit snd_fm801_pcm(struct fm801 *chip, int device, struct snd_pc * TEA5757 radio */ -#ifdef CONFIG_SND_FM801_TEA575X_BOOL +#ifdef TEA575X_RADIO -/* GPIO to TEA575x maps */ -struct snd_fm801_tea575x_gpio { - u8 data, clk, wren, most; - char *name; -}; +/* 256PCS GPIO numbers */ +#define TEA_256PCS_DATA 1 +#define TEA_256PCS_WRITE_ENABLE 2 /* inverted */ +#define TEA_256PCS_BUS_CLOCK 3 -static struct snd_fm801_tea575x_gpio snd_fm801_tea575x_gpios[] = { - { .data = 1, .clk = 3, .wren = 2, .most = 0, .name = "SF256-PCS" }, - { .data = 1, .clk = 0, .wren = 2, .most = 3, .name = "SF256-PCP" }, - { .data = 2, .clk = 0, .wren = 1, .most = 3, .name = "SF64-PCR" }, -}; +static void snd_fm801_tea575x_256pcs_write(struct snd_tea575x *tea, unsigned int val) +{ + struct fm801 *chip = tea->private_data; + unsigned short reg; + int i = 25; -static void snd_fm801_tea575x_set_pins(struct snd_tea575x *tea, u8 pins) + spin_lock_irq(&chip->reg_lock); + reg = inw(FM801_REG(chip, GPIO_CTRL)); + /* use GPIO lines and set write enable bit */ + reg |= FM801_GPIO_GS(TEA_256PCS_DATA) | + FM801_GPIO_GS(TEA_256PCS_WRITE_ENABLE) | + FM801_GPIO_GS(TEA_256PCS_BUS_CLOCK); + /* all of lines are in the write direction */ + /* clear data and clock lines */ + reg &= ~(FM801_GPIO_GD(TEA_256PCS_DATA) | + FM801_GPIO_GD(TEA_256PCS_WRITE_ENABLE) | + FM801_GPIO_GD(TEA_256PCS_BUS_CLOCK) | + FM801_GPIO_GP(TEA_256PCS_DATA) | + FM801_GPIO_GP(TEA_256PCS_BUS_CLOCK) | + FM801_GPIO_GP(TEA_256PCS_WRITE_ENABLE)); + outw(reg, FM801_REG(chip, GPIO_CTRL)); + udelay(1); + + while (i--) { + if (val & (1 << i)) + reg |= FM801_GPIO_GP(TEA_256PCS_DATA); + else + reg &= ~FM801_GPIO_GP(TEA_256PCS_DATA); + outw(reg, FM801_REG(chip, GPIO_CTRL)); + udelay(1); + reg |= FM801_GPIO_GP(TEA_256PCS_BUS_CLOCK); + outw(reg, FM801_REG(chip, GPIO_CTRL)); + reg &= ~FM801_GPIO_GP(TEA_256PCS_BUS_CLOCK); + outw(reg, FM801_REG(chip, GPIO_CTRL)); + udelay(1); + } + + /* and reset the write enable bit */ + reg |= FM801_GPIO_GP(TEA_256PCS_WRITE_ENABLE) | + FM801_GPIO_GP(TEA_256PCS_DATA); + outw(reg, FM801_REG(chip, GPIO_CTRL)); + spin_unlock_irq(&chip->reg_lock); +} + +static unsigned int snd_fm801_tea575x_256pcs_read(struct snd_tea575x *tea) { struct fm801 *chip = tea->private_data; - unsigned short reg = inw(FM801_REG(chip, GPIO_CTRL)); - struct snd_fm801_tea575x_gpio gpio = snd_fm801_tea575x_gpios[(chip->tea575x_tuner & TUNER_TYPE_MASK) - 1]; + unsigned short reg; + unsigned int val = 0; + int i; + + spin_lock_irq(&chip->reg_lock); + reg = inw(FM801_REG(chip, GPIO_CTRL)); + /* use GPIO lines, set data direction to input */ + reg |= FM801_GPIO_GS(TEA_256PCS_DATA) | + FM801_GPIO_GS(TEA_256PCS_WRITE_ENABLE) | + FM801_GPIO_GS(TEA_256PCS_BUS_CLOCK) | + FM801_GPIO_GD(TEA_256PCS_DATA) | + FM801_GPIO_GP(TEA_256PCS_DATA) | + FM801_GPIO_GP(TEA_256PCS_WRITE_ENABLE); + /* all of lines are in the write direction, except data */ + /* clear data, write enable and clock lines */ + reg &= ~(FM801_GPIO_GD(TEA_256PCS_WRITE_ENABLE) | + FM801_GPIO_GD(TEA_256PCS_BUS_CLOCK) | + FM801_GPIO_GP(TEA_256PCS_BUS_CLOCK)); + + for (i = 0; i < 24; i++) { + reg &= ~FM801_GPIO_GP(TEA_256PCS_BUS_CLOCK); + outw(reg, FM801_REG(chip, GPIO_CTRL)); + udelay(1); + reg |= FM801_GPIO_GP(TEA_256PCS_BUS_CLOCK); + outw(reg, FM801_REG(chip, GPIO_CTRL)); + udelay(1); + val <<= 1; + if (inw(FM801_REG(chip, GPIO_CTRL)) & FM801_GPIO_GP(TEA_256PCS_DATA)) + val |= 1; + } - reg &= ~(FM801_GPIO_GP(gpio.data) | - FM801_GPIO_GP(gpio.clk) | - FM801_GPIO_GP(gpio.wren)); + spin_unlock_irq(&chip->reg_lock); + + return val; +} - reg |= (pins & TEA575X_DATA) ? FM801_GPIO_GP(gpio.data) : 0; - reg |= (pins & TEA575X_CLK) ? FM801_GPIO_GP(gpio.clk) : 0; - /* WRITE_ENABLE is inverted */ - reg |= (pins & TEA575X_WREN) ? 0 : FM801_GPIO_GP(gpio.wren); +/* 256PCPR GPIO numbers */ +#define TEA_256PCPR_BUS_CLOCK 0 +#define TEA_256PCPR_DATA 1 +#define TEA_256PCPR_WRITE_ENABLE 2 /* inverted */ + +static void snd_fm801_tea575x_256pcpr_write(struct snd_tea575x *tea, unsigned int val) +{ + struct fm801 *chip = tea->private_data; + unsigned short reg; + int i = 25; + + spin_lock_irq(&chip->reg_lock); + reg = inw(FM801_REG(chip, GPIO_CTRL)); + /* use GPIO lines and set write enable bit */ + reg |= FM801_GPIO_GS(TEA_256PCPR_DATA) | + FM801_GPIO_GS(TEA_256PCPR_WRITE_ENABLE) | + FM801_GPIO_GS(TEA_256PCPR_BUS_CLOCK); + /* all of lines are in the write direction */ + /* clear data and clock lines */ + reg &= ~(FM801_GPIO_GD(TEA_256PCPR_DATA) | + FM801_GPIO_GD(TEA_256PCPR_WRITE_ENABLE) | + FM801_GPIO_GD(TEA_256PCPR_BUS_CLOCK) | + FM801_GPIO_GP(TEA_256PCPR_DATA) | + FM801_GPIO_GP(TEA_256PCPR_BUS_CLOCK) | + FM801_GPIO_GP(TEA_256PCPR_WRITE_ENABLE)); + outw(reg, FM801_REG(chip, GPIO_CTRL)); + udelay(1); + + while (i--) { + if (val & (1 << i)) + reg |= FM801_GPIO_GP(TEA_256PCPR_DATA); + else + reg &= ~FM801_GPIO_GP(TEA_256PCPR_DATA); + outw(reg, FM801_REG(chip, GPIO_CTRL)); + udelay(1); + reg |= FM801_GPIO_GP(TEA_256PCPR_BUS_CLOCK); + outw(reg, FM801_REG(chip, GPIO_CTRL)); + reg &= ~FM801_GPIO_GP(TEA_256PCPR_BUS_CLOCK); + outw(reg, FM801_REG(chip, GPIO_CTRL)); + udelay(1); + } + /* and reset the write enable bit */ + reg |= FM801_GPIO_GP(TEA_256PCPR_WRITE_ENABLE) | + FM801_GPIO_GP(TEA_256PCPR_DATA); outw(reg, FM801_REG(chip, GPIO_CTRL)); + spin_unlock_irq(&chip->reg_lock); } -static u8 snd_fm801_tea575x_get_pins(struct snd_tea575x *tea) +static unsigned int snd_fm801_tea575x_256pcpr_read(struct snd_tea575x *tea) { struct fm801 *chip = tea->private_data; - unsigned short reg = inw(FM801_REG(chip, GPIO_CTRL)); - struct snd_fm801_tea575x_gpio gpio = snd_fm801_tea575x_gpios[(chip->tea575x_tuner & TUNER_TYPE_MASK) - 1]; + unsigned short reg; + unsigned int val = 0; + int i; + + spin_lock_irq(&chip->reg_lock); + reg = inw(FM801_REG(chip, GPIO_CTRL)); + /* use GPIO lines, set data direction to input */ + reg |= FM801_GPIO_GS(TEA_256PCPR_DATA) | + FM801_GPIO_GS(TEA_256PCPR_WRITE_ENABLE) | + FM801_GPIO_GS(TEA_256PCPR_BUS_CLOCK) | + FM801_GPIO_GD(TEA_256PCPR_DATA) | + FM801_GPIO_GP(TEA_256PCPR_DATA) | + FM801_GPIO_GP(TEA_256PCPR_WRITE_ENABLE); + /* all of lines are in the write direction, except data */ + /* clear data, write enable and clock lines */ + reg &= ~(FM801_GPIO_GD(TEA_256PCPR_WRITE_ENABLE) | + FM801_GPIO_GD(TEA_256PCPR_BUS_CLOCK) | + FM801_GPIO_GP(TEA_256PCPR_BUS_CLOCK)); + + for (i = 0; i < 24; i++) { + reg &= ~FM801_GPIO_GP(TEA_256PCPR_BUS_CLOCK); + outw(reg, FM801_REG(chip, GPIO_CTRL)); + udelay(1); + reg |= FM801_GPIO_GP(TEA_256PCPR_BUS_CLOCK); + outw(reg, FM801_REG(chip, GPIO_CTRL)); + udelay(1); + val <<= 1; + if (inw(FM801_REG(chip, GPIO_CTRL)) & FM801_GPIO_GP(TEA_256PCPR_DATA)) + val |= 1; + } + + spin_unlock_irq(&chip->reg_lock); - return (reg & FM801_GPIO_GP(gpio.data)) ? TEA575X_DATA : 0 | - (reg & FM801_GPIO_GP(gpio.most)) ? TEA575X_MOST : 0; + return val; } -static void snd_fm801_tea575x_set_direction(struct snd_tea575x *tea, bool output) +/* 64PCR GPIO numbers */ +#define TEA_64PCR_BUS_CLOCK 0 +#define TEA_64PCR_WRITE_ENABLE 1 /* inverted */ +#define TEA_64PCR_DATA 2 + +static void snd_fm801_tea575x_64pcr_write(struct snd_tea575x *tea, unsigned int val) { struct fm801 *chip = tea->private_data; - unsigned short reg = inw(FM801_REG(chip, GPIO_CTRL)); - struct snd_fm801_tea575x_gpio gpio = snd_fm801_tea575x_gpios[(chip->tea575x_tuner & TUNER_TYPE_MASK) - 1]; + unsigned short reg; + int i = 25; + spin_lock_irq(&chip->reg_lock); + reg = inw(FM801_REG(chip, GPIO_CTRL)); /* use GPIO lines and set write enable bit */ - reg |= FM801_GPIO_GS(gpio.data) | - FM801_GPIO_GS(gpio.wren) | - FM801_GPIO_GS(gpio.clk) | - FM801_GPIO_GS(gpio.most); - if (output) { - /* all of lines are in the write direction */ - /* clear data and clock lines */ - reg &= ~(FM801_GPIO_GD(gpio.data) | - FM801_GPIO_GD(gpio.wren) | - FM801_GPIO_GD(gpio.clk) | - FM801_GPIO_GP(gpio.data) | - FM801_GPIO_GP(gpio.clk) | - FM801_GPIO_GP(gpio.wren)); - } else { - /* use GPIO lines, set data direction to input */ - reg |= FM801_GPIO_GD(gpio.data) | - FM801_GPIO_GD(gpio.most) | - FM801_GPIO_GP(gpio.data) | - FM801_GPIO_GP(gpio.most) | - FM801_GPIO_GP(gpio.wren); - /* all of lines are in the write direction, except data */ - /* clear data, write enable and clock lines */ - reg &= ~(FM801_GPIO_GD(gpio.wren) | - FM801_GPIO_GD(gpio.clk) | - FM801_GPIO_GP(gpio.clk)); + reg |= FM801_GPIO_GS(TEA_64PCR_DATA) | + FM801_GPIO_GS(TEA_64PCR_WRITE_ENABLE) | + FM801_GPIO_GS(TEA_64PCR_BUS_CLOCK); + /* all of lines are in the write direction */ + /* clear data and clock lines */ + reg &= ~(FM801_GPIO_GD(TEA_64PCR_DATA) | + FM801_GPIO_GD(TEA_64PCR_WRITE_ENABLE) | + FM801_GPIO_GD(TEA_64PCR_BUS_CLOCK) | + FM801_GPIO_GP(TEA_64PCR_DATA) | + FM801_GPIO_GP(TEA_64PCR_BUS_CLOCK) | + FM801_GPIO_GP(TEA_64PCR_WRITE_ENABLE)); + outw(reg, FM801_REG(chip, GPIO_CTRL)); + udelay(1); + + while (i--) { + if (val & (1 << i)) + reg |= FM801_GPIO_GP(TEA_64PCR_DATA); + else + reg &= ~FM801_GPIO_GP(TEA_64PCR_DATA); + outw(reg, FM801_REG(chip, GPIO_CTRL)); + udelay(1); + reg |= FM801_GPIO_GP(TEA_64PCR_BUS_CLOCK); + outw(reg, FM801_REG(chip, GPIO_CTRL)); + reg &= ~FM801_GPIO_GP(TEA_64PCR_BUS_CLOCK); + outw(reg, FM801_REG(chip, GPIO_CTRL)); + udelay(1); + } + + /* and reset the write enable bit */ + reg |= FM801_GPIO_GP(TEA_64PCR_WRITE_ENABLE) | + FM801_GPIO_GP(TEA_64PCR_DATA); + outw(reg, FM801_REG(chip, GPIO_CTRL)); + spin_unlock_irq(&chip->reg_lock); +} + +static unsigned int snd_fm801_tea575x_64pcr_read(struct snd_tea575x *tea) +{ + struct fm801 *chip = tea->private_data; + unsigned short reg; + unsigned int val = 0; + int i; + + spin_lock_irq(&chip->reg_lock); + reg = inw(FM801_REG(chip, GPIO_CTRL)); + /* use GPIO lines, set data direction to input */ + reg |= FM801_GPIO_GS(TEA_64PCR_DATA) | + FM801_GPIO_GS(TEA_64PCR_WRITE_ENABLE) | + FM801_GPIO_GS(TEA_64PCR_BUS_CLOCK) | + FM801_GPIO_GD(TEA_64PCR_DATA) | + FM801_GPIO_GP(TEA_64PCR_DATA) | + FM801_GPIO_GP(TEA_64PCR_WRITE_ENABLE); + /* all of lines are in the write direction, except data */ + /* clear data, write enable and clock lines */ + reg &= ~(FM801_GPIO_GD(TEA_64PCR_WRITE_ENABLE) | + FM801_GPIO_GD(TEA_64PCR_BUS_CLOCK) | + FM801_GPIO_GP(TEA_64PCR_BUS_CLOCK)); + + for (i = 0; i < 24; i++) { + reg &= ~FM801_GPIO_GP(TEA_64PCR_BUS_CLOCK); + outw(reg, FM801_REG(chip, GPIO_CTRL)); + udelay(1); + reg |= FM801_GPIO_GP(TEA_64PCR_BUS_CLOCK); + outw(reg, FM801_REG(chip, GPIO_CTRL)); + udelay(1); + val <<= 1; + if (inw(FM801_REG(chip, GPIO_CTRL)) & FM801_GPIO_GP(TEA_64PCR_DATA)) + val |= 1; } + spin_unlock_irq(&chip->reg_lock); + + return val; +} + +static void snd_fm801_tea575x_64pcr_mute(struct snd_tea575x *tea, + unsigned int mute) +{ + struct fm801 *chip = tea->private_data; + unsigned short reg; + + spin_lock_irq(&chip->reg_lock); + + reg = inw(FM801_REG(chip, GPIO_CTRL)); + if (mute) + /* 0xf800 (mute) */ + reg &= ~FM801_GPIO_GP(TEA_64PCR_WRITE_ENABLE); + else + /* 0xf802 (unmute) */ + reg |= FM801_GPIO_GP(TEA_64PCR_WRITE_ENABLE); outw(reg, FM801_REG(chip, GPIO_CTRL)); + udelay(1); + + spin_unlock_irq(&chip->reg_lock); } -static struct snd_tea575x_ops snd_fm801_tea_ops = { - .set_pins = snd_fm801_tea575x_set_pins, - .get_pins = snd_fm801_tea575x_get_pins, - .set_direction = snd_fm801_tea575x_set_direction, +static struct snd_tea575x_ops snd_fm801_tea_ops[3] = { + { + /* 1 = MediaForte 256-PCS */ + .write = snd_fm801_tea575x_256pcs_write, + .read = snd_fm801_tea575x_256pcs_read, + }, + { + /* 2 = MediaForte 256-PCPR */ + .write = snd_fm801_tea575x_256pcpr_write, + .read = snd_fm801_tea575x_256pcpr_read, + }, + { + /* 3 = MediaForte 64-PCR */ + .write = snd_fm801_tea575x_64pcr_write, + .read = snd_fm801_tea575x_64pcr_read, + .mute = snd_fm801_tea575x_64pcr_mute, + } }; #endif @@ -1149,7 +1371,7 @@ static int snd_fm801_free(struct fm801 *chip) outw(cmdw, FM801_REG(chip, IRQ_MASK)); __end_hw: -#ifdef CONFIG_SND_FM801_TEA575X_BOOL +#ifdef TEA575X_RADIO snd_tea575x_exit(&chip->tea); #endif if (chip->irq >= 0) @@ -1228,34 +1450,16 @@ static int __devinit snd_fm801_create(struct snd_card *card, snd_card_set_dev(card, &pci->dev); -#ifdef CONFIG_SND_FM801_TEA575X_BOOL - chip->tea.private_data = chip; - chip->tea.ops = &snd_fm801_tea_ops; - sprintf(chip->tea.bus_info, "PCI:%s", pci_name(pci)); +#ifdef TEA575X_RADIO if ((tea575x_tuner & TUNER_TYPE_MASK) > 0 && (tea575x_tuner & TUNER_TYPE_MASK) < 4) { - if (snd_tea575x_init(&chip->tea)) { - snd_printk(KERN_ERR "TEA575x radio not found\n"); - snd_fm801_free(chip); - return -ENODEV; - } - } else if ((tea575x_tuner & TUNER_TYPE_MASK) == 0) { - /* autodetect tuner connection */ - for (tea575x_tuner = 1; tea575x_tuner <= 3; tea575x_tuner++) { - chip->tea575x_tuner = tea575x_tuner; - if (!snd_tea575x_init(&chip->tea)) { - snd_printk(KERN_INFO "detected TEA575x radio type %s\n", - snd_fm801_tea575x_gpios[tea575x_tuner - 1].name); - break; - } - } - if (tea575x_tuner == 4) { - snd_printk(KERN_ERR "TEA575x radio not found\n"); - snd_fm801_free(chip); - return -ENODEV; - } + chip->tea.dev_nr = tea575x_tuner >> 16; + chip->tea.card = card; + chip->tea.freq_fixup = 10700; + chip->tea.private_data = chip; + chip->tea.ops = &snd_fm801_tea_ops[(tea575x_tuner & TUNER_TYPE_MASK) - 1]; + snd_tea575x_init(&chip->tea); } - strlcpy(chip->tea.card, snd_fm801_tea575x_gpios[(tea575x_tuner & TUNER_TYPE_MASK) - 1].name, sizeof(chip->tea.card)); #endif *rchip = chip; diff --git a/sound/pci/intel8x0m.c b/sound/pci/intel8x0m.c index f3353b4..27709f0 100644 --- a/sound/pci/intel8x0m.c +++ b/sound/pci/intel8x0m.c @@ -235,8 +235,8 @@ static DEFINE_PCI_DEVICE_TABLE(snd_intel8x0m_ids) = { { PCI_VDEVICE(NVIDIA, 0x0069), DEVICE_NFORCE }, /* NFORCE2 */ { PCI_VDEVICE(NVIDIA, 0x0089), DEVICE_NFORCE }, /* NFORCE2s */ { PCI_VDEVICE(NVIDIA, 0x00d9), DEVICE_NFORCE }, /* NFORCE3 */ - { PCI_VDEVICE(AMD, 0x746e), DEVICE_INTEL }, /* AMD8111 */ #if 0 + { PCI_VDEVICE(AMD, 0x746d), DEVICE_INTEL }, /* AMD8111 */ { PCI_VDEVICE(AL, 0x5455), DEVICE_ALI }, /* Ali5455 */ #endif { 0, } @@ -1261,9 +1261,9 @@ static struct shortname_table { { PCI_DEVICE_ID_NVIDIA_MCP2_MODEM, "NVidia nForce2" }, { PCI_DEVICE_ID_NVIDIA_MCP2S_MODEM, "NVidia nForce2s" }, { PCI_DEVICE_ID_NVIDIA_MCP3_MODEM, "NVidia nForce3" }, - { 0x746e, "AMD AMD8111" }, #if 0 { 0x5455, "ALi M5455" }, + { 0x746d, "AMD AMD8111" }, #endif { 0 }, }; -- 1.7.5.3 -- Michal Hocko SUSE Labs SUSE LINUX s.r.o. Lihovarska 1060/12 190 00 Praha 9 Czech Republic

1 0

[alsa-devel] snd_pcm_link:Function not implemented
by ashwanik 10 Jun '11

10 Jun '11

Hi All, I have download and compile latency.c application from http://www.alsa-project.org/alsa-doc/alsa-lib/_2test_2latency_8c-example.ht…. This application is working fine on Linux PC. But when I am using this application on my omap4 board(using ubuntu10.10) is not working. I am getting"Streams link error: Function not implemented" error. I debug the application and found this error coming from the *snd_pcm_link* function. I am using ALSA Driver Version 1.0.23. please find pointers. Thanks in Advance Ashwani

1 0

[alsa-devel] [PATCH] ASoC: pcm - rename snd_codec_close() to snd_pcm_close().
by Liam Girdwood 10 Jun '11

10 Jun '11

Make sure we follow naming convention for all PCM ops. Signed-off-by: Liam Girdwood <lrg(a)ti.com> --- sound/soc/soc-pcm.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sound/soc/soc-pcm.c b/sound/soc/soc-pcm.c index f4864b0..b575939 100644 --- a/sound/soc/soc-pcm.c +++ b/sound/soc/soc-pcm.c @@ -268,7 +268,7 @@ static void close_delayed_work(struct work_struct *work) * freed here. The cpu DAI, codec DAI, machine and platform are also * shutdown. */ -static int soc_codec_close(struct snd_pcm_substream *substream) +static int soc_pcm_close(struct snd_pcm_substream *substream) { struct snd_soc_pcm_runtime *rtd = substream->private_data; struct snd_soc_platform *platform = rtd->platform; @@ -567,7 +567,7 @@ static snd_pcm_uframes_t soc_pcm_pointer(struct snd_pcm_substream *substream) /* ASoC PCM operations */ static struct snd_pcm_ops soc_pcm_ops = { .open = soc_pcm_open, - .close = soc_codec_close, + .close = soc_pcm_close, .hw_params = soc_pcm_hw_params, .hw_free = soc_pcm_hw_free, .prepare = soc_pcm_prepare, -- 1.7.4.1

3 2

[alsa-devel] [PATCH v3 00/12] MFD/ASoC/Input: TWL4030/TWL60X0 changes
by Peter Ujfalusi 10 Jun '11

10 Jun '11

Hello, Changes since v2: - TWL_COMMON_PDATA_AUDIO is used from the beginning, reducing changes later - twl6040 thermal shutdown handling added - pmic-common.c/h renamed as twl-common.c/h. This will allows new twl related features to be added, not directly related to pmic. - Rebased on top of linux-3.0-rc2 (l-o next, asoc next, mfd next) Updated intro message from the v2 series: The series will do four major things, and they are in one series, because they pretty much depending on each other, so it is easier to handle them together. 0. Move the common pmic related configurations out from the board files. New twl-common.c/h file has been created for this purpose. OMAP3 board files received two patches (pdata, and regualtor changes), OMAP4 board files has been changed with one patch. 1. Rename the twl4030-codec MFD driver to twl4030-audio Since the ASoC multicomponent introduction (2.6.37) the twl4030-codec MFD dirver had been using twl4030-audio to register (twl4030-codec is the ASoC codec driver). The documentation refers to this part of twl as audio block, so it is better to rename the driver as well to avoid confusion. 2. Introduction of MFD driver for twl6040. The TWL6040 audio IC has codec and vibra functionality. Convert the existing ASoC codec driver to use the new MFD driver's interface. 3. Vibrator driver for TWL6040 (Input/ForceFeedback driver) The driver itself, and support for the vibrators in SDP4430 board. Regards, Peter --- Misael Lopez Cruz (3): mfd: twl6040: Add initial support ASoC: twl6040: Convert into TWL6040 MFD child input: Add initial support for TWL6040 vibrator Peter Ujfalusi (9): OMAP: New twl-common for common TWL configuration OMAP4: Move common twl6030 configuration to twl-common OMAP3: Move common twl configuration to twl-common OMAP3: Move common regulator configuration to twl-common MFD: twl4030-codec: Rename internals from codec to audio MFD: twl4030-codec -> twl4030-audio: Rename the driver MFD: twl4030-audio: Rename platform data MFD: twl6040: Change platform data for soc codec driver OMAP4: SDP4430: Add twl6040 vibrator platform support arch/arm/mach-omap2/Makefile | 2 +- arch/arm/mach-omap2/board-3430sdp.c | 89 +---- arch/arm/mach-omap2/board-4430sdp.c | 183 +++------ arch/arm/mach-omap2/board-cm-t35.c | 48 +-- arch/arm/mach-omap2/board-devkit8000.c | 37 +-- arch/arm/mach-omap2/board-igep0020.c | 44 +-- arch/arm/mach-omap2/board-ldp.c | 15 +- arch/arm/mach-omap2/board-omap3beagle.c | 60 +--- arch/arm/mach-omap2/board-omap3evm.c | 67 +--- arch/arm/mach-omap2/board-omap3pandora.c | 59 +--- arch/arm/mach-omap2/board-omap3stalker.c | 70 +--- arch/arm/mach-omap2/board-omap3touchbook.c | 57 +-- arch/arm/mach-omap2/board-omap4panda.c | 149 +------ arch/arm/mach-omap2/board-overo.c | 59 +--- arch/arm/mach-omap2/board-rm680.c | 8 +- arch/arm/mach-omap2/board-rx51-peripherals.c | 44 +-- arch/arm/mach-omap2/board-zoom-peripherals.c | 88 +---- arch/arm/mach-omap2/common-board-devices.c | 21 - arch/arm/mach-omap2/common-board-devices.h | 26 +- arch/arm/mach-omap2/twl-common.c | 304 +++++++++++++ arch/arm/mach-omap2/twl-common.h | 59 +++ arch/arm/plat-omap/include/plat/irqs.h | 12 +- drivers/input/misc/Kconfig | 13 +- drivers/input/misc/Makefile | 1 + drivers/input/misc/twl4030-vibra.c | 12 +- drivers/input/misc/twl6040-vibra.c | 428 ++++++++++++++++++ drivers/mfd/Kconfig | 8 +- drivers/mfd/Makefile | 3 +- drivers/mfd/twl-core.c | 13 +- drivers/mfd/twl4030-audio.c | 277 ++++++++++++ drivers/mfd/twl4030-codec.c | 277 ------------ drivers/mfd/twl6040-core.c | 601 ++++++++++++++++++++++++++ drivers/mfd/twl6040-irq.c | 205 +++++++++ include/linux/i2c/twl.h | 21 +- include/linux/mfd/twl4030-audio.h | 272 ++++++++++++ include/linux/mfd/twl4030-codec.h | 272 ------------ include/linux/mfd/twl6040.h | 261 +++++++++++ sound/soc/codecs/Kconfig | 3 +- sound/soc/codecs/twl4030.c | 22 +- sound/soc/codecs/twl6040.c | 426 ++++--------------- sound/soc/codecs/twl6040.h | 118 ----- sound/soc/omap/sdp3430.c | 2 +- sound/soc/omap/sdp4430.c | 2 + sound/soc/omap/zoom2.c | 2 +- 44 files changed, 2729 insertions(+), 2011 deletions(-) create mode 100644 arch/arm/mach-omap2/twl-common.c create mode 100644 arch/arm/mach-omap2/twl-common.h create mode 100644 drivers/input/misc/twl6040-vibra.c create mode 100644 drivers/mfd/twl4030-audio.c delete mode 100644 drivers/mfd/twl4030-codec.c create mode 100644 drivers/mfd/twl6040-core.c create mode 100644 drivers/mfd/twl6040-irq.c create mode 100644 include/linux/mfd/twl4030-audio.h delete mode 100644 include/linux/mfd/twl4030-codec.h create mode 100644 include/linux/mfd/twl6040.h -- 1.7.5.3

2 14

[alsa-devel] [PATCH] ALSA: HDA: Add jack detection for HDMI
by David Henningsson 09 Jun '11

09 Jun '11

Just as for headphones and microphone jacks, this patch adds reporting of HDMI jack status through the input layer. I considered making additional SND_JACK_* constants for HDMI and Displayport instead of going with SND_JACK_VIDEOOUT, but it didn't seem worth the additions, and breakage of compiling with old kernels, etc. Let me know if you think otherwise and I'll prepare a second patch for that. -- David Henningsson, Canonical Ltd. http://launchpad.net/~diwic

7 33

Re: [alsa-devel] [PATCH 1/1] ASoC: codecs: max98088: Combined DAI operations for DAI1 and DAI2.
by Peter Hsiang 09 Jun '11

09 Jun '11

On Thu, Jun 09, 2011, Jin Park wrote: > Combined DAI operations for DAI1 and DAI2. > For this, added id into DAI runtime data to identify each DAI. > > Signed-off-by: Jin Park <jinyoungp(a)nvidia.com> > @@ -1262,87 +1262,43 @@ static int max98088_dai1_hw_params(struct snd_pcm_substream *substream, > > - cdata = &max98088->dai[1]; > + cdata = &max98088->dai[dai->id - 1]; Please add BUG_ON protection in case later someone changes the id usage. Mark, what's your thought on the use of id for this purpose here? Would it be better to have 2 wrapper DAI functions passing in the DAI number? > +static int max98088_dai_set_fmt(struct snd_soc_dai *dai, unsigned int fmt) > { > + unsigned short fmt_reg; > + unsigned short clk_reg; > + unsigned short clkcfg_hi_reg; > + unsigned short clkcfg_lo_reg; > + u8 clk_val; > + u8 fmt_val = 0; > + > + switch (dai->id) { > + case 1: > + fmt_reg = M98088_REG_14_DAI1_FORMAT; > + clk_reg = M98088_REG_15_DAI1_CLOCK; > + clkcfg_hi_reg = M98088_REG_12_DAI1_CLKCFG_HI; > + clkcfg_lo_reg = M98088_REG_13_DAI1_CLKCFG_LO; > + break; > + case 2: > + fmt_reg = M98088_REG_1C_DAI2_FORMAT; > + clk_reg = M98088_REG_1D_DAI2_CLOCK; > + clkcfg_hi_reg = M98088_REG_1A_DAI2_CLKCFG_HI; > + clkcfg_lo_reg = M98088_REG_1B_DAI2_CLKCFG_LO; > + break; > + default: > + return -EINVAL; > + } These added local variables and their initialization repeats. It may be better to put them in struct max98088_cdata[]. > @@ -1470,127 +1439,54 @@ static int max98088_dai1_set_fmt(struct snd_soc_dai *codec_dai, > - reg15val = M98088_DAI_BSEL64; > + clk_val = M98088_DAI_BSEL64; > if (max98088->digmic) > - reg15val |= M98088_DAI_OSR64; > - snd_soc_write(codec, M98088_REG_15_DAI1_CLOCK, reg15val); > + clk_val |= M98088_DAI_OSR64; > + snd_soc_write(codec, clk_reg, clk_val); DAI2 does not have an OSR bit in the _CLOCK register. In the combined function, this should be conditionally for DAI1 only. Peter

2 2

[alsa-devel] Proposed changes to soc core to allow multiple codecs bound together on a single bus
by Caleb Crome 09 Jun '11

09 Jun '11

Hi all, I finally got my multi-codec board up and running, but by hacking the codec driver in a very nasty way. It would be much preferable to modify the soc core so that multiple codecs can be easily instantiated on a single bus. Problem overview ----------------------------- The problem is this: a single CPU DAI is connected to multiple codecs. Each codec is assigned a different TDM slot on the TDM bus. All codecs are bound together and expected to start at the same time and have the same clocks, etc. Either the CPU or one of the codecs can be the master, all other devices are slaves. Each codec, as it transmits, must tri-state its output when not transmitting valid data, so that the other codecs may transmit in their given time slot. I think from user-space, these codecs should really be bound pretty tightly together, so they may be opened as a single 'sound card' with the sum of the channels available. My card is an 8 codec (2 channel/codec) card, so it should appear as a 16-channel sound card that opens/closes all in one go. Currently, I don't see a way in the soc core to handle this kind of situation. It seems that when you add multiple codecs onto one host DAI, you may only open one codec at a time. The others are not available. There are a few variations on this general theme: * 1 cpu DAI, many codecs, all sharing the same data in and data out pins (TDM/network mode) (like the McBSP) * 1 cpu DAI, many codecs, but the cpu dai may have more than 1 data pin (like the McASP on TI parts). Shared clocks. * multiple cpu DAIs bound together on the same clocks, multiple codecs. What is the proper way to add this functionality to the SOC API? Perhaps a specification like this: static char *my_codec_dais[] = { "tlv320aic3x-hifi.0", <---- in this case, the '.0' "tlv320aic3x-hifi.1", ---- means that it's slot 0 "tlv320aic3x-hifi.2", ---- on the TDM bus. "tlv320aic3x-hifi.3", }; static char *my_codec_names[] = { "tlv320aic3x-codec.2-0018", <--- codec on i2c bus 2, addr 0x18 "tlv320aic3x-codec.2-0019", <--- codec on i2c bus 2, addr 0x19 "tlv320aic3x-codec.2-001a", <--- codec on i2c bus 2, addr 0x1a "tlv320aic3x-codec.2-001b", <--- codec on i2c bus 2, addr 0x1b }; static struct snd_soc_dai_link my_dai[] = { .name = "my_dai_name", .stream_name = "my_stream_name", .cpu_dai_name = "omap-mcbsp-dai.2", .platform_name= "omap-pcm_audio", .codec_dai_name = my_codec_dais, .num_codec = ARRAY_SIZE(my_codec_dais), .codec_name = my_codec_names, .ops = &my_ops, }; The core will parse the dai name for the slot order, and pass it on to the codec during hw_params. Then the codec can properly set the TDM slot on the hardware interface. It will also pass the cpu dai the number of slices that are configured, so it knows how many slots to be expecting. This means that the snd_soc_pcm_runtime, and probably a bunch of other places, will need to keep track of multiple codecs, and multiple dai's, and functions like 'hw_params' will need to loop through multiple codec_dai's, so each codec and cpu dai can be configured correctly. I suspect this would be a pretty major change to the SOC core, and non-trivial. Any thoughts on this, or if I'm totally barking up the wrong tree here? Thanks, -Caleb

3 3

[alsa-devel] [PATCH] ASoC: core - PCM mutex per rtd
by Liam Girdwood 09 Jun '11

09 Jun '11

In preparation for the new ASoC Dynamic PCM support (AKA DSP support). The new ASoC Dynamic PCM core allows DAIs to be dynamically re-routed at runtime between the PCM device end (or Frontend - FE) and the physical DAI (Backend - BE) using regular kcontrols (just like a hardware CODEC routes audio in the analog domain). The Dynamic PCM core therefore must be able to call PCM operations for both the Frontend and Backend(s) DAIs at the same time. Currently we have a global pcm_mutex that is used to serialise the ASoC PCM operations. This patch removes the global mutex and adds a mutex per RTD allowing the PCM operations to be reentrant and allow control of more than one DAI at at time. e.g. a frontend PCM hw_params() could configure multiple backend DAI hw_params() with similar or different hw parameters at the same time. Signed-off-by: Liam Girdwood <lrg(a)ti.com> --- include/sound/soc.h | 8 ++++++++ sound/soc/soc-core.c | 1 + sound/soc/soc-pcm.c | 28 ++++++++++++++-------------- 3 files changed, 23 insertions(+), 14 deletions(-) diff --git a/include/sound/soc.h b/include/sound/soc.h index d5db87e..4334ab2 100644 --- a/include/sound/soc.h +++ b/include/sound/soc.h @@ -269,6 +269,11 @@ enum snd_soc_compress_type { SND_SOC_RBTREE_COMPRESSION }; +enum snd_soc_pcm_subclass { + SND_SOC_PCM_CLASS_PCM = 0, + SND_SOC_PCM_CLASS_BE = 1, +}; + int snd_soc_codec_set_sysclk(struct snd_soc_codec *codec, int clk_id, unsigned int freq, int dir); int snd_soc_codec_set_pll(struct snd_soc_codec *codec, int pll_id, int source, @@ -809,6 +814,9 @@ struct snd_soc_pcm_runtime { struct device dev; struct snd_soc_card *card; struct snd_soc_dai_link *dai_link; + struct mutex pcm_mutex; + enum snd_soc_pcm_subclass pcm_subclass; + struct snd_pcm_ops ops; unsigned int complete:1; unsigned int dev_registered:1; diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index 32d7d2f..32bc503 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -1032,6 +1032,7 @@ static int soc_post_component_init(struct snd_soc_card *card, rtd->dev.parent = card->dev; rtd->dev.release = rtd_release; rtd->dev.init_name = name; + mutex_init(&rtd->pcm_mutex); ret = device_register(&rtd->dev); if (ret < 0) { dev_err(card->dev, diff --git a/sound/soc/soc-pcm.c b/sound/soc/soc-pcm.c index 9bebee8..f4864b0 100644 --- a/sound/soc/soc-pcm.c +++ b/sound/soc/soc-pcm.c @@ -81,7 +81,7 @@ static int soc_pcm_open(struct snd_pcm_substream *substream) struct snd_soc_dai_driver *codec_dai_drv = codec_dai->driver; int ret = 0; - mutex_lock(&pcm_mutex); + mutex_lock_nested(&rtd->pcm_mutex, rtd->pcm_subclass); /* startup the audio subsystem */ if (cpu_dai->driver->ops->startup) { @@ -211,7 +211,7 @@ static int soc_pcm_open(struct snd_pcm_substream *substream) cpu_dai->active++; codec_dai->active++; rtd->codec->active++; - mutex_unlock(&pcm_mutex); + mutex_unlock(&rtd->pcm_mutex); return 0; config_err: @@ -230,7 +230,7 @@ platform_err: if (cpu_dai->driver->ops->shutdown) cpu_dai->driver->ops->shutdown(substream, cpu_dai); out: - mutex_unlock(&pcm_mutex); + mutex_unlock(&rtd->pcm_mutex); return ret; } @@ -245,7 +245,7 @@ static void close_delayed_work(struct work_struct *work) container_of(work, struct snd_soc_pcm_runtime, delayed_work.work); struct snd_soc_dai *codec_dai = rtd->codec_dai; - mutex_lock(&pcm_mutex); + mutex_lock_nested(&rtd->pcm_mutex, rtd->pcm_subclass); pr_debug("pop wq checking: %s status: %s waiting: %s\n", codec_dai->driver->playback.stream_name, @@ -260,7 +260,7 @@ static void close_delayed_work(struct work_struct *work) SND_SOC_DAPM_STREAM_STOP); } - mutex_unlock(&pcm_mutex); + mutex_unlock(&rtd->pcm_mutex); } /* @@ -276,7 +276,7 @@ static int soc_codec_close(struct snd_pcm_substream *substream) struct snd_soc_dai *codec_dai = rtd->codec_dai; struct snd_soc_codec *codec = rtd->codec; - mutex_lock(&pcm_mutex); + mutex_lock_nested(&rtd->pcm_mutex, rtd->pcm_subclass); if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) { cpu_dai->playback_active--; @@ -321,7 +321,7 @@ static int soc_codec_close(struct snd_pcm_substream *substream) SND_SOC_DAPM_STREAM_STOP); } - mutex_unlock(&pcm_mutex); + mutex_unlock(&rtd->pcm_mutex); return 0; } @@ -338,7 +338,7 @@ static int soc_pcm_prepare(struct snd_pcm_substream *substream) struct snd_soc_dai *codec_dai = rtd->codec_dai; int ret = 0; - mutex_lock(&pcm_mutex); + mutex_lock_nested(&rtd->pcm_mutex, rtd->pcm_subclass); if (rtd->dai_link->ops && rtd->dai_link->ops->prepare) { ret = rtd->dai_link->ops->prepare(substream); @@ -391,7 +391,7 @@ static int soc_pcm_prepare(struct snd_pcm_substream *substream) snd_soc_dai_digital_mute(codec_dai, 0); out: - mutex_unlock(&pcm_mutex); + mutex_unlock(&rtd->pcm_mutex); return ret; } @@ -409,7 +409,7 @@ static int soc_pcm_hw_params(struct snd_pcm_substream *substream, struct snd_soc_dai *codec_dai = rtd->codec_dai; int ret = 0; - mutex_lock(&pcm_mutex); + mutex_lock_nested(&rtd->pcm_mutex, rtd->pcm_subclass); if (rtd->dai_link->ops && rtd->dai_link->ops->hw_params) { ret = rtd->dai_link->ops->hw_params(substream, params); @@ -449,7 +449,7 @@ static int soc_pcm_hw_params(struct snd_pcm_substream *substream, rtd->rate = params_rate(params); out: - mutex_unlock(&pcm_mutex); + mutex_unlock(&rtd->pcm_mutex); return ret; platform_err: @@ -464,7 +464,7 @@ codec_err: if (rtd->dai_link->ops && rtd->dai_link->ops->hw_free) rtd->dai_link->ops->hw_free(substream); - mutex_unlock(&pcm_mutex); + mutex_unlock(&rtd->pcm_mutex); return ret; } @@ -479,7 +479,7 @@ static int soc_pcm_hw_free(struct snd_pcm_substream *substream) struct snd_soc_dai *codec_dai = rtd->codec_dai; struct snd_soc_codec *codec = rtd->codec; - mutex_lock(&pcm_mutex); + mutex_lock_nested(&rtd->pcm_mutex, rtd->pcm_subclass); /* apply codec digital mute */ if (!codec->active) @@ -500,7 +500,7 @@ static int soc_pcm_hw_free(struct snd_pcm_substream *substream) if (cpu_dai->driver->ops->hw_free) cpu_dai->driver->ops->hw_free(substream, cpu_dai); - mutex_unlock(&pcm_mutex); + mutex_unlock(&rtd->pcm_mutex); return 0; } -- 1.7.4.1

2 1

[alsa-devel] Problem capturing from sound board
by André Prado 09 Jun '11

09 Jun '11

Hello i am trying to do a simple program in order to capture the input from the microphone in my OnBoard HDA Intel sound board. However it doesnt work and gives me a segmentation fault. Any help is appreciated. #include <stdio.h> #include <string.h> #include <alsa/asoundlib.h> int main(int argc, char** argv) { register int err; int cardNum, totalCards; totalCards = 0; cardNum = -1; short buf[128]; while(1) { snd_ctl_t *cardHandle; printf("\n***********\n"); //Number of boards if ((err = snd_card_next(&cardNum)) < 0) { printf("%s\n", snd_strerror(err)); break; } if(cardNum<0) { break; } ++totalCards; char str[64]; sprintf(str, "hw:%i", cardNum); (IS THIS THE RIGHT WAY TO NAME MY DEVICE?) snd_pcm_t *capture_handle; snd_pcm_hw_params_t *hw_params; if(err = snd_pcm_open( &capture_handle, str, SND_PCM_STREAM_CAPTURE, 0 ) < 0 ) { printf(" %s\n", snd_strerror(err)); break; } snd_pcm_hw_params_malloc (&hw_params); snd_pcm_hw_params_any(capture_handle, hw_params); if(err = snd_pcm_hw_params_set_access(capture_handle, hw_params, SND_PCM_ACCESS_RW_INTERLEAVED) < 0) printf("Nao e setar o acesso: %s\n", snd_strerror(err)); unsigned int num_canais = 0; int ret; if(err = snd_pcm_hw_params_get_channels_max(hw_params, &num_canais) < 0) printf(" Nao e conseguir o numero de canais: %s\n", snd_strerror(err)); printf("Numero de canais: %i\n",num_canais); // Configurando hardware // Resampling printf("Fim preparacao"); unsigned int resample = 1; if (err = snd_pcm_hw_params_set_rate_resample(capture_handle, hw_params, resample)<0) printf("Erro setando o sample: %s\n", snd_strerror(err)); // Formato Little endian 16 bits snd_pcm_hw_params_set_format (capture_handle, hw_params, SND_PCM_FORMAT_S16_LE); // Stereo if (err = snd_pcm_hw_params_set_channels (capture_handle, hw_params, 2) < 0) printf("Erro setando o numero de canais: %s\n", snd_strerror(err)); // Playback Rate unsigned int actualRate = 44100; if (err = snd_pcm_hw_params_set_rate_near (capture_handle, hw_params, &actualRate, 0) < 0) printf("Erro setando o rate de playback: %s\n", snd_strerror(err)); // Setando os valores configurados no hardware. if (err = snd_pcm_hw_params (capture_handle, hw_params) < 0 ) printf("Erro setando o hardware: %s\n", snd_strerror(err)); // Tamanho do buffer recebido apos configurar o hardware snd_pcm_uframes_t bufferSize; snd_pcm_hw_params_get_buffer_size( hw_params, &bufferSize ); //printf( "Init: Buffer size = %s", bufferSize); //_playbackFrames = bufferSize; printf( "\nBits significantes para amostra linear = %i\n", snd_pcm_hw_params_get_sbits(hw_params)); // Preparando para leitura int i=0; int d=0; if ((err = snd_pcm_prepare (capture_handle)) < 0) printf("cannot prepare audio interface for use (%s)\n",snd_strerror(err)); snd_pcm_hw_params_free (hw_params); // if ((err = snd_pcm_readi (capture_handle, buf, 128)) != 128) // printf( "read from audio interface failed (%s)\n", snd_strerror (err)); } snd_config_update_free_global(); } -- Att André

1 0

[alsa-devel] dsnoop
by Lorenzo Fundaró 09 Jun '11

09 Jun '11

Hi folks, I want to use dsnoop in my .asoundrc, but this plugin does not seem to be available to me as shown by `arecord -L` . Does the availability depend on the sound card or is it just a sort of module I have to load ? Thanks, Lorenzo Fundaró García Université de Technologie de Compiègne Génie Informatique <%2B33%206%2086%2069%2056%2011>

1 0