vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Fix compilation on i386-pc

Browse source
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2010-04-21 10:01:41 +02:00
parent 6d6f55c557
commit 5490ddc18b
4 changed files with 6 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
efiemu/main.c
View file

@ -182,22 +182,6 @@ grub_cmd_efiemu_prepare (grub_command_t cmd __attribute__ ((unused)),
int
grub_efiemu_exit_boot_services (grub_efi_uintn_t map_key
__attribute__ ((unused)))
{
/* Nothing to do here yet */
return 1;
}
int
grub_efiemu_finish_boot_services (void)
{
/* Nothing to do here yet */
return 1;
}
/* Load the runtime from the file FILENAME. */ /* Load the runtime from the file FILENAME. */
static grub_err_t static grub_err_t
grub_efiemu_load_file (const char *filename) grub_efiemu_load_file (const char *filename)

2
include/grub/autoefi.h
View file

@ -50,6 +50,7 @@ static inline grub_err_t grub_autoefi_prepare (void)
# define SYSTEM_TABLE_PTR(x) ((void *)(grub_efi_system_table->x)) # define SYSTEM_TABLE_PTR(x) ((void *)(grub_efi_system_table->x))
# define SIZEOF_OF_UINTN sizeof (grub_efi_uintn_t) # define SIZEOF_OF_UINTN sizeof (grub_efi_uintn_t)
# define SYSTEM_TABLE(x) (grub_efi_system_table->x) # define SYSTEM_TABLE(x) (grub_efi_system_table->x)
# define grub_autoefi_finish_boot_services grub_efi_finish_boot_services
# define EFI_PRESENT 1 # define EFI_PRESENT 1
#else #else
# include <grub/efiemu/efiemu.h> # include <grub/efiemu/efiemu.h>
@ -72,6 +73,7 @@ static inline grub_err_t grub_autoefi_prepare (void)
# define SYSTEM_TABLE GRUB_EFIEMU_SYSTEM_TABLE # define SYSTEM_TABLE GRUB_EFIEMU_SYSTEM_TABLE
# define grub_efi_allocate_pages(x,y) (x) # define grub_efi_allocate_pages(x,y) (x)
# define grub_efi_free_pages(x,y) GRUB_EFI_SUCCESS # define grub_efi_free_pages(x,y) GRUB_EFI_SUCCESS
# define grub_autoefi_finish_boot_services grub_efiemu_finish_boot_services
# define EFI_PRESENT 1 # define EFI_PRESENT 1
#endif #endif

3
include/grub/efiemu/efiemu.h
View file

@ -217,13 +217,12 @@ int grub_efiemu_get_memory_map (grub_efi_uintn_t *memory_map_size,
grub_efi_uintn_t *map_key, grub_efi_uintn_t *map_key,
grub_efi_uintn_t *descriptor_size, grub_efi_uintn_t *descriptor_size,
grub_efi_uint32_t *descriptor_version); grub_efi_uint32_t *descriptor_version);
#define grub_efiemu_finish_boot_services grub_efiemu_get_memory_map
grub_err_t grub_err_t
grub_efiemu_mmap_iterate (int NESTED_FUNC_ATTR (*hook) (grub_uint64_t, grub_efiemu_mmap_iterate (int NESTED_FUNC_ATTR (*hook) (grub_uint64_t,
grub_uint64_t, grub_uint64_t,
grub_uint32_t)); grub_uint32_t));
int grub_efiemu_sizeof_uintn_t (void); int grub_efiemu_sizeof_uintn_t (void);
int grub_efiemu_exit_boot_services (grub_efi_uintn_t map_key);
int grub_efiemu_finish_boot_services (void);
grub_err_t grub_err_t
grub_efiemu_get_lower_upper_memory (grub_uint64_t *lower, grub_uint64_t *upper); grub_efiemu_get_lower_upper_memory (grub_uint64_t *lower, grub_uint64_t *upper);
#define GRUB_EFIEMU_MEMORY_AVAILABLE 1 #define GRUB_EFIEMU_MEMORY_AVAILABLE 1

6
loader/i386/xnu.c
View file

@ -1038,9 +1038,9 @@ grub_xnu_boot (void)
bootparams->devtree = devtree_target; bootparams->devtree = devtree_target;
bootparams->devtreelen = devtreelen; bootparams->devtreelen = devtreelen;
err = grub_efi_finish_boot_services (&memory_map_size, memory_map, err = grub_autoefi_finish_boot_services (&memory_map_size, memory_map,
&map_key, &descriptor_size, &map_key, &descriptor_size,
&descriptor_version); &descriptor_version);
if (err) if (err)
return err; return err;