Commit b1c70645 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_PLL_STATUS_REG bits 



Rename the CamelCase and convert the enum 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 b965e6a4

drivers/staging/comedi/drivers/ni_mio_common.c

+1 −1
Original line number Diff line number Diff line
@@ -4740,7 +4740,7 @@ static int ni_mseries_set_pll_master_clock(struct comedi_device *dev, 
	devpriv->clock_source = source;

	/* it seems to typically take a few hundred microseconds for PLL to lock */

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

		if (ni_readw(dev, NI_M_PLL_STATUS_REG) & MSeries_PLL_Locked_Bit)

		if (ni_readw(dev, NI_M_PLL_STATUS_REG) & NI_M_PLL_STATUS_LOCKED)

			break;

		udelay(1);

	}

drivers/staging/comedi/drivers/ni_stc.h

+1 −4
Original line number Diff line number Diff line
@@ -991,6 +991,7 @@ static const struct comedi_lrange range_ni_E_ao_ext; 
#define NI_M_PLL_MAX_MULTIPLIER		0x100

#define NI_M_PLL_CTRL_MULTIPLIER(x)	(((x) & 0xff) << 0)

#define NI_M_PLL_STATUS_REG		0x1c8

#define NI_M_PLL_STATUS_LOCKED		BIT(0)

#define NI_M_PFI_OUT_SEL_REG(x)		(0x1d0 + ((x) * 2))

#define NI_M_PFI_DI_REG			0x1dc

#define NI_M_PFI_DO_REG			0x1de
@@ -1007,10 +1008,6 @@ static const struct comedi_lrange range_ni_E_ao_ext; 
#define NI_M_STATIC_AI_CTRL_REG(x)	((x) ? (0x260 + (x)) : 0x064)

#define NI_M_AO_REF_ATTENUATION_REG(x)	(0x264 + (x))



enum MSeries_PLL_Status {

	MSeries_PLL_Locked_Bit = 0x1

};



enum MSeries_AI_Config_FIFO_Bypass_Bits {

	MSeries_AI_Bypass_Channel_Mask = 0x7,

	MSeries_AI_Bypass_Bank_Mask = 0x78,