fs.mitm: split out set.mitm

This commit is contained in:
Michael Scire 2018-10-29 22:14:34 -07:00 committed by SciresM
parent 3dc679215b
commit 23a85a7c24
6 changed files with 13 additions and 167 deletions

View file

@ -26,8 +26,6 @@
#include "fsmitm_utils.hpp"
#include "setsys_mitm_service.hpp"
extern "C" {
extern u32 __start__;
@ -63,11 +61,6 @@ void __appInit(void) {
fatalSimple(MAKERESULT(Module_Libnx, LibnxError_InitFail_SM));
}
rc = smMitMInitialize();
if (R_FAILED(rc)) {
fatalSimple(MAKERESULT(Module_Libnx, LibnxError_InitFail_SM));
}
rc = fsInitialize();
if (R_FAILED(rc)) {
fatalSimple(MAKERESULT(Module_Libnx, LibnxError_InitFail_FS));
@ -78,7 +71,6 @@ void __appInit(void) {
void __appExit(void) {
/* Cleanup services. */
fsExit();
smMitMExit();
smExit();
}
@ -87,27 +79,12 @@ struct FsMitmManagerOptions {
static const size_t MaxDomains = 0x10;
static const size_t MaxDomainObjects = 0x4000;
};
using FsMitmManager = WaitableManager<FsMitmManagerOptions>;
void CreateSettingsMitMServer(void *arg) {
auto server_manager = (FsMitmManager *)arg;
Result rc;
if (R_FAILED((rc = setsysInitialize()))) {
fatalSimple(rc);
}
AddMitmServerToManager<SetSysMitmService>(server_manager, "set:sys", 5);
svcExitThread();
}
int main(int argc, char **argv)
{
Thread sd_initializer_thread = {0};
Thread hid_initializer_thread = {0};
Thread set_mitm_setup_thread = {0};
consoleDebugInit(debugDevice_SVC);
if (R_FAILED(threadCreate(&sd_initializer_thread, &Utils::InitializeSdThreadFunc, NULL, 0x4000, 0x15, 0))) {
@ -129,15 +106,7 @@ int main(int argc, char **argv)
/* Create fsp-srv mitm. */
AddMitmServerToManager<FsMitmService>(server_manager, "fsp-srv", 61);
/* Create set:sys mitm server, delayed until set:sys is available. */
if (R_FAILED(threadCreate(&set_mitm_setup_thread, &CreateSettingsMitMServer, server_manager, 0x4000, 0x15, 0))) {
/* TODO: Panic. */
}
if (R_FAILED(threadStart(&set_mitm_setup_thread))) {
/* TODO: Panic. */
}
/* Loop forever, servicing our services. */
server_manager->Process();