diff options
author | Greg Kroah-Hartman <gregkh@suse.de> | 2010-10-28 09:44:56 -0700 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-10-28 09:44:56 -0700 |
commit | e4c5bf8e3dca827a1b3a6fac494eae8c74b7e1e7 (patch) | |
tree | ea51b391f7d74ca695dcb9f5e46eb02688a92ed9 /drivers/staging/line6/usbdefs.h | |
parent | 81280572ca6f54009edfa4deee563e8678784218 (diff) | |
parent | a4ac0d847af9dd34d5953a5e264400326144b6b2 (diff) | |
download | kernel_samsung_smdk4412-e4c5bf8e3dca827a1b3a6fac494eae8c74b7e1e7.zip kernel_samsung_smdk4412-e4c5bf8e3dca827a1b3a6fac494eae8c74b7e1e7.tar.gz kernel_samsung_smdk4412-e4c5bf8e3dca827a1b3a6fac494eae8c74b7e1e7.tar.bz2 |
Merge 'staging-next' to Linus's tree
This merges the staging-next tree to Linus's tree and resolves
some conflicts that were present due to changes in other trees that were
affected by files here.
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/line6/usbdefs.h')
-rw-r--r-- | drivers/staging/line6/usbdefs.h | 44 |
1 files changed, 27 insertions, 17 deletions
diff --git a/drivers/staging/line6/usbdefs.h b/drivers/staging/line6/usbdefs.h index c38f31f..c6dffe6 100644 --- a/drivers/staging/line6/usbdefs.h +++ b/drivers/staging/line6/usbdefs.h @@ -1,5 +1,5 @@ /* - * Line6 Linux USB driver - 0.8.0 + * Line6 Linux USB driver - 0.9.1beta * * Copyright (C) 2005-2008 Markus Grabner (grabner@icg.tugraz.at) * @@ -12,7 +12,6 @@ #ifndef USBDEFS_H #define USBDEFS_H - #define LINE6_VENDOR_ID 0x0e41 #define USB_INTERVALS_PER_SECOND 1000 @@ -25,6 +24,9 @@ #define LINE6_DEVID_BASSPODXTPRO 0x4252 #define LINE6_DEVID_GUITARPORT 0x4750 #define LINE6_DEVID_POCKETPOD 0x5051 +#define LINE6_DEVID_PODSTUDIO_GX 0x4153 +#define LINE6_DEVID_PODSTUDIO_UX1 0x4150 +#define LINE6_DEVID_PODSTUDIO_UX2 0x4151 #define LINE6_DEVID_PODX3 0x414a #define LINE6_DEVID_PODX3LIVE 0x414b #define LINE6_DEVID_PODXT 0x5044 @@ -35,20 +37,23 @@ #define LINE6_DEVID_TONEPORT_UX2 0x4142 #define LINE6_DEVID_VARIAX 0x534d -#define LINE6_BIT_BASSPODXT (1 << 0) -#define LINE6_BIT_BASSPODXTLIVE (1 << 1) -#define LINE6_BIT_BASSPODXTPRO (1 << 2) -#define LINE6_BIT_GUITARPORT (1 << 3) -#define LINE6_BIT_POCKETPOD (1 << 4) -#define LINE6_BIT_PODX3 (1 << 5) -#define LINE6_BIT_PODX3LIVE (1 << 6) -#define LINE6_BIT_PODXT (1 << 7) -#define LINE6_BIT_PODXTLIVE (1 << 8) -#define LINE6_BIT_PODXTPRO (1 << 9) -#define LINE6_BIT_TONEPORT_GX (1 << 10) -#define LINE6_BIT_TONEPORT_UX1 (1 << 11) -#define LINE6_BIT_TONEPORT_UX2 (1 << 12) -#define LINE6_BIT_VARIAX (1 << 13) +#define LINE6_BIT_BASSPODXT (1 << 0) +#define LINE6_BIT_BASSPODXTLIVE (1 << 1) +#define LINE6_BIT_BASSPODXTPRO (1 << 2) +#define LINE6_BIT_GUITARPORT (1 << 3) +#define LINE6_BIT_POCKETPOD (1 << 4) +#define LINE6_BIT_PODSTUDIO_GX (1 << 5) +#define LINE6_BIT_PODSTUDIO_UX1 (1 << 6) +#define LINE6_BIT_PODSTUDIO_UX2 (1 << 7) +#define LINE6_BIT_PODX3 (1 << 8) +#define LINE6_BIT_PODX3LIVE (1 << 9) +#define LINE6_BIT_PODXT (1 << 10) +#define LINE6_BIT_PODXTLIVE (1 << 11) +#define LINE6_BIT_PODXTPRO (1 << 12) +#define LINE6_BIT_TONEPORT_GX (1 << 13) +#define LINE6_BIT_TONEPORT_UX1 (1 << 14) +#define LINE6_BIT_TONEPORT_UX2 (1 << 15) +#define LINE6_BIT_VARIAX (1 << 16) #define LINE6_BITS_PRO (LINE6_BIT_BASSPODXTPRO | \ LINE6_BIT_PODXTPRO) @@ -66,7 +71,12 @@ #define LINE6_BIT_CONTROL (1 << 0) /* device supports PCM input/output via USB */ #define LINE6_BIT_PCM (1 << 1) -#define LINE6_BIT_CONTROL_PCM (LINE6_BIT_CONTROL | LINE6_BIT_PCM) +/* device support hardware monitoring */ +#define LINE6_BIT_HWMON (1 << 2) + +#define LINE6_BIT_CONTROL_PCM_HWMON (LINE6_BIT_CONTROL | \ + LINE6_BIT_PCM | \ + LINE6_BIT_HWMON) #define LINE6_FALLBACK_INTERVAL 10 #define LINE6_FALLBACK_MAXPACKETSIZE 16 |