summaryrefslogtreecommitdiffstats
path: root/apps/buffering.c
diff options
context:
space:
mode:
authorAndree Buschmann <AndreeBuschmann@t-online.de>2011-02-02 17:43:32 +0000
committerAndree Buschmann <AndreeBuschmann@t-online.de>2011-02-02 17:43:32 +0000
commit5d849a963e562d1996c20cd72228835276288141 (patch)
tree8c96a2524f6c1b6d714506a8d012a9c7ded24918 /apps/buffering.c
parent35bcdef1441519bb66a77b675013309ef39e9eec (diff)
downloadrockbox-5d849a963e562d1996c20cd72228835276288141.tar.gz
rockbox-5d849a963e562d1996c20cd72228835276288141.tar.bz2
rockbox-5d849a963e562d1996c20cd72228835276288141.zip
Clean up multiple definitions of RAM size. Remove -DMEM (make) and MEM (code), use the already defined MEMORYSIZE instead.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@29189 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/buffering.c')
-rw-r--r--apps/buffering.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/apps/buffering.c b/apps/buffering.c
index 46b6455178..8d41324190 100644
--- a/apps/buffering.c
+++ b/apps/buffering.c
@@ -119,7 +119,7 @@ static volatile size_t buf_ridx; /* current reading position */
/* Configuration */
static size_t conf_watermark = 0; /* Level to trigger filebuf fill */
-#if MEM > 8
+#if MEMORYSIZE > 8
static size_t high_watermark = 0; /* High watermark for rebuffer */
#endif
@@ -1509,7 +1509,7 @@ void buffering_thread(void)
#if 0
/* TODO: This needs to be fixed to use the idle callback, disable it
* for simplicity until its done right */
-#if MEM > 8
+#if MEMORYSIZE > 8
/* If the disk is spinning, take advantage by filling the buffer */
else if (storage_disk_is_active() && queue_empty(&buffering_queue))
{
@@ -1589,7 +1589,7 @@ bool buffering_reset(char *buf, size_t buflen)
base_handle_id = -1;
/* Set the high watermark as 75% full...or 25% empty :) */
-#if MEM > 8
+#if MEMORYSIZE > 8
high_watermark = 3*buflen / 4;
#endif