X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=ui%2Fcommon%2Fui-system.h;h=b4372ee7fcab02ab8be7239b2d0dac017322d723;hp=2dc37a30d8506cf722734d57b352b4afd8d81b4c;hb=69c459db80abece18b5557d9b8a8098a88329c28;hpb=28b939a43107cfe5438f3b36bd175f1b9aa138ee

diff --git a/ui/common/ui-system.h b/ui/common/ui-system.h
index 2dc37a3..b4372ee 100644
--- a/ui/common/ui-system.h
+++ b/ui/common/ui-system.h
@@ -19,19 +19,17 @@
 #if !defined(_PB_UI_SYSTEM_H)
 #define _PB_UI_SYSTEM_H
 
-#include "pb-protocol/pb-protocol.h"
+#include <stdint.h>
+
 #include "system/system.h"
+#include "types/types.h"
 #include "ui/common/timer.h"
+#include "ui/common/discover-client.h"
 
 #include <signal.h>
 
-struct pb_kexec_data {
-	char *image;
-	char *initrd;
-	char *args;
-};
-
-int pb_run_kexec(const struct pb_kexec_data *kd);
+int pb_boot(const struct pb_boot_data *bd, int dry_run);
+int pb_start_daemon(void);
 
 unsigned int pb_elf_hash(const char *str);
 unsigned int pb_cat_hash(const char *a, const char *b);
@@ -44,13 +42,11 @@ static inline uint32_t pb_opt_hash(const struct device *dev,
 
 struct pb_opt_data {
 	const char *name;
-	struct pb_kexec_data *kd;
+	struct pb_boot_data *bd;
 
 	/* optional data */
-	union {
-		const struct device *dev;
-		const struct boot_option *opt;
-	};
+	const struct device *dev;
+	const struct boot_option *opt;
 	uint32_t opt_hash;
 };