---

yaml --- r: 337887 b: refs/heads/master c: 1567cea h: refs/heads/master i: 337885: dfb6a78 337883: 3d34fa6 337879: 16a3b67 337871: 3148a22 337855: f7a238b v: v3
git-mirror · Nov 13, 2012 · 98f5c48 · 98f5c48
1 parent 901be1b
commit 98f5c48
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 11 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0ff1fa77687052ff36aa141317c45f737057ce5d
+refs/heads/master: 1567ceaa3f0e4207fcce46e5116752c9e2d8e294
diff --git a/trunk/drivers/staging/comedi/drivers/addi_apci_1516.c b/trunk/drivers/staging/comedi/drivers/addi_apci_1516.c
@@ -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;