mirror of
https://github.com/ipxe/ipxe
synced 2025-12-28 02:28:57 +03:00
[ioapi] Move get_memmap() to the I/O API group
pcbios specific get_memmap() is used by the b44 driver making all-drivers builds fail on other platforms. Move it to the I/O API group and provide a dummy implementation on EFI. Signed-off-by: Piotr Jaroszyński <p.jaroszynski@gmail.com> Signed-off-by: Michael Brown <mcb30@ipxe.org>
This commit is contained in:
committed by
Michael Brown
parent
e3c7a1948d
commit
5bbad9c8f0
@@ -1,6 +1,5 @@
|
||||
#include <ipxe/io.h>
|
||||
#include <registers.h>
|
||||
#include <ipxe/memmap.h>
|
||||
|
||||
/*
|
||||
* Originally by Eric Biederman
|
||||
|
||||
@@ -23,7 +23,7 @@ FILE_LICENCE ( GPL2_OR_LATER );
|
||||
#include <basemem.h>
|
||||
#include <fakee820.h>
|
||||
#include <ipxe/init.h>
|
||||
#include <ipxe/memmap.h>
|
||||
#include <ipxe/io.h>
|
||||
#include <ipxe/hidemem.h>
|
||||
|
||||
/** Set to true if you want to test a fake E820 map */
|
||||
|
||||
@@ -23,7 +23,7 @@ FILE_LICENCE ( GPL2_OR_LATER );
|
||||
#include <realmode.h>
|
||||
#include <bios.h>
|
||||
#include <memsizes.h>
|
||||
#include <ipxe/memmap.h>
|
||||
#include <ipxe/io.h>
|
||||
|
||||
/**
|
||||
* @file
|
||||
@@ -282,7 +282,7 @@ static int meme820 ( struct memory_map *memmap ) {
|
||||
*
|
||||
* @v memmap Memory map to fill in
|
||||
*/
|
||||
void get_memmap ( struct memory_map *memmap ) {
|
||||
void x86_get_memmap ( struct memory_map *memmap ) {
|
||||
unsigned int basemem, extmem;
|
||||
int rc;
|
||||
|
||||
@@ -310,3 +310,5 @@ void get_memmap ( struct memory_map *memmap ) {
|
||||
memmap->regions[1].end = 0x100000 + ( extmem * 1024 );
|
||||
memmap->count = 2;
|
||||
}
|
||||
|
||||
PROVIDE_IOAPI ( x86, get_memmap, x86_get_memmap );
|
||||
|
||||
@@ -38,7 +38,7 @@ FILE_LICENCE ( GPL2_OR_LATER );
|
||||
#include <ipxe/image.h>
|
||||
#include <ipxe/segment.h>
|
||||
#include <ipxe/init.h>
|
||||
#include <ipxe/memmap.h>
|
||||
#include <ipxe/io.h>
|
||||
|
||||
struct image_type com32_image_type __image_type ( PROBE_NORMAL );
|
||||
|
||||
|
||||
@@ -33,7 +33,7 @@ FILE_LICENCE ( GPL2_OR_LATER );
|
||||
#include <ipxe/uaccess.h>
|
||||
#include <ipxe/image.h>
|
||||
#include <ipxe/segment.h>
|
||||
#include <ipxe/memmap.h>
|
||||
#include <ipxe/io.h>
|
||||
#include <ipxe/elf.h>
|
||||
#include <ipxe/init.h>
|
||||
#include <ipxe/features.h>
|
||||
|
||||
@@ -25,7 +25,7 @@ FILE_LICENCE ( GPL2_OR_LATER );
|
||||
#include <assert.h>
|
||||
#include <ipxe/list.h>
|
||||
#include <ipxe/blockdev.h>
|
||||
#include <ipxe/memmap.h>
|
||||
#include <ipxe/io.h>
|
||||
#include <realmode.h>
|
||||
#include <bios.h>
|
||||
#include <biosint.h>
|
||||
|
||||
@@ -29,7 +29,7 @@ FILE_LICENCE ( GPL2_OR_LATER );
|
||||
#include <errno.h>
|
||||
#include <ipxe/uaccess.h>
|
||||
#include <ipxe/hidemem.h>
|
||||
#include <ipxe/memmap.h>
|
||||
#include <ipxe/io.h>
|
||||
#include <ipxe/umalloc.h>
|
||||
|
||||
/** Alignment of external allocated memory */
|
||||
|
||||
Reference in New Issue
Block a user