From b6bbc0d48355a53a8f55f2371dc7aa79613ce43f Mon Sep 17 00:00:00 2001 From: german77 Date: Wed, 7 Apr 2021 19:28:29 -0600 Subject: [PATCH 01/28] audin_a: Use proper names --- src/core/hle/service/audio/audin_a.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/core/hle/service/audio/audin_a.cpp b/src/core/hle/service/audio/audin_a.cpp index 79c3aa9206..10acaad19c 100644 --- a/src/core/hle/service/audio/audin_a.cpp +++ b/src/core/hle/service/audio/audin_a.cpp @@ -9,10 +9,10 @@ namespace Service::Audio { AudInA::AudInA(Core::System& system_) : ServiceFramework{system_, "audin:a"} { // clang-format off static const FunctionInfo functions[] = { - {0, nullptr, "RequestSuspendAudioIns"}, - {1, nullptr, "RequestResumeAudioIns"}, - {2, nullptr, "GetAudioInsProcessMasterVolume"}, - {3, nullptr, "SetAudioInsProcessMasterVolume"}, + {0, nullptr, "RequestSuspend"}, + {1, nullptr, "RequestResume"}, + {2, nullptr, "GetProcessMasterVolume"}, + {3, nullptr, "SetProcessMasterVolume"}, }; // clang-format on From d7f2078e7bac750f47c56ea7ee18fb2f665ae786 Mon Sep 17 00:00:00 2001 From: german77 Date: Wed, 7 Apr 2021 19:32:37 -0600 Subject: [PATCH 02/28] audin_u: Use proper names --- src/core/hle/service/audio/audin_u.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/core/hle/service/audio/audin_u.cpp b/src/core/hle/service/audio/audin_u.cpp index 26a6deddfb..ecd05e4a63 100644 --- a/src/core/hle/service/audio/audin_u.cpp +++ b/src/core/hle/service/audio/audin_u.cpp @@ -15,19 +15,19 @@ public: // clang-format off static const FunctionInfo functions[] = { {0, nullptr, "GetAudioInState"}, - {1, nullptr, "StartAudioIn"}, - {2, nullptr, "StopAudioIn"}, + {1, nullptr, "Start"}, + {2, nullptr, "Stop"}, {3, nullptr, "AppendAudioInBuffer"}, {4, nullptr, "RegisterBufferEvent"}, {5, nullptr, "GetReleasedAudioInBuffer"}, {6, nullptr, "ContainsAudioInBuffer"}, - {7, nullptr, "AppendAudioInBufferWithUserEvent"}, + {7, nullptr, "AppendUacInBuffer"}, {8, nullptr, "AppendAudioInBufferAuto"}, - {9, nullptr, "GetReleasedAudioInBufferAuto"}, - {10, nullptr, "AppendAudioInBufferWithUserEventAuto"}, + {9, nullptr, "GetReleasedAudioInBuffersAuto"}, + {10, nullptr, "AppendUacInBufferAuto"}, {11, nullptr, "GetAudioInBufferCount"}, - {12, nullptr, "SetAudioInDeviceGain"}, - {13, nullptr, "GetAudioInDeviceGain"}, + {12, nullptr, "SetDeviceGain"}, + {13, nullptr, "GetDeviceGain"}, {14, nullptr, "FlushAudioInBuffers"}, }; // clang-format on From c51d9e0b0a65e57204696b68e4c0a98b7a0be697 Mon Sep 17 00:00:00 2001 From: german77 Date: Wed, 7 Apr 2021 19:34:15 -0600 Subject: [PATCH 03/28] audout_a: Use proper names --- src/core/hle/service/audio/audout_a.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/core/hle/service/audio/audout_a.cpp b/src/core/hle/service/audio/audout_a.cpp index 19825fd5d2..3ee522b507 100644 --- a/src/core/hle/service/audio/audout_a.cpp +++ b/src/core/hle/service/audio/audout_a.cpp @@ -9,12 +9,12 @@ namespace Service::Audio { AudOutA::AudOutA(Core::System& system_) : ServiceFramework{system_, "audout:a"} { // clang-format off static const FunctionInfo functions[] = { - {0, nullptr, "RequestSuspendAudioOuts"}, - {1, nullptr, "RequestResumeAudioOuts"}, - {2, nullptr, "GetAudioOutsProcessMasterVolume"}, - {3, nullptr, "SetAudioOutsProcessMasterVolume"}, - {4, nullptr, "GetAudioOutsProcessRecordVolume"}, - {5, nullptr, "SetAudioOutsProcessRecordVolume"}, + {0, nullptr, "RequestSuspend"}, + {1, nullptr, "RequestResume"}, + {2, nullptr, "GetProcessMasterVolume"}, + {3, nullptr, "SetProcessMasterVolume"}, + {4, nullptr, "GetProcessRecordVolume"}, + {5, nullptr, "SetProcessRecordVolume"}, }; // clang-format on From b059db74c51a4d356cf8cf4420ed4b0b8600f2a9 Mon Sep 17 00:00:00 2001 From: german77 Date: Wed, 7 Apr 2021 19:37:08 -0600 Subject: [PATCH 04/28] audout_u: Use proper names --- src/core/hle/service/audio/audout_u.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/core/hle/service/audio/audout_u.cpp b/src/core/hle/service/audio/audout_u.cpp index 5ed9cb20e4..5f51fca9ab 100644 --- a/src/core/hle/service/audio/audout_u.cpp +++ b/src/core/hle/service/audio/audout_u.cpp @@ -49,11 +49,11 @@ public: // clang-format off static const FunctionInfo functions[] = { {0, &IAudioOut::GetAudioOutState, "GetAudioOutState"}, - {1, &IAudioOut::StartAudioOut, "StartAudioOut"}, - {2, &IAudioOut::StopAudioOut, "StopAudioOut"}, + {1, &IAudioOut::StartAudioOut, "Start"}, + {2, &IAudioOut::StopAudioOut, "Stop"}, {3, &IAudioOut::AppendAudioOutBufferImpl, "AppendAudioOutBuffer"}, {4, &IAudioOut::RegisterBufferEvent, "RegisterBufferEvent"}, - {5, &IAudioOut::GetReleasedAudioOutBufferImpl, "GetReleasedAudioOutBuffer"}, + {5, &IAudioOut::GetReleasedAudioOutBufferImpl, "GetReleasedAudioOutBuffers"}, {6, &IAudioOut::ContainsAudioOutBuffer, "ContainsAudioOutBuffer"}, {7, &IAudioOut::AppendAudioOutBufferImpl, "AppendAudioOutBufferAuto"}, {8, &IAudioOut::GetReleasedAudioOutBufferImpl, "GetReleasedAudioOutBufferAuto"}, From 5ce97bf0a0917f68acf2d88ff091ddb064bff7ff Mon Sep 17 00:00:00 2001 From: german77 Date: Wed, 7 Apr 2021 19:38:34 -0600 Subject: [PATCH 05/28] audrec_a: Use proper names --- src/core/hle/service/audio/audrec_a.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/core/hle/service/audio/audrec_a.cpp b/src/core/hle/service/audio/audrec_a.cpp index c5ab7cad4b..70fc17ae21 100644 --- a/src/core/hle/service/audio/audrec_a.cpp +++ b/src/core/hle/service/audio/audrec_a.cpp @@ -9,8 +9,8 @@ namespace Service::Audio { AudRecA::AudRecA(Core::System& system_) : ServiceFramework{system_, "audrec:a"} { // clang-format off static const FunctionInfo functions[] = { - {0, nullptr, "RequestSuspendFinalOutputRecorders"}, - {1, nullptr, "RequestResumeFinalOutputRecorders"}, + {0, nullptr, "RequestSuspend"}, + {1, nullptr, "RequestResume"}, }; // clang-format on From 6219da627b4728efacb1b6844b67aaf36bafc683 Mon Sep 17 00:00:00 2001 From: german77 Date: Wed, 7 Apr 2021 19:41:14 -0600 Subject: [PATCH 06/28] audrec_u: Use proper names, update to 12.x --- src/core/hle/service/audio/audrec_u.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/core/hle/service/audio/audrec_u.cpp b/src/core/hle/service/audio/audrec_u.cpp index eb5c63c622..74a65ccff2 100644 --- a/src/core/hle/service/audio/audrec_u.cpp +++ b/src/core/hle/service/audio/audrec_u.cpp @@ -13,16 +13,17 @@ public: // clang-format off static const FunctionInfo functions[] = { {0, nullptr, "GetFinalOutputRecorderState"}, - {1, nullptr, "StartFinalOutputRecorder"}, - {2, nullptr, "StopFinalOutputRecorder"}, + {1, nullptr, "Start"}, + {2, nullptr, "Stop"}, {3, nullptr, "AppendFinalOutputRecorderBuffer"}, {4, nullptr, "RegisterBufferEvent"}, - {5, nullptr, "GetReleasedFinalOutputRecorderBuffer"}, + {5, nullptr, "GetReleasedFinalOutputRecorderBuffers"}, {6, nullptr, "ContainsFinalOutputRecorderBuffer"}, {7, nullptr, "GetFinalOutputRecorderBufferEndTime"}, {8, nullptr, "AppendFinalOutputRecorderBufferAuto"}, {9, nullptr, "GetReleasedFinalOutputRecorderBufferAuto"}, {10, nullptr, "FlushFinalOutputRecorderBuffers"}, + {11, nullptr, "AttachWorkBuffer"}, }; // clang-format on From 8f1300cd319c157ea5c3cbfbe2039eb727c8096b Mon Sep 17 00:00:00 2001 From: german77 Date: Wed, 7 Apr 2021 19:43:52 -0600 Subject: [PATCH 07/28] audren_a: Use proper names --- src/core/hle/service/audio/audren_a.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/core/hle/service/audio/audren_a.cpp b/src/core/hle/service/audio/audren_a.cpp index 5e9f866f0d..cf8c34a152 100644 --- a/src/core/hle/service/audio/audren_a.cpp +++ b/src/core/hle/service/audio/audren_a.cpp @@ -9,14 +9,14 @@ namespace Service::Audio { AudRenA::AudRenA(Core::System& system_) : ServiceFramework{system_, "audren:a"} { // clang-format off static const FunctionInfo functions[] = { - {0, nullptr, "RequestSuspendAudioRenderers"}, - {1, nullptr, "RequestResumeAudioRenderers"}, - {2, nullptr, "GetAudioRenderersProcessMasterVolume"}, - {3, nullptr, "SetAudioRenderersProcessMasterVolume"}, + {0, nullptr, "RequestSuspend"}, + {1, nullptr, "RequestResume"}, + {2, nullptr, "GetProcessMasterVolume"}, + {3, nullptr, "SetProcessMasterVolume"}, {4, nullptr, "RegisterAppletResourceUserId"}, {5, nullptr, "UnregisterAppletResourceUserId"}, - {6, nullptr, "GetAudioRenderersProcessRecordVolume"}, - {7, nullptr, "SetAudioRenderersProcessRecordVolume"}, + {6, nullptr, "GetProcessRecordVolume"}, + {7, nullptr, "SetProcessRecordVolume"}, }; // clang-format on From ec0e644fb028f96f7849c424e5590a004ba4671c Mon Sep 17 00:00:00 2001 From: german77 Date: Wed, 7 Apr 2021 19:48:14 -0600 Subject: [PATCH 08/28] audren_u: Use proper names --- src/core/hle/service/audio/audren_u.cpp | 6 +++--- src/core/hle/service/audio/audren_u.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/core/hle/service/audio/audren_u.cpp b/src/core/hle/service/audio/audren_u.cpp index b2b2ffc5aa..572be8e004 100644 --- a/src/core/hle/service/audio/audren_u.cpp +++ b/src/core/hle/service/audio/audren_u.cpp @@ -332,9 +332,9 @@ AudRenU::AudRenU(Core::System& system_) : ServiceFramework{system_, "audren:u"} // clang-format off static const FunctionInfo functions[] = { {0, &AudRenU::OpenAudioRenderer, "OpenAudioRenderer"}, - {1, &AudRenU::GetAudioRendererWorkBufferSize, "GetAudioRendererWorkBufferSize"}, + {1, &AudRenU::GetAudioRendererWorkBufferSize, "GetWorkBufferSize"}, {2, &AudRenU::GetAudioDeviceService, "GetAudioDeviceService"}, - {3, &AudRenU::OpenAudioRendererAuto, "OpenAudioRendererAuto"}, + {3, &AudRenU::OpenAudioRendererForManualExecution, "OpenAudioRendererForManualExecution"}, {4, &AudRenU::GetAudioDeviceServiceWithRevisionInfo, "GetAudioDeviceServiceWithRevisionInfo"}, }; // clang-format on @@ -665,7 +665,7 @@ void AudRenU::GetAudioDeviceService(Kernel::HLERequestContext& ctx) { rb.PushIpcInterface(system, Common::MakeMagic('R', 'E', 'V', '1')); } -void AudRenU::OpenAudioRendererAuto(Kernel::HLERequestContext& ctx) { +void AudRenU::OpenAudioRendererForManualExecution(Kernel::HLERequestContext& ctx) { LOG_DEBUG(Service_Audio, "called"); OpenAudioRendererImpl(ctx); diff --git a/src/core/hle/service/audio/audren_u.h b/src/core/hle/service/audio/audren_u.h index d693dc4069..37e8b47162 100644 --- a/src/core/hle/service/audio/audren_u.h +++ b/src/core/hle/service/audio/audren_u.h @@ -25,7 +25,7 @@ private: void OpenAudioRenderer(Kernel::HLERequestContext& ctx); void GetAudioRendererWorkBufferSize(Kernel::HLERequestContext& ctx); void GetAudioDeviceService(Kernel::HLERequestContext& ctx); - void OpenAudioRendererAuto(Kernel::HLERequestContext& ctx); + void OpenAudioRendererForManualExecution(Kernel::HLERequestContext& ctx); void GetAudioDeviceServiceWithRevisionInfo(Kernel::HLERequestContext& ctx); void OpenAudioRendererImpl(Kernel::HLERequestContext& ctx); From 247b1c14d2de117fc754a89ea109f0f41deaa50c Mon Sep 17 00:00:00 2001 From: german77 Date: Wed, 7 Apr 2021 19:50:34 -0600 Subject: [PATCH 09/28] codecctl: Use proper names --- src/core/hle/service/audio/codecctl.cpp | 26 ++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/src/core/hle/service/audio/codecctl.cpp b/src/core/hle/service/audio/codecctl.cpp index 94afec1b6d..42961d9085 100644 --- a/src/core/hle/service/audio/codecctl.cpp +++ b/src/core/hle/service/audio/codecctl.cpp @@ -8,19 +8,19 @@ namespace Service::Audio { CodecCtl::CodecCtl(Core::System& system_) : ServiceFramework{system_, "codecctl"} { static const FunctionInfo functions[] = { - {0, nullptr, "InitializeCodecController"}, - {1, nullptr, "FinalizeCodecController"}, - {2, nullptr, "SleepCodecController"}, - {3, nullptr, "WakeCodecController"}, - {4, nullptr, "SetCodecVolume"}, - {5, nullptr, "GetCodecVolumeMax"}, - {6, nullptr, "GetCodecVolumeMin"}, - {7, nullptr, "SetCodecActiveTarget"}, - {8, nullptr, "GetCodecActiveTarget"}, - {9, nullptr, "BindCodecHeadphoneMicJackInterrupt"}, - {10, nullptr, "IsCodecHeadphoneMicJackInserted"}, - {11, nullptr, "ClearCodecHeadphoneMicJackInterrupt"}, - {12, nullptr, "IsCodecDeviceRequested"}, + {0, nullptr, "Initialize"}, + {1, nullptr, "Finalize"}, + {2, nullptr, "Sleep"}, + {3, nullptr, "Wake"}, + {4, nullptr, "SetVolume"}, + {5, nullptr, "GetVolumeMax"}, + {6, nullptr, "GetVolumeMin"}, + {7, nullptr, "SetActiveTarget"}, + {8, nullptr, "GetActiveTarget"}, + {9, nullptr, "BindHeadphoneMicJackInterrupt"}, + {10, nullptr, "IsHeadphoneMicJackInserted"}, + {11, nullptr, "ClearHeadphoneMicJackInterrupt"}, + {12, nullptr, "IsRequested"}, }; RegisterHandlers(functions); } From 0377618288bb0a65f1b7d02adf6b6b185650f4c0 Mon Sep 17 00:00:00 2001 From: german77 Date: Wed, 7 Apr 2021 19:59:13 -0600 Subject: [PATCH 10/28] bcat_module: Update to 12.x --- src/core/hle/service/bcat/module.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/core/hle/service/bcat/module.cpp b/src/core/hle/service/bcat/module.cpp index 503109fdd8..b68e2c3455 100644 --- a/src/core/hle/service/bcat/module.cpp +++ b/src/core/hle/service/bcat/module.cpp @@ -155,10 +155,12 @@ public: {30210, nullptr, "SetDeliveryTaskTimer"}, {30300, nullptr, "RegisterSystemApplicationDeliveryTasks"}, {90100, nullptr, "EnumerateBackgroundDeliveryTask"}, + {90101, nullptr, "Unknown90101"}, {90200, nullptr, "GetDeliveryList"}, {90201, &IBcatService::ClearDeliveryCacheStorage, "ClearDeliveryCacheStorage"}, {90202, nullptr, "ClearDeliveryTaskSubscriptionStatus"}, {90300, nullptr, "GetPushNotificationLog"}, + {90301, nullptr, "Unknown90301"}, }; // clang-format on RegisterHandlers(functions); From 03790771a671a3c3f2fd283b4db5e3ec1d8e8ce6 Mon Sep 17 00:00:00 2001 From: german77 Date: Wed, 7 Apr 2021 20:01:54 -0600 Subject: [PATCH 11/28] bpc: Use proper names --- src/core/hle/service/bpc/bpc.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/core/hle/service/bpc/bpc.cpp b/src/core/hle/service/bpc/bpc.cpp index e4630320ef..78e01d8d8f 100644 --- a/src/core/hle/service/bpc/bpc.cpp +++ b/src/core/hle/service/bpc/bpc.cpp @@ -29,8 +29,8 @@ public: {11, nullptr, "CreateWakeupTimerEx"}, {12, nullptr, "GetLastEnabledWakeupTimerType"}, {13, nullptr, "CleanAllWakeupTimers"}, - {14, nullptr, "Unknown"}, - {15, nullptr, "Unknown2"}, + {14, nullptr, "GetPowerButton"}, + {15, nullptr, "SetEnableWakeupTimer"}, }; // clang-format on From dbc4c8e31422d3f0dea59c607648a9cf328a738a Mon Sep 17 00:00:00 2001 From: german77 Date: Wed, 7 Apr 2021 20:11:50 -0600 Subject: [PATCH 12/28] caps_a: Update to 12.x --- src/core/hle/service/caps/caps_a.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/core/hle/service/caps/caps_a.cpp b/src/core/hle/service/caps/caps_a.cpp index 1fe4f0e148..6220e9f77f 100644 --- a/src/core/hle/service/caps/caps_a.cpp +++ b/src/core/hle/service/caps/caps_a.cpp @@ -49,6 +49,7 @@ CAPS_A::CAPS_A(Core::System& system_) : ServiceFramework{system_, "caps:a"} { {16, nullptr, "GetAlbumMountResult"}, {17, nullptr, "GetAlbumUsage16"}, {18, nullptr, "Unknown18"}, + {19, nullptr, "Unknown19"}, {100, nullptr, "GetAlbumFileCountEx0"}, {101, nullptr, "GetAlbumFileListEx0"}, {202, nullptr, "SaveEditedScreenShot"}, From a83f0f7154537b3aa19b928fa43c6087620dd92d Mon Sep 17 00:00:00 2001 From: german77 Date: Wed, 7 Apr 2021 20:26:20 -0600 Subject: [PATCH 13/28] caps_u: Update to 12.x --- src/core/hle/service/caps/caps_u.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/core/hle/service/caps/caps_u.cpp b/src/core/hle/service/caps/caps_u.cpp index 842316a2ef..10b8d54b1c 100644 --- a/src/core/hle/service/caps/caps_u.cpp +++ b/src/core/hle/service/caps/caps_u.cpp @@ -43,6 +43,7 @@ CAPS_U::CAPS_U(Core::System& system_) : ServiceFramework{system_, "caps:u"} { {141, nullptr, "GetAlbumFileList2AafeUidAruidDeprecated"}, {142, &CAPS_U::GetAlbumFileList3AaeAruid, "GetAlbumFileList3AaeAruid"}, {143, nullptr, "GetAlbumFileList4AaeUidAruid"}, + {144, nullptr, "GetAllAlbumFileList3AaeAruid"}, {60002, nullptr, "OpenAccessorSessionForApplication"}, }; // clang-format on From a4e28215304a612e32c66f068243c759e7fee25e Mon Sep 17 00:00:00 2001 From: german77 Date: Thu, 8 Apr 2021 12:58:23 -0600 Subject: [PATCH 14/28] arp: Use proper names, update to 12.x --- src/core/hle/service/glue/arp.cpp | 11 +++++++++-- src/core/hle/service/glue/arp.h | 2 +- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/src/core/hle/service/glue/arp.cpp b/src/core/hle/service/glue/arp.cpp index fc77e72865..322125135f 100644 --- a/src/core/hle/service/glue/arp.cpp +++ b/src/core/hle/service/glue/arp.cpp @@ -41,6 +41,12 @@ ARP_R::ARP_R(Core::System& system_, const ARPManager& manager_) {1, &ARP_R::GetApplicationLaunchPropertyWithApplicationId, "GetApplicationLaunchPropertyWithApplicationId"}, {2, &ARP_R::GetApplicationControlProperty, "GetApplicationControlProperty"}, {3, &ARP_R::GetApplicationControlPropertyWithApplicationId, "GetApplicationControlPropertyWithApplicationId"}, + {4, nullptr, "GetApplicationInstanceUnregistrationNotifier"}, + {5, nullptr, "ListApplicationInstanceId"}, + {6, nullptr, "GetMicroApplicationInstanceId"}, + {7, nullptr, "GetApplicationCertificate"}, + {9998, nullptr, "GetPreomiaApplicationLaunchProperty"}, + {9999, nullptr, "GetPreomiaApplicationControlProperty"}, }; // clang-format on @@ -243,7 +249,8 @@ ARP_W::ARP_W(Core::System& system_, ARPManager& manager_) // clang-format off static const FunctionInfo functions[] = { {0, &ARP_W::AcquireRegistrar, "AcquireRegistrar"}, - {1, &ARP_W::DeleteProperties, "DeleteProperties"}, + {1, &ARP_W::UnregisterApplicationInstance , "UnregisterApplicationInstance "}, + {2, nullptr, "AcquireUpdater"}, }; // clang-format on @@ -270,7 +277,7 @@ void ARP_W::AcquireRegistrar(Kernel::HLERequestContext& ctx) { rb.PushIpcInterface(registrar); } -void ARP_W::DeleteProperties(Kernel::HLERequestContext& ctx) { +void ARP_W::UnregisterApplicationInstance(Kernel::HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const auto process_id = rp.PopRaw(); diff --git a/src/core/hle/service/glue/arp.h b/src/core/hle/service/glue/arp.h index 34b412e267..0df3c5e1f4 100644 --- a/src/core/hle/service/glue/arp.h +++ b/src/core/hle/service/glue/arp.h @@ -32,7 +32,7 @@ public: private: void AcquireRegistrar(Kernel::HLERequestContext& ctx); - void DeleteProperties(Kernel::HLERequestContext& ctx); + void UnregisterApplicationInstance(Kernel::HLERequestContext& ctx); ARPManager& manager; std::shared_ptr registrar; From 278c38aa4a3d6571f8ebcab24baab654f176ebb2 Mon Sep 17 00:00:00 2001 From: german77 Date: Thu, 8 Apr 2021 13:12:42 -0600 Subject: [PATCH 15/28] ldr: Use proper names --- src/core/hle/service/ldr/ldr.cpp | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/src/core/hle/service/ldr/ldr.cpp b/src/core/hle/service/ldr/ldr.cpp index d111c13578..c8bc60ad17 100644 --- a/src/core/hle/service/ldr/ldr.cpp +++ b/src/core/hle/service/ldr/ldr.cpp @@ -118,9 +118,9 @@ public: explicit DebugMonitor(Core::System& system_) : ServiceFramework{system_, "ldr:dmnt"} { // clang-format off static const FunctionInfo functions[] = { - {0, nullptr, "AddProcessToDebugLaunchQueue"}, - {1, nullptr, "ClearDebugLaunchQueue"}, - {2, nullptr, "GetNsoInfos"}, + {0, nullptr, "SetProgramArgument"}, + {1, nullptr, "FlushArguments"}, + {2, nullptr, "GetProcessModuleInfo"}, }; // clang-format on @@ -135,8 +135,8 @@ public: static const FunctionInfo functions[] = { {0, nullptr, "CreateProcess"}, {1, nullptr, "GetProgramInfo"}, - {2, nullptr, "RegisterTitle"}, - {3, nullptr, "UnregisterTitle"}, + {2, nullptr, "PinProgram"}, + {3, nullptr, "UnpinProgram"}, {4, nullptr, "SetEnabledProgramVerification"}, }; // clang-format on @@ -150,8 +150,8 @@ public: explicit Shell(Core::System& system_) : ServiceFramework{system_, "ldr:shel"} { // clang-format off static const FunctionInfo functions[] = { - {0, nullptr, "AddProcessToLaunchQueue"}, - {1, nullptr, "ClearLaunchQueue"}, + {0, nullptr, "SetProgramArgument"}, + {1, nullptr, "FlushArguments"}, }; // clang-format on @@ -164,19 +164,19 @@ public: explicit RelocatableObject(Core::System& system_) : ServiceFramework{system_, "ldr:ro"} { // clang-format off static const FunctionInfo functions[] = { - {0, &RelocatableObject::LoadNro, "LoadNro"}, - {1, &RelocatableObject::UnloadNro, "UnloadNro"}, - {2, &RelocatableObject::LoadNrr, "LoadNrr"}, - {3, &RelocatableObject::UnloadNrr, "UnloadNrr"}, + {0, &RelocatableObject::LoadModule, "LoadModule"}, + {1, &RelocatableObject::UnloadModule, "UnloadModule"}, + {2, &RelocatableObject::RegisterModuleInfo, "RegisterModuleInfo"}, + {3, &RelocatableObject::UnregisterModuleInfo, "UnregisterModuleInfo"}, {4, &RelocatableObject::Initialize, "Initialize"}, - {10, nullptr, "LoadNrrEx"}, + {10, nullptr, "RegisterModuleInfo2"}, }; // clang-format on RegisterHandlers(functions); } - void LoadNrr(Kernel::HLERequestContext& ctx) { + void RegisterModuleInfo(Kernel::HLERequestContext& ctx) { struct Parameters { u64_le process_id; u64_le nrr_address; @@ -273,7 +273,7 @@ public: rb.Push(RESULT_SUCCESS); } - void UnloadNrr(Kernel::HLERequestContext& ctx) { + void UnregisterModuleInfo(Kernel::HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const auto pid = rp.Pop(); const auto nrr_address = rp.Pop(); @@ -408,7 +408,7 @@ public: data_start, bss_end_addr - data_start, Kernel::KMemoryPermission::ReadAndWrite); } - void LoadNro(Kernel::HLERequestContext& ctx) { + void LoadModule(Kernel::HLERequestContext& ctx) { struct Parameters { u64_le process_id; u64_le image_address; @@ -546,7 +546,7 @@ public: return RESULT_SUCCESS; } - void UnloadNro(Kernel::HLERequestContext& ctx) { + void UnloadModule(Kernel::HLERequestContext& ctx) { if (!initialized) { LOG_ERROR(Service_LDR, "LDR:RO not initialized before use!"); IPC::ResponseBuilder rb{ctx, 2}; From c37b8a1028e1dc2cc39252eec68477582c831209 Mon Sep 17 00:00:00 2001 From: german77 Date: Thu, 8 Apr 2021 13:49:38 -0600 Subject: [PATCH 16/28] pl_u: Update to 12.x --- src/core/hle/service/ns/pl_u.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/core/hle/service/ns/pl_u.cpp b/src/core/hle/service/ns/pl_u.cpp index fcd15d81fa..da139fdc42 100644 --- a/src/core/hle/service/ns/pl_u.cpp +++ b/src/core/hle/service/ns/pl_u.cpp @@ -154,6 +154,10 @@ PL_U::PL_U(Core::System& system_) {100, nullptr, "RequestApplicationFunctionAuthorization"}, {101, nullptr, "RequestApplicationFunctionAuthorizationByProcessId"}, {102, nullptr, "RequestApplicationFunctionAuthorizationByApplicationId"}, + {103, nullptr, "RefreshApplicationFunctionBlackListDebugRecord"}, + {104, nullptr, "RequestApplicationFunctionAuthorizationByProgramId"}, + {105, nullptr, "GetFunctionBlackListSystemVersionToAuthorize"}, + {106, nullptr, "GetFunctionBlackListVersion"}, {1000, nullptr, "LoadNgWordDataForPlatformRegionChina"}, {1001, nullptr, "GetNgWordDataSizeForPlatformRegionChina"}, }; From 53f1560a24bfe1ae8f901d934fb3dd62c5002896 Mon Sep 17 00:00:00 2001 From: german77 Date: Thu, 8 Apr 2021 13:54:01 -0600 Subject: [PATCH 17/28] olsc: Update to 12.x --- src/core/hle/service/olsc/olsc.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/core/hle/service/olsc/olsc.cpp b/src/core/hle/service/olsc/olsc.cpp index e2ac71fa14..b066c3417b 100644 --- a/src/core/hle/service/olsc/olsc.cpp +++ b/src/core/hle/service/olsc/olsc.cpp @@ -26,6 +26,7 @@ public: {22, nullptr, "DeleteSaveDataBackupAsync"}, {25, nullptr, "ListDownloadableSaveDataBackupInfoAsync"}, {26, nullptr, "DownloadSaveDataBackupAsync"}, + {27, nullptr, "UploadSaveDataBackupAsync"}, {9010, nullptr, "VerifySaveDataBackupLicenseAsyncForDebug"}, {9013, nullptr, "GetSaveDataBackupSettingForDebug"}, {9014, nullptr, "SetSaveDataBackupSettingEnabledForDebug"}, From 4530b58eb0cdd8ac8268625dd44e29be6b7b7f9f Mon Sep 17 00:00:00 2001 From: german77 Date: Thu, 8 Apr 2021 13:55:57 -0600 Subject: [PATCH 18/28] pcie: Use proper names --- src/core/hle/service/pcie/pcie.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/core/hle/service/pcie/pcie.cpp b/src/core/hle/service/pcie/pcie.cpp index f6686fc4d9..9bc851591c 100644 --- a/src/core/hle/service/pcie/pcie.cpp +++ b/src/core/hle/service/pcie/pcie.cpp @@ -37,7 +37,7 @@ public: {19, nullptr, "SetIrqEnable"}, {20, nullptr, "SetAspmEnable"}, {21, nullptr, "SetResetUponResumeEnable"}, - {22, nullptr, "Unknown22"}, + {22, nullptr, "ResetFunction"}, {23, nullptr, "Unknown23"}, }; // clang-format on From 556c5df745373bbb2bfd5bccf39c42b610660612 Mon Sep 17 00:00:00 2001 From: german77 Date: Thu, 8 Apr 2021 14:00:24 -0600 Subject: [PATCH 19/28] pctl_module: Update to 12.x --- src/core/hle/service/pctl/module.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/core/hle/service/pctl/module.cpp b/src/core/hle/service/pctl/module.cpp index f9089bf2f7..e6cd4b3c72 100644 --- a/src/core/hle/service/pctl/module.cpp +++ b/src/core/hle/service/pctl/module.cpp @@ -50,6 +50,7 @@ public: {1046, nullptr, "DisableFeaturesForReset"}, {1047, nullptr, "NotifyApplicationDownloadStarted"}, {1048, nullptr, "NotifyNetworkProfileCreated"}, + {1049, nullptr, "ResetFreeCommunicationApplicationList"}, {1061, &IParentalControlService::ConfirmStereoVisionRestrictionConfigurable, "ConfirmStereoVisionRestrictionConfigurable"}, {1062, &IParentalControlService::GetStereoVisionRestriction, "GetStereoVisionRestriction"}, {1063, &IParentalControlService::SetStereoVisionRestriction, "SetStereoVisionRestriction"}, @@ -69,6 +70,8 @@ public: {1421, nullptr, "GetAccountNickname"}, {1424, nullptr, "GetAccountState"}, {1425, nullptr, "RequestPostEvents"}, + {1426, nullptr, "GetPostEventInterval"}, + {1427, nullptr, "SetPostEventInterval"}, {1432, nullptr, "GetSynchronizationEvent"}, {1451, nullptr, "StartPlayTimer"}, {1452, nullptr, "StopPlayTimer"}, From 7133bfdd2c2353242371aadd792e9281a07f1902 Mon Sep 17 00:00:00 2001 From: german77 Date: Thu, 8 Apr 2021 14:10:32 -0600 Subject: [PATCH 20/28] set_sys: Update to 12.x --- src/core/hle/service/set/set_sys.cpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/core/hle/service/set/set_sys.cpp b/src/core/hle/service/set/set_sys.cpp index b58b2c8c57..5909fdd855 100644 --- a/src/core/hle/service/set/set_sys.cpp +++ b/src/core/hle/service/set/set_sys.cpp @@ -261,6 +261,10 @@ SET_SYS::SET_SYS(Core::System& system_) : ServiceFramework{system_, "set:sys"} { {155, nullptr, "SetAccountOnlineStorageSettings"}, {156, nullptr, "GetPctlReadyFlag"}, {157, nullptr, "SetPctlReadyFlag"}, + {158, nullptr, "GetAnalogStickUserCalibrationL"}, + {159, nullptr, "SetAnalogStickUserCalibrationL"}, + {160, nullptr, "GetAnalogStickUserCalibrationR"}, + {161, nullptr, "SetAnalogStickUserCalibrationR"}, {162, nullptr, "GetPtmBatteryVersion"}, {163, nullptr, "SetPtmBatteryVersion"}, {164, nullptr, "GetUsb30HostEnableFlag"}, @@ -302,6 +306,8 @@ SET_SYS::SET_SYS(Core::System& system_) : ServiceFramework{system_, "set:sys"} { {200, nullptr, "SetButtonConfigRegisteredSettings"}, {201, nullptr, "GetFieldTestingFlag"}, {202, nullptr, "SetFieldTestingFlag"}, + {203, nullptr, "GetPanelCrcMode"}, + {204, nullptr, "SetPanelCrcMode"}, }; // clang-format on From 6c81332ca7a39e645e711acffeb6cf992d842a62 Mon Sep 17 00:00:00 2001 From: german77 Date: Thu, 8 Apr 2021 14:13:33 -0600 Subject: [PATCH 21/28] sm: Use proper names, update to 12.x --- src/core/hle/service/sm/sm.cpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/core/hle/service/sm/sm.cpp b/src/core/hle/service/sm/sm.cpp index 2b91a89d1b..94608d5297 100644 --- a/src/core/hle/service/sm/sm.cpp +++ b/src/core/hle/service/sm/sm.cpp @@ -190,10 +190,11 @@ SM::SM(std::shared_ptr service_manager_, Core::System& system_) : ServiceFramework{system_, "sm:", 4}, service_manager{std::move(service_manager_)}, kernel{system_.Kernel()} { static const FunctionInfo functions[] = { - {0x00000000, &SM::Initialize, "Initialize"}, - {0x00000001, &SM::GetService, "GetService"}, - {0x00000002, &SM::RegisterService, "RegisterService"}, - {0x00000003, &SM::UnregisterService, "UnregisterService"}, + {0, &SM::Initialize, "Initialize"}, + {1, &SM::GetService, "GetService"}, + {2, &SM::RegisterService, "RegisterService"}, + {3, &SM::UnregisterService, "UnregisterService"}, + {4, nullptr, "DetachClient"}, }; RegisterHandlers(functions); } From f90041a2d4a52b80456bd836ef7a69969fd3f6c7 Mon Sep 17 00:00:00 2001 From: german77 Date: Thu, 8 Apr 2021 14:15:59 -0600 Subject: [PATCH 22/28] ethc: Update to 12.x --- src/core/hle/service/sockets/ethc.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/core/hle/service/sockets/ethc.cpp b/src/core/hle/service/sockets/ethc.cpp index 05681ca2db..899a64c2f5 100644 --- a/src/core/hle/service/sockets/ethc.cpp +++ b/src/core/hle/service/sockets/ethc.cpp @@ -15,6 +15,7 @@ ETHC_C::ETHC_C(Core::System& system_) : ServiceFramework{system_, "ethc:c"} { {3, nullptr, "GetMediaList"}, {4, nullptr, "SetMediaType"}, {5, nullptr, "GetMediaType"}, + {6, nullptr, "Unknown6"}, }; // clang-format on From ff1201210c364bf5a350295cd1c4f2983c97ce1a Mon Sep 17 00:00:00 2001 From: german77 Date: Thu, 8 Apr 2021 14:17:22 -0600 Subject: [PATCH 23/28] nsd: Update to 12.x --- src/core/hle/service/sockets/nsd.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/core/hle/service/sockets/nsd.cpp b/src/core/hle/service/sockets/nsd.cpp index 51c3739bb5..1159debc52 100644 --- a/src/core/hle/service/sockets/nsd.cpp +++ b/src/core/hle/service/sockets/nsd.cpp @@ -9,6 +9,7 @@ namespace Service::Sockets { NSD::NSD(Core::System& system_, const char* name) : ServiceFramework{system_, name} { // clang-format off static const FunctionInfo functions[] = { + {5, nullptr, "GetSettingUrl"}, {10, nullptr, "GetSettingName"}, {11, nullptr, "GetEnvironmentIdentifier"}, {12, nullptr, "GetDeviceId"}, From 01928b1d1717871447bc81ba7461f68c314b9eae Mon Sep 17 00:00:00 2001 From: german77 Date: Thu, 8 Apr 2021 14:19:46 -0600 Subject: [PATCH 24/28] sfdnsres: Use proper names --- src/core/hle/service/sockets/sfdnsres.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/core/hle/service/sockets/sfdnsres.cpp b/src/core/hle/service/sockets/sfdnsres.cpp index 3a6329f56c..5c71f423c1 100644 --- a/src/core/hle/service/sockets/sfdnsres.cpp +++ b/src/core/hle/service/sockets/sfdnsres.cpp @@ -9,8 +9,8 @@ namespace Service::Sockets { SFDNSRES::SFDNSRES(Core::System& system_) : ServiceFramework{system_, "sfdnsres"} { static const FunctionInfo functions[] = { - {0, nullptr, "SetDnsAddressesPrivate"}, - {1, nullptr, "GetDnsAddressPrivate"}, + {0, nullptr, "SetDnsAddressesPrivateRequest"}, + {1, nullptr, "GetDnsAddressPrivateRequest"}, {2, nullptr, "GetHostByNameRequest"}, {3, nullptr, "GetHostByAddrRequest"}, {4, nullptr, "GetHostStringErrorRequest"}, From e7530b341e84653b1d64805e3db0b00519b3725d Mon Sep 17 00:00:00 2001 From: german77 Date: Thu, 8 Apr 2021 14:28:50 -0600 Subject: [PATCH 25/28] spl: Update to 12.x --- src/core/hle/service/spl/spl.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/core/hle/service/spl/spl.cpp b/src/core/hle/service/spl/spl.cpp index 4e212610fe..fff3f3c42e 100644 --- a/src/core/hle/service/spl/spl.cpp +++ b/src/core/hle/service/spl/spl.cpp @@ -60,6 +60,8 @@ SPL_FS::SPL_FS(Core::System& system_, std::shared_ptr module_) {4, nullptr, "GenerateAesKey"}, {5, nullptr, "SetConfig"}, {7, &SPL::GetRandomBytes, "GenerateRandomBytes"}, + {9, nullptr, "ImportLotusKey"}, + {10, nullptr, "DecryptLotusMessage"}, {11, nullptr, "IsDevelopment"}, {12, nullptr, "GenerateSpecificAesKey"}, {14, nullptr, "DecryptAesKey"}, @@ -123,6 +125,7 @@ SPL_ES::SPL_ES(Core::System& system_, std::shared_ptr module_) {14, nullptr, "DecryptAesKey"}, {15, nullptr, "CryptAesCtr"}, {16, nullptr, "ComputeCmac"}, + {17, nullptr, "ImportEsKey"}, {18, nullptr, "UnwrapTitleKey"}, {20, nullptr, "PrepareEsCommonKey"}, {21, nullptr, "AllocateAesKeyslot"}, From 35abd560c48201dab2ecaa8a8c3b33a67eecc81a Mon Sep 17 00:00:00 2001 From: german77 Date: Thu, 8 Apr 2021 14:34:01 -0600 Subject: [PATCH 26/28] ITimeZoneService: Update to 12.x --- src/core/hle/service/time/time_zone_service.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/core/hle/service/time/time_zone_service.cpp b/src/core/hle/service/time/time_zone_service.cpp index 25cecbc830..3117627cf3 100644 --- a/src/core/hle/service/time/time_zone_service.cpp +++ b/src/core/hle/service/time/time_zone_service.cpp @@ -20,6 +20,7 @@ ITimeZoneService ::ITimeZoneService(Core::System& system_, {3, nullptr, "LoadLocationNameList"}, {4, &ITimeZoneService::LoadTimeZoneRule, "LoadTimeZoneRule"}, {5, nullptr, "GetTimeZoneRuleVersion"}, + {6, nullptr, "GetDeviceLocationNameAndUpdatedTime"}, {100, &ITimeZoneService::ToCalendarTime, "ToCalendarTime"}, {101, &ITimeZoneService::ToCalendarTimeWithMyRule, "ToCalendarTimeWithMyRule"}, {201, &ITimeZoneService::ToPosixTime, "ToPosixTime"}, From ac14ef70b5bfcf6f96aa74dca25993fe960f6725 Mon Sep 17 00:00:00 2001 From: german77 Date: Thu, 8 Apr 2021 14:42:53 -0600 Subject: [PATCH 27/28] usb: Use proper names --- src/core/hle/service/usb/usb.cpp | 42 ++++++++++++++++---------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/src/core/hle/service/usb/usb.cpp b/src/core/hle/service/usb/usb.cpp index 579de83e46..b3b230a8c6 100644 --- a/src/core/hle/service/usb/usb.cpp +++ b/src/core/hle/service/usb/usb.cpp @@ -69,15 +69,15 @@ public: : ServiceFramework{system_, "IClientEpSession"} { // clang-format off static const FunctionInfo functions[] = { - {0, nullptr, "Open"}, + {0, nullptr, "ReOpen"}, {1, nullptr, "Close"}, - {2, nullptr, "Unknown2"}, - {3, nullptr, "Populate"}, + {2, nullptr, "GetCompletionEvent"}, + {3, nullptr, "PopulateRing"}, {4, nullptr, "PostBufferAsync"}, {5, nullptr, "GetXferReport"}, {6, nullptr, "PostBufferMultiAsync"}, - {7, nullptr, "Unknown7"}, - {8, nullptr, "Unknown8"}, + {7, nullptr, "CreateSmmuSpace"}, + {8, nullptr, "ShareReportRing"}, }; // clang-format on @@ -91,7 +91,7 @@ public: : ServiceFramework{system_, "IClientIfSession"} { // clang-format off static const FunctionInfo functions[] = { - {0, nullptr, "Unknown0"}, + {0, nullptr, "GetStateChangeEvent"}, {1, nullptr, "SetInterface"}, {2, nullptr, "GetInterface"}, {3, nullptr, "GetAlternateInterface"}, @@ -176,15 +176,15 @@ public: : ServiceFramework{system_, "IPdCradleSession"} { // clang-format off static const FunctionInfo functions[] = { - {0, nullptr, "VdmUserWrite"}, - {1, nullptr, "VdmUserRead"}, - {2, nullptr, "Vdm20Init"}, - {3, nullptr, "GetFwType"}, - {4, nullptr, "GetFwRevision"}, - {5, nullptr, "GetManufacturerId"}, - {6, nullptr, "GetDeviceId"}, - {7, nullptr, "Unknown7"}, - {8, nullptr, "Unknown8"}, + {0, nullptr, "SetCradleVdo"}, + {1, nullptr, "GetCradleVdo"}, + {2, nullptr, "ResetCradleUsbHub"}, + {3, nullptr, "GetHostPdcFirmwareType"}, + {4, nullptr, "GetHostPdcFirmwareRevision"}, + {5, nullptr, "GetHostPdcManufactureId"}, + {6, nullptr, "GetHostPdcDeviceId"}, + {7, nullptr, "AwakeCradle"}, + {8, nullptr, "SleepCradle"}, }; // clang-format on @@ -219,12 +219,12 @@ public: explicit USB_PM(Core::System& system_) : ServiceFramework{system_, "usb:pm"} { // clang-format off static const FunctionInfo functions[] = { - {0, nullptr, "Unknown0"}, - {1, nullptr, "Unknown1"}, - {2, nullptr, "Unknown2"}, - {3, nullptr, "Unknown3"}, - {4, nullptr, "Unknown4"}, - {5, nullptr, "Unknown5"}, + {0, nullptr, "GetPowerEvent"}, + {1, nullptr, "GetPowerState"}, + {2, nullptr, "GetDataEvent"}, + {3, nullptr, "GetDataRole"}, + {4, nullptr, "SetDiagData"}, + {5, nullptr, "GetDiagData"}, }; // clang-format on From 09a8e08109b71fa5cbf85cfae72f1fb73d33dbad Mon Sep 17 00:00:00 2001 From: german77 Date: Thu, 8 Apr 2021 19:32:27 -0600 Subject: [PATCH 28/28] wlan: Update to 12.x --- src/core/hle/service/wlan/wlan.cpp | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/core/hle/service/wlan/wlan.cpp b/src/core/hle/service/wlan/wlan.cpp index ddbf040691..44957e01db 100644 --- a/src/core/hle/service/wlan/wlan.cpp +++ b/src/core/hle/service/wlan/wlan.cpp @@ -46,6 +46,13 @@ public: {28, nullptr, "Unknown28"}, {29, nullptr, "Unknown29"}, {30, nullptr, "Unknown30"}, + {31, nullptr, "Unknown31"}, + {32, nullptr, "Unknown32"}, + {33, nullptr, "Unknown33"}, + {34, nullptr, "Unknown34"}, + {35, nullptr, "Unknown35"}, + {36, nullptr, "Unknown36"}, + {37, nullptr, "Unknown37"}, }; // clang-format on