diff --git a/configure.py b/configure.py index a463dc7ce..9d75b62e7 100644 --- a/configure.py +++ b/configure.py @@ -962,29 +962,29 @@ def JSystemLib(lib_name, objects): DolphinLib( "os", [ - Object(Matching, "dolphin/os/__start.c"), - Object(Matching, "dolphin/os/OS.c"), - Object(Matching, "dolphin/os/OSAlarm.c"), - Object(Matching, "dolphin/os/OSAlloc.c"), - Object(Matching, "dolphin/os/OSArena.c"), - Object(Matching, "dolphin/os/OSAudioSystem.c"), - Object(Matching, "dolphin/os/OSCache.c"), - Object(Matching, "dolphin/os/OSContext.c"), - Object(Matching, "dolphin/os/OSError.c"), - Object(Matching, "dolphin/os/OSFont.c"), - Object(Matching, "dolphin/os/OSInterrupt.c"), - Object(Matching, "dolphin/os/OSLink.c"), - Object(Matching, "dolphin/os/OSMessage.c"), - Object(Matching, "dolphin/os/OSMemory.c"), - Object(Matching, "dolphin/os/OSMutex.c"), - Object(NonMatching, "dolphin/os/OSReboot.c"), - Object(Matching, "dolphin/os/OSReset.c"), - Object(Matching, "dolphin/os/OSResetSW.c"), - Object(Matching, "dolphin/os/OSRtc.c"), - Object(Matching, "dolphin/os/OSSync.c"), - Object(Matching, "dolphin/os/OSThread.c"), - Object(Matching, "dolphin/os/OSTime.c"), - Object(Matching, "dolphin/os/__ppc_eabi_init.cpp"), + Object(Matching, "dolphin/os/__start.c"), + Object(Matching, "dolphin/os/OS.c"), + Object(Matching, "dolphin/os/OSAlarm.c"), + Object(Matching, "dolphin/os/OSAlloc.c"), + Object(Matching, "dolphin/os/OSArena.c"), + Object(Matching, "dolphin/os/OSAudioSystem.c"), + Object(Matching, "dolphin/os/OSCache.c"), + Object(Matching, "dolphin/os/OSContext.c"), + Object(Matching, "dolphin/os/OSError.c"), + Object(Matching, "dolphin/os/OSFont.c"), + Object(Matching, "dolphin/os/OSInterrupt.c"), + Object(Matching, "dolphin/os/OSLink.c"), + Object(Matching, "dolphin/os/OSMessage.c"), + Object(Matching, "dolphin/os/OSMemory.c"), + Object(Matching, "dolphin/os/OSMutex.c"), + Object(Matching, "dolphin/os/OSReboot.c"), + Object(Matching, "dolphin/os/OSReset.c"), + Object(Matching, "dolphin/os/OSResetSW.c"), + Object(Matching, "dolphin/os/OSRtc.c"), + Object(Matching, "dolphin/os/OSSync.c"), + Object(Matching, "dolphin/os/OSThread.c"), + Object(Matching, "dolphin/os/OSTime.c"), + Object(Matching, "dolphin/os/__ppc_eabi_init.cpp"), ], ), DolphinLib( diff --git a/src/dolphin/os/OSReboot.c b/src/dolphin/os/OSReboot.c index 92879288b..1da64fc38 100644 --- a/src/dolphin/os/OSReboot.c +++ b/src/dolphin/os/OSReboot.c @@ -67,7 +67,6 @@ void ReadApploader(DVDCommandBlock* dvdCmd, void* addr, u32 offset, u32 numBytes static void Callback(s32 result, struct DVDCommandBlock* block) { Prepared = TRUE; } void __OSReboot(u32 resetCode, u32 bootDol) { - /* Nonmatching */ OSContext exceptionContext; DVDCommandBlock dvdCmd; DVDCommandBlock dvdCmd2; @@ -76,9 +75,8 @@ void __OSReboot(u32 resetCode, u32 bootDol) { OSDisableInterrupts(); - UNK_817FFFFC = 1; - UNK_817FFFF8 = 1; - OS_RESET_CODE = resetCode; + UNK_817FFFFC = 0; + UNK_817FFFF8 = 0; OS_REBOOT_BOOL = TRUE; BOOT_REGION_START = (u32)SaveStart; BOOT_REGION_END = (u32)SaveEnd;