From 368c542d5d695d5fbc59553d5994674d08317482 Mon Sep 17 00:00:00 2001 From: Alejandro Javier Asenjo Nitti Date: Sat, 14 Oct 2023 04:26:09 -0300 Subject: [PATCH] more libultra symbols --- linker_scripts/us/symbol_addrs.txt | 15 ++++++++++++++- src/libultra/io/controller.c | 4 ++-- src/libultra/io/epirawdma.c | 2 +- src/libultra/io/sptask.c | 4 ++-- src/libultra/leointerrupt.c | 2 +- 5 files changed, 20 insertions(+), 7 deletions(-) diff --git a/linker_scripts/us/symbol_addrs.txt b/linker_scripts/us/symbol_addrs.txt index 7c0bc77d..ed214c66 100644 --- a/linker_scripts/us/symbol_addrs.txt +++ b/linker_scripts/us/symbol_addrs.txt @@ -2,6 +2,8 @@ bootproc = 0x80004DA8; D_800C90F0 = 0x800C90F0; D_800D934C = 0x800D934C; // force_migration:True osContInit = 0x8001FFC0; +__osContGetInitData = 0x800201B8; +__osPackRequestData = 0x80020288; osRecvMesg = 0x800205E0; osSendMesg = 0x80020720; osContStartQuery = 0x80020870; @@ -26,6 +28,8 @@ osSetEventMesg = 0x80021D20; osViSetEvent = 0x80021D90; osSpTaskYielded = 0x80021E00; osSpTaskYield = 0x80021E80; +osSpTaskLoad = 0x80021FBC; +osSpTaskStartGo = 0x8002214C; osDpSetStatus = 0x80022190; osCreateThread = 0x800221A0; osStartThread = 0x800222F0; @@ -55,6 +59,7 @@ osEepromProbe = 0x80023F50; memcpy = 0x80023FC0; strlen = 0x80023FEC; strchr = 0x80024014; +_Printf = 0x800246D0; osSetTime = 0x80024D20; osAiSetFrequency = 0x80024D60; osEPiStartDma = 0x80024FB0; @@ -101,6 +106,8 @@ osGetThreadPri = 0x80027C00; __osViGetCurrentContext = 0x80027C20; __osViSwapContext = 0x80027C30; osPiRawStartDma = 0x80028150; +osEPiRawStartDma = 0x80028230; +__osDevMgrMain = 0x80028460; __osSetSR = 0x80028BB0; __osGetSR = 0x80028BC0; __osSetFpcCsr = 0x80028BD0; @@ -111,6 +118,7 @@ _Litob = 0x80028DE0; _Ldtob = 0x800295F0; __osAiDeviceBusy = 0x80029B40; __osSiDeviceBusy = 0x80029B70; +__osLeoInterrupt = 0x8002A210; osSetIntMask = 0x8002AA90; osDestroyThread = 0x8002AB30; __osProbeTLB = 0x8002AD40; @@ -125,8 +133,12 @@ ldiv = 0x8002B0B0; __osGetCause = 0x8002B140; osStopThread = 0x8002E280; __osContinitialized = 0x800C7CC0; +osViModeNtscLan1 = 0x800C7CD0; +osViModePalLan1 = 0x800C7D20; +osViModeMpalLan1 = 0x800C7D70; __osViDevMgr = 0x800C7DC0; __osPiDevMgr = 0x800C7DE0; +__osCurrentHandle = 0x800C7E00; osClockRate = 0x800C7E10; osViClock = 0x800C7E18; __OSGlobalIntMask = 0x800C7E20; @@ -149,4 +161,5 @@ __osEepPifRam = 0x801793E0; __osPfsPifRam = 0x801794C0; __osCurrentTime = 0x80179520; __osBaseCounter = 0x80179528; -__osViIntrCount = 0x8017952C; \ No newline at end of file +__osViIntrCount = 0x8017952C; +__osDiskHandle = 0x801795D4; \ No newline at end of file diff --git a/src/libultra/io/controller.c b/src/libultra/io/controller.c index affc5045..ba278426 100644 --- a/src/libultra/io/controller.c +++ b/src/libultra/io/controller.c @@ -2,6 +2,6 @@ #pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/io/controller/osContInit.s") -#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/io/controller/func_800201B8.s") +#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/io/controller/__osContGetInitData.s") -#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/io/controller/func_80020288.s") +#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/io/controller/__osPackRequestData.s") diff --git a/src/libultra/io/epirawdma.c b/src/libultra/io/epirawdma.c index d2a4c669..85eb9e77 100644 --- a/src/libultra/io/epirawdma.c +++ b/src/libultra/io/epirawdma.c @@ -1,3 +1,3 @@ #include "common.h" -#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/io/epirawdma/func_80028230.s") +#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/io/epirawdma/osEPiRawStartDma.s") diff --git a/src/libultra/io/sptask.c b/src/libultra/io/sptask.c index 3bf5d9b5..3af80315 100644 --- a/src/libultra/io/sptask.c +++ b/src/libultra/io/sptask.c @@ -2,6 +2,6 @@ #pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/io/sptask/func_80021EA0.s") -#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/io/sptask/func_80021FBC.s") +#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/io/sptask/osSpTaskLoad.s") -#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/io/sptask/func_8002214C.s") +#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/io/sptask/osSpTaskStartGo.s") diff --git a/src/libultra/leointerrupt.c b/src/libultra/leointerrupt.c index 18cb06fa..0ae66d16 100644 --- a/src/libultra/leointerrupt.c +++ b/src/libultra/leointerrupt.c @@ -1,6 +1,6 @@ #include "common.h" -#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/leointerrupt/func_8002A210.s") +#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/leointerrupt/__osLeoInterrupt.s") #pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/leointerrupt/func_8002A8B4.s")