Merge pull request #4251 from FearlessTobi/port-1309

Port yuzu-emu/yuzu#1309: "service: Use nested namespace specifiers where applicable"

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 Service::AC {
-namespace 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_U>(ac)->InstallAsService(service_manager);
 }
 
-} // namespace AC
+} // namespace Service::AC
-} // namespace Service

src/core/hle/service/ac/ac.h

@@ -13,8 +13,7 @@ namespace Kernel {
 class Event;
 }
 
-namespace Service {
+namespace Service::AC {
-namespace AC {
 class Module final {
 public:
     class Interface : public ServiceFramework<Interface> {
@@ -155,5 +154,4 @@ protected:
 
 void InstallInterfaces(SM::ServiceManager& service_manager);
 
-} // namespace AC
+} // namespace Service::AC
-} // namespace Service

src/core/hle/service/ac/ac_i.cpp

@@ -4,8 +4,7 @@
 
 #include "core/hle/service/ac/ac_i.h"
 
-namespace Service {
+namespace Service::AC {
-namespace AC {
 
 AC_I::AC_I(std::shared_ptr<Module> ac) : Module::Interface(std::move(ac), "ac:i", 10) {
     static const FunctionInfo functions[] = {
@@ -33,5 +32,4 @@ AC_I::AC_I(std::shared_ptr<Module> ac) : Module::Interface(std::move(ac), "ac:i"
     RegisterHandlers(functions);
 }
 
-} // namespace AC
+} // namespace Service::AC
-} // namespace Service

src/core/hle/service/ac/ac_i.h

@@ -7,13 +7,11 @@
 #include <memory>
 #include "core/hle/service/ac/ac.h"
 
-namespace Service {
+namespace Service::AC {
-namespace AC {
 
 class AC_I final : public Module::Interface {
 public:
     explicit AC_I(std::shared_ptr<Module> ac);
 };
 
-} // namespace AC
+} // namespace Service::AC
-} // namespace Service

src/core/hle/service/ac/ac_u.cpp

@@ -4,8 +4,7 @@
 
 #include "core/hle/service/ac/ac_u.h"
 
-namespace Service {
+namespace Service::AC {
-namespace AC {
 
 AC_U::AC_U(std::shared_ptr<Module> ac) : Module::Interface(std::move(ac), "ac:u", 10) {
     static const FunctionInfo functions[] = {
@@ -33,5 +32,4 @@ AC_U::AC_U(std::shared_ptr<Module> ac) : Module::Interface(std::move(ac), "ac:u"
     RegisterHandlers(functions);
 }
 
-} // namespace AC
+} // namespace Service::AC
-} // namespace Service

src/core/hle/service/ac/ac_u.h

@@ -7,13 +7,11 @@
 #include <memory>
 #include "core/hle/service/ac/ac.h"
 
-namespace Service {
+namespace Service::AC {
-namespace AC {
 
 class AC_U final : public Module::Interface {
 public:
     explicit AC_U(std::shared_ptr<Module> ac);
 };
 
-} // namespace AC
+} // namespace Service::AC
-} // namespace Service

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 Service::ACT {
-namespace ACT {
 
 Module::Interface::Interface(std::shared_ptr<Module> 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_U>(act)->InstallAsService(service_manager);
 }
 
-} // namespace ACT
+} // namespace Service::ACT
-} // namespace Service

src/core/hle/service/act/act.h

@@ -6,8 +6,7 @@
 
 #include "core/hle/service/service.h"
 
-namespace Service {
+namespace Service::ACT {
-namespace ACT {
 
 /// Initializes all ACT services
 class Module final {
@@ -24,5 +23,4 @@ public:
 
 void InstallInterfaces(SM::ServiceManager& service_manager);
 
-} // namespace ACT
+} // namespace Service::ACT
-} // namespace Service

src/core/hle/service/act/act_a.cpp

@@ -4,8 +4,7 @@
 
 #include "core/hle/service/act/act_a.h"
 
-namespace Service {
+namespace Service::ACT {
-namespace ACT {
 
 ACT_A::ACT_A(std::shared_ptr<Module> act) : Module::Interface(std::move(act), "act:a") {
     const FunctionInfo functions[] = {
@@ -24,5 +23,4 @@ ACT_A::ACT_A(std::shared_ptr<Module> act) : Module::Interface(std::move(act), "a
     RegisterHandlers(functions);
 }
 
-} // namespace ACT
+} // namespace Service::ACT
-} // namespace Service

src/core/hle/service/act/act_a.h

@@ -6,13 +6,11 @@
 
 #include "core/hle/service/act/act.h"
 
-namespace Service {
+namespace Service::ACT {
-namespace ACT {
 
 class ACT_A final : public Module::Interface {
 public:
     explicit ACT_A(std::shared_ptr<Module> act);
 };
 
-} // namespace ACT
+} // namespace Service::ACT
-} // namespace Service

src/core/hle/service/act/act_u.cpp

@@ -4,8 +4,7 @@
 
 #include "core/hle/service/act/act_u.h"
 
-namespace Service {
+namespace Service::ACT {
-namespace ACT {
 
 ACT_U::ACT_U(std::shared_ptr<Module> act) : Module::Interface(std::move(act), "act:u") {
     static const FunctionInfo functions[] = {
@@ -20,5 +19,4 @@ ACT_U::ACT_U(std::shared_ptr<Module> act) : Module::Interface(std::move(act), "a
     RegisterHandlers(functions);
 }
 
-} // namespace ACT
+} // namespace Service::ACT
-} // namespace Service

src/core/hle/service/act/act_u.h

@@ -6,13 +6,11 @@
 
 #include "core/hle/service/act/act.h"
 
-namespace Service {
+namespace Service::ACT {
-namespace ACT {
 
 class ACT_U final : public Module::Interface {
 public:
     explicit ACT_U(std::shared_ptr<Module> act);
 };
 
-} // namespace ACT
+} // namespace Service::ACT
-} // namespace Service

src/core/hle/service/am/am.cpp

@@ -30,8 +30,7 @@
 #include "core/loader/loader.h"
 #include "core/loader/smdh.h"
 
-namespace Service {
+namespace Service::AM {
-namespace 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_U>(am)->InstallAsService(service_manager);
 }
 
-} // namespace AM
+} // namespace Service::AM
-
-} // namespace Service

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 Service::FS {
-namespace FS {
 enum class MediaType : u32;
 }
-} // namespace Service
 
-namespace Service {
+namespace Service::AM {
-namespace AM {
 
 namespace ErrCodes {
 enum {
@@ -526,5 +523,4 @@ private:
 
 void InstallInterfaces(SM::ServiceManager& service_manager);
 
-} // namespace AM
+} // namespace Service::AM
-} // namespace Service

src/core/hle/service/am/am_app.cpp

@@ -4,8 +4,7 @@
 
 #include "core/hle/service/am/am_app.h"
 
-namespace Service {
+namespace Service::AM {
-namespace AM {
 
 AM_APP::AM_APP(std::shared_ptr<Module> am) : Module::Interface(std::move(am), "am:app", 5) {
     static const FunctionInfo functions[] = {
@@ -26,5 +25,4 @@ AM_APP::AM_APP(std::shared_ptr<Module> am) : Module::Interface(std::move(am), "a
     RegisterHandlers(functions);
 }
 
-} // namespace AM
+} // namespace Service::AM
-} // namespace Service

src/core/hle/service/am/am_app.h

@@ -6,13 +6,11 @@
 
 #include "core/hle/service/am/am.h"
 
-namespace Service {
+namespace Service::AM {
-namespace AM {
 
 class AM_APP final : public Module::Interface {
 public:
     explicit AM_APP(std::shared_ptr<Module> am);
 };
 
-} // namespace AM
+} // namespace Service::AM
-} // namespace Service

src/core/hle/service/am/am_net.cpp

@@ -4,8 +4,7 @@
 
 #include "core/hle/service/am/am_net.h"
 
-namespace Service {
+namespace Service::AM {
-namespace AM {
 
 AM_NET::AM_NET(std::shared_ptr<Module> am) : Module::Interface(std::move(am), "am:net", 5) {
     static const FunctionInfo functions[] = {
@@ -123,5 +122,4 @@ AM_NET::AM_NET(std::shared_ptr<Module> am) : Module::Interface(std::move(am), "a
     RegisterHandlers(functions);
 }
 
-} // namespace AM
+} // namespace Service::AM
-} // namespace Service

src/core/hle/service/am/am_net.h

@@ -6,13 +6,11 @@
 
 #include "core/hle/service/am/am.h"
 
-namespace Service {
+namespace Service::AM {
-namespace AM {
 
 class AM_NET final : public Module::Interface {
 public:
     explicit AM_NET(std::shared_ptr<Module> am);
 };
 
-} // namespace AM
+} // namespace Service::AM
-} // namespace Service

src/core/hle/service/am/am_sys.cpp

@@ -4,8 +4,7 @@
 
 #include "core/hle/service/am/am_sys.h"
 
-namespace Service {
+namespace Service::AM {
-namespace AM {
 
 AM_SYS::AM_SYS(std::shared_ptr<Module> am) : Module::Interface(std::move(am), "am:sys", 5) {
     static const FunctionInfo functions[] = {
@@ -71,5 +70,4 @@ AM_SYS::AM_SYS(std::shared_ptr<Module> am) : Module::Interface(std::move(am), "a
     RegisterHandlers(functions);
 }
 
-} // namespace AM
+} // namespace Service::AM
-} // namespace Service

src/core/hle/service/am/am_sys.h

@@ -6,13 +6,11 @@
 
 #include "core/hle/service/am/am.h"
 
-namespace Service {
+namespace Service::AM {
-namespace AM {
 
 class AM_SYS final : public Module::Interface {
 public:
     explicit AM_SYS(std::shared_ptr<Module> am);
 };
 
-} // namespace AM
+} // namespace Service::AM
-} // namespace Service

src/core/hle/service/am/am_u.cpp

@@ -4,8 +4,7 @@
 
 #include "core/hle/service/am/am_u.h"
 
-namespace Service {
+namespace Service::AM {
-namespace AM {
 
 AM_U::AM_U(std::shared_ptr<Module> am) : Module::Interface(std::move(am), "am:u", 5) {
     static const FunctionInfo functions[] = {
@@ -83,5 +82,4 @@ AM_U::AM_U(std::shared_ptr<Module> am) : Module::Interface(std::move(am), "am:u"
     RegisterHandlers(functions);
 }
 
-} // namespace AM
+} // namespace Service::AM
-} // namespace Service

src/core/hle/service/am/am_u.h

@@ -6,13 +6,11 @@
 
 #include "core/hle/service/am/am.h"
 
-namespace Service {
+namespace Service::AM {
-namespace AM {
 
 class AM_U final : public Module::Interface {
 public:
     explicit AM_U(std::shared_ptr<Module> am);
 };
 
-} // namespace AM
+} // namespace Service::AM
-} // namespace Service

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 Service::APT {
-namespace 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::APT
-} // namespace Service

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 Service::APT {
-namespace APT {
 
 /// Signals used by APT functions
 enum class SignalType : u32 {
@@ -185,5 +184,4 @@ private:
     SignalType library_applet_closing_command;
 };
 
-} // namespace APT
+} // namespace Service::APT
-} // namespace Service

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 Service::APT {
-namespace 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_A>(apt)->InstallAsService(service_manager);
 }
 
-} // namespace APT
+} // namespace Service::APT
-} // namespace Service

src/core/hle/service/apt/apt.h

@@ -16,8 +16,7 @@ class Mutex;
 class SharedMemory;
 } // namespace Kernel
 
-namespace Service {
+namespace Service::APT {
-namespace APT {
 
 class AppletManager;
 
@@ -605,5 +604,4 @@ private:
 
 void InstallInterfaces(SM::ServiceManager& service_manager);
 
-} // namespace APT
+} // namespace Service::APT
-} // namespace Service

src/core/hle/service/apt/apt_a.cpp

@@ -4,8 +4,7 @@
 
 #include "core/hle/service/apt/apt_a.h"
 
-namespace Service {
+namespace Service::APT {
-namespace APT {
 
 APT_A::APT_A(std::shared_ptr<Module> apt)
     : Module::Interface(std::move(apt), "APT:A", MaxAPTSessions) {
@@ -105,5 +104,4 @@ APT_A::APT_A(std::shared_ptr<Module> apt)
     RegisterHandlers(functions);
 }
 
-} // namespace APT
+} // namespace Service::APT
-} // namespace Service

src/core/hle/service/apt/apt_a.h

@@ -6,13 +6,11 @@
 
 #include "core/hle/service/apt/apt.h"
 
-namespace Service {
+namespace Service::APT {
-namespace APT {
 
 class APT_A final : public Module::Interface {
 public:
     explicit APT_A(std::shared_ptr<Module> apt);
 };
 
-} // namespace APT
+} // namespace Service::APT
-} // namespace Service

src/core/hle/service/apt/apt_s.cpp

@@ -4,8 +4,7 @@
 
 #include "core/hle/service/apt/apt_s.h"
 
-namespace Service {
+namespace Service::APT {
-namespace APT {
 
 APT_S::APT_S(std::shared_ptr<Module> apt)
     : Module::Interface(std::move(apt), "APT:S", MaxAPTSessions) {
@@ -105,5 +104,4 @@ APT_S::APT_S(std::shared_ptr<Module> apt)
     RegisterHandlers(functions);
 }
 
-} // namespace APT
+} // namespace Service::APT
-} // namespace Service

src/core/hle/service/apt/apt_s.h

@@ -6,8 +6,7 @@
 
 #include "core/hle/service/apt/apt.h"
 
-namespace Service {
+namespace Service::APT {
-namespace 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<Module> apt);
 };
 
-} // namespace APT
+} // namespace Service::APT
-} // namespace Service

src/core/hle/service/apt/apt_u.cpp

@@ -4,8 +4,7 @@
 
 #include "core/hle/service/apt/apt_u.h"
 
-namespace Service {
+namespace Service::APT {
-namespace APT {
 
 APT_U::APT_U(std::shared_ptr<Module> apt)
     : Module::Interface(std::move(apt), "APT:U", MaxAPTSessions) {
@@ -102,5 +101,4 @@ APT_U::APT_U(std::shared_ptr<Module> apt)
     RegisterHandlers(functions);
 }
 
-} // namespace APT
+} // namespace Service::APT
-} // namespace Service

src/core/hle/service/apt/apt_u.h

@@ -6,8 +6,7 @@
 
 #include "core/hle/service/apt/apt.h"
 
-namespace Service {
+namespace Service::APT {
-namespace 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<Module> apt);
 };
 
-} // namespace APT
+} // namespace Service::APT
-} // namespace Service

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 Service::APT::BCFNT {
-namespace APT {
-namespace BCFNT {
 
 void RelocateSharedFont(Kernel::SharedPtr<Kernel::SharedMemory> shared_font, VAddr new_address) {
     static const u32 SharedFontStartOffset = 0x80;
@@ -105,6 +103,4 @@ void RelocateSharedFont(Kernel::SharedPtr<Kernel::SharedMemory> shared_font, VAd
     }
 }
 
-} // namespace BCFNT
+} // namespace Service::APT::BCFNT
-} // namespace APT
-} // namespace Service

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 Service::APT::BCFNT { ///< BCFNT Shared Font file structures
-namespace APT {
-namespace BCFNT { ///< BCFNT Shared Font file structures
 
 struct CFNT {
     u8 magic[4];
@@ -87,6 +85,4 @@ struct CWDH {
  */
 void RelocateSharedFont(Kernel::SharedPtr<Kernel::SharedMemory> shared_font, VAddr new_address);
 
-} // namespace BCFNT
+} // namespace Service::APT::BCFNT
-} // namespace APT
-} // namespace Service

src/core/hle/service/apt/errors.h

@@ -4,13 +4,9 @@
 
 #pragma once
 
-namespace Service {
+namespace Service::APT::ErrCodes {
-namespace APT {
-namespace ErrCodes {
 enum {
     ParameterPresent = 2,
     InvalidAppletSlot = 4,
 };
-} // namespace ErrCodes
+} // namespace Service::APT::ErrCodes
-} // namespace APT
-} // namespace Service

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 Service::BOSS {
-namespace 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_U>(boss)->InstallAsService(service_manager);
 }
 
-} // namespace BOSS
+} // namespace Service::BOSS
-} // namespace Service

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 Service::BOSS {
-namespace BOSS {
 
 class Module final {
 public:
@@ -963,5 +962,4 @@ private:
 
 void InstallInterfaces(SM::ServiceManager& service_manager);
 
-} // namespace BOSS
+} // namespace Service::BOSS
-} // namespace Service

src/core/hle/service/boss/boss_p.cpp

@@ -4,8 +4,7 @@
 
 #include "core/hle/service/boss/boss_p.h"
 
-namespace Service {
+namespace Service::BOSS {
-namespace BOSS {
 
 BOSS_P::BOSS_P(std::shared_ptr<Module> boss)
     : Module::Interface(std::move(boss), "boss:P", DefaultMaxSessions) {
@@ -84,5 +83,4 @@ BOSS_P::BOSS_P(std::shared_ptr<Module> boss)
     RegisterHandlers(functions);
 }
 
-} // namespace BOSS
+} // namespace Service::BOSS
-} // namespace Service

src/core/hle/service/boss/boss_p.h

@@ -6,13 +6,11 @@
 
 #include "core/hle/service/boss/boss.h"
 
-namespace Service {
+namespace Service::BOSS {
-namespace BOSS {
 
 class BOSS_P final : public Module::Interface {
 public:
     explicit BOSS_P(std::shared_ptr<Module> boss);
 };
 
-} // namespace BOSS
+} // namespace Service::BOSS
-} // namespace Service

src/core/hle/service/boss/boss_u.cpp

@@ -4,8 +4,7 @@
 
 #include "core/hle/service/boss/boss_u.h"
 
-namespace Service {
+namespace Service::BOSS {
-namespace BOSS {
 
 BOSS_U::BOSS_U(std::shared_ptr<Module> boss)
     : Module::Interface(std::move(boss), "boss:U", DefaultMaxSessions) {
@@ -72,5 +71,4 @@ BOSS_U::BOSS_U(std::shared_ptr<Module> boss)
     RegisterHandlers(functions);
 }
 
-} // namespace BOSS
+} // namespace Service::BOSS
-} // namespace Service

src/core/hle/service/boss/boss_u.h

@@ -6,13 +6,11 @@
 
 #include "core/hle/service/boss/boss.h"
 
-namespace Service {
+namespace Service::BOSS {
-namespace BOSS {
 
 class BOSS_U final : public Module::Interface {
 public:
     explicit BOSS_U(std::shared_ptr<Module> boss);
 };
 
-} // namespace BOSS
+} // namespace Service::BOSS
-} // namespace Service

src/core/hle/service/cam/cam.cpp

@@ -19,8 +19,7 @@
 #include "core/memory.h"
 #include "core/settings.h"
 
-namespace Service {
+namespace Service::CAM {
-namespace CAM {
 
 static std::weak_ptr<Module> current_cam;
 
@@ -1065,6 +1064,4 @@ void InstallInterfaces(SM::ServiceManager& service_manager) {
     std::make_shared<CAM_Q>()->InstallAsService(service_manager);
 }
 
-} // namespace CAM
+} // namespace Service::CAM
-
-} // namespace Service

src/core/hle/service/cam/cam.h

@@ -25,8 +25,7 @@ namespace Kernel {
 class Process;
 }
 
-namespace Service {
+namespace Service::CAM {
-namespace CAM {
 
 enum CameraIndex {
     OuterRightCamera = 0,
@@ -785,5 +784,4 @@ void ReloadCameraDevices();
 
 void InstallInterfaces(SM::ServiceManager& service_manager);
 
-} // namespace CAM
+} // namespace Service::CAM
-} // namespace Service

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 Service::CAM {
-namespace CAM {
 
 CAM_C::CAM_C(std::shared_ptr<Module> cam) : Module::Interface(std::move(cam), "cam:c", 1) {
     static const FunctionInfo functions[] = {
@@ -79,5 +78,4 @@ CAM_C::CAM_C(std::shared_ptr<Module> cam) : Module::Interface(std::move(cam), "c
     RegisterHandlers(functions);
 }
 
-} // namespace CAM
+} // namespace Service::CAM
-} // namespace Service

src/core/hle/service/cam/cam_c.h

@@ -6,13 +6,11 @@
 
 #include "core/hle/service/cam/cam.h"
 
-namespace Service {
+namespace Service::CAM {
-namespace CAM {
 
 class CAM_C final : public Module::Interface {
 public:
     explicit CAM_C(std::shared_ptr<Module> cam);
 };
 
-} // namespace CAM
+} // namespace Service::CAM
-} // namespace Service

src/core/hle/service/cam/cam_q.cpp

@@ -4,8 +4,7 @@
 
 #include "core/hle/service/cam/cam_q.h"
 
-namespace Service {
+namespace Service::CAM {
-namespace 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::CAM
-} // namespace Service

src/core/hle/service/cam/cam_q.h

@@ -6,13 +6,11 @@
 
 #include "core/hle/service/service.h"
 
-namespace Service {
+namespace Service::CAM {
-namespace CAM {
 
 class CAM_Q : public ServiceFramework<CAM_Q> {
 public:
     CAM_Q();
 };
 
-} // namespace CAM
+} // namespace Service::CAM
-} // namespace Service

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 Service::CAM {
-namespace CAM {
 
 CAM_S::CAM_S(std::shared_ptr<Module> cam) : Module::Interface(std::move(cam), "cam:s", 1) {
     static const FunctionInfo functions[] = {
@@ -79,5 +78,4 @@ CAM_S::CAM_S(std::shared_ptr<Module> cam) : Module::Interface(std::move(cam), "c
     RegisterHandlers(functions);
 }
 
-} // namespace CAM
+} // namespace Service::CAM
-} // namespace Service

src/core/hle/service/cam/cam_s.h

@@ -6,13 +6,11 @@
 
 #include "core/hle/service/cam/cam.h"
 
-namespace Service {
+namespace Service::CAM {
-namespace CAM {
 
 class CAM_S final : public Module::Interface {
 public:
     explicit CAM_S(std::shared_ptr<Module> cam);
 };
 
-} // namespace CAM
+} // namespace Service::CAM
-} // namespace Service

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 Service::CAM {
-namespace CAM {
 
 CAM_U::CAM_U(std::shared_ptr<Module> cam) : Module::Interface(std::move(cam), "cam:u", 1) {
     static const FunctionInfo functions[] = {
@@ -79,5 +78,4 @@ CAM_U::CAM_U(std::shared_ptr<Module> cam) : Module::Interface(std::move(cam), "c
     RegisterHandlers(functions);
 }
 
-} // namespace CAM
+} // namespace Service::CAM
-} // namespace Service

src/core/hle/service/cam/cam_u.h

@@ -6,13 +6,11 @@
 
 #include "core/hle/service/cam/cam.h"
 
-namespace Service {
+namespace Service::CAM {
-namespace CAM {
 
 class CAM_U final : public Module::Interface {
 public:
     explicit CAM_U(std::shared_ptr<Module> cam);
 };
 
-} // namespace CAM
+} // namespace Service::CAM
-} // namespace Service

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 Service::CECD {
-namespace 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_U>(cecd)->InstallAsService(service_manager);
 }
 
-} // namespace CECD
+} // namespace Service::CECD
-} // namespace Service

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 Service::CECD {
-namespace 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::CECD
-} // namespace Service

src/core/hle/service/cecd/cecd_ndm.cpp

@@ -4,8 +4,7 @@
 
 #include "core/hle/service/cecd/cecd_ndm.h"
 
-namespace Service {
+namespace Service::CECD {
-namespace CECD {
 
 CECD_NDM::CECD_NDM(std::shared_ptr<Module> cecd)
     : Module::Interface(std::move(cecd), "cecd:ndm", DefaultMaxSessions) {
@@ -21,5 +20,4 @@ CECD_NDM::CECD_NDM(std::shared_ptr<Module> cecd)
     RegisterHandlers(functions);
 }
 
-} // namespace CECD
+} // namespace Service::CECD
-} // namespace Service

src/core/hle/service/cecd/cecd_ndm.h

@@ -6,13 +6,11 @@
 
 #include "core/hle/service/cecd/cecd.h"
 
-namespace Service {
+namespace Service::CECD {
-namespace CECD {
 
 class CECD_NDM final : public Module::Interface {
 public:
     explicit CECD_NDM(std::shared_ptr<Module> cecd);
 };
 
-} // namespace CECD
+} // namespace Service::CECD
-} // namespace Service

src/core/hle/service/cecd/cecd_s.cpp

@@ -4,8 +4,7 @@
 
 #include "core/hle/service/cecd/cecd_s.h"
 
-namespace Service {
+namespace Service::CECD {
-namespace CECD {
 
 CECD_S::CECD_S(std::shared_ptr<Module> cecd)
     : Module::Interface(std::move(cecd), "cecd:s", DefaultMaxSessions) {
@@ -34,5 +33,4 @@ CECD_S::CECD_S(std::shared_ptr<Module> cecd)
     RegisterHandlers(functions);
 }
 
-} // namespace CECD
+} // namespace Service::CECD
-} // namespace Service

src/core/hle/service/cecd/cecd_s.h

@@ -6,13 +6,11 @@
 
 #include "core/hle/service/cecd/cecd.h"
 
-namespace Service {
+namespace Service::CECD {
-namespace CECD {
 
 class CECD_S final : public Module::Interface {
 public:
     explicit CECD_S(std::shared_ptr<Module> cecd);
 };
 
-} // namespace CECD
+} // namespace Service::CECD
-} // namespace Service

src/core/hle/service/cecd/cecd_u.cpp

@@ -4,8 +4,7 @@
 
 #include "core/hle/service/cecd/cecd_u.h"
 
-namespace Service {
+namespace Service::CECD {
-namespace CECD {
 
 CECD_U::CECD_U(std::shared_ptr<Module> cecd)
     : Module::Interface(std::move(cecd), "cecd:u", DefaultMaxSessions) {
@@ -34,5 +33,4 @@ CECD_U::CECD_U(std::shared_ptr<Module> cecd)
     RegisterHandlers(functions);
 }
 
-} // namespace CECD
+} // namespace Service::CECD
-} // namespace Service

src/core/hle/service/cecd/cecd_u.h

@@ -6,13 +6,11 @@
 
 #include "core/hle/service/cecd/cecd.h"
 
-namespace Service {
+namespace Service::CECD {
-namespace CECD {
 
 class CECD_U final : public Module::Interface {
 public:
     explicit CECD_U(std::shared_ptr<Module> cecd);
 };
 
-} // namespace CECD
+} // namespace Service::CECD
-} // namespace Service

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 Service::CFG {
-namespace 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::CFG
-} // namespace Service

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 Service::CFG {
-namespace CFG {
 
 enum SystemModel {
     NINTENDO_3DS = 0,
@@ -407,5 +406,4 @@ private:
 void InstallInterfaces(SM::ServiceManager& service_manager);
 std::shared_ptr<Module> GetCurrentModule();
 
-} // namespace CFG
+} // namespace Service::CFG
-} // namespace Service

src/core/hle/service/cfg/cfg_i.cpp

@@ -4,8 +4,7 @@
 
 #include "core/hle/service/cfg/cfg_i.h"
 
-namespace Service {
+namespace Service::CFG {
-namespace CFG {
 
 CFG_I::CFG_I(std::shared_ptr<Module> cfg) : Module::Interface(std::move(cfg), "cfg:i", 23) {
     static const FunctionInfo functions[] = {
@@ -60,5 +59,4 @@ CFG_I::CFG_I(std::shared_ptr<Module> cfg) : Module::Interface(std::move(cfg), "c
     RegisterHandlers(functions);
 }
 
-} // namespace CFG
+} // namespace Service::CFG
-} // namespace Service

src/core/hle/service/cfg/cfg_i.h

@@ -6,13 +6,11 @@
 
 #include "core/hle/service/cfg/cfg.h"
 
-namespace Service {
+namespace Service::CFG {
-namespace CFG {
 
 class CFG_I final : public Module::Interface {
 public:
     explicit CFG_I(std::shared_ptr<Module> cfg);
 };
 
-} // namespace CFG
+} // namespace Service::CFG
-} // namespace Service

src/core/hle/service/cfg/cfg_nor.cpp

@@ -4,8 +4,7 @@
 
 #include "core/hle/service/cfg/cfg_nor.h"
 
-namespace Service {
+namespace Service::CFG {
-namespace 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::CFG
-} // namespace Service

src/core/hle/service/cfg/cfg_nor.h

@@ -6,13 +6,11 @@
 
 #include "core/hle/service/service.h"
 
-namespace Service {
+namespace Service::CFG {
-namespace CFG {
 
 class CFG_NOR final : public ServiceFramework<CFG_NOR> {
 public:
     CFG_NOR();
 };
 
-} // namespace CFG
+} // namespace Service::CFG
-} // namespace Service

src/core/hle/service/cfg/cfg_s.cpp

@@ -4,8 +4,7 @@
 
 #include "core/hle/service/cfg/cfg_s.h"
 
-namespace Service {
+namespace Service::CFG {
-namespace CFG {
 
 CFG_S::CFG_S(std::shared_ptr<Module> cfg) : Module::Interface(std::move(cfg), "cfg:s", 23) {
     static const FunctionInfo functions[] = {
@@ -36,5 +35,4 @@ CFG_S::CFG_S(std::shared_ptr<Module> cfg) : Module::Interface(std::move(cfg), "c
     RegisterHandlers(functions);
 }
 
-} // namespace CFG
+} // namespace Service::CFG
-} // namespace Service

src/core/hle/service/cfg/cfg_s.h

@@ -6,13 +6,11 @@
 
 #include "core/hle/service/cfg/cfg.h"
 
-namespace Service {
+namespace Service::CFG {
-namespace CFG {
 
 class CFG_S final : public Module::Interface {
 public:
     explicit CFG_S(std::shared_ptr<Module> cfg);
 };
 
-} // namespace CFG
+} // namespace Service::CFG
-} // namespace Service

src/core/hle/service/cfg/cfg_u.cpp

@@ -4,8 +4,7 @@
 
 #include "core/hle/service/cfg/cfg_u.h"
 
-namespace Service {
+namespace Service::CFG {
-namespace CFG {
 
 CFG_U::CFG_U(std::shared_ptr<Module> cfg) : Module::Interface(std::move(cfg), "cfg:u", 23) {
     static const FunctionInfo functions[] = {
@@ -25,5 +24,4 @@ CFG_U::CFG_U(std::shared_ptr<Module> cfg) : Module::Interface(std::move(cfg), "c
     RegisterHandlers(functions);
 }
 
-} // namespace CFG
+} // namespace Service::CFG
-} // namespace Service

src/core/hle/service/cfg/cfg_u.h

@@ -6,13 +6,11 @@
 
 #include "core/hle/service/cfg/cfg.h"
 
-namespace Service {
+namespace Service::CFG {
-namespace CFG {
 
 class CFG_U final : public Module::Interface {
 public:
     explicit CFG_U(std::shared_ptr<Module> cfg);
 };
 
-} // namespace CFG
+} // namespace Service::CFG
-} // namespace Service

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 Service::CSND {
-namespace 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<CSND_SND>()->InstallAsService(service_manager);
 }
 
-} // namespace CSND
+} // namespace Service::CSND
-} // namespace Service

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 Service::CSND {
-namespace CSND {
 
 class CSND_SND final : public ServiceFramework<CSND_SND> {
 public:
@@ -181,5 +180,4 @@ private:
 /// Initializes the CSND_SND Service
 void InstallInterfaces(SM::ServiceManager& service_manager);
 
-} // namespace CSND
+} // namespace Service::CSND
-} // namespace Service

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 Service::DLP {
-namespace DLP {
 
 void InstallInterfaces(SM::ServiceManager& service_manager) {
     std::make_shared<DLP_CLNT>()->InstallAsService(service_manager);
@@ -16,5 +15,4 @@ void InstallInterfaces(SM::ServiceManager& service_manager) {
     std::make_shared<DLP_SRVR>()->InstallAsService(service_manager);
 }
 
-} // namespace DLP
+} // namespace Service::DLP
-} // namespace Service

src/core/hle/service/dlp/dlp.h

@@ -6,11 +6,9 @@
 
 #include "core/hle/service/service.h"
 
-namespace Service {
+namespace Service::DLP {
-namespace DLP {
 
 /// Initializes the DLP services.
 void InstallInterfaces(SM::ServiceManager& service_manager);
 
-} // namespace DLP
+} // namespace Service::DLP
-} // namespace Service

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 Service::DLP {
-namespace 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::DLP
-} // namespace Service

src/core/hle/service/dlp/dlp_clnt.h

@@ -6,8 +6,7 @@
 
 #include "core/hle/service/service.h"
 
-namespace Service {
+namespace Service::DLP {
-namespace DLP {
 
 class DLP_CLNT final : public ServiceFramework<DLP_CLNT> {
 public:
@@ -15,5 +14,4 @@ public:
     ~DLP_CLNT() = default;
 };
 
-} // namespace DLP
+} // namespace Service::DLP
-} // namespace Service

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 Service::DLP {
-namespace 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::DLP
-} // namespace Service

src/core/hle/service/dlp/dlp_fkcl.h

@@ -6,8 +6,7 @@
 
 #include "core/hle/service/service.h"
 
-namespace Service {
+namespace Service::DLP {
-namespace DLP {
 
 class DLP_FKCL final : public ServiceFramework<DLP_FKCL> {
 public:
@@ -15,5 +14,4 @@ public:
     ~DLP_FKCL() = default;
 };
 
-} // namespace DLP
+} // namespace Service::DLP
-} // namespace Service

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 Service::DLP {
-namespace 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::DLP
-} // namespace Service

src/core/hle/service/dlp/dlp_srvr.h

@@ -6,8 +6,7 @@
 
 #include "core/hle/service/service.h"
 
-namespace Service {
+namespace Service::DLP {
-namespace DLP {
 
 class DLP_SRVR final : public ServiceFramework<DLP_SRVR> {
 public:
@@ -18,5 +17,4 @@ private:
     void IsChild(Kernel::HLERequestContext& ctx);
 };
 
-} // namespace DLP
+} // namespace Service::DLP
-} // namespace Service

src/core/hle/service/dsp/dsp_dsp.cpp

@@ -18,8 +18,7 @@ namespace AudioCore {
 enum class DspPipe;
 }
 
-namespace Service {
+namespace Service::DSP {
-namespace 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::DSP
-} // namespace Service

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 Service::DSP {
-namespace DSP {
 
 class DSP_DSP final : public ServiceFramework<DSP_DSP> {
 public:
@@ -253,5 +252,4 @@ private:
 
 void InstallInterfaces(SM::ServiceManager& service_manager);
 
-} // namespace DSP
+} // namespace Service::DSP
-} // namespace Service

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 Service::ERR {
-namespace ERR {
 
 enum class FatalErrType : u32 {
     Generic = 0,
@@ -248,5 +247,4 @@ void InstallInterfaces() {
     errf->InstallAsNamedPort();
 }
 
-} // namespace ERR
+} // namespace Service::ERR
-} // namespace Service

src/core/hle/service/err_f.h

@@ -10,8 +10,7 @@ namespace Kernel {
 class HLERequestContext;
 }
 
-namespace Service {
+namespace Service::ERR {
-namespace ERR {
 
 /// Interface to "err:f" service
 class ERR_F final : public ServiceFramework<ERR_F> {
@@ -33,5 +32,4 @@ private:
 
 void InstallInterfaces();
 
-} // namespace ERR
+} // namespace Service::ERR
-} // namespace Service

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 Service::FRD {
-namespace FRD {
 
 Module::Interface::Interface(std::shared_ptr<Module> 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_A>(frd)->InstallAsService(service_manager);
 }
 
-} // namespace FRD
+} // namespace Service::FRD
-
-} // namespace Service

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 Service::FRD {
-
-namespace FRD {
 
 struct FriendKey {
     u32 friend_id;
@@ -139,5 +137,4 @@ private:
 
 void InstallInterfaces(SM::ServiceManager& service_manager);
 
-} // namespace FRD
+} // namespace Service::FRD
-} // namespace Service

src/core/hle/service/frd/frd_a.cpp

@@ -4,8 +4,7 @@
 
 #include "core/hle/service/frd/frd_a.h"
 
-namespace Service {
+namespace Service::FRD {
-namespace FRD {
 
 FRD_A::FRD_A(std::shared_ptr<Module> frd) : Module::Interface(std::move(frd), "frd:a", 8) {
     static const FunctionInfo functions[] = {
@@ -66,5 +65,4 @@ FRD_A::FRD_A(std::shared_ptr<Module> frd) : Module::Interface(std::move(frd), "f
     RegisterHandlers(functions);
 }
 
-} // namespace FRD
+} // namespace Service::FRD
-} // namespace Service

src/core/hle/service/frd/frd_a.h

@@ -6,13 +6,11 @@
 
 #include "core/hle/service/frd/frd.h"
 
-namespace Service {
+namespace Service::FRD {
-namespace FRD {
 
 class FRD_A final : public Module::Interface {
 public:
     explicit FRD_A(std::shared_ptr<Module> frd);
 };
 
-} // namespace FRD
+} // namespace Service::FRD
-} // namespace Service

src/core/hle/service/frd/frd_u.cpp

@@ -4,8 +4,7 @@
 
 #include "core/hle/service/frd/frd_u.h"
 
-namespace Service {
+namespace Service::FRD {
-namespace FRD {
 
 FRD_U::FRD_U(std::shared_ptr<Module> frd) : Module::Interface(std::move(frd), "frd:u", 8) {
     static const FunctionInfo functions[] = {
@@ -66,5 +65,4 @@ FRD_U::FRD_U(std::shared_ptr<Module> frd) : Module::Interface(std::move(frd), "f
     RegisterHandlers(functions);
 }
 
-} // namespace FRD
+} // namespace Service::FRD
-} // namespace Service

src/core/hle/service/frd/frd_u.h

@@ -6,13 +6,11 @@
 
 #include "core/hle/service/frd/frd.h"
 
-namespace Service {
+namespace Service::FRD {
-namespace FRD {
 
 class FRD_U final : public Module::Interface {
 public:
     explicit FRD_U(std::shared_ptr<Module> frd);
 };
 
-} // namespace FRD
+} // namespace Service::FRD
-} // namespace Service

src/core/hle/service/fs/archive.cpp

@@ -40,8 +40,7 @@
 #include "core/hle/service/service.h"
 #include "core/memory.h"
 
-namespace Service {
+namespace Service::FS {
-namespace FS {
 
 // Command to access directory
 enum class DirectoryCommand : u32 {
@@ -701,5 +700,4 @@ void ArchiveShutdown() {
     UnregisterArchiveTypes();
 }
 
-} // namespace FS
+} // namespace Service::FS
-} // namespace Service

src/core/hle/service/fs/archive.h

@@ -28,8 +28,7 @@ namespace Loader {
 class AppLoader;
 }
 
-namespace Service {
+namespace Service::FS {
-namespace FS {
 
 /// Supported archive types
 enum class ArchiveIdCode : u32 {
@@ -296,5 +295,4 @@ void RegisterArchiveTypes();
 /// Unregister all archive types
 void UnregisterArchiveTypes();
 
-} // namespace FS
+} // namespace Service::FS
-} // namespace Service

src/core/hle/service/fs/fs_user.cpp

@@ -30,8 +30,7 @@ using Kernel::ClientSession;
 using Kernel::ServerSession;
 using Kernel::SharedPtr;
 
-namespace Service {
+namespace Service::FS {
-namespace 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<FS_USER>()->InstallAsService(service_manager);
 }
-} // namespace FS
+} // namespace Service::FS
-} // namespace Service

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 Service::FS {
-namespace FS {
 
 class FS_USER final : public ServiceFramework<FS_USER> {
 public:
@@ -520,5 +519,4 @@ private:
 
 void InstallInterfaces(SM::ServiceManager& service_manager);
 
-} // namespace FS
+} // namespace Service::FS
-} // namespace Service

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 Service::GSP {
-namespace GSP {
 
 static std::weak_ptr<GSP_GPU> gsp_gpu;
 
@@ -32,5 +31,4 @@ void InstallInterfaces(SM::ServiceManager& service_manager) {
     std::make_shared<GSP_LCD>()->InstallAsService(service_manager);
 }
 
-} // namespace GSP
+} // namespace Service::GSP
-} // namespace Service

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 Service::GSP {
-namespace 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::GSP
-} // namespace Service

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 Service::GSP {
-namespace 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::GSP
-} // namespace Service

src/core/hle/service/gsp/gsp_gpu.h

@@ -17,8 +17,7 @@ namespace Kernel {
 class SharedMemory;
 } // namespace Kernel
 
-namespace Service {
+namespace Service::GSP {
-namespace 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::GSP
-} // namespace Service

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 Service::GSP {
-namespace 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::GSP
-} // namespace Service

src/core/hle/service/gsp/gsp_lcd.h

@@ -6,8 +6,7 @@
 
 #include "core/hle/service/service.h"
 
-namespace Service {
+namespace Service::GSP {
-namespace GSP {
 
 class GSP_LCD final : public ServiceFramework<GSP_LCD> {
 public:
@@ -15,5 +14,4 @@ public:
     ~GSP_LCD() = default;
 };
 
-} // namespace GSP
+} // namespace Service::GSP
-} // namespace Service

src/core/hle/service/hid/hid.cpp

@@ -19,8 +19,7 @@
 #include "core/movie.h"
 #include "video_core/video_core.h"
 
-namespace Service {
+namespace Service::HID {
-namespace HID {
 
 static std::weak_ptr<Module> current_module;
 
@@ -401,6 +400,4 @@ void InstallInterfaces(SM::ServiceManager& service_manager) {
     current_module = hid;
 }
 
-} // namespace HID
+} // namespace Service::HID
-
-} // namespace Service