X-Git-Url: http://rtime.felk.cvut.cz/gitweb/lincan.git/blobdiff_plain/a4c9ead4b64bd4de307f375c2ff313a7a07a06e0..3810959545bb02dd92e5ad90531af62e3c985da6:/lincan/src/can_queue.c

diff --git a/lincan/src/can_queue.c b/lincan/src/can_queue.c
index dfdafbb..db433af 100644
--- a/lincan/src/can_queue.c
+++ b/lincan/src/can_queue.c
@@ -1,10 +1,35 @@
-/* can_queue.c - CAN message queues
- * Linux CAN-bus device driver.
- * 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: can_queue.c - CAN message queues                                 */
+/*                                                                        */
+/* 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                               */
+/*                                                                        */
+/* 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"
@@ -97,6 +122,11 @@ int canque_fifo_init_slots(struct canque_fifo_t *fifo)
  list_entry(ptr, type, member)
 */
 
+void __canque_edge_decref(struct canque_edge_t *edge)
+{
+	__canque_edge_decref_body(edge);
+}
+
 /**
  * canque_get_inslot - finds one outgoing edge and allocates slot from it
  * @qends: ends structure belonging to calling communication object
@@ -519,8 +549,7 @@ int canqueue_connect_edge(struct canque_edge_t *qedge, struct canque_ends_t *ine
 	if(qedge == NULL) return -1;
 	DEBUGQUE("canqueue_connect_edge %d\n",qedge->edge_num);
 	canque_edge_incref(qedge);
-	can_spin_lock_irqsave(&inends->ends_lock, flags);
-	can_spin_lock(&outends->ends_lock);
+	flags=canque_edge_lock_both_ends(inends, outends);
 	can_spin_lock(&qedge->fifo.fifo_lock);
 	qedge->inends=inends;
 	list_add(&qedge->inpeers,&inends->inlist);
@@ -528,8 +557,7 @@ int canqueue_connect_edge(struct canque_edge_t *qedge, struct canque_ends_t *ine
 	list_add(&qedge->outpeers,&outends->outlist);
 	list_add(&qedge->activepeers,&outends->idle);
 	can_spin_unlock(&qedge->fifo.fifo_lock);
-	can_spin_unlock(&outends->ends_lock);
-	can_spin_unlock_irqrestore(&inends->ends_lock, flags);
+	canque_edge_unlock_both_ends(inends, outends, flags);
 	canque_notify_bothends(qedge, CANQUEUE_NOTIFY_ATTACH);
 
 	if(canque_fifo_test_and_set_fl(&qedge->fifo, READY))
@@ -551,9 +579,17 @@ int canqueue_disconnect_edge(struct canque_edge_t *qedge)
 	struct canque_ends_t *inends, *outends;
 
 	inends=qedge->inends;
-	if(inends) can_spin_lock_irqsave(&inends->ends_lock,flags);
 	outends=qedge->outends;
-	if(outends) can_spin_lock(&outends->ends_lock);
+
+	if(inends && outends) {
+		flags=canque_edge_lock_both_ends(inends, outends);
+	} else {
+		DEBUGQUE("canqueue_disconnect_edge called with not fully connected edge");
+		if(inends) can_spin_lock_irqsave(&inends->ends_lock,flags);
+		if(outends) can_spin_lock(&outends->ends_lock);
+		flags=0;
+	}
+	
 	can_spin_lock(&qedge->fifo.fifo_lock);
 	if(atomic_read(&qedge->edge_used)==0) {
 		if(qedge->outends){
@@ -569,8 +605,14 @@ int canqueue_disconnect_edge(struct canque_edge_t *qedge)
 		ret=1;
 	} else ret=-1;
 	can_spin_unlock(&qedge->fifo.fifo_lock);
-	if(outends) can_spin_unlock(&outends->ends_lock);
-	if(inends) can_spin_unlock_irqrestore(&inends->ends_lock,flags);
+
+	if(inends && outends) {
+		canque_edge_unlock_both_ends(inends, outends, flags);
+	} else {
+		if(outends) can_spin_unlock(&outends->ends_lock);
+		if(inends) can_spin_unlock_irqrestore(&inends->ends_lock,flags);
+	}
+
 	DEBUGQUE("canqueue_disconnect_edge %d returned %d\n",qedge->edge_num,ret);
 	return ret;
 }