diff options
| author | Simon Glass <sjg@chromium.org> | 2023-08-14 16:40:25 -0600 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2023-08-25 13:54:33 -0400 |
| commit | 040b04685ea4c47a5148c2fcc2ff6dfdd83bc714 (patch) | |
| tree | c7b2257b3916b3769b15ffa336389b559364dd76 | |
| parent | 431b21fd407f4a76cdc182ee40184311562e5505 (diff) | |
| download | u-boot-040b04685ea4c47a5148c2fcc2ff6dfdd83bc714.tar.gz u-boot-040b04685ea4c47a5148c2fcc2ff6dfdd83bc714.tar.bz2 u-boot-040b04685ea4c47a5148c2fcc2ff6dfdd83bc714.zip | |
expo: Split out cedit into its own header
Before adding more functions to this interface, create a new header for
the configuration editor.
Fix up the expo header guard while we are here.
Signed-off-by: Simon Glass <sjg@chromium.org>
| -rw-r--r-- | boot/cedit.c | 1 | ||||
| -rw-r--r-- | cmd/cedit.c | 1 | ||||
| -rw-r--r-- | include/cedit.h | 33 | ||||
| -rw-r--r-- | include/expo.h | 27 |
4 files changed, 38 insertions, 24 deletions
diff --git a/boot/cedit.c b/boot/cedit.c index ee24658917..2d16086bad 100644 --- a/boot/cedit.c +++ b/boot/cedit.c @@ -7,6 +7,7 @@ */ #include <common.h> +#include <cedit.h> #include <cli.h> #include <dm.h> #include <expo.h> diff --git a/cmd/cedit.c b/cmd/cedit.c index 0cae304c4a..5f0e84403f 100644 --- a/cmd/cedit.c +++ b/cmd/cedit.c @@ -7,6 +7,7 @@ */ #include <common.h> +#include <cedit.h> #include <command.h> #include <expo.h> #include <fs.h> diff --git a/include/cedit.h b/include/cedit.h new file mode 100644 index 0000000000..21de12dfe7 --- /dev/null +++ b/include/cedit.h @@ -0,0 +1,33 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ +/* + * Copyright 2023 Google LLC + * Written by Simon Glass <sjg@chromium.org> + */ + +#ifndef __CEDIT_H +#define __CEDIT_H + +struct expo; +struct video_priv; + +/** + * cedit_arange() - Arrange objects in a configuration-editor scene + * + * @exp: Expo to update + * @vid_priv: Private info of the video device + * @scene_id: scene ID to arrange + * Returns: 0 if OK, -ve on error + */ +int cedit_arange(struct expo *exp, struct video_priv *vid_priv, uint scene_id); + +/** + * cedit_run() - Run a configuration editor + * + * This accepts input until the user quits with Escape + * + * @exp: Expo to use + * Returns: 0 if OK, -ve on error + */ +int cedit_run(struct expo *exp); + +#endif /* __CEDIT_H */ diff --git a/include/expo.h b/include/expo.h index 0b1d944a16..da151074d2 100644 --- a/include/expo.h +++ b/include/expo.h @@ -4,14 +4,13 @@ * Written by Simon Glass <sjg@chromium.org> */ -#ifndef __SCENE_H -#define __SCENE_H +#ifndef __EXPO_H +#define __EXPO_H #include <dm/ofnode_decl.h> #include <linux/list.h> struct udevice; -struct video_priv; /** * enum expoact_type - types of actions reported by the expo @@ -676,24 +675,4 @@ int expo_apply_theme(struct expo *exp, ofnode node); */ int expo_build(ofnode root, struct expo **expp); -/** - * cedit_arange() - Arrange objects in a configuration-editor scene - * - * @exp: Expo to update - * @vid_priv: Private info of the video device - * @scene_id: scene ID to arrange - * Returns: 0 if OK, -ve on error - */ -int cedit_arange(struct expo *exp, struct video_priv *vid_priv, uint scene_id); - -/** - * cedit_run() - Run a configuration editor - * - * This accepts input until the user quits with Escape - * - * @exp: Expo to use - * Returns: 0 if OK, -ve on error - */ -int cedit_run(struct expo *exp); - -#endif /*__SCENE_H */ +#endif /*__EXPO_H */ |