From: Chris Rorvick <chris@xxxxxxxxxxx>
Define an enum containing the supported devices and associate each entry
in the device table to the respective value.
Signed-off-by: Chris Rorvick <chris@xxxxxxxxxxx>
Reviewed-by: Stefan Hajnoczi <stefanha@xxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
drivers/staging/line6/driver.c | 54 ++++++++++++++++++++++++++++--------------
drivers/staging/line6/driver.h | 21 ++++++++++++++++
2 files changed, 57 insertions(+), 18 deletions(-)
diff --git a/drivers/staging/line6/driver.c b/drivers/staging/line6/driver.c
index a263bce95414..2797e4132cfa 100644
--- a/drivers/staging/line6/driver.c
+++ b/drivers/staging/line6/driver.c
@@ -34,24 +34,42 @@
/* table of devices that work with this driver */
static const struct usb_device_id line6_id_table[] = {
- { LINE6_DEVICE(LINE6_DEVID_BASSPODXT) },
- { LINE6_DEVICE(LINE6_DEVID_BASSPODXTLIVE) },
- { LINE6_DEVICE(LINE6_DEVID_BASSPODXTPRO) },
- { LINE6_DEVICE(LINE6_DEVID_GUITARPORT) },
- { LINE6_DEVICE(LINE6_DEVID_POCKETPOD) },
- { LINE6_DEVICE(LINE6_DEVID_PODHD300) },
- { LINE6_DEVICE(LINE6_DEVID_PODHD400) },
- { LINE6_DEVICE(LINE6_DEVID_PODHD500) },
- { LINE6_DEVICE(LINE6_DEVID_PODSTUDIO_GX) },
- { LINE6_DEVICE(LINE6_DEVID_PODSTUDIO_UX1) },
- { LINE6_DEVICE(LINE6_DEVID_PODSTUDIO_UX2) },
- { LINE6_DEVICE(LINE6_DEVID_PODXT) },
- { LINE6_DEVICE(LINE6_DEVID_PODXTLIVE) },
- { LINE6_DEVICE(LINE6_DEVID_PODXTPRO) },
- { LINE6_DEVICE(LINE6_DEVID_TONEPORT_GX) },
- { LINE6_DEVICE(LINE6_DEVID_TONEPORT_UX1) },
- { LINE6_DEVICE(LINE6_DEVID_TONEPORT_UX2) },
- { LINE6_DEVICE(LINE6_DEVID_VARIAX) },
+ { LINE6_DEVICE(LINE6_DEVID_BASSPODXT),
+ .driver_info = LINE6_BASSPODXT },
+ { LINE6_DEVICE(LINE6_DEVID_BASSPODXTLIVE),
+ .driver_info = LINE6_BASSPODXTLIVE },
+ { LINE6_DEVICE(LINE6_DEVID_BASSPODXTPRO),
+ .driver_info = LINE6_BASSPODXTPRO },
+ { LINE6_DEVICE(LINE6_DEVID_GUITARPORT),
+ .driver_info = LINE6_GUITARPORT },
+ { LINE6_DEVICE(LINE6_DEVID_POCKETPOD),
+ .driver_info = LINE6_POCKETPOD },
+ { LINE6_DEVICE(LINE6_DEVID_PODHD300),
+ .driver_info = LINE6_PODHD300 },
+ { LINE6_DEVICE(LINE6_DEVID_PODHD400),
+ .driver_info = LINE6_PODHD400 },
+ { LINE6_DEVICE(LINE6_DEVID_PODHD500),
+ .driver_info = LINE6_PODHD500 },
+ { LINE6_DEVICE(LINE6_DEVID_PODSTUDIO_GX),
+ .driver_info = LINE6_PODSTUDIO_GX },
+ { LINE6_DEVICE(LINE6_DEVID_PODSTUDIO_UX1),
+ .driver_info = LINE6_PODSTUDIO_UX1 },
+ { LINE6_DEVICE(LINE6_DEVID_PODSTUDIO_UX2),
+ .driver_info = LINE6_PODSTUDIO_UX2 },
+ { LINE6_DEVICE(LINE6_DEVID_PODXT),
+ .driver_info = LINE6_PODXT },
+ { LINE6_DEVICE(LINE6_DEVID_PODXTLIVE),
+ .driver_info = LINE6_PODXTLIVE },
+ { LINE6_DEVICE(LINE6_DEVID_PODXTPRO),
+ .driver_info = LINE6_PODXTPRO },
+ { LINE6_DEVICE(LINE6_DEVID_TONEPORT_GX),
+ .driver_info = LINE6_TONEPORT_GX },
+ { LINE6_DEVICE(LINE6_DEVID_TONEPORT_UX1),
+ .driver_info = LINE6_TONEPORT_UX1 },
+ { LINE6_DEVICE(LINE6_DEVID_TONEPORT_UX2),
+ .driver_info = LINE6_TONEPORT_UX2 },
+ { LINE6_DEVICE(LINE6_DEVID_VARIAX),
+ .driver_info = LINE6_VARIAX },
{}
};
diff --git a/drivers/staging/line6/driver.h b/drivers/staging/line6/driver.h
index 1cc7532257b6..8fb4a9c073b2 100644
--- a/drivers/staging/line6/driver.h
+++ b/drivers/staging/line6/driver.h
@@ -20,6 +20,27 @@
#define DRIVER_NAME "line6usb"
+enum line6_device_type {
+ LINE6_BASSPODXT,
+ LINE6_BASSPODXTLIVE,
+ LINE6_BASSPODXTPRO,
+ LINE6_GUITARPORT,
+ LINE6_POCKETPOD,
+ LINE6_PODHD300,
+ LINE6_PODHD400,
+ LINE6_PODHD500,
+ LINE6_PODSTUDIO_GX,
+ LINE6_PODSTUDIO_UX1,
+ LINE6_PODSTUDIO_UX2,
+ LINE6_PODXT,
+ LINE6_PODXTLIVE,
+ LINE6_PODXTPRO,
+ LINE6_TONEPORT_GX,
+ LINE6_TONEPORT_UX1,
+ LINE6_TONEPORT_UX2,
+ LINE6_VARIAX
+};
+
#define LINE6_TIMEOUT 1
#define LINE6_BUFSIZE_LISTEN 32
#define LINE6_MESSAGE_MAXLEN 256
--
2.2.1
_______________________________________________
devel mailing list
devel@xxxxxxxxxxxxxxxxxxxxxx
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
