X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fprocd.git;a=blobdiff_plain;f=procd.h;h=66d183c1bc11d623476a064da7e74631100b8539;hp=4fd45f2a11e6ae9b320a0ae116e430bd7e467237;hb=f355e233714e6ff38a38ccfe74f2f42d65a519c8;hpb=3283d681f9da65b500ad0cb3d4550cb840ed481a

diff --git a/procd.h b/procd.h
index 4fd45f2..66d183c 100644
--- a/procd.h
+++ b/procd.h
@@ -22,42 +22,20 @@
 #include <stdio.h>
 #include <syslog.h>
 
-#include "syslog.h"
+#include "log.h"
 
 #define __init __attribute__((constructor))
 
-#define DEBUG(level, fmt, ...) do { \
-	if (debug >= level) \
-		fprintf(stderr, "procd: %s(%d): " fmt, __func__, __LINE__, ## __VA_ARGS__); \
-	} while (0)
-
-#define SYSLOG(p, fmt, ...) do { \
-	syslog(p, fmt, ## __VA_ARGS__); \
-	} while (0)
-
-#define LOG(fmt, ...) do { \
-	syslog(LOG_INFO, fmt, ## __VA_ARGS__); \
-	fprintf(stderr, "procd: "fmt, ## __VA_ARGS__); \
-	} while (0)
-
-#define ERROR(fmt, ...) do { \
-	syslog(LOG_ERR, fmt, ## __VA_ARGS__); \
-	fprintf(stderr, "procd: "fmt, ## __VA_ARGS__); \
-	} while (0)
-
 extern char *ubus_socket;
-
-extern unsigned int debug;
-void debug_init(void);
+extern int upgrade_running;
 
 void procd_connect_ubus(void);
 void procd_reconnect_ubus(int reconnect);
 void ubus_init_service(struct ubus_context *ctx);
-void ubus_init_log(struct ubus_context *ctx);
 void ubus_init_system(struct ubus_context *ctx);
-void ubus_notify_log(struct log_head *l);
 
 void procd_state_next(void);
+void procd_state_ubus_connect(void);
 void procd_shutdown(int event);
 void procd_early(void);
 void procd_preinit(void);
@@ -66,13 +44,16 @@ void procd_signal(void);
 void procd_signal_preinit(void);
 void procd_inittab(void);
 void procd_inittab_run(const char *action);
-
-int mkdev(const char *progname, int progmode);
+void procd_bcast_event(char *event, struct blob_attr *msg);
 
 struct trigger;
 void trigger_init(void);
-void trigger_event(char *type, struct blob_attr *data);
+void trigger_event(const char *type, struct blob_attr *data);
 void trigger_add(struct blob_attr *rule, void *id);
 void trigger_del(void *id);
 
+void watch_add(const char *_name, void *id);
+void watch_del(void *id);
+void watch_ubus(struct ubus_context *ctx);
+
 #endif