Fixes for SMP kernels and build for 2.2.xx and 2.6.xx kernels

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

diff --git a/lincan/src/main.c b/lincan/src/main.c
index f21e78fe437daa581109eb4de1af882c3b1369c5..d52cabf469702c79f0e82f94a04d4f4c393dc246 100644 (file)
--- a/lincan/src/main.c
+++ b/lincan/src/main.c
@@ -1,32 +1,30 @@
 /* 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 0.7  6 Aug 2001
+ * Version lincan-0.2  9 Jul 2003
  */
 
 #define EXPORT_SYMTAB
 
 #include <linux/autoconf.h>
-#if defined (CONFIG_MODVERSIONS) && !defined (MODVERSIONS)
-#define MODVERSIONS
-#endif
 
 #include <linux/module.h>
 
-#if defined (MODVERSIONS)
-#include <linux/modversions.h>
-#endif
-
 #include <linux/kernel.h>
 #include <linux/fs.h>
-#include <linux/wrapper.h>
 #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,5,50))
+#include <linux/wrapper.h>
+#endif
+
 #if (LINUX_VERSION_CODE <= KERNEL_VERSION(2,3,0))
 #include <asm/spinlock.h>
 #else
@@ -40,12 +38,16 @@
 #endif
 #endif
 
+/*#undef CONFIG_DEVFS_FS*/
+
 #ifdef CONFIG_DEVFS_FS
+#include <linux/devfs_fs_kernel.h>
 #include <linux/miscdevice.h>
 #endif
 
 #include "../include/main.h"
 #include "../include/modparms.h"
+#include "../include/devcommon.h"
 #include "../include/setup.h"
 #include "../include/proc.h"
 #include "../include/open.h"
@@ -97,12 +99,13 @@ MODULE_DESCRIPTION("Universal Linux CAN-bus device driver");
 /* Global structures, used to describe the installed hardware. */
 struct canhardware_t canhardware;
 struct canhardware_t *hardware_p=&canhardware;
-struct candevice_t *candevices_p[MAX_HW_CARDS];
 struct chip_t *chips_p[MAX_TOT_CHIPS];
 struct msgobj_t *objects_p[MAX_TOT_MSGOBJS];
 #ifdef CONFIG_DEVFS_FS
+#if (LINUX_VERSION_CODE <= KERNEL_VERSION(2,5,60))
 devfs_handle_t  devfs_handles[MAX_TOT_MSGOBJS];
 #endif
