X-Git-Url: http://rtime.felk.cvut.cz/gitweb/lincan.git/blobdiff_plain/c6d6f58c34e1b6a4c03d1e86d1abf48eeb6f5624..a2eb4407e9772cf1057e7ea093250d5d38245c1d:/lincan/src/finish.c

diff --git a/lincan/src/finish.c b/lincan/src/finish.c
index a5cd8d1..f10f309 100644
--- a/lincan/src/finish.c
+++ b/lincan/src/finish.c
@@ -1,3 +1,12 @@
+/* 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
+ */
+
 #include "../include/can.h"
 #include "../include/can_sysdep.h"
 #include "../include/main.h"
@@ -6,11 +15,16 @@
 #include "../include/setup.h"
 
 
-
+/**
+ * msgobj_done - destroys one CAN message object
+ * @obj: pointer to CAN message object structure
+ */
 void msgobj_done(struct msgobj_t *obj)
 {
+	int delayed=0;
 	if(obj->qends) {
-		if(canqueue_ends_done_chip(obj->qends) < 0)
+		delayed=canqueue_ends_done_chip(obj->qends);
+		if(delayed < 0)
 			CANMSG("msgobj_done: problem with chip queue ends\n");
 	}
 
@@ -18,7 +32,7 @@ void msgobj_done(struct msgobj_t *obj)
 		if(obj->hostchip->msgobj[obj->object-1] == obj)
 			obj->hostchip->msgobj[obj->object-1]=NULL;
 		else
-			CANMSG("msgobj_done: not registered in the chip_t\n");
+			CANMSG("msgobj_done: not registered in the canchip_t\n");
 		obj->hostchip=NULL;
 	}
 	
@@ -32,18 +46,29 @@ void msgobj_done(struct msgobj_t *obj)
 	del_timer_sync(&obj->tx_timeout);
 
 	if(obj->qends) {
-		can_checked_free(obj->qends);
+		/*delayed free could be required there in the future,
+		  actual use patter cannot generate such situation*/
+		if(!delayed) {
+			can_checked_free(obj->qends);
+		}
 	}
 	obj->qends=NULL;
 }
 
 
-void canchip_done(struct chip_t *chip)
+/**
+ * canchip_done - destroys one CAN chip representation
+ * @chip: pointer to CAN chip structure
+ */
+void canchip_done(struct canchip_t *chip)
 {
 
 	int i;
 	struct msgobj_t *obj;
 
+	if(chip->flags & CHIP_ATTACHED)
+		chip->chipspecops->release_chip(chip);
+
 	if((chip->hostdevice) && (chip->chip_idx>=0)) {
 		if(chip->hostdevice->chip[chip->chip_idx] == chip)
 			chip->hostdevice->chip[chip->chip_idx] = NULL;
@@ -51,10 +76,7 @@ void canchip_done(struct chip_t *chip)
 			CANMSG("canchip_done: not registered in hostdevice\n");
 	}
 
-	if((chip->flags & CHIP_IRQ_SETUP) && (chip->chip_irq>=0)) {
-		free_irq(chip->chip_irq, chip);
-		chip->flags &= ~CHIP_IRQ_SETUP;
-	}
+	can_chip_free_irq(chip);
 		
 	can_synchronize_irq(chip->chip_irq);
 	
@@ -70,10 +92,14 @@ void canchip_done(struct chip_t *chip)
 
 }
 
+/**
+ * candevice_done - destroys representation of one CAN device/board
+ * @candev: pointer to CAN device/board structure
+ */
 void candevice_done(struct candevice_t *candev)
 {
 	int i;
-	struct chip_t *chip;
+	struct canchip_t *chip;
 	
   	for(i=0; i<candev->nr_all_chips; i++){
 		if((chip=candev->chip[i])==NULL)
@@ -90,6 +116,10 @@ void candevice_done(struct candevice_t *candev)
 	candev->hwspecops=NULL;
 }
 
+/**
+ * candevice_done - destroys representation of all CAN devices/boards
+ * @canhw: pointer to the root of all CAN hardware representation
+ */
 void canhardware_done(struct canhardware_t *canhw)
 {
 	int i;