Merge branch 'master' into can-usb1

[lincan.git] / lincan / src / main.c

diff --git a/lincan/src/main.c b/lincan/src/main.c
index b8edf46f5c37a3b7f59f1f91f36f5862bf1a645b..197f37f2a7a5e558af105c6f73053167cce7f96c 100644 (file)
--- a/lincan/src/main.c
+++ b/lincan/src/main.c
@@ -1,18 +1,41 @@
-/* main.c
- * Linux CAN-bus device driver.
- * Written by Arnaud Westenberg email:arnaud@wanadoo.nl
- * Rewritten for new CAN queues 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: main.c - the CAN driver top level glue code (needs rewrite)      */
+/*                                                                        */
+/* 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                               */
+/* Based on CAN driver code by Arnaud Westenberg <arnaud@wanadoo.nl>      */
+/*                                                                        */
+/* 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 EXPORT_SYMTAB
 #define EXPORT_SYMTAB
 #endif
 
-#include <linux/autoconf.h>
-
 #include <linux/module.h>
 
 #include <linux/kernel.h>
@@ -20,10 +43,10 @@
 #include <linux/sched.h>
 #include <linux/poll.h>
 #include <linux/version.h>
-#include <linux/autoconf.h>
 #include <linux/interrupt.h>
 
 #if (LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,0))
+ #include <linux/autoconf.h>
  #include <linux/wrapper.h>
 #else
  #include <linux/device.h>
@@ -348,9 +371,11 @@ int init_module(void)
                        this_dev=class_device_create(can_class, MKDEV(major, dev_minor), NULL,  "can%d", dev_minor);
                      #elif  LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,25) /* >= 2.6.15 */
                        this_dev=class_device_create(can_class, NULL, MKDEV(major, dev_minor), NULL,  "can%d", dev_minor);
-                     #else /* >= 2.6.26 */
+                     #elif  LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,27)
                        this_dev=device_create_drvdata(can_class, NULL, MKDEV(major, dev_minor), objects_p[i],  "can%d", dev_minor);
-                     #endif /* >= 2.6.26 */
+                     #else /* >= 2.6.28 */
+                       this_dev=device_create(can_class, NULL, MKDEV(major, dev_minor), objects_p[i],  "can%d", dev_minor);
+                     #endif /* >= 2.6.28 */
                        if(IS_ERR(this_dev)){
                                CANMSG("problem to create device \"can%d\" in the class \"can\"\n", dev_minor);
                      #if  LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,25)
@@ -513,9 +538,11 @@ struct candevice_t* register_usbdev(const char *hwname,void *devdata,void (*chip
                        this_dev=class_device_create(can_class, MKDEV(major, dev_minor), NULL,  "can%d", dev_minor);
                        #elif  LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,25) /* >= 2.6.15 */
                        this_dev=class_device_create(can_class, NULL, MKDEV(major, dev_minor), NULL,  "can%d", dev_minor);
-                       #else /* >= 2.6.26 */
+                       #elif  LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,27)
                        this_dev=device_create_drvdata(can_class, NULL, MKDEV(major, dev_minor), objects_p[i],  "can%d", dev_minor);
-                       #endif /* >= 2.6.26 */
+                       #else /* >= 2.6.28 */
+                       this_dev=device_create(can_class, NULL, MKDEV(major, dev_minor), objects_p[i],  "can%d", dev_minor);
+                       #endif /* >= 2.6.28 */
                        if(IS_ERR(this_dev)){
                                CANMSG("problem to create device \"can%d\" in the class \"can\"\n", dev_minor);
                      #if  LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,25)