diff options
Diffstat (limited to 'drivers/staging/line6/dumprequest.h')
| -rw-r--r-- | drivers/staging/line6/dumprequest.h | 28 |
1 files changed, 7 insertions, 21 deletions
diff --git a/drivers/staging/line6/dumprequest.h b/drivers/staging/line6/dumprequest.h index 1975d54..c17a262 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.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,19 +12,15 @@ #ifndef DUMPREQUEST_H #define DUMPREQUEST_H - #include <linux/usb.h> #include <linux/wait.h> - #include <sound/core.h> - enum { LINE6_DUMP_NONE, LINE6_DUMP_CURRENT }; - struct line6_dump_reqbuf { /** Buffer for dump requests. @@ -56,16 +52,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 +59,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 +68,9 @@ 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 |
