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

Update to use latest wut version

Browse Source
This commit is contained in:
Maschell 2022-07-25 11:52:33 +02:00
parent f756a3c985
commit b6b1f99d85
3 changed files with 23 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Dockerfile
View File

@ -1,5 +1,5 @@
FROM wiiuenv/devkitppc:20211229 FROM wiiuenv/devkitppc:20220724
COPY --from=wiiuenv/libiosuhax:20211008 /artifacts $DEVKITPRO COPY --from=wiiuenv/libiosuhax:20220523 /artifacts $DEVKITPRO
WORKDIR project WORKDIR project

37
source/BootUtils.cpp
View File

@ -1,29 +1,26 @@
#include "BootUtils.h"
#include "ACTAccountInfo.h"
#include "DrawUtils.h"
#include "MenuUtils.h"
#include "logger.h"
#include <codecvt> #include <codecvt>
#include <coreinit/debug.h>
#include <coreinit/screen.h>
#include <gx2/state.h>
#include <iosuhax.h>
#include <locale> #include <locale>
#include <malloc.h> #include <malloc.h>
#include <map> #include <map>
#include <memory> #include <memory>
#include <string>
#include <vector>
#include "ACTAccountInfo.h"
#include "BootUtils.h"
#include "DrawUtils.h"
#include "MenuUtils.h"
#include "logger.h"
#include <coreinit/debug.h>
#include <coreinit/screen.h>
#include <gx2/state.h>
#include <nn/act.h> #include <nn/act.h>
#include <nn/cmpt/cmpt.h> #include <nn/cmpt/cmpt.h>
#include <padscore/kpad.h> #include <padscore/kpad.h>
#include <string>
#include <sysapp/launch.h> #include <sysapp/launch.h>
#include <sysapp/title.h> #include <sysapp/title.h>
#include <vector>
#include <vpad/input.h> #include <vpad/input.h>
#include <iosuhax.h>
void handleAccountSelection(); void handleAccountSelection();
void bootWiiUMenu() { void bootWiiUMenu() {
@ -90,7 +87,7 @@ void handleAccountSelection() {
nn::act::Finalize(); nn::act::Finalize();
} }
static void launchvWiiTitle(uint32_t titleId_low, uint32_t titleId_high) { static void launchvWiiTitle(uint64_t titleId) {
// we need to init kpad for cmpt // we need to init kpad for cmpt
KPADInit(); KPADInit();
@ -108,17 +105,17 @@ static void launchvWiiTitle(uint32_t titleId_low, uint32_t titleId_high) {
void *dataBuffer = memalign(0x40, dataSize); void *dataBuffer = memalign(0x40, dataSize);
if (titleId_low == 0 && titleId_high == 0) { if (titleId == 0) {
CMPTLaunchMenu(dataBuffer, dataSize); CMPTLaunchMenu(dataBuffer, dataSize);
} else { } else {
CMPTLaunchTitle(dataBuffer, dataSize, titleId_low, titleId_high); CMPTLaunchTitle(dataBuffer, dataSize, titleId);
} }
free(dataBuffer); free(dataBuffer);
} }
void bootvWiiMenu() { void bootvWiiMenu() {
launchvWiiTitle(0, 0); launchvWiiTitle(0);
} }
void bootHomebrewChannel() { void bootHomebrewChannel() {
@ -130,7 +127,7 @@ void bootHomebrewChannel() {
if (fsaFd >= 0) { if (fsaFd >= 0) {
// mount the slccmpt // mount the slccmpt
if (IOSUHAX_FSA_Mount(fsaFd, "/dev/slccmpt01", "/vol/storage_slccmpt01", 2, nullptr, 0) >= 0) { if (IOSUHAX_FSA_Mount(fsaFd, "/dev/slccmpt01", "/vol/storage_slccmpt01", 2, nullptr, 0) >= 0) {
fileStat_s stat; FSStat stat;
// test if the OHBC or HBC is installed // test if the OHBC or HBC is installed
if (IOSUHAX_FSA_GetStat(fsaFd, "/vol/storage_slccmpt01/title/00010001/4f484243/content/00000000.app", &stat) >= 0) { if (IOSUHAX_FSA_GetStat(fsaFd, "/vol/storage_slccmpt01/title/00010001/4f484243/content/00000000.app", &stat) >= 0) {
@ -157,5 +154,5 @@ void bootHomebrewChannel() {
} }
DEBUG_FUNCTION_LINE("Launching vWii title %016llx", titleId); DEBUG_FUNCTION_LINE("Launching vWii title %016llx", titleId);
launchvWiiTitle((uint32_t) (titleId >> 32), (uint32_t) (titleId & 0xffffffff)); launchvWiiTitle(titleId);
} }

12
source/QuickStartUtils.cpp
View File

@ -62,10 +62,6 @@ static void StartAppletAndExit() {
_Exit(0); _Exit(0);
} }
extern "C" int32_t SYSSwitchToBrowser(void *);
extern "C" int32_t SYSSwitchToEShop(void *);
extern "C" int32_t _SYSSwitchTo(uint32_t pfid);
void loadConsoleAccount(const char *data_uuid) { void loadConsoleAccount(const char *data_uuid) {
nn::act::Initialize(); nn::act::Initialize();
for (int32_t i = 0; i < 13; i++) { for (int32_t i = 0; i < 13; i++) {
@ -162,7 +158,7 @@ bool getQuickBoot() {
info.titleId == 0x000500301001820AL) { info.titleId == 0x000500301001820AL) {
DEBUG_FUNCTION_LINE("Launching the Download Management"); DEBUG_FUNCTION_LINE("Launching the Download Management");
loadConsoleAccount(data.uuid); loadConsoleAccount(data.uuid);
_SYSSwitchTo(12); _SYSSwitchTo(SYSAPP_PFID_DOWNLOAD_MANAGEMENT);
StartAppletAndExit(); StartAppletAndExit();
@ -173,7 +169,7 @@ bool getQuickBoot() {
info.titleId == 0x000500301001620AL) { info.titleId == 0x000500301001620AL) {
DEBUG_FUNCTION_LINE("Launching Miiverse"); DEBUG_FUNCTION_LINE("Launching Miiverse");
loadConsoleAccount(data.uuid); loadConsoleAccount(data.uuid);
_SYSSwitchTo(9); _SYSSwitchTo(SYSAPP_PFID_MIIVERSE);
StartAppletAndExit(); StartAppletAndExit();
@ -184,7 +180,7 @@ bool getQuickBoot() {
info.titleId == 0x000500301001520AL) { info.titleId == 0x000500301001520AL) {
DEBUG_FUNCTION_LINE("Launching Friendlist"); DEBUG_FUNCTION_LINE("Launching Friendlist");
loadConsoleAccount(data.uuid); loadConsoleAccount(data.uuid);
_SYSSwitchTo(11); _SYSSwitchTo(SYSAPP_PFID_FRIENDLIST);
StartAppletAndExit(); StartAppletAndExit();
@ -195,7 +191,7 @@ bool getQuickBoot() {
info.titleId == 0x000500301001320AL) { info.titleId == 0x000500301001320AL) {
DEBUG_FUNCTION_LINE("Launching TVii"); DEBUG_FUNCTION_LINE("Launching TVii");
loadConsoleAccount(data.uuid); loadConsoleAccount(data.uuid);
_SYSSwitchTo(3); _SYSSwitchTo(SYSAPP_PFID_TVII);
StartAppletAndExit(); StartAppletAndExit();