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

Commit a5e7d93d authored by Ian Abbott's avatar Ian Abbott Committed by Greg Kroah-Hartman
Browse files

staging: comedi: ni_65xx: refactor edge detection configuration 



Refactor the code that updates the rising and falling edge detection
registers into new function `ni_65xx_update_edge_detection()`.  This
updates the rising and falling edge detection registers for up to 32
channels starting at an arbitrary channel.  Call it from the code that
handles the `INSN_CONFIG_CHANGE_NOTIFY` instruction, which is limited to
the first 32 channels.

(For the purposes of edge detection, the channels are in the natural
port order of the board, 8 channels per port.  In practice, this is all
the digital I/O channels (if any), followed by all the digital input
channels (if any), followed by all the digital output channels (if any).

Signed-off-by: default avatarIan Abbott <abbotti@mev.co.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent de35c941

drivers/staging/comedi/drivers/ni_65xx.c

+49 −22
Original line number Original line Diff line number Diff line
@@ -317,6 +317,54 @@ static void ni_65xx_disable_input_filters(struct comedi_device *dev) 
	writel(0x00000000, devpriv->mmio + NI_65XX_FILTER_REG);

	writel(0x00000000, devpriv->mmio + NI_65XX_FILTER_REG);

}

}





/* updates edge detection for base_chan to base_chan+31 */

static void ni_65xx_update_edge_detection(struct comedi_device *dev,

					  unsigned int base_chan,

					  unsigned int rising,

					  unsigned int falling)

{

	struct ni_65xx_private *devpriv = dev->private;

	unsigned int num_ports = ni_65xx_num_ports(dev);

	unsigned int port;



	if (base_chan >= NI_65XX_PORT_TO_CHAN(num_ports))

		return;



	for (port = NI_65XX_CHAN_TO_PORT(base_chan); port < num_ports; port++) {

		int bitshift = (int)(NI_65XX_PORT_TO_CHAN(port) - base_chan);

		unsigned int port_mask, port_rising, port_falling;



		if (bitshift >= 32)

			break;



		if (bitshift >= 0) {

			port_mask = ~0U >> bitshift;

			port_rising = rising >> bitshift;

			port_falling = falling >> bitshift;

		} else {

			port_mask = ~0U << -bitshift;

			port_rising = rising << -bitshift;

			port_falling = falling << -bitshift;

		}

		if (port_mask & 0xff) {

			if (~port_mask & 0xff) {

				port_rising |=

				    readb(devpriv->mmio +

					  NI_65XX_RISE_EDGE_ENA_REG(port)) &

				    ~port_mask;

				port_falling |=

				    readb(devpriv->mmio +

					  NI_65XX_FALL_EDGE_ENA_REG(port)) &

				    ~port_mask;

			}

			writeb(port_rising & 0xff,

			       devpriv->mmio + NI_65XX_RISE_EDGE_ENA_REG(port));

			writeb(port_falling & 0xff,

			       devpriv->mmio + NI_65XX_FALL_EDGE_ENA_REG(port));

		}

	}

}



static int ni_65xx_dio_insn_config(struct comedi_device *dev,

static int ni_65xx_dio_insn_config(struct comedi_device *dev,

				   struct comedi_subdevice *s,

				   struct comedi_subdevice *s,

				   struct comedi_insn *insn,

				   struct comedi_insn *insn,
@@ -545,8 +593,6 @@ static int ni_65xx_intr_insn_config(struct comedi_device *dev, 
				    struct comedi_insn *insn,

				    struct comedi_insn *insn,

				    unsigned int *data)

				    unsigned int *data)

{

{

	struct ni_65xx_private *devpriv = dev->private;



	switch (data[0]) {

	switch (data[0]) {

	case INSN_CONFIG_CHANGE_NOTIFY:

	case INSN_CONFIG_CHANGE_NOTIFY:

		/* add instruction to check_insn_config_length() */

		/* add instruction to check_insn_config_length() */
@@ -556,26 +602,7 @@ static int ni_65xx_intr_insn_config(struct comedi_device *dev, 
		/*

		/*

		 * This only works for the first 4 ports (32 channels)!

		 * This only works for the first 4 ports (32 channels)!

		 */

		 */



		ni_65xx_update_edge_detection(dev, 0, data[1], data[2]);

		/* set the channels to monitor for rising edges */

		writeb(data[1] & 0xff,

		       devpriv->mmio + NI_65XX_RISE_EDGE_ENA_REG(0));

		writeb((data[1] >> 8) & 0xff,

		       devpriv->mmio + NI_65XX_RISE_EDGE_ENA_REG(1));

		writeb((data[1] >> 16) & 0xff,

		       devpriv->mmio + NI_65XX_RISE_EDGE_ENA_REG(2));

		writeb((data[1] >> 24) & 0xff,

		       devpriv->mmio + NI_65XX_RISE_EDGE_ENA_REG(3));



		/* set the channels to monitor for falling edges */

		writeb(data[2] & 0xff,

		       devpriv->mmio + NI_65XX_FALL_EDGE_ENA_REG(0));

		writeb((data[2] >> 8) & 0xff,

		       devpriv->mmio + NI_65XX_FALL_EDGE_ENA_REG(1));

		writeb((data[2] >> 16) & 0xff,

		       devpriv->mmio + NI_65XX_FALL_EDGE_ENA_REG(2));

		writeb((data[2] >> 24) & 0xff,

		       devpriv->mmio + NI_65XX_FALL_EDGE_ENA_REG(3));

		break;

		break;

	default:

	default:

		return -EINVAL;

		return -EINVAL;