From 1f9a35369b7ce207caa92874dacdc2579579480c Mon Sep 17 00:00:00 2001 From: Richard Wilson Date: Mon, 2 Jan 2006 02:52:53 +0000 Subject: [project @ 2006-01-02 02:52:53 by rjw] Allow dynamic memory configuration. svn path=/import/netsurf/; revision=1938 --- riscos/bitmap.c | 13 +++++-------- riscos/bitmap.h | 8 ++++++++ riscos/configure.c | 4 +++- riscos/configure.h | 1 - 4 files changed, 16 insertions(+), 10 deletions(-) (limited to 'riscos') diff --git a/riscos/bitmap.c b/riscos/bitmap.c index eadff03dd..45a7372b7 100644 --- a/riscos/bitmap.c +++ b/riscos/bitmap.c @@ -110,8 +110,8 @@ void bitmap_initialise_memory(void) /* calculate our memory block sizes */ if (option_image_memory_direct == -1) { - /* claim 20% of free memory - min 256KB, max 32768KB */ - direct_size = available_memory / 5; + /* claim 25% of free memory - min 256KB, max 32768KB */ + direct_size = available_memory / 4; if (direct_size < (256 << 10)) direct_size = (256 << 10); if (direct_size > (32768 << 10)) @@ -120,8 +120,8 @@ void bitmap_initialise_memory(void) direct_size = (option_image_memory_direct << 10); } if (option_image_memory_compressed == -1) { - /* claim 5% of free memory - min 256KB, max 4192KB */ - compressed_size = available_memory / 20; + /* claim 10% of free memory - min 256KB, max 4192KB */ + compressed_size = available_memory / 10; if (compressed_size < (256 << 10)) compressed_size = 0; if (compressed_size > (4192 << 10)) @@ -133,10 +133,7 @@ void bitmap_initialise_memory(void) /* set our values. No fixed buffers here, ho hum. */ bitmap_direct_size = direct_size; bitmap_compressed_size = compressed_size; - LOG(("Allowing %iKB of memory for compressed images.", - (bitmap_compressed_size >> 10))); - LOG(("Allowing %iKB of memory for uncompressed images.", - (bitmap_direct_size >> 10))); + bitmap_maintenance = bitmap_maintenance_priority = true; } diff --git a/riscos/bitmap.h b/riscos/bitmap.h index a43c3a6bf..840660a73 100644 --- a/riscos/bitmap.h +++ b/riscos/bitmap.h @@ -41,5 +41,13 @@ extern bool bitmap_maintenance; */ extern bool bitmap_maintenance_priority; +/** Maximum amount of memory for direct images +*/ +extern unsigned int bitmap_direct_size; + +/** Total size of compressed area +*/ +extern unsigned int bitmap_compressed_size; + #endif diff --git a/riscos/configure.c b/riscos/configure.c index 18411ef30..565274861 100644 --- a/riscos/configure.c +++ b/riscos/configure.c @@ -62,10 +62,12 @@ void ro_gui_configure_initialise(void) { ro_gui_wimp_event_set_help_prefix(dialog_zoom, "HelpConfigure"); /* add in our option windows */ - for (int i = 0; i < 12; i++) ro_gui_configure_register("con_fonts", ro_gui_options_fonts_initialise, ro_gui_wimp_event_finalise); + ro_gui_configure_register("con_memory", + ro_gui_options_memory_initialise, + ro_gui_wimp_event_finalise); } void ro_gui_configure_show(void) { diff --git a/riscos/configure.h b/riscos/configure.h index 322391420..5e040d533 100644 --- a/riscos/configure.h +++ b/riscos/configure.h @@ -25,5 +25,4 @@ void ro_gui_configure_initialise(void); void ro_gui_configure_show(void); void ro_gui_configure_register(const char *window, bool (*initialise)(wimp_w w), void (*finalise)(wimp_w w)); - #endif -- cgit v1.2.3