diff --git a/out/bins/ext_booter.bin b/out/bins/ext_booter.bin index 1aea4aa1..77179527 100644 Binary files a/out/bins/ext_booter.bin and b/out/bins/ext_booter.bin differ diff --git a/out/boot.dol b/out/boot.dol index 2690d255..15e31ebf 100644 Binary files a/out/boot.dol and b/out/boot.dol differ diff --git a/source/banner/Animator.cpp b/source/banner/Animator.cpp index f0db1efe..3da24db0 100644 --- a/source/banner/Animator.cpp +++ b/source/banner/Animator.cpp @@ -232,10 +232,10 @@ float HermiteKeyHandler::GetFrame(FrameNumber frame_number) const // curvy code from marcan, :p return - prev->second.slope * nf * (t + powf(t, 3) - 2 * powf(t, 2)) + - next->second.slope * nf * (powf(t, 3) - powf(t, 2)) + - prev->second.value * (1 + (2 * powf(t, 3) - 3 * powf(t, 2))) + - next->second.value * (-2 * powf(t, 3) + 3 * powf(t, 2)); + prev->second.slope * nf * (t + pow(t, 3) - 2 * pow(t, 2)) + + next->second.slope * nf * (pow(t, 3) - pow(t, 2)) + + prev->second.value * (1 + (2 * pow(t, 3) - 3 * pow(t, 2))) + + next->second.value * (-2 * pow(t, 3) + 3 * pow(t, 2)); } } diff --git a/source/fileOps/fileOps.c b/source/fileOps/fileOps.c index df598efb..9c8ab9c5 100644 --- a/source/fileOps/fileOps.c +++ b/source/fileOps/fileOps.c @@ -14,6 +14,7 @@ en exposed s_fsop fsop structure can be used by callback to update operation sta #include #include #include +#include #include "fileOps/fileOps.h" #include "gecko/gecko.hpp" diff --git a/source/gecko/gecko.cpp b/source/gecko/gecko.cpp index ac3c480f..3f6722f9 100644 --- a/source/gecko/gecko.cpp +++ b/source/gecko/gecko.cpp @@ -60,6 +60,8 @@ static const devoptab_t gecko_out = { NULL, // device chmod_r NULL, // device fchmod_r NULL, // device rmdir_r + NULL, // lstat_r + NULL, // utimes_r }; static void USBGeckoOutput() diff --git a/source/gui/video.cpp b/source/gui/video.cpp index 41908df1..669eb5af 100644 --- a/source/gui/video.cpp +++ b/source/gui/video.cpp @@ -578,8 +578,8 @@ void CVideo::waitMessage(const vector &tex, float delay)// start wait i { m_WaitThreadRunning = true; /* changing light */ - wiiLightSetLevel(0); - wiiLightStartThread();// start thread in gekko.c that pulses the wii disc slot light on and off + //wiiLightSetLevel(0); + //wiiLightStartThread();// start thread in gekko.c that pulses the wii disc slot light on and off /* onscreen animation */ m_showWaitMessage = true;// start wait images thread to animate them LWP_CreateThread(&waitThread, _showWaitMessages, this, waitMessageStack, waitMessageStackSize, LWP_PRIO_HIGHEST); @@ -593,9 +593,9 @@ void * CVideo::_showWaitMessages(void *obj)// wait images thread u32 frames = m->m_waitMessageDelay * 50;// set delay start u32 waitFrames = frames;// set delay counter to delay start - s8 fadeDirection = 1; + //s8 fadeDirection = 1; s8 PNGfadeDirection = 1;// set frames movement direction - s16 currentLightLevel = 0; + //s16 currentLightLevel = 0; vector::iterator waitItr = m->m_waitMessages.begin();// set start frame image m->_clearScreen(); @@ -606,7 +606,7 @@ void * CVideo::_showWaitMessages(void *obj)// wait images thread //gprintf("Wait Message Thread: Start\nDelay: %d, Images: %d\n", waitFrames, m->m_waitMessages.size()); while(m->m_showWaitMessage) { - currentLightLevel += fadeDirection * 5; + /*currentLightLevel += fadeDirection * 5; if(currentLightLevel >= 255) { currentLightLevel = 255; @@ -616,8 +616,8 @@ void * CVideo::_showWaitMessages(void *obj)// wait images thread { currentLightLevel = 0; fadeDirection = 1; - } - wiiLightSetLevel(currentLightLevel); + }*/ + //wiiLightSetLevel(currentLightLevel); if(waitFrames == 0)// if delay count reaches 0 { @@ -651,7 +651,7 @@ void CVideo::hideWaitMessage()// stop wait images thread and wii disc slot light usleep(50); LWP_JoinThread(waitThread, NULL); /* end light thread */ - wiiLightEndThread(); + //wiiLightEndThread(); m_WaitThreadRunning = false; } waitThread = LWP_THREAD_NULL; diff --git a/source/hw/Gekko.c b/source/hw/Gekko.c index bf7f8eda..6221751a 100644 --- a/source/hw/Gekko.c +++ b/source/hw/Gekko.c @@ -100,11 +100,11 @@ void *light_loop() timeoff = light_timeoff; // Turn on the light and sleep for a bit wiiLightOn(); - nanosleep(&timeon); + nanosleep(&timeon, NULL); // Turn off the light (if required) and sleep for a bit if(timeoff.tv_nsec > 0) wiiLightOff(); - nanosleep(&timeoff); + nanosleep(&timeoff, NULL); } return NULL; } diff --git a/source/loader/sys.c b/source/loader/sys.c index 00d3e2f8..ba032edf 100644 --- a/source/loader/sys.c +++ b/source/loader/sys.c @@ -128,7 +128,7 @@ void Sys_Exit(void) exit(0); } -void __Sys_ResetCallback(void) +void __Sys_ResetCallback(u32 irq, void *ctx) { reset = true; } diff --git a/source/menu/menu_nandemu.cpp b/source/menu/menu_nandemu.cpp index 54da9e5e..41b2d5db 100644 --- a/source/menu/menu_nandemu.cpp +++ b/source/menu/menu_nandemu.cpp @@ -1,6 +1,7 @@ #include #include #include +#include #include "menu.hpp" #include "defines.h" #include "lockMutex.hpp"