aboutsummaryrefslogtreecommitdiffstats
path: root/com32/gplinclude/memory.h
diff options
context:
space:
mode:
authorErwan Velu <erwan.velu@free.fr>2009-11-24 10:26:28 +0100
committerErwan Velu <erwan.velu@free.fr>2009-11-24 10:26:28 +0100
commita06075995c5ea9c4c473820cba03033e9c945a41 (patch)
tree3aa4e444c8d57c7305ab989b7b5af2e1da601c01 /com32/gplinclude/memory.h
parent990205b434e7652c835cdb2dd86ef1c43eab7b44 (diff)
parentd8cf54da28e566e73809d772a65b8a1cb1b81f9c (diff)
downloadsyslinux-a06075995c5ea9c4c473820cba03033e9c945a41.tar.gz
syslinux-a06075995c5ea9c4c473820cba03033e9c945a41.tar.xz
syslinux-a06075995c5ea9c4c473820cba03033e9c945a41.zip
Merge branch 'master' of ssh://terminus.zytor.com//pub/git/users/erwan/hdt
Diffstat (limited to 'com32/gplinclude/memory.h')
-rw-r--r--com32/gplinclude/memory.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/com32/gplinclude/memory.h b/com32/gplinclude/memory.h
index 9157792f..1fee1782 100644
--- a/com32/gplinclude/memory.h
+++ b/com32/gplinclude/memory.h
@@ -43,6 +43,9 @@ void get_type(int, char*, int);
void detect_memory_e820(struct e820entry *desc, int size_map, int *size_found);
int detect_memory_e801(int*, int*);
int detect_memory_88(int*);
+
+/* The following stuff could be merge once the addr_t will be set to 64bits.
+ * syslinux_scan_memory can be used for that purpose */
unsigned long memsize_e820(struct e820entry *e820, int e820_nr);
int sanitize_e820_map(struct e820entry *orig_map, struct e820entry *new_bios, short old_nr);
unsigned long detect_memsize(void);