diff options
author | Greg Kroah-Hartman <gregkh@suse.de> | 2009-02-28 00:09:55 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-04-03 17:54:25 -0400 |
commit | a49e483835823ab97028f396531d83b6668734cf (patch) | |
tree | 91a426aeb1a6201bf2163e9f175093a128b5b05f | |
parent | 536165d8ef6933131bf7166338eafa77b75f8bb7 (diff) |
Staging: line6: coding style cleanups for .h files.
Mostly all line length issues.
Skipped the control.h file as it makes sense to leave it alone.
Cc: Markus Grabner <grabner@icg.tugraz.at>
Cc: Mariusz Kozlowski <m.kozlowski@tuxland.pl>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r-- | drivers/staging/line6/capture.h | 3 | ||||
-rw-r--r-- | drivers/staging/line6/config.h | 3 | ||||
-rw-r--r-- | drivers/staging/line6/driver.h | 48 | ||||
-rw-r--r-- | drivers/staging/line6/dumprequest.h | 11 | ||||
-rw-r--r-- | drivers/staging/line6/midi.h | 6 | ||||
-rw-r--r-- | drivers/staging/line6/midibuf.h | 6 | ||||
-rw-r--r-- | drivers/staging/line6/pcm.h | 44 | ||||
-rw-r--r-- | drivers/staging/line6/playback.h | 3 | ||||
-rw-r--r-- | drivers/staging/line6/pod.h | 9 | ||||
-rw-r--r-- | drivers/staging/line6/toneport.h | 3 | ||||
-rw-r--r-- | drivers/staging/line6/usbdefs.h | 27 | ||||
-rw-r--r-- | drivers/staging/line6/variax.h | 3 |
12 files changed, 108 insertions, 58 deletions
diff --git a/drivers/staging/line6/capture.h b/drivers/staging/line6/capture.h index 7b92e4de392..5c44464d29d 100644 --- a/drivers/staging/line6/capture.h +++ b/drivers/staging/line6/capture.h | |||
@@ -24,7 +24,8 @@ extern struct snd_pcm_ops snd_line6_capture_ops; | |||
24 | 24 | ||
25 | 25 | ||
26 | extern int create_audio_in_urbs(struct snd_line6_pcm *line6pcm); | 26 | extern int create_audio_in_urbs(struct snd_line6_pcm *line6pcm); |
27 | extern int snd_line6_capture_trigger(struct snd_pcm_substream *substream, int cmd); | 27 | extern int snd_line6_capture_trigger(struct snd_pcm_substream *substream, |
28 | int cmd); | ||
28 | extern void unlink_wait_clear_audio_in_urbs(struct snd_line6_pcm *line6pcm); | 29 | extern void unlink_wait_clear_audio_in_urbs(struct snd_line6_pcm *line6pcm); |
29 | 30 | ||
30 | 31 | ||
diff --git a/drivers/staging/line6/config.h b/drivers/staging/line6/config.h index 8cefdbac9d2..adad130c5dc 100644 --- a/drivers/staging/line6/config.h +++ b/drivers/staging/line6/config.h | |||
@@ -34,7 +34,8 @@ | |||
34 | #define CREATE_RAW_FILE 0 | 34 | #define CREATE_RAW_FILE 0 |
35 | 35 | ||
36 | #if DO_DEBUG_MESSAGES | 36 | #if DO_DEBUG_MESSAGES |
37 | #define CHECKPOINT printk("line6usb: %s (%s:%d)\n", __FUNCTION__, __FILE__, __LINE__) | 37 | #define CHECKPOINT printk(KERN_INFO "line6usb: %s (%s:%d)\n", \ |
38 | __func__, __FILE__, __LINE__) | ||
38 | #endif | 39 | #endif |
39 | 40 | ||
40 | #if DO_DEBUG_MESSAGES | 41 | #if DO_DEBUG_MESSAGES |
diff --git a/drivers/staging/line6/driver.h b/drivers/staging/line6/driver.h index 20966534259..9908bfa6afa 100644 --- a/drivers/staging/line6/driver.h +++ b/drivers/staging/line6/driver.h | |||
@@ -55,10 +55,17 @@ | |||
55 | #define LINE6_CHANNEL_MASK 0x0f | 55 | #define LINE6_CHANNEL_MASK 0x0f |
56 | 56 | ||
57 | 57 | ||
58 | #define MISSING_CASE printk("line6usb driver bug: missing case in %s:%d\n", __FILE__, __LINE__) | 58 | #define MISSING_CASE \ |
59 | printk(KERN_ERR "line6usb driver bug: missing case in %s:%d\n", \ | ||
60 | __FILE__, __LINE__) | ||
59 | 61 | ||
60 | 62 | ||
61 | #define CHECK_RETURN(x) if((err = x) < 0) return err | 63 | #define CHECK_RETURN(x) \ |
64 | do { \ | ||
65 | err = x; \ | ||
66 | if (err < 0) \ | ||
67 | return err; \ | ||
68 | } while (0) | ||
62 | 69 | ||
63 | 70 | ||
64 | extern const unsigned char line6_midi_id[3]; | 71 | extern const unsigned char line6_midi_id[3]; |
@@ -166,19 +173,32 @@ struct usb_line6 { | |||
166 | }; | 173 | }; |
167 | 174 | ||
168 | 175 | ||
169 | extern char *line6_alloc_sysex_buffer(struct usb_line6 *line6, int code1, int code2, int size); | 176 | extern char *line6_alloc_sysex_buffer(struct usb_line6 *line6, int code1, |
170 | extern ssize_t line6_nop_read(struct device *dev, struct device_attribute *attr, char *buf); | 177 | int code2, int size); |
171 | extern ssize_t line6_nop_write(struct device *dev, struct device_attribute *attr, const char *buf, size_t count); | 178 | extern ssize_t line6_nop_read(struct device *dev, |
172 | extern int line6_read_data(struct usb_line6 *line6, int address, void *data, size_t datalen); | 179 | struct device_attribute *attr, char *buf); |
173 | extern int line6_read_serial_number(struct usb_line6 *line6, int *serial_number); | 180 | extern ssize_t line6_nop_write(struct device *dev, |
181 | struct device_attribute *attr, | ||
182 | const char *buf, size_t count); | ||
183 | extern int line6_read_data(struct usb_line6 *line6, int address, void *data, | ||
184 | size_t datalen); | ||
185 | extern int line6_read_serial_number(struct usb_line6 *line6, | ||
186 | int *serial_number); | ||
174 | extern int line6_send_program(struct usb_line6 *line6, int value); | 187 | extern int line6_send_program(struct usb_line6 *line6, int value); |
175 | extern int line6_send_raw_message(struct usb_line6 *line6, const char *buffer, int size); | 188 | extern int line6_send_raw_message(struct usb_line6 *line6, const char *buffer, |
176 | extern int line6_send_raw_message_async(struct usb_line6 *line6, const char *buffer, int size); | 189 | int size); |
177 | extern int line6_send_sysex_message(struct usb_line6 *line6, const char *buffer, int size); | 190 | extern int line6_send_raw_message_async(struct usb_line6 *line6, |
178 | extern ssize_t line6_set_raw(struct device *dev, struct device_attribute *attr, const char *buf, size_t count); | 191 | const char *buffer, int size); |
179 | extern int line6_transmit_parameter(struct usb_line6 *line6, int param, int value); | 192 | extern int line6_send_sysex_message(struct usb_line6 *line6, |
180 | extern int line6_write_data(struct usb_line6 *line6, int address, void *data, size_t datalen); | 193 | const char *buffer, int size); |
181 | extern void line6_write_hexdump(struct usb_line6 *line6, char dir, const unsigned char *buffer, int size); | 194 | extern ssize_t line6_set_raw(struct device *dev, struct device_attribute *attr, |
195 | const char *buf, size_t count); | ||
196 | extern int line6_transmit_parameter(struct usb_line6 *line6, int param, | ||
197 | int value); | ||
198 | extern int line6_write_data(struct usb_line6 *line6, int address, void *data, | ||
199 | size_t datalen); | ||
200 | extern void line6_write_hexdump(struct usb_line6 *line6, char dir, | ||
201 | const unsigned char *buffer, int size); | ||
182 | 202 | ||
183 | 203 | ||
184 | #endif | 204 | #endif |
diff --git a/drivers/staging/line6/dumprequest.h b/drivers/staging/line6/dumprequest.h index e0b38bbc1ad..1975d54b3c2 100644 --- a/drivers/staging/line6/dumprequest.h +++ b/drivers/staging/line6/dumprequest.h | |||
@@ -72,15 +72,18 @@ struct line6_dump_request { | |||
72 | }; | 72 | }; |
73 | 73 | ||
74 | extern void line6_dump_finished(struct line6_dump_request *l6dr); | 74 | extern void line6_dump_finished(struct line6_dump_request *l6dr); |
75 | extern int line6_dump_request_async(struct line6_dump_request *l6dr, struct usb_line6 *line6, int num); | 75 | extern int line6_dump_request_async(struct line6_dump_request *l6dr, |
76 | struct usb_line6 *line6, int num); | ||
76 | extern void line6_dump_started(struct line6_dump_request *l6dr, int dest); | 77 | extern void line6_dump_started(struct line6_dump_request *l6dr, int dest); |
77 | extern void line6_dumpreq_destruct(struct line6_dump_request *l6dr); | 78 | extern void line6_dumpreq_destruct(struct line6_dump_request *l6dr); |
78 | extern void line6_dumpreq_destructbuf(struct line6_dump_request *l6dr, int num); | 79 | extern void line6_dumpreq_destructbuf(struct line6_dump_request *l6dr, int num); |
79 | extern int line6_dumpreq_init(struct line6_dump_request *l6dr, const void *buf, size_t len); | 80 | extern int line6_dumpreq_init(struct line6_dump_request *l6dr, const void *buf, |
80 | extern int line6_dumpreq_initbuf(struct line6_dump_request *l6dr, const void *buf, size_t len, int num); | 81 | size_t len); |
82 | extern int line6_dumpreq_initbuf(struct line6_dump_request *l6dr, | ||
83 | const void *buf, size_t len, int num); | ||
81 | extern void line6_invalidate_current(struct line6_dump_request *l6dr); | 84 | extern void line6_invalidate_current(struct line6_dump_request *l6dr); |
82 | extern void line6_startup_delayed(struct line6_dump_request *l6dr, int seconds, | 85 | extern void line6_startup_delayed(struct line6_dump_request *l6dr, int seconds, |
83 | void (*function)(unsigned long), void *data); | 86 | void (*function)(unsigned long), void *data); |
84 | extern int line6_wait_dump(struct line6_dump_request *l6dr, int nonblock); | 87 | extern int line6_wait_dump(struct line6_dump_request *l6dr, int nonblock); |
85 | 88 | ||
86 | 89 | ||
diff --git a/drivers/staging/line6/midi.h b/drivers/staging/line6/midi.h index be05a54205c..c69fd118957 100644 --- a/drivers/staging/line6/midi.h +++ b/drivers/staging/line6/midi.h | |||
@@ -21,8 +21,7 @@ | |||
21 | #define MIDI_BUFFER_SIZE 1024 | 21 | #define MIDI_BUFFER_SIZE 1024 |
22 | 22 | ||
23 | 23 | ||
24 | struct snd_line6_midi | 24 | struct snd_line6_midi { |
25 | { | ||
26 | /** | 25 | /** |
27 | Pointer back to the Line6 driver data structure. | 26 | Pointer back to the Line6 driver data structure. |
28 | */ | 27 | */ |
@@ -81,7 +80,8 @@ struct snd_line6_midi | |||
81 | 80 | ||
82 | 81 | ||
83 | extern int line6_init_midi(struct usb_line6 *line6); | 82 | extern int line6_init_midi(struct usb_line6 *line6); |
84 | extern void line6_midi_receive(struct usb_line6 *line6, unsigned char *data, int length); | 83 | extern void line6_midi_receive(struct usb_line6 *line6, unsigned char *data, |
84 | int length); | ||
85 | 85 | ||
86 | 86 | ||
87 | #endif | 87 | #endif |
diff --git a/drivers/staging/line6/midibuf.h b/drivers/staging/line6/midibuf.h index 0e7762c677c..9877581bcd9 100644 --- a/drivers/staging/line6/midibuf.h +++ b/drivers/staging/line6/midibuf.h | |||
@@ -13,8 +13,7 @@ | |||
13 | #define MIDIBUF_H | 13 | #define MIDIBUF_H |
14 | 14 | ||
15 | 15 | ||
16 | struct MidiBuffer | 16 | struct MidiBuffer { |
17 | { | ||
18 | unsigned char *buf; | 17 | unsigned char *buf; |
19 | int size; | 18 | int size; |
20 | int split; | 19 | int split; |
@@ -33,7 +32,8 @@ extern int midibuf_read(struct MidiBuffer *mb, unsigned char *data, int length); | |||
33 | extern void midibuf_reset(struct MidiBuffer *mb); | 32 | extern void midibuf_reset(struct MidiBuffer *mb); |
34 | extern int midibuf_skip_message(struct MidiBuffer *mb, unsigned short mask); | 33 | extern int midibuf_skip_message(struct MidiBuffer *mb, unsigned short mask); |
35 | extern void midibuf_status(struct MidiBuffer *mb); | 34 | extern void midibuf_status(struct MidiBuffer *mb); |
36 | extern int midibuf_write(struct MidiBuffer *mb, unsigned char *data, int length); | 35 | extern int midibuf_write(struct MidiBuffer *mb, unsigned char *data, |
36 | int length); | ||
37 | 37 | ||
38 | 38 | ||
39 | #endif | 39 | #endif |
diff --git a/drivers/staging/line6/pcm.h b/drivers/staging/line6/pcm.h index 90f8bb9816d..53db217cd42 100644 --- a/drivers/staging/line6/pcm.h +++ b/drivers/staging/line6/pcm.h | |||
@@ -23,16 +23,24 @@ | |||
23 | #include "usbdefs.h" | 23 | #include "usbdefs.h" |
24 | 24 | ||
25 | 25 | ||
26 | #define LINE6_ISO_BUFFERS 8 /* number of URBs */ | 26 | /* number of URBs */ |
27 | #define LINE6_ISO_PACKETS 2 /* number of USB frames per URB */ | 27 | #define LINE6_ISO_BUFFERS 8 |
28 | #define LINE6_ISO_INTERVAL 1 /* in a "full speed" device (such as the PODxt Pro) this means 1ms */ | 28 | |
29 | #define LINE6_ISO_PACKET_SIZE_MAX 252 /* this should be queried dynamically from the USB interface! */ | 29 | /* number of USB frames per URB */ |
30 | #define LINE6_ISO_PACKETS 2 | ||
31 | |||
32 | /* in a "full speed" device (such as the PODxt Pro) this means 1ms */ | ||
33 | #define LINE6_ISO_INTERVAL 1 | ||
34 | |||
35 | /* this should be queried dynamically from the USB interface! */ | ||
36 | #define LINE6_ISO_PACKET_SIZE_MAX 252 | ||
30 | 37 | ||
31 | 38 | ||
32 | /* | 39 | /* |
33 | Extract the messaging device from the substream instance | 40 | Extract the messaging device from the substream instance |
34 | */ | 41 | */ |
35 | #define s2m(s) (((struct snd_line6_pcm *)snd_pcm_substream_chip(s))->line6->ifcdev) | 42 | #define s2m(s) (((struct snd_line6_pcm *) \ |
43 | snd_pcm_substream_chip(s))->line6->ifcdev) | ||
36 | 44 | ||
37 | 45 | ||
38 | enum { | 46 | enum { |
@@ -48,8 +56,7 @@ struct line6_pcm_properties { | |||
48 | int bytes_per_frame; | 56 | int bytes_per_frame; |
49 | }; | 57 | }; |
50 | 58 | ||
51 | struct snd_line6_pcm | 59 | struct snd_line6_pcm { |
52 | { | ||
53 | /** | 60 | /** |
54 | Pointer back to the Line6 driver data structure. | 61 | Pointer back to the Line6 driver data structure. |
55 | */ | 62 | */ |
@@ -82,8 +89,8 @@ struct snd_line6_pcm | |||
82 | 89 | ||
83 | /** | 90 | /** |
84 | Temporary buffer for capture. | 91 | Temporary buffer for capture. |
85 | Since the packet size is not known in advance, this buffer is large enough | 92 | Since the packet size is not known in advance, this buffer is |
86 | to store maximum size packets. | 93 | large enough to store maximum size packets. |
87 | */ | 94 | */ |
88 | unsigned char *buffer_in; | 95 | unsigned char *buffer_in; |
89 | 96 | ||
@@ -94,7 +101,8 @@ struct snd_line6_pcm | |||
94 | 101 | ||
95 | /** | 102 | /** |
96 | Count processed bytes for playback. | 103 | Count processed bytes for playback. |
97 | This is modulo period size (to determine when a period is finished). | 104 | This is modulo period size (to determine when a period is |
105 | finished). | ||
98 | */ | 106 | */ |
99 | unsigned bytes_out; | 107 | unsigned bytes_out; |
100 | 108 | ||
@@ -110,14 +118,16 @@ struct snd_line6_pcm | |||
110 | 118 | ||
111 | /** | 119 | /** |
112 | Processed frame position in the playback buffer. | 120 | Processed frame position in the playback buffer. |
113 | The contents of the output ring buffer have been consumed by the USB | 121 | The contents of the output ring buffer have been consumed by |
114 | subsystem (i.e., sent to the USB device) up to this position. | 122 | the USB subsystem (i.e., sent to the USB device) up to this |
123 | position. | ||
115 | */ | 124 | */ |
116 | snd_pcm_uframes_t pos_out_done; | 125 | snd_pcm_uframes_t pos_out_done; |
117 | 126 | ||
118 | /** | 127 | /** |
119 | Count processed bytes for capture. | 128 | Count processed bytes for capture. |
120 | This is modulo period size (to determine when a period is finished). | 129 | This is modulo period size (to determine when a period is |
130 | finished). | ||
121 | */ | 131 | */ |
122 | unsigned bytes_in; | 132 | unsigned bytes_in; |
123 | 133 | ||
@@ -133,8 +143,9 @@ struct snd_line6_pcm | |||
133 | 143 | ||
134 | /** | 144 | /** |
135 | Processed frame position in the capture buffer. | 145 | Processed frame position in the capture buffer. |
136 | The contents of the output ring buffer have been consumed by the USB | 146 | The contents of the output ring buffer have been consumed by |
137 | subsystem (i.e., sent to the USB device) up to this position. | 147 | the USB subsystem (i.e., sent to the USB device) up to this |
148 | position. | ||
138 | */ | 149 | */ |
139 | snd_pcm_uframes_t pos_in_done; | 150 | snd_pcm_uframes_t pos_in_done; |
140 | 151 | ||
@@ -202,7 +213,8 @@ struct snd_line6_pcm | |||
202 | }; | 213 | }; |
203 | 214 | ||
204 | 215 | ||
205 | extern int line6_init_pcm(struct usb_line6 *line6, struct line6_pcm_properties *properties); | 216 | extern int line6_init_pcm(struct usb_line6 *line6, |
217 | struct line6_pcm_properties *properties); | ||
206 | extern int snd_line6_trigger(struct snd_pcm_substream *substream, int cmd); | 218 | extern int snd_line6_trigger(struct snd_pcm_substream *substream, int cmd); |
207 | extern int snd_line6_prepare(struct snd_pcm_substream *substream); | 219 | extern int snd_line6_prepare(struct snd_pcm_substream *substream); |
208 | 220 | ||
diff --git a/drivers/staging/line6/playback.h b/drivers/staging/line6/playback.h index 019c40f2cdb..db1e48b3596 100644 --- a/drivers/staging/line6/playback.h +++ b/drivers/staging/line6/playback.h | |||
@@ -22,7 +22,8 @@ extern struct snd_pcm_ops snd_line6_playback_ops; | |||
22 | 22 | ||
23 | 23 | ||
24 | extern int create_audio_out_urbs(struct snd_line6_pcm *line6pcm); | 24 | extern int create_audio_out_urbs(struct snd_line6_pcm *line6pcm); |
25 | extern int snd_line6_playback_trigger(struct snd_pcm_substream *substream, int cmd); | 25 | extern int snd_line6_playback_trigger(struct snd_pcm_substream *substream, |
26 | int cmd); | ||
26 | extern void unlink_wait_clear_audio_out_urbs(struct snd_line6_pcm *line6pcm); | 27 | extern void unlink_wait_clear_audio_out_urbs(struct snd_line6_pcm *line6pcm); |
27 | 28 | ||
28 | 29 | ||
diff --git a/drivers/staging/line6/pod.h b/drivers/staging/line6/pod.h index 0db59484c4b..7051ca61381 100644 --- a/drivers/staging/line6/pod.h +++ b/drivers/staging/line6/pod.h | |||
@@ -49,8 +49,7 @@ | |||
49 | Data structure for values that need to be requested explicitly. | 49 | Data structure for values that need to be requested explicitly. |
50 | This is the case for system and tuner settings. | 50 | This is the case for system and tuner settings. |
51 | */ | 51 | */ |
52 | struct ValueWait | 52 | struct ValueWait { |
53 | { | ||
54 | unsigned short value; | 53 | unsigned short value; |
55 | wait_queue_head_t wait; | 54 | wait_queue_head_t wait; |
56 | }; | 55 | }; |
@@ -194,10 +193,12 @@ struct usb_line6_pod { | |||
194 | 193 | ||
195 | extern void pod_disconnect(struct usb_interface *interface); | 194 | extern void pod_disconnect(struct usb_interface *interface); |
196 | extern int pod_init(struct usb_interface *interface, struct usb_line6_pod *pod); | 195 | extern int pod_init(struct usb_interface *interface, struct usb_line6_pod *pod); |
197 | extern void pod_midi_postprocess(struct usb_line6_pod *pod, unsigned char *data, int length); | 196 | extern void pod_midi_postprocess(struct usb_line6_pod *pod, |
197 | unsigned char *data, int length); | ||
198 | extern void pod_process_message(struct usb_line6_pod *pod); | 198 | extern void pod_process_message(struct usb_line6_pod *pod); |
199 | extern void pod_receive_parameter(struct usb_line6_pod *pod, int param); | 199 | extern void pod_receive_parameter(struct usb_line6_pod *pod, int param); |
200 | extern void pod_transmit_parameter(struct usb_line6_pod *pod, int param, int value); | 200 | extern void pod_transmit_parameter(struct usb_line6_pod *pod, int param, |
201 | int value); | ||
201 | 202 | ||
202 | 203 | ||
203 | #endif | 204 | #endif |
diff --git a/drivers/staging/line6/toneport.h b/drivers/staging/line6/toneport.h index cd0b19fe7c8..bddc58dd7e3 100644 --- a/drivers/staging/line6/toneport.h +++ b/drivers/staging/line6/toneport.h | |||
@@ -38,7 +38,8 @@ struct usb_line6_toneport { | |||
38 | 38 | ||
39 | 39 | ||
40 | extern void toneport_disconnect(struct usb_interface *interface); | 40 | extern void toneport_disconnect(struct usb_interface *interface); |
41 | extern int toneport_init(struct usb_interface *interface, struct usb_line6_toneport *toneport); | 41 | extern int toneport_init(struct usb_interface *interface, |
42 | struct usb_line6_toneport *toneport); | ||
42 | 43 | ||
43 | 44 | ||
44 | #endif | 45 | #endif |
diff --git a/drivers/staging/line6/usbdefs.h b/drivers/staging/line6/usbdefs.h index 15dbca757ac..c38f31f2f42 100644 --- a/drivers/staging/line6/usbdefs.h +++ b/drivers/staging/line6/usbdefs.h | |||
@@ -50,16 +50,25 @@ | |||
50 | #define LINE6_BIT_TONEPORT_UX2 (1 << 12) | 50 | #define LINE6_BIT_TONEPORT_UX2 (1 << 12) |
51 | #define LINE6_BIT_VARIAX (1 << 13) | 51 | #define LINE6_BIT_VARIAX (1 << 13) |
52 | 52 | ||
53 | #define LINE6_BITS_PRO (LINE6_BIT_BASSPODXTPRO | LINE6_BIT_PODXTPRO) | 53 | #define LINE6_BITS_PRO (LINE6_BIT_BASSPODXTPRO | \ |
54 | #define LINE6_BITS_LIVE (LINE6_BIT_BASSPODXTLIVE | LINE6_BIT_PODXTLIVE | LINE6_BIT_PODX3LIVE) | 54 | LINE6_BIT_PODXTPRO) |
55 | #define LINE6_BITS_PODXTALL (LINE6_BIT_PODXT | LINE6_BIT_PODXTLIVE | LINE6_BIT_PODXTPRO) | 55 | #define LINE6_BITS_LIVE (LINE6_BIT_BASSPODXTLIVE | \ |
56 | #define LINE6_BITS_BASSPODXTALL (LINE6_BIT_BASSPODXT | LINE6_BIT_BASSPODXTLIVE | LINE6_BIT_BASSPODXTPRO) | 56 | LINE6_BIT_PODXTLIVE | \ |
57 | LINE6_BIT_PODX3LIVE) | ||
58 | #define LINE6_BITS_PODXTALL (LINE6_BIT_PODXT | \ | ||
59 | LINE6_BIT_PODXTLIVE | \ | ||
60 | LINE6_BIT_PODXTPRO) | ||
61 | #define LINE6_BITS_BASSPODXTALL (LINE6_BIT_BASSPODXT | \ | ||
62 | LINE6_BIT_BASSPODXTLIVE | \ | ||
63 | LINE6_BIT_BASSPODXTPRO) | ||
57 | 64 | ||
58 | #define LINE6_BIT_CONTROL (1 << 0) /* device supports settings parameter via USB */ | 65 | /* device supports settings parameter via USB */ |
59 | #define LINE6_BIT_PCM (1 << 1) /* device supports PCM input/output via USB */ | 66 | #define LINE6_BIT_CONTROL (1 << 0) |
60 | #define LINE6_BIT_CONTROL_PCM (LINE6_BIT_CONTROL | LINE6_BIT_PCM) | 67 | /* device supports PCM input/output via USB */ |
68 | #define LINE6_BIT_PCM (1 << 1) | ||
69 | #define LINE6_BIT_CONTROL_PCM (LINE6_BIT_CONTROL | LINE6_BIT_PCM) | ||
61 | 70 | ||
62 | #define LINE6_FALLBACK_INTERVAL 10 | 71 | #define LINE6_FALLBACK_INTERVAL 10 |
63 | #define LINE6_FALLBACK_MAXPACKETSIZE 16 | 72 | #define LINE6_FALLBACK_MAXPACKETSIZE 16 |
64 | 73 | ||
65 | #endif | 74 | #endif |
diff --git a/drivers/staging/line6/variax.h b/drivers/staging/line6/variax.h index 286df248c81..ee330ba3089 100644 --- a/drivers/staging/line6/variax.h +++ b/drivers/staging/line6/variax.h | |||
@@ -100,7 +100,8 @@ struct usb_line6_variax { | |||
100 | 100 | ||
101 | 101 | ||
102 | extern void variax_disconnect(struct usb_interface *interface); | 102 | extern void variax_disconnect(struct usb_interface *interface); |
103 | extern int variax_init(struct usb_interface *interface, struct usb_line6_variax *variax); | 103 | extern int variax_init(struct usb_interface *interface, |
104 | struct usb_line6_variax *variax); | ||
104 | extern void variax_process_message(struct usb_line6_variax *variax); | 105 | extern void variax_process_message(struct usb_line6_variax *variax); |
105 | 106 | ||
106 | 107 | ||