staging: comedi: ke_counter: add digital output support
authorH Hartley Sweeten <hsweeten@visionengravers.com>
Mon, 3 Mar 2014 23:47:41 +0000 (16:47 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 5 Mar 2014 00:40:27 +0000 (16:40 -0800)
The hardware has three digital output channels. Add the subdevice
support for these channels.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/comedi/drivers/ke_counter.c

index aab72ab3434e31c7959b761be08a1a91ff0a7a70..3b57a52e0d3ae9bcc3300af8f901328b1b15f5e0 100644 (file)
@@ -95,6 +95,19 @@ static int ke_counter_insn_read(struct comedi_device *dev,
        return insn->n;
 }
 
+static int ke_counter_do_insn_bits(struct comedi_device *dev,
+                                  struct comedi_subdevice *s,
+                                  struct comedi_insn *insn,
+                                  unsigned int *data)
+{
+       if (comedi_dio_update_state(s, data))
+               outb(s->state, dev->iobase + KE_DO_REG);
+
+       data[1] = s->state;
+
+       return insn->n;
+}
+
 static int ke_counter_auto_attach(struct comedi_device *dev,
                                  unsigned long context_unused)
 {
@@ -107,7 +120,7 @@ static int ke_counter_auto_attach(struct comedi_device *dev,
                return ret;
        dev->iobase = pci_resource_start(pcidev, 0);
 
-       ret = comedi_alloc_subdevices(dev, 1);
+       ret = comedi_alloc_subdevices(dev, 2);
        if (ret)
                return ret;
 
@@ -120,6 +133,14 @@ static int ke_counter_auto_attach(struct comedi_device *dev,
        s->insn_read    = ke_counter_insn_read;
        s->insn_write   = ke_counter_insn_write;
 
+       s = &dev->subdevices[1];
+       s->type         = COMEDI_SUBD_DO;
+       s->subdev_flags = SDF_WRITABLE;
+       s->n_chan       = 3;
+       s->maxdata      = 1;
+       s->range_table  = &range_digital;
+       s->insn_bits    = ke_counter_do_insn_bits;
+
        outb(KE_OSC_SEL_20MHZ, dev->iobase + KE_OSC_SEL_REG);
 
        outb(0, dev->iobase + KE_RESET_REG(0));