From: David Schleef <ds@schleef.org>
Date: Wed, 4 Sep 2002 21:47:03 +0000 (+0000)
Subject: Move buffer info ioctl to new buffer code
X-Git-Tag: r0_7_66~105
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=cabc42b716feb079b27ac616a6d0be1eca5f15a8;p=comedi.git

Move buffer info ioctl to new buffer code
---

diff --git a/comedi/comedi_fops.c b/comedi/comedi_fops.c
index 020bf4fd..69eface2 100644
--- a/comedi/comedi_fops.c
+++ b/comedi/comedi_fops.c
@@ -461,31 +461,15 @@ static int do_bufinfo_ioctl(comedi_device *dev,void *arg)
 	}
 
 	if(bi.bytes_read){
+		comedi_buf_read_free(async, bi.bytes_read);
 
-		// check for buffer underflow
-		m = async->buf_write_count - async->buf_read_count;
-		if(bi.bytes_read > m)
-		{
-			DPRINTK("buffer underflow\n");
-			return -EIO;
-		}
-
-		async->buf_read_ptr += bi.bytes_read;
-		if( async->buf_read_ptr >= async->prealloc_bufsz )
-			async->buf_read_ptr %= async->prealloc_bufsz;
-		async->buf_read_count += bi.bytes_read;
-
-		// check for buffer overflow
-		if( m > async->prealloc_bufsz )
-		{
-			do_cancel(dev, dev->read_subdev);
-			DPRINTK("buffer overflow\n");
-			return -EIO;
-		}
-		if(!(s->subdev_flags&SDF_RUNNING) && async->buf_write_count==async->buf_read_count){
+		if(!(s->subdev_flags&SDF_RUNNING) &&
+		   !(s->runflags & SRF_ERROR) &&
+		   async->buf_write_count==async->buf_read_count){
 			do_become_nonbusy(dev,s);
 		}
 	}
+
 	// XXX fix bufinfo struct
 	bi.buf_int_count = async->buf_write_count;
 	bi.buf_int_ptr = async->buf_write_ptr;