summaryrefslogtreecommitdiff
path: root/src/boot_O2_g3
diff options
context:
space:
mode:
Diffstat (limited to 'src/boot_O2_g3')
-rw-r--r--src/boot_O2_g3/idle.c6
-rw-r--r--src/boot_O2_g3/z_std_dma.c3
2 files changed, 4 insertions, 5 deletions
diff --git a/src/boot_O2_g3/idle.c b/src/boot_O2_g3/idle.c
index 4d01b4c37..4be8a1094 100644
--- a/src/boot_O2_g3/idle.c
+++ b/src/boot_O2_g3/idle.c
@@ -58,15 +58,15 @@ void Idle_InitCodeAndMemory(void) {
oldSize = sDmaMgrDmaBuffSize;
sDmaMgrDmaBuffSize = 0;
- DmaMgr_SendRequestImpl(&dmaReq, _codeSegmentStart, _codeSegmentRomStart, _codeSegmentRomEnd - _codeSegmentRomStart,
- 0, &queue, 0);
+ DmaMgr_SendRequestImpl(&dmaReq, SEGMENT_START(code), SEGMENT_ROM_START(code),
+ SEGMENT_ROM_END(code) - SEGMENT_ROM_START(code), 0, &queue, 0);
Idle_InitScreen();
Idle_InitMemory();
osRecvMesg(&queue, NULL, 1);
sDmaMgrDmaBuffSize = oldSize;
- Idle_ClearMemory(_codeSegmentBssStart, _codeSegmentBssEnd);
+ Idle_ClearMemory(SEGMENT_BSS_START(code), SEGMENT_BSS_END(code));
}
void Main_ThreadEntry(void* arg) {
diff --git a/src/boot_O2_g3/z_std_dma.c b/src/boot_O2_g3/z_std_dma.c
index 5a29d5d56..3a447b0e8 100644
--- a/src/boot_O2_g3/z_std_dma.c
+++ b/src/boot_O2_g3/z_std_dma.c
@@ -213,8 +213,7 @@ void DmaMgr_Start(void) {
DmaEntry* iter;
u32 idx;
- DmaMgr_DMARomToRam((u32)_dmadataSegmentRomStart, (u32)dmadata,
- (u32)_dmadataSegmentRomEnd - (u32)_dmadataSegmentRomStart);
+ DmaMgr_DMARomToRam(SEGMENT_ROM_START(dmadata), dmadata, SEGMENT_ROM_SIZE(dmadata));
dummy_label:;