From 46da908a00d90a709d8988478cab19c198f7578e Mon Sep 17 00:00:00 2001 From: Lioncash Date: Sat, 22 Sep 2018 14:23:08 +0200 Subject: [PATCH] service: Use nested namespace specifiers where applicable There were a few places where nested namespace specifiers weren't being used where they could be within the service code. This amends that to make the namespacing a tiny bit more compact. --- src/core/hle/service/ac/ac.cpp | 6 ++---- src/core/hle/service/ac/ac.h | 6 ++---- src/core/hle/service/ac/ac_i.cpp | 6 ++---- src/core/hle/service/ac/ac_i.h | 6 ++---- src/core/hle/service/ac/ac_u.cpp | 6 ++---- src/core/hle/service/ac/ac_u.h | 6 ++---- src/core/hle/service/act/act.cpp | 6 ++---- src/core/hle/service/act/act.h | 6 ++---- src/core/hle/service/act/act_a.cpp | 6 ++---- src/core/hle/service/act/act_a.h | 6 ++---- src/core/hle/service/act/act_u.cpp | 6 ++---- src/core/hle/service/act/act_u.h | 6 ++---- src/core/hle/service/am/am.cpp | 7 ++----- src/core/hle/service/am/am.h | 10 +++------- src/core/hle/service/am/am_app.cpp | 6 ++---- src/core/hle/service/am/am_app.h | 6 ++---- src/core/hle/service/am/am_net.cpp | 6 ++---- src/core/hle/service/am/am_net.h | 6 ++---- src/core/hle/service/am/am_sys.cpp | 6 ++---- src/core/hle/service/am/am_sys.h | 6 ++---- src/core/hle/service/am/am_u.cpp | 6 ++---- src/core/hle/service/am/am_u.h | 6 ++---- src/core/hle/service/apt/applet_manager.cpp | 6 ++---- src/core/hle/service/apt/applet_manager.h | 6 ++---- src/core/hle/service/apt/apt.cpp | 6 ++---- src/core/hle/service/apt/apt.h | 6 ++---- src/core/hle/service/apt/apt_a.cpp | 6 ++---- src/core/hle/service/apt/apt_a.h | 6 ++---- src/core/hle/service/apt/apt_s.cpp | 6 ++---- src/core/hle/service/apt/apt_s.h | 6 ++---- src/core/hle/service/apt/apt_u.cpp | 6 ++---- src/core/hle/service/apt/apt_u.h | 6 ++---- src/core/hle/service/apt/bcfnt/bcfnt.cpp | 8 ++------ src/core/hle/service/apt/bcfnt/bcfnt.h | 8 ++------ src/core/hle/service/apt/errors.h | 8 ++------ src/core/hle/service/boss/boss.cpp | 6 ++---- src/core/hle/service/boss/boss.h | 6 ++---- src/core/hle/service/boss/boss_p.cpp | 6 ++---- src/core/hle/service/boss/boss_p.h | 6 ++---- src/core/hle/service/boss/boss_u.cpp | 6 ++---- src/core/hle/service/boss/boss_u.h | 6 ++---- src/core/hle/service/cam/cam.cpp | 7 ++----- src/core/hle/service/cam/cam.h | 6 ++---- src/core/hle/service/cam/cam_c.cpp | 6 ++---- src/core/hle/service/cam/cam_c.h | 6 ++---- src/core/hle/service/cam/cam_q.cpp | 6 ++---- src/core/hle/service/cam/cam_q.h | 6 ++---- src/core/hle/service/cam/cam_s.cpp | 6 ++---- src/core/hle/service/cam/cam_s.h | 6 ++---- src/core/hle/service/cam/cam_u.cpp | 6 ++---- src/core/hle/service/cam/cam_u.h | 6 ++---- src/core/hle/service/cecd/cecd.cpp | 6 ++---- src/core/hle/service/cecd/cecd.h | 6 ++---- src/core/hle/service/cecd/cecd_ndm.cpp | 6 ++---- src/core/hle/service/cecd/cecd_ndm.h | 6 ++---- src/core/hle/service/cecd/cecd_s.cpp | 6 ++---- src/core/hle/service/cecd/cecd_s.h | 6 ++---- src/core/hle/service/cecd/cecd_u.cpp | 6 ++---- src/core/hle/service/cecd/cecd_u.h | 6 ++---- src/core/hle/service/cfg/cfg.cpp | 6 ++---- src/core/hle/service/cfg/cfg.h | 6 ++---- src/core/hle/service/cfg/cfg_i.cpp | 6 ++---- src/core/hle/service/cfg/cfg_i.h | 6 ++---- src/core/hle/service/cfg/cfg_nor.cpp | 6 ++---- src/core/hle/service/cfg/cfg_nor.h | 6 ++---- src/core/hle/service/cfg/cfg_s.cpp | 6 ++---- src/core/hle/service/cfg/cfg_s.h | 6 ++---- src/core/hle/service/cfg/cfg_u.cpp | 6 ++---- src/core/hle/service/cfg/cfg_u.h | 6 ++---- src/core/hle/service/csnd/csnd_snd.cpp | 6 ++---- src/core/hle/service/csnd/csnd_snd.h | 6 ++---- src/core/hle/service/dlp/dlp.cpp | 6 ++---- src/core/hle/service/dlp/dlp.h | 6 ++---- src/core/hle/service/dlp/dlp_clnt.cpp | 6 ++---- src/core/hle/service/dlp/dlp_clnt.h | 6 ++---- src/core/hle/service/dlp/dlp_fkcl.cpp | 6 ++---- src/core/hle/service/dlp/dlp_fkcl.h | 6 ++---- src/core/hle/service/dlp/dlp_srvr.cpp | 6 ++---- src/core/hle/service/dlp/dlp_srvr.h | 6 ++---- src/core/hle/service/dsp/dsp_dsp.cpp | 6 ++---- src/core/hle/service/dsp/dsp_dsp.h | 6 ++---- src/core/hle/service/err_f.cpp | 6 ++---- src/core/hle/service/err_f.h | 6 ++---- src/core/hle/service/frd/frd.cpp | 7 ++----- src/core/hle/service/frd/frd.h | 7 ++----- src/core/hle/service/frd/frd_a.cpp | 6 ++---- src/core/hle/service/frd/frd_a.h | 6 ++---- src/core/hle/service/frd/frd_u.cpp | 6 ++---- src/core/hle/service/frd/frd_u.h | 6 ++---- src/core/hle/service/fs/archive.cpp | 6 ++---- src/core/hle/service/fs/archive.h | 6 ++---- src/core/hle/service/fs/fs_user.cpp | 6 ++---- src/core/hle/service/fs/fs_user.h | 6 ++---- src/core/hle/service/gsp/gsp.cpp | 6 ++---- src/core/hle/service/gsp/gsp.h | 6 ++---- src/core/hle/service/gsp/gsp_gpu.cpp | 6 ++---- src/core/hle/service/gsp/gsp_gpu.h | 6 ++---- src/core/hle/service/gsp/gsp_lcd.cpp | 6 ++---- src/core/hle/service/gsp/gsp_lcd.h | 6 ++---- src/core/hle/service/hid/hid.cpp | 7 ++----- src/core/hle/service/hid/hid.h | 7 ++----- src/core/hle/service/hid/hid_spvr.cpp | 6 ++---- src/core/hle/service/hid/hid_spvr.h | 6 ++---- src/core/hle/service/hid/hid_user.cpp | 6 ++---- src/core/hle/service/hid/hid_user.h | 6 ++---- src/core/hle/service/http_c.cpp | 6 ++---- src/core/hle/service/http_c.h | 6 ++---- src/core/hle/service/ir/extra_hid.cpp | 6 ++---- src/core/hle/service/ir/extra_hid.h | 6 ++---- src/core/hle/service/ir/ir.cpp | 7 ++----- src/core/hle/service/ir/ir.h | 6 ++---- src/core/hle/service/ir/ir_rst.cpp | 6 ++---- src/core/hle/service/ir/ir_rst.h | 6 ++---- src/core/hle/service/ir/ir_u.cpp | 6 ++---- src/core/hle/service/ir/ir_u.h | 6 ++---- src/core/hle/service/ir/ir_user.cpp | 6 ++---- src/core/hle/service/ir/ir_user.h | 6 ++---- src/core/hle/service/ldr_ro/cro_helper.cpp | 6 ++---- src/core/hle/service/ldr_ro/cro_helper.h | 6 ++---- src/core/hle/service/ldr_ro/ldr_ro.cpp | 6 ++---- src/core/hle/service/ldr_ro/ldr_ro.h | 6 ++---- src/core/hle/service/ldr_ro/memory_synchronizer.cpp | 6 ++---- src/core/hle/service/ldr_ro/memory_synchronizer.h | 6 ++---- src/core/hle/service/mic_u.cpp | 6 ++---- src/core/hle/service/mic_u.h | 6 ++---- src/core/hle/service/mvd/mvd.cpp | 6 ++---- src/core/hle/service/mvd/mvd.h | 6 ++---- src/core/hle/service/mvd/mvd_std.cpp | 6 ++---- src/core/hle/service/mvd/mvd_std.h | 6 ++---- src/core/hle/service/ndm/ndm_u.cpp | 6 ++---- src/core/hle/service/ndm/ndm_u.h | 6 ++---- src/core/hle/service/news/news.cpp | 7 ++----- src/core/hle/service/news/news.h | 6 ++---- src/core/hle/service/news/news_s.cpp | 6 ++---- src/core/hle/service/news/news_s.h | 6 ++---- src/core/hle/service/news/news_u.cpp | 6 ++---- src/core/hle/service/news/news_u.h | 6 ++---- src/core/hle/service/nfc/nfc.cpp | 6 ++---- src/core/hle/service/nfc/nfc.h | 6 ++---- src/core/hle/service/nfc/nfc_m.cpp | 6 ++---- src/core/hle/service/nfc/nfc_m.h | 6 ++---- src/core/hle/service/nfc/nfc_u.cpp | 6 ++---- src/core/hle/service/nfc/nfc_u.h | 6 ++---- src/core/hle/service/nim/nim.cpp | 7 ++----- src/core/hle/service/nim/nim.h | 6 ++---- src/core/hle/service/nim/nim_aoc.cpp | 6 ++---- src/core/hle/service/nim/nim_aoc.h | 6 ++---- src/core/hle/service/nim/nim_s.cpp | 6 ++---- src/core/hle/service/nim/nim_s.h | 6 ++---- src/core/hle/service/nim/nim_u.cpp | 6 ++---- src/core/hle/service/nim/nim_u.h | 6 ++---- src/core/hle/service/ns/ns.cpp | 6 ++---- src/core/hle/service/ns/ns.h | 6 ++---- src/core/hle/service/ns/ns_s.cpp | 6 ++---- src/core/hle/service/ns/ns_s.h | 6 ++---- src/core/hle/service/nwm/nwm.cpp | 6 ++---- src/core/hle/service/nwm/nwm.h | 6 ++---- src/core/hle/service/nwm/nwm_cec.cpp | 6 ++---- src/core/hle/service/nwm/nwm_cec.h | 6 ++---- src/core/hle/service/nwm/nwm_ext.cpp | 6 ++---- src/core/hle/service/nwm/nwm_ext.h | 6 ++---- src/core/hle/service/nwm/nwm_inf.cpp | 6 ++---- src/core/hle/service/nwm/nwm_inf.h | 6 ++---- src/core/hle/service/nwm/nwm_sap.cpp | 6 ++---- src/core/hle/service/nwm/nwm_sap.h | 6 ++---- src/core/hle/service/nwm/nwm_soc.cpp | 6 ++---- src/core/hle/service/nwm/nwm_soc.h | 6 ++---- src/core/hle/service/nwm/nwm_tst.cpp | 6 ++---- src/core/hle/service/nwm/nwm_tst.h | 6 ++---- src/core/hle/service/nwm/nwm_uds.cpp | 6 ++---- src/core/hle/service/nwm/nwm_uds.h | 6 ++---- src/core/hle/service/nwm/uds_beacon.cpp | 6 ++---- src/core/hle/service/nwm/uds_beacon.h | 6 ++---- src/core/hle/service/nwm/uds_connection.cpp | 6 ++---- src/core/hle/service/nwm/uds_connection.h | 6 ++---- src/core/hle/service/nwm/uds_data.cpp | 6 ++---- src/core/hle/service/nwm/uds_data.h | 6 ++---- src/core/hle/service/pm/pm.cpp | 6 ++---- src/core/hle/service/pm/pm.h | 6 ++---- src/core/hle/service/pm/pm_app.cpp | 6 ++---- src/core/hle/service/pm/pm_app.h | 6 ++---- src/core/hle/service/pm/pm_dbg.cpp | 6 ++---- src/core/hle/service/pm/pm_dbg.h | 6 ++---- src/core/hle/service/ps/ps_ps.cpp | 6 ++---- src/core/hle/service/ps/ps_ps.h | 6 ++---- src/core/hle/service/ptm/ptm.cpp | 6 ++---- src/core/hle/service/ptm/ptm.h | 6 ++---- src/core/hle/service/ptm/ptm_gets.cpp | 6 ++---- src/core/hle/service/ptm/ptm_gets.h | 6 ++---- src/core/hle/service/ptm/ptm_play.cpp | 6 ++---- src/core/hle/service/ptm/ptm_play.h | 6 ++---- src/core/hle/service/ptm/ptm_sets.cpp | 6 ++---- src/core/hle/service/ptm/ptm_sets.h | 6 ++---- src/core/hle/service/ptm/ptm_sysm.cpp | 6 ++---- src/core/hle/service/ptm/ptm_sysm.h | 6 ++---- src/core/hle/service/ptm/ptm_u.cpp | 6 ++---- src/core/hle/service/ptm/ptm_u.h | 6 ++---- src/core/hle/service/pxi/dev.cpp | 6 ++---- src/core/hle/service/pxi/dev.h | 6 ++---- src/core/hle/service/pxi/pxi.cpp | 6 ++---- src/core/hle/service/pxi/pxi.h | 6 ++---- src/core/hle/service/qtm/qtm.cpp | 6 ++---- src/core/hle/service/qtm/qtm.h | 6 ++---- src/core/hle/service/qtm/qtm_c.cpp | 6 ++---- src/core/hle/service/qtm/qtm_c.h | 6 ++---- src/core/hle/service/qtm/qtm_s.cpp | 6 ++---- src/core/hle/service/qtm/qtm_s.h | 6 ++---- src/core/hle/service/qtm/qtm_sp.cpp | 6 ++---- src/core/hle/service/qtm/qtm_sp.h | 6 ++---- src/core/hle/service/qtm/qtm_u.cpp | 6 ++---- src/core/hle/service/qtm/qtm_u.h | 6 ++---- src/core/hle/service/sm/sm.cpp | 6 ++---- src/core/hle/service/sm/sm.h | 6 ++---- src/core/hle/service/sm/srv.cpp | 6 ++---- src/core/hle/service/sm/srv.h | 6 ++---- src/core/hle/service/soc_u.cpp | 6 ++---- src/core/hle/service/soc_u.h | 6 ++---- src/core/hle/service/ssl_c.cpp | 6 ++---- src/core/hle/service/ssl_c.h | 6 ++---- src/core/hle/service/y2r_u.cpp | 6 ++---- src/core/hle/service/y2r_u.h | 6 ++---- 221 files changed, 443 insertions(+), 902 deletions(-) diff --git a/src/core/hle/service/ac/ac.cpp b/src/core/hle/service/ac/ac.cpp index 083f7193f..e0340c1f1 100644 --- a/src/core/hle/service/ac/ac.cpp +++ b/src/core/hle/service/ac/ac.cpp @@ -15,8 +15,7 @@ #include "core/hle/service/ac/ac_u.h" #include "core/memory.h" -namespace Service { -namespace AC { +namespace Service::AC { void Module::Interface::CreateDefaultConfig(Kernel::HLERequestContext& ctx) { IPC::RequestParser rp(ctx, 0x1, 0, 0); @@ -178,5 +177,4 @@ void InstallInterfaces(SM::ServiceManager& service_manager) { std::make_shared(ac)->InstallAsService(service_manager); } -} // namespace AC -} // namespace Service +} // namespace Service::AC diff --git a/src/core/hle/service/ac/ac.h b/src/core/hle/service/ac/ac.h index 1990a67ae..805e0840e 100644 --- a/src/core/hle/service/ac/ac.h +++ b/src/core/hle/service/ac/ac.h @@ -13,8 +13,7 @@ namespace Kernel { class Event; } -namespace Service { -namespace AC { +namespace Service::AC { class Module final { public: class Interface : public ServiceFramework { @@ -155,5 +154,4 @@ protected: void InstallInterfaces(SM::ServiceManager& service_manager); -} // namespace AC -} // namespace Service +} // namespace Service::AC diff --git a/src/core/hle/service/ac/ac_i.cpp b/src/core/hle/service/ac/ac_i.cpp index afb1b243b..0dde7bf90 100644 --- a/src/core/hle/service/ac/ac_i.cpp +++ b/src/core/hle/service/ac/ac_i.cpp @@ -4,8 +4,7 @@ #include "core/hle/service/ac/ac_i.h" -namespace Service { -namespace AC { +namespace Service::AC { AC_I::AC_I(std::shared_ptr ac) : Module::Interface(std::move(ac), "ac:i", 10) { static const FunctionInfo functions[] = { @@ -33,5 +32,4 @@ AC_I::AC_I(std::shared_ptr ac) : Module::Interface(std::move(ac), "ac:i" RegisterHandlers(functions); } -} // namespace AC -} // namespace Service +} // namespace Service::AC diff --git a/src/core/hle/service/ac/ac_i.h b/src/core/hle/service/ac/ac_i.h index c6f9d6d49..bca91aabe 100644 --- a/src/core/hle/service/ac/ac_i.h +++ b/src/core/hle/service/ac/ac_i.h @@ -7,13 +7,11 @@ #include #include "core/hle/service/ac/ac.h" -namespace Service { -namespace AC { +namespace Service::AC { class AC_I final : public Module::Interface { public: explicit AC_I(std::shared_ptr ac); }; -} // namespace AC -} // namespace Service +} // namespace Service::AC diff --git a/src/core/hle/service/ac/ac_u.cpp b/src/core/hle/service/ac/ac_u.cpp index ec31fcb3d..d62d7ccb6 100644 --- a/src/core/hle/service/ac/ac_u.cpp +++ b/src/core/hle/service/ac/ac_u.cpp @@ -4,8 +4,7 @@ #include "core/hle/service/ac/ac_u.h" -namespace Service { -namespace AC { +namespace Service::AC { AC_U::AC_U(std::shared_ptr ac) : Module::Interface(std::move(ac), "ac:u", 10) { static const FunctionInfo functions[] = { @@ -33,5 +32,4 @@ AC_U::AC_U(std::shared_ptr ac) : Module::Interface(std::move(ac), "ac:u" RegisterHandlers(functions); } -} // namespace AC -} // namespace Service +} // namespace Service::AC diff --git a/src/core/hle/service/ac/ac_u.h b/src/core/hle/service/ac/ac_u.h index 6643f3ce5..18efcd1e6 100644 --- a/src/core/hle/service/ac/ac_u.h +++ b/src/core/hle/service/ac/ac_u.h @@ -7,13 +7,11 @@ #include #include "core/hle/service/ac/ac.h" -namespace Service { -namespace AC { +namespace Service::AC { class AC_U final : public Module::Interface { public: explicit AC_U(std::shared_ptr ac); }; -} // namespace AC -} // namespace Service +} // namespace Service::AC diff --git a/src/core/hle/service/act/act.cpp b/src/core/hle/service/act/act.cpp index dbe5617b9..9827aa8dc 100644 --- a/src/core/hle/service/act/act.cpp +++ b/src/core/hle/service/act/act.cpp @@ -6,8 +6,7 @@ #include "core/hle/service/act/act_a.h" #include "core/hle/service/act/act_u.h" -namespace Service { -namespace ACT { +namespace Service::ACT { Module::Interface::Interface(std::shared_ptr act, const char* name) : ServiceFramework(name, 1 /* Placeholder */), act(std::move(act)) {} @@ -20,5 +19,4 @@ void InstallInterfaces(SM::ServiceManager& service_manager) { std::make_shared(act)->InstallAsService(service_manager); } -} // namespace ACT -} // namespace Service +} // namespace Service::ACT diff --git a/src/core/hle/service/act/act.h b/src/core/hle/service/act/act.h index a5805a5ff..357496b59 100644 --- a/src/core/hle/service/act/act.h +++ b/src/core/hle/service/act/act.h @@ -6,8 +6,7 @@ #include "core/hle/service/service.h" -namespace Service { -namespace ACT { +namespace Service::ACT { /// Initializes all ACT services class Module final { @@ -24,5 +23,4 @@ public: void InstallInterfaces(SM::ServiceManager& service_manager); -} // namespace ACT -} // namespace Service +} // namespace Service::ACT diff --git a/src/core/hle/service/act/act_a.cpp b/src/core/hle/service/act/act_a.cpp index cd8ca40dd..7a33f9175 100644 --- a/src/core/hle/service/act/act_a.cpp +++ b/src/core/hle/service/act/act_a.cpp @@ -4,8 +4,7 @@ #include "core/hle/service/act/act_a.h" -namespace Service { -namespace ACT { +namespace Service::ACT { ACT_A::ACT_A(std::shared_ptr act) : Module::Interface(std::move(act), "act:a") { const FunctionInfo functions[] = { @@ -24,5 +23,4 @@ ACT_A::ACT_A(std::shared_ptr act) : Module::Interface(std::move(act), "a RegisterHandlers(functions); } -} // namespace ACT -} // namespace Service +} // namespace Service::ACT diff --git a/src/core/hle/service/act/act_a.h b/src/core/hle/service/act/act_a.h index 4b5f37fbb..48a79aab7 100644 --- a/src/core/hle/service/act/act_a.h +++ b/src/core/hle/service/act/act_a.h @@ -6,13 +6,11 @@ #include "core/hle/service/act/act.h" -namespace Service { -namespace ACT { +namespace Service::ACT { class ACT_A final : public Module::Interface { public: explicit ACT_A(std::shared_ptr act); }; -} // namespace ACT -} // namespace Service +} // namespace Service::ACT diff --git a/src/core/hle/service/act/act_u.cpp b/src/core/hle/service/act/act_u.cpp index eda253b78..99978d9ca 100644 --- a/src/core/hle/service/act/act_u.cpp +++ b/src/core/hle/service/act/act_u.cpp @@ -4,8 +4,7 @@ #include "core/hle/service/act/act_u.h" -namespace Service { -namespace ACT { +namespace Service::ACT { ACT_U::ACT_U(std::shared_ptr act) : Module::Interface(std::move(act), "act:u") { static const FunctionInfo functions[] = { @@ -20,5 +19,4 @@ ACT_U::ACT_U(std::shared_ptr act) : Module::Interface(std::move(act), "a RegisterHandlers(functions); } -} // namespace ACT -} // namespace Service +} // namespace Service::ACT diff --git a/src/core/hle/service/act/act_u.h b/src/core/hle/service/act/act_u.h index 82214f496..3aca428e6 100644 --- a/src/core/hle/service/act/act_u.h +++ b/src/core/hle/service/act/act_u.h @@ -6,13 +6,11 @@ #include "core/hle/service/act/act.h" -namespace Service { -namespace ACT { +namespace Service::ACT { class ACT_U final : public Module::Interface { public: explicit ACT_U(std::shared_ptr act); }; -} // namespace ACT -} // namespace Service +} // namespace Service::ACT diff --git a/src/core/hle/service/am/am.cpp b/src/core/hle/service/am/am.cpp index 984f5fb83..ba11090ea 100644 --- a/src/core/hle/service/am/am.cpp +++ b/src/core/hle/service/am/am.cpp @@ -30,8 +30,7 @@ #include "core/loader/loader.h" #include "core/loader/smdh.h" -namespace Service { -namespace AM { +namespace Service::AM { constexpr u16 PLATFORM_CTR = 0x0004; constexpr u16 CATEGORY_SYSTEM = 0x0010; @@ -1326,6 +1325,4 @@ void InstallInterfaces(SM::ServiceManager& service_manager) { std::make_shared(am)->InstallAsService(service_manager); } -} // namespace AM - -} // namespace Service +} // namespace Service::AM diff --git a/src/core/hle/service/am/am.h b/src/core/hle/service/am/am.h index 6729a6b36..fc12a90f6 100644 --- a/src/core/hle/service/am/am.h +++ b/src/core/hle/service/am/am.h @@ -14,14 +14,11 @@ #include "core/hle/result.h" #include "core/hle/service/service.h" -namespace Service { -namespace FS { +namespace Service::FS { enum class MediaType : u32; } -} // namespace Service -namespace Service { -namespace AM { +namespace Service::AM { namespace ErrCodes { enum { @@ -526,5 +523,4 @@ private: void InstallInterfaces(SM::ServiceManager& service_manager); -} // namespace AM -} // namespace Service +} // namespace Service::AM diff --git a/src/core/hle/service/am/am_app.cpp b/src/core/hle/service/am/am_app.cpp index debd64f45..cee1aa81b 100644 --- a/src/core/hle/service/am/am_app.cpp +++ b/src/core/hle/service/am/am_app.cpp @@ -4,8 +4,7 @@ #include "core/hle/service/am/am_app.h" -namespace Service { -namespace AM { +namespace Service::AM { AM_APP::AM_APP(std::shared_ptr am) : Module::Interface(std::move(am), "am:app", 5) { static const FunctionInfo functions[] = { @@ -26,5 +25,4 @@ AM_APP::AM_APP(std::shared_ptr am) : Module::Interface(std::move(am), "a RegisterHandlers(functions); } -} // namespace AM -} // namespace Service +} // namespace Service::AM diff --git a/src/core/hle/service/am/am_app.h b/src/core/hle/service/am/am_app.h index 5edecb387..67cf8ba2e 100644 --- a/src/core/hle/service/am/am_app.h +++ b/src/core/hle/service/am/am_app.h @@ -6,13 +6,11 @@ #include "core/hle/service/am/am.h" -namespace Service { -namespace AM { +namespace Service::AM { class AM_APP final : public Module::Interface { public: explicit AM_APP(std::shared_ptr am); }; -} // namespace AM -} // namespace Service +} // namespace Service::AM diff --git a/src/core/hle/service/am/am_net.cpp b/src/core/hle/service/am/am_net.cpp index c96df1761..120ee53e7 100644 --- a/src/core/hle/service/am/am_net.cpp +++ b/src/core/hle/service/am/am_net.cpp @@ -4,8 +4,7 @@ #include "core/hle/service/am/am_net.h" -namespace Service { -namespace AM { +namespace Service::AM { AM_NET::AM_NET(std::shared_ptr am) : Module::Interface(std::move(am), "am:net", 5) { static const FunctionInfo functions[] = { @@ -123,5 +122,4 @@ AM_NET::AM_NET(std::shared_ptr am) : Module::Interface(std::move(am), "a RegisterHandlers(functions); } -} // namespace AM -} // namespace Service +} // namespace Service::AM diff --git a/src/core/hle/service/am/am_net.h b/src/core/hle/service/am/am_net.h index d557cf01d..a5adbd7e5 100644 --- a/src/core/hle/service/am/am_net.h +++ b/src/core/hle/service/am/am_net.h @@ -6,13 +6,11 @@ #include "core/hle/service/am/am.h" -namespace Service { -namespace AM { +namespace Service::AM { class AM_NET final : public Module::Interface { public: explicit AM_NET(std::shared_ptr am); }; -} // namespace AM -} // namespace Service +} // namespace Service::AM diff --git a/src/core/hle/service/am/am_sys.cpp b/src/core/hle/service/am/am_sys.cpp index 22dab73c7..ca4affbc2 100644 --- a/src/core/hle/service/am/am_sys.cpp +++ b/src/core/hle/service/am/am_sys.cpp @@ -4,8 +4,7 @@ #include "core/hle/service/am/am_sys.h" -namespace Service { -namespace AM { +namespace Service::AM { AM_SYS::AM_SYS(std::shared_ptr am) : Module::Interface(std::move(am), "am:sys", 5) { static const FunctionInfo functions[] = { @@ -71,5 +70,4 @@ AM_SYS::AM_SYS(std::shared_ptr am) : Module::Interface(std::move(am), "a RegisterHandlers(functions); } -} // namespace AM -} // namespace Service +} // namespace Service::AM diff --git a/src/core/hle/service/am/am_sys.h b/src/core/hle/service/am/am_sys.h index 7d38dfc98..b142916ca 100644 --- a/src/core/hle/service/am/am_sys.h +++ b/src/core/hle/service/am/am_sys.h @@ -6,13 +6,11 @@ #include "core/hle/service/am/am.h" -namespace Service { -namespace AM { +namespace Service::AM { class AM_SYS final : public Module::Interface { public: explicit AM_SYS(std::shared_ptr am); }; -} // namespace AM -} // namespace Service +} // namespace Service::AM diff --git a/src/core/hle/service/am/am_u.cpp b/src/core/hle/service/am/am_u.cpp index c39a93863..bab230a44 100644 --- a/src/core/hle/service/am/am_u.cpp +++ b/src/core/hle/service/am/am_u.cpp @@ -4,8 +4,7 @@ #include "core/hle/service/am/am_u.h" -namespace Service { -namespace AM { +namespace Service::AM { AM_U::AM_U(std::shared_ptr am) : Module::Interface(std::move(am), "am:u", 5) { static const FunctionInfo functions[] = { @@ -83,5 +82,4 @@ AM_U::AM_U(std::shared_ptr am) : Module::Interface(std::move(am), "am:u" RegisterHandlers(functions); } -} // namespace AM -} // namespace Service +} // namespace Service::AM diff --git a/src/core/hle/service/am/am_u.h b/src/core/hle/service/am/am_u.h index 92a797ca0..1d732c90a 100644 --- a/src/core/hle/service/am/am_u.h +++ b/src/core/hle/service/am/am_u.h @@ -6,13 +6,11 @@ #include "core/hle/service/am/am.h" -namespace Service { -namespace AM { +namespace Service::AM { class AM_U final : public Module::Interface { public: explicit AM_U(std::shared_ptr am); }; -} // namespace AM -} // namespace Service +} // namespace Service::AM diff --git a/src/core/hle/service/apt/applet_manager.cpp b/src/core/hle/service/apt/applet_manager.cpp index 1f312c059..708adc27f 100644 --- a/src/core/hle/service/apt/applet_manager.cpp +++ b/src/core/hle/service/apt/applet_manager.cpp @@ -9,8 +9,7 @@ #include "core/hle/service/cfg/cfg.h" #include "core/hle/service/ns/ns.h" -namespace Service { -namespace APT { +namespace Service::APT { enum class AppletPos { Application = 0, Library = 1, System = 2, SysLibrary = 3, Resident = 4 }; @@ -486,5 +485,4 @@ AppletManager::~AppletManager() { HLE::Applets::Shutdown(); } -} // namespace APT -} // namespace Service +} // namespace Service::APT diff --git a/src/core/hle/service/apt/applet_manager.h b/src/core/hle/service/apt/applet_manager.h index 7c17eccff..32a39c213 100644 --- a/src/core/hle/service/apt/applet_manager.h +++ b/src/core/hle/service/apt/applet_manager.h @@ -11,8 +11,7 @@ #include "core/hle/result.h" #include "core/hle/service/fs/archive.h" -namespace Service { -namespace APT { +namespace Service::APT { /// Signals used by APT functions enum class SignalType : u32 { @@ -185,5 +184,4 @@ private: SignalType library_applet_closing_command; }; -} // namespace APT -} // namespace Service +} // namespace Service::APT diff --git a/src/core/hle/service/apt/apt.cpp b/src/core/hle/service/apt/apt.cpp index 776fba72f..55b1a448f 100644 --- a/src/core/hle/service/apt/apt.cpp +++ b/src/core/hle/service/apt/apt.cpp @@ -24,8 +24,7 @@ #include "core/hw/aes/ccm.h" #include "core/hw/aes/key.h" -namespace Service { -namespace APT { +namespace Service::APT { void Module::Interface::Initialize(Kernel::HLERequestContext& ctx) { IPC::RequestParser rp(ctx, 0x2, 2, 0); // 0x20080 @@ -871,5 +870,4 @@ void InstallInterfaces(SM::ServiceManager& service_manager) { std::make_shared(apt)->InstallAsService(service_manager); } -} // namespace APT -} // namespace Service +} // namespace Service::APT diff --git a/src/core/hle/service/apt/apt.h b/src/core/hle/service/apt/apt.h index 54149f4e9..bd4008e6e 100644 --- a/src/core/hle/service/apt/apt.h +++ b/src/core/hle/service/apt/apt.h @@ -16,8 +16,7 @@ class Mutex; class SharedMemory; } // namespace Kernel -namespace Service { -namespace APT { +namespace Service::APT { class AppletManager; @@ -605,5 +604,4 @@ private: void InstallInterfaces(SM::ServiceManager& service_manager); -} // namespace APT -} // namespace Service +} // namespace Service::APT diff --git a/src/core/hle/service/apt/apt_a.cpp b/src/core/hle/service/apt/apt_a.cpp index 8ad09025d..9558b50bf 100644 --- a/src/core/hle/service/apt/apt_a.cpp +++ b/src/core/hle/service/apt/apt_a.cpp @@ -4,8 +4,7 @@ #include "core/hle/service/apt/apt_a.h" -namespace Service { -namespace APT { +namespace Service::APT { APT_A::APT_A(std::shared_ptr apt) : Module::Interface(std::move(apt), "APT:A", MaxAPTSessions) { @@ -105,5 +104,4 @@ APT_A::APT_A(std::shared_ptr apt) RegisterHandlers(functions); } -} // namespace APT -} // namespace Service +} // namespace Service::APT diff --git a/src/core/hle/service/apt/apt_a.h b/src/core/hle/service/apt/apt_a.h index f4bed80bb..7682b9f3f 100644 --- a/src/core/hle/service/apt/apt_a.h +++ b/src/core/hle/service/apt/apt_a.h @@ -6,13 +6,11 @@ #include "core/hle/service/apt/apt.h" -namespace Service { -namespace APT { +namespace Service::APT { class APT_A final : public Module::Interface { public: explicit APT_A(std::shared_ptr apt); }; -} // namespace APT -} // namespace Service +} // namespace Service::APT diff --git a/src/core/hle/service/apt/apt_s.cpp b/src/core/hle/service/apt/apt_s.cpp index 341c384ca..820f50a65 100644 --- a/src/core/hle/service/apt/apt_s.cpp +++ b/src/core/hle/service/apt/apt_s.cpp @@ -4,8 +4,7 @@ #include "core/hle/service/apt/apt_s.h" -namespace Service { -namespace APT { +namespace Service::APT { APT_S::APT_S(std::shared_ptr apt) : Module::Interface(std::move(apt), "APT:S", MaxAPTSessions) { @@ -105,5 +104,4 @@ APT_S::APT_S(std::shared_ptr apt) RegisterHandlers(functions); } -} // namespace APT -} // namespace Service +} // namespace Service::APT diff --git a/src/core/hle/service/apt/apt_s.h b/src/core/hle/service/apt/apt_s.h index 20b6c814a..3913727e8 100644 --- a/src/core/hle/service/apt/apt_s.h +++ b/src/core/hle/service/apt/apt_s.h @@ -6,8 +6,7 @@ #include "core/hle/service/apt/apt.h" -namespace Service { -namespace APT { +namespace Service::APT { // Application and title launching service. These services handle signaling for home/power button as // well. Only one session for either APT service can be open at a time, normally processes close the @@ -21,5 +20,4 @@ public: explicit APT_S(std::shared_ptr apt); }; -} // namespace APT -} // namespace Service +} // namespace Service::APT diff --git a/src/core/hle/service/apt/apt_u.cpp b/src/core/hle/service/apt/apt_u.cpp index 9fcb38005..c39042c00 100644 --- a/src/core/hle/service/apt/apt_u.cpp +++ b/src/core/hle/service/apt/apt_u.cpp @@ -4,8 +4,7 @@ #include "core/hle/service/apt/apt_u.h" -namespace Service { -namespace APT { +namespace Service::APT { APT_U::APT_U(std::shared_ptr apt) : Module::Interface(std::move(apt), "APT:U", MaxAPTSessions) { @@ -102,5 +101,4 @@ APT_U::APT_U(std::shared_ptr apt) RegisterHandlers(functions); } -} // namespace APT -} // namespace Service +} // namespace Service::APT diff --git a/src/core/hle/service/apt/apt_u.h b/src/core/hle/service/apt/apt_u.h index 4a0d8fe08..fa87f00e8 100644 --- a/src/core/hle/service/apt/apt_u.h +++ b/src/core/hle/service/apt/apt_u.h @@ -6,8 +6,7 @@ #include "core/hle/service/apt/apt.h" -namespace Service { -namespace APT { +namespace Service::APT { // Application and title launching service. These services handle signaling for home/power button as // well. Only one session for either APT service can be open at a time, normally processes close the @@ -21,5 +20,4 @@ public: explicit APT_U(std::shared_ptr apt); }; -} // namespace APT -} // namespace Service +} // namespace Service::APT diff --git a/src/core/hle/service/apt/bcfnt/bcfnt.cpp b/src/core/hle/service/apt/bcfnt/bcfnt.cpp index 6d2474702..c51caaace 100644 --- a/src/core/hle/service/apt/bcfnt/bcfnt.cpp +++ b/src/core/hle/service/apt/bcfnt/bcfnt.cpp @@ -5,9 +5,7 @@ #include "core/hle/service/apt/bcfnt/bcfnt.h" #include "core/hle/service/service.h" -namespace Service { -namespace APT { -namespace BCFNT { +namespace Service::APT::BCFNT { void RelocateSharedFont(Kernel::SharedPtr shared_font, VAddr new_address) { static const u32 SharedFontStartOffset = 0x80; @@ -105,6 +103,4 @@ void RelocateSharedFont(Kernel::SharedPtr shared_font, VAd } } -} // namespace BCFNT -} // namespace APT -} // namespace Service \ No newline at end of file +} // namespace Service::APT::BCFNT diff --git a/src/core/hle/service/apt/bcfnt/bcfnt.h b/src/core/hle/service/apt/bcfnt/bcfnt.h index 453bf7606..1c3bd3495 100644 --- a/src/core/hle/service/apt/bcfnt/bcfnt.h +++ b/src/core/hle/service/apt/bcfnt/bcfnt.h @@ -8,9 +8,7 @@ #include "core/hle/kernel/shared_memory.h" #include "core/hle/service/service.h" -namespace Service { -namespace APT { -namespace BCFNT { ///< BCFNT Shared Font file structures +namespace Service::APT::BCFNT { ///< BCFNT Shared Font file structures struct CFNT { u8 magic[4]; @@ -87,6 +85,4 @@ struct CWDH { */ void RelocateSharedFont(Kernel::SharedPtr shared_font, VAddr new_address); -} // namespace BCFNT -} // namespace APT -} // namespace Service +} // namespace Service::APT::BCFNT diff --git a/src/core/hle/service/apt/errors.h b/src/core/hle/service/apt/errors.h index 9c6f32c17..ae0213513 100644 --- a/src/core/hle/service/apt/errors.h +++ b/src/core/hle/service/apt/errors.h @@ -4,13 +4,9 @@ #pragma once -namespace Service { -namespace APT { -namespace ErrCodes { +namespace Service::APT::ErrCodes { enum { ParameterPresent = 2, InvalidAppletSlot = 4, }; -} // namespace ErrCodes -} // namespace APT -} // namespace Service +} // namespace Service::APT::ErrCodes diff --git a/src/core/hle/service/boss/boss.cpp b/src/core/hle/service/boss/boss.cpp index 9af733d0b..a417fe008 100644 --- a/src/core/hle/service/boss/boss.cpp +++ b/src/core/hle/service/boss/boss.cpp @@ -9,8 +9,7 @@ #include "core/hle/service/boss/boss_p.h" #include "core/hle/service/boss/boss_u.h" -namespace Service { -namespace BOSS { +namespace Service::BOSS { void Module::Interface::InitializeSession(Kernel::HLERequestContext& ctx) { IPC::RequestParser rp(ctx, 0x01, 2, 2); @@ -915,5 +914,4 @@ void InstallInterfaces(SM::ServiceManager& service_manager) { std::make_shared(boss)->InstallAsService(service_manager); } -} // namespace BOSS -} // namespace Service +} // namespace Service::BOSS diff --git a/src/core/hle/service/boss/boss.h b/src/core/hle/service/boss/boss.h index d005c8b61..873170b03 100644 --- a/src/core/hle/service/boss/boss.h +++ b/src/core/hle/service/boss/boss.h @@ -7,8 +7,7 @@ #include "core/hle/kernel/event.h" #include "core/hle/service/service.h" -namespace Service { -namespace BOSS { +namespace Service::BOSS { class Module final { public: @@ -963,5 +962,4 @@ private: void InstallInterfaces(SM::ServiceManager& service_manager); -} // namespace BOSS -} // namespace Service +} // namespace Service::BOSS diff --git a/src/core/hle/service/boss/boss_p.cpp b/src/core/hle/service/boss/boss_p.cpp index ceb0aa5a6..cdc8f1036 100644 --- a/src/core/hle/service/boss/boss_p.cpp +++ b/src/core/hle/service/boss/boss_p.cpp @@ -4,8 +4,7 @@ #include "core/hle/service/boss/boss_p.h" -namespace Service { -namespace BOSS { +namespace Service::BOSS { BOSS_P::BOSS_P(std::shared_ptr boss) : Module::Interface(std::move(boss), "boss:P", DefaultMaxSessions) { @@ -84,5 +83,4 @@ BOSS_P::BOSS_P(std::shared_ptr boss) RegisterHandlers(functions); } -} // namespace BOSS -} // namespace Service +} // namespace Service::BOSS diff --git a/src/core/hle/service/boss/boss_p.h b/src/core/hle/service/boss/boss_p.h index 09632d58b..9c84a1e9d 100644 --- a/src/core/hle/service/boss/boss_p.h +++ b/src/core/hle/service/boss/boss_p.h @@ -6,13 +6,11 @@ #include "core/hle/service/boss/boss.h" -namespace Service { -namespace BOSS { +namespace Service::BOSS { class BOSS_P final : public Module::Interface { public: explicit BOSS_P(std::shared_ptr boss); }; -} // namespace BOSS -} // namespace Service +} // namespace Service::BOSS diff --git a/src/core/hle/service/boss/boss_u.cpp b/src/core/hle/service/boss/boss_u.cpp index fb7eacc81..c6aaba888 100644 --- a/src/core/hle/service/boss/boss_u.cpp +++ b/src/core/hle/service/boss/boss_u.cpp @@ -4,8 +4,7 @@ #include "core/hle/service/boss/boss_u.h" -namespace Service { -namespace BOSS { +namespace Service::BOSS { BOSS_U::BOSS_U(std::shared_ptr boss) : Module::Interface(std::move(boss), "boss:U", DefaultMaxSessions) { @@ -72,5 +71,4 @@ BOSS_U::BOSS_U(std::shared_ptr boss) RegisterHandlers(functions); } -} // namespace BOSS -} // namespace Service +} // namespace Service::BOSS diff --git a/src/core/hle/service/boss/boss_u.h b/src/core/hle/service/boss/boss_u.h index 9f8065606..a93b4e502 100644 --- a/src/core/hle/service/boss/boss_u.h +++ b/src/core/hle/service/boss/boss_u.h @@ -6,13 +6,11 @@ #include "core/hle/service/boss/boss.h" -namespace Service { -namespace BOSS { +namespace Service::BOSS { class BOSS_U final : public Module::Interface { public: explicit BOSS_U(std::shared_ptr boss); }; -} // namespace BOSS -} // namespace Service +} // namespace Service::BOSS diff --git a/src/core/hle/service/cam/cam.cpp b/src/core/hle/service/cam/cam.cpp index 4df0f774f..3cf3bf755 100644 --- a/src/core/hle/service/cam/cam.cpp +++ b/src/core/hle/service/cam/cam.cpp @@ -19,8 +19,7 @@ #include "core/memory.h" #include "core/settings.h" -namespace Service { -namespace CAM { +namespace Service::CAM { static std::weak_ptr current_cam; @@ -1065,6 +1064,4 @@ void InstallInterfaces(SM::ServiceManager& service_manager) { std::make_shared()->InstallAsService(service_manager); } -} // namespace CAM - -} // namespace Service +} // namespace Service::CAM diff --git a/src/core/hle/service/cam/cam.h b/src/core/hle/service/cam/cam.h index 324c52023..b0145dead 100644 --- a/src/core/hle/service/cam/cam.h +++ b/src/core/hle/service/cam/cam.h @@ -25,8 +25,7 @@ namespace Kernel { class Process; } -namespace Service { -namespace CAM { +namespace Service::CAM { enum CameraIndex { OuterRightCamera = 0, @@ -785,5 +784,4 @@ void ReloadCameraDevices(); void InstallInterfaces(SM::ServiceManager& service_manager); -} // namespace CAM -} // namespace Service +} // namespace Service::CAM diff --git a/src/core/hle/service/cam/cam_c.cpp b/src/core/hle/service/cam/cam_c.cpp index db46413cc..80816c923 100644 --- a/src/core/hle/service/cam/cam_c.cpp +++ b/src/core/hle/service/cam/cam_c.cpp @@ -5,8 +5,7 @@ #include "core/hle/service/cam/cam.h" #include "core/hle/service/cam/cam_c.h" -namespace Service { -namespace CAM { +namespace Service::CAM { CAM_C::CAM_C(std::shared_ptr cam) : Module::Interface(std::move(cam), "cam:c", 1) { static const FunctionInfo functions[] = { @@ -79,5 +78,4 @@ CAM_C::CAM_C(std::shared_ptr cam) : Module::Interface(std::move(cam), "c RegisterHandlers(functions); } -} // namespace CAM -} // namespace Service +} // namespace Service::CAM diff --git a/src/core/hle/service/cam/cam_c.h b/src/core/hle/service/cam/cam_c.h index e68887c57..d6dfcd6c5 100644 --- a/src/core/hle/service/cam/cam_c.h +++ b/src/core/hle/service/cam/cam_c.h @@ -6,13 +6,11 @@ #include "core/hle/service/cam/cam.h" -namespace Service { -namespace CAM { +namespace Service::CAM { class CAM_C final : public Module::Interface { public: explicit CAM_C(std::shared_ptr cam); }; -} // namespace CAM -} // namespace Service +} // namespace Service::CAM diff --git a/src/core/hle/service/cam/cam_q.cpp b/src/core/hle/service/cam/cam_q.cpp index ed4067f4c..71fc127d2 100644 --- a/src/core/hle/service/cam/cam_q.cpp +++ b/src/core/hle/service/cam/cam_q.cpp @@ -4,8 +4,7 @@ #include "core/hle/service/cam/cam_q.h" -namespace Service { -namespace CAM { +namespace Service::CAM { CAM_Q::CAM_Q() : ServiceFramework("cam:q", 1 /*TODO: find the true value*/) { // Empty arrays are illegal -- commented out until an entry is added. @@ -13,5 +12,4 @@ CAM_Q::CAM_Q() : ServiceFramework("cam:q", 1 /*TODO: find the true value*/) { // RegisterHandlers(functions); } -} // namespace CAM -} // namespace Service +} // namespace Service::CAM diff --git a/src/core/hle/service/cam/cam_q.h b/src/core/hle/service/cam/cam_q.h index a96698668..d1124493b 100644 --- a/src/core/hle/service/cam/cam_q.h +++ b/src/core/hle/service/cam/cam_q.h @@ -6,13 +6,11 @@ #include "core/hle/service/service.h" -namespace Service { -namespace CAM { +namespace Service::CAM { class CAM_Q : public ServiceFramework { public: CAM_Q(); }; -} // namespace CAM -} // namespace Service +} // namespace Service::CAM diff --git a/src/core/hle/service/cam/cam_s.cpp b/src/core/hle/service/cam/cam_s.cpp index 5e8bd1cd9..c4936f9b5 100644 --- a/src/core/hle/service/cam/cam_s.cpp +++ b/src/core/hle/service/cam/cam_s.cpp @@ -5,8 +5,7 @@ #include "core/hle/service/cam/cam.h" #include "core/hle/service/cam/cam_s.h" -namespace Service { -namespace CAM { +namespace Service::CAM { CAM_S::CAM_S(std::shared_ptr cam) : Module::Interface(std::move(cam), "cam:s", 1) { static const FunctionInfo functions[] = { @@ -79,5 +78,4 @@ CAM_S::CAM_S(std::shared_ptr cam) : Module::Interface(std::move(cam), "c RegisterHandlers(functions); } -} // namespace CAM -} // namespace Service +} // namespace Service::CAM diff --git a/src/core/hle/service/cam/cam_s.h b/src/core/hle/service/cam/cam_s.h index f958b4261..0c9d26644 100644 --- a/src/core/hle/service/cam/cam_s.h +++ b/src/core/hle/service/cam/cam_s.h @@ -6,13 +6,11 @@ #include "core/hle/service/cam/cam.h" -namespace Service { -namespace CAM { +namespace Service::CAM { class CAM_S final : public Module::Interface { public: explicit CAM_S(std::shared_ptr cam); }; -} // namespace CAM -} // namespace Service +} // namespace Service::CAM diff --git a/src/core/hle/service/cam/cam_u.cpp b/src/core/hle/service/cam/cam_u.cpp index f4e23ec30..3c3c4b17d 100644 --- a/src/core/hle/service/cam/cam_u.cpp +++ b/src/core/hle/service/cam/cam_u.cpp @@ -5,8 +5,7 @@ #include "core/hle/service/cam/cam.h" #include "core/hle/service/cam/cam_u.h" -namespace Service { -namespace CAM { +namespace Service::CAM { CAM_U::CAM_U(std::shared_ptr cam) : Module::Interface(std::move(cam), "cam:u", 1) { static const FunctionInfo functions[] = { @@ -79,5 +78,4 @@ CAM_U::CAM_U(std::shared_ptr cam) : Module::Interface(std::move(cam), "c RegisterHandlers(functions); } -} // namespace CAM -} // namespace Service +} // namespace Service::CAM diff --git a/src/core/hle/service/cam/cam_u.h b/src/core/hle/service/cam/cam_u.h index a76daf0e3..85b12559a 100644 --- a/src/core/hle/service/cam/cam_u.h +++ b/src/core/hle/service/cam/cam_u.h @@ -6,13 +6,11 @@ #include "core/hle/service/cam/cam.h" -namespace Service { -namespace CAM { +namespace Service::CAM { class CAM_U final : public Module::Interface { public: explicit CAM_U(std::shared_ptr cam); }; -} // namespace CAM -} // namespace Service +} // namespace Service::CAM diff --git a/src/core/hle/service/cecd/cecd.cpp b/src/core/hle/service/cecd/cecd.cpp index c7bb8c1aa..b3434c6dd 100644 --- a/src/core/hle/service/cecd/cecd.cpp +++ b/src/core/hle/service/cecd/cecd.cpp @@ -10,8 +10,7 @@ #include "core/hle/service/cecd/cecd_s.h" #include "core/hle/service/cecd/cecd_u.h" -namespace Service { -namespace CECD { +namespace Service::CECD { void Module::Interface::GetCecStateAbbreviated(Kernel::HLERequestContext& ctx) { IPC::RequestParser rp(ctx, 0x0E, 0, 0); @@ -59,5 +58,4 @@ void InstallInterfaces(SM::ServiceManager& service_manager) { std::make_shared(cecd)->InstallAsService(service_manager); } -} // namespace CECD -} // namespace Service +} // namespace Service::CECD diff --git a/src/core/hle/service/cecd/cecd.h b/src/core/hle/service/cecd/cecd.h index 9d4f659c1..2db74be4d 100644 --- a/src/core/hle/service/cecd/cecd.h +++ b/src/core/hle/service/cecd/cecd.h @@ -7,8 +7,7 @@ #include "core/hle/kernel/event.h" #include "core/hle/service/service.h" -namespace Service { -namespace CECD { +namespace Service::CECD { enum class CecStateAbbreviated : u32 { CEC_STATE_ABBREV_IDLE = 1, ///< Corresponds to CEC_STATE_IDLE @@ -73,5 +72,4 @@ private: /// Initialize CECD service(s) void InstallInterfaces(SM::ServiceManager& service_manager); -} // namespace CECD -} // namespace Service +} // namespace Service::CECD diff --git a/src/core/hle/service/cecd/cecd_ndm.cpp b/src/core/hle/service/cecd/cecd_ndm.cpp index f615c13bf..e4366e9c6 100644 --- a/src/core/hle/service/cecd/cecd_ndm.cpp +++ b/src/core/hle/service/cecd/cecd_ndm.cpp @@ -4,8 +4,7 @@ #include "core/hle/service/cecd/cecd_ndm.h" -namespace Service { -namespace CECD { +namespace Service::CECD { CECD_NDM::CECD_NDM(std::shared_ptr cecd) : Module::Interface(std::move(cecd), "cecd:ndm", DefaultMaxSessions) { @@ -21,5 +20,4 @@ CECD_NDM::CECD_NDM(std::shared_ptr cecd) RegisterHandlers(functions); } -} // namespace CECD -} // namespace Service +} // namespace Service::CECD diff --git a/src/core/hle/service/cecd/cecd_ndm.h b/src/core/hle/service/cecd/cecd_ndm.h index 01e9e19fd..a9fabb1a1 100644 --- a/src/core/hle/service/cecd/cecd_ndm.h +++ b/src/core/hle/service/cecd/cecd_ndm.h @@ -6,13 +6,11 @@ #include "core/hle/service/cecd/cecd.h" -namespace Service { -namespace CECD { +namespace Service::CECD { class CECD_NDM final : public Module::Interface { public: explicit CECD_NDM(std::shared_ptr cecd); }; -} // namespace CECD -} // namespace Service +} // namespace Service::CECD diff --git a/src/core/hle/service/cecd/cecd_s.cpp b/src/core/hle/service/cecd/cecd_s.cpp index f9cab854e..a17278b29 100644 --- a/src/core/hle/service/cecd/cecd_s.cpp +++ b/src/core/hle/service/cecd/cecd_s.cpp @@ -4,8 +4,7 @@ #include "core/hle/service/cecd/cecd_s.h" -namespace Service { -namespace CECD { +namespace Service::CECD { CECD_S::CECD_S(std::shared_ptr cecd) : Module::Interface(std::move(cecd), "cecd:s", DefaultMaxSessions) { @@ -34,5 +33,4 @@ CECD_S::CECD_S(std::shared_ptr cecd) RegisterHandlers(functions); } -} // namespace CECD -} // namespace Service +} // namespace Service::CECD diff --git a/src/core/hle/service/cecd/cecd_s.h b/src/core/hle/service/cecd/cecd_s.h index 96ac68756..6c50b13ba 100644 --- a/src/core/hle/service/cecd/cecd_s.h +++ b/src/core/hle/service/cecd/cecd_s.h @@ -6,13 +6,11 @@ #include "core/hle/service/cecd/cecd.h" -namespace Service { -namespace CECD { +namespace Service::CECD { class CECD_S final : public Module::Interface { public: explicit CECD_S(std::shared_ptr cecd); }; -} // namespace CECD -} // namespace Service +} // namespace Service::CECD diff --git a/src/core/hle/service/cecd/cecd_u.cpp b/src/core/hle/service/cecd/cecd_u.cpp index d13c3ca09..5d392848e 100644 --- a/src/core/hle/service/cecd/cecd_u.cpp +++ b/src/core/hle/service/cecd/cecd_u.cpp @@ -4,8 +4,7 @@ #include "core/hle/service/cecd/cecd_u.h" -namespace Service { -namespace CECD { +namespace Service::CECD { CECD_U::CECD_U(std::shared_ptr cecd) : Module::Interface(std::move(cecd), "cecd:u", DefaultMaxSessions) { @@ -34,5 +33,4 @@ CECD_U::CECD_U(std::shared_ptr cecd) RegisterHandlers(functions); } -} // namespace CECD -} // namespace Service +} // namespace Service::CECD diff --git a/src/core/hle/service/cecd/cecd_u.h b/src/core/hle/service/cecd/cecd_u.h index 39712e71a..49ddadb69 100644 --- a/src/core/hle/service/cecd/cecd_u.h +++ b/src/core/hle/service/cecd/cecd_u.h @@ -6,13 +6,11 @@ #include "core/hle/service/cecd/cecd.h" -namespace Service { -namespace CECD { +namespace Service::CECD { class CECD_U final : public Module::Interface { public: explicit CECD_U(std::shared_ptr cecd); }; -} // namespace CECD -} // namespace Service +} // namespace Service::CECD diff --git a/src/core/hle/service/cfg/cfg.cpp b/src/core/hle/service/cfg/cfg.cpp index 49d17c190..1b99c0e2c 100644 --- a/src/core/hle/service/cfg/cfg.cpp +++ b/src/core/hle/service/cfg/cfg.cpp @@ -21,8 +21,7 @@ #include "core/hle/service/cfg/cfg_u.h" #include "core/settings.h" -namespace Service { -namespace CFG { +namespace Service::CFG { /// The maximum number of block entries that can exist in the config file static const u32 CONFIG_FILE_MAX_BLOCK_ENTRIES = 1479; @@ -721,5 +720,4 @@ void InstallInterfaces(SM::ServiceManager& service_manager) { current_cfg = cfg; } -} // namespace CFG -} // namespace Service +} // namespace Service::CFG diff --git a/src/core/hle/service/cfg/cfg.h b/src/core/hle/service/cfg/cfg.h index 5f5c8e1f1..f240d194b 100644 --- a/src/core/hle/service/cfg/cfg.h +++ b/src/core/hle/service/cfg/cfg.h @@ -10,8 +10,7 @@ #include "common/common_types.h" #include "core/hle/service/fs/archive.h" -namespace Service { -namespace CFG { +namespace Service::CFG { enum SystemModel { NINTENDO_3DS = 0, @@ -407,5 +406,4 @@ private: void InstallInterfaces(SM::ServiceManager& service_manager); std::shared_ptr GetCurrentModule(); -} // namespace CFG -} // namespace Service +} // namespace Service::CFG diff --git a/src/core/hle/service/cfg/cfg_i.cpp b/src/core/hle/service/cfg/cfg_i.cpp index b43112fdb..624299076 100644 --- a/src/core/hle/service/cfg/cfg_i.cpp +++ b/src/core/hle/service/cfg/cfg_i.cpp @@ -4,8 +4,7 @@ #include "core/hle/service/cfg/cfg_i.h" -namespace Service { -namespace CFG { +namespace Service::CFG { CFG_I::CFG_I(std::shared_ptr cfg) : Module::Interface(std::move(cfg), "cfg:i", 23) { static const FunctionInfo functions[] = { @@ -60,5 +59,4 @@ CFG_I::CFG_I(std::shared_ptr cfg) : Module::Interface(std::move(cfg), "c RegisterHandlers(functions); } -} // namespace CFG -} // namespace Service +} // namespace Service::CFG diff --git a/src/core/hle/service/cfg/cfg_i.h b/src/core/hle/service/cfg/cfg_i.h index 0fd972c0e..704eb4a71 100644 --- a/src/core/hle/service/cfg/cfg_i.h +++ b/src/core/hle/service/cfg/cfg_i.h @@ -6,13 +6,11 @@ #include "core/hle/service/cfg/cfg.h" -namespace Service { -namespace CFG { +namespace Service::CFG { class CFG_I final : public Module::Interface { public: explicit CFG_I(std::shared_ptr cfg); }; -} // namespace CFG -} // namespace Service +} // namespace Service::CFG diff --git a/src/core/hle/service/cfg/cfg_nor.cpp b/src/core/hle/service/cfg/cfg_nor.cpp index 685a1461e..413548313 100644 --- a/src/core/hle/service/cfg/cfg_nor.cpp +++ b/src/core/hle/service/cfg/cfg_nor.cpp @@ -4,8 +4,7 @@ #include "core/hle/service/cfg/cfg_nor.h" -namespace Service { -namespace CFG { +namespace Service::CFG { CFG_NOR::CFG_NOR() : ServiceFramework("cfg:nor", 23) { static const FunctionInfo functions[] = { @@ -17,5 +16,4 @@ CFG_NOR::CFG_NOR() : ServiceFramework("cfg:nor", 23) { RegisterHandlers(functions); } -} // namespace CFG -} // namespace Service +} // namespace Service::CFG diff --git a/src/core/hle/service/cfg/cfg_nor.h b/src/core/hle/service/cfg/cfg_nor.h index 197c927db..3dace92bd 100644 --- a/src/core/hle/service/cfg/cfg_nor.h +++ b/src/core/hle/service/cfg/cfg_nor.h @@ -6,13 +6,11 @@ #include "core/hle/service/service.h" -namespace Service { -namespace CFG { +namespace Service::CFG { class CFG_NOR final : public ServiceFramework { public: CFG_NOR(); }; -} // namespace CFG -} // namespace Service +} // namespace Service::CFG diff --git a/src/core/hle/service/cfg/cfg_s.cpp b/src/core/hle/service/cfg/cfg_s.cpp index 4449b2b6c..a211dae05 100644 --- a/src/core/hle/service/cfg/cfg_s.cpp +++ b/src/core/hle/service/cfg/cfg_s.cpp @@ -4,8 +4,7 @@ #include "core/hle/service/cfg/cfg_s.h" -namespace Service { -namespace CFG { +namespace Service::CFG { CFG_S::CFG_S(std::shared_ptr cfg) : Module::Interface(std::move(cfg), "cfg:s", 23) { static const FunctionInfo functions[] = { @@ -36,5 +35,4 @@ CFG_S::CFG_S(std::shared_ptr cfg) : Module::Interface(std::move(cfg), "c RegisterHandlers(functions); } -} // namespace CFG -} // namespace Service +} // namespace Service::CFG diff --git a/src/core/hle/service/cfg/cfg_s.h b/src/core/hle/service/cfg/cfg_s.h index 98853954e..7f135b357 100644 --- a/src/core/hle/service/cfg/cfg_s.h +++ b/src/core/hle/service/cfg/cfg_s.h @@ -6,13 +6,11 @@ #include "core/hle/service/cfg/cfg.h" -namespace Service { -namespace CFG { +namespace Service::CFG { class CFG_S final : public Module::Interface { public: explicit CFG_S(std::shared_ptr cfg); }; -} // namespace CFG -} // namespace Service +} // namespace Service::CFG diff --git a/src/core/hle/service/cfg/cfg_u.cpp b/src/core/hle/service/cfg/cfg_u.cpp index 4b554e175..6aa862f82 100644 --- a/src/core/hle/service/cfg/cfg_u.cpp +++ b/src/core/hle/service/cfg/cfg_u.cpp @@ -4,8 +4,7 @@ #include "core/hle/service/cfg/cfg_u.h" -namespace Service { -namespace CFG { +namespace Service::CFG { CFG_U::CFG_U(std::shared_ptr cfg) : Module::Interface(std::move(cfg), "cfg:u", 23) { static const FunctionInfo functions[] = { @@ -25,5 +24,4 @@ CFG_U::CFG_U(std::shared_ptr cfg) : Module::Interface(std::move(cfg), "c RegisterHandlers(functions); } -} // namespace CFG -} // namespace Service +} // namespace Service::CFG diff --git a/src/core/hle/service/cfg/cfg_u.h b/src/core/hle/service/cfg/cfg_u.h index b3ad8b31b..8b48e963e 100644 --- a/src/core/hle/service/cfg/cfg_u.h +++ b/src/core/hle/service/cfg/cfg_u.h @@ -6,13 +6,11 @@ #include "core/hle/service/cfg/cfg.h" -namespace Service { -namespace CFG { +namespace Service::CFG { class CFG_U final : public Module::Interface { public: explicit CFG_U(std::shared_ptr cfg); }; -} // namespace CFG -} // namespace Service +} // namespace Service::CFG diff --git a/src/core/hle/service/csnd/csnd_snd.cpp b/src/core/hle/service/csnd/csnd_snd.cpp index c1d937473..2b42cba3f 100644 --- a/src/core/hle/service/csnd/csnd_snd.cpp +++ b/src/core/hle/service/csnd/csnd_snd.cpp @@ -7,8 +7,7 @@ #include "core/hle/result.h" #include "core/hle/service/csnd/csnd_snd.h" -namespace Service { -namespace CSND { +namespace Service::CSND { void CSND_SND::Initialize(Kernel::HLERequestContext& ctx) { IPC::RequestParser rp(ctx, 0x01, 5, 0); @@ -198,5 +197,4 @@ void InstallInterfaces(SM::ServiceManager& service_manager) { std::make_shared()->InstallAsService(service_manager); } -} // namespace CSND -} // namespace Service +} // namespace Service::CSND diff --git a/src/core/hle/service/csnd/csnd_snd.h b/src/core/hle/service/csnd/csnd_snd.h index baa4086e3..b8d19e116 100644 --- a/src/core/hle/service/csnd/csnd_snd.h +++ b/src/core/hle/service/csnd/csnd_snd.h @@ -8,8 +8,7 @@ #include "core/hle/kernel/shared_memory.h" #include "core/hle/service/service.h" -namespace Service { -namespace CSND { +namespace Service::CSND { class CSND_SND final : public ServiceFramework { public: @@ -181,5 +180,4 @@ private: /// Initializes the CSND_SND Service void InstallInterfaces(SM::ServiceManager& service_manager); -} // namespace CSND -} // namespace Service +} // namespace Service::CSND diff --git a/src/core/hle/service/dlp/dlp.cpp b/src/core/hle/service/dlp/dlp.cpp index 5d2f68b74..87d428423 100644 --- a/src/core/hle/service/dlp/dlp.cpp +++ b/src/core/hle/service/dlp/dlp.cpp @@ -7,8 +7,7 @@ #include "core/hle/service/dlp/dlp_fkcl.h" #include "core/hle/service/dlp/dlp_srvr.h" -namespace Service { -namespace DLP { +namespace Service::DLP { void InstallInterfaces(SM::ServiceManager& service_manager) { std::make_shared()->InstallAsService(service_manager); @@ -16,5 +15,4 @@ void InstallInterfaces(SM::ServiceManager& service_manager) { std::make_shared()->InstallAsService(service_manager); } -} // namespace DLP -} // namespace Service +} // namespace Service::DLP diff --git a/src/core/hle/service/dlp/dlp.h b/src/core/hle/service/dlp/dlp.h index d45d8c5db..f2c925f70 100644 --- a/src/core/hle/service/dlp/dlp.h +++ b/src/core/hle/service/dlp/dlp.h @@ -6,11 +6,9 @@ #include "core/hle/service/service.h" -namespace Service { -namespace DLP { +namespace Service::DLP { /// Initializes the DLP services. void InstallInterfaces(SM::ServiceManager& service_manager); -} // namespace DLP -} // namespace Service +} // namespace Service::DLP diff --git a/src/core/hle/service/dlp/dlp_clnt.cpp b/src/core/hle/service/dlp/dlp_clnt.cpp index dbf61ab13..63308f57e 100644 --- a/src/core/hle/service/dlp/dlp_clnt.cpp +++ b/src/core/hle/service/dlp/dlp_clnt.cpp @@ -5,8 +5,7 @@ #include "core/hle/ipc_helpers.h" #include "core/hle/service/dlp/dlp_clnt.h" -namespace Service { -namespace DLP { +namespace Service::DLP { DLP_CLNT::DLP_CLNT() : ServiceFramework("dlp:CLNT", 1) { static const FunctionInfo functions[] = { @@ -37,5 +36,4 @@ DLP_CLNT::DLP_CLNT() : ServiceFramework("dlp:CLNT", 1) { RegisterHandlers(functions); } -} // namespace DLP -} // namespace Service +} // namespace Service::DLP diff --git a/src/core/hle/service/dlp/dlp_clnt.h b/src/core/hle/service/dlp/dlp_clnt.h index a1a5078e8..db506b985 100644 --- a/src/core/hle/service/dlp/dlp_clnt.h +++ b/src/core/hle/service/dlp/dlp_clnt.h @@ -6,8 +6,7 @@ #include "core/hle/service/service.h" -namespace Service { -namespace DLP { +namespace Service::DLP { class DLP_CLNT final : public ServiceFramework { public: @@ -15,5 +14,4 @@ public: ~DLP_CLNT() = default; }; -} // namespace DLP -} // namespace Service +} // namespace Service::DLP diff --git a/src/core/hle/service/dlp/dlp_fkcl.cpp b/src/core/hle/service/dlp/dlp_fkcl.cpp index 8003ee580..30a98c4bf 100644 --- a/src/core/hle/service/dlp/dlp_fkcl.cpp +++ b/src/core/hle/service/dlp/dlp_fkcl.cpp @@ -5,8 +5,7 @@ #include "core/hle/ipc_helpers.h" #include "core/hle/service/dlp/dlp_fkcl.h" -namespace Service { -namespace DLP { +namespace Service::DLP { DLP_FKCL::DLP_FKCL() : ServiceFramework("dlp:FKCL", 1) { static const FunctionInfo functions[] = { @@ -34,5 +33,4 @@ DLP_FKCL::DLP_FKCL() : ServiceFramework("dlp:FKCL", 1) { RegisterHandlers(functions); } -} // namespace DLP -} // namespace Service +} // namespace Service::DLP diff --git a/src/core/hle/service/dlp/dlp_fkcl.h b/src/core/hle/service/dlp/dlp_fkcl.h index cc95f77f1..a3b2ac86d 100644 --- a/src/core/hle/service/dlp/dlp_fkcl.h +++ b/src/core/hle/service/dlp/dlp_fkcl.h @@ -6,8 +6,7 @@ #include "core/hle/service/service.h" -namespace Service { -namespace DLP { +namespace Service::DLP { class DLP_FKCL final : public ServiceFramework { public: @@ -15,5 +14,4 @@ public: ~DLP_FKCL() = default; }; -} // namespace DLP -} // namespace Service +} // namespace Service::DLP diff --git a/src/core/hle/service/dlp/dlp_srvr.cpp b/src/core/hle/service/dlp/dlp_srvr.cpp index c190c57d0..9d7405941 100644 --- a/src/core/hle/service/dlp/dlp_srvr.cpp +++ b/src/core/hle/service/dlp/dlp_srvr.cpp @@ -8,8 +8,7 @@ #include "core/hle/result.h" #include "core/hle/service/dlp/dlp_srvr.h" -namespace Service { -namespace DLP { +namespace Service::DLP { void DLP_SRVR::IsChild(Kernel::HLERequestContext& ctx) { IPC::RequestParser rp(ctx, 0x0E, 1, 0); @@ -47,5 +46,4 @@ DLP_SRVR::DLP_SRVR() : ServiceFramework("dlp:SRVR", 1) { RegisterHandlers(functions); } -} // namespace DLP -} // namespace Service +} // namespace Service::DLP diff --git a/src/core/hle/service/dlp/dlp_srvr.h b/src/core/hle/service/dlp/dlp_srvr.h index ce16f42ff..50d8d92b2 100644 --- a/src/core/hle/service/dlp/dlp_srvr.h +++ b/src/core/hle/service/dlp/dlp_srvr.h @@ -6,8 +6,7 @@ #include "core/hle/service/service.h" -namespace Service { -namespace DLP { +namespace Service::DLP { class DLP_SRVR final : public ServiceFramework { public: @@ -18,5 +17,4 @@ private: void IsChild(Kernel::HLERequestContext& ctx); }; -} // namespace DLP -} // namespace Service +} // namespace Service::DLP diff --git a/src/core/hle/service/dsp/dsp_dsp.cpp b/src/core/hle/service/dsp/dsp_dsp.cpp index 5568eb9d0..6b4157ae0 100644 --- a/src/core/hle/service/dsp/dsp_dsp.cpp +++ b/src/core/hle/service/dsp/dsp_dsp.cpp @@ -18,8 +18,7 @@ namespace AudioCore { enum class DspPipe; } -namespace Service { -namespace DSP { +namespace Service::DSP { void DSP_DSP::RecvData(Kernel::HLERequestContext& ctx) { IPC::RequestParser rp(ctx, 0x01, 1, 0); @@ -406,5 +405,4 @@ void InstallInterfaces(SM::ServiceManager& service_manager) { Core::DSP().SetServiceToInterrupt(std::move(dsp)); } -} // namespace DSP -} // namespace Service +} // namespace Service::DSP diff --git a/src/core/hle/service/dsp/dsp_dsp.h b/src/core/hle/service/dsp/dsp_dsp.h index 144ea75f1..b030c8ff3 100644 --- a/src/core/hle/service/dsp/dsp_dsp.h +++ b/src/core/hle/service/dsp/dsp_dsp.h @@ -9,8 +9,7 @@ #include "core/hle/result.h" #include "core/hle/service/service.h" -namespace Service { -namespace DSP { +namespace Service::DSP { class DSP_DSP final : public ServiceFramework { public: @@ -253,5 +252,4 @@ private: void InstallInterfaces(SM::ServiceManager& service_manager); -} // namespace DSP -} // namespace Service +} // namespace Service::DSP diff --git a/src/core/hle/service/err_f.cpp b/src/core/hle/service/err_f.cpp index de45db0f6..e76a21a6a 100644 --- a/src/core/hle/service/err_f.cpp +++ b/src/core/hle/service/err_f.cpp @@ -15,8 +15,7 @@ #include "core/hle/result.h" #include "core/hle/service/err_f.h" -namespace Service { -namespace ERR { +namespace Service::ERR { enum class FatalErrType : u32 { Generic = 0, @@ -248,5 +247,4 @@ void InstallInterfaces() { errf->InstallAsNamedPort(); } -} // namespace ERR -} // namespace Service +} // namespace Service::ERR diff --git a/src/core/hle/service/err_f.h b/src/core/hle/service/err_f.h index 6895f9222..1f4f3808e 100644 --- a/src/core/hle/service/err_f.h +++ b/src/core/hle/service/err_f.h @@ -10,8 +10,7 @@ namespace Kernel { class HLERequestContext; } -namespace Service { -namespace ERR { +namespace Service::ERR { /// Interface to "err:f" service class ERR_F final : public ServiceFramework { @@ -33,5 +32,4 @@ private: void InstallInterfaces(); -} // namespace ERR -} // namespace Service +} // namespace Service::ERR diff --git a/src/core/hle/service/frd/frd.cpp b/src/core/hle/service/frd/frd.cpp index e9681e4c1..37ac87c41 100644 --- a/src/core/hle/service/frd/frd.cpp +++ b/src/core/hle/service/frd/frd.cpp @@ -13,8 +13,7 @@ #include "core/hle/service/frd/frd_a.h" #include "core/hle/service/frd/frd_u.h" -namespace Service { -namespace FRD { +namespace Service::FRD { Module::Interface::Interface(std::shared_ptr frd, const char* name, u32 max_session) : ServiceFramework(name, max_session), frd(std::move(frd)) {} @@ -156,6 +155,4 @@ void InstallInterfaces(SM::ServiceManager& service_manager) { std::make_shared(frd)->InstallAsService(service_manager); } -} // namespace FRD - -} // namespace Service +} // namespace Service::FRD diff --git a/src/core/hle/service/frd/frd.h b/src/core/hle/service/frd/frd.h index b266cd339..87a5e1972 100644 --- a/src/core/hle/service/frd/frd.h +++ b/src/core/hle/service/frd/frd.h @@ -8,9 +8,7 @@ #include "common/common_types.h" #include "core/hle/service/service.h" -namespace Service { - -namespace FRD { +namespace Service::FRD { struct FriendKey { u32 friend_id; @@ -139,5 +137,4 @@ private: void InstallInterfaces(SM::ServiceManager& service_manager); -} // namespace FRD -} // namespace Service +} // namespace Service::FRD diff --git a/src/core/hle/service/frd/frd_a.cpp b/src/core/hle/service/frd/frd_a.cpp index c134964c6..c68689cc0 100644 --- a/src/core/hle/service/frd/frd_a.cpp +++ b/src/core/hle/service/frd/frd_a.cpp @@ -4,8 +4,7 @@ #include "core/hle/service/frd/frd_a.h" -namespace Service { -namespace FRD { +namespace Service::FRD { FRD_A::FRD_A(std::shared_ptr frd) : Module::Interface(std::move(frd), "frd:a", 8) { static const FunctionInfo functions[] = { @@ -66,5 +65,4 @@ FRD_A::FRD_A(std::shared_ptr frd) : Module::Interface(std::move(frd), "f RegisterHandlers(functions); } -} // namespace FRD -} // namespace Service +} // namespace Service::FRD diff --git a/src/core/hle/service/frd/frd_a.h b/src/core/hle/service/frd/frd_a.h index 92e3f4c2e..97657a072 100644 --- a/src/core/hle/service/frd/frd_a.h +++ b/src/core/hle/service/frd/frd_a.h @@ -6,13 +6,11 @@ #include "core/hle/service/frd/frd.h" -namespace Service { -namespace FRD { +namespace Service::FRD { class FRD_A final : public Module::Interface { public: explicit FRD_A(std::shared_ptr frd); }; -} // namespace FRD -} // namespace Service +} // namespace Service::FRD diff --git a/src/core/hle/service/frd/frd_u.cpp b/src/core/hle/service/frd/frd_u.cpp index 2acde5444..2cbc64243 100644 --- a/src/core/hle/service/frd/frd_u.cpp +++ b/src/core/hle/service/frd/frd_u.cpp @@ -4,8 +4,7 @@ #include "core/hle/service/frd/frd_u.h" -namespace Service { -namespace FRD { +namespace Service::FRD { FRD_U::FRD_U(std::shared_ptr frd) : Module::Interface(std::move(frd), "frd:u", 8) { static const FunctionInfo functions[] = { @@ -66,5 +65,4 @@ FRD_U::FRD_U(std::shared_ptr frd) : Module::Interface(std::move(frd), "f RegisterHandlers(functions); } -} // namespace FRD -} // namespace Service +} // namespace Service::FRD diff --git a/src/core/hle/service/frd/frd_u.h b/src/core/hle/service/frd/frd_u.h index 06824090f..5704d5e11 100644 --- a/src/core/hle/service/frd/frd_u.h +++ b/src/core/hle/service/frd/frd_u.h @@ -6,13 +6,11 @@ #include "core/hle/service/frd/frd.h" -namespace Service { -namespace FRD { +namespace Service::FRD { class FRD_U final : public Module::Interface { public: explicit FRD_U(std::shared_ptr frd); }; -} // namespace FRD -} // namespace Service +} // namespace Service::FRD diff --git a/src/core/hle/service/fs/archive.cpp b/src/core/hle/service/fs/archive.cpp index 79fb1847f..470970942 100644 --- a/src/core/hle/service/fs/archive.cpp +++ b/src/core/hle/service/fs/archive.cpp @@ -40,8 +40,7 @@ #include "core/hle/service/service.h" #include "core/memory.h" -namespace Service { -namespace FS { +namespace Service::FS { // Command to access directory enum class DirectoryCommand : u32 { @@ -701,5 +700,4 @@ void ArchiveShutdown() { UnregisterArchiveTypes(); } -} // namespace FS -} // namespace Service +} // namespace Service::FS diff --git a/src/core/hle/service/fs/archive.h b/src/core/hle/service/fs/archive.h index 38ba6222a..3209958f8 100644 --- a/src/core/hle/service/fs/archive.h +++ b/src/core/hle/service/fs/archive.h @@ -28,8 +28,7 @@ namespace Loader { class AppLoader; } -namespace Service { -namespace FS { +namespace Service::FS { /// Supported archive types enum class ArchiveIdCode : u32 { @@ -296,5 +295,4 @@ void RegisterArchiveTypes(); /// Unregister all archive types void UnregisterArchiveTypes(); -} // namespace FS -} // namespace Service +} // namespace Service::FS diff --git a/src/core/hle/service/fs/fs_user.cpp b/src/core/hle/service/fs/fs_user.cpp index 62a4bb793..4c5d53bc7 100644 --- a/src/core/hle/service/fs/fs_user.cpp +++ b/src/core/hle/service/fs/fs_user.cpp @@ -30,8 +30,7 @@ using Kernel::ClientSession; using Kernel::ServerSession; using Kernel::SharedPtr; -namespace Service { -namespace FS { +namespace Service::FS { void FS_USER::Initialize(Kernel::HLERequestContext& ctx) { IPC::RequestParser rp(ctx, 0x0801, 0, 2); @@ -857,5 +856,4 @@ FS_USER::FS_USER() : ServiceFramework("fs:USER", 30) { void InstallInterfaces(SM::ServiceManager& service_manager) { std::make_shared()->InstallAsService(service_manager); } -} // namespace FS -} // namespace Service +} // namespace Service::FS diff --git a/src/core/hle/service/fs/fs_user.h b/src/core/hle/service/fs/fs_user.h index 275cd9f8e..728c4ef0f 100644 --- a/src/core/hle/service/fs/fs_user.h +++ b/src/core/hle/service/fs/fs_user.h @@ -7,8 +7,7 @@ #include "common/common_types.h" #include "core/hle/service/service.h" -namespace Service { -namespace FS { +namespace Service::FS { class FS_USER final : public ServiceFramework { public: @@ -520,5 +519,4 @@ private: void InstallInterfaces(SM::ServiceManager& service_manager); -} // namespace FS -} // namespace Service +} // namespace Service::FS diff --git a/src/core/hle/service/gsp/gsp.cpp b/src/core/hle/service/gsp/gsp.cpp index 660a68e55..f5fe99f5d 100644 --- a/src/core/hle/service/gsp/gsp.cpp +++ b/src/core/hle/service/gsp/gsp.cpp @@ -7,8 +7,7 @@ #include "core/hle/kernel/shared_memory.h" #include "core/hle/service/gsp/gsp.h" -namespace Service { -namespace GSP { +namespace Service::GSP { static std::weak_ptr gsp_gpu; @@ -32,5 +31,4 @@ void InstallInterfaces(SM::ServiceManager& service_manager) { std::make_shared()->InstallAsService(service_manager); } -} // namespace GSP -} // namespace Service +} // namespace Service::GSP diff --git a/src/core/hle/service/gsp/gsp.h b/src/core/hle/service/gsp/gsp.h index c3e6cd030..0e1017b5d 100644 --- a/src/core/hle/service/gsp/gsp.h +++ b/src/core/hle/service/gsp/gsp.h @@ -11,8 +11,7 @@ #include "core/hle/service/gsp/gsp_gpu.h" #include "core/hle/service/gsp/gsp_lcd.h" -namespace Service { -namespace GSP { +namespace Service::GSP { /** * Retrieves the framebuffer info stored in the GSP shared memory for the * specified screen index and thread id. @@ -29,5 +28,4 @@ FrameBufferUpdate* GetFrameBufferInfo(u32 thread_id, u32 screen_index); void SignalInterrupt(InterruptId interrupt_id); void InstallInterfaces(SM::ServiceManager& service_manager); -} // namespace GSP -} // namespace Service +} // namespace Service::GSP diff --git a/src/core/hle/service/gsp/gsp_gpu.cpp b/src/core/hle/service/gsp/gsp_gpu.cpp index 0de369b4e..d9aad5ea5 100644 --- a/src/core/hle/service/gsp/gsp_gpu.cpp +++ b/src/core/hle/service/gsp/gsp_gpu.cpp @@ -23,8 +23,7 @@ // Main graphics debugger object - TODO: Here is probably not the best place for this GraphicsDebugger g_debugger; -namespace Service { -namespace GSP { +namespace Service::GSP { // Beginning address of HW regs const u32 REGS_BEGIN = 0x1EB00000; @@ -807,5 +806,4 @@ SessionData::~SessionData() { used_thread_ids[thread_id] = false; } -} // namespace GSP -} // namespace Service +} // namespace Service::GSP diff --git a/src/core/hle/service/gsp/gsp_gpu.h b/src/core/hle/service/gsp/gsp_gpu.h index 01c747d41..da36a5f09 100644 --- a/src/core/hle/service/gsp/gsp_gpu.h +++ b/src/core/hle/service/gsp/gsp_gpu.h @@ -17,8 +17,7 @@ namespace Kernel { class SharedMemory; } // namespace Kernel -namespace Service { -namespace GSP { +namespace Service::GSP { /// GSP interrupt ID enum class InterruptId : u8 { @@ -411,5 +410,4 @@ private: ResultCode SetBufferSwap(u32 screen_id, const FrameBufferInfo& info); -} // namespace GSP -} // namespace Service +} // namespace Service::GSP diff --git a/src/core/hle/service/gsp/gsp_lcd.cpp b/src/core/hle/service/gsp/gsp_lcd.cpp index f7188c01b..d795b8716 100644 --- a/src/core/hle/service/gsp/gsp_lcd.cpp +++ b/src/core/hle/service/gsp/gsp_lcd.cpp @@ -5,8 +5,7 @@ #include "core/hle/ipc_helpers.h" #include "core/hle/service/gsp/gsp_lcd.h" -namespace Service { -namespace GSP { +namespace Service::GSP { GSP_LCD::GSP_LCD() : ServiceFramework("gsp::Lcd") { static const FunctionInfo functions[] = { @@ -23,5 +22,4 @@ GSP_LCD::GSP_LCD() : ServiceFramework("gsp::Lcd") { RegisterHandlers(functions); }; -} // namespace GSP -} // namespace Service +} // namespace Service::GSP diff --git a/src/core/hle/service/gsp/gsp_lcd.h b/src/core/hle/service/gsp/gsp_lcd.h index 90f7e5c8b..24e57fb42 100644 --- a/src/core/hle/service/gsp/gsp_lcd.h +++ b/src/core/hle/service/gsp/gsp_lcd.h @@ -6,8 +6,7 @@ #include "core/hle/service/service.h" -namespace Service { -namespace GSP { +namespace Service::GSP { class GSP_LCD final : public ServiceFramework { public: @@ -15,5 +14,4 @@ public: ~GSP_LCD() = default; }; -} // namespace GSP -} // namespace Service +} // namespace Service::GSP diff --git a/src/core/hle/service/hid/hid.cpp b/src/core/hle/service/hid/hid.cpp index 6f3719a05..32837a870 100644 --- a/src/core/hle/service/hid/hid.cpp +++ b/src/core/hle/service/hid/hid.cpp @@ -19,8 +19,7 @@ #include "core/movie.h" #include "video_core/video_core.h" -namespace Service { -namespace HID { +namespace Service::HID { static std::weak_ptr current_module; @@ -401,6 +400,4 @@ void InstallInterfaces(SM::ServiceManager& service_manager) { current_module = hid; } -} // namespace HID - -} // namespace Service +} // namespace Service::HID diff --git a/src/core/hle/service/hid/hid.h b/src/core/hle/service/hid/hid.h index c367c9e53..286189df0 100644 --- a/src/core/hle/service/hid/hid.h +++ b/src/core/hle/service/hid/hid.h @@ -27,9 +27,7 @@ namespace CoreTiming { struct EventType; }; -namespace Service { - -namespace HID { +namespace Service::HID { /** * Structure of a Pad controller state. @@ -335,5 +333,4 @@ void InstallInterfaces(SM::ServiceManager& service_manager); /// Reload input devices. Used when input configuration changed void ReloadInputDevices(); -} // namespace HID -} // namespace Service +} // namespace Service::HID diff --git a/src/core/hle/service/hid/hid_spvr.cpp b/src/core/hle/service/hid/hid_spvr.cpp index acc93d570..8371a6169 100644 --- a/src/core/hle/service/hid/hid_spvr.cpp +++ b/src/core/hle/service/hid/hid_spvr.cpp @@ -4,8 +4,7 @@ #include "core/hle/service/hid/hid_spvr.h" -namespace Service { -namespace HID { +namespace Service::HID { Spvr::Spvr(std::shared_ptr hid) : Module::Interface(std::move(hid), "hid:SPVR", 6) { static const FunctionInfo functions[] = { @@ -26,5 +25,4 @@ Spvr::Spvr(std::shared_ptr hid) : Module::Interface(std::move(hid), "hid RegisterHandlers(functions); } -} // namespace HID -} // namespace Service +} // namespace Service::HID diff --git a/src/core/hle/service/hid/hid_spvr.h b/src/core/hle/service/hid/hid_spvr.h index c0d831146..e2346dda5 100644 --- a/src/core/hle/service/hid/hid_spvr.h +++ b/src/core/hle/service/hid/hid_spvr.h @@ -6,13 +6,11 @@ #include "core/hle/service/hid/hid.h" -namespace Service { -namespace HID { +namespace Service::HID { class Spvr final : public Module::Interface { public: explicit Spvr(std::shared_ptr hid); }; -} // namespace HID -} // namespace Service +} // namespace Service::HID diff --git a/src/core/hle/service/hid/hid_user.cpp b/src/core/hle/service/hid/hid_user.cpp index 818a2589c..129b3fd02 100644 --- a/src/core/hle/service/hid/hid_user.cpp +++ b/src/core/hle/service/hid/hid_user.cpp @@ -4,8 +4,7 @@ #include "core/hle/service/hid/hid_user.h" -namespace Service { -namespace HID { +namespace Service::HID { User::User(std::shared_ptr hid) : Module::Interface(std::move(hid), "hid:USER", 6) { static const FunctionInfo functions[] = { @@ -26,5 +25,4 @@ User::User(std::shared_ptr hid) : Module::Interface(std::move(hid), "hid RegisterHandlers(functions); } -} // namespace HID -} // namespace Service +} // namespace Service::HID diff --git a/src/core/hle/service/hid/hid_user.h b/src/core/hle/service/hid/hid_user.h index 8e4ca52bb..813f09504 100644 --- a/src/core/hle/service/hid/hid_user.h +++ b/src/core/hle/service/hid/hid_user.h @@ -9,13 +9,11 @@ // This service is used for interfacing to physical user controls. // Uses include game pad controls, touchscreen, accelerometers, gyroscopes, and debug pad. -namespace Service { -namespace HID { +namespace Service::HID { class User final : public Module::Interface { public: explicit User(std::shared_ptr hid); }; -} // namespace HID -} // namespace Service +} // namespace Service::HID diff --git a/src/core/hle/service/http_c.cpp b/src/core/hle/service/http_c.cpp index 1872f4820..694b8b129 100644 --- a/src/core/hle/service/http_c.cpp +++ b/src/core/hle/service/http_c.cpp @@ -13,8 +13,7 @@ #include "core/hle/service/http_c.h" #include "core/hw/aes/key.h" -namespace Service { -namespace HTTP { +namespace Service::HTTP { namespace ErrCodes { enum { @@ -434,5 +433,4 @@ HTTP_C::HTTP_C() : ServiceFramework("http:C", 32) { void InstallInterfaces(SM::ServiceManager& service_manager) { std::make_shared()->InstallAsService(service_manager); } -} // namespace HTTP -} // namespace Service +} // namespace Service::HTTP diff --git a/src/core/hle/service/http_c.h b/src/core/hle/service/http_c.h index 1e089d5f0..033ed5aef 100644 --- a/src/core/hle/service/http_c.h +++ b/src/core/hle/service/http_c.h @@ -12,8 +12,7 @@ #include "core/hle/kernel/shared_memory.h" #include "core/hle/service/service.h" -namespace Service { -namespace HTTP { +namespace Service::HTTP { enum class RequestMethod : u8 { None = 0x0, @@ -222,5 +221,4 @@ private: void InstallInterfaces(SM::ServiceManager& service_manager); -} // namespace HTTP -} // namespace Service +} // namespace Service::HTTP diff --git a/src/core/hle/service/ir/extra_hid.cpp b/src/core/hle/service/ir/extra_hid.cpp index 3dcf9f422..a53c9fbf7 100644 --- a/src/core/hle/service/ir/extra_hid.cpp +++ b/src/core/hle/service/ir/extra_hid.cpp @@ -9,8 +9,7 @@ #include "core/movie.h" #include "core/settings.h" -namespace Service { -namespace IR { +namespace Service::IR { enum class RequestID : u8 { /** @@ -270,5 +269,4 @@ void ExtraHID::LoadInputDevices() { Settings::values.analogs[Settings::NativeAnalog::CStick]); } -} // namespace IR -} // namespace Service +} // namespace Service::IR diff --git a/src/core/hle/service/ir/extra_hid.h b/src/core/hle/service/ir/extra_hid.h index 0949334bf..dc4691d87 100644 --- a/src/core/hle/service/ir/extra_hid.h +++ b/src/core/hle/service/ir/extra_hid.h @@ -15,8 +15,7 @@ namespace CoreTiming { struct EventType; } // namespace CoreTiming -namespace Service { -namespace IR { +namespace Service::IR { struct ExtraHIDResponse { union { @@ -66,5 +65,4 @@ private: std::atomic is_device_reload_pending; }; -} // namespace IR -} // namespace Service +} // namespace Service::IR diff --git a/src/core/hle/service/ir/ir.cpp b/src/core/hle/service/ir/ir.cpp index 1dc09f300..b9803f0fd 100644 --- a/src/core/hle/service/ir/ir.cpp +++ b/src/core/hle/service/ir/ir.cpp @@ -9,8 +9,7 @@ #include "core/hle/service/ir/ir_user.h" #include "core/hle/service/service.h" -namespace Service { -namespace IR { +namespace Service::IR { static std::weak_ptr current_ir_rst; static std::weak_ptr current_ir_user; @@ -35,6 +34,4 @@ void InstallInterfaces(SM::ServiceManager& service_manager) { current_ir_rst = ir_rst; } -} // namespace IR - -} // namespace Service +} // namespace Service::IR diff --git a/src/core/hle/service/ir/ir.h b/src/core/hle/service/ir/ir.h index 3b1a32eac..931be77e7 100644 --- a/src/core/hle/service/ir/ir.h +++ b/src/core/hle/service/ir/ir.h @@ -8,13 +8,11 @@ namespace SM { class ServiceManager; } -namespace Service { -namespace IR { +namespace Service::IR { /// Reload input devices. Used when input configuration changed void ReloadInputDevices(); void InstallInterfaces(SM::ServiceManager& service_manager); -} // namespace IR -} // namespace Service +} // namespace Service::IR diff --git a/src/core/hle/service/ir/ir_rst.cpp b/src/core/hle/service/ir/ir_rst.cpp index 587487373..3dbf04722 100644 --- a/src/core/hle/service/ir/ir_rst.cpp +++ b/src/core/hle/service/ir/ir_rst.cpp @@ -11,8 +11,7 @@ #include "core/movie.h" #include "core/settings.h" -namespace Service { -namespace IR { +namespace Service::IR { struct PadDataEntry { PadState current_state; @@ -174,5 +173,4 @@ void IR_RST::ReloadInputDevices() { is_device_reload_pending.store(true); } -} // namespace IR -} // namespace Service +} // namespace Service::IR diff --git a/src/core/hle/service/ir/ir_rst.h b/src/core/hle/service/ir/ir_rst.h index 7aacb7be2..0ba5ea8f7 100644 --- a/src/core/hle/service/ir/ir_rst.h +++ b/src/core/hle/service/ir/ir_rst.h @@ -22,8 +22,7 @@ namespace CoreTiming { struct EventType; }; -namespace Service { -namespace IR { +namespace Service::IR { union PadState { u32_le hex{}; @@ -90,5 +89,4 @@ private: int update_period{0}; }; -} // namespace IR -} // namespace Service +} // namespace Service::IR diff --git a/src/core/hle/service/ir/ir_u.cpp b/src/core/hle/service/ir/ir_u.cpp index 23ccbf33f..d76323e91 100644 --- a/src/core/hle/service/ir/ir_u.cpp +++ b/src/core/hle/service/ir/ir_u.cpp @@ -4,8 +4,7 @@ #include "core/hle/service/ir/ir_u.h" -namespace Service { -namespace IR { +namespace Service::IR { IR_U::IR_U() : ServiceFramework("ir:u", 1) { static const FunctionInfo functions[] = { @@ -31,5 +30,4 @@ IR_U::IR_U() : ServiceFramework("ir:u", 1) { RegisterHandlers(functions); } -} // namespace IR -} // namespace Service +} // namespace Service::IR diff --git a/src/core/hle/service/ir/ir_u.h b/src/core/hle/service/ir/ir_u.h index 16c117fea..ea150b082 100644 --- a/src/core/hle/service/ir/ir_u.h +++ b/src/core/hle/service/ir/ir_u.h @@ -6,8 +6,7 @@ #include "core/hle/service/service.h" -namespace Service { -namespace IR { +namespace Service::IR { /// Interface to "ir:u" service class IR_U final : public ServiceFramework { @@ -15,5 +14,4 @@ public: IR_U(); }; -} // namespace IR -} // namespace Service +} // namespace Service::IR diff --git a/src/core/hle/service/ir/ir_user.cpp b/src/core/hle/service/ir/ir_user.cpp index 65ccb6171..2edf11c48 100644 --- a/src/core/hle/service/ir/ir_user.cpp +++ b/src/core/hle/service/ir/ir_user.cpp @@ -12,8 +12,7 @@ #include "core/hle/service/ir/extra_hid.h" #include "core/hle/service/ir/ir_user.h" -namespace Service { -namespace IR { +namespace Service::IR { // This is a header that will present in the ir:USER shared memory if it is initialized with // InitializeIrNopShared service function. Otherwise the shared memory doesn't have this header if @@ -439,5 +438,4 @@ void IRDevice::Send(const std::vector& data) { send_func(data); } -} // namespace IR -} // namespace Service +} // namespace Service::IR diff --git a/src/core/hle/service/ir/ir_user.h b/src/core/hle/service/ir/ir_user.h index f2f0123dc..207a54058 100644 --- a/src/core/hle/service/ir/ir_user.h +++ b/src/core/hle/service/ir/ir_user.h @@ -18,8 +18,7 @@ namespace CoreTiming { struct EventType; }; -namespace Service { -namespace IR { +namespace Service::IR { class BufferManager; class ExtraHID; @@ -174,5 +173,4 @@ private: std::unique_ptr extra_hid; }; -} // namespace IR -} // namespace Service +} // namespace Service::IR diff --git a/src/core/hle/service/ldr_ro/cro_helper.cpp b/src/core/hle/service/ldr_ro/cro_helper.cpp index 272f1b027..cd6995c3c 100644 --- a/src/core/hle/service/ldr_ro/cro_helper.cpp +++ b/src/core/hle/service/ldr_ro/cro_helper.cpp @@ -9,8 +9,7 @@ #include "core/core.h" #include "core/hle/service/ldr_ro/cro_helper.h" -namespace Service { -namespace LDR { +namespace Service::LDR { static const ResultCode ERROR_BUFFER_TOO_SMALL = // 0xE0E12C1F ResultCode(static_cast(31), ErrorModule::RO, ErrorSummary::InvalidArgument, @@ -1514,5 +1513,4 @@ std::tuple CROHelper::GetExecutablePages() const { return std::make_tuple(0, 0); } -} // namespace LDR -} // namespace Service +} // namespace Service::LDR diff --git a/src/core/hle/service/ldr_ro/cro_helper.h b/src/core/hle/service/ldr_ro/cro_helper.h index dc14039fb..cac8d97a3 100644 --- a/src/core/hle/service/ldr_ro/cro_helper.h +++ b/src/core/hle/service/ldr_ro/cro_helper.h @@ -11,8 +11,7 @@ #include "core/hle/result.h" #include "core/memory.h" -namespace Service { -namespace LDR { +namespace Service::LDR { // GCC versions < 5.0 do not implement std::is_trivially_copyable. // Excluding MSVC because it has weird behaviour for std::is_trivially_copyable. @@ -711,5 +710,4 @@ private: ResultCode ApplyExitRelocations(VAddr crs_address); }; -} // namespace LDR -} // namespace Service +} // namespace Service::LDR diff --git a/src/core/hle/service/ldr_ro/ldr_ro.cpp b/src/core/hle/service/ldr_ro/ldr_ro.cpp index fdb7b0fdf..07cf68cc8 100644 --- a/src/core/hle/service/ldr_ro/ldr_ro.cpp +++ b/src/core/hle/service/ldr_ro/ldr_ro.cpp @@ -12,8 +12,7 @@ #include "core/hle/service/ldr_ro/cro_helper.h" #include "core/hle/service/ldr_ro/ldr_ro.h" -namespace Service { -namespace LDR { +namespace Service::LDR { static const ResultCode ERROR_ALREADY_INITIALIZED = // 0xD9612FF9 ResultCode(ErrorDescription::AlreadyInitialized, ErrorModule::RO, ErrorSummary::Internal, @@ -591,5 +590,4 @@ void InstallInterfaces(SM::ServiceManager& service_manager) { std::make_shared()->InstallAsService(service_manager); } -} // namespace LDR -} // namespace Service +} // namespace Service::LDR diff --git a/src/core/hle/service/ldr_ro/ldr_ro.h b/src/core/hle/service/ldr_ro/ldr_ro.h index 92417dfb4..4d3fd5c91 100644 --- a/src/core/hle/service/ldr_ro/ldr_ro.h +++ b/src/core/hle/service/ldr_ro/ldr_ro.h @@ -7,8 +7,7 @@ #include "core/hle/service/ldr_ro/memory_synchronizer.h" #include "core/hle/service/service.h" -namespace Service { -namespace LDR { +namespace Service::LDR { struct ClientSlot : public Kernel::SessionRequestHandler::SessionDataBase { MemorySynchronizer memory_synchronizer; @@ -152,5 +151,4 @@ private: void InstallInterfaces(SM::ServiceManager& service_manager); -} // namespace LDR -} // namespace Service +} // namespace Service::LDR diff --git a/src/core/hle/service/ldr_ro/memory_synchronizer.cpp b/src/core/hle/service/ldr_ro/memory_synchronizer.cpp index 9fd44088a..78817f8bc 100644 --- a/src/core/hle/service/ldr_ro/memory_synchronizer.cpp +++ b/src/core/hle/service/ldr_ro/memory_synchronizer.cpp @@ -7,8 +7,7 @@ #include "core/hle/kernel/process.h" #include "core/hle/service/ldr_ro/memory_synchronizer.h" -namespace Service { -namespace LDR { +namespace Service::LDR { auto MemorySynchronizer::FindMemoryBlock(VAddr mapping, VAddr original) { auto block = std::find_if(memory_blocks.begin(), memory_blocks.end(), @@ -39,5 +38,4 @@ void MemorySynchronizer::SynchronizeOriginalMemory(Kernel::Process& process) { } } -} // namespace LDR -} // namespace Service +} // namespace Service::LDR diff --git a/src/core/hle/service/ldr_ro/memory_synchronizer.h b/src/core/hle/service/ldr_ro/memory_synchronizer.h index 2634406ba..0b8bafdb4 100644 --- a/src/core/hle/service/ldr_ro/memory_synchronizer.h +++ b/src/core/hle/service/ldr_ro/memory_synchronizer.h @@ -11,8 +11,7 @@ namespace Kernel { class Process; } -namespace Service { -namespace LDR { +namespace Service::LDR { /** * This is a work-around before we implement memory aliasing. @@ -42,5 +41,4 @@ private: auto FindMemoryBlock(VAddr mapping, VAddr original); }; -} // namespace LDR -} // namespace Service +} // namespace Service::LDR diff --git a/src/core/hle/service/mic_u.cpp b/src/core/hle/service/mic_u.cpp index 4e07abe70..096d4c862 100644 --- a/src/core/hle/service/mic_u.cpp +++ b/src/core/hle/service/mic_u.cpp @@ -11,8 +11,7 @@ #include "core/hle/kernel/shared_memory.h" #include "core/hle/service/mic_u.h" -namespace Service { -namespace MIC { +namespace Service::MIC { enum class Encoding : u8 { PCM8 = 0, @@ -295,5 +294,4 @@ void InstallInterfaces(SM::ServiceManager& service_manager) { std::make_shared()->InstallAsService(service_manager); } -} // namespace MIC -} // namespace Service +} // namespace Service::MIC diff --git a/src/core/hle/service/mic_u.h b/src/core/hle/service/mic_u.h index cd444a841..2f46a277e 100644 --- a/src/core/hle/service/mic_u.h +++ b/src/core/hle/service/mic_u.h @@ -8,8 +8,7 @@ #include "core/hle/service/service.h" -namespace Service { -namespace MIC { +namespace Service::MIC { class MIC_U final : public ServiceFramework { public: @@ -189,5 +188,4 @@ private: void InstallInterfaces(SM::ServiceManager& service_manager); -} // namespace MIC -} // namespace Service +} // namespace Service::MIC diff --git a/src/core/hle/service/mvd/mvd.cpp b/src/core/hle/service/mvd/mvd.cpp index 38096904a..d62e267f2 100644 --- a/src/core/hle/service/mvd/mvd.cpp +++ b/src/core/hle/service/mvd/mvd.cpp @@ -5,12 +5,10 @@ #include "core/hle/service/mvd/mvd.h" #include "core/hle/service/mvd/mvd_std.h" -namespace Service { -namespace MVD { +namespace Service::MVD { void InstallInterfaces(SM::ServiceManager& service_manager) { std::make_shared()->InstallAsService(service_manager); } -} // namespace MVD -} // namespace Service +} // namespace Service::MVD diff --git a/src/core/hle/service/mvd/mvd.h b/src/core/hle/service/mvd/mvd.h index b50e243cd..dc2a6632c 100644 --- a/src/core/hle/service/mvd/mvd.h +++ b/src/core/hle/service/mvd/mvd.h @@ -6,11 +6,9 @@ #include "core/hle/service/service.h" -namespace Service { -namespace MVD { +namespace Service::MVD { /// Initializes all MVD services. void InstallInterfaces(SM::ServiceManager& service_manager); -} // namespace MVD -} // namespace Service +} // namespace Service::MVD diff --git a/src/core/hle/service/mvd/mvd_std.cpp b/src/core/hle/service/mvd/mvd_std.cpp index 09a8953a3..2c397f2dd 100644 --- a/src/core/hle/service/mvd/mvd_std.cpp +++ b/src/core/hle/service/mvd/mvd_std.cpp @@ -5,8 +5,7 @@ #include "core/hle/ipc_helpers.h" #include "core/hle/service/mvd/mvd_std.h" -namespace Service { -namespace MVD { +namespace Service::MVD { MVD_STD::MVD_STD() : ServiceFramework("mvd:std", 1) { static const FunctionInfo functions[] = { @@ -29,5 +28,4 @@ MVD_STD::MVD_STD() : ServiceFramework("mvd:std", 1) { RegisterHandlers(functions); }; -} // namespace MVD -} // namespace Service +} // namespace Service::MVD diff --git a/src/core/hle/service/mvd/mvd_std.h b/src/core/hle/service/mvd/mvd_std.h index 02a1b46b1..6764f6ba8 100644 --- a/src/core/hle/service/mvd/mvd_std.h +++ b/src/core/hle/service/mvd/mvd_std.h @@ -6,8 +6,7 @@ #include "core/hle/service/service.h" -namespace Service { -namespace MVD { +namespace Service::MVD { class MVD_STD final : public ServiceFramework { public: @@ -15,5 +14,4 @@ public: ~MVD_STD() = default; }; -} // namespace MVD -} // namespace Service +} // namespace Service::MVD diff --git a/src/core/hle/service/ndm/ndm_u.cpp b/src/core/hle/service/ndm/ndm_u.cpp index 73282cb36..7e2ed79ea 100644 --- a/src/core/hle/service/ndm/ndm_u.cpp +++ b/src/core/hle/service/ndm/ndm_u.cpp @@ -5,8 +5,7 @@ #include "core/hle/ipc_helpers.h" #include "core/hle/service/ndm/ndm_u.h" -namespace Service { -namespace NDM { +namespace Service::NDM { void NDM_U::EnterExclusiveState(Kernel::HLERequestContext& ctx) { IPC::RequestParser rp(ctx, 0x01, 1, 2); @@ -241,5 +240,4 @@ void InstallInterfaces(SM::ServiceManager& service_manager) { std::make_shared()->InstallAsService(service_manager); } -} // namespace NDM -} // namespace Service +} // namespace Service::NDM diff --git a/src/core/hle/service/ndm/ndm_u.h b/src/core/hle/service/ndm/ndm_u.h index cfac12620..ff348b9f6 100644 --- a/src/core/hle/service/ndm/ndm_u.h +++ b/src/core/hle/service/ndm/ndm_u.h @@ -7,8 +7,7 @@ #include #include "core/hle/service/service.h" -namespace Service { -namespace NDM { +namespace Service::NDM { class NDM_U final : public ServiceFramework { public: @@ -271,5 +270,4 @@ private: void InstallInterfaces(SM::ServiceManager& service_manager); -} // namespace NDM -} // namespace Service +} // namespace Service::NDM diff --git a/src/core/hle/service/news/news.cpp b/src/core/hle/service/news/news.cpp index 51304b013..b4cb7c8cf 100644 --- a/src/core/hle/service/news/news.cpp +++ b/src/core/hle/service/news/news.cpp @@ -7,14 +7,11 @@ #include "core/hle/service/news/news_u.h" #include "core/hle/service/service.h" -namespace Service { -namespace NEWS { +namespace Service::NEWS { void InstallInterfaces(SM::ServiceManager& service_manager) { std::make_shared()->InstallAsService(service_manager); std::make_shared()->InstallAsService(service_manager); } -} // namespace NEWS - -} // namespace Service +} // namespace Service::NEWS diff --git a/src/core/hle/service/news/news.h b/src/core/hle/service/news/news.h index 35308369e..f7afc5226 100644 --- a/src/core/hle/service/news/news.h +++ b/src/core/hle/service/news/news.h @@ -4,10 +4,8 @@ #pragma once -namespace Service { -namespace NEWS { +namespace Service::NEWS { void InstallInterfaces(SM::ServiceManager& service_manager); -} // namespace NEWS -} // namespace Service +} // namespace Service::NEWS diff --git a/src/core/hle/service/news/news_s.cpp b/src/core/hle/service/news/news_s.cpp index 1949a22f0..17eaa5ea8 100644 --- a/src/core/hle/service/news/news_s.cpp +++ b/src/core/hle/service/news/news_s.cpp @@ -5,8 +5,7 @@ #include "core/hle/ipc_helpers.h" #include "core/hle/service/news/news_s.h" -namespace Service { -namespace NEWS { +namespace Service::NEWS { void NEWS_S::GetTotalNotifications(Kernel::HLERequestContext& ctx) { IPC::RequestParser rp(ctx, 0x5, 0, 0); @@ -38,5 +37,4 @@ NEWS_S::NEWS_S() : ServiceFramework("news:s", 2) { RegisterHandlers(functions); } -} // namespace NEWS -} // namespace Service +} // namespace Service::NEWS diff --git a/src/core/hle/service/news/news_s.h b/src/core/hle/service/news/news_s.h index 890aa1f01..e4673d22c 100644 --- a/src/core/hle/service/news/news_s.h +++ b/src/core/hle/service/news/news_s.h @@ -7,8 +7,7 @@ #include #include "core/hle/service/service.h" -namespace Service { -namespace NEWS { +namespace Service::NEWS { class NEWS_S final : public ServiceFramework { public: @@ -27,5 +26,4 @@ private: void GetTotalNotifications(Kernel::HLERequestContext& ctx); }; -} // namespace NEWS -} // namespace Service +} // namespace Service::NEWS diff --git a/src/core/hle/service/news/news_u.cpp b/src/core/hle/service/news/news_u.cpp index af8a06e36..3d6e87f91 100644 --- a/src/core/hle/service/news/news_u.cpp +++ b/src/core/hle/service/news/news_u.cpp @@ -4,8 +4,7 @@ #include "core/hle/service/news/news_u.h" -namespace Service { -namespace NEWS { +namespace Service::NEWS { NEWS_U::NEWS_U() : ServiceFramework("news:u", 1) { const FunctionInfo functions[] = { @@ -14,5 +13,4 @@ NEWS_U::NEWS_U() : ServiceFramework("news:u", 1) { RegisterHandlers(functions); } -} // namespace NEWS -} // namespace Service +} // namespace Service::NEWS diff --git a/src/core/hle/service/news/news_u.h b/src/core/hle/service/news/news_u.h index d78648e44..cb06bad39 100644 --- a/src/core/hle/service/news/news_u.h +++ b/src/core/hle/service/news/news_u.h @@ -7,13 +7,11 @@ #include #include "core/hle/service/service.h" -namespace Service { -namespace NEWS { +namespace Service::NEWS { class NEWS_U final : public ServiceFramework { public: NEWS_U(); }; -} // namespace NEWS -} // namespace Service +} // namespace Service::NEWS diff --git a/src/core/hle/service/nfc/nfc.cpp b/src/core/hle/service/nfc/nfc.cpp index 5357f0970..40399382a 100644 --- a/src/core/hle/service/nfc/nfc.cpp +++ b/src/core/hle/service/nfc/nfc.cpp @@ -8,8 +8,7 @@ #include "core/hle/service/nfc/nfc_m.h" #include "core/hle/service/nfc/nfc_u.h" -namespace Service { -namespace NFC { +namespace Service::NFC { void Module::Interface::Initialize(Kernel::HLERequestContext& ctx) { IPC::RequestParser rp(ctx, 0x01, 1, 0); @@ -155,5 +154,4 @@ void InstallInterfaces(SM::ServiceManager& service_manager) { std::make_shared(nfc)->InstallAsService(service_manager); } -} // namespace NFC -} // namespace Service +} // namespace Service::NFC diff --git a/src/core/hle/service/nfc/nfc.h b/src/core/hle/service/nfc/nfc.h index 89530706d..af296662a 100644 --- a/src/core/hle/service/nfc/nfc.h +++ b/src/core/hle/service/nfc/nfc.h @@ -13,8 +13,7 @@ namespace Kernel { class Event; } // namespace Kernel -namespace Service { -namespace NFC { +namespace Service::NFC { namespace ErrCodes { enum { @@ -177,5 +176,4 @@ private: void InstallInterfaces(SM::ServiceManager& service_manager); -} // namespace NFC -} // namespace Service +} // namespace Service::NFC diff --git a/src/core/hle/service/nfc/nfc_m.cpp b/src/core/hle/service/nfc/nfc_m.cpp index 032bda0d6..d91b6a31a 100644 --- a/src/core/hle/service/nfc/nfc_m.cpp +++ b/src/core/hle/service/nfc/nfc_m.cpp @@ -4,8 +4,7 @@ #include "core/hle/service/nfc/nfc_m.h" -namespace Service { -namespace NFC { +namespace Service::NFC { NFC_M::NFC_M(std::shared_ptr nfc) : Module::Interface(std::move(nfc), "nfc:m", 1) { static const FunctionInfo functions[] = { @@ -41,5 +40,4 @@ NFC_M::NFC_M(std::shared_ptr nfc) : Module::Interface(std::move(nfc), "n RegisterHandlers(functions); } -} // namespace NFC -} // namespace Service +} // namespace Service::NFC diff --git a/src/core/hle/service/nfc/nfc_m.h b/src/core/hle/service/nfc/nfc_m.h index 207b7b263..c9fe9b130 100644 --- a/src/core/hle/service/nfc/nfc_m.h +++ b/src/core/hle/service/nfc/nfc_m.h @@ -6,13 +6,11 @@ #include "core/hle/service/nfc/nfc.h" -namespace Service { -namespace NFC { +namespace Service::NFC { class NFC_M final : public Module::Interface { public: explicit NFC_M(std::shared_ptr nfc); }; -} // namespace NFC -} // namespace Service +} // namespace Service::NFC diff --git a/src/core/hle/service/nfc/nfc_u.cpp b/src/core/hle/service/nfc/nfc_u.cpp index ff1310749..8cdcca287 100644 --- a/src/core/hle/service/nfc/nfc_u.cpp +++ b/src/core/hle/service/nfc/nfc_u.cpp @@ -4,8 +4,7 @@ #include "core/hle/service/nfc/nfc_u.h" -namespace Service { -namespace NFC { +namespace Service::NFC { NFC_U::NFC_U(std::shared_ptr nfc) : Module::Interface(std::move(nfc), "nfc:u", 1) { static const FunctionInfo functions[] = { @@ -38,5 +37,4 @@ NFC_U::NFC_U(std::shared_ptr nfc) : Module::Interface(std::move(nfc), "n RegisterHandlers(functions); } -} // namespace NFC -} // namespace Service +} // namespace Service::NFC diff --git a/src/core/hle/service/nfc/nfc_u.h b/src/core/hle/service/nfc/nfc_u.h index ef23c6763..aab408269 100644 --- a/src/core/hle/service/nfc/nfc_u.h +++ b/src/core/hle/service/nfc/nfc_u.h @@ -6,13 +6,11 @@ #include "core/hle/service/nfc/nfc.h" -namespace Service { -namespace NFC { +namespace Service::NFC { class NFC_U final : public Module::Interface { public: explicit NFC_U(std::shared_ptr nfc); }; -} // namespace NFC -} // namespace Service +} // namespace Service::NFC diff --git a/src/core/hle/service/nim/nim.cpp b/src/core/hle/service/nim/nim.cpp index f8d745fb4..9d393f59f 100644 --- a/src/core/hle/service/nim/nim.cpp +++ b/src/core/hle/service/nim/nim.cpp @@ -7,8 +7,7 @@ #include "core/hle/service/nim/nim_s.h" #include "core/hle/service/nim/nim_u.h" -namespace Service { -namespace NIM { +namespace Service::NIM { void InstallInterfaces(SM::ServiceManager& service_manager) { std::make_shared()->InstallAsService(service_manager); @@ -16,6 +15,4 @@ void InstallInterfaces(SM::ServiceManager& service_manager) { std::make_shared()->InstallAsService(service_manager); } -} // namespace NIM - -} // namespace Service +} // namespace Service::NIM diff --git a/src/core/hle/service/nim/nim.h b/src/core/hle/service/nim/nim.h index 4182d0361..ec118ff6d 100644 --- a/src/core/hle/service/nim/nim.h +++ b/src/core/hle/service/nim/nim.h @@ -6,10 +6,8 @@ #include "core/hle/service/service.h" -namespace Service { -namespace NIM { +namespace Service::NIM { void InstallInterfaces(SM::ServiceManager& service_manager); -} // namespace NIM -} // namespace Service +} // namespace Service::NIM diff --git a/src/core/hle/service/nim/nim_aoc.cpp b/src/core/hle/service/nim/nim_aoc.cpp index ffee9c5e1..ddd8d5e03 100644 --- a/src/core/hle/service/nim/nim_aoc.cpp +++ b/src/core/hle/service/nim/nim_aoc.cpp @@ -4,8 +4,7 @@ #include "core/hle/service/nim/nim_aoc.h" -namespace Service { -namespace NIM { +namespace Service::NIM { NIM_AOC::NIM_AOC() : ServiceFramework("nim:aoc", 2) { const FunctionInfo functions[] = { @@ -23,5 +22,4 @@ NIM_AOC::NIM_AOC() : ServiceFramework("nim:aoc", 2) { NIM_AOC::~NIM_AOC() = default; -} // namespace NIM -} // namespace Service +} // namespace Service::NIM diff --git a/src/core/hle/service/nim/nim_aoc.h b/src/core/hle/service/nim/nim_aoc.h index dc6fcec1c..5a1f518ec 100644 --- a/src/core/hle/service/nim/nim_aoc.h +++ b/src/core/hle/service/nim/nim_aoc.h @@ -6,8 +6,7 @@ #include "core/hle/service/service.h" -namespace Service { -namespace NIM { +namespace Service::NIM { class NIM_AOC final : public ServiceFramework { public: @@ -15,5 +14,4 @@ public: ~NIM_AOC(); }; -} // namespace NIM -} // namespace Service +} // namespace Service::NIM diff --git a/src/core/hle/service/nim/nim_s.cpp b/src/core/hle/service/nim/nim_s.cpp index b0acc1937..d7236249f 100644 --- a/src/core/hle/service/nim/nim_s.cpp +++ b/src/core/hle/service/nim/nim_s.cpp @@ -4,8 +4,7 @@ #include "core/hle/service/nim/nim_s.h" -namespace Service { -namespace NIM { +namespace Service::NIM { NIM_S::NIM_S() : ServiceFramework("nim:s", 1) { const FunctionInfo functions[] = { @@ -20,5 +19,4 @@ NIM_S::NIM_S() : ServiceFramework("nim:s", 1) { NIM_S::~NIM_S() = default; -} // namespace NIM -} // namespace Service +} // namespace Service::NIM diff --git a/src/core/hle/service/nim/nim_s.h b/src/core/hle/service/nim/nim_s.h index bbcd40b5c..6485cde18 100644 --- a/src/core/hle/service/nim/nim_s.h +++ b/src/core/hle/service/nim/nim_s.h @@ -6,8 +6,7 @@ #include "core/hle/service/service.h" -namespace Service { -namespace NIM { +namespace Service::NIM { class NIM_S final : public ServiceFramework { public: @@ -15,5 +14,4 @@ public: ~NIM_S(); }; -} // namespace NIM -} // namespace Service +} // namespace Service::NIM diff --git a/src/core/hle/service/nim/nim_u.cpp b/src/core/hle/service/nim/nim_u.cpp index 5a7a2bafb..acf29cfe0 100644 --- a/src/core/hle/service/nim/nim_u.cpp +++ b/src/core/hle/service/nim/nim_u.cpp @@ -6,8 +6,7 @@ #include "core/hle/kernel/event.h" #include "core/hle/service/nim/nim_u.h" -namespace Service { -namespace NIM { +namespace Service::NIM { NIM_U::NIM_U() : ServiceFramework("nim:u", 2) { const FunctionInfo functions[] = { @@ -44,5 +43,4 @@ void NIM_U::CheckSysUpdateAvailable(Kernel::HLERequestContext& ctx) { LOG_WARNING(Service_NIM, "(STUBBED) called"); } -} // namespace NIM -} // namespace Service +} // namespace Service::NIM diff --git a/src/core/hle/service/nim/nim_u.h b/src/core/hle/service/nim/nim_u.h index 7dd8ea087..610688fc2 100644 --- a/src/core/hle/service/nim/nim_u.h +++ b/src/core/hle/service/nim/nim_u.h @@ -6,8 +6,7 @@ #include "core/hle/service/service.h" -namespace Service { -namespace NIM { +namespace Service::NIM { class NIM_U final : public ServiceFramework { public: @@ -39,5 +38,4 @@ private: Kernel::SharedPtr nim_system_update_event; }; -} // namespace NIM -} // namespace Service +} // namespace Service::NIM diff --git a/src/core/hle/service/ns/ns.cpp b/src/core/hle/service/ns/ns.cpp index 7e7ab9d21..1ea1f6615 100644 --- a/src/core/hle/service/ns/ns.cpp +++ b/src/core/hle/service/ns/ns.cpp @@ -8,8 +8,7 @@ #include "core/hle/service/ns/ns_s.h" #include "core/loader/loader.h" -namespace Service { -namespace NS { +namespace Service::NS { Kernel::SharedPtr LaunchTitle(FS::MediaType media_type, u64 title_id) { std::string path = AM::GetTitleContentPath(media_type, title_id); @@ -35,5 +34,4 @@ void InstallInterfaces(SM::ServiceManager& service_manager) { std::make_shared()->InstallAsService(service_manager); } -} // namespace NS -} // namespace Service +} // namespace Service::NS diff --git a/src/core/hle/service/ns/ns.h b/src/core/hle/service/ns/ns.h index 035d21a4c..3175cb74f 100644 --- a/src/core/hle/service/ns/ns.h +++ b/src/core/hle/service/ns/ns.h @@ -8,8 +8,7 @@ #include "core/hle/service/fs/archive.h" #include "core/hle/service/service.h" -namespace Service { -namespace NS { +namespace Service::NS { /// Loads and launches the title identified by title_id in the specified media type. Kernel::SharedPtr LaunchTitle(FS::MediaType media_type, u64 title_id); @@ -17,5 +16,4 @@ Kernel::SharedPtr LaunchTitle(FS::MediaType media_type, u64 tit /// Registers all NS services with the specified service manager. void InstallInterfaces(SM::ServiceManager& service_manager); -} // namespace NS -} // namespace Service +} // namespace Service::NS diff --git a/src/core/hle/service/ns/ns_s.cpp b/src/core/hle/service/ns/ns_s.cpp index d952888dc..1709e8bd2 100644 --- a/src/core/hle/service/ns/ns_s.cpp +++ b/src/core/hle/service/ns/ns_s.cpp @@ -4,8 +4,7 @@ #include "core/hle/service/ns/ns_s.h" -namespace Service { -namespace NS { +namespace Service::NS { NS_S::NS_S() : ServiceFramework("ns:s", 2) { static const FunctionInfo functions[] = { @@ -30,5 +29,4 @@ NS_S::NS_S() : ServiceFramework("ns:s", 2) { NS_S::~NS_S() = default; -} // namespace NS -} // namespace Service +} // namespace Service::NS diff --git a/src/core/hle/service/ns/ns_s.h b/src/core/hle/service/ns/ns_s.h index 660ae453f..cc8cdb57a 100644 --- a/src/core/hle/service/ns/ns_s.h +++ b/src/core/hle/service/ns/ns_s.h @@ -7,8 +7,7 @@ #include "core/hle/kernel/kernel.h" #include "core/hle/service/service.h" -namespace Service { -namespace NS { +namespace Service::NS { /// Interface to "ns:s" service class NS_S final : public ServiceFramework { @@ -17,5 +16,4 @@ public: ~NS_S(); }; -} // namespace NS -} // namespace Service +} // namespace Service::NS diff --git a/src/core/hle/service/nwm/nwm.cpp b/src/core/hle/service/nwm/nwm.cpp index a9b198281..8b1fa2b89 100644 --- a/src/core/hle/service/nwm/nwm.cpp +++ b/src/core/hle/service/nwm/nwm.cpp @@ -11,8 +11,7 @@ #include "core/hle/service/nwm/nwm_tst.h" #include "core/hle/service/nwm/nwm_uds.h" -namespace Service { -namespace NWM { +namespace Service::NWM { void InstallInterfaces(SM::ServiceManager& service_manager) { std::make_shared()->InstallAsService(service_manager); @@ -24,5 +23,4 @@ void InstallInterfaces(SM::ServiceManager& service_manager) { std::make_shared()->InstallAsService(service_manager); } -} // namespace NWM -} // namespace Service +} // namespace Service::NWM diff --git a/src/core/hle/service/nwm/nwm.h b/src/core/hle/service/nwm/nwm.h index a5e9ba205..b0e95621f 100644 --- a/src/core/hle/service/nwm/nwm.h +++ b/src/core/hle/service/nwm/nwm.h @@ -6,11 +6,9 @@ #include "core/hle/service/service.h" -namespace Service { -namespace NWM { +namespace Service::NWM { /// Initialize all NWM services void InstallInterfaces(SM::ServiceManager& service_manager); -} // namespace NWM -} // namespace Service +} // namespace Service::NWM diff --git a/src/core/hle/service/nwm/nwm_cec.cpp b/src/core/hle/service/nwm/nwm_cec.cpp index df778f667..7c47c88c7 100644 --- a/src/core/hle/service/nwm/nwm_cec.cpp +++ b/src/core/hle/service/nwm/nwm_cec.cpp @@ -4,8 +4,7 @@ #include "core/hle/service/nwm/nwm_cec.h" -namespace Service { -namespace NWM { +namespace Service::NWM { NWM_CEC::NWM_CEC() : ServiceFramework("nwm::CEC") { static const FunctionInfo functions[] = { @@ -14,5 +13,4 @@ NWM_CEC::NWM_CEC() : ServiceFramework("nwm::CEC") { RegisterHandlers(functions); } -} // namespace NWM -} // namespace Service +} // namespace Service::NWM diff --git a/src/core/hle/service/nwm/nwm_cec.h b/src/core/hle/service/nwm/nwm_cec.h index db1825b1f..afdf98477 100644 --- a/src/core/hle/service/nwm/nwm_cec.h +++ b/src/core/hle/service/nwm/nwm_cec.h @@ -6,13 +6,11 @@ #include "core/hle/service/service.h" -namespace Service { -namespace NWM { +namespace Service::NWM { class NWM_CEC final : public ServiceFramework { public: NWM_CEC(); }; -} // namespace NWM -} // namespace Service +} // namespace Service::NWM diff --git a/src/core/hle/service/nwm/nwm_ext.cpp b/src/core/hle/service/nwm/nwm_ext.cpp index fd3903a22..4bbac391f 100644 --- a/src/core/hle/service/nwm/nwm_ext.cpp +++ b/src/core/hle/service/nwm/nwm_ext.cpp @@ -4,8 +4,7 @@ #include "core/hle/service/nwm/nwm_ext.h" -namespace Service { -namespace NWM { +namespace Service::NWM { NWM_EXT::NWM_EXT() : ServiceFramework("nwm::EXT") { static const FunctionInfo functions[] = { @@ -14,5 +13,4 @@ NWM_EXT::NWM_EXT() : ServiceFramework("nwm::EXT") { RegisterHandlers(functions); } -} // namespace NWM -} // namespace Service +} // namespace Service::NWM diff --git a/src/core/hle/service/nwm/nwm_ext.h b/src/core/hle/service/nwm/nwm_ext.h index ed15d18a2..1711db65a 100644 --- a/src/core/hle/service/nwm/nwm_ext.h +++ b/src/core/hle/service/nwm/nwm_ext.h @@ -6,13 +6,11 @@ #include "core/hle/service/service.h" -namespace Service { -namespace NWM { +namespace Service::NWM { class NWM_EXT final : public ServiceFramework { public: NWM_EXT(); }; -} // namespace NWM -} // namespace Service +} // namespace Service::NWM diff --git a/src/core/hle/service/nwm/nwm_inf.cpp b/src/core/hle/service/nwm/nwm_inf.cpp index 6663e100c..71cf11891 100644 --- a/src/core/hle/service/nwm/nwm_inf.cpp +++ b/src/core/hle/service/nwm/nwm_inf.cpp @@ -4,8 +4,7 @@ #include "core/hle/service/nwm/nwm_inf.h" -namespace Service { -namespace NWM { +namespace Service::NWM { NWM_INF::NWM_INF() : ServiceFramework("nwm::INF") { static const FunctionInfo functions[] = { @@ -16,5 +15,4 @@ NWM_INF::NWM_INF() : ServiceFramework("nwm::INF") { RegisterHandlers(functions); } -} // namespace NWM -} // namespace Service +} // namespace Service::NWM diff --git a/src/core/hle/service/nwm/nwm_inf.h b/src/core/hle/service/nwm/nwm_inf.h index 2fdbfbfcb..2c69cfb1e 100644 --- a/src/core/hle/service/nwm/nwm_inf.h +++ b/src/core/hle/service/nwm/nwm_inf.h @@ -6,13 +6,11 @@ #include "core/hle/service/service.h" -namespace Service { -namespace NWM { +namespace Service::NWM { class NWM_INF final : public ServiceFramework { public: NWM_INF(); }; -} // namespace NWM -} // namespace Service +} // namespace Service::NWM diff --git a/src/core/hle/service/nwm/nwm_sap.cpp b/src/core/hle/service/nwm/nwm_sap.cpp index 2621823df..2ef196ab4 100644 --- a/src/core/hle/service/nwm/nwm_sap.cpp +++ b/src/core/hle/service/nwm/nwm_sap.cpp @@ -4,8 +4,7 @@ #include "core/hle/service/nwm/nwm_sap.h" -namespace Service { -namespace NWM { +namespace Service::NWM { NWM_SAP::NWM_SAP() : ServiceFramework("nwm::SAP") { /* @@ -15,5 +14,4 @@ NWM_SAP::NWM_SAP() : ServiceFramework("nwm::SAP") { */ } -} // namespace NWM -} // namespace Service +} // namespace Service::NWM diff --git a/src/core/hle/service/nwm/nwm_sap.h b/src/core/hle/service/nwm/nwm_sap.h index ad163a585..b6700b8ed 100644 --- a/src/core/hle/service/nwm/nwm_sap.h +++ b/src/core/hle/service/nwm/nwm_sap.h @@ -6,13 +6,11 @@ #include "core/hle/service/service.h" -namespace Service { -namespace NWM { +namespace Service::NWM { class NWM_SAP final : public ServiceFramework { public: NWM_SAP(); }; -} // namespace NWM -} // namespace Service +} // namespace Service::NWM diff --git a/src/core/hle/service/nwm/nwm_soc.cpp b/src/core/hle/service/nwm/nwm_soc.cpp index eacc511cb..443baaf39 100644 --- a/src/core/hle/service/nwm/nwm_soc.cpp +++ b/src/core/hle/service/nwm/nwm_soc.cpp @@ -4,8 +4,7 @@ #include "core/hle/service/nwm/nwm_soc.h" -namespace Service { -namespace NWM { +namespace Service::NWM { NWM_SOC::NWM_SOC() : ServiceFramework("nwm::SOC") { /* @@ -15,5 +14,4 @@ NWM_SOC::NWM_SOC() : ServiceFramework("nwm::SOC") { */ } -} // namespace NWM -} // namespace Service +} // namespace Service::NWM diff --git a/src/core/hle/service/nwm/nwm_soc.h b/src/core/hle/service/nwm/nwm_soc.h index 38fd4ac1e..8e1b922bc 100644 --- a/src/core/hle/service/nwm/nwm_soc.h +++ b/src/core/hle/service/nwm/nwm_soc.h @@ -6,13 +6,11 @@ #include "core/hle/service/service.h" -namespace Service { -namespace NWM { +namespace Service::NWM { class NWM_SOC final : public ServiceFramework { public: NWM_SOC(); }; -} // namespace NWM -} // namespace Service +} // namespace Service::NWM diff --git a/src/core/hle/service/nwm/nwm_tst.cpp b/src/core/hle/service/nwm/nwm_tst.cpp index 33ef6f1cd..3be65200b 100644 --- a/src/core/hle/service/nwm/nwm_tst.cpp +++ b/src/core/hle/service/nwm/nwm_tst.cpp @@ -4,8 +4,7 @@ #include "core/hle/service/nwm/nwm_tst.h" -namespace Service { -namespace NWM { +namespace Service::NWM { NWM_TST::NWM_TST() : ServiceFramework("nwm::TST") { /* @@ -15,5 +14,4 @@ NWM_TST::NWM_TST() : ServiceFramework("nwm::TST") { */ } -} // namespace NWM -} // namespace Service +} // namespace Service::NWM diff --git a/src/core/hle/service/nwm/nwm_tst.h b/src/core/hle/service/nwm/nwm_tst.h index abbd56140..8214e0d1d 100644 --- a/src/core/hle/service/nwm/nwm_tst.h +++ b/src/core/hle/service/nwm/nwm_tst.h @@ -6,13 +6,11 @@ #include "core/hle/service/service.h" -namespace Service { -namespace NWM { +namespace Service::NWM { class NWM_TST final : public ServiceFramework { public: NWM_TST(); }; -} // namespace NWM -} // namespace Service +} // namespace Service::NWM diff --git a/src/core/hle/service/nwm/nwm_uds.cpp b/src/core/hle/service/nwm/nwm_uds.cpp index 8e0dfece9..1302e59d6 100644 --- a/src/core/hle/service/nwm/nwm_uds.cpp +++ b/src/core/hle/service/nwm/nwm_uds.cpp @@ -28,8 +28,7 @@ #include "core/memory.h" #include "network/network.h" -namespace Service { -namespace NWM { +namespace Service::NWM { namespace ErrCodes { enum { @@ -1359,5 +1358,4 @@ NWM_UDS::~NWM_UDS() { CoreTiming::UnscheduleEvent(beacon_broadcast_event, 0); } -} // namespace NWM -} // namespace Service +} // namespace Service::NWM diff --git a/src/core/hle/service/nwm/nwm_uds.h b/src/core/hle/service/nwm/nwm_uds.h index 6111c6995..d19bd4a1c 100644 --- a/src/core/hle/service/nwm/nwm_uds.h +++ b/src/core/hle/service/nwm/nwm_uds.h @@ -13,8 +13,7 @@ // Local-WLAN service -namespace Service { -namespace NWM { +namespace Service::NWM { const std::size_t ApplicationDataSize = 0xC8; const u8 DefaultNetworkChannel = 11; @@ -343,5 +342,4 @@ private: void DecryptBeaconData(Kernel::HLERequestContext& ctx); }; -} // namespace NWM -} // namespace Service +} // namespace Service::NWM diff --git a/src/core/hle/service/nwm/uds_beacon.cpp b/src/core/hle/service/nwm/uds_beacon.cpp index d616386ff..293506a0a 100644 --- a/src/core/hle/service/nwm/uds_beacon.cpp +++ b/src/core/hle/service/nwm/uds_beacon.cpp @@ -13,8 +13,7 @@ #include "core/hle/service/nwm/nwm_uds.h" #include "core/hle/service/nwm/uds_beacon.h" -namespace Service { -namespace NWM { +namespace Service::NWM { // 802.11 broadcast MAC address constexpr MacAddress BroadcastMac = {0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF}; @@ -328,5 +327,4 @@ std::vector GenerateBeaconFrame(const NetworkInfo& network_info, const NodeL return buffer; } -} // namespace NWM -} // namespace Service +} // namespace Service::NWM diff --git a/src/core/hle/service/nwm/uds_beacon.h b/src/core/hle/service/nwm/uds_beacon.h index e8743e954..f3749efb5 100644 --- a/src/core/hle/service/nwm/uds_beacon.h +++ b/src/core/hle/service/nwm/uds_beacon.h @@ -11,8 +11,7 @@ #include "common/swap.h" #include "core/hle/service/service.h" -namespace Service { -namespace NWM { +namespace Service::NWM { using MacAddress = std::array; constexpr std::array NintendoOUI = {0x00, 0x1F, 0x32}; @@ -136,5 +135,4 @@ void DecryptBeacon(const NetworkInfo& network_info, std::vector& buffer); */ std::vector GenerateBeaconFrame(const NetworkInfo& network_info, const NodeList& nodes); -} // namespace NWM -} // namespace Service +} // namespace Service::NWM diff --git a/src/core/hle/service/nwm/uds_connection.cpp b/src/core/hle/service/nwm/uds_connection.cpp index c74f51253..85123cf74 100644 --- a/src/core/hle/service/nwm/uds_connection.cpp +++ b/src/core/hle/service/nwm/uds_connection.cpp @@ -6,8 +6,7 @@ #include "core/hle/service/nwm/uds_connection.h" #include "fmt/format.h" -namespace Service { -namespace NWM { +namespace Service::NWM { // Note: These values were taken from a packet capture of an o3DS XL // broadcasting a Super Smash Bros. 4 lobby. @@ -84,5 +83,4 @@ std::tuple GetAssociationResult(const std::vector& body) { frame.assoc_id & AssociationIdMask); } -} // namespace NWM -} // namespace Service +} // namespace Service::NWM diff --git a/src/core/hle/service/nwm/uds_connection.h b/src/core/hle/service/nwm/uds_connection.h index a664f8471..27cfbf229 100644 --- a/src/core/hle/service/nwm/uds_connection.h +++ b/src/core/hle/service/nwm/uds_connection.h @@ -10,8 +10,7 @@ #include "common/swap.h" #include "core/hle/service/service.h" -namespace Service { -namespace NWM { +namespace Service::NWM { /// Sequence number of the 802.11 authentication frames. enum class AuthenticationSeq : u16 { SEQ1 = 1, SEQ2 = 2 }; @@ -52,5 +51,4 @@ std::vector GenerateAssocResponseFrame(AssocStatus status, u16 association_i /// frame. std::tuple GetAssociationResult(const std::vector& body); -} // namespace NWM -} // namespace Service +} // namespace Service::NWM diff --git a/src/core/hle/service/nwm/uds_data.cpp b/src/core/hle/service/nwm/uds_data.cpp index 1f227de6d..4a0bba647 100644 --- a/src/core/hle/service/nwm/uds_data.cpp +++ b/src/core/hle/service/nwm/uds_data.cpp @@ -15,8 +15,7 @@ #include "core/hle/service/nwm/uds_data.h" #include "core/hw/aes/key.h" -namespace Service { -namespace NWM { +namespace Service::NWM { using MacAddress = std::array; @@ -383,5 +382,4 @@ EAPoLLogoffPacket ParseEAPoLLogoffFrame(const std::vector& frame) { return eapol_logoff; } -} // namespace NWM -} // namespace Service +} // namespace Service::NWM diff --git a/src/core/hle/service/nwm/uds_data.h b/src/core/hle/service/nwm/uds_data.h index 59906f677..5f137c565 100644 --- a/src/core/hle/service/nwm/uds_data.h +++ b/src/core/hle/service/nwm/uds_data.h @@ -11,8 +11,7 @@ #include "core/hle/service/nwm/uds_beacon.h" #include "core/hle/service/service.h" -namespace Service { -namespace NWM { +namespace Service::NWM { enum class SAP : u8 { SNAPExtensionUsed = 0xAA }; @@ -169,5 +168,4 @@ std::vector GenerateEAPoLLogoffFrame(const MacAddress& mac_address, u16 netw */ EAPoLLogoffPacket ParseEAPoLLogoffFrame(const std::vector& frame); -} // namespace NWM -} // namespace Service +} // namespace Service::NWM diff --git a/src/core/hle/service/pm/pm.cpp b/src/core/hle/service/pm/pm.cpp index c79541921..fedf00efc 100644 --- a/src/core/hle/service/pm/pm.cpp +++ b/src/core/hle/service/pm/pm.cpp @@ -6,13 +6,11 @@ #include "core/hle/service/pm/pm_app.h" #include "core/hle/service/pm/pm_dbg.h" -namespace Service { -namespace PM { +namespace Service::PM { void InstallInterfaces(SM::ServiceManager& service_manager) { std::make_shared()->InstallAsService(service_manager); std::make_shared()->InstallAsService(service_manager); } -} // namespace PM -} // namespace Service +} // namespace Service::PM diff --git a/src/core/hle/service/pm/pm.h b/src/core/hle/service/pm/pm.h index 1d3474b0a..63f832598 100644 --- a/src/core/hle/service/pm/pm.h +++ b/src/core/hle/service/pm/pm.h @@ -6,11 +6,9 @@ #include "core/hle/service/service.h" -namespace Service { -namespace PM { +namespace Service::PM { /// Initializes the PM services. void InstallInterfaces(SM::ServiceManager& service_manager); -} // namespace PM -} // namespace Service +} // namespace Service::PM diff --git a/src/core/hle/service/pm/pm_app.cpp b/src/core/hle/service/pm/pm_app.cpp index 764d4c075..9599dfcfc 100644 --- a/src/core/hle/service/pm/pm_app.cpp +++ b/src/core/hle/service/pm/pm_app.cpp @@ -5,8 +5,7 @@ #include "core/hle/ipc_helpers.h" #include "core/hle/service/pm/pm_app.h" -namespace Service { -namespace PM { +namespace Service::PM { PM_APP::PM_APP() : ServiceFramework("pm:app", 3) { static const FunctionInfo functions[] = { @@ -30,5 +29,4 @@ PM_APP::PM_APP() : ServiceFramework("pm:app", 3) { RegisterHandlers(functions); } -} // namespace PM -} // namespace Service +} // namespace Service::PM diff --git a/src/core/hle/service/pm/pm_app.h b/src/core/hle/service/pm/pm_app.h index 4bd778166..8c7e375f0 100644 --- a/src/core/hle/service/pm/pm_app.h +++ b/src/core/hle/service/pm/pm_app.h @@ -6,8 +6,7 @@ #include "core/hle/service/service.h" -namespace Service { -namespace PM { +namespace Service::PM { class PM_APP final : public ServiceFramework { public: @@ -15,5 +14,4 @@ public: ~PM_APP() = default; }; -} // namespace PM -} // namespace Service +} // namespace Service::PM diff --git a/src/core/hle/service/pm/pm_dbg.cpp b/src/core/hle/service/pm/pm_dbg.cpp index b4889509d..63879ff20 100644 --- a/src/core/hle/service/pm/pm_dbg.cpp +++ b/src/core/hle/service/pm/pm_dbg.cpp @@ -5,8 +5,7 @@ #include "core/hle/ipc_helpers.h" #include "core/hle/service/pm/pm_dbg.h" -namespace Service { -namespace PM { +namespace Service::PM { PM_DBG::PM_DBG() : ServiceFramework("pm:dbg", 3) { static const FunctionInfo functions[] = { @@ -20,5 +19,4 @@ PM_DBG::PM_DBG() : ServiceFramework("pm:dbg", 3) { RegisterHandlers(functions); } -} // namespace PM -} // namespace Service +} // namespace Service::PM diff --git a/src/core/hle/service/pm/pm_dbg.h b/src/core/hle/service/pm/pm_dbg.h index 6fc118769..77b644969 100644 --- a/src/core/hle/service/pm/pm_dbg.h +++ b/src/core/hle/service/pm/pm_dbg.h @@ -6,8 +6,7 @@ #include "core/hle/service/service.h" -namespace Service { -namespace PM { +namespace Service::PM { class PM_DBG final : public ServiceFramework { public: @@ -15,5 +14,4 @@ public: ~PM_DBG() = default; }; -} // namespace PM -} // namespace Service +} // namespace Service::PM diff --git a/src/core/hle/service/ps/ps_ps.cpp b/src/core/hle/service/ps/ps_ps.cpp index 6f85d1966..62ddf9c12 100644 --- a/src/core/hle/service/ps/ps_ps.cpp +++ b/src/core/hle/service/ps/ps_ps.cpp @@ -5,8 +5,7 @@ #include "core/hle/ipc_helpers.h" #include "core/hle/service/ps/ps_ps.h" -namespace Service { -namespace PS { +namespace Service::PS { PS_PS::PS_PS() : ServiceFramework("ps:ps", DefaultMaxSessions) { static const FunctionInfo functions[] = { @@ -37,5 +36,4 @@ void InstallInterfaces(SM::ServiceManager& service_manager) { std::make_shared()->InstallAsService(service_manager); } -} // namespace PS -} // namespace Service +} // namespace Service::PS diff --git a/src/core/hle/service/ps/ps_ps.h b/src/core/hle/service/ps/ps_ps.h index 56363ae6c..09bf4f54c 100644 --- a/src/core/hle/service/ps/ps_ps.h +++ b/src/core/hle/service/ps/ps_ps.h @@ -6,8 +6,7 @@ #include "core/hle/service/service.h" -namespace Service { -namespace PS { +namespace Service::PS { class PS_PS final : public ServiceFramework { public: @@ -227,5 +226,4 @@ private: /// Initializes the PS_PS Service void InstallInterfaces(SM::ServiceManager& service_manager); -} // namespace PS -} // namespace Service +} // namespace Service::PS diff --git a/src/core/hle/service/ptm/ptm.cpp b/src/core/hle/service/ptm/ptm.cpp index 849e77d6d..eb5142cc8 100644 --- a/src/core/hle/service/ptm/ptm.cpp +++ b/src/core/hle/service/ptm/ptm.cpp @@ -15,8 +15,7 @@ #include "core/hle/service/ptm/ptm_u.h" #include "core/settings.h" -namespace Service { -namespace PTM { +namespace Service::PTM { /// Values for the default gamecoin.dat file static const GameCoin default_game_coin = {0x4F00, 42, 0, 0, 0, 2014, 12, 29}; @@ -181,5 +180,4 @@ void InstallInterfaces(SM::ServiceManager& service_manager) { std::make_shared(ptm)->InstallAsService(service_manager); } -} // namespace PTM -} // namespace Service +} // namespace Service::PTM diff --git a/src/core/hle/service/ptm/ptm.h b/src/core/hle/service/ptm/ptm.h index 1cbc0e446..09ac31059 100644 --- a/src/core/hle/service/ptm/ptm.h +++ b/src/core/hle/service/ptm/ptm.h @@ -9,8 +9,7 @@ #include "core/hle/ipc_helpers.h" #include "core/hle/service/service.h" -namespace Service { -namespace PTM { +namespace Service::PTM { /// Charge levels used by PTM functions enum class ChargeLevels : u32 { @@ -141,5 +140,4 @@ private: void InstallInterfaces(SM::ServiceManager& service_manager); -} // namespace PTM -} // namespace Service +} // namespace Service::PTM diff --git a/src/core/hle/service/ptm/ptm_gets.cpp b/src/core/hle/service/ptm/ptm_gets.cpp index 7fa742b03..e083aed6a 100644 --- a/src/core/hle/service/ptm/ptm_gets.cpp +++ b/src/core/hle/service/ptm/ptm_gets.cpp @@ -4,8 +4,7 @@ #include "core/hle/service/ptm/ptm_gets.h" -namespace Service { -namespace PTM { +namespace Service::PTM { PTM_Gets::PTM_Gets(std::shared_ptr ptm) : Module::Interface(std::move(ptm), "ptm:gets", 26) { @@ -32,5 +31,4 @@ PTM_Gets::PTM_Gets(std::shared_ptr ptm) RegisterHandlers(functions); } -} // namespace PTM -} // namespace Service +} // namespace Service::PTM diff --git a/src/core/hle/service/ptm/ptm_gets.h b/src/core/hle/service/ptm/ptm_gets.h index 4dc443b39..a8d71fdc9 100644 --- a/src/core/hle/service/ptm/ptm_gets.h +++ b/src/core/hle/service/ptm/ptm_gets.h @@ -7,13 +7,11 @@ #include #include "core/hle/service/ptm/ptm.h" -namespace Service { -namespace PTM { +namespace Service::PTM { class PTM_Gets final : public Module::Interface { public: explicit PTM_Gets(std::shared_ptr ptm); }; -} // namespace PTM -} // namespace Service +} // namespace Service::PTM diff --git a/src/core/hle/service/ptm/ptm_play.cpp b/src/core/hle/service/ptm/ptm_play.cpp index 8bc1ea6b3..6ef45780e 100644 --- a/src/core/hle/service/ptm/ptm_play.cpp +++ b/src/core/hle/service/ptm/ptm_play.cpp @@ -4,8 +4,7 @@ #include "core/hle/service/ptm/ptm_play.h" -namespace Service { -namespace PTM { +namespace Service::PTM { PTM_Play::PTM_Play(std::shared_ptr ptm) : Module::Interface(std::move(ptm), "ptm:play", 26) { @@ -35,5 +34,4 @@ PTM_Play::PTM_Play(std::shared_ptr ptm) RegisterHandlers(functions); } -} // namespace PTM -} // namespace Service +} // namespace Service::PTM diff --git a/src/core/hle/service/ptm/ptm_play.h b/src/core/hle/service/ptm/ptm_play.h index 5650e80c9..3a226149d 100644 --- a/src/core/hle/service/ptm/ptm_play.h +++ b/src/core/hle/service/ptm/ptm_play.h @@ -7,13 +7,11 @@ #include #include "core/hle/service/ptm/ptm.h" -namespace Service { -namespace PTM { +namespace Service::PTM { class PTM_Play final : public Module::Interface { public: explicit PTM_Play(std::shared_ptr ptm); }; -} // namespace PTM -} // namespace Service +} // namespace Service::PTM diff --git a/src/core/hle/service/ptm/ptm_sets.cpp b/src/core/hle/service/ptm/ptm_sets.cpp index 45670d0ce..b925f49c9 100644 --- a/src/core/hle/service/ptm/ptm_sets.cpp +++ b/src/core/hle/service/ptm/ptm_sets.cpp @@ -4,8 +4,7 @@ #include "core/hle/service/ptm/ptm_sets.h" -namespace Service { -namespace PTM { +namespace Service::PTM { PTM_Sets::PTM_Sets(std::shared_ptr ptm) : Module::Interface(std::move(ptm), "ptm:sets", 1) { static const FunctionInfo functions[] = { @@ -15,5 +14,4 @@ PTM_Sets::PTM_Sets(std::shared_ptr ptm) : Module::Interface(std::move(pt RegisterHandlers(functions); } -} // namespace PTM -} // namespace Service +} // namespace Service::PTM diff --git a/src/core/hle/service/ptm/ptm_sets.h b/src/core/hle/service/ptm/ptm_sets.h index fcfbdf6a9..317781faf 100644 --- a/src/core/hle/service/ptm/ptm_sets.h +++ b/src/core/hle/service/ptm/ptm_sets.h @@ -7,13 +7,11 @@ #include #include "core/hle/service/ptm/ptm.h" -namespace Service { -namespace PTM { +namespace Service::PTM { class PTM_Sets final : public Module::Interface { public: explicit PTM_Sets(std::shared_ptr ptm); }; -} // namespace PTM -} // namespace Service +} // namespace Service::PTM diff --git a/src/core/hle/service/ptm/ptm_sysm.cpp b/src/core/hle/service/ptm/ptm_sysm.cpp index 47c870929..45ee1b6fc 100644 --- a/src/core/hle/service/ptm/ptm_sysm.cpp +++ b/src/core/hle/service/ptm/ptm_sysm.cpp @@ -4,8 +4,7 @@ #include "core/hle/service/ptm/ptm_sysm.h" -namespace Service { -namespace PTM { +namespace Service::PTM { PTM_S_Common::PTM_S_Common(std::shared_ptr ptm, const char* name) : Module::Interface(std::move(ptm), name, 26) { @@ -66,5 +65,4 @@ PTM_S::PTM_S(std::shared_ptr ptm) : PTM_S_Common(std::move(ptm), "ptm:s" PTM_Sysm::PTM_Sysm(std::shared_ptr ptm) : PTM_S_Common(std::move(ptm), "ptm:sysm") {} -} // namespace PTM -} // namespace Service +} // namespace Service::PTM diff --git a/src/core/hle/service/ptm/ptm_sysm.h b/src/core/hle/service/ptm/ptm_sysm.h index 1d2f9f177..8667f2a95 100644 --- a/src/core/hle/service/ptm/ptm_sysm.h +++ b/src/core/hle/service/ptm/ptm_sysm.h @@ -7,8 +7,7 @@ #include #include "core/hle/service/ptm/ptm.h" -namespace Service { -namespace PTM { +namespace Service::PTM { class PTM_S_Common : public Module::Interface { public: @@ -25,5 +24,4 @@ public: explicit PTM_Sysm(std::shared_ptr ptm); }; -} // namespace PTM -} // namespace Service +} // namespace Service::PTM diff --git a/src/core/hle/service/ptm/ptm_u.cpp b/src/core/hle/service/ptm/ptm_u.cpp index 13c86c3d3..647ef5961 100644 --- a/src/core/hle/service/ptm/ptm_u.cpp +++ b/src/core/hle/service/ptm/ptm_u.cpp @@ -4,8 +4,7 @@ #include "core/hle/service/ptm/ptm_u.h" -namespace Service { -namespace PTM { +namespace Service::PTM { PTM_U::PTM_U(std::shared_ptr ptm) : Module::Interface(std::move(ptm), "ptm:u", 26) { static const FunctionInfo functions[] = { @@ -28,5 +27,4 @@ PTM_U::PTM_U(std::shared_ptr ptm) : Module::Interface(std::move(ptm), "p RegisterHandlers(functions); } -} // namespace PTM -} // namespace Service +} // namespace Service::PTM diff --git a/src/core/hle/service/ptm/ptm_u.h b/src/core/hle/service/ptm/ptm_u.h index fe06c3660..618401cec 100644 --- a/src/core/hle/service/ptm/ptm_u.h +++ b/src/core/hle/service/ptm/ptm_u.h @@ -7,13 +7,11 @@ #include #include "core/hle/service/ptm/ptm.h" -namespace Service { -namespace PTM { +namespace Service::PTM { class PTM_U final : public Module::Interface { public: explicit PTM_U(std::shared_ptr ptm); }; -} // namespace PTM -} // namespace Service +} // namespace Service::PTM diff --git a/src/core/hle/service/pxi/dev.cpp b/src/core/hle/service/pxi/dev.cpp index d3c793ab8..dcea938a6 100644 --- a/src/core/hle/service/pxi/dev.cpp +++ b/src/core/hle/service/pxi/dev.cpp @@ -4,8 +4,7 @@ #include "core/hle/service/pxi/dev.h" -namespace Service { -namespace PXI { +namespace Service::PXI { DEV::DEV() : ServiceFramework("pxi:dev", 1) { // clang-format off @@ -32,5 +31,4 @@ DEV::DEV() : ServiceFramework("pxi:dev", 1) { DEV::~DEV() = default; -} // namespace PXI -} // namespace Service +} // namespace Service::PXI diff --git a/src/core/hle/service/pxi/dev.h b/src/core/hle/service/pxi/dev.h index 7cee918fa..d79fa49ba 100644 --- a/src/core/hle/service/pxi/dev.h +++ b/src/core/hle/service/pxi/dev.h @@ -7,8 +7,7 @@ #include "core/hle/kernel/kernel.h" #include "core/hle/service/service.h" -namespace Service { -namespace PXI { +namespace Service::PXI { /// Interface to "pxi:dev" service class DEV final : public ServiceFramework { @@ -17,5 +16,4 @@ public: ~DEV(); }; -} // namespace PXI -} // namespace Service +} // namespace Service::PXI diff --git a/src/core/hle/service/pxi/pxi.cpp b/src/core/hle/service/pxi/pxi.cpp index b0df65a56..d7eff7a5f 100644 --- a/src/core/hle/service/pxi/pxi.cpp +++ b/src/core/hle/service/pxi/pxi.cpp @@ -5,12 +5,10 @@ #include "core/hle/service/pxi/dev.h" #include "core/hle/service/pxi/pxi.h" -namespace Service { -namespace PXI { +namespace Service::PXI { void InstallInterfaces(SM::ServiceManager& service_manager) { std::make_shared()->InstallAsService(service_manager); } -} // namespace PXI -} // namespace Service +} // namespace Service::PXI diff --git a/src/core/hle/service/pxi/pxi.h b/src/core/hle/service/pxi/pxi.h index 8b563a11a..f0ca55e35 100644 --- a/src/core/hle/service/pxi/pxi.h +++ b/src/core/hle/service/pxi/pxi.h @@ -6,11 +6,9 @@ #include "core/hle/service/service.h" -namespace Service { -namespace PXI { +namespace Service::PXI { /// Registers all PXI services with the specified service manager. void InstallInterfaces(SM::ServiceManager& service_manager); -} // namespace PXI -} // namespace Service +} // namespace Service::PXI diff --git a/src/core/hle/service/qtm/qtm.cpp b/src/core/hle/service/qtm/qtm.cpp index 7c1eba2d6..c0e545541 100644 --- a/src/core/hle/service/qtm/qtm.cpp +++ b/src/core/hle/service/qtm/qtm.cpp @@ -8,8 +8,7 @@ #include "core/hle/service/qtm/qtm_sp.h" #include "core/hle/service/qtm/qtm_u.h" -namespace Service { -namespace QTM { +namespace Service::QTM { void InstallInterfaces(SM::ServiceManager& service_manager) { std::make_shared()->InstallAsService(service_manager); @@ -18,5 +17,4 @@ void InstallInterfaces(SM::ServiceManager& service_manager) { std::make_shared()->InstallAsService(service_manager); } -} // namespace QTM -} // namespace Service +} // namespace Service::QTM diff --git a/src/core/hle/service/qtm/qtm.h b/src/core/hle/service/qtm/qtm.h index 6cf50e5f2..31d8eee82 100644 --- a/src/core/hle/service/qtm/qtm.h +++ b/src/core/hle/service/qtm/qtm.h @@ -6,11 +6,9 @@ #include "core/hle/service/service.h" -namespace Service { -namespace QTM { +namespace Service::QTM { /// Initializes all QTM services. void InstallInterfaces(SM::ServiceManager& service_manager); -} // namespace QTM -} // namespace Service +} // namespace Service::QTM diff --git a/src/core/hle/service/qtm/qtm_c.cpp b/src/core/hle/service/qtm/qtm_c.cpp index 2f617f8b0..84baaba3a 100644 --- a/src/core/hle/service/qtm/qtm_c.cpp +++ b/src/core/hle/service/qtm/qtm_c.cpp @@ -5,8 +5,7 @@ #include "core/hle/ipc_helpers.h" #include "core/hle/service/qtm/qtm_c.h" -namespace Service { -namespace QTM { +namespace Service::QTM { QTM_C::QTM_C() : ServiceFramework("qtm:c", 2) { static const FunctionInfo functions[] = { @@ -20,5 +19,4 @@ QTM_C::QTM_C() : ServiceFramework("qtm:c", 2) { RegisterHandlers(functions); }; -} // namespace QTM -} // namespace Service +} // namespace Service::QTM diff --git a/src/core/hle/service/qtm/qtm_c.h b/src/core/hle/service/qtm/qtm_c.h index 0abd6da88..c9cad0329 100644 --- a/src/core/hle/service/qtm/qtm_c.h +++ b/src/core/hle/service/qtm/qtm_c.h @@ -6,8 +6,7 @@ #include "core/hle/service/service.h" -namespace Service { -namespace QTM { +namespace Service::QTM { class QTM_C final : public ServiceFramework { public: @@ -15,5 +14,4 @@ public: ~QTM_C() = default; }; -} // namespace QTM -} // namespace Service +} // namespace Service::QTM diff --git a/src/core/hle/service/qtm/qtm_s.cpp b/src/core/hle/service/qtm/qtm_s.cpp index b9069e69d..2af7ced7b 100644 --- a/src/core/hle/service/qtm/qtm_s.cpp +++ b/src/core/hle/service/qtm/qtm_s.cpp @@ -5,8 +5,7 @@ #include "core/hle/ipc_helpers.h" #include "core/hle/service/qtm/qtm_s.h" -namespace Service { -namespace QTM { +namespace Service::QTM { QTM_S::QTM_S() : ServiceFramework("qtm:s", 2) { static const FunctionInfo functions[] = { @@ -20,5 +19,4 @@ QTM_S::QTM_S() : ServiceFramework("qtm:s", 2) { RegisterHandlers(functions); } -} // namespace QTM -} // namespace Service +} // namespace Service::QTM diff --git a/src/core/hle/service/qtm/qtm_s.h b/src/core/hle/service/qtm/qtm_s.h index 290c5728f..72b5e058b 100644 --- a/src/core/hle/service/qtm/qtm_s.h +++ b/src/core/hle/service/qtm/qtm_s.h @@ -6,8 +6,7 @@ #include "core/hle/service/service.h" -namespace Service { -namespace QTM { +namespace Service::QTM { class QTM_S final : public ServiceFramework { public: @@ -15,5 +14,4 @@ public: ~QTM_S() = default; }; -} // namespace QTM -} // namespace Service +} // namespace Service::QTM diff --git a/src/core/hle/service/qtm/qtm_sp.cpp b/src/core/hle/service/qtm/qtm_sp.cpp index 955313a16..bd5a71605 100644 --- a/src/core/hle/service/qtm/qtm_sp.cpp +++ b/src/core/hle/service/qtm/qtm_sp.cpp @@ -5,8 +5,7 @@ #include "core/hle/ipc_helpers.h" #include "core/hle/service/qtm/qtm_sp.h" -namespace Service { -namespace QTM { +namespace Service::QTM { QTM_SP::QTM_SP() : ServiceFramework("qtm:sp", 2) { static const FunctionInfo functions[] = { @@ -20,5 +19,4 @@ QTM_SP::QTM_SP() : ServiceFramework("qtm:sp", 2) { RegisterHandlers(functions); } -} // namespace QTM -} // namespace Service +} // namespace Service::QTM diff --git a/src/core/hle/service/qtm/qtm_sp.h b/src/core/hle/service/qtm/qtm_sp.h index 622e90ad0..c3f1049a1 100644 --- a/src/core/hle/service/qtm/qtm_sp.h +++ b/src/core/hle/service/qtm/qtm_sp.h @@ -6,8 +6,7 @@ #include "core/hle/service/service.h" -namespace Service { -namespace QTM { +namespace Service::QTM { class QTM_SP final : public ServiceFramework { public: @@ -15,5 +14,4 @@ public: ~QTM_SP() = default; }; -} // namespace QTM -} // namespace Service +} // namespace Service::QTM diff --git a/src/core/hle/service/qtm/qtm_u.cpp b/src/core/hle/service/qtm/qtm_u.cpp index c8756d308..471692189 100644 --- a/src/core/hle/service/qtm/qtm_u.cpp +++ b/src/core/hle/service/qtm/qtm_u.cpp @@ -5,8 +5,7 @@ #include "core/hle/ipc_helpers.h" #include "core/hle/service/qtm/qtm_u.h" -namespace Service { -namespace QTM { +namespace Service::QTM { QTM_U::QTM_U() : ServiceFramework("qtm:u", 2) { static const FunctionInfo functions[] = { @@ -20,5 +19,4 @@ QTM_U::QTM_U() : ServiceFramework("qtm:u", 2) { RegisterHandlers(functions); } -} // namespace QTM -} // namespace Service +} // namespace Service::QTM diff --git a/src/core/hle/service/qtm/qtm_u.h b/src/core/hle/service/qtm/qtm_u.h index 78d611081..01bb1e6e0 100644 --- a/src/core/hle/service/qtm/qtm_u.h +++ b/src/core/hle/service/qtm/qtm_u.h @@ -6,8 +6,7 @@ #include "core/hle/service/service.h" -namespace Service { -namespace QTM { +namespace Service::QTM { class QTM_U final : public ServiceFramework { public: @@ -15,5 +14,4 @@ public: ~QTM_U() = default; }; -} // namespace QTM -} // namespace Service +} // namespace Service::QTM diff --git a/src/core/hle/service/sm/sm.cpp b/src/core/hle/service/sm/sm.cpp index 4cb28ca16..df432ec74 100644 --- a/src/core/hle/service/sm/sm.cpp +++ b/src/core/hle/service/sm/sm.cpp @@ -11,8 +11,7 @@ #include "core/hle/service/sm/sm.h" #include "core/hle/service/sm/srv.h" -namespace Service { -namespace SM { +namespace Service::SM { static ResultCode ValidateServiceName(const std::string& name) { if (name.size() <= 0 || name.size() > 8) { @@ -67,5 +66,4 @@ ResultVal> ServiceManager::ConnectToSer return client_port->Connect(); } -} // namespace SM -} // namespace Service +} // namespace Service::SM diff --git a/src/core/hle/service/sm/sm.h b/src/core/hle/service/sm/sm.h index ae3de6eff..585f19d79 100644 --- a/src/core/hle/service/sm/sm.h +++ b/src/core/hle/service/sm/sm.h @@ -19,8 +19,7 @@ class ServerPort; class SessionRequestHandler; } // namespace Kernel -namespace Service { -namespace SM { +namespace Service::SM { class SRV; @@ -54,5 +53,4 @@ private: std::unordered_map> registered_services; }; -} // namespace SM -} // namespace Service +} // namespace Service::SM diff --git a/src/core/hle/service/sm/srv.cpp b/src/core/hle/service/sm/srv.cpp index a8f2db4f0..b1d299566 100644 --- a/src/core/hle/service/sm/srv.cpp +++ b/src/core/hle/service/sm/srv.cpp @@ -19,8 +19,7 @@ #include "core/hle/service/sm/sm.h" #include "core/hle/service/sm/srv.h" -namespace Service { -namespace SM { +namespace Service::SM { constexpr int MAX_PENDING_NOTIFICATIONS = 16; @@ -266,5 +265,4 @@ SRV::SRV(std::shared_ptr service_manager) SRV::~SRV() = default; -} // namespace SM -} // namespace Service +} // namespace Service::SM diff --git a/src/core/hle/service/sm/srv.h b/src/core/hle/service/sm/srv.h index d3525ca65..066d00eac 100644 --- a/src/core/hle/service/sm/srv.h +++ b/src/core/hle/service/sm/srv.h @@ -13,8 +13,7 @@ class HLERequestContext; class Semaphore; } // namespace Kernel -namespace Service { -namespace SM { +namespace Service::SM { /// Interface to "srv:" service class SRV final : public ServiceFramework { @@ -37,5 +36,4 @@ private: get_service_handle_delayed_map; }; -} // namespace SM -} // namespace Service +} // namespace Service::SM diff --git a/src/core/hle/service/soc_u.cpp b/src/core/hle/service/soc_u.cpp index 4c72dab3e..5ffd28f47 100644 --- a/src/core/hle/service/soc_u.cpp +++ b/src/core/hle/service/soc_u.cpp @@ -50,8 +50,7 @@ #define closesocket(x) close(x) #endif -namespace Service { -namespace SOC { +namespace Service::SOC { const s32 SOCKET_ERROR_VALUE = -1; @@ -914,5 +913,4 @@ void InstallInterfaces(SM::ServiceManager& service_manager) { std::make_shared()->InstallAsService(service_manager); } -} // namespace SOC -} // namespace Service +} // namespace Service::SOC diff --git a/src/core/hle/service/soc_u.h b/src/core/hle/service/soc_u.h index b1fa7751d..54106ef0a 100644 --- a/src/core/hle/service/soc_u.h +++ b/src/core/hle/service/soc_u.h @@ -7,8 +7,7 @@ #include #include "core/hle/service/service.h" -namespace Service { -namespace SOC { +namespace Service::SOC { /// Holds information about a particular socket struct SocketHolder { @@ -51,5 +50,4 @@ private: void InstallInterfaces(SM::ServiceManager& service_manager); -} // namespace SOC -} // namespace Service +} // namespace Service::SOC diff --git a/src/core/hle/service/ssl_c.cpp b/src/core/hle/service/ssl_c.cpp index 63ef2c2bb..0a9107796 100644 --- a/src/core/hle/service/ssl_c.cpp +++ b/src/core/hle/service/ssl_c.cpp @@ -7,8 +7,7 @@ #include "core/hle/ipc_helpers.h" #include "core/hle/service/ssl_c.h" -namespace Service { -namespace SSL { +namespace Service::SSL { void SSL_C::Initialize(Kernel::HLERequestContext& ctx) { IPC::RequestParser rp(ctx, 0x01, 0, 2); @@ -91,5 +90,4 @@ void InstallInterfaces(SM::ServiceManager& service_manager) { std::make_shared()->InstallAsService(service_manager); } -} // namespace SSL -} // namespace Service +} // namespace Service::SSL diff --git a/src/core/hle/service/ssl_c.h b/src/core/hle/service/ssl_c.h index 06d8f4371..34cbe0655 100644 --- a/src/core/hle/service/ssl_c.h +++ b/src/core/hle/service/ssl_c.h @@ -7,8 +7,7 @@ #include #include "core/hle/service/service.h" -namespace Service { -namespace SSL { +namespace Service::SSL { class SSL_C final : public ServiceFramework { public: @@ -24,5 +23,4 @@ private: void InstallInterfaces(SM::ServiceManager& service_manager); -} // namespace SSL -} // namespace Service +} // namespace Service::SSL diff --git a/src/core/hle/service/y2r_u.cpp b/src/core/hle/service/y2r_u.cpp index 7d6109101..e73a4abab 100644 --- a/src/core/hle/service/y2r_u.cpp +++ b/src/core/hle/service/y2r_u.cpp @@ -11,8 +11,7 @@ #include "core/hle/service/y2r_u.h" #include "core/hw/y2r.h" -namespace Service { -namespace Y2R { +namespace Service::Y2R { static const CoefficientSet standard_coefficients[4] = { {{0x100, 0x166, 0xB6, 0x58, 0x1C5, -0x166F, 0x10EE, -0x1C5B}}, // ITU_Rec601 @@ -691,5 +690,4 @@ void InstallInterfaces(SM::ServiceManager& service_manager) { std::make_shared()->InstallAsService(service_manager); } -} // namespace Y2R -} // namespace Service +} // namespace Service::Y2R diff --git a/src/core/hle/service/y2r_u.h b/src/core/hle/service/y2r_u.h index ea5060b4a..81b38e642 100644 --- a/src/core/hle/service/y2r_u.h +++ b/src/core/hle/service/y2r_u.h @@ -16,8 +16,7 @@ namespace Kernel { class Event; } -namespace Service { -namespace Y2R { +namespace Service::Y2R { enum class InputFormat : u8 { /// 8-bit input, with YUV components in separate planes and 4:2:2 subsampling. @@ -301,5 +300,4 @@ private: void InstallInterfaces(SM::ServiceManager& service_manager); -} // namespace Y2R -} // namespace Service +} // namespace Service::Y2R