summaryrefslogtreecommitdiffstats
path: root/common/blspec.c
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2016-07-20 08:55:11 +0200
committerSascha Hauer <s.hauer@pengutronix.de>2016-07-26 08:31:35 +0200
commit0d054f330377d64e994b93c842f447b4a00b3169 (patch)
treec3d1d461738ab7f0f344da98b52ab29eacfb0509 /common/blspec.c
parentdbc1894b425b587a48a410e9e516c84e6192716b (diff)
downloadbarebox-0d054f330377d64e994b93c842f447b4a00b3169.tar.gz
blspec: factor out a struct bootentry
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'common/blspec.c')
-rw-r--r--common/blspec.c11
1 files changed, 7 insertions, 4 deletions
diff --git a/common/blspec.c b/common/blspec.c
index 81049a7..d1597f9 100644
--- a/common/blspec.c
+++ b/common/blspec.c
@@ -128,9 +128,11 @@ static struct blspec_entry *blspec_entry_open(struct bootentries *bootentries,
*/
static int blspec_have_entry(struct bootentries *bootentries, const char *path)
{
+ struct bootentry *be;
struct blspec_entry *e;
- list_for_each_entry(e, &bootentries->entries, list) {
+ list_for_each_entry(be, &bootentries->entries, list) {
+ e = container_of(be, struct blspec_entry, entry);
if (e->configpath && !strcmp(e->configpath, path))
return 1;
}
@@ -407,7 +409,7 @@ int blspec_scan_directory(struct bootentries *bootentries, const char *root)
hwdevname = xstrdup(dev_name(entry->cdev->dev->parent));
}
- entry->me.display = basprintf("%-20s %-20s %s",
+ entry->entry.me.display = basprintf("%-20s %-20s %s",
devname ? devname : "",
hwdevname ? hwdevname : "",
blspec_entry_var_get(entry, "title"));
@@ -415,7 +417,7 @@ int blspec_scan_directory(struct bootentries *bootentries, const char *root)
free(devname);
free(hwdevname);
- entry->me.type = MENU_ENTRY_NORMAL;
+ entry->entry.me.type = MENU_ENTRY_NORMAL;
}
ret = found;
@@ -634,8 +636,9 @@ int blspec_scan_devicename(struct bootentries *bootentries, const char *devname)
* In case of an error the error code is returned. This function may
* return 0 in case of a succesful dry run.
*/
-int blspec_boot(struct blspec_entry *entry, int verbose, int dryrun)
+int blspec_boot(struct bootentry *be, int verbose, int dryrun)
{
+ struct blspec_entry *entry = container_of(be, struct blspec_entry, entry);
int ret;
const char *abspath, *devicetree, *options, *initrd, *linuximage;
const char *appendroot;