From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751404AbaEXWYc (ORCPT ); Sat, 24 May 2014 18:24:32 -0400 Received: from mail-ie0-f172.google.com ([209.85.223.172]:57780 "EHLO mail-ie0-f172.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751282AbaEXWYb (ORCPT ); Sat, 24 May 2014 18:24:31 -0400 From: Chase Southwood To: gregkh@linuxfoundation.org Cc: abbotti@mev.co.uk, hsweeten@visionengravers.com, devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org, Chase Southwood Subject: [PATCH 1/3] staging: comedi: addi_apci_1564: add a subdevice for Change-of-State interrupt support Date: Sat, 24 May 2014 17:24:18 -0500 Message-Id: <1400970258-20475-1-git-send-email-chase.southwood@gmail.com> X-Mailer: git-send-email 1.9.0 In-Reply-To: <1400970182-20196-1-git-send-email-chase.southwood@gmail.com> References: <1400970182-20196-1-git-send-email-chase.southwood@gmail.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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. In doing this, this patch moves the apci1564_di_config() operation from the digital input subdevice to this new subdevice, and also renames it to make it more apparent that it is the config operation for the COS interrupt. Signed-off-by: Chase Southwood Cc: Ian Abbott Cc: H Hartley Sweeten --- .../staging/comedi/drivers/addi-data/hwdrv_apci1564.c | 8 ++++---- drivers/staging/comedi/drivers/addi_apci_1564.c | 18 ++++++++++++++++-- 2 files changed, 20 insertions(+), 6 deletions(-) diff --git a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1564.c b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1564.c index 0ba5385..a38ccf9 100644 --- a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1564.c +++ b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1564.c @@ -101,10 +101,10 @@ static unsigned int ui_InterruptData, ui_Type; * data[2] Interrupt mask for the mode 1 * data[3] Interrupt mask for the mode 2 */ -static int apci1564_di_config(struct comedi_device *dev, - struct comedi_subdevice *s, - struct comedi_insn *insn, - unsigned int *data) +static int apci1564_cos_insn_config(struct comedi_device *dev, + struct comedi_subdevice *s, + struct comedi_insn *insn, + unsigned int *data) { struct addi_private *devpriv = dev->private; diff --git a/drivers/staging/comedi/drivers/addi_apci_1564.c b/drivers/staging/comedi/drivers/addi_apci_1564.c index 13d9962..6af1e4c 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; @@ -117,7 +117,6 @@ static int apci1564_auto_attach(struct comedi_device *dev, s->maxdata = 1; s->len_chanlist = 32; s->range_table = &range_digital; - s->insn_config = apci1564_di_config; s->insn_bits = apci1564_di_insn_bits; /* Allocate and Initialise DO Subdevice Structures */ @@ -144,6 +143,21 @@ 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->len_chanlist = 1; + s->range_table = &range_digital; + s->insn_config = apci1564_cos_insn_config; + } else { + s->type = COMEDI_SUBD_UNUSED; + } + return 0; } -- 1.9.0