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

Harmonize ieee1275's grub_available_iterate() with the generic

Browse source 
grub_machine_mmap_iterate() interface (fixes a recently-introduced
        build problem on i386-ieee1275):
        * kern/ieee1275/openfw.c (grub_available_iterate): Moved from here ...
        * kern/ieee1275/mmap.c (grub_machine_mmap_iterate): ... here.  Add third
        parameter `type'.  Update all users of this function.
        * conf/i386-ieee1275.rmk (kernel_elf_SOURCES): Add
        `kern/ieee1275/mmap.c'.
        * kern/ieee1275/init.c
        * include/grub/ieee1275/ieee1275.h (grub_available_iterate): Replace
        with ...
        (grub_machine_mmap_iterate): ... this.
        * include/grub/i386/pc/memory.h (grub_machine_mmap_iterate): Change
        return type to `grub_err_t'.  Update all implementations of this
        function prototype.
        * include/grub/i386/coreboot/memory.h (grub_machine_mmap_iterate):
        Likewise.
This commit is contained in:
robertmh 2008-11-20 20:30:24 +00:00
parent 40f9faa4de
commit 79d29fd7b8
12 changed files with 124 additions and 67 deletions
Download patch file Download diff file Expand all files Collapse all files

3
include/grub/i386/coreboot/memory.h
View file

@ -24,6 +24,7 @@
#include <grub/i386/pc/memory.h>
#ifndef ASM_FILE
#include <grub/err.h>
#include <grub/types.h>
#endif
@ -61,7 +62,7 @@ typedef struct grub_linuxbios_mem_region *mem_region_t;
void grub_machine_mmap_init (void);
void EXPORT_FUNC(grub_machine_mmap_iterate)
grub_err_t EXPORT_FUNC(grub_machine_mmap_iterate)
(int NESTED_FUNC_ATTR (*hook) (grub_uint64_t, grub_uint64_t, grub_uint32_t));
#endif

3
include/grub/i386/pc/memory.h
View file

@ -24,6 +24,7 @@
#include <grub/machine/machine.h>
#ifndef ASM_FILE
#include <grub/types.h>
#include <grub/err.h>
#endif
/* The scratch buffer used in real mode code. */
@ -94,7 +95,7 @@ struct grub_machine_mmap_entry
grub_uint32_t type;
} __attribute__((packed));
void EXPORT_FUNC(grub_machine_mmap_iterate)
grub_err_t EXPORT_FUNC(grub_machine_mmap_iterate)
(int NESTED_FUNC_ATTR (*hook) (grub_uint64_t, grub_uint64_t, grub_uint32_t));
#endif

4
include/grub/ieee1275/ieee1275.h
View file

@ -167,8 +167,8 @@ grub_err_t EXPORT_FUNC(grub_devalias_iterate)
(int (*hook) (struct grub_ieee1275_devalias *alias));
grub_err_t EXPORT_FUNC(grub_children_iterate) (char *devpath,
int (*hook) (struct grub_ieee1275_devalias *alias));
grub_err_t EXPORT_FUNC(grub_available_iterate)
(int NESTED_FUNC_ATTR (*hook) (grub_uint64_t, grub_uint64_t));
grub_err_t EXPORT_FUNC(grub_machine_mmap_iterate)
(int NESTED_FUNC_ATTR (*hook) (grub_uint64_t, grub_uint64_t, grub_uint32_t));
int EXPORT_FUNC(grub_claimmap) (grub_addr_t addr, grub_size_t size);
char *EXPORT_FUNC(grub_ieee1275_encode_devname) (const char *path);