add mac address to device info

[project/netifd.git] / utils.h

diff --git a/utils.h b/utils.h
index 8ef968a..b5ae7e0 100644 (file)
--- a/utils.h
+++ b/utils.h
@@ -4,16 +4,6 @@
 #include <libubox/list.h>
 #include <libubox/avl.h>
 
-#ifdef DEBUG
-#define DPRINTF(format, ...) fprintf(stderr, "%s(%d): " format, __func__, __LINE__, ## __VA_ARGS__)
-#else
-#define DPRINTF(format, ...) no_debug(format, ## __VA_ARGS__)
-#endif
-
-static inline void no_debug(const char *fmt, ...)
-{
-}
-
 #define __init __attribute__((constructor))
 
 struct vlist_tree;
@@ -44,6 +34,14 @@ void __vlist_init(struct vlist_tree *tree, avl_tree_comp cmp, vlist_update_cb up
 #define vlist_init(tree, cmp, update, type, node, key) \
        __vlist_init(tree, cmp, update, offsetof(type, key) - offsetof(type, node))
 
+#define vlist_find(tree, name, element, node_member) \
+       avl_find_element(&(tree)->avl, name, element, node_member.avl)
+
+static inline void vlist_update(struct vlist_tree *tree)
+{
+       tree->version++;
+}
+
 void vlist_add(struct vlist_tree *tree, struct vlist_node *node);
 void vlist_delete(struct vlist_tree *tree, struct vlist_node *node);
 void vlist_flush(struct vlist_tree *tree);
@@ -52,6 +50,43 @@ void vlist_flush_all(struct vlist_tree *tree);
 #define vlist_for_each_element(tree, element, node_member) \
        avl_for_each_element(&(tree)->avl, element, node_member.avl)
 
+
+struct vlist_simple_tree {
+       struct list_head list;
+       int head_offset;
+       int version;
+};
+
+struct vlist_simple_node {
+       struct list_head list;
+       int version;
+};
+
+#define vlist_simple_init(tree, node, member) \
+       __vlist_simple_init(tree, offsetof(node, member))
+
+void __vlist_simple_init(struct vlist_simple_tree *tree, int offset);
+void vlist_simple_delete(struct vlist_simple_tree *tree, struct vlist_simple_node *node);
+void vlist_simple_flush(struct vlist_simple_tree *tree);
+void vlist_simple_flush_all(struct vlist_simple_tree *tree);
+
+static inline void vlist_simple_update(struct vlist_simple_tree *tree)
+{
+       tree->version++;
+}
+
+static inline void vlist_simple_add(struct vlist_simple_tree *tree, struct vlist_simple_node *node)
+{
+       list_add(&node->list, &tree->list);
+}
+
+#define vlist_simple_for_each_element(tree, element, node_member) \
+       list_for_each_entry(element, &(tree)->list, node_member.list)
+
+#define vlist_simple_empty(tree) \
+       list_empty(&(tree)->list)
+
+
 #ifdef __linux__
 static inline int fls(int x)
 {