[PATCH 7/9] staging: comedi: ke_counter: add digital output support
H Hartley Sweeten
hsweeten at visionengravers.com
Mon Mar 3 23:47:41 UTC 2014
The hardware has three digital output channels. Add the subdevice
support for these channels.
Signed-off-by: H Hartley Sweeten <hsweeten at visionengravers.com>
Cc: Ian Abbott <abbotti at mev.co.uk>
Cc: Greg Kroah-Hartman <gregkh at linuxfoundation.org>
---
drivers/staging/comedi/drivers/ke_counter.c | 23 ++++++++++++++++++++++-
1 file changed, 22 insertions(+), 1 deletion(-)
diff --git a/drivers/staging/comedi/drivers/ke_counter.c b/drivers/staging/comedi/drivers/ke_counter.c
index aab72ab..3b57a52 100644
--- a/drivers/staging/comedi/drivers/ke_counter.c
+++ b/drivers/staging/comedi/drivers/ke_counter.c
@@ -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));
--
1.8.5.2
More information about the devel
mailing list