vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

2003-01-07 Yoshinori K. Okuji <okuji@enbug.org>

Browse source 
* util/i386/pc/pupa-setup.c (setup): Convert the endianness of
		the length of a blocklist correctly.

			* util/i386/pc/biosdisk.c (pupa_util_biosdisk_open) [__linux__]:
				Use ioctl only if the OS file is a block device.
					(pupa_util_biosdisk_open): Don't use ST.ST_BLOCKS, because it is
						not very useful for normal files.

							* kern/main.c (pupa_set_root_dev): New function.
								(pupa_load_normal_mode): Likewise.
									(pupa_main): Call those above.

										* include/pupa/types.h (pupa_swap_bytes16): Cast the result to
											pupa_uint16_t.

												* include/pupa/kernel.h (pupa_enter_normal_mode): Removed.
This commit is contained in:
okuji 2003-01-07 07:54:07 +00:00
parent a5ffe96617
commit a13f92373c
6 changed files with 95 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

74
kern/main.c
View file

@ -1,3 +1,4 @@
/* main.c - the kernel main routine */
/*
* PUPA -- Preliminary Universal Programming Architecture for GRUB
* Copyright (C) 2002 Yoshinori K. Okuji <okuji@enbug.org>
@ -56,12 +57,68 @@ pupa_add_unused_region (void)
pupa_mm_init_region ((void *) pupa_end_addr, pupa_total_module_size);
}
/* Set the root device according to the dl prefix. */
static void
pupa_set_root_dev (void)
{
const char *prefix;
prefix = pupa_dl_get_prefix ();
if (prefix)
{
char *dev;
dev = pupa_file_get_device_name (prefix);
if (dev)
{
pupa_device_set_root (dev);
pupa_free (dev);
}
}
}
/* Load the normal mode module and execute the normal mode if possible. */
static void
pupa_load_normal_mode (void)
{
if (pupa_dl_load ("normal"))
{
void (*normal_func) (const char *config);
/* If the function pupa_enter_normal_mode is present, call it. */
normal_func = pupa_dl_resolve_symbol ("pupa_enter_normal_mode");
if (normal_func)
{
char *config;
char *prefix;
prefix = pupa_dl_get_prefix ();
if (! prefix)
pupa_fatal ("The dl prefix is not set!");
config = pupa_malloc (pupa_strlen (prefix) + sizeof ("/pupa.cfg"));
if (! config)
pupa_fatal ("out of memory");
pupa_sprintf (config, "%s/pupa.cfg", prefix);
(*normal_func) (config);
pupa_free (config);
}
else
pupa_printf ("No entrance routine in the normal mode!\n");
}
else
pupa_printf ("Failed to load the normal mode.\n");
/* Ignore any error, because we have the rescue mode anyway. */
pupa_errno = PUPA_ERR_NONE;
}
/* The main routine. */
void
pupa_main (void)
{
void (*normal_func) (void);
/* First of all, initialize the machine. */
pupa_machine_init ();
@ -70,15 +127,18 @@ pupa_main (void)
pupa_printf ("Welcome to PUPA!\n\n");
pupa_setcolorstate (PUPA_TERM_COLOR_STANDARD);
/* It is better to set the root device as soon as possible,
for convenience. */
pupa_set_root_dev ();
/* Load pre-loaded modules and free the space. */
pupa_register_exported_symbols ();
pupa_load_modules ();
pupa_add_unused_region ();
/* If the function pupa_enter_normal_mode is present, call it. */
normal_func = pupa_dl_resolve_symbol ("pupa_enter_normal_mode");
if (normal_func)
(*normal_func) ();
/* Go to the real world. */
pupa_load_normal_mode ();
/* If pupa_enter_normal_mode fails or doesn't exist, enter rescue mode. */
pupa_printf ("Entering into rescue mode...\n");
pupa_enter_rescue_mode ();