Skip to content

Commit

Permalink
staging: comedi: addi_apci_1516: final cleanup of the register map de…
Browse files Browse the repository at this point in the history
…fines

I finally got hold of the i/o mapping from ADDI-DATA. Cleanup the defines
a bit and add the missing information.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
H Hartley Sweeten authored and Greg Kroah-Hartman committed Nov 13, 2012
1 parent 0ff1fa7 commit 1567cea
Showing 1 changed file with 12 additions and 10 deletions.
22 changes: 12 additions & 10 deletions drivers/staging/comedi/drivers/addi_apci_1516.c
Original file line number Diff line number Diff line change
Expand Up @@ -40,20 +40,22 @@
#define PCI_DEVICE_ID_APCI2016 0x1002

/*
* PCI bar 1 I/O Register map
* PCI bar 1 I/O Register map - Digital input/output
*/
#define APCI1516_DI_REG 0x00
#define APCI1516_DO_REG 0x04
#define APCI1516_DI_REG 0x00
#define APCI1516_DO_REG 0x04

/*
* PCI bar 2 I/O Register map
* PCI bar 2 I/O Register map - Watchdog (APCI-1516 and APCI-2016)
*/
#define APCI1516_WDOG_REG 0x00
#define APCI1516_WDOG_RELOAD_REG 0x04
#define APCI1516_WDOG_CTRL_REG 0x0c
#define APCI1516_WDOG_CTRL_ENABLE (1 << 0)
#define APCI1516_WDOG_CTRL_SW_TRIG (1 << 9)
#define APCI1516_WDOG_STATUS_REG 0x10
#define APCI1516_WDOG_REG 0x00
#define APCI1516_WDOG_RELOAD_REG 0x04
#define APCI1516_WDOG_CTRL_REG 0x0c
#define APCI1516_WDOG_CTRL_ENABLE (1 << 0)
#define APCI1516_WDOG_CTRL_SW_TRIG (1 << 9)
#define APCI1516_WDOG_STATUS_REG 0x10
#define APCI1516_WDOG_STATUS_ENABLED (1 << 0)
#define APCI1516_WDOG_STATUS_SW_TRIG (1 << 1)

struct apci1516_boardinfo {
const char *name;
Expand Down

0 comments on commit 1567cea

Please sign in to comment.