mirror/ac-decomp
1
0
Fork 0
mirror of https://github.com/ACreTeam/ac-decomp synced 2026-05-22 22:24:16 -04:00
Code Issues Packages Projects Releases Wiki Activity

libultra: add expected size for osAppNMIBuffer in declaration & improve shutdown.c

Browse Source
This commit is contained in:
Cuyler36
2025-07-16 04:38:28 -04:00
parent c146604821
commit b5ab50084b
2 changed files with 40 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/libultra/libultra.h
+1 -1
View File
@@ -30,7 +30,7 @@ void osWritebackDCache(void* vaddr, u32 nbytes);
u32 osGetCount(void);
OSTime osGetTime(void);
extern s32 osAppNMIBuffer[];
extern s32 osAppNMIBuffer[16];
extern int osShutdown;
extern u8 __osResetSwitchPressed;
src/static/libultra/shutdown.c
+39 -39
View File
@@ -19,54 +19,54 @@ void osShutdownStart(int val) {
OSReport("***osShutdownStart***\n");
dstat = DVDGetDriveStatus();
if (dstat == -1) {
if (dstat == -1) {
while (TRUE) {}
}
osIsEnableShutdown();
PADRecalibrate(0xF0000000);
Na_Reset();
osIsEnableShutdown();
PADRecalibrate(0xF0000000);
Na_Reset();
gthread = GXGetCurrentGXThread();
enable = OSDisableInterrupts();
cthread = OSGetCurrentThread();
gthread = GXGetCurrentGXThread();
enable = OSDisableInterrupts();
cthread = OSGetCurrentThread();
if(gthread != cthread){
OSCancelThread(gthread);
GXSetCurrentGXThread();
}
GXFlush();
GXAbortFrame();
GXDrawDone();
if (gthread != cthread) {
OSCancelThread(gthread);
GXSetCurrentGXThread();
}
GXFlush();
GXAbortFrame();
GXDrawDone();
OSRestoreInterrupts(enable);
JW_JUTXfb_clearIndex();
VIWaitForRetrace();
VISetBlack(TRUE);
VIFlush();
VIWaitForRetrace();
osStopTimerAll();
LCDisable();
OSReport("リセットしてもこれだけは忘れない。 osAppNMIBuffer[15] = %08x\n", osAppNMIBuffer[15]);
OSRestoreInterrupts(enable);
JW_JUTXfb_clearIndex();
VIWaitForRetrace();
VISetBlack(TRUE);
VIFlush();
VIWaitForRetrace();
osStopTimerAll();
LCDisable();
OSReport("リセットしてもこれだけは忘れない。 osAppNMIBuffer[15] = %08x\n", osAppNMIBuffer[15]);
if((val == 2) && (DVDCheckDisk() == 0)){
OSReport("蓋空き。ホットリセットします。\n");
val = 0;
}
if ((val == 2) && (DVDCheckDisk() == 0)) {
OSReport("蓋空き。ホットリセットします。\n");
val = 0;
}
if (APPNMI_HOTRESET_GET()) {
OSResetSystem(FALSE, 0, FALSE);
OSResetSystem(OS_RESET_RESTART, 0, FALSE);
return;
}
switch (val) {
case 0:
OSResetSystem(TRUE,osAppNMIBuffer[15], FALSE);
break;
case 1:
HotResetIplMenu();
break;
case 2:
bcopy(osAppNMIBuffer, (void*)0x811FFFC0, 0x40U);
OSResetSystem(0, 0x80000000, FALSE);
break;;
switch (val) {
case OS_RESET_RESTART:
OSResetSystem(OS_RESET_HOTRESET, osAppNMIBuffer[15], FALSE);
break;
case OS_RESET_HOTRESET:
HotResetIplMenu();
break;
case OS_RESET_SHUTDOWN:
bcopy(osAppNMIBuffer, NMISaveArea, sizeof(osAppNMIBuffer));
OSResetSystem(OS_RESET_RESTART, 0x80000000, FALSE);
break;
}
}