Changeset 299 for GPL/branches/alsa-resync1/alsa-kernel/include

Timestamp:

Feb 21, 2008, 7:31:22 AM (18 years ago)

Author:

Brendan Oakley

Message:

Separate misc_driver.c functions from misc.c

Location:

GPL/branches/alsa-resync1/alsa-kernel/include/sound

Files:

• adriver.h (modified) (2 diffs)
• core.h (modified) (1 diff)

GPL/branches/alsa-resync1/alsa-kernel/include/sound/adriver.h

@@ -213 +213 @@
 typedef int irqreturn_t;
 
+
+/* workqueue-alike; 2.5.45 */
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 0)
+#include <linux/workqueue.h>
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 5, 45) && !defined(__WORK_INITIALIZER)
+#define SND_WORKQUEUE_COMPAT
+struct workqueue_struct;
 struct work_struct {
         unsigned long pending;
@@ -235 +242 @@
 int snd_compat_schedule_work(struct work_struct *work);
 #define schedule_work(w) snd_compat_schedule_work(w)
+struct workqueue_struct *snd_compat_create_workqueue(const char *name);
+#define create_workqueue(name) snd_compat_create_workqueue((name))
+void snd_compat_flush_workqueue(struct workqueue_struct *wq);
+#define flush_workqueue(wq) snd_compat_flush_workqueue((wq));
+void snd_compat_destroy_workqueue(struct workqueue_struct *wq);
+#define destroy_workqueue(wq) snd_compat_destroy_workqueue((wq));
+int snd_compat_queue_work(struct workqueue_struct *wq, struct work_struct *work);
+#define queue_work(wq, work) snd_compat_queue_work((wq), (work))
+int snd_compat_queue_delayed_work(struct workqueue_struct *wq, struct work_struct *work, unsigned long delay);
+#define queue_delayed_work(wq, work, delay) snd_compat_queue_delayed_work((wq), (work), (delay))
+#endif /* < 2.5.45 */
+#endif /* < 2.6.0 */
 
 /* 2.5 new modules */

GPL/branches/alsa-resync1/alsa-kernel/include/sound/core.h

@@ -25 +25 @@
 #include <linux/sched.h>                /* wake_up() */
 #include <asm/semaphore.h>
-#ifndef TARGET_OS2 //TODO: implement linux/rwsem.h, workqueue.h
 #include <linux/rwsem.h>                /* struct rw_semaphore */
 #include <linux/workqueue.h>            /* struct workqueue_struct */
-#endif /* !TARGET_OS2 */
 #include <sound/typedefs.h>