diff options
author | Kevin O'Connor <kevin@koconnor.net> | 2013-08-14 23:37:56 -0400 |
---|---|---|
committer | Kevin O'Connor <kevin@koconnor.net> | 2013-08-14 23:37:56 -0400 |
commit | 915f64aee37159d21760d44cdc5778220468fe0b (patch) | |
tree | 6e817616cd23646829ef45bf394a64e307858972 /src | |
parent | f96ff4484d1b49740c643c3cc5ff613fc0828e0f (diff) | |
download | seabios-hppa-915f64aee37159d21760d44cdc5778220468fe0b.zip seabios-hppa-915f64aee37159d21760d44cdc5778220468fe0b.tar.gz seabios-hppa-915f64aee37159d21760d44cdc5778220468fe0b.tar.bz2 |
Minor - simplify rom_reserve().
Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
Diffstat (limited to 'src')
-rw-r--r-- | src/pmm.c | 17 |
1 files changed, 7 insertions, 10 deletions
@@ -348,17 +348,14 @@ rom_get_last(void) struct rom_header * rom_reserve(u32 size) { - if (!CONFIG_MALLOC_UPPERMEMORY) { - if (RomEnd + size > rom_get_max()) - return NULL; - return (void*)RomEnd; - } - u32 newend = ALIGN(RomEnd + size, OPTION_ROM_ALIGN) + OPROM_HEADER_RESERVE; - if (newend > (u32)RomBase->allocend) + u32 newend = ALIGN(RomEnd + size, OPTION_ROM_ALIGN); + if (newend > rom_get_max()) return NULL; - if (newend < (u32)zonelow_base + OPROM_HEADER_RESERVE) - newend = (u32)zonelow_base + OPROM_HEADER_RESERVE; - RomBase->data = RomBase->dataend = (void*)newend; + if (CONFIG_MALLOC_UPPERMEMORY) { + if (newend < (u32)zonelow_base) + newend = (u32)zonelow_base; + RomBase->data = RomBase->dataend = (void*)newend + OPROM_HEADER_RESERVE; + } return (void*)RomEnd; } |