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

Re: [alsa-devel] multiple, non-physically accesible, HDMI devices listed for Intel IbexPeak ALC269VB
by Stephen Warren 22 Feb '12

22 Feb '12

Andres Cimmarusti wrote at Tuesday, February 21, 2012 11:44 PM: ... > Unfortunately with kernel 3.2.x and 3.1.x I get no sound out choosing the same > configuration in pulseaudio. Device is advertised correctly but > there's a bizarre multiplicity advertised: > > $ aplay -l > **** List of PLAYBACK Hardware Devices **** > card 0: Intel [HDA Intel], device 0: ALC269VB Analog [ALC269VB Analog] > Subdevices: 1/1 > Subdevice #0: subdevice #0 > card 0: Intel [HDA Intel], device 3: HDMI 0 [HDMI 0] > Subdevices: 1/1 > Subdevice #0: subdevice #0 > card 0: Intel [HDA Intel], device 7: HDMI 1 [HDMI 1] > Subdevices: 1/1 > Subdevice #0: subdevice #0 > card 0: Intel [HDA Intel], device 8: HDMI 2 [HDMI 2] > Subdevices: 1/1 > Subdevice #0: subdevice #0 > > Using aplay with device 3 says device is busy. pulseaudio probably has that device open, hence aplay can't open it again. To validate this, run the following: pasuspender bash Then, run your aplay within that bash. At least aplay should run now, even if you still can't hear audio; it's possible you don't (or can't) have anything hooked up to that audio output > Device 7 works > correctly (but is not available in pulseaudio unless forced by > default, which then renders internal speakers disabled) There are ways to configure pulseaudio to allow the user to select which PCM device to use on a given sound card. David Henningsson made this work for NVIDIA GPUs at least in Ubuntu, and I imagine the same technique could be applied to Intel devices too. In the meantime, the WAR that Takashi mentioned in his response sounds like it'd work very well, albeit it's a bit manual to set up. > and device 8 produces no sound out. It's plausible that isn't connected, or is connected to a graphics port you simply don't have hooked up to a monitor or audio-capable monitor. As Takashi mentions, from a kernel perspective, this isn't really a regression at all, but simply exposing all the features of the HW that were previously hidden. Without that change, others can't use some HW usefully at all. Unfortunately, pulseaudio makes some rather simplistic assumptions about how HW works by default, and can be confused by the additional features that are exposed. Sorry this caused problems for you. -- nvpublic

2 1

[alsa-devel] [PATCH 0/5] Refresh ak4104 driver
by Mark Brown 22 Feb '12

22 Feb '12

This patch series updates the ak4104 driver to more modern idioms, mainly converting to regmap. I've absolutely no ability to test this so there's a reasonable chance this will just explode but hopefully it should work fine. Since all the read modify write, I/O and cache code was open coded in the driver we end up factoring out a reasonable amount. Mark Brown (5): ASoC: ak4104: Remove uninformative print on probe() ASoC: ak4104: Convert to module_spi_driver() ASoC: ak4104: Use snd_soc_update_bits() for read/modify/write ASoC: ak4104: Use snd_soc_write() rather than internal write function ASoC: ak4104: Convert to direct regmap API usage sound/soc/codecs/ak4104.c | 174 ++++++++++++++++----------------------------- 1 files changed, 62 insertions(+), 112 deletions(-)

2 6

Re: [alsa-devel] Random process lockup on ARM board: alsa-lib-1.0.25, FUTEX_WAIT_PRIVATE
by Clemens Ladisch 22 Feb '12

22 Feb '12

Jonathan Andrews wrote: > On Mon, 2012-02-20 at 08:54 +0100, Clemens Ladisch wrote: >> Jonathan Andrews wrote: >>> I've tried building alsalib in many ways, at the moment its : >>> $ ./configure --target=arm-linux --host=i686-linux --enable-shared --disable-static --without-pthread >> >> Try adding --disable-ucm and --disable-python. > > Err ok, alsa-lib still builds ok. Now it doesn't use any pthread functions. > My application runs for longer, but still freezes in the end. With the > same futex locking problem. I'd guess that this is not an alsa-lib problem. Now you really need a stack trace. Regards, Clemens

1 0

[alsa-devel] v3.1.8: hda-intel broken
by Russell King - ARM Linux 22 Feb '12

22 Feb '12

