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

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

staging: comedi: ni_stc.h: tidy up Misc_Command register and bits 



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

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 2ed183ff

drivers/staging/comedi/drivers/ni_mio_common.c

+1 −1
Original line number Diff line number Diff line
@@ -1620,7 +1620,7 @@ static int ni_ai_reset(struct comedi_device *dev, struct comedi_subdevice *s) 
	ni_clear_ai_fifo(dev);



	if (!devpriv->is_6143)

		ni_writeb(dev, 0, Misc_Command);

		ni_writeb(dev, NI_E_MISC_CMD_EXT_ATRIG, NI_E_MISC_CMD_REG);



	ni_stc_writew(dev, NISTC_AI_CMD1_DISARM, NISTC_AI_CMD1_REG);

	ni_stc_writew(dev, NISTC_AI_MODE1_START_STOP |

drivers/staging/comedi/drivers/ni_stc.h

+5 −1
Original line number Diff line number Diff line
@@ -577,7 +577,11 @@ 
#define NI_E_SERIAL_CMD_SDATA		BIT(1)

#define NI_E_SERIAL_CMD_SCLK		BIT(0)



#define Misc_Command			0x0f

#define NI_E_MISC_CMD_REG		0x0f	/* w8 */

#define NI_E_MISC_CMD_INTEXT_ATRIG(x)	(((x) & 0x1) << 7)

#define NI_E_MISC_CMD_EXT_ATRIG		NI_E_MISC_CMD_INTEXT_ATRIG(0)

#define NI_E_MISC_CMD_INT_ATRIG		NI_E_MISC_CMD_INTEXT_ATRIG(1)



#define Port_A				0x19

#define Port_B				0x1b

#define Port_C				0x1d