nihilazo
/
rockbox
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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
This commit is contained in:
Andree Buschmann 2011-02-02 17:43:32 +00:00
parent 35bcdef144
commit 5d849a963e
26 changed files with 33 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
apps/buffering.c
View File

@ -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

4
apps/codecs.h
View File

@ -27,10 +27,6 @@
#define NO_REDEFINES_PLEASE
#endif
#ifndef MEM
#define MEM 2
#endif
#include <stdbool.h>
#include <stdlib.h>
#include "strlcpy.h"

2
apps/main.c
View File

@ -430,7 +430,7 @@ static void init(void)
system_init();
#if defined(IPOD_VIDEO)
audiobufend=(unsigned char *)audiobufend_lds;
if(MEM==64 && probed_ramsize!=64)
if(MEMORYSIZE==64 && probed_ramsize!=64)
{
audiobufend -= (32<<20);
}

4
apps/mpeg.c
View File

@ -1623,7 +1623,7 @@ static void mpeg_thread(void)
#if (CONFIG_STORAGE & STORAGE_MMC)
/* MMC is slow, so don't read too large chunks */
amount_to_read = MIN(0x40000, amount_to_read);
#elif MEM == 8
#elif MEMORYSIZE == 8
amount_to_read = MIN(0x100000, amount_to_read);
#endif
@ -1933,7 +1933,7 @@ static void mpeg_thread(void)
#if (CONFIG_STORAGE & STORAGE_MMC)
/* MMC is slow, so don't save too large chunks at once */
amount_to_save = MIN(0x40000, amount_to_save);
#elif MEM == 8
#elif MEMORYSIZE == 8
amount_to_save = MIN(0x100000, amount_to_save);
#endif
rc = write(mpeg_file, audiobuf + audiobuf_read,

4
apps/plugin.h
View File

@ -27,10 +27,6 @@
#define NO_REDEFINES_PLEASE
#endif
#ifndef MEM
#define MEM 2
#endif
#include <stdbool.h>
#include <inttypes.h>
#include <sys/types.h>

2
apps/plugins/rockboy/rockboy.c
View File

@ -430,7 +430,7 @@ enum plugin_status plugin_start(const void* parameter)
= rb->plugin_get_audio_buffer(&audio_buffer_free);
plugbuf=false;
}
#if MEM <= 8 && (CONFIG_PLATFORM & PLATFORM_NATIVE)
#if MEMORYSIZE <= 8 && (CONFIG_PLATFORM & PLATFORM_NATIVE)
/* loaded as an overlay plugin, protect from overwriting ourselves */
if ((unsigned)(plugin_start_addr - (unsigned char *)audio_bufferbase)
< audio_buffer_free)

2
apps/plugins/wavplay.c
View File

@ -3600,7 +3600,7 @@ int play_file(char* filename)
wanted = MIN(free_space, aud_size - aud_write);
#if (CONFIG_STORAGE & STORAGE_MMC)
wanted = MIN(wanted, 256*1024);
#elif MEM == 8
#elif MEMORYSIZE == 8
wanted = MIN(wanted, 1024*1024);
#endif
if (available() < low_water)

8
apps/recorder/pcm_record.c
View File

@ -131,7 +131,7 @@ static unsigned long pre_record_ticks; /* pre-record time in ticks */
****************************************************************************/
/** buffer parameters where incoming PCM data is placed **/
#if MEM <= 2
#if MEMORYSIZE <= 2
#define PCM_NUM_CHUNKS 16 /* Power of 2 */
#else
#define PCM_NUM_CHUNKS 256 /* Power of 2 */
@ -180,13 +180,13 @@ static int flood_watermark; /* boost thread priority when here */
#ifdef HAVE_PRIORITY_SCHEDULING
#define PRIO_SECONDS 10 /* max flush time before priority boost */
#endif
#if MEM <= 2
#if MEMORYSIZE <= 2
/* fractions must be integer fractions of 4 because they are evaluated with
* X*4*XXX_SECONDS, that way we avoid float calculation */
#define LOW_SECONDS 1/4 /* low watermark time till empty */
#define PANIC_SECONDS 1/2 /* flood watermark time until full */
#define FLUSH_SECONDS 1 /* flush watermark time until full */
#elif MEM <= 16
#elif MEMORYSIZE <= 16
#define LOW_SECONDS 1 /* low watermark time till empty */
#define PANIC_SECONDS 5 /* flood watermark time until full */
#define FLUSH_SECONDS 7 /* flush watermark time until full */
@ -194,7 +194,7 @@ static int flood_watermark; /* boost thread priority when here */
#define LOW_SECONDS 1 /* low watermark time till empty */
#define PANIC_SECONDS 8
#define FLUSH_SECONDS 10
#endif /* MEM */
#endif /* MEMORYSIZE */
/** encoder events **/
static void (*enc_events_callback)(enum enc_events event, void *data);

