aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFeng Tang <feng.tang@intel.com>2010-06-30 16:12:04 +0800
committerFeng Tang <feng.tang@intel.com>2010-07-20 11:10:04 +0800
commit4b0e99d36684588d564cf0fec66f648ffc9ebb76 (patch)
tree5d7f984222abcbbf128a70cdd2aea179dd714f58
parentfeb934cbd1c730d3fcd945d7e397c55b3b476bdc (diff)
downloadsyslinux-4b0e99d36684588d564cf0fec66f648ffc9ebb76.tar.gz
syslinux-4b0e99d36684588d564cf0fec66f648ffc9ebb76.tar.xz
syslinux-4b0e99d36684588d564cf0fec66f648ffc9ebb76.zip
elflink: will run default item in config file after starting ui
-rw-r--r--core/elflink/cli.c6
-rw-r--r--core/elflink/execute.c3
-rw-r--r--core/elflink/load_env32.c2
3 files changed, 5 insertions, 6 deletions
diff --git a/core/elflink/cli.c b/core/elflink/cli.c
index db2c7758..f029ae44 100644
--- a/core/elflink/cli.c
+++ b/core/elflink/cli.c
@@ -360,19 +360,17 @@ void process_command(const char *cmd)
printf("\n");
return;
}
+ printf("\n");
+ mp("raw cmd = %s", cmd);
strcpy(temp_cmd, cmd);
module_name = strtok(cmd, COMMAND_DELIM);
len_mn = strlen(module_name);
- printf("\n");
- mp("enter, cmd = %s, module_name = %s",cmd, module_name);
-
if (!strcmp(module_name + len_mn - 4, ".c32")) {
if (module_find(module_name) != NULL) {
/* make module re-enterable */
mp("Module %s is already running");
- //goto cleanup;
}
do {
argv[0] = module_name;
diff --git a/core/elflink/execute.c b/core/elflink/execute.c
index 08946aac..29e9933d 100644
--- a/core/elflink/execute.c
+++ b/core/elflink/execute.c
@@ -21,7 +21,6 @@ void execute(const char *cmdline, enum kernel_type type)
{
com32sys_t ireg;
const char *p, *const *pp;
- //char *q = __com32.cs_bounce;
char *q;
const char *kernel, *args;
@@ -30,6 +29,8 @@ void execute(const char *cmdline, enum kernel_type type)
memset(&ireg, 0, sizeof ireg);
+ /* for parameter will be passed to __intcall, we need use
+ * lmalloc a block of low memory */
q = lmalloc(128);
if (!q) {
printf("%s(): Fail to lmalloc a buffer to exec %s\n",
diff --git a/core/elflink/load_env32.c b/core/elflink/load_env32.c
index 663c82ef..b153281d 100644
--- a/core/elflink/load_env32.c
+++ b/core/elflink/load_env32.c
@@ -97,6 +97,7 @@ void start_ui(char *config_file)
parse_configs(argv);
/* run the default menu if found */
/*
+ */
if (default_menu) {
cmdline = default_menu->menu_entries[default_menu->defentry]->cmdline;
if (*cmdline == '.') {
@@ -104,7 +105,6 @@ void start_ui(char *config_file)
}
process_command(cmdline);
}
- */
/* try to run a default linux kernel */
/*