Mirrors/MissionControl
2
0
Fork 0
mirror of https://github.com/ndeadly/MissionControl synced 2024-11-22 04:13:07 +00:00
Code Issues Projects Releases Packages Wiki Activity

mc.mitm: move mc service out of mitm namespace

Browse source
This commit is contained in:
ndeadly 2023-07-26 21:24:47 +02:00
parent cfa9041422
commit 1409d462ea
7 changed files with 16 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Makefile
View file

@ -14,7 +14,7 @@ TARGETS := mcmitm_version.cpp mc_mitm
all: $(TARGETS) all: $(TARGETS)
mcmitm_version.cpp: .git/HEAD .git/index mcmitm_version.cpp: .git/HEAD .git/index
echo "namespace ams::mitm { unsigned int mc_version = $(VERSION); const char *mc_build_name = \"$(BUILD_VERSION)\"; const char *mc_build_date = \"$(BUILD_DATE)\"; }" > mc_mitm/source/$@ echo "namespace ams::mc { unsigned int mc_version = $(VERSION); const char *mc_build_name = \"$(BUILD_VERSION)\"; const char *mc_build_date = \"$(BUILD_DATE)\"; }" > mc_mitm/source/$@
mc_mitm: mc_mitm:
$(MAKE) -C $@ $(MAKE) -C $@

8
mc_mitm/source/mc/mc_module.cpp
View file

@ -16,7 +16,7 @@
#include "mc_module.hpp" #include "mc_module.hpp"
#include "mc_service.hpp" #include "mc_service.hpp"
namespace ams::mitm::mc { namespace ams::mc {
namespace { namespace {
@ -60,8 +60,8 @@ namespace ams::mitm::mc {
} }
Result Launch() { void Launch() {
R_TRY(os::CreateThread(&g_thread, R_ABORT_UNLESS(os::CreateThread(&g_thread,
MissionControlThreadFunction, MissionControlThreadFunction,
nullptr, nullptr,
g_thread_stack, g_thread_stack,
@ -71,8 +71,6 @@ namespace ams::mitm::mc {
os::SetThreadNamePointer(&g_thread, "mc::MissionControlThread"); os::SetThreadNamePointer(&g_thread, "mc::MissionControlThread");
os::StartThread(&g_thread); os::StartThread(&g_thread);
R_SUCCEED();
} }
void WaitFinished() { void WaitFinished() {

4
mc_mitm/source/mc/mc_module.hpp
View file

@ -16,9 +16,9 @@
#pragma once #pragma once
#include <stratosphere.hpp> #include <stratosphere.hpp>
namespace ams::mitm::mc { namespace ams::mc {
Result Launch(); void Launch();
void WaitFinished(); void WaitFinished();
} }

4
mc_mitm/source/mc/mc_service.cpp
View file

@ -16,7 +16,7 @@
#include "mc_service.hpp" #include "mc_service.hpp"
#include "../mcmitm_version.hpp" #include "../mcmitm_version.hpp"
namespace ams::mitm::mc { namespace ams::mc {
Result MissionControlService::GetVersion(sf::Out<u32> version) { Result MissionControlService::GetVersion(sf::Out<u32> version) {
version.SetValue(mc_version); version.SetValue(mc_version);
@ -28,7 +28,7 @@ namespace ams::mitm::mc {
R_SUCCEED(); R_SUCCEED();
} }
Result MissionControlService::GetBuildDateString(sf::Out<ams::mitm::mc::DateString> date) { Result MissionControlService::GetBuildDateString(sf::Out<mc::DateString> date) {
std::strncpy(date.GetPointer()->date, mc_build_date, sizeof(mc::DateString)); std::strncpy(date.GetPointer()->date, mc_build_date, sizeof(mc::DateString));
R_SUCCEED(); R_SUCCEED();
} }

12
mc_mitm/source/mc/mc_service.hpp
View file

@ -20,20 +20,20 @@
#define AMS_MISSION_CONTROL_INTERFACE_INFO(C, H) \ #define AMS_MISSION_CONTROL_INTERFACE_INFO(C, H) \
AMS_SF_METHOD_INFO(C, H, 0, Result, GetVersion, (sf::Out<u32> version), (version)) \ AMS_SF_METHOD_INFO(C, H, 0, Result, GetVersion, (sf::Out<u32> version), (version)) \
AMS_SF_METHOD_INFO(C, H, 1, Result, GetBuildVersionString, (sf::Out<ams::mitm::mc::VersionString> version), (version)) \ AMS_SF_METHOD_INFO(C, H, 1, Result, GetBuildVersionString, (sf::Out<ams::mc::VersionString> version), (version)) \
AMS_SF_METHOD_INFO(C, H, 2, Result, GetBuildDateString, (sf::Out<ams::mitm::mc::DateString> version), (version)) \ AMS_SF_METHOD_INFO(C, H, 2, Result, GetBuildDateString, (sf::Out<ams::mc::DateString> version), (version)) \
AMS_SF_DEFINE_INTERFACE(ams::mitm::mc, IMissionControlInterface, AMS_MISSION_CONTROL_INTERFACE_INFO, 0x30eba3d4) AMS_SF_DEFINE_INTERFACE(ams::mc, IMissionControlInterface, AMS_MISSION_CONTROL_INTERFACE_INFO, 0x30eba3d4)
namespace ams::mitm::mc { namespace ams::mc {
class MissionControlService { class MissionControlService {
private: private:
public: public:
Result GetVersion(sf::Out<u32> version); Result GetVersion(sf::Out<u32> version);
Result GetBuildVersionString(sf::Out<ams::mitm::mc::VersionString> version); Result GetBuildVersionString(sf::Out<ams::mc::VersionString> version);
Result GetBuildDateString(sf::Out<ams::mitm::mc::DateString> date); Result GetBuildDateString(sf::Out<ams::mc::DateString> date);
}; };
static_assert(IsIMissionControlInterface<MissionControlService>); static_assert(IsIMissionControlInterface<MissionControlService>);

2
mc_mitm/source/mc/mc_types.hpp
View file

@ -15,7 +15,7 @@
*/ */
#pragma once #pragma once
namespace ams::mitm::mc { namespace ams::mc {
struct VersionString { struct VersionString {
char version[32]; char version[32];

2
mc_mitm/source/mcmitm_version.hpp
View file

@ -15,7 +15,7 @@
*/ */
#pragma once #pragma once
namespace ams::mitm { namespace ams::mc {
extern const unsigned int mc_version; extern const unsigned int mc_version;
extern const char *mc_build_name; extern const char *mc_build_name;