v3.1.8: <4>[1641072.853409] WARNING: at sound/pci/hda/hda_codec.c:5152 snd_array_new+0x47/0x9b [snd_hda_codec]() <4>[1641072.853412] Hardware name: 2081CTO <4>[1641072.853413] BUG? (num >= 4096) <4>[1641072.853415] Modules linked in: lp cdc_ether usbnet mii cdc_acm cdc_wdm usblp ftdi_sio usbserial parport_jtag fuse joydev cpufreq_ondemand acpi_cpufreq mperf nf_conntrack_netbios_ns nf_conntrack_broadcast ip6t_REJECT nf_conntrack_ipv6 nf_defrag_ipv6 ip6table_filter ip6_tables ipv6 uinput snd_hda_codec_conexant snd_hda_intel snd_hda_codec snd_hwdep snd_seq snd_seq_device arc4 snd_pcm snd_timer r852 sm_common nand nand_ids nand_ecc mtd iwlagn mac80211 snd_page_alloc ppdev iTCO_wdt parport_pc cfg80211 iTCO_vendor_support i2c_i801 thinkpad_acpi rfkill e1000e snd soundcore parport pcspkr wmi microcode firewire_ohci sdhci_pci sdhci mmc_core firewire_core crc_itu_t yenta_socket i915 drm_kms_helper drm i2c_algo_bit i2c_core video [last unloaded: ftdi_sio] <4>[1641072.853459] Pid: 3089, comm: bash Tainted: G W 3.1.8 #2 <4>[1641072.853461] Call Trace: <4>[1641072.853466] [<c04387eb>] warn_slowpath_common+0x6a/0x7f <4>[1641072.853472] [<f861d5d0>] ? snd_array_new+0x47/0x9b [snd_hda_codec] <4>[1641072.853475] [<c0438873>] warn_slowpath_fmt+0x2b/0x2f <4>[1641072.853481] [<f861d5d0>] snd_array_new+0x47/0x9b [snd_hda_codec] <4>[1641072.853488] [<f861d65c>] snd_hda_input_jack_add+0x38/0xa2 [snd_hda_codec] <4>[1641072.853493] [<f872dcc4>] cxt5051_init+0x62/0xea [snd_hda_codec_conexant] <4>[1641072.853500] [<f8621c51>] hda_call_codec_resume+0xa5/0xba [snd_hda_codec] <4>[1641072.853506] [<f861f369>] snd_hda_power_up+0x46/0x5c [snd_hda_codec] <4>[1641072.853513] [<f861f3b9>] codec_exec_verb+0x3a/0xc7 [snd_hda_codec] <4>[1641072.853519] [<f861f482>] snd_hda_codec_write+0x3c/0x43 [snd_hda_codec] <4>[1641072.853526] [<f861f4b9>] set_pincfg+0x30/0x45 [snd_hda_codec] <4>[1641072.853532] [<f861f507>] restore_pincfgs+0x39/0x46 [snd_hda_codec] <4>[1641072.853539] [<f861fa0a>] snd_hda_codec_free+0x6c/0x1f8 [snd_hda_codec] <4>[1641072.853545] [<f861fbdb>] snd_hda_bus_free+0x45/0x7c [snd_hda_codec] <4>[1641072.853552] [<f861fdb9>] snd_hda_bus_dev_free+0x17/0x19 [snd_hda_codec]<4>[1641072.853560] [<f80979a4>] snd_device_free+0x91/0xde [snd] <4>[1641072.853566] [<f8097c9c>] snd_device_free_all+0x68/0x80 [snd] <4>[1641072.853572] [<f80936e3>] snd_card_do_free+0x4e/0xdf [snd] <4>[1641072.853577] [<f8094160>] snd_card_free+0x89/0x94 [snd] <4>[1641072.853581] [<c044fcee>] ? wake_up_bit+0x20/0x20 <4>[1641072.853585] [<f86ccddf>] azx_remove+0x13/0x1f [snd_hda_intel] <4>[1641072.853589] [<c05de80d>] pci_device_remove+0x2c/0x74 <4>[1641072.853593] [<c066371d>] __device_release_driver+0x66/0x9c <4>[1641072.853596] [<c0663770>] device_release_driver+0x1d/0x28 <4>[1641072.853599] [<c0662caf>] driver_unbind+0x4d/0x7b <4>[1641072.853601] [<c0662c62>] ? store_drivers_probe+0x33/0x33 <4>[1641072.853604] [<c06627fb>] drv_attr_store+0x24/0x28 <4>[1641072.853607] [<c05263a6>] sysfs_write_file+0xb3/0xec <4>[1641072.853609] [<c05262f3>] ? sysfs_poll+0x73/0x73 <4>[1641072.853612] [<c04df254>] vfs_write+0x87/0xde <4>[1641072.853615] [<c04e678e>] ? path_put+0x1a/0x1d <4>[1641072.853617] [<c04df428>] sys_write+0x40/0x62 <4>[1641072.853621] [<c07c751f>] sysenter_do_call+0x12/0x28 <4>[1641072.853623] ---[ end trace 3d590d4bbb62d735 ]--- _From what I can see, this uses the suspend/resume methods on device open/ close. The suspend method does nothing apart from "shutting up pins". The resume method adds new jacks via snd_array_new(), which eventually ends up getting (after many many days of uptime) to 4096 entries. And then it starts exploding with warnings every so often, filling my screen from top to bottom with abrtd boxes warning me that my kernel is doing this. Then, if I try to unbind the PCI device associated with this to shut the thing up, it oopses and takes the machine out: <1>[1641072.855748] BUG: unable to handle kernel NULL pointer dereference at 00000018 <1>[1641072.855796] IP: [<c06cf531>] is_event_supported+0xf/0x20 <4>[1641072.855830] *pde = 00000000 <0>[1641072.855849] Oops: 0000 [#1] SMP <4>[1641072.855873] Modules linked in: lp cdc_ether usbnet mii cdc_acm cdc_wdm usblp ftdi_sio usbserial parport_jtag fuse joydev cpufreq_ondemand acpi_cpufreq mperf nf_conntrack_netbios_ns nf_conntrack_broadcast ip6t_REJECT nf_conntrack_ipv6 nf_defrag_ipv6 ip6table_filter ip6_tables ipv6 uinput snd_hda_codec_conexant snd_hda_intel snd_hda_codec snd_hwdep snd_seq snd_seq_device arc4 snd_pcm snd_timer r852 sm_common nand nand_ids nand_ecc mtd iwlagn mac80211 snd_page_alloc ppdev iTCO_wdt parport_pc cfg80211 iTCO_vendor_support i2c_i801 thinkpad_acpi rfkill e1000e snd soundcore parport pcspkr wmi microcode firewire_ohci sdhci_pci sdhci mmc_core firewire_core crc_itu_t yenta_socket i915 drm_kms_helper drm i2c_algo_bit i2c_core video [last unloaded: ftdi_sio] <4>[1641072.856004] <4>[1641072.856004] Pid: 3089, comm: bash Tainted: G W 3.1.8 #2 LENOVO 2081CTO/2081CTO <4>[1641072.856004] EIP: 0060:[<c06cf531>] EFLAGS: 00210293 CPU: 1 <4>[1641072.856004] EIP is at is_event_supported+0xf/0x20 <4>[1641072.856004] EAX: 00000005 EBX: 00000000 ECX: 0000001f EDX: 00000018 <4>[1641072.856004] ESI: 00000005 EDI: 00000000 EBP: c42a3d50 ESP: c42a3d4c <4>[1641072.856004] DS: 007b ES: 007b FS: 00d8 GS: 00e0 SS: 0068 <0>[1641072.856004] Process bash (pid: 3089, ti=c42a2000 task=c8009920 task.ti=c42a2000) <0>[1641072.856004] Stack: <4>[1641072.856004] 00000000 c42a3d6c c06d075f 00000000 00000002 f1a47780 00000000 00000000 <4>[1641072.856004] c42a3d84 f8098c00 00000000 c13005a0 f46c6000 00000078 c42a3da4 f862132e <4>[1641072.856004] 00000000 00000016 00160016 f8731ce8 f46c6000 00000000 c42a3dc8 f872dcd1 <0>[1641072.856004] Call Trace: <4>[1641072.856004] [<c06d075f>] input_event+0x24/0x69 <4>[1641072.856004] [<f8098c00>] snd_jack_report+0x70/0x8d [snd] <4>[1641072.856004] [<f862132e>] snd_hda_input_jack_report+0x7a/0x8e [snd_hda_codec] <4>[1641072.856004] [<f872dcd1>] cxt5051_init+0x6f/0xea [snd_hda_codec_conexant] <4>[1641072.856004] [<f8621c51>] hda_call_codec_resume+0xa5/0xba [snd_hda_codec] <4>[1641072.856004] [<f861f369>] snd_hda_power_up+0x46/0x5c [snd_hda_codec] <4>[1641072.856004] [<f861f3b9>] codec_exec_verb+0x3a/0xc7 [snd_hda_codec] <4>[1641072.856004] [<f861f482>] snd_hda_codec_write+0x3c/0x43 [snd_hda_codec] <4>[1641072.856004] [<f861f4b9>] set_pincfg+0x30/0x45 [snd_hda_codec] <4>[1641072.856004] [<f861f507>] restore_pincfgs+0x39/0x46 [snd_hda_codec] <4>[1641072.856004] [<f861fa0a>] snd_hda_codec_free+0x6c/0x1f8 [snd_hda_codec] <4>[1641072.856004] [<f861fbdb>] snd_hda_bus_free+0x45/0x7c [snd_hda_codec] <4>[1641072.856004] [<f861fdb9>] snd_hda_bus_dev_free+0x17/0x19 [snd_hda_codec]<4>[1641072.856004] [<f80979a4>] snd_device_free+0x91/0xde [snd] <4>[1641072.856004] [<f8097c9c>] snd_device_free_all+0x68/0x80 [snd] <4>[1641072.856004] [<f80936e3>] snd_card_do_free+0x4e/0xdf [snd] <4>[1641072.856004] [<f8094160>] snd_card_free+0x89/0x94 [snd] <4>[1641072.856004] [<c044fcee>] ? wake_up_bit+0x20/0x20 <4>[1641072.856004] [<f86ccddf>] azx_remove+0x13/0x1f [snd_hda_intel] <4>[1641072.856004] [<c05de80d>] pci_device_remove+0x2c/0x74 <4>[1641072.856004] [<c066371d>] __device_release_driver+0x66/0x9c <4>[1641072.856004] [<c0663770>] device_release_driver+0x1d/0x28 <4>[1641072.856004] [<c0662caf>] driver_unbind+0x4d/0x7b <4>[1641072.856004] [<c0662c62>] ? store_drivers_probe+0x33/0x33 <4>[1641072.856004] [<c06627fb>] drv_attr_store+0x24/0x28 <4>[1641072.856004] [<c05263a6>] sysfs_write_file+0xb3/0xec <4>[1641072.856004] [<c05262f3>] ? sysfs_poll+0x73/0x73 <4>[1641072.856004] [<c04df254>] vfs_write+0x87/0xde <4>[1641072.856004] [<c04e678e>] ? path_put+0x1a/0x1d <4>[1641072.856004] [<c04df428>] sys_write+0x40/0x62 <4>[1641072.856004] [<c07c751f>] sysenter_do_call+0x12/0x28 <0>[1641072.856004] Code: d0 fe ff ff eb 05 bf f0 ff ff ff b8 14 ce 9e c0 e8 a2 19 0f 00 89 f8 5b 5e 5f 5d c3 55 89 e5 53 3e 8d 74 26 00 31 db 39 c8 77 0c <0f> a3 02 19 c0 31 db 85 c0 0f 95 c3 89 d8 5b 5d c3 55 89 e5 57 <0>[1641072.856004] EIP: [<c06cf531>] is_event_supported+0xf/0x20 SS:ESP 0068:c42a3d4c <0>[1641072.856004] CR2: 0000000000000018

