X-Git-Url: http://rtime.felk.cvut.cz/gitweb/lincan.git/blobdiff_plain/11132ea490f9e860744ee4f851c67e7fb4444231..2827b727d2910a3b48f9de7d67b3a67f59e256c7:/lincan/src/open.c

diff --git a/lincan/src/open.c b/lincan/src/open.c
index e980f16..deb027c 100644
--- a/lincan/src/open.c
+++ b/lincan/src/open.c
@@ -7,30 +7,24 @@
  * 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;
+	can_spin_irqflags_t iflags;
 
 	if ( ((obj=objects_p[MINOR_NR]) == NULL) || 
 			((chip=objects_p[MINOR_NR]->hostchip) == NULL) ) {
@@ -40,7 +34,7 @@ int can_open(struct inode *inode, struct file *file)
 
 	atomic_inc(&obj->obj_used);
 	DEBUGMSG("Device %d opened %d times.\n", MINOR_NR, atomic_read(&obj->obj_used));
-	obj->flags |= OBJ_OPENED;
+	can_msgobj_set_fl(obj,OPENED);
 
 	if (chip->flags & CHIP_CONFIGURED) 
 		DEBUGMSG("Device is already configured.\n");
@@ -53,13 +47,12 @@ int can_open(struct inode *inode, struct file *file)
 		if (chip->chipspecops->pre_read_config(chip,obj)<0)
 			CANMSG("Error initializing chip for receiving\n");
 
-		/* chip->flags |= OBJ_BUFFERS_ALLOCATED; */
-		
 	} /* End of chip configuration */
 
 	canuser = (struct canuser_t *)kmalloc(sizeof(struct canuser_t), GFP_KERNEL);
 	if(canuser == NULL) goto no_canuser;
-	canuser->file = file;
+	canuser->flags=0;
+	canuser->userinfo.fileinfo.file = file;
 	canuser->msgobj = obj;
 	canuser->magic = CAN_USER_MAGIC;
 	file->private_data = canuser;
@@ -69,13 +62,19 @@ int can_open(struct inode *inode, struct file *file)
 	canqueue_ends_init_kern(qends);
 	canuser->qends = qends;
 	
+	/*required to synchronize with RT-Linux context*/
+	can_spin_lock_irqsave(&canuser_manipulation_lock, iflags);
 	list_add(&canuser->peers, &obj->obj_users);
+	can_spin_unlock_irqrestore(&canuser_manipulation_lock, iflags);
 
-	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 +82,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);