summaryrefslogtreecommitdiff
path: root/src/boot_O2_g3
diff options
context:
space:
mode:
authorengineer124 <47598039+engineer124@users.noreply.github.com>2022-03-24 12:22:13 +1100
committerGitHub <noreply@github.com>2022-03-23 21:22:13 -0400
commitb852a9a9300c05de4e01e71a578ca355b6793f91 (patch)
tree0be976ba1a139f319e8b634953067b90fa8e43f0 /src/boot_O2_g3
parent92c4d42f446cc12c79de9b441b9afa341cf294e8 (diff)
Audio_Load OK and Documented (#620)
* Copy audio_load progress from main branch * Fix warning * fix UB * cleanup WIP * Add docs, bss still broken * bss fix * bytesRemaining with size_t * PR Suggestions * PR Suggestions * Fix bss * Fix bss * PR Suggestions
Diffstat (limited to 'src/boot_O2_g3')
-rw-r--r--src/boot_O2_g3/yaz0.c4
-rw-r--r--src/boot_O2_g3/z_std_dma.c10
2 files changed, 7 insertions, 7 deletions
diff --git a/src/boot_O2_g3/yaz0.c b/src/boot_O2_g3/yaz0.c
index 5fb32b8ea..5f8e5a0ed 100644
--- a/src/boot_O2_g3/yaz0.c
+++ b/src/boot_O2_g3/yaz0.c
@@ -18,7 +18,7 @@ void* Yaz0_FirstDMA() {
curSize = (u32)sYaz0CurDataEnd - (u32)sYaz0DataBuffer;
dmaSize = (curSize > sYaz0CurSize) ? sYaz0CurSize : curSize;
- DmaMgr_DMARomToRam(sYaz0CurRomStart, sYaz0DataBuffer, dmaSize);
+ DmaMgr_DmaRomToRam(sYaz0CurRomStart, sYaz0DataBuffer, dmaSize);
sYaz0CurRomStart += dmaSize;
sYaz0CurSize -= dmaSize;
return sYaz0DataBuffer;
@@ -41,7 +41,7 @@ void* Yaz0_NextDMA(void* curSrcPos) {
}
if (dmaSize != 0) {
- DmaMgr_DMARomToRam(sYaz0CurRomStart, dst + restSize, dmaSize);
+ DmaMgr_DmaRomToRam(sYaz0CurRomStart, dst + restSize, dmaSize);
sYaz0CurRomStart += dmaSize;
sYaz0CurSize -= dmaSize;
if (!sYaz0CurSize) {
diff --git a/src/boot_O2_g3/z_std_dma.c b/src/boot_O2_g3/z_std_dma.c
index 9edc65e52..10d84dcb0 100644
--- a/src/boot_O2_g3/z_std_dma.c
+++ b/src/boot_O2_g3/z_std_dma.c
@@ -10,7 +10,7 @@ OSMesg sDmaMgrMsgs[32];
OSThread sDmaMgrThread;
u8 sDmaMgrStack[0x500];
-s32 DmaMgr_DMARomToRam(uintptr_t rom, void* ram, size_t size) {
+s32 DmaMgr_DmaRomToRam(uintptr_t rom, void* ram, size_t size) {
OSIoMesg ioMsg;
OSMesgQueue queue;
OSMesg msg[1];
@@ -56,8 +56,8 @@ END:
return ret;
}
-void DmaMgr_DmaCallback0(OSPiHandle* pihandle, OSIoMesg* mb, s32 direction) {
- osEPiStartDma(pihandle, mb, direction);
+s32 DmaMgr_DmaHandler(OSPiHandle* pihandle, OSIoMesg* mb, s32 direction) {
+ return osEPiStartDma(pihandle, mb, direction);
}
DmaEntry* DmaMgr_FindDmaEntry(u32 vrom) {
@@ -130,7 +130,7 @@ void DmaMgr_ProcessMsg(DmaRequest* req) {
if (dmaEntry->vromEnd < (vrom + size)) {
Fault_AddHungupAndCrash("../z_std_dma.c", 499);
}
- DmaMgr_DMARomToRam((dmaEntry->romStart + vrom) - dmaEntry->vromStart, (u8*)ram, size);
+ DmaMgr_DmaRomToRam((dmaEntry->romStart + vrom) - dmaEntry->vromStart, (u8*)ram, size);
return;
}
@@ -211,7 +211,7 @@ s32 DmaMgr_SendRequest0(void* vramStart, uintptr_t vromStart, size_t size) {
}
void DmaMgr_Start(void) {
- DmaMgr_DMARomToRam(SEGMENT_ROM_START(dmadata), dmadata, SEGMENT_ROM_SIZE(dmadata));
+ DmaMgr_DmaRomToRam(SEGMENT_ROM_START(dmadata), dmadata, SEGMENT_ROM_SIZE(dmadata));
{
DmaEntry* iter = dmadata;