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

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

staging: comedi: ni_stc.h: tidy up DIO_Serial_Input_Register 



Rename the CamelCase.

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 d3fed081

drivers/staging/comedi/drivers/ni_mio_common.c

+2 −2
Original line number Diff line number Diff line
@@ -424,7 +424,7 @@ static const struct mio_regmap m_series_stc_read_regmap[] = { 
	[NISTC_AO_BC_SAVE_REG]		= { 0x124, 4 },

	[NISTC_AO_UC_SAVE_REG]		= { 0x128, 4 },

	[NISTC_STATUS1_REG]		= { 0x136, 2 },

	[DIO_Serial_Input_Register]	= { 0x009, 1 },

	[NISTC_DIO_SERIAL_IN_REG]	= { 0x009, 1 },

	[Joint_Status_2_Register]	= { 0x13a, 2 },

	[AI_SI_Save_Registers]		= { 0x180, 4 },

	[AI_SC_Save_Registers]		= { 0x184, 4 },
@@ -3552,7 +3552,7 @@ static int ni_serial_hw_readwrite8(struct comedi_device *dev, 
	udelay((devpriv->serial_interval_ns + 999) / 1000);



	if (data_in)

		*data_in = ni_stc_readw(dev, DIO_Serial_Input_Register);

		*data_in = ni_stc_readw(dev, NISTC_DIO_SERIAL_IN_REG);



Error:

	ni_stc_writew(dev, devpriv->dio_control, NISTC_DIO_CTRL_REG);

drivers/staging/comedi/drivers/ni_stc.h

+2 −1
Original line number Diff line number Diff line
@@ -553,10 +553,11 @@ 
#define NISTC_STATUS1_REG		27

#define NISTC_STATUS1_SERIO_IN_PROG	BIT(12)



#define NISTC_DIO_SERIAL_IN_REG		28



#define AI_SI_Save_Registers		64

#define AI_SC_Save_Registers		66



#define DIO_Serial_Input_Register       28

#define Joint_Status_2_Register         29

enum Joint_Status_2_Bits {

	AO_TMRDACWRs_In_Progress_St = 0x20,