diff options
| author | Adrian Lees <adrian@aemulor.com> | 2005-06-26 23:24:03 +0000 |
|---|---|---|
| committer | Adrian Lees <adrian@aemulor.com> | 2005-06-26 23:24:03 +0000 |
| commit | ba6f228418e2698f48c5d7460ba7a7e12e2cf5b8 (patch) | |
| tree | f2f99de3ad3bd2e2e3d1e233ca1a8c5f6b888a53 | |
| parent | 20e3c010588f4ba7e4a1b7e2e4cc9a861ba3b368 (diff) | |
| download | netsurf-ba6f228418e2698f48c5d7460ba7a7e12e2cf5b8.tar.gz netsurf-ba6f228418e2698f48c5d7460ba7a7e12e2cf5b8.tar.bz2 | |
[project @ 2005-06-26 23:24:03 by adrianl]
Fix calculation of available memory
svn path=/import/netsurf/; revision=1769
| -rw-r--r-- | riscos/bitmap.c | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/riscos/bitmap.c b/riscos/bitmap.c index a29cc1229..f24ea06f6 100644 --- a/riscos/bitmap.c +++ b/riscos/bitmap.c @@ -88,23 +88,28 @@ void bitmap_delete_file(struct bitmap *bitmap); void bitmap_initialise_memory(void) { int available_memory, direct_size, compressed_size; - int next_slot, free_slot; + int free_slot; os_error *error; - /* calculate how much memory is currently free */ - error = xwimp_slot_size(-1, -1, 0, &next_slot, &free_slot); + /* calculate how much memory is currently free + (Note that the free_slot returned by wimp_slot_size + includes the next_slot; the value displayed by the + TaskManager has been adjusted to make it more logical + for the user). + */ + error = xwimp_slot_size(-1, -1, 0, NULL, &free_slot); if (error) { LOG(("xwimp_slot_size: 0x%x: %s", error->errnum, error->errmess)); warn_user("WimpError", error->errmess); return; } - available_memory = next_slot + free_slot; - + available_memory = free_slot; + /* calculate our memory block sizes */ if (option_image_memory_direct == -1) { /* claim 20% of free memory - min 256KB, max 32768KB */ - direct_size = available_memory * 0.20; + direct_size = available_memory / 5; if (direct_size < (256 << 10)) direct_size = (256 << 10); if (direct_size > (32768 << 10)) |