Correction of spinlock acquire order.

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

diff --git a/lincan/include/can_sysdep.h b/lincan/include/can_sysdep.h
index 1de145449c9fd3237eabe20185a4d46bc302dbac..53e2ce1cde76dcde50420cc0987dce0499949c95 100644 (file)
--- a/lincan/include/can_sysdep.h
+++ b/lincan/include/can_sysdep.h
@@ -1,3 +1,12 @@
+/* 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
+ * This software is released under the GPL-License.
+ * Version lincan-0.3  17 Jun 2004
+ */
+
 #ifndef _CAN_SYSDEP_H
 #define _CAN_SYSDEP_H
 
@@ -27,12 +36,28 @@
 #include <asm/irq.h>
 #include <asm/uaccess.h>
 
+#include "lincan_config.h"
+
+/*optional features*/
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,0))
+#define CAN_ENABLE_KERN_FASYNC
+#ifdef CONFIG_PCI
+#define CAN_ENABLE_PCI_SUPPORT
+#endif
+#ifdef CONFIG_OC_LINCANVME
+#define CAN_ENABLE_VME_SUPPORT
+#endif
+#endif
+
 #if (LINUX_VERSION_CODE < KERNEL_VERSION(2,4,0))
 #include <linux/malloc.h>
 #else
 #include <linux/slab.h>
 #endif
 
+#ifdef CAN_ENABLE_PCI_SUPPORT
+#include "linux/pci.h"
+#endif /*CAN_ENABLE_PCI_SUPPORT*/
 
 /* Next is not sctrictly correct, because of 2.3.0, 2.3.1, 2.3.2
    kernels need next definitions  too */
@@ -50,6 +75,34 @@
   #define DECLARE_MUTEX(name) struct semaphore name=MUTEX
 #endif /* 2.2.19 */
 
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,4,0)) && !defined(DECLARE_TASKLET)
+  #define tasklet_struct tq_struct
+  #define DECLARE_TASKLET(_name, _func, _data) \
+                struct tq_struct _name = { sync: 0, routine: _func, data: (void*)_data }
+
+  /* void tasklet_init(struct tasklet_struct *t, void (*func)(unsigned long), unsigned long data); */
+  #define tasklet_init(_tasklet, _func, _data) \
+    do{ \
+       /* (_tasklet)->next=NULL; */ \
+       /* Above not needed for 2.2.x and buggy for 2.4.x */ \
+       (_tasklet)->sync=0; \
+       (_tasklet)->routine=_func; \
+       (_tasklet)->data=(void*)_data; \
+    }while(0)
+
+  /* void tasklet_schedule(struct tasklet_struct *t) */
+  #define tasklet_schedule(_tasklet) \
+    do{ \
+       queue_task(_tasklet,&tq_immediate); \
+       mark_bh(IMMEDIATE_BH); \
+    }while(0)
+
+  /* void tasklet_kill(struct tasklet_struct *t); */
+  #define tasklet_kill(_tasklet) \
+                synchronize_irq()
+
+#endif /* 2.4.0 */
+
 
 #if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,7)) || (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0))
 
@@ -92,7 +145,9 @@
   #define del_timer_sync del_timer
 #endif /* <2.4.0 */
 
-#define CAN_ENABLE_KERN_FASYNC
+#ifdef __HAVE_ARCH_CMPXCHG
+  #define CAN_HAVE_ARCH_CMPXCHG
+#endif
 
 #ifndef CAN_WITH_RTL
 /* Standard LINUX kernel */
@@ -121,7 +176,7 @@
 #else /*CAN_WITH_RTL*/
 
 #define can_spinlock_t             rtl_spinlock_t
-#define can_spin_irqflags_t        unsigned long
+#define can_spin_irqflags_t        rtl_irqstate_t
 #define can_spin_lock              rtl_spin_lock
 #define can_spin_unlock            rtl_spin_unlock
 #define can_spin_lock_irqsave      rtl_spin_lock_irqsave
@@ -136,6 +191,16 @@
 
 #define can_printk                 rtl_printf
 
+/*
+ * terrible hack to test rtl_file private_data concept, ugh !!!
+ * 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)
+#define can_get_rtl_file_private_data(fptr) ((void*)((fptr)->f_minor))
+
+extern can_spinlock_t can_irq_manipulation_lock;
+
 #endif /*CAN_WITH_RTL*/
 
 #endif /*_CAN_SYSDEP_H*/