On Thursday, May 29, 2014 9:43 PM, Chase Southwood wrote:
> This board supports an interrupt that can be generated by an AND/OR
> combination of 16 of the input channels.
>
> Create a separate subdevice to handle this interrupt.
>
> Signed-off-by: Chase Southwood <chase.southw...@gmail.com>
> Cc: Ian Abbott <abbo...@mev.co.uk>
> Cc: H Hartley Sweeten <hswee...@visionengravers.com>
> ---
> drivers/staging/comedi/drivers/addi_apci_1564.c | 16 +++++++++++++++-
> 1 file changed, 15 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/staging/comedi/drivers/addi_apci_1564.c
> b/drivers/staging/comedi/drivers/addi_apci_1564.c
> index 5901143..183fdc3 100644
> --- a/drivers/staging/comedi/drivers/addi_apci_1564.c
> +++ b/drivers/staging/comedi/drivers/addi_apci_1564.c
> @@ -105,7 +105,7 @@ static int apci1564_auto_attach(struct comedi_device *dev,
> dev->irq = pcidev->irq;
> }
>
> - ret = comedi_alloc_subdevices(dev, 3);
> + ret = comedi_alloc_subdevices(dev, 4);
> if (ret)
> return ret;
>
> @@ -144,6 +144,20 @@ static int apci1564_auto_attach(struct comedi_device
> *dev,
> s->insn_read = apci1564_timer_read;
> s->insn_config = apci1564_timer_config;
>
> + /* Change-Of-State (COS) interrupt subdevice */
> + s = &dev->subdevices[3];
> + if (dev->irq) {
> + dev->read_subdev = s;
> + s->type = COMEDI_SUBD_DI;
> + s->subdev_flags = SDF_READABLE | SDF_CMD_READ;
> + s->n_chan = 1;
> + s->maxdata = 1;
> + s->range_table = &range_digital;
> + s->len_chanlist = 1;
> + } else {
> + s->type = COMEDI_SUBD_UNUSED;
> + }
> +
> return 0;
> }
This patch could be merged with patch 5/6 but not a big deal.
Reviewed-by: H Hartley Sweeten <hswee...@visionengravers.com>
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
