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

namespace sts -> namespace ams

Browse Source 
namespace sts::ams -> ams::exosphere, ams::.

This is to facilitate future use of ams:: namespace code in
mesosphere, as we'll want to include ams::util, ams::result, ams::svc...
This commit is contained in:
Michael Scire
2019-10-24 02:30:10 -07:00
committed by SciresM
parent 4059dc6187
commit 8cb77ac136
397 changed files with 968 additions and 926 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
stratosphere/ro/source/impl/ro_nro_utils.cpp
View File

@@ -18,7 +18,7 @@
#include "ro_nro_utils.hpp"
namespace sts::ro::impl {
namespace ams::ro::impl {
namespace {

2
stratosphere/ro/source/impl/ro_nro_utils.hpp
View File

@@ -19,7 +19,7 @@
#include <stratosphere.hpp>
#include <stratosphere/ro.hpp>
namespace sts::ro::impl {
namespace ams::ro::impl {
/* Utilities for working with NROs. */
Result MapNro(u64 *out_base_address, Handle process_handle, u64 nro_heap_address, u64 nro_heap_size, u64 bss_heap_address, u64 bss_heap_size);

2
stratosphere/ro/source/impl/ro_nrr_utils.cpp
View File

@@ -19,7 +19,7 @@
#include "ro_nrr_utils.hpp"
#include "ro_service_impl.hpp"
namespace sts::ro::impl {
namespace ams::ro::impl {
namespace {

2
stratosphere/ro/source/impl/ro_nrr_utils.hpp
View File

@@ -19,7 +19,7 @@
#include <stratosphere.hpp>
#include <stratosphere/ro.hpp>
namespace sts::ro::impl {
namespace ams::ro::impl {
/* Utilities for working with NRRs. */
Result MapAndValidateNrr(NrrHeader **out_header, u64 *out_mapped_code_address, Handle process_handle, ncm::TitleId title_id, u64 nrr_heap_address, u64 nrr_heap_size, ModuleType expected_type, bool enforce_type);

4
stratosphere/ro/source/impl/ro_patcher.cpp
View File

@@ -18,7 +18,7 @@
#include "ro_patcher.hpp"
namespace sts::ro::impl {
namespace ams::ro::impl {
namespace {
@@ -33,7 +33,7 @@ namespace sts::ro::impl {
/* Apply IPS patches. */
void LocateAndApplyIpsPatchesToModule(const ModuleId *module_id, u8 *mapped_nro, size_t mapped_size) {
sts::patcher::LocateAndApplyIpsPatchesToModule(NroPatchesDirectory, NroPatchesProtectedSize, NroPatchesProtectedOffset, module_id, mapped_nro, mapped_size);
ams::patcher::LocateAndApplyIpsPatchesToModule(NroPatchesDirectory, NroPatchesProtectedSize, NroPatchesProtectedOffset, module_id, mapped_nro, mapped_size);
}
}

2
stratosphere/ro/source/impl/ro_patcher.hpp
View File

@@ -18,7 +18,7 @@
#include <switch.h>
#include <stratosphere/ro.hpp>
namespace sts::ro::impl {
namespace ams::ro::impl {
/* Apply IPS patches. */
void LocateAndApplyIpsPatchesToModule(const ModuleId *module_id, u8 *mapped_nro, size_t mapped_size);

14
stratosphere/ro/source/impl/ro_service_impl.cpp
View File

@@ -25,7 +25,7 @@
#include "ro_patcher.hpp"
#include "ro_service_impl.hpp"
namespace sts::ro::impl {
namespace ams::ro::impl {
namespace {
@@ -248,7 +248,7 @@ namespace sts::ro::impl {
return nullptr;
}
STS_ASSERT(context_id < MaxSessions);
AMS_ASSERT(context_id < MaxSessions);
return &g_process_contexts[context_id];
}
@@ -275,7 +275,7 @@ namespace sts::ro::impl {
}
}
/* Failure to find a free context is actually an abort condition. */
STS_ASSERT(false);
AMS_ASSERT(false);
}
void FreeContext(size_t context_id) {
@@ -369,7 +369,7 @@ namespace sts::ro::impl {
Result LoadNrr(size_t context_id, Handle process_h, u64 nrr_address, u64 nrr_size, ModuleType expected_type, bool enforce_type) {
/* Get context. */
ProcessContext *context = GetContextById(context_id);
STS_ASSERT(context != nullptr);
AMS_ASSERT(context != nullptr);
/* Get title id. */
const ncm::TitleId title_id = context->GetTitleId(process_h);
@@ -399,7 +399,7 @@ namespace sts::ro::impl {
Result UnloadNrr(size_t context_id, u64 nrr_address) {
/* Get context. */
ProcessContext *context = GetContextById(context_id);
STS_ASSERT(context != nullptr);
AMS_ASSERT(context != nullptr);
/* Validate address. */
R_UNLESS(util::IsAligned(nrr_address, 0x1000), ResultInvalidAddress());
@@ -421,7 +421,7 @@ namespace sts::ro::impl {
Result LoadNro(u64 *out_address, size_t context_id, u64 nro_address, u64 nro_size, u64 bss_address, u64 bss_size) {
/* Get context. */
ProcessContext *context = GetContextById(context_id);
STS_ASSERT(context != nullptr);
AMS_ASSERT(context != nullptr);
/* Validate address/size. */
R_TRY(ValidateAddressAndSize(nro_address, nro_size));
@@ -467,7 +467,7 @@ namespace sts::ro::impl {
Result UnloadNro(size_t context_id, u64 nro_address) {
/* Get context. */
ProcessContext *context = GetContextById(context_id);
STS_ASSERT(context != nullptr);
AMS_ASSERT(context != nullptr);
/* Validate address. */
R_UNLESS(util::IsAligned(nro_address, 0x1000), ResultInvalidAddress());

2
stratosphere/ro/source/impl/ro_service_impl.hpp
View File

@@ -19,7 +19,7 @@
#include <stratosphere.hpp>
#include <stratosphere/ro.hpp>
namespace sts::ro::impl {
namespace ams::ro::impl {
/* Definitions. */
constexpr size_t InvalidContextId = static_cast<size_t>(-1);

2
stratosphere/ro/source/ro_debug_monitor.cpp
View File

@@ -21,7 +21,7 @@
#include "ro_debug_monitor.hpp"
#include "impl/ro_service_impl.hpp"
namespace sts::ro {
namespace ams::ro {
Result DebugMonitorService::GetProcessModuleInfo(sf::Out<u32> out_count, const sf::OutArray<LoaderModuleInfo> &out_infos, os::ProcessId process_id) {
R_UNLESS(out_infos.GetSize() <= std::numeric_limits<s32>::max(), ResultInvalidSize());

2
stratosphere/ro/source/ro_debug_monitor.hpp
View File

@@ -18,7 +18,7 @@
#include <switch.h>
#include <stratosphere.hpp>
namespace sts::ro {
namespace ams::ro {
class DebugMonitorService final : public sf::IServiceObject {
protected:

18
stratosphere/ro/source/ro_main.cpp
View File

@@ -44,19 +44,19 @@ extern "C" {
void __appExit(void);
}
namespace sts::ams {
namespace ams {
ncm::TitleId StratosphereTitleId = ncm::TitleId::Ro;
ncm::TitleId CurrentTitleId = ncm::TitleId::Ro;
namespace result {
bool CallFatalOnResultAssertion = true;
}
}
namespace sts::result {
bool CallFatalOnResultAssertion = true;
}
using namespace sts;
using namespace ams;
void __libnx_initheap(void) {
void* addr = nx_inner_heap;

2
stratosphere/ro/source/ro_service.cpp
View File

@@ -22,7 +22,7 @@
#include "ro_service.hpp"
#include "impl/ro_service_impl.hpp"
namespace sts::ro {
namespace ams::ro {
void SetDevelopmentHardware(bool is_development_hardware) {
impl::SetDevelopmentHardware(is_development_hardware);

2
stratosphere/ro/source/ro_service.hpp
View File

@@ -20,7 +20,7 @@
#include <stratosphere.hpp>
#include <stratosphere/ro.hpp>
namespace sts::ro {
namespace ams::ro {
/* Access utilities. */
void SetDevelopmentHardware(bool is_development_hardware);