diff options
| author | Andree Buschmann <AndreeBuschmann@t-online.de> | 2011-02-02 17:43:32 +0000 |
|---|---|---|
| committer | Andree Buschmann <AndreeBuschmann@t-online.de> | 2011-02-02 17:43:32 +0000 |
| commit | 5d849a963e562d1996c20cd72228835276288141 (patch) | |
| tree | 8c96a2524f6c1b6d714506a8d012a9c7ded24918 /apps/plugins | |
| parent | 35bcdef1441519bb66a77b675013309ef39e9eec (diff) | |
| download | rockbox-5d849a963e562d1996c20cd72228835276288141.tar.gz 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/plugins')
| -rw-r--r-- | apps/plugins/rockboy/rockboy.c | 2 | ||||
| -rw-r--r-- | apps/plugins/wavplay.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/apps/plugins/rockboy/rockboy.c b/apps/plugins/rockboy/rockboy.c index 01a706be45..4dc88fdf5a 100644 --- a/apps/plugins/rockboy/rockboy.c +++ b/apps/plugins/rockboy/rockboy.c | |||
| @@ -430,7 +430,7 @@ enum plugin_status plugin_start(const void* parameter) | |||
| 430 | = rb->plugin_get_audio_buffer(&audio_buffer_free); | 430 | = rb->plugin_get_audio_buffer(&audio_buffer_free); |
| 431 | plugbuf=false; | 431 | plugbuf=false; |
| 432 | } | 432 | } |
| 433 | #if MEM <= 8 && (CONFIG_PLATFORM & PLATFORM_NATIVE) | 433 | #if MEMORYSIZE <= 8 && (CONFIG_PLATFORM & PLATFORM_NATIVE) |
| 434 | /* loaded as an overlay plugin, protect from overwriting ourselves */ | 434 | /* loaded as an overlay plugin, protect from overwriting ourselves */ |
| 435 | if ((unsigned)(plugin_start_addr - (unsigned char *)audio_bufferbase) | 435 | if ((unsigned)(plugin_start_addr - (unsigned char *)audio_bufferbase) |
| 436 | < audio_buffer_free) | 436 | < audio_buffer_free) |
diff --git a/apps/plugins/wavplay.c b/apps/plugins/wavplay.c index 887c5cdd55..073af31280 100644 --- a/apps/plugins/wavplay.c +++ b/apps/plugins/wavplay.c | |||
| @@ -3600,7 +3600,7 @@ int play_file(char* filename) | |||
| 3600 | wanted = MIN(free_space, aud_size - aud_write); | 3600 | wanted = MIN(free_space, aud_size - aud_write); |
| 3601 | #if (CONFIG_STORAGE & STORAGE_MMC) | 3601 | #if (CONFIG_STORAGE & STORAGE_MMC) |
| 3602 | wanted = MIN(wanted, 256*1024); | 3602 | wanted = MIN(wanted, 256*1024); |
| 3603 | #elif MEM == 8 | 3603 | #elif MEMORYSIZE == 8 |
| 3604 | wanted = MIN(wanted, 1024*1024); | 3604 | wanted = MIN(wanted, 1024*1024); |
| 3605 | #endif | 3605 | #endif |
| 3606 | if (available() < low_water) | 3606 | if (available() < low_water) |