From: ppisa <pisa@cmp.felk.cvut.cz>
Date: Fri, 30 Jan 2009 18:47:04 +0000 (+0100)
Subject: Merge branch 'master' into can-usb1
X-Git-Url: http://rtime.felk.cvut.cz/gitweb/lincan.git/commitdiff_plain/a35b5224bbdfbd7147e1cf715c2931a2d740f592?hp=-c

Merge branch 'master' into can-usb1
---

a35b5224bbdfbd7147e1cf715c2931a2d740f592
diff --combined lincan/include/can_sysdep.h
index 1009689,77f9d8a..b4ffff5
--- a/lincan/include/can_sysdep.h
+++ b/lincan/include/can_sysdep.h
@@@ -161,20 -161,20 +161,20 @@@
     #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)
+    #define can_inw(ioaddr) inw(ioaddr)
+    #define can_outw(data,ioaddr) outw(data,ioaddr)
+    #define can_inl(ioaddr) inl(ioaddr)
+    #define can_outl(data,ioaddr) outl(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))
+    #define can_inw(ioaddr) inw(can_ioptr2ulong(ioaddr))
+    #define can_outw(data,ioaddr) outw(data,can_ioptr2ulong(ioaddr))
+    #define can_inl(ioaddr) inl(can_ioptr2ulong(ioaddr))
+    #define can_outl(data,ioaddr) outl(data,can_ioptr2ulong(ioaddr))
  #endif
  
  #define can_readb  readb
@@@ -263,20 -263,4 +263,20 @@@ extern can_spinlock_t can_irq_manipulat
  
  #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*/