From patchwork Wed Jul 1 16:55:09 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Cyrus Harmon X-Patchwork-Id: 6705281 Return-Path: X-Original-To: patchwork-alsa-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id EFA89C05AC for ; Wed, 1 Jul 2015 16:55:48 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 196B520738 for ; Wed, 1 Jul 2015 16:55:48 +0000 (UTC) Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) by mail.kernel.org (Postfix) with ESMTP id 9037C2070A for ; Wed, 1 Jul 2015 16:55:46 +0000 (UTC) Received: by alsa0.perex.cz (Postfix, from userid 1000) id A8691260654; Wed, 1 Jul 2015 18:55:44 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,NO_DNS_FOR_FROM, UNPARSEABLE_RELAY autolearn=no version=3.3.1 Received: from alsa0.perex.cz (localhost [IPv6:::1]) by alsa0.perex.cz (Postfix) with ESMTP id EAC572606F6; Wed, 1 Jul 2015 18:55:34 +0200 (CEST) X-Original-To: alsa-devel@alsa-project.org Delivered-To: alsa-devel@alsa-project.org Received: by alsa0.perex.cz (Postfix, from userid 1000) id F2D65261493; Wed, 1 Jul 2015 18:55:33 +0200 (CEST) Received: from aspen.bobobeach.com (aspen.bobobeach.com [208.79.93.82]) by alsa0.perex.cz (Postfix) with ESMTP id 93376260654 for ; Wed, 1 Jul 2015 18:55:27 +0200 (CEST) Received: from aspen.bobobeach.com (localhost [127.0.0.1]) by aspen.bobobeach.com (Postfix) with ESMTP id 8853910157 for ; Wed, 1 Jul 2015 09:55:29 -0700 (PDT) Received: from [192.168.1.224] (unknown [107.200.10.244]) (using TLSv1 with cipher DHE-RSA-AES128-SHA (128/128 bits)) (Client did not present a certificate) by aspen.bobobeach.com (Postfix) with ESMTPSA id 405E610148 for ; Wed, 1 Jul 2015 09:55:29 -0700 (PDT) To: alsa-devel@alsa-project.org References: <558C4709.3090903@ladisch.de> <1435678893-6757-1-git-send-email-dominic.sacre@gmx.de> From: Cyrus Harmon Message-ID: <55941B6D.7090503@bobobeach.com> Date: Wed, 1 Jul 2015 09:55:09 -0700 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:42.0) Gecko/20100101 Thunderbird/42.0a1 MIME-Version: 1.0 In-Reply-To: X-Virus-Scanned: ClamAV using ClamSMTP Subject: Re: [alsa-devel] [PATCH v2] ALSA: usb-audio: Add MIDI support for Steinberg MI2/MI4 X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: alsa-devel-bounces@alsa-project.org Sender: alsa-devel-bounces@alsa-project.org X-Virus-Scanned: ClamAV using ClamSMTP As long as you're messing around with the quirks table, it would be nice to add support for the UR44. This was discussed on the list a while back and it wasn't clear why the quirk was needed, but it still seems to be needed, at least last I looked. thanks, Cyrus YAMAHA_DEVICE(0x2002, NULL), On 07/01/2015 08:30 AM, Takashi Iwai wrote: > At Tue, 30 Jun 2015 17:41:33 +0200, > Dominic Sacré wrote: >> The Steinberg MI2 and MI4 interfaces are compatible with the USB class >> audio spec, but the MIDI part of the devices is reported as a vendor >> specific interface. >> >> This patch adds entries to quirks-table.h to recognize the MIDI >> endpoints. Audio functionality was already working and is unaffected by >> this change. >> >> Signed-off-by: Dominic Sacré >> Signed-off-by: Albert Huitsing > Applied now with Clemens' ack, and Cc to stable. > > > thanks, > > Takashi > >> --- >> sound/usb/quirks-table.h | 68 ++++++++++++++++++++++++++++++++++++++++++++++++ >> 1 file changed, 68 insertions(+) >> >> diff --git a/sound/usb/quirks-table.h b/sound/usb/quirks-table.h >> index 2f6d3e9..e475665 100644 >> --- a/sound/usb/quirks-table.h >> +++ b/sound/usb/quirks-table.h >> @@ -2512,6 +2512,74 @@ YAMAHA_DEVICE(0x7010, "UB99"), >> } >> }, >> >> +/* Steinberg devices */ >> +{ >> + /* Steinberg MI2 */ >> + USB_DEVICE_VENDOR_SPEC(0x0a4e, 0x2040), >> + .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_STANDARD_INTERFACE >> + }, >> + { >> + .ifnum = 1, >> + .type = QUIRK_AUDIO_STANDARD_INTERFACE >> + }, >> + { >> + .ifnum = 2, >> + .type = QUIRK_AUDIO_STANDARD_INTERFACE >> + }, >> + { >> + .ifnum = 3, >> + .type = QUIRK_MIDI_FIXED_ENDPOINT, >> + .data = &(const struct snd_usb_midi_endpoint_info) { >> + .out_cables = 0x0001, >> + .in_cables = 0x0001 >> + } >> + }, >> + { >> + .ifnum = -1 >> + } >> + } >> + } >> +}, >> +{ >> + /* Steinberg MI4 */ >> + USB_DEVICE_VENDOR_SPEC(0x0a4e, 0x4040), >> + .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_STANDARD_INTERFACE >> + }, >> + { >> + .ifnum = 1, >> + .type = QUIRK_AUDIO_STANDARD_INTERFACE >> + }, >> + { >> + .ifnum = 2, >> + .type = QUIRK_AUDIO_STANDARD_INTERFACE >> + }, >> + { >> + .ifnum = 3, >> + .type = QUIRK_MIDI_FIXED_ENDPOINT, >> + .data = &(const struct snd_usb_midi_endpoint_info) { >> + .out_cables = 0x0001, >> + .in_cables = 0x0001 >> + } >> + }, >> + { >> + .ifnum = -1 >> + } >> + } >> + } >> +}, >> + >> /* TerraTec devices */ >> { >> USB_DEVICE_VENDOR_SPEC(0x0ccd, 0x0012), >> -- >> 2.4.5 >> >> _______________________________________________ >> Alsa-devel mailing list >> Alsa-devel@alsa-project.org >> http://mailman.alsa-project.org/mailman/listinfo/alsa-devel > _______________________________________________ > Alsa-devel mailing list > Alsa-devel@alsa-project.org > http://mailman.alsa-project.org/mailman/listinfo/alsa-devel diff --git a/sound/usb/quirks-table.h b/sound/usb/quirks-table.h index 2f6d3e9..ed7875e 100644 --- a/sound/usb/quirks-table.h +++ b/sound/usb/quirks-table.h @@ -466,6 +466,36 @@ YAMAHA_DEVICE(0x105d, NULL), } } }, +{ + USB_DEVICE(0x0499, 0x150e), + .driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) { + /* .vendor_name = "Yamaha", */ + /* .product_name = "Steinberg UR44", */ + .ifnum = QUIRK_ANY_INTERFACE, + .type = QUIRK_COMPOSITE, + .data = (const struct snd_usb_audio_quirk[]) { + { + .ifnum = 1, + .type = QUIRK_AUDIO_STANDARD_INTERFACE + }, + { + .ifnum = 2, + .type = QUIRK_AUDIO_STANDARD_INTERFACE + }, + { + .ifnum = 3, + .type = QUIRK_MIDI_YAMAHA + }, + { + .ifnum = 4, + .type = QUIRK_IGNORE_INTERFACE + }, + { + .ifnum = -1 + } + } + } +}, YAMAHA_DEVICE(0x2000, "DGP-7"), YAMAHA_DEVICE(0x2001, "DGP-5"),