Update of /cvsroot/alsa/alsa-driver/acore/seq
In directory sc8-pr-cvs1:/tmp/cvs-serv15847/acore/seq
Modified Files:
.cvsignore Makefile
Added Files:
seq_clientmgr.patch seq_memory.patch
Removed Files:
seq_clientmgr.c seq_memory.c
Log Message:
Cleanups for 2.5 (introducing patches)
--- NEW FILE: seq_clientmgr.patch ---
--- seq_clientmgr.c 2003-05-30 15:37:39.000000000 +0200
+++ seq_clientmgr.c.old 2003-05-30 15:38:16.000000000 +0200
@@ -1,3 +1,4 @@
+#define __NO_VERSION__
/*
* ALSA sequencer Client Manager
* Copyright (c) 1998-2001 by Frank van de Pol <[EMAIL PROTECTED]>
@@ -2454,7 +2455,9 @@
static struct file_operations snd_seq_f_ops =
{
+#ifndef LINUX_2_2
.owner = THIS_MODULE,
+#endif
.read = snd_seq_read,
.write = snd_seq_write,
.open = snd_seq_open,
--- NEW FILE: seq_memory.patch ---
--- seq_memory.c 2003-05-30 15:40:18.000000000 +0200
+++ seq_memory.c.old 2003-05-30 15:42:46.000000000 +0200
@@ -1,3 +1,4 @@
+#define __NO_VERSION__
/*
* ALSA sequencer Memory Manager
* Copyright (c) 1998 by Frank van de Pol <[EMAIL PROTECTED]>
@@ -235,7 +236,18 @@
while (pool->free == NULL && ! nonblock && ! pool->closing) {
spin_unlock(&pool->lock);
+#ifdef LINUX_2_2
+ /* change semaphore to allow other clients
+ to access device file */
+ if (file)
+ up(&semaphore_of(file));
+#endif
interruptible_sleep_on(&pool->output_sleep);
+#ifdef LINUX_2_2
+ /* restore semaphore again */
+ if (file)
+ down(&semaphore_of(file));
+#endif
spin_lock(&pool->lock);
/* interrupted? */
if (signal_pending(current)) {
Index: .cvsignore
===================================================================
RCS file: /cvsroot/alsa/alsa-driver/acore/seq/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 22 Dec 2001 20:09:21 -0000 1.1
+++ .cvsignore 30 May 2003 13:58:59 -0000 1.2
@@ -1 +1,3 @@
.depend
+seq_clientmgr.c
+seq_memory.c
Index: Makefile
===================================================================
RCS file: /cvsroot/alsa/alsa-driver/acore/seq/Makefile,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- Makefile 20 May 2003 12:42:45 -0000 1.8
+++ Makefile 30 May 2003 13:58:59 -0000 1.9
@@ -13,4 +13,9 @@
TOPDIR = $(MAINSRCDIR)
include $(TOPDIR)/alsa-kernel/core/seq/Makefile
+EXTRA_CFLAGS = -I$(TOPDIR)/alsa-kernel/core/seq
+
include $(TOPDIR)/Rules.make
+
+seq_clientmgr.c: seq_clientmgr.patch $(TOPDIR)/alsa-kernel/core/seq/seq_clientmgr.c
+seq_memory.c: seq_memory.patch $(TOPDIR)/alsa-kernel/core/seq/seq_memory.c
--- seq_clientmgr.c DELETED ---
--- seq_memory.c DELETED ---
-------------------------------------------------------
This SF.net email is sponsored by: eBay
Get office equipment for less on eBay!
http://adfarm.mediaplex.com/ad/ck/711-11697-6916-5
_______________________________________________
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
