diff options
| author | Thomas Martitz <kugel@rockbox.org> | 2010-11-05 19:12:23 +0000 |
|---|---|---|
| committer | Thomas Martitz <kugel@rockbox.org> | 2010-11-05 19:12:23 +0000 |
| commit | 5411e14c57185b2b33fbfbb7ff7fec8ca2700551 (patch) | |
| tree | 41149a1100c3ba708e0065cd7409c2e14ac976b2 /apps/gui | |
| parent | d98f2929e9c07505056d846d1d309f1e16694ce7 (diff) | |
| download | rockbox-5411e14c57185b2b33fbfbb7ff7fec8ca2700551.zip rockbox-5411e14c57185b2b33fbfbb7ff7fec8ca2700551.tar.gz rockbox-5411e14c57185b2b33fbfbb7ff7fec8ca2700551.tar.bz2 rockbox-5411e14c57185b2b33fbfbb7ff7fec8ca2700551.tar.xz | |
Undo the part of r28480 that caused the simulator to also use host malloc.
We want simulators to simulate target code where possible, that includes memory constraints and memory allocation schemes. It also removed the sim's ability to show the theme's ram usage.
Use malloc only in application builds.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@28498 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/gui')
| -rw-r--r-- | apps/gui/skin_engine/skin_engine.c | 12 | ||||
| -rw-r--r-- | apps/gui/skin_engine/skin_parser.c | 6 |
2 files changed, 9 insertions, 9 deletions
diff --git a/apps/gui/skin_engine/skin_engine.c b/apps/gui/skin_engine/skin_engine.c index 960bbdb..25baeb2 100644 --- a/apps/gui/skin_engine/skin_engine.c +++ b/apps/gui/skin_engine/skin_engine.c @@ -40,18 +40,18 @@ static bool skins_initialising = true; -/* Hosted platforms use the host malloc to manage the buffer */ -#if ((CONFIG_PLATFORM&PLATFORM_HOSTED) == 0) -static char *skin_buffer = NULL; +/* App uses the host malloc to manage the buffer */ +#ifdef APPLICATION +#define skin_buffer NULL void theme_init_buffer(void) { - skin_buffer = buffer_alloc(SKIN_BUFFER_SIZE); skins_initialising = false; } -#else -#define skin_buffer NULL +#else +static char *skin_buffer = NULL; void theme_init_buffer(void) { + skin_buffer = buffer_alloc(SKIN_BUFFER_SIZE); skins_initialising = false; } #endif diff --git a/apps/gui/skin_engine/skin_parser.c b/apps/gui/skin_engine/skin_parser.c index c0ea3e3..ad3e7e4 100644 --- a/apps/gui/skin_engine/skin_parser.c +++ b/apps/gui/skin_engine/skin_parser.c @@ -1613,13 +1613,13 @@ bool skin_data_load(enum screen_type screen, struct wps_data *wps_data, wps_data->backdrop_id = -1; #endif /* parse the skin source */ -#if ((CONFIG_PLATFORM&PLATFORM_HOSTED) == 0) +#ifndef APPLICATION skin_buffer_save_position(); #endif wps_data->tree = skin_parse(wps_buffer, skin_element_callback, wps_data); if (!wps_data->tree) { skin_data_reset(wps_data); -#if ((CONFIG_PLATFORM&PLATFORM_HOSTED) == 0) +#ifndef APPLICATION skin_buffer_restore_position(); #endif return false; @@ -1643,7 +1643,7 @@ bool skin_data_load(enum screen_type screen, struct wps_data *wps_data, !skin_load_fonts(wps_data)) { skin_data_reset(wps_data); -#if ((CONFIG_PLATFORM&PLATFORM_HOSTED) == 0) +#ifndef APPLICATION skin_buffer_restore_position(); #endif return false; |