+#endif
 
 /* Pointers to dynamically allocated memory are maintained in a linked list
  * to ease memory deallocation.
@@ -142,6 +145,7 @@ EXPORT_SYMBOL(can_fops);
 int init_module(void)
 {
        int res=0,i=0;
+       struct candevice_t *candev;
 
        if (parse_mod_parms())
                return -EINVAL;
@@ -160,12 +164,14 @@ int init_module(void)
        }
 
        for (i=0; i<hardware_p->nr_boards; i++) {
-               if (candevices_p[i]->hwspecops->request_io(candevices_p[i]->io_addr)) 
-               goto memory_error;
+               candev=hardware_p->candevice[i];
+               if (candev->hwspecops->request_io(candev)) 
+                       goto memory_error;
        }
 
        for (i=0; i<hardware_p->nr_boards; i++) {
-               if (candevices_p[i]->hwspecops->reset(i)) 
+               candev=hardware_p->candevice[i];
+               if (candev->hwspecops->reset(candev)) 
                        goto reset_error;
        }
 
@@ -174,16 +180,8 @@ int init_module(void)
 
        i=0;
        while ( (chips_p[i] != NULL) && (i < MAX_TOT_CHIPS) ) {
-               if (!strcmp(chips_p[i]->chip_type,"i82527")) {
-                       if (request_irq(chips_p[i]->chip_irq,i82527_irq_handler,SA_SHIRQ,DEVICE_NAME,chips_p[i]))  
-                               goto interrupt_error;
-                       else
-                               DEBUGMSG("Registered interrupt %d\n",chips_p[i]->chip_irq);
-               }
-               if (!strcmp(chips_p[i]->chip_type,"sja1000p") ||  
-                               !strcmp(chips_p[i]->chip_type,"sja1000")) {
-                       if (request_irq(chips_p[i]->chip_irq,
-       chips_p[i]->chipspecops->irq_handler,SA_SHIRQ,DEVICE_NAME,chips_p[i]))
+               if (chips_p[i]->chipspecops->irq_handler) {
+                       if (request_irq(chips_p[i]->chip_irq,chips_p[i]->chipspecops->irq_handler,SA_SHIRQ,DEVICE_NAME,chips_p[i]))
                                goto interrupt_error;
                        else
                                DEBUGMSG("Registered interrupt %d\n",chips_p[i]->chip_irq);
@@ -192,8 +190,9 @@ int init_module(void)
        }
 
        for (i=0; i<hardware_p->nr_boards; i++) {
-               if (candevices_p[i]->flags & PROGRAMMABLE_IRQ)
-                       if (candevices_p[i]->hwspecops->program_irq(i))
+               candev=hardware_p->candevice[i];
+               if (candev->flags & PROGRAMMABLE_IRQ)
+                       if (candev->hwspecops->program_irq(candev))
                                goto interrupt_error;
        }
 
@@ -209,11 +208,15 @@ int init_module(void)
                for(i=0;i<MAX_TOT_MSGOBJS;i++) {
                        if(!objects_p[i]) continue;
                        dev_minor=objects_p[i]->minor;
+                   #if (LINUX_VERSION_CODE <= KERNEL_VERSION(2,5,50))
                        sprintf (dev_name, "can%d", dev_minor);
                        devfs_handles[i]=devfs_register(NULL, dev_name,
                                DEVFS_FL_DEFAULT, major, dev_minor,
                                S_IFCHR | S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP,
                                &can_fops, (void*)objects_p[i]);
+                   #else
+                       devfs_mk_cdev(MKDEV(major, dev_minor), S_IFCHR | S_IRUGO | S_IWUGO, "can%d", dev_minor);
+                   #endif
                }
         }
 #endif
@@ -233,8 +236,10 @@ int init_module(void)
                goto memory_error;
 
        memory_error: ;
-               for (i=0; i<hardware_p->nr_boards; i++)
-                       candevices_p[i]->hwspecops->release_io(candevices_p[i]->io_addr);
+               for (i=0; i<hardware_p->nr_boards; i++) {
+                       candev=hardware_p->candevice[i];
+                       candev->hwspecops->release_io(candev);
+               }
                goto register_error;
 
        register_error: ;
@@ -250,6 +255,7 @@ int init_module(void)
 void cleanup_module(void)
 {
        int res=0,i=0;
+       struct candevice_t *candev;
 
 #ifdef CONFIG_PROC_FS
        if (can_delete_procdir())
@@ -258,8 +264,16 @@ void cleanup_module(void)
 
 #ifdef CONFIG_DEVFS_FS
                for(i=0;i<MAX_TOT_MSGOBJS;i++) {
+           #if (LINUX_VERSION_CODE <= KERNEL_VERSION(2,5,50))
                        if(devfs_handles[i])
                                devfs_unregister(devfs_handles[i]);
+           #else
+               int dev_minor;
+                       if(!objects_p[i]) continue;
+                       dev_minor=objects_p[i]->minor;
+               if(minor>=0)
+                       devfs_remove("can%d", dev_minor);
+           #endif
                }
 #endif
         i=0;
@@ -268,8 +282,10 @@ void cleanup_module(void)
                i++;
        }
 
-       for (i=0; i<hardware_p->nr_boards; i++) 
-               candevices_p[i]->hwspecops->release_io(candevices_p[i]->io_addr);
+       for (i=0; i<hardware_p->nr_boards; i++){ 
+               candev=hardware_p->candevice[i];
+               candev->hwspecops->release_io(candev);
+       }
 
        if ( del_mem_list() ) 
                CANMSG("Error deallocating memory\n");