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/fatal/source/fatal_config.cpp
View File

@@ -16,7 +16,7 @@
#include "fatal_config.hpp"
namespace sts::fatal::srv {
namespace ams::fatal::srv {
namespace {

2
stratosphere/fatal/source/fatal_config.hpp
View File

@@ -18,7 +18,7 @@
#include <switch.h>
#include <stratosphere.hpp>
namespace sts::fatal::srv {
namespace ams::fatal::srv {
class FatalConfig {
private:

2
stratosphere/fatal/source/fatal_debug.cpp
View File

@@ -17,7 +17,7 @@
#include "fatal_debug.hpp"
#include "fatal_config.hpp"
namespace sts::fatal::srv {
namespace ams::fatal::srv {
namespace {

2
stratosphere/fatal/source/fatal_debug.hpp
View File

@@ -18,7 +18,7 @@
#include <switch.h>
#include <stratosphere.hpp>
namespace sts::fatal::srv {
namespace ams::fatal::srv {
void TryCollectDebugInformation(ThrowContext *ctx, os::ProcessId process_id);

2
stratosphere/fatal/source/fatal_event_manager.cpp
View File

@@ -16,7 +16,7 @@
#include "fatal_event_manager.hpp"
namespace sts::fatal::srv {
namespace ams::fatal::srv {
FatalEventManager::FatalEventManager() {
/* Just create all the events. */

2
stratosphere/fatal/source/fatal_event_manager.hpp
View File

@@ -18,7 +18,7 @@
#include <switch.h>
#include <stratosphere.hpp>
namespace sts::fatal::srv {
namespace ams::fatal::srv {
class FatalEventManager {
private:

2
stratosphere/fatal/source/fatal_font.cpp
View File

@@ -26,7 +26,7 @@
#define RGB565_GET_G8(c) ((((c >> 5) & 0x3F) << 2) | ((c >> 9) & 3))
#define RGB565_GET_B8(c) ((((c >> 0) & 0x1F) << 3) | ((c >> 2) & 7))
namespace sts::fatal::srv::font {
namespace ams::fatal::srv::font {
namespace {

2
stratosphere/fatal/source/fatal_font.hpp
View File

@@ -19,7 +19,7 @@
#include <switch.h>
#include <stratosphere.hpp>
namespace sts::fatal::srv::font {
namespace ams::fatal::srv::font {
Result InitializeSharedFont();
void ConfigureFontFramebuffer(u16 *fb, u32 (*unswizzle_func)(u32, u32));

22
stratosphere/fatal/source/fatal_main.cpp
View File

@@ -51,19 +51,19 @@ extern "C" {
void __libnx_exception_handler(ThreadExceptionDump *ctx);
}
namespace sts::ams {
namespace ams {
ncm::TitleId StratosphereTitleId = ncm::TitleId::Fatal;
ncm::TitleId CurrentTitleId = ncm::TitleId::Fatal;
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);
@@ -163,8 +163,8 @@ int main(int argc, char **argv)
R_ASSERT((g_server_manager.RegisterServer<fatal::srv::UserService>(UserServiceName, UserMaxSessions)));
/* Add dirty event holder. */
/* TODO: s_server_manager.AddWaitable(sts::fatal::srv::GetFatalDirtyEvent()); */
auto *dirty_event_holder = sts::fatal::srv::GetFatalDirtyWaitableHolder();
/* TODO: s_server_manager.AddWaitable(ams::fatal::srv::GetFatalDirtyEvent()); */
auto *dirty_event_holder = ams::fatal::srv::GetFatalDirtyWaitableHolder();
g_server_manager.AddUserWaitableHolder(dirty_event_holder);
/* Loop forever, servicing our services. */

2
stratosphere/fatal/source/fatal_repair.cpp
View File

@@ -17,7 +17,7 @@
#include "fatal_repair.hpp"
#include "fatal_service_for_self.hpp"
namespace sts::fatal::srv {
namespace ams::fatal::srv {
namespace {

2
stratosphere/fatal/source/fatal_repair.hpp
View File

@@ -18,7 +18,7 @@
#include <switch.h>
#include <stratosphere.hpp>
namespace sts::fatal::srv {
namespace ams::fatal::srv {
void CheckRepairStatus();

4
stratosphere/fatal/source/fatal_service.cpp
View File

@@ -21,7 +21,7 @@
#include "fatal_event_manager.hpp"
#include "fatal_task.hpp"
namespace sts::fatal::srv {
namespace ams::fatal::srv {
namespace {
@@ -119,7 +119,7 @@ namespace sts::fatal::srv {
}
break;
/* N aborts here. Should we just return an error code? */
STS_UNREACHABLE_DEFAULT_CASE();
AMS_UNREACHABLE_DEFAULT_CASE();
}
return ResultSuccess();

2
stratosphere/fatal/source/fatal_service.hpp
View File

@@ -18,7 +18,7 @@
#include <switch.h>
#include <stratosphere.hpp>
namespace sts::fatal::srv {
namespace ams::fatal::srv {
class UserService final : public sf::IServiceObject {
private:

2
stratosphere/fatal/source/fatal_service_for_self.hpp
View File

@@ -17,7 +17,7 @@
#pragma once
#include <switch.h>
namespace sts::fatal::srv {
namespace ams::fatal::srv {
Result ThrowFatalForSelf(Result error_code);

4
stratosphere/fatal/source/fatal_task.cpp
View File

@@ -24,7 +24,7 @@
#include "fatal_task_clock.hpp"
#include "fatal_task_power.hpp"
namespace sts::fatal::srv {
namespace ams::fatal::srv {
namespace {
@@ -60,7 +60,7 @@ namespace sts::fatal::srv {
public:
TaskManager() { /* ... */ }
void StartTask(ITask *task) {
STS_ASSERT(this->task_count < MaxTasks);
AMS_ASSERT(this->task_count < MaxTasks);
this->task_threads[this->task_count++].StartTask(task);
}
};

2
stratosphere/fatal/source/fatal_task.hpp
View File

@@ -19,7 +19,7 @@
#include <stratosphere.hpp>
#include "fatal_service.hpp"
namespace sts::fatal::srv {
namespace ams::fatal::srv {
class ITask {
protected:

2
stratosphere/fatal/source/fatal_task_clock.cpp
View File

@@ -16,7 +16,7 @@
#include "fatal_task_clock.hpp"
namespace sts::fatal::srv {
namespace ams::fatal::srv {
namespace {

2
stratosphere/fatal/source/fatal_task_clock.hpp
View File

@@ -17,7 +17,7 @@
#pragma once
#include "fatal_task.hpp"
namespace sts::fatal::srv {
namespace ams::fatal::srv {
ITask *GetAdjustClockTask(const ThrowContext *ctx);

2
stratosphere/fatal/source/fatal_task_error_report.cpp
View File

@@ -22,7 +22,7 @@
#include "fatal_config.hpp"
#include "fatal_task_error_report.hpp"
namespace sts::fatal::srv {
namespace ams::fatal::srv {
namespace {

2
stratosphere/fatal/source/fatal_task_error_report.hpp
View File

@@ -17,7 +17,7 @@
#pragma once
#include "fatal_task.hpp"
namespace sts::fatal::srv {
namespace ams::fatal::srv {
ITask *GetErrorReportTask(const ThrowContext *ctx);

2
stratosphere/fatal/source/fatal_task_power.cpp
View File

@@ -17,7 +17,7 @@
#include "fatal_config.hpp"
#include "fatal_task_power.hpp"
namespace sts::fatal::srv {
namespace ams::fatal::srv {
namespace {

2
stratosphere/fatal/source/fatal_task_power.hpp
View File

@@ -17,7 +17,7 @@
#pragma once
#include "fatal_task.hpp"
namespace sts::fatal::srv {
namespace ams::fatal::srv {
ITask *GetPowerControlTask(const ThrowContext *ctx);
ITask *GetPowerButtonObserveTask(const ThrowContext *ctx);

4
stratosphere/fatal/source/fatal_task_screen.cpp
View File

@@ -21,7 +21,7 @@
#include "fatal_config.hpp"
#include "fatal_font.hpp"
namespace sts::fatal::srv {
namespace ams::fatal::srv {
/* Include Atmosphere logo into its own anonymous namespace. */
@@ -218,7 +218,7 @@ namespace sts::fatal::srv {
font::AddSpacingLines(0.5f);
font::PrintFormatLine(u8"Firmware: %s (Atmosphère %u.%u.%u-%s)", config.GetFirmwareVersion().display_version, ATMOSPHERE_RELEASE_VERSION, ams::GetGitRevision());
font::AddSpacingLines(1.5f);
if (!ams::ResultVersionMismatch::Includes(this->context->result)) {
if (!exosphere::ResultVersionMismatch::Includes(this->context->result)) {
font::Print(config.GetErrorDescription());
} else {
/* Print a special message for atmosphere version mismatch. */

2
stratosphere/fatal/source/fatal_task_screen.hpp
View File

@@ -17,7 +17,7 @@
#pragma once
#include "fatal_task.hpp"
namespace sts::fatal::srv {
namespace ams::fatal::srv {
ITask *GetShowFatalTask(const ThrowContext *ctx);
ITask *GetBacklightControlTask(const ThrowContext *ctx);

2
stratosphere/fatal/source/fatal_task_sound.cpp
View File

@@ -16,7 +16,7 @@
#include "fatal_task_sound.hpp"
namespace sts::fatal::srv {
namespace ams::fatal::srv {
namespace {

2
stratosphere/fatal/source/fatal_task_sound.hpp
View File

@@ -17,7 +17,7 @@
#pragma once
#include "fatal_task.hpp"
namespace sts::fatal::srv {
namespace ams::fatal::srv {
ITask *GetStopSoundTask(const ThrowContext *ctx);