X-Git-Url: http://rtime.felk.cvut.cz/gitweb/lincan.git/blobdiff_plain/6250b3805fb7e368adf1e3f7ca39c8cc617bccff..831ccb1f14f7472962fc2d185f32e18105209bd7:/lincan/include/can_sysdep.h

diff --git a/lincan/include/can_sysdep.h b/lincan/include/can_sysdep.h
index f4d66a7..1009689 100644
--- a/lincan/include/can_sysdep.h
+++ b/lincan/include/can_sysdep.h
@@ -1,5 +1,5 @@
-/* can_sysdep.h - hides differences between individual Linux kernel 
- *                versions and RT extensions 
+/* can_sysdep.h - hides differences between individual Linux kernel
+ *                versions and RT extensions
  * Linux CAN-bus device driver.
  * Written by Pavel Pisa - OCERA team member
  * email:pisa@cmp.felk.cvut.cz
@@ -155,6 +155,37 @@
   #define del_timer_sync del_timer
 #endif /* <2.4.0 */
 
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,9))
+   typedef unsigned long can_ioptr_t;
+   #define can_ioptr2ulong(ioaddr) ((unsigned long)(ioaddr))
+   #define can_ulong2ioptr(addr)   ((unsigned long)(addr))
+   #define can_inb(ioaddr) inb(ioaddr)
+   #define can_outb(data,ioaddr) outb(data,ioaddr)
+   #define can_inw(ioaddr) inb(ioaddr)
+   #define can_outw(data,ioaddr) outb(data,ioaddr)
+   #define can_inl(ioaddr) inb(ioaddr)
+   #define can_outl(data,ioaddr) outb(data,ioaddr)
+#else /* >=2.6.9 */
+   typedef void __iomem * can_ioptr_t;
+   #define can_ioptr2ulong(ioaddr) ((unsigned long __force)(ioaddr))
+   #define can_ulong2ioptr(addr)   ((can_ioptr_t)(addr))
+   #define can_inb(ioaddr) inb(can_ioptr2ulong(ioaddr))
+   #define can_outb(data,ioaddr) outb(data,can_ioptr2ulong(ioaddr))
+   #define can_inw(ioaddr) inb(can_ioptr2ulong(ioaddr))
+   #define can_outw(data,ioaddr) outb(data,can_ioptr2ulong(ioaddr))
+   #define can_inl(ioaddr) inb(can_ioptr2ulong(ioaddr))
+   #define can_outl(data,ioaddr) outb(data,can_ioptr2ulong(ioaddr))
+#endif
+
+#define can_readb  readb
+#define can_writeb writeb
+#define can_readw  readw
+#define can_writew writew
+#define can_readl  readl
+#define can_writel writel
+
+#define can_ioport2ioptr can_ulong2ioptr
+
 #ifdef __HAVE_ARCH_CMPXCHG
   #define CAN_HAVE_ARCH_CMPXCHG
 #endif
@@ -214,7 +245,7 @@
 
 /*
  * terrible hack to test rtl_file private_data concept, ugh !!!
- * this would result in crash on architectures,  where 
+ * this would result in crash on architectures,  where
  * sizeof(int) < sizeof(void *)
  */
 #define can_set_rtl_file_private_data(fptr, p) do{ fptr->f_minor=(long)(p); } while(0)
@@ -232,4 +263,20 @@ extern can_spinlock_t can_irq_manipulation_lock;
 
 #endif /*CAN_WITH_RTL*/
 
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,4))
+	#include <linux/kthread.h>
+	#define	can_kthread_create	kthread_create
+	#define can_kthread_run	kthread_run
+	#define can_kthread_bind	kthread_bind
+	#define can_kthread_stop	kthread_stop
+	#define can_kthread_should_stop	kthread_should_stop
+#else
+	#define	can_kthread_create
+	#define can_kthread_run
+	#define can_kthread_bind
+	#define can_kthread_stop
+	#define can_kthread_should_stop
+#endif
+
+
 #endif /*_CAN_SYSDEP_H*/