Structured comments updated.

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

diff --git a/lincan/src/close.c b/lincan/src/close.c
index b1146be6a45aae584523b78f921616372f40673b..9042ff2a2ec0d4e188dd2a12cad32315e8c458cf 100644 (file)
--- a/lincan/src/close.c
+++ b/lincan/src/close.c
@@ -7,29 +7,23 @@
  * Version lincan-0.2  9 Jul 2003
  */
 
-#define __NO_VERSION__
-#include <linux/module.h> 
-
-#include <linux/autoconf.h>
-
-#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/can.h"
+#include "../include/can_sysdep.h"
 #include "../include/main.h"
 #include "../include/close.h"
 #include "../include/i82527.h"
 #include "../include/setup.h"
+#include "../include/fasync.h"
+
+#define __NO_VERSION__
+#include <linux/module.h>
 
 int can_close(struct inode *inode, struct file *file)
 {
        struct canuser_t *canuser = (struct canuser_t*)(file->private_data);
        struct canque_ends_t *qends;
        struct msgobj_t *obj;
+       can_spin_irqflags_t iflags;
        
        if(!canuser || (canuser->magic != CAN_USER_MAGIC)){
                CANMSG("can_close: bad canuser magic\n");
@@ -38,21 +32,29 @@ int can_close(struct inode *inode, struct file *file)
        
        obj = canuser->msgobj;
        qends = canuser->qends;
+       
+    #ifdef CAN_ENABLE_KERN_FASYNC
+
+       can_fasync(-1, file, 0);
+
+    #endif /*CAN_ENABLE_KERN_FASYNC*/
 
+       can_spin_lock_irqsave(&canuser_manipulation_lock, iflags);
        list_del(&canuser->peers);
-       canqueue_ends_done_kern(qends, 1);
+       can_spin_unlock_irqrestore(&canuser_manipulation_lock, iflags);
        canuser->qends = NULL;
-       kfree(qends);
+       canqueue_ends_dispose_kern(qends, file->f_flags & O_SYNC);
 
        kfree(canuser);
 
+       can_spin_lock_irqsave(&canuser_manipulation_lock, iflags);
        if(atomic_dec_and_test(&obj->obj_used)){
-               obj->flags &= ~OBJ_OPENED;
-               /* FIXME: what about clearing chip HW status, stopping sending messages etc? */
+               can_msgobj_clear_fl(obj,OPENED);
        };
+       can_spin_unlock_irqrestore(&canuser_manipulation_lock, iflags);
        
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,50))
+    #if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,50))
        MOD_DEC_USE_COUNT;
-#endif
+    #endif
        return 0;
 }