service: Use nested namespace specifiers where applicable

Tidies up namespace declarations
This commit is contained in:
Lioncash 2018-04-19 21:41:44 -04:00
parent 17ad56c1dc
commit ccca5e7c28
136 changed files with 273 additions and 570 deletions

View File

@ -10,8 +10,7 @@
#include "core/hle/service/acc/acc_u0.h"
#include "core/hle/service/acc/acc_u1.h"
namespace Service {
namespace Account {
namespace Service::Account {
// TODO: RE this structure
struct UserData {
@ -148,5 +147,4 @@ void InstallInterfaces(SM::ServiceManager& service_manager) {
std::make_shared<ACC_U1>(module)->InstallAsService(service_manager);
}
} // namespace Account
} // namespace Service
} // namespace Service::Account

View File

@ -6,8 +6,7 @@
#include "core/hle/service/service.h"
namespace Service {
namespace Account {
namespace Service::Account {
class Module final {
public:
@ -31,5 +30,4 @@ public:
/// Registers all ACC services with the specified service manager.
void InstallInterfaces(SM::ServiceManager& service_manager);
} // namespace Account
} // namespace Service
} // namespace Service::Account

View File

@ -4,8 +4,7 @@
#include "core/hle/service/acc/acc_aa.h"
namespace Service {
namespace Account {
namespace Service::Account {
ACC_AA::ACC_AA(std::shared_ptr<Module> module) : Module::Interface(std::move(module), "acc:aa") {
static const FunctionInfo functions[] = {
@ -18,5 +17,4 @@ ACC_AA::ACC_AA(std::shared_ptr<Module> module) : Module::Interface(std::move(mod
RegisterHandlers(functions);
}
} // namespace Account
} // namespace Service
} // namespace Service::Account

View File

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

View File

@ -4,8 +4,7 @@
#include "core/hle/service/acc/acc_su.h"
namespace Service {
namespace Account {
namespace Service::Account {
ACC_SU::ACC_SU(std::shared_ptr<Module> module) : Module::Interface(std::move(module), "acc:su") {
static const FunctionInfo functions[] = {
@ -51,5 +50,4 @@ ACC_SU::ACC_SU(std::shared_ptr<Module> module) : Module::Interface(std::move(mod
RegisterHandlers(functions);
}
} // namespace Account
} // namespace Service
} // namespace Service::Account

View File

@ -4,8 +4,7 @@
#include "core/hle/service/acc/acc_u0.h"
namespace Service {
namespace Account {
namespace Service::Account {
ACC_U0::ACC_U0(std::shared_ptr<Module> module) : Module::Interface(std::move(module), "acc:u0") {
static const FunctionInfo functions[] = {
@ -31,5 +30,4 @@ ACC_U0::ACC_U0(std::shared_ptr<Module> module) : Module::Interface(std::move(mod
RegisterHandlers(functions);
}
} // namespace Account
} // namespace Service
} // namespace Service::Account

View File

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

View File

@ -4,8 +4,7 @@
#include "core/hle/service/acc/acc_u1.h"
namespace Service {
namespace Account {
namespace Service::Account {
ACC_U1::ACC_U1(std::shared_ptr<Module> module) : Module::Interface(std::move(module), "acc:u1") {
static const FunctionInfo functions[] = {
@ -38,5 +37,4 @@ ACC_U1::ACC_U1(std::shared_ptr<Module> module) : Module::Interface(std::move(mod
RegisterHandlers(functions);
}
} // namespace Account
} // namespace Service
} // namespace Service::Account

View File

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

View File

@ -14,8 +14,7 @@
#include "core/hle/service/nvflinger/nvflinger.h"
#include "core/settings.h"
namespace Service {
namespace AM {
namespace Service::AM {
IWindowController::IWindowController() : ServiceFramework("IWindowController") {
static const FunctionInfo functions[] = {
@ -571,5 +570,4 @@ void InstallInterfaces(SM::ServiceManager& service_manager,
std::make_shared<AppletOE>(nvflinger)->InstallAsService(service_manager);
}
} // namespace AM
} // namespace Service
} // namespace Service::AM

View File

@ -8,8 +8,7 @@
#include "core/hle/service/am/applet_ae.h"
#include "core/hle/service/nvflinger/nvflinger.h"
namespace Service {
namespace AM {
namespace Service::AM {
class ILibraryAppletProxy final : public ServiceFramework<ILibraryAppletProxy> {
public:
@ -109,5 +108,4 @@ AppletAE::AppletAE(std::shared_ptr<NVFlinger::NVFlinger> nvflinger)
RegisterHandlers(functions);
}
} // namespace AM
} // namespace Service
} // namespace Service::AM

View File

@ -8,8 +8,7 @@
#include "core/hle/service/am/applet_oe.h"
#include "core/hle/service/nvflinger/nvflinger.h"
namespace Service {
namespace AM {
namespace Service::AM {
class IApplicationProxy final : public ServiceFramework<IApplicationProxy> {
public:
@ -104,5 +103,4 @@ AppletOE::AppletOE(std::shared_ptr<NVFlinger::NVFlinger> nvflinger)
RegisterHandlers(functions);
}
} // namespace AM
} // namespace Service
} // namespace Service::AM

View File

@ -6,8 +6,7 @@
#include "core/hle/ipc_helpers.h"
#include "core/hle/service/aoc/aoc_u.h"
namespace Service {
namespace AOC {
namespace Service::AOC {
AOC_U::AOC_U() : ServiceFramework("aoc:u") {
static const FunctionInfo functions[] = {
@ -42,5 +41,4 @@ void InstallInterfaces(SM::ServiceManager& service_manager) {
std::make_shared<AOC_U>()->InstallAsService(service_manager);
}
} // namespace AOC
} // namespace Service
} // namespace Service::AOC

View File

@ -6,8 +6,7 @@
#include "core/hle/service/service.h"
namespace Service {
namespace AOC {
namespace Service::AOC {
class AOC_U final : public ServiceFramework<AOC_U> {
public:
@ -22,5 +21,4 @@ private:
/// Registers all AOC services with the specified service manager.
void InstallInterfaces(SM::ServiceManager& service_manager);
} // namespace AOC
} // namespace Service
} // namespace Service::AOC

View File

@ -7,8 +7,7 @@
#include "core/hle/service/apm/apm.h"
#include "core/hle/service/apm/interface.h"
namespace Service {
namespace APM {
namespace Service::APM {
void InstallInterfaces(SM::ServiceManager& service_manager) {
auto module_ = std::make_shared<Module>();
@ -16,5 +15,4 @@ void InstallInterfaces(SM::ServiceManager& service_manager) {
std::make_shared<APM>(module_, "apm:p")->InstallAsService(service_manager);
}
} // namespace APM
} // namespace Service
} // namespace Service::APM

View File

@ -6,8 +6,7 @@
#include "core/hle/service/service.h"
namespace Service {
namespace APM {
namespace Service::APM {
enum class PerformanceMode : u8 {
Handheld = 0,
@ -23,5 +22,4 @@ public:
/// Registers all AM services with the specified service manager.
void InstallInterfaces(SM::ServiceManager& service_manager);
} // namespace APM
} // namespace Service
} // namespace Service::APM

View File

@ -7,8 +7,7 @@
#include "core/hle/service/apm/apm.h"
#include "core/hle/service/apm/interface.h"
namespace Service {
namespace APM {
namespace Service::APM {
class ISession final : public ServiceFramework<ISession> {
public:
@ -62,5 +61,4 @@ void APM::OpenSession(Kernel::HLERequestContext& ctx) {
rb.PushIpcInterface<ISession>();
}
} // namespace APM
} // namespace Service
} // namespace Service::APM

View File

@ -6,8 +6,7 @@
#include "core/hle/service/service.h"
namespace Service {
namespace APM {
namespace Service::APM {
class APM final : public ServiceFramework<APM> {
public:
@ -23,5 +22,4 @@ private:
/// Registers all AM services with the specified service manager.
void InstallInterfaces(SM::ServiceManager& service_manager);
} // namespace APM
} // namespace Service
} // namespace Service::APM

View File

@ -7,8 +7,7 @@
#include "core/hle/kernel/hle_ipc.h"
#include "core/hle/service/audio/audin_u.h"
namespace Service {
namespace Audio {
namespace Service::Audio {
class IAudioIn final : public ServiceFramework<IAudioIn> {
public:
@ -44,5 +43,4 @@ AudInU::AudInU() : ServiceFramework("audin:u") {
RegisterHandlers(functions);
}
} // namespace Audio
} // namespace Service
} // namespace Service::Audio

View File

@ -10,8 +10,7 @@ namespace Kernel {
class HLERequestContext;
}
namespace Service {
namespace Audio {
namespace Service::Audio {
class AudInU final : public ServiceFramework<AudInU> {
public:
@ -19,5 +18,4 @@ public:
~AudInU() = default;
};
} // namespace Audio
} // namespace Service
} // namespace Service::Audio

View File

@ -9,8 +9,7 @@
#include "core/hle/service/audio/audren_u.h"
#include "core/hle/service/audio/codecctl.h"
namespace Service {
namespace Audio {
namespace Service::Audio {
void InstallInterfaces(SM::ServiceManager& service_manager) {
std::make_shared<AudOutU>()->InstallAsService(service_manager);
@ -20,5 +19,4 @@ void InstallInterfaces(SM::ServiceManager& service_manager) {
std::make_shared<CodecCtl>()->InstallAsService(service_manager);
}
} // namespace Audio
} // namespace Service
} // namespace Service::Audio

View File

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

View File

@ -10,8 +10,7 @@
#include "core/hle/kernel/hle_ipc.h"
#include "core/hle/service/audio/audout_u.h"
namespace Service {
namespace Audio {
namespace Service::Audio {
/// Switch sample rate frequency
constexpr u32 sample_rate{48000};
@ -204,5 +203,4 @@ AudOutU::AudOutU() : ServiceFramework("audout:u") {
RegisterHandlers(functions);
}
} // namespace Audio
} // namespace Service
} // namespace Service::Audio

View File

@ -10,8 +10,7 @@ namespace Kernel {
class HLERequestContext;
}
namespace Service {
namespace Audio {
namespace Service::Audio {
class IAudioOut;
@ -37,5 +36,4 @@ private:
};
};
} // namespace Audio
} // namespace Service
} // namespace Service::Audio

View File

@ -7,8 +7,7 @@
#include "core/hle/kernel/hle_ipc.h"
#include "core/hle/service/audio/audrec_u.h"
namespace Service {
namespace Audio {
namespace Service::Audio {
class IFinalOutputRecorder final : public ServiceFramework<IFinalOutputRecorder> {
public:
@ -36,5 +35,4 @@ AudRecU::AudRecU() : ServiceFramework("audrec:u") {
RegisterHandlers(functions);
}
} // namespace Audio
} // namespace Service
} // namespace Service::Audio

View File

@ -10,8 +10,7 @@ namespace Kernel {
class HLERequestContext;
}
namespace Service {
namespace Audio {
namespace Service::Audio {
class AudRecU final : public ServiceFramework<AudRecU> {
public:
@ -19,5 +18,4 @@ public:
~AudRecU() = default;
};
} // namespace Audio
} // namespace Service
} // namespace Service::Audio

View File

@ -9,8 +9,7 @@
#include "core/hle/kernel/hle_ipc.h"
#include "core/hle/service/audio/audren_u.h"
namespace Service {
namespace Audio {
namespace Service::Audio {
/// TODO(bunnei): Find a proper value for the audio_ticks
constexpr u64 audio_ticks{static_cast<u64>(BASE_CLOCK_RATE / 200)};
@ -272,5 +271,4 @@ void AudRenU::GetAudioDevice(Kernel::HLERequestContext& ctx) {
LOG_DEBUG(Service_Audio, "called");
}
} // namespace Audio
} // namespace Service
} // namespace Service::Audio

View File

@ -10,8 +10,7 @@ namespace Kernel {
class HLERequestContext;
}
namespace Service {
namespace Audio {
namespace Service::Audio {
class AudRenU final : public ServiceFramework<AudRenU> {
public:
@ -24,5 +23,4 @@ private:
void GetAudioDevice(Kernel::HLERequestContext& ctx);
};
} // namespace Audio
} // namespace Service
} // namespace Service::Audio

View File

@ -7,8 +7,7 @@
#include "core/hle/kernel/hle_ipc.h"
#include "core/hle/service/audio/codecctl.h"
namespace Service {
namespace Audio {
namespace Service::Audio {
CodecCtl::CodecCtl() : ServiceFramework("codecctl") {
static const FunctionInfo functions[] = {
@ -29,5 +28,4 @@ CodecCtl::CodecCtl() : ServiceFramework("codecctl") {
RegisterHandlers(functions);
}
} // namespace Audio
} // namespace Service
} // namespace Service::Audio

View File

@ -10,8 +10,7 @@ namespace Kernel {
class HLERequestContext;
}
namespace Service {
namespace Audio {
namespace Service::Audio {
class CodecCtl final : public ServiceFramework<CodecCtl> {
public:
@ -19,5 +18,4 @@ public:
~CodecCtl() = default;
};
} // namespace Audio
} // namespace Service
} // namespace Service::Audio

View File

@ -8,8 +8,7 @@
#include "core/hle/service/fatal/fatal_p.h"
#include "core/hle/service/fatal/fatal_u.h"
namespace Service {
namespace Fatal {
namespace Service::Fatal {
Module::Interface::Interface(std::shared_ptr<Module> module, const char* name)
: ServiceFramework(name), module(std::move(module)) {}
@ -34,5 +33,4 @@ void InstallInterfaces(SM::ServiceManager& service_manager) {
std::make_shared<Fatal_U>(module)->InstallAsService(service_manager);
}
} // namespace Fatal
} // namespace Service
} // namespace Service::Fatal

View File

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

View File

@ -4,11 +4,9 @@
#include "core/hle/service/fatal/fatal_p.h"
namespace Service {
namespace Fatal {
namespace Service::Fatal {
Fatal_P::Fatal_P(std::shared_ptr<Module> module)
: Module::Interface(std::move(module), "fatal:p") {}
} // namespace Fatal
} // namespace Service
} // namespace Service::Fatal

View File

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

View File

@ -4,8 +4,7 @@
#include "core/hle/service/fatal/fatal_u.h"
namespace Service {
namespace Fatal {
namespace Service::Fatal {
Fatal_U::Fatal_U(std::shared_ptr<Module> module) : Module::Interface(std::move(module), "fatal:u") {
static const FunctionInfo functions[] = {
@ -15,5 +14,4 @@ Fatal_U::Fatal_U(std::shared_ptr<Module> module) : Module::Interface(std::move(m
RegisterHandlers(functions);
}
} // namespace Fatal
} // namespace Service
} // namespace Service::Fatal

View File

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

View File

@ -10,8 +10,7 @@
#include "core/hle/service/filesystem/filesystem.h"
#include "core/hle/service/filesystem/fsp_srv.h"
namespace Service {
namespace FileSystem {
namespace Service::FileSystem {
/**
* Map of registered file systems, identified by type. Once an file system is registered here, it
@ -75,5 +74,4 @@ void InstallInterfaces(SM::ServiceManager& service_manager) {
std::make_shared<FSP_SRV>()->InstallAsService(service_manager);
}
} // namespace FileSystem
} // namespace Service
} // namespace Service::FileSystem

View File

@ -14,8 +14,7 @@
#include "core/hle/service/filesystem/filesystem.h"
#include "core/hle/service/filesystem/fsp_srv.h"
namespace Service {
namespace FileSystem {
namespace Service::FileSystem {
class IStorage final : public ServiceFramework<IStorage> {
public:
@ -573,5 +572,4 @@ void FSP_SRV::OpenRomStorage(Kernel::HLERequestContext& ctx) {
OpenDataStorageByCurrentProcess(ctx);
}
} // namespace FileSystem
} // namespace Service
} // namespace Service::FileSystem

View File

@ -11,8 +11,7 @@ namespace FileSys {
class FileSystemBackend;
}
namespace Service {
namespace FileSystem {
namespace Service::FileSystem {
class FSP_SRV final : public ServiceFramework<FSP_SRV> {
public:
@ -33,5 +32,4 @@ private:
std::unique_ptr<FileSys::FileSystemBackend> romfs;
};
} // namespace FileSystem
} // namespace Service
} // namespace Service::FileSystem

View File

@ -8,8 +8,7 @@
#include "core/hle/service/friend/friend_a.h"
#include "core/hle/service/friend/friend_u.h"
namespace Service {
namespace Friend {
namespace Service::Friend {
void Module::Interface::CreateFriendService(Kernel::HLERequestContext& ctx) {
IPC::ResponseBuilder rb{ctx, 2};
@ -26,5 +25,4 @@ void InstallInterfaces(SM::ServiceManager& service_manager) {
std::make_shared<Friend_U>(module)->InstallAsService(service_manager);
}
} // namespace Friend
} // namespace Service
} // namespace Service::Friend

View File

@ -6,8 +6,7 @@
#include "core/hle/service/service.h"
namespace Service {
namespace Friend {
namespace Service::Friend {
class Module final {
public:
@ -25,5 +24,4 @@ public:
/// Registers all Friend services with the specified service manager.
void InstallInterfaces(SM::ServiceManager& service_manager);
} // namespace Friend
} // namespace Service
} // namespace Service::Friend

View File

@ -4,8 +4,7 @@
#include "core/hle/service/friend/friend_a.h"
namespace Service {
namespace Friend {
namespace Service::Friend {
Friend_A::Friend_A(std::shared_ptr<Module> module)
: Module::Interface(std::move(module), "friend:a") {
@ -16,5 +15,4 @@ Friend_A::Friend_A(std::shared_ptr<Module> module)
RegisterHandlers(functions);
}
} // namespace Friend
} // namespace Service
} // namespace Service::Friend

View File

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

View File

@ -4,8 +4,7 @@
#include "core/hle/service/friend/friend_u.h"
namespace Service {
namespace Friend {
namespace Service::Friend {
Friend_U::Friend_U(std::shared_ptr<Module> module)
: Module::Interface(std::move(module), "friend:u") {
@ -16,5 +15,4 @@ Friend_U::Friend_U(std::shared_ptr<Module> module)
RegisterHandlers(functions);
}
} // namespace Friend
} // namespace Service
} // namespace Service::Friend

View File

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

View File

@ -14,8 +14,7 @@
#include "core/hle/service/hid/hid.h"
#include "core/hle/service/service.h"
namespace Service {
namespace HID {
namespace Service::HID {
// Updating period for each HID device.
// TODO(shinyquagsire23): These need better values.
@ -434,5 +433,4 @@ void InstallInterfaces(SM::ServiceManager& service_manager) {
std::make_shared<Hid>()->InstallAsService(service_manager);
}
} // namespace HID
} // namespace Service
} // namespace Service::HID

View File

@ -7,8 +7,7 @@
#include "core/hle/service/service.h"
#include "core/settings.h"
namespace Service {
namespace HID {
namespace Service::HID {
// Begin enums and output structs
@ -337,5 +336,4 @@ void ReloadInputDevices();
/// Registers all HID services with the specified service manager.
void InstallInterfaces(SM::ServiceManager& service_manager);
} // namespace HID
} // namespace Service
} // namespace Service::HID

View File

@ -9,8 +9,7 @@
#include "core/hle/kernel/client_session.h"
#include "core/hle/service/lm/lm.h"
namespace Service {
namespace LM {
namespace Service::LM {
class Logger final : public ServiceFramework<Logger> {
public:
@ -189,5 +188,4 @@ LM::LM() : ServiceFramework("lm") {
RegisterHandlers(functions);
}
} // namespace LM
} // namespace Service
} // namespace Service::LM

View File

@ -8,8 +8,7 @@
#include "core/hle/kernel/kernel.h"
#include "core/hle/service/service.h"
namespace Service {
namespace LM {
namespace Service::LM {
class LM final : public ServiceFramework<LM> {
public:
@ -23,5 +22,4 @@ private:
/// Registers all LM services with the specified service manager.
void InstallInterfaces(SM::ServiceManager& service_manager);
} // namespace LM
} // namespace Service
} // namespace Service::LM

View File

@ -7,8 +7,7 @@
#include "core/hle/service/nfp/nfp.h"
#include "core/hle/service/nfp/nfp_user.h"
namespace Service {
namespace NFP {
namespace Service::NFP {
Module::Interface::Interface(std::shared_ptr<Module> module, const char* name)
: ServiceFramework(name), module(std::move(module)) {}
@ -24,5 +23,4 @@ void InstallInterfaces(SM::ServiceManager& service_manager) {
std::make_shared<NFP_User>(module)->InstallAsService(service_manager);
}
} // namespace NFP
} // namespace Service
} // namespace Service::NFP

View File

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

View File

@ -4,8 +4,7 @@
#include "core/hle/service/nfp/nfp_user.h"
namespace Service {
namespace NFP {
namespace Service::NFP {
NFP_User::NFP_User(std::shared_ptr<Module> module)
: Module::Interface(std::move(module), "nfp:user") {
@ -15,5 +14,4 @@ NFP_User::NFP_User(std::shared_ptr<Module> module)
RegisterHandlers(functions);
}
} // namespace NFP
} // namespace Service
} // namespace Service::NFP

View File

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

View File

@ -9,8 +9,7 @@
#include "core/hle/service/nifm/nifm_s.h"
#include "core/hle/service/nifm/nifm_u.h"
namespace Service {
namespace NIFM {
namespace Service::NIFM {
class IScanRequest final : public ServiceFramework<IScanRequest> {
public:
@ -208,5 +207,4 @@ void InstallInterfaces(SM::ServiceManager& service_manager) {
std::make_shared<NIFM_U>(module)->InstallAsService(service_manager);
}
} // namespace NIFM
} // namespace Service
} // namespace Service::NIFM

View File

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

View File

@ -4,8 +4,7 @@
#include "core/hle/service/nifm/nifm_a.h"
namespace Service {
namespace NIFM {
namespace Service::NIFM {
NIFM_A::NIFM_A(std::shared_ptr<Module> module) : Module::Interface(std::move(module), "nifm:a") {
static const FunctionInfo functions[] = {
@ -15,5 +14,4 @@ NIFM_A::NIFM_A(std::shared_ptr<Module> module) : Module::Interface(std::move(mod
RegisterHandlers(functions);
}
} // namespace NIFM
} // namespace Service
} // namespace Service::NIFM

View File

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

View File

@ -4,8 +4,7 @@
#include "core/hle/service/nifm/nifm_s.h"
namespace Service {
namespace NIFM {
namespace Service::NIFM {
NIFM_S::NIFM_S(std::shared_ptr<Module> module) : Module::Interface(std::move(module), "nifm:s") {
static const FunctionInfo functions[] = {
@ -15,5 +14,4 @@ NIFM_S::NIFM_S(std::shared_ptr<Module> module) : Module::Interface(std::move(mod
RegisterHandlers(functions);
}
} // namespace NIFM
} // namespace Service
} // namespace Service::NIFM

View File

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

View File

@ -4,8 +4,7 @@
#include "core/hle/service/nifm/nifm_u.h"
namespace Service {
namespace NIFM {
namespace Service::NIFM {
NIFM_U::NIFM_U(std::shared_ptr<Module> module) : Module::Interface(std::move(module), "nifm:u") {
static const FunctionInfo functions[] = {
@ -15,5 +14,4 @@ NIFM_U::NIFM_U(std::shared_ptr<Module> module) : Module::Interface(std::move(mod
RegisterHandlers(functions);
}
} // namespace NIFM
} // namespace Service
} // namespace Service::NIFM

View File

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

View File

@ -5,12 +5,10 @@
#include "core/hle/service/ns/ns.h"
#include "core/hle/service/ns/pl_u.h"
namespace Service {
namespace NS {
namespace Service::NS {
void InstallInterfaces(SM::ServiceManager& service_manager) {
std::make_shared<PL_U>()->InstallAsService(service_manager);
}
} // namespace NS
} // namespace Service
} // namespace Service::NS

View File

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

View File

@ -8,8 +8,7 @@
#include "core/hle/ipc_helpers.h"
#include "core/hle/service/ns/pl_u.h"
namespace Service {
namespace NS {
namespace Service::NS {
struct FontRegion {
u32 offset;
@ -117,5 +116,4 @@ void PL_U::GetSharedMemoryNativeHandle(Kernel::HLERequestContext& ctx) {
rb.PushCopyObjects(shared_font_mem);
}
} // namespace NS
} // namespace Service
} // namespace Service::NS

View File

@ -8,8 +8,7 @@
#include "core/hle/kernel/shared_memory.h"
#include "core/hle/service/service.h"
namespace Service {
namespace NS {
namespace Service::NS {
class PL_U final : public ServiceFramework<PL_U> {
public:
@ -30,5 +29,4 @@ private:
std::shared_ptr<std::vector<u8>> shared_font;
};
} // namespace NS
} // namespace Service
} // namespace Service::NS

View File

@ -9,9 +9,7 @@
#include "common/common_types.h"
#include "common/swap.h"
namespace Service {
namespace Nvidia {
namespace Devices {
namespace Service::Nvidia::Devices {
/// Represents an abstract nvidia device node. It is to be subclassed by concrete device nodes to
/// implement the ioctl interface.
@ -38,6 +36,4 @@ public:
virtual u32 ioctl(Ioctl command, const std::vector<u8>& input, std::vector<u8>& output) = 0;
};
} // namespace Devices
} // namespace Nvidia
} // namespace Service
} // namespace Service::Nvidia::Devices

View File

@ -10,9 +10,7 @@
#include "video_core/renderer_base.h"
#include "video_core/video_core.h"
namespace Service {
namespace Nvidia {
namespace Devices {
namespace Service::Nvidia::Devices {
u32 nvdisp_disp0::ioctl(Ioctl command, const std::vector<u8>& input, std::vector<u8>& output) {
UNIMPLEMENTED();
@ -35,6 +33,4 @@ void nvdisp_disp0::flip(u32 buffer_handle, u32 offset, u32 format, u32 width, u3
VideoCore::g_renderer->SwapBuffers(framebuffer);
}
} // namespace Devices
} // namespace Nvidia
} // namespace Service
} // namespace Service::Nvidia::Devices

View File

@ -10,9 +10,7 @@
#include "core/hle/service/nvdrv/devices/nvdevice.h"
#include "core/hle/service/nvflinger/buffer_queue.h"
namespace Service {
namespace Nvidia {
namespace Devices {
namespace Service::Nvidia::Devices {
class nvmap;
@ -31,6 +29,4 @@ private:
std::shared_ptr<nvmap> nvmap_dev;
};
} // namespace Devices
} // namespace Nvidia
} // namespace Service
} // namespace Service::Nvidia::Devices

View File

@ -9,9 +9,7 @@
#include "core/hle/service/nvdrv/devices/nvhost_as_gpu.h"
#include "core/hle/service/nvdrv/devices/nvmap.h"
namespace Service {
namespace Nvidia {
namespace Devices {
namespace Service::Nvidia::Devices {
u32 nvhost_as_gpu::ioctl(Ioctl command, const std::vector<u8>& input, std::vector<u8>& output) {
LOG_DEBUG(Service_NVDRV, "called, command=0x%08x, input_size=0x%zx, output_size=0x%zx",
@ -115,6 +113,4 @@ u32 nvhost_as_gpu::GetVARegions(const std::vector<u8>& input, std::vector<u8>& o
return 0;
}
} // namespace Devices
} // namespace Nvidia
} // namespace Service
} // namespace Service::Nvidia::Devices

View File

@ -11,9 +11,7 @@
#include "common/swap.h"
#include "core/hle/service/nvdrv/devices/nvdevice.h"
namespace Service {
namespace Nvidia {
namespace Devices {
namespace Service::Nvidia::Devices {
class nvmap;
@ -100,6 +98,4 @@ private:
std::shared_ptr<nvmap> nvmap_dev;
};
} // namespace Devices
} // namespace Nvidia
} // namespace Service
} // namespace Service::Nvidia::Devices

View File

@ -6,9 +6,7 @@
#include "common/logging/log.h"
#include "core/hle/service/nvdrv/devices/nvhost_ctrl.h"
namespace Service {
namespace Nvidia {
namespace Devices {
namespace Service::Nvidia::Devices {
u32 nvhost_ctrl::ioctl(Ioctl command, const std::vector<u8>& input, std::vector<u8>& output) {
LOG_DEBUG(Service_NVDRV, "called, command=0x%08x, input_size=0x%zx, output_size=0x%zx",
@ -59,6 +57,4 @@ u32 nvhost_ctrl::IocCtrlEventWait(const std::vector<u8>& input, std::vector<u8>&
return 0;
}
} // namespace Devices
} // namespace Nvidia
} // namespace Service
} // namespace Service::Nvidia::Devices

View File

@ -11,9 +11,7 @@
#include "common/common_types.h"
#include "core/hle/service/nvdrv/devices/nvdevice.h"
namespace Service {
namespace Nvidia {
namespace Devices {
namespace Service::Nvidia::Devices {
class nvhost_ctrl final : public nvdevice {
public:
@ -55,6 +53,4 @@ private:
u32 IocCtrlEventWait(const std::vector<u8>& input, std::vector<u8>& output);
};
} // namespace Devices
} // namespace Nvidia
} // namespace Service
} // namespace Service::Nvidia::Devices

View File

@ -7,9 +7,7 @@
#include "common/logging/log.h"
#include "core/hle/service/nvdrv/devices/nvhost_ctrl_gpu.h"
namespace Service {
namespace Nvidia {
namespace Devices {
namespace Service::Nvidia::Devices {
u32 nvhost_ctrl_gpu::ioctl(Ioctl command, const std::vector<u8>& input, std::vector<u8>& output) {
LOG_DEBUG(Service_NVDRV, "called, command=0x%08x, input_size=0x%zx, output_size=0x%zx",
@ -122,6 +120,4 @@ u32 nvhost_ctrl_gpu::ZCullGetInfo(const std::vector<u8>& input, std::vector<u8>&
return 0;
}
} // namespace Devices
} // namespace Nvidia
} // namespace Service
} // namespace Service::Nvidia::Devices

View File

@ -9,9 +9,7 @@
#include "common/swap.h"
#include "core/hle/service/nvdrv/devices/nvdevice.h"
namespace Service {
namespace Nvidia {
namespace Devices {
namespace Service::Nvidia::Devices {
class nvhost_ctrl_gpu final : public nvdevice {
public:
@ -125,6 +123,5 @@ private:
u32 ZCullGetCtxSize(const std::vector<u8>& input, std::vector<u8>& output);
u32 ZCullGetInfo(const std::vector<u8>& input, std::vector<u8>& output);
};
} // namespace Devices
} // namespace Nvidia
} // namespace Service
} // namespace Service::Nvidia::Devices

View File

@ -9,9 +9,7 @@
#include "core/core.h"
#include "core/hle/service/nvdrv/devices/nvhost_gpu.h"
namespace Service {
namespace Nvidia {
namespace Devices {
namespace Service::Nvidia::Devices {
u32 nvhost_gpu::ioctl(Ioctl command, const std::vector<u8>& input, std::vector<u8>& output) {
LOG_DEBUG(Service_NVDRV, "called, command=0x%08x, input_size=0x%zx, output_size=0x%zx",
@ -142,6 +140,4 @@ u32 nvhost_gpu::SubmitGPFIFO(const std::vector<u8>& input, std::vector<u8>& outp
return 0;
}
} // namespace Devices
} // namespace Nvidia
} // namespace Service
} // namespace Service::Nvidia::Devices

View File

@ -10,9 +10,7 @@
#include "common/swap.h"
#include "core/hle/service/nvdrv/devices/nvdevice.h"
namespace Service {
namespace Nvidia {
namespace Devices {
namespace Service::Nvidia::Devices {
class nvmap;
constexpr u32 NVGPU_IOCTL_MAGIC('H');
@ -139,6 +137,4 @@ private:
std::shared_ptr<nvmap> nvmap_dev;
};
} // namespace Devices
} // namespace Nvidia
} // namespace Service
} // namespace Service::Nvidia::Devices

View File

@ -9,9 +9,7 @@
#include "common/logging/log.h"
#include "core/hle/service/nvdrv/devices/nvmap.h"
namespace Service {
namespace Nvidia {
namespace Devices {
namespace Service::Nvidia::Devices {
VAddr nvmap::GetObjectAddress(u32 handle) const {
auto object = GetObject(handle);
@ -144,6 +142,4 @@ u32 nvmap::IocParam(const std::vector<u8>& input, std::vector<u8>& output) {
return 0;
}
} // namespace Devices
} // namespace Nvidia
} // namespace Service
} // namespace Service::Nvidia::Devices

View File

@ -12,9 +12,7 @@
#include "common/swap.h"
#include "core/hle/service/nvdrv/devices/nvdevice.h"
namespace Service {
namespace Nvidia {
namespace Devices {
namespace Service::Nvidia::Devices {
class nvmap final : public nvdevice {
public:
@ -111,6 +109,4 @@ private:
u32 IocParam(const std::vector<u8>& input, std::vector<u8>& output);
};
} // namespace Devices
} // namespace Nvidia
} // namespace Service
} // namespace Service::Nvidia::Devices

View File

@ -9,8 +9,7 @@
#include "core/hle/service/nvdrv/interface.h"
#include "core/hle/service/nvdrv/nvdrv.h"
namespace Service {
namespace Nvidia {
namespace Service::Nvidia {
void NVDRV::Open(Kernel::HLERequestContext& ctx) {
LOG_DEBUG(Service_NVDRV, "called");
@ -111,5 +110,4 @@ NVDRV::NVDRV(std::shared_ptr<Module> nvdrv, const char* name)
query_event = Kernel::Event::Create(Kernel::ResetType::OneShot, "NVDRV::query_event");
}
} // namespace Nvidia
} // namespace Service
} // namespace Service::Nvidia

View File

@ -10,8 +10,7 @@
#include "core/hle/service/nvdrv/nvdrv.h"
#include "core/hle/service/service.h"
namespace Service {
namespace Nvidia {
namespace Service::Nvidia {
class NVDRV final : public ServiceFramework<NVDRV> {
public:
@ -34,5 +33,4 @@ private:
Kernel::SharedPtr<Kernel::Event> query_event;
};
} // namespace Nvidia
} // namespace Service
} // namespace Service::Nvidia

View File

@ -14,8 +14,7 @@
#include "core/hle/service/nvdrv/nvdrv.h"
#include "core/hle/service/nvdrv/nvmemp.h"
namespace Service {
namespace Nvidia {
namespace Service::Nvidia {
std::weak_ptr<Module> nvdrv;
@ -69,5 +68,4 @@ ResultCode Module::Close(u32 fd) {
return RESULT_SUCCESS;
}
} // namespace Nvidia
} // namespace Service
} // namespace Service::Nvidia

View File

@ -10,8 +10,7 @@
#include "common/common_types.h"
#include "core/hle/service/service.h"
namespace Service {
namespace Nvidia {
namespace Service::Nvidia {
namespace Devices {
class nvdevice;
@ -61,5 +60,4 @@ void InstallInterfaces(SM::ServiceManager& service_manager);
extern std::weak_ptr<Module> nvdrv;
} // namespace Nvidia
} // namespace Service
} // namespace Service::Nvidia

View File

@ -8,8 +8,7 @@
#include "core/hle/service/nvdrv/nvdrv.h"
#include "core/hle/service/nvdrv/nvmemp.h"
namespace Service {
namespace Nvidia {
namespace Service::Nvidia {
NVMEMP::NVMEMP() : ServiceFramework("nvmemp") {
static const FunctionInfo functions[] = {
@ -27,5 +26,4 @@ void NVMEMP::Cmd1(Kernel::HLERequestContext& ctx) {
UNIMPLEMENTED();
}
} // namespace Nvidia
} // namespace Service
} // namespace Service::Nvidia

View File

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

View File

@ -9,8 +9,7 @@
#include "core/core_timing.h"
#include "core/hle/service/nvflinger/buffer_queue.h"
namespace Service {
namespace NVFlinger {
namespace Service::NVFlinger {
BufferQueue::BufferQueue(u32 id, u64 layer_id) : id(id), layer_id(layer_id) {
native_handle = Kernel::Event::Create(Kernel::ResetType::OneShot, "BufferQueue NativeHandle");
@ -111,5 +110,4 @@ void BufferQueue::SetBufferWaitEvent(Kernel::SharedPtr<Kernel::Event>&& wait_eve
buffer_wait_event = std::move(wait_event);
}
} // namespace NVFlinger
} // namespace Service
} // namespace Service::NVFlinger

View File

@ -13,8 +13,7 @@ namespace CoreTiming {
struct EventType;
}
namespace Service {
namespace NVFlinger {
namespace Service::NVFlinger {
struct IGBPBuffer {
u32_le magic;
@ -98,5 +97,4 @@ private:
Kernel::SharedPtr<Kernel::Event> buffer_wait_event;
};
} // namespace NVFlinger
} // namespace Service
} // namespace Service::NVFlinger

View File

@ -16,8 +16,7 @@
#include "video_core/renderer_base.h"
#include "video_core/video_core.h"
namespace Service {
namespace NVFlinger {
namespace Service::NVFlinger {
constexpr size_t SCREEN_REFRESH_RATE = 60;
constexpr u64 frame_ticks = static_cast<u64>(BASE_CLOCK_RATE / SCREEN_REFRESH_RATE);
@ -165,5 +164,4 @@ Display::Display(u64 id, std::string name) : id(id), name(std::move(name)) {
vsync_event = Kernel::Event::Create(Kernel::ResetType::Pulse, "Display VSync Event");
}
} // namespace NVFlinger
} // namespace Service
} // namespace Service::NVFlinger

View File

@ -12,8 +12,7 @@ namespace CoreTiming {
struct EventType;
}
namespace Service {
namespace NVFlinger {
namespace Service::NVFlinger {
class BufferQueue;
@ -80,5 +79,4 @@ private:
CoreTiming::EventType* composition_event;
};
} // namespace NVFlinger
} // namespace Service
} // namespace Service::NVFlinger

View File

@ -5,12 +5,10 @@
#include "core/hle/service/pctl/pctl.h"
#include "core/hle/service/pctl/pctl_a.h"
namespace Service {
namespace PCTL {
namespace Service::PCTL {
void InstallInterfaces(SM::ServiceManager& service_manager) {
std::make_shared<PCTL_A>()->InstallAsService(service_manager);
}
} // namespace PCTL
} // namespace Service
} // namespace Service::PCTL

View File

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

View File

@ -6,8 +6,7 @@
#include "core/hle/ipc_helpers.h"
#include "core/hle/service/pctl/pctl_a.h"
namespace Service {
namespace PCTL {
namespace Service::PCTL {
class IParentalControlService final : public ServiceFramework<IParentalControlService> {
public:
@ -125,5 +124,4 @@ PCTL_A::PCTL_A() : ServiceFramework("pctl:a") {
RegisterHandlers(functions);
}
} // namespace PCTL
} // namespace Service
} // namespace Service::PCTL

View File

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

View File

@ -9,8 +9,7 @@
#include "core/hle/kernel/client_session.h"
#include "core/hle/service/set/set.h"
namespace Service {
namespace Set {
namespace Service::Set {
void SET::GetAvailableLanguageCodes(Kernel::HLERequestContext& ctx) {
IPC::RequestParser rp{ctx};
@ -41,5 +40,4 @@ SET::SET() : ServiceFramework("set") {
RegisterHandlers(functions);
}
} // namespace Set
} // namespace Service
} // namespace Service::Set

View File

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

View File

@ -4,8 +4,7 @@
#include "core/hle/service/set/set_cal.h"
namespace Service {
namespace Set {
namespace Service::Set {
SET_CAL::SET_CAL() : ServiceFramework("set:cal") {
static const FunctionInfo functions[] = {
@ -45,5 +44,4 @@ SET_CAL::SET_CAL() : ServiceFramework("set:cal") {
RegisterHandlers(functions);
}
} // namespace Set
} // namespace Service
} // namespace Service::Set

View File

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

View File

@ -4,8 +4,7 @@
#include "core/hle/service/set/set_fd.h"
namespace Service {
namespace Set {
namespace Service::Set {
SET_FD::SET_FD() : ServiceFramework("set:fd") {
static const FunctionInfo functions[] = {
@ -21,5 +20,4 @@ SET_FD::SET_FD() : ServiceFramework("set:fd") {
RegisterHandlers(functions);
}
} // namespace Set
} // namespace Service
} // namespace Service::Set

View File

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

View File

@ -7,8 +7,7 @@
#include "core/hle/kernel/client_port.h"
#include "core/hle/service/set/set_sys.h"
namespace Service {
namespace Set {
namespace Service::Set {
void SET_SYS::GetColorSetId(Kernel::HLERequestContext& ctx) {
@ -173,5 +172,4 @@ SET_SYS::SET_SYS() : ServiceFramework("set:sys") {
RegisterHandlers(functions);
}
} // namespace Set
} // namespace Service
} // namespace Service::Set

View File

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

Some files were not shown because too many files have changed in this diff Show More