2 14

[alsa-devel] [PATCH v3 0/5] snd-usb-6fire: volume control updates
by Torsten Schenk 22 Feb '12

22 Feb '12

Changes in v3: - update only channels that need updating - indices for controls now start from 0 - snd_ctl_make_virtual_master now also gets a tlv Thanks, Torsten

2 1

[alsa-devel] [PATCH v3 5/5] snd-usb-6fire: add analog input volume control
by Torsten Schenk 22 Feb '12

22 Feb '12

Add a stereo volume control for analog input channel pair 1/2. Signed-off-by: Torsten Schenk <torsten.schenk(a)zoho.com> diff -Nur a/sound/usb/6fire/control.c b/sound/usb/6fire/control.c --- a/sound/usb/6fire/control.c 2012-02-22 15:05:47.206526365 +0100 +++ b/sound/usb/6fire/control.c 2012-02-22 15:11:26.846504694 +0100 @@ -55,6 +55,7 @@ static const u16 rates_6fire_vh[] = {0x11, 0x11, 0x10, 0x10, 0x00, 0x00}; static DECLARE_TLV_DB_MINMAX(tlv_output, -9000, 0); +static DECLARE_TLV_DB_MINMAX(tlv_input, -1500, 1500); enum { DIGITAL_THRU_ONLY_SAMPLERATE = 3 @@ -82,6 +83,20 @@ comm_rt->write8(comm_rt, 0x12, 0x0e, ~rt->output_mute); } +static void usb6fire_control_input_vol_update(struct control_runtime *rt) +{ + struct comm_runtime *comm_rt = rt->chip->comm; + int i; + + if (comm_rt) + for (i = 0; i < 2; i++) + if (!(rt->ivol_updated & (1 << i))) { + comm_rt->write8(comm_rt, 0x12, 0x1c + i, + rt->input_vol[i] & 0x3f); + rt->ivol_updated |= 1 << i; + } +} + static void usb6fire_control_line_phono_update(struct control_runtime *rt) { struct comm_runtime *comm_rt = rt->chip->comm; @@ -261,6 +276,50 @@ return 0; } +static int usb6fire_control_input_vol_info(struct snd_kcontrol *kcontrol, + struct snd_ctl_elem_info *uinfo) +{ + uinfo->type = SNDRV_CTL_ELEM_TYPE_INTEGER; + uinfo->count = 2; + uinfo->value.integer.min = 0; + uinfo->value.integer.max = 30; + return 0; +} + +static int usb6fire_control_input_vol_put(struct snd_kcontrol *kcontrol, + struct snd_ctl_elem_value *ucontrol) +{ + struct control_runtime *rt = snd_kcontrol_chip(kcontrol); + int changed = 0; + + if (rt->input_vol[0] != ucontrol->value.integer.value[0]) { + rt->input_vol[0] = ucontrol->value.integer.value[0] - 15; + rt->ivol_updated &= ~(1 << 0); + changed = 1; + } + if (rt->input_vol[1] != ucontrol->value.integer.value[1]) { + rt->input_vol[1] = ucontrol->value.integer.value[1] - 15; + rt->ivol_updated &= ~(1 << 1); + changed = 1; + } + + if (changed) + usb6fire_control_input_vol_update(rt); + + return changed; +} + +static int usb6fire_control_input_vol_get(struct snd_kcontrol *kcontrol, + struct snd_ctl_elem_value *ucontrol) +{ + struct control_runtime *rt = snd_kcontrol_chip(kcontrol); + + ucontrol->value.integer.value[0] = rt->input_vol[0] + 15; + ucontrol->value.integer.value[1] = rt->input_vol[1] + 15; + + return 0; +} + static int usb6fire_control_line_phono_info(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo) { @@ -454,6 +513,17 @@ .get = usb6fire_control_digital_thru_get, .put = usb6fire_control_digital_thru_put }, + { + .iface = SNDRV_CTL_ELEM_IFACE_MIXER, + .name = "Analog Capture Volume", + .index = 0, + .access = SNDRV_CTL_ELEM_ACCESS_READWRITE | + SNDRV_CTL_ELEM_ACCESS_TLV_READ, + .info = usb6fire_control_input_vol_info, + .get = usb6fire_control_input_vol_get, + .put = usb6fire_control_input_vol_put, + .tlv = { .p = tlv_input } + }, {} }; @@ -518,6 +588,7 @@ usb6fire_control_line_phono_update(rt); usb6fire_control_output_vol_update(rt); usb6fire_control_output_mute_update(rt); + usb6fire_control_input_vol_update(rt); usb6fire_control_streaming_update(rt); ret = usb6fire_control_add_virtual(rt, chip->card, diff -Nur a/sound/usb/6fire/control.h b/sound/usb/6fire/control.h --- a/sound/usb/6fire/control.h 2012-02-22 15:03:44.370251101 +0100 +++ b/sound/usb/6fire/control.h 2012-02-22 15:10:05.055517247 +0100 @@ -46,6 +46,8 @@ u8 output_vol[6]; u8 ovol_updated; u8 output_mute; + s8 input_vol[2]; + u8 ivol_updated; }; int __devinit usb6fire_control_init(struct sfire_chip *chip);

