summaryrefslogtreecommitdiff
path: root/src/boot_O2_g3
diff options
context:
space:
mode:
authorRozelette <Rozelette@users.noreply.github.com>2020-09-27 19:19:06 -0500
committerGitHub <noreply@github.com>2020-09-27 20:19:06 -0400
commit07efebe2ff721d7b690ca15fab19b81b823d30d1 (patch)
tree6c5602c1908d543035e5df847f9688b26d888911 /src/boot_O2_g3
parenta672633c3bcaea1e92080bcb48fc5dc8fddb1799 (diff)
z_actor_dlftbls.c OK. Rework a bunch of segment address organization. (#29)
Diffstat (limited to 'src/boot_O2_g3')
-rw-r--r--src/boot_O2_g3/idle.c2
-rw-r--r--src/boot_O2_g3/z_std_dma.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/boot_O2_g3/idle.c b/src/boot_O2_g3/idle.c
index 02a3ad68e..9039ba6b3 100644
--- a/src/boot_O2_g3/idle.c
+++ b/src/boot_O2_g3/idle.c
@@ -55,7 +55,7 @@ void Idle_InitCodeAndMemory(void) {
oldSize = sDmaMgrDmaBuffSize;
sDmaMgrDmaBuffSize = 0;
- DmaMgr_SendRequestImpl(&dmaReq, (u32)&code_text_start, (u32)&code_vrom_start, (u32)&code_vrom_end - (u32)&code_vrom_start, 0, &queue, 0);
+ DmaMgr_SendRequestImpl(&dmaReq, (u32)&code_text_start, (u32)_codeSegmentRomStart, (u32)_codeSegmentRomEnd - (u32)_codeSegmentRomStart, 0, &queue, 0);
Idle_InitScreen();
Idle_InitMemory();
osRecvMesg(&queue, 0, 1);
diff --git a/src/boot_O2_g3/z_std_dma.c b/src/boot_O2_g3/z_std_dma.c
index b82337db1..5cb074606 100644
--- a/src/boot_O2_g3/z_std_dma.c
+++ b/src/boot_O2_g3/z_std_dma.c
@@ -200,7 +200,7 @@ s32 DmaMgr_SendRequest0(void* vramStart, u32 vromStart, u32 size) {
void Dmamgr_Start() {
DmaEntry* v0;
u32 v1;
- DmaMgr_DMARomToRam((u32)&dmadata_vrom_start, dmadata, (u32)&dmadata_vrom_end - (u32)&dmadata_vrom_start);
+ DmaMgr_DMARomToRam((u32)_dmadataSegmentRomStart, dmadata, (u32)_dmadataSegmentRomEnd - (u32)_dmadataSegmentRomStart);
for (v0 = dmadata, v1 = 0; v0->vromEnd != 0; v0++, v1++);