X-Git-Url: http://rtime.felk.cvut.cz/gitweb/lincan.git/blobdiff_plain/c6d6f58c34e1b6a4c03d1e86d1abf48eeb6f5624..6d1158545bf86bf3478a1e247d6c3d80b8e4ed13:/lincan/src/open.c

diff --git a/lincan/src/open.c b/lincan/src/open.c
index 38ee4d4..e471470 100644
--- a/lincan/src/open.c
+++ b/lincan/src/open.c
@@ -4,14 +4,13 @@
  * 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.2  9 Jul 2003
+ * Version lincan-0.3  17 Jun 2004
  */
 
 #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__
@@ -20,10 +19,12 @@
 int can_open(struct inode *inode, struct file *file)
 {
 	struct msgobj_t *obj;
-	struct chip_t *chip;
+	struct canchip_t *chip;
 	struct canuser_t *canuser;
 	struct canque_ends_t *qends;
 	struct canque_edge_t *edge;
+	can_spin_irqflags_t iflags;
+	char openflag;		// Martin Petera: Object already opened
 
 	if ( ((obj=objects_p[MINOR_NR]) == NULL) || 
 			((chip=objects_p[MINOR_NR]->hostchip) == NULL) ) {
@@ -33,7 +34,8 @@ 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;
+	openflag = can_msgobj_test_fl(obj,OPENED);	// Martin Petera: store previous status
+	can_msgobj_set_fl(obj,OPENED);
 
 	if (chip->flags & CHIP_CONFIGURED) 
 		DEBUGMSG("Device is already configured.\n");
@@ -42,17 +44,24 @@ int can_open(struct inode *inode, struct file *file)
 			CANMSG("Error configuring chip.\n");
 		else
 			chip->flags |= CHIP_CONFIGURED; 
+	} /* End of chip configuration */
+
 
+	/* Martin Petera: Fix for HCAN2
+	 * pre_read was called only once -> Opening second MSG object from userspace
+	 * didn't call function to configure MSG object for receive.
+	 * FIX: Call pre_read once for each MSG object
+	 **/
+	if (!openflag) {
 		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;
@@ -62,7 +71,10 @@ 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(edge=canque_new_edge_kern(MAX_BUF_LENGTH),
 		canuser->qends, obj->qends)<0) goto no_tx_qedge;
@@ -78,7 +90,7 @@ int can_open(struct inode *inode, struct file *file)
 #endif	
 
 	return 0;
-	
+
     no_rx_qedge:
 	canque_notify_bothends(edge, CANQUEUE_NOTIFY_DEAD_WANTED);
 	canque_edge_decref(edge);