4
apps/settings_list.c
View File

@ -760,7 +760,7 @@ const struct settings_list settings[] = {
SYSTEM_SETTING(NVRAM(4), topruntime, 0),
INT_SETTING(F_BANFROMQS, max_files_in_playlist,
LANG_MAX_FILES_IN_PLAYLIST,
#if MEM > 1
#if MEMORYSIZE > 1
10000,
#else
400,
@ -768,7 +768,7 @@ const struct settings_list settings[] = {
"max files in playlist", UNIT_INT, 1000, 32000, 1000,
NULL, NULL, NULL),
INT_SETTING(F_BANFROMQS, max_files_in_dir, LANG_MAX_FILES_IN_DIR,
#if MEM > 1
#if MEMORYSIZE > 1
1000,
#else
200,

2
apps/talk.c
View File

@ -112,7 +112,7 @@ struct queue_entry /* one entry of the internal queue */
/* The MMC storage on the Ondios is slow enough that we want to buffer the
* talk clips only when they are needed */
# define TALK_PROGRESSIVE_LOAD
#elif CONFIG_CODEC == SWCODEC && MEM <= 2
#elif CONFIG_CODEC == SWCODEC && MEMORYSIZE <= 2
/* The entire voice file wouldn't fit in memory together with codecs, so we
* load clips each time they are accessed */
# define TALK_PARTIAL_LOAD

2
firmware/buffer.c
View File

@ -24,7 +24,7 @@
#include "logf.h"
#if (CONFIG_PLATFORM & PLATFORM_HOSTED)
unsigned char audiobuffer[(MEM*1024-256)*1024];
unsigned char audiobuffer[(MEMORYSIZE*1024-256)*1024];
unsigned char *audiobufend = audiobuffer + sizeof(audiobuffer);
#else
/* defined in linker script */

2
firmware/common/dir_uncached.c
View File

@ -28,7 +28,7 @@
#include "debug.h"
#include "filefuncs.h"
#if ((defined(MEMORYSIZE) && (MEMORYSIZE > 8)) || MEM > 8)
#if (MEMORYSIZE > 8)
#define MAX_OPEN_DIRS 12
#else
#define MAX_OPEN_DIRS 8

2
firmware/common/dircache.c
View File

@ -51,7 +51,7 @@
#define DIRCACHE_BUILD 1
#define DIRCACHE_STOP 2
#if ((defined(MEMORYSIZE) && (MEMORYSIZE > 8)) || MEM > 8)
#if (MEMORYSIZE > 8)
#define MAX_OPEN_DIRS 12
#else
#define MAX_OPEN_DIRS 8

2
firmware/drivers/ata.c
View File

@ -79,7 +79,7 @@
static unsigned int ata_thread_id = 0;
#endif
#if defined(MAX_PHYS_SECTOR_SIZE) && MEM == 64
#if defined(MAX_PHYS_SECTOR_SIZE) && MEMORYSIZE == 64
/* Hack - what's the deal with 5g? */
struct ata_lock
{

2
firmware/export/config/archosrecorder.h
View File

@ -80,7 +80,7 @@
#define BATTERY_CAPACITY_INC 50 /* capacity increment */
#define BATTERY_TYPES_COUNT 1 /* only one type */
#if MEM < 8
#if MEMORYSIZE < 8
#define CURRENT_NORMAL 145 /* usual current in mA */
#else
#define CURRENT_NORMAL 145 *100 / 122 /* assuming 192 kbps, the running time is 22% longer with 8MB */

2
firmware/export/imx31l.h
View File

@ -28,7 +28,7 @@
#define REG32_PTR_T volatile unsigned long *
/* Place in the section with the framebuffer */
#define TTB_BASE_ADDR (CSD0_BASE_ADDR + (MEM*0x100000) - TTB_SIZE)
#define TTB_BASE_ADDR (CSD0_BASE_ADDR + (MEMORYSIZE*0x100000) - TTB_SIZE)
#define TTB_SIZE (0x4000)
#define IRAM_SIZE (0x4000)
#define TTB_BASE ((unsigned long *)TTB_BASE_ADDR)

2
firmware/font.c
View File

@ -44,7 +44,7 @@
/* max static loadable font buffer size */
#ifndef MAX_FONT_SIZE
#if LCD_HEIGHT > 64
#if MEM > 2
#if MEMORYSIZE > 2
#define MAX_FONT_SIZE 60000
#else
#define MAX_FONT_SIZE 10000

2
firmware/target/arm/as3525/system-target.h
View File

@ -42,7 +42,7 @@
#define AS3525_UNCACHED_ADDR(a) ((typeof(a)) ((uintptr_t)(a) + 0x10000000))
#define AS3525_PHYSICAL_ADDR(a) \
((typeof(a)) ((((uintptr_t)(a)) & (MEM*0x100000)) \
((typeof(a)) ((((uintptr_t)(a)) & (MEMORYSIZE*0x100000)) \
? (((uintptr_t)(a)) - IRAM_ORIG) \
: ((uintptr_t)(a))))

4
firmware/target/arm/crt0-pp.S
View File

@ -48,7 +48,7 @@ start:
.equ CACHE_CTRL, 0xcf004024
.equ MMAP_LOG, 0xf000f000 /* MMAP0 */
.equ MMAP_PHYS, 0xf000f004
#if MEM > 32
#if MEMORYSIZE > 32
.equ MMAP_MASK, 0x00003c00
#else
.equ MMAP_MASK, 0x00003e00
@ -69,7 +69,7 @@ start:
.equ CACHE_CTRL, 0x6000c000
.equ MMAP_LOG, 0xf000f000 /* MMAP0 */
.equ MMAP_PHYS, 0xf000f004
#if MEM > 32
#if MEMORYSIZE > 32
.equ MMAP_MASK, 0x00003c00
#else
.equ MMAP_MASK, 0x00003e00

2
firmware/target/arm/crt0-pp502x-bl-usb.S
View File

@ -47,7 +47,7 @@
.equ CACHE_ENAB, 0x1
.equ CACHE_OP_COMMIT_DISCARD, 0x1
.equ CACHE_OP_COMMIT , 0x0
#if MEM > 32
#if MEMORYSIZE > 32
.equ MMAP_MASK, 0x00003c00
#else
.equ MMAP_MASK, 0x00003e00

2
firmware/target/arm/tcc77x/crt0.S
View File

@ -109,7 +109,7 @@ start_loc:
mov r0, #0x20000000 /* Otherwise, load address is the start of DRAM */
#endif
mov r1, #0x20000000 /* Destination: 1MB from end of DRAM */
add r1, r1, #((MEM - 1) * 0x100000)
add r1, r1, #((MEMORYSIZE - 1) * 0x100000)
ldr r2, =_dataend
1:

2
firmware/target/arm/thread-pp.c
View File

@ -21,7 +21,7 @@
*
****************************************************************************/
#if defined(MAX_PHYS_SECTOR_SIZE) && MEM == 64
#if defined(MAX_PHYS_SECTOR_SIZE) && MEMORYSIZE == 64
/* Support a special workaround object for large-sector disks */
#define IF_NO_SKIP_YIELD(...) __VA_ARGS__
#endif

4
firmware/target/coldfire/crt0.S
View File

@ -138,7 +138,7 @@ start:
/* Set up the DRAM controller. The refresh is based on the 11.2896MHz
clock (5.6448MHz bus frequency). We haven't yet started the PLL */
#if MEM < 32
#if MEMORYSIZE < 32
move.w #0x8004,%d0 /* DCR - Synchronous, 80 cycle refresh */
#else
move.w #0x8001,%d0 /* DCR - Synchronous, 32 cycle refresh */
@ -153,7 +153,7 @@ start:
In our case this means that we set the base address 16M ahead and
use a 64M mask.
*/
#if MEM < 32
#if MEMORYSIZE < 32
move.l #0x31002324,%d0 /* DACR0 - Base 0x31000000, Banks on 21 and up,
CAS latency 2, Page mode, No refresh yet */
move.l %d0,(0x108,%a0)

2
firmware/target/coldfire/iriver/system-iriver.c
View File

@ -49,7 +49,7 @@
* 124185600 11 0x018ae025 59 29 0x1180 0x1580 0x2180 3 1 1
*/
#if MEM < 32
#if MEMORYSIZE < 32
#define MAX_REFRESH_TIMER 59
#define NORMAL_REFRESH_TIMER 21
#define DEFAULT_REFRESH_TIMER 4

2
firmware/target/mips/mmu-mips.c
View File

@ -121,7 +121,7 @@ void mmu_init(void)
local_flush_tlb_all();
/*
map_address(0x80000000, 0x80000000, 0x4000, K_CacheAttrC);
map_address(0x80004000, 0x80004000, MEM * 0x100000, K_CacheAttrC);
map_address(0x80004000, 0x80004000, MEMORYSIZE * 0x100000, K_CacheAttrC);
*/
}

2
tools/root.make
View File

@ -9,7 +9,7 @@
include $(TOOLSDIR)/functions.make
DEFINES = -DROCKBOX -DMEMORYSIZE=$(MEMORYSIZE) -DMEM=$(MEMORYSIZE) $(TARGET) \
DEFINES = -DROCKBOX -DMEMORYSIZE=$(MEMORYSIZE) $(TARGET) \
-DTARGET_ID=$(TARGET_ID) -DTARGET_NAME=\"$(MODELNAME)\" $(BUILDDATE) \
$(EXTRA_DEFINES) # <-- -DSIMULATOR or not
INCLUDES = -I$(BUILDDIR) -I$(BUILDDIR)/lang $(TARGET_INC)