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

staging: comedi: ni_stc.h: tidy up NI_M_INTC_ENA_REG bits 



Rename the CamelCase and convert enums into defines. 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 258f0047

drivers/staging/comedi/drivers/ni_mio_common.c

+1 −1
Original line number Diff line number Diff line
@@ -3433,7 +3433,7 @@ static int ni_cdo_inttrig(struct comedi_device *dev, 
	/*

	 * XXX not sure what interrupt C group does

	 * wait for dma to fill output fifo

	 * ni_writeb(dev, Interrupt_Group_C_Enable_Bit, NI_M_INTC_ENA_REG);

	 * ni_writeb(dev, NI_M_INTC_ENA, NI_M_INTC_ENA_REG);

	 */

	for (i = 0; i < timeout; ++i) {

		if (ni_readl(dev, NI_M_CDIO_STATUS_REG) &

drivers/staging/comedi/drivers/ni_stc.h

+1 −4
Original line number Diff line number Diff line
@@ -959,6 +959,7 @@ static const struct comedi_lrange range_ni_E_ao_ext; 
#define NI_M_AI_CFG_BANK_SEL(x)		((((x) & 0x40) << 4) | ((x) & 0x30))

#define NI_M_AI_CFG_CHAN_SEL(x)		(((x) & 0xf) << 0)

#define NI_M_INTC_ENA_REG		0x088

#define NI_M_INTC_ENA			BIT(0)

#define NI_M_INTC_STATUS_REG		0x088

#define NI_M_ATRIG_CTRL_REG		0x08c

#define NI_M_AO_SER_INT_ENA_REG		0x0a0
@@ -1112,10 +1113,6 @@ static const struct comedi_lrange range_ni_E_ao_ext; 
#define NI_M_AO_REF_ATTENUATION_REG(x)	(0x264 + (x))

#define NI_M_AO_REF_ATTENUATION_X5	BIT(0)



enum Interrupt_C_Enable_Bits {

	Interrupt_Group_C_Enable_Bit = 0x1

};



enum Interrupt_C_Status_Bits {

	Interrupt_Group_C_Status_Bit = 0x1

};