On Mon, 18 Jan 2021 14:06:21 +0100,
Olivia Mackintosh wrote:
>
> This adds the Pioneer DJ DJM-750 to the quirks table and ensures
> skip_pioneer_sync_ep() is (also) called: this device uses the vendor
> ID of 0x08e4 (I'm not sure why they use multiple vendor IDs but many
> just like to be awkward it seems).
>
> Playback on all 8 channels works. I'll likely keep this working in the
> future and submit futher patches and improvements as necessary.
>
> Signed-off-by: Olivia Mackintosh <livvy@xxxxxxx>
Thanks, applied now to for-next branch, i.e. targeted for 5.12.
I'd take for 5.11 if it were a oneliner, but this is a bit too long as
a late merge material, unfortunately.
Takashi
> ---
> sound/usb/implicit.c | 3 +-
> sound/usb/quirks-table.h | 60 ++++++++++++++++++++++++++++++++++++++++
> 2 files changed, 62 insertions(+), 1 deletion(-)
>
> diff --git a/sound/usb/implicit.c b/sound/usb/implicit.c
> index 521cc846d9d9..e7216d0b860d 100644
> --- a/sound/usb/implicit.c
> +++ b/sound/usb/implicit.c
> @@ -302,7 +302,8 @@ static int audioformat_implicit_fb_quirk(struct snd_usb_audio *chip,
> /* Pioneer devices with vendor spec class */
> if (attr == USB_ENDPOINT_SYNC_ASYNC &&
> alts->desc.bInterfaceClass == USB_CLASS_VENDOR_SPEC &&
> - USB_ID_VENDOR(chip->usb_id) == 0x2b73 /* Pioneer */) {
> + (USB_ID_VENDOR(chip->usb_id) == 0x2b73 || /* Pioneer */
> + USB_ID_VENDOR(chip->usb_id) == 0x08e4 /* Pioneer */)) {
> if (skip_pioneer_sync_ep(chip, fmt, alts))
> return 1;
> }
> diff --git a/sound/usb/quirks-table.h b/sound/usb/quirks-table.h
> index c8a4bdf18207..98b31c3160ad 100644
> --- a/sound/usb/quirks-table.h
> +++ b/sound/usb/quirks-table.h
> @@ -3757,6 +3757,66 @@ AU0828_DEVICE(0x2040, 0x7270, "Hauppauge", "HVR-950Q"),
> }
> }
> },
> +{
> + /*
> + * Pioneer DJ DJM-750
> + * 8 channels playback & 8 channels capture @ 44.1/48/96kHz S24LE
> + */
> + USB_DEVICE_VENDOR_SPEC(0x08e4, 0x017f),
> + .driver_info = (unsigned long) &(const struct snd_usb_audio_quirk) {
> + .ifnum = QUIRK_ANY_INTERFACE,
> + .type = QUIRK_COMPOSITE,
> + .data = (const struct snd_usb_audio_quirk[]) {
> + {
> + .ifnum = 0,
> + .type = QUIRK_AUDIO_FIXED_ENDPOINT,
> + .data = &(const struct audioformat) {
> + .formats = SNDRV_PCM_FMTBIT_S24_3LE,
> + .channels = 8,
> + .iface = 0,
> + .altsetting = 1,
> + .altset_idx = 1,
> + .endpoint = 0x05,
> + .ep_attr = USB_ENDPOINT_XFER_ISOC|
> + USB_ENDPOINT_SYNC_ASYNC,
> + .rates = SNDRV_PCM_RATE_44100|
> + SNDRV_PCM_RATE_48000|
> + SNDRV_PCM_RATE_96000,
> + .rate_min = 44100,
> + .rate_max = 96000,
> + .nr_rates = 3,
> + .rate_table = (unsigned int[]) { 44100, 48000, 96000 }
> + }
> + },
> + {
> + .ifnum = 0,
> + .type = QUIRK_AUDIO_FIXED_ENDPOINT,
> + .data = &(const struct audioformat) {
> + .formats = SNDRV_PCM_FMTBIT_S24_3LE,
> + .channels = 8,
> + .iface = 0,
> + .altsetting = 1,
> + .altset_idx = 1,
> + .endpoint = 0x86,
> + .ep_idx = 1,
> + .ep_attr = USB_ENDPOINT_XFER_ISOC|
> + USB_ENDPOINT_SYNC_ASYNC|
> + USB_ENDPOINT_USAGE_IMPLICIT_FB,
> + .rates = SNDRV_PCM_RATE_44100|
> + SNDRV_PCM_RATE_48000|
> + SNDRV_PCM_RATE_96000,
> + .rate_min = 44100,
> + .rate_max = 96000,
> + .nr_rates = 3,
> + .rate_table = (unsigned int[]) { 44100, 48000, 96000 }
> + }
> + },
> + {
> + .ifnum = -1
> + }
> + }
> + }
> +},
>
> #undef USB_DEVICE_VENDOR_SPEC
> #undef USB_AUDIO_DEVICE
> --
> 2.30.0
>
