Date: Fri, 13 Mar 1998 11:52:33 +0100 (MET) From: Luigi Rizzo <luigi@labinfo.iet.unipi.it> To: multimedia@FreeBSD.ORG, hackers@FreeBSD.ORG Subject: small sound (pcm) patches for 2.2.6! Message-ID: <199803131052.LAA14841@labinfo.iet.unipi.it>
next in thread | raw e-mail | index | archive | help
Here are a few patches to my audio driver (from a recently cvsupped
2.2.6-BETA). The first two were already submitted some time ago
but probably were applied to the wrong line. The last one fixes a
problem that has been there for ages.
I consider these important for 2.2.6 -- so please Jordan apply them.
cheers
luigi
diff -ubwr /sys/i386/isa/snd/dmabuf.c snd/dmabuf.c
--- /sys/i386/isa/snd/dmabuf.c Tue Mar 10 14:05:00 1998
+++ snd/dmabuf.c Sat Feb 28 13:08:32 1998
@@ -270,10 +270,10 @@
else
timeout = 1 ;
ret = tsleep( (caddr_t)b, PRIBIO|PCATCH, "dspwr", timeout);
- if (ret == EINTR || ret == ERESTART)
+ if (ret == EINTR)
d->flags |= SND_F_ABORTING ;
splx(s);
- if (ret == EINTR)
+ if (ret == EINTR || ret == ERESTART)
break ;
continue;
}
@@ -553,10 +553,10 @@
else
timeout = 1; /* maybe data will be ready earlier */
ret = tsleep( (caddr_t)b, PRIBIO | PCATCH , "dsprd", timeout ) ;
- if (ret == EINTR || ret == ERESTART)
+ if (ret == EINTR)
d->flags |= SND_F_ABORTING ;
splx(s);
- if (ret == EINTR)
+ if (ret == EINTR || ret == ERESTART)
break ;
continue;
}
@@ -593,7 +593,7 @@
s = spltty(); /* no interrupts here ... */
d->flags &= ~SND_F_READING ;
if (d->flags & SND_F_ABORTING) {
- d->flags |= ~SND_F_ABORTING;
+ d->flags &= ~SND_F_ABORTING; /* XXX */
splx(s);
dsp_rdabort(d, 1 /* restart */);
/* XXX return EINTR ? */
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-hackers" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?199803131052.LAA14841>