X-Git-Url: http://rtime.felk.cvut.cz/gitweb/lincan.git/blobdiff_plain/c759ac4ffabb78a8863d9bced695980077eeb319..9c8ab08d7e8fca3916a7f91a3c001d151989137c:/lincan/include/can_queue.h

diff --git a/lincan/include/can_queue.h b/lincan/include/can_queue.h
index 5ed1fe4..00ac94c 100644
--- a/lincan/include/can_queue.h
+++ b/lincan/include/can_queue.h
@@ -1,10 +1,35 @@
-/* can_queue.h - CAN queues and message passing infrastructure 
- * Linux CAN-bus device driver.
- * Written 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.h - CAN queues and message passing infrastructure      */
+/*                                                                        */
+/* 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.  */
+/**************************************************************************/
 
 #ifndef _CAN_QUEUE_H
 #define _CAN_QUEUE_H
@@ -273,7 +298,7 @@ int canque_fifo_init_slots(struct canque_fifo_t *fifo);
 
 /* Forward declarations for external types */
 struct msgobj_t;
-struct chip_t;
+struct canchip_t;
 
 /**
  * struct canque_edge_t - CAN message delivery subsystem graph edge
@@ -382,7 +407,7 @@ struct canque_ends_t {
 	    #endif /*CAN_WITH_RTL*/
 		struct {
 			struct msgobj_t *msgobj;
-			struct chip_t *chip;
+			struct canchip_t *chip;
 		    #ifndef CAN_WITH_RTL
 			wait_queue_head_t daemonq;
 		    #else /*CAN_WITH_RTL*/
@@ -545,7 +570,7 @@ void canque_edge_do_dead(struct canque_edge_t *edge);
 
 /**
  * canque_edge_incref - increments edge reference count
- * @qedg: pointer to the edge structure
+ * @edge: pointer to the edge structure
  */
 static inline
 void canque_edge_incref(struct canque_edge_t *edge)
@@ -599,7 +624,7 @@ void __canque_edge_decref_body(struct canque_edge_t *edge)
 #ifndef CAN_HAVE_ARCH_CMPXCHG
 /**
  * canque_edge_decref - decrements edge reference count
- * @qedg: pointer to the edge structure
+ * @edge: pointer to the edge structure
  *
  * This function has to be called without lock held for both ends of edge.
  * If reference count drops to 0, function canque_edge_do_dead()