Structured comments updated.

[lincan.git] / lincan / include / can_queue.h

diff --git a/lincan/include/can_queue.h b/lincan/include/can_queue.h
index 8821dca02c488ea8fdc8d64af161f3879d8bd777..c3df3ad4fab73ab5fd5fc460ae58d9a1220aa191 100644 (file)
--- a/lincan/include/can_queue.h
+++ b/lincan/include/can_queue.h
@@ -1,7 +1,7 @@
 #ifndef _CAN_QUEUE_H
 #define _CAN_QUEUE_H
 
-#include "./can.h"
+#include "./canmsg.h"
 #include "./constants.h"
 #include "./can_sysdep.h"
 
@@ -39,7 +39,7 @@
  * @flist: pointer to list of the free slots associated with queue
  * @entry: pointer to the memory allocated for the list slots.
  * @fifo_lock: the lock to ensure atomicity of slot manipulation operations.
- * @slotnr:  number of allocated slots
+ * @slotsnr:  number of allocated slots
  *
  * This structure represents CAN FIFO queue. It is implemented as 
  * a single linked list of slots prepared for processing. The empty slots
@@ -319,6 +319,8 @@ struct canque_edge_t {
  *     with ready messages. The array is indexed by the edges priorities. 
  * @idle: the list of the edges directed to the ends structure with empty FIFOs.
  * @inlist: the list of outgoing edges input sides.
+ * @outlist: the list of all incoming edges output sides. Each of there edges
+ *     is listed on one of @active or @idle lists.
  * @ends_lock: the lock synchronizing operations between threads accessing
  *     same ends structure.
  * @notify: pointer to notify procedure. The next state changes are notified.
@@ -525,6 +527,8 @@ int canqueue_ends_kill_inlist(struct canque_ends_t *qends, int send_rest);
 
 int canqueue_ends_kill_outlist(struct canque_ends_t *qends);
 
+int canqueue_ends_filt_conjuction(struct canque_ends_t *qends, struct canfilt_t *filt);
+
 /* edge reference and traversal functions */
 
 void canque_edge_do_dead(struct canque_edge_t *edge, int dead_fl);