X-Git-Url: http://rtime.felk.cvut.cz/gitweb/lincan.git/blobdiff_plain/8554583c1846da3be0ab3e25c5e4621e78de8125..9c8ab08d7e8fca3916a7f91a3c001d151989137c:/lincan/include/can_queue.h diff --git a/lincan/include/can_queue.h b/lincan/include/can_queue.h index 3be8469..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 */ +/* Copyright (C) 2002-2009 Pavel Pisa */ +/* 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) @@ -554,24 +579,24 @@ void canque_edge_incref(struct canque_edge_t *edge) } static inline -can_spin_irqflags_t canque_edge_lock_both_ends(struct canque_edge_t *edge) +can_spin_irqflags_t canque_edge_lock_both_ends(struct canque_ends_t *inends, struct canque_ends_t *outends) { can_spin_irqflags_t flags; - if(edge->inendsoutends) { - can_spin_lock_irqsave(&edge->inends->ends_lock, flags); - can_spin_lock(&edge->outends->ends_lock); + if(inendsends_lock, flags); + can_spin_lock(&outends->ends_lock); }else{ - can_spin_lock_irqsave(&edge->outends->ends_lock, flags); - if(edge->outends!=edge->inends) can_spin_lock(&edge->inends->ends_lock); + can_spin_lock_irqsave(&outends->ends_lock, flags); + if(outends!=inends) can_spin_lock(&inends->ends_lock); } return flags; } static inline -void canque_edge_unlock_both_ends(struct canque_edge_t *edge, can_spin_irqflags_t flags) +void canque_edge_unlock_both_ends(struct canque_ends_t *inends, struct canque_ends_t *outends, can_spin_irqflags_t flags) { - if(edge->outends!=edge->inends) can_spin_unlock(&edge->outends->ends_lock); - can_spin_unlock_irqrestore(&edge->inends->ends_lock, flags); + if(outends!=inends) can_spin_unlock(&outends->ends_lock); + can_spin_unlock_irqrestore(&inends->ends_lock, flags); } /* Non-inlined version of edge reference decrement */ @@ -582,22 +607,24 @@ void __canque_edge_decref_body(struct canque_edge_t *edge) { can_spin_irqflags_t flags; int dead_fl=0; + struct canque_ends_t *inends=edge->inends; + struct canque_ends_t *outends=edge->outends; - flags=canque_edge_lock_both_ends(edge); + flags=canque_edge_lock_both_ends(inends, outends); if(atomic_dec_and_test(&edge->edge_used)) { dead_fl=!canque_fifo_test_and_set_fl(&edge->fifo,DEAD); /* Because of former evolution of edge references management notify of CANQUEUE_NOTIFY_NOUSR could be moved to canque_edge_do_dead :-) */ } - canque_edge_unlock_both_ends(edge, flags); + canque_edge_unlock_both_ends(inends, outends, flags); if(dead_fl) canque_edge_do_dead(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()