diff options
| author | shawlucas <lgs84@cornell.edu> | 2020-03-21 18:13:55 -0700 |
|---|---|---|
| committer | shawlucas <lgs84@cornell.edu> | 2020-03-21 18:14:17 -0700 |
| commit | 08b73fe68558c041d332ae330a06bee7f052c68b (patch) | |
| tree | 4de9435b02ab20ec289058acf94596f4aaaab63b /src/code/main.c | |
| parent | fd2dae78a2f90af23a834f77bab7dfff2e05f5d6 (diff) | |
| parent | 1d79f4b93d77f7f52c805c2b8a04975e63cc3aaa (diff) | |
fixed merge conflict
Diffstat (limited to 'src/code/main.c')
| -rw-r--r-- | src/code/main.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/code/main.c b/src/code/main.c index f69f62317..987654a41 100644 --- a/src/code/main.c +++ b/src/code/main.c @@ -7,7 +7,7 @@ u32 gScreenWidth = SCREEN_WIDTH; u32 gScreenHeight = SCREEN_HEIGHT; u32 gSystemHeapSize = 0; -u8* gAppNmiBufferPtr; +PreNmiBuff* gAppNmiBufferPtr; SchedContext gSchedContext; PadMgr gPadMgr; IrqMgr gIrqMgr; @@ -50,8 +50,8 @@ void Main(void* arg0) osSyncPrintf("mainproc 実行開始\n"); //Start running gScreenWidth = SCREEN_WIDTH; gScreenHeight = SCREEN_HEIGHT; - gAppNmiBufferPtr = osAppNmiBuffer; - func_8007BE60(gAppNmiBufferPtr); + gAppNmiBufferPtr = (PreNmiBuff*)osAppNmiBuffer; + PreNmiBuff_Init(gAppNmiBufferPtr); Fault_Start(); SysCfb_Init(0); sysHeap = (u32)gSystemHeap; @@ -112,7 +112,7 @@ void Main(void* arg0) if (*msg == OS_SC_PRE_NMI_MSG) { osSyncPrintf("main.c: リセットされたみたいだよ\n"); //Looks like it's been reset - func_8007BED4(gAppNmiBufferPtr); + PreNmiBuff_SetReset(gAppNmiBufferPtr); } } |