p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

staging: line6: Define a device type enum 

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@rorvick.com>
Reviewed-by: Stefan Hajnoczi <stefanha@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Chris Rorvick 2015-01-12 12:42:40 -08:00 committed by Takashi Iwai
parent daf54a59f3
commit 410dca8d99
2 changed files with 57 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
drivers/staging/line6/driver.c
View File

@ -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 },
{}
};

21
drivers/staging/line6/driver.h
View File

@ -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