diff options
| author | Markus Grabner <grabner@icg.tugraz.at> | 2010-08-23 01:08:25 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-08-31 15:28:16 -0700 |
| commit | e1a164d7a3e05aae15eb603ee8f1b77446480a3b (patch) | |
| tree | 829d6ed586e9fe3680be24faab8c61d5c596443e /drivers/staging/line6/driver.h | |
| parent | 1027f476f507ef7ed9919cd3e3d32310f3985da1 (diff) | |
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/driver.h')
| -rw-r--r-- | drivers/staging/line6/driver.h | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/drivers/staging/line6/driver.h b/drivers/staging/line6/driver.h index b1e5557d5a80..01fa27e75774 100644 --- a/drivers/staging/line6/driver.h +++ b/drivers/staging/line6/driver.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,14 +12,12 @@ #ifndef DRIVER_H #define DRIVER_H - #include <linux/spinlock.h> #include <linux/usb.h> #include <sound/core.h> #include "midi.h" - #define DRIVER_NAME "line6usb" #if defined(CONFIG_LINE6_USB_DUMP_CTRL) || defined(CONFIG_LINE6_USB_DUMP_MIDI) || defined(CONFIG_LINE6_USB_DUMP_PCM) @@ -51,7 +49,7 @@ */ #define LINE6_CHANNEL_DEVICE 0x02 -#define LINE6_CHANNEL_UNKNOWN 5 /* don't know yet what this is good for */ +#define LINE6_CHANNEL_UNKNOWN 5 /* don't know yet what this is good for */ #define LINE6_CHANNEL_MASK 0x0f @@ -61,12 +59,10 @@ #define DEBUG_MESSAGES(x) #endif - #define MISSING_CASE \ printk(KERN_ERR "line6usb driver bug: missing case in %s:%d\n", \ __FILE__, __LINE__) - #define CHECK_RETURN(x) \ do { \ err = x; \ @@ -79,14 +75,12 @@ do { \ return; \ x = (n); - extern const unsigned char line6_midi_id[3]; extern struct usb_line6 *line6_devices[LINE6_MAX_DEVICES]; static const int SYSEX_DATA_OFS = sizeof(line6_midi_id) + 3; static const int SYSEX_EXTRA_SIZE = sizeof(line6_midi_id) + 4; - /** Common properties of Line6 devices. */ @@ -202,7 +196,6 @@ struct usb_line6 { int message_length; }; - extern char *line6_alloc_sysex_buffer(struct usb_line6 *line6, int code1, int code2, int size); extern ssize_t line6_nop_read(struct device *dev, @@ -226,7 +219,8 @@ extern int line6_send_sysex_message_async(struct usb_line6 *line6, extern ssize_t line6_set_raw(struct device *dev, struct device_attribute *attr, const char *buf, size_t count); extern void line6_start_timer(struct timer_list *timer, unsigned int msecs, - void (*function)(unsigned long), unsigned long data); + void (*function) (unsigned long), + unsigned long data); extern int line6_transmit_parameter(struct usb_line6 *line6, int param, int value); extern int line6_version_request_async(struct usb_line6 *line6); @@ -238,5 +232,4 @@ extern void line6_write_hexdump(struct usb_line6 *line6, char dir, const unsigned char *buffer, int size); #endif - #endif |