mirror/tp
1
0
Fork 0
mirror of https://github.com/zeldaret/tp synced 2026-08-19 05:52:31 -04:00
Code Issues Packages Projects Releases Wiki Activity

m_Do_Reset: reset, callback not statics (ty @notyourav) (#50)

Browse Source 
Co-authored-by: Pheenoh <pheenoh@gmail.com>
This commit is contained in:
Erin Moon
2021-01-02 09:39:15 -06:00
committed by GitHub
parent 8821a84a70
commit 30a10e0352
8 changed files with 21 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/functions.h
+1 -1
View File
@@ -1251,7 +1251,7 @@ JASTaskThread* JASDvd_NS_getThreadPointer(void);
// m_Do_Rst
extern "C" {
void getResetData__6mDoRstFv(void);
void resetCallBack__6mDoRstFiPv(void);
void mDoRst_resetCallBack__FiPv(void);
}
// additional symbols needed for d_attention.cpp
include/m_Do/m_Do_Reset/m_Do_Reset.h
+3 -6
View File
@@ -4,10 +4,6 @@
#include "JSystem/JUtility/JUTXfb/JUTXfb.h"
#include "dolphin/types.h"
extern "C" {
// void my_OSCancelAlarmAll(void);
}
struct ResetData {
s32 field_0x0;
u32 field_0x4;
@@ -25,8 +21,9 @@ struct ResetData {
struct mDoRst {
ResetData* getResetData();
static void reset(s32 p1, u32 p2, s32 p3);
static void resetCallBack(int p1, void* p2);
};
void mDoRst_reset(int p1, u32 p2, int p3);
void mDoRst_resetCallBack(int p1, void* p2);
#endif
include/m_Do/m_Do_controller_pad/asm/mDoCPd_c_NS_create.s
+2 -2
View File
@@ -60,8 +60,8 @@ lbl_80007A1C:
/* 80007A28 00004968 40 82 00 1C */ bne lbl_80007A44
/* 80007A2C 0000496C 38 80 00 00 */ li r4, 0
/* 80007A30 00004970 98 8D 8F 81 */ stb r4, lbl_80451501-_SDA_BASE_(r13)
/* 80007A34 00004974 3C 60 80 01 */ lis r3, resetCallBack__6mDoRstFiPv@ha
/* 80007A38 00004978 38 03 57 4C */ addi r0, r3, resetCallBack__6mDoRstFiPv@l
/* 80007A34 00004974 3C 60 80 01 */ lis r3, mDoRst_resetCallBack__FiPv@ha
/* 80007A38 00004978 38 03 57 4C */ addi r0, r3, mDoRst_resetCallBack__FiPv@l
/* 80007A3C 0000497C 90 0D 8F 6C */ stw r0, lbl_804514EC-_SDA_BASE_(r13)
/* 80007A40 00004980 90 8D 8F 70 */ stw r4, lbl_804514F0-_SDA_BASE_(r13)
lbl_80007A44: