X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=bertos%2Fstruct%2Flist.h;h=c83063547ef42d3a55403bf1e1a4be3d5904a850;hb=4c61653db84fe75fc2bb8f5af9d1ac0343068b4c;hp=62abdc4a83f8bd3a6c319f470a355b061ec05ed3;hpb=b90e284547eab472e3d9e478a058304bdd6b2da7;p=bertos.git diff --git a/bertos/struct/list.h b/bertos/struct/list.h index 62abdc4a..c8306354 100644 --- a/bertos/struct/list.h +++ b/bertos/struct/list.h @@ -32,7 +32,6 @@ * * \brief General pourpose double-linked lists * - * \version $Id$ * \author Bernie Innocenti */ @@ -216,6 +215,7 @@ typedef struct _PriNode #define INVALIDATE_NODE(n) ((n)->succ = (n)->pred = NULL) #else #define LIST_ASSERT_VALID(l) do {} while (0) + #define LIST_ASSERT_NOT_CONTAINS(list,node) do {} while (0) #define INVALIDATE_NODE(n) do {} while (0) #endif @@ -275,9 +275,24 @@ typedef struct _PriNode /** * Insert a priority node in a priority queue. * - * The new node is inserted immediately before the - * first node with lower priority or appended to - * the tail if no such node exists. + * The new node is inserted immediately before the first node with the same + * priority or appended to the tail if no such node exists. + */ +#define LIST_ENQUEUE_HEAD(list, node) \ + do { \ + PriNode *ln; \ + LIST_ASSERT_NOT_CONTAINS((list),(node)); \ + FOREACH_NODE(ln, (list)) \ + if (ln->pri <= (node)->pri) \ + break; \ + INSERT_BEFORE(&(node)->link, &ln->link); \ + } while (0) + +/** + * Insert a priority node in a priority queue. + * + * The new node is inserted immediately before the first node with lower + * priority or appended to the tail if no such node exists. */ #define LIST_ENQUEUE(list, node) \ do { \