X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=lib%2Flist%2Flist.h;h=ad562e4cc9bedece8d299893329d084f1abddefd;hp=f78411ea18f7679e058dfaa1f4f6ebb987cc582c;hb=052961eb2e8279f103c091e850c317da335c0207;hpb=9057583b8b37d07eb9af2fd48674f1732fecda17

diff --git a/lib/list/list.h b/lib/list/list.h
index f78411e..ad562e4 100644
--- a/lib/list/list.h
+++ b/lib/list/list.h
@@ -1,6 +1,8 @@
 #ifndef _LIST_H
 #define _LIST_H
 
+#include <util/util.h>
+
 struct list_item {
 	struct list_item *prev, *next;
 };
@@ -9,38 +11,56 @@ struct list {
 	struct list_item head;
 };
 
-#ifndef container_of
-#define container_of(ptr, type, member) ({			\
-	const typeof( ((type *)0)->member ) *__mptr = (ptr);	\
-	(type *)( (char *)__mptr - offsetof(type,member) );})
-#endif
+#define list_for_each(_list, _pos) \
+	for (_pos = (_list)->head.next; _pos != ((_list)->head); _pos = _pos->next)
 
-#ifndef offsetof
-#define offsetof(TYPE, MEMBER) ((size_t) &((TYPE *)0)->MEMBER)
-#endif
+#define list_entry(_ptr, _type, _member, _list) \
+	(&container_of(_ptr, _type, _member)->_member == &((_list)->head) \
+	? NULL \
+	: container_of(_ptr, _type, _member))
 
-#define list_for_each(list, pos) \
-	for (pos = (list)->head.next; pos != ((list)->head); pos = pos->next)
+#define list_prev_entry(_list, _pos, _member) \
+	list_entry(_pos->_member.prev, typeof(*_pos), _member, _list)
 
-#define list_entry(ptr, type, member) \
-	container_of(ptr, type, member)
+#define list_next_entry(_list, _pos, _member) \
+	list_entry(_pos->_member.next, typeof(*_pos), _member, _list)
 
-#define list_for_each_entry(list, pos, member)				\
-	for (pos = list_entry((list)->head.next, typeof(*pos), member);	\
-	     &pos->member != &(list)->head; 	\
-	     pos = list_entry(pos->member.next, typeof(*pos), member))
+#define list_for_each_entry(_list, _pos, _member) \
+	for (_pos = list_entry((_list)->head.next, typeof(*_pos), _member, _list); \
+		_pos; _pos = list_next_entry(_list, _pos, _member))
 
-#define list_for_each_entry_safe(list, pos, n, member)			\
-	for (pos = list_entry((list)->head.next, typeof(*pos), member),	\
-		n = list_entry(pos->member.next, typeof(*pos), member);	\
-	     &pos->member != &(list)->head;				\
-	     pos = n, n = list_entry(n->member.next, typeof(*n), member))
+#define list_for_each_entry_continue(_list, _pos, _member) \
+	for (; _pos; _pos = list_next_entry(_list, _pos, _member))
 
+#define list_for_each_entry_safe(_list, _pos, _tmp, _member) \
+	for (_pos = container_of((_list)->head.next, typeof(*_pos), _member), \
+		_tmp = container_of(_pos->_member.next, typeof(*_pos), \
+				_member); \
+	     &_pos->_member != &(_list)->head; \
+	     _pos = _tmp, \
+	     _tmp = container_of(_tmp->_member.next, typeof(*_pos), _member))
 
-void list_init(struct list *list);
+#define DEFINE_LIST(_list) struct list _list = { \
+	.head = { \
+		.next = &_list.head, \
+		.prev = &_list.head \
+	} \
+}
 
-void list_add(struct list *list, struct list_item *item);
+#define STATIC_LIST(_list) static DEFINE_LIST(_list)
 
+void list_init(struct list *list);
+void list_insert_before(struct list_item *next, struct list_item *item);
+void list_insert_after(struct list_item *prev, struct list_item *item);
 void list_remove(struct list_item *item);
 
+static inline void list_add(struct list *list, struct list_item *item)
+{
+	list_insert_after(&list->head, item);
+}
+static inline void list_add_tail(struct list *list, struct list_item *item)
+{
+	list_insert_before(&list->head, item);
+}
+
 #endif /* _LIST_H */