mirror of
https://git.proxmox.com/git/grub2
synced 2025-05-21 18:35:18 +00:00
deceb3ecd3
* conf/i386-pc.rmk (kernel_img_SOURCES): Add `kern/i386/pc/mmap.c'.
* include/grub/i386/pc/init.h (GRUB_MACHINE_MEMORY_AVAILABLE)
(GRUB_MACHINE_MEMORY_RESERVED): New macros.
(grub_machine_mmap_iterate): New function declaration.
* include/grub/multiboot.h (struct grub_multiboot_mmap_entry): New
structure.
(GRUB_MMAP_MEMORY_AVAILABLE, GRUB_MMAP_MEMORY_RESERVED): New
macros.
* kern/i386/pc/init.c (grub_machine_init): Replace hardcoded region
type check value with `GRUB_MACHINE_MEMORY_AVAILABLE'.
Move e820 parsing from here ...
* kern/i386/pc/mmap.c: New file.
(grub_machine_mmap_iterate): ... to here.
* include/grub/i386/coreboot/memory.h: Remove `<grub/err.h>'.
(GRUB_LINUXBIOS_MEMORY_AVAILABLE): Rename (for consistency) to ...
(GRUB_MACHINE_MEMORY_AVAILABLE): ... this. Update all users.
(grub_available_iterate): Redeclare to return `void', and redeclare
its hook to use grub_uint64_t as addr and size parameters, and rename
to ...
(grub_machine_mmap_iterate): ... this. Update all users.
* kern/i386/coreboot/mmap.c (grub_mmap_iterate): Simplify parser loop
to make it more readable. Rename to ...
(grub_machine_mmap_iterate): ... this.
* loader/i386/pc/multiboot.c (mmap_addr, mmap_length): New variables.
(grub_get_multiboot_mmap_len, grub_fill_multiboot_mmap): New functions.
(grub_multiboot): Allocate an extra region after the payload, and fill
it with a Multiboot memory map. Adjust a.out loader to calculate size
with the extra space.
(grub_multiboot_load_elf32): Adjust elf32 loader to calculate size
with the extra space.
63 lines
2.1 KiB
C
63 lines
2.1 KiB
C
/*
|
|
* GRUB -- GRand Unified Bootloader
|
|
* Copyright (C) 2002,2004,2005,2007,2008 Free Software Foundation, Inc.
|
|
*
|
|
* 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/>.
|
|
*/
|
|
|
|
#ifndef GRUB_INIT_MACHINE_HEADER
|
|
#define GRUB_INIT_MACHINE_HEADER 1
|
|
|
|
#include <grub/types.h>
|
|
#include <grub/symbol.h>
|
|
|
|
/* Get the memory size in KB. If EXTENDED is zero, return conventional
|
|
memory, otherwise return extended memory. */
|
|
grub_uint16_t grub_get_memsize (int extended);
|
|
|
|
/* Get a packed EISA memory map. Lower 16 bits are between 1MB and 16MB
|
|
in 1KB parts, and upper 16 bits are above 16MB in 64KB parts. */
|
|
grub_uint32_t grub_get_eisa_mmap (void);
|
|
|
|
struct grub_machine_mmap_entry
|
|
{
|
|
grub_uint32_t size;
|
|
grub_uint64_t addr;
|
|
grub_uint64_t len;
|
|
#define GRUB_MACHINE_MEMORY_AVAILABLE 1
|
|
#define GRUB_MACHINE_MEMORY_RESERVED 2
|
|
grub_uint32_t type;
|
|
} __attribute__((packed));
|
|
|
|
/* Get a memory map entry. Return next continuation value. Zero means
|
|
the end. */
|
|
grub_uint32_t EXPORT_FUNC(grub_get_mmap_entry) (struct grub_machine_mmap_entry *entry,
|
|
grub_uint32_t cont);
|
|
|
|
void EXPORT_FUNC(grub_machine_mmap_iterate)
|
|
(int NESTED_FUNC_ATTR (*hook) (grub_uint64_t, grub_uint64_t, grub_uint32_t));
|
|
|
|
/* Turn on/off Gate A20. */
|
|
void grub_gate_a20 (int on);
|
|
|
|
/* Reboot the machine. */
|
|
void EXPORT_FUNC (grub_reboot) (void);
|
|
|
|
/* Halt the system, using APM if possible. If NO_APM is true, don't
|
|
* use APM even if it is available. */
|
|
void EXPORT_FUNC (grub_halt) (int no_apm);
|
|
|
|
|
|
#endif /* ! GRUB_INIT_MACHINE_HEADER */
|