Make the getmemsize() prototype available in memsizes.h, for code that

doesn't want to go to the hassle of processing a full memory map.

1 files changed, 11 insertions, 30 deletions

diff --git a/src/arch/i386/include/memsizes.h b/src/arch/i386/include/memsizes.h
index e64009ea7..6222fd66b 100644
--- a/src/arch/i386/include/memsizes.h
+++ b/src/arch/i386/include/memsizes.h
@@ -1,36 +1,17 @@
-#ifndef MEMSIZES_H
-#define MEMSIZES_H
+#ifndef _MEMSIZES_H
+#define _MEMSIZES_H
 
-#warning "This header is no longer functional; use memmap.h instead"
+#include <basemem.h>
 
-/*
- * These structures seem to be very i386 (and, in fact, PCBIOS)
- * specific, so I've moved them out of etherboot.h.
+/**
+ * Get size of base memory from BIOS free base memory counter
  *
+ * @ret basemem		Base memory size, in kB
  */
+static inline unsigned int basememsize ( void ) {
+	return get_fbms();
+}
 
-struct e820entry {
-	uint64_t addr;
-	uint64_t size;
-	uint32_t type;
-#define E820_RAM	1
-#define E820_RESERVED	2
-#define E820_ACPI	3 /* usable as RAM once ACPI tables have been read */
-#define E820_NVS	4
-} __attribute__ (( packed ));
-#define E820ENTRY_SIZE 20
-#define E820MAX 32
+extern unsigned int extmemsize ( void );
 
-struct meminfo {
-	uint16_t basememsize;
-	uint16_t pad;
-	uint32_t memsize;
-	uint32_t map_count;
-	struct e820entry map[E820MAX];
-} __attribute__ (( packed ));
-
-extern struct meminfo meminfo;
-
-extern void get_memsizes ( void );
-
-#endif /* MEMSIZES_H */
+#endif /* _MEMSIZES_H */