Update of /cvsroot/alsa/alsa-kernel/core/oss
In directory sc8-pr-cvs1:/tmp/cvs-serv28002

Modified Files:
        pcm_oss.c 
Log Message:
Fixed read for partial OSS period buffer contents

Index: pcm_oss.c
===================================================================
RCS file: /cvsroot/alsa/alsa-kernel/core/oss/pcm_oss.c,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- pcm_oss.c   28 Oct 2003 13:29:00 -0000      1.54
+++ pcm_oss.c   29 Oct 2003 09:30:33 -0000      1.55
@@ -554,6 +554,7 @@
        runtime->oss.prepare = 0;
        runtime->oss.prev_hw_ptr_interrupt = 0;
        runtime->oss.period_ptr = 0;
+       runtime->oss.buffer_used = 0;
 
        return 0;
 }
@@ -882,12 +883,13 @@
                                if (tmp <= 0)
                                        return xfer > 0 ? (snd_pcm_sframes_t)xfer : 
tmp;
                                runtime->oss.bytes += tmp;
+                               runtime->oss.period_ptr = tmp;
                                runtime->oss.buffer_used = tmp;
                        }
                        tmp = bytes;
                        if ((size_t) tmp > runtime->oss.buffer_used)
                                tmp = runtime->oss.buffer_used;
-                       if (copy_to_user(buf, runtime->oss.buffer + 
(runtime->oss.period_bytes - runtime->oss.buffer_used), tmp))
+                       if (copy_to_user(buf, runtime->oss.buffer + 
(runtime->oss.period_ptr - runtime->oss.buffer_used), tmp))
                                return xfer > 0 ? (snd_pcm_sframes_t)xfer : -EFAULT;
                        buf += tmp;
                        bytes -= tmp;



-------------------------------------------------------
This SF.net email is sponsored by: SF.net Giveback Program.
Does SourceForge.net help you be more productive?  Does it
help you create better code?   SHARE THE LOVE, and help us help
YOU!  Click Here: http://sourceforge.net/donate/
_______________________________________________
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog

Reply via email to