Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-28 07:01:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

ALSA: usb-audio: Add support for Zoom R16/24 capture and midi interfaces

Browse Source 
This makes the midi interface and capture work out of the box with
R16 (and presumably R24 too but untested). Playback stream would also
seem to function fine except for one caveat: no sound is produced,
so it is disabled for now. Mixer descriptors are garbage and will
require further quirks to enable functionality, also disabled here.

Signed-off-by: Panu Matilainen <pmatilai@laiskiainen.org>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Panu Matilainen 2014-11-30 18:45:40 +02:00 committed by Takashi Iwai
parent fc5d3c70f9
commit dacacb0aa0
2 changed files with 48 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
sound/usb/quirks-table.h
View File

@ -3173,6 +3173,46 @@ YAMAHA_DEVICE(0x7010, "UB99"),
}
},
{
/*
* ZOOM R16/24 in audio interface mode.
* Mixer descriptors are garbage, further quirks will be needed
* to make any of it functional, thus disabled for now.
* Playback stream appears to start and run fine but no sound
* is produced, so also disabled for now.
*/
USB_DEVICE(0x1686, 0x00dd),
.driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
.ifnum = QUIRK_ANY_INTERFACE,
.type = QUIRK_COMPOSITE,
.data = (const struct snd_usb_audio_quirk[]) {
{
/* Mixer */
.ifnum = 0,
.type = QUIRK_IGNORE_INTERFACE,
},
{
/* Playback */
.ifnum = 1,
.type = QUIRK_IGNORE_INTERFACE,
},
{
/* Capture */
.ifnum = 2,
.type = QUIRK_AUDIO_STANDARD_INTERFACE,
},
{
/* Midi */
.ifnum = 3,
.type = QUIRK_MIDI_STANDARD_INTERFACE
},
{
.ifnum = -1
},
}
}
},
{
/*
* Some USB MIDI devices don't have an audio control interface,

8
sound/usb/quirks.c
View File

@ -1207,6 +1207,14 @@ void snd_usb_ctl_msg_quirk(struct usb_device *dev, unsigned int pipe,
break;
}
}
/* Zoom R16/24 needs a tiny delay here, otherwise requests like
* get/set frequency return as failed despite actually succeeding.
*/
if ((le16_to_cpu(dev->descriptor.idVendor) == 0x1686) &&
(le16_to_cpu(dev->descriptor.idProduct) == 0x00dd) &&
(requesttype & USB_TYPE_MASK) == USB_TYPE_CLASS)
mdelay(1);
}
/*