The-Homebrew-Cloud/ftpiiu_plugin
2
0
Fork 0
mirror of https://github.com/wiiu-env/ftpiiu_plugin.git synced 2024-12-23 03:11:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

Use libmocha instead of libiosuhax

Browse Source
This commit is contained in:
Maschell 2022-08-27 13:35:12 +02:00
parent fe8c2abd1e
commit acde083dcf
4 changed files with 47 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Dockerfile
View File

@ -1,6 +1,6 @@
FROM wiiuenv/devkitppc:20220507 FROM wiiuenv/devkitppc:20220806
COPY --from=wiiuenv/wiiupluginsystem:20220513 /artifacts $DEVKITPRO COPY --from=wiiuenv/wiiupluginsystem:20220724 /artifacts $DEVKITPRO
COPY --from=wiiuenv/libiosuhax:20220129 /artifacts $DEVKITPRO COPY --from=wiiuenv/libmocha:20220827 /artifacts $DEVKITPRO
WORKDIR project WORKDIR project

2
Makefile
View File

@ -48,7 +48,7 @@ CXXFLAGS += -DDEBUG -DVERBOSE_DEBUG -g
CFLAGS += -DDEBUG -DVERBOSE_DEBUG -g CFLAGS += -DDEBUG -DVERBOSE_DEBUG -g
endif endif
LIBS := -lwups -lwut -liosuhax LIBS := -lwups -lwut -lmocha
#------------------------------------------------------------------------------- #-------------------------------------------------------------------------------
# list of directories containing libraries, this must be the top level # list of directories containing libraries, this must be the top level

87
src/main.cpp
View File

@ -3,9 +3,7 @@
#include "virtualpath.h" #include "virtualpath.h"
#include <coreinit/cache.h> #include <coreinit/cache.h>
#include <cstring> #include <cstring>
#include <iosuhax.h> #include <mocha/mocha.h>
#include <iosuhax_devoptab.h>
#include <iosuhax_disc_interface.h>
#include <nn/ac.h> #include <nn/ac.h>
#include <wups.h> #include <wups.h>
@ -18,11 +16,24 @@ WUPS_PLUGIN_LICENSE("GPL");
WUPS_USE_WUT_DEVOPTAB(); WUPS_USE_WUT_DEVOPTAB();
uint32_t hostIpAddress = 0; uint32_t hostIpAddress = 0;
int iosuhaxMount = 0;
int fsaFd = -1;
BackgroundThread *thread = nullptr; BackgroundThread *thread = nullptr;
MochaUtilsStatus MountWrapper(const char *mount, const char *dev, const char *mountTo) {
auto res = Mocha_MountFS(mount, dev, mountTo);
if (res == MOCHA_RESULT_ALREADY_EXISTS) {
res = Mocha_MountFS(mount, nullptr, mountTo);
}
if (res == MOCHA_RESULT_SUCCESS) {
std::string mountPath = std::string(mount) + ":/";
VirtualMountDevice(mountPath.c_str());
DEBUG_FUNCTION_LINE_VERBOSE("Mounted %s", mountPath.c_str());
} else {
DEBUG_FUNCTION_LINE_ERR("Failed to mount %s: %s [%d]", mount, Mocha_GetStatusStr(res), res);
}
return res;
}
/* Entry point */ /* Entry point */
ON_APPLICATION_START() { ON_APPLICATION_START() {
nn::ac::Initialize(); nn::ac::Initialize();
@ -38,39 +49,18 @@ ON_APPLICATION_START() {
AddVirtualFSPath("vol", nullptr, nullptr); AddVirtualFSPath("vol", nullptr, nullptr);
AddVirtualFSVOLPath("external01", nullptr, nullptr); AddVirtualFSVOLPath("external01", nullptr, nullptr);
AddVirtualFSVOLPath("content", nullptr, nullptr); AddVirtualFSVOLPath("content", nullptr, nullptr);
MochaUtilsStatus res;
int res = IOSUHAX_Open(nullptr); if ((res = Mocha_InitLibrary()) == MOCHA_RESULT_SUCCESS) {
if (res < 0) { MountWrapper("slccmpt01", "/dev/slccmpt01", "/vol/storage_slccmpt01");
DEBUG_FUNCTION_LINE_ERR("IOSUHAX_open failed"); MountWrapper("storage_odd_tickets", nullptr, "/vol/storage_odd01");
MountWrapper("storage_odd_updates", nullptr, "/vol/storage_odd02");
MountWrapper("storage_odd_content", nullptr, "/vol/storage_odd03");
MountWrapper("storage_odd_content2", nullptr, "/vol/storage_odd04");
MountWrapper("storage_slc", "/dev/slc01", "/vol/storage_slc01");
Mocha_MountFS("storage_mlc", nullptr, "/vol/storage_mlc01");
Mocha_MountFS("storage_usb", nullptr, "/vol/storage_usb01");
} else { } else {
iosuhaxMount = 1; DEBUG_FUNCTION_LINE_ERR("Failed to init libmocha: %s [%d]", Mocha_GetStatusStr(res), res);
//fatInitDefault();
fsaFd = IOSUHAX_FSA_Open();
if (fsaFd < 0) {
DEBUG_FUNCTION_LINE_ERR("IOSUHAX_FSA_Open failed");
}
DEBUG_FUNCTION_LINE("IOSUHAX_FSA_Open done");
mount_fs("slccmpt01", fsaFd, "/dev/slccmpt01", "/vol/storage_slccmpt01");
mount_fs("storage_odd_tickets", fsaFd, "/dev/odd01", "/vol/storage_odd_tickets");
mount_fs("storage_odd_updates", fsaFd, "/dev/odd02", "/vol/storage_odd_updates");
mount_fs("storage_odd_content", fsaFd, "/dev/odd03", "/vol/storage_odd_content");
mount_fs("storage_odd_content2", fsaFd, "/dev/odd04", "/vol/storage_odd_content2");
mount_fs("storage_slc", fsaFd, nullptr, "/vol/system");
mount_fs("storage_mlc", fsaFd, nullptr, "/vol/storage_mlc01");
mount_fs("storage_usb", fsaFd, nullptr, "/vol/storage_usb01");
VirtualMountDevice("slccmpt01:/");
VirtualMountDevice("storage_odd_tickets:/");
VirtualMountDevice("storage_odd_updates:/");
VirtualMountDevice("storage_odd_content:/");
VirtualMountDevice("storage_odd_content2:/");
VirtualMountDevice("storage_slc:/");
VirtualMountDevice("storage_mlc:/");
VirtualMountDevice("storage_usb:/");
VirtualMountDevice("usb:/");
} }
thread = BackgroundThread::getInstance(); thread = BackgroundThread::getInstance();
@ -87,21 +77,14 @@ ON_APPLICATION_REQUESTS_EXIT() {
DEBUG_FUNCTION_LINE_VERBOSE("Ended ftp Server."); DEBUG_FUNCTION_LINE_VERBOSE("Ended ftp Server.");
if (iosuhaxMount) { Mocha_UnmountFS("slccmpt01");
IOSUHAX_sdio_disc_interface.shutdown(); Mocha_UnmountFS("storage_odd_tickets");
IOSUHAX_usb_disc_interface.shutdown(); Mocha_UnmountFS("storage_odd_updates");
Mocha_UnmountFS("storage_odd_content");
unmount_fs("slccmpt01"); Mocha_UnmountFS("storage_odd_content2");
unmount_fs("storage_odd_tickets"); Mocha_UnmountFS("storage_slc");
unmount_fs("storage_odd_updates"); Mocha_UnmountFS("storage_mlc");
unmount_fs("storage_odd_content"); Mocha_UnmountFS("storage_usb");
unmount_fs("storage_odd_content2");
unmount_fs("storage_slc");
unmount_fs("storage_mlc");
unmount_fs("storage_usb");
IOSUHAX_FSA_Close(fsaFd);
IOSUHAX_Close();
}
DEBUG_FUNCTION_LINE("Unmount virtual paths"); DEBUG_FUNCTION_LINE("Unmount virtual paths");
UnmountVirtualPaths(); UnmountVirtualPaths();

12
src/utils/logger.h
View File

@ -8,11 +8,15 @@
extern "C" { extern "C" {
#endif #endif
#define LOG_APP_TYPE "P" #define LOG_APP_TYPE "P"
#define LOG_APP_NAME "ftpiiu" #define LOG_APP_NAME "ftpiiu"
#define __FILENAME_X__ (strrchr(__FILE__, '\\') ? strrchr(__FILE__, '\\') + 1 : __FILE__) #define __FILENAME__ ({ \
#define __FILENAME__ (strrchr(__FILE__, '/') ? strrchr(__FILE__, '/') + 1 : __FILENAME_X__) const char *__filename = __FILE__; \
const char *__pos = strrchr(__filename, '/'); \
if (!__pos) __pos = strrchr(__filename, '\\'); \
__pos ? __pos + 1 : __filename; \
})
#define LOG(LOG_FUNC, FMT, ARGS...) LOG_EX_DEFAULT(LOG_FUNC, "", "", FMT, ##ARGS) #define LOG(LOG_FUNC, FMT, ARGS...) LOG_EX_DEFAULT(LOG_FUNC, "", "", FMT, ##ARGS)