debuggerx/eden
1
0
Fork 0
mirror of https://git.eden-emu.dev/eden-emu/eden.git synced 2026-09-26 19:11:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

2026-09-26 11:36:51

Browse Source 
Signed-off-by: lizzie <lizzie@eden-emu.dev>
This commit is contained in:
lizzie
2026-09-26 11:36:51 +00:00
committed by crueter
parent b0b8050eda
commit 0150bfc66d
299 changed files with 501 additions and 496 deletions
Download Patch File Download Diff File Expand all files Collapse all files
docs/SubsystemHLE.md
+1 -1
View File
@@ -67,7 +67,7 @@ public:
FunctionInfo{110, nullptr, "SetSystemProgramIdentification"}, FunctionInfo{110, nullptr, "SetSystemProgramIdentification"},
FunctionInfo{111, nullptr, "EnsureIdTokenCacheAsync"} FunctionInfo{111, nullptr, "EnsureIdTokenCacheAsync"}
); );
FunctionInfoBase const* FindRequest(u32 key) override { std::optional<FunctionInfoBase> FindRequest(u32 key) override {
return HandlerTableGenerateWithFind(key, functions); return HandlerTableGenerateWithFind(key, functions);
} }
}; };
src/core/hle/service/acc/acc.cpp
+24 -24
View File
@@ -139,7 +139,7 @@ private:
FunctionInfo{170, nullptr, "CreateDeviceHistoryRequest"}, // 17.0.0+ FunctionInfo{170, nullptr, "CreateDeviceHistoryRequest"}, // 17.0.0+
FunctionInfo{180, nullptr, "GetRequestForNintendoAccountReauthentication"} // 18.0.0+ FunctionInfo{180, nullptr, "GetRequestForNintendoAccountReauthentication"} // 18.0.0+
); );
FunctionInfoBase const* FindRequest(u32 key) override { std::optional<FunctionInfoBase> FindRequest(u32 key) override {
return HandlerTableGenerateWithFind(key, functions); return HandlerTableGenerateWithFind(key, functions);
} }
Common::UUID account_id; Common::UUID account_id;
@@ -167,7 +167,7 @@ public:
FunctionInfo{110, nullptr, "SetSystemProgramIdentification"}, FunctionInfo{110, nullptr, "SetSystemProgramIdentification"},
FunctionInfo{111, nullptr, "EnsureIdTokenCacheAsync"} FunctionInfo{111, nullptr, "EnsureIdTokenCacheAsync"}
); );
FunctionInfoBase const* FindRequest(u32 key) override { std::optional<FunctionInfoBase> FindRequest(u32 key) override {
return HandlerTableGenerateWithFind(key, functions); return HandlerTableGenerateWithFind(key, functions);
} }
}; };
@@ -237,7 +237,7 @@ private:
FunctionInfo{997, nullptr, "DebugUnlinkNintendoAccountAsync"}, FunctionInfo{997, nullptr, "DebugUnlinkNintendoAccountAsync"},
FunctionInfo{998, nullptr, "DebugSetAvailabilityErrorDetail"} FunctionInfo{998, nullptr, "DebugSetAvailabilityErrorDetail"}
); );
FunctionInfoBase const* FindRequest(u32 key) override { std::optional<FunctionInfoBase> FindRequest(u32 key) override {
return HandlerTableGenerateWithFind(key, functions); return HandlerTableGenerateWithFind(key, functions);
} }
}; };
@@ -256,7 +256,7 @@ public:
FunctionInfo{21, nullptr, "GetIdToken"}, FunctionInfo{21, nullptr, "GetIdToken"},
FunctionInfo{22, nullptr, "GetState"} FunctionInfo{22, nullptr, "GetState"}
); );
FunctionInfoBase const* FindRequest(u32 key) override { std::optional<FunctionInfoBase> FindRequest(u32 key) override {
return HandlerTableGenerateWithFind(key, functions); return HandlerTableGenerateWithFind(key, functions);
} }
}; };
@@ -273,7 +273,7 @@ public:
FunctionInfo{3, nullptr, "ApplyResponseAsync"}, FunctionInfo{3, nullptr, "ApplyResponseAsync"},
FunctionInfo{10, nullptr, "Suspend"} FunctionInfo{10, nullptr, "Suspend"}
); );
FunctionInfoBase const* FindRequest(u32 key) override { std::optional<FunctionInfoBase> FindRequest(u32 key) override {
return HandlerTableGenerateWithFind(key, functions); return HandlerTableGenerateWithFind(key, functions);
} }
}; };
@@ -297,7 +297,7 @@ public:
FunctionInfo{103, nullptr, "GetProfileImage"}, FunctionInfo{103, nullptr, "GetProfileImage"},
FunctionInfo{104, nullptr, "GetProfileLargeImage"} // 18.0.0+ FunctionInfo{104, nullptr, "GetProfileLargeImage"} // 18.0.0+
); );
FunctionInfoBase const* FindRequest(u32 key) override { std::optional<FunctionInfoBase> FindRequest(u32 key) override {
return HandlerTableGenerateWithFind(key, functions); return HandlerTableGenerateWithFind(key, functions);
} }
}; };
@@ -323,7 +323,7 @@ public:
FunctionInfo{221, nullptr, "RegisterUserWithProfileAsync"}, // 17.0.0+ FunctionInfo{221, nullptr, "RegisterUserWithProfileAsync"}, // 17.0.0+
FunctionInfo{230, nullptr, "RegisterUserWithLargeImageProfileAsync"} // 18.0.0+ FunctionInfo{230, nullptr, "RegisterUserWithLargeImageProfileAsync"} // 18.0.0+
); );
FunctionInfoBase const* FindRequest(u32 key) override { std::optional<FunctionInfoBase> FindRequest(u32 key) override {
return HandlerTableGenerateWithFind(key, functions); return HandlerTableGenerateWithFind(key, functions);
} }
}; };
@@ -336,7 +336,7 @@ public:
static constexpr auto functions = CreateStaticMap( static constexpr auto functions = CreateStaticMap(
FunctionInfo{0, nullptr, "GetSystemEvent"} FunctionInfo{0, nullptr, "GetSystemEvent"}
); );
FunctionInfoBase const* FindRequest(u32 key) override { std::optional<FunctionInfoBase> FindRequest(u32 key) override {
return HandlerTableGenerateWithFind(key, functions); return HandlerTableGenerateWithFind(key, functions);
} }
}; };
@@ -571,7 +571,7 @@ protected:
rb.Push(ResultSuccess); rb.Push(ResultSuccess);
} }
FunctionInfoBase const* FindRequest(u32 key) override { std::optional<FunctionInfoBase> FindRequest(u32 key) override {
return HandlerTableGenerateWithFind(key, functions); return HandlerTableGenerateWithFind(key, functions);
} }
static constexpr auto functions = CreateStaticMap( static constexpr auto functions = CreateStaticMap(
@@ -613,7 +613,7 @@ public:
static constexpr auto functions = CreateStaticMap( static constexpr auto functions = CreateStaticMap(
FunctionInfo{999, nullptr, "Dummy"} FunctionInfo{999, nullptr, "Dummy"}
); );
FunctionInfoBase const* FindRequest(u32 key) override { std::optional<FunctionInfoBase> FindRequest(u32 key) override {
return HandlerTableGenerateWithFind(key, functions); return HandlerTableGenerateWithFind(key, functions);
} }
}; };
@@ -633,7 +633,7 @@ public:
FunctionInfo{16, nullptr, "GetProfileLargeImage"}, // 18.0.0+ FunctionInfo{16, nullptr, "GetProfileLargeImage"}, // 18.0.0+
FunctionInfo{21, nullptr, "LoadIdTokenCache"} // 3.0.0+ FunctionInfo{21, nullptr, "LoadIdTokenCache"} // 3.0.0+
); );
FunctionInfoBase const* FindRequest(u32 key) override { std::optional<FunctionInfoBase> FindRequest(u32 key) override {
return HandlerTableGenerateWithFind(key, functions); return HandlerTableGenerateWithFind(key, functions);
} }
}; };
@@ -673,7 +673,7 @@ public:
ensure_token_id{std::make_shared<EnsureTokenIdCacheAsyncInterface>(system)}, ensure_token_id{std::make_shared<EnsureTokenIdCacheAsyncInterface>(system)},
profile_manager{profile_manager_} {} profile_manager{profile_manager_} {}
FunctionInfoBase const* FindRequest(u32 key) override { std::optional<FunctionInfoBase> FindRequest(u32 key) override {
return HandlerTableGenerateWithFind(key, functions); return HandlerTableGenerateWithFind(key, functions);
} }
@@ -774,7 +774,7 @@ public:
FunctionInfo{3, nullptr, "GetResult"}, FunctionInfo{3, nullptr, "GetResult"},
FunctionInfo{4, nullptr, "GetNetworkServiceLicenseKind"} FunctionInfo{4, nullptr, "GetNetworkServiceLicenseKind"}
); );
FunctionInfoBase const* FindRequest(u32 key) override { std::optional<FunctionInfoBase> FindRequest(u32 key) override {
return HandlerTableGenerateWithFind(key, functions); return HandlerTableGenerateWithFind(key, functions);
} }
}; };
@@ -806,7 +806,7 @@ public:
FunctionInfo{221, nullptr, "RegisterUserWithProfileAsync"}, // 17.0.0+ FunctionInfo{221, nullptr, "RegisterUserWithProfileAsync"}, // 17.0.0+
FunctionInfo{230, nullptr, "RegisterUserWithLargeImageProfileAsync"} // 18.0.0+ FunctionInfo{230, nullptr, "RegisterUserWithLargeImageProfileAsync"} // 18.0.0+
); );
FunctionInfoBase const* FindRequest(u32 key) override { std::optional<FunctionInfoBase> FindRequest(u32 key) override {
return HandlerTableGenerateWithFind(key, functions); return HandlerTableGenerateWithFind(key, functions);
} }
}; };
@@ -830,7 +830,7 @@ public:
FunctionInfo{23, nullptr, "IsApplicationAuthenticationCacheAvailable"}, FunctionInfo{23, nullptr, "IsApplicationAuthenticationCacheAvailable"},
FunctionInfo{24, nullptr, "InvalidateApplicationAuthenticationCache"} FunctionInfo{24, nullptr, "InvalidateApplicationAuthenticationCache"}
); );
FunctionInfoBase const* FindRequest(u32 key) override { std::optional<FunctionInfoBase> FindRequest(u32 key) override {
return HandlerTableGenerateWithFind(key, functions); return HandlerTableGenerateWithFind(key, functions);
} }
}; };
@@ -847,7 +847,7 @@ public:
FunctionInfo{2, nullptr, "IsAvailable"}, FunctionInfo{2, nullptr, "IsAvailable"},
FunctionInfo{3, nullptr, "GetSystemEvent"} FunctionInfo{3, nullptr, "GetSystemEvent"}
); );
FunctionInfoBase const* FindRequest(u32 key) override { std::optional<FunctionInfoBase> FindRequest(u32 key) override {
return HandlerTableGenerateWithFind(key, functions); return HandlerTableGenerateWithFind(key, functions);
} }
}; };
@@ -1251,7 +1251,7 @@ public:
explicit ACC_AA(std::shared_ptr<Module> module_, std::shared_ptr<ProfileManager> profile_manager_, Core::System& system_) explicit ACC_AA(std::shared_ptr<Module> module_, std::shared_ptr<ProfileManager> profile_manager_, Core::System& system_)
: Interface(std::move(module_), std::move(profile_manager_), system_, "acc:aa") {} : Interface(std::move(module_), std::move(profile_manager_), system_, "acc:aa") {}
FunctionInfoBase const* FindRequest(u32 key) override { std::optional<FunctionInfoBase> FindRequest(u32 key) override {
return HandlerTableGenerateWithFind(key, functions); return HandlerTableGenerateWithFind(key, functions);
} }
~ACC_AA() override = default; ~ACC_AA() override = default;
@@ -1272,7 +1272,7 @@ public:
~ACC_SU() override = default; ~ACC_SU() override = default;
FunctionInfoBase const* FindRequest(u32 key) override { std::optional<FunctionInfoBase> FindRequest(u32 key) override {
return HandlerTableGenerateWithFind(key, functions); return HandlerTableGenerateWithFind(key, functions);
} }
@@ -1347,7 +1347,7 @@ public:
ACC_U0(std::shared_ptr<Module> module_, std::shared_ptr<ProfileManager> profile_manager_, Core::System& system_) ACC_U0(std::shared_ptr<Module> module_, std::shared_ptr<ProfileManager> profile_manager_, Core::System& system_)
: Interface(std::move(module_), std::move(profile_manager_), system_, "acc:u0") {} : Interface(std::move(module_), std::move(profile_manager_), system_, "acc:u0") {}
FunctionInfoBase const* FindRequest(u32 key) override { std::optional<FunctionInfoBase> FindRequest(u32 key) override {
return HandlerTableGenerateWithFind(key, functions); return HandlerTableGenerateWithFind(key, functions);
} }
~ACC_U0() override = default; ~ACC_U0() override = default;
@@ -1386,7 +1386,7 @@ public:
ACC_U1(std::shared_ptr<Module> module_, std::shared_ptr<ProfileManager> profile_manager_, Core::System& system_) ACC_U1(std::shared_ptr<Module> module_, std::shared_ptr<ProfileManager> profile_manager_, Core::System& system_)
: Interface(std::move(module_), std::move(profile_manager_), system_, "acc:u1") {} : Interface(std::move(module_), std::move(profile_manager_), system_, "acc:u1") {}
FunctionInfoBase const* FindRequest(u32 key) override { std::optional<FunctionInfoBase> FindRequest(u32 key) override {
return HandlerTableGenerateWithFind(key, functions); return HandlerTableGenerateWithFind(key, functions);
} }
~ACC_U1() override = default; ~ACC_U1() override = default;
@@ -1435,7 +1435,7 @@ class DAUTH_0 final : public ServiceFramework<DAUTH_0> {
public: public:
explicit DAUTH_0(Core::System& system_) : ServiceFramework{system_, "dauth:0"} {} explicit DAUTH_0(Core::System& system_) : ServiceFramework{system_, "dauth:0"} {}
FunctionInfoBase const* FindRequest(u32 key) override { std::optional<FunctionInfoBase> FindRequest(u32 key) override {
return HandlerTableGenerateWithFind(key, functions); return HandlerTableGenerateWithFind(key, functions);
} }
@@ -1547,7 +1547,7 @@ public:
FunctionInfo{10050, nullptr, "IsUserRegistrationRequestPermittedForAccountPolicy"}, FunctionInfo{10050, nullptr, "IsUserRegistrationRequestPermittedForAccountPolicy"},
FunctionInfo{10105, nullptr, "CheckNetworkServiceAvailabilityAsyncForAccountPolicy"} FunctionInfo{10105, nullptr, "CheckNetworkServiceAvailabilityAsyncForAccountPolicy"}
); );
FunctionInfoBase const* FindRequest(u32 key) override { std::optional<FunctionInfoBase> FindRequest(u32 key) override {
return HandlerTableGenerateWithFind(key, functions); return HandlerTableGenerateWithFind(key, functions);
} }
}; };
@@ -1590,7 +1590,7 @@ public:
FunctionInfo{998, nullptr, "DebugSetUserStateClose"}, FunctionInfo{998, nullptr, "DebugSetUserStateClose"},
FunctionInfo{999, nullptr, "DebugSetUserStateOpen"} FunctionInfo{999, nullptr, "DebugSetUserStateOpen"}
); );
FunctionInfoBase const* FindRequest(u32 key) override { std::optional<FunctionInfoBase> FindRequest(u32 key) override {
return HandlerTableGenerateWithFind(key, functions); return HandlerTableGenerateWithFind(key, functions);
} }
}; };
@@ -1640,7 +1640,7 @@ public:
FunctionInfo{998, nullptr, "DebugSetUserStateClose"}, FunctionInfo{998, nullptr, "DebugSetUserStateClose"},
FunctionInfo{999, nullptr, "DebugSetUserStateOpen"} FunctionInfo{999, nullptr, "DebugSetUserStateOpen"}
); );
FunctionInfoBase const* FindRequest(u32 key) override { std::optional<FunctionInfoBase> FindRequest(u32 key) override {
return HandlerTableGenerateWithFind(key, functions); return HandlerTableGenerateWithFind(key, functions);
} }
}; };
src/core/hle/service/acc/async_context.h
+1 -1
View File
@@ -33,7 +33,7 @@ protected:
void MarkComplete(); void MarkComplete();
FunctionInfoBase const* FindRequest(u32 key) override { std::optional<FunctionInfoBase> FindRequest(u32 key) override {
return HandlerTableGenerateWithFind(key, functions); return HandlerTableGenerateWithFind(key, functions);
} }
static constexpr auto functions = CreateStaticMap( static constexpr auto functions = CreateStaticMap(
src/core/hle/service/am/am.cpp
+8 -8
View File
@@ -137,7 +137,7 @@ public:
} }
private: private:
FunctionInfoBase const* FindRequest(u32 key) override { std::optional<FunctionInfoBase> FindRequest(u32 key) override {
return HandlerTableGenerateWithFind(key, functions); return HandlerTableGenerateWithFind(key, functions);
} }
static constexpr auto functions = CreateStaticMap( static constexpr auto functions = CreateStaticMap(
@@ -184,7 +184,7 @@ public:
return m_window_system.GetByAppletResourceUserId(process_id.pid); return m_window_system.GetByAppletResourceUserId(process_id.pid);
} }
FunctionInfoBase const* FindRequest(u32 key) override { std::optional<FunctionInfoBase> FindRequest(u32 key) override {
return HandlerTableGenerateWithFind(key, functions); return HandlerTableGenerateWithFind(key, functions);
} }
static constexpr auto functions = CreateStaticMap( static constexpr auto functions = CreateStaticMap(
@@ -288,7 +288,7 @@ public:
R_SUCCEED(); R_SUCCEED();
} }
FunctionInfoBase const* FindRequest(u32 key) override { std::optional<FunctionInfoBase> FindRequest(u32 key) override {
return HandlerTableGenerateWithFind(key, functions); return HandlerTableGenerateWithFind(key, functions);
} }
static constexpr auto functions = CreateStaticMap( static constexpr auto functions = CreateStaticMap(
@@ -573,7 +573,7 @@ public:
R_SUCCEED(); R_SUCCEED();
} }
FunctionInfoBase const* FindRequest(u32 key) override { std::optional<FunctionInfoBase> FindRequest(u32 key) override {
return HandlerTableGenerateWithFind(key, functions); return HandlerTableGenerateWithFind(key, functions);
} }
static constexpr auto functions = CreateStaticMap( static constexpr auto functions = CreateStaticMap(
@@ -714,7 +714,7 @@ public:
R_SUCCEED(); R_SUCCEED();
} }
FunctionInfoBase const* FindRequest(u32 key) override { std::optional<FunctionInfoBase> FindRequest(u32 key) override {
return HandlerTableGenerateWithFind(key, functions); return HandlerTableGenerateWithFind(key, functions);
} }
static constexpr auto functions = CreateStaticMap( static constexpr auto functions = CreateStaticMap(
@@ -824,7 +824,7 @@ public:
R_SUCCEED(); R_SUCCEED();
} }
FunctionInfoBase const* FindRequest(u32 key) override { std::optional<FunctionInfoBase> FindRequest(u32 key) override {
return HandlerTableGenerateWithFind(key, functions); return HandlerTableGenerateWithFind(key, functions);
} }
static constexpr auto functions = CreateStaticMap( static constexpr auto functions = CreateStaticMap(
@@ -1093,7 +1093,7 @@ public:
R_SUCCEED(); R_SUCCEED();
} }
FunctionInfoBase const* FindRequest(u32 key) override { std::optional<FunctionInfoBase> FindRequest(u32 key) override {
return HandlerTableGenerateWithFind(key, functions); return HandlerTableGenerateWithFind(key, functions);
} }
static constexpr auto functions = CreateStaticMap( static constexpr auto functions = CreateStaticMap(
@@ -1204,7 +1204,7 @@ public:
return m_window_system.GetByAppletResourceUserId(process_id.pid); return m_window_system.GetByAppletResourceUserId(process_id.pid);
} }
FunctionInfoBase const* FindRequest(u32 key) override { std::optional<FunctionInfoBase> FindRequest(u32 key) override {
return HandlerTableGenerateWithFind(key, functions); return HandlerTableGenerateWithFind(key, functions);
} }
static constexpr auto functions = CreateStaticMap( static constexpr auto functions = CreateStaticMap(
src/core/hle/service/am/service/applet_common_functions.cpp
+1 -1
View File
@@ -12,7 +12,7 @@
namespace Service::AM { namespace Service::AM {
ServiceFrameworkBase::FunctionInfoBase const* IAppletCommonFunctions::FindRequest(u32 key) { std::optional<ServiceFrameworkBase::FunctionInfoBase> IAppletCommonFunctions::FindRequest(u32 key) {
static constexpr auto functions = CreateStaticMap( static constexpr auto functions = CreateStaticMap(
FunctionInfo{0, nullptr, "SetTerminateResult"}, FunctionInfo{0, nullptr, "SetTerminateResult"},
FunctionInfo{10, nullptr, "ReadThemeStorage"}, FunctionInfo{10, nullptr, "ReadThemeStorage"},
src/core/hle/service/am/service/applet_common_functions.h
+1 -1
View File
@@ -27,7 +27,7 @@ private:
Result SetGpuTimeSliceBoost(s64 time_span); Result SetGpuTimeSliceBoost(s64 time_span);
Result Unknown350(Out<u16> out_unknown); Result Unknown350(Out<u16> out_unknown);
FunctionInfoBase const* FindRequest(u32 key) override; std::optional<FunctionInfoBase> FindRequest(u32 key) override;
const std::shared_ptr<Applet> applet; const std::shared_ptr<Applet> applet;
}; };
src/core/hle/service/am/service/application_accessor.cpp
+1 -1
View File
@@ -18,7 +18,7 @@
namespace Service::AM { namespace Service::AM {
ServiceFrameworkBase::FunctionInfoBase const* IApplicationAccessor::FindRequest(u32 key) { std::optional<ServiceFrameworkBase::FunctionInfoBase> IApplicationAccessor::FindRequest(u32 key) {
static constexpr auto functions = CreateStaticMap( static constexpr auto functions = CreateStaticMap(
FunctionInfo{0, D<&IApplicationAccessor::GetAppletStateChangedEvent>, "GetAppletStateChangedEvent"}, FunctionInfo{0, D<&IApplicationAccessor::GetAppletStateChangedEvent>, "GetAppletStateChangedEvent"},
FunctionInfo{1, nullptr, "IsCompleted"}, FunctionInfo{1, nullptr, "IsCompleted"},
src/core/hle/service/am/service/application_accessor.h
+1 -1
View File
@@ -39,7 +39,7 @@ private:
Result GetNsRightsEnvironmentHandle(Out<u64> out_handle); Result GetNsRightsEnvironmentHandle(Out<u64> out_handle);
Result ReportApplicationExitTimeout(); Result ReportApplicationExitTimeout();
FunctionInfoBase const* FindRequest(u32 key) override; std::optional<FunctionInfoBase> FindRequest(u32 key) override;
WindowSystem& m_window_system; WindowSystem& m_window_system;
const std::shared_ptr<Applet> m_applet; const std::shared_ptr<Applet> m_applet;
}; };
src/core/hle/service/am/service/application_creator.cpp
+1 -1
View File
@@ -20,7 +20,7 @@
namespace Service::AM { namespace Service::AM {
ServiceFrameworkBase::FunctionInfoBase const* IApplicationCreator::FindRequest(u32 key) { std::optional<ServiceFrameworkBase::FunctionInfoBase> IApplicationCreator::FindRequest(u32 key) {
static constexpr auto functions = CreateStaticMap( static constexpr auto functions = CreateStaticMap(
FunctionInfo{0, D<&IApplicationCreator::CreateApplication>, "CreateApplication"}, FunctionInfo{0, D<&IApplicationCreator::CreateApplication>, "CreateApplication"},
FunctionInfo{1, nullptr, "PopLaunchRequestedApplication"}, FunctionInfo{1, nullptr, "PopLaunchRequestedApplication"},
src/core/hle/service/am/service/application_creator.h
+1 -1
View File
@@ -24,7 +24,7 @@ private:
Result CreateApplication(Out<SharedPointer<IApplicationAccessor>>, u64 application_id); Result CreateApplication(Out<SharedPointer<IApplicationAccessor>>, u64 application_id);
Result CreateSystemApplication(Out<SharedPointer<IApplicationAccessor>>, u64 application_id); Result CreateSystemApplication(Out<SharedPointer<IApplicationAccessor>>, u64 application_id);
FunctionInfoBase const* FindRequest(u32 key) override; std::optional<FunctionInfoBase> FindRequest(u32 key) override;
WindowSystem& m_window_system; WindowSystem& m_window_system;
}; };
src/core/hle/service/am/service/application_functions.cpp
+1 -1
View File
@@ -51,7 +51,7 @@ FileSys::PatchManager::Metadata GetApplicationMetadata(Core::System& system, u64
} // Anonymous namespace } // Anonymous namespace
ServiceFrameworkBase::FunctionInfoBase const* IApplicationFunctions::FindRequest(u32 key) { std::optional<ServiceFrameworkBase::FunctionInfoBase> IApplicationFunctions::FindRequest(u32 key) {
static constexpr auto functions = CreateStaticMap( static constexpr auto functions = CreateStaticMap(
FunctionInfo{1, D<&IApplicationFunctions::PopLaunchParameter>, "PopLaunchParameter"}, FunctionInfo{1, D<&IApplicationFunctions::PopLaunchParameter>, "PopLaunchParameter"},
FunctionInfo{10, nullptr, "CreateApplicationAndPushAndRequestToStart"}, FunctionInfo{10, nullptr, "CreateApplicationAndPushAndRequestToStart"},
src/core/hle/service/am/service/application_functions.h
+1 -1
View File
@@ -84,7 +84,7 @@ private:
Result GetUnknownEvent210(OutCopyHandle<Kernel::KReadableEvent> out_event); Result GetUnknownEvent210(OutCopyHandle<Kernel::KReadableEvent> out_event);
Result Unknown330(Out<u8> out); Result Unknown330(Out<u8> out);
Result PrepareForJit(); Result PrepareForJit();
FunctionInfoBase const* FindRequest(u32 key) override; std::optional<FunctionInfoBase> FindRequest(u32 key) override;
const std::shared_ptr<Applet> m_applet; const std::shared_ptr<Applet> m_applet;
}; };
src/core/hle/service/am/service/audio_controller.cpp
+1 -1
View File
@@ -9,7 +9,7 @@
namespace Service::AM { namespace Service::AM {
ServiceFrameworkBase::FunctionInfoBase const* IAudioController::FindRequest(u32 key) { std::optional<ServiceFrameworkBase::FunctionInfoBase> IAudioController::FindRequest(u32 key) {
static constexpr auto functions = CreateStaticMap( static constexpr auto functions = CreateStaticMap(
FunctionInfo{0, D<&IAudioController::SetExpectedMasterVolume>, "SetExpectedMasterVolume"}, FunctionInfo{0, D<&IAudioController::SetExpectedMasterVolume>, "SetExpectedMasterVolume"},
FunctionInfo{1, D<&IAudioController::GetMainAppletExpectedMasterVolume>, "GetMainAppletExpectedMasterVolume"}, FunctionInfo{1, D<&IAudioController::GetMainAppletExpectedMasterVolume>, "GetMainAppletExpectedMasterVolume"},
src/core/hle/service/am/service/audio_controller.h
+1 -1
View File
@@ -23,7 +23,7 @@ private:
Result ChangeMainAppletMasterVolume(f32 volume, s64 fade_time_ns); Result ChangeMainAppletMasterVolume(f32 volume, s64 fade_time_ns);
Result SetTransparentVolumeRate(f32 transparent_volume_rate); Result SetTransparentVolumeRate(f32 transparent_volume_rate);
FunctionInfoBase const* FindRequest(u32 key) override; std::optional<FunctionInfoBase> FindRequest(u32 key) override;
static constexpr float MinAllowedVolume = 0.0f; static constexpr float MinAllowedVolume = 0.0f;
static constexpr float MaxAllowedVolume = 1.0f; static constexpr float MaxAllowedVolume = 1.0f;
src/core/hle/service/am/service/common_state_getter.cpp
+2 -2
View File
@@ -17,7 +17,7 @@
namespace Service::AM { namespace Service::AM {
ServiceFrameworkBase::FunctionInfoBase const* ICommonStateGetter::FindRequest(u32 key) { std::optional<ServiceFrameworkBase::FunctionInfoBase> ICommonStateGetter::FindRequest(u32 key) {
static constexpr auto functions = CreateStaticMap( static constexpr auto functions = CreateStaticMap(
FunctionInfo{0, D<&ICommonStateGetter::GetEventHandle>, "GetEventHandle"}, FunctionInfo{0, D<&ICommonStateGetter::GetEventHandle>, "GetEventHandle"},
FunctionInfo{1, D<&ICommonStateGetter::ReceiveMessage>, "ReceiveMessage"}, FunctionInfo{1, D<&ICommonStateGetter::ReceiveMessage>, "ReceiveMessage"},
@@ -141,7 +141,7 @@ public:
} }
private: private:
FunctionInfoBase const* FindRequest(u32 key) override { std::optional<FunctionInfoBase> FindRequest(u32 key) override {
return HandlerTableGenerateWithFind(key, functions); return HandlerTableGenerateWithFind(key, functions);
} }
static constexpr auto functions = CreateStaticMap( static constexpr auto functions = CreateStaticMap(
src/core/hle/service/am/service/common_state_getter.h
+1 -1
View File
@@ -76,7 +76,7 @@ private:
void SetCpuBoostMode(HLERequestContext& ctx); void SetCpuBoostMode(HLERequestContext& ctx);
FunctionInfoBase const* FindRequest(u32 key) override; std::optional<FunctionInfoBase> FindRequest(u32 key) override;
const std::shared_ptr<Applet> m_applet; const std::shared_ptr<Applet> m_applet;
}; };
src/core/hle/service/am/service/cradle_firmware_updater.cpp
+1 -1
View File
@@ -9,7 +9,7 @@
namespace Service::AM { namespace Service::AM {
ServiceFrameworkBase::FunctionInfoBase const* ICradleFirmwareUpdater::FindRequest(u32 key) { std::optional<ServiceFrameworkBase::FunctionInfoBase> ICradleFirmwareUpdater::FindRequest(u32 key) {
static constexpr auto functions = CreateStaticMap( static constexpr auto functions = CreateStaticMap(
FunctionInfo{0, D<&ICradleFirmwareUpdater::StartUpdate>, "StartUpdate"}, FunctionInfo{0, D<&ICradleFirmwareUpdater::StartUpdate>, "StartUpdate"},
FunctionInfo{1, D<&ICradleFirmwareUpdater::FinishUpdate>, "FinishUpdate"}, FunctionInfo{1, D<&ICradleFirmwareUpdater::FinishUpdate>, "FinishUpdate"},
src/core/hle/service/am/service/cradle_firmware_updater.h
+1 -1
View File
@@ -33,7 +33,7 @@ private:
Result GetCradleDeviceInfoChangeEvent(OutCopyHandle<Kernel::KReadableEvent> out_event); Result GetCradleDeviceInfoChangeEvent(OutCopyHandle<Kernel::KReadableEvent> out_event);
private: private:
FunctionInfoBase const* FindRequest(u32 key) override; std::optional<FunctionInfoBase> FindRequest(u32 key) override;
KernelHelpers::ServiceContext m_context; KernelHelpers::ServiceContext m_context;
Event m_cradle_device_info_event; Event m_cradle_device_info_event;
}; };
src/core/hle/service/am/service/debug_functions.h
+1 -1
View File
@@ -15,7 +15,7 @@ public:
explicit IDebugFunctions(Core::System& system_); explicit IDebugFunctions(Core::System& system_);
~IDebugFunctions() override; ~IDebugFunctions() override;
FunctionInfoBase const* FindRequest(u32 key) override { std::optional<FunctionInfoBase> FindRequest(u32 key) override {
return HandlerTableGenerateWithFind(key, functions); return HandlerTableGenerateWithFind(key, functions);
} }
static constexpr auto functions = CreateStaticMap( static constexpr auto functions = CreateStaticMap(
src/core/hle/service/am/service/display_controller.cpp
+1 -1
View File
@@ -12,7 +12,7 @@
namespace Service::AM { namespace Service::AM {
ServiceFrameworkBase::FunctionInfoBase const* IDisplayController::FindRequest(u32 key) { std::optional<ServiceFrameworkBase::FunctionInfoBase> IDisplayController::FindRequest(u32 key) {
static constexpr auto functions = CreateStaticMap( static constexpr auto functions = CreateStaticMap(
FunctionInfo{0, nullptr, "GetLastForegroundCaptureImage"}, FunctionInfo{0, nullptr, "GetLastForegroundCaptureImage"},
FunctionInfo{1, nullptr, "UpdateLastForegroundCaptureImage"}, FunctionInfo{1, nullptr, "UpdateLastForegroundCaptureImage"},
src/core/hle/service/am/service/display_controller.h
+1 -1
View File
@@ -35,7 +35,7 @@ private:
Out<s32> out_fbshare_layer_index); Out<s32> out_fbshare_layer_index);
Result ReleaseLastApplicationCaptureSharedBuffer(); Result ReleaseLastApplicationCaptureSharedBuffer();
FunctionInfoBase const* FindRequest(u32 key) override; std::optional<FunctionInfoBase> FindRequest(u32 key) override;
const std::shared_ptr<Applet> applet; const std::shared_ptr<Applet> applet;
}; };
src/core/hle/service/am/service/global_state_controller.cpp
+1 -1
View File
@@ -10,7 +10,7 @@
namespace Service::AM { namespace Service::AM {
ServiceFrameworkBase::FunctionInfoBase const* IGlobalStateController::FindRequest(u32 key) { std::optional<ServiceFrameworkBase::FunctionInfoBase> IGlobalStateController::FindRequest(u32 key) {
static constexpr auto functions = CreateStaticMap( static constexpr auto functions = CreateStaticMap(
FunctionInfo{0, nullptr, "RequestToEnterSleep"}, FunctionInfo{0, nullptr, "RequestToEnterSleep"},
FunctionInfo{1, nullptr, "EnterSleep"}, FunctionInfo{1, nullptr, "EnterSleep"},
src/core/hle/service/am/service/global_state_controller.h
+1 -1
View File
@@ -28,7 +28,7 @@ private:
Result GetHdcpAuthenticationFailedEvent(OutCopyHandle<Kernel::KReadableEvent> out_event); Result GetHdcpAuthenticationFailedEvent(OutCopyHandle<Kernel::KReadableEvent> out_event);
Result OpenCradleFirmwareUpdater(Out<SharedPointer<ICradleFirmwareUpdater>> out_cradle_firmware_updater); Result OpenCradleFirmwareUpdater(Out<SharedPointer<ICradleFirmwareUpdater>> out_cradle_firmware_updater);
FunctionInfoBase const* FindRequest(u32 key) override; std::optional<FunctionInfoBase> FindRequest(u32 key) override;
KernelHelpers::ServiceContext m_context; KernelHelpers::ServiceContext m_context;
Event m_hdcp_authentication_failed_event; Event m_hdcp_authentication_failed_event;
}; };
src/core/hle/service/am/service/home_menu_functions.cpp
+1 -1
View File
@@ -14,7 +14,7 @@
namespace Service::AM { namespace Service::AM {
ServiceFrameworkBase::FunctionInfoBase const* IHomeMenuFunctions::FindRequest(u32 key) { std::optional<ServiceFrameworkBase::FunctionInfoBase> IHomeMenuFunctions::FindRequest(u32 key) {
static constexpr auto functions = CreateStaticMap( static constexpr auto functions = CreateStaticMap(
FunctionInfo{10, D<&IHomeMenuFunctions::RequestToGetForeground>, "RequestToGetForeground"}, FunctionInfo{10, D<&IHomeMenuFunctions::RequestToGetForeground>, "RequestToGetForeground"},
FunctionInfo{11, D<&IHomeMenuFunctions::LockForeground>, "LockForeground"}, FunctionInfo{11, D<&IHomeMenuFunctions::LockForeground>, "LockForeground"},
src/core/hle/service/am/service/home_menu_functions.h
+1 -1
View File
@@ -34,7 +34,7 @@ private:
Result IsForceTerminateApplicationDisabledForDebug( Result IsForceTerminateApplicationDisabledForDebug(
Out<bool> out_is_force_terminate_application_disabled_for_debug); Out<bool> out_is_force_terminate_application_disabled_for_debug);
FunctionInfoBase const* FindRequest(u32 key) override; std::optional<FunctionInfoBase> FindRequest(u32 key) override;
WindowSystem& m_window_system; WindowSystem& m_window_system;
const std::shared_ptr<Applet> m_applet; const std::shared_ptr<Applet> m_applet;
KernelHelpers::ServiceContext m_context; KernelHelpers::ServiceContext m_context;
src/core/hle/service/am/service/library_applet_accessor.cpp
+1 -1
View File
@@ -45,7 +45,7 @@ static void ReplaceEmptyUuidWithCurrentUser(const std::shared_ptr<LibraryAppletS
} }
} }
ServiceFrameworkBase::FunctionInfoBase const* ILibraryAppletAccessor::FindRequest(u32 key) { std::optional<ServiceFrameworkBase::FunctionInfoBase> ILibraryAppletAccessor::FindRequest(u32 key) {
static constexpr auto functions = CreateStaticMap( static constexpr auto functions = CreateStaticMap(
FunctionInfo{0, D<&ILibraryAppletAccessor::GetAppletStateChangedEvent>, "GetAppletStateChangedEvent"}, FunctionInfo{0, D<&ILibraryAppletAccessor::GetAppletStateChangedEvent>, "GetAppletStateChangedEvent"},
FunctionInfo{1, D<&ILibraryAppletAccessor::IsCompleted>, "IsCompleted"}, FunctionInfo{1, D<&ILibraryAppletAccessor::IsCompleted>, "IsCompleted"},
src/core/hle/service/am/service/library_applet_accessor.h
+1 -1
View File
@@ -68,7 +68,7 @@ private:
void FrontendExecuteInteractive(); void FrontendExecuteInteractive();
void FrontendRequestExit(); void FrontendRequestExit();
FunctionInfoBase const* FindRequest(u32 key) override; std::optional<FunctionInfoBase> FindRequest(u32 key) override;
const std::shared_ptr<AppletDataBroker> m_broker; const std::shared_ptr<AppletDataBroker> m_broker;
const std::shared_ptr<Applet> m_applet; const std::shared_ptr<Applet> m_applet;
}; };
src/core/hle/service/am/service/overlay_functions.cpp
+1 -1
View File
@@ -8,7 +8,7 @@
#include "core/hle/service/am/window_system.h" #include "core/hle/service/am/window_system.h"
namespace Service::AM { namespace Service::AM {
ServiceFrameworkBase::FunctionInfoBase const* IOverlayFunctions::FindRequest(u32 key) { std::optional<ServiceFrameworkBase::FunctionInfoBase> IOverlayFunctions::FindRequest(u32 key) {
static constexpr auto functions = CreateStaticMap( static constexpr auto functions = CreateStaticMap(
FunctionInfo{0, D<&IOverlayFunctions::BeginToWatchShortHomeButtonMessage>, "BeginToWatchShortHomeButtonMessage"}, FunctionInfo{0, D<&IOverlayFunctions::BeginToWatchShortHomeButtonMessage>, "BeginToWatchShortHomeButtonMessage"},
FunctionInfo{1, D<&IOverlayFunctions::EndToWatchShortHomeButtonMessage>, "EndToWatchShortHomeButtonMessage"}, FunctionInfo{1, D<&IOverlayFunctions::EndToWatchShortHomeButtonMessage>, "EndToWatchShortHomeButtonMessage"},
src/core/hle/service/am/service/overlay_functions.h
+1 -1
View File
@@ -24,7 +24,7 @@ private:
Result Unknown70(); Result Unknown70();
private: private:
FunctionInfoBase const* FindRequest(u32 key) override; std::optional<FunctionInfoBase> FindRequest(u32 key) override;
const std::shared_ptr<Applet> m_applet; const std::shared_ptr<Applet> m_applet;
}; };
} // namespace Service::AM } // namespace Service::AM
src/core/hle/service/am/service/process_winding_controller.cpp
+1 -1
View File
@@ -13,7 +13,7 @@
namespace Service::AM { namespace Service::AM {
ServiceFrameworkBase::FunctionInfoBase const* IProcessWindingController::FindRequest(u32 key) { std::optional<ServiceFrameworkBase::FunctionInfoBase> IProcessWindingController::FindRequest(u32 key) {
static constexpr auto functions = CreateStaticMap( static constexpr auto functions = CreateStaticMap(
FunctionInfo{0, D<&IProcessWindingController::GetLaunchReason>, "GetLaunchReason"}, FunctionInfo{0, D<&IProcessWindingController::GetLaunchReason>, "GetLaunchReason"},
FunctionInfo{11, D<&IProcessWindingController::OpenCallingLibraryApplet>, "OpenCallingLibraryApplet"}, FunctionInfo{11, D<&IProcessWindingController::OpenCallingLibraryApplet>, "OpenCallingLibraryApplet"},
src/core/hle/service/am/service/process_winding_controller.h
+1 -1
View File
@@ -33,7 +33,7 @@ private:
SharedPointer<ILibraryAppletAccessor> reserved_applet_accessor); SharedPointer<ILibraryAppletAccessor> reserved_applet_accessor);
Result ReserveToStartAndWait(SharedPointer<ILibraryAppletAccessor> reserved_applet_accessor); Result ReserveToStartAndWait(SharedPointer<ILibraryAppletAccessor> reserved_applet_accessor);
FunctionInfoBase const* FindRequest(u32 key) override; std::optional<FunctionInfoBase> FindRequest(u32 key) override;
const std::shared_ptr<Applet> m_applet; const std::shared_ptr<Applet> m_applet;
}; };
src/core/hle/service/am/service/self_controller.cpp
+1 -1
View File
@@ -17,7 +17,7 @@
namespace Service::AM { namespace Service::AM {
ServiceFrameworkBase::FunctionInfoBase const* ISelfController::FindRequest(u32 key) { std::optional<ServiceFrameworkBase::FunctionInfoBase> ISelfController::FindRequest(u32 key) {
static constexpr auto functions = CreateStaticMap( static constexpr auto functions = CreateStaticMap(
FunctionInfo{0, D<&ISelfController::Exit>, "Exit"}, FunctionInfo{0, D<&ISelfController::Exit>, "Exit"},
FunctionInfo{1, D<&ISelfController::LockExit>, "LockExit"}, FunctionInfo{1, D<&ISelfController::LockExit>, "LockExit"},
src/core/hle/service/am/service/self_controller.h
+1 -1
View File
@@ -70,7 +70,7 @@ private:
Result Unknown230(u32 in_val, Out<u16> out_val); Result Unknown230(u32 in_val, Out<u16> out_val);
Result Unknown240(u32 in_val); Result Unknown240(u32 in_val);
FunctionInfoBase const* FindRequest(u32 key) override; std::optional<FunctionInfoBase> FindRequest(u32 key) override;
Kernel::KProcess* const m_process; Kernel::KProcess* const m_process;
const std::shared_ptr<Applet> m_applet; const std::shared_ptr<Applet> m_applet;
}; };
src/core/hle/service/am/service/storage.cpp
+1 -1
View File
@@ -12,7 +12,7 @@
namespace Service::AM { namespace Service::AM {
ServiceFrameworkBase::FunctionInfoBase const* IStorage::FindRequest(u32 key) { std::optional<ServiceFrameworkBase::FunctionInfoBase> IStorage::FindRequest(u32 key) {
static constexpr auto functions = CreateStaticMap( static constexpr auto functions = CreateStaticMap(
FunctionInfo{0, D<&IStorage::Open>, "Open"}, FunctionInfo{0, D<&IStorage::Open>, "Open"},
FunctionInfo{1, D<&IStorage::OpenTransferStorage>, "OpenTransferStorage"} FunctionInfo{1, D<&IStorage::OpenTransferStorage>, "OpenTransferStorage"}
src/core/hle/service/am/service/storage.h
+1 -1
View File
@@ -32,7 +32,7 @@ private:
Result OpenTransferStorage( Result OpenTransferStorage(
Out<SharedPointer<ITransferStorageAccessor>> out_transfer_storage_accessor); Out<SharedPointer<ITransferStorageAccessor>> out_transfer_storage_accessor);
FunctionInfoBase const* FindRequest(u32 key) override; std::optional<FunctionInfoBase> FindRequest(u32 key) override;
const std::shared_ptr<LibraryAppletStorage> m_impl; const std::shared_ptr<LibraryAppletStorage> m_impl;
}; };
src/core/hle/service/am/service/storage_accessor.cpp
+2 -2
View File
@@ -11,7 +11,7 @@
namespace Service::AM { namespace Service::AM {
ServiceFrameworkBase::FunctionInfoBase const* IStorageAccessor::FindRequest(u32 key) { std::optional<ServiceFrameworkBase::FunctionInfoBase> IStorageAccessor::FindRequest(u32 key) {
static constexpr auto functions = CreateStaticMap( static constexpr auto functions = CreateStaticMap(
FunctionInfo{0, D<&IStorageAccessor::GetSize>, "GetSize"}, FunctionInfo{0, D<&IStorageAccessor::GetSize>, "GetSize"},
FunctionInfo{10, D<&IStorageAccessor::Write>, "Write"}, FunctionInfo{10, D<&IStorageAccessor::Write>, "Write"},
@@ -43,7 +43,7 @@ Result IStorageAccessor::Read(OutBuffer<BufferAttr_HipcAutoSelect> out_buffer, s
R_RETURN(m_impl->Read(offset, out_buffer.data(), out_buffer.size())); R_RETURN(m_impl->Read(offset, out_buffer.data(), out_buffer.size()));
} }
ServiceFrameworkBase::FunctionInfoBase const* ITransferStorageAccessor::FindRequest(u32 key) { std::optional<ServiceFrameworkBase::FunctionInfoBase> ITransferStorageAccessor::FindRequest(u32 key) {
static constexpr auto functions = CreateStaticMap( static constexpr auto functions = CreateStaticMap(
FunctionInfo{0, D<&ITransferStorageAccessor::GetSize>, "GetSize"}, FunctionInfo{0, D<&ITransferStorageAccessor::GetSize>, "GetSize"},
FunctionInfo{1, D<&ITransferStorageAccessor::GetHandle>, "GetHandle"} FunctionInfo{1, D<&ITransferStorageAccessor::GetHandle>, "GetHandle"}
src/core/hle/service/am/service/storage_accessor.h
+2 -2
View File
@@ -22,7 +22,7 @@ private:
Result Write(InBuffer<BufferAttr_HipcAutoSelect> buffer, s64 offset); Result Write(InBuffer<BufferAttr_HipcAutoSelect> buffer, s64 offset);
Result Read(OutBuffer<BufferAttr_HipcAutoSelect> out_buffer, s64 offset); Result Read(OutBuffer<BufferAttr_HipcAutoSelect> out_buffer, s64 offset);
FunctionInfoBase const* FindRequest(u32 key) override; std::optional<FunctionInfoBase> FindRequest(u32 key) override;
const std::shared_ptr<LibraryAppletStorage> m_impl; const std::shared_ptr<LibraryAppletStorage> m_impl;
}; };
@@ -36,7 +36,7 @@ private:
Result GetSize(Out<s64> out_size); Result GetSize(Out<s64> out_size);
Result GetHandle(Out<s64> out_size, OutCopyHandle<Kernel::KTransferMemory> out_handle); Result GetHandle(Out<s64> out_size, OutCopyHandle<Kernel::KTransferMemory> out_handle);
FunctionInfoBase const* FindRequest(u32 key) override; std::optional<FunctionInfoBase> FindRequest(u32 key) override;
const std::shared_ptr<LibraryAppletStorage> m_impl; const std::shared_ptr<LibraryAppletStorage> m_impl;
}; };
src/core/hle/service/am/service/window_controller.cpp
+1 -1
View File
@@ -12,7 +12,7 @@
namespace Service::AM { namespace Service::AM {
ServiceFrameworkBase::FunctionInfoBase const* IWindowController::FindRequest(u32 key) { std::optional<ServiceFrameworkBase::FunctionInfoBase> IWindowController::FindRequest(u32 key) {
static constexpr auto functions = CreateStaticMap( static constexpr auto functions = CreateStaticMap(
FunctionInfo{0, nullptr, "CreateWindow"}, FunctionInfo{0, nullptr, "CreateWindow"},
FunctionInfo{1, D<&IWindowController::GetAppletResourceUserId>, "GetAppletResourceUserId"}, FunctionInfo{1, D<&IWindowController::GetAppletResourceUserId>, "GetAppletResourceUserId"},
src/core/hle/service/am/service/window_controller.h
+1 -1
View File
@@ -29,7 +29,7 @@ private:
Result SetAppletWindowVisibility(bool visible); Result SetAppletWindowVisibility(bool visible);
Result SetAppletGpuTimeSlice(s64 time_slice); Result SetAppletGpuTimeSlice(s64 time_slice);
FunctionInfoBase const* FindRequest(u32 key) override; std::optional<FunctionInfoBase> FindRequest(u32 key) override;
WindowSystem& m_window_system; WindowSystem& m_window_system;
const std::shared_ptr<Applet> m_applet; const std::shared_ptr<Applet> m_applet;
}; };
src/core/hle/service/aoc/addon_content_manager.cpp
+1 -1
View File
@@ -28,7 +28,7 @@
namespace Service::AOC { namespace Service::AOC {
ServiceFrameworkBase::FunctionInfoBase const* IAddOnContentManager::FindRequest(u32 key) { std::optional<ServiceFrameworkBase::FunctionInfoBase> IAddOnContentManager::FindRequest(u32 key) {
static constexpr auto functions = CreateStaticMap( static constexpr auto functions = CreateStaticMap(
FunctionInfo{0, nullptr, "CountAddOnContentByApplicationId"}, FunctionInfo{0, nullptr, "CountAddOnContentByApplicationId"},
FunctionInfo{1, nullptr, "ListAddOnContentByApplicationId"}, FunctionInfo{1, nullptr, "ListAddOnContentByApplicationId"},
src/core/hle/service/aoc/addon_content_manager.h
+1 -1
View File
@@ -43,7 +43,7 @@ public:
OutInterface<IPurchaseEventManager> out_interface); OutInterface<IPurchaseEventManager> out_interface);
private: private:
FunctionInfoBase const* FindRequest(u32 key) override; std::optional<FunctionInfoBase> FindRequest(u32 key) override;
std::vector<u64> add_on_content; std::vector<u64> add_on_content;
KernelHelpers::ServiceContext service_context; KernelHelpers::ServiceContext service_context;
Kernel::KEvent* aoc_change_event; Kernel::KEvent* aoc_change_event;
src/core/hle/service/aoc/purchase_event_manager.cpp
+1 -1
View File
@@ -11,7 +11,7 @@ namespace Service::AOC {
constexpr Result ResultNoPurchasedProductInfoAvailable{ErrorModule::NIMShop, 400}; constexpr Result ResultNoPurchasedProductInfoAvailable{ErrorModule::NIMShop, 400};
ServiceFrameworkBase::FunctionInfoBase const* IPurchaseEventManager::FindRequest(u32 key) { std::optional<ServiceFrameworkBase::FunctionInfoBase> IPurchaseEventManager::FindRequest(u32 key) {
static constexpr auto functions = CreateStaticMap( static constexpr auto functions = CreateStaticMap(
FunctionInfo{0, D<&IPurchaseEventManager::SetDefaultDeliveryTarget>, "SetDefaultDeliveryTarget"}, FunctionInfo{0, D<&IPurchaseEventManager::SetDefaultDeliveryTarget>, "SetDefaultDeliveryTarget"},
FunctionInfo{1, D<&IPurchaseEventManager::SetDeliveryTarget>, "SetDeliveryTarget"}, FunctionInfo{1, D<&IPurchaseEventManager::SetDeliveryTarget>, "SetDeliveryTarget"},
src/core/hle/service/aoc/purchase_event_manager.h
+1 -1
View File
@@ -25,7 +25,7 @@ public:
Result PopPurchasedProductInfo(); Result PopPurchasedProductInfo();
Result PopPurchasedProductInfoWithUid(); Result PopPurchasedProductInfoWithUid();
FunctionInfoBase const* FindRequest(u32 key) override; std::optional<FunctionInfoBase> FindRequest(u32 key) override;
private: private:
KernelHelpers::ServiceContext service_context; KernelHelpers::ServiceContext service_context;
src/core/hle/service/apm/apm_interface.cpp
+1 -1
View File
@@ -53,7 +53,7 @@ private:
rb.Push(ResultSuccess); rb.Push(ResultSuccess);
} }
FunctionInfoBase const* FindRequest(u32 key) override { std::optional<FunctionInfoBase> FindRequest(u32 key) override {
return HandlerTableGenerateWithFind(key, functions); return HandlerTableGenerateWithFind(key, functions);
} }
static constexpr auto functions = CreateStaticMap( static constexpr auto functions = CreateStaticMap(
src/core/hle/service/apm/apm_interface.h
+2 -2
View File
@@ -24,7 +24,7 @@ private:
void GetPerformanceMode(HLERequestContext& ctx); void GetPerformanceMode(HLERequestContext& ctx);
void IsCpuOverclockEnabled(HLERequestContext& ctx); void IsCpuOverclockEnabled(HLERequestContext& ctx);
FunctionInfoBase const* FindRequest(u32 key) override { std::optional<FunctionInfoBase> FindRequest(u32 key) override {
return HandlerTableGenerateWithFind(key, functions); return HandlerTableGenerateWithFind(key, functions);
} }
static constexpr auto functions = CreateStaticMap( static constexpr auto functions = CreateStaticMap(
@@ -47,7 +47,7 @@ private:
void GetPerformanceEvent(HLERequestContext& ctx); void GetPerformanceEvent(HLERequestContext& ctx);
void GetCurrentPerformanceConfiguration(HLERequestContext& ctx); void GetCurrentPerformanceConfiguration(HLERequestContext& ctx);
FunctionInfoBase const* FindRequest(u32 key) override { std::optional<FunctionInfoBase> FindRequest(u32 key) override {
return HandlerTableGenerateWithFind(key, functions); return HandlerTableGenerateWithFind(key, functions);
} }
static constexpr auto functions = CreateStaticMap( static constexpr auto functions = CreateStaticMap(
src/core/hle/service/audio/audio.cpp
+10 -10
View File
@@ -31,7 +31,7 @@ public:
FunctionInfo{4, nullptr, "GetProcessRecordVolume"}, FunctionInfo{4, nullptr, "GetProcessRecordVolume"},
FunctionInfo{5, nullptr, "SetProcessRecordVolume"} FunctionInfo{5, nullptr, "SetProcessRecordVolume"}
); );
FunctionInfoBase const* FindRequest(u32 key) override { std::optional<FunctionInfoBase> FindRequest(u32 key) override {
return HandlerTableGenerateWithFind(key, functions); return HandlerTableGenerateWithFind(key, functions);
} }
}; };
@@ -48,7 +48,7 @@ public:
FunctionInfo{3, nullptr, "GetDspStatisticsParameter"}, FunctionInfo{3, nullptr, "GetDspStatisticsParameter"},
FunctionInfo{6, nullptr, "GetDspUsage"} FunctionInfo{6, nullptr, "GetDspUsage"}
); );
FunctionInfoBase const* FindRequest(u32 key) override { std::optional<FunctionInfoBase> FindRequest(u32 key) override {
return HandlerTableGenerateWithFind(key, functions); return HandlerTableGenerateWithFind(key, functions);
} }
}; };
@@ -64,7 +64,7 @@ public:
FunctionInfo{2, nullptr, "GetProcessMasterVolume"}, FunctionInfo{2, nullptr, "GetProcessMasterVolume"},
FunctionInfo{3, nullptr, "SetProcessMasterVolume"} FunctionInfo{3, nullptr, "SetProcessMasterVolume"}
); );
FunctionInfoBase const* FindRequest(u32 key) override { std::optional<FunctionInfoBase> FindRequest(u32 key) override {
return HandlerTableGenerateWithFind(key, functions); return HandlerTableGenerateWithFind(key, functions);
} }
}; };
@@ -84,7 +84,7 @@ public:
FunctionInfo{6, nullptr, "GetProcessRecordVolume"}, FunctionInfo{6, nullptr, "GetProcessRecordVolume"},
FunctionInfo{7, nullptr, "SetProcessRecordVolume"} FunctionInfo{7, nullptr, "SetProcessRecordVolume"}
); );
FunctionInfoBase const* FindRequest(u32 key) override { std::optional<FunctionInfoBase> FindRequest(u32 key) override {
return HandlerTableGenerateWithFind(key, functions); return HandlerTableGenerateWithFind(key, functions);
} }
}; };
@@ -98,7 +98,7 @@ public:
FunctionInfo{0, nullptr, "RequestSuspend"}, FunctionInfo{0, nullptr, "RequestSuspend"},
FunctionInfo{1, nullptr, "RequestResume"} FunctionInfo{1, nullptr, "RequestResume"}
); );
FunctionInfoBase const* FindRequest(u32 key) override { std::optional<FunctionInfoBase> FindRequest(u32 key) override {
return HandlerTableGenerateWithFind(key, functions); return HandlerTableGenerateWithFind(key, functions);
} }
}; };
@@ -112,7 +112,7 @@ public:
FunctionInfo{0, nullptr, "RequestSuspend"}, FunctionInfo{0, nullptr, "RequestSuspend"},
FunctionInfo{1, nullptr, "RequestResume"} FunctionInfo{1, nullptr, "RequestResume"}
); );
FunctionInfoBase const* FindRequest(u32 key) override { std::optional<FunctionInfoBase> FindRequest(u32 key) override {
return HandlerTableGenerateWithFind(key, functions); return HandlerTableGenerateWithFind(key, functions);
} }
}; };
@@ -126,7 +126,7 @@ public:
FunctionInfo{0, nullptr, "RequestSuspend"}, FunctionInfo{0, nullptr, "RequestSuspend"},
FunctionInfo{1, nullptr, "RequestResume"} FunctionInfo{1, nullptr, "RequestResume"}
); );
FunctionInfoBase const* FindRequest(u32 key) override { std::optional<FunctionInfoBase> FindRequest(u32 key) override {
return HandlerTableGenerateWithFind(key, functions); return HandlerTableGenerateWithFind(key, functions);
} }
}; };
@@ -140,7 +140,7 @@ public:
FunctionInfo{0, nullptr, "RequestSuspend"}, FunctionInfo{0, nullptr, "RequestSuspend"},
FunctionInfo{1, nullptr, "RequestResume"} FunctionInfo{1, nullptr, "RequestResume"}
); );
FunctionInfoBase const* FindRequest(u32 key) override { std::optional<FunctionInfoBase> FindRequest(u32 key) override {
return HandlerTableGenerateWithFind(key, functions); return HandlerTableGenerateWithFind(key, functions);
} }
}; };
@@ -163,7 +163,7 @@ public:
FunctionInfo{9, nullptr, "SetAudioOutputProcessRecordVolume"}, FunctionInfo{9, nullptr, "SetAudioOutputProcessRecordVolume"},
FunctionInfo{10, nullptr, "GetAppletStateSummaries"} FunctionInfo{10, nullptr, "GetAppletStateSummaries"}
); );
FunctionInfoBase const* FindRequest(u32 key) override { std::optional<FunctionInfoBase> FindRequest(u32 key) override {
return HandlerTableGenerateWithFind(key, functions); return HandlerTableGenerateWithFind(key, functions);
} }
}; };
@@ -177,7 +177,7 @@ public:
FunctionInfo{0, nullptr, "RequestSuspendAudioForDebug"}, FunctionInfo{0, nullptr, "RequestSuspendAudioForDebug"},
FunctionInfo{1, nullptr, "RequestResumeAudioForDebug"} FunctionInfo{1, nullptr, "RequestResumeAudioForDebug"}
); );
FunctionInfoBase const* FindRequest(u32 key) override { std::optional<FunctionInfoBase> FindRequest(u32 key) override {
return HandlerTableGenerateWithFind(key, functions); return HandlerTableGenerateWithFind(key, functions);
} }
}; };
src/core/hle/service/audio/audio_controller.cpp
+1 -1
View File
@@ -20,7 +20,7 @@
namespace Service::Audio { namespace Service::Audio {
ServiceFrameworkBase::FunctionInfoBase const* IAudioController::FindRequest(u32 key) { std::optional<ServiceFrameworkBase::FunctionInfoBase> IAudioController::FindRequest(u32 key) {
static constexpr auto functions = CreateStaticMap( static constexpr auto functions = CreateStaticMap(
FunctionInfo{0, D<&IAudioController::GetTargetVolume>, "GetTargetVolume"}, FunctionInfo{0, D<&IAudioController::GetTargetVolume>, "GetTargetVolume"},
FunctionInfo{1, D<&IAudioController::SetTargetVolume>, "SetTargetVolume"}, FunctionInfo{1, D<&IAudioController::SetTargetVolume>, "SetTargetVolume"},
src/core/hle/service/audio/audio_controller.h
+1 -1
View File
@@ -59,7 +59,7 @@ private:
Result AcquireTargetNotification(OutCopyHandle<Kernel::KReadableEvent> out_notification_event); Result AcquireTargetNotification(OutCopyHandle<Kernel::KReadableEvent> out_notification_event);
Result Unknown5000(Out<SharedPointer<IAudioController>> out_audio_controller); Result Unknown5000(Out<SharedPointer<IAudioController>> out_audio_controller);
FunctionInfoBase const* FindRequest(u32 key) override; std::optional<FunctionInfoBase> FindRequest(u32 key) override;
KernelHelpers::ServiceContext service_context; KernelHelpers::ServiceContext service_context;
Kernel::KEvent* notification_event; Kernel::KEvent* notification_event;
std::shared_ptr<Service::Set::ISystemSettingsServer> m_set_sys; std::shared_ptr<Service::Set::ISystemSettingsServer> m_set_sys;
src/core/hle/service/audio/audio_device.cpp
+1 -1
View File
@@ -12,7 +12,7 @@
namespace Service::Audio { namespace Service::Audio {
using namespace AudioCore::Renderer; using namespace AudioCore::Renderer;
ServiceFrameworkBase::FunctionInfoBase const* IAudioDevice::FindRequest(u32 key) { std::optional<ServiceFrameworkBase::FunctionInfoBase> IAudioDevice::FindRequest(u32 key) {
static constexpr auto functions = CreateStaticMap( static constexpr auto functions = CreateStaticMap(
FunctionInfo{0, D<&IAudioDevice::ListAudioDeviceName>, "ListAudioDeviceName"}, FunctionInfo{0, D<&IAudioDevice::ListAudioDeviceName>, "ListAudioDeviceName"},
FunctionInfo{1, D<&IAudioDevice::SetAudioDeviceOutputVolume>, "SetAudioDeviceOutputVolume"}, FunctionInfo{1, D<&IAudioDevice::SetAudioDeviceOutputVolume>, "SetAudioDeviceOutputVolume"},
src/core/hle/service/audio/audio_device.h
+1 -1
View File
@@ -55,7 +55,7 @@ private:
Result SetAudioDeviceOutputVolumeAutoTuneEnabled(bool enabled); Result SetAudioDeviceOutputVolumeAutoTuneEnabled(bool enabled);
Result IsAudioDeviceOutputVolumeAutoTuneEnabled(Out<bool> out_enabled); Result IsAudioDeviceOutputVolumeAutoTuneEnabled(Out<bool> out_enabled);
FunctionInfoBase const* FindRequest(u32 key) override; std::optional<FunctionInfoBase> FindRequest(u32 key) override;
KernelHelpers::ServiceContext service_context; KernelHelpers::ServiceContext service_context;
std::unique_ptr<AudioCore::Renderer::AudioDevice> impl; std::unique_ptr<AudioCore::Renderer::AudioDevice> impl;
Kernel::KEvent* event; Kernel::KEvent* event;
src/core/hle/service/audio/audio_in.cpp
+1 -1
View File
@@ -11,7 +11,7 @@
namespace Service::Audio { namespace Service::Audio {
using namespace AudioCore::AudioIn; using namespace AudioCore::AudioIn;
ServiceFrameworkBase::FunctionInfoBase const* IAudioIn::FindRequest(u32 key) { std::optional<ServiceFrameworkBase::FunctionInfoBase> IAudioIn::FindRequest(u32 key) {
static constexpr auto functions = CreateStaticMap( static constexpr auto functions = CreateStaticMap(
FunctionInfo{0, D<&IAudioIn::GetAudioInState>, "GetAudioInState"}, FunctionInfo{0, D<&IAudioIn::GetAudioInState>, "GetAudioInState"},
FunctionInfo{1, D<&IAudioIn::Start>, "Start"}, FunctionInfo{1, D<&IAudioIn::Start>, "Start"},
src/core/hle/service/audio/audio_in.h
+1 -1
View File
@@ -46,7 +46,7 @@ public:
Result FlushAudioInBuffers(Out<bool> out_flushed); Result FlushAudioInBuffers(Out<bool> out_flushed);
private: private:
FunctionInfoBase const* FindRequest(u32 key) override; std::optional<FunctionInfoBase> FindRequest(u32 key) override;
Kernel::KProcess* process; Kernel::KProcess* process;
KernelHelpers::ServiceContext service_context; KernelHelpers::ServiceContext service_context;
Kernel::KEvent* event; Kernel::KEvent* event;
src/core/hle/service/audio/audio_in_manager.cpp
+1 -1
View File
@@ -12,7 +12,7 @@
namespace Service::Audio { namespace Service::Audio {
using namespace AudioCore::AudioIn; using namespace AudioCore::AudioIn;
ServiceFrameworkBase::FunctionInfoBase const* IAudioInManager::FindRequest(u32 key) { std::optional<ServiceFrameworkBase::FunctionInfoBase> IAudioInManager::FindRequest(u32 key) {
static constexpr auto functions = CreateStaticMap( static constexpr auto functions = CreateStaticMap(
FunctionInfo{0, D<&IAudioInManager::ListAudioIns>, "ListAudioIns"}, FunctionInfo{0, D<&IAudioInManager::ListAudioIns>, "ListAudioIns"},
FunctionInfo{1, D<&IAudioInManager::OpenAudioIn>, "OpenAudioIn"}, FunctionInfo{1, D<&IAudioInManager::OpenAudioIn>, "OpenAudioIn"},
src/core/hle/service/audio/audio_in_manager.h
+1 -1
View File
@@ -54,7 +54,7 @@ private:
AudioCore::AudioIn::AudioInParameter parameter, AudioCore::AudioIn::AudioInParameter parameter,
InCopyHandle<Kernel::KProcess> process_handle, ClientAppletResourceUserId aruid); InCopyHandle<Kernel::KProcess> process_handle, ClientAppletResourceUserId aruid);
FunctionInfoBase const* FindRequest(u32 key) override; std::optional<FunctionInfoBase> FindRequest(u32 key) override;
std::unique_ptr<AudioCore::AudioIn::Manager> impl; std::unique_ptr<AudioCore::AudioIn::Manager> impl;
}; };
src/core/hle/service/audio/audio_out.cpp
+1 -1
View File
@@ -15,7 +15,7 @@
namespace Service::Audio { namespace Service::Audio {
using namespace AudioCore::AudioOut; using namespace AudioCore::AudioOut;
ServiceFrameworkBase::FunctionInfoBase const* IAudioOut::FindRequest(u32 key) { std::optional<ServiceFrameworkBase::FunctionInfoBase> IAudioOut::FindRequest(u32 key) {
static constexpr auto functions = CreateStaticMap( static constexpr auto functions = CreateStaticMap(
FunctionInfo{0, D<&IAudioOut::GetAudioOutState>, "GetAudioOutState"}, FunctionInfo{0, D<&IAudioOut::GetAudioOutState>, "GetAudioOutState"},
FunctionInfo{1, D<&IAudioOut::Start>, "Start"}, FunctionInfo{1, D<&IAudioOut::Start>, "Start"},
src/core/hle/service/audio/audio_out.h
+1 -1
View File
@@ -52,7 +52,7 @@ public:
Result GetAudioOutVolume(Out<f32> out_volume); Result GetAudioOutVolume(Out<f32> out_volume);
private: private:
FunctionInfoBase const* FindRequest(u32 key) override; std::optional<FunctionInfoBase> FindRequest(u32 key) override;
KernelHelpers::ServiceContext service_context; KernelHelpers::ServiceContext service_context;
Kernel::KEvent* event; Kernel::KEvent* event;
src/core/hle/service/audio/audio_out_manager.cpp
+1 -1
View File
@@ -13,7 +13,7 @@
namespace Service::Audio { namespace Service::Audio {
using namespace AudioCore::AudioOut; using namespace AudioCore::AudioOut;
ServiceFrameworkBase::FunctionInfoBase const* IAudioOutManager::FindRequest(u32 key) { std::optional<ServiceFrameworkBase::FunctionInfoBase> IAudioOutManager::FindRequest(u32 key) {
static constexpr auto functions = CreateStaticMap( static constexpr auto functions = CreateStaticMap(
FunctionInfo{0, D<&IAudioOutManager::ListAudioOuts>, "ListAudioOuts"}, FunctionInfo{0, D<&IAudioOutManager::ListAudioOuts>, "ListAudioOuts"},
FunctionInfo{1, D<&IAudioOutManager::OpenAudioOut>, "OpenAudioOut"}, FunctionInfo{1, D<&IAudioOutManager::OpenAudioOut>, "OpenAudioOut"},
src/core/hle/service/audio/audio_out_manager.h
+1 -1
View File
@@ -43,7 +43,7 @@ private:
AudioCore::AudioOut::AudioOutParameter parameter, AudioCore::AudioOut::AudioOutParameter parameter,
InCopyHandle<Kernel::KProcess> process_handle, ClientAppletResourceUserId aruid); InCopyHandle<Kernel::KProcess> process_handle, ClientAppletResourceUserId aruid);
FunctionInfoBase const* FindRequest(u32 key) override; std::optional<FunctionInfoBase> FindRequest(u32 key) override;
std::optional<AudioCore::AudioOut::Manager> impl; std::optional<AudioCore::AudioOut::Manager> impl;
}; };
src/core/hle/service/audio/audio_renderer.cpp
+1 -1
View File
@@ -10,7 +10,7 @@
namespace Service::Audio { namespace Service::Audio {
using namespace AudioCore::Renderer; using namespace AudioCore::Renderer;
ServiceFrameworkBase::FunctionInfoBase const* IAudioRenderer::FindRequest(u32 key) { std::optional<ServiceFrameworkBase::FunctionInfoBase> IAudioRenderer::FindRequest(u32 key) {
static constexpr auto functions = CreateStaticMap( static constexpr auto functions = CreateStaticMap(
FunctionInfo{0, D<&IAudioRenderer::GetSampleRate>, "GetSampleRate"}, FunctionInfo{0, D<&IAudioRenderer::GetSampleRate>, "GetSampleRate"},
FunctionInfo{1, D<&IAudioRenderer::GetSampleCount>, "GetSampleCount"}, FunctionInfo{1, D<&IAudioRenderer::GetSampleCount>, "GetSampleCount"},
src/core/hle/service/audio/audio_renderer.h
+1 -1
View File
@@ -45,7 +45,7 @@ private:
Result SetVoiceDropParameter(f32 voice_drop_parameter); Result SetVoiceDropParameter(f32 voice_drop_parameter);
Result GetVoiceDropParameter(Out<f32> out_voice_drop_parameter); Result GetVoiceDropParameter(Out<f32> out_voice_drop_parameter);
FunctionInfoBase const* FindRequest(u32 key) override; std::optional<FunctionInfoBase> FindRequest(u32 key) override;
KernelHelpers::ServiceContext service_context; KernelHelpers::ServiceContext service_context;
Kernel::KEvent* rendered_event; Kernel::KEvent* rendered_event;
AudioCore::Renderer::Manager& manager; AudioCore::Renderer::Manager& manager;
src/core/hle/service/audio/audio_renderer_manager.cpp
+1 -1
View File
@@ -18,7 +18,7 @@ namespace Service::Audio {
using namespace AudioCore::Renderer; using namespace AudioCore::Renderer;
ServiceFrameworkBase::FunctionInfoBase const* IAudioRendererManager::FindRequest(u32 key) { std::optional<ServiceFrameworkBase::FunctionInfoBase> IAudioRendererManager::FindRequest(u32 key) {
static constexpr auto functions = CreateStaticMap( static constexpr auto functions = CreateStaticMap(
FunctionInfo{0, D<&IAudioRendererManager::OpenAudioRenderer>, "OpenAudioRenderer"}, FunctionInfo{0, D<&IAudioRendererManager::OpenAudioRenderer>, "OpenAudioRenderer"},
FunctionInfo{1, D<&IAudioRendererManager::GetWorkBufferSize>, "GetWorkBufferSize"}, FunctionInfo{1, D<&IAudioRendererManager::GetWorkBufferSize>, "GetWorkBufferSize"},
src/core/hle/service/audio/audio_renderer_manager.h
+1 -1
View File
@@ -33,7 +33,7 @@ private:
Result GetAudioDeviceServiceWithRevisionInfo(Out<SharedPointer<IAudioDevice>> out_audio_device, Result GetAudioDeviceServiceWithRevisionInfo(Out<SharedPointer<IAudioDevice>> out_audio_device,
u32 revision, ClientAppletResourceUserId aruid); u32 revision, ClientAppletResourceUserId aruid);
FunctionInfoBase const* FindRequest(u32 key) override; std::optional<FunctionInfoBase> FindRequest(u32 key) override;
std::optional<AudioCore::Renderer::Manager> impl; std::optional<AudioCore::Renderer::Manager> impl;
u32 num_audio_devices{0}; u32 num_audio_devices{0};
}; };
src/core/hle/service/audio/final_output_recorder_manager.cpp
+1 -1
View File
@@ -27,7 +27,7 @@ public:
FunctionInfo{10, nullptr, "FlushFinalOutputRecorderBuffers"}, FunctionInfo{10, nullptr, "FlushFinalOutputRecorderBuffers"},
FunctionInfo{11, nullptr, "AttachWorkBuffer"} FunctionInfo{11, nullptr, "AttachWorkBuffer"}
); );
FunctionInfoBase const* FindRequest(u32 key) override { std::optional<FunctionInfoBase> FindRequest(u32 key) override {
return HandlerTableGenerateWithFind(key, functions); return HandlerTableGenerateWithFind(key, functions);
} }
}; };
src/core/hle/service/audio/final_output_recorder_manager.h
+1 -1
View File
@@ -19,7 +19,7 @@ public:
explicit IFinalOutputRecorderManager(Core::System& system_); explicit IFinalOutputRecorderManager(Core::System& system_);
~IFinalOutputRecorderManager() override; ~IFinalOutputRecorderManager() override;
FunctionInfoBase const* FindRequest(u32 key) override { std::optional<FunctionInfoBase> FindRequest(u32 key) override {
return HandlerTableGenerateWithFind(key, functions); return HandlerTableGenerateWithFind(key, functions);
} }
static constexpr auto functions = CreateStaticMap( static constexpr auto functions = CreateStaticMap(
src/core/hle/service/audio/final_output_recorder_manager_for_applet.h
+1 -1
View File
@@ -20,7 +20,7 @@ public:
explicit IFinalOutputRecorderManagerForApplet(Core::System& system_); explicit IFinalOutputRecorderManagerForApplet(Core::System& system_);
~IFinalOutputRecorderManagerForApplet() override; ~IFinalOutputRecorderManagerForApplet() override;
FunctionInfoBase const* FindRequest(u32 key) override { std::optional<FunctionInfoBase> FindRequest(u32 key) override {
return HandlerTableGenerateWithFind(key, functions); return HandlerTableGenerateWithFind(key, functions);
} }
static constexpr auto functions = CreateStaticMap( static constexpr auto functions = CreateStaticMap(
src/core/hle/service/audio/hardware_opus_decoder.cpp
+1 -1
View File
@@ -11,7 +11,7 @@ namespace Service::Audio {
using namespace AudioCore::OpusDecoder; using namespace AudioCore::OpusDecoder;
ServiceFrameworkBase::FunctionInfoBase const* IHardwareOpusDecoder::FindRequest(u32 key) { std::optional<ServiceFrameworkBase::FunctionInfoBase> IHardwareOpusDecoder::FindRequest(u32 key) {
static constexpr auto functions = CreateStaticMap( static constexpr auto functions = CreateStaticMap(
FunctionInfo{0, D<&IHardwareOpusDecoder::DecodeInterleavedOld>, "DecodeInterleavedOld"}, FunctionInfo{0, D<&IHardwareOpusDecoder::DecodeInterleavedOld>, "DecodeInterleavedOld"},
FunctionInfo{1, D<&IHardwareOpusDecoder::SetContext>, "SetContext"}, FunctionInfo{1, D<&IHardwareOpusDecoder::SetContext>, "SetContext"},
src/core/hle/service/audio/hardware_opus_decoder.h
+1 -1
View File
@@ -58,7 +58,7 @@ private:
Out<u32> out_data_size, Out<u32> out_sample_count, Out<u64> out_time_taken, Out<u32> out_data_size, Out<u32> out_sample_count, Out<u64> out_time_taken,
InBuffer<BufferAttr_HipcMapAlias | BufferAttr_HipcMapTransferAllowsNonSecure> opus_data, InBuffer<BufferAttr_HipcMapAlias | BufferAttr_HipcMapTransferAllowsNonSecure> opus_data,
bool reset); bool reset);
FunctionInfoBase const* FindRequest(u32 key) override; std::optional<FunctionInfoBase> FindRequest(u32 key) override;
std::unique_ptr<AudioCore::OpusDecoder::OpusDecoder> impl; std::unique_ptr<AudioCore::OpusDecoder::OpusDecoder> impl;
Common::ScratchBuffer<u8> output_data; Common::ScratchBuffer<u8> output_data;
src/core/hle/service/audio/hardware_opus_decoder_manager.cpp
+1 -1
View File
@@ -12,7 +12,7 @@ namespace Service::Audio {
using namespace AudioCore::OpusDecoder; using namespace AudioCore::OpusDecoder;
ServiceFrameworkBase::FunctionInfoBase const* IHardwareOpusDecoderManager::FindRequest(u32 key) { std::optional<ServiceFrameworkBase::FunctionInfoBase> IHardwareOpusDecoderManager::FindRequest(u32 key) {
static constexpr auto functions = CreateStaticMap( static constexpr auto functions = CreateStaticMap(
FunctionInfo{0, D<&IHardwareOpusDecoderManager::OpenHardwareOpusDecoder>, "OpenHardwareOpusDecoder"}, FunctionInfo{0, D<&IHardwareOpusDecoderManager::OpenHardwareOpusDecoder>, "OpenHardwareOpusDecoder"},
FunctionInfo{1, D<&IHardwareOpusDecoderManager::GetWorkBufferSize>, "GetWorkBufferSize"}, FunctionInfo{1, D<&IHardwareOpusDecoderManager::GetWorkBufferSize>, "GetWorkBufferSize"},
src/core/hle/service/audio/hardware_opus_decoder_manager.h
+1 -1
View File
@@ -49,7 +49,7 @@ private:
Result GetWorkBufferSizeForMultiStreamExEx( Result GetWorkBufferSizeForMultiStreamExEx(
Out<u32> out_size, InLargeData<OpusMultiStreamParametersEx, BufferAttr_HipcPointer> params); Out<u32> out_size, InLargeData<OpusMultiStreamParametersEx, BufferAttr_HipcPointer> params);
FunctionInfoBase const* FindRequest(u32 key) override; std::optional<FunctionInfoBase> FindRequest(u32 key) override;
Core::System& system; Core::System& system;
AudioCore::OpusDecoder::OpusDecoderManager impl; AudioCore::OpusDecoder::OpusDecoderManager impl;
}; };
src/core/hle/service/bcat/bcat_service.cpp
+1 -1
View File
@@ -24,7 +24,7 @@ static u64 GetCurrentBuildID(const Core::System::CurrentBuildProcessID& id) {
return out; return out;
} }
ServiceFrameworkBase::FunctionInfoBase const* IBcatService::FindRequest(u32 key) { std::optional<ServiceFrameworkBase::FunctionInfoBase> IBcatService::FindRequest(u32 key) {
static constexpr auto functions = CreateStaticMap( static constexpr auto functions = CreateStaticMap(
FunctionInfo{10100, D<&IBcatService::RequestSyncDeliveryCache>, "RequestSyncDeliveryCache"}, FunctionInfo{10100, D<&IBcatService::RequestSyncDeliveryCache>, "RequestSyncDeliveryCache"},
FunctionInfo{10101, D<&IBcatService::RequestSyncDeliveryCacheWithDirectoryName>, "RequestSyncDeliveryCacheWithDirectoryName"}, FunctionInfo{10101, D<&IBcatService::RequestSyncDeliveryCacheWithDirectoryName>, "RequestSyncDeliveryCacheWithDirectoryName"},
src/core/hle/service/bcat/bcat_service.h
+1 -1
View File
@@ -41,7 +41,7 @@ private:
ProgressServiceBackend& GetProgressBackend(SyncType type); ProgressServiceBackend& GetProgressBackend(SyncType type);
const ProgressServiceBackend& GetProgressBackend(SyncType type) const; const ProgressServiceBackend& GetProgressBackend(SyncType type) const;
FunctionInfoBase const* FindRequest(u32 key) override; std::optional<FunctionInfoBase> FindRequest(u32 key) override;
BcatBackend& backend; BcatBackend& backend;
u64 program_id; u64 program_id;
std::array<ProgressServiceBackend, static_cast<size_t>(SyncType::Count)> progress; std::array<ProgressServiceBackend, static_cast<size_t>(SyncType::Count)> progress;
src/core/hle/service/bcat/delivery_cache_directory_service.cpp
+1 -1
View File
@@ -27,7 +27,7 @@ static BcatDigest DigestFile(const FileSys::VirtualFile& file) {
return out; return out;
} }
ServiceFrameworkBase::FunctionInfoBase const* IDeliveryCacheDirectoryService::FindRequest(u32 key) { std::optional<ServiceFrameworkBase::FunctionInfoBase> IDeliveryCacheDirectoryService::FindRequest(u32 key) {
static constexpr auto functions = CreateStaticMap( static constexpr auto functions = CreateStaticMap(
FunctionInfo{0, D<&IDeliveryCacheDirectoryService::Open>, "Open"}, FunctionInfo{0, D<&IDeliveryCacheDirectoryService::Open>, "Open"},
FunctionInfo{1, D<&IDeliveryCacheDirectoryService::Read>, "Read"}, FunctionInfo{1, D<&IDeliveryCacheDirectoryService::Read>, "Read"},
src/core/hle/service/bcat/delivery_cache_directory_service.h
+1 -1
View File
@@ -29,7 +29,7 @@ private:
OutArray<DeliveryCacheDirectoryEntry, BufferAttr_HipcMapAlias> out_buffer); OutArray<DeliveryCacheDirectoryEntry, BufferAttr_HipcMapAlias> out_buffer);
Result GetCount(Out<s32> out_count); Result GetCount(Out<s32> out_count);
FunctionInfoBase const* FindRequest(u32 key) override; std::optional<FunctionInfoBase> FindRequest(u32 key) override;
FileSys::VirtualDir root; FileSys::VirtualDir root;
FileSys::VirtualDir current_dir; FileSys::VirtualDir current_dir;
}; };
src/core/hle/service/bcat/delivery_cache_file_service.cpp
+1 -1
View File
@@ -12,7 +12,7 @@
namespace Service::BCAT { namespace Service::BCAT {
ServiceFrameworkBase::FunctionInfoBase const* IDeliveryCacheFileService::FindRequest(u32 key) { std::optional<ServiceFrameworkBase::FunctionInfoBase> IDeliveryCacheFileService::FindRequest(u32 key) {
static constexpr auto functions = CreateStaticMap( static constexpr auto functions = CreateStaticMap(
FunctionInfo{0, D<&IDeliveryCacheFileService::Open>, "Open"}, FunctionInfo{0, D<&IDeliveryCacheFileService::Open>, "Open"},
FunctionInfo{1, D<&IDeliveryCacheFileService::Read>, "Read"}, FunctionInfo{1, D<&IDeliveryCacheFileService::Read>, "Read"},
src/core/hle/service/bcat/delivery_cache_file_service.h
+1 -1
View File
@@ -29,7 +29,7 @@ private:
Result GetSize(Out<u64> out_size); Result GetSize(Out<u64> out_size);
Result GetDigest(Out<BcatDigest> out_digest); Result GetDigest(Out<BcatDigest> out_digest);
FunctionInfoBase const* FindRequest(u32 key) override; std::optional<FunctionInfoBase> FindRequest(u32 key) override;
FileSys::VirtualDir root; FileSys::VirtualDir root;
FileSys::VirtualFile current_file; FileSys::VirtualFile current_file;
}; };
src/core/hle/service/bcat/delivery_cache_progress_service.cpp
+1 -1
View File
@@ -10,7 +10,7 @@
namespace Service::BCAT { namespace Service::BCAT {
ServiceFrameworkBase::FunctionInfoBase const* IDeliveryCacheProgressService::FindRequest(u32 key) { std::optional<ServiceFrameworkBase::FunctionInfoBase> IDeliveryCacheProgressService::FindRequest(u32 key) {
static constexpr auto functions = CreateStaticMap( static constexpr auto functions = CreateStaticMap(
FunctionInfo{0, D<&IDeliveryCacheProgressService::GetEvent>, "GetEvent"}, FunctionInfo{0, D<&IDeliveryCacheProgressService::GetEvent>, "GetEvent"},
FunctionInfo{1, D<&IDeliveryCacheProgressService::GetImpl>, "GetImpl"} FunctionInfo{1, D<&IDeliveryCacheProgressService::GetImpl>, "GetImpl"}
src/core/hle/service/bcat/delivery_cache_progress_service.h
+1 -1
View File
@@ -31,7 +31,7 @@ private:
Result GetEvent(OutCopyHandle<Kernel::KReadableEvent> out_event); Result GetEvent(OutCopyHandle<Kernel::KReadableEvent> out_event);
Result GetImpl(OutLargeData<DeliveryCacheProgressImpl, BufferAttr_HipcPointer> out_impl); Result GetImpl(OutLargeData<DeliveryCacheProgressImpl, BufferAttr_HipcPointer> out_impl);
FunctionInfoBase const* FindRequest(u32 key) override; std::optional<FunctionInfoBase> FindRequest(u32 key) override;
Kernel::KReadableEvent& event; Kernel::KReadableEvent& event;
const DeliveryCacheProgressImpl& impl; const DeliveryCacheProgressImpl& impl;
}; };
src/core/hle/service/bcat/delivery_cache_storage_service.cpp
+1 -1
View File
@@ -12,7 +12,7 @@
namespace Service::BCAT { namespace Service::BCAT {
ServiceFrameworkBase::FunctionInfoBase const* IDeliveryCacheStorageService::FindRequest(u32 key) { std::optional<ServiceFrameworkBase::FunctionInfoBase> IDeliveryCacheStorageService::FindRequest(u32 key) {
static constexpr auto functions = CreateStaticMap( static constexpr auto functions = CreateStaticMap(
FunctionInfo{0, D<&IDeliveryCacheStorageService::CreateFileService>, "CreateFileService"}, FunctionInfo{0, D<&IDeliveryCacheStorageService::CreateFileService>, "CreateFileService"},
FunctionInfo{1, D<&IDeliveryCacheStorageService::CreateDirectoryService>, "CreateDirectoryService"}, FunctionInfo{1, D<&IDeliveryCacheStorageService::CreateDirectoryService>, "CreateDirectoryService"},
src/core/hle/service/bcat/delivery_cache_storage_service.h
+1 -1
View File
@@ -31,7 +31,7 @@ private:
Out<s32> out_directory_count, Out<s32> out_directory_count,
OutArray<DirectoryName, BufferAttr_HipcMapAlias> out_directories); OutArray<DirectoryName, BufferAttr_HipcMapAlias> out_directories);
FunctionInfoBase const* FindRequest(u32 key) override; std::optional<FunctionInfoBase> FindRequest(u32 key) override;
FileSys::VirtualDir root; FileSys::VirtualDir root;
std::vector<DirectoryName> entries; std::vector<DirectoryName> entries;
std::size_t next_read_index = 0; std::size_t next_read_index = 0;
src/core/hle/service/bcat/news/newly_arrived_event_holder.cpp
+1 -1
View File
@@ -9,7 +9,7 @@
namespace Service::News { namespace Service::News {
ServiceFrameworkBase::FunctionInfoBase const* INewlyArrivedEventHolder::FindRequest(u32 key) { std::optional<ServiceFrameworkBase::FunctionInfoBase> INewlyArrivedEventHolder::FindRequest(u32 key) {
static constexpr auto functions = CreateStaticMap( static constexpr auto functions = CreateStaticMap(
FunctionInfo{0, D<&INewlyArrivedEventHolder::Get>, "Get"} FunctionInfo{0, D<&INewlyArrivedEventHolder::Get>, "Get"}
); );
src/core/hle/service/bcat/news/newly_arrived_event_holder.h
+1 -1
View File
@@ -29,7 +29,7 @@ public:
private: private:
Result Get(OutCopyHandle<Kernel::KReadableEvent> out_event); Result Get(OutCopyHandle<Kernel::KReadableEvent> out_event);
FunctionInfoBase const* FindRequest(u32 key) override; std::optional<FunctionInfoBase> FindRequest(u32 key) override;
Kernel::KEvent* arrived_event; Kernel::KEvent* arrived_event;
KernelHelpers::ServiceContext service_context; KernelHelpers::ServiceContext service_context;
}; };
src/core/hle/service/bcat/news/news_data_service.cpp
+1 -1
View File
@@ -24,7 +24,7 @@ std::string_view ToStringView(std::span<const char> buf) {
} // namespace } // namespace
ServiceFrameworkBase::FunctionInfoBase const* INewsDataService::FindRequest(u32 key) { std::optional<ServiceFrameworkBase::FunctionInfoBase> INewsDataService::FindRequest(u32 key) {
static constexpr auto functions = CreateStaticMap( static constexpr auto functions = CreateStaticMap(
FunctionInfo{0, D<&INewsDataService::Open>, "Open"}, FunctionInfo{0, D<&INewsDataService::Open>, "Open"},
FunctionInfo{1, D<&INewsDataService::OpenWithNewsRecordV1>, "OpenWithNewsRecordV1"}, FunctionInfo{1, D<&INewsDataService::OpenWithNewsRecordV1>, "OpenWithNewsRecordV1"},
src/core/hle/service/bcat/news/news_data_service.h
+1 -1
View File
@@ -31,7 +31,7 @@ private:
Result Read(Out<u64> out_size, s64 offset, OutBuffer<BufferAttr_HipcMapAlias> out_buffer); Result Read(Out<u64> out_size, s64 offset, OutBuffer<BufferAttr_HipcMapAlias> out_buffer);
Result GetSize(Out<s64> out_size); Result GetSize(Out<s64> out_size);
FunctionInfoBase const* FindRequest(u32 key) override; std::optional<FunctionInfoBase> FindRequest(u32 key) override;
std::vector<u8> opened_payload; std::vector<u8> opened_payload;
}; };
src/core/hle/service/bcat/news/news_database_service.cpp
+1 -1
View File
@@ -45,7 +45,7 @@ bool UpdateField(NewsRecord& rec, std::string_view column, s32 value, bool addit
} // namespace } // namespace
ServiceFrameworkBase::FunctionInfoBase const* INewsDatabaseService::FindRequest(u32 key) { std::optional<ServiceFrameworkBase::FunctionInfoBase> INewsDatabaseService::FindRequest(u32 key) {
static constexpr auto functions = CreateStaticMap( static constexpr auto functions = CreateStaticMap(
FunctionInfo{0, D<&INewsDatabaseService::GetListV1>, "GetListV1"}, FunctionInfo{0, D<&INewsDatabaseService::GetListV1>, "GetListV1"},
FunctionInfo{1, D<&INewsDatabaseService::Count>, "Count"}, FunctionInfo{1, D<&INewsDatabaseService::Count>, "Count"},
src/core/hle/service/bcat/news/news_database_service.h
+1 -1
View File
@@ -50,7 +50,7 @@ private:
InBuffer<BufferAttr_HipcPointer> order_by_phrase, InBuffer<BufferAttr_HipcPointer> order_by_phrase,
s32 offset); s32 offset);
FunctionInfoBase const* FindRequest(u32 key) override; std::optional<FunctionInfoBase> FindRequest(u32 key) override;
}; };
} // namespace Service::News } // namespace Service::News
src/core/hle/service/bcat/news/news_service.cpp
+1 -1
View File
@@ -12,7 +12,7 @@
namespace Service::News { namespace Service::News {
ServiceFrameworkBase::FunctionInfoBase const* INewsService::FindRequest(u32 key) { std::optional<ServiceFrameworkBase::FunctionInfoBase> INewsService::FindRequest(u32 key) {
static constexpr auto functions = CreateStaticMap( static constexpr auto functions = CreateStaticMap(
FunctionInfo{10100, D<&INewsService::PostLocalNews>, "PostLocalNews"}, FunctionInfo{10100, D<&INewsService::PostLocalNews>, "PostLocalNews"},
FunctionInfo{20100, D<&INewsService::SetPassphrase>, "SetPassphrase"}, FunctionInfo{20100, D<&INewsService::SetPassphrase>, "SetPassphrase"},
src/core/hle/service/bcat/news/news_service.h
+1 -1
View File
@@ -30,7 +30,7 @@ private:
Result ClearStorage(); Result ClearStorage();
Result ClearSubscriptionStatusAll(); Result ClearSubscriptionStatusAll();
Result GetNewsDatabaseDump(); Result GetNewsDatabaseDump();
FunctionInfoBase const* FindRequest(u32 key) override; std::optional<FunctionInfoBase> FindRequest(u32 key) override;
}; };
} // namespace Service::News } // namespace Service::News
src/core/hle/service/bcat/news/overwrite_event_holder.cpp
+1 -1
View File
@@ -9,7 +9,7 @@
namespace Service::News { namespace Service::News {
ServiceFrameworkBase::FunctionInfoBase const* IOverwriteEventHolder::FindRequest(u32 key) { std::optional<ServiceFrameworkBase::FunctionInfoBase> IOverwriteEventHolder::FindRequest(u32 key) {
static constexpr auto functions = CreateStaticMap( static constexpr auto functions = CreateStaticMap(
FunctionInfo{0, D<&IOverwriteEventHolder::Get>, "Get"} FunctionInfo{0, D<&IOverwriteEventHolder::Get>, "Get"}
); );
src/core/hle/service/bcat/news/overwrite_event_holder.h
+1 -1
View File
@@ -29,7 +29,7 @@ public:
private: private:
Result Get(OutCopyHandle<Kernel::KReadableEvent> out_event); Result Get(OutCopyHandle<Kernel::KReadableEvent> out_event);
FunctionInfoBase const* FindRequest(u32 key) override; std::optional<FunctionInfoBase> FindRequest(u32 key) override;
Kernel::KEvent* overwrite_event; Kernel::KEvent* overwrite_event;
KernelHelpers::ServiceContext service_context; KernelHelpers::ServiceContext service_context;
}; };
src/core/hle/service/bcat/news/service_creator.cpp
+1 -1
View File
@@ -14,7 +14,7 @@
namespace Service::News { namespace Service::News {
ServiceFrameworkBase::FunctionInfoBase const* IServiceCreator::FindRequest(u32 key) { std::optional<ServiceFrameworkBase::FunctionInfoBase> IServiceCreator::FindRequest(u32 key) {
static constexpr auto functions = CreateStaticMap( static constexpr auto functions = CreateStaticMap(
FunctionInfo{0, D<&IServiceCreator::CreateNewsService>, "CreateNewsService"}, FunctionInfo{0, D<&IServiceCreator::CreateNewsService>, "CreateNewsService"},
FunctionInfo{1, D<&IServiceCreator::CreateNewlyArrivedEventHolder>, "CreateNewlyArrivedEventHolder"}, FunctionInfo{1, D<&IServiceCreator::CreateNewlyArrivedEventHolder>, "CreateNewlyArrivedEventHolder"},
src/core/hle/service/bcat/news/service_creator.h
+1 -1
View File
@@ -32,7 +32,7 @@ private:
Result CreateNewsDatabaseService(OutInterface<INewsDatabaseService> out_interface); Result CreateNewsDatabaseService(OutInterface<INewsDatabaseService> out_interface);
Result CreateOverwriteEventHolder(OutInterface<IOverwriteEventHolder> out_interface); Result CreateOverwriteEventHolder(OutInterface<IOverwriteEventHolder> out_interface);
FunctionInfoBase const* FindRequest(u32 key) override; std::optional<FunctionInfoBase> FindRequest(u32 key) override;
u32 permissions; u32 permissions;
}; };
src/core/hle/service/bcat/service_creator.cpp
+1 -1
View File
@@ -13,7 +13,7 @@
namespace Service::BCAT { namespace Service::BCAT {
ServiceFrameworkBase::FunctionInfoBase const* IServiceCreator::FindRequest(u32 key) { std::optional<ServiceFrameworkBase::FunctionInfoBase> IServiceCreator::FindRequest(u32 key) {
static constexpr auto functions = CreateStaticMap( static constexpr auto functions = CreateStaticMap(
FunctionInfo{0, D<&IServiceCreator::CreateBcatService>, "CreateBcatService"}, FunctionInfo{0, D<&IServiceCreator::CreateBcatService>, "CreateBcatService"},
FunctionInfo{1, D<&IServiceCreator::CreateDeliveryCacheStorageService>, "CreateDeliveryCacheStorageService"}, FunctionInfo{1, D<&IServiceCreator::CreateDeliveryCacheStorageService>, "CreateDeliveryCacheStorageService"},
src/core/hle/service/bcat/service_creator.h
+1 -1
View File
@@ -36,7 +36,7 @@ private:
Result CreateDeliveryCacheStorageServiceWithApplicationId( Result CreateDeliveryCacheStorageServiceWithApplicationId(
u64 application_id, OutInterface<IDeliveryCacheStorageService> out_interface); u64 application_id, OutInterface<IDeliveryCacheStorageService> out_interface);
FunctionInfoBase const* FindRequest(u32 key) override; std::optional<FunctionInfoBase> FindRequest(u32 key) override;
std::unique_ptr<BcatBackend> backend; std::unique_ptr<BcatBackend> backend;
Service::FileSystem::FileSystemController& fsc; Service::FileSystem::FileSystemController& fsc;
}; };
src/core/hle/service/bpc/bpc.cpp
+6 -6
View File
@@ -34,7 +34,7 @@ public:
FunctionInfo{14, nullptr, "GetPowerButton"}, FunctionInfo{14, nullptr, "GetPowerButton"},
FunctionInfo{15, nullptr, "SetEnableWakeupTimer"} FunctionInfo{15, nullptr, "SetEnableWakeupTimer"}
); );
FunctionInfoBase const* FindRequest(u32 key) override { std::optional<FunctionInfoBase> FindRequest(u32 key) override {
return HandlerTableGenerateWithFind(key, functions); return HandlerTableGenerateWithFind(key, functions);
} }
}; };
@@ -50,7 +50,7 @@ public:
FunctionInfo{3, nullptr, "ClearRtcResetDetected"}, FunctionInfo{3, nullptr, "ClearRtcResetDetected"},
FunctionInfo{4, nullptr, "SetUpRtcResetOnShutdown"} FunctionInfo{4, nullptr, "SetUpRtcResetOnShutdown"}
); );
FunctionInfoBase const* FindRequest(u32 key) override { std::optional<FunctionInfoBase> FindRequest(u32 key) override {
return HandlerTableGenerateWithFind(key, functions); return HandlerTableGenerateWithFind(key, functions);
} }
}; };
@@ -67,7 +67,7 @@ public:
FunctionInfo{4, nullptr, "GetAcOk"}, FunctionInfo{4, nullptr, "GetAcOk"},
FunctionInfo{5, nullptr, "GetPowerEvent"} FunctionInfo{5, nullptr, "GetPowerEvent"}
); );
FunctionInfoBase const* FindRequest(u32 key) override { std::optional<FunctionInfoBase> FindRequest(u32 key) override {
return HandlerTableGenerateWithFind(key, functions); return HandlerTableGenerateWithFind(key, functions);
} }
}; };
@@ -80,7 +80,7 @@ public:
FunctionInfo{0, nullptr, "GetSleepButtonState"}, FunctionInfo{0, nullptr, "GetSleepButtonState"},
FunctionInfo{1, nullptr, "GetPowerButtonEvent"} FunctionInfo{1, nullptr, "GetPowerButtonEvent"}
); );
FunctionInfoBase const* FindRequest(u32 key) override { std::optional<FunctionInfoBase> FindRequest(u32 key) override {
return HandlerTableGenerateWithFind(key, functions); return HandlerTableGenerateWithFind(key, functions);
} }
}; };
@@ -94,7 +94,7 @@ public:
FunctionInfo{1, nullptr, "CancelWakeupTimer"}, FunctionInfo{1, nullptr, "CancelWakeupTimer"},
FunctionInfo{2, nullptr, "EnableWakeupTimerOnDevice"} FunctionInfo{2, nullptr, "EnableWakeupTimerOnDevice"}
); );
FunctionInfoBase const* FindRequest(u32 key) override { std::optional<FunctionInfoBase> FindRequest(u32 key) override {
return HandlerTableGenerateWithFind(key, functions); return HandlerTableGenerateWithFind(key, functions);
} }
}; };
@@ -107,7 +107,7 @@ public:
FunctionInfo{65000, nullptr, "RebootToFatalError"}, FunctionInfo{65000, nullptr, "RebootToFatalError"},
FunctionInfo{65001, nullptr, "SetRebootPayload"} FunctionInfo{65001, nullptr, "SetRebootPayload"}
); );
FunctionInfoBase const* FindRequest(u32 key) override { std::optional<FunctionInfoBase> FindRequest(u32 key) override {
return HandlerTableGenerateWithFind(key, functions); return HandlerTableGenerateWithFind(key, functions);
} }
}; };
src/core/hle/service/btdrv/btdrv.cpp
+2 -2
View File
@@ -25,7 +25,7 @@ public:
register_event = service_context.CreateEvent("BT:RegisterEvent"); register_event = service_context.CreateEvent("BT:RegisterEvent");
} }
FunctionInfoBase const* FindRequest(u32 key) override { std::optional<FunctionInfoBase> FindRequest(u32 key) override {
return HandlerTableGenerateWithFind(key, functions); return HandlerTableGenerateWithFind(key, functions);
} }
@@ -61,7 +61,7 @@ class IBluetoothDriver final : public ServiceFramework<IBluetoothDriver> {
public: public:
explicit IBluetoothDriver(Core::System& system_) : ServiceFramework{system_, "btdrv"} {} explicit IBluetoothDriver(Core::System& system_) : ServiceFramework{system_, "btdrv"} {}
FunctionInfoBase const* FindRequest(u32 key) override { std::optional<FunctionInfoBase> FindRequest(u32 key) override {
return HandlerTableGenerateWithFind(key, functions); return HandlerTableGenerateWithFind(key, functions);
} }
src/core/hle/service/btm/btm.cpp
+6 -6
View File
@@ -118,7 +118,7 @@ public:
R_SUCCEED(); R_SUCCEED();
} }
FunctionInfoBase const* FindRequest(u32 key) override { std::optional<FunctionInfoBase> FindRequest(u32 key) override {
return HandlerTableGenerateWithFind(key, functions); return HandlerTableGenerateWithFind(key, functions);
} }
static constexpr auto functions = CreateStaticMap( static constexpr auto functions = CreateStaticMap(
@@ -165,7 +165,7 @@ public:
R_SUCCEED(); R_SUCCEED();
} }
FunctionInfoBase const* FindRequest(u32 key) override { std::optional<FunctionInfoBase> FindRequest(u32 key) override {
return HandlerTableGenerateWithFind(key, functions); return HandlerTableGenerateWithFind(key, functions);
} }
static constexpr auto functions = CreateStaticMap( static constexpr auto functions = CreateStaticMap(
@@ -226,7 +226,7 @@ public:
R_SUCCEED(); R_SUCCEED();
} }
FunctionInfoBase const* FindRequest(u32 key) override { std::optional<FunctionInfoBase> FindRequest(u32 key) override {
return HandlerTableGenerateWithFind(key, functions); return HandlerTableGenerateWithFind(key, functions);
} }
static constexpr auto functions = CreateStaticMap( static constexpr auto functions = CreateStaticMap(
@@ -282,7 +282,7 @@ public:
R_SUCCEED(); R_SUCCEED();
} }
FunctionInfoBase const* FindRequest(u32 key) override { std::optional<FunctionInfoBase> FindRequest(u32 key) override {
return HandlerTableGenerateWithFind(key, functions); return HandlerTableGenerateWithFind(key, functions);
} }
static constexpr auto functions = CreateStaticMap( static constexpr auto functions = CreateStaticMap(
@@ -294,7 +294,7 @@ class IBtmDebug final : public ServiceFramework<IBtmDebug> {
public: public:
explicit IBtmDebug(Core::System& system_) : ServiceFramework{system_, "btm:dbg"} {} explicit IBtmDebug(Core::System& system_) : ServiceFramework{system_, "btm:dbg"} {}
~IBtmDebug() override = default; ~IBtmDebug() override = default;
FunctionInfoBase const* FindRequest(u32 key) override { std::optional<FunctionInfoBase> FindRequest(u32 key) override {
return HandlerTableGenerateWithFind(key, functions); return HandlerTableGenerateWithFind(key, functions);
} }
static constexpr auto functions = CreateStaticMap( static constexpr auto functions = CreateStaticMap(
@@ -412,7 +412,7 @@ public:
FunctionInfo{116, nullptr, "SetAudioSinkVolume"}, //15.0.0+ FunctionInfo{116, nullptr, "SetAudioSinkVolume"}, //15.0.0+
FunctionInfo{117, nullptr, "GetAudioSinkVolume"} //15.0.0+ FunctionInfo{117, nullptr, "GetAudioSinkVolume"} //15.0.0+
); );
FunctionInfoBase const* FindRequest(u32 key) override { std::optional<FunctionInfoBase> FindRequest(u32 key) override {
return HandlerTableGenerateWithFind(key, functions); return HandlerTableGenerateWithFind(key, functions);
} }
}; };
src/core/hle/service/caps/caps.cpp
+1 -1
View File
@@ -27,7 +27,7 @@ public:
FunctionInfo{4001, nullptr, "ShrinkJpeg"}, FunctionInfo{4001, nullptr, "ShrinkJpeg"},
FunctionInfo{4002, nullptr, "ShrinkJpegEx"} FunctionInfo{4002, nullptr, "ShrinkJpegEx"}
); );
FunctionInfoBase const* FindRequest(u32 key) override { std::optional<FunctionInfoBase> FindRequest(u32 key) override {
return HandlerTableGenerateWithFind(key, functions); return HandlerTableGenerateWithFind(key, functions);
} }
}; };
src/core/hle/service/caps/caps_a.cpp
+1 -1
View File
@@ -13,7 +13,7 @@
namespace Service::Capture { namespace Service::Capture {
ServiceFrameworkBase::FunctionInfoBase const* IAlbumAccessorService::FindRequest(u32 key) { std::optional<ServiceFrameworkBase::FunctionInfoBase> IAlbumAccessorService::FindRequest(u32 key) {
static constexpr auto functions = CreateStaticMap( static constexpr auto functions = CreateStaticMap(
FunctionInfo{0, nullptr, "GetAlbumFileCount"}, FunctionInfo{0, nullptr, "GetAlbumFileCount"},
FunctionInfo{1, C<&IAlbumAccessorService::GetAlbumFileList>, "GetAlbumFileList"}, FunctionInfo{1, C<&IAlbumAccessorService::GetAlbumFileList>, "GetAlbumFileList"},
src/core/hle/service/caps/caps_a.h
+1 -1
View File
@@ -57,7 +57,7 @@ private:
Result GetAlbumAccessResultForDebug(Out<Result> out_result); Result GetAlbumAccessResultForDebug(Out<Result> out_result);
FunctionInfoBase const* FindRequest(u32 key) override; std::optional<FunctionInfoBase> FindRequest(u32 key) override;
std::shared_ptr<AlbumManager> manager = nullptr; std::shared_ptr<AlbumManager> manager = nullptr;
}; };
src/core/hle/service/caps/caps_c.cpp
+1 -1
View File
@@ -14,7 +14,7 @@
namespace Service::Capture { namespace Service::Capture {
ServiceFrameworkBase::FunctionInfoBase const* IAlbumControlService::FindRequest(u32 key) { std::optional<ServiceFrameworkBase::FunctionInfoBase> IAlbumControlService::FindRequest(u32 key) {
static constexpr auto functions = CreateStaticMap( static constexpr auto functions = CreateStaticMap(
FunctionInfo{1, nullptr, "CaptureRawImage"}, FunctionInfo{1, nullptr, "CaptureRawImage"},
FunctionInfo{2, nullptr, "CaptureRawImageWithTimeout"}, FunctionInfo{2, nullptr, "CaptureRawImageWithTimeout"},

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