Each (future) canchip associated to different usb endpoint, instead of whole device...

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

diff --git a/lincan/src/main.c b/lincan/src/main.c
index dd2319a876618a68471a83e5a9541bbc5d908676..b8edf46f5c37a3b7f59f1f91f36f5862bf1a645b 100644 (file)
--- a/lincan/src/main.c
+++ b/lincan/src/main.c
@@ -417,14 +417,18 @@ int init_module(void)
 
 
 
-struct candevice_t* register_usbdev(const char *hwname,void *anydev){
-       int i=0, j, board;
+struct candevice_t* register_usbdev(const char *hwname,void *devdata,void (*chipdataregfnc)(struct canchip_t *ch,void *data)){
+       int i=0, j, board=0;
        struct candevice_t *candev;
        struct canchip_t *chip;
        struct boardtype_t *brp;
 
        while ( (hw[board] != NULL) && (board < MAX_HW_CARDS) )
                board++;
+       if (board>=MAX_HW_CARDS){
+               CANMSG("Maximum number of devices has been reached, no space for new device");
+               return NULL;
+       }
        brp = boardtype_find(hwname);
        if(!brp) {
                CANMSG("Sorry, hardware \"%s\" is currently not supported.\n",hw[board]);
@@ -446,7 +450,7 @@ struct candevice_t* register_usbdev(const char *hwname,void *anydev){
        candev=hardware_p->candevice[board];
 
        /* Adding link to usb device structure into can device */
-       candev->sysdevptr.anydev=anydev;
+       candev->sysdevptr.anydev=devdata;
 
        if (candev->hwspecops->request_io(candev))
                goto request_io_error;
@@ -459,6 +463,8 @@ struct candevice_t* register_usbdev(const char *hwname,void *anydev){
                if((chip=candev->chip[j])==NULL)
                        continue;
 
+               chipdataregfnc(chip,devdata);
+
                if(chip->chipspecops->attach_to_chip(chip)<0) {
                        CANMSG("Initial attach to the chip HW failed\n");
                        goto interrupt_error;
@@ -599,29 +605,15 @@ void cleanup_usbdev(struct candevice_t *dev)
        }
 #endif
 
-       for(i=0;i<MAX_TOT_MSGOBJS;i++) {
-               if(!objects_p[i]) continue;
-               if(objects_p[i]->hostchip->hostdevice != dev) continue;
-               //canqueue_ends_done_chip(objects_p[i]->qends);
-               //can_checked_free(objects_p[i]->qends);
-               //can_checked_free(objects_p[i]);
-               objects_p[i]=NULL;
-       }
-
        for(i=0;i<MAX_TOT_CHIPS;i++){
                if(!chips_p[i]) continue;
                if(chips_p[i]->hostdevice != dev) continue;
-               //can_checked_free(chips_p[i]->chipspecops);
-               //can_checked_free(chips_p[i]);
                chips_p[i]=NULL;
        }
 
        hardware_p->candevice[dev->candev_idx]=NULL;
        hardware_p->nr_boards--;
-       //kfree(hw[dev->candev_idx]);
        hw[dev->candev_idx]=NULL;
-       //can_checked_free(dev->hwspecops);
-       //can_checked_free(dev);
 
        candevice_done(dev);
        can_checked_free(dev);