gijs
/
ogrebattle64
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename `PTR_CART_ROM_HANDLE` to `nuPiCartHandle`

This commit is contained in:
gijs 2023-10-20 18:33:02 +02:00
parent f52d20844a
commit 10c83abcbf
3 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/common.h
View File

@ -138,8 +138,6 @@ extern OSMesg OSMESG_800BE048[0x32];
extern OSMesgQueue MQ_800E7988; extern OSMesgQueue MQ_800E7988;
extern OSPiHandle* PTR_CART_ROM_HANDLE;
extern s32 D_800C4B30; extern s32 D_800C4B30;
extern OSMesgQueue MQ_800E9BF0; extern OSMesgQueue MQ_800E9BF0;
extern u8 D_800A9FF8; extern u8 D_800A9FF8;

2
linker_scripts/symbols/addr.txt
View File

@ -28,6 +28,7 @@ nuSiMesgBuf = 0x800BBE60;
siMgrThread = 0x800BBE80; siMgrThread = 0x800BBE80;
nuThreadIdle = 0x800AF440; nuThreadIdle = 0x800AF440;
nuStackIdle = 0x800B17A0; nuStackIdle = 0x800B17A0;
nuPiCartHandle = 0x800E7A20;
nuBoot = 0x8007F880; nuBoot = 0x8007F880;
nuScCreateScheduler = 0x80088C50; // rom:0x19050 nuScCreateScheduler = 0x80088C50; // rom:0x19050
@ -684,7 +685,6 @@ __osPiTable = 0x800AA41C; // rom:0x3A81C
osEPiLinkHandle = 0x8008BCE0l // rom:0x1C0E0 osEPiLinkHandle = 0x8008BCE0l // rom:0x1C0E0
CartRomHandle = 0x800C4C50; // size:0x2A CartRomHandle = 0x800C4C50; // size:0x2A
osCartRomInit = 0x8008BD30; osCartRomInit = 0x8008BD30;
PTR_CART_ROM_HANDLE = 0x800E7A20;
D_800A81C0 = 0x800A81C0; // size:0x30 D_800A81C0 = 0x800A81C0; // size:0x30
D_800C4BBC = 0x800C4BBC; // size:0x8 D_800C4BBC = 0x800C4BBC; // size:0x8

4
src/_ob_icy_coast.c
View File

@ -49,7 +49,7 @@ INCLUDE_ASM(const s32, "_ob_icy_coast", nuSiMgrThread);
void nuPiInit(void) { void nuPiInit(void) {
osCreatePiManager(OS_PRIORITY_PIMGR, &MQ_800BE030, OSMESG_800BE048, sizeof(OSMESG_800BE048) / sizeof(OSMesg)); osCreatePiManager(OS_PRIORITY_PIMGR, &MQ_800BE030, OSMESG_800BE048, sizeof(OSMESG_800BE048) / sizeof(OSMesg));
PTR_CART_ROM_HANDLE = osCartRomInit(); nuPiCartHandle = osCartRomInit();
} }
/* 1A380 80089F80 */ /* 1A380 80089F80 */
@ -74,7 +74,7 @@ void nuPiReadRom(void *src, void *dst, u32 size) {
ioMesg.dramAddr = dst; ioMesg.dramAddr = dst;
ioMesg.size = mesgSize; ioMesg.size = mesgSize;
// Start the DMA transfer // Start the DMA transfer
osEPiStartDma(PTR_CART_ROM_HANDLE, &ioMesg, OS_READ); osEPiStartDma(nuPiCartHandle, &ioMesg, OS_READ);
// Wait for the DMA transfer to complete // Wait for the DMA transfer to complete
osRecvMesg(&queue, &mesg, OS_MESG_BLOCK); osRecvMesg(&queue, &mesg, OS_MESG_BLOCK);