X-Git-Url: http://rtime.felk.cvut.cz/gitweb/lincan.git/blobdiff_plain/97078fff5202521b758c9081d75580880417a123..11132ea490f9e860744ee4f851c67e7fb4444231:/lincan/src/close.c

diff --git a/lincan/src/close.c b/lincan/src/close.c
index 5f7d112..b1146be 100644
--- a/lincan/src/close.c
+++ b/lincan/src/close.c
@@ -1,23 +1,24 @@
 /* close.c
  * 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 0.7  6 Aug 2001
+ * Version lincan-0.2  9 Jul 2003
  */
 
 #define __NO_VERSION__
 #include <linux/module.h> 
 
 #include <linux/autoconf.h>
-#if defined (CONFIG_MODVERSIONS) && !defined (MODVERSIONS)
-#define MODVERSIONS
-#endif
-
-#if defined (MODVERSIONS)
-#include <linux/modversions.h>
-#endif
 
 #include <linux/fs.h>
+#include <linux/version.h>
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,4,0))
+#include <linux/malloc.h>
+#else
+#include <linux/slab.h>
+#endif
 
 #include "../include/main.h"
 #include "../include/close.h"
@@ -26,20 +27,30 @@
 
 int can_close(struct inode *inode, struct file *file)
 {
-	objects_p[MINOR_NR]->flags &= ~BUFFERS_ALLOCATED;
-	/* Give up message buffer memory */
-	if (objects_p[MINOR_NR]->fifo->buf_tx_entry)
-		del_mem_from_list(objects_p[MINOR_NR]->fifo->buf_tx_entry);
-	else
-		CANMSG("objects_p[MINOR_NR]->fifo->buf_tx_entry is NULL\n");
-	if (objects_p[MINOR_NR]->fifo->buf_rx_entry)
-		del_mem_from_list(objects_p[MINOR_NR]->fifo->buf_rx_entry);
-	else
-		CANMSG("objects_p[MINOR_NR]->fifo->buf_rx_entry is NULL\n");
-
-/* FIXME: what about clearing chip HW status, stopping sending messages etc? */
+	struct canuser_t *canuser = (struct canuser_t*)(file->private_data);
+	struct canque_ends_t *qends;
+	struct msgobj_t *obj;
+	
+	if(!canuser || (canuser->magic != CAN_USER_MAGIC)){
+		CANMSG("can_close: bad canuser magic\n");
+		return -ENODEV;
+	}
+	
+	obj = canuser->msgobj;
+	qends = canuser->qends;
+
+	list_del(&canuser->peers);
+	canqueue_ends_done_kern(qends, 1);
+	canuser->qends = NULL;
+	kfree(qends);
+
+	kfree(canuser);
+
+	if(atomic_dec_and_test(&obj->obj_used)){
+		obj->flags &= ~OBJ_OPENED;
+		/* FIXME: what about clearing chip HW status, stopping sending messages etc? */
+	};
 	
-	objects_p[MINOR_NR]->flags &= ~OPENED;
 #if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,50))
 	MOD_DEC_USE_COUNT;
 #endif