fixed compilation problems with RTL/RTAI

diff --git a/comedi/Makefile b/comedi/Makefile
index 5ba357fedd916a0f5afe0941acdd86133d178f79..23c178375587d5333cbc62f6738718ee5866e9f4 100644 (file)
--- a/comedi/Makefile
+++ b/comedi/Makefile
@@ -17,13 +17,8 @@ MI_OBJS := comedi_fops.o dummy.o proc.o range.o drivers.o kvmem.o
 MIX_OBJS := comedi_ksyms.o
 
 
-ifeq ($(CONFIG_COMEDI_REALTIME),y)
-MI_OBJS += rt.o
-endif
-
 ifeq ($(CONFIG_COMEDI_RTL),y)
 MI_OBJS += rtl.o
-CFLAGS += -D__RTL__
 endif
 
 ifeq ($(CONFIG_COMEDI_RTAI),y)
@@ -32,7 +27,6 @@ endif
 
 ifeq ($(CONFIG_COMEDI_RTL_V1),y)
 MI_OBJS += rtl_v1.o
-CFLAGS += -D__RTL__
 endif
 
 range-y := range.c

diff --git a/comedi/comedi_module.h b/comedi/comedi_module.h
index b65dfb564030ebaf0b7f073f155971b62a60400e..0a7ec7b118561fe357abe3120a5ed690e5cb21fb 100644 (file)
--- a/comedi/comedi_module.h
+++ b/comedi/comedi_module.h
@@ -56,23 +56,24 @@ struct comedi_irq_struct * get_irq_struct(unsigned int);
 #endif
 
 #ifdef CONFIG_COMEDI_RTL
-#include <rtl.h>
+void comedi_rtl_init(void);
+void comedi_rtl_cleanup(void);
 #endif
 
 #ifdef CONFIG_COMEDI_RTAI
-#include <rtai.h>
+void comedi_rtai_init(void);
+void comedi_rtai_cleanup(void);
 #define rt_printk(format,args...)      printk(format,##args)
 #define rt_printk_init()               
 #define rt_printk_cleanup()            
-
 #endif
 
 #ifdef CONFIG_COMEDI_RTL_V1
-#include <rtl_v1.h>
+void comedi_rtl_v1_init(void);
+void comedi_rtl_v1_cleanup(void);
 #define rt_printk(format,args...)      printk(format,##args)
 #define rt_printk_init()               
 #define rt_printk_cleanup()            
-
 #endif
 
 #else /* !CONFIG_COMEDI_RT */
@@ -83,7 +84,7 @@ struct comedi_irq_struct * get_irq_struct(unsigned int);
 
 #endif
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_COMEDI_DEBUG
 #define DPRINTK(format, args...)       printk("comedi: " format , ## args )
 #else
 #define DPRINTK(format, args...)       /* */

diff --git a/comedi/rtai.c b/comedi/rtai.c
index 94f1a2523b25337d8b876b582cb7129eb1991629..b510e91673e19b41a98d48c0c4cc3682f502a158 100644 (file)
--- a/comedi/rtai.c
+++ b/comedi/rtai.c
@@ -13,6 +13,8 @@
 #include <linux/string.h>
 #include <linux/errno.h>
 
+#include <rtai.h>
+
 
 extern void rt_unmask_irq(unsigned int irq);
 

diff --git a/comedi/rtai.h b/comedi/rtai.h
deleted file mode 100644 (file)
index 144c1df..0000000
--- a/comedi/rtai.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- *  RTL compatibility,, version 1
- *
- */
-
-#ifndef __COMEDI_RTAI_H
-#define __COMEDI_RTAI_H
-
-#include <rtai/rtai.h>
-
-#if 0
-int rt_printk(const char *fmt, ...);
-
-void rt_printk_cleanup(void);
-int rt_printk_init(void);
-#endif
-
-void comedi_rtai_init(void);
-void comedi_rtai_cleanup(void);
-
-
-#endif
-

diff --git a/comedi/rtl.c b/comedi/rtl.c
index ff615e0a86272662fdd4598828c3ab7f23bbe352..a804ed8f2ce2c3030eb231d81bcf50504df73137 100644 (file)
--- a/comedi/rtl.c
+++ b/comedi/rtl.c
@@ -4,7 +4,7 @@
  */
 
 #include <comedi_module.h>
-#include <rtl.h>
+#include "rtl.h"
 
 #include <linux/kernel.h>
 #include <linux/string.h>
@@ -14,6 +14,8 @@
 #include <linux/rtl.h>
 #include <linux/string.h>
 #include <linux/errno.h>
+
+#include <rtl_core.h>
 #if 0
 #include <rtlinux/rtl_posixio.h>
 #endif
@@ -183,6 +185,12 @@ struct rtl_file_operations comedi_rtl_fops={
 
 #endif
 
+static struct comedi_irq_struct rtl_irq_struct;
+
+struct comedi_irq_struct * get_irq_struct(unsigned int irq)
+{
+       return &rtl_irq_struct;
+}
 
 static unsigned int handle_rtl_irq(unsigned int irq,struct pt_regs *regs)
 {