7 files changed, 36 insertions, 33 deletions

diff --git a/src/core/hle/service/apt_a.cpp b/src/core/hle/service/apt_a.cpp
index 4b0f761d9..37be4b027 100644
--- a/src/core/hle/service/apt_a.cpp
+++ b/src/core/hle/service/apt_a.cpp
@@ -25,12 +25,12 @@ const Interface::FunctionInfo FunctionTable[] = {
     {0x00040040, nullptr,                   "Finalize?"},
     {0x00050040, nullptr,                   "GetAppletManInfo?"},
     {0x00060040, nullptr,                   "GetAppletInfo?"},
+    {0x000D0080, APT_U::ReceiveParameter,   "ReceiveParameter?"},
+    {0x000E0080, APT_U::GlanceParameter,    "GlanceParameter?"},
     {0x003B0040, nullptr,                   "CancelLibraryApplet?"},
     {0x00430040, nullptr,                   "NotifyToWait?"},
     {0x004B00C2, nullptr,                   "AppletUtility?"},
     {0x00550040, nullptr,                   "WriteInputToNsState?"},
-    {0x000D0080, APT_U::ReceiveParameter,   "ReceiveParameter" },
-    {0x000E0080, APT_U::GlanceParameter,    "GlanceParameter" },
 };
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
diff --git a/src/core/hle/service/cfg/cfg_u.cpp b/src/core/hle/service/cfg/cfg_u.cpp
index 03c01cf90..835620909 100644
--- a/src/core/hle/service/cfg/cfg_u.cpp
+++ b/src/core/hle/service/cfg/cfg_u.cpp
@@ -172,12 +172,12 @@ static void GetModelNintendo2DS(Service::Interface* self) {
 const Interface::FunctionInfo FunctionTable[] = {
     {0x00010082, GetConfigInfoBlk2,     "GetConfigInfoBlk2"},
     {0x00020000, nullptr,               "SecureInfoGetRegion"},
-    {0x00030000, nullptr,               "GenHashConsoleUnique"},
+    {0x00030040, nullptr,               "GenHashConsoleUnique"},
     {0x00040000, nullptr,               "GetRegionCanadaUSA"},
     {0x00050000, GetSystemModel,        "GetSystemModel"},
     {0x00060000, GetModelNintendo2DS,   "GetModelNintendo2DS"},
-    {0x00070040, nullptr,               "unknown"},
-    {0x00080080, nullptr,               "unknown"},
+    {0x00070040, nullptr,               "WriteToFirstByteCfgSavegame"},
+    {0x00080080, nullptr,               "GoThroughTable"},
     {0x00090040, GetCountryCodeString,  "GetCountryCodeString"},
     {0x000A0040, GetCountryCodeID,      "GetCountryCodeID"},
 };
diff --git a/src/core/hle/service/csnd_snd.cpp b/src/core/hle/service/csnd_snd.cpp
index aef8cfbca..3a557efe1 100644
--- a/src/core/hle/service/csnd_snd.cpp
+++ b/src/core/hle/service/csnd_snd.cpp
@@ -14,16 +14,15 @@ namespace CSND_SND {
 const Interface::FunctionInfo FunctionTable[] = {
     {0x00010140, nullptr,               "Initialize"},
     {0x00020000, nullptr,               "Shutdown"},
-    {0x00030040, nullptr,               "Unknown"},
-    {0x00040080, nullptr,               "Unknown"},
-    {0x00050000, nullptr,               "Unknown"},
-    {0x00060000, nullptr,               "Unknown"},
-    {0x00070000, nullptr,               "Unknown"},
-    {0x00080040, nullptr,               "Unknown"},
+    {0x00030040, nullptr,               "ExecuteType0Commands"},
+    {0x00040080, nullptr,               "ExecuteType1Commands"},
+    {0x00050000, nullptr,               "AcquireSoundChannels"},
+    {0x00060000, nullptr,               "ReleaseSoundChannels"},
+    {0x00070000, nullptr,               "AcquireCaptureDevice"},
+    {0x00080040, nullptr,               "ReleaseCaptureDevice"},
     {0x00090082, nullptr,               "FlushDCache"},
     {0x000A0082, nullptr,               "StoreDCache"},
     {0x000B0082, nullptr,               "InvalidateDCache"},
-    {0x000C0000, nullptr,               "Unknown"},
 };
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
diff --git a/src/core/hle/service/ir_rst.cpp b/src/core/hle/service/ir_rst.cpp
index b388afb15..d49bd5335 100644
--- a/src/core/hle/service/ir_rst.cpp
+++ b/src/core/hle/service/ir_rst.cpp
@@ -15,12 +15,7 @@ const Interface::FunctionInfo FunctionTable[] = {
     {0x00010000, nullptr,                 "GetHandles"},
     {0x00020080, nullptr,                 "Initialize"},
     {0x00030000, nullptr,                 "Shutdown"},
-    {0x00040000, nullptr,                 "Unknown"},
-    {0x00050000, nullptr,                 "Unknown"},
-    {0x00060000, nullptr,                 "Unknown"},
-    {0x00070080, nullptr,                 "Unknown"},
-    {0x00080000, nullptr,                 "Unknown"},
-    {0x00090000, nullptr,                 "Unknown"},
+    {0x00090000, nullptr,                 "WriteToTwoFields"},
 };
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
diff --git a/src/core/hle/service/ldr_ro.cpp b/src/core/hle/service/ldr_ro.cpp
index 9c9e90a40..7d6e2e8e8 100644
--- a/src/core/hle/service/ldr_ro.cpp
+++ b/src/core/hle/service/ldr_ro.cpp
@@ -13,10 +13,14 @@ namespace LDR_RO {
 
 const Interface::FunctionInfo FunctionTable[] = {
     {0x000100C2, nullptr,               "Initialize"},
-    {0x00020082, nullptr,               "CRR_Load"},
-    {0x00030042, nullptr,               "CRR_Unload"},
-    {0x000402C2, nullptr,               "CRO_LoadAndFix"},
-    {0x000500C2, nullptr,               "CRO_ApplyRelocationPatchesAndLink"}
+    {0x00020082, nullptr,               "LoadCRR"},
+    {0x00030042, nullptr,               "UnloadCCR"},
+    {0x000402C2, nullptr,               "LoadExeCRO"},
+    {0x000500C2, nullptr,               "LoadCROSymbols"},
+    {0x00060042, nullptr,               "CRO_Load?"},
+    {0x00070042, nullptr,               "LoadCROSymbols"},
+    {0x00080042, nullptr,               "Shutdown"},
+    {0x000902C2, nullptr,               "LoadExeCRO_New?"},
 };
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
diff --git a/src/core/hle/service/ndm_u.cpp b/src/core/hle/service/ndm_u.cpp
index 233b14f6d..0f03de6ae 100644
--- a/src/core/hle/service/ndm_u.cpp
+++ b/src/core/hle/service/ndm_u.cpp
@@ -11,10 +11,13 @@
 namespace NDM_U {
 
 const Interface::FunctionInfo FunctionTable[] = {
-    {0x00060040, nullptr, "SuspendDaemons"},
-    {0x00080040, nullptr, "DisableWifiUsage"},
-    {0x00090000, nullptr, "EnableWifiUsage"},
-    {0x00140040, nullptr, "OverrideDefaultDaemons"},
+    {0x00010042, nullptr,                 "EnterExclusiveState"},
+    {0x00020002, nullptr,                 "LeaveExclusiveState"},
+    {0x00030000, nullptr,                 "QueryExclusiveMode"},
+    {0x00060040, nullptr,                 "SuspendDaemons"},
+    {0x00080040, nullptr,                 "DisableWifiUsage"},
+    {0x00090000, nullptr,                 "EnableWifiUsage"},
+    {0x00140040, nullptr,                 "OverrideDefaultDaemons"},
 };
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
diff --git a/src/core/hle/service/srv.cpp b/src/core/hle/service/srv.cpp
index 25fab1a4f..912b52adf 100644
--- a/src/core/hle/service/srv.cpp
+++ b/src/core/hle/service/srv.cpp
@@ -52,13 +52,15 @@ static void GetServiceHandle(Service::Interface* self) {
 }
 
 const Interface::FunctionInfo FunctionTable[] = {
-    {0x00010002, Initialize,        "Initialize"},
-    {0x00020000, GetProcSemaphore,  "GetProcSemaphore"},
-    {0x00030100, nullptr,           "RegisterService"},
-    {0x000400C0, nullptr,           "UnregisterService"},
-    {0x00050100, GetServiceHandle,  "GetServiceHandle"},
-    {0x000B0000, nullptr,           "ReceiveNotification"},
-    {0x000C0080, nullptr,           "PublishToSubscriber"}
+    {0x00010002, Initialize,          "Initialize"},
+    {0x00020000, GetProcSemaphore,    "GetProcSemaphore"},
+    {0x00030100, nullptr,             "RegisterService"},
+    {0x000400C0, nullptr,             "UnregisterService"},
+    {0x00050100, GetServiceHandle,    "GetServiceHandle"},
+    {0x000600C2, nullptr,             "RegisterHandle"},
+    {0x00090040, nullptr,             "Subscribe"},
+    {0x000B0000, nullptr,             "ReceiveNotification"},
+    {0x000C0080, nullptr,             "PublishToSubscriber"},
 };
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////