From 6bba6b72dc1f7cd448f7364ba9be4183a29c6bcb Mon Sep 17 00:00:00 2001 From: David Schleef Date: Mon, 5 Feb 2001 02:09:19 +0000 Subject: [PATCH] cleanup, fixes for real-time --- comedi/comedi_ksyms.c | 2 ++ include/linux/comedi_rt.h | 11 ++++++----- include/linux/comedidev.h | 19 ++----------------- 3 files changed, 10 insertions(+), 22 deletions(-) diff --git a/comedi/comedi_ksyms.c b/comedi/comedi_ksyms.c index baac6bde..6c7126dc 100644 --- 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 249581f5..41d9c922 100644 --- 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 c50a4680..90ffa444 100644 --- 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 -#endif +//#endif #endif /* _COMEDIDEV_H */ -- 2.26.2