diff --git a/decompressed.us.v10.yaml b/decompressed.us.v10.yaml index 696f3e25..3f2c78bf 100644 --- a/decompressed.us.v10.yaml +++ b/decompressed.us.v10.yaml @@ -485,6 +485,14 @@ segments: - [0xF55960, .bss, done/io/controller] - [0xF55960, .bss, done/io/motor] - [0xF55960, .bss, done/io/cartrominit] + - [0xF55960, .bss, done/io/leodiskinit] + - [0xF55960, .bss, done/io/piacs] + - [0xF55960, .bss, done/os/timerintr] + - [0xF55960, .bss, done/io/siacs] + - [0xF55960, .bss, done/io/pfsisplug] + - [0xF55960, .bss, done/io/conteepread] + - [0xF55960, .bss, os/kdebugserver] + - [0xF55960, .bss, done/io/leointerrupt] - name: core2 dir: core2 type: code diff --git a/src/core1/done/io/conteepread.c b/src/core1/done/io/conteepread.c index 46a9512d..600aa413 100644 --- a/src/core1/done/io/conteepread.c +++ b/src/core1/done/io/conteepread.c @@ -3,7 +3,7 @@ #include "siint.h" static void __osPackEepReadData(u8 address); -extern OSPifRam __osEepPifRam; // todo bss +OSPifRam __osEepPifRam; // todo bss s32 osEepromRead(OSMesgQueue *mq, u8 address, u8 *buffer) { s32 ret; diff --git a/src/core1/done/io/leointerrupt.c b/src/core1/done/io/leointerrupt.c index 4e9a1b2f..678855c9 100644 --- a/src/core1/done/io/leointerrupt.c +++ b/src/core1/done/io/leointerrupt.c @@ -15,7 +15,6 @@ extern OSIntMask __OSGlobalIntMask; extern OSPiHandle *__osDiskHandle; u8 leoDiskStack[OS_PIM_STACKSIZE]; - s32 __osLeoInterrupt() { u32 stat; diff --git a/src/core1/done/io/pfsgetstatus.c b/src/core1/done/io/pfsgetstatus.c index 96bce3d2..c5d65051 100644 --- a/src/core1/done/io/pfsgetstatus.c +++ b/src/core1/done/io/pfsgetstatus.c @@ -2,7 +2,7 @@ #include "controller.h" #include "siint.h" -OSPifRam __osPfsPifRam; +extern OSPifRam __osPfsPifRam; s32 __osPfsGetStatus(OSMesgQueue *queue, int channel) { s32 ret; diff --git a/src/core1/done/io/pfsisplug.c b/src/core1/done/io/pfsisplug.c index 5add6ecb..1e5be720 100644 --- a/src/core1/done/io/pfsisplug.c +++ b/src/core1/done/io/pfsisplug.c @@ -2,7 +2,7 @@ #include "controller.h" #include "siint.h" -extern OSPifRam __osPfsPifRam; // TODO bss +OSPifRam __osPfsPifRam; // TODO bss s32 osPfsIsPlug(OSMesgQueue *queue, u8 *pattern) { s32 ret; diff --git a/src/core1/done/io/piacs.c b/src/core1/done/io/piacs.c index 67a55fb0..0ec4264f 100644 --- a/src/core1/done/io/piacs.c +++ b/src/core1/done/io/piacs.c @@ -2,8 +2,8 @@ #define PI_Q_BUF_LEN 1 u32 __osPiAccessQueueEnabled = 0; -extern OSMesg piAccessBuf[PI_Q_BUF_LEN]; // todo bss -extern OSMesgQueue __osPiAccessQueue; +OSMesg piAccessBuf[PI_Q_BUF_LEN]; // todo bss +OSMesgQueue __osPiAccessQueue; void __osPiCreateAccessQueue(void) { diff --git a/src/core1/done/io/siacs.c b/src/core1/done/io/siacs.c index efe5693a..737ee103 100644 --- a/src/core1/done/io/siacs.c +++ b/src/core1/done/io/siacs.c @@ -2,8 +2,8 @@ #define SI_Q_BUF_LEN 1 u32 __osSiAccessQueueEnabled = 0; -extern OSMesg siAccessBuf[SI_Q_BUF_LEN]; -extern OSMesgQueue __osSiAccessQueue; +OSMesg siAccessBuf[SI_Q_BUF_LEN]; +OSMesgQueue __osSiAccessQueue; void __osSiCreateAccessQueue(void) { diff --git a/src/core1/os/kdebugserver.c b/src/core1/os/kdebugserver.c new file mode 100644 index 00000000..9d062249 --- /dev/null +++ b/src/core1/os/kdebugserver.c @@ -0,0 +1,4 @@ +#include + +//not included in final rom, but __osThreadSave is here for some reason +OSThread __osThreadSave; \ No newline at end of file diff --git a/symbol_addrs.us.v10.txt b/symbol_addrs.us.v10.txt index e273979a..f6468db9 100644 --- a/symbol_addrs.us.v10.txt +++ b/symbol_addrs.us.v10.txt @@ -457,6 +457,8 @@ _motorstopbuf = 0x80285BA0; __osSetSR = 0x8026A210; __osGetSR = 0x8026A220; __osEepPifRam = 0x80285DA0; +__osThreadSave = 0x80285DE0; +leoDiskStack = 0x80285F90;//technically should have a OS_LEO_STACKSIZE or something.. alCSeqGetLoc = 0x80267320;