aboutsummaryrefslogtreecommitdiff
path: root/src/util.h
diff options
context:
space:
mode:
authorKevin O'Connor <kevin@koconnor.net>2010-07-26 22:43:18 -0400
committerKevin O'Connor <kevin@koconnor.net>2010-07-26 22:43:18 -0400
commita576c9c8ca919d9e8435b49600265e5914f84bac (patch)
tree31a669c27237bf88c954e9c33a4bcfb3c4d36ce6 /src/util.h
parent9fd485148dedfe080831fedb2ad7bf5959766c42 (diff)
downloadseabios-hppa-a576c9c8ca919d9e8435b49600265e5914f84bac.zip
seabios-hppa-a576c9c8ca919d9e8435b49600265e5914f84bac.tar.gz
seabios-hppa-a576c9c8ca919d9e8435b49600265e5914f84bac.tar.bz2
Bootsplash fixes and cleanups.
VESA structs must be in first 1Meg - so use malloc_tmplow(). Use 'struct segoff_s' for segment/offset pairs in vesa structs. Don't call start/finish_preempt() around jpeg_decode() - the preempt only works when calling functions in 16bit mode. Some indentation and debug output enhancements.
Diffstat (limited to 'src/util.h')
-rw-r--r--src/util.h5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/util.h b/src/util.h
index 63999e0..45896c6 100644
--- a/src/util.h
+++ b/src/util.h
@@ -414,6 +414,9 @@ static inline void *malloc_high(u32 size) {
static inline void *malloc_fseg(u32 size) {
return pmm_malloc(&ZoneFSeg, PMM_DEFAULT_HANDLE, size, MALLOC_MIN_ALIGN);
}
+static inline void *malloc_tmplow(u32 size) {
+ return pmm_malloc(&ZoneTmpLow, PMM_DEFAULT_HANDLE, size, MALLOC_MIN_ALIGN);
+}
static inline void *malloc_tmphigh(u32 size) {
return pmm_malloc(&ZoneTmpHigh, PMM_DEFAULT_HANDLE, size, MALLOC_MIN_ALIGN);
}
@@ -421,7 +424,7 @@ static inline void *malloc_tmp(u32 size) {
void *ret = malloc_tmphigh(size);
if (ret)
return ret;
- return pmm_malloc(&ZoneTmpLow, PMM_DEFAULT_HANDLE, size, MALLOC_MIN_ALIGN);
+ return malloc_tmplow(size);
}
static inline void *memalign_low(u32 align, u32 size) {
return pmm_malloc(&ZoneLow, PMM_DEFAULT_HANDLE, size, align);