From 1a0b820b741b4a3284a3fbca3dd49e1a1a0a7d1c Mon Sep 17 00:00:00 2001 From: David Schleef Date: Mon, 26 Jun 2000 15:29:16 +0000 Subject: [PATCH] fix hidden include of linux/module.h by rtl.h --- comedi/drivers/8253.h | 3 ++- comedi/drivers/ni_pcidio.c | 9 +++++++++ comedi/drivers/pcl812.c | 4 ++-- comedi/rtl.c | 2 ++ 4 files changed, 15 insertions(+), 3 deletions(-) diff --git a/comedi/drivers/8253.h b/comedi/drivers/8253.h index fbec196c..85073bf2 100644 --- a/comedi/drivers/8253.h +++ b/comedi/drivers/8253.h @@ -78,7 +78,7 @@ static inline void i8253_cascade_ns_to_timer_power(int i8253_osc_base, unsigned int div1, div2; int base; - for (div1 = 1; div1 <= (1 << 16); div1 <<= 1) { + for (div1 = 2; div1 <= (1 << 16); div1 <<= 1) { base = i8253_osc_base * div1; switch (round_mode) { case TRIG_ROUND_NEAREST: @@ -92,6 +92,7 @@ static inline void i8253_cascade_ns_to_timer_power(int i8253_osc_base, unsigned div2 = (*nanosec + base - 1) / base; break; } + if (div2 < 2) div2 = 2; if (div2 <= 65536) { *nanosec = div2 * base; *d1 = div1 & 0xffff; diff --git a/comedi/drivers/ni_pcidio.c b/comedi/drivers/ni_pcidio.c index a97e330b..f1ea1e42 100644 --- a/comedi/drivers/ni_pcidio.c +++ b/comedi/drivers/ni_pcidio.c @@ -27,6 +27,15 @@ This driver is for both the NI PCI-DIO-32HS and the PCI-DIO-96, which have very different architectures. But, since the '96 is so simple, it is included here. + + Manuals (available from ftp://ftp.natinst.com/support/manuals) + + 320938c.pdf PCI-DIO-96/PXI-6508/PCI-6503 User Manual + 321464a.pdf AT/PCI-DIO-32HS User Manual + 321464b.pdf AT/PCI-DIO-32HS User Manual + 321329A.pdf PCI-6533 Register-Level Programmer Manual + 321330A.pdf DAQ-DIO Technical Reference Manual + */ #include diff --git a/comedi/drivers/pcl812.c b/comedi/drivers/pcl812.c index c5eca850..70540710 100644 --- a/comedi/drivers/pcl812.c +++ b/comedi/drivers/pcl812.c @@ -282,7 +282,7 @@ static int pcl812_ao_mode0(comedi_device * dev, comedi_subdevice * s, comedi_tri data = it->data[i]; outb((data & 0xff), dev->iobase + (chan ? PCL812_DA2_LO : PCL812_DA1_LO)); - outb(((data & 0xf) >> 8), dev->iobase + (chan ? PCL812_DA2_HI : PCL812_DA1_HI)); + outb((data >> 8) & 0x0f, dev->iobase + (chan ? PCL812_DA2_HI : PCL812_DA1_HI)); } return i; @@ -358,7 +358,7 @@ static void interrupt_pcl812_ai_mode13_int(int irq, void *d, struct pt_regs *reg if (s->cur_trig.flags & TRIG_WAKE_EOS) { comedi_eos(dev, s); } else { - comedi_eobuf(dev, s); + comedi_bufcheck(dev, s); } devpriv->int13_act_scan++; } else { diff --git a/comedi/rtl.c b/comedi/rtl.c index 33b5bae0..e5b7457f 100644 --- a/comedi/rtl.c +++ b/comedi/rtl.c @@ -3,6 +3,8 @@ * */ +#define __NO_VERSION__ + #include #include -- 2.26.2