summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndree Buschmann <AndreeBuschmann@t-online.de>2011-02-02 17:55:04 +0000
committerAndree Buschmann <AndreeBuschmann@t-online.de>2011-02-02 17:55:04 +0000
commitadf722453879bb93e708d0501a192d00b629fadf (patch)
treeffd4d394ad86c6cf4d18d5e3491200cef6ecbdf4
parent5d849a963e562d1996c20cd72228835276288141 (diff)
downloadrockbox-adf722453879bb93e708d0501a192d00b629fadf.tar.gz
rockbox-adf722453879bb93e708d0501a192d00b629fadf.zip
Fix red. Replace remaining MEM's mit MEMORYSIZE.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@29190 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--firmware/target/arm/as3525/memory-init.S2
-rw-r--r--firmware/target/arm/tms320dm320/system-dm320.c2
-rw-r--r--utils/zenutils/libraries/zlib123/zlib/inflate.c4
3 files changed, 4 insertions, 4 deletions
diff --git a/firmware/target/arm/as3525/memory-init.S b/firmware/target/arm/as3525/memory-init.S
index fbc11e5c56..e45e28a608 100644
--- a/firmware/target/arm/as3525/memory-init.S
+++ b/firmware/target/arm/as3525/memory-init.S
@@ -98,7 +98,7 @@ memory_init:
98 mov r1, #0x82 @ SDRAM MODE, MPMCCLKOUT runs continuously 98 mov r1, #0x82 @ SDRAM MODE, MPMCCLKOUT runs continuously
99 str r1, [r3, #0x20] @ MPMC_DYNAMIC_CONTROL 99 str r1, [r3, #0x20] @ MPMC_DYNAMIC_CONTROL
100 100
101 ldr r1, =DRAM_ORIG+(0x2300*MEM) 101 ldr r1, =DRAM_ORIG+(0x2300*MEMORYSIZE)
102 ldr r1, [r1] 102 ldr r1, [r1]
103 103
104 str r2, [r3, #0x20] @ MPMC_DYNAMIC_CONTROL= SDRAM NORMAL, 104 str r2, [r3, #0x20] @ MPMC_DYNAMIC_CONTROL= SDRAM NORMAL,
diff --git a/firmware/target/arm/tms320dm320/system-dm320.c b/firmware/target/arm/tms320dm320/system-dm320.c
index 7c4650468f..2d618a1b8b 100644
--- a/firmware/target/arm/tms320dm320/system-dm320.c
+++ b/firmware/target/arm/tms320dm320/system-dm320.c
@@ -308,7 +308,7 @@ void system_init(void)
308 map_section(0, 0, 0x1000, CACHE_NONE); 308 map_section(0, 0, 0x1000, CACHE_NONE);
309 309
310 /* Enable caching for RAM */ 310 /* Enable caching for RAM */
311 map_section(CONFIG_SDRAM_START, CONFIG_SDRAM_START, MEM, CACHE_ALL); 311 map_section(CONFIG_SDRAM_START, CONFIG_SDRAM_START, MEMORYSIZE, CACHE_ALL);
312 /* enable buffered writing for the framebuffer */ 312 /* enable buffered writing for the framebuffer */
313 map_section((int)FRAME, (int)FRAME, LCD_TTB_AREA, BUFFERED); 313 map_section((int)FRAME, (int)FRAME, LCD_TTB_AREA, BUFFERED);
314#ifdef CREATIVE_ZVx 314#ifdef CREATIVE_ZVx
diff --git a/utils/zenutils/libraries/zlib123/zlib/inflate.c b/utils/zenutils/libraries/zlib123/zlib/inflate.c
index 792fdee8e9..c3e606812c 100644
--- a/utils/zenutils/libraries/zlib123/zlib/inflate.c
+++ b/utils/zenutils/libraries/zlib123/zlib/inflate.c
@@ -1134,7 +1134,7 @@ int flush;
1134 RESTORE(); 1134 RESTORE();
1135 if (state->wsize || (state->mode < CHECK && out != strm->avail_out)) 1135 if (state->wsize || (state->mode < CHECK && out != strm->avail_out))
1136 if (updatewindow(strm, out)) { 1136 if (updatewindow(strm, out)) {
1137 state->mode = MEM; 1137 state->mode = MEMORYSIZE;
1138 return Z_MEM_ERROR; 1138 return Z_MEM_ERROR;
1139 } 1139 }
1140 in -= strm->avail_in; 1140 in -= strm->avail_in;
@@ -1190,7 +1190,7 @@ uInt dictLength;
1190 1190
1191 /* copy dictionary to window */ 1191 /* copy dictionary to window */
1192 if (updatewindow(strm, strm->avail_out)) { 1192 if (updatewindow(strm, strm->avail_out)) {
1193 state->mode = MEM; 1193 state->mode = MEMORYSIZE;
1194 return Z_MEM_ERROR; 1194 return Z_MEM_ERROR;
1195 } 1195 }
1196 if (dictLength > state->wsize) { 1196 if (dictLength > state->wsize) {