Commit 686869b4 authored by Ian Abbott's avatar Ian Abbott Committed by Greg Kroah-Hartman
Browse files

staging: comedi: plx9080.h: rename some macros for consistency 



Most of the macros in "plx9080.h" that define register values are
single-bits flags of the form `PLX_<REG>_<FLAG>`, or are constant,
multi-bit values of the form `PLX_<REG>_<FIELD>_<VAL>`, or are
non-constant, function-like macros of the form `PLX_<REG>_<FIELD>(x)`.
Some of the macros for constant, multi-bit values do not currently
fit the pattern, so rename them for consistency.

Signed-off-by: default avatarIan Abbott <abbotti@mev.co.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 6ad124d5

drivers/staging/comedi/drivers/cb_pcidas64.c

+2 −2
Original line number Diff line number Diff line
@@ -1327,9 +1327,9 @@ static void init_plx9080(struct comedi_device *dev) 
	bits |= PLX_DMAMODE_BURSTEN;

	/*  4020 uses 32 bit dma */

	if (board->layout == LAYOUT_4020)

		bits |= PLX_DMAMODE_WIDTH32;

		bits |= PLX_DMAMODE_WIDTH_32;

	else		/*  localspace0 bus is 16 bits wide */

		bits |= PLX_DMAMODE_WIDTH16;

		bits |= PLX_DMAMODE_WIDTH_16;

	writel(bits, plx_iobase + PLX_REG_DMAMODE1);

	if (ao_cmd_is_supported(board))

		writel(bits, plx_iobase + PLX_REG_DMAMODE0);

drivers/staging/comedi/drivers/gsc_hpdi.c

+1 −1
Original line number Diff line number Diff line
@@ -582,7 +582,7 @@ static void gsc_hpdi_init_plx9080(struct comedi_device *dev) 
	bits |= PLX_DMAMODE_DEMAND;

	/* enable local burst mode */

	bits |= PLX_DMAMODE_BURSTEN;

	bits |= PLX_DMAMODE_WIDTH32;

	bits |= PLX_DMAMODE_WIDTH_32;

	writel(bits, plx_iobase + PLX_REG_DMAMODE0);

}

drivers/staging/comedi/drivers/plx9080.h

