USBCAN converter code updated to match full version of LinCAN sources.

[lincan.git] / embedded / app / usbcan / can_queue.c

diff --git a/embedded/app/usbcan/can_queue.c b/embedded/app/usbcan/can_queue.c
index 9815fd01d248cda0342b37a5e13dbc3d53ddfc3d..6505e1db9ece13f949a1914ad6cd80308ed6c577 100644 (file)
--- a/embedded/app/usbcan/can_queue.c
+++ b/embedded/app/usbcan/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 "./can/can.h"
 #include "./can/can_sysdep.h"
 
 #include "./can/can.h"
 #include "./can/can_sysdep.h"


@@ -20,7 +45,7 @@ extern int processlocal;
 
 atomic_t edge_num_cnt;
 
 
 atomic_t edge_num_cnt;
 

-// #define CAN_DEBUG
+//#define CAN_DEBUG

 #undef CAN_DEBUG
 
 #ifdef CAN_DEBUG
 #undef CAN_DEBUG
 
 #ifdef CAN_DEBUG


@@ -561,8 +586,8 @@ int canqueue_disconnect_edge(struct canque_edge_t *qedge)
        } else {
                DEBUGQUE("canqueue_disconnect_edge called with not fully connected edge");
                if(inends) can_spin_lock_irqsave(&inends->ends_lock,flags);
        } 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;
+               else if(outends) can_spin_lock_irqsave(&outends->ends_lock,flags);
+               else flags=0;

        }
 
        can_spin_lock(&qedge->fifo.fifo_lock);
        }
 
        can_spin_lock(&qedge->fifo.fifo_lock);


@@ -584,8 +609,8 @@ int canqueue_disconnect_edge(struct canque_edge_t *qedge)
        if(inends && outends) {
                canque_edge_unlock_both_ends(inends, outends, flags);
        } else {
        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);
                if(inends) can_spin_unlock_irqrestore(&inends->ends_lock,flags);

+               else if(outends) can_spin_unlock_irqrestore(&outends->ends_lock,flags);

        }
 
        DEBUGQUE("canqueue_disconnect_edge %d returned %d\n",qedge->edge_num,ret);
        }
 
        DEBUGQUE("canqueue_disconnect_edge %d returned %d\n",qedge->edge_num,ret);