Lncvrt/grub
1
0 Fork 0
mirror of https://git.savannah.gnu.org/git/grub.git synced 2026-10-27 01:29:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into phcoder/ports/alpha

Browse Source 
Conflicts:
	grub-core/term/terminfo.c
This commit is contained in:
Vladimir Serbinenko committed 2013-10-25 16:08:50 +02:00
2 parents 2762216e13 af81ed880d
commit 20fbcb1e9d
14 files changed
+34 -96
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

grub-core/commands/boot.c
-8
View File
@@ -183,22 +183,14 @@ grub_cmd_boot (struct grub_command *cmd __attribute__ ((unused)),
static grub_command_t cmd_boot;
#if defined (GRUB_MACHINE_MIPS_LOONGSON) || defined (GRUB_MACHINE_MIPS_QEMU_MIPS)
void grub_boot_init (void)
#else
GRUB_MOD_INIT(boot)
#endif
{
cmd_boot =
grub_register_command ("boot", grub_cmd_boot,
0, N_("Boot an operating system."));
}
#if defined (GRUB_MACHINE_MIPS_LOONGSON) || defined (GRUB_MACHINE_MIPS_QEMU_MIPS)
void grub_boot_fini (void)
#else
GRUB_MOD_FINI(boot)
#endif
{
grub_unregister_command (cmd_boot);
}
grub-core/commands/keylayouts.c
-8
View File
@@ -293,21 +293,13 @@ grub_cmd_keymap (struct grub_command *cmd __attribute__ ((unused)),
static grub_command_t cmd;
#if defined (GRUB_MACHINE_MIPS_LOONGSON) || defined (GRUB_MACHINE_MIPS_QEMU_MIPS)
void grub_keylayouts_init (void)
#else
GRUB_MOD_INIT(keylayouts)
#endif
{
cmd = grub_register_command ("keymap", grub_cmd_keymap,
0, N_("Load a keyboard layout."));
}
#if defined (GRUB_MACHINE_MIPS_LOONGSON) || defined (GRUB_MACHINE_MIPS_QEMU_MIPS)
void grub_keylayouts_fini (void)
#else
GRUB_MOD_FINI(keylayouts)
#endif
{
grub_unregister_command (cmd);
}
grub-core/lib/progress.c
+2 -1
View File
@@ -57,7 +57,8 @@ grub_file_progress_hook_real (grub_disk_addr_t sector __attribute__ ((unused)),
partial_file_name,
grub_get_human_size (file->progress_offset,
GRUB_HUMAN_SIZE_NORMAL),
grub_divmod64 (100 * file->progress_offset, file->size, 0));
(unsigned long long) grub_divmod64 (100 * file->progress_offset,
file->size, 0));
char *ptr = buffer + grub_strlen (buffer);
grub_snprintf (ptr, sizeof (buffer) - (ptr - buffer), "%s ]",
grub-core/term/at_keyboard.c
-8
View File
@@ -646,22 +646,14 @@ static struct grub_term_input grub_at_keyboard_term =
.getkey = grub_at_keyboard_getkey
};
#if defined (GRUB_MACHINE_MIPS_LOONGSON) || defined (GRUB_MACHINE_MIPS_QEMU_MIPS)
void grub_at_keyboard_init (void)
#else
GRUB_MOD_INIT(at_keyboard)
#endif
{
grub_term_register_input ("at_keyboard", &grub_at_keyboard_term);
grub_loader_register_preboot_hook (grub_at_fini_hw, grub_at_restore_hw,
GRUB_LOADER_PREBOOT_HOOK_PRIO_CONSOLE);
}
#if defined (GRUB_MACHINE_MIPS_LOONGSON) || defined (GRUB_MACHINE_MIPS_QEMU_MIPS)
void grub_at_keyboard_fini (void)
#else
GRUB_MOD_FINI(at_keyboard)
#endif
{
grub_keyboard_controller_fini (NULL);
grub_term_unregister_input (&grub_at_keyboard_term);
grub-core/term/gfxterm.c
-8
View File
@@ -1132,20 +1132,12 @@ grub_gfxterm_get_dimensions (unsigned *width, unsigned *height)
*height = window.height;
}
#if defined (GRUB_MACHINE_MIPS_LOONGSON) || defined (GRUB_MACHINE_COREBOOT)
void grub_gfxterm_init (void)
#else
GRUB_MOD_INIT(gfxterm)
#endif
{
grub_term_register_output ("gfxterm", &grub_video_term);
}
#if defined (GRUB_MACHINE_MIPS_LOONGSON) || defined (GRUB_MACHINE_COEBOOT)
void grub_gfxterm_fini (void)
#else
GRUB_MOD_FINI(gfxterm)
#endif
{
grub_term_unregister_output (&grub_video_term);
}
grub-core/term/i386/pc/vga_text.c
-10
View File
@@ -270,15 +270,9 @@ static struct grub_term_output grub_vga_text_term =
.progress_update_divisor = GRUB_PROGRESS_FAST
};
/* FIXME: this is was too spaghetti. */
#ifndef MODE_MDA
#if defined (GRUB_MACHINE_COREBOOT) || defined (GRUB_MACHINE_QEMU) || defined (GRUB_MACHINE_MIPS_QEMU_MIPS) || defined (GRUB_MACHINE_MULTIBOOT)
void grub_vga_text_init (void)
#else
GRUB_MOD_INIT(vga_text)
#endif
{
#ifdef GRUB_MACHINE_COREBOOT
if (!grub_video_coreboot_fbtable)
@@ -286,11 +280,7 @@ GRUB_MOD_INIT(vga_text)
grub_term_register_output ("vga_text", &grub_vga_text_term);
}
#if defined (GRUB_MACHINE_COREBOOT) || defined (GRUB_MACHINE_QEMU) || defined (GRUB_MACHINE_MIPS_QEMU_MIPS) || defined (GRUB_MACHINE_MULTIBOOT)
void grub_vga_text_fini (void)
#else
GRUB_MOD_FINI(vga_text)
#endif
{
grub_term_unregister_output (&grub_vga_text_term);
}
grub-core/term/serial.c
-8
View File
@@ -379,11 +379,7 @@ grub_serial_unregister_driver (struct grub_serial_driver *driver)
static grub_extcmd_t cmd;
#if defined (GRUB_MACHINE_MIPS_LOONGSON) || defined (GRUB_MACHINE_MIPS_QEMU_MIPS)
void grub_serial_init (void)
#else
GRUB_MOD_INIT(serial)
#endif
{
cmd = grub_register_extcmd ("serial", grub_cmd_serial, 0,
N_("[OPTIONS...]"),
@@ -410,11 +406,7 @@ GRUB_MOD_INIT(serial)
#endif
}
#if defined (GRUB_MACHINE_MIPS_LOONGSON) || defined (GRUB_MACHINE_MIPS_QEMU_MIPS)
void grub_serial_fini (void)
#else
GRUB_MOD_FINI(serial)
#endif
{
while (grub_serial_ports)
grub_serial_unregister (grub_serial_ports);
grub-core/term/terminfo.c
-12
View File
@@ -776,13 +776,7 @@ grub_cmd_terminfo (grub_extcmd_context_t ctxt, int argc, char **args)
static grub_extcmd_t cmd;
#if defined (GRUB_MACHINE_IEEE1275) || defined (GRUB_MACHINE_MIPS_LOONGSON) \
|| defined (GRUB_MACHINE_MIPS_QEMU_MIPS) || defined (GRUB_MACHINE_ARC) \
|| defined (GRUB_MACHINE_UBOOT) || defined (GRUB_MACHINE_ALPHA_SRM)
void grub_terminfo_init (void)
#else
GRUB_MOD_INIT(terminfo)
#endif
{
cmd = grub_register_extcmd ("terminfo", grub_cmd_terminfo, 0,
N_("[[-a|-u|-v] [-g WxH] TERM [TYPE]]"),
@@ -790,13 +784,7 @@ GRUB_MOD_INIT(terminfo)
options);
}
#if defined (GRUB_MACHINE_IEEE1275) || defined (GRUB_MACHINE_MIPS_LOONGSON) \
|| defined (GRUB_MACHINE_MIPS_QEMU_MIPS) || defined (GRUB_MACHINE_ARC) \
|| defined (GRUB_MACHINE_ALPHA_SRM)
void grub_terminfo_fini (void)
#else
GRUB_MOD_FINI(terminfo)
#endif
{
grub_unregister_extcmd (cmd);
}
grub-core/video/radeon_fuloong2e.c
-8
View File
@@ -224,20 +224,12 @@ static struct grub_video_adapter grub_video_radeon_fuloong2e_adapter =
.next = 0
};
#ifdef GRUB_MACHINE_MIPS_LOONGSON
void grub_video_radeon_fuloong2e_init (void)
#else
GRUB_MOD_INIT(video_radeon_fuloong2e)
#endif
{
grub_video_register (&grub_video_radeon_fuloong2e_adapter);
}
#ifdef GRUB_MACHINE_MIPS_LOONGSON
void grub_video_radeon_fuloong2e_fini (void)
#else
GRUB_MOD_FINI(video_radeon_fuloong2e)
#endif
{
grub_video_unregister (&grub_video_radeon_fuloong2e_adapter);
}
grub-core/video/sis315pro.c
-8
View File
@@ -437,20 +437,12 @@ static struct grub_video_adapter grub_video_sis315pro_adapter =
.next = 0
};
#ifdef GRUB_MACHINE_MIPS_LOONGSON
void grub_video_sis315pro_init (void)
#else
GRUB_MOD_INIT(video_sis315pro)
#endif
{
grub_video_register (&grub_video_sis315pro_adapter);
}
#ifdef GRUB_MACHINE_MIPS_LOONGSON
void grub_video_sis315pro_fini (void)
#else
GRUB_MOD_FINI(video_sis315pro)
#endif
{
grub_video_unregister (&grub_video_sis315pro_adapter);
}
grub-core/video/sm712.c
-8
View File
@@ -796,20 +796,12 @@ static struct grub_video_adapter grub_video_sm712_adapter =
.next = 0
};
#ifdef GRUB_MACHINE_MIPS_LOONGSON
void grub_video_sm712_init (void)
#else
GRUB_MOD_INIT(video_sm712)
#endif
{
grub_video_register (&grub_video_sm712_adapter);
}
#ifdef GRUB_MACHINE_MIPS_LOONGSON
void grub_video_sm712_fini (void)
#else
GRUB_MOD_FINI(video_sm712)
#endif
{
grub_video_unregister (&grub_video_sm712_adapter);
}