diff options
| author | Max Horn | 2010-11-18 17:01:30 +0000 |
|---|---|---|
| committer | Max Horn | 2010-11-18 17:01:30 +0000 |
| commit | b8f00267398d2a1722ed550beee8178bc2a9ac6f (patch) | |
| tree | 9591961d3c0a69f6bc02f42a77d60d000a7e7fc8 /backends/platform/ds/arm9/source | |
| parent | 1621e7d5c0ea5aca51c72040fffd589f41573847 (diff) | |
| download | scummvm-rg350-b8f00267398d2a1722ed550beee8178bc2a9ac6f.tar.gz scummvm-rg350-b8f00267398d2a1722ed550beee8178bc2a9ac6f.tar.bz2 scummvm-rg350-b8f00267398d2a1722ed550beee8178bc2a9ac6f.zip | |
DS: Port changes from 1.2.0 branch to trunk
svn-id: r54325
Diffstat (limited to 'backends/platform/ds/arm9/source')
| -rw-r--r-- | backends/platform/ds/arm9/source/dsmain.cpp | 2 | ||||
| -rw-r--r-- | backends/platform/ds/arm9/source/fat/gba_nds_fat.c | 3 | ||||
| -rw-r--r-- | backends/platform/ds/arm9/source/wordcompletion.cpp | 6 |
3 files changed, 6 insertions, 5 deletions
diff --git a/backends/platform/ds/arm9/source/dsmain.cpp b/backends/platform/ds/arm9/source/dsmain.cpp index 8820fc8b35..303e504873 100644 --- a/backends/platform/ds/arm9/source/dsmain.cpp +++ b/backends/platform/ds/arm9/source/dsmain.cpp @@ -2788,7 +2788,7 @@ bool getIndyFightState() { // Fast Ram /////////////////// -#define FAST_RAM_SIZE (24000) +#define FAST_RAM_SIZE (22500) #define ITCM_DATA __attribute__((section(".itcm"))) u8 *fastRamPointer; diff --git a/backends/platform/ds/arm9/source/fat/gba_nds_fat.c b/backends/platform/ds/arm9/source/fat/gba_nds_fat.c index 07affd8839..7f0757ef53 100644 --- a/backends/platform/ds/arm9/source/fat/gba_nds_fat.c +++ b/backends/platform/ds/arm9/source/fat/gba_nds_fat.c @@ -194,7 +194,8 @@ const char lfn_offset_table[13]={0x01,0x03,0x05,0x07,0x09,0x0E,0x10,0x12,0x14,0x // available: IWRAM on NDS ARM7, EWRAM on NDS ARM9 and GBA // Files -_VARS_IN_RAM FAT_FILE openFiles[MAX_FILES_OPEN]; +FAT_FILE openFiles[MAX_FILES_OPEN] __attribute__((section(".itcm"))); +//_VARS_IN_RAM // Long File names _VARS_IN_RAM char lfnName[MAX_FILENAME_LENGTH]; diff --git a/backends/platform/ds/arm9/source/wordcompletion.cpp b/backends/platform/ds/arm9/source/wordcompletion.cpp index 43a16486c5..a4fc2aed77 100644 --- a/backends/platform/ds/arm9/source/wordcompletion.cpp +++ b/backends/platform/ds/arm9/source/wordcompletion.cpp @@ -30,11 +30,11 @@ #ifdef ENABLE_AGI namespace DS { -// Default dictionary is about 64Kb, so 128Kb should be enough for future expansion -#define WORD_BUFFER_SIZE (128 * 1024) +// Default dictionary is about 64Kb, so 96Kb should be enough for future expansion +#define WORD_BUFFER_SIZE (96 * 1024) // Default dictionary has ~8000 words -#define MAX_WORD_COUNT 16000 +#define MAX_WORD_COUNT 12000 char wordBuffer[WORD_BUFFER_SIZE]; int wordBufferPos = 0; |