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

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

staging: comedi: drivers: re-do PLX PCI 9080 DMCFGA register values 



Replace the existing macros in "plx9080.h" that define values for the
DMCFGA register.  Use the prefix `PLX_DMCFGA_` for the macros.  Make use
of the `BIT(x)` and `GENMASK(h,l)` macros to define the values.

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

drivers/staging/comedi/drivers/plx9080.h

+22 −7
Original line number Diff line number Diff line
@@ -266,13 +266,28 @@ struct plx_dma_desc { 
/* PCI Configuration Address Register for Direct Master to PCI IO/CFG */

#define PLX_REG_DMCFGA		0x002c



#define  CAR_CT0           0x00000000	/* Config Type 0 */

#define  CAR_CT1           0x00000001	/* Config Type 1 */

#define  CAR_REG           0x000000FC	/* Register Number Bits */

#define  CAR_FUN           0x00000700	/* Function Number Bits */

#define  CAR_DEV           0x0000F800	/* Device Number Bits */

#define  CAR_BUS           0x00FF0000	/* Bus Number Bits */

#define  CAR_CFG           0x80000000	/* Config Spc Access Enable */

/* Congiguration Type */

#define PLX_DMCFGA_TYPE0	(BIT(0) * 0)

#define PLX_DMCFGA_TYPE1	(BIT(0) * 1)

#define PLX_DMCFGA_TYPE_MASK	GENMASK(1, 0)

/* Register Number */

#define PLX_DMCFGA_REGNUM(x)	(BIT(2) * ((x) & 0x3f))

#define PLX_DMCFGA_REGNUM_MASK	GENMASK(7, 2)

#define PLX_DMCFGA_REGNUM_SHIFT	2

/* Function Number */

#define PLX_DMCFGA_FUNCNUM(x)	(BIT(8) * ((x) & 0x7))

#define PLX_DMCFGA_FUNCNUM_MASK	GENMASK(10, 8)

#define PLX_DMCFGA_FUNCNUM_SHIFT 8

/* Device Number */

#define PLX_DMCFGA_DEVNUM(x)	(BIT(11) * ((x) & 0x1f))

#define PLX_DMCFGA_DEVNUM_MASK	GENMASK(15, 11)

#define PLX_DMCFGA_DEVNUM_SHIFT	11

/* Bus Number */

#define PLX_DMCFGA_BUSNUM(x)	(BIT(16) * ((x) & 0xff))

#define PLX_DMCFGA_BUSNUM_MASK	GENMASK(23, 16)

#define PLX_DMCFGA_BUSNUM_SHIFT	16

/* Configuration Enable */

#define PLX_DMCFGA_CONFIGEN	BIT(31)



/*

 * Mailbox Register N (N <= 7)