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

staging: comedi: ni_stc.h: tidy up AI_Trigger_Select_Register and bits 



Rename the CamelCase. Use the BIT() macro to define the bits.

Tidy up ni_ai_cmd() by using a local var to set the common bits and
programming the register in the common code path.

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 3e908892

drivers/staging/comedi/drivers/ni_mio_common.c

+15 −18
Original line number Diff line number Diff line
@@ -358,7 +358,7 @@ static const struct mio_regmap m_series_stc_write_regmap[] = { 
	[NISTC_AI_OUT_CTRL_REG]		= { 0x178, 2 },

	[NISTC_ATRIG_ETC_REG]		= { 0x17a, 2 },

	[NISTC_AI_START_STOP_REG]	= { 0x17c, 2 },

	[AI_Trigger_Select_Register]	= { 0x17e, 2 },

	[NISTC_AI_TRIG_SEL_REG]		= { 0x17e, 2 },

	[AI_DIV_Load_A_Register]	= { 0x180, 4 },

	[AO_Start_Select_Register]	= { 0x184, 2 },

	[AO_Trigger_Select_Register]	= { 0x186, 2 },
@@ -2248,6 +2248,7 @@ static int ni_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s) 
	int start_stop_select = 0;

	unsigned int stop_count;

	int interrupt_a_enable = 0;

	unsigned ai_trig;



	if (dev->irq == 0) {

		dev_err(dev->class_dev, "cannot run command without an irq\n");
@@ -2265,29 +2266,25 @@ static int ni_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s) 
	devpriv->an_trig_etc_reg &= ~NISTC_ATRIG_ETC_ENA;

	ni_stc_writew(dev, devpriv->an_trig_etc_reg, NISTC_ATRIG_ETC_REG);



	ai_trig = NISTC_AI_TRIG_START2_SEL(0) | NISTC_AI_TRIG_START1_SYNC;

	switch (cmd->start_src) {

	case TRIG_INT:

	case TRIG_NOW:

		ni_stc_writew(dev,

			      AI_START2_Select(0) |

			      AI_START1_Sync | AI_START1_Edge |

			      AI_START1_Select(0),

			      AI_Trigger_Select_Register);

		ai_trig |= NISTC_AI_TRIG_START1_EDGE |

			   NISTC_AI_TRIG_START1_SEL(0),

			   NISTC_AI_TRIG_SEL_REG;

		break;

	case TRIG_EXT:

		{

			int chan = CR_CHAN(cmd->start_arg);

			unsigned int bits = AI_START2_Select(0) |

			    AI_START1_Sync | AI_START1_Select(chan + 1);

		ai_trig |= NISTC_AI_TRIG_START1_SEL(CR_CHAN(cmd->start_arg) +

						    1);



		if (cmd->start_arg & CR_INVERT)

				bits |= AI_START1_Polarity;

			ai_trig |= NISTC_AI_TRIG_START1_POLARITY;

		if (cmd->start_arg & CR_EDGE)

				bits |= AI_START1_Edge;

			ni_stc_writew(dev, bits, AI_Trigger_Select_Register);

			ai_trig |= NISTC_AI_TRIG_START1_EDGE;

		break;

	}

	}

	ni_stc_writew(dev, ai_trig, NISTC_AI_TRIG_SEL_REG);



	mode2 &= ~NISTC_AI_MODE2_PRE_TRIGGER;

	mode2 &= ~NISTC_AI_MODE2_SC_INIT_LOAD_SRC;

drivers/staging/comedi/drivers/ni_stc.h

+10 −10
Original line number Diff line number Diff line
@@ -326,6 +326,16 @@ 
#define NISTC_AI_START_EDGE		BIT(5)

#define NISTC_AI_START_SEL(x)		(((x) & 0x1f) << 0)



#define NISTC_AI_TRIG_SEL_REG		63

#define NISTC_AI_TRIG_START1_POLARITY	BIT(15)

#define NISTC_AI_TRIG_START2_POLARITY	BIT(14)

#define NISTC_AI_TRIG_START2_SYNC	BIT(13)

#define NISTC_AI_TRIG_START2_EDGE	BIT(12)

#define NISTC_AI_TRIG_START2_SEL(x)	(((x) & 0x1f) << 7)

#define NISTC_AI_TRIG_START1_SYNC	BIT(6)

#define NISTC_AI_TRIG_START1_EDGE	BIT(5)

#define NISTC_AI_TRIG_START1_SEL(x)	(((x) & 0x1f) << 0)



#define AI_Status_1_Register		2

#define Interrupt_A_St				0x8000

#define AI_FIFO_Full_St				0x4000
@@ -384,16 +394,6 @@ enum Joint_Status_2_Bits { 
#define AO_BC_Save_Registers		18

#define AO_UC_Save_Registers		20



#define AI_Trigger_Select_Register	63

#define AI_START1_Polarity			_bit15

#define AI_START2_Polarity			_bit14

#define AI_START2_Sync				_bit13

#define AI_START2_Edge				_bit12

#define AI_START2_Select(a)			(((a) & 0x1f) << 7)

#define AI_START1_Sync				_bit6

#define AI_START1_Edge				_bit5

#define AI_START1_Select(a)			((a) & 0x1f)



#define AI_DIV_Load_A_Register	64



#define AO_Start_Select_Register	66

CRA Git | Maintained and supported by SUSTech CRA and CCSE