Merge pull request #6171 from german77/services

service: Update service function tables and use proper names

30 files changed, 137 insertions, 97 deletions

diff --git a/src/core/hle/service/audio/audin_a.cpp b/src/core/hle/service/audio/audin_a.cpp
index 79c3aa920..10acaad19 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
 
diff --git a/src/core/hle/service/audio/audin_u.cpp b/src/core/hle/service/audio/audin_u.cpp
index 26a6deddf..ecd05e4a6 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
diff --git a/src/core/hle/service/audio/audout_a.cpp b/src/core/hle/service/audio/audout_a.cpp
index 19825fd5d..3ee522b50 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
 
diff --git a/src/core/hle/service/audio/audout_u.cpp b/src/core/hle/service/audio/audout_u.cpp
index 5ed9cb20e..5f51fca9a 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"},
diff --git a/src/core/hle/service/audio/audrec_a.cpp b/src/core/hle/service/audio/audrec_a.cpp
index c5ab7cad4..70fc17ae2 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
 
diff --git a/src/core/hle/service/audio/audrec_u.cpp b/src/core/hle/service/audio/audrec_u.cpp
index eb5c63c62..74a65ccff 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
 
diff --git a/src/core/hle/service/audio/audren_a.cpp b/src/core/hle/service/audio/audren_a.cpp
index 5e9f866f0..cf8c34a15 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
 
diff --git a/src/core/hle/service/audio/audren_u.cpp b/src/core/hle/service/audio/audren_u.cpp
index b2b2ffc5a..572be8e00 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<IAudioDevice>(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 d693dc406..37e8b4716 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);
diff --git a/src/core/hle/service/audio/codecctl.cpp b/src/core/hle/service/audio/codecctl.cpp
index 94afec1b6..42961d908 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);
 }
diff --git a/src/core/hle/service/bcat/module.cpp b/src/core/hle/service/bcat/module.cpp
index 503109fdd..b68e2c345 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);
diff --git a/src/core/hle/service/bpc/bpc.cpp b/src/core/hle/service/bpc/bpc.cpp
index e4630320e..78e01d8d8 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
 
diff --git a/src/core/hle/service/caps/caps_a.cpp b/src/core/hle/service/caps/caps_a.cpp
index 1fe4f0e14..6220e9f77 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"},
diff --git a/src/core/hle/service/caps/caps_u.cpp b/src/core/hle/service/caps/caps_u.cpp
index 842316a2e..10b8d54b1 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
diff --git a/src/core/hle/service/glue/arp.cpp b/src/core/hle/service/glue/arp.cpp
index fc77e7286..322125135 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<u64>();
 
diff --git a/src/core/hle/service/glue/arp.h b/src/core/hle/service/glue/arp.h
index 34b412e26..0df3c5e1f 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<IRegistrar> registrar;
diff --git a/src/core/hle/service/ldr/ldr.cpp b/src/core/hle/service/ldr/ldr.cpp
index d111c1357..c8bc60ad1 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<u64>();
         const auto nrr_address = rp.Pop<VAddr>();
@@ -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};
diff --git a/src/core/hle/service/ns/pl_u.cpp b/src/core/hle/service/ns/pl_u.cpp
index fcd15d81f..da139fdc4 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"},
     };
diff --git a/src/core/hle/service/olsc/olsc.cpp b/src/core/hle/service/olsc/olsc.cpp
index e2ac71fa1..b066c3417 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"},
diff --git a/src/core/hle/service/pcie/pcie.cpp b/src/core/hle/service/pcie/pcie.cpp
index f6686fc4d..9bc851591 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
diff --git a/src/core/hle/service/pctl/module.cpp b/src/core/hle/service/pctl/module.cpp
index f9089bf2f..e6cd4b3c7 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"},
diff --git a/src/core/hle/service/set/set_sys.cpp b/src/core/hle/service/set/set_sys.cpp
index b58b2c8c5..5909fdd85 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
 
diff --git a/src/core/hle/service/sm/sm.cpp b/src/core/hle/service/sm/sm.cpp
index 2b91a89d1..94608d529 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<ServiceManager> 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);
 }
diff --git a/src/core/hle/service/sockets/ethc.cpp b/src/core/hle/service/sockets/ethc.cpp
index 05681ca2d..899a64c2f 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
 
diff --git a/src/core/hle/service/sockets/nsd.cpp b/src/core/hle/service/sockets/nsd.cpp
index 51c3739bb..1159debc5 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"},
diff --git a/src/core/hle/service/sockets/sfdnsres.cpp b/src/core/hle/service/sockets/sfdnsres.cpp
index 3a6329f56..5c71f423c 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"},
diff --git a/src/core/hle/service/spl/spl.cpp b/src/core/hle/service/spl/spl.cpp
index 4e212610f..fff3f3c42 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> 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> module_)
         {14, nullptr, "DecryptAesKey"},
         {15, nullptr, "CryptAesCtr"},
         {16, nullptr, "ComputeCmac"},
+        {17, nullptr, "ImportEsKey"},
         {18, nullptr, "UnwrapTitleKey"},
         {20, nullptr, "PrepareEsCommonKey"},
         {21, nullptr, "AllocateAesKeyslot"},
diff --git a/src/core/hle/service/time/time_zone_service.cpp b/src/core/hle/service/time/time_zone_service.cpp
index 25cecbc83..3117627cf 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"},
diff --git a/src/core/hle/service/usb/usb.cpp b/src/core/hle/service/usb/usb.cpp
index 579de83e4..b3b230a8c 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
 
diff --git a/src/core/hle/service/wlan/wlan.cpp b/src/core/hle/service/wlan/wlan.cpp
index ddbf04069..44957e01d 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