The-Homebrew-Cloud/AutobootModule
2
0
Fork 0
mirror of https://github.com/wiiu-env/AutobootModule.git synced 2024-11-01 01:25:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

Improve OSFatal/logging messages

Browse Source
This commit is contained in:
Maschell 2024-07-04 17:22:06 +02:00
parent 0ce39e61be
commit ca588cb0e5
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
source/MenuUtils.cpp
View File

@ -110,7 +110,7 @@ void drawMenuScreen(const std::map<uint32_t, std::string> &menu, uint32_t select
int32_t handleMenuScreen(std::string &configPath, int32_t autobootOptionInput, const std::map<uint32_t, std::string> &menu) { int32_t handleMenuScreen(std::string &configPath, int32_t autobootOptionInput, const std::map<uint32_t, std::string> &menu) {
auto screenBuffer = DrawUtils::InitOSScreen(); auto screenBuffer = DrawUtils::InitOSScreen();
if (!screenBuffer) { if (!screenBuffer) {
OSFatal("Failed to alloc memory for screen"); OSFatal("AutobootModule: Failed to alloc memory for screen");
} }
uint32_t tvBufferSize = OSScreenGetBufferSizeEx(SCREEN_TV); uint32_t tvBufferSize = OSScreenGetBufferSizeEx(SCREEN_TV);
@ -118,7 +118,7 @@ int32_t handleMenuScreen(std::string &configPath, int32_t autobootOptionInput, c
DrawUtils::initBuffers(screenBuffer, tvBufferSize, (void *) ((uint32_t) screenBuffer + tvBufferSize), drcBufferSize); DrawUtils::initBuffers(screenBuffer, tvBufferSize, (void *) ((uint32_t) screenBuffer + tvBufferSize), drcBufferSize);
if (!DrawUtils::initFont()) { if (!DrawUtils::initFont()) {
OSFatal("Failed to init font"); OSFatal("AutobootModule: Failed to init font");
} }
int32_t selectedIndex = autobootOptionInput > 0 ? autobootOptionInput : 0; int32_t selectedIndex = autobootOptionInput > 0 ? autobootOptionInput : 0;
@ -225,7 +225,7 @@ int32_t handleMenuScreen(std::string &configPath, int32_t autobootOptionInput, c
nn::act::SlotNo handleAccountSelectScreen(const std::vector<std::shared_ptr<AccountInfo>> &data) { nn::act::SlotNo handleAccountSelectScreen(const std::vector<std::shared_ptr<AccountInfo>> &data) {
auto screenBuffer = DrawUtils::InitOSScreen(); auto screenBuffer = DrawUtils::InitOSScreen();
if (!screenBuffer) { if (!screenBuffer) {
OSFatal("Failed to alloc memory for screen"); OSFatal("AutobootModule: Failed to alloc memory for screen");
} }
uint32_t tvBufferSize = OSScreenGetBufferSizeEx(SCREEN_TV); uint32_t tvBufferSize = OSScreenGetBufferSizeEx(SCREEN_TV);
@ -233,7 +233,7 @@ nn::act::SlotNo handleAccountSelectScreen(const std::vector<std::shared_ptr<Acco
DrawUtils::initBuffers(screenBuffer, tvBufferSize, (void *) ((uint32_t) screenBuffer + tvBufferSize), drcBufferSize); DrawUtils::initBuffers(screenBuffer, tvBufferSize, (void *) ((uint32_t) screenBuffer + tvBufferSize), drcBufferSize);
if (!DrawUtils::initFont()) { if (!DrawUtils::initFont()) {
OSFatal("Failed to init font"); OSFatal("AutobootModule: Failed to init font");
} }
int32_t selected = 0; int32_t selected = 0;
@ -403,7 +403,7 @@ void handleUpdateWarningScreen() {
auto screenBuffer = DrawUtils::InitOSScreen(); auto screenBuffer = DrawUtils::InitOSScreen();
if (!screenBuffer) { if (!screenBuffer) {
OSFatal("Failed to alloc memory for screen"); OSFatal("AutobootModule: Failed to alloc memory for screen");
} }
uint32_t tvBufferSize = OSScreenGetBufferSizeEx(SCREEN_TV); uint32_t tvBufferSize = OSScreenGetBufferSizeEx(SCREEN_TV);
@ -411,7 +411,7 @@ void handleUpdateWarningScreen() {
DrawUtils::initBuffers(screenBuffer, tvBufferSize, (void *) ((uint32_t) screenBuffer + tvBufferSize), drcBufferSize); DrawUtils::initBuffers(screenBuffer, tvBufferSize, (void *) ((uint32_t) screenBuffer + tvBufferSize), drcBufferSize);
if (!DrawUtils::initFont()) { if (!DrawUtils::initFont()) {
OSFatal("Failed to init font"); OSFatal("AutobootModule: Failed to init font");
} }
{ {

4
source/PairUtils.cpp
View File

@ -105,7 +105,7 @@ PairMenu::PairMenu() {
mIMHandle = IM_Open(); mIMHandle = IM_Open();
if (mIMHandle < 0) { if (mIMHandle < 0) {
DEBUG_FUNCTION_LINE_ERR("PairMenu: IM_Open failed"); DEBUG_FUNCTION_LINE_ERR("PairMenu: IM_Open failed");
OSFatal("PairMenu: IM_Open failed"); OSFatal("AutobootModule: PairMenu: IM_Open failed");
} }
mIMRequest = (IMRequest *) memalign(0x40, sizeof(IMRequest)); mIMRequest = (IMRequest *) memalign(0x40, sizeof(IMRequest));
@ -114,7 +114,7 @@ PairMenu::PairMenu() {
if (!mIMRequest || !mIMCancelRequest) { if (!mIMRequest || !mIMCancelRequest) {
DEBUG_FUNCTION_LINE_ERR("Failed to allocate im request"); DEBUG_FUNCTION_LINE_ERR("Failed to allocate im request");
OSFatal("PairMenu: Failed to allocate im request"); OSFatal("AutobootModule: PairMenu: Failed to allocate im request");
} }
mIMEventMask = IM_EVENT_SYNC; mIMEventMask = IM_EVENT_SYNC;

2
source/QuickStartUtils.cpp
View File

@ -157,7 +157,7 @@ public:
// The gamepad does reconnect after selecting a title, make sure it's still disconnected after waiting 3 seconds // The gamepad does reconnect after selecting a title, make sure it's still disconnected after waiting 3 seconds
OSSleepTicks(OSSecondsToTicks(3)); OSSleepTicks(OSSecondsToTicks(3));
if (!IsDRCConnected()) { if (!IsDRCConnected()) {
DEBUG_FUNCTION_LINE("GamePad was disconnected, lets abort the quick start menu"); DEBUG_FUNCTION_LINE_INFO("GamePad was disconnected, lets abort the quick start menu");
CCRSysCaffeineBootCheckAbort(); CCRSysCaffeineBootCheckAbort();
} }
} }