X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=lib%2Ftypes%2Ftypes.h;h=36841cd20b50fed4345579a78b9e25a09b685339;hp=e5c7e3e00225daa162c7850eb1d302da63074f7a;hb=98b04aa42a4f1dc8e585f00d75c3b28d9e9aa2a9;hpb=b9af039e99527159aad905c3395fa974b9621f8e

diff --git a/lib/types/types.h b/lib/types/types.h
index e5c7e3e..36841cd 100644
--- a/lib/types/types.h
+++ b/lib/types/types.h
@@ -8,6 +8,7 @@
 enum device_type {
 	DEVICE_TYPE_NETWORK,
 	DEVICE_TYPE_DISK,
+	DEVICE_TYPE_USB,
 	DEVICE_TYPE_OPTICAL,
 	DEVICE_TYPE_ANY,
 	DEVICE_TYPE_UNKNOWN,
@@ -51,6 +52,7 @@ struct boot_option {
 	char		*initrd_file;
 	char		*dtb_file;
 	char		*boot_args;
+	char		*args_sig_file;
 	bool		is_default;
 
 	struct list_item	list;
@@ -58,22 +60,43 @@ struct boot_option {
 	void		*ui_info;
 };
 
+struct plugin_option {
+	char		*id;
+	char		*name;
+	char		*vendor;
+	char		*vendor_id;
+	char		*version;
+	char		*date;
+	char		*plugin_file;
+
+	unsigned int	n_executables;
+	char		**executables;
+
+	void		*ui_info;
+};
+
 struct boot_command {
 	char *option_id;
 	char *boot_image_file;
 	char *initrd_file;
 	char *dtb_file;
 	char *boot_args;
+	char *args_sig_file;
+	char *console;
 };
 
-struct boot_status {
-	enum {
-		BOOT_STATUS_INFO,
-		BOOT_STATUS_ERROR,
+struct status {
+	enum status_type {
+		STATUS_INFO,
+		STATUS_ERROR,
 	} type;
 	char	*message;
-	char	*detail;
-	int	progress;
+	bool	backlog;
+};
+
+struct statuslog_entry {
+	struct status		*status;
+	struct list_item	list;
 };
 
 struct interface_info {
@@ -81,6 +104,7 @@ struct interface_info {
 	uint8_t		*hwaddr;
 	char		*name;
 	bool		link;
+	char		*address;
 };
 
 struct blockdev_info {
@@ -92,6 +116,15 @@ struct blockdev_info {
 struct system_info {
 	char			*type;
 	char			*identifier;
+	char			**platform_primary;
+	char			**platform_other;
+	unsigned int		n_primary;
+	unsigned int		n_other;
+	char			**bmc_current;
+	char			**bmc_golden;
+	unsigned int		n_bmc_current;
+	unsigned int		n_bmc_golden;
+	uint8_t			*bmc_mac;
 	struct interface_info	**interfaces;
 	unsigned int		n_interfaces;
 	struct blockdev_info	**blockdevs;
@@ -113,8 +146,10 @@ struct interface_config {
 		struct {
 			char *address;
 			char *gateway;
+			char *url;
 		} static_config;
 	};
+	bool	override;
 };
 
 struct network_config {
@@ -146,11 +181,23 @@ struct config {
 	unsigned int		ipmi_bootdev;
 	bool			ipmi_bootdev_persistent;
 
+	char			*http_proxy;
+	char			*https_proxy;
+
+	bool			allow_writes;
+
+	char			*boot_console;
+	bool			manual_console;
 	char			*lang;
 
 	/* not user-settable */
+	unsigned int		n_consoles;
+	char			**consoles;
+	bool			disable_snapshots;
 	bool			safe_mode;
 	bool			debug;
 };
 
+bool config_autoboot_active(const struct config *config);
+
 #endif /* _TYPES_H */