cleanup, fixes for real-time

diff --git a/comedi/comedi_ksyms.c b/comedi/comedi_ksyms.c
index baac6bded01bf5d5b2a96b9e14b082a93edf3d2e..6c7126dc381dd035943a537fa9b7ed6f05845426 100644 (file)
--- a/comedi/comedi_ksyms.c
+++ b/comedi/comedi_ksyms.c
@@ -56,6 +56,8 @@ EXPORT_SYMBOL(range_unknown);
 #ifdef CONFIG_COMEDI_RT
 EXPORT_SYMBOL(comedi_free_irq);
 EXPORT_SYMBOL(comedi_request_irq);
+EXPORT_SYMBOL(comedi_switch_to_rt);
+EXPORT_SYMBOL(comedi_switch_to_non_rt);
 #endif
 
 /* for kcomedilib */

diff --git a/include/linux/comedi_rt.h b/include/linux/comedi_rt.h
index 249581f5483dca32f18cd28131122a086d780e76..41d9c9223272c4b482b7618110b06b3e018e59da 100644 (file)
--- a/include/linux/comedi_rt.h
+++ b/include/linux/comedi_rt.h
@@ -60,10 +60,12 @@ void comedi_rt_pend_wakeup(wait_queue_head_t *q);
 #define comedi_free_irq(a,b) free_irq(a,b)
 #define comedi_rt_init() do{}while(0)
 #define comedi_rt_cleanup() do{}while(0)
-#define comedi_swtich_to_rt(a) do{}while(0)
-#define comedi_swtich_to_non_rt(a) do{}while(0)
+#define comedi_switch_to_rt(a) do{}while(0)
+#define comedi_switch_to_non_rt(a) do{}while(0)
 #define comedi_rt_pend_wakeup(a) do{}while(0)
 
+#define rt_printk(format,args...)      printk(format,##args)
+
 #endif
 
 
@@ -88,9 +90,8 @@ void comedi_rt_pend_wakeup(wait_queue_head_t *q);
        rtl_spin_unlock_irqrestore(x, flags)
 
 #else
-// These are defined in comedidev.h
-//#define comedi_spin_lock_irqsave(x, flags)   spin_lock_irqsave(x, flags)
-//#define comedi_spin_unlock_irqrestore(x, flags)      spin_unlock_irqrestore(x, flags)
+#define comedi_spin_lock_irqsave(x, flags)     spin_lock_irqsave(x, flags)
+#define comedi_spin_unlock_irqrestore(x, flags)        spin_unlock_irqrestore(x, flags)
 
 #endif
 

diff --git a/include/linux/comedidev.h b/include/linux/comedidev.h
index c50a46804bf9b061d2cb0fc4a56d97f6e603cf6a..90ffa444099b540565f399c91586887ad7572753 100644 (file)
--- a/include/linux/comedidev.h
+++ b/include/linux/comedidev.h
@@ -215,21 +215,6 @@ int di_unpack(unsigned int bits,comedi_trig *it);
 int do_pack(unsigned int *bits,comedi_trig *it);
 #endif
 
-#ifndef CONFIG_COMEDI_RT
-
-#define rt_printk(format,args...)      printk(format,##args)
-#define rt_printk_init()
-#define rt_printk_cleanup()
-
-#define comedi_request_irq             request_irq
-#define comedi_change_irq_flags(a,b,c) /* */
-#define comedi_free_irq                        free_irq
-
-#define comedi_spin_lock_irqsave(x, flags)     spin_lock_irqsave(x, flags)
-#define comedi_spin_unlock_irqrestore(x, flags)        spin_unlock_irqrestore(x, flags)
-
-#endif
-
 
 #define SRF_USER               0x00000001
 #define SRF_RT                 0x00000002
@@ -296,9 +281,9 @@ static inline int alloc_private(comedi_device *dev,int size)
 extern struct symbol_table comedi_syms;
 #endif
 
-#ifdef CONFIG_COMEDI_RT
+//#ifdef CONFIG_COMEDI_RT
 #include <linux/comedi_rt.h>
-#endif
+//#endif
 
 
 #endif /* _COMEDIDEV_H */