diff options
| author | Matt Fleming <matt.fleming@intel.com> | 2012-07-11 13:12:33 +0100 |
|---|---|---|
| committer | Matt Fleming <matt.fleming@intel.com> | 2012-07-20 10:20:18 +0100 |
| commit | b93e6bc9bdafc9fa2dc8709dc97fa5e598c7e94d (patch) | |
| tree | 27def756e27efd3f398f53d97ecfe2f80fb31ba8 /com32/menu | |
| parent | c2d3f65790c15efed66e6ba3a6e4c08836070889 (diff) | |
| download | syslinux-b93e6bc9bdafc9fa2dc8709dc97fa5e598c7e94d.tar.gz | |
ldlinux: Stop using the internal KT_* image types
The KT_* image types were never meant to be used outside of
com32/menu, so use the external image types from syslinux/boot.h
Signed-off-by: Matt Fleming <matt.fleming@intel.com>
Diffstat (limited to 'com32/menu')
| -rw-r--r-- | com32/menu/menumain.c | 6 | ||||
| -rw-r--r-- | com32/menu/readconfig.c | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/com32/menu/menumain.c b/com32/menu/menumain.c index 53bc6c64..c9762b27 100644 --- a/com32/menu/menumain.c +++ b/com32/menu/menumain.c @@ -28,7 +28,9 @@ #include <setjmp.h> #include <limits.h> #include <com32.h> +#include <core.h> #include <syslinux/adv.h> +#include <syslinux/boot.h> #include "menu.h" @@ -1161,11 +1163,11 @@ int main(int argc, char *argv[]) printf("\033[?25h\033[%d;1H\033[0m", cursorrow); if (cmdline) { - enum kernel_type type = parse_kernel_type(cmdline); + uint32_t type = parse_image_type(cmdline); execute(cmdline, type); if (cm->onerror) { - type = parse_kernel_type(cm->onerror); + type = parse_image_type(cm->onerror); execute(cm->onerror, type); } } else { diff --git a/com32/menu/readconfig.c b/com32/menu/readconfig.c index 8f9d2372..69f524c4 100644 --- a/com32/menu/readconfig.c +++ b/com32/menu/readconfig.c @@ -62,7 +62,7 @@ static const struct messages messages[MSG_COUNT] = { __p; }) /* Must match enum kernel_type */ -const char *const kernel_types[] = { +static const char *const kernel_types[] = { "none", "localboot", "kernel", |