Merge branch 'master' into can-usb1

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

diff --git a/lincan/src/finish.c b/lincan/src/finish.c
index 532d868c4b8edf93a22775299aa842b625d20f1c..d1f6a871e807d3d9173216737410124871fd8435 100644 (file)
--- a/lincan/src/finish.c
+++ b/lincan/src/finish.c
@@ -1,11 +1,36 @@
-/* finish.c - finalization of the driver operation
- * 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: finish.c - finalization of the driver operations                 */
+/*                                                                        */
+/* 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.  */
+/**************************************************************************/
 
 #include "../include/can.h"
 #include "../include/can_sysdep.h"
@@ -14,7 +39,7 @@
 #include "../include/finish.h"
 #include "../include/setup.h"
 
-
+extern int next_minor;
 /**
  * msgobj_done - destroys one CAN message object
  * @obj: pointer to CAN message object structure
@@ -37,8 +62,11 @@ void msgobj_done(struct msgobj_t *obj)
        }
 
        if((obj->minor>=0)) {
-               if(objects_p[obj->minor] == obj)
+               if(objects_p[obj->minor] == obj){
                        objects_p[obj->minor] = NULL;
+                       if (--next_minor<0)
+                               next_minor=0;
+               }
                else
                        CANMSG("msgobj_done: not registered as minor\n");
        }
@@ -66,8 +94,10 @@ void canchip_done(struct canchip_t *chip)
        int i;
        struct msgobj_t *obj;
 
-       if(chip->flags & CHIP_ATTACHED)
+       if(chip->flags & CHIP_ATTACHED){
                chip->chipspecops->release_chip(chip);
+               chip->flags &= ~CHIP_ATTACHED;
+       }
 
        if((chip->hostdevice) && (chip->chip_idx>=0)) {
                if(chip->hostdevice->chip[chip->chip_idx] == chip)
@@ -88,6 +118,10 @@ void canchip_done(struct canchip_t *chip)
        }
 
        can_checked_free(chip->chipspecops);
+       
+       if(~chip->flags & CHIP_KEEP_DATA)
+               can_checked_free(chip->chip_data);
+       chip->chip_data = NULL;
        chip->chipspecops=NULL;
 
 }
@@ -112,6 +146,9 @@ void candevice_done(struct candevice_t *candev)
                candev->hwspecops->release_io(candev);
                candev->flags &= ~CANDEV_IO_RESERVED;
        }
+       if(candev->hwspecops->done_hw_data != NULL)
+               candev->hwspecops->done_hw_data(candev);
+
        can_checked_free(candev->hwspecops);
        candev->hwspecops=NULL;
 }
@@ -125,7 +162,7 @@ void canhardware_done(struct canhardware_t *canhw)
        int i;
        struct candevice_t *candev;
 
-       for(i=0; i<canhw->nr_boards; i++){
+       for(i=0; i<MAX_HW_CARDS; i++){
                if((candev=canhw->candevice[i])==NULL)
                        continue;
                candevice_done(candev);