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

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

staging: comedi: addi_apci_1564: move counter register defines to driver 



Move the defines for the counter registers from the included source
file to the main driver source file.

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 3a2cf2f9

drivers/staging/comedi/drivers/addi-data/hwdrv_apci1564.c

+0 −12
Original line number Diff line number Diff line
@@ -17,18 +17,6 @@ 
#define ADDIDATA_COUNTER				1

#define ADDIDATA_WATCHDOG				2



/*

 * devpriv->counters Register Map

 */

#define APCI1564_COUNTER_REG(x)				(0x00 + ((x) * 0x20))

#define APCI1564_COUNTER_RELOAD_REG(x)			(0x04 + ((x) * 0x20))

#define APCI1564_COUNTER_TIMEBASE_REG(x)		(0x08 + ((x) * 0x20))

#define APCI1564_COUNTER_CTRL_REG(x)			(0x0c + ((x) * 0x20))

#define APCI1564_COUNTER_STATUS_REG(x)			(0x10 + ((x) * 0x20))

#define APCI1564_COUNTER_IRQ_REG(x)			(0x14 + ((x) * 0x20))

#define APCI1564_COUNTER_WARN_TIMEVAL_REG(x)		(0x18 + ((x) * 0x20))

#define APCI1564_COUNTER_WARN_TIMEBASE_REG(x)		(0x1c + ((x) * 0x20))



/*

 * Configures The Timer or Counter

 *

drivers/staging/comedi/drivers/addi_apci_1564.c

+13 −0
Original line number Diff line number Diff line
@@ -107,6 +107,19 @@ 
#define APCI1564_TIMER_WARN_TIMEVAL_REG		0x18  /* Rev 2.x only */

#define APCI1564_TIMER_WARN_TIMEBASE_REG	0x1c  /* Rev 2.x only */



/*

 * devpriv->counters Register Map

 *   PLD Revision 2.x - PCI BAR 1 + 0x00

 */

#define APCI1564_COUNTER_REG(x)			(0x00 + ((x) * 0x20))

#define APCI1564_COUNTER_RELOAD_REG(x)		(0x04 + ((x) * 0x20))

#define APCI1564_COUNTER_TIMEBASE_REG(x)	(0x08 + ((x) * 0x20))

#define APCI1564_COUNTER_CTRL_REG(x)		(0x0c + ((x) * 0x20))

#define APCI1564_COUNTER_STATUS_REG(x)		(0x10 + ((x) * 0x20))

#define APCI1564_COUNTER_IRQ_REG(x)		(0x14 + ((x) * 0x20))

#define APCI1564_COUNTER_WARN_TIMEVAL_REG(x)	(0x18 + ((x) * 0x20))

#define APCI1564_COUNTER_WARN_TIMEBASE_REG(x)	(0x1c + ((x) * 0x20))



struct apci1564_private {

	unsigned long eeprom;		/* base address of EEPROM register */

	unsigned long timer;		/* base address of 12-bit timer */