namespace sts -> namespace ams

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...

stratosphere/sm/source/impl/sm_service_manager.cpp

@@ -22,7 +22,7 @@
 
 #include "sm_service_manager.hpp"
 
-namespace sts::sm::impl {
+namespace ams::sm::impl {
 
     /* Anonymous namespace for implementation details. */
     namespace {
@@ -167,11 +167,11 @@ namespace sts::sm::impl {
                     cfg::GetInitialProcessRange(&this->min, &this->max);
 
                     /* Ensure range is sane. */
-                    STS_ASSERT(this->min <= this->max);
+                    AMS_ASSERT(this->min <= this->max);
                 }
 
                 bool IsInitialProcess(os::ProcessId pid) const {
-                    STS_ASSERT(pid != os::InvalidProcessId);
+                    AMS_ASSERT(pid != os::InvalidProcessId);
                     return this->min <= pid && pid <= this->max;
                 }
         };
@@ -234,7 +234,7 @@ namespace sts::sm::impl {
         ncm::TitleId GetTitleIdForMitm(os::ProcessId pid) {
             /* Anything that can request a mitm session must have a process info. */
             const auto process_info = GetProcessInfo(pid);
-            STS_ASSERT(process_info != nullptr);
+            AMS_ASSERT(process_info != nullptr);
             return process_info->tid;
         }
 

stratosphere/sm/source/impl/sm_service_manager.hpp

@@ -19,7 +19,7 @@
 #include <stratosphere/sm.hpp>
 #include <stratosphere/ncm.hpp>
 
-namespace sts::sm::impl {
+namespace ams::sm::impl {
 
     /* Process management. */
     Result RegisterProcess(os::ProcessId pid, ncm::TitleId tid, const void *acid_sac, size_t acid_sac_size, const void *aci_sac, size_t aci_sac_size);

stratosphere/sm/source/sm_dmnt_service.cpp

@@ -20,7 +20,7 @@
 #include "sm_dmnt_service.hpp"
 #include "impl/sm_service_manager.hpp"
 
-namespace sts::sm {
+namespace ams::sm {
 
     Result DmntService::AtmosphereGetRecord(sf::Out<ServiceRecord> record, ServiceName service) {
         return impl::GetServiceRecord(record.GetPointer(), service);

stratosphere/sm/source/sm_dmnt_service.hpp

@@ -19,7 +19,7 @@
 #include <stratosphere.hpp>
 #include <stratosphere/sm.hpp>
 
-namespace sts::sm {
+namespace ams::sm {
 
     /* Service definition. */
     class DmntService final : public sf::IServiceObject {

stratosphere/sm/source/sm_main.cpp

@@ -48,19 +48,19 @@ extern "C" {
 
 }
 
-namespace sts::ams {
+namespace ams {
 
-    ncm::TitleId StratosphereTitleId = ncm::TitleId::Sm;
+    ncm::TitleId CurrentTitleId = ncm::TitleId::Sm;
+
+    namespace result {
+
+        bool CallFatalOnResultAssertion = false;
+
+    }
 
 }
 
-namespace sts::result {
-
-    bool CallFatalOnResultAssertion = false;
-
-}
-
-using namespace sts;
+using namespace ams;
 
 void __libnx_exception_handler(ThreadExceptionDump *ctx) {
     ams::CrashHandler(ctx);

stratosphere/sm/source/sm_manager_service.cpp

@@ -20,7 +20,7 @@
 #include "sm_manager_service.hpp"
 #include "impl/sm_service_manager.hpp"
 
-namespace sts::sm {
+namespace ams::sm {
 
     Result ManagerService::RegisterProcess(os::ProcessId process_id, const sf::InBuffer &acid_sac, const sf::InBuffer &aci_sac) {
         return impl::RegisterProcess(process_id, ncm::TitleId::Invalid, acid_sac.GetPointer(), acid_sac.GetSize(), aci_sac.GetPointer(), aci_sac.GetSize());

stratosphere/sm/source/sm_manager_service.hpp

@@ -20,7 +20,7 @@
 #include <stratosphere/sm.hpp>
 #include <stratosphere/ncm.hpp>
 
-namespace sts::sm {
+namespace ams::sm {
 
     /* Service definition. */
     class ManagerService final : public sf::IServiceObject {

stratosphere/sm/source/sm_user_service.cpp

@@ -20,7 +20,7 @@
 #include "sm_user_service.hpp"
 #include "impl/sm_service_manager.hpp"
 
-namespace sts::sm {
+namespace ams::sm {
 
     Result UserService::Initialize(const sf::ClientProcessId &client_process_id) {
         this->process_id = client_process_id.GetValue();

stratosphere/sm/source/sm_user_service.hpp

@@ -20,7 +20,7 @@
 #include <stratosphere/sm.hpp>
 #include <stratosphere/ncm.hpp>
 
-namespace sts::sm {
+namespace ams::sm {
 
     /* Service definition. */
     class UserService final : public sf::IServiceObject {