1 0

[alsa-devel] [PATCH v3 4/5] snd-usb-6fire: add mute control for analog outputs
by Torsten Schenk 22 Feb '12

22 Feb '12

Add a mute control for every analog output channel. Signed-off-by: Torsten Schenk <torsten.schenk(a)zoho.com> diff -Nur a/sound/usb/6fire/control.c b/sound/usb/6fire/control.c --- a/sound/usb/6fire/control.c 2012-02-22 15:02:08.594916052 +0100 +++ b/sound/usb/6fire/control.c 2012-02-22 15:05:47.206526365 +0100 @@ -74,6 +74,14 @@ } } +static void usb6fire_control_output_mute_update(struct control_runtime *rt) +{ + struct comm_runtime *comm_rt = rt->chip->comm; + + if (comm_rt) + comm_rt->write8(comm_rt, 0x12, 0x0e, ~rt->output_mute); +} + static void usb6fire_control_line_phono_update(struct control_runtime *rt) { struct comm_runtime *comm_rt = rt->chip->comm; @@ -208,6 +216,51 @@ return 0; } +static int usb6fire_control_output_mute_put(struct snd_kcontrol *kcontrol, + struct snd_ctl_elem_value *ucontrol) +{ + struct control_runtime *rt = snd_kcontrol_chip(kcontrol); + unsigned int ch = kcontrol->private_value; + u8 old = rt->output_mute; + u8 value = 0; + + if (ch > 4) { + snd_printk(KERN_ERR PREFIX "Invalid channel in volume control."); + return -EINVAL; + } + + rt->output_mute &= ~(3 << ch); + if (ucontrol->value.integer.value[0]) + value |= 1; + if (ucontrol->value.integer.value[1]) + value |= 2; + rt->output_mute |= value << ch; + + if (rt->output_mute != old) + usb6fire_control_output_mute_update(rt); + + return rt->output_mute != old; +} + +static int usb6fire_control_output_mute_get(struct snd_kcontrol *kcontrol, + struct snd_ctl_elem_value *ucontrol) +{ + struct control_runtime *rt = snd_kcontrol_chip(kcontrol); + unsigned int ch = kcontrol->private_value; + u8 value = rt->output_mute >> ch; + + if (ch > 4) { + snd_printk(KERN_ERR PREFIX "Invalid channel in volume control."); + return -EINVAL; + } + + ucontrol->value.integer.value[0] = 1 & value; + value >>= 1; + ucontrol->value.integer.value[1] = 1 & value; + + return 0; +} + static int usb6fire_control_line_phono_info(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo) { @@ -339,6 +392,40 @@ {} }; +static struct __devinitdata snd_kcontrol_new mute_elements[] = { + { + .iface = SNDRV_CTL_ELEM_IFACE_MIXER, + .name = "Analog Playback Switch", + .index = 0, + .private_value = 0, + .access = SNDRV_CTL_ELEM_ACCESS_READWRITE, + .info = snd_ctl_boolean_stereo_info, + .get = usb6fire_control_output_mute_get, + .put = usb6fire_control_output_mute_put, + }, + { + .iface = SNDRV_CTL_ELEM_IFACE_MIXER, + .name = "Analog Playback Switch", + .index = 1, + .private_value = 2, + .access = SNDRV_CTL_ELEM_ACCESS_READWRITE, + .info = snd_ctl_boolean_stereo_info, + .get = usb6fire_control_output_mute_get, + .put = usb6fire_control_output_mute_put, + }, + { + .iface = SNDRV_CTL_ELEM_IFACE_MIXER, + .name = "Analog Playback Switch", + .index = 2, + .private_value = 4, + .access = SNDRV_CTL_ELEM_ACCESS_READWRITE, + .info = snd_ctl_boolean_stereo_info, + .get = usb6fire_control_output_mute_get, + .put = usb6fire_control_output_mute_put, + }, + {} +}; + static struct __devinitdata snd_kcontrol_new elements[] = { { .iface = SNDRV_CTL_ELEM_IFACE_MIXER, @@ -430,13 +517,21 @@ usb6fire_control_opt_coax_update(rt); usb6fire_control_line_phono_update(rt); usb6fire_control_output_vol_update(rt); + usb6fire_control_output_mute_update(rt); usb6fire_control_streaming_update(rt); ret = usb6fire_control_add_virtual(rt, chip->card, "Master Playback Volume", vol_elements); if (ret) { + snd_printk(KERN_ERR PREFIX "cannot add control.\n"); kfree(rt); + return ret; + } + ret = usb6fire_control_add_virtual(rt, chip->card, + "Master Playback Switch", mute_elements); + if (ret) { snd_printk(KERN_ERR PREFIX "cannot add control.\n"); + kfree(rt); return ret; } diff -Nur a/sound/usb/6fire/control.h b/sound/usb/6fire/control.h --- a/sound/usb/6fire/control.h 2012-02-22 15:00:10.034785200 +0100 +++ b/sound/usb/6fire/control.h 2012-02-22 15:03:44.370251101 +0100 @@ -45,6 +45,7 @@ bool usb_streaming; u8 output_vol[6]; u8 ovol_updated; + u8 output_mute; }; int __devinit usb6fire_control_init(struct sfire_chip *chip);

1 0

[alsa-devel] [PATCH v3 3/5] snd-usb-6fire: add individual volume control for analog channels
by Torsten Schenk 22 Feb '12

22 Feb '12

Add a stereo volume control for every analog output pair 1/2, 3/4, 5/6. Signed-off-by: Torsten Schenk <torsten.schenk(a)zoho.com> diff -Nur a/sound/usb/6fire/control.c b/sound/usb/6fire/control.c --- a/sound/usb/6fire/control.c 2012-01-17 18:36:14.480508754 +0100 +++ b/sound/usb/6fire/control.c 2012-02-22 15:02:08.594916052 +0100 @@ -7,6 +7,10 @@ * Created: Jan 01, 2011 * Copyright: (C) Torsten Schenk * + * Thanks to: + * - Holger Ruckdeschel: he found out how to control individual channel + * volumes and introduced mute switch + * * 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 @@ -39,7 +43,7 @@ { 0x22, 0x03, 0x00 }, { 0x20, 0x03, 0x08 }, { 0x22, 0x04, 0x00 }, { 0x20, 0x04, 0x08 }, { 0x22, 0x05, 0x01 }, { 0x20, 0x05, 0x08 }, { 0x22, 0x04, 0x01 }, { 0x12, 0x04, 0x00 }, { 0x12, 0x05, 0x00 }, - { 0x12, 0x0d, 0x78 }, { 0x12, 0x21, 0x82 }, { 0x12, 0x22, 0x80 }, + { 0x12, 0x0d, 0x38 }, { 0x12, 0x21, 0x82 }, { 0x12, 0x22, 0x80 }, { 0x12, 0x23, 0x00 }, { 0x12, 0x06, 0x02 }, { 0x12, 0x03, 0x00 }, { 0x12, 0x02, 0x00 }, { 0x22, 0x03, 0x01 }, { 0 } /* TERMINATING ENTRY */ @@ -56,15 +60,18 @@ DIGITAL_THRU_ONLY_SAMPLERATE = 3 }; -static void usb6fire_control_master_vol_update(struct control_runtime *rt) +static void usb6fire_control_output_vol_update(struct control_runtime *rt) { struct comm_runtime *comm_rt = rt->chip->comm; - if (comm_rt) { - /* set volume */ - comm_rt->write8(comm_rt, 0x12, 0x0f, 180 - rt->master_vol); - /* unmute */ - comm_rt->write8(comm_rt, 0x12, 0x0e, 0x00); - } + int i; + + if (comm_rt) + for (i = 0; i < 6; i++) + if (!(rt->ovol_updated & (1 << i))) { + comm_rt->write8(comm_rt, 0x12, 0x0f + i, + 180 - rt->output_vol[i]); + rt->ovol_updated |= 1 << i; + } } static void usb6fire_control_line_phono_update(struct control_runtime *rt) @@ -146,34 +153,58 @@ return -EINVAL; } -static int usb6fire_control_master_vol_info(struct snd_kcontrol *kcontrol, +static int usb6fire_control_output_vol_info(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo) { uinfo->type = SNDRV_CTL_ELEM_TYPE_INTEGER; - uinfo->count = 1; + uinfo->count = 2; uinfo->value.integer.min = 0; uinfo->value.integer.max = 180; return 0; } -static int usb6fire_control_master_vol_put(struct snd_kcontrol *kcontrol, +static int usb6fire_control_output_vol_put(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol) { struct control_runtime *rt = snd_kcontrol_chip(kcontrol); + unsigned int ch = kcontrol->private_value; int changed = 0; - if (rt->master_vol != ucontrol->value.integer.value[0]) { - rt->master_vol = ucontrol->value.integer.value[0]; - usb6fire_control_master_vol_update(rt); + + if (ch > 4) { + snd_printk(KERN_ERR PREFIX "Invalid channel in volume control."); + return -EINVAL; + } + + if (rt->output_vol[ch] != ucontrol->value.integer.value[0]) { + rt->output_vol[ch] = ucontrol->value.integer.value[0]; + rt->ovol_updated &= ~(1 << ch); changed = 1; } + if (rt->output_vol[ch + 1] != ucontrol->value.integer.value[1]) { + rt->output_vol[ch + 1] = ucontrol->value.integer.value[1]; + rt->ovol_updated &= ~(2 << ch); + changed = 1; + } + + if (changed) + usb6fire_control_output_vol_update(rt); + return changed; } -static int usb6fire_control_master_vol_get(struct snd_kcontrol *kcontrol, +static int usb6fire_control_output_vol_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol) { struct control_runtime *rt = snd_kcontrol_chip(kcontrol); - ucontrol->value.integer.value[0] = rt->master_vol; + unsigned int ch = kcontrol->private_value; + + if (ch > 4) { + snd_printk(KERN_ERR PREFIX "Invalid channel in volume control."); + return -EINVAL; + } + + ucontrol->value.integer.value[0] = rt->output_vol[ch]; + ucontrol->value.integer.value[1] = rt->output_vol[ch + 1]; return 0; } @@ -268,18 +299,47 @@ return 0; } -static struct __devinitdata snd_kcontrol_new elements[] = { +static struct __devinitdata snd_kcontrol_new vol_elements[] = { { .iface = SNDRV_CTL_ELEM_IFACE_MIXER, - .name = "Master Playback Volume", + .name = "Analog Playback Volume", .index = 0, + .private_value = 0, + .access = SNDRV_CTL_ELEM_ACCESS_READWRITE | + SNDRV_CTL_ELEM_ACCESS_TLV_READ, + .info = usb6fire_control_output_vol_info, + .get = usb6fire_control_output_vol_get, + .put = usb6fire_control_output_vol_put, + .tlv = { .p = tlv_output } + }, + { + .iface = SNDRV_CTL_ELEM_IFACE_MIXER, + .name = "Analog Playback Volume", + .index = 1, + .private_value = 2, + .access = SNDRV_CTL_ELEM_ACCESS_READWRITE | + SNDRV_CTL_ELEM_ACCESS_TLV_READ, + .info = usb6fire_control_output_vol_info, + .get = usb6fire_control_output_vol_get, + .put = usb6fire_control_output_vol_put, + .tlv = { .p = tlv_output } + }, + { + .iface = SNDRV_CTL_ELEM_IFACE_MIXER, + .name = "Analog Playback Volume", + .index = 2, + .private_value = 4, .access = SNDRV_CTL_ELEM_ACCESS_READWRITE | SNDRV_CTL_ELEM_ACCESS_TLV_READ, - .info = usb6fire_control_master_vol_info, - .get = usb6fire_control_master_vol_get, - .put = usb6fire_control_master_vol_put, + .info = usb6fire_control_output_vol_info, + .get = usb6fire_control_output_vol_get, + .put = usb6fire_control_output_vol_put, .tlv = { .p = tlv_output } }, + {} +}; + +static struct __devinitdata snd_kcontrol_new elements[] = { { .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = "Line/Phono Capture Route", @@ -310,6 +370,40 @@ {} }; +static int usb6fire_control_add_virtual( + struct control_runtime *rt, + struct snd_card *card, + char *name, + struct snd_kcontrol_new *elems) +{ + int ret; + int i; + struct snd_kcontrol *vmaster = + snd_ctl_make_virtual_master(name, tlv_output); + struct snd_kcontrol *control; + + if (!vmaster) + return -ENOMEM; + ret = snd_ctl_add(card, vmaster); + if (ret < 0) + return ret; + + i = 0; + while (elems[i].name) { + control = snd_ctl_new1(&elems[i], rt); + if (!control) + return -ENOMEM; + ret = snd_ctl_add(card, control); + if (ret < 0) + return ret; + ret = snd_ctl_add_slave(vmaster, control); + if (ret < 0) + return ret; + i++; + } + return 0; +} + int __devinit usb6fire_control_init(struct sfire_chip *chip) { int i; @@ -335,9 +429,17 @@ usb6fire_control_opt_coax_update(rt); usb6fire_control_line_phono_update(rt); - usb6fire_control_master_vol_update(rt); + usb6fire_control_output_vol_update(rt); usb6fire_control_streaming_update(rt); + ret = usb6fire_control_add_virtual(rt, chip->card, + "Master Playback Volume", vol_elements); + if (ret) { + kfree(rt); + snd_printk(KERN_ERR PREFIX "cannot add control.\n"); + return ret; + } + i = 0; while (elements[i].name) { ret = snd_ctl_add(chip->card, snd_ctl_new1(&elements[i], rt)); diff -Nur a/sound/usb/6fire/control.h b/sound/usb/6fire/control.h --- a/sound/usb/6fire/control.h 2012-01-09 22:32:56.088002206 +0100 +++ b/sound/usb/6fire/control.h 2012-02-22 15:00:10.034785200 +0100 @@ -43,7 +43,8 @@ bool line_phono_switch; bool digital_thru_switch; bool usb_streaming; - u8 master_vol; + u8 output_vol[6]; + u8 ovol_updated; }; int __devinit usb6fire_control_init(struct sfire_chip *chip);

1 0

[alsa-devel] [PATCH v3 2/5] snd-usb-6fire: add tlv to controls
by Torsten Schenk 22 Feb '12

22 Feb '12

Remove the soft log-conversion and add a dB scale according to the DAC documentation instead. Signed-off-by: Torsten Schenk <torsten.schenk(a)zoho.com> diff -Nur a/sound/usb/6fire/control.c b/sound/usb/6fire/control.c --- a/sound/usb/6fire/control.c 2012-01-09 22:33:01.512182294 +0100 +++ b/sound/usb/6fire/control.c 2012-01-17 18:36:14.480508754 +0100 @@ -15,6 +15,7 @@ #include <linux/interrupt.h> #include <sound/control.h> +#include <sound/tlv.h> #include "control.h" #include "comm.h" @@ -24,26 +25,6 @@ static char *line_phono_texts[2] = { "Line", "Phono" }; /* - * calculated with $value\[i\] = 128 \cdot sqrt[3]{\frac{i}{128}}$ - * this is done because the linear values cause rapid degredation - * of volume in the uppermost region. - */ -static const u8 log_volume_table[128] = { - 0x00, 0x19, 0x20, 0x24, 0x28, 0x2b, 0x2e, 0x30, 0x32, 0x34, - 0x36, 0x38, 0x3a, 0x3b, 0x3d, 0x3e, 0x40, 0x41, 0x42, 0x43, - 0x44, 0x46, 0x47, 0x48, 0x49, 0x4a, 0x4b, 0x4c, 0x4d, 0x4e, - 0x4e, 0x4f, 0x50, 0x51, 0x52, 0x53, 0x53, 0x54, 0x55, 0x56, - 0x56, 0x57, 0x58, 0x58, 0x59, 0x5a, 0x5b, 0x5b, 0x5c, 0x5c, - 0x5d, 0x5e, 0x5e, 0x5f, 0x60, 0x60, 0x61, 0x61, 0x62, 0x62, - 0x63, 0x63, 0x64, 0x65, 0x65, 0x66, 0x66, 0x67, 0x67, 0x68, - 0x68, 0x69, 0x69, 0x6a, 0x6a, 0x6b, 0x6b, 0x6c, 0x6c, 0x6c, - 0x6d, 0x6d, 0x6e, 0x6e, 0x6f, 0x6f, 0x70, 0x70, 0x70, 0x71, - 0x71, 0x72, 0x72, 0x73, 0x73, 0x73, 0x74, 0x74, 0x75, 0x75, - 0x75, 0x76, 0x76, 0x77, 0x77, 0x77, 0x78, 0x78, 0x78, 0x79, - 0x79, 0x7a, 0x7a, 0x7a, 0x7b, 0x7b, 0x7b, 0x7c, 0x7c, 0x7c, - 0x7d, 0x7d, 0x7d, 0x7e, 0x7e, 0x7e, 0x7f, 0x7f }; - -/* * data that needs to be sent to device. sets up card internal stuff. * values dumped from windows driver and filtered by trial'n'error. */ @@ -69,6 +50,8 @@ static const u16 rates_6fire_vl[] = {0x00, 0x01, 0x00, 0x01, 0x00, 0x01}; static const u16 rates_6fire_vh[] = {0x11, 0x11, 0x10, 0x10, 0x00, 0x00}; +static DECLARE_TLV_DB_MINMAX(tlv_output, -9000, 0); + enum { DIGITAL_THRU_ONLY_SAMPLERATE = 3 }; @@ -78,8 +61,7 @@ struct comm_runtime *comm_rt = rt->chip->comm; if (comm_rt) { /* set volume */ - comm_rt->write8(comm_rt, 0x12, 0x0f, 0x7f - - log_volume_table[rt->master_vol]); + comm_rt->write8(comm_rt, 0x12, 0x0f, 180 - rt->master_vol); /* unmute */ comm_rt->write8(comm_rt, 0x12, 0x0e, 0x00); } @@ -170,7 +152,7 @@ uinfo->type = SNDRV_CTL_ELEM_TYPE_INTEGER; uinfo->count = 1; uinfo->value.integer.min = 0; - uinfo->value.integer.max = 127; + uinfo->value.integer.max = 180; return 0; } @@ -291,10 +273,12 @@ .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = "Master Playback Volume", .index = 0, - .access = SNDRV_CTL_ELEM_ACCESS_READWRITE, + .access = SNDRV_CTL_ELEM_ACCESS_READWRITE | + SNDRV_CTL_ELEM_ACCESS_TLV_READ, .info = usb6fire_control_master_vol_info, .get = usb6fire_control_master_vol_get, - .put = usb6fire_control_master_vol_put + .put = usb6fire_control_master_vol_put, + .tlv = { .p = tlv_output } }, { .iface = SNDRV_CTL_ELEM_IFACE_MIXER,

1 0

[alsa-devel] [PATCH v3 1/5] snd-usb-6fire: remove driver version information
by Torsten Schenk 22 Feb '12

22 Feb '12

Remove unused driver version information from the individual files. Signed-off-by: Torsten Schenk <torsten.schenk(a)zoho.com> diff -Nur a/sound/usb/6fire/chip.c b/sound/usb/6fire/chip.c --- a/sound/usb/6fire/chip.c 2012-01-09 21:55:55.863579333 +0100 +++ b/sound/usb/6fire/chip.c 2012-01-09 22:33:49.857786986 +0100 @@ -5,7 +5,6 @@ * * Author: Torsten Schenk <torsten.schenk(a)zoho.com> * Created: Jan 01, 2011 - * Version: 0.3.0 * Copyright: (C) Torsten Schenk * * This program is free software; you can redistribute it and/or modify @@ -29,7 +28,7 @@ #include <sound/initval.h> MODULE_AUTHOR("Torsten Schenk <torsten.schenk(a)zoho.com>"); -MODULE_DESCRIPTION("TerraTec DMX 6Fire USB audio driver, version 0.3.0"); +MODULE_DESCRIPTION("TerraTec DMX 6Fire USB audio driver"); MODULE_LICENSE("GPL v2"); MODULE_SUPPORTED_DEVICE("{{TerraTec, DMX 6Fire USB}}"); diff -Nur a/sound/usb/6fire/chip.h b/sound/usb/6fire/chip.h --- a/sound/usb/6fire/chip.h 2012-01-09 21:55:55.000000000 +0100 +++ b/sound/usb/6fire/chip.h 2012-01-09 22:33:38.469409108 +0100 @@ -3,7 +3,6 @@ * * Author: Torsten Schenk <torsten.schenk(a)zoho.com> * Created: Jan 01, 2011 - * Version: 0.3.0 * Copyright: (C) Torsten Schenk * * This program is free software; you can redistribute it and/or modify diff -Nur a/sound/usb/6fire/comm.c b/sound/usb/6fire/comm.c --- a/sound/usb/6fire/comm.c 2012-01-09 21:55:55.000000000 +0100 +++ b/sound/usb/6fire/comm.c 2012-01-09 22:33:11.620517902 +0100 @@ -5,7 +5,6 @@ * * Author: Torsten Schenk <torsten.schenk(a)zoho.com> * Created: Jan 01, 2011 - * Version: 0.3.0 * Copyright: (C) Torsten Schenk * * This program is free software; you can redistribute it and/or modify diff -Nur a/sound/usb/6fire/comm.h b/sound/usb/6fire/comm.h --- a/sound/usb/6fire/comm.h 2012-01-09 21:55:55.000000000 +0100 +++ b/sound/usb/6fire/comm.h 2012-01-09 22:33:16.900693132 +0100 @@ -3,7 +3,6 @@ * * Author: Torsten Schenk <torsten.schenk(a)zoho.com> * Created: Jan 01, 2011 - * Version: 0.3.0 * Copyright: (C) Torsten Schenk * * This program is free software; you can redistribute it and/or modify diff -Nur a/sound/usb/6fire/common.h b/sound/usb/6fire/common.h --- a/sound/usb/6fire/common.h 2012-01-09 21:55:55.000000000 +0100 +++ b/sound/usb/6fire/common.h 2012-01-09 22:33:24.636949983 +0100 @@ -3,7 +3,6 @@ * * Author: Torsten Schenk <torsten.schenk(a)zoho.com> * Created: Jan 01, 2011 - * Version: 0.3.0 * Copyright: (C) Torsten Schenk * * This program is free software; you can redistribute it and/or modify diff -Nur a/sound/usb/6fire/control.c b/sound/usb/6fire/control.c --- a/sound/usb/6fire/control.c 2012-01-09 21:55:55.000000000 +0100 +++ b/sound/usb/6fire/control.c 2012-01-09 22:33:01.512182294 +0100 @@ -5,7 +5,6 @@ * * Author: Torsten Schenk <torsten.schenk(a)zoho.com> * Created: Jan 01, 2011 - * Version: 0.3.0 * Copyright: (C) Torsten Schenk * * This program is free software; you can redistribute it and/or modify diff -Nur a/sound/usb/6fire/control.h b/sound/usb/6fire/control.h --- a/sound/usb/6fire/control.h 2012-01-09 21:55:55.000000000 +0100 +++ b/sound/usb/6fire/control.h 2012-01-09 22:32:56.088002206 +0100 @@ -3,7 +3,6 @@ * * Author: Torsten Schenk <torsten.schenk(a)zoho.com> * Created: Jan 01, 2011 - * Version: 0.3.0 * Copyright: (C) Torsten Schenk * * This program is free software; you can redistribute it and/or modify diff -Nur a/sound/usb/6fire/firmware.c b/sound/usb/6fire/firmware.c --- a/sound/usb/6fire/firmware.c 2012-01-09 21:55:55.000000000 +0100 +++ b/sound/usb/6fire/firmware.c 2012-01-09 22:33:30.933158868 +0100 @@ -5,7 +5,6 @@ * * Author: Torsten Schenk <torsten.schenk(a)zoho.com> * Created: Jan 01, 2011 - * Version: 0.3.0 * Copyright: (C) Torsten Schenk * * This program is free software; you can redistribute it and/or modify diff -Nur a/sound/usb/6fire/midi.c b/sound/usb/6fire/midi.c --- a/sound/usb/6fire/midi.c 2012-01-09 21:55:55.000000000 +0100 +++ b/sound/usb/6fire/midi.c 2012-01-09 22:35:07.356357430 +0100 @@ -5,7 +5,6 @@ * * Author: Torsten Schenk <torsten.schenk(a)zoho.com> * Created: Jan 01, 2011 - * Version: 0.3.0 * Copyright: (C) Torsten Schenk * * This program is free software; you can redistribute it and/or modify diff -Nur a/sound/usb/6fire/midi.h b/sound/usb/6fire/midi.h --- a/sound/usb/6fire/midi.h 2012-01-09 21:55:55.000000000 +0100 +++ b/sound/usb/6fire/midi.h 2012-01-09 22:33:58.866085888 +0100 @@ -3,7 +3,6 @@ * * Author: Torsten Schenk <torsten.schenk(a)zoho.com> * Created: Jan 01, 2011 - * Version: 0.3.0 * Copyright: (C) Torsten Schenk * * This program is free software; you can redistribute it and/or modify diff -Nur a/sound/usb/6fire/pcm.c b/sound/usb/6fire/pcm.c --- a/sound/usb/6fire/pcm.c 2012-01-09 21:55:55.000000000 +0100 +++ b/sound/usb/6fire/pcm.c 2012-01-09 22:34:04.546274285 +0100 @@ -5,7 +5,6 @@ * * Author: Torsten Schenk <torsten.schenk(a)zoho.com> * Created: Jan 01, 2011 - * Version: 0.3.0 * Copyright: (C) Torsten Schenk * * This program is free software; you can redistribute it and/or modify diff -Nur a/sound/usb/6fire/pcm.h b/sound/usb/6fire/pcm.h --- a/sound/usb/6fire/pcm.h 2012-01-09 21:55:55.000000000 +0100 +++ b/sound/usb/6fire/pcm.h 2012-01-09 22:34:07.798382278 +0100 @@ -3,7 +3,6 @@ * * Author: Torsten Schenk <torsten.schenk(a)zoho.com> * Created: Jan 01, 2011 - * Version: 0.3.0 * Copyright: (C) Torsten Schenk * * This program is free software; you can redistribute it and/or modify

1 0