From 77502e87622e215deae4de694afead3b7e278987 Mon Sep 17 00:00:00 2001 From: David Schleef Date: Mon, 4 Jun 2001 22:42:19 +0000 Subject: [PATCH] Reverted the variable timeout part of the last change. --- comedi/drivers/das08.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/comedi/drivers/das08.c b/comedi/drivers/das08.c index 550e85e5..8df4be6c 100644 --- a/comedi/drivers/das08.c +++ b/comedi/drivers/das08.c @@ -384,7 +384,7 @@ struct das08_private_struct{ #define devpriv ((struct das08_private_struct *)dev->private) #define thisboard ((struct das08_board_struct *)dev->board_ptr) -#define TIMEOUT 1000 +#define TIMEOUT 100000 static int das08_ai_rinsn(comedi_device *dev,comedi_subdevice *s,comedi_insn *insn,lsampl_t *data) { @@ -421,12 +421,11 @@ static int das08_ai_rinsn(comedi_device *dev,comedi_subdevice *s,comedi_insn *in /* trigger conversion */ outb_p(0,dev->iobase+DAS08_TRIG_12BIT); - for(i=0;i<(thisboard->ai_nbits == 16 ? 100 : 1) * TIMEOUT; - i++){ + for(i=0;iiobase+DAS08_STATUS)&DAS08_EOC)) break; } - if(i==(thisboard->ai_nbits == 16 ? 100 : 1) * TIMEOUT){ + if(i==TIMEOUT){ rt_printk("das08: timeout\n"); return -ETIME; } -- 2.26.2