---

yaml --- r: 337495 b: refs/heads/master c: c89f387 h: refs/heads/master i: 337493: 3f298b0 337491: ef0eeec 337487: c32e393 v: v3
git-mirror · Oct 31, 2012 · ae6dc23 · ae6dc23
1 parent 37f1b63
commit ae6dc23
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 44 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: afad945a8aa508c6a4bfa8d9cb616dbe6d17962e
+refs/heads/master: c89f3871846e28e12c5f15e3c7d043ca92ee25ef
diff --git a/trunk/drivers/staging/comedi/drivers/addi-data/hwdrv_apci2016.c b/trunk/drivers/staging/comedi/drivers/addi-data/hwdrv_apci2016.c
@@ -46,12 +46,27 @@ You should also find the complete GPL in the COPYING file accompanying this sour
   +----------+-----------+------------------------------------------------+
 */
 
-/*
-+----------------------------------------------------------------------------+
-|                               Included files                               |
-+----------------------------------------------------------------------------+
-*/
-#include "hwdrv_apci2016.h"
+/*********      Definitions for APCI-2016 card  *****/
+
+#define APCI2016_ADDRESS_RANGE		8
+
+/* DIGITAL INPUT-OUTPUT DEFINE */
+
+#define APCI2016_DIGITAL_OP		0x04
+#define APCI2016_DIGITAL_OP_RW		4
+
+/* ADDIDATA Enable Disable */
+
+#define ADDIDATA_ENABLE			1
+#define ADDIDATA_DISABLE		0
+
+/* TIMER COUNTER WATCHDOG DEFINES */
+
+#define ADDIDATA_WATCHDOG		2
+#define APCI2016_DIGITAL_OP_WATCHDOG	0
+#define APCI2016_WATCHDOG_ENABLEDISABLE	12
+#define APCI2016_WATCHDOG_RELOAD_VALUE	4
+#define APCI2016_WATCHDOG_STATUS	16
 
 /*
 +----------------------------------------------------------------------------+

diff --git a/trunk/drivers/staging/comedi/drivers/addi-data/hwdrv_apci2016.h b/trunk/drivers/staging/comedi/drivers/addi-data/hwdrv_apci2016.h