---

yaml --- r: 337494 b: refs/heads/master c: afad945 h: refs/heads/master v: v3
git-mirror · Oct 31, 2012 · 37f1b63 · 37f1b63
1 parent 3f298b0
commit 37f1b63
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 47 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 441617a3a0483d561c91b929cc7e8fb7e47fdf12
+refs/heads/master: afad945a8aa508c6a4bfa8d9cb616dbe6d17962e
diff --git a/trunk/drivers/staging/comedi/drivers/addi-data/hwdrv_apci16xx.c b/trunk/drivers/staging/comedi/drivers/addi-data/hwdrv_apci16xx.c
@@ -47,13 +47,29 @@ You should also find the complete GPL in the COPYING file accompanying this sour
   +-----------------------------------------------------------------------+
 */
 
-/*
-+----------------------------------------------------------------------------+
-|                               Included files                               |
-+----------------------------------------------------------------------------+
-*/
+#ifndef COMEDI_SUBD_TTLIO
+#define COMEDI_SUBD_TTLIO		11 /* Digital Input Output But TTL */
+#endif
+
+#ifndef ADDIDATA_ENABLE
+#define ADDIDATA_ENABLE			1
+#define ADDIDATA_DISABLE		0
+#endif
+
+#define APCI16XX_TTL_INIT		0
+#define APCI16XX_TTL_INITDIRECTION	1
+#define APCI16XX_TTL_OUTPUTMEMORY	2
+
+#define APCI16XX_TTL_READCHANNEL	0
+#define APCI16XX_TTL_READPORT		1
+
+#define APCI16XX_TTL_WRITECHANNEL_ON	0
+#define APCI16XX_TTL_WRITECHANNEL_OFF	1
+#define APCI16XX_TTL_WRITEPORT_ON	2
+#define APCI16XX_TTL_WRITEPORT_OFF	3
 
-#include "hwdrv_apci16xx.h"
+#define APCI16XX_TTL_READ_ALL_INPUTS	0
+#define APCI16XX_TTL_READ_ALL_OUTPUTS	1
 
 /*
 +----------------------------------------------------------------------------+

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