X-Git-Url: http://rtime.felk.cvut.cz/gitweb/lincan.git/blobdiff_plain/95c031e101c74ae6472a7e538f3128f67a490082..50e9e47fc21191ea9ea758fea1e7f2bd5a275e98:/lincan/src/open.c

diff --git a/lincan/src/open.c b/lincan/src/open.c
index 127fdea..942225a 100644
--- a/lincan/src/open.c
+++ b/lincan/src/open.c
@@ -1,17 +1,41 @@
-/* open.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 lincan-0.3  17 Jun 2004
- */
+/**************************************************************************/
+/* File: open.c - systemcall to open new user connection/handle           */
+/*                                                                        */
+/* LinCAN - (Not only) Linux CAN bus driver                               */
+/* Copyright (C) 2002-2009 DCE FEE CTU Prague <http://dce.felk.cvut.cz>   */
+/* Copyright (C) 2002-2009 Pavel Pisa <pisa@cmp.felk.cvut.cz>             */
+/* Funded by OCERA and FRESCOR IST projects                               */
+/* Based on CAN driver code by Arnaud Westenberg <arnaud@wanadoo.nl>      */
+/*                                                                        */
+/* LinCAN is free software; you can redistribute it and/or modify it      */
+/* under terms of the GNU General Public License as published by the      */
+/* Free Software Foundation; either version 2, or (at your option) any    */
+/* later version.  LinCAN is distributed in the hope that it will be      */
+/* useful, but WITHOUT ANY WARRANTY; without even the implied warranty    */
+/* of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU    */
+/* General Public License for more details. You should have received a    */
+/* copy of the GNU General Public License along with LinCAN; see file     */
+/* COPYING. If not, write to the Free Software Foundation, 675 Mass Ave,  */
+/* Cambridge, MA 02139, USA.                                              */
+/*                                                                        */
+/* To allow use of LinCAN in the compact embedded systems firmware        */
+/* and RT-executives (RTEMS for example), main authors agree with next    */
+/* special exception:                                                     */
+/*                                                                        */
+/* Including LinCAN header files in a file, instantiating LinCAN generics */
+/* or templates, or linking other files with LinCAN objects to produce    */
+/* an application image/executable, does not by itself cause the          */
+/* resulting application image/executable to be covered by                */
+/* the GNU General Public License.                                        */
+/* This exception does not however invalidate any other reasons           */
+/* why the executable file might be covered by the GNU Public License.    */
+/* Publication of enhanced or derived LinCAN files is required although.  */
+/**************************************************************************/
 
 #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__
@@ -25,8 +49,9 @@ int can_open(struct inode *inode, struct file *file)
 	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) || 
+	if ( ((obj=objects_p[MINOR_NR]) == NULL) ||
 			((chip=objects_p[MINOR_NR]->hostchip) == NULL) ) {
 		CANMSG("There is no hardware support for the device file with minor nr.: %d\n",MINOR_NR);
 		return -ENODEV;
@@ -34,20 +59,33 @@ 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));
+	openflag = can_msgobj_test_fl(obj,OPENED);	// Martin Petera: store previous status
 	can_msgobj_set_fl(obj,OPENED);
 
-	if (chip->flags & CHIP_CONFIGURED) 
+	if (chip->flags & CHIP_CONFIGURED)
 		DEBUGMSG("Device is already configured.\n");
 	else {
 		if (chip->chipspecops->chip_config(chip))
 			CANMSG("Error configuring chip.\n");
 		else
-			chip->flags |= CHIP_CONFIGURED; 
+			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");
+	}
 
-	} /* End of chip configuration */
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,10))
+	if (chip->hostdevice->hwspecops->release_device)
+		kref_get(&chip->hostdevice->refcount);
+#endif
 
 	canuser = (struct canuser_t *)kmalloc(sizeof(struct canuser_t), GFP_KERNEL);
 	if(canuser == NULL) goto no_canuser;
@@ -61,7 +99,7 @@ int can_open(struct inode *inode, struct file *file)
 	if(qends == NULL) goto no_qends;
 	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);
@@ -78,10 +116,10 @@ int can_open(struct inode *inode, struct file *file)
 
 #if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,50))
 	MOD_INC_USE_COUNT;
-#endif	
+#endif
 
 	return 0;
-	
+
     no_rx_qedge:
 	canque_notify_bothends(edge, CANQUEUE_NOTIFY_DEAD_WANTED);
 	canque_edge_decref(edge);