embedded: reintroduce missing emulated bus initialization for UL_USB1 board.

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

diff --git a/embedded/app/usbcan/devcommon.c b/embedded/app/usbcan/devcommon.c
index 2af0f86e98eecc2e7148b2af9226c40b38b80fdc..0b0c576e5a9a51f6c1633e0e1d4085570cf4d0a4 100644 (file)
--- a/embedded/app/usbcan/devcommon.c
+++ b/embedded/app/usbcan/devcommon.c
@@ -1,16 +1,41 @@
-/* devcommon.c - common device code
- * 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: devcommon.c - common device code                                 */
+/*                                                                        */
+/* 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"
-#include "../include/can_queue.h"
-#include "../include/main.h"
-#include "../include/devcommon.h"
+#include "./can/can.h"
+#include "./can/can_sysdep.h"
+#include "./can/can_queue.h"
+#include "./can/main.h"
+#include "./can/devcommon.h"
 
 #ifdef CAN_WITH_RTL
 static inline
@@ -36,7 +61,7 @@ void canqueue_wake_chip_worker(struct canque_ends_t *qends, struct canchip_t *ch
 /**
  * canqueue_notify_chip - notification callback handler for CAN chips ends of queues
  * @qends: pointer to the callback side ends structure
- * @qedge: edge which invoked notification 
+ * @qedge: edge which invoked notification
  * @what: notification type
  *
  * This function has to deal with more possible cases. It can be called from
@@ -59,7 +84,10 @@ void canqueue_notify_chip(struct canque_ends_t *qends, struct canque_edge_t *qed
                case CANQUEUE_NOTIFY_PROC:
                    #ifndef CAN_WITH_RTL
                        /*wake_up(&qends->endinfo.chipinfo.daemonq);*/
-                       chip->chipspecops->wakeup_tx(chip, obj);
+                       if(canque_fifo_test_fl(&qedge->fifo, READY)){
+                               if ((chip) && (chip->flags & CHIP_ATTACHED))
+                                       chip->chipspecops->wakeup_tx(chip, obj);
+                       }
                    #else /*CAN_WITH_RTL*/
                        can_msgobj_set_fl(obj,TX_REQUEST);
                        canqueue_wake_chip_worker(qends, chip, obj);
@@ -81,7 +109,7 @@ void canqueue_notify_chip(struct canque_ends_t *qends, struct canque_edge_t *qed
                        can_msgobj_set_fl(obj,FILTCH_REQUEST);
                        canqueue_wake_chip_worker(qends, chip, obj);
                    #endif /*CAN_WITH_RTL*/
-                       
+
                        break;
        }
 }
@@ -98,7 +126,7 @@ int canqueue_ends_init_chip(struct canque_ends_t *qends, struct canchip_t *chip,
        int ret;
        ret=canqueue_ends_init_gen(qends);
        if(ret<0) return ret;
-       
+
        qends->context=NULL;
     #ifndef CAN_WITH_RTL
        init_waitqueue_head(&qends->endinfo.chipinfo.daemonq);
@@ -121,7 +149,7 @@ int canqueue_ends_init_chip(struct canque_ends_t *qends, struct canchip_t *chip,
 int canqueue_ends_done_chip(struct canque_ends_t *qends)
 {
        int delayed;
-       
+
        /* Finish or kill all outgoing edges listed in inends */
        delayed=canqueue_ends_kill_inlist(qends, 1);
        /* Kill all incoming edges listed in outends */