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

staging: comedi: addi_apci_3xxx: tidy up the ttl digital i/o subdevice init 



For aesthetic reasons, add some whitespace to the initialization of the
ttl digital i/o subdevices.

Fix the subdev_flags for the subdevice. The SDF_GROUND and SDF_COMMON
flags only apply to analog subdevices.

Fix the s->iobits for the subdevice. According to the datasheet:
	Port 0 (channels 0-7) are always outputs
	Port 1 (channels 8-15) are always inputs
	Port 2 (channels 9-23) are programmable i/o (default to inputs)

Signed-off-by: default avatarH Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: default avatarIan Abbott <abbotti@mev.co.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent ca1cc85b

drivers/staging/comedi/drivers/addi_apci_3xxx.c

+11 −12
Original line number Diff line number Diff line
@@ -596,15 +596,14 @@ static int apci3xxx_auto_attach(struct comedi_device *dev, 
	s = &dev->subdevices[4];

	s->type = COMEDI_SUBD_UNUSED;



	/*  Allocate and Initialise TTL */

	/* TTL Digital I/O subdevice */

	s = &dev->subdevices[5];

	if (board->has_ttl_io) {

		s->type		= COMEDI_SUBD_DIO;

		s->subdev_flags =

			SDF_WRITEABLE | SDF_READABLE | SDF_GROUND | SDF_COMMON;

		s->subdev_flags	= SDF_READABLE | SDF_WRITEABLE;

		s->n_chan	= 24;

		s->maxdata	= 1;

		s->io_bits = 0;	/* all bits input */

		s->io_bits	= 0xff;	/* channels 0-7 are always outputs */

		s->range_table	= &range_digital;

		s->insn_config	= i_APCI3XXX_InsnConfigInitTTLIO;

		s->insn_bits	= i_APCI3XXX_InsnBitsTTLIO;