From: Frank Mori Hess <fmhess@speakeasy.net>
Date: Mon, 19 Mar 2001 19:34:00 +0000 (+0000)
Subject: changed some stuff so I could get a clean compile with 2.2.18-rtl kernel and rtlinux... 
X-Git-Tag: r0_7_58~50
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=95cb2b97f1fccfa8944eb1b96590081858421a4b;p=comedi.git

changed some stuff so I could get a clean compile with 2.2.18-rtl kernel and rtlinux v3.0 final
---

diff --git a/comedi/rt_pend_tq/Makefile b/comedi/rt_pend_tq/Makefile
index 00815b0f..93936808 100644
--- a/comedi/rt_pend_tq/Makefile
+++ b/comedi/rt_pend_tq/Makefile
@@ -29,12 +29,12 @@ MX_OBJS		:= $(sort $(filter     $(export-objs), $(obj-m)))
 include $(TOPDIR)/Rules.make
 
 ifdef CONFIG_COMEDI_RTL
-rt_pend_tq.o : rt_pend_tq_rtl.c
+#rt_pend_tq.o : rt_pend_tq_rtl.c
 
 endif
 
 ifdef CONFIG_COMEDI_RTAI
-rt_pend_tq.o : rt_pend_tq_rtai.c
+#rt_pend_tq.o : rt_pend_tq_rtai.c
 
 endif
 
diff --git a/comedi/rt_pend_tq/rt_pend_tq.c b/comedi/rt_pend_tq/rt_pend_tq.c
index a4830da2..2c8822bd 100644
--- a/comedi/rt_pend_tq/rt_pend_tq.c
+++ b/comedi/rt_pend_tq/rt_pend_tq.c
@@ -7,8 +7,9 @@
 #ifdef CONFIG_COMEDI_RTAI
 #include <rtai.h>
 #endif
-#ifdef CONFIG_COMEDI_RTLINUX
-#include <linux/rtl.h>
+#ifdef CONFIG_COMEDI_RTL
+#include <rtl.h>
+#include <rtl_core.h>
 #endif
 
 #ifdef standalone
@@ -46,7 +47,7 @@ int rt_pend_call(void (*func)(int arg1, void * arg2), int arg1, void * arg2)
 #ifdef CONFIG_COMEDI_RTAI
 	rt_pend_linux_srq(rt_pend_tq_irq);
 #endif
-#ifdef CONFIG_COMEDI_RTLINUX
+#ifdef CONFIG_COMEDI_RTL
 	rtl_global_pend_irq(rt_pend_tq_irq);
 #endif
 	return 0;
@@ -55,7 +56,7 @@ int rt_pend_call(void (*func)(int arg1, void * arg2), int arg1, void * arg2)
 #ifdef CONFIG_COMEDI_RTAI
 void rt_pend_irq_handler(void)
 #endif
-#ifdef CONFIG_COMEDI_RTLINUX
+#ifdef CONFIG_COMEDI_RTL
 void rt_pend_irq_handler(int irq, void *dev, struct pt_regs * regs)
 #endif
 {
@@ -71,7 +72,7 @@ int rt_pend_tq_init(void)
 #ifdef CONFIG_COMEDI_RTAI
 	rt_pend_tq_irq=rt_request_srq(0,rt_pend_irq_handler,NULL);
 #endif
-#ifdef CONFIG_COMEDI_RTLINUX
+#ifdef CONFIG_COMEDI_RTL
 	rt_pend_tq_irq=rtl_get_soft_irq(rt_pend_irq_handler,"rt_pend_irq");
 	if(rt_pend_tq_irq>0) 
 		printk("rt_pend_tq: RT bottom half scheduler initialized OK\n");