+23 −23
Original line number Diff line number Diff line
@@ -60,9 +60,9 @@ struct plx_dma_desc { 
#define PLX_REG_LAS1RR		0x00f0



#define PLX_LASRR_IO		BIT(0)		/* Map to: 1=I/O, 0=Mem */

#define PLX_LASRR_ANY32		(BIT(1) * 0)	/* Locate anywhere in 32 bit */

#define PLX_LASRR_LT1MB		(BIT(1) * 1)	/* Locate in 1st meg */

#define PLX_LASRR_ANY64		(BIT(1) * 2)	/* Locate anywhere in 64 bit */

#define PLX_LASRR_MLOC_ANY32	(BIT(1) * 0)	/* Locate anywhere in 32 bit */

#define PLX_LASRR_MLOC_LT1MB	(BIT(1) * 1)	/* Locate in 1st meg */

#define PLX_LASRR_MLOC_ANY64	(BIT(1) * 2)	/* Locate anywhere in 64 bit */

#define PLX_LASRR_MLOC_MASK	GENMASK(2, 1)	/* Memory location bits */

#define PLX_LASRR_PREFETCH	BIT(3)		/* Memory is prefetchable */

/* bits that specify range for memory space decode bits */
@@ -166,10 +166,10 @@ struct plx_dma_desc { 
#define PLX_REG_LBRD1		0x00f8



/* Memory Space Local Bus Width */

#define PLX_LBRD_MSWIDTH8	(BIT(0) * 0)	/* 8 bits wide */

#define PLX_LBRD_MSWIDTH16	(BIT(0) * 1)	/* 16 bits wide */

#define PLX_LBRD_MSWIDTH32	(BIT(0) * 2)	/* 32 bits wide */

#define PLX_LBRD_MSWIDTH32A	(BIT(0) * 3)	/* 32 bits wide */

#define PLX_LBRD_MSWIDTH_8	(BIT(0) * 0)	/* 8 bits wide */

#define PLX_LBRD_MSWIDTH_16	(BIT(0) * 1)	/* 16 bits wide */

#define PLX_LBRD_MSWIDTH_32	(BIT(0) * 2)	/* 32 bits wide */

#define PLX_LBRD_MSWIDTH_32A	(BIT(0) * 3)	/* 32 bits wide */

#define PLX_LBRD_MSWIDTH_MASK	GENMASK(1, 0)

/* Memory Space Internal Wait States */

#define PLX_LBRD_MSIWS(x)	(BIT(2) * ((x) & 0xf))
@@ -194,10 +194,10 @@ struct plx_dma_desc { 
#define PLX_LBRD_PFCOUNT_MASK	GENMASK(14, 11)

#define PLX_LBRD_TO_PFCOUNT(r)	(((r) & PLX_LBRD_PFCOUNT_MASK) >> 11)

/* Expansion ROM Space Local Bus Width (LBRD0 only) */

#define PLX_LBRD0_EROMWIDTH8	(BIT(16) * 0)	/* 8 bits wide */

#define PLX_LBRD0_EROMWIDTH16	(BIT(16) * 1)	/* 16 bits wide */

#define PLX_LBRD0_EROMWIDTH32	(BIT(16) * 2)	/* 32 bits wide */

#define PLX_LBRD0_EROMWIDTH32A	(BIT(16) * 3)	/* 32 bits wide */

#define PLX_LBRD0_EROMWIDTH_8	(BIT(16) * 0)	/* 8 bits wide */

#define PLX_LBRD0_EROMWIDTH_16	(BIT(16) * 1)	/* 16 bits wide */

#define PLX_LBRD0_EROMWIDTH_32	(BIT(16) * 2)	/* 32 bits wide */

#define PLX_LBRD0_EROMWIDTH_32A	(BIT(16) * 3)	/* 32 bits wide */

#define PLX_LBRD0_EROMWIDTH_MASK	GENMASK(17, 16)

/* Expansion ROM Space Internal Wait States (LBRD0 only) */

#define PLX_LBRD0_EROMIWS(x)	(BIT(18) * ((x) & 0xf))
@@ -239,10 +239,10 @@ struct plx_dma_desc { 
/* LLOCK# Input Enable */

#define PLX_DMPBAM_LLOCKIEN	BIT(2)

/* Direct Master Read Prefetch Size Control (bits 12, 3) */

#define PLX_DMPBAM_RPSIZECONT	((BIT(12) * 0) | (BIT(3) * 0))

#define PLX_DMPBAM_RPSIZE4	((BIT(12) * 0) | (BIT(3) * 1))

#define PLX_DMPBAM_RPSIZE8	((BIT(12) * 1) | (BIT(3) * 0))

#define PLX_DMPBAM_RPSIZE16	((BIT(12) * 1) | (BIT(3) * 1))

#define PLX_DMPBAM_RPSIZE_CONT	((BIT(12) * 0) | (BIT(3) * 0))

#define PLX_DMPBAM_RPSIZE_4	((BIT(12) * 0) | (BIT(3) * 1))

#define PLX_DMPBAM_RPSIZE_8	((BIT(12) * 1) | (BIT(3) * 0))

#define PLX_DMPBAM_RPSIZE_16	((BIT(12) * 1) | (BIT(3) * 1))

#define PLX_DMPBAM_RPSIZE_MASK	(BIT(12) | BIT(3))

/* Direct Master PCI Read Mode - deassert IRDY when FIFO full */

#define PLX_DMPBAM_RMIRDY	BIT(4)
@@ -259,10 +259,10 @@ struct plx_dma_desc { 
/* I/O Remap Select */

#define PLX_DMPBAM_IOREMAPSEL	BIT(13)

/* Direct Master Write Delay */

#define PLX_DMPBAM_WDELAYNONE	(BIT(14) * 0)

#define PLX_DMPBAM_WDELAY4	(BIT(14) * 1)

#define PLX_DMPBAM_WDELAY8	(BIT(14) * 2)

#define PLX_DMPBAM_WDELAY16	(BIT(14) * 3)

#define PLX_DMPBAM_WDELAY_NONE	(BIT(14) * 0)

#define PLX_DMPBAM_WDELAY_4	(BIT(14) * 1)

#define PLX_DMPBAM_WDELAY_8	(BIT(14) * 2)

#define PLX_DMPBAM_WDELAY_16	(BIT(14) * 3)

#define PLX_DMPBAM_WDELAY_MASK	GENMASK(15, 14)

/* Remap of Local-to-PCI Space Into PCI Address Space */

#define PLX_DMPBAM_REMAP_MASK	GENMASK(31, 16)
@@ -462,10 +462,10 @@ struct plx_dma_desc { 
#define PLX_REG_DMAMODE1	0x0094



/* Local Bus Width */

#define PLX_DMAMODE_WIDTH8	(BIT(0) * 0)	/* 8 bits wide */

#define PLX_DMAMODE_WIDTH16	(BIT(0) * 1)	/* 16 bits wide */

#define PLX_DMAMODE_WIDTH32	(BIT(0) * 2)	/* 32 bits wide */

#define PLX_DMAMODE_WIDTH32A	(BIT(0) * 3)	/* 32 bits wide */

#define PLX_DMAMODE_WIDTH_8	(BIT(0) * 0)	/* 8 bits wide */

#define PLX_DMAMODE_WIDTH_16	(BIT(0) * 1)	/* 16 bits wide */

#define PLX_DMAMODE_WIDTH_32	(BIT(0) * 2)	/* 32 bits wide */

#define PLX_DMAMODE_WIDTH_32A	(BIT(0) * 3)	/* 32 bits wide */

#define PLX_DMAMODE_WIDTH_MASK	GENMASK(1, 0)

/* Internal Wait States */

#define PLX_DMAMODE_IWS(x)	(BIT(2) * ((x) & 0xf))