diff options
| author | Michael Brown | 2007-01-11 15:08:44 +0100 |
|---|---|---|
| committer | Michael Brown | 2007-01-11 15:08:44 +0100 |
| commit | c980cdd0aadc6ab781511bf18107a18879a8af38 (patch) | |
| tree | a422db3b3384d608cd94746d5319a0959498dfce /src/arch | |
| parent | Add phys_to_user() and copy_user(). (diff) | |
| download | ipxe-c980cdd0aadc6ab781511bf18107a18879a8af38.tar.gz ipxe-c980cdd0aadc6ab781511bf18107a18879a8af38.tar.xz ipxe-c980cdd0aadc6ab781511bf18107a18879a8af38.zip | |
Move memmap.h out of arch/i386; it no longer contains anything
architecture-dependent and is needed by the ELF code.
Diffstat (limited to 'src/arch')
| -rw-r--r-- | src/arch/i386/core/relocate.c | 2 | ||||
| -rw-r--r-- | src/arch/i386/firmware/pcbios/memmap.c | 2 | ||||
| -rw-r--r-- | src/arch/i386/include/memmap.h | 34 |
3 files changed, 2 insertions, 36 deletions
diff --git a/src/arch/i386/core/relocate.c b/src/arch/i386/core/relocate.c index c9ac7ee12..d3b42d0da 100644 --- a/src/arch/i386/core/relocate.c +++ b/src/arch/i386/core/relocate.c @@ -1,6 +1,6 @@ #include <io.h> #include <registers.h> -#include <memmap.h> +#include <gpxe/memmap.h> /* * Originally by Eric Biederman diff --git a/src/arch/i386/firmware/pcbios/memmap.c b/src/arch/i386/firmware/pcbios/memmap.c index daa1d99cc..6bbb22aca 100644 --- a/src/arch/i386/firmware/pcbios/memmap.c +++ b/src/arch/i386/firmware/pcbios/memmap.c @@ -20,7 +20,7 @@ #include <errno.h> #include <realmode.h> #include <bios.h> -#include <memmap.h> +#include <gpxe/memmap.h> /** * @file diff --git a/src/arch/i386/include/memmap.h b/src/arch/i386/include/memmap.h deleted file mode 100644 index ccba14b68..000000000 --- a/src/arch/i386/include/memmap.h +++ /dev/null @@ -1,34 +0,0 @@ -#ifndef _MEMMAP_H -#define _MEMMAP_H - -#include <stdint.h> - -/** - * @file - * - * Memory mapping - * - */ - -/** A usable memory region */ -struct memory_region { - /** Physical start address */ - uint64_t start; - /** Physical end address */ - uint64_t end; -}; - -/** Maximum number of memory regions we expect to encounter */ -#define MAX_MEMORY_REGIONS 8 - -/** A memory map */ -struct memory_map { - /** Memory regions */ - struct memory_region regions[MAX_MEMORY_REGIONS]; - /** Number of used regions */ - unsigned int count; -}; - -extern void get_memmap ( struct memory_map *memmap ); - -#endif /* _MEMMAP_H */ |