2004-04-04 Yoshinori K. Okuji <okuji@enbug.org>

All symbols prefixed with PUPA_ and pupa_ are renamed to GRUB_
	and grub_, respectively. Because the conversion is trivial and
	mechanical, I omit the details here. Please refer to the CVS
	if you need more information.
This commit is contained in:
okuji 2004-04-04 13:46:03 +00:00
parent 6a1425510d
commit 4b13b216f4
125 changed files with 6198 additions and 6181 deletions

View file

@ -1,6 +1,6 @@
/* main.c - the kernel main routine */
/*
* PUPA -- Preliminary Universal Programming Architecture for GRUB
* GRUB -- GRand Unified Bootloader
* Copyright (C) 2002, 2003 Free Software Foundation, Inc.
*
* This program is free software; you can redistribute it and/or modify
@ -18,104 +18,104 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
#include <pupa/kernel.h>
#include <pupa/misc.h>
#include <pupa/mm.h>
#include <pupa/symbol.h>
#include <pupa/dl.h>
#include <pupa/term.h>
#include <pupa/rescue.h>
#include <pupa/file.h>
#include <pupa/device.h>
#include <pupa/env.h>
#include <grub/kernel.h>
#include <grub/misc.h>
#include <grub/mm.h>
#include <grub/symbol.h>
#include <grub/dl.h>
#include <grub/term.h>
#include <grub/rescue.h>
#include <grub/file.h>
#include <grub/device.h>
#include <grub/env.h>
/* Return the end of the core image. */
pupa_addr_t
pupa_get_end_addr (void)
grub_addr_t
grub_get_end_addr (void)
{
return pupa_total_module_size + pupa_end_addr;
return grub_total_module_size + grub_end_addr;
}
/* Load all modules in core. */
static void
pupa_load_modules (void)
grub_load_modules (void)
{
struct pupa_module_header *header;
struct grub_module_header *header;
for (header = (struct pupa_module_header *) pupa_end_addr;
header < (struct pupa_module_header *) pupa_get_end_addr ();
header = (struct pupa_module_header *) ((char *) header + header->size))
for (header = (struct grub_module_header *) grub_end_addr;
header < (struct grub_module_header *) grub_get_end_addr ();
header = (struct grub_module_header *) ((char *) header + header->size))
{
if (! pupa_dl_load_core ((char *) header + header->offset,
if (! grub_dl_load_core ((char *) header + header->offset,
(header->size - header->offset)))
pupa_fatal ("%s", pupa_errmsg);
grub_fatal ("%s", grub_errmsg);
}
}
/* Add the region where modules reside into dynamic memory. */
static void
pupa_add_unused_region (void)
grub_add_unused_region (void)
{
if (pupa_total_module_size)
pupa_mm_init_region ((void *) pupa_end_addr, pupa_total_module_size);
if (grub_total_module_size)
grub_mm_init_region ((void *) grub_end_addr, grub_total_module_size);
}
/* Set the root device according to the dl prefix. */
static void
pupa_set_root_dev (void)
grub_set_root_dev (void)
{
const char *prefix;
prefix = pupa_env_get ("prefix");
prefix = grub_env_get ("prefix");
if (prefix)
{
char *dev;
dev = pupa_file_get_device_name (prefix);
dev = grub_file_get_device_name (prefix);
if (dev)
{
pupa_device_set_root (dev);
pupa_free (dev);
grub_device_set_root (dev);
grub_free (dev);
}
}
}
/* Load the normal mode module and execute the normal mode if possible. */
static void
pupa_load_normal_mode (void)
grub_load_normal_mode (void)
{
/* Load the module. */
pupa_dl_load ("normal");
grub_dl_load ("normal");
/* Ignore any error, because we have the rescue mode anyway. */
pupa_errno = PUPA_ERR_NONE;
grub_errno = GRUB_ERR_NONE;
}
/* The main routine. */
void
pupa_main (void)
grub_main (void)
{
/* First of all, initialize the machine. */
pupa_machine_init ();
grub_machine_init ();
/* Hello. */
pupa_setcolorstate (PUPA_TERM_COLOR_HIGHLIGHT);
pupa_printf ("Welcome to PUPA!\n\n");
pupa_setcolorstate (PUPA_TERM_COLOR_STANDARD);
grub_setcolorstate (GRUB_TERM_COLOR_HIGHLIGHT);
grub_printf ("Welcome to GRUB!\n\n");
grub_setcolorstate (GRUB_TERM_COLOR_STANDARD);
/* It is better to set the root device as soon as possible,
for convenience. */
pupa_set_root_dev ();
grub_set_root_dev ();
/* Load pre-loaded modules and free the space. */
pupa_register_exported_symbols ();
pupa_load_modules ();
pupa_add_unused_region ();
grub_register_exported_symbols ();
grub_load_modules ();
grub_add_unused_region ();
/* Load the normal mode module. */
pupa_load_normal_mode ();
grub_load_normal_mode ();
/* Enter the rescue mode. */
pupa_enter_rescue_mode ();
grub_enter_rescue_mode ();
}