Header-files cleanup and CAN queue edges and ends locking reimplemented.

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

diff --git a/lincan/src/main.c b/lincan/src/main.c
index 1e84d34a96bccf6f08dcc92475f7f3180fbeb1c8..a1b6631289049175931e213146d49fd2a8fcb759 100644 (file)
--- a/lincan/src/main.c
+++ b/lincan/src/main.c
@@ -25,12 +25,6 @@
 #include <linux/wrapper.h>
 #endif
 
-#if (LINUX_VERSION_CODE <= KERNEL_VERSION(2,3,0))
-#include <asm/spinlock.h>
-#else
-#include <linux/spinlock.h>
-#endif
-
 #if !defined (__GENKSYMS__) 
 #if (defined (MODVERSIONS) && !defined(NOVER))
 #include <linux/modversions.h>
@@ -45,6 +39,8 @@
 #include <linux/miscdevice.h>
 #endif
 
+#include "../include/can.h"
+#include "../include/can_sysdep.h"
 #include "../include/main.h"
 #include "../include/modparms.h"
 #include "../include/devcommon.h"
@@ -57,6 +53,7 @@
 #include "../include/irq.h"
 #include "../include/ioctl.h"
 #include "../include/write.h"
+#include "../include/finish.h"
 
 #define EXPORT_SYMTAB
 
@@ -70,8 +67,8 @@ int extended=0;
 MODULE_PARM(extended,"1i");
 int pelican=0;
 MODULE_PARM(pelican,"1i");
-int baudrate=0;
-MODULE_PARM(baudrate,"1i");
+int baudrate[MAX_TOT_CHIPS];
+MODULE_PARM(baudrate, "1-" __MODULE_STRING(MAX_TOT_CHIPS_STR)"i");
 char *hw[MAX_HW_CARDS]={NULL,};
 MODULE_PARM(hw, "1-" __MODULE_STRING(MAX_HW_CARDS)"s");
 int irq[MAX_IRQ]={-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1};
@@ -146,12 +143,15 @@ EXPORT_SYMBOL(can_fops);
 
 int init_module(void)
 {
-       int res=0,i=0;
+       int res=0,i=0, j;
        struct candevice_t *candev;
+       struct chip_t *chip;
 
        if (parse_mod_parms())
                return -EINVAL;
 
+       canqueue_kern_initialize();
+
        if (init_hw_struct())
                return -ENODEV;
 
@@ -169,6 +169,7 @@ int init_module(void)
                candev=hardware_p->candevice[i];
                if (candev->hwspecops->request_io(candev)) 
                        goto memory_error;
+               candev->flags|=CANDEV_IO_RESERVED;
        }
 
        for (i=0; i<hardware_p->nr_boards; i++) {
@@ -180,20 +181,23 @@ int init_module(void)
        spin_lock_init(&hardware_p->rtr_lock);
        hardware_p->rtr_queue=NULL;
 
-       i=0;
-       while ( (chips_p[i] != NULL) && (i < MAX_TOT_CHIPS) ) {
-               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);
-               }
-               i++;
-       }
-
        for (i=0; i<hardware_p->nr_boards; i++) {
                candev=hardware_p->candevice[i];
-               if (candev->flags & PROGRAMMABLE_IRQ)
+               for(j=0; j<candev->nr_all_chips; j++) {
+                       if((chip=candev->chip[j])==NULL)
+                               continue;
+                       if(!chip->chipspecops->irq_handler)
+                               continue;
+                       
+                       if (request_irq(chip->chip_irq,chip->chipspecops->irq_handler,SA_SHIRQ,DEVICE_NAME,chip))
+                               goto interrupt_error;
+                       else {
+                               DEBUGMSG("Registered interrupt %d\n",chip->chip_irq);
+                               chip->flags |= CHIP_IRQ_SETUP;
+                       }
+               }
+               
+               if (candev->flags & CANDEV_PROGRAMMABLE_IRQ)
                        if (candev->hwspecops->program_irq(candev))
                                goto interrupt_error;
        }
@@ -238,18 +242,13 @@ int init_module(void)
                goto memory_error;
 
        memory_error: ;
-               for (i=0; i<hardware_p->nr_boards; i++) {
-                       candev=hardware_p->candevice[i];
-                       candev->hwspecops->release_io(candev);
-               }
-               goto register_error;
+               canhardware_done(hardware_p);
 
-       register_error: ;
                res=unregister_chrdev(major,DEVICE_NAME);
                if (res<0)
                        CANMSG("Error unloading CAN driver, error: %d\n",res);
                else
-                       CANMSG("Successfully unloaded CAN driver.\n");
+                       CANMSG("No CAN devices or driver setup error.\n");
                return -ENODEV;
 
 }
@@ -257,7 +256,6 @@ 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())
@@ -278,19 +276,10 @@ void cleanup_module(void)
            #endif
                }
 #endif
-        i=0;
-       while ( (chips_p[i] != NULL) & (i < MAX_TOT_CHIPS) ) {
-               if(chips_p[i]->chipspecops->irq_handler)
-                       free_irq(chips_p[i]->chip_irq, chips_p[i]);
-               i++;
-       }
 
-       for (i=0; i<hardware_p->nr_boards; i++){ 
-               candev=hardware_p->candevice[i];
-               candev->hwspecops->release_io(candev);
-       }
+       canhardware_done(hardware_p);
 
-       if ( del_mem_list() ) 
+       if ( can_del_mem_list() ) 
                CANMSG("Error deallocating memory\n");
 
        res=unregister_chrdev(major,DEVICE_NAME);