Commit 8f567c37 authored by H Hartley Sweeten's avatar H Hartley Sweeten Committed by Greg Kroah-Hartman
Browse files

staging: comedi: new adl_pci7x3x driver 



Currently the ADLink PCI-7230 and PCI-7432 Isolated Digital
I/O Boards are supported using two drivers (adl_pci7230 and
adl_pci7432). These drivers are very similar and only differ
in the total number of di/do channels provided.

This driver combines the support for both boards into one
common driver. In addition, it adds PCI PnP support for the
other boards in the ADLink PCI-723x and PCI-743x series.

This driver only supports the comedi PCI auto config attach
mechanism. The legacy attach using the comedi_config utility
is not supported or required by this driver.

Signed-off-by: default avatarH Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 0d7614f0

drivers/staging/comedi/Kconfig

+11 −0
Original line number Diff line number Diff line
@@ -676,6 +676,17 @@ config COMEDI_ADL_PCI6208 
	  To compile this driver as a module, choose M here: the module will be

	  called adl_pci6208.



config COMEDI_ADL_PCI7X3X

	tristate "ADLink PCI-723X/743X isolated digital i/o board support"

	---help---

	  Enable support for ADlink PCI-723X/743X isolated digital i/o boards.

	  Supported boards include the 32-channel PCI-7230 (16 in/16 out),

	  PCI-7233 (32 in), and PCI-7234 (32 out) as well as the 64-channel

	  PCI-7432 (32 in/32 out), PCI-7433 (64 in), and PCI-7434 (64 out).



	  To compile this driver as a module, choose M here: the module will be

	  called adl_pci7x3x.



config COMEDI_ADL_PCI7230

	tristate "ADLink PCI-7230 digital io board support"

	---help---

drivers/staging/comedi/drivers/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -69,6 +69,7 @@ obj-$(CONFIG_COMEDI_ADDI_APCI_3120) += addi_apci_3120.o 
obj-$(CONFIG_COMEDI_ADDI_APCI_3501)	+= addi_apci_3501.o

obj-$(CONFIG_COMEDI_ADDI_APCI_3XXX)	+= addi_apci_3xxx.o

obj-$(CONFIG_COMEDI_ADL_PCI6208)	+= adl_pci6208.o

obj-$(CONFIG_COMEDI_ADL_PCI7X3X)	+= adl_pci7x3x.o

obj-$(CONFIG_COMEDI_ADL_PCI7230)	+= adl_pci7230.o

obj-$(CONFIG_COMEDI_ADL_PCI7296)	+= adl_pci7296.o

obj-$(CONFIG_COMEDI_ADL_PCI7432)	+= adl_pci7432.o

drivers/staging/comedi/drivers/adl_pci7x3x.c

0 → 100644
+342 −0
Original line number Diff line number Diff line 
/*

 * COMEDI driver for the ADLINK PCI-723x/743x series boards.

 * Copyright (C) 2012 H Hartley Sweeten <hsweeten@visionengravers.com>

 *

 * Based on the adl_pci7230 driver written by:

 *	David Fernandez <dfcastelao@gmail.com>

 * and the adl_pci7432 driver written by:

 *	Michel Lachaine <mike@mikelachaine.ca>

 *

 * COMEDI - Linux Control and Measurement Device Interface

 * Copyright (C) 2000 David A. Schleef <ds@schleef.org>

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License as published by

 * the Free Software Foundation; either version 2 of the License, or

 * (at your option) any later version.

 *

 * This program is distributed in the hope that it will be useful,

 * but WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 * GNU General Public License for more details.

 *

 * You should have received a copy of the GNU General Public License

 * along with this program; if not, write to the Free Software

 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.

 */



/*

Driver: adl_pci7x3x

Description: 32/64-Channel Isolated Digital I/O Boards

Devices: (ADLink) PCI-7230 [adl_pci7230] - 16 input / 16 output

	 (ADLink) PCI-7233 [adl_pci7233] - 32 input

	 (ADLink) PCI-7234 [adl_pci7234] - 32 output

	 (ADLink) PCI-7432 [adl_pci7432] - 32 input / 32 output

	 (ADLink) PCI-7433 [adl_pci7433] - 64 input

	 (ADLink) PCI-7434 [adl_pci7434] - 64 output

Author: H Hartley Sweeten <hsweeten@visionengravers.com>

Updated: Thu, 02 Aug 2012 14:27:46 -0700

Status: untested



This driver only attaches using the PCI PnP auto config support

in the comedi core. The module parameter 'comedi_autoconfig'

must be 1 (default) to enable this feature. The COMEDI_DEVCONFIG

ioctl, used by the comedi_config utility, is not supported by

this driver.



The PCI-7230, PCI-7432 and PCI-7433 boards also support external

interrupt signals on digital input channels 0 and 1. The PCI-7233

has dual-interrupt sources for change-of-state (COS) on any 16

digital input channels of LSB and for COS on any 16 digital input

lines of MSB. Interrupts are not currently supported by this

driver.



Configuration Options: not applicable

*/



#include "../comedidev.h"



/*

 * PCI Device ID's supported by this driver

 */

#define PCI_DEVICE_ID_PCI7230	0x7230

#define PCI_DEVICE_ID_PCI7233	0x7233

#define PCI_DEVICE_ID_PCI7234	0x7234

#define PCI_DEVICE_ID_PCI7432	0x7432

#define PCI_DEVICE_ID_PCI7433	0x7433

#define PCI_DEVICE_ID_PCI7434	0x7434



/*

 * Register I/O map (32-bit access only)

 */

#define PCI7X3X_DIO_REG		0x00

#define PCI743X_DIO_REG		0x04



struct adl_pci7x3x_boardinfo {

	const char *name;

	unsigned short device;

	int nsubdevs;

	int di_nchan;

	int do_nchan;

};



static const struct adl_pci7x3x_boardinfo adl_pci7x3x_boards[] = {

	{

		.name		= "adl_pci7230",

		.device		= PCI_DEVICE_ID_PCI7230,

		.nsubdevs	= 2,

		.di_nchan	= 16,

		.do_nchan	= 16,

	}, {

		.name		= "adl_pci7233",

		.device		= PCI_DEVICE_ID_PCI7233,

		.nsubdevs	= 1,

		.di_nchan	= 32,

	}, {

		.name		= "adl_pci7234",

		.device		= PCI_DEVICE_ID_PCI7234,

		.nsubdevs	= 1,

		.do_nchan	= 32,

	}, {

		.name		= "adl_pci7432",

		.device		= PCI_DEVICE_ID_PCI7432,

		.nsubdevs	= 2,

		.di_nchan	= 32,

		.do_nchan	= 32,

	}, {

		.name		= "adl_pci7433",

		.device		= PCI_DEVICE_ID_PCI7433,

		.nsubdevs	= 2,

		.di_nchan	= 64,

	}, {

		.name		= "adl_pci7434",

		.device		= PCI_DEVICE_ID_PCI7434,

		.nsubdevs	= 2,

		.do_nchan	= 64,

	}

};



static int adl_pci7x3x_do_insn_bits(struct comedi_device *dev,

				    struct comedi_subdevice *s,

				    struct comedi_insn *insn,

				    unsigned int *data)

{

	unsigned int reg = (unsigned int)s->private;

	unsigned int mask = data[0];

	unsigned int bits = data[1];



	if (mask) {

		s->state &= ~mask;

		s->state |= (bits & mask);



		outl(s->state, dev->iobase + reg);

	}



	/*

	 * NOTE: The output register is not readable.

	 * This returned state will not be correct until all the

	 * outputs have been updated.

	 */

	data[1] = s->state;



	return insn->n;

}



static int adl_pci7x3x_di_insn_bits(struct comedi_device *dev,

				    struct comedi_subdevice *s,

				    struct comedi_insn *insn,

				    unsigned int *data)

{

	unsigned int reg = (unsigned int)s->private;



	data[1] = inl(dev->iobase + reg);



	return insn->n;

}



static const void *adl_pci7x3x_find_boardinfo(struct comedi_device *dev,

					      struct pci_dev *pcidev)

{

	const struct adl_pci7x3x_boardinfo *board;

	int i;



	for (i = 0; i < ARRAY_SIZE(adl_pci7x3x_boards); i++) {

		board = &adl_pci7x3x_boards[i];

		if (pcidev->device == board->device)

			return board;

	}

	return NULL;

}



static int adl_pci7x3x_attach_pci(struct comedi_device *dev,

				  struct pci_dev *pcidev)

{

	const struct adl_pci7x3x_boardinfo *board;

	struct comedi_subdevice *s;

	int subdev;

	int nchan;

	int ret;



	comedi_set_hw_dev(dev, &pcidev->dev);



	board = adl_pci7x3x_find_boardinfo(dev, pcidev);

	if (!board)

		return -ENODEV;

	dev->board_ptr = board;

	dev->board_name = board->name;



	ret = comedi_pci_enable(pcidev, dev->board_name);

	if (ret)

		return ret;

	dev->iobase = pci_resource_start(pcidev, 2);



	/*

	 * One or two subdevices are setup by this driver depending on

	 * the number of digital inputs and/or outputs provided by the

	 * board. Each subdevice has a maximum of 32 channels.

	 *

	 *	PCI-7230 - 2 subdevices: 0 - 16 input, 1 - 16 output

	 *	PCI-7233 - 1 subdevice: 0 - 32 input

	 *	PCI-7234 - 1 subdevice: 0 - 32 output

	 *	PCI-7432 - 2 subdevices: 0 - 32 input, 1 - 32 output

	 *	PCI-7433 - 2 subdevices: 0 - 32 input, 1 - 32 input

	 *	PCI-7434 - 2 subdevices: 0 - 32 output, 1 - 32 output

	 */

	ret = comedi_alloc_subdevices(dev, board->nsubdevs);

	if (ret)

		return ret;



	subdev = 0;



	if (board->di_nchan) {

		nchan = min(board->di_nchan, 32);



		s = dev->subdevices + subdev;

		/* Isolated digital inputs 0 to 15/31 */

		s->type		= COMEDI_SUBD_DI;

		s->subdev_flags	= SDF_READABLE;

		s->n_chan	= nchan;

		s->maxdata	= 1;

		s->insn_bits	= adl_pci7x3x_di_insn_bits;

		s->range_table	= &range_digital;



		s->private	= (void *)PCI7X3X_DIO_REG;



		subdev++;



		nchan = board->di_nchan - nchan;

		if (nchan) {

			s = dev->subdevices + subdev;

			/* Isolated digital inputs 32 to 63 */

			s->type		= COMEDI_SUBD_DI;

			s->subdev_flags	= SDF_READABLE;

			s->n_chan	= nchan;

			s->maxdata	= 1;

			s->insn_bits	= adl_pci7x3x_di_insn_bits;

			s->range_table	= &range_digital;



			s->private	= (void *)PCI743X_DIO_REG;



			subdev++;

		}

	}



	if (board->do_nchan) {

		nchan = min(board->do_nchan, 32);



		s = dev->subdevices + subdev;

		/* Isolated digital outputs 0 to 15/31 */

		s->type		= COMEDI_SUBD_DO;

		s->subdev_flags	= SDF_WRITABLE;

		s->n_chan	= nchan;

		s->maxdata	= 1;

		s->insn_bits	= adl_pci7x3x_do_insn_bits;

		s->range_table	= &range_digital;



		s->private	= (void *)PCI7X3X_DIO_REG;



		subdev++;



		nchan = board->do_nchan - nchan;

		if (nchan) {

			s = dev->subdevices + subdev;

			/* Isolated digital outputs 32 to 63 */

			s->type		= COMEDI_SUBD_DO;

			s->subdev_flags	= SDF_WRITABLE;

			s->n_chan	= nchan;

			s->maxdata	= 1;

			s->insn_bits	= adl_pci7x3x_do_insn_bits;

			s->range_table	= &range_digital;



			s->private	= (void *)PCI743X_DIO_REG;



			subdev++;

		}

	}



	dev_info(dev->class_dev, "%s attached (%d inputs/%d outputs)\n",

		dev->board_name, board->di_nchan, board->do_nchan);



	return 0;

}



static int adl_pci7x3x_attach(struct comedi_device *dev,

			      struct comedi_devconfig *it)

{

	dev_warn(dev->class_dev,

		"This driver does not support attach using comedi_config\n");



	return -ENOSYS;

}



static void adl_pci7x3x_detach(struct comedi_device *dev)

{

	struct pci_dev *pcidev = comedi_to_pci_dev(dev);



	if (pcidev) {

		if (dev->iobase)

			comedi_pci_disable(pcidev);

	}

}



static struct comedi_driver adl_pci7x3x_driver = {

	.driver_name	= "adl_pci7x3x",

	.module		= THIS_MODULE,

	.attach		= adl_pci7x3x_attach,

	.attach_pci	= adl_pci7x3x_attach_pci,

	.detach		= adl_pci7x3x_detach,

};



static int __devinit adl_pci7x3x_pci_probe(struct pci_dev *dev,

					   const struct pci_device_id *ent)

{

	return comedi_pci_auto_config(dev, &adl_pci7x3x_driver);

}



static void __devexit adl_pci7x3x_pci_remove(struct pci_dev *dev)

{

	comedi_pci_auto_unconfig(dev);

}



static DEFINE_PCI_DEVICE_TABLE(adl_pci7x3x_pci_table) = {

	{ PCI_DEVICE(PCI_VENDOR_ID_ADLINK, PCI_DEVICE_ID_PCI7230) },

	{ PCI_DEVICE(PCI_VENDOR_ID_ADLINK, PCI_DEVICE_ID_PCI7233) },

	{ PCI_DEVICE(PCI_VENDOR_ID_ADLINK, PCI_DEVICE_ID_PCI7234) },

	{ PCI_DEVICE(PCI_VENDOR_ID_ADLINK, PCI_DEVICE_ID_PCI7432) },

	{ PCI_DEVICE(PCI_VENDOR_ID_ADLINK, PCI_DEVICE_ID_PCI7433) },

	{ PCI_DEVICE(PCI_VENDOR_ID_ADLINK, PCI_DEVICE_ID_PCI7434) },

	{ 0 }

};

MODULE_DEVICE_TABLE(pci, adl_pci7x3x_pci_table);



static struct pci_driver adl_pci7x3x_pci_driver = {

	.name		= "adl_pci7x3x",

	.id_table	= adl_pci7x3x_pci_table,

	.probe		= adl_pci7x3x_pci_probe,

	.remove		= __devexit_p(adl_pci7x3x_pci_remove),

};

module_comedi_pci_driver(adl_pci7x3x_driver, adl_pci7x3x_pci_driver);



MODULE_DESCRIPTION("ADLINK PCI-723x/743x Isolated Digital I/O boards");

MODULE_AUTHOR("H Hartley Sweeten <hsweeten@visionengravers.com>");

MODULE_LICENSE("GPL");

CRA Git | Maintained and supported by SUSTech CRA and CCSE