2008-08-21 13:18:07 +00:00
|
|
|
/*
|
|
|
|
* GRUB -- GRand Unified Bootloader
|
2009-03-18 10:21:28 +00:00
|
|
|
* Copyright (C) 2006,2007,2008,2009 Free Software Foundation, Inc.
|
2008-08-21 13:18:07 +00:00
|
|
|
*
|
|
|
|
* GRUB 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 3 of the License, or
|
|
|
|
* (at your option) any later version.
|
|
|
|
*
|
|
|
|
* GRUB 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 GRUB. If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
*/
|
|
|
|
|
|
|
|
#include <grub/loader.h>
|
2008-11-14 20:18:07 +00:00
|
|
|
#include <grub/machine/machine.h>
|
2008-08-21 13:18:07 +00:00
|
|
|
#include <grub/machine/memory.h>
|
|
|
|
#include <grub/machine/loader.h>
|
2009-05-02 15:24:28 +00:00
|
|
|
#include <grub/normal.h>
|
2008-08-21 13:18:07 +00:00
|
|
|
#include <grub/file.h>
|
|
|
|
#include <grub/disk.h>
|
|
|
|
#include <grub/err.h>
|
|
|
|
#include <grub/misc.h>
|
|
|
|
#include <grub/types.h>
|
|
|
|
#include <grub/dl.h>
|
|
|
|
#include <grub/mm.h>
|
|
|
|
#include <grub/term.h>
|
|
|
|
#include <grub/cpu/linux.h>
|
2009-03-18 10:21:28 +00:00
|
|
|
#include <grub/video.h>
|
|
|
|
/* FIXME: the definition of `struct grub_video_render_target' is
|
|
|
|
VBE-specific. */
|
|
|
|
#include <grub/i386/pc/vbe.h>
|
2009-03-21 Bean <bean123ch@gmail.com>
* commands/blocklist.c: Add include file <grub/command.h>, remove
<grub/normal.h> and <grub/arg.h>.
(grub_cmd_blocklist): Use the new command interface.
(GRUB_MOD_INIT): Likewise.
(GRUB_MOD_FINI): Likewise.
* commands/boot.c: Likewise.
* commands/cat.c: Likewise.
* commands/cmp.c: Likewise.
* commands/configfile.c: Likewise.
* commands/crc.c: Likewise.
* commands/echo.c: Likewise.
* commands/halt.c: Likewise.
* commands/handler.c: Likewise.
* commands/hdparm.c: Likewise.
* commands/help.c: Likewise.
* commands/hexdump.c: Likewise.
* commands/loadenv.c: Likewise.
* commands/ls.c: Likewise.
* commands/lsmmap.c: Likewise.
* commands/lspci.c: Likewise.
* commands/loadenv.c: Likewise.
* commands/read.c: Likewise.
* commands/reboot.c: Likewise.
* commands/search.c: Likewise.
* commands/sleep.c: Likewise.
* commands/test.c: Likewise.
* commands/usbtest.c: Likewise.
* commands/videotest.c: Likewise.
* commands/i386/cpuid.c: Likewise.
* commands/i386/pc/halt.c: Likewise.
* commands/i386/pc/play.c: Likewise.
* commands/i386/pc/pxecmd.c: Likewise.
* commands/i386/pc/vbeinfo.c: Likewise.
* commands/i386/pc/vbetest.c: Likewise.
* commands/ieee1275/suspend.c: Likewise.
* disk/loopback.c: Likewise.
* font/font_cmd.c: Likewise.
* hello/hello.c: Likewise.
* loader/efi/appleloader.c: Likewise.
* loader/efi/chainloader.c: Likewise.
* loader/i386/bsd.c: Likewise.
* loader/i386/efi/linux.c: Likewise.
* loader/i386/ieee1275/linux.c: Likewise.
* loader/i386/linux.c: Likewise.
* loader/i386/pc/chainloader.c: Likewise.
* loader/i386/pc/linux.c: Likewise.
* loader/powerpc/ieee1275/linux.c: Likewise.
* loader/multiboot_loader.c: Likewise.
* term/gfxterm.c: Likewise.
* term/i386/pc/serial.c: Likewise.
* term/terminfo.c: Likewise.
* term/i386/pc/vesafb.c: Removed <grub/arg.h>.
* term/i386/pc/vga.c: Likewise.
* video/readers/jpeg.c: Likewise.
* video/readers/png.c: Likewise.
* video/readers/tga.c: Likewise.
* util/grub-fstest (cmd_loopback): Removed.
(cmd_blocklist): Likewise.
(cmd_ls): Likewise.
(grub_register_command): Likewise.
(grub_unregister_command): Likewise.
(execute_command): Use grub_command_find to locate command and execute
it.
* include/grub/efi/chainloader.h: Removed.
* loader/efi/chainloader_normal.c: Likewise.
* loader/i386/bsd_normal.c: Likewise.
* loader/i386/pc/chainloader_normal.c: Likewise.
* loader/i386/pc/multiboot_normal.c: Likewise.
* loader/linux_normal.c: Likewise.
* loader/multiboot_loader_normal.c: Likewise.
* loader/powerpc/ieee1275/linux_normal.c: Likewise.
* gencmdlist.sh: Scan new registration command grub_register_extcmd
and grub_register_command_p1.
* conf/common.rmk (grub_fstest_SOURCES): Add kern/list.c,
kern/command.c, lib/arg.c and commands/extcmd.c.
(pkglib_MODULES): Remove boot.mod, and minicmd.mod and extcmd.mod.
(minicmd_mod_SOURCES): New variable.
(minicmd_mod_CFLAGS): Likewise.
(minicmd_mod_LDFLAGS): Likewise.
(extcmd_mod_SOURCES): Likewise.
(extcmd_mod_CFLAGS): Likewise.
(extcmd_mod_LDFLAGS): Likewise.
(boot_mod_SOURCES): Removed.
(boot_mod_CFLAGS): Likewise.
(boot_mod_LDFLAGS): Likewise.
* conf/i386-pc.rmk (kernel_img_SOURCES): Add kern/command.c and
kern/corecmd.c.
(kernel_img_HEADERS): Add command.h.
(grub_emu_SOURCES): Remove commands/boot.c and normal/arg.c, add
commands/minicmd.c, kern/command.c, kern/corecmd.c, commands/extcmd.c
and lib/arg.c.
(pkglib_MODULES): Change _linux.mod, _chain.mod, _bsd.mod and
_multiboot.mod as linux.mod, chain.mod, bsd.mod and multiboot.mod,
remove the corresponding normal mode command.
(normal_mod_SOURCES): Remove normal/arg.c.
* conf/i386-coreboot.rmk: Likewise.
* conf/i386-efi.rmk: Likewise.
* conf/i386-ieee1275.rmk: Likewise.
* conf/powerpc-ieee1275.rmk: Likewise.
* conf/x86_64-efi.rmk: Likewise.
* include/grub/arg.h: Move from here ...
* include/grub/lib/arg.h: ... to here.
* normal/arg.c: Move from here ...
* lib/arg.c: ... to here.
* commands/extcmd.c: New file.
* commands/minicmd.c: Likewise.
* include/grub/command.h: Likewise.
* include/grub/extcmd.h: Likewise.
* kern/command.c: Likewise.
* kern/corecmd.c: Likewise.
* kern/list.c (grub_list_iterate): Return int instead of void.
(grub_list_insert): New function.
(grub_prio_list_insert): Likewise.
* kern/rescue.c (grub_rescue_command): Removed.
(grub_rescue_command_list): Likewise.
(grub_rescue_register_command): Likewise.
(grub_rescue_unregister_command): Likewise.
(grub_rescue_cmd_boot): Move to minicmd.c
(grub_rescue_cmd_help): Likewise.
(grub_rescue_cmd_info): Likewise.
(grub_rescue_cmd_boot): Likewise.
(grub_rescue_cmd_testload): Likewise.
(grub_rescue_cmd_dump): Likewise.
(grub_rescue_cmd_rmmod): Likewise.
(grub_rescue_cmd_lsmod): Likewise.
(grub_rescue_cmd_exit): Likewise.
(grub_rescue_print_devices): Moved to corecmd.c.
(grub_rescue_print_files): Likewise.
(grub_rescue_cmd_ls): Likewise.
(grub_rescue_cmd_insmod): Likewise.
(grub_rescue_cmd_set): Likewise.
(grub_rescue_cmd_unset): Likewise.
(attemp_normal_mode): Use grub_command_find to get normal module.
(grub_enter_rescue_mode): Use grub_register_core_commands to register
commands, remove grub_rescue_regiter_command calls.
* normal/command.c (grub_regiser_command): Removed.
(grub_unregister_command): Likewise.
(grub_command_find): Likewise.
(grub_iterate_commands): Likewise.
(rescue_command): Likewise.
(export_command): Moved to corecmd.c.
(set_command): Removed.
(unset_command): Likewise.
(insmod_command): Likewise.
(rmmod_command): Likewise.
(lsmod_command): Likewise.
(grub_command_init): Likewise.
* normal/completion.c (iterate_command): Use cmd->prio to check for
active command.
(complete_arguments): Use grub_extcmd_t structure to find options.
(grub_normal_do_completion): Change function grub_iterate_commands to
grub_command_iterate.
* normal/execute.c (grub_script_execute_cmd): No need to parse
argument here.
* normal/main.c (grub_dyncmd_dispatcher): New function.
(read_command_list): Register unload commands as dyncmd.
(grub_cmd_normal): Use new command interface, register rescue,
unregister normal at entry, register normal, unregister rescue at exit.
* include/grub/list.h (grub_list_test_t): New type.
(grub_list_iterate): Return int instead of void.
(grub_list_insert): New function.
(GRUB_AS_NAMED_LIST_P): New macro.
(GRUB_AS_PRIO_LIST): Likewise.
(GRUB_AS_PRIO_LIST_P): Likewise.
(GRUB_PRIO_LIST_PRIO_MASK): New constant.
(GRUB_PRIO_LIST_FLAG_ACTIVE): Likewise.
(grub_prio_list): New structure.
(grub_prio_list_insert): New function.
(grub_prio_list_remove): New inline function.
* include/grub/normal.h: Remove <grub/arg.h>, add <grub/command.h>.
(GRUB_COMMAND_FLAG_CMDLINE): Moved to command.h.
(GRUB_COMMAND_FLAG_MENU): Likewise.
(GRUB_COMMAND_FLAG_BOTH): Likewise.
(GRUB_COMMAND_FLAG_TITLE): Likewise.
(GRUB_COMMAND_FLAG_NO_ECHO): Likewise.
(GRUB_COMMAND_FLAG_NO_ARG_PARSE): Removed.
(GRUB_COMMAND_FLAG_NOT_LOADED): Likewise.
(grub_command): Likewise.
(grub_register_command): Likewise.
(grub_command_find): Likewise.
(grub_iterate_commands): Likewise.
(grub_command_init): Likewise.
(grub_arg_parse): Likewise.
(grub_arg_show_help): Likewise.
* include/grub/rescue.h (grub_rescue_register_command): Removed.
(grub_rescue_unregister_command): Likewise.
* include/grub/i386/bsd.h: Remove grub_rescue_cmd_freebsd,
grub_rescue_cmd_openbsd, grub_rescue_cmd_netbsd,
grub_rescue_cmd_freebsd_loadenv and grub_rescue_cmd_freebsd_module.
* include/grub/i386/efi/loader.h: Remove grub_rescue_cmd_linux and
grub_rescue_cmd_initrd.
* include/grub/i386/loader.h: Likewise.
* include/grub/x86_64/loader.h: Likewise.
* include/grub/i386/pc/chainloader.h: Remove grub_chainloader_cmd.
2009-03-21 08:39:59 +00:00
|
|
|
#include <grub/command.h>
|
2008-08-21 13:18:07 +00:00
|
|
|
|
|
|
|
#define GRUB_LINUX_CL_OFFSET 0x1000
|
|
|
|
#define GRUB_LINUX_CL_END_OFFSET 0x2000
|
|
|
|
|
2009-05-04 18:04:09 +00:00
|
|
|
/* This macro is useful for distributors, who can be certain they built FB support
|
|
|
|
into Linux, and therefore can benefit from seamless mode transition between
|
|
|
|
GRUB and Linux (saving boot time and visual glitches). Official GRUB, OTOH,
|
|
|
|
needs to be conservative. */
|
2009-06-04 18:22:45 +00:00
|
|
|
#ifdef GRUB_ASSUME_LINUX_HAS_FB_SUPPORT
|
|
|
|
#define DEFAULT_VIDEO_MODE "keep,1024x768,800x600,640x480"
|
|
|
|
#else
|
|
|
|
#define DEFAULT_VIDEO_MODE "text"
|
2009-05-04 18:04:09 +00:00
|
|
|
#endif
|
|
|
|
|
2008-08-21 13:18:07 +00:00
|
|
|
static grub_dl_t my_mod;
|
|
|
|
|
|
|
|
static grub_size_t linux_mem_size;
|
|
|
|
static int loaded;
|
|
|
|
static void *real_mode_mem;
|
|
|
|
static void *prot_mode_mem;
|
|
|
|
static void *initrd_mem;
|
|
|
|
static grub_uint32_t real_mode_pages;
|
|
|
|
static grub_uint32_t prot_mode_pages;
|
|
|
|
static grub_uint32_t initrd_pages;
|
|
|
|
|
|
|
|
static grub_uint8_t gdt[] __attribute__ ((aligned(16))) =
|
|
|
|
{
|
|
|
|
/* NULL. */
|
|
|
|
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
|
|
/* Reserved. */
|
|
|
|
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
|
|
/* Code segment. */
|
|
|
|
0xFF, 0xFF, 0x00, 0x00, 0x00, 0x9A, 0xCF, 0x00,
|
|
|
|
/* Data segment. */
|
|
|
|
0xFF, 0xFF, 0x00, 0x00, 0x00, 0x92, 0xCF, 0x00
|
|
|
|
};
|
|
|
|
|
|
|
|
struct gdt_descriptor
|
|
|
|
{
|
|
|
|
grub_uint16_t limit;
|
|
|
|
void *base;
|
|
|
|
} __attribute__ ((packed));
|
|
|
|
|
|
|
|
static struct gdt_descriptor gdt_desc =
|
|
|
|
{
|
|
|
|
sizeof (gdt) - 1,
|
|
|
|
gdt
|
|
|
|
};
|
|
|
|
|
|
|
|
struct idt_descriptor
|
|
|
|
{
|
|
|
|
grub_uint16_t limit;
|
|
|
|
void *base;
|
|
|
|
} __attribute__ ((packed));
|
|
|
|
|
|
|
|
static struct idt_descriptor idt_desc =
|
|
|
|
{
|
|
|
|
0,
|
|
|
|
0
|
|
|
|
};
|
|
|
|
|
2009-06-04 18:22:45 +00:00
|
|
|
#ifdef GRUB_MACHINE_PCBIOS
|
2009-03-29 19:52:35 +00:00
|
|
|
struct linux_vesafb_res
|
|
|
|
{
|
|
|
|
grub_uint16_t width;
|
|
|
|
grub_uint16_t height;
|
|
|
|
};
|
|
|
|
|
2009-05-04 20:21:33 +00:00
|
|
|
struct linux_vesafb_mode
|
|
|
|
{
|
|
|
|
grub_uint8_t res_index;
|
|
|
|
grub_uint8_t depth;
|
|
|
|
};
|
|
|
|
|
2009-03-29 19:52:35 +00:00
|
|
|
enum vga_modes
|
|
|
|
{
|
2009-05-04 20:21:33 +00:00
|
|
|
VGA_320_200,
|
|
|
|
VGA_640_400,
|
2009-03-29 19:52:35 +00:00
|
|
|
VGA_640_480,
|
2009-05-04 20:21:33 +00:00
|
|
|
VGA_800_500,
|
2009-03-29 19:52:35 +00:00
|
|
|
VGA_800_600,
|
2009-05-04 20:21:33 +00:00
|
|
|
VGA_896_672,
|
|
|
|
VGA_1024_640,
|
2009-03-29 19:52:35 +00:00
|
|
|
VGA_1024_768,
|
2009-05-04 20:21:33 +00:00
|
|
|
VGA_1152_720,
|
2009-03-29 19:52:35 +00:00
|
|
|
VGA_1280_1024,
|
2009-05-04 20:21:33 +00:00
|
|
|
VGA_1440_900,
|
|
|
|
VGA_1600_1200,
|
2009-03-29 19:52:35 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
static struct linux_vesafb_res linux_vesafb_res[] =
|
|
|
|
{
|
2009-05-04 20:21:33 +00:00
|
|
|
{ 320, 200 },
|
|
|
|
{ 640, 400 },
|
2009-03-29 19:52:35 +00:00
|
|
|
{ 640, 480 },
|
2009-05-04 20:21:33 +00:00
|
|
|
{ 800, 500 },
|
2009-03-29 19:52:35 +00:00
|
|
|
{ 800, 600 },
|
2009-05-04 20:21:33 +00:00
|
|
|
{ 896, 672 },
|
|
|
|
{ 1024, 640 },
|
2009-03-29 19:52:35 +00:00
|
|
|
{ 1024, 768 },
|
2009-05-04 20:21:33 +00:00
|
|
|
{ 1152, 720 },
|
|
|
|
{ 1280, 1024 },
|
|
|
|
{ 1440, 900 },
|
|
|
|
{ 1600, 1200 },
|
2009-03-29 19:52:35 +00:00
|
|
|
};
|
|
|
|
|
2009-05-04 20:21:33 +00:00
|
|
|
/* This is the reverse of the table in [linux]/Documentation/fb/vesafb.txt
|
|
|
|
plus a few more modes based on the table in
|
|
|
|
http://en.wikipedia.org/wiki/VESA_BIOS_Extensions */
|
2009-03-29 19:52:35 +00:00
|
|
|
struct linux_vesafb_mode linux_vesafb_modes[] =
|
|
|
|
{
|
2009-05-04 20:21:33 +00:00
|
|
|
{ VGA_640_400, 8 }, /* 0x300 */
|
2009-03-29 19:52:35 +00:00
|
|
|
{ VGA_640_480, 8 }, /* 0x301 */
|
2009-05-04 20:21:33 +00:00
|
|
|
{ VGA_800_600, 4 }, /* 0x302 */
|
2009-03-29 19:52:35 +00:00
|
|
|
{ VGA_800_600, 8 }, /* 0x303 */
|
2009-05-04 20:21:33 +00:00
|
|
|
{ VGA_1024_768, 4 }, /* 0x304 */
|
2009-03-29 19:52:35 +00:00
|
|
|
{ VGA_1024_768, 8 }, /* 0x305 */
|
2009-05-04 20:21:33 +00:00
|
|
|
{ VGA_1280_1024, 4 }, /* 0x306 */
|
2009-03-29 19:52:35 +00:00
|
|
|
{ VGA_1280_1024, 8 }, /* 0x307 */
|
|
|
|
{ 0, 0 },
|
|
|
|
{ 0, 0 },
|
|
|
|
{ 0, 0 },
|
|
|
|
{ 0, 0 },
|
|
|
|
{ 0, 0 },
|
2009-05-04 20:21:33 +00:00
|
|
|
{ VGA_320_200, 15 }, /* 0x30d */
|
|
|
|
{ VGA_320_200, 16 }, /* 0x30e */
|
|
|
|
{ VGA_320_200, 24 }, /* 0x30f */
|
2009-03-29 19:52:35 +00:00
|
|
|
{ VGA_640_480, 15 }, /* 0x310 */
|
|
|
|
{ VGA_640_480, 16 }, /* 0x311 */
|
|
|
|
{ VGA_640_480, 24 }, /* 0x312 */
|
|
|
|
{ VGA_800_600, 15 }, /* 0x313 */
|
|
|
|
{ VGA_800_600, 16 }, /* 0x314 */
|
|
|
|
{ VGA_800_600, 24 }, /* 0x315 */
|
|
|
|
{ VGA_1024_768, 15 }, /* 0x316 */
|
|
|
|
{ VGA_1024_768, 16 }, /* 0x317 */
|
|
|
|
{ VGA_1024_768, 24 }, /* 0x318 */
|
|
|
|
{ VGA_1280_1024, 15 }, /* 0x319 */
|
|
|
|
{ VGA_1280_1024, 16 }, /* 0x31a */
|
|
|
|
{ VGA_1280_1024, 24 }, /* 0x31b */
|
2009-05-04 20:21:33 +00:00
|
|
|
{ VGA_1600_1200, 8 }, /* 0x31c */
|
|
|
|
{ VGA_1600_1200, 15 }, /* 0x31d */
|
|
|
|
{ VGA_1600_1200, 16 }, /* 0x31e */
|
|
|
|
{ VGA_1600_1200, 24 }, /* 0x31f */
|
|
|
|
{ 0, 0 },
|
|
|
|
{ VGA_640_400, 15 }, /* 0x321 */
|
|
|
|
{ VGA_640_400, 16 }, /* 0x322 */
|
|
|
|
{ VGA_640_400, 24 }, /* 0x323 */
|
|
|
|
{ VGA_640_400, 32 }, /* 0x324 */
|
|
|
|
{ 0, 0 },
|
|
|
|
{ 0, 0 },
|
|
|
|
{ 0, 0 },
|
|
|
|
{ 0, 0 },
|
|
|
|
{ VGA_640_480, 32 }, /* 0x329 */
|
|
|
|
{ 0, 0 },
|
|
|
|
{ 0, 0 },
|
|
|
|
{ 0, 0 },
|
|
|
|
{ 0, 0 },
|
|
|
|
{ 0, 0 },
|
|
|
|
{ VGA_896_672, 8 }, /* 0x32f */
|
|
|
|
{ VGA_896_672, 15 }, /* 0x330 */
|
|
|
|
{ VGA_896_672, 16 }, /* 0x331 */
|
|
|
|
{ VGA_896_672, 24 }, /* 0x332 */
|
|
|
|
{ VGA_896_672, 32 }, /* 0x333 */
|
|
|
|
{ 0, 0 },
|
|
|
|
{ 0, 0 },
|
|
|
|
{ 0, 0 },
|
|
|
|
{ 0, 0 },
|
|
|
|
{ 0, 0 },
|
|
|
|
{ 0, 0 },
|
|
|
|
{ 0, 0 },
|
|
|
|
{ 0, 0 },
|
|
|
|
{ 0, 0 },
|
|
|
|
{ 0, 0 },
|
|
|
|
{ 0, 0 },
|
|
|
|
{ 0, 0 },
|
|
|
|
{ 0, 0 },
|
|
|
|
{ 0, 0 },
|
|
|
|
{ VGA_1600_1200, 32 }, /* 0x342 */
|
|
|
|
{ 0, 0 },
|
|
|
|
{ 0, 0 },
|
|
|
|
{ 0, 0 },
|
|
|
|
{ 0, 0 },
|
|
|
|
{ 0, 0 },
|
|
|
|
{ 0, 0 },
|
|
|
|
{ 0, 0 },
|
|
|
|
{ 0, 0 },
|
|
|
|
{ 0, 0 },
|
|
|
|
{ 0, 0 },
|
|
|
|
{ 0, 0 },
|
|
|
|
{ 0, 0 },
|
|
|
|
{ 0, 0 },
|
|
|
|
{ 0, 0 },
|
|
|
|
{ 0, 0 },
|
|
|
|
{ 0, 0 },
|
|
|
|
{ 0, 0 },
|
|
|
|
{ 0, 0 },
|
|
|
|
{ 0, 0 },
|
|
|
|
{ 0, 0 },
|
|
|
|
{ 0, 0 },
|
|
|
|
{ 0, 0 },
|
|
|
|
{ 0, 0 },
|
|
|
|
{ 0, 0 },
|
|
|
|
{ 0, 0 },
|
|
|
|
{ 0, 0 },
|
|
|
|
{ 0, 0 },
|
|
|
|
{ 0, 0 },
|
|
|
|
{ 0, 0 },
|
|
|
|
{ VGA_1440_900, 8 }, /* 0x360 */
|
|
|
|
{ VGA_1440_900, 15 }, /* 0x361 */
|
|
|
|
{ VGA_1440_900, 16 }, /* 0x362 */
|
|
|
|
{ VGA_1440_900, 24 }, /* 0x363 */
|
|
|
|
{ VGA_1440_900, 32 }, /* 0x364 */
|
|
|
|
{ VGA_1152_720, 8 }, /* 0x365 */
|
|
|
|
{ VGA_1152_720, 15 }, /* 0x366 */
|
|
|
|
{ VGA_1152_720, 16 }, /* 0x367 */
|
|
|
|
{ VGA_1152_720, 24 }, /* 0x368 */
|
|
|
|
{ VGA_1152_720, 32 }, /* 0x369 */
|
|
|
|
{ VGA_1024_640, 8 }, /* 0x36a */
|
|
|
|
{ VGA_1024_640, 15 }, /* 0x36b */
|
|
|
|
{ VGA_1024_640, 16 }, /* 0x36c */
|
|
|
|
{ VGA_1024_640, 24 }, /* 0x36d */
|
|
|
|
{ VGA_1024_640, 32 }, /* 0x36e */
|
|
|
|
{ VGA_800_500, 8 }, /* 0x36f */
|
|
|
|
{ VGA_800_500, 15 }, /* 0x370 */
|
|
|
|
{ VGA_800_500, 16 }, /* 0x371 */
|
|
|
|
{ VGA_800_500, 24 }, /* 0x372 */
|
|
|
|
{ VGA_800_500, 32 }, /* 0x373 */
|
2009-03-29 19:52:35 +00:00
|
|
|
};
|
2009-06-04 18:22:45 +00:00
|
|
|
#endif
|
2009-03-29 19:52:35 +00:00
|
|
|
|
2008-08-21 13:18:07 +00:00
|
|
|
static inline grub_size_t
|
|
|
|
page_align (grub_size_t size)
|
|
|
|
{
|
|
|
|
return (size + (1 << 12) - 1) & (~((1 << 12) - 1));
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Find the optimal number of pages for the memory map. */
|
|
|
|
static grub_size_t
|
|
|
|
find_mmap_size (void)
|
|
|
|
{
|
|
|
|
grub_size_t count = 0, mmap_size;
|
|
|
|
|
|
|
|
auto int NESTED_FUNC_ATTR hook (grub_uint64_t, grub_uint64_t, grub_uint32_t);
|
|
|
|
int NESTED_FUNC_ATTR hook (grub_uint64_t addr __attribute__ ((unused)),
|
|
|
|
grub_uint64_t size __attribute__ ((unused)),
|
|
|
|
grub_uint32_t type __attribute__ ((unused)))
|
|
|
|
{
|
|
|
|
count++;
|
|
|
|
return 0;
|
|
|
|
}
|
2009-06-10 21:04:23 +00:00
|
|
|
|
2009-05-02 21:46:34 +00:00
|
|
|
grub_mmap_iterate (hook);
|
2009-06-10 21:04:23 +00:00
|
|
|
|
2008-08-21 13:18:07 +00:00
|
|
|
mmap_size = count * sizeof (struct grub_e820_mmap);
|
|
|
|
|
|
|
|
/* Increase the size a bit for safety, because GRUB allocates more on
|
|
|
|
later. */
|
|
|
|
mmap_size += (1 << 12);
|
2009-06-10 21:04:23 +00:00
|
|
|
|
2008-08-21 13:18:07 +00:00
|
|
|
return page_align (mmap_size);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
free_pages (void)
|
|
|
|
{
|
|
|
|
real_mode_mem = prot_mode_mem = initrd_mem = 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Allocate pages for the real mode code and the protected mode code
|
|
|
|
for linux as well as a memory map buffer. */
|
|
|
|
static int
|
|
|
|
allocate_pages (grub_size_t prot_size)
|
|
|
|
{
|
|
|
|
grub_size_t real_size, mmap_size;
|
|
|
|
|
|
|
|
/* Make sure that each size is aligned to a page boundary. */
|
|
|
|
real_size = GRUB_LINUX_CL_END_OFFSET;
|
|
|
|
prot_size = page_align (prot_size);
|
|
|
|
mmap_size = find_mmap_size ();
|
|
|
|
|
|
|
|
grub_dprintf ("linux", "real_size = %x, prot_size = %x, mmap_size = %x\n",
|
|
|
|
(unsigned) real_size, (unsigned) prot_size, (unsigned) mmap_size);
|
2009-06-10 21:04:23 +00:00
|
|
|
|
2008-08-21 13:18:07 +00:00
|
|
|
/* Calculate the number of pages; Combine the real mode code with
|
|
|
|
the memory map buffer for simplicity. */
|
|
|
|
real_mode_pages = ((real_size + mmap_size) >> 12);
|
|
|
|
prot_mode_pages = (prot_size >> 12);
|
2009-06-10 21:04:23 +00:00
|
|
|
|
2008-08-21 13:18:07 +00:00
|
|
|
/* Initialize the memory pointers with NULL for convenience. */
|
2009-04-07 00:48:57 +00:00
|
|
|
free_pages ();
|
2009-06-10 21:04:23 +00:00
|
|
|
|
2009-03-08 12:46:27 +00:00
|
|
|
/* FIXME: Should request low memory from the heap when this feature is
|
|
|
|
implemented. */
|
2008-11-14 20:18:07 +00:00
|
|
|
|
2008-11-14 19:04:26 +00:00
|
|
|
auto int NESTED_FUNC_ATTR hook (grub_uint64_t, grub_uint64_t, grub_uint32_t);
|
|
|
|
int NESTED_FUNC_ATTR hook (grub_uint64_t addr, grub_uint64_t size, grub_uint32_t type)
|
|
|
|
{
|
|
|
|
/* We must put real mode code in the traditional space. */
|
|
|
|
|
|
|
|
if (type == GRUB_MACHINE_MEMORY_AVAILABLE
|
|
|
|
&& addr <= 0x90000)
|
|
|
|
{
|
|
|
|
if (addr < 0x10000)
|
|
|
|
{
|
|
|
|
size += addr - 0x10000;
|
|
|
|
addr = 0x10000;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (addr + size > 0x90000)
|
|
|
|
size = 0x90000 - addr;
|
|
|
|
|
|
|
|
if (real_size + mmap_size > size)
|
|
|
|
return 0;
|
|
|
|
|
2009-05-14 03:48:08 +00:00
|
|
|
real_mode_mem =
|
|
|
|
(void *) (grub_size_t) ((addr + size) - (real_size + mmap_size));
|
2008-11-14 19:04:26 +00:00
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
2009-05-02 21:46:34 +00:00
|
|
|
grub_mmap_iterate (hook);
|
2008-08-21 13:18:07 +00:00
|
|
|
if (! real_mode_mem)
|
|
|
|
{
|
|
|
|
grub_error (GRUB_ERR_OUT_OF_MEMORY, "cannot allocate real mode pages");
|
|
|
|
goto fail;
|
|
|
|
}
|
|
|
|
|
|
|
|
prot_mode_mem = (void *) 0x100000;
|
|
|
|
|
|
|
|
grub_dprintf ("linux", "real_mode_mem = %lx, real_mode_pages = %x, "
|
|
|
|
"prot_mode_mem = %lx, prot_mode_pages = %x\n",
|
|
|
|
(unsigned long) real_mode_mem, (unsigned) real_mode_pages,
|
|
|
|
(unsigned long) prot_mode_mem, (unsigned) prot_mode_pages);
|
|
|
|
|
|
|
|
return 1;
|
|
|
|
|
|
|
|
fail:
|
|
|
|
free_pages ();
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
grub_e820_add_region (struct grub_e820_mmap *e820_map, int *e820_num,
|
|
|
|
grub_uint64_t start, grub_uint64_t size,
|
|
|
|
grub_uint32_t type)
|
|
|
|
{
|
|
|
|
int n = *e820_num;
|
|
|
|
|
|
|
|
if (n >= GRUB_E820_MAX_ENTRY)
|
|
|
|
grub_fatal ("Too many e820 memory map entries");
|
|
|
|
|
|
|
|
if ((n > 0) && (e820_map[n - 1].addr + e820_map[n - 1].size == start) &&
|
|
|
|
(e820_map[n - 1].type == type))
|
|
|
|
e820_map[n - 1].size += size;
|
|
|
|
else
|
|
|
|
{
|
|
|
|
e820_map[n].addr = start;
|
|
|
|
e820_map[n].size = size;
|
|
|
|
e820_map[n].type = type;
|
|
|
|
(*e820_num)++;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2009-03-18 10:21:28 +00:00
|
|
|
static int
|
|
|
|
grub_linux_setup_video (struct linux_kernel_params *params)
|
|
|
|
{
|
|
|
|
struct grub_video_mode_info mode_info;
|
|
|
|
struct grub_video_render_target *render_target;
|
|
|
|
int ret;
|
|
|
|
|
|
|
|
ret = grub_video_get_info (&mode_info);
|
|
|
|
if (ret)
|
|
|
|
return 1;
|
|
|
|
|
|
|
|
ret = grub_video_get_active_render_target (&render_target);
|
|
|
|
if (ret)
|
|
|
|
return 1;
|
|
|
|
|
|
|
|
params->lfb_width = mode_info.width;
|
|
|
|
params->lfb_height = mode_info.height;
|
|
|
|
params->lfb_depth = mode_info.bpp;
|
|
|
|
params->lfb_line_len = mode_info.pitch;
|
|
|
|
|
2009-05-14 03:48:08 +00:00
|
|
|
params->lfb_base = (grub_size_t) render_target->data;
|
2009-03-18 10:21:28 +00:00
|
|
|
params->lfb_size = (params->lfb_line_len * params->lfb_height + 65535) >> 16;
|
|
|
|
|
2009-04-03 20:03:39 +00:00
|
|
|
params->red_mask_size = mode_info.red_mask_size;
|
|
|
|
params->red_field_pos = mode_info.red_field_pos;
|
|
|
|
params->green_mask_size = mode_info.green_mask_size;
|
|
|
|
params->green_field_pos = mode_info.green_field_pos;
|
|
|
|
params->blue_mask_size = mode_info.blue_mask_size;
|
|
|
|
params->blue_field_pos = mode_info.blue_field_pos;
|
|
|
|
params->reserved_mask_size = mode_info.reserved_mask_size;
|
|
|
|
params->reserved_field_pos = mode_info.reserved_field_pos;
|
2009-03-18 10:21:28 +00:00
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2008-08-21 13:18:07 +00:00
|
|
|
#ifdef __x86_64__
|
2009-05-17 11:27:08 +00:00
|
|
|
extern grub_uint8_t grub_linux_trampoline_start[];
|
|
|
|
extern grub_uint8_t grub_linux_trampoline_end[];
|
2008-08-21 13:18:07 +00:00
|
|
|
#endif
|
|
|
|
|
|
|
|
static grub_err_t
|
2009-03-28 12:53:16 +00:00
|
|
|
grub_linux_boot (void)
|
2008-08-21 13:18:07 +00:00
|
|
|
{
|
|
|
|
struct linux_kernel_params *params;
|
|
|
|
int e820_num;
|
2009-06-27 17:37:07 +00:00
|
|
|
grub_err_t err = 0;
|
2009-06-04 18:22:45 +00:00
|
|
|
char *modevar, *tmp;
|
|
|
|
|
2008-08-21 13:18:07 +00:00
|
|
|
params = real_mode_mem;
|
|
|
|
|
2009-06-04 18:22:45 +00:00
|
|
|
modevar = grub_env_get ("gfxpayload");
|
|
|
|
|
2009-06-10 21:04:23 +00:00
|
|
|
/* Now all graphical modes are acceptable.
|
2009-06-04 18:22:45 +00:00
|
|
|
May change in future if we have modes without framebuffer. */
|
|
|
|
if (modevar && *modevar != 0)
|
2009-03-29 19:52:35 +00:00
|
|
|
{
|
2009-06-10 21:04:23 +00:00
|
|
|
tmp = grub_malloc (grub_strlen (modevar)
|
2009-06-04 18:22:45 +00:00
|
|
|
+ sizeof (DEFAULT_VIDEO_MODE) + 1);
|
|
|
|
if (! tmp)
|
|
|
|
return grub_errno;
|
|
|
|
grub_sprintf (tmp, "%s;" DEFAULT_VIDEO_MODE, modevar);
|
|
|
|
err = grub_video_set_mode (tmp, 0);
|
|
|
|
grub_free (tmp);
|
2009-03-29 19:52:35 +00:00
|
|
|
}
|
2009-06-04 18:22:45 +00:00
|
|
|
#ifndef GRUB_ASSUME_LINUX_HAS_FB_SUPPORT
|
2009-05-04 18:04:09 +00:00
|
|
|
else
|
2009-06-04 18:22:45 +00:00
|
|
|
err = grub_video_set_mode (DEFAULT_VIDEO_MODE, 0);
|
2009-05-04 18:04:09 +00:00
|
|
|
#endif
|
2009-03-29 19:52:35 +00:00
|
|
|
|
2009-06-04 18:22:45 +00:00
|
|
|
if (err)
|
|
|
|
{
|
|
|
|
grub_print_error ();
|
|
|
|
grub_printf ("Booting however\n");
|
|
|
|
grub_errno = GRUB_ERR_NONE;
|
|
|
|
}
|
|
|
|
|
2009-03-18 10:21:28 +00:00
|
|
|
if (! grub_linux_setup_video (params))
|
|
|
|
params->have_vga = GRUB_VIDEO_TYPE_VLFB;
|
2009-03-29 19:52:35 +00:00
|
|
|
else
|
|
|
|
{
|
2009-06-29 17:19:35 +00:00
|
|
|
params->have_vga = GRUB_VIDEO_TYPE_TEXT;
|
2009-03-29 19:52:35 +00:00
|
|
|
params->video_width = 80;
|
|
|
|
params->video_height = 25;
|
|
|
|
}
|
2009-06-10 21:04:23 +00:00
|
|
|
|
2008-08-21 13:18:07 +00:00
|
|
|
grub_dprintf ("linux", "code32_start = %x, idt_desc = %lx, gdt_desc = %lx\n",
|
|
|
|
(unsigned) params->code32_start,
|
|
|
|
(unsigned long) &(idt_desc.limit),
|
|
|
|
(unsigned long) &(gdt_desc.limit));
|
|
|
|
grub_dprintf ("linux", "idt = %x:%lx, gdt = %x:%lx\n",
|
|
|
|
(unsigned) idt_desc.limit, (unsigned long) idt_desc.base,
|
|
|
|
(unsigned) gdt_desc.limit, (unsigned long) gdt_desc.base);
|
|
|
|
|
|
|
|
auto int NESTED_FUNC_ATTR hook (grub_uint64_t, grub_uint64_t, grub_uint32_t);
|
|
|
|
int NESTED_FUNC_ATTR hook (grub_uint64_t addr, grub_uint64_t size, grub_uint32_t type)
|
|
|
|
{
|
|
|
|
switch (type)
|
|
|
|
{
|
|
|
|
case GRUB_MACHINE_MEMORY_AVAILABLE:
|
|
|
|
grub_e820_add_region (params->e820_map, &e820_num,
|
|
|
|
addr, size, GRUB_E820_RAM);
|
|
|
|
break;
|
|
|
|
|
2009-05-02 21:46:34 +00:00
|
|
|
#ifdef GRUB_MACHINE_MEMORY_ACPI
|
|
|
|
case GRUB_MACHINE_MEMORY_ACPI:
|
|
|
|
grub_e820_add_region (params->e820_map, &e820_num,
|
|
|
|
addr, size, GRUB_E820_ACPI);
|
|
|
|
break;
|
|
|
|
#endif
|
|
|
|
|
|
|
|
#ifdef GRUB_MACHINE_MEMORY_NVS
|
|
|
|
case GRUB_MACHINE_MEMORY_NVS:
|
|
|
|
grub_e820_add_region (params->e820_map, &e820_num,
|
|
|
|
addr, size, GRUB_E820_NVS);
|
|
|
|
break;
|
|
|
|
#endif
|
|
|
|
|
|
|
|
#ifdef GRUB_MACHINE_MEMORY_CODE
|
|
|
|
case GRUB_MACHINE_MEMORY_CODE:
|
|
|
|
grub_e820_add_region (params->e820_map, &e820_num,
|
|
|
|
addr, size, GRUB_E820_EXEC_CODE);
|
|
|
|
break;
|
|
|
|
#endif
|
|
|
|
|
2008-08-21 13:18:07 +00:00
|
|
|
default:
|
|
|
|
grub_e820_add_region (params->e820_map, &e820_num,
|
|
|
|
addr, size, GRUB_E820_RESERVED);
|
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
e820_num = 0;
|
2009-05-02 21:46:34 +00:00
|
|
|
grub_mmap_iterate (hook);
|
2008-08-21 13:18:07 +00:00
|
|
|
params->mmap_size = e820_num;
|
|
|
|
|
2009-06-29 17:19:35 +00:00
|
|
|
/* Initialize these last, because terminal position could be affected by printfs above. */
|
|
|
|
if (params->have_vga == GRUB_VIDEO_TYPE_TEXT)
|
|
|
|
{
|
|
|
|
params->video_cursor_x = grub_getxy () >> 8;
|
|
|
|
params->video_cursor_y = grub_getxy () & 0xff;
|
|
|
|
}
|
|
|
|
|
2009-05-17 11:27:08 +00:00
|
|
|
#ifdef __x86_64__
|
|
|
|
|
2009-06-10 21:04:23 +00:00
|
|
|
grub_memcpy ((char *) prot_mode_mem + (prot_mode_pages << 12),
|
|
|
|
grub_linux_trampoline_start,
|
2009-05-17 11:27:08 +00:00
|
|
|
grub_linux_trampoline_end - grub_linux_trampoline_start);
|
2009-06-10 21:04:23 +00:00
|
|
|
|
|
|
|
((void (*) (unsigned long, void *)) ((char *) prot_mode_mem
|
2009-05-17 11:27:08 +00:00
|
|
|
+ (prot_mode_pages << 12)))
|
|
|
|
(params->code32_start, real_mode_mem);
|
|
|
|
#else
|
2009-05-02 21:46:34 +00:00
|
|
|
|
2008-08-21 13:18:07 +00:00
|
|
|
/* Hardware interrupts are not safe any longer. */
|
|
|
|
asm volatile ("cli" : : );
|
2009-06-10 21:04:23 +00:00
|
|
|
|
2008-08-21 13:18:07 +00:00
|
|
|
/* Load the IDT and the GDT for the bootstrap. */
|
|
|
|
asm volatile ("lidt %0" : : "m" (idt_desc));
|
|
|
|
asm volatile ("lgdt %0" : : "m" (gdt_desc));
|
|
|
|
|
|
|
|
/* Enter Linux. */
|
2009-06-29 15:55:42 +00:00
|
|
|
asm volatile ("jmp *%2" : : "b" (0), "S" (real_mode_mem), "g" (params->code32_start));
|
2009-06-10 21:04:23 +00:00
|
|
|
|
2008-08-21 13:18:07 +00:00
|
|
|
#endif
|
|
|
|
|
|
|
|
/* Never reach here. */
|
|
|
|
return GRUB_ERR_NONE;
|
|
|
|
}
|
|
|
|
|
|
|
|
static grub_err_t
|
|
|
|
grub_linux_unload (void)
|
|
|
|
{
|
|
|
|
grub_dl_unref (my_mod);
|
|
|
|
loaded = 0;
|
|
|
|
return GRUB_ERR_NONE;
|
|
|
|
}
|
|
|
|
|
2009-03-21 Bean <bean123ch@gmail.com>
* commands/blocklist.c: Add include file <grub/command.h>, remove
<grub/normal.h> and <grub/arg.h>.
(grub_cmd_blocklist): Use the new command interface.
(GRUB_MOD_INIT): Likewise.
(GRUB_MOD_FINI): Likewise.
* commands/boot.c: Likewise.
* commands/cat.c: Likewise.
* commands/cmp.c: Likewise.
* commands/configfile.c: Likewise.
* commands/crc.c: Likewise.
* commands/echo.c: Likewise.
* commands/halt.c: Likewise.
* commands/handler.c: Likewise.
* commands/hdparm.c: Likewise.
* commands/help.c: Likewise.
* commands/hexdump.c: Likewise.
* commands/loadenv.c: Likewise.
* commands/ls.c: Likewise.
* commands/lsmmap.c: Likewise.
* commands/lspci.c: Likewise.
* commands/loadenv.c: Likewise.
* commands/read.c: Likewise.
* commands/reboot.c: Likewise.
* commands/search.c: Likewise.
* commands/sleep.c: Likewise.
* commands/test.c: Likewise.
* commands/usbtest.c: Likewise.
* commands/videotest.c: Likewise.
* commands/i386/cpuid.c: Likewise.
* commands/i386/pc/halt.c: Likewise.
* commands/i386/pc/play.c: Likewise.
* commands/i386/pc/pxecmd.c: Likewise.
* commands/i386/pc/vbeinfo.c: Likewise.
* commands/i386/pc/vbetest.c: Likewise.
* commands/ieee1275/suspend.c: Likewise.
* disk/loopback.c: Likewise.
* font/font_cmd.c: Likewise.
* hello/hello.c: Likewise.
* loader/efi/appleloader.c: Likewise.
* loader/efi/chainloader.c: Likewise.
* loader/i386/bsd.c: Likewise.
* loader/i386/efi/linux.c: Likewise.
* loader/i386/ieee1275/linux.c: Likewise.
* loader/i386/linux.c: Likewise.
* loader/i386/pc/chainloader.c: Likewise.
* loader/i386/pc/linux.c: Likewise.
* loader/powerpc/ieee1275/linux.c: Likewise.
* loader/multiboot_loader.c: Likewise.
* term/gfxterm.c: Likewise.
* term/i386/pc/serial.c: Likewise.
* term/terminfo.c: Likewise.
* term/i386/pc/vesafb.c: Removed <grub/arg.h>.
* term/i386/pc/vga.c: Likewise.
* video/readers/jpeg.c: Likewise.
* video/readers/png.c: Likewise.
* video/readers/tga.c: Likewise.
* util/grub-fstest (cmd_loopback): Removed.
(cmd_blocklist): Likewise.
(cmd_ls): Likewise.
(grub_register_command): Likewise.
(grub_unregister_command): Likewise.
(execute_command): Use grub_command_find to locate command and execute
it.
* include/grub/efi/chainloader.h: Removed.
* loader/efi/chainloader_normal.c: Likewise.
* loader/i386/bsd_normal.c: Likewise.
* loader/i386/pc/chainloader_normal.c: Likewise.
* loader/i386/pc/multiboot_normal.c: Likewise.
* loader/linux_normal.c: Likewise.
* loader/multiboot_loader_normal.c: Likewise.
* loader/powerpc/ieee1275/linux_normal.c: Likewise.
* gencmdlist.sh: Scan new registration command grub_register_extcmd
and grub_register_command_p1.
* conf/common.rmk (grub_fstest_SOURCES): Add kern/list.c,
kern/command.c, lib/arg.c and commands/extcmd.c.
(pkglib_MODULES): Remove boot.mod, and minicmd.mod and extcmd.mod.
(minicmd_mod_SOURCES): New variable.
(minicmd_mod_CFLAGS): Likewise.
(minicmd_mod_LDFLAGS): Likewise.
(extcmd_mod_SOURCES): Likewise.
(extcmd_mod_CFLAGS): Likewise.
(extcmd_mod_LDFLAGS): Likewise.
(boot_mod_SOURCES): Removed.
(boot_mod_CFLAGS): Likewise.
(boot_mod_LDFLAGS): Likewise.
* conf/i386-pc.rmk (kernel_img_SOURCES): Add kern/command.c and
kern/corecmd.c.
(kernel_img_HEADERS): Add command.h.
(grub_emu_SOURCES): Remove commands/boot.c and normal/arg.c, add
commands/minicmd.c, kern/command.c, kern/corecmd.c, commands/extcmd.c
and lib/arg.c.
(pkglib_MODULES): Change _linux.mod, _chain.mod, _bsd.mod and
_multiboot.mod as linux.mod, chain.mod, bsd.mod and multiboot.mod,
remove the corresponding normal mode command.
(normal_mod_SOURCES): Remove normal/arg.c.
* conf/i386-coreboot.rmk: Likewise.
* conf/i386-efi.rmk: Likewise.
* conf/i386-ieee1275.rmk: Likewise.
* conf/powerpc-ieee1275.rmk: Likewise.
* conf/x86_64-efi.rmk: Likewise.
* include/grub/arg.h: Move from here ...
* include/grub/lib/arg.h: ... to here.
* normal/arg.c: Move from here ...
* lib/arg.c: ... to here.
* commands/extcmd.c: New file.
* commands/minicmd.c: Likewise.
* include/grub/command.h: Likewise.
* include/grub/extcmd.h: Likewise.
* kern/command.c: Likewise.
* kern/corecmd.c: Likewise.
* kern/list.c (grub_list_iterate): Return int instead of void.
(grub_list_insert): New function.
(grub_prio_list_insert): Likewise.
* kern/rescue.c (grub_rescue_command): Removed.
(grub_rescue_command_list): Likewise.
(grub_rescue_register_command): Likewise.
(grub_rescue_unregister_command): Likewise.
(grub_rescue_cmd_boot): Move to minicmd.c
(grub_rescue_cmd_help): Likewise.
(grub_rescue_cmd_info): Likewise.
(grub_rescue_cmd_boot): Likewise.
(grub_rescue_cmd_testload): Likewise.
(grub_rescue_cmd_dump): Likewise.
(grub_rescue_cmd_rmmod): Likewise.
(grub_rescue_cmd_lsmod): Likewise.
(grub_rescue_cmd_exit): Likewise.
(grub_rescue_print_devices): Moved to corecmd.c.
(grub_rescue_print_files): Likewise.
(grub_rescue_cmd_ls): Likewise.
(grub_rescue_cmd_insmod): Likewise.
(grub_rescue_cmd_set): Likewise.
(grub_rescue_cmd_unset): Likewise.
(attemp_normal_mode): Use grub_command_find to get normal module.
(grub_enter_rescue_mode): Use grub_register_core_commands to register
commands, remove grub_rescue_regiter_command calls.
* normal/command.c (grub_regiser_command): Removed.
(grub_unregister_command): Likewise.
(grub_command_find): Likewise.
(grub_iterate_commands): Likewise.
(rescue_command): Likewise.
(export_command): Moved to corecmd.c.
(set_command): Removed.
(unset_command): Likewise.
(insmod_command): Likewise.
(rmmod_command): Likewise.
(lsmod_command): Likewise.
(grub_command_init): Likewise.
* normal/completion.c (iterate_command): Use cmd->prio to check for
active command.
(complete_arguments): Use grub_extcmd_t structure to find options.
(grub_normal_do_completion): Change function grub_iterate_commands to
grub_command_iterate.
* normal/execute.c (grub_script_execute_cmd): No need to parse
argument here.
* normal/main.c (grub_dyncmd_dispatcher): New function.
(read_command_list): Register unload commands as dyncmd.
(grub_cmd_normal): Use new command interface, register rescue,
unregister normal at entry, register normal, unregister rescue at exit.
* include/grub/list.h (grub_list_test_t): New type.
(grub_list_iterate): Return int instead of void.
(grub_list_insert): New function.
(GRUB_AS_NAMED_LIST_P): New macro.
(GRUB_AS_PRIO_LIST): Likewise.
(GRUB_AS_PRIO_LIST_P): Likewise.
(GRUB_PRIO_LIST_PRIO_MASK): New constant.
(GRUB_PRIO_LIST_FLAG_ACTIVE): Likewise.
(grub_prio_list): New structure.
(grub_prio_list_insert): New function.
(grub_prio_list_remove): New inline function.
* include/grub/normal.h: Remove <grub/arg.h>, add <grub/command.h>.
(GRUB_COMMAND_FLAG_CMDLINE): Moved to command.h.
(GRUB_COMMAND_FLAG_MENU): Likewise.
(GRUB_COMMAND_FLAG_BOTH): Likewise.
(GRUB_COMMAND_FLAG_TITLE): Likewise.
(GRUB_COMMAND_FLAG_NO_ECHO): Likewise.
(GRUB_COMMAND_FLAG_NO_ARG_PARSE): Removed.
(GRUB_COMMAND_FLAG_NOT_LOADED): Likewise.
(grub_command): Likewise.
(grub_register_command): Likewise.
(grub_command_find): Likewise.
(grub_iterate_commands): Likewise.
(grub_command_init): Likewise.
(grub_arg_parse): Likewise.
(grub_arg_show_help): Likewise.
* include/grub/rescue.h (grub_rescue_register_command): Removed.
(grub_rescue_unregister_command): Likewise.
* include/grub/i386/bsd.h: Remove grub_rescue_cmd_freebsd,
grub_rescue_cmd_openbsd, grub_rescue_cmd_netbsd,
grub_rescue_cmd_freebsd_loadenv and grub_rescue_cmd_freebsd_module.
* include/grub/i386/efi/loader.h: Remove grub_rescue_cmd_linux and
grub_rescue_cmd_initrd.
* include/grub/i386/loader.h: Likewise.
* include/grub/x86_64/loader.h: Likewise.
* include/grub/i386/pc/chainloader.h: Remove grub_chainloader_cmd.
2009-03-21 08:39:59 +00:00
|
|
|
static grub_err_t
|
|
|
|
grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
|
|
|
|
int argc, char *argv[])
|
2008-08-21 13:18:07 +00:00
|
|
|
{
|
|
|
|
grub_file_t file = 0;
|
|
|
|
struct linux_kernel_header lh;
|
|
|
|
struct linux_kernel_params *params;
|
|
|
|
grub_uint8_t setup_sects;
|
|
|
|
grub_size_t real_size, prot_size;
|
|
|
|
grub_ssize_t len;
|
|
|
|
int i;
|
|
|
|
char *dest;
|
|
|
|
|
|
|
|
grub_dl_ref (my_mod);
|
2009-06-10 21:04:23 +00:00
|
|
|
|
2008-08-21 13:18:07 +00:00
|
|
|
if (argc == 0)
|
|
|
|
{
|
|
|
|
grub_error (GRUB_ERR_BAD_ARGUMENT, "no kernel specified");
|
|
|
|
goto fail;
|
|
|
|
}
|
|
|
|
|
|
|
|
file = grub_file_open (argv[0]);
|
|
|
|
if (! file)
|
2009-06-27 12:21:18 +00:00
|
|
|
goto fail;
|
2008-08-21 13:18:07 +00:00
|
|
|
|
2009-06-10 23:47:49 +00:00
|
|
|
if (grub_file_read (file, &lh, sizeof (lh)) != sizeof (lh))
|
2008-08-21 13:18:07 +00:00
|
|
|
{
|
|
|
|
grub_error (GRUB_ERR_READ_ERROR, "cannot read the linux header");
|
|
|
|
goto fail;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (lh.boot_flag != grub_cpu_to_le16 (0xaa55))
|
|
|
|
{
|
|
|
|
grub_error (GRUB_ERR_BAD_OS, "invalid magic number");
|
|
|
|
goto fail;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (lh.setup_sects > GRUB_LINUX_MAX_SETUP_SECTS)
|
|
|
|
{
|
|
|
|
grub_error (GRUB_ERR_BAD_OS, "too many setup sectors");
|
|
|
|
goto fail;
|
|
|
|
}
|
|
|
|
|
2009-03-30 22:22:31 +00:00
|
|
|
if (! (lh.loadflags & GRUB_LINUX_FLAG_BIG_KERNEL))
|
2008-08-21 13:18:07 +00:00
|
|
|
{
|
2009-03-30 22:22:31 +00:00
|
|
|
grub_error (GRUB_ERR_BAD_OS, "zImage doesn't support 32-bit boot"
|
|
|
|
#ifdef GRUB_MACHINE_PCBIOS
|
|
|
|
" (try with `linux16')"
|
|
|
|
#endif
|
|
|
|
);
|
2008-08-21 13:18:07 +00:00
|
|
|
goto fail;
|
|
|
|
}
|
|
|
|
|
2009-03-30 22:22:31 +00:00
|
|
|
/* FIXME: 2.03 is not always good enough (Linux 2.4 can be 2.03 and
|
|
|
|
still not support 32-bit boot. */
|
|
|
|
if (lh.header != grub_cpu_to_le32 (GRUB_LINUX_MAGIC_SIGNATURE)
|
|
|
|
|| grub_le_to_cpu16 (lh.version) < 0x0203)
|
2008-08-21 13:18:07 +00:00
|
|
|
{
|
2009-03-30 22:22:31 +00:00
|
|
|
grub_error (GRUB_ERR_BAD_OS, "version too old for 32-bit boot"
|
|
|
|
#ifdef GRUB_MACHINE_PCBIOS
|
|
|
|
" (try with `linux16')"
|
|
|
|
#endif
|
|
|
|
);
|
2008-08-21 13:18:07 +00:00
|
|
|
goto fail;
|
|
|
|
}
|
|
|
|
|
|
|
|
setup_sects = lh.setup_sects;
|
2009-06-10 21:04:23 +00:00
|
|
|
|
2008-08-21 13:18:07 +00:00
|
|
|
/* If SETUP_SECTS is not set, set it to the default (4). */
|
|
|
|
if (! setup_sects)
|
|
|
|
setup_sects = GRUB_LINUX_DEFAULT_SETUP_SECTS;
|
|
|
|
|
|
|
|
real_size = setup_sects << GRUB_DISK_SECTOR_BITS;
|
|
|
|
prot_size = grub_file_size (file) - real_size - GRUB_DISK_SECTOR_SIZE;
|
2009-06-10 21:04:23 +00:00
|
|
|
|
2008-08-21 13:18:07 +00:00
|
|
|
if (! allocate_pages (prot_size))
|
|
|
|
goto fail;
|
2009-06-10 21:04:23 +00:00
|
|
|
|
2008-08-21 13:18:07 +00:00
|
|
|
params = (struct linux_kernel_params *) real_mode_mem;
|
|
|
|
grub_memset (params, 0, GRUB_LINUX_CL_END_OFFSET);
|
|
|
|
grub_memcpy (¶ms->setup_sects, &lh.setup_sects, sizeof (lh) - 0x1F1);
|
|
|
|
|
|
|
|
params->ps_mouse = params->padding10 = 0;
|
|
|
|
|
|
|
|
len = 0x400 - sizeof (lh);
|
|
|
|
if (grub_file_read (file, (char *) real_mode_mem + sizeof (lh), len) != len)
|
|
|
|
{
|
|
|
|
grub_error (GRUB_ERR_FILE_READ_ERROR, "Couldn't read file");
|
|
|
|
goto fail;
|
|
|
|
}
|
|
|
|
|
|
|
|
params->type_of_loader = (LINUX_LOADER_ID_GRUB << 4);
|
|
|
|
|
2009-06-29 17:19:35 +00:00
|
|
|
/* These two are used (instead of cmd_line_ptr) by older versions of Linux,
|
|
|
|
and otherwise ignored. */
|
2008-08-21 13:18:07 +00:00
|
|
|
params->cl_magic = GRUB_LINUX_CL_MAGIC;
|
|
|
|
params->cl_offset = 0x1000;
|
2009-06-29 17:19:35 +00:00
|
|
|
|
2008-08-21 13:18:07 +00:00
|
|
|
params->cmd_line_ptr = (unsigned long) real_mode_mem + 0x1000;
|
|
|
|
params->ramdisk_image = 0;
|
|
|
|
params->ramdisk_size = 0;
|
|
|
|
|
|
|
|
params->heap_end_ptr = GRUB_LINUX_HEAP_END_OFFSET;
|
|
|
|
params->loadflags |= GRUB_LINUX_FLAG_CAN_USE_HEAP;
|
|
|
|
|
|
|
|
/* These are not needed to be precise, because Linux uses these values
|
|
|
|
only to raise an error when the decompression code cannot find good
|
|
|
|
space. */
|
|
|
|
params->ext_mem = ((32 * 0x100000) >> 10);
|
|
|
|
params->alt_mem = ((32 * 0x100000) >> 10);
|
2009-06-10 21:04:23 +00:00
|
|
|
|
2009-06-29 17:19:35 +00:00
|
|
|
/* Ignored by Linux. */
|
|
|
|
params->video_page = 0;
|
|
|
|
|
|
|
|
/* Must be non-zero even in text mode, or Linux will think there's no VGA. */
|
|
|
|
params->video_mode = 0x3;
|
|
|
|
|
|
|
|
/* Only used when `video_mode == 0x7', otherwise ignored. */
|
2008-08-21 13:18:07 +00:00
|
|
|
params->video_ega_bx = 0;
|
2009-06-29 17:19:35 +00:00
|
|
|
|
2008-08-21 13:18:07 +00:00
|
|
|
params->font_size = 16; /* XXX */
|
|
|
|
|
|
|
|
/* The other parameters are filled when booting. */
|
|
|
|
|
|
|
|
grub_file_seek (file, real_size + GRUB_DISK_SECTOR_SIZE);
|
|
|
|
|
|
|
|
grub_printf (" [Linux-bzImage, setup=0x%x, size=0x%x]\n",
|
|
|
|
(unsigned) real_size, (unsigned) prot_size);
|
|
|
|
|
2009-04-07 00:48:57 +00:00
|
|
|
/* Look for memory size and video mode specified on the command line. */
|
2008-08-21 13:18:07 +00:00
|
|
|
linux_mem_size = 0;
|
|
|
|
for (i = 1; i < argc; i++)
|
2009-05-04 18:40:33 +00:00
|
|
|
#ifdef GRUB_MACHINE_PCBIOS
|
2009-03-29 19:52:35 +00:00
|
|
|
if (grub_memcmp (argv[i], "vga=", 4) == 0)
|
|
|
|
{
|
|
|
|
/* Video mode selection support. */
|
|
|
|
char *val = argv[i] + 4;
|
2009-06-04 18:22:45 +00:00
|
|
|
unsigned vid_mode = GRUB_LINUX_VID_MODE_NORMAL;
|
|
|
|
struct linux_vesafb_mode *linux_mode;
|
|
|
|
grub_err_t err;
|
|
|
|
char *buf;
|
2009-03-29 19:52:35 +00:00
|
|
|
|
|
|
|
if (grub_strcmp (val, "normal") == 0)
|
|
|
|
vid_mode = GRUB_LINUX_VID_MODE_NORMAL;
|
|
|
|
else if (grub_strcmp (val, "ext") == 0)
|
|
|
|
vid_mode = GRUB_LINUX_VID_MODE_EXTENDED;
|
2009-04-07 00:48:57 +00:00
|
|
|
else if (grub_strcmp (val, "ask") == 0)
|
2009-04-13 14:38:10 +00:00
|
|
|
{
|
2009-05-02 15:24:28 +00:00
|
|
|
grub_printf ("Legacy `ask' parameter no longer supported.\n");
|
|
|
|
|
|
|
|
/* We usually would never do this in a loader, but "vga=ask" means user
|
|
|
|
requested interaction, so it can't hurt to request keyboard input. */
|
|
|
|
grub_wait_after_message ();
|
|
|
|
|
2009-04-13 14:38:10 +00:00
|
|
|
goto fail;
|
|
|
|
}
|
2009-03-29 19:52:35 +00:00
|
|
|
else
|
|
|
|
vid_mode = (grub_uint16_t) grub_strtoul (val, 0, 0);
|
|
|
|
|
2009-05-04 18:04:09 +00:00
|
|
|
switch (vid_mode)
|
|
|
|
{
|
|
|
|
case 0:
|
2009-06-04 18:22:45 +00:00
|
|
|
case GRUB_LINUX_VID_MODE_NORMAL:
|
|
|
|
grub_env_set ("gfxpayload", "text");
|
|
|
|
grub_printf ("%s is deprecated. "
|
|
|
|
"Use set gfxpayload=text before "
|
2009-06-10 21:04:23 +00:00
|
|
|
"linux command instead.\n",
|
|
|
|
argv[i]);
|
2009-05-04 18:04:09 +00:00
|
|
|
break;
|
2009-06-04 18:22:45 +00:00
|
|
|
|
2009-05-04 18:04:09 +00:00
|
|
|
case 1:
|
2009-06-04 18:22:45 +00:00
|
|
|
case GRUB_LINUX_VID_MODE_EXTENDED:
|
|
|
|
/* FIXME: support 80x50 text. */
|
|
|
|
grub_env_set ("gfxpayload", "text");
|
|
|
|
grub_printf ("%s is deprecated. "
|
|
|
|
"Use set gfxpayload=text before "
|
2009-06-10 21:04:23 +00:00
|
|
|
"linux command instead.\n",
|
|
|
|
argv[i]);
|
2009-05-04 18:04:09 +00:00
|
|
|
break;
|
|
|
|
default:
|
|
|
|
/* Ignore invalid values. */
|
|
|
|
if (vid_mode < GRUB_LINUX_VID_MODE_VESA_START ||
|
|
|
|
vid_mode >= GRUB_LINUX_VID_MODE_VESA_START +
|
|
|
|
ARRAY_SIZE (linux_vesafb_modes))
|
2009-06-04 18:22:45 +00:00
|
|
|
{
|
|
|
|
grub_env_set ("gfxpayload", "text");
|
|
|
|
grub_printf ("%s is deprecated. Mode %d isn't recognized. "
|
|
|
|
"Use set gfxpayload=WIDTHxHEIGHT[xDEPTH] before "
|
2009-06-10 21:04:23 +00:00
|
|
|
"linux command instead.\n",
|
|
|
|
argv[i], vid_mode);
|
2009-06-04 18:22:45 +00:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
2009-06-08 16:12:58 +00:00
|
|
|
buf = grub_malloc (sizeof ("WWWWxHHHHxDD;WWWWxHHHH"));
|
2009-06-04 18:22:45 +00:00
|
|
|
if (! buf)
|
|
|
|
goto fail;
|
2009-06-10 21:04:23 +00:00
|
|
|
|
|
|
|
linux_mode
|
2009-06-04 18:22:45 +00:00
|
|
|
= &linux_vesafb_modes[vid_mode - GRUB_LINUX_VID_MODE_VESA_START];
|
2009-06-10 21:04:23 +00:00
|
|
|
|
|
|
|
grub_sprintf (buf, "%ux%ux%u;%ux%u",
|
2009-06-04 18:22:45 +00:00
|
|
|
linux_vesafb_res[linux_mode->res_index].width,
|
|
|
|
linux_vesafb_res[linux_mode->res_index].height,
|
2009-06-08 16:12:58 +00:00
|
|
|
linux_mode->depth,
|
|
|
|
linux_vesafb_res[linux_mode->res_index].width,
|
|
|
|
linux_vesafb_res[linux_mode->res_index].height);
|
2009-06-04 18:22:45 +00:00
|
|
|
grub_printf ("%s is deprecated. "
|
|
|
|
"Use set gfxpayload=%s before "
|
2009-06-10 21:04:23 +00:00
|
|
|
"linux command instead.\n",
|
|
|
|
argv[i], buf);
|
2009-06-04 18:22:45 +00:00
|
|
|
err = grub_env_set ("gfxpayload", buf);
|
|
|
|
grub_free (buf);
|
|
|
|
if (err)
|
|
|
|
goto fail;
|
2009-05-04 18:04:09 +00:00
|
|
|
}
|
2009-03-29 19:52:35 +00:00
|
|
|
}
|
2009-05-04 18:59:12 +00:00
|
|
|
else
|
2009-05-04 18:40:33 +00:00
|
|
|
#endif /* GRUB_MACHINE_PCBIOS */
|
2009-05-04 18:59:12 +00:00
|
|
|
if (grub_memcmp (argv[i], "mem=", 4) == 0)
|
2008-08-21 13:18:07 +00:00
|
|
|
{
|
|
|
|
char *val = argv[i] + 4;
|
2009-06-10 21:04:23 +00:00
|
|
|
|
2008-08-21 13:18:07 +00:00
|
|
|
linux_mem_size = grub_strtoul (val, &val, 0);
|
2009-06-10 21:04:23 +00:00
|
|
|
|
2008-08-21 13:18:07 +00:00
|
|
|
if (grub_errno)
|
|
|
|
{
|
|
|
|
grub_errno = GRUB_ERR_NONE;
|
|
|
|
linux_mem_size = 0;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
int shift = 0;
|
2009-06-10 21:04:23 +00:00
|
|
|
|
2008-08-21 13:18:07 +00:00
|
|
|
switch (grub_tolower (val[0]))
|
|
|
|
{
|
|
|
|
case 'g':
|
|
|
|
shift += 10;
|
|
|
|
case 'm':
|
|
|
|
shift += 10;
|
|
|
|
case 'k':
|
|
|
|
shift += 10;
|
|
|
|
default:
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Check an overflow. */
|
|
|
|
if (linux_mem_size > (~0UL >> shift))
|
|
|
|
linux_mem_size = 0;
|
|
|
|
else
|
|
|
|
linux_mem_size <<= shift;
|
|
|
|
}
|
|
|
|
}
|
2009-06-29 12:20:56 +00:00
|
|
|
else if (grub_memcmp (argv[i], "quiet", sizeof ("quiet") - 1) == 0)
|
|
|
|
{
|
|
|
|
params->loadflags |= GRUB_LINUX_FLAG_QUIET;
|
|
|
|
}
|
|
|
|
|
2009-06-10 21:04:23 +00:00
|
|
|
|
2008-08-21 13:18:07 +00:00
|
|
|
/* Specify the boot file. */
|
|
|
|
dest = grub_stpcpy ((char *) real_mode_mem + GRUB_LINUX_CL_OFFSET,
|
|
|
|
"BOOT_IMAGE=");
|
|
|
|
dest = grub_stpcpy (dest, argv[0]);
|
2009-06-10 21:04:23 +00:00
|
|
|
|
2008-08-21 13:18:07 +00:00
|
|
|
/* Copy kernel parameters. */
|
|
|
|
for (i = 1;
|
|
|
|
i < argc
|
|
|
|
&& dest + grub_strlen (argv[i]) + 1 < ((char *) real_mode_mem
|
|
|
|
+ GRUB_LINUX_CL_END_OFFSET);
|
|
|
|
i++)
|
|
|
|
{
|
|
|
|
*dest++ = ' ';
|
|
|
|
dest = grub_stpcpy (dest, argv[i]);
|
|
|
|
}
|
|
|
|
|
|
|
|
len = prot_size;
|
2009-06-10 23:47:49 +00:00
|
|
|
if (grub_file_read (file, (void *) GRUB_LINUX_BZIMAGE_ADDR, len) != len)
|
2008-08-21 13:18:07 +00:00
|
|
|
grub_error (GRUB_ERR_FILE_READ_ERROR, "Couldn't read file");
|
|
|
|
|
|
|
|
if (grub_errno == GRUB_ERR_NONE)
|
|
|
|
{
|
2009-03-28 12:53:16 +00:00
|
|
|
grub_loader_set (grub_linux_boot, grub_linux_unload,
|
2009-03-18 10:21:28 +00:00
|
|
|
0 /* set noreturn=0 in order to avoid grub_console_fini() */);
|
2008-08-21 13:18:07 +00:00
|
|
|
loaded = 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
fail:
|
2009-06-10 21:04:23 +00:00
|
|
|
|
2008-08-21 13:18:07 +00:00
|
|
|
if (file)
|
|
|
|
grub_file_close (file);
|
|
|
|
|
|
|
|
if (grub_errno != GRUB_ERR_NONE)
|
|
|
|
{
|
|
|
|
grub_dl_unref (my_mod);
|
|
|
|
loaded = 0;
|
|
|
|
}
|
2009-03-21 Bean <bean123ch@gmail.com>
* commands/blocklist.c: Add include file <grub/command.h>, remove
<grub/normal.h> and <grub/arg.h>.
(grub_cmd_blocklist): Use the new command interface.
(GRUB_MOD_INIT): Likewise.
(GRUB_MOD_FINI): Likewise.
* commands/boot.c: Likewise.
* commands/cat.c: Likewise.
* commands/cmp.c: Likewise.
* commands/configfile.c: Likewise.
* commands/crc.c: Likewise.
* commands/echo.c: Likewise.
* commands/halt.c: Likewise.
* commands/handler.c: Likewise.
* commands/hdparm.c: Likewise.
* commands/help.c: Likewise.
* commands/hexdump.c: Likewise.
* commands/loadenv.c: Likewise.
* commands/ls.c: Likewise.
* commands/lsmmap.c: Likewise.
* commands/lspci.c: Likewise.
* commands/loadenv.c: Likewise.
* commands/read.c: Likewise.
* commands/reboot.c: Likewise.
* commands/search.c: Likewise.
* commands/sleep.c: Likewise.
* commands/test.c: Likewise.
* commands/usbtest.c: Likewise.
* commands/videotest.c: Likewise.
* commands/i386/cpuid.c: Likewise.
* commands/i386/pc/halt.c: Likewise.
* commands/i386/pc/play.c: Likewise.
* commands/i386/pc/pxecmd.c: Likewise.
* commands/i386/pc/vbeinfo.c: Likewise.
* commands/i386/pc/vbetest.c: Likewise.
* commands/ieee1275/suspend.c: Likewise.
* disk/loopback.c: Likewise.
* font/font_cmd.c: Likewise.
* hello/hello.c: Likewise.
* loader/efi/appleloader.c: Likewise.
* loader/efi/chainloader.c: Likewise.
* loader/i386/bsd.c: Likewise.
* loader/i386/efi/linux.c: Likewise.
* loader/i386/ieee1275/linux.c: Likewise.
* loader/i386/linux.c: Likewise.
* loader/i386/pc/chainloader.c: Likewise.
* loader/i386/pc/linux.c: Likewise.
* loader/powerpc/ieee1275/linux.c: Likewise.
* loader/multiboot_loader.c: Likewise.
* term/gfxterm.c: Likewise.
* term/i386/pc/serial.c: Likewise.
* term/terminfo.c: Likewise.
* term/i386/pc/vesafb.c: Removed <grub/arg.h>.
* term/i386/pc/vga.c: Likewise.
* video/readers/jpeg.c: Likewise.
* video/readers/png.c: Likewise.
* video/readers/tga.c: Likewise.
* util/grub-fstest (cmd_loopback): Removed.
(cmd_blocklist): Likewise.
(cmd_ls): Likewise.
(grub_register_command): Likewise.
(grub_unregister_command): Likewise.
(execute_command): Use grub_command_find to locate command and execute
it.
* include/grub/efi/chainloader.h: Removed.
* loader/efi/chainloader_normal.c: Likewise.
* loader/i386/bsd_normal.c: Likewise.
* loader/i386/pc/chainloader_normal.c: Likewise.
* loader/i386/pc/multiboot_normal.c: Likewise.
* loader/linux_normal.c: Likewise.
* loader/multiboot_loader_normal.c: Likewise.
* loader/powerpc/ieee1275/linux_normal.c: Likewise.
* gencmdlist.sh: Scan new registration command grub_register_extcmd
and grub_register_command_p1.
* conf/common.rmk (grub_fstest_SOURCES): Add kern/list.c,
kern/command.c, lib/arg.c and commands/extcmd.c.
(pkglib_MODULES): Remove boot.mod, and minicmd.mod and extcmd.mod.
(minicmd_mod_SOURCES): New variable.
(minicmd_mod_CFLAGS): Likewise.
(minicmd_mod_LDFLAGS): Likewise.
(extcmd_mod_SOURCES): Likewise.
(extcmd_mod_CFLAGS): Likewise.
(extcmd_mod_LDFLAGS): Likewise.
(boot_mod_SOURCES): Removed.
(boot_mod_CFLAGS): Likewise.
(boot_mod_LDFLAGS): Likewise.
* conf/i386-pc.rmk (kernel_img_SOURCES): Add kern/command.c and
kern/corecmd.c.
(kernel_img_HEADERS): Add command.h.
(grub_emu_SOURCES): Remove commands/boot.c and normal/arg.c, add
commands/minicmd.c, kern/command.c, kern/corecmd.c, commands/extcmd.c
and lib/arg.c.
(pkglib_MODULES): Change _linux.mod, _chain.mod, _bsd.mod and
_multiboot.mod as linux.mod, chain.mod, bsd.mod and multiboot.mod,
remove the corresponding normal mode command.
(normal_mod_SOURCES): Remove normal/arg.c.
* conf/i386-coreboot.rmk: Likewise.
* conf/i386-efi.rmk: Likewise.
* conf/i386-ieee1275.rmk: Likewise.
* conf/powerpc-ieee1275.rmk: Likewise.
* conf/x86_64-efi.rmk: Likewise.
* include/grub/arg.h: Move from here ...
* include/grub/lib/arg.h: ... to here.
* normal/arg.c: Move from here ...
* lib/arg.c: ... to here.
* commands/extcmd.c: New file.
* commands/minicmd.c: Likewise.
* include/grub/command.h: Likewise.
* include/grub/extcmd.h: Likewise.
* kern/command.c: Likewise.
* kern/corecmd.c: Likewise.
* kern/list.c (grub_list_iterate): Return int instead of void.
(grub_list_insert): New function.
(grub_prio_list_insert): Likewise.
* kern/rescue.c (grub_rescue_command): Removed.
(grub_rescue_command_list): Likewise.
(grub_rescue_register_command): Likewise.
(grub_rescue_unregister_command): Likewise.
(grub_rescue_cmd_boot): Move to minicmd.c
(grub_rescue_cmd_help): Likewise.
(grub_rescue_cmd_info): Likewise.
(grub_rescue_cmd_boot): Likewise.
(grub_rescue_cmd_testload): Likewise.
(grub_rescue_cmd_dump): Likewise.
(grub_rescue_cmd_rmmod): Likewise.
(grub_rescue_cmd_lsmod): Likewise.
(grub_rescue_cmd_exit): Likewise.
(grub_rescue_print_devices): Moved to corecmd.c.
(grub_rescue_print_files): Likewise.
(grub_rescue_cmd_ls): Likewise.
(grub_rescue_cmd_insmod): Likewise.
(grub_rescue_cmd_set): Likewise.
(grub_rescue_cmd_unset): Likewise.
(attemp_normal_mode): Use grub_command_find to get normal module.
(grub_enter_rescue_mode): Use grub_register_core_commands to register
commands, remove grub_rescue_regiter_command calls.
* normal/command.c (grub_regiser_command): Removed.
(grub_unregister_command): Likewise.
(grub_command_find): Likewise.
(grub_iterate_commands): Likewise.
(rescue_command): Likewise.
(export_command): Moved to corecmd.c.
(set_command): Removed.
(unset_command): Likewise.
(insmod_command): Likewise.
(rmmod_command): Likewise.
(lsmod_command): Likewise.
(grub_command_init): Likewise.
* normal/completion.c (iterate_command): Use cmd->prio to check for
active command.
(complete_arguments): Use grub_extcmd_t structure to find options.
(grub_normal_do_completion): Change function grub_iterate_commands to
grub_command_iterate.
* normal/execute.c (grub_script_execute_cmd): No need to parse
argument here.
* normal/main.c (grub_dyncmd_dispatcher): New function.
(read_command_list): Register unload commands as dyncmd.
(grub_cmd_normal): Use new command interface, register rescue,
unregister normal at entry, register normal, unregister rescue at exit.
* include/grub/list.h (grub_list_test_t): New type.
(grub_list_iterate): Return int instead of void.
(grub_list_insert): New function.
(GRUB_AS_NAMED_LIST_P): New macro.
(GRUB_AS_PRIO_LIST): Likewise.
(GRUB_AS_PRIO_LIST_P): Likewise.
(GRUB_PRIO_LIST_PRIO_MASK): New constant.
(GRUB_PRIO_LIST_FLAG_ACTIVE): Likewise.
(grub_prio_list): New structure.
(grub_prio_list_insert): New function.
(grub_prio_list_remove): New inline function.
* include/grub/normal.h: Remove <grub/arg.h>, add <grub/command.h>.
(GRUB_COMMAND_FLAG_CMDLINE): Moved to command.h.
(GRUB_COMMAND_FLAG_MENU): Likewise.
(GRUB_COMMAND_FLAG_BOTH): Likewise.
(GRUB_COMMAND_FLAG_TITLE): Likewise.
(GRUB_COMMAND_FLAG_NO_ECHO): Likewise.
(GRUB_COMMAND_FLAG_NO_ARG_PARSE): Removed.
(GRUB_COMMAND_FLAG_NOT_LOADED): Likewise.
(grub_command): Likewise.
(grub_register_command): Likewise.
(grub_command_find): Likewise.
(grub_iterate_commands): Likewise.
(grub_command_init): Likewise.
(grub_arg_parse): Likewise.
(grub_arg_show_help): Likewise.
* include/grub/rescue.h (grub_rescue_register_command): Removed.
(grub_rescue_unregister_command): Likewise.
* include/grub/i386/bsd.h: Remove grub_rescue_cmd_freebsd,
grub_rescue_cmd_openbsd, grub_rescue_cmd_netbsd,
grub_rescue_cmd_freebsd_loadenv and grub_rescue_cmd_freebsd_module.
* include/grub/i386/efi/loader.h: Remove grub_rescue_cmd_linux and
grub_rescue_cmd_initrd.
* include/grub/i386/loader.h: Likewise.
* include/grub/x86_64/loader.h: Likewise.
* include/grub/i386/pc/chainloader.h: Remove grub_chainloader_cmd.
2009-03-21 08:39:59 +00:00
|
|
|
|
|
|
|
return grub_errno;
|
2008-08-21 13:18:07 +00:00
|
|
|
}
|
|
|
|
|
2009-03-21 Bean <bean123ch@gmail.com>
* commands/blocklist.c: Add include file <grub/command.h>, remove
<grub/normal.h> and <grub/arg.h>.
(grub_cmd_blocklist): Use the new command interface.
(GRUB_MOD_INIT): Likewise.
(GRUB_MOD_FINI): Likewise.
* commands/boot.c: Likewise.
* commands/cat.c: Likewise.
* commands/cmp.c: Likewise.
* commands/configfile.c: Likewise.
* commands/crc.c: Likewise.
* commands/echo.c: Likewise.
* commands/halt.c: Likewise.
* commands/handler.c: Likewise.
* commands/hdparm.c: Likewise.
* commands/help.c: Likewise.
* commands/hexdump.c: Likewise.
* commands/loadenv.c: Likewise.
* commands/ls.c: Likewise.
* commands/lsmmap.c: Likewise.
* commands/lspci.c: Likewise.
* commands/loadenv.c: Likewise.
* commands/read.c: Likewise.
* commands/reboot.c: Likewise.
* commands/search.c: Likewise.
* commands/sleep.c: Likewise.
* commands/test.c: Likewise.
* commands/usbtest.c: Likewise.
* commands/videotest.c: Likewise.
* commands/i386/cpuid.c: Likewise.
* commands/i386/pc/halt.c: Likewise.
* commands/i386/pc/play.c: Likewise.
* commands/i386/pc/pxecmd.c: Likewise.
* commands/i386/pc/vbeinfo.c: Likewise.
* commands/i386/pc/vbetest.c: Likewise.
* commands/ieee1275/suspend.c: Likewise.
* disk/loopback.c: Likewise.
* font/font_cmd.c: Likewise.
* hello/hello.c: Likewise.
* loader/efi/appleloader.c: Likewise.
* loader/efi/chainloader.c: Likewise.
* loader/i386/bsd.c: Likewise.
* loader/i386/efi/linux.c: Likewise.
* loader/i386/ieee1275/linux.c: Likewise.
* loader/i386/linux.c: Likewise.
* loader/i386/pc/chainloader.c: Likewise.
* loader/i386/pc/linux.c: Likewise.
* loader/powerpc/ieee1275/linux.c: Likewise.
* loader/multiboot_loader.c: Likewise.
* term/gfxterm.c: Likewise.
* term/i386/pc/serial.c: Likewise.
* term/terminfo.c: Likewise.
* term/i386/pc/vesafb.c: Removed <grub/arg.h>.
* term/i386/pc/vga.c: Likewise.
* video/readers/jpeg.c: Likewise.
* video/readers/png.c: Likewise.
* video/readers/tga.c: Likewise.
* util/grub-fstest (cmd_loopback): Removed.
(cmd_blocklist): Likewise.
(cmd_ls): Likewise.
(grub_register_command): Likewise.
(grub_unregister_command): Likewise.
(execute_command): Use grub_command_find to locate command and execute
it.
* include/grub/efi/chainloader.h: Removed.
* loader/efi/chainloader_normal.c: Likewise.
* loader/i386/bsd_normal.c: Likewise.
* loader/i386/pc/chainloader_normal.c: Likewise.
* loader/i386/pc/multiboot_normal.c: Likewise.
* loader/linux_normal.c: Likewise.
* loader/multiboot_loader_normal.c: Likewise.
* loader/powerpc/ieee1275/linux_normal.c: Likewise.
* gencmdlist.sh: Scan new registration command grub_register_extcmd
and grub_register_command_p1.
* conf/common.rmk (grub_fstest_SOURCES): Add kern/list.c,
kern/command.c, lib/arg.c and commands/extcmd.c.
(pkglib_MODULES): Remove boot.mod, and minicmd.mod and extcmd.mod.
(minicmd_mod_SOURCES): New variable.
(minicmd_mod_CFLAGS): Likewise.
(minicmd_mod_LDFLAGS): Likewise.
(extcmd_mod_SOURCES): Likewise.
(extcmd_mod_CFLAGS): Likewise.
(extcmd_mod_LDFLAGS): Likewise.
(boot_mod_SOURCES): Removed.
(boot_mod_CFLAGS): Likewise.
(boot_mod_LDFLAGS): Likewise.
* conf/i386-pc.rmk (kernel_img_SOURCES): Add kern/command.c and
kern/corecmd.c.
(kernel_img_HEADERS): Add command.h.
(grub_emu_SOURCES): Remove commands/boot.c and normal/arg.c, add
commands/minicmd.c, kern/command.c, kern/corecmd.c, commands/extcmd.c
and lib/arg.c.
(pkglib_MODULES): Change _linux.mod, _chain.mod, _bsd.mod and
_multiboot.mod as linux.mod, chain.mod, bsd.mod and multiboot.mod,
remove the corresponding normal mode command.
(normal_mod_SOURCES): Remove normal/arg.c.
* conf/i386-coreboot.rmk: Likewise.
* conf/i386-efi.rmk: Likewise.
* conf/i386-ieee1275.rmk: Likewise.
* conf/powerpc-ieee1275.rmk: Likewise.
* conf/x86_64-efi.rmk: Likewise.
* include/grub/arg.h: Move from here ...
* include/grub/lib/arg.h: ... to here.
* normal/arg.c: Move from here ...
* lib/arg.c: ... to here.
* commands/extcmd.c: New file.
* commands/minicmd.c: Likewise.
* include/grub/command.h: Likewise.
* include/grub/extcmd.h: Likewise.
* kern/command.c: Likewise.
* kern/corecmd.c: Likewise.
* kern/list.c (grub_list_iterate): Return int instead of void.
(grub_list_insert): New function.
(grub_prio_list_insert): Likewise.
* kern/rescue.c (grub_rescue_command): Removed.
(grub_rescue_command_list): Likewise.
(grub_rescue_register_command): Likewise.
(grub_rescue_unregister_command): Likewise.
(grub_rescue_cmd_boot): Move to minicmd.c
(grub_rescue_cmd_help): Likewise.
(grub_rescue_cmd_info): Likewise.
(grub_rescue_cmd_boot): Likewise.
(grub_rescue_cmd_testload): Likewise.
(grub_rescue_cmd_dump): Likewise.
(grub_rescue_cmd_rmmod): Likewise.
(grub_rescue_cmd_lsmod): Likewise.
(grub_rescue_cmd_exit): Likewise.
(grub_rescue_print_devices): Moved to corecmd.c.
(grub_rescue_print_files): Likewise.
(grub_rescue_cmd_ls): Likewise.
(grub_rescue_cmd_insmod): Likewise.
(grub_rescue_cmd_set): Likewise.
(grub_rescue_cmd_unset): Likewise.
(attemp_normal_mode): Use grub_command_find to get normal module.
(grub_enter_rescue_mode): Use grub_register_core_commands to register
commands, remove grub_rescue_regiter_command calls.
* normal/command.c (grub_regiser_command): Removed.
(grub_unregister_command): Likewise.
(grub_command_find): Likewise.
(grub_iterate_commands): Likewise.
(rescue_command): Likewise.
(export_command): Moved to corecmd.c.
(set_command): Removed.
(unset_command): Likewise.
(insmod_command): Likewise.
(rmmod_command): Likewise.
(lsmod_command): Likewise.
(grub_command_init): Likewise.
* normal/completion.c (iterate_command): Use cmd->prio to check for
active command.
(complete_arguments): Use grub_extcmd_t structure to find options.
(grub_normal_do_completion): Change function grub_iterate_commands to
grub_command_iterate.
* normal/execute.c (grub_script_execute_cmd): No need to parse
argument here.
* normal/main.c (grub_dyncmd_dispatcher): New function.
(read_command_list): Register unload commands as dyncmd.
(grub_cmd_normal): Use new command interface, register rescue,
unregister normal at entry, register normal, unregister rescue at exit.
* include/grub/list.h (grub_list_test_t): New type.
(grub_list_iterate): Return int instead of void.
(grub_list_insert): New function.
(GRUB_AS_NAMED_LIST_P): New macro.
(GRUB_AS_PRIO_LIST): Likewise.
(GRUB_AS_PRIO_LIST_P): Likewise.
(GRUB_PRIO_LIST_PRIO_MASK): New constant.
(GRUB_PRIO_LIST_FLAG_ACTIVE): Likewise.
(grub_prio_list): New structure.
(grub_prio_list_insert): New function.
(grub_prio_list_remove): New inline function.
* include/grub/normal.h: Remove <grub/arg.h>, add <grub/command.h>.
(GRUB_COMMAND_FLAG_CMDLINE): Moved to command.h.
(GRUB_COMMAND_FLAG_MENU): Likewise.
(GRUB_COMMAND_FLAG_BOTH): Likewise.
(GRUB_COMMAND_FLAG_TITLE): Likewise.
(GRUB_COMMAND_FLAG_NO_ECHO): Likewise.
(GRUB_COMMAND_FLAG_NO_ARG_PARSE): Removed.
(GRUB_COMMAND_FLAG_NOT_LOADED): Likewise.
(grub_command): Likewise.
(grub_register_command): Likewise.
(grub_command_find): Likewise.
(grub_iterate_commands): Likewise.
(grub_command_init): Likewise.
(grub_arg_parse): Likewise.
(grub_arg_show_help): Likewise.
* include/grub/rescue.h (grub_rescue_register_command): Removed.
(grub_rescue_unregister_command): Likewise.
* include/grub/i386/bsd.h: Remove grub_rescue_cmd_freebsd,
grub_rescue_cmd_openbsd, grub_rescue_cmd_netbsd,
grub_rescue_cmd_freebsd_loadenv and grub_rescue_cmd_freebsd_module.
* include/grub/i386/efi/loader.h: Remove grub_rescue_cmd_linux and
grub_rescue_cmd_initrd.
* include/grub/i386/loader.h: Likewise.
* include/grub/x86_64/loader.h: Likewise.
* include/grub/i386/pc/chainloader.h: Remove grub_chainloader_cmd.
2009-03-21 08:39:59 +00:00
|
|
|
static grub_err_t
|
|
|
|
grub_cmd_initrd (grub_command_t cmd __attribute__ ((unused)),
|
|
|
|
int argc, char *argv[])
|
2008-08-21 13:18:07 +00:00
|
|
|
{
|
|
|
|
grub_file_t file = 0;
|
|
|
|
grub_ssize_t size;
|
|
|
|
grub_addr_t addr_min, addr_max;
|
|
|
|
grub_addr_t addr;
|
|
|
|
struct linux_kernel_header *lh;
|
2009-06-10 21:04:23 +00:00
|
|
|
|
2008-08-21 13:18:07 +00:00
|
|
|
if (argc == 0)
|
|
|
|
{
|
|
|
|
grub_error (GRUB_ERR_BAD_ARGUMENT, "No module specified");
|
|
|
|
goto fail;
|
|
|
|
}
|
2009-06-10 21:04:23 +00:00
|
|
|
|
2008-08-21 13:18:07 +00:00
|
|
|
if (! loaded)
|
|
|
|
{
|
|
|
|
grub_error (GRUB_ERR_BAD_ARGUMENT, "You need to load the kernel first.");
|
|
|
|
goto fail;
|
|
|
|
}
|
|
|
|
|
|
|
|
file = grub_file_open (argv[0]);
|
|
|
|
if (! file)
|
|
|
|
goto fail;
|
|
|
|
|
|
|
|
size = grub_file_size (file);
|
|
|
|
initrd_pages = (page_align (size) >> 12);
|
|
|
|
|
|
|
|
lh = (struct linux_kernel_header *) real_mode_mem;
|
2008-11-19 12:11:44 +00:00
|
|
|
|
|
|
|
/* Get the highest address available for the initrd. */
|
|
|
|
if (grub_le_to_cpu16 (lh->version) >= 0x0203)
|
|
|
|
{
|
|
|
|
addr_max = grub_cpu_to_le32 (lh->initrd_addr_max);
|
|
|
|
|
|
|
|
/* XXX in reality, Linux specifies a bogus value, so
|
|
|
|
it is necessary to make sure that ADDR_MAX does not exceed
|
|
|
|
0x3fffffff. */
|
|
|
|
if (addr_max > GRUB_LINUX_INITRD_MAX_ADDRESS)
|
|
|
|
addr_max = GRUB_LINUX_INITRD_MAX_ADDRESS;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
addr_max = GRUB_LINUX_INITRD_MAX_ADDRESS;
|
2009-06-10 21:04:23 +00:00
|
|
|
|
2008-08-21 13:18:07 +00:00
|
|
|
if (linux_mem_size != 0 && linux_mem_size < addr_max)
|
|
|
|
addr_max = linux_mem_size;
|
2009-06-10 21:04:23 +00:00
|
|
|
|
2008-08-21 13:18:07 +00:00
|
|
|
/* Linux 2.3.xx has a bug in the memory range check, so avoid
|
|
|
|
the last page.
|
|
|
|
Linux 2.2.xx has a bug in the memory range check, which is
|
|
|
|
worse than that of Linux 2.3.xx, so avoid the last 64kb. */
|
|
|
|
addr_max -= 0x10000;
|
|
|
|
|
|
|
|
/* Usually, the compression ratio is about 50%. */
|
|
|
|
addr_min = (grub_addr_t) prot_mode_mem + ((prot_mode_pages * 3) << 12)
|
|
|
|
+ page_align (size);
|
2009-06-10 21:04:23 +00:00
|
|
|
|
2008-11-19 12:11:44 +00:00
|
|
|
if (addr_max > grub_os_area_addr + grub_os_area_size)
|
|
|
|
addr_max = grub_os_area_addr + grub_os_area_size;
|
|
|
|
|
|
|
|
/* Put the initrd as high as possible, 4KiB aligned. */
|
|
|
|
addr = (addr_max - size) & ~0xFFF;
|
2008-08-21 13:18:07 +00:00
|
|
|
|
2008-11-19 12:11:44 +00:00
|
|
|
if (addr < addr_min)
|
2008-08-21 13:18:07 +00:00
|
|
|
{
|
2008-11-19 12:11:44 +00:00
|
|
|
grub_error (GRUB_ERR_OUT_OF_RANGE, "The initrd is too big");
|
2008-08-21 13:18:07 +00:00
|
|
|
goto fail;
|
|
|
|
}
|
2009-06-10 21:04:23 +00:00
|
|
|
|
2008-08-21 13:18:07 +00:00
|
|
|
initrd_mem = (void *) addr;
|
2009-06-10 21:04:23 +00:00
|
|
|
|
2008-08-21 13:18:07 +00:00
|
|
|
if (grub_file_read (file, initrd_mem, size) != size)
|
|
|
|
{
|
|
|
|
grub_error (GRUB_ERR_FILE_READ_ERROR, "Couldn't read file");
|
|
|
|
goto fail;
|
|
|
|
}
|
|
|
|
|
|
|
|
grub_printf (" [Initrd, addr=0x%x, size=0x%x]\n",
|
|
|
|
(unsigned) addr, (unsigned) size);
|
2009-06-10 21:04:23 +00:00
|
|
|
|
2008-08-21 13:18:07 +00:00
|
|
|
lh->ramdisk_image = addr;
|
|
|
|
lh->ramdisk_size = size;
|
|
|
|
lh->root_dev = 0x0100; /* XXX */
|
2009-06-10 21:04:23 +00:00
|
|
|
|
2008-08-21 13:18:07 +00:00
|
|
|
fail:
|
|
|
|
if (file)
|
|
|
|
grub_file_close (file);
|
2009-03-21 Bean <bean123ch@gmail.com>
* commands/blocklist.c: Add include file <grub/command.h>, remove
<grub/normal.h> and <grub/arg.h>.
(grub_cmd_blocklist): Use the new command interface.
(GRUB_MOD_INIT): Likewise.
(GRUB_MOD_FINI): Likewise.
* commands/boot.c: Likewise.
* commands/cat.c: Likewise.
* commands/cmp.c: Likewise.
* commands/configfile.c: Likewise.
* commands/crc.c: Likewise.
* commands/echo.c: Likewise.
* commands/halt.c: Likewise.
* commands/handler.c: Likewise.
* commands/hdparm.c: Likewise.
* commands/help.c: Likewise.
* commands/hexdump.c: Likewise.
* commands/loadenv.c: Likewise.
* commands/ls.c: Likewise.
* commands/lsmmap.c: Likewise.
* commands/lspci.c: Likewise.
* commands/loadenv.c: Likewise.
* commands/read.c: Likewise.
* commands/reboot.c: Likewise.
* commands/search.c: Likewise.
* commands/sleep.c: Likewise.
* commands/test.c: Likewise.
* commands/usbtest.c: Likewise.
* commands/videotest.c: Likewise.
* commands/i386/cpuid.c: Likewise.
* commands/i386/pc/halt.c: Likewise.
* commands/i386/pc/play.c: Likewise.
* commands/i386/pc/pxecmd.c: Likewise.
* commands/i386/pc/vbeinfo.c: Likewise.
* commands/i386/pc/vbetest.c: Likewise.
* commands/ieee1275/suspend.c: Likewise.
* disk/loopback.c: Likewise.
* font/font_cmd.c: Likewise.
* hello/hello.c: Likewise.
* loader/efi/appleloader.c: Likewise.
* loader/efi/chainloader.c: Likewise.
* loader/i386/bsd.c: Likewise.
* loader/i386/efi/linux.c: Likewise.
* loader/i386/ieee1275/linux.c: Likewise.
* loader/i386/linux.c: Likewise.
* loader/i386/pc/chainloader.c: Likewise.
* loader/i386/pc/linux.c: Likewise.
* loader/powerpc/ieee1275/linux.c: Likewise.
* loader/multiboot_loader.c: Likewise.
* term/gfxterm.c: Likewise.
* term/i386/pc/serial.c: Likewise.
* term/terminfo.c: Likewise.
* term/i386/pc/vesafb.c: Removed <grub/arg.h>.
* term/i386/pc/vga.c: Likewise.
* video/readers/jpeg.c: Likewise.
* video/readers/png.c: Likewise.
* video/readers/tga.c: Likewise.
* util/grub-fstest (cmd_loopback): Removed.
(cmd_blocklist): Likewise.
(cmd_ls): Likewise.
(grub_register_command): Likewise.
(grub_unregister_command): Likewise.
(execute_command): Use grub_command_find to locate command and execute
it.
* include/grub/efi/chainloader.h: Removed.
* loader/efi/chainloader_normal.c: Likewise.
* loader/i386/bsd_normal.c: Likewise.
* loader/i386/pc/chainloader_normal.c: Likewise.
* loader/i386/pc/multiboot_normal.c: Likewise.
* loader/linux_normal.c: Likewise.
* loader/multiboot_loader_normal.c: Likewise.
* loader/powerpc/ieee1275/linux_normal.c: Likewise.
* gencmdlist.sh: Scan new registration command grub_register_extcmd
and grub_register_command_p1.
* conf/common.rmk (grub_fstest_SOURCES): Add kern/list.c,
kern/command.c, lib/arg.c and commands/extcmd.c.
(pkglib_MODULES): Remove boot.mod, and minicmd.mod and extcmd.mod.
(minicmd_mod_SOURCES): New variable.
(minicmd_mod_CFLAGS): Likewise.
(minicmd_mod_LDFLAGS): Likewise.
(extcmd_mod_SOURCES): Likewise.
(extcmd_mod_CFLAGS): Likewise.
(extcmd_mod_LDFLAGS): Likewise.
(boot_mod_SOURCES): Removed.
(boot_mod_CFLAGS): Likewise.
(boot_mod_LDFLAGS): Likewise.
* conf/i386-pc.rmk (kernel_img_SOURCES): Add kern/command.c and
kern/corecmd.c.
(kernel_img_HEADERS): Add command.h.
(grub_emu_SOURCES): Remove commands/boot.c and normal/arg.c, add
commands/minicmd.c, kern/command.c, kern/corecmd.c, commands/extcmd.c
and lib/arg.c.
(pkglib_MODULES): Change _linux.mod, _chain.mod, _bsd.mod and
_multiboot.mod as linux.mod, chain.mod, bsd.mod and multiboot.mod,
remove the corresponding normal mode command.
(normal_mod_SOURCES): Remove normal/arg.c.
* conf/i386-coreboot.rmk: Likewise.
* conf/i386-efi.rmk: Likewise.
* conf/i386-ieee1275.rmk: Likewise.
* conf/powerpc-ieee1275.rmk: Likewise.
* conf/x86_64-efi.rmk: Likewise.
* include/grub/arg.h: Move from here ...
* include/grub/lib/arg.h: ... to here.
* normal/arg.c: Move from here ...
* lib/arg.c: ... to here.
* commands/extcmd.c: New file.
* commands/minicmd.c: Likewise.
* include/grub/command.h: Likewise.
* include/grub/extcmd.h: Likewise.
* kern/command.c: Likewise.
* kern/corecmd.c: Likewise.
* kern/list.c (grub_list_iterate): Return int instead of void.
(grub_list_insert): New function.
(grub_prio_list_insert): Likewise.
* kern/rescue.c (grub_rescue_command): Removed.
(grub_rescue_command_list): Likewise.
(grub_rescue_register_command): Likewise.
(grub_rescue_unregister_command): Likewise.
(grub_rescue_cmd_boot): Move to minicmd.c
(grub_rescue_cmd_help): Likewise.
(grub_rescue_cmd_info): Likewise.
(grub_rescue_cmd_boot): Likewise.
(grub_rescue_cmd_testload): Likewise.
(grub_rescue_cmd_dump): Likewise.
(grub_rescue_cmd_rmmod): Likewise.
(grub_rescue_cmd_lsmod): Likewise.
(grub_rescue_cmd_exit): Likewise.
(grub_rescue_print_devices): Moved to corecmd.c.
(grub_rescue_print_files): Likewise.
(grub_rescue_cmd_ls): Likewise.
(grub_rescue_cmd_insmod): Likewise.
(grub_rescue_cmd_set): Likewise.
(grub_rescue_cmd_unset): Likewise.
(attemp_normal_mode): Use grub_command_find to get normal module.
(grub_enter_rescue_mode): Use grub_register_core_commands to register
commands, remove grub_rescue_regiter_command calls.
* normal/command.c (grub_regiser_command): Removed.
(grub_unregister_command): Likewise.
(grub_command_find): Likewise.
(grub_iterate_commands): Likewise.
(rescue_command): Likewise.
(export_command): Moved to corecmd.c.
(set_command): Removed.
(unset_command): Likewise.
(insmod_command): Likewise.
(rmmod_command): Likewise.
(lsmod_command): Likewise.
(grub_command_init): Likewise.
* normal/completion.c (iterate_command): Use cmd->prio to check for
active command.
(complete_arguments): Use grub_extcmd_t structure to find options.
(grub_normal_do_completion): Change function grub_iterate_commands to
grub_command_iterate.
* normal/execute.c (grub_script_execute_cmd): No need to parse
argument here.
* normal/main.c (grub_dyncmd_dispatcher): New function.
(read_command_list): Register unload commands as dyncmd.
(grub_cmd_normal): Use new command interface, register rescue,
unregister normal at entry, register normal, unregister rescue at exit.
* include/grub/list.h (grub_list_test_t): New type.
(grub_list_iterate): Return int instead of void.
(grub_list_insert): New function.
(GRUB_AS_NAMED_LIST_P): New macro.
(GRUB_AS_PRIO_LIST): Likewise.
(GRUB_AS_PRIO_LIST_P): Likewise.
(GRUB_PRIO_LIST_PRIO_MASK): New constant.
(GRUB_PRIO_LIST_FLAG_ACTIVE): Likewise.
(grub_prio_list): New structure.
(grub_prio_list_insert): New function.
(grub_prio_list_remove): New inline function.
* include/grub/normal.h: Remove <grub/arg.h>, add <grub/command.h>.
(GRUB_COMMAND_FLAG_CMDLINE): Moved to command.h.
(GRUB_COMMAND_FLAG_MENU): Likewise.
(GRUB_COMMAND_FLAG_BOTH): Likewise.
(GRUB_COMMAND_FLAG_TITLE): Likewise.
(GRUB_COMMAND_FLAG_NO_ECHO): Likewise.
(GRUB_COMMAND_FLAG_NO_ARG_PARSE): Removed.
(GRUB_COMMAND_FLAG_NOT_LOADED): Likewise.
(grub_command): Likewise.
(grub_register_command): Likewise.
(grub_command_find): Likewise.
(grub_iterate_commands): Likewise.
(grub_command_init): Likewise.
(grub_arg_parse): Likewise.
(grub_arg_show_help): Likewise.
* include/grub/rescue.h (grub_rescue_register_command): Removed.
(grub_rescue_unregister_command): Likewise.
* include/grub/i386/bsd.h: Remove grub_rescue_cmd_freebsd,
grub_rescue_cmd_openbsd, grub_rescue_cmd_netbsd,
grub_rescue_cmd_freebsd_loadenv and grub_rescue_cmd_freebsd_module.
* include/grub/i386/efi/loader.h: Remove grub_rescue_cmd_linux and
grub_rescue_cmd_initrd.
* include/grub/i386/loader.h: Likewise.
* include/grub/x86_64/loader.h: Likewise.
* include/grub/i386/pc/chainloader.h: Remove grub_chainloader_cmd.
2009-03-21 08:39:59 +00:00
|
|
|
|
|
|
|
return grub_errno;
|
2008-08-21 13:18:07 +00:00
|
|
|
}
|
|
|
|
|
2009-03-21 Bean <bean123ch@gmail.com>
* commands/blocklist.c: Add include file <grub/command.h>, remove
<grub/normal.h> and <grub/arg.h>.
(grub_cmd_blocklist): Use the new command interface.
(GRUB_MOD_INIT): Likewise.
(GRUB_MOD_FINI): Likewise.
* commands/boot.c: Likewise.
* commands/cat.c: Likewise.
* commands/cmp.c: Likewise.
* commands/configfile.c: Likewise.
* commands/crc.c: Likewise.
* commands/echo.c: Likewise.
* commands/halt.c: Likewise.
* commands/handler.c: Likewise.
* commands/hdparm.c: Likewise.
* commands/help.c: Likewise.
* commands/hexdump.c: Likewise.
* commands/loadenv.c: Likewise.
* commands/ls.c: Likewise.
* commands/lsmmap.c: Likewise.
* commands/lspci.c: Likewise.
* commands/loadenv.c: Likewise.
* commands/read.c: Likewise.
* commands/reboot.c: Likewise.
* commands/search.c: Likewise.
* commands/sleep.c: Likewise.
* commands/test.c: Likewise.
* commands/usbtest.c: Likewise.
* commands/videotest.c: Likewise.
* commands/i386/cpuid.c: Likewise.
* commands/i386/pc/halt.c: Likewise.
* commands/i386/pc/play.c: Likewise.
* commands/i386/pc/pxecmd.c: Likewise.
* commands/i386/pc/vbeinfo.c: Likewise.
* commands/i386/pc/vbetest.c: Likewise.
* commands/ieee1275/suspend.c: Likewise.
* disk/loopback.c: Likewise.
* font/font_cmd.c: Likewise.
* hello/hello.c: Likewise.
* loader/efi/appleloader.c: Likewise.
* loader/efi/chainloader.c: Likewise.
* loader/i386/bsd.c: Likewise.
* loader/i386/efi/linux.c: Likewise.
* loader/i386/ieee1275/linux.c: Likewise.
* loader/i386/linux.c: Likewise.
* loader/i386/pc/chainloader.c: Likewise.
* loader/i386/pc/linux.c: Likewise.
* loader/powerpc/ieee1275/linux.c: Likewise.
* loader/multiboot_loader.c: Likewise.
* term/gfxterm.c: Likewise.
* term/i386/pc/serial.c: Likewise.
* term/terminfo.c: Likewise.
* term/i386/pc/vesafb.c: Removed <grub/arg.h>.
* term/i386/pc/vga.c: Likewise.
* video/readers/jpeg.c: Likewise.
* video/readers/png.c: Likewise.
* video/readers/tga.c: Likewise.
* util/grub-fstest (cmd_loopback): Removed.
(cmd_blocklist): Likewise.
(cmd_ls): Likewise.
(grub_register_command): Likewise.
(grub_unregister_command): Likewise.
(execute_command): Use grub_command_find to locate command and execute
it.
* include/grub/efi/chainloader.h: Removed.
* loader/efi/chainloader_normal.c: Likewise.
* loader/i386/bsd_normal.c: Likewise.
* loader/i386/pc/chainloader_normal.c: Likewise.
* loader/i386/pc/multiboot_normal.c: Likewise.
* loader/linux_normal.c: Likewise.
* loader/multiboot_loader_normal.c: Likewise.
* loader/powerpc/ieee1275/linux_normal.c: Likewise.
* gencmdlist.sh: Scan new registration command grub_register_extcmd
and grub_register_command_p1.
* conf/common.rmk (grub_fstest_SOURCES): Add kern/list.c,
kern/command.c, lib/arg.c and commands/extcmd.c.
(pkglib_MODULES): Remove boot.mod, and minicmd.mod and extcmd.mod.
(minicmd_mod_SOURCES): New variable.
(minicmd_mod_CFLAGS): Likewise.
(minicmd_mod_LDFLAGS): Likewise.
(extcmd_mod_SOURCES): Likewise.
(extcmd_mod_CFLAGS): Likewise.
(extcmd_mod_LDFLAGS): Likewise.
(boot_mod_SOURCES): Removed.
(boot_mod_CFLAGS): Likewise.
(boot_mod_LDFLAGS): Likewise.
* conf/i386-pc.rmk (kernel_img_SOURCES): Add kern/command.c and
kern/corecmd.c.
(kernel_img_HEADERS): Add command.h.
(grub_emu_SOURCES): Remove commands/boot.c and normal/arg.c, add
commands/minicmd.c, kern/command.c, kern/corecmd.c, commands/extcmd.c
and lib/arg.c.
(pkglib_MODULES): Change _linux.mod, _chain.mod, _bsd.mod and
_multiboot.mod as linux.mod, chain.mod, bsd.mod and multiboot.mod,
remove the corresponding normal mode command.
(normal_mod_SOURCES): Remove normal/arg.c.
* conf/i386-coreboot.rmk: Likewise.
* conf/i386-efi.rmk: Likewise.
* conf/i386-ieee1275.rmk: Likewise.
* conf/powerpc-ieee1275.rmk: Likewise.
* conf/x86_64-efi.rmk: Likewise.
* include/grub/arg.h: Move from here ...
* include/grub/lib/arg.h: ... to here.
* normal/arg.c: Move from here ...
* lib/arg.c: ... to here.
* commands/extcmd.c: New file.
* commands/minicmd.c: Likewise.
* include/grub/command.h: Likewise.
* include/grub/extcmd.h: Likewise.
* kern/command.c: Likewise.
* kern/corecmd.c: Likewise.
* kern/list.c (grub_list_iterate): Return int instead of void.
(grub_list_insert): New function.
(grub_prio_list_insert): Likewise.
* kern/rescue.c (grub_rescue_command): Removed.
(grub_rescue_command_list): Likewise.
(grub_rescue_register_command): Likewise.
(grub_rescue_unregister_command): Likewise.
(grub_rescue_cmd_boot): Move to minicmd.c
(grub_rescue_cmd_help): Likewise.
(grub_rescue_cmd_info): Likewise.
(grub_rescue_cmd_boot): Likewise.
(grub_rescue_cmd_testload): Likewise.
(grub_rescue_cmd_dump): Likewise.
(grub_rescue_cmd_rmmod): Likewise.
(grub_rescue_cmd_lsmod): Likewise.
(grub_rescue_cmd_exit): Likewise.
(grub_rescue_print_devices): Moved to corecmd.c.
(grub_rescue_print_files): Likewise.
(grub_rescue_cmd_ls): Likewise.
(grub_rescue_cmd_insmod): Likewise.
(grub_rescue_cmd_set): Likewise.
(grub_rescue_cmd_unset): Likewise.
(attemp_normal_mode): Use grub_command_find to get normal module.
(grub_enter_rescue_mode): Use grub_register_core_commands to register
commands, remove grub_rescue_regiter_command calls.
* normal/command.c (grub_regiser_command): Removed.
(grub_unregister_command): Likewise.
(grub_command_find): Likewise.
(grub_iterate_commands): Likewise.
(rescue_command): Likewise.
(export_command): Moved to corecmd.c.
(set_command): Removed.
(unset_command): Likewise.
(insmod_command): Likewise.
(rmmod_command): Likewise.
(lsmod_command): Likewise.
(grub_command_init): Likewise.
* normal/completion.c (iterate_command): Use cmd->prio to check for
active command.
(complete_arguments): Use grub_extcmd_t structure to find options.
(grub_normal_do_completion): Change function grub_iterate_commands to
grub_command_iterate.
* normal/execute.c (grub_script_execute_cmd): No need to parse
argument here.
* normal/main.c (grub_dyncmd_dispatcher): New function.
(read_command_list): Register unload commands as dyncmd.
(grub_cmd_normal): Use new command interface, register rescue,
unregister normal at entry, register normal, unregister rescue at exit.
* include/grub/list.h (grub_list_test_t): New type.
(grub_list_iterate): Return int instead of void.
(grub_list_insert): New function.
(GRUB_AS_NAMED_LIST_P): New macro.
(GRUB_AS_PRIO_LIST): Likewise.
(GRUB_AS_PRIO_LIST_P): Likewise.
(GRUB_PRIO_LIST_PRIO_MASK): New constant.
(GRUB_PRIO_LIST_FLAG_ACTIVE): Likewise.
(grub_prio_list): New structure.
(grub_prio_list_insert): New function.
(grub_prio_list_remove): New inline function.
* include/grub/normal.h: Remove <grub/arg.h>, add <grub/command.h>.
(GRUB_COMMAND_FLAG_CMDLINE): Moved to command.h.
(GRUB_COMMAND_FLAG_MENU): Likewise.
(GRUB_COMMAND_FLAG_BOTH): Likewise.
(GRUB_COMMAND_FLAG_TITLE): Likewise.
(GRUB_COMMAND_FLAG_NO_ECHO): Likewise.
(GRUB_COMMAND_FLAG_NO_ARG_PARSE): Removed.
(GRUB_COMMAND_FLAG_NOT_LOADED): Likewise.
(grub_command): Likewise.
(grub_register_command): Likewise.
(grub_command_find): Likewise.
(grub_iterate_commands): Likewise.
(grub_command_init): Likewise.
(grub_arg_parse): Likewise.
(grub_arg_show_help): Likewise.
* include/grub/rescue.h (grub_rescue_register_command): Removed.
(grub_rescue_unregister_command): Likewise.
* include/grub/i386/bsd.h: Remove grub_rescue_cmd_freebsd,
grub_rescue_cmd_openbsd, grub_rescue_cmd_netbsd,
grub_rescue_cmd_freebsd_loadenv and grub_rescue_cmd_freebsd_module.
* include/grub/i386/efi/loader.h: Remove grub_rescue_cmd_linux and
grub_rescue_cmd_initrd.
* include/grub/i386/loader.h: Likewise.
* include/grub/x86_64/loader.h: Likewise.
* include/grub/i386/pc/chainloader.h: Remove grub_chainloader_cmd.
2009-03-21 08:39:59 +00:00
|
|
|
static grub_command_t cmd_linux, cmd_initrd;
|
2008-08-21 13:18:07 +00:00
|
|
|
|
|
|
|
GRUB_MOD_INIT(linux)
|
|
|
|
{
|
2009-03-21 Bean <bean123ch@gmail.com>
* commands/blocklist.c: Add include file <grub/command.h>, remove
<grub/normal.h> and <grub/arg.h>.
(grub_cmd_blocklist): Use the new command interface.
(GRUB_MOD_INIT): Likewise.
(GRUB_MOD_FINI): Likewise.
* commands/boot.c: Likewise.
* commands/cat.c: Likewise.
* commands/cmp.c: Likewise.
* commands/configfile.c: Likewise.
* commands/crc.c: Likewise.
* commands/echo.c: Likewise.
* commands/halt.c: Likewise.
* commands/handler.c: Likewise.
* commands/hdparm.c: Likewise.
* commands/help.c: Likewise.
* commands/hexdump.c: Likewise.
* commands/loadenv.c: Likewise.
* commands/ls.c: Likewise.
* commands/lsmmap.c: Likewise.
* commands/lspci.c: Likewise.
* commands/loadenv.c: Likewise.
* commands/read.c: Likewise.
* commands/reboot.c: Likewise.
* commands/search.c: Likewise.
* commands/sleep.c: Likewise.
* commands/test.c: Likewise.
* commands/usbtest.c: Likewise.
* commands/videotest.c: Likewise.
* commands/i386/cpuid.c: Likewise.
* commands/i386/pc/halt.c: Likewise.
* commands/i386/pc/play.c: Likewise.
* commands/i386/pc/pxecmd.c: Likewise.
* commands/i386/pc/vbeinfo.c: Likewise.
* commands/i386/pc/vbetest.c: Likewise.
* commands/ieee1275/suspend.c: Likewise.
* disk/loopback.c: Likewise.
* font/font_cmd.c: Likewise.
* hello/hello.c: Likewise.
* loader/efi/appleloader.c: Likewise.
* loader/efi/chainloader.c: Likewise.
* loader/i386/bsd.c: Likewise.
* loader/i386/efi/linux.c: Likewise.
* loader/i386/ieee1275/linux.c: Likewise.
* loader/i386/linux.c: Likewise.
* loader/i386/pc/chainloader.c: Likewise.
* loader/i386/pc/linux.c: Likewise.
* loader/powerpc/ieee1275/linux.c: Likewise.
* loader/multiboot_loader.c: Likewise.
* term/gfxterm.c: Likewise.
* term/i386/pc/serial.c: Likewise.
* term/terminfo.c: Likewise.
* term/i386/pc/vesafb.c: Removed <grub/arg.h>.
* term/i386/pc/vga.c: Likewise.
* video/readers/jpeg.c: Likewise.
* video/readers/png.c: Likewise.
* video/readers/tga.c: Likewise.
* util/grub-fstest (cmd_loopback): Removed.
(cmd_blocklist): Likewise.
(cmd_ls): Likewise.
(grub_register_command): Likewise.
(grub_unregister_command): Likewise.
(execute_command): Use grub_command_find to locate command and execute
it.
* include/grub/efi/chainloader.h: Removed.
* loader/efi/chainloader_normal.c: Likewise.
* loader/i386/bsd_normal.c: Likewise.
* loader/i386/pc/chainloader_normal.c: Likewise.
* loader/i386/pc/multiboot_normal.c: Likewise.
* loader/linux_normal.c: Likewise.
* loader/multiboot_loader_normal.c: Likewise.
* loader/powerpc/ieee1275/linux_normal.c: Likewise.
* gencmdlist.sh: Scan new registration command grub_register_extcmd
and grub_register_command_p1.
* conf/common.rmk (grub_fstest_SOURCES): Add kern/list.c,
kern/command.c, lib/arg.c and commands/extcmd.c.
(pkglib_MODULES): Remove boot.mod, and minicmd.mod and extcmd.mod.
(minicmd_mod_SOURCES): New variable.
(minicmd_mod_CFLAGS): Likewise.
(minicmd_mod_LDFLAGS): Likewise.
(extcmd_mod_SOURCES): Likewise.
(extcmd_mod_CFLAGS): Likewise.
(extcmd_mod_LDFLAGS): Likewise.
(boot_mod_SOURCES): Removed.
(boot_mod_CFLAGS): Likewise.
(boot_mod_LDFLAGS): Likewise.
* conf/i386-pc.rmk (kernel_img_SOURCES): Add kern/command.c and
kern/corecmd.c.
(kernel_img_HEADERS): Add command.h.
(grub_emu_SOURCES): Remove commands/boot.c and normal/arg.c, add
commands/minicmd.c, kern/command.c, kern/corecmd.c, commands/extcmd.c
and lib/arg.c.
(pkglib_MODULES): Change _linux.mod, _chain.mod, _bsd.mod and
_multiboot.mod as linux.mod, chain.mod, bsd.mod and multiboot.mod,
remove the corresponding normal mode command.
(normal_mod_SOURCES): Remove normal/arg.c.
* conf/i386-coreboot.rmk: Likewise.
* conf/i386-efi.rmk: Likewise.
* conf/i386-ieee1275.rmk: Likewise.
* conf/powerpc-ieee1275.rmk: Likewise.
* conf/x86_64-efi.rmk: Likewise.
* include/grub/arg.h: Move from here ...
* include/grub/lib/arg.h: ... to here.
* normal/arg.c: Move from here ...
* lib/arg.c: ... to here.
* commands/extcmd.c: New file.
* commands/minicmd.c: Likewise.
* include/grub/command.h: Likewise.
* include/grub/extcmd.h: Likewise.
* kern/command.c: Likewise.
* kern/corecmd.c: Likewise.
* kern/list.c (grub_list_iterate): Return int instead of void.
(grub_list_insert): New function.
(grub_prio_list_insert): Likewise.
* kern/rescue.c (grub_rescue_command): Removed.
(grub_rescue_command_list): Likewise.
(grub_rescue_register_command): Likewise.
(grub_rescue_unregister_command): Likewise.
(grub_rescue_cmd_boot): Move to minicmd.c
(grub_rescue_cmd_help): Likewise.
(grub_rescue_cmd_info): Likewise.
(grub_rescue_cmd_boot): Likewise.
(grub_rescue_cmd_testload): Likewise.
(grub_rescue_cmd_dump): Likewise.
(grub_rescue_cmd_rmmod): Likewise.
(grub_rescue_cmd_lsmod): Likewise.
(grub_rescue_cmd_exit): Likewise.
(grub_rescue_print_devices): Moved to corecmd.c.
(grub_rescue_print_files): Likewise.
(grub_rescue_cmd_ls): Likewise.
(grub_rescue_cmd_insmod): Likewise.
(grub_rescue_cmd_set): Likewise.
(grub_rescue_cmd_unset): Likewise.
(attemp_normal_mode): Use grub_command_find to get normal module.
(grub_enter_rescue_mode): Use grub_register_core_commands to register
commands, remove grub_rescue_regiter_command calls.
* normal/command.c (grub_regiser_command): Removed.
(grub_unregister_command): Likewise.
(grub_command_find): Likewise.
(grub_iterate_commands): Likewise.
(rescue_command): Likewise.
(export_command): Moved to corecmd.c.
(set_command): Removed.
(unset_command): Likewise.
(insmod_command): Likewise.
(rmmod_command): Likewise.
(lsmod_command): Likewise.
(grub_command_init): Likewise.
* normal/completion.c (iterate_command): Use cmd->prio to check for
active command.
(complete_arguments): Use grub_extcmd_t structure to find options.
(grub_normal_do_completion): Change function grub_iterate_commands to
grub_command_iterate.
* normal/execute.c (grub_script_execute_cmd): No need to parse
argument here.
* normal/main.c (grub_dyncmd_dispatcher): New function.
(read_command_list): Register unload commands as dyncmd.
(grub_cmd_normal): Use new command interface, register rescue,
unregister normal at entry, register normal, unregister rescue at exit.
* include/grub/list.h (grub_list_test_t): New type.
(grub_list_iterate): Return int instead of void.
(grub_list_insert): New function.
(GRUB_AS_NAMED_LIST_P): New macro.
(GRUB_AS_PRIO_LIST): Likewise.
(GRUB_AS_PRIO_LIST_P): Likewise.
(GRUB_PRIO_LIST_PRIO_MASK): New constant.
(GRUB_PRIO_LIST_FLAG_ACTIVE): Likewise.
(grub_prio_list): New structure.
(grub_prio_list_insert): New function.
(grub_prio_list_remove): New inline function.
* include/grub/normal.h: Remove <grub/arg.h>, add <grub/command.h>.
(GRUB_COMMAND_FLAG_CMDLINE): Moved to command.h.
(GRUB_COMMAND_FLAG_MENU): Likewise.
(GRUB_COMMAND_FLAG_BOTH): Likewise.
(GRUB_COMMAND_FLAG_TITLE): Likewise.
(GRUB_COMMAND_FLAG_NO_ECHO): Likewise.
(GRUB_COMMAND_FLAG_NO_ARG_PARSE): Removed.
(GRUB_COMMAND_FLAG_NOT_LOADED): Likewise.
(grub_command): Likewise.
(grub_register_command): Likewise.
(grub_command_find): Likewise.
(grub_iterate_commands): Likewise.
(grub_command_init): Likewise.
(grub_arg_parse): Likewise.
(grub_arg_show_help): Likewise.
* include/grub/rescue.h (grub_rescue_register_command): Removed.
(grub_rescue_unregister_command): Likewise.
* include/grub/i386/bsd.h: Remove grub_rescue_cmd_freebsd,
grub_rescue_cmd_openbsd, grub_rescue_cmd_netbsd,
grub_rescue_cmd_freebsd_loadenv and grub_rescue_cmd_freebsd_module.
* include/grub/i386/efi/loader.h: Remove grub_rescue_cmd_linux and
grub_rescue_cmd_initrd.
* include/grub/i386/loader.h: Likewise.
* include/grub/x86_64/loader.h: Likewise.
* include/grub/i386/pc/chainloader.h: Remove grub_chainloader_cmd.
2009-03-21 08:39:59 +00:00
|
|
|
cmd_linux = grub_register_command ("linux", grub_cmd_linux,
|
|
|
|
0, "load linux");
|
|
|
|
cmd_initrd = grub_register_command ("initrd", grub_cmd_initrd,
|
|
|
|
0, "load initrd");
|
2008-08-21 13:18:07 +00:00
|
|
|
my_mod = mod;
|
|
|
|
}
|
|
|
|
|
|
|
|
GRUB_MOD_FINI(linux)
|
|
|
|
{
|
2009-03-21 Bean <bean123ch@gmail.com>
* commands/blocklist.c: Add include file <grub/command.h>, remove
<grub/normal.h> and <grub/arg.h>.
(grub_cmd_blocklist): Use the new command interface.
(GRUB_MOD_INIT): Likewise.
(GRUB_MOD_FINI): Likewise.
* commands/boot.c: Likewise.
* commands/cat.c: Likewise.
* commands/cmp.c: Likewise.
* commands/configfile.c: Likewise.
* commands/crc.c: Likewise.
* commands/echo.c: Likewise.
* commands/halt.c: Likewise.
* commands/handler.c: Likewise.
* commands/hdparm.c: Likewise.
* commands/help.c: Likewise.
* commands/hexdump.c: Likewise.
* commands/loadenv.c: Likewise.
* commands/ls.c: Likewise.
* commands/lsmmap.c: Likewise.
* commands/lspci.c: Likewise.
* commands/loadenv.c: Likewise.
* commands/read.c: Likewise.
* commands/reboot.c: Likewise.
* commands/search.c: Likewise.
* commands/sleep.c: Likewise.
* commands/test.c: Likewise.
* commands/usbtest.c: Likewise.
* commands/videotest.c: Likewise.
* commands/i386/cpuid.c: Likewise.
* commands/i386/pc/halt.c: Likewise.
* commands/i386/pc/play.c: Likewise.
* commands/i386/pc/pxecmd.c: Likewise.
* commands/i386/pc/vbeinfo.c: Likewise.
* commands/i386/pc/vbetest.c: Likewise.
* commands/ieee1275/suspend.c: Likewise.
* disk/loopback.c: Likewise.
* font/font_cmd.c: Likewise.
* hello/hello.c: Likewise.
* loader/efi/appleloader.c: Likewise.
* loader/efi/chainloader.c: Likewise.
* loader/i386/bsd.c: Likewise.
* loader/i386/efi/linux.c: Likewise.
* loader/i386/ieee1275/linux.c: Likewise.
* loader/i386/linux.c: Likewise.
* loader/i386/pc/chainloader.c: Likewise.
* loader/i386/pc/linux.c: Likewise.
* loader/powerpc/ieee1275/linux.c: Likewise.
* loader/multiboot_loader.c: Likewise.
* term/gfxterm.c: Likewise.
* term/i386/pc/serial.c: Likewise.
* term/terminfo.c: Likewise.
* term/i386/pc/vesafb.c: Removed <grub/arg.h>.
* term/i386/pc/vga.c: Likewise.
* video/readers/jpeg.c: Likewise.
* video/readers/png.c: Likewise.
* video/readers/tga.c: Likewise.
* util/grub-fstest (cmd_loopback): Removed.
(cmd_blocklist): Likewise.
(cmd_ls): Likewise.
(grub_register_command): Likewise.
(grub_unregister_command): Likewise.
(execute_command): Use grub_command_find to locate command and execute
it.
* include/grub/efi/chainloader.h: Removed.
* loader/efi/chainloader_normal.c: Likewise.
* loader/i386/bsd_normal.c: Likewise.
* loader/i386/pc/chainloader_normal.c: Likewise.
* loader/i386/pc/multiboot_normal.c: Likewise.
* loader/linux_normal.c: Likewise.
* loader/multiboot_loader_normal.c: Likewise.
* loader/powerpc/ieee1275/linux_normal.c: Likewise.
* gencmdlist.sh: Scan new registration command grub_register_extcmd
and grub_register_command_p1.
* conf/common.rmk (grub_fstest_SOURCES): Add kern/list.c,
kern/command.c, lib/arg.c and commands/extcmd.c.
(pkglib_MODULES): Remove boot.mod, and minicmd.mod and extcmd.mod.
(minicmd_mod_SOURCES): New variable.
(minicmd_mod_CFLAGS): Likewise.
(minicmd_mod_LDFLAGS): Likewise.
(extcmd_mod_SOURCES): Likewise.
(extcmd_mod_CFLAGS): Likewise.
(extcmd_mod_LDFLAGS): Likewise.
(boot_mod_SOURCES): Removed.
(boot_mod_CFLAGS): Likewise.
(boot_mod_LDFLAGS): Likewise.
* conf/i386-pc.rmk (kernel_img_SOURCES): Add kern/command.c and
kern/corecmd.c.
(kernel_img_HEADERS): Add command.h.
(grub_emu_SOURCES): Remove commands/boot.c and normal/arg.c, add
commands/minicmd.c, kern/command.c, kern/corecmd.c, commands/extcmd.c
and lib/arg.c.
(pkglib_MODULES): Change _linux.mod, _chain.mod, _bsd.mod and
_multiboot.mod as linux.mod, chain.mod, bsd.mod and multiboot.mod,
remove the corresponding normal mode command.
(normal_mod_SOURCES): Remove normal/arg.c.
* conf/i386-coreboot.rmk: Likewise.
* conf/i386-efi.rmk: Likewise.
* conf/i386-ieee1275.rmk: Likewise.
* conf/powerpc-ieee1275.rmk: Likewise.
* conf/x86_64-efi.rmk: Likewise.
* include/grub/arg.h: Move from here ...
* include/grub/lib/arg.h: ... to here.
* normal/arg.c: Move from here ...
* lib/arg.c: ... to here.
* commands/extcmd.c: New file.
* commands/minicmd.c: Likewise.
* include/grub/command.h: Likewise.
* include/grub/extcmd.h: Likewise.
* kern/command.c: Likewise.
* kern/corecmd.c: Likewise.
* kern/list.c (grub_list_iterate): Return int instead of void.
(grub_list_insert): New function.
(grub_prio_list_insert): Likewise.
* kern/rescue.c (grub_rescue_command): Removed.
(grub_rescue_command_list): Likewise.
(grub_rescue_register_command): Likewise.
(grub_rescue_unregister_command): Likewise.
(grub_rescue_cmd_boot): Move to minicmd.c
(grub_rescue_cmd_help): Likewise.
(grub_rescue_cmd_info): Likewise.
(grub_rescue_cmd_boot): Likewise.
(grub_rescue_cmd_testload): Likewise.
(grub_rescue_cmd_dump): Likewise.
(grub_rescue_cmd_rmmod): Likewise.
(grub_rescue_cmd_lsmod): Likewise.
(grub_rescue_cmd_exit): Likewise.
(grub_rescue_print_devices): Moved to corecmd.c.
(grub_rescue_print_files): Likewise.
(grub_rescue_cmd_ls): Likewise.
(grub_rescue_cmd_insmod): Likewise.
(grub_rescue_cmd_set): Likewise.
(grub_rescue_cmd_unset): Likewise.
(attemp_normal_mode): Use grub_command_find to get normal module.
(grub_enter_rescue_mode): Use grub_register_core_commands to register
commands, remove grub_rescue_regiter_command calls.
* normal/command.c (grub_regiser_command): Removed.
(grub_unregister_command): Likewise.
(grub_command_find): Likewise.
(grub_iterate_commands): Likewise.
(rescue_command): Likewise.
(export_command): Moved to corecmd.c.
(set_command): Removed.
(unset_command): Likewise.
(insmod_command): Likewise.
(rmmod_command): Likewise.
(lsmod_command): Likewise.
(grub_command_init): Likewise.
* normal/completion.c (iterate_command): Use cmd->prio to check for
active command.
(complete_arguments): Use grub_extcmd_t structure to find options.
(grub_normal_do_completion): Change function grub_iterate_commands to
grub_command_iterate.
* normal/execute.c (grub_script_execute_cmd): No need to parse
argument here.
* normal/main.c (grub_dyncmd_dispatcher): New function.
(read_command_list): Register unload commands as dyncmd.
(grub_cmd_normal): Use new command interface, register rescue,
unregister normal at entry, register normal, unregister rescue at exit.
* include/grub/list.h (grub_list_test_t): New type.
(grub_list_iterate): Return int instead of void.
(grub_list_insert): New function.
(GRUB_AS_NAMED_LIST_P): New macro.
(GRUB_AS_PRIO_LIST): Likewise.
(GRUB_AS_PRIO_LIST_P): Likewise.
(GRUB_PRIO_LIST_PRIO_MASK): New constant.
(GRUB_PRIO_LIST_FLAG_ACTIVE): Likewise.
(grub_prio_list): New structure.
(grub_prio_list_insert): New function.
(grub_prio_list_remove): New inline function.
* include/grub/normal.h: Remove <grub/arg.h>, add <grub/command.h>.
(GRUB_COMMAND_FLAG_CMDLINE): Moved to command.h.
(GRUB_COMMAND_FLAG_MENU): Likewise.
(GRUB_COMMAND_FLAG_BOTH): Likewise.
(GRUB_COMMAND_FLAG_TITLE): Likewise.
(GRUB_COMMAND_FLAG_NO_ECHO): Likewise.
(GRUB_COMMAND_FLAG_NO_ARG_PARSE): Removed.
(GRUB_COMMAND_FLAG_NOT_LOADED): Likewise.
(grub_command): Likewise.
(grub_register_command): Likewise.
(grub_command_find): Likewise.
(grub_iterate_commands): Likewise.
(grub_command_init): Likewise.
(grub_arg_parse): Likewise.
(grub_arg_show_help): Likewise.
* include/grub/rescue.h (grub_rescue_register_command): Removed.
(grub_rescue_unregister_command): Likewise.
* include/grub/i386/bsd.h: Remove grub_rescue_cmd_freebsd,
grub_rescue_cmd_openbsd, grub_rescue_cmd_netbsd,
grub_rescue_cmd_freebsd_loadenv and grub_rescue_cmd_freebsd_module.
* include/grub/i386/efi/loader.h: Remove grub_rescue_cmd_linux and
grub_rescue_cmd_initrd.
* include/grub/i386/loader.h: Likewise.
* include/grub/x86_64/loader.h: Likewise.
* include/grub/i386/pc/chainloader.h: Remove grub_chainloader_cmd.
2009-03-21 08:39:59 +00:00
|
|
|
grub_unregister_command (cmd_linux);
|
|
|
|
grub_unregister_command (cmd_initrd);
|
2008-08-21 13:18:07 +00:00
|
|
|
}
|