reference count for device opens added (helps while asynchronous remove

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

diff --git a/lincan/src/main.c b/lincan/src/main.c
index 3aa24fa0ee2d4dadc4504e3904e089e8e7859b4f..367c98db26e13da5687768b0ec9927fa7b24da43 100644 (file)
--- a/lincan/src/main.c
+++ b/lincan/src/main.c
@@ -36,8 +36,6 @@
 #define EXPORT_SYMTAB
 #endif
 
-#include <linux/autoconf.h>
-
 #include <linux/module.h>
 
 #include <linux/kernel.h>
@@ -45,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>
@@ -398,7 +396,7 @@ int init_module(void)
        res = usbcan_init();
        if (res){
                CANMSG("usb_register for usbcan failed. Error number %d.\n", res);
-               return -ENODEV;
+               goto memory_error;
        }
 #endif
 
@@ -443,8 +441,7 @@ int init_module(void)
 
 
 
-
-struct candevice_t* register_usbdev(const char *hwname,void *devdata,void (*chipdataregfnc)(struct canchip_t *ch,void *data)){
+struct candevice_t* register_hotplug_dev(const char *hwname,int (*chipdataregfnc)(struct canchip_t *ch,void *data),void *devdata){
        int i=0, j, board=0;
        struct candevice_t *candev;
        struct canchip_t *chip;
@@ -458,17 +455,19 @@ struct candevice_t* register_usbdev(const char *hwname,void *devdata,void (*chip
        }
        brp = boardtype_find(hwname);
        if(!brp) {
-               CANMSG("Sorry, hardware \"%s\" is currently not supported.\n",hw[board]);
+               CANMSG("Sorry, hardware \"%s\" is currently not supported.\n",hwname);
                return NULL;
        }
        if (board==MAX_HW_CARDS){
-                       CANMSG("Device \"%s\" could not be registered due to internal limits.\n",hw[board]);
+                       CANMSG("Device \"%s\" could not be registered due to internal limits.\n",hwname);
                        return NULL;
        }
        hw[board]=brp->boardtype;
 
-       if (init_new_hw_struct(board))
+       if (init_new_hw_struct(board)){
+               CANMSG("HW struct creation failed.\n");
                return NULL;
+       }
 
        #ifdef CAN_DEBUG
                list_hw();
@@ -490,7 +489,10 @@ struct candevice_t* register_usbdev(const char *hwname,void *devdata,void (*chip
                if((chip=candev->chip[j])==NULL)
                        continue;
 
-               chipdataregfnc(chip,devdata);
+               if (chipdataregfnc && devdata){
+                       if (chipdataregfnc(chip,devdata))
+                               goto interrupt_error;
+               }
 
                if(chip->chipspecops->attach_to_chip(chip)<0) {
                        CANMSG("Initial attach to the chip HW failed\n");
@@ -510,7 +512,7 @@ struct candevice_t* register_usbdev(const char *hwname,void *devdata,void (*chip
                        CANMSG("Error to program board interrupt\n");
                        goto interrupt_error;
                }
-
+       CANMSG("Registering /proc entry\n");
 #ifdef CONFIG_PROC_FS
        if (can_init_procentry(board))
                goto proc_error;
@@ -586,25 +588,20 @@ struct candevice_t* register_usbdev(const char *hwname,void *devdata,void (*chip
                #endif /*CAN_WITH_RTL*/
 
 //     register_error:
-               if ( can_del_mem_list() )
-                       CANMSG("Error deallocating memory\n");
+//             if ( can_del_mem_list() )
+//                     CANMSG("Error deallocating memory\n");
 
                return NULL;
 }
 
-
-
-
-
-
-
-void cleanup_usbdev(struct candevice_t *dev)
+void deregister_hotplug_dev(struct candevice_t *dev)
 {
        int i=0;
        int dev_minor;
 
        if (!dev)
                return;
+       DEBUGMSG("Deregistering hotplug device.\n");
 
 #ifdef CONFIG_PROC_FS
        if (can_delete_procentry(dev))
@@ -634,6 +631,18 @@ void cleanup_usbdev(struct candevice_t *dev)
        }
 #endif
 
+}
+
+
+void cleanup_hotplug_dev(struct candevice_t *dev)
+{
+       int i=0;
+       int dev_minor;
+
+       if (!dev)
+               return;
+       DEBUGMSG("Cleaning up hotplug device.\n");
+
        for(i=0;i<MAX_TOT_CHIPS;i++){
                if(!chips_p[i]) continue;
                if(chips_p[i]->hostdevice != dev) continue;
@@ -658,9 +667,11 @@ void cleanup_module(void)
 #endif
 
 #if defined(CONFIG_OC_LINCAN_CARD_usbcan)
+       DEBUGMSG("Unregistering usbcan.\n");
        usbcan_exit();
 #endif
 
+       DEBUGMSG("Continuing with coldplug cleanup.\n");
 #ifdef CONFIG_PROC_FS
        if (can_delete_procdir())
                CANMSG("Error unregistering /proc/can entry.\n");
@@ -700,6 +711,8 @@ void cleanup_module(void)
        canqueue_rtl_done();
        #endif /*CAN_WITH_RTL*/
 
+       DEBUGMSG("Can hardware cleanup done, freeing memory.\n");
+
        if ( can_del_mem_list() )
                CANMSG("Error deallocating memory\n");