evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

staging: line6: List out capabilities individually

Browse source 
The `LINE6_CAP_CTRL_PCM_HW' macro combines three capabilities to save
horizontal space when defining the properties entries.  Now that these
are no longer limited to single lines this is not such a concern.
Specify capabilities individually when defining each property for
better clarity.

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:47 -08:00 • committed by Takashi Iwai
parent 4d947546c3
commit 7b3e4d47ca
2 changed files with 36 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
drivers/staging/line6/driver.c
View file

@ -61,17 +61,23 @@ static const struct line6_properties line6_properties_table[] = {
[LINE6_BASSPODXT] = { [LINE6_BASSPODXT] = {
.id = "BassPODxt", .id = "BassPODxt",
.name = "BassPODxt", .name = "BassPODxt",
.capabilities = LINE6_CAP_CTRL_PCM_HW, .capabilities = LINE6_CAP_CONTROL
| LINE6_CAP_PCM
| LINE6_CAP_HWMON,
}, },
[LINE6_BASSPODXTLIVE] = { [LINE6_BASSPODXTLIVE] = {
.id = "BassPODxtLive", .id = "BassPODxtLive",
.name = "BassPODxt Live", .name = "BassPODxt Live",
.capabilities = LINE6_CAP_CTRL_PCM_HW, .capabilities = LINE6_CAP_CONTROL
| LINE6_CAP_PCM
| LINE6_CAP_HWMON,
}, },
[LINE6_BASSPODXTPRO] = { [LINE6_BASSPODXTPRO] = {
.id = "BassPODxtPro", .id = "BassPODxtPro",
.name = "BassPODxt Pro", .name = "BassPODxt Pro",
.capabilities = LINE6_CAP_CTRL_PCM_HW, .capabilities = LINE6_CAP_CONTROL
| LINE6_CAP_PCM
| LINE6_CAP_HWMON,
}, },
[LINE6_GUITARPORT] = { [LINE6_GUITARPORT] = {
.id = "GuitarPort", .id = "GuitarPort",
@ -86,17 +92,23 @@ static const struct line6_properties line6_properties_table[] = {
[LINE6_PODHD300] = { [LINE6_PODHD300] = {
.id = "PODHD300", .id = "PODHD300",
.name = "POD HD300", .name = "POD HD300",
.capabilities = LINE6_CAP_CTRL_PCM_HW, .capabilities = LINE6_CAP_CONTROL
| LINE6_CAP_PCM
| LINE6_CAP_HWMON,
}, },
[LINE6_PODHD400] = { [LINE6_PODHD400] = {
.id = "PODHD400", .id = "PODHD400",
.name = "POD HD400", .name = "POD HD400",
.capabilities = LINE6_CAP_CTRL_PCM_HW, .capabilities = LINE6_CAP_CONTROL
| LINE6_CAP_PCM
| LINE6_CAP_HWMON,
}, },
[LINE6_PODHD500] = { [LINE6_PODHD500] = {
.id = "PODHD500", .id = "PODHD500",
.name = "POD HD500", .name = "POD HD500",
.capabilities = LINE6_CAP_CTRL_PCM_HW, .capabilities = LINE6_CAP_CONTROL
| LINE6_CAP_PCM
| LINE6_CAP_HWMON,
}, },
[LINE6_PODSTUDIO_GX] = { [LINE6_PODSTUDIO_GX] = {
.id = "PODStudioGX", .id = "PODStudioGX",
@ -116,17 +128,23 @@ static const struct line6_properties line6_properties_table[] = {
[LINE6_PODXT] = { [LINE6_PODXT] = {
.id = "PODxt", .id = "PODxt",
.name = "PODxt", .name = "PODxt",
.capabilities = LINE6_CAP_CTRL_PCM_HW, .capabilities = LINE6_CAP_CONTROL
| LINE6_CAP_PCM
| LINE6_CAP_HWMON,
}, },
[LINE6_PODXTLIVE] = { [LINE6_PODXTLIVE] = {
.id = "PODxtLive", .id = "PODxtLive",
.name = "PODxt Live", .name = "PODxt Live",
.capabilities = LINE6_CAP_CTRL_PCM_HW, .capabilities = LINE6_CAP_CONTROL
| LINE6_CAP_PCM
| LINE6_CAP_HWMON,
}, },
[LINE6_PODXTPRO] = { [LINE6_PODXTPRO] = {
.id = "PODxtPro", .id = "PODxtPro",
.name = "PODxt Pro", .name = "PODxt Pro",
.capabilities = LINE6_CAP_CTRL_PCM_HW, .capabilities = LINE6_CAP_CONTROL
| LINE6_CAP_PCM
| LINE6_CAP_HWMON,
}, },
[LINE6_TONEPORT_GX] = { [LINE6_TONEPORT_GX] = {
.id = "TonePortGX", .id = "TonePortGX",

4
drivers/staging/line6/usbdefs.h
View file

@ -21,10 +21,6 @@
/* device support hardware monitoring */ /* device support hardware monitoring */
#define LINE6_CAP_HWMON (1 << 2) #define LINE6_CAP_HWMON (1 << 2)
#define LINE6_CAP_CTRL_PCM_HW (LINE6_CAP_CONTROL | \
LINE6_CAP_PCM | \
LINE6_CAP_HWMON)
#define LINE6_FALLBACK_INTERVAL 10 #define LINE6_FALLBACK_INTERVAL 10
#define LINE6_FALLBACK_MAXPACKETSIZE 16 #define LINE6_FALLBACK_MAXPACKETSIZE 16