extend vlist code to allow keeping the old data structure instead of the new one...

[project/netifd.git] / netifd.h

diff --git a/netifd.h b/netifd.h
index 77c8719..be29b3c 100644 (file)
--- a/netifd.h
+++ b/netifd.h
@@ -7,58 +7,16 @@
 #include <stdbool.h>
 #include <stdio.h>
 
-#include <libubox/list.h>
 #include <libubox/uloop.h>
 
 #include <libubus.h>
-#include <uci.h>
 
-#ifdef DEBUG
-#define DPRINTF(format, ...) fprintf(stderr, "%s(%d): " format, __func__, __LINE__, ## __VA_ARGS__)
-#else
-#define DPRINTF(...) do {} while(0)
-#endif
-
-#define __init __attribute__((constructor))
+#include "utils.h"
 
 struct device;
 struct interface;
 
-extern struct uci_context *uci_ctx;
-extern bool config_init;
-
-int avl_strcmp(const void *k1, const void *k2, void *ptr);
-void config_init_interfaces(const char *name);
-
-#ifdef __linux__
-static inline int fls(int x)
-{
-    int r = 32;
-
-    if (!x)
-        return 0;
-    if (!(x & 0xffff0000u)) {
-        x <<= 16;
-        r -= 16;
-    }
-    if (!(x & 0xff000000u)) {
-        x <<= 8;
-        r -= 8;
-    }
-    if (!(x & 0xf0000000u)) {
-        x <<= 4;
-        r -= 4;
-    }
-    if (!(x & 0xc0000000u)) {
-        x <<= 2;
-        r -= 2;
-    }
-    if (!(x & 0x80000000u)) {
-        x <<= 1;
-        r -= 1;
-    }
-    return r;
-}
-#endif
+extern const char *main_path;
+void netifd_restart(void);
 
 #endif