| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-Id: <1420868171-2031-14-git-send-email-chris@rorvick.com>
Date: Fri, 9 Jan 2015 23:35:59 -0600
From: Chris Rorvick <chris@...vick.com>
To: Greg Kroah-Hartman <gregkh@...uxfoundation.org>
Cc: Chris Rorvick <chris@...vick.com>,
Alexey Khoroshilov <khoroshilov@...ras.ru>,
Davide Berardi <berardi.dav@...il.com>,
devel@...verdev.osuosl.org,
Fabian Mewes <architekt@...ing4coffee.org>,
Gulsah Kose <gulsah.1004@...il.com>,
Himangi Saraogi <himangi774@...il.com>,
Jerry Snitselaar <dev@...tselaar.org>,
L. Alberto Giménez <agimenez@...valve.es>,
linux-kernel@...r.kernel.org, Mikhail Boiko <mm.boiko@...dex.ru>,
Monam Agarwal <monamagarwal123@...il.com>,
Peter P Waskiewicz Jr <peter.p.waskiewicz.jr@...el.com>,
Stefan Hajnoczi <stefanha@...il.com>,
Takashi Iwai <tiwai@...e.de>
Subject: [PATCH 13/25] staging: line6: Split out PODxt Live interfaces
The PODxt Live device has both a POD and a Variax interface. Add device
type entries for each of these.
Signed-off-by: Chris Rorvick <chris@...vick.com>
---
drivers/staging/line6/driver.c | 112 ++++++++++++++++-------------------------
drivers/staging/line6/driver.h | 8 +--
drivers/staging/line6/pcm.c | 3 +-
drivers/staging/line6/pod.h | 6 ---
4 files changed, 48 insertions(+), 81 deletions(-)
diff --git a/drivers/staging/line6/driver.c b/drivers/staging/line6/driver.c
index 6fecc1b..cb96029 100644
--- a/drivers/staging/line6/driver.c
+++ b/drivers/staging/line6/driver.c
@@ -31,6 +31,7 @@
#define DRIVER_VERSION "0.9.1beta" DRIVER_REVISION
#define LINE6_DEVICE(prod) USB_DEVICE(0x0e41, prod)
+#define LINE6_IF_NUM(prod, n) USB_DEVICE_INTERFACE_NUMBER(0x0e41, prod, n)
/* table of devices that work with this driver */
static const struct usb_device_id line6_id_table[] = {
@@ -46,7 +47,8 @@ static const struct usb_device_id line6_id_table[] = {
{ LINE6_DEVICE(0x4150), .driver_info = LINE6_PODSTUDIO_UX1 },
{ LINE6_DEVICE(0x4151), .driver_info = LINE6_PODSTUDIO_UX2 },
{ LINE6_DEVICE(0x5044), .driver_info = LINE6_PODXT },
- { LINE6_DEVICE(0x4650), .driver_info = LINE6_PODXTLIVE },
+ { LINE6_IF_NUM(0x4650, 0), .driver_info = LINE6_PODXTLIVE_POD },
+ { LINE6_IF_NUM(0x4650, 1), .driver_info = LINE6_PODXTLIVE_VARIAX },
{ LINE6_DEVICE(0x5050), .driver_info = LINE6_PODXTPRO },
{ LINE6_DEVICE(0x4147), .driver_info = LINE6_TONEPORT_GX },
{ LINE6_DEVICE(0x4141), .driver_info = LINE6_TONEPORT_UX1 },
@@ -132,7 +134,14 @@ static const struct line6_properties line6_properties_table[] = {
| LINE6_CAP_PCM
| LINE6_CAP_HWMON,
},
- [LINE6_PODXTLIVE] = {
+ [LINE6_PODXTLIVE_POD] = {
+ .id = "PODxtLive",
+ .name = "PODxt Live",
+ .capabilities = LINE6_CAP_CONTROL
+ | LINE6_CAP_PCM
+ | LINE6_CAP_HWMON,
+ },
+ [LINE6_PODXTLIVE_VARIAX] = {
.id = "PODxtLive",
.name = "PODxt Live",
.capabilities = LINE6_CAP_CONTROL
@@ -445,24 +454,15 @@ static void line6_data_received(struct urb *urb)
case LINE6_PODHD500:
break; /* let userspace handle MIDI */
- case LINE6_PODXTLIVE:
- switch (line6->interface_number) {
- case PODXTLIVE_INTERFACE_POD:
- line6_pod_process_message((struct usb_line6_pod
+ case LINE6_PODXTLIVE_POD:
+ line6_pod_process_message((struct usb_line6_pod
*)line6);
- break;
-
- case PODXTLIVE_INTERFACE_VARIAX:
- line6_variax_process_message((struct
- usb_line6_variax
- *)line6);
- break;
-
- default:
- dev_err(line6->ifcdev,
- "PODxt Live interface %d not supported\n",
- line6->interface_number);
- }
+ break;
+
+ case LINE6_PODXTLIVE_VARIAX:
+ line6_variax_process_message((struct
+ usb_line6_variax
+ *)line6);
break;
case LINE6_VARIAX:
@@ -722,7 +722,8 @@ static int line6_probe(struct usb_interface *interface,
switch (devtype) {
case LINE6_BASSPODXTLIVE:
- case LINE6_PODXTLIVE:
+ case LINE6_PODXTLIVE_POD:
+ case LINE6_PODXTLIVE_VARIAX:
case LINE6_VARIAX:
alternate = 1;
break;
@@ -841,24 +842,16 @@ static int line6_probe(struct usb_interface *interface,
/* these don't have a control channel */
break;
- case LINE6_PODXTLIVE:
- switch (interface_number) {
- case PODXTLIVE_INTERFACE_POD:
- size = sizeof(struct usb_line6_pod);
- ep_read = 0x84;
- ep_write = 0x03;
- break;
-
- case PODXTLIVE_INTERFACE_VARIAX:
- size = sizeof(struct usb_line6_variax);
- ep_read = 0x86;
- ep_write = 0x05;
- break;
+ case LINE6_PODXTLIVE_POD:
+ size = sizeof(struct usb_line6_pod);
+ ep_read = 0x84;
+ ep_write = 0x03;
+ break;
- default:
- ret = -ENODEV;
- goto err_put;
- }
+ case LINE6_PODXTLIVE_VARIAX:
+ size = sizeof(struct usb_line6_variax);
+ ep_read = 0x86;
+ ep_write = 0x05;
break;
case LINE6_VARIAX:
@@ -887,7 +880,6 @@ static int line6_probe(struct usb_interface *interface,
}
/* store basic data: */
- line6->interface_number = interface_number;
line6->properties = properties;
line6->usbdev = usbdev;
line6->ifcdev = &interface->dev;
@@ -967,27 +959,16 @@ static int line6_probe(struct usb_interface *interface,
(struct usb_line6_podhd *)line6);
break;
- case LINE6_PODXTLIVE:
- switch (interface_number) {
- case PODXTLIVE_INTERFACE_POD:
- ret =
- line6_pod_init(interface,
- (struct usb_line6_pod *)line6);
- break;
-
- case PODXTLIVE_INTERFACE_VARIAX:
- ret =
- line6_variax_init(interface,
- (struct usb_line6_variax *)line6);
- break;
-
- default:
- dev_err(&interface->dev,
- "PODxt Live interface %d not supported\n",
- interface_number);
- ret = -ENODEV;
- }
+ case LINE6_PODXTLIVE_POD:
+ ret =
+ line6_pod_init(interface,
+ (struct usb_line6_pod *)line6);
+ break;
+ case LINE6_PODXTLIVE_VARIAX:
+ ret =
+ line6_variax_init(interface,
+ (struct usb_line6_variax *)line6);
break;
case LINE6_VARIAX:
@@ -1084,17 +1065,12 @@ static void line6_disconnect(struct usb_interface *interface)
line6_podhd_disconnect(interface);
break;
- case LINE6_PODXTLIVE:
- switch (interface_number) {
- case PODXTLIVE_INTERFACE_POD:
- line6_pod_disconnect(interface);
- break;
-
- case PODXTLIVE_INTERFACE_VARIAX:
- line6_variax_disconnect(interface);
- break;
- }
+ case LINE6_PODXTLIVE_POD:
+ line6_pod_disconnect(interface);
+ break;
+ case LINE6_PODXTLIVE_VARIAX:
+ line6_variax_disconnect(interface);
break;
case LINE6_VARIAX:
diff --git a/drivers/staging/line6/driver.h b/drivers/staging/line6/driver.h
index c536795..085aa44 100644
--- a/drivers/staging/line6/driver.h
+++ b/drivers/staging/line6/driver.h
@@ -33,7 +33,8 @@ enum line6_device_type {
LINE6_PODSTUDIO_UX1,
LINE6_PODSTUDIO_UX2,
LINE6_PODXT,
- LINE6_PODXTLIVE,
+ LINE6_PODXTLIVE_POD,
+ LINE6_PODXTLIVE_VARIAX,
LINE6_PODXTPRO,
LINE6_TONEPORT_GX,
LINE6_TONEPORT_UX1,
@@ -136,11 +137,6 @@ struct usb_line6 {
const struct line6_properties *properties;
/**
- Interface number.
- */
- int interface_number;
-
- /**
Interval (ms).
*/
int interval;
diff --git a/drivers/staging/line6/pcm.c b/drivers/staging/line6/pcm.c
index e09772f..d09d1ea 100644
--- a/drivers/staging/line6/pcm.c
+++ b/drivers/staging/line6/pcm.c
@@ -433,7 +433,8 @@ int line6_init_pcm(struct usb_line6 *line6,
case LINE6_BASSPODXTLIVE:
case LINE6_BASSPODXTPRO:
case LINE6_PODXT:
- case LINE6_PODXTLIVE:
+ case LINE6_PODXTLIVE_POD:
+ case LINE6_PODXTLIVE_VARIAX:
case LINE6_PODXTPRO:
case LINE6_PODHD300:
case LINE6_PODHD400:
diff --git a/drivers/staging/line6/pod.h b/drivers/staging/line6/pod.h
index 397d94c..91fd4c5 100644
--- a/drivers/staging/line6/pod.h
+++ b/drivers/staging/line6/pod.h
@@ -21,12 +21,6 @@
#include "driver.h"
/*
- PODxt Live interfaces
-*/
-#define PODXTLIVE_INTERFACE_POD 0
-#define PODXTLIVE_INTERFACE_VARIAX 1
-
-/*
Locate name in binary program dump
*/
#define POD_NAME_OFFSET 0
--
2.1.0
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists