From: Chris Rorvick <chris@rorvick.com>
To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: "Chris Rorvick" <chris@rorvick.com>,
"Alexey Khoroshilov" <khoroshilov@ispras.ru>,
"Davide Berardi" <berardi.dav@gmail.com>,
devel@driverdev.osuosl.org,
"Fabian Mewes" <architekt@coding4coffee.org>,
"Gulsah Kose" <gulsah.1004@gmail.com>,
"Himangi Saraogi" <himangi774@gmail.com>,
"Jerry Snitselaar" <dev@snitselaar.org>,
"L. Alberto Giménez" <agimenez@sysvalve.es>,
linux-kernel@vger.kernel.org,
"Mikhail Boiko" <mm.boiko@yandex.ru>,
"Monam Agarwal" <monamagarwal123@gmail.com>,
"Peter P Waskiewicz Jr" <peter.p.waskiewicz.jr@intel.com>,
"Stefan Hajnoczi" <stefanha@gmail.com>,
"Takashi Iwai" <tiwai@suse.de>
Subject: [PATCH 14/25] staging: line6: Split out POD HD500 interfaces
Date: Fri, 9 Jan 2015 23:36:00 -0600 [thread overview]
Message-ID: <1420868171-2031-15-git-send-email-chris@rorvick.com> (raw)
In-Reply-To: <1420868171-2031-1-git-send-email-chris@rorvick.com>
The driver uses a different altsetting depending on the interface. Add
device type entries for each of these.
Signed-off-by: Chris Rorvick <chris@rorvick.com>
---
drivers/staging/line6/driver.c | 41 ++++++++++++++++++++++++-----------------
drivers/staging/line6/driver.h | 3 ++-
drivers/staging/line6/pcm.c | 3 ++-
3 files changed, 28 insertions(+), 19 deletions(-)
diff --git a/drivers/staging/line6/driver.c b/drivers/staging/line6/driver.c
index cb96029..e97e2cb 100644
--- a/drivers/staging/line6/driver.c
+++ b/drivers/staging/line6/driver.c
@@ -42,7 +42,8 @@ static const struct usb_device_id line6_id_table[] = {
{ LINE6_DEVICE(0x5051), .driver_info = LINE6_POCKETPOD },
{ LINE6_DEVICE(0x5057), .driver_info = LINE6_PODHD300 },
{ LINE6_DEVICE(0x5058), .driver_info = LINE6_PODHD400 },
- { LINE6_DEVICE(0x414D), .driver_info = LINE6_PODHD500 },
+ { LINE6_IF_NUM(0x414D, 0), .driver_info = LINE6_PODHD500_0 },
+ { LINE6_IF_NUM(0x414D, 1), .driver_info = LINE6_PODHD500_1 },
{ LINE6_DEVICE(0x4153), .driver_info = LINE6_PODSTUDIO_GX },
{ LINE6_DEVICE(0x4150), .driver_info = LINE6_PODSTUDIO_UX1 },
{ LINE6_DEVICE(0x4151), .driver_info = LINE6_PODSTUDIO_UX2 },
@@ -105,7 +106,14 @@ static const struct line6_properties line6_properties_table[] = {
| LINE6_CAP_PCM
| LINE6_CAP_HWMON,
},
- [LINE6_PODHD500] = {
+ [LINE6_PODHD500_0] = {
+ .id = "PODHD500",
+ .name = "POD HD500",
+ .capabilities = LINE6_CAP_CONTROL
+ | LINE6_CAP_PCM
+ | LINE6_CAP_HWMON,
+ },
+ [LINE6_PODHD500_1] = {
.id = "PODHD500",
.name = "POD HD500",
.capabilities = LINE6_CAP_CONTROL
@@ -451,7 +459,8 @@ static void line6_data_received(struct urb *urb)
case LINE6_PODHD300:
case LINE6_PODHD400:
- case LINE6_PODHD500:
+ case LINE6_PODHD500_0:
+ case LINE6_PODHD500_1:
break; /* let userspace handle MIDI */
case LINE6_PODXTLIVE_POD:
@@ -740,17 +749,12 @@ static int line6_probe(struct usb_interface *interface,
}
break;
- case LINE6_PODHD500:
- switch (interface_number) {
- case 0:
- alternate = 1;
- break;
- case 1:
- alternate = 0;
- break;
- default:
- MISSING_CASE;
- }
+ case LINE6_PODHD500_0:
+ alternate = 1;
+ break;
+
+ case LINE6_PODHD500_1:
+ alternate = 0;
break;
case LINE6_BASSPODXT:
@@ -819,7 +823,8 @@ static int line6_probe(struct usb_interface *interface,
ep_write = 0x03;
break;
- case LINE6_PODHD500:
+ case LINE6_PODHD500_0:
+ case LINE6_PODHD500_1:
size = sizeof(struct usb_line6_podhd);
ep_read = 0x81;
ep_write = 0x01;
@@ -954,7 +959,8 @@ static int line6_probe(struct usb_interface *interface,
case LINE6_PODHD300:
case LINE6_PODHD400:
- case LINE6_PODHD500:
+ case LINE6_PODHD500_0:
+ case LINE6_PODHD500_1:
ret = line6_podhd_init(interface,
(struct usb_line6_podhd *)line6);
break;
@@ -1061,7 +1067,8 @@ static void line6_disconnect(struct usb_interface *interface)
case LINE6_PODHD300:
case LINE6_PODHD400:
- case LINE6_PODHD500:
+ case LINE6_PODHD500_0:
+ case LINE6_PODHD500_1:
line6_podhd_disconnect(interface);
break;
diff --git a/drivers/staging/line6/driver.h b/drivers/staging/line6/driver.h
index 085aa44..9d6b351 100644
--- a/drivers/staging/line6/driver.h
+++ b/drivers/staging/line6/driver.h
@@ -28,7 +28,8 @@ enum line6_device_type {
LINE6_POCKETPOD,
LINE6_PODHD300,
LINE6_PODHD400,
- LINE6_PODHD500,
+ LINE6_PODHD500_0,
+ LINE6_PODHD500_1,
LINE6_PODSTUDIO_GX,
LINE6_PODSTUDIO_UX1,
LINE6_PODSTUDIO_UX2,
diff --git a/drivers/staging/line6/pcm.c b/drivers/staging/line6/pcm.c
index d09d1ea..d8450af 100644
--- a/drivers/staging/line6/pcm.c
+++ b/drivers/staging/line6/pcm.c
@@ -442,7 +442,8 @@ int line6_init_pcm(struct usb_line6 *line6,
ep_write = 0x01;
break;
- case LINE6_PODHD500:
+ case LINE6_PODHD500_0:
+ case LINE6_PODHD500_1:
ep_read = 0x86;
ep_write = 0x02;
break;
--
2.1.0
next prev parent reply other threads:[~2015-01-10 5:39 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-01-10 5:35 [PATCH 00/25] line6usb cleanup Chris Rorvick
2015-01-10 5:35 ` [PATCH 01/25] staging: line6: Remove `device_bit' from properties Chris Rorvick
2015-01-10 5:35 ` [PATCH 02/25] staging: line6: Remove line6_pod_transmit_paramter() Chris Rorvick
2015-01-10 5:35 ` [PATCH 03/25] staging: line6: Remove unsupported X3 devices Chris Rorvick
2015-01-10 5:35 ` [PATCH 04/25] staging: line6: Cleanup device table Chris Rorvick
2015-01-10 5:35 ` [PATCH 05/25] staging: line6: Define a device type enum Chris Rorvick
2015-01-10 5:35 ` [PATCH 06/25] staging: line6: Index properties array with device type Chris Rorvick
2015-01-10 5:35 ` [PATCH 07/25] staging: line6: Key off of " Chris Rorvick
2015-01-10 5:35 ` [PATCH 08/25] staging: line6: Remove idVendor and idProduct macros Chris Rorvick
2015-01-10 5:35 ` [PATCH 09/25] staging: line6: Remove useless comments Chris Rorvick
2015-01-10 5:35 ` [PATCH 10/25] staging: line6: Rename capability macros Chris Rorvick
2015-01-10 5:35 ` [PATCH 11/25] staging: line6: Use explicit indexes when defining properties Chris Rorvick
2015-01-10 5:35 ` [PATCH 12/25] staging: line6: List out capabilities individually Chris Rorvick
2015-01-10 5:35 ` [PATCH 13/25] staging: line6: Split out PODxt Live interfaces Chris Rorvick
2015-01-10 5:36 ` Chris Rorvick [this message]
2015-01-10 5:36 ` [PATCH 15/25] staging: line6: Filter on Pocket POD interface Chris Rorvick
2015-01-10 5:36 ` [PATCH 16/25] staging: line6: Filter on UX2 interfaces Chris Rorvick
2015-01-10 5:36 ` [PATCH 17/25] staging: line6: Move altsetting to properties Chris Rorvick
2015-01-10 5:36 ` [PATCH 18/25] staging: line6: Move control endpoints " Chris Rorvick
2015-01-10 5:36 ` [PATCH 19/25] staging: line6: Remove stale Pocket POD PCM endpoints Chris Rorvick
2015-01-10 5:36 ` [PATCH 20/25] staging: line6: Move audio endpoints to properties Chris Rorvick
2015-01-10 5:36 ` [PATCH 21/25] staging: line6: Pass *_init() `usb_line6' pointers Chris Rorvick
2015-01-10 5:36 ` [PATCH 22/25] staging: line6: Pass *_process_message() " Chris Rorvick
2015-01-10 5:36 ` [PATCH 23/25] staging: line6: Call *_process_message() via pointer Chris Rorvick
2015-01-10 5:36 ` [PATCH 24/25] staging: line6: Call *_disconnect() " Chris Rorvick
2015-01-10 5:36 ` [PATCH 25/25] staging: line6: Make *_disconnect() functions static Chris Rorvick
2015-01-10 8:48 ` [PATCH 00/25] line6usb cleanup Stefan Hajnoczi
[not found] ` <s5h8uh94nce.wl-tiwai@suse.de>
2015-01-11 11:26 ` Stefan Hajnoczi
2015-01-11 21:04 ` Chris Rorvick
[not found] ` <s5hh9vwj6tm.wl-tiwai@suse.de>
2015-01-12 19:52 ` Greg Kroah-Hartman
2015-01-12 9:23 ` Dan Carpenter
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1420868171-2031-15-git-send-email-chris@rorvick.com \
--to=chris@rorvick.com \
--cc=agimenez@sysvalve.es \
--cc=architekt@coding4coffee.org \
--cc=berardi.dav@gmail.com \
--cc=dev@snitselaar.org \
--cc=devel@driverdev.osuosl.org \
--cc=gregkh@linuxfoundation.org \
--cc=gulsah.1004@gmail.com \
--cc=himangi774@gmail.com \
--cc=khoroshilov@ispras.ru \
--cc=linux-kernel@vger.kernel.org \
--cc=mm.boiko@yandex.ru \
--cc=monamagarwal123@gmail.com \
--cc=peter.p.waskiewicz.jr@intel.com \
--cc=stefanha@gmail.com \
--cc=tiwai@suse.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Powered by JetHome