diff options
| author |   Markus Grabner <grabner@icg.tugraz.at> | 2010-08-12 01:35:30 +0200 |
|---|---|---|
| committer |   Greg Kroah-Hartman <gregkh@suse.de> | 2010-08-31 15:28:15 -0700 |
| commit | 1027f476f507ef7ed9919cd3e3d32310f3985da1 (patch) | |
| tree | 5f0da58a5bc15338c71e848693a5ae259b97a207 /drivers/staging/line6/toneport.h | |
| parent | staging: rtl8193*: Remove double test (diff) | |
| download | linux-dev-1027f476f507ef7ed9919cd3e3d32310f3985da1.tar.xz linux-dev-1027f476f507ef7ed9919cd3e3d32310f3985da1.zip | |
staging: line6: sync with upstream
Big upstream sync.
Signed-off-by: Markus Grabner <grabner@icg.tugraz.at>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/line6/toneport.h')
| -rw-r--r-- | drivers/staging/line6/toneport.h | 31 |
1 files changed, 21 insertions, 10 deletions
diff --git a/drivers/staging/line6/toneport.h b/drivers/staging/line6/toneport.h index bddc58dd7e3a..c2adee3779a0 100644 --- a/drivers/staging/line6/toneport.h +++ b/drivers/staging/line6/toneport.h @@ -1,7 +1,7 @@ /* - * Line6 Linux USB driver - 0.8.0 + * Line6 Linux USB driver - 0.9.0 * - * Copyright (C) 2004-2009 Markus Grabner (grabner@icg.tugraz.at) + * Copyright (C) 2004-2010 Markus Grabner (grabner@icg.tugraz.at) * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License as @@ -13,33 +13,44 @@ #define TONEPORT_H -#include "driver.h" - #include <linux/usb.h> #include <sound/core.h> +#include "driver.h" + struct usb_line6_toneport { /** - Generic Line6 USB data. + Generic Line6 USB data. */ struct usb_line6 line6; /** - Serial number of device. + Source selector. + */ + int source; + + /** + Serial number of device. */ int serial_number; /** - Firmware version (x 100). + Firmware version (x 100). */ int firmware_version; + + /** + Timer for delayed PCM startup. + */ + struct timer_list timer; }; -extern void toneport_disconnect(struct usb_interface *interface); -extern int toneport_init(struct usb_interface *interface, - struct usb_line6_toneport *toneport); +extern void line6_toneport_disconnect(struct usb_interface *interface); +extern int line6_toneport_init(struct usb_interface *interface, + struct usb_line6_toneport *toneport); +extern void line6_toneport_reset_resume(struct usb_line6_toneport *toneport); #endif |