Header-files cleanup and CAN queue edges and ends locking reimplemented.

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

diff --git a/lincan/src/open.c b/lincan/src/open.c
index e980f1613770c43486356f363203408733c8cb15..38ee4d4c8d91ba4b16044379bf024b8ba020f1e8 100644 (file)
--- a/lincan/src/open.c
+++ b/lincan/src/open.c
@@ -7,30 +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/open.h"
 #include "../include/i82527.h"
 #include "../include/setup.h"
 
+#define __NO_VERSION__
+#include <linux/module.h>
+
 int can_open(struct inode *inode, struct file *file)
 {
        struct msgobj_t *obj;
        struct chip_t *chip;
        struct canuser_t *canuser;
        struct canque_ends_t *qends;
+       struct canque_edge_t *edge;
 
        if ( ((obj=objects_p[MINOR_NR]) == NULL) || 
                        ((chip=objects_p[MINOR_NR]->hostchip) == NULL) ) {
@@ -71,11 +64,14 @@ int can_open(struct inode *inode, struct file *file)
        
        list_add(&canuser->peers, &obj->obj_users);
 
-       if(canqueue_connect_edge(canque_new_edge_kern(MAX_BUF_LENGTH),
-               canuser->qends, obj->qends)<0) goto no_qedge;
+       if(canqueue_connect_edge(edge=canque_new_edge_kern(MAX_BUF_LENGTH),
+               canuser->qends, obj->qends)<0) goto no_tx_qedge;
 
        if(canqueue_connect_edge(canuser->rx_edge0=canque_new_edge_kern(MAX_BUF_LENGTH),
-               obj->qends, canuser->qends)<0) goto no_qedge;
+               obj->qends, canuser->qends)<0) goto no_rx_qedge;
+       /*FIXME: more generic model should be used there*/
+       canque_edge_decref(canuser->rx_edge0);
+       canque_edge_decref(edge);
 
 #if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,50))
        MOD_INC_USE_COUNT;
@@ -83,12 +79,13 @@ int can_open(struct inode *inode, struct file *file)
 
        return 0;
        
-    no_qedge:
+    no_rx_qedge:
+       canque_notify_bothends(edge, CANQUEUE_NOTIFY_DEAD_WANTED);
+       canque_edge_decref(edge);
+    no_tx_qedge:
        list_del(&canuser->peers);
-       canqueue_ends_done_kern(qends, 1);
        canuser->qends = NULL;
-       kfree(qends);
-       obj->qends = NULL;
+       canqueue_ends_dispose_kern(qends, 1);
 
     no_qends:
        kfree(canuser);