aboutsummaryrefslogtreecommitdiffstats
path: root/com32
diff options
context:
space:
mode:
authorroot <root@localhost.localdomain>2009-11-23 22:04:05 +0100
committerroot <root@localhost.localdomain>2009-11-23 22:04:05 +0100
commitd8cf54da28e566e73809d772a65b8a1cb1b81f9c (patch)
treea80160e49b0eb4b2f05ef5781278e127b50adb66 /com32
parent219c2a3ea81917d4c80814dce2c58f85dbcf2cf9 (diff)
downloadsyslinux-d8cf54da28e566e73809d772a65b8a1cb1b81f9c.tar.gz
syslinux-d8cf54da28e566e73809d772a65b8a1cb1b81f9c.tar.xz
syslinux-d8cf54da28e566e73809d772a65b8a1cb1b81f9c.zip
memory: Commenting workaround
Impact: none HDT is using a memory detection code which duplicates some syslinux code. Once addr_t will be moved into 64bit, this can be removed by using syslinux_scan_memory().
Diffstat (limited to 'com32')
-rw-r--r--com32/gplinclude/memory.h3
-rw-r--r--com32/gpllib/memory.c8
2 files changed, 10 insertions, 1 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);
diff --git a/com32/gpllib/memory.c b/com32/gpllib/memory.c
index 4bf7ba7d..52ca3523 100644
--- a/com32/gpllib/memory.c
+++ b/com32/gpllib/memory.c
@@ -222,7 +222,9 @@ int detect_memory_88(int* mem_size)
* the syslinux environement.
* Some e820 responses include overlapping entries. The following
* replaces the original e820 map with a new one, removing overlaps.
- *
+ *
+ * The following stuff could be merge once the addr_t will be set to 64bits.
+ * syslinux_scan_memory can be used for that purpose
*/
int sanitize_e820_map(struct e820entry *orig_map, struct e820entry *new_bios,
short old_nr)
@@ -375,6 +377,8 @@ int sanitize_e820_map(struct e820entry *orig_map, struct e820entry *new_bios,
return(new_bios_entry);
}
+/* 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 detect_memsize(void) {
unsigned long memory_size=0;
@@ -399,6 +403,8 @@ unsigned long detect_memsize(void) {
return 0;
}
+/* 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 i, n, nr;
unsigned long memory_size=0;