[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>

2 files changed, 26 insertions, 36 deletions

diff --git a/src/include/ipxe/io.h b/src/include/ipxe/io.h
index 5bfd89987..b4d88fe89 100644
--- a/src/include/ipxe/io.h
+++ b/src/include/ipxe/io.h
@@ -503,4 +503,30 @@ void mb ( void );
 #define rmb()	mb()
 #define wmb()	mb()
 
+/** 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;
+};
+
+/**
+ * Get memory map
+ *
+ * @v memmap		Memory map to fill in
+ */
+void get_memmap ( struct memory_map *memmap );
+
 #endif /* _IPXE_IO_H */
diff --git a/src/include/ipxe/memmap.h b/src/include/ipxe/memmap.h
deleted file mode 100644
index cfd3fe9dc..000000000
--- a/src/include/ipxe/memmap.h
+++ /dev/null
@@ -1,36 +0,0 @@
-#ifndef _IPXE_MEMMAP_H
-#define _IPXE_MEMMAP_H
-
-#include <stdint.h>
-
-/**
- * @file
- *
- * Memory mapping
- *
- */
-
-FILE_LICENCE ( GPL2_OR_LATER );
-
-/** 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 /* _IPXE_MEMMAP_H */