diff options
| author | Jeremy Kerr <jk@ozlabs.org> | 2013-04-10 12:19:13 +1000 |
|---|---|---|
| committer | Geoff Levand <geoff@infradead.org> | 2013-04-10 10:49:01 -0700 |
| commit | ee86a0bd989511319adf3467b41b5b2e1f486aa6 (patch) | |
| tree | 43ecd9479052388dc6bd3dae697fc2a9f6962d42 /ui | |
| parent | 6b2d8ff75f1b9554d01dc6872b4498d660827e58 (diff) | |
| download | talos-petitboot-ee86a0bd989511319adf3467b41b5b2e1f486aa6.tar.gz talos-petitboot-ee86a0bd989511319adf3467b41b5b2e1f486aa6.zip | |
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 <jk@ozlabs.org>
Signed-off-by: Geoff Levand <geoff@infradead.org>
Diffstat (limited to 'ui')
| -rw-r--r-- | ui/common/discover-client.h | 2 | ||||
| -rw-r--r-- | ui/common/ui-system.h | 4 | ||||
| -rw-r--r-- | ui/ncurses/nc-ked.h | 2 | ||||
| -rw-r--r-- | ui/ncurses/nc-menu.h | 2 | ||||
| -rw-r--r-- | ui/twin/pbt-client.c | 2 | ||||
| -rw-r--r-- | ui/twin/pbt-menu.h | 2 |
6 files changed, 9 insertions, 5 deletions
diff --git a/ui/common/discover-client.h b/ui/common/discover-client.h index f9f74e5..4af936c 100644 --- a/ui/common/discover-client.h +++ b/ui/common/discover-client.h @@ -1,7 +1,7 @@ #ifndef _DISCOVER_CLIENT_H #define _DISCOVER_CLIENT_H -#include <pb-protocol/pb-protocol.h> +#include <types/types.h> struct discover_client; diff --git a/ui/common/ui-system.h b/ui/common/ui-system.h index 63d1a92..b75c4d1 100644 --- a/ui/common/ui-system.h +++ b/ui/common/ui-system.h @@ -19,8 +19,10 @@ #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 <signal.h> diff --git a/ui/ncurses/nc-ked.h b/ui/ncurses/nc-ked.h index 62fddd6..2f2792d 100644 --- a/ui/ncurses/nc-ked.h +++ b/ui/ncurses/nc-ked.h @@ -23,7 +23,7 @@ #include <linux/input.h> /* This must be included before ncurses.h */ #include <form.h> -#include "pb-protocol/pb-protocol.h" +#include "types/types.h" #include "ui/common/ui-system.h" #include "nc-scr.h" diff --git a/ui/ncurses/nc-menu.h b/ui/ncurses/nc-menu.h index 4abec6f..750bef5 100644 --- a/ui/ncurses/nc-menu.h +++ b/ui/ncurses/nc-menu.h @@ -24,7 +24,7 @@ #include <menu.h> #include "log/log.h" -#include "pb-protocol/pb-protocol.h" +#include "types/types.h" #include "nc-scr.h" struct pmenu; diff --git a/ui/twin/pbt-client.c b/ui/twin/pbt-client.c index ed12e5a..6a4d863 100644 --- a/ui/twin/pbt-client.c +++ b/ui/twin/pbt-client.c @@ -23,6 +23,8 @@ #include <assert.h> #include <string.h> +#include <pb-protocol/pb-protocol.h> + #include "pbt-client.h" #include "log/log.h" diff --git a/ui/twin/pbt-menu.h b/ui/twin/pbt-menu.h index 7547f16..cb696ea 100644 --- a/ui/twin/pbt-menu.h +++ b/ui/twin/pbt-menu.h @@ -19,7 +19,7 @@ #define _PBT_MENU_H #include "list/list.h" -#include "pb-protocol/pb-protocol.h" +#include "types/types.h" #include "pbt-scr.h" |
