From: Frank Mori Hess Date: Tue, 13 Feb 2001 17:06:45 +0000 (+0000) Subject: removed direct references to prealloc_buf from das800 and das1800 drivers X-Git-Tag: r0_7_57~27 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=0f4656754084767119b4311141e533c514efb3e9;p=comedi.git removed direct references to prealloc_buf from das800 and das1800 drivers --- diff --git a/comedi/drivers/das1800.c b/comedi/drivers/das1800.c index a6257473..f607193a 100644 --- a/comedi/drivers/das1800.c +++ b/comedi/drivers/das1800.c @@ -1085,12 +1085,12 @@ static void das1800_handle_fifo_not_empty(comedi_device *dev, comedi_subdevice * /* utility function used by das1800 interrupt service routines */ inline void write_to_buffer(comedi_device *dev, comedi_subdevice *s, sampl_t data_point) { - if(s->async->buf_int_ptr >= s->async->prealloc_bufsz ) + if(s->async->buf_int_ptr >= s->async->cmd.data_len ) { s->async->buf_int_ptr = 0; comedi_eobuf(dev, s); } - *((sampl_t *)((void *)s->async->prealloc_buf + s->async->buf_int_ptr)) = data_point; + *((sampl_t *)((void *)s->async->cmd.data + s->async->buf_int_ptr)) = data_point; s->async->cur_chan++; if(s->async->cur_chan >= s->async->cur_chanlist_len) { diff --git a/comedi/drivers/das800.c b/comedi/drivers/das800.c index b0e68ade..1a0be37e 100644 --- a/comedi/drivers/das800.c +++ b/comedi/drivers/das800.c @@ -391,12 +391,12 @@ static void das800_interrupt(int irq, void *d, struct pt_regs *regs) if(devpriv->count > 0 || devpriv->forever == 1) { /* write data point to buffer */ - if(async->buf_int_ptr >= async->prealloc_bufsz ) + if(async->buf_int_ptr >= async->cmd.data_len ) { async->buf_int_ptr = 0; comedi_eobuf(dev, s); } - *((sampl_t *)((void *)async->prealloc_buf + async->buf_int_ptr)) = dataPoint; + *((sampl_t *)((void *)async->cmd.data + async->buf_int_ptr)) = dataPoint; async->cur_chan++; if( async->cur_chan >= async->cur_chanlist_len ) {