diff --git a/codescript.txt b/codescript.txt index 50d5b7786f..ed1e6f08b2 100644 --- a/codescript.txt +++ b/codescript.txt @@ -58,7 +58,7 @@ SECTIONS build/asm/sirawdma.o(.text) build/asm/boot_0x8008AE20.o(.text) build/asm/boot_0x8008AE70.o(.text) - build/asm/boot_0x8008AEE0.o(.text) + build/asm/sirawread.o(.text) build/src/libultra/os/getthreadid.o(.text) build/asm/sptaskyield.o(.text) build/asm/boot_0x8008AF70.o(.text) diff --git a/functions.py b/functions.py index ae9a5a1444..2e9a1e1346 100644 --- a/functions.py +++ b/functions.py @@ -90,7 +90,7 @@ known_funcs = { 0x8008ACE0:("__osSpRawStartDma","s32","s32 direction, u32 devAddr, void* dramAddr, u32 size"), 0x8008AD70:("__osSiRawStartDma","s32","s32 direction, void* dramAddr"), 0x8008AE70:("func_8008AE70","UNK_RET","UNK_TYPE"), - 0x8008AEE0:("func_8008AEE0","UNK_TYPE","UNK_TYPE, UNK_PTR"), + 0x8008AEE0:("__osSiRawReadIo","s32","u32 devAddr, u32* data"), 0x8008AF30:("osGetThreadId","OSId","OSThread* t"), 0x8008AF50:("osSpTaskYield","void","void"), 0x8008B650:("func_8008B650","UNK_RET","UNK_PTR"), diff --git a/include/functions.h b/include/functions.h index 069ee6b62f..02118236b8 100644 --- a/include/functions.h +++ b/include/functions.h @@ -277,7 +277,7 @@ s32 __osSpRawStartDma(s32 direction, u32 devAddr, void* dramAddr, u32 size); // s32 __osSiRawStartDma(s32 direction, void* dramAddr); // func_8008AD70 // UNK_RET func_8008AE20(UNK_ARGS); UNK_RET func_8008AE70(UNK_TYPE); // func_8008AE70 -UNK_TYPE func_8008AEE0(UNK_TYPE, UNK_PTR); // func_8008AEE0 +s32 __osSiRawReadIo(u32 devAddr, u32* data); // func_8008AEE0 OSId osGetThreadId(OSThread* t); // func_8008AF30 void osSpTaskYield(void); // func_8008AF50 // UNK_RET func_8008AF70(UNK_ARGS); diff --git a/objects.py b/objects.py index 39f33ac5d9..605814e82b 100644 --- a/objects.py +++ b/objects.py @@ -1,23 +1,23 @@ known_objects = { 0x80080180:"", - 0x80087b00:"setcause", - 0x80087b10:"sendmesg", - 0x80087e10:"stopthread", - 0x80087ed0:"recvmesg", + 0x80087B00:"setcause", + 0x80087B10:"sendmesg", + 0x80087E10:"stopthread", + 0x80087ED0:"recvmesg", 0x80088010:"setintmask", - 0x800880b0:"getintmask", + 0x800880B0:"getintmask", 0x80088110:"", 0x80088350:"sinf", 0x80088510:"sins", 0x80088580:"sptask", 0x80088840:"ll", - 0x80088b00:"exceptasm", + 0x80088B00:"exceptasm", 0x80089430:"thread", 0x80089470:"destroythread", 0x80089630:"bzero", 0x80089AA0:"siacs", 0x80089B60:"controller", - 0x80089e40:"createthread", + 0x80089E40:"createthread", 0x80089F90:"contreaddata", 0x8008A540:"virtualtophysical", 0x8008A5C0:"getsr", @@ -26,8 +26,9 @@ known_objects = { 0x8008A660:"initialize", 0x8008AA50:"perspective", 0x8008AD70:"sirawdma", - 0x8008af30:"getthreadid", - 0x8008af50:"sptaskyield", + 0x8008AEE0:"sirawread", + 0x8008AF30:"getthreadid", + 0x8008AF50:"sptaskyield", 0x8008AF70:"", 0x8008B6B0:"getconfig", 0x8008B6C0:"setconfig",