Added regshift parameter after base address in i8254_load(), i8254_mm_load(),

i8254_read(), i8254_mm_read(), i8254_write(), i8254_mm_write(),
i8254_set_mode(), i8254_mm_set_mode(), i8254_status(), i8254_mm_status().
The offsets to the four 8253/8254 registers will be shifted left by this
amount.  This is to cater for cards where the four registers do not occupy
consecutive bytes.

diff --git a/comedi/drivers/8253.h b/comedi/drivers/8253.h
index 0c920354474f0270e2d698106e605bfb62308f2c..f4f0bcb17c32d646c5690330679756457cd7b1c3 100644 (file)
--- a/comedi/drivers/8253.h
+++ b/comedi/drivers/8253.h
@@ -221,9 +221,9 @@ static inline void i8253_cascade_ns_to_timer_2div(int i8253_osc_base,
  * FMH
  */
 
-static const int i8254_control_reg = 3;
+#define i8254_control_reg      3
 
-static inline int i8254_load(unsigned long base_address,
+static inline int i8254_load(unsigned long base_address, unsigned int regshift,
        unsigned int counter_number, unsigned int count, unsigned int mode)
 {
        unsigned int byte;
@@ -236,16 +236,16 @@ static inline int i8254_load(unsigned long base_address,
        byte = counter_number << 6;
        byte |= 0x30;   // load low then high byte
        byte |= (mode << 1);    // set counter mode
-       outb(byte, base_address + i8254_control_reg);
+       outb(byte, base_address + (i8254_control_reg << regshift));
        byte = count & 0xff;    // lsb of counter value
-       outb(byte, base_address + counter_number);
+       outb(byte, base_address + (counter_number << regshift));
        byte = (count >> 8) & 0xff;     // msb of counter value
-       outb(byte, base_address + counter_number);
+       outb(byte, base_address + (counter_number << regshift));
 
        return 0;
 }
 
-static inline int i8254_mm_load(void *base_address,
+static inline int i8254_mm_load(void *base_address, unsigned int regshift,
        unsigned int counter_number, unsigned int count, unsigned int mode)
 {
        unsigned int byte;
@@ -258,17 +258,18 @@ static inline int i8254_mm_load(void *base_address,
        byte = counter_number << 6;
        byte |= 0x30;   // load low then high byte
        byte |= (mode << 1);    // set counter mode
-       writeb(byte, base_address + i8254_control_reg);
+       writeb(byte, base_address + (i8254_control_reg << regshift));
        byte = count & 0xff;    // lsb of counter value
-       writeb(byte, base_address + counter_number);
+       writeb(byte, base_address + (counter_number << regshift));
        byte = (count >> 8) & 0xff;     // msb of counter value
-       writeb(byte, base_address + counter_number);
+       writeb(byte, base_address + (counter_number << regshift));
 
        return 0;
 }
 
 /* Returns 16 bit counter value, should work for 8253 also.*/
-static inline int i8254_read(unsigned long base_address, unsigned int counter_number)
+static inline int i8254_read(unsigned long base_address, unsigned int regshift,
+       unsigned int counter_number)
 {
        unsigned int byte;
        int ret;
@@ -277,61 +278,61 @@ static inline int i8254_read(unsigned long base_address, unsigned int counter_nu
 
        // latch counter
        byte = counter_number << 6;
-       outb(byte, base_address + i8254_control_reg);
+       outb(byte, base_address + (i8254_control_reg << regshift));
 
        // read lsb
-       ret = inb(base_address + counter_number);
+       ret = inb(base_address + (counter_number << regshift));
        // read msb
-       ret += inb(base_address + counter_number) << 8;
+       ret += inb(base_address + (counter_number << regshift)) << 8;
 
        return ret;
 }
 
-static inline int i8254_mm_read(void *base_address, unsigned int counter_number)
+static inline int i8254_mm_read(void *base_address, unsigned int regshift,
+       unsigned int counter_number)
 {
        unsigned int byte;
        int ret;
-       static const int counter_control = 3;
 
        if(counter_number > 2) return -1;
 
        // latch counter
        byte = counter_number << 6;
-       writeb(byte, base_address + counter_control);
+       writeb(byte, base_address + (i8254_control_reg << regshift));
 
        // read lsb
-       ret = readb(base_address + counter_number);
+       ret = readb(base_address + (counter_number << regshift));
        // read msb
-       ret += readb(base_address + counter_number) << 8;
+       ret += readb(base_address + (counter_number << regshift)) << 8;
 
        return ret;
 }
 
 /* Loads 16 bit initial counter value, should work for 8253 also. */
 static inline void i8254_write(unsigned long base_address,
-       unsigned int counter_number, unsigned int count)
+       unsigned int regshift, unsigned int counter_number, unsigned int count)
 {
        unsigned int byte;
 
        if(counter_number > 2) return;
 
        byte = count & 0xff;    // lsb of counter value
-       outb(byte, base_address + counter_number);
+       outb(byte, base_address + (counter_number << regshift));
        byte = (count >> 8) & 0xff;     // msb of counter value
-       outb(byte, base_address + counter_number);
+       outb(byte, base_address + (counter_number << regshift));
 }
 
 static inline void i8254_mm_write(void *base_address,
-       unsigned int counter_number, unsigned int count)
+       unsigned int regshift, unsigned int counter_number, unsigned int count)
 {
        unsigned int byte;
 
        if(counter_number > 2) return;
 
        byte = count & 0xff;    // lsb of counter value
-       writeb(byte, base_address + counter_number);
+       writeb(byte, base_address + (counter_number << regshift));
        byte = (count >> 8) & 0xff;     // msb of counter value
-       writeb(byte, base_address + counter_number);
+       writeb(byte, base_address + (counter_number << regshift));
 }
 
 /* Set counter mode, should work for 8253 also.
@@ -342,10 +343,9 @@ static inline void i8254_mm_write(void *base_address,
  *   I8254_BCD, I8254_BINARY
  */
 static inline int i8254_set_mode(unsigned long base_address,
-       unsigned int counter_number, unsigned int mode)
+       unsigned int regshift, unsigned int counter_number, unsigned int mode)
 {
        unsigned int byte;
-       static const int counter_control = 3;
 
        if(counter_number > 2) return -1;
        if(mode > (I8254_MODE5 | I8254_BINARY)) return -1;
@@ -353,16 +353,15 @@ static inline int i8254_set_mode(unsigned long base_address,
        byte = counter_number << 6;
        byte |= 0x30;   // load low then high byte
        byte |= mode;   // set counter mode and BCD|binary
-       outb(byte, base_address + counter_control);
+       outb(byte, base_address + (i8254_control_reg << regshift));
 
        return 0;
 }
 
 static inline int i8254_mm_set_mode(void *base_address,
-       unsigned int counter_number, unsigned int mode)
+       unsigned int regshift, unsigned int counter_number, unsigned int mode)
 {
        unsigned int byte;
-       static const int counter_control = 3;
 
        if(counter_number > 2) return -1;
        if(mode > (I8254_MODE5 | I8254_BINARY)) return -1;
@@ -370,21 +369,25 @@ static inline int i8254_mm_set_mode(void *base_address,
        byte = counter_number << 6;
        byte |= 0x30;   // load low then high byte
        byte |= mode;   // set counter mode and BCD|binary
-       writeb(byte, base_address + counter_control);
+       writeb(byte, base_address + (i8254_control_reg << regshift));
 
        return 0;
 }
 
-static inline int i8254_status(unsigned long base_address, int counter_number)
+static inline int i8254_status(unsigned long base_address,
+       unsigned int regshift, unsigned int counter_number)
 {
-       outb(0xE0 | (2 << counter_number), base_address + i8254_control_reg);
-       return inb(base_address + counter_number);
+       outb(0xE0 | (2 << counter_number),
+                       base_address + (i8254_control_reg << regshift));
+       return inb(base_address + (counter_number << regshift));
 }
 
-static inline int i8254_mm_status(void *base_address, int counter_number)
+static inline int i8254_mm_status(void *base_address,
+       unsigned int regshift, unsigned int counter_number)
 {
-       writeb(0xE0 | (2 << counter_number), base_address + i8254_control_reg);
-       return readb(base_address + counter_number);
+       writeb(0xE0 | (2 << counter_number),
+                       base_address + (i8254_control_reg << regshift));
+       return readb(base_address + (counter_number << regshift));
 }
 
 #endif

diff --git a/comedi/drivers/amplc_dio200.c b/comedi/drivers/amplc_dio200.c
index eac321f1f0f30b1ef8f04def8dd6415152a94e18..c5203d15439ea090c88d71f999346683e780a466 100644 (file)
--- a/comedi/drivers/amplc_dio200.c
+++ b/comedi/drivers/amplc_dio200.c
@@ -992,7 +992,7 @@ dio200_subdev_8254_read(comedi_device *dev, comedi_subdevice *s,
        dio200_subdev_8254 *subpriv = s->private;
        int chan = CR_CHAN(insn->chanspec);
 
-       data[0] = i8254_read(subpriv->iobase, chan);
+       data[0] = i8254_read(subpriv->iobase, 0, chan);
 
        return 1;
 }
@@ -1007,7 +1007,7 @@ dio200_subdev_8254_write(comedi_device *dev, comedi_subdevice *s,
        dio200_subdev_8254 *subpriv = s->private;
        int chan = CR_CHAN(insn->chanspec);
 
-       i8254_write(subpriv->iobase, chan, data[0]);
+       i8254_write(subpriv->iobase, 0, chan, data[0]);
 
        return 1;
 }
@@ -1094,11 +1094,11 @@ dio200_subdev_8254_config(comedi_device *dev, comedi_subdevice *s,
 
        switch (data[0]) {
        case INSN_CONFIG_8254_SET_MODE:
-               ret = i8254_set_mode(subpriv->iobase, chan, data[1]);
+               ret = i8254_set_mode(subpriv->iobase, 0, chan, data[1]);
                if (ret < 0) return -EINVAL;
                break;
        case INSN_CONFIG_8254_READ_STATUS:
-               data[1] = i8254_status(subpriv->iobase, chan);
+               data[1] = i8254_status(subpriv->iobase, 0, chan);
                break;
        case INSN_CONFIG_SET_GATE_SRC:
                ret = dio200_set_gate_src(subpriv, chan, data[2]);
@@ -1168,7 +1168,7 @@ dio200_subdev_8254_init(comedi_device *dev, comedi_subdevice *s,
 
        /* Initialize channels. */
        for (chan = 0; chan < 3; chan++) {
-               i8254_set_mode(subpriv->iobase, chan,
+               i8254_set_mode(subpriv->iobase, 0, chan,
                                I8254_MODE0 | I8254_BINARY);
                if (subpriv->has_clk_gat_sce) {
                        /* Gate source 0 is VCC (logic 1). */

diff --git a/comedi/drivers/amplc_pci224.c b/comedi/drivers/amplc_pci224.c
index 739953f0cd6e8a5791a16fee5ec189f16d5d1878..530b42cd58039d6d2386e77b10bb2dc374c8f757 100644 (file)
--- a/comedi/drivers/amplc_pci224.c
+++ b/comedi/drivers/amplc_pci224.c
@@ -1106,14 +1106,14 @@ pci224_ao_cmd(comedi_device *dev, comedi_subdevice *s)
                        outb(CLK_CONFIG(2, CLK_10MHZ),
                                        devpriv->iobase1 + PCI224_ZCLK_SCE);
                        /* Load Z2-2 mode (2) and counter (div1). */
-                       i8254_load(devpriv->iobase1 + PCI224_Z2_CT0,
+                       i8254_load(devpriv->iobase1 + PCI224_Z2_CT0, 0,
                                        2, div1, 2);
                        /* Z2-0 is clocked from Z2-2's output. */
                        outb(CLK_CONFIG(0, CLK_OUTNM1),
                                        devpriv->iobase1 + PCI224_ZCLK_SCE);
                }
                /* Load Z2-0 mode (2) and counter (div2). */
-               i8254_load(devpriv->iobase1 + PCI224_Z2_CT0, 0, div2, 2);
+               i8254_load(devpriv->iobase1 + PCI224_Z2_CT0, 0, 0, div2, 2);
        }
 
        /*

diff --git a/comedi/drivers/amplc_pci230.c b/comedi/drivers/amplc_pci230.c
index 3ae203399bd0e4b58828c4ecfff39f4093f096f0..1616e37af48bbe8b4e7ab1ecc350eebdaa2a3b60 100644 (file)
--- a/comedi/drivers/amplc_pci230.c
+++ b/comedi/drivers/amplc_pci230.c
@@ -1282,7 +1282,7 @@ static void pci230_setup_monostable_ct0(comedi_device *dev, unsigned int ns, uns
 
        devpriv->divisor0=pulse_duration/devpriv->clk_src0;
 
-       i8254_load(devpriv->pci_iobase + PCI230_Z2_CT0, 0, devpriv->divisor0, 1);       /* Counter 1, mode 1 */
+       i8254_load(devpriv->pci_iobase + PCI230_Z2_CT0, 0, 0, devpriv->divisor0, 1);    /* Counter 1, mode 1 */
 
        /* PCI 230 specific - ties up counter clk input with correct clk source */
        switch (devpriv->clk_src0) {
@@ -1361,7 +1361,7 @@ static void pci230_z2_ct1(comedi_device *dev, unsigned int *ns,int round)
        i8253_single_ns_to_timer(devpriv->clk_src1, &devpriv->divisor1, ns, TRIG_ROUND_MASK);
 
        /* Generic i8254_load calls; program counters' divide ratios. */
-       i8254_load(devpriv->pci_iobase + PCI230_Z2_CT0, 1, devpriv->divisor1, 3);       /* Counter 1, divisor1, square wave (8254 mode 3). */
+       i8254_load(devpriv->pci_iobase + PCI230_Z2_CT0, 0, 1, devpriv->divisor1, 3);    /* Counter 1, divisor1, square wave (8254 mode 3). */
 
        /* PCI 230 specific - ties up counter clk input with clk source */
        switch (devpriv->clk_src1) {
@@ -1388,7 +1388,7 @@ static void pci230_z2_ct1(comedi_device *dev, unsigned int *ns,int round)
 static void pci230_cancel_ct1(comedi_device *dev)
 {
        devpriv->divisor1 = 0;
-       i8254_load(devpriv->pci_iobase + PCI230_Z2_CT0, 1, devpriv->divisor1, 0);       /* Counter 1, divisor1, 8254 mode 0. */
+       i8254_load(devpriv->pci_iobase + PCI230_Z2_CT0, 0, 1, devpriv->divisor1, 0);    /* Counter 1, divisor1, 8254 mode 0. */
 }
 
 /*
@@ -1401,7 +1401,7 @@ static void pci230_z2_ct2(comedi_device *dev, unsigned int *ns,int round)
        i8253_single_ns_to_timer(devpriv->clk_src2, &devpriv->divisor2, ns, TRIG_ROUND_MASK);
 
        /* Generic i8254_load calls; program counters' divide ratios. */
-       i8254_load(devpriv->pci_iobase + PCI230_Z2_CT0, 2, devpriv->divisor2, 3);       /* Counter 2, divisor2, square wave (8254 mode 3). */
+       i8254_load(devpriv->pci_iobase + PCI230_Z2_CT0, 0, 2, devpriv->divisor2, 3);    /* Counter 2, divisor2, square wave (8254 mode 3). */
 
        /* PCI 230 specific - ties up counter clk input with clk source */
        switch (devpriv->clk_src2) {
@@ -1428,7 +1428,7 @@ static void pci230_z2_ct2(comedi_device *dev, unsigned int *ns,int round)
 static void pci230_cancel_ct2(comedi_device *dev)
 {
        devpriv->divisor2 = 0;
-       i8254_load(devpriv->pci_iobase + PCI230_Z2_CT0, 2, devpriv->divisor2, 0);       /* Counter 2, divisor2, 8254 mode 0. */
+       i8254_load(devpriv->pci_iobase + PCI230_Z2_CT0, 0, 2, devpriv->divisor2, 0);    /* Counter 2, divisor2, 8254 mode 0. */
 }
 
 /* Interrupt handler */

diff --git a/comedi/drivers/cb_pcidas.c b/comedi/drivers/cb_pcidas.c
index 4c80aeb07a1ba48ca9e72cb63e8f6b8259fc1b2d..28f155be21d04739ad2b0fe1b4b975106714d507 100644 (file)
--- a/comedi/drivers/cb_pcidas.c
+++ b/comedi/drivers/cb_pcidas.c
@@ -1410,8 +1410,8 @@ static int cb_pcidas_ao_cmd(comedi_device *dev,comedi_subdevice *s)
                        cmd->flags);
 
                /* Write the values of ctr1 and ctr2 into counters 1 and 2 */
-               i8254_load(devpriv->pacer_counter_dio + DAC8254, 1, devpriv->ao_divisor1, 2);
-               i8254_load(devpriv->pacer_counter_dio + DAC8254, 2, devpriv->ao_divisor2, 2);
+               i8254_load(devpriv->pacer_counter_dio + DAC8254, 0, 1, devpriv->ao_divisor1, 2);
+               i8254_load(devpriv->pacer_counter_dio + DAC8254, 0, 2, devpriv->ao_divisor2, 2);
        }
 
        // set number of conversions
@@ -1708,8 +1708,8 @@ static void cb_pcidas_load_counters(comedi_device *dev, unsigned int *ns, int ro
                &(devpriv->divisor2), ns, rounding_flags & TRIG_ROUND_MASK);
 
        /* Write the values of ctr1 and ctr2 into counters 1 and 2 */
-       i8254_load(devpriv->pacer_counter_dio + ADC8254, 1, devpriv->divisor1, 2);
-       i8254_load(devpriv->pacer_counter_dio + ADC8254, 2, devpriv->divisor2, 2);
+       i8254_load(devpriv->pacer_counter_dio + ADC8254, 0, 1, devpriv->divisor1, 2);
+       i8254_load(devpriv->pacer_counter_dio + ADC8254, 0, 2, devpriv->divisor2, 2);
 }
 
 static void write_calibration_bitstream( comedi_device *dev, unsigned int register_bits,

diff --git a/comedi/drivers/das16.c b/comedi/drivers/das16.c
index 7897f8f2c3ab8fbd114ec041d1760426786277c7..2132791b09f2e647bc436758a2a240a3466a1673 100644 (file)
--- a/comedi/drivers/das16.c
+++ b/comedi/drivers/das16.c
@@ -1296,8 +1296,8 @@ static unsigned int das16_set_pacer(comedi_device *dev, unsigned int ns, int rou
                &(devpriv->divisor2), &ns, rounding_flags & TRIG_ROUND_MASK);
 
        /* Write the values of ctr1 and ctr2 into counters 1 and 2 */
-       i8254_load(dev->iobase + DAS16_CNTR0_DATA, 1, devpriv->divisor1, 2);
-       i8254_load(dev->iobase + DAS16_CNTR0_DATA, 2, devpriv->divisor2, 2);
+       i8254_load(dev->iobase + DAS16_CNTR0_DATA, 0, 1, devpriv->divisor1, 2);
+       i8254_load(dev->iobase + DAS16_CNTR0_DATA, 0, 2, devpriv->divisor2, 2);
 
        return ns;
 }

diff --git a/comedi/drivers/das16m1.c b/comedi/drivers/das16m1.c
index 260b17c2432c435ec13a006afdc0f906f730f3df..a68c8e44595430a26f0257bec2c54da21ce2308a 100644 (file)
--- a/comedi/drivers/das16m1.c
+++ b/comedi/drivers/das16m1.c
@@ -332,10 +332,10 @@ static int das16m1_cmd_exec(comedi_device *dev,comedi_subdevice *s)
        /* Initialize lower half of hardware counter, used to determine how
         * many samples are in fifo.  Value doesn't actually load into counter
         * until counter's next clock (the next a/d conversion) */
-       i8254_load(dev->iobase + DAS16M1_8254_FIRST, 1, 0, 2);
+       i8254_load(dev->iobase + DAS16M1_8254_FIRST, 0, 1, 0, 2);
        /* remember current reading of counter so we know when counter has
         * actually been loaded */
-       devpriv->initial_hw_count = i8254_read(dev->iobase + DAS16M1_8254_FIRST, 1);
+       devpriv->initial_hw_count = i8254_read(dev->iobase + DAS16M1_8254_FIRST, 0, 1);
        /* setup channel/gain queue */
        for(i = 0; i < cmd->chanlist_len; i++)
        {
@@ -520,7 +520,7 @@ static void das16m1_handler(comedi_device *dev, unsigned int status)
        cmd = &async->cmd;
 
        // figure out how many samples are in fifo
-       hw_counter = i8254_read(dev->iobase + DAS16M1_8254_FIRST, 1);
+       hw_counter = i8254_read(dev->iobase + DAS16M1_8254_FIRST, 0, 1);
        /* make sure hardware counter reading is not bogus due to initial value
         * not having been loaded yet */
        if(devpriv->adc_count == 0 && hw_counter == devpriv->initial_hw_count)
@@ -581,8 +581,8 @@ static unsigned int das16m1_set_pacer(comedi_device *dev, unsigned int ns, int r
                &(devpriv->divisor2), &ns, rounding_flags & TRIG_ROUND_MASK);
 
        /* Write the values of ctr1 and ctr2 into counters 1 and 2 */
-       i8254_load(dev->iobase + DAS16M1_8254_SECOND, 1, devpriv->divisor1, 2);
-       i8254_load(dev->iobase + DAS16M1_8254_SECOND, 2, devpriv->divisor2, 2);
+       i8254_load(dev->iobase + DAS16M1_8254_SECOND, 0, 1, devpriv->divisor1, 2);
+       i8254_load(dev->iobase + DAS16M1_8254_SECOND, 0, 2, devpriv->divisor2, 2);
 
        return ns;
 }

diff --git a/comedi/drivers/das1800.c b/comedi/drivers/das1800.c
index b3d9ee71f23bd9d70a13c40b28cefce746e59747..532f42bf8aea266ae922ee1e2cac991823546c10 100644 (file)
--- a/comedi/drivers/das1800.c
+++ b/comedi/drivers/das1800.c
@@ -1422,7 +1422,7 @@ static int setup_counters(comedi_device *dev, comedi_cmd cmd)
        if(cmd.stop_src == TRIG_EXT)
        {
                // load counter 0 in mode 0
-               i8254_load(dev->iobase + DAS1800_COUNTER, 0, 1, 0);
+               i8254_load(dev->iobase + DAS1800_COUNTER, 0, 0, 1, 0);
        }
 
        return 0;
@@ -1688,9 +1688,9 @@ static int das1800_set_frequency(comedi_device *dev)
        int err = 0;
 
        // counter 1, mode 2
-       if(i8254_load(dev->iobase + DAS1800_COUNTER, 1, devpriv->divisor1, 2)) err++;
+       if(i8254_load(dev->iobase + DAS1800_COUNTER, 0, 1, devpriv->divisor1, 2)) err++;
        // counter 2, mode 2
-       if(i8254_load(dev->iobase + DAS1800_COUNTER, 2, devpriv->divisor2, 2)) err++;
+       if(i8254_load(dev->iobase + DAS1800_COUNTER, 0, 2, devpriv->divisor2, 2)) err++;
        if(err)
                return -1;
 

diff --git a/comedi/drivers/das800.c b/comedi/drivers/das800.c
index 007fde7917eb23e6bb98bccb5a76457f3e1fbf29..729742af8996128582e57594eaf60d4a43921dbb 100644 (file)
--- a/comedi/drivers/das800.c
+++ b/comedi/drivers/das800.c
@@ -902,8 +902,8 @@ static int das800_set_frequency(comedi_device *dev)
 {
        int err = 0;
 
-       if(i8254_load(dev->iobase + DAS800_8254, 1, devpriv->divisor1, 2)) err++;
-       if(i8254_load(dev->iobase + DAS800_8254, 2, devpriv->divisor2, 2)) err++;
+       if(i8254_load(dev->iobase + DAS800_8254, 0, 1, devpriv->divisor1, 2)) err++;
+       if(i8254_load(dev->iobase + DAS800_8254, 0, 2, devpriv->divisor2, 2)) err++;
        if(err)
                return -1;
 

diff --git a/comedi/drivers/ni_at_a2150.c b/comedi/drivers/ni_at_a2150.c
index 7059591a8d27e7ccbb30c5418ce1ff93f7676313..f99aec58cc3610e48a0cb31a0ebc072d7407d418 100644 (file)
--- a/comedi/drivers/ni_at_a2150.c
+++ b/comedi/drivers/ni_at_a2150.c
@@ -709,7 +709,7 @@ static int a2150_ai_cmd(comedi_device *dev, comedi_subdevice *s)
        outw(devpriv->irq_dma_bits, dev->iobase + IRQ_DMA_CNTRL_REG);
 
        // may need to wait 72 sampling periods if timing was changed
-       i8254_load(dev->iobase + I8253_BASE_REG, 2, 72, 0);
+       i8254_load(dev->iobase + I8253_BASE_REG, 0, 2, 72, 0);
 
        // setup start triggering
        trigger_bits = 0;

diff --git a/comedi/drivers/ni_labpc.c b/comedi/drivers/ni_labpc.c
index d268316c439a1a926317f4db04150dea9aae38e4..ea281968cd60b025b6d68fe63e7635e9c90a9cd4 100644 (file)
--- a/comedi/drivers/ni_labpc.c
+++ b/comedi/drivers/ni_labpc.c
@@ -461,9 +461,9 @@ static inline int labpc_counter_load(comedi_device *dev, unsigned long base_addr
        unsigned int counter_number, unsigned int count, unsigned int mode)
 {
        if(thisboard->memory_mapped_io)
-               return i8254_mm_load((void*)base_address, counter_number, count, mode);
+               return i8254_mm_load((void*)base_address, 0, counter_number, count, mode);
        else
-               return i8254_load(base_address, counter_number, count, mode);
+               return i8254_load(base_address, 0, counter_number, count, mode);
 }
 
 int labpc_common_attach( comedi_device *dev, unsigned long iobase,