addi-data drivers once again

Diff with parts that didn't make it to CVS + minor GREP -> EGREP patch included

Regards

Anders Blomdell

-- 
Anders Blomdell                  Email: anders.blomdell_at_control.lth.se
Department of Automatic Control
Lund University                  Phone:    +46 46 222 4625
P.O. Box 118                     Fax:      +46 46 138118
SE-221 00 Lund, Sweden
diff -urbN orig/comedi/comedi/drivers/addi_apci_035.c comedi/comedi/drivers/addi_apci_035.c
--- orig/comedi/comedi/drivers/addi_apci_035.c	1970-01-01 01:00:00.000000000 +0100
+++ comedi/comedi/drivers/addi_apci_035.c	2007-09-05 11:39:17.000000000 +0200
_at__at_ -0,0 +1,5 _at__at_
+#define CONFIG_APCI_035 1
+
+#define ADDIDATA_WATCHDOG 2  // Or should it be something else
+
+#include "addi-data/addi_common.c"
diff -urbN orig/comedi/comedi/drivers/addi_apci_1032.c comedi/comedi/drivers/addi_apci_1032.c
--- orig/comedi/comedi/drivers/addi_apci_1032.c	1970-01-01 01:00:00.000000000 +0100
+++ comedi/comedi/drivers/addi_apci_1032.c	2007-09-05 11:39:17.000000000 +0200
_at__at_ -0,0 +1,3 _at__at_
+#define CONFIG_APCI_1032 1
+
+#include "addi-data/addi_common.c"
diff -urbN orig/comedi/comedi/drivers/addi_apci_1500.c comedi/comedi/drivers/addi_apci_1500.c
--- orig/comedi/comedi/drivers/addi_apci_1500.c	1970-01-01 01:00:00.000000000 +0100
+++ comedi/comedi/drivers/addi_apci_1500.c	2007-09-05 11:39:17.000000000 +0200
_at__at_ -0,0 +1,3 _at__at_
+#define CONFIG_APCI_1500 1
+
+#include "addi-data/addi_common.c"
diff -urbN orig/comedi/comedi/drivers/addi_apci_1516.c comedi/comedi/drivers/addi_apci_1516.c
--- orig/comedi/comedi/drivers/addi_apci_1516.c	1970-01-01 01:00:00.000000000 +0100
+++ comedi/comedi/drivers/addi_apci_1516.c	2007-09-05 11:39:19.000000000 +0200
_at__at_ -0,0 +1,3 _at__at_
+#define CONFIG_APCI_1516 1
+
+#include "addi-data/addi_common.c"
diff -urbN orig/comedi/comedi/drivers/addi_apci_1564.c comedi/comedi/drivers/addi_apci_1564.c
--- orig/comedi/comedi/drivers/addi_apci_1564.c	1970-01-01 01:00:00.000000000 +0100
+++ comedi/comedi/drivers/addi_apci_1564.c	2007-09-05 11:39:17.000000000 +0200
_at__at_ -0,0 +1,3 _at__at_
+#define CONFIG_APCI_1564 1
+
+#include "addi-data/addi_common.c"
diff -urbN orig/comedi/comedi/drivers/addi_apci_16xx.c comedi/comedi/drivers/addi_apci_16xx.c
--- orig/comedi/comedi/drivers/addi_apci_16xx.c	1970-01-01 01:00:00.000000000 +0100
+++ comedi/comedi/drivers/addi_apci_16xx.c	2007-09-05 11:39:18.000000000 +0200
_at__at_ -0,0 +1,3 _at__at_
+#define CONFIG_APCI_16XX 1
+
+#include "addi-data/addi_common.c"
diff -urbN orig/comedi/comedi/drivers/addi_apci_1710.c comedi/comedi/drivers/addi_apci_1710.c
--- orig/comedi/comedi/drivers/addi_apci_1710.c	1970-01-01 01:00:00.000000000 +0100
+++ comedi/comedi/drivers/addi_apci_1710.c	2007-09-05 11:39:17.000000000 +0200
_at__at_ -0,0 +1,3 _at__at_
+#define CONFIG_APCI_1710 1
+
+#include "addi-data/addi_common.c"
diff -urbN orig/comedi/comedi/drivers/addi_apci_2016.c comedi/comedi/drivers/addi_apci_2016.c
--- orig/comedi/comedi/drivers/addi_apci_2016.c	1970-01-01 01:00:00.000000000 +0100
+++ comedi/comedi/drivers/addi_apci_2016.c	2007-09-05 11:39:18.000000000 +0200
_at__at_ -0,0 +1,3 _at__at_
+#define CONFIG_APCI_2016 1
+
+#include "addi-data/addi_common.c"
diff -urbN orig/comedi/comedi/drivers/addi_apci_2032.c comedi/comedi/drivers/addi_apci_2032.c
--- orig/comedi/comedi/drivers/addi_apci_2032.c	1970-01-01 01:00:00.000000000 +0100
+++ comedi/comedi/drivers/addi_apci_2032.c	2007-09-05 11:39:18.000000000 +0200
_at__at_ -0,0 +1,3 _at__at_
+#define CONFIG_APCI_2032 1
+
+#include "addi-data/addi_common.c"
diff -urbN orig/comedi/comedi/drivers/addi_apci_2200.c comedi/comedi/drivers/addi_apci_2200.c
--- orig/comedi/comedi/drivers/addi_apci_2200.c	1970-01-01 01:00:00.000000000 +0100
+++ comedi/comedi/drivers/addi_apci_2200.c	2007-09-05 11:39:17.000000000 +0200
_at__at_ -0,0 +1,3 _at__at_
+#define CONFIG_APCI_2200 1
+
+#include "addi-data/addi_common.c"
diff -urbN orig/comedi/comedi/drivers/addi_apci_3001.c comedi/comedi/drivers/addi_apci_3001.c
--- orig/comedi/comedi/drivers/addi_apci_3001.c	1970-01-01 01:00:00.000000000 +0100
+++ comedi/comedi/drivers/addi_apci_3001.c	2007-09-05 11:39:17.000000000 +0200
_at__at_ -0,0 +1,3 _at__at_
+#define CONFIG_APCI_3001 1
+
+#include "addi-data/addi_common.c"
diff -urbN orig/comedi/comedi/drivers/addi_apci_3120.c comedi/comedi/drivers/addi_apci_3120.c
--- orig/comedi/comedi/drivers/addi_apci_3120.c	1970-01-01 01:00:00.000000000 +0100
+++ comedi/comedi/drivers/addi_apci_3120.c	2007-09-05 11:39:19.000000000 +0200
_at__at_ -0,0 +1,3 _at__at_
+#define CONFIG_APCI_3120 1
+
+#include "addi-data/addi_common.c"
diff -urbN orig/comedi/comedi/drivers/addi_apci_3200.c comedi/comedi/drivers/addi_apci_3200.c
--- orig/comedi/comedi/drivers/addi_apci_3200.c	1970-01-01 01:00:00.000000000 +0100
+++ comedi/comedi/drivers/addi_apci_3200.c	2007-09-05 11:39:19.000000000 +0200
_at__at_ -0,0 +1,3 _at__at_
+#define CONFIG_APCI_3200 1
+
+#include "addi-data/addi_common.c"
diff -urbN orig/comedi/comedi/drivers/addi_apci_3300.c comedi/comedi/drivers/addi_apci_3300.c
--- orig/comedi/comedi/drivers/addi_apci_3300.c	1970-01-01 01:00:00.000000000 +0100
+++ comedi/comedi/drivers/addi_apci_3300.c	2007-09-05 11:39:17.000000000 +0200
_at__at_ -0,0 +1,3 _at__at_
+#define CONFIG_APCI_3300 1
+
+#include "addi-data/addi_common.c"
diff -urbN orig/comedi/comedi/drivers/addi_apci_3501.c comedi/comedi/drivers/addi_apci_3501.c
--- orig/comedi/comedi/drivers/addi_apci_3501.c	1970-01-01 01:00:00.000000000 +0100
+++ comedi/comedi/drivers/addi_apci_3501.c	2007-09-05 11:39:18.000000000 +0200
_at__at_ -0,0 +1,3 _at__at_
+#define CONFIG_APCI_3501 1
+
+#include "addi-data/addi_common.c"
diff -urbN orig/comedi/comedi/drivers/addi_apci_3xxx.c comedi/comedi/drivers/addi_apci_3xxx.c
--- orig/comedi/comedi/drivers/addi_apci_3xxx.c	1970-01-01 01:00:00.000000000 +0100
+++ comedi/comedi/drivers/addi_apci_3xxx.c	2007-09-05 11:39:18.000000000 +0200
_at__at_ -0,0 +1,3 _at__at_
+#define CONFIG_APCI_3XXX 1
+
+#include "addi-data/addi_common.c"
diff -urbN orig/comedi/comedi/drivers/addi_apci_all.c comedi/comedi/drivers/addi_apci_all.c
--- orig/comedi/comedi/drivers/addi_apci_all.c	1970-01-01 01:00:00.000000000 +0100
+++ comedi/comedi/drivers/addi_apci_all.c	2007-09-05 11:39:19.000000000 +0200
_at__at_ -0,0 +1,18 _at__at_
+#define CONFIG_APCI_035  1
+#define CONFIG_APCI_1032 1  
+#define CONFIG_APCI_1500 1
+#define CONFIG_APCI_1516 1
+#define CONFIG_APCI_1564 1
+#define CONFIG_APCI_16XX 1
+#define CONFIG_APCI_1710 1
+#define CONFIG_APCI_2016 1
+#define CONFIG_APCI_2032 1
+#define CONFIG_APCI_2200 1
+#define CONFIG_APCI_3001 1
+#define CONFIG_APCI_3120 1
+#define CONFIG_APCI_3200 1
+#define CONFIG_APCI_3300 1
+#define CONFIG_APCI_3501 1
+#define CONFIG_APCI_3XXX 1
+
+#include "addi-data/addi_common.c"
diff -urbN orig/comedi/comedi/Makefile.am comedi/comedi/Makefile.am
--- orig/comedi/comedi/Makefile.am	2007-09-05 11:50:54.000000000 +0200
+++ comedi/comedi/Makefile.am	2007-09-05 11:35:18.000000000 +0200
_at__at_ -12,7 +12,7 _at__at_
 #the kernel's build system doesn't get lost.
 	if test "$(srcdir)" != "."; then \
 		for dir in . drivers kcomedilib drivers/addi-data; do \
-			for file in `ls _at_abs_srcdir_at_/$$dir/*\.[ch] _at_abs_srcdir_at_/$$dir/Kbuild | $(GREP) -v \.mod\.c`; do \
+			for file in `ls _at_abs_srcdir_at_/$$dir/*\.[ch] _at_abs_srcdir_at_/$$dir/Kbuild | $(EGREP) -v \.mod\.c`; do \
 				LINK_NAME=$$dir/`basename "$$file"`; \
 				if test ! -e $$LINK_NAME; then ln -vs $$file $$LINK_NAME; fi; \
 			done; \

Received on 2007-09-05Z08:56:45