diff options
| author | petrie911 <69443847+petrie911@users.noreply.github.com> | 2022-10-04 15:46:32 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-10-04 21:46:32 +0100 |
| commit | 2006a65ba62e7e848823cd1de009c9e16d6421eb (patch) | |
| tree | 90748c833b1620d1be9b9cbf1c19b18037626acf /src/boot_O2_g3 | |
| parent | 8cd48db087ed7527d376195736eb9d4714bdf862 (diff) | |
z_overlay and z_fbdemo_dlftbls (Transition overlay handling), clean up a lot of u32s used to store pointers (#1073)
* overlay matches
* prototypes
* fbdemo too
* virtual to physical
* names, cleanup, etc
* bss reordering
* uintptr stuff
* fixed now?
* one fix
* headers and such
* fixes'n'stuff
* XXX action
* docs of a sort
* useless error codes
* n
* format
* header? I barely know her!
Co-authored-by: petrie911 <petrie911@users.noreply.github.com>
Diffstat (limited to 'src/boot_O2_g3')
| -rw-r--r-- | src/boot_O2_g3/yaz0.c | 4 | ||||
| -rw-r--r-- | src/boot_O2_g3/z_std_dma.c | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/boot_O2_g3/yaz0.c b/src/boot_O2_g3/yaz0.c index 5f8e5a0ed..63260e885 100644 --- a/src/boot_O2_g3/yaz0.c +++ b/src/boot_O2_g3/yaz0.c @@ -3,7 +3,7 @@ u8 sYaz0DataBuffer[0x400]; u8* sYaz0CurDataEnd; -u32 sYaz0CurRomStart; +uintptr_t sYaz0CurRomStart; u32 sYaz0CurSize; u8* sYaz0MaxPtr; u8* D_8009BE20; @@ -123,7 +123,7 @@ s32 Yaz0_DecompressImpl(u8* src, u8* dst) { return 0; } -void Yaz0_Decompress(u32 romStart, void* dst, size_t size) { +void Yaz0_Decompress(uintptr_t romStart, void* dst, size_t size) { s32 status; u32 pad; char sp80[0x50]; diff --git a/src/boot_O2_g3/z_std_dma.c b/src/boot_O2_g3/z_std_dma.c index 10d84dcb0..8e9d83872 100644 --- a/src/boot_O2_g3/z_std_dma.c +++ b/src/boot_O2_g3/z_std_dma.c @@ -60,7 +60,7 @@ s32 DmaMgr_DmaHandler(OSPiHandle* pihandle, OSIoMesg* mb, s32 direction) { return osEPiStartDma(pihandle, mb, direction); } -DmaEntry* DmaMgr_FindDmaEntry(u32 vrom) { +DmaEntry* DmaMgr_FindDmaEntry(uintptr_t vrom) { DmaEntry* curr; for (curr = dmadata; curr->vromEnd != 0; curr++) { @@ -77,7 +77,7 @@ DmaEntry* DmaMgr_FindDmaEntry(u32 vrom) { return NULL; } -u32 DmaMgr_TranslateVromToRom(u32 vrom) { +u32 DmaMgr_TranslateVromToRom(uintptr_t vrom) { DmaEntry* entry = DmaMgr_FindDmaEntry(vrom); if (entry != NULL) { @@ -95,7 +95,7 @@ u32 DmaMgr_TranslateVromToRom(u32 vrom) { return -1; } -s32 DmaMgr_FindDmaIndex(u32 vrom) { +s32 DmaMgr_FindDmaIndex(uintptr_t vrom) { DmaEntry* entry = DmaMgr_FindDmaEntry(vrom); if (entry != NULL) { |