2008-07-17 Bean <bean123ch@gmail.com>
* conf/i386/efi.rmk (pkglib_MODULES): add pci.mod and lspci.mod. (appleldr_mod_SOURCE): New variavle. (appleldr_mod_CFLAGS): Likewise. (appleldr_mod_LDFLAGS): Likewise. (pci_mod_SOURCES): Likewise. (pci_mod_CFLAGS): Likewise. (pci_mod_LDFLAGS): Likewise. (lspci_mod_SOURCES): Likewise. (lspci_mod_CFLAGS): Likewise. (lspci_mod_LDFLAGS): Likewise. * conf/x86_64-efi.rmk: New file. * disk/efi/efidisk.c (grub_efidisk_read): Wrap efi calls with efi_call_N macro. (grub_efidisk_write): Likewise. * include/efi/api.h (efi_call_0): New macro. (efi_call_1): Likewise. (efi_call_2): Likewise. (efi_call_3): Likewise. (efi_call_4): Likewise. (efi_call_5): Likewise. (efi_call_6): Likewise. * include/grub/efi/chainloader.h (grub_chainloader_cmd): Rename to grub_rescue_cmd_chainloader. * include/grub/efi/pe32.h (GRUB_PE32_MACHINE_X86_64): New macro. (grub_pe32_optional_header): Change some fields based on i386 or x86_64 platform. (GRUB_PE32_PE32_MAGIC): Likewise. * include/grub/efi/uga_draw.h: New file. * include/grub/elf.h (STN_ABS): New constant. (R_X86_64_NONE): Relocation constant for x86_64. (R_X86_64_64): Likewise. (R_X86_64_PC32): Likewise. (R_X86_64_GOT32): Likewise. (R_X86_64_PLT32): Likewise. (R_X86_64_COPY): Likewise. (R_X86_64_GLOB_DAT): Likewise. (R_X86_64_JUMP_SLOT): Likewise. (R_X86_64_RELATIVE): Likewise. (R_X86_64_GOTPCREL): Likewise. (R_X86_64_32): Likewise. (R_X86_64_32S): Likewise. (R_X86_64_16): Likewise. (R_X86_64_PC16): Likewise. (R_X86_64_8): Likewise. (R_X86_64_PC8): Likewise. * include/grub/i386/efi/pci.h: New file. * include/grub/i386/linux.h (GRUB_LINUX_EFI_SIGNATURE): Change it value based on platform. (GRUB_LINUX_EFI_SIGNATURE_0204): New constant. (GRUB_E820_RAM): Likewise. (GRUB_E820_RESERVED): Likewise. (GRUB_E820_ACPI): Likewise. (GRUB_E820_NVS): Likewise. (GRUB_E820_EXEC_CODE): Likewise. (GRUB_E820_MAX_ENTRY): Likewise. (grub_e820_mmap): New structure. (linux_kernel_header): Change the efi field according to different kernel version, also field from linux_kernel_header. * include/grub/kernel.h (grub_module_info): Add padding for x86_64. * include/grub/pci.h (GRUB_PCI_ADDR_SPACE_MASK): New constant. (GRUB_PCI_ADDR_SPACE_MEMORY): Likewise. (GRUB_PCI_ADDR_SPACE_IO): Likewise. (GRUB_PCI_ADDR_MEM_TYPE_MASK): Likewise. (GRUB_PCI_ADDR_MEM_TYPE_32): Likewise. (GRUB_PCI_ADDR_MEM_TYPE_1M): Likewise. (GRUB_PCI_ADDR_MEM_TYPE_64): Likewise. (GRUB_PCI_ADDR_MEM_PREFETCH): Likewise. (GRUB_PCI_ADDR_MEM_MASK): Likewise. (GRUB_PCI_ADDR_IO_MASK): Likewise. * include/grub/x86_64/efi/kernel.h: New file. * include/grub/x86_64/efi/loader.h: Likewise. * include/grub/x86_64/efi/machine.h: Likewise. * include/grub/x86_64/efi/pci.h: Likewise. * include/grub/x86_64/efi/time.h: Likewise. * include/grub/x86_64/linux.h: Likewise. * include/grub/x86_64/setjmp.h: Likewise. * include/grub/x86_64/time.h: Likewise. * include/grub/x86_64/types.h: Likewise. * kern/dl.c (GRUB_CPU_SIZEOF_VOID_P): Changed to GRUB_TARGET_SIZEOF_VOID_P. * kern/efi/efi.c (grub_efi_locate_protocol): Wrap efi calls. (grub_efi_locate_handle): Likewise. (grub_efi_open_protocol): Likewise. (grub_efi_set_text_mode): Likewise. (grub_efi_stall): Likewise. (grub_exit): Likewise. (grub_reboot): Likewise. (grub_halt): Likewise. (grub_efi_exit_boot_services): Likewise. (grub_get_rtc): Likewise. * kern/efi/mm.c (MEMORY_MAP_SIZE): Change to 0x3000 for new models. (GRUB_CPU_SIZEOF_VOID_P): Changed to GRUB_TARGET_SIZEOF_VOID_P. (grub_efi_allocate_pages): Wrap efi calls. (grub_efi_free_pages): Wrap efi calls. (grub_efi_get_memory_map): Wrap efi calls. * kern/x86_64/dl.c: New file. * kern/x86_64/efi/callwrap.S: Likewise. * kern/x86_64/efi/startup.S: Likewise. * loader/efi/appleloader.c: Likewise. * loader/efi/chainloader.c (cmdline): New variable. (grub_chainloader_unload): Wrap efi calls. (grub_chainloader_boot): Likewise. (grub_rescue_cmd_chainloader): Wrap efi calls, handle command line. * loader/efi/chainloader_normal.c (chainloader_command): Change grub_chainloader_cmd to grub_rescue_cmd_chainloader, pass command line. * loader/i386/efi/linux.c (allocate_pages): Change allocation method. (grub_e820_add_region): New function. (grub_linux_boot): Construct e820 map from efi map, handle x86_64 booting. (grub_find_video_card): New function. (grub_linux_setup_video): New function. (grub_rescue_cmd_linux): Probe for video information. * normal/x86_64/setjmp.S: New file. * term/efi/console.c (map_char): New function. (grub_console_putchar): Map unicode char. (grub_console_checkkey): Wrap efi calls. (grub_console_getkey): Likewise. (grub_console_getwh): Likewise. (grub_console_gotoxy): Likewise. (grub_console_cls): Likewise. (grub_console_setcolorstate): Likewise. (grub_console_setcursor): Likewise. * util/i386/efi/grub-mkimage.c: Add support for x86_64.
This commit is contained in:
bean
parent
ef29405511
commit
2001169405
39 changed files with 3960 additions and 309 deletions
|
|
@ -36,6 +36,54 @@ grub_console_highlight_color = GRUB_EFI_TEXT_ATTR (GRUB_EFI_BLACK,
|
|||
|
||||
static int read_key = -1;
|
||||
|
||||
static grub_uint32_t
|
||||
map_char (grub_uint32_t c)
|
||||
{
|
||||
if (c > 0x7f)
|
||||
{
|
||||
/* Map some unicode characters to the EFI character. */
|
||||
switch (c)
|
||||
{
|
||||
case 0x2190: /* left arrow */
|
||||
c = 0x25c4;
|
||||
break;
|
||||
case 0x2191: /* up arrow */
|
||||
c = 0x25b2;
|
||||
break;
|
||||
case 0x2192: /* right arrow */
|
||||
c = 0x25ba;
|
||||
break;
|
||||
case 0x2193: /* down arrow */
|
||||
c = 0x25bc;
|
||||
break;
|
||||
case 0x2501: /* horizontal line */
|
||||
c = 0x2500;
|
||||
break;
|
||||
case 0x2503: /* vertical line */
|
||||
c = 0x2502;
|
||||
break;
|
||||
case 0x250F: /* upper-left corner */
|
||||
c = 0x250c;
|
||||
break;
|
||||
case 0x2513: /* upper-right corner */
|
||||
c = 0x2510;
|
||||
break;
|
||||
case 0x2517: /* lower-left corner */
|
||||
c = 0x2514;
|
||||
break;
|
||||
case 0x251B: /* lower-right corner */
|
||||
c = 0x2518;
|
||||
break;
|
||||
|
||||
default:
|
||||
c = '?';
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
return c;
|
||||
}
|
||||
|
||||
static void
|
||||
grub_console_putchar (grub_uint32_t c)
|
||||
{
|
||||
|
|
@ -48,14 +96,14 @@ grub_console_putchar (grub_uint32_t c)
|
|||
if (c > 0xffff)
|
||||
c = '?';
|
||||
|
||||
str[0] = (grub_efi_char16_t) (c & 0xffff);
|
||||
str[0] = (grub_efi_char16_t) map_char (c & 0xffff);
|
||||
str[1] = 0;
|
||||
|
||||
/* Should this test be cached? */
|
||||
if (c > 0x7f && o->test_string (o, str) != GRUB_EFI_SUCCESS)
|
||||
if (c > 0x7f && efi_call_2 (o->test_string, o, str) != GRUB_EFI_SUCCESS)
|
||||
return;
|
||||
|
||||
o->output_string (o, str);
|
||||
efi_call_2 (o->output_string, o, str);
|
||||
}
|
||||
|
||||
static grub_ssize_t
|
||||
|
|
@ -76,8 +124,8 @@ grub_console_checkkey (void)
|
|||
return 1;
|
||||
|
||||
i = grub_efi_system_table->con_in;
|
||||
status = i->read_key_stroke (i, &key);
|
||||
#if 1
|
||||
status = efi_call_2 (i->read_key_stroke, i, &key);
|
||||
#if 0
|
||||
switch (status)
|
||||
{
|
||||
case GRUB_EFI_SUCCESS:
|
||||
|
|
@ -137,6 +185,15 @@ grub_console_checkkey (void)
|
|||
break;
|
||||
case 0x0a:
|
||||
break;
|
||||
case 0x0b:
|
||||
read_key = 24;
|
||||
break;
|
||||
case 0x0c:
|
||||
read_key = 1;
|
||||
break;
|
||||
case 0x0d:
|
||||
read_key = 5;
|
||||
break;
|
||||
case 0x17:
|
||||
read_key = '\e';
|
||||
break;
|
||||
|
|
@ -169,9 +226,9 @@ grub_console_getkey (void)
|
|||
|
||||
do
|
||||
{
|
||||
status = b->wait_for_event (1, &(i->wait_for_key), &index);
|
||||
status = efi_call_3 (b->wait_for_event, 1, &(i->wait_for_key), &index);
|
||||
if (status != GRUB_EFI_SUCCESS)
|
||||
return -1;
|
||||
return -1;
|
||||
|
||||
grub_console_checkkey ();
|
||||
}
|
||||
|
|
@ -189,7 +246,7 @@ grub_console_getwh (void)
|
|||
grub_efi_uintn_t columns, rows;
|
||||
|
||||
o = grub_efi_system_table->con_out;
|
||||
if (o->query_mode (o, o->mode->mode, &columns, &rows) != GRUB_EFI_SUCCESS)
|
||||
if (efi_call_4 (o->query_mode, o, o->mode->mode, &columns, &rows) != GRUB_EFI_SUCCESS)
|
||||
{
|
||||
/* Why does this fail? */
|
||||
columns = 80;
|
||||
|
|
@ -214,7 +271,7 @@ grub_console_gotoxy (grub_uint8_t x, grub_uint8_t y)
|
|||
grub_efi_simple_text_output_interface_t *o;
|
||||
|
||||
o = grub_efi_system_table->con_out;
|
||||
o->set_cursor_position (o, x, y);
|
||||
efi_call_3 (o->set_cursor_position, o, x, y);
|
||||
}
|
||||
|
||||
static void
|
||||
|
|
@ -225,9 +282,9 @@ grub_console_cls (void)
|
|||
|
||||
o = grub_efi_system_table->con_out;
|
||||
orig_attr = o->mode->attribute;
|
||||
o->set_attributes (o, GRUB_EFI_BACKGROUND_BLACK);
|
||||
o->clear_screen (o);
|
||||
o->set_attributes (o, orig_attr);
|
||||
efi_call_2 (o->set_attributes, o, GRUB_EFI_BACKGROUND_BLACK);
|
||||
efi_call_1 (o->clear_screen, o);
|
||||
efi_call_2 (o->set_attributes, o, orig_attr);
|
||||
}
|
||||
|
||||
static void
|
||||
|
|
@ -239,13 +296,13 @@ grub_console_setcolorstate (grub_term_color_state state)
|
|||
|
||||
switch (state) {
|
||||
case GRUB_TERM_COLOR_STANDARD:
|
||||
o->set_attributes (o, grub_console_standard_color);
|
||||
efi_call_2 (o->set_attributes, o, grub_console_standard_color);
|
||||
break;
|
||||
case GRUB_TERM_COLOR_NORMAL:
|
||||
o->set_attributes (o, grub_console_normal_color);
|
||||
efi_call_2 (o->set_attributes, o, grub_console_normal_color);
|
||||
break;
|
||||
case GRUB_TERM_COLOR_HIGHLIGHT:
|
||||
o->set_attributes (o, grub_console_highlight_color);
|
||||
efi_call_2 (o->set_attributes, o, grub_console_highlight_color);
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
|
|
@ -272,7 +329,7 @@ grub_console_setcursor (int on)
|
|||
grub_efi_simple_text_output_interface_t *o;
|
||||
|
||||
o = grub_efi_system_table->con_out;
|
||||
o->enable_cursor (o, on);
|
||||
efi_call_2 (o->enable_cursor, o, on);
|
||||
}
|
||||
|
||||
static struct grub_term grub_console_term =
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue