Merge branch 'master' into can-usb1

[lincan.git] / lincan / include / can_sysdep.h

diff --git a/lincan/include/can_sysdep.h b/lincan/include/can_sysdep.h
index f6d985d015d90a420853c6780a9480de4a4cf457..b2c8d83e3d5ce0ff54c2d1ad7d58dca944038c01 100644 (file)
--- a/lincan/include/can_sysdep.h
+++ b/lincan/include/can_sysdep.h
@@ -55,6 +55,10 @@
 #include <linux/delay.h>
 #include <linux/sched.h>
 #include <linux/interrupt.h>
+#include <linux/time.h>
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,10))
+       #include <linux/kref.h>
+#endif
 #include <asm/errno.h>
 
 #include <asm/io.h>
@@ -132,13 +136,13 @@
 
 #if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,7)) || (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0))
 
-#define MINOR_NR \
-       (MINOR(file->f_dentry->d_inode->i_rdev))
+#define INODE2MINOR_NR(inode) \
+       (MINOR(inode->i_rdev))
 
 #else /* Linux kernel < 2.5.7 or >= 2.6.0 */
 
-#define MINOR_NR \
-       (minor(file->f_dentry->d_inode->i_rdev))
+#define INODE2MINOR_NR(inode) \
+       (minor(inode->i_rdev))
 
 #endif /* Linux kernel < 2.5.7 or >= 2.6.0 */
 
@@ -218,6 +222,18 @@
   #endif
 #endif
 
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0))
+  #define can_pci_dev_get(_M_pdev) (_M_pdev)
+  #define can_pci_dev_put(_M_pdev) do {} while(0)
+  #define can_pci_get_device pci_find_device
+  #define can_pci_get_subsys pci_find_subsys
+#else /* > 2.6.0 */
+  #define can_pci_dev_get pci_dev_get
+  #define can_pci_dev_put pci_dev_put
+  #define can_pci_get_device pci_get_device
+  #define can_pci_get_subsys pci_get_subsys
+#endif
+
 #ifndef CAN_WITH_RTL
 /* Standard LINUX kernel */
 
@@ -291,4 +307,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*/