From ee86a0bd989511319adf3467b41b5b2e1f486aa6 Mon Sep 17 00:00:00 2001 From: Jeremy Kerr Date: Wed, 10 Apr 2013 12:19:13 +1000 Subject: lib/types: Create common file for type definitions The device and boot_option types are defined in pb-protocol.h, but aren't really specific to the procotol. This means a lot of non-messaging-related files are #including the protocol definitions unnecessarily. This change separates the types out into lib/types/types.h. Signed-off-by: Jeremy Kerr Signed-off-by: Geoff Levand --- lib/Makefile.am | 1 + lib/pb-protocol/pb-protocol.h | 27 +-------------------------- lib/types/types.h | 32 ++++++++++++++++++++++++++++++++ 3 files changed, 34 insertions(+), 26 deletions(-) create mode 100644 lib/types/types.h (limited to 'lib') diff --git a/lib/Makefile.am b/lib/Makefile.am index 6440fe4..7847d09 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -28,6 +28,7 @@ libpbcore_la_SOURCES = \ waiter/waiter.h \ pb-protocol/pb-protocol.c \ pb-protocol/pb-protocol.h \ + types/types.h \ talloc/talloc.c \ talloc/talloc.h \ system/system.c \ diff --git a/lib/pb-protocol/pb-protocol.h b/lib/pb-protocol/pb-protocol.h index bfa9222..07ef7e1 100644 --- a/lib/pb-protocol/pb-protocol.h +++ b/lib/pb-protocol/pb-protocol.h @@ -5,6 +5,7 @@ #include #include +#include #define PB_SOCKET_PATH "/tmp/petitboot.ui" @@ -21,32 +22,6 @@ struct pb_protocol_message { char payload[]; }; -struct device { - char *id; - char *name; - char *description; - char *icon_file; - - struct list boot_options; - - int n_options; - void *ui_info; -}; - -struct boot_option { - char *id; - char *name; - char *description; - char *icon_file; - char *boot_image_file; - char *initrd_file; - char *boot_args; - - struct list_item list; - - void *ui_info; -}; - void pb_protocol_dump_device(const struct device *dev, const char *text, FILE *stream); int pb_protocol_device_len(const struct device *dev); diff --git a/lib/types/types.h b/lib/types/types.h new file mode 100644 index 0000000..acd9e3e --- /dev/null +++ b/lib/types/types.h @@ -0,0 +1,32 @@ +#ifndef _TYPES_H +#define _TYPES_H + +#include + +struct device { + char *id; + char *name; + char *description; + char *icon_file; + + int n_options; + struct list boot_options; + + void *ui_info; +}; + +struct boot_option { + char *id; + char *name; + char *description; + char *icon_file; + char *boot_image_file; + char *initrd_file; + char *boot_args; + + struct list_item list; + + void *ui_info; +}; + +#endif /* _TYPES_H */ -- cgit v1.2.1