diff options
| author | Markus Grabner | 2010-08-23 01:08:25 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2010-09-01 00:28:16 +0200 |
| commit | e1a164d7a3e05aae15eb603ee8f1b77446480a3b (patch) | |
| tree | 829d6ed586e9fe3680be24faab8c61d5c596443e /drivers/staging/line6/pod.h | |
| parent | staging: line6: sync with upstream (diff) | |
| download | kernel-qcow2-linux-e1a164d7a3e05aae15eb603ee8f1b77446480a3b.tar.gz kernel-qcow2-linux-e1a164d7a3e05aae15eb603ee8f1b77446480a3b.tar.xz kernel-qcow2-linux-e1a164d7a3e05aae15eb603ee8f1b77446480a3b.zip | |
Staging: line6: another upstream sync
Everything should be in sync now.
Signed-off-by: Markus Grabner <grabner@icg.tugraz.at>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/line6/pod.h')
| -rw-r--r-- | drivers/staging/line6/pod.h | 23 |
1 files changed, 16 insertions, 7 deletions
diff --git a/drivers/staging/line6/pod.h b/drivers/staging/line6/pod.h index d8e38a95d076..18b9d08c3288 100644 --- a/drivers/staging/line6/pod.h +++ b/drivers/staging/line6/pod.h @@ -1,5 +1,5 @@ /* - * Line6 Linux USB driver - 0.9.0 + * Line6 Linux USB driver - 0.9.1beta * * Copyright (C) 2004-2010 Markus Grabner (grabner@icg.tugraz.at) * @@ -12,7 +12,6 @@ #ifndef POD_H #define POD_H - #include <linux/interrupt.h> #include <linux/spinlock.h> #include <linux/usb.h> @@ -23,7 +22,6 @@ #include "driver.h" #include "dumprequest.h" - /* PODxt Live interfaces */ @@ -41,7 +39,19 @@ */ #define POD_CONTROL_SIZE 0x80 #define POD_BUFSIZE_DUMPREQ 7 -#define POD_STARTUP_DELAY 3000 +#define POD_STARTUP_DELAY 1000 + +/* + Stages of POD startup procedure +*/ +enum { + POD_STARTUP_INIT = 1, + POD_STARTUP_DUMPREQ, + POD_STARTUP_VERSIONREQ, + POD_STARTUP_WORKQUEUE, + POD_STARTUP_SETUP, + POD_STARTUP_LAST = POD_STARTUP_SETUP - 1 +}; /** Data structure for values that need to be requested explicitly. @@ -183,14 +193,13 @@ struct usb_line6_pod { char midi_postprocess; }; - extern void line6_pod_disconnect(struct usb_interface *interface); -extern int line6_pod_init(struct usb_interface *interface, struct usb_line6_pod *pod); +extern int line6_pod_init(struct usb_interface *interface, + struct usb_line6_pod *pod); extern void line6_pod_midi_postprocess(struct usb_line6_pod *pod, unsigned char *data, int length); extern void line6_pod_process_message(struct usb_line6_pod *pod); extern void line6_pod_transmit_parameter(struct usb_line6_pod *pod, int param, int value); - #endif |