Update of /cvsroot/alsa/alsa-kernel/core/seq
In directory usw-pr-cvs1:/tmp/cvs-serv11819
Modified Files:
seq.c seq_fifo.c seq_lock.c seq_lock.h seq_memory.c
Log Message:
removed snd_seq_sleep* functions.
the relevant parts are replaced with the normal spin_unlock/sleep/spin_lock
procedure.
Index: seq.c
===================================================================
RCS file: /cvsroot/alsa/alsa-kernel/core/seq/seq.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- seq.c 22 Jul 2002 10:50:13 -0000 1.5
+++ seq.c 8 Oct 2002 10:54:44 -0000 1.6
@@ -135,7 +135,7 @@
EXPORT_SYMBOL(snd_seq_event_port_detach);
/* seq_lock.c */
#if defined(__SMP__) || defined(CONFIG_SND_DEBUG)
-EXPORT_SYMBOL(snd_seq_sleep_in_lock);
-EXPORT_SYMBOL(snd_seq_sleep_timeout_in_lock);
+/*EXPORT_SYMBOL(snd_seq_sleep_in_lock);*/
+/*EXPORT_SYMBOL(snd_seq_sleep_timeout_in_lock);*/
EXPORT_SYMBOL(snd_use_lock_sync_helper);
#endif
Index: seq_fifo.c
===================================================================
RCS file: /cvsroot/alsa/alsa-kernel/core/seq/seq_fifo.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- seq_fifo.c 12 Aug 2002 08:43:45 -0000 1.5
+++ seq_fifo.c 8 Oct 2002 10:54:44 -0000 1.6
@@ -182,7 +182,9 @@
spin_unlock_irqrestore(&f->lock, flags);
return -EAGAIN;
}
- snd_seq_sleep_in_lock(&f->input_sleep, &f->lock);
+ spin_unlock(&f->lock);
+ interruptible_sleep_on(&f->input_sleep);
+ spin_lock(&f->lock);
if (signal_pending(current)) {
spin_unlock_irqrestore(&f->lock, flags);
Index: seq_lock.c
===================================================================
RCS file: /cvsroot/alsa/alsa-kernel/core/seq/seq_lock.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- seq_lock.c 12 Aug 2002 08:43:45 -0000 1.5
+++ seq_lock.c 8 Oct 2002 10:54:44 -0000 1.6
@@ -25,6 +25,7 @@
#if defined(__SMP__) || defined(CONFIG_SND_DEBUG)
+#if 0 /* NOT USED */
/* (interruptible) sleep_on during the specified spinlock */
void snd_seq_sleep_in_lock(wait_queue_head_t *p, spinlock_t *lock)
{
@@ -60,6 +61,7 @@
return timeout;
}
+#endif /* NOT USED */
/* wait until all locks are released */
void snd_use_lock_sync_helper(snd_use_lock_t *lockp, const char *file, int line)
Index: seq_lock.h
===================================================================
RCS file: /cvsroot/alsa/alsa-kernel/core/seq/seq_lock.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- seq_lock.h 14 Feb 2002 17:40:31 -0000 1.2
+++ seq_lock.h 8 Oct 2002 10:54:44 -0000 1.3
@@ -20,12 +20,6 @@
void snd_use_lock_sync_helper(snd_use_lock_t *lock, const char *file, int line);
#define snd_use_lock_sync(lockp) snd_use_lock_sync_helper(lockp, __BASE_FILE__,
__LINE__)
-/* (interruptible) sleep_on during the specified spinlock */
-void snd_seq_sleep_in_lock(wait_queue_head_t *p, spinlock_t *lock);
-
-/* (interruptible) sleep_on with timeout during the specified spinlock */
-long snd_seq_sleep_timeout_in_lock(wait_queue_head_t *p, spinlock_t *lock, long
timeout);
-
#else /* SMP || CONFIG_SND_DEBUG */
typedef spinlock_t snd_use_lock_t; /* dummy */
@@ -33,9 +27,6 @@
#define snd_use_lock_use(lockp) /**/
#define snd_use_lock_free(lockp) /**/
#define snd_use_lock_sync(lockp) /**/
-
-#define snd_seq_sleep_in_lock(p,lock) interruptible_sleep_on(p)
-#define snd_seq_sleep_timeout_in_lock(p,lock,timeout)
interruptible_sleep_on_timeout(p,timeout)
#endif /* SMP || CONFIG_SND_DEBUG */
Index: seq_memory.c
===================================================================
RCS file: /cvsroot/alsa/alsa-kernel/core/seq/seq_memory.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- seq_memory.c 12 Aug 2002 08:43:45 -0000 1.8
+++ seq_memory.c 8 Oct 2002 10:54:44 -0000 1.9
@@ -233,17 +233,20 @@
goto __error;
}
while (pool->free == NULL && ! nonblock && ! pool->closing) {
+
+ spin_unlock(&pool->lock);
/* change semaphore to allow other clients
to access device file */
if (file)
up(&semaphore_of(file));
- snd_seq_sleep_in_lock(&pool->output_sleep, &pool->lock);
+ interruptible_sleep_on(&pool->output_sleep);
/* restore semaphore again */
if (file)
down(&semaphore_of(file));
+ spin_lock(&pool->lock);
/* interrupted? */
if (signal_pending(current)) {
err = -ERESTARTSYS;
-------------------------------------------------------
This sf.net email is sponsored by:ThinkGeek
Welcome to geek heaven.
http://thinkgeek.com/sf
_______________________________________________
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
