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/dumprequest.h | |
| parent | 4498dbcd2d85b67e9f46790bcfee5860d2dd1762 (diff) | |
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/dumprequest.h')
| -rw-r--r-- | drivers/staging/line6/dumprequest.h | 24 |
1 files changed, 7 insertions, 17 deletions
diff --git a/drivers/staging/line6/dumprequest.h b/drivers/staging/line6/dumprequest.h index 1975d54b3c2..fce2306d234 100644 --- a/drivers/staging/line6/dumprequest.h +++ b/drivers/staging/line6/dumprequest.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 @@ -15,7 +15,6 @@ #include <linux/usb.h> #include <linux/wait.h> - #include <sound/core.h> @@ -56,16 +55,6 @@ struct line6_dump_request { int in_progress; /** - Timer for delayed dump request. - */ - struct timer_list timer; - - /** - Flag if initial dump request has been successful. - */ - char ok; - - /** Dump request buffers */ struct line6_dump_reqbuf reqbufs[1]; @@ -73,7 +62,7 @@ struct line6_dump_request { extern void line6_dump_finished(struct line6_dump_request *l6dr); extern int line6_dump_request_async(struct line6_dump_request *l6dr, - struct usb_line6 *line6, int num); + struct usb_line6 *line6, int num, int dest); extern void line6_dump_started(struct line6_dump_request *l6dr, int dest); extern void line6_dumpreq_destruct(struct line6_dump_request *l6dr); extern void line6_dumpreq_destructbuf(struct line6_dump_request *l6dr, int num); @@ -82,9 +71,10 @@ extern int line6_dumpreq_init(struct line6_dump_request *l6dr, const void *buf, extern int line6_dumpreq_initbuf(struct line6_dump_request *l6dr, const void *buf, size_t len, int num); extern void line6_invalidate_current(struct line6_dump_request *l6dr); -extern void line6_startup_delayed(struct line6_dump_request *l6dr, int seconds, - void (*function)(unsigned long), void *data); -extern int line6_wait_dump(struct line6_dump_request *l6dr, int nonblock); +extern void line6_dump_wait(struct line6_dump_request *l6dr); +extern int line6_dump_wait_interruptible(struct line6_dump_request *l6dr); +extern int line6_dump_wait_timeout(struct line6_dump_request *l6dr, + long timeout); #endif |