aboutsummaryrefslogtreecommitdiffstats
path: root/com32/lib
diff options
context:
space:
mode:
authorMatt Fleming <matt.fleming@intel.com>2013-07-15 17:31:48 +0100
committerMatt Fleming <matt.fleming@intel.com>2013-07-17 18:10:42 +0100
commit6252212849d945450310248b656dfb6f13f5de48 (patch)
tree3b52d346e2020fa9106d705ef2e2e33085bed4b1 /com32/lib
parent93e143290383556345586cc23c01fd17ba334aff (diff)
downloadsyslinux-6252212849d945450310248b656dfb6f13f5de48.tar.gz
syslinux-6252212849d945450310248b656dfb6f13f5de48.tar.xz
syslinux-6252212849d945450310248b656dfb6f13f5de48.zip
zonelist: rename syslinux_memmap_find()...
to syslinux_memmap_find_type(), which more accurately reflects its function and frees up the old name for another use. Signed-off-by: Matt Fleming <matt.fleming@intel.com>
Diffstat (limited to 'com32/lib')
-rw-r--r--com32/lib/syslinux/shuffle_pm.c2
-rw-r--r--com32/lib/syslinux/shuffle_rm.c4
-rw-r--r--com32/lib/syslinux/zonelist.c6
3 files changed, 6 insertions, 6 deletions
diff --git a/com32/lib/syslinux/shuffle_pm.c b/com32/lib/syslinux/shuffle_pm.c
index 5e3183b7..96c055c6 100644
--- a/com32/lib/syslinux/shuffle_pm.c
+++ b/com32/lib/syslinux/shuffle_pm.c
@@ -52,7 +52,7 @@ int syslinux_shuffle_boot_pm(struct syslinux_movelist *fraglist,
regstub = 0x800; /* Locate anywhere above this point */
stublen = sizeof handoff_code;
- rv = syslinux_memmap_find(tmap, SMT_FREE, &regstub, &stublen, 1);
+ rv = syslinux_memmap_find_type(tmap, SMT_FREE, &regstub, &stublen, 1);
syslinux_free_memmap(tmap);
if (rv)
return -1;
diff --git a/com32/lib/syslinux/shuffle_rm.c b/com32/lib/syslinux/shuffle_rm.c
index a7d16d63..9935f4cd 100644
--- a/com32/lib/syslinux/shuffle_rm.c
+++ b/com32/lib/syslinux/shuffle_rm.c
@@ -105,7 +105,7 @@ int syslinux_shuffle_boot_rm(struct syslinux_movelist *fraglist,
*/
regstub = 0x800;
stublen = sizeof handoff_code;
- rv = syslinux_memmap_find(tmap, SMT_FREE, &regstub, &stublen, 16);
+ rv = syslinux_memmap_find_type(tmap, SMT_FREE, &regstub, &stublen, 16);
if (rv || (regstub > 0x100000 - sizeof handoff_code)) {
/*
@@ -116,7 +116,7 @@ int syslinux_shuffle_boot_rm(struct syslinux_movelist *fraglist,
*/
regstub = 0x510; /* Try the 0x5xx segment... */
stublen = sizeof handoff_code;
- rv = syslinux_memmap_find(tmap, SMT_FREE, &regstub, &stublen, 16);
+ rv = syslinux_memmap_find_type(tmap, SMT_FREE, &regstub, &stublen, 16);
if (!rv && (regstub > 0x100000 - sizeof handoff_code))
rv = -1; /* No acceptable memory found */
diff --git a/com32/lib/syslinux/zonelist.c b/com32/lib/syslinux/zonelist.c
index 7034c4be..d1510d2f 100644
--- a/com32/lib/syslinux/zonelist.c
+++ b/com32/lib/syslinux/zonelist.c
@@ -214,9 +214,9 @@ int syslinux_memmap_largest(struct syslinux_memmap *list,
* a certain minimum size, with an optional starting address.
* The input values of start and len are used as minima.
*/
-int syslinux_memmap_find(struct syslinux_memmap *list,
- enum syslinux_memmap_types type,
- addr_t * start, addr_t * len, addr_t align)
+int syslinux_memmap_find_type(struct syslinux_memmap *list,
+ enum syslinux_memmap_types type,
+ addr_t * start, addr_t * len, addr_t align)
{
addr_t min_start = *start;
addr_t min_len = *len;