2002-12-27 08:53:07 +00:00
|
|
|
/*
|
2004-04-04 13:46:03 +00:00
|
|
|
* GRUB -- GRand Unified Bootloader
|
2005-01-04 14:01:45 +00:00
|
|
|
* Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
|
2002-12-27 08:53:07 +00:00
|
|
|
*
|
|
|
|
* This program is free software; you can redistribute it and/or modify
|
|
|
|
* it under the terms of the GNU General Public License as published by
|
|
|
|
* the Free Software Foundation; either version 2 of the License, or
|
|
|
|
* (at your option) any later version.
|
|
|
|
*
|
|
|
|
* This program is distributed in the hope that it will be useful,
|
|
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
* GNU General Public License for more details.
|
|
|
|
*
|
|
|
|
* You should have received a copy of the GNU General Public License
|
|
|
|
* along with this program; if not, write to the Free Software
|
|
|
|
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
|
|
|
*/
|
|
|
|
|
2004-04-04 13:46:03 +00:00
|
|
|
#include <grub/kernel.h>
|
|
|
|
#include <grub/mm.h>
|
|
|
|
#include <grub/machine/init.h>
|
|
|
|
#include <grub/machine/memory.h>
|
|
|
|
#include <grub/machine/console.h>
|
|
|
|
#include <grub/machine/biosdisk.h>
|
|
|
|
#include <grub/machine/kernel.h>
|
|
|
|
#include <grub/types.h>
|
|
|
|
#include <grub/err.h>
|
|
|
|
#include <grub/dl.h>
|
|
|
|
#include <grub/misc.h>
|
|
|
|
#include <grub/loader.h>
|
|
|
|
#include <grub/env.h>
|
2005-01-04 14:01:45 +00:00
|
|
|
#include <grub/cache.h>
|
2003-01-17 02:52:05 +00:00
|
|
|
|
|
|
|
struct mem_region
|
|
|
|
{
|
2004-04-04 13:46:03 +00:00
|
|
|
grub_addr_t addr;
|
|
|
|
grub_size_t size;
|
2003-01-17 02:52:05 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
#define MAX_REGIONS 32
|
|
|
|
|
|
|
|
static struct mem_region mem_regions[MAX_REGIONS];
|
|
|
|
static int num_regions;
|
|
|
|
|
2004-04-04 13:46:03 +00:00
|
|
|
grub_addr_t grub_os_area_addr;
|
|
|
|
grub_size_t grub_os_area_size;
|
|
|
|
grub_size_t grub_lower_mem, grub_upper_mem;
|
2003-01-06 00:01:35 +00:00
|
|
|
|
2004-12-27 Marco Gerards <metgerards@student.han.nl>
* genmk.rb: Handle the `Program' class in the main loop. Written
by Johan Rydberg <jrydberg@gnu.org>.
(Program): New class.
(programs): New variable.
* boot/powerpc/ieee1275/cmain.c: Include <grub/machine/ieee1275.h>
instead of "grub/machine/ieee1275.h". Include <grub/kernel.h>
instead of "grub/kernel.h". Include <grub/machine/init.h>.
(help_arch): Function removed.
* conf/powerpc-ieee1275.rmk (grubof_HEADERS): Add
`powerpc/libgcc.h' and `loader.h'.
(pkgdata_PROGRAMS): New variable.
(sbin_UTILITIES): Variable removed.
(grub_emu_SOURCES): Added kern/powerpc/cache.S.
(grubof_SOURCES): Variable re-defined so it only includes the
core functionality.
(grubof_CFLAGS): Remove `-DGRUBOF'.
(pkgdata_MODULES, fshelp_mod_SOURCES, fshelp_mod_CFLAGS,
(fat_mod_SOURCES, fat_mod_CFLAGS, ext2_mod_SOURCES)
(ext2_mod_CFLAGS, ufs_mod_SOURCES, ufs_mod_CFLAGS)
(minix_mod_SOURCES, minix_mod_CFLAGS, hfs_mod_SOURCES)
(hfs_mod_CFLAGS, jfs_mod_SOURCES, jfs_mod_CFLAGS)
(iso9660_mod_SOURCES, iso9660_mod_CFLAGS, _linux_mod_SOURCES)
(_linux_mod_CFLAGS, linux_mod_SOURCES, linux_mod_CFLAGS)
(normal_mod_SOURCES, normal_mod_CFLAGS, normal_mod_ASFLAGS)
(hello_mod_SOURCES, hello_mod_CFLAGS, boot_mod_SOURCES)
(boot_mod_CFLAGS, terminal_mod_SOURCES, terminal_mod_CFLAGS)
(ls_mod_SOURCES, ls_mod_CFLAGS, cmp_mod_SOURCES, cmp_mod_CFLAGS)
(cat_mod_SOURCES, cat_mod_CFLAGS, font_mod_SOURCES)
(font_mod_CFLAGS, amiga_mod_SOURCES, amiga_mod_CFLAGS)
(apple_mod_SOURCES, apple_mod_CFLAGS, pc_mod_SOURCES)
(pc_mod_CFLAGS): New variables.
* disk/powerpc/ieee1275/ofdisk.c: Include <grub/machine/init.h>.
(grub_ofdisk_iterate): Add a prototype for `dev_iterate'.
* include/grub/dl.h (grub_arch_dl_sync_caches): New prototype.
* include/grub/loader.h (grub_os_area_addr, grub_os_area_size):
Moved from here...
* include/grub/i386/pc/init.h (grub_os_area_addr)
(rub_os_area_size): ... to here.
* include/grub/powerpc/ieee1275/ieee1275.h
(grub_ieee1275_entry_fn): Export symbol.
* include/grub/powerpc/ieee1275/init.h: New file.
* include/grub/powerpc/libgcc.h: Likewise.
* include/grub/cache.h: Likewise.
* kern/powerpc/cache.S: Likewise. Written by Hollis Blanchard
<hollis@penguinppc.org>.
* kern/dl.c: Include <grub/cache.h>.
(grub_dl_flush_cache): New function.
(grub_dl_load_core): Call `grub_dl_flush_cache' to flush the cache
for this module.
* kern/powerpc/ieee1275/init.c (grub_ofdisk_init)
(grub_console_init): Removed prototypes.
(grub_machine_init): Don't initialize the modules anymore.
* kern/powerpc/ieee1275/openfw.c (grub_map): Make the function
static.
* include/grub/powerpc/types.h (GRUB_HOST_WORDS_LITTLEENDIAN):
Macro undef removed.
(GRUB_HOST_WORDS_BIGENDIAN): New macro.
* kern/powerpc/dl.c (grub_arch_dl_relocate_symbols): Add
relocation `R_PPC_REL32'. Return an error when the relocation is
unknown.
* Makefile.in (DATA): Add `$(pkgdata_PROGRAMS)'.
* kern/i386/pc/init.c (grub_arch_sync_caches): New function.
* util/misc.c (grub_arch_sync_caches): Likewise.
2004-12-27 13:46:20 +00:00
|
|
|
void
|
|
|
|
grub_arch_sync_caches (void *address __attribute__ ((unused)),
|
|
|
|
grub_size_t len __attribute__ ((unused)))
|
|
|
|
{
|
|
|
|
}
|
|
|
|
|
2003-01-06 00:01:35 +00:00
|
|
|
static char *
|
|
|
|
make_install_device (void)
|
|
|
|
{
|
|
|
|
/* XXX: This should be enough. */
|
|
|
|
char dev[100];
|
|
|
|
|
2004-04-04 13:46:03 +00:00
|
|
|
grub_sprintf (dev, "(%cd%u",
|
|
|
|
(grub_boot_drive & 0x80) ? 'h' : 'f',
|
|
|
|
grub_boot_drive & 0x7f);
|
2003-01-06 00:01:35 +00:00
|
|
|
|
2004-04-04 13:46:03 +00:00
|
|
|
if (grub_install_dos_part >= 0)
|
|
|
|
grub_sprintf (dev + grub_strlen (dev), ",%u", grub_install_dos_part);
|
2003-01-06 00:01:35 +00:00
|
|
|
|
2004-04-04 13:46:03 +00:00
|
|
|
if (grub_install_bsd_part >= 0)
|
|
|
|
grub_sprintf (dev + grub_strlen (dev), ",%c", grub_install_bsd_part + 'a');
|
2003-01-06 00:01:35 +00:00
|
|
|
|
2004-04-04 13:46:03 +00:00
|
|
|
grub_sprintf (dev + grub_strlen (dev), ")%s", grub_prefix);
|
|
|
|
grub_strcpy (grub_prefix, dev);
|
2003-01-06 00:01:35 +00:00
|
|
|
|
2004-04-04 13:46:03 +00:00
|
|
|
return grub_prefix;
|
2003-01-06 00:01:35 +00:00
|
|
|
}
|
2002-12-27 08:53:07 +00:00
|
|
|
|
2003-01-17 02:52:05 +00:00
|
|
|
/* Add a memory region. */
|
|
|
|
static void
|
2004-04-04 13:46:03 +00:00
|
|
|
add_mem_region (grub_addr_t addr, grub_size_t size)
|
2003-01-17 02:52:05 +00:00
|
|
|
{
|
|
|
|
if (num_regions == MAX_REGIONS)
|
|
|
|
/* Ignore. */
|
|
|
|
return;
|
|
|
|
|
|
|
|
mem_regions[num_regions].addr = addr;
|
|
|
|
mem_regions[num_regions].size = size;
|
|
|
|
num_regions++;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Compact memory regions. */
|
|
|
|
static void
|
|
|
|
compact_mem_regions (void)
|
|
|
|
{
|
|
|
|
int i, j;
|
|
|
|
|
|
|
|
/* Sort them. */
|
|
|
|
for (i = 0; i < num_regions - 1; i++)
|
|
|
|
for (j = i + 1; j < num_regions; j++)
|
|
|
|
if (mem_regions[i].addr > mem_regions[j].addr)
|
|
|
|
{
|
|
|
|
struct mem_region tmp = mem_regions[i];
|
|
|
|
mem_regions[i] = mem_regions[j];
|
|
|
|
mem_regions[j] = tmp;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Merge overlaps. */
|
|
|
|
for (i = 0; i < num_regions - 1; i++)
|
|
|
|
if (mem_regions[i].addr + mem_regions[i].size >= mem_regions[i + 1].addr)
|
|
|
|
{
|
|
|
|
j = i + 1;
|
|
|
|
|
|
|
|
if (mem_regions[i].addr + mem_regions[i].size
|
|
|
|
< mem_regions[j].addr + mem_regions[j].size)
|
|
|
|
mem_regions[i].size = (mem_regions[j].addr + mem_regions[j].size
|
|
|
|
- mem_regions[i].addr);
|
|
|
|
|
2004-04-04 13:46:03 +00:00
|
|
|
grub_memmove (mem_regions + j, mem_regions + j + 1,
|
2003-01-17 02:52:05 +00:00
|
|
|
(num_regions - j - 1) * sizeof (struct mem_region));
|
|
|
|
i--;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2002-12-27 08:53:07 +00:00
|
|
|
void
|
2004-04-04 13:46:03 +00:00
|
|
|
grub_machine_init (void)
|
2002-12-27 08:53:07 +00:00
|
|
|
{
|
2004-04-04 13:46:03 +00:00
|
|
|
grub_uint32_t cont;
|
|
|
|
struct grub_machine_mmap_entry *entry
|
|
|
|
= (struct grub_machine_mmap_entry *) GRUB_MEMORY_MACHINE_SCRATCH_ADDR;
|
2003-01-17 02:52:05 +00:00
|
|
|
int i;
|
|
|
|
|
2002-12-27 08:53:07 +00:00
|
|
|
/* Initialize the console as early as possible. */
|
2004-04-04 13:46:03 +00:00
|
|
|
grub_console_init ();
|
2002-12-27 08:53:07 +00:00
|
|
|
|
2004-04-04 13:46:03 +00:00
|
|
|
grub_lower_mem = grub_get_memsize (0) << 10;
|
2003-01-17 02:52:05 +00:00
|
|
|
|
2002-12-27 08:53:07 +00:00
|
|
|
/* Sanity check. */
|
2004-04-04 13:46:03 +00:00
|
|
|
if (grub_lower_mem < GRUB_MEMORY_MACHINE_RESERVED_END)
|
|
|
|
grub_fatal ("too small memory");
|
2003-01-31 03:26:56 +00:00
|
|
|
|
|
|
|
#if 0
|
2002-12-27 08:53:07 +00:00
|
|
|
/* Turn on Gate A20 to access >1MB. */
|
2004-04-04 13:46:03 +00:00
|
|
|
grub_gate_a20 (1);
|
2003-01-31 03:26:56 +00:00
|
|
|
#endif
|
2002-12-27 08:53:07 +00:00
|
|
|
|
|
|
|
/* Add the lower memory into free memory. */
|
2004-04-04 13:46:03 +00:00
|
|
|
if (grub_lower_mem >= GRUB_MEMORY_MACHINE_RESERVED_END)
|
|
|
|
add_mem_region (GRUB_MEMORY_MACHINE_RESERVED_END,
|
|
|
|
grub_lower_mem - GRUB_MEMORY_MACHINE_RESERVED_END);
|
2002-12-27 08:53:07 +00:00
|
|
|
|
2004-04-04 13:46:03 +00:00
|
|
|
/* Check if grub_get_mmap_entry works. */
|
|
|
|
cont = grub_get_mmap_entry (entry, 0);
|
2002-12-27 08:53:07 +00:00
|
|
|
|
2002-12-28 07:16:30 +00:00
|
|
|
if (entry->size)
|
2002-12-27 08:53:07 +00:00
|
|
|
do
|
|
|
|
{
|
|
|
|
/* Avoid the lower memory. */
|
2002-12-28 07:16:30 +00:00
|
|
|
if (entry->addr < 0x100000)
|
2002-12-27 08:53:07 +00:00
|
|
|
{
|
2002-12-28 07:16:30 +00:00
|
|
|
if (entry->len <= 0x100000 - entry->addr)
|
2002-12-27 08:53:07 +00:00
|
|
|
goto next;
|
|
|
|
|
2002-12-28 07:16:30 +00:00
|
|
|
entry->len -= 0x100000 - entry->addr;
|
|
|
|
entry->addr = 0x100000;
|
2002-12-27 08:53:07 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Ignore >4GB. */
|
2002-12-28 07:16:30 +00:00
|
|
|
if (entry->addr <= 0xFFFFFFFF && entry->type == 1)
|
2002-12-27 08:53:07 +00:00
|
|
|
{
|
2004-04-04 13:46:03 +00:00
|
|
|
grub_addr_t addr;
|
|
|
|
grub_size_t len;
|
2002-12-27 08:53:07 +00:00
|
|
|
|
2004-04-04 13:46:03 +00:00
|
|
|
addr = (grub_addr_t) entry->addr;
|
2002-12-28 07:16:30 +00:00
|
|
|
len = ((addr + entry->len > 0xFFFFFFFF)
|
2002-12-27 08:53:07 +00:00
|
|
|
? 0xFFFFFFFF - addr
|
2004-04-04 13:46:03 +00:00
|
|
|
: (grub_size_t) entry->len);
|
2003-01-17 02:52:05 +00:00
|
|
|
add_mem_region (addr, len);
|
2002-12-27 08:53:07 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
next:
|
|
|
|
if (! cont)
|
|
|
|
break;
|
|
|
|
|
2004-04-04 13:46:03 +00:00
|
|
|
cont = grub_get_mmap_entry (entry, cont);
|
2002-12-27 08:53:07 +00:00
|
|
|
}
|
2002-12-28 07:16:30 +00:00
|
|
|
while (entry->size);
|
2002-12-27 08:53:07 +00:00
|
|
|
else
|
|
|
|
{
|
2004-04-04 13:46:03 +00:00
|
|
|
grub_uint32_t eisa_mmap = grub_get_eisa_mmap ();
|
2002-12-27 08:53:07 +00:00
|
|
|
|
|
|
|
if (eisa_mmap)
|
|
|
|
{
|
|
|
|
if ((eisa_mmap & 0xFFFF) == 0x3C00)
|
2003-01-17 02:52:05 +00:00
|
|
|
add_mem_region (0x100000, (eisa_mmap << 16) + 0x100000 * 15);
|
2002-12-27 08:53:07 +00:00
|
|
|
else
|
|
|
|
{
|
2003-01-17 02:52:05 +00:00
|
|
|
add_mem_region (0x100000, (eisa_mmap & 0xFFFF) << 10);
|
|
|
|
add_mem_region (0x1000000, eisa_mmap << 16);
|
2002-12-27 08:53:07 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
2004-04-04 13:46:03 +00:00
|
|
|
add_mem_region (0x100000, grub_get_memsize (1) << 10);
|
2002-12-27 08:53:07 +00:00
|
|
|
}
|
|
|
|
|
2003-01-17 02:52:05 +00:00
|
|
|
compact_mem_regions ();
|
|
|
|
|
|
|
|
/* Add the memory regions to free memory, except for the region starting
|
|
|
|
from 1MB. This region is partially used for loading OS images.
|
|
|
|
For now, 1/4 of this is added to free memory. */
|
|
|
|
for (i = 0; i < num_regions; i++)
|
|
|
|
if (mem_regions[i].addr == 0x100000)
|
|
|
|
{
|
2004-04-04 13:46:03 +00:00
|
|
|
grub_size_t quarter = mem_regions[i].size >> 2;
|
2003-01-17 02:52:05 +00:00
|
|
|
|
2004-04-04 13:46:03 +00:00
|
|
|
grub_upper_mem = mem_regions[i].size;
|
|
|
|
grub_os_area_addr = mem_regions[i].addr;
|
|
|
|
grub_os_area_size = mem_regions[i].size - quarter;
|
|
|
|
grub_mm_init_region ((void *) (grub_os_area_addr + grub_os_area_size),
|
2003-01-17 02:52:05 +00:00
|
|
|
quarter);
|
|
|
|
}
|
|
|
|
else
|
2004-04-04 13:46:03 +00:00
|
|
|
grub_mm_init_region ((void *) mem_regions[i].addr, mem_regions[i].size);
|
2003-01-17 02:52:05 +00:00
|
|
|
|
2004-04-04 13:46:03 +00:00
|
|
|
if (! grub_os_area_addr)
|
|
|
|
grub_fatal ("no upper memory");
|
2003-01-17 02:52:05 +00:00
|
|
|
|
2002-12-27 08:53:07 +00:00
|
|
|
/* The memory system was initialized, thus register built-in devices. */
|
2004-04-04 13:46:03 +00:00
|
|
|
grub_biosdisk_init ();
|
2003-01-06 00:01:35 +00:00
|
|
|
|
2004-03-14 Marco Gerards <metgerards@student.han.nl>
* commands/boot.c: New file.
* commands/cat.c: Likewise.
* commands/cmp.c: Likewise.
* commands/ls.c: Likewise.
* commands/terminal.c: Likewise.
* normal/command.c: Include <pupa/env.h> and <pupa/dl.h>.
(pupa_register_command): Changed interface to match the new
argument parser.
(pupa_command_execute): Changed (almost rewritten) so it uses
pupa_split_command. Added support for setting variables using the
syntax `foo=bar'.
(rescue_command): Changed to work with the new argument parser.
(terminal_command): Moved from here to commands/terminal.c.
(set_command): New function.
(unset_command): New function.
(insmod_command): New function.
(rmmod_command): New function.
(lsmod_command): New function.
(pupa_command_init): Don't initialize the command terminal
anymore. Initialize the commands set, unset, insmod, rmmod and
lsmod.
* conf/i386-pc.rmk (kernel_img_SOURCES): Add kern/env.c.
(kernel_img_HEADERS): Add arg.h and env.h.
(pupa_mkimage_LDFLAGS): Add kern/env.c.
(pupa_emu_SOURCES): Add kern/env.c, commands/ls.c,
commands/terminal.c commands/boot.c commands/cmp.c commands/cat.c,
normal/arg.c.
(pkgdata_MODULES): Add ls.mod, boot.mod, cmp.mod, cat.mod and
terminal.mod.
(normal_mod_SOURCES): Add normal/arg.c and normal/arg.c.
(boot_mod_SOURCES): New variable.
(terminal_mod_SOURCES): Likewise.
(ls_mod_SOURCES): Likewise.
(cmp_mod_SOURCES): Likewise.
(cat_mod_SOURCES): Likewise.
* normal/arg.c: New file.
* kern/env.c: Likewise.
* include/pupa/arg.h: Likewise.
* include/pupa/env.h: Likewise.
* font/manager.c (font_command): Changed to match argument parsing
interface changes.
(PUPA_MOD_INIT): Likewise.
* hello/hello.c (pupa_cmd_hello): Likewise.
(PUPA_MOD_INIT): Likewise.
* include/pupa/disk.h: Include <pupa/device.h>.
(pupa_print_partinfo): New prototype.
* include/pupa/dl.h (pupa_dl_set_prefix): Prototype removed.
(pupa_dl_get_prefix): Likewise.
* include/pupa/misc.h: Include <pupa/err.h>.
(pupa_isgraph): New prototype.
(pupa_isdigit): Likewise.
(pupa_split_cmdline): Likewise.
* include/pupa/normal.h: Include <pupa/arg.h>.
(pupa_command): Changed the prototype of the member `func' to
match the argument parsing interface. Added member `options'.
(pupa_register_command): Updated to match function.
(pupa_arg_parse): New prototype.
(pupa_hello_init) [PUPA_UTIL]: New prototype.
(pupa_hello_fini) [PUPA_UTIL]: Likewise.
(pupa_ls_init) [PUPA_UTIL]: Likewise.
(pupa_ls_fini) [PUPA_UTIL]: Likewise.
(pupa_cat_init) [PUPA_UTIL]: Likewise.
(pupa_cat_fini) [PUPA_UTIL]: Likewise.
(pupa_boot_init) [PUPA_UTIL]: Likewise.
(pupa_boot_fini) [PUPA_UTIL]: Likewise.
(pupa_cmp_init) [PUPA_UTIL]: Likewise.
(pupa_cmp_fini) [PUPA_UTIL]: Likewise.
(pupa_terminal_init) [PUPA_UTIL]: Likewise.
(pupa_terminal_fini) [PUPA_UTIL]: Likewise.
* kern/disk.c: Include <pupa/file.h>.
(pupa_print_partinfo): New function.
* kern/dl.c: Include <pupa/env.h>.
(pupa_dl_dir): Variable removed.
(pupa_dl_load): Use the environment variable `prefix' instead of
the variable pupa_dl_dir.
(pupa_dl_set_prefix): Function removed.
(pupa_dl_get_prefix): Likewise.
* kern/i386/pc/init.c: Include <pupa/env.h>.
(pupa_machine_init): Use the environment variable `prefix' instead of
using pupa_dl_set_prefix to set the prefix.
* kern/main.c: Include <pupa/env.h>.
(pupa_set_root_dev): Use the environment variable `prefix' instead of
using pupa_dl_get_prefix to get the prefix.
* kern/misc.c: Include <pupa/env.h>.
(pupa_isdigit): New function.
(pupa_isgraph): Likewise.
(pupa_ftoa): Likewise.
(pupa_vsprintf): Added support for printing values of the type
`double'. Make it possible to format variable output when using
formatting like `%1.2%f'.
(pupa_split_cmdline): New function.
* kern/rescue.c: Include <pupa/env.h>.
(next_word): Removed function.
(pupa_rescue_cmd_prefix): Likewise.
(pupa_rescue_cmd_set): New function.
(pupa_rescue_cmd_unset): New function.
(pupa_enter_rescue_mode): Use the `pupa_split_cmdline' function to
split the command line instead of splitting it here. Added
support for setting variables using the syntax `foo=bar'. Don't
initialize the prefix command anymore. Initialized the set and
unset commands.
* normal/cmdline.c: Include <pupa/env.h>.
(pupa_tab_complete): Added prototypes for print_simple_completion,
print_partition_completion, add_completion, iterate_commands,
iterate_dev, iterate_part and iterate_dir. Moved code to print
partition information from here to kern/disk.c.
(pupa_cmdline_run): Don't check if the funtion exists anymore.
* normal/main.c: Include <pupa/env.h>.
(pupa_rescue_cmd_normal): Use the environment variable `prefix'
instead of using pupa_dl_get_prefix to get the prefix.
* term/i386/pc/vga.c: Include <pupa/arg.h>.
(check_vga_mem): Cast pointers to `void *' to silence a gcc
warning.
(pupa_vga_putchar) [! DEBUG_VGA]: Removed for this case.
(pupa_vga_setcolor): Declare unused variables with `__attribute__
((unused))' to silence a gcc warning.
(pupa_vga_setcolor): Likewise.
(debug_command): Changed to match argument parsing
interface changes.
* util/pupa-emu.c: Include <pupa/env.h>.
(options): Added 0's for unused fields to silence a gcc warning.
(argp): Likewise.
(main): Use the environment variable `prefix' instead of using
pupa_dl_set_prefix to set the prefix. Initialize the commands ls,
boot, cmp, cat and terminal. Finish the commands boot, cmp, cat
and terminal.
* util/i386/pc/getroot.c: Include <pupa/i386/pc/util/biosdisk.h>.
* util/misc.c: Include <malloc.h>.
(pupa_malloc): Rewritten so errors are correctly reported.
(pupa_realloc): Likewise.
(pupa_memalign): Likewise.
(pupa_mm_init_region): Declare unused variables with
`__attribute__ ((unused))' to silence a gcc warning.
* normal/i386/setjmp.S: Remove tab at the end of the file to
silence a gcc warning.
* loader/i386/pc/linux.c (pupa_rescue_cmd_initrd): Declare unused
variables with `__attribute__ ((unused))' to silence a gcc
warning.
* loader/i386/pc/multiboot.c (pupa_multiboot_unload): Make the
local variable i unsigned to silence a gcc warning.
* kern/term.c: Include <pupa/misc.h>.
(pupa_more_lines): New variable.
(pupa_more): Likewise.
(pupa_putcode): When the pager is active pause at the end of every
screen.
(pupa_set_more): New function.
* include/pupa/term.h (pupa_set_more): New prototype.
2004-03-13 13:59:25 +00:00
|
|
|
|
2003-01-06 00:01:35 +00:00
|
|
|
/* Initialize the prefix. */
|
2004-04-04 13:46:03 +00:00
|
|
|
grub_env_set ("prefix", make_install_device ());
|
2002-12-27 08:53:07 +00:00
|
|
|
}
|
2005-01-04 14:01:45 +00:00
|
|
|
|
|
|
|
/* Return the end of the core image. */
|
|
|
|
grub_addr_t
|
|
|
|
grub_arch_modules_addr (void)
|
|
|
|
{
|
|
|
|
return grub_end_addr;
|
|
|
|
}
|