X-Git-Url: http://rtime.felk.cvut.cz/gitweb/lincan.git/blobdiff_plain/c88af798fcccad5bdd5bbefecde119fd7824efa5..16e7fc19118a4f24bda40b18eaf03273577c83da:/lincan/include/can_sysdep.h

diff --git a/lincan/include/can_sysdep.h b/lincan/include/can_sysdep.h
index 77f9d8a..5ade341 100644
--- a/lincan/include/can_sysdep.h
+++ b/lincan/include/can_sysdep.h
@@ -1,11 +1,36 @@
-/* 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
- */
+/**************************************************************************/
+/* File: can_sysdep.h - hides differences between individual Linux kernel */
+/*                      versions and RT extensions                        */
+/*                                                                        */
+/* LinCAN - (Not only) Linux CAN bus driver                               */
+/* Copyright (C) 2002-2009 DCE FEE CTU Prague <http://dce.felk.cvut.cz>   */
+/* Copyright (C) 2002-2009 Pavel Pisa <pisa@cmp.felk.cvut.cz>             */
+/* Funded by OCERA and FRESCOR IST projects                               */
+/*                                                                        */
+/* LinCAN is free software; you can redistribute it and/or modify it      */
+/* under terms of the GNU General Public License as published by the      */
+/* Free Software Foundation; either version 2, or (at your option) any    */
+/* later version.  LinCAN is distributed in the hope that it will be      */
+/* useful, but WITHOUT ANY WARRANTY; without even the implied warranty    */
+/* of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU    */
+/* General Public License for more details. You should have received a    */
+/* copy of the GNU General Public License along with LinCAN; see file     */
+/* COPYING. If not, write to the Free Software Foundation, 675 Mass Ave,  */
+/* Cambridge, MA 02139, USA.                                              */
+/*                                                                        */
+/* To allow use of LinCAN in the compact embedded systems firmware        */
+/* and RT-executives (RTEMS for example), main authors agree with next    */
+/* special exception:                                                     */
+/*                                                                        */
+/* Including LinCAN header files in a file, instantiating LinCAN generics */
+/* or templates, or linking other files with LinCAN objects to produce    */
+/* an application image/executable, does not by itself cause the          */
+/* resulting application image/executable to be covered by                */
+/* the GNU General Public License.                                        */
+/* This exception does not however invalidate any other reasons           */
+/* why the executable file might be covered by the GNU Public License.    */
+/* Publication of enhanced or derived LinCAN files is required although.  */
+/**************************************************************************/
 
 #ifndef _CAN_SYSDEP_H
 #define _CAN_SYSDEP_H
@@ -30,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>
@@ -188,6 +217,9 @@
 
 #ifdef __HAVE_ARCH_CMPXCHG
   #define CAN_HAVE_ARCH_CMPXCHG
+  #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0))
+    #define CAN_HAVE_ATOMIC_CMPXCHG
+  #endif
 #endif
 
 #ifndef CAN_WITH_RTL
@@ -263,4 +295,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*/