Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

staging: comedi: me_daq: cleanup me_dio_insn_bits() 



This function only needs to update the output channel state when
the 'mask' (data[0]) indicates that the state is changing. It's
also supposed to return the state for all the input and output
channels in data[1].

This function appears to work correctly but it's coded quite
differently form the other comedi drivers. Rework the function so
it follows the normal form. Also, use a couple local variables
for the mmio addresses used to read/write the dio ports.

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

drivers/staging/comedi/drivers/me_daq.c

+26 −19
Original line number Diff line number Diff line
@@ -229,33 +229,40 @@ static int me_dio_insn_config(struct comedi_device *dev, 
	return insn->n;

}



/* Digital instant input/outputs */

static int me_dio_insn_bits(struct comedi_device *dev,

			    struct comedi_subdevice *s,

			    struct comedi_insn *insn, unsigned int *data)

			    struct comedi_insn *insn,

			    unsigned int *data)

{

	struct me_private_data *dev_private = dev->private;

	void __iomem *mmio_porta = dev_private->me_regbase + ME_DIO_PORT_A;

	void __iomem *mmio_portb = dev_private->me_regbase + ME_DIO_PORT_B;

	unsigned int mask = data[0];

	unsigned int bits = data[1];

	unsigned int val;



	mask &= s->io_bits;	/* only update the COMEDI_OUTPUT channels */

	if (mask) {

		s->state &= ~mask;

	s->state |= (mask & data[1]);

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



	mask &= s->io_bits;

	if (mask & 0x0000ffff) {	/* Port A */

		writew((s->state & 0xffff),

		       dev_private->me_regbase + ME_DIO_PORT_A);

	} else {

		data[1] &= ~0x0000ffff;

		data[1] |= readw(dev_private->me_regbase + ME_DIO_PORT_A);

		if (mask & 0x0000ffff)

			writew((s->state & 0xffff), mmio_porta);

		if (mask & 0xffff0000)

			writew(((s->state >> 16) & 0xffff), mmio_portb);

	}



	if (mask & 0xffff0000) {	/* Port B */

		writew(((s->state >> 16) & 0xffff),

		       dev_private->me_regbase + ME_DIO_PORT_B);

	} else {

		data[1] &= ~0xffff0000;

		data[1] |= readw(dev_private->me_regbase + ME_DIO_PORT_B) << 16;

	}

	if (s->io_bits & 0x0000ffff)

		val = s->state & 0xffff;

	else

		val = readw(mmio_porta);



	if (s->io_bits & 0xffff0000)

		val |= (s->state & 0xffff0000);

	else

		val |= (readw(mmio_portb) << 16);



	data[1] = val;



	return insn->n;

}