OmniNX/Atmosphere
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

strat: go all in on ncm::TitleId

Browse Source
This commit is contained in:
Michael Scire
2019-07-02 20:54:16 -07:00
committed by SciresM
parent c916a7db88
commit 2d0c881ffe
33 changed files with 191 additions and 186 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
stratosphere/ams_mitm/source/set_mitm/set_mitm_service.cpp
View File

@@ -68,14 +68,14 @@ Result SetMitmService::EnsureLocale() {
if (!this->got_locale) {
std::memset(&this->locale, 0xCC, sizeof(this->locale));
if (this->title_id == TitleId_Ns) {
if (this->title_id == sts::ncm::TitleId::Ns) {
u64 app_pid = 0;
u64 app_tid = 0;
R_TRY(pmdmntGetApplicationPid(&app_pid));
R_TRY(pminfoGetTitleId(&app_tid, app_pid));
this->locale = Utils::GetTitleOverrideLocale(app_tid);
} else {
this->locale = Utils::GetTitleOverrideLocale(this->title_id);
this->locale = Utils::GetTitleOverrideLocale(static_cast<u64>(this->title_id));
this->got_locale = true;
}
}

4
stratosphere/ams_mitm/source/set_mitm/set_mitm_service.hpp
View File

@@ -39,9 +39,9 @@ class SetMitmService : public IMitmServiceObject {
this->got_locale = false;
}
static bool ShouldMitm(u64 pid, u64 tid) {
static bool ShouldMitm(u64 pid, sts::ncm::TitleId tid) {
/* Mitm all applications. */
return tid == TitleId_Ns || TitleIdIsApplication(tid);
return tid == sts::ncm::TitleId::Ns || sts::ncm::IsApplicationTitleId(tid);
}
static void PostProcess(IMitmServiceObject *obj, IpcResponseContext *ctx);

6
stratosphere/ams_mitm/source/set_mitm/setsys_firmware_version.cpp
View File

@@ -32,7 +32,7 @@ void VersionManager::Initialize() {
}
/* Mount firmware version data archive. */
R_ASSERT(romfsMountFromDataArchive(TitleId_ArchiveSystemVersion, FsStorageId_NandSystem, "sysver"));
R_ASSERT(romfsMountFromDataArchive(static_cast<u64>(sts::ncm::TitleId::ArchiveSystemVersion), FsStorageId_NandSystem, "sysver"));
{
ON_SCOPE_EXIT { romfsUnmount("sysver"); };
@@ -70,11 +70,11 @@ void VersionManager::Initialize() {
g_got_version = true;
}
Result VersionManager::GetFirmwareVersion(u64 title_id, SetSysFirmwareVersion *out) {
Result VersionManager::GetFirmwareVersion(sts::ncm::TitleId title_id, SetSysFirmwareVersion *out) {
VersionManager::Initialize();
/* Report atmosphere string to qlaunch, maintenance and nothing else. */
if (title_id == TitleId_AppletQlaunch || title_id == TitleId_AppletMaintenanceMenu) {
if (title_id == sts::ncm::TitleId::AppletQlaunch || title_id == sts::ncm::TitleId::AppletMaintenanceMenu) {
*out = g_ams_fw_version;
} else {
*out = g_fw_version;

2
stratosphere/ams_mitm/source/set_mitm/setsys_firmware_version.hpp
View File

@@ -21,5 +21,5 @@
class VersionManager {
public:
static void Initialize();
static Result GetFirmwareVersion(u64 title_id, SetSysFirmwareVersion *out);
static Result GetFirmwareVersion(sts::ncm::TitleId title_id, SetSysFirmwareVersion *out);
};

2
stratosphere/ams_mitm/source/set_mitm/setsys_mitm_service.hpp
View File

@@ -37,7 +37,7 @@ class SetSysMitmService : public IMitmServiceObject {
/* ... */
}
static bool ShouldMitm(u64 pid, u64 tid) {
static bool ShouldMitm(u64 pid, sts::ncm::TitleId tid) {
/* Mitm everything. */
return true;
}