Merge branch 'master' into tk71

[mv-sheeva.git] / drivers / staging / line6 / toneport.h

diff --git a/drivers/staging/line6/toneport.h b/drivers/staging/line6/toneport.h
index bddc58dd7e3aace964d12683ec1d11c4fb79147a..8576b72636487ae0aa01e9ca8fe33af8ccfce792 100644 (file)
--- 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.1beta
  *
- * 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
@@ -12,34 +12,41 @@
 #ifndef TONEPORT_H
 #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;
-};
-
 
-extern void toneport_disconnect(struct usb_interface *interface);
-extern int toneport_init(struct usb_interface *interface,
-                        struct usb_line6_toneport *toneport);
+       /**
+                Timer for delayed PCM startup.
+       */
+       struct timer_list timer;
+};
 
+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