Various fixes and clang

6 files changed, 108 insertions, 115 deletions

diff --git a/src/core/hle/service/am/am.cpp b/src/core/hle/service/am/am.cpp
index cda1f419a..bfc431e88 100644
--- a/src/core/hle/service/am/am.cpp
+++ b/src/core/hle/service/am/am.cpp
@@ -109,7 +109,7 @@ ISelfController::ISelfController(std::shared_ptr<NVFlinger::NVFlinger> nvflinger
         {61, nullptr, "SetMediaPlaybackState"},
         {62, nullptr, "SetIdleTimeDetectionExtension"},
         {63, nullptr, "GetIdleTimeDetectionExtension"},
-        {64, nullptr, "SetInputDetectionSourceSet"}
+        {64, nullptr, "SetInputDetectionSourceSet"},
         {65, nullptr, "ReportUserIsActive"},
         {66, nullptr, "GetCurrentIlluminance"},
         {67, nullptr, "IsIlluminanceAvailable"},
diff --git a/src/core/hle/service/filesystem/fsp_srv.cpp b/src/core/hle/service/filesystem/fsp_srv.cpp
index 92e48a757..48c45b1b4 100644
--- a/src/core/hle/service/filesystem/fsp_srv.cpp
+++ b/src/core/hle/service/filesystem/fsp_srv.cpp
@@ -22,12 +22,8 @@ public:
     IStorage(std::unique_ptr<FileSys::StorageBackend>&& backend)
         : ServiceFramework("IStorage"), backend(std::move(backend)) {
         static const FunctionInfo functions[] = {
-            {0, &IStorage::Read, "Read"}, 
-            {1, nullptr, "Write"},   
-            {2, nullptr, "Flush"},
-            {3, nullptr, "SetSize"},      
-            {4, nullptr, "GetSize"},
-            {5, nullptr, "OperateRange"},
+            {0, &IStorage::Read, "Read"}, {1, nullptr, "Write"},   {2, nullptr, "Flush"},
+            {3, nullptr, "SetSize"},      {4, nullptr, "GetSize"}, {5, nullptr, "OperateRange"},
         };
         RegisterHandlers(functions);
     }
@@ -76,12 +72,9 @@ public:
     explicit IFile(std::unique_ptr<FileSys::StorageBackend>&& backend)
         : ServiceFramework("IFile"), backend(std::move(backend)) {
         static const FunctionInfo functions[] = {
-            {0, &IFile::Read, "Read"},       
-            {1, &IFile::Write, "Write"},     
-            {2, nullptr, "Flush"},
-            {3, &IFile::SetSize, "SetSize"}, 
-            {4, &IFile::GetSize, "GetSize"},
-            {5, nullptr, "OperateRange"},
+            {0, &IFile::Read, "Read"},       {1, &IFile::Write, "Write"},
+            {2, nullptr, "Flush"},           {3, &IFile::SetSize, "SetSize"},
+            {4, &IFile::GetSize, "GetSize"}, {5, nullptr, "OperateRange"},
         };
         RegisterHandlers(functions);
     }
diff --git a/src/core/hle/service/friend/friend.h b/src/core/hle/service/friend/friend.h
index ffa498397..2b21b4e15 100644
--- a/src/core/hle/service/friend/friend.h
+++ b/src/core/hle/service/friend/friend.h
@@ -15,7 +15,7 @@ public:
     public:
         Interface(std::shared_ptr<Module> module, const char* name);
 
-        void Unknown(Kernel::HLERequestContext& ctx);
+        void CreateFriendService(Kernel::HLERequestContext& ctx);
 
     protected:
         std::shared_ptr<Module> module;
diff --git a/src/core/hle/service/nvdrv/nvmemp.h b/src/core/hle/service/nvdrv/nvmemp.h
index a6b5fbb82..fb16026b0 100644
--- a/src/core/hle/service/nvdrv/nvmemp.h
+++ b/src/core/hle/service/nvdrv/nvmemp.h
@@ -15,8 +15,8 @@ public:
     ~NVMEMP() = default;
 
 private:
-    void Unknown0(Kernel::HLERequestContext& ctx);
-    void Unknown1(Kernel::HLERequestContext& ctx);
+    void Cmd0(Kernel::HLERequestContext& ctx);
+    void Cmd1(Kernel::HLERequestContext& ctx);
 };
 
 } // namespace Nvidia
diff --git a/src/core/hle/service/pctl/pctl_a.cpp b/src/core/hle/service/pctl/pctl_a.cpp
index 3d0474105..4e644be64 100644
--- a/src/core/hle/service/pctl/pctl_a.cpp
+++ b/src/core/hle/service/pctl/pctl_a.cpp
@@ -12,104 +12,104 @@ namespace PCTL {
 class IParentalControlService final : public ServiceFramework<IParentalControlService> {
 public:
     IParentalControlService() : ServiceFramework("IParentalControlService") {
-    static const FunctionInfo functions[] = {
-        {1, nullptr, "Initialize"},
-        {1001, nullptr, "CheckFreeCommunicationPermission"},
-        {1002, nullptr, "ConfirmLaunchApplicationPermission"},
-        {1003, nullptr, "ConfirmResumeApplicationPermission"},
-        {1004, nullptr, "ConfirmSnsPostPermission"},
-        {1005, nullptr, "ConfirmSystemSettingsPermission"},
-        {1006, nullptr, "IsRestrictionTemporaryUnlocked"},
-        {1007, nullptr, "RevertRestrictionTemporaryUnlocked"},
-        {1008, nullptr, "EnterRestrictedSystemSettings"},
-        {1009, nullptr, "LeaveRestrictedSystemSettings"},
-        {1010, nullptr, "IsRestrictedSystemSettingsEntered"},
-        {1011, nullptr, "RevertRestrictedSystemSettingsEntered"},
-        {1012, nullptr, "GetRestrictedFeatures"},
-        {1013, nullptr, "ConfirmStereoVisionPermission"},
-        {1014, nullptr, "ConfirmPlayableApplicationVideoOld"},
-        {1015, nullptr, "ConfirmPlayableApplicationVideo"},
-        {1031, nullptr, "IsRestrictionEnabled"},
-        {1032, nullptr, "GetSafetyLevel"},
-        {1033, nullptr, "SetSafetyLevel"},
-        {1034, nullptr, "GetSafetyLevelSettings"},
-        {1035, nullptr, "GetCurrentSettings"},
-        {1036, nullptr, "SetCustomSafetyLevelSettings"},
-        {1037, nullptr, "GetDefaultRatingOrganization"},
-        {1038, nullptr, "SetDefaultRatingOrganization"},
-        {1039, nullptr, "GetFreeCommunicationApplicationListCount"},
-        {1042, nullptr, "AddToFreeCommunicationApplicationList"},
-        {1043, nullptr, "DeleteSettings"},
-        {1044, nullptr, "GetFreeCommunicationApplicationList"},
-        {1045, nullptr, "UpdateFreeCommunicationApplicationList"},
-        {1046, nullptr, "DisableFeaturesForReset"},
-        {1047, nullptr, "NotifyApplicationDownloadStarted"},
-        {1061, nullptr, "ConfirmStereoVisionRestrictionConfigurable"},
-        {1062, nullptr, "GetStereoVisionRestriction"},
-        {1063, nullptr, "SetStereoVisionRestriction"},
-        {1064, nullptr, "ResetConfirmedStereoVisionPermission"},
-        {1065, nullptr, "IsStereoVisionPermitted"},
-        {1201, nullptr, "UnlockRestrictionTemporarily"},
-        {1202, nullptr, "UnlockSystemSettingsRestriction"},
-        {1203, nullptr, "SetPinCode"},
-        {1204, nullptr, "GenerateInquiryCode"},
-        {1205, nullptr, "CheckMasterKey"},
-        {1206, nullptr, "GetPinCodeLength"},
-        {1207, nullptr, "GetPinCodeChangedEvent"},
-        {1208, nullptr, "GetPinCode"},
-        {1403, nullptr, "IsPairingActive"},
-        {1406, nullptr, "GetSettingsLastUpdated"},
-        {1411, nullptr, "GetPairingAccountInfo"},
-        {1421, nullptr, "GetAccountNickname"},
-        {1424, nullptr, "GetAccountState"},
-        {1432, nullptr, "GetSynchronizationEvent"},
-        {1451, nullptr, "StartPlayTimer"},
-        {1452, nullptr, "StopPlayTimer"},
-        {1453, nullptr, "IsPlayTimerEnabled"},
-        {1454, nullptr, "GetPlayTimerRemainingTime"},
-        {1455, nullptr, "IsRestrictedByPlayTimer"},
-        {1456, nullptr, "GetPlayTimerSettings"},
-        {1457, nullptr, "GetPlayTimerEventToRequestSuspension"},
-        {1458, nullptr, "IsPlayTimerAlarmDisabled"},
-        {1471, nullptr, "NotifyWrongPinCodeInputManyTimes"},
-        {1472, nullptr, "CancelNetworkRequest"},
-        {1473, nullptr, "GetUnlinkedEvent"},
-        {1474, nullptr, "ClearUnlinkedEvent"},
-        {1601, nullptr, "DisableAllFeatures"},
-        {1602, nullptr, "PostEnableAllFeatures"},
-        {1603, nullptr, "IsAllFeaturesDisabled"},
-        {1901, nullptr, "DeleteFromFreeCommunicationApplicationListForDebug"},
-        {1902, nullptr, "ClearFreeCommunicationApplicationListForDebug"},
-        {1903, nullptr, "GetExemptApplicationListCountForDebug"},
-        {1904, nullptr, "GetExemptApplicationListForDebug"},
-        {1905, nullptr, "UpdateExemptApplicationListForDebug"},
-        {1906, nullptr, "AddToExemptApplicationListForDebug"},
-        {1907, nullptr, "DeleteFromExemptApplicationListForDebug"},
-        {1908, nullptr, "ClearExemptApplicationListForDebug"},
-        {1941, nullptr, "DeletePairing"},
-        {1951, nullptr, "SetPlayTimerSettingsForDebug"},
-        {1952, nullptr, "GetPlayTimerSpentTimeForTest"},
-        {1953, nullptr, "SetPlayTimerAlarmDisabledForDebug"},
-        {2001, nullptr, "RequestPairingAsync"},
-        {2002, nullptr, "FinishRequestPairing"},
-        {2003, nullptr, "AuthorizePairingAsync"},
-        {2004, nullptr, "FinishAuthorizePairing"},
-        {2005, nullptr, "RetrievePairingInfoAsync"},
-        {2006, nullptr, "FinishRetrievePairingInfo"},
-        {2007, nullptr, "UnlinkPairingAsync"},
-        {2008, nullptr, "FinishUnlinkPairing"},
-        {2009, nullptr, "GetAccountMiiImageAsync"},
-        {2010, nullptr, "FinishGetAccountMiiImage"},
-        {2011, nullptr, "GetAccountMiiImageContentTypeAsync"},
-        {2012, nullptr, "FinishGetAccountMiiImageContentType"},
-        {2013, nullptr, "SynchronizeParentalControlSettingsAsync"},
-        {2014, nullptr, "FinishSynchronizeParentalControlSettings"},
-        {2015, nullptr, "FinishSynchronizeParentalControlSettingsWithLastUpdated"},
-        {2016, nullptr, "RequestUpdateExemptionListAsync"},
-    };
-    RegisterHandlers(functions);
-}
-
+        static const FunctionInfo functions[] = {
+            {1, nullptr, "Initialize"},
+            {1001, nullptr, "CheckFreeCommunicationPermission"},
+            {1002, nullptr, "ConfirmLaunchApplicationPermission"},
+            {1003, nullptr, "ConfirmResumeApplicationPermission"},
+            {1004, nullptr, "ConfirmSnsPostPermission"},
+            {1005, nullptr, "ConfirmSystemSettingsPermission"},
+            {1006, nullptr, "IsRestrictionTemporaryUnlocked"},
+            {1007, nullptr, "RevertRestrictionTemporaryUnlocked"},
+            {1008, nullptr, "EnterRestrictedSystemSettings"},
+            {1009, nullptr, "LeaveRestrictedSystemSettings"},
+            {1010, nullptr, "IsRestrictedSystemSettingsEntered"},
+            {1011, nullptr, "RevertRestrictedSystemSettingsEntered"},
+            {1012, nullptr, "GetRestrictedFeatures"},
+            {1013, nullptr, "ConfirmStereoVisionPermission"},
+            {1014, nullptr, "ConfirmPlayableApplicationVideoOld"},
+            {1015, nullptr, "ConfirmPlayableApplicationVideo"},
+            {1031, nullptr, "IsRestrictionEnabled"},
+            {1032, nullptr, "GetSafetyLevel"},
+            {1033, nullptr, "SetSafetyLevel"},
+            {1034, nullptr, "GetSafetyLevelSettings"},
+            {1035, nullptr, "GetCurrentSettings"},
+            {1036, nullptr, "SetCustomSafetyLevelSettings"},
+            {1037, nullptr, "GetDefaultRatingOrganization"},
+            {1038, nullptr, "SetDefaultRatingOrganization"},
+            {1039, nullptr, "GetFreeCommunicationApplicationListCount"},
+            {1042, nullptr, "AddToFreeCommunicationApplicationList"},
+            {1043, nullptr, "DeleteSettings"},
+            {1044, nullptr, "GetFreeCommunicationApplicationList"},
+            {1045, nullptr, "UpdateFreeCommunicationApplicationList"},
+            {1046, nullptr, "DisableFeaturesForReset"},
+            {1047, nullptr, "NotifyApplicationDownloadStarted"},
+            {1061, nullptr, "ConfirmStereoVisionRestrictionConfigurable"},
+            {1062, nullptr, "GetStereoVisionRestriction"},
+            {1063, nullptr, "SetStereoVisionRestriction"},
+            {1064, nullptr, "ResetConfirmedStereoVisionPermission"},
+            {1065, nullptr, "IsStereoVisionPermitted"},
+            {1201, nullptr, "UnlockRestrictionTemporarily"},
+            {1202, nullptr, "UnlockSystemSettingsRestriction"},
+            {1203, nullptr, "SetPinCode"},
+            {1204, nullptr, "GenerateInquiryCode"},
+            {1205, nullptr, "CheckMasterKey"},
+            {1206, nullptr, "GetPinCodeLength"},
+            {1207, nullptr, "GetPinCodeChangedEvent"},
+            {1208, nullptr, "GetPinCode"},
+            {1403, nullptr, "IsPairingActive"},
+            {1406, nullptr, "GetSettingsLastUpdated"},
+            {1411, nullptr, "GetPairingAccountInfo"},
+            {1421, nullptr, "GetAccountNickname"},
+            {1424, nullptr, "GetAccountState"},
+            {1432, nullptr, "GetSynchronizationEvent"},
+            {1451, nullptr, "StartPlayTimer"},
+            {1452, nullptr, "StopPlayTimer"},
+            {1453, nullptr, "IsPlayTimerEnabled"},
+            {1454, nullptr, "GetPlayTimerRemainingTime"},
+            {1455, nullptr, "IsRestrictedByPlayTimer"},
+            {1456, nullptr, "GetPlayTimerSettings"},
+            {1457, nullptr, "GetPlayTimerEventToRequestSuspension"},
+            {1458, nullptr, "IsPlayTimerAlarmDisabled"},
+            {1471, nullptr, "NotifyWrongPinCodeInputManyTimes"},
+            {1472, nullptr, "CancelNetworkRequest"},
+            {1473, nullptr, "GetUnlinkedEvent"},
+            {1474, nullptr, "ClearUnlinkedEvent"},
+            {1601, nullptr, "DisableAllFeatures"},
+            {1602, nullptr, "PostEnableAllFeatures"},
+            {1603, nullptr, "IsAllFeaturesDisabled"},
+            {1901, nullptr, "DeleteFromFreeCommunicationApplicationListForDebug"},
+            {1902, nullptr, "ClearFreeCommunicationApplicationListForDebug"},
+            {1903, nullptr, "GetExemptApplicationListCountForDebug"},
+            {1904, nullptr, "GetExemptApplicationListForDebug"},
+            {1905, nullptr, "UpdateExemptApplicationListForDebug"},
+            {1906, nullptr, "AddToExemptApplicationListForDebug"},
+            {1907, nullptr, "DeleteFromExemptApplicationListForDebug"},
+            {1908, nullptr, "ClearExemptApplicationListForDebug"},
+            {1941, nullptr, "DeletePairing"},
+            {1951, nullptr, "SetPlayTimerSettingsForDebug"},
+            {1952, nullptr, "GetPlayTimerSpentTimeForTest"},
+            {1953, nullptr, "SetPlayTimerAlarmDisabledForDebug"},
+            {2001, nullptr, "RequestPairingAsync"},
+            {2002, nullptr, "FinishRequestPairing"},
+            {2003, nullptr, "AuthorizePairingAsync"},
+            {2004, nullptr, "FinishAuthorizePairing"},
+            {2005, nullptr, "RetrievePairingInfoAsync"},
+            {2006, nullptr, "FinishRetrievePairingInfo"},
+            {2007, nullptr, "UnlinkPairingAsync"},
+            {2008, nullptr, "FinishUnlinkPairing"},
+            {2009, nullptr, "GetAccountMiiImageAsync"},
+            {2010, nullptr, "FinishGetAccountMiiImage"},
+            {2011, nullptr, "GetAccountMiiImageContentTypeAsync"},
+            {2012, nullptr, "FinishGetAccountMiiImageContentType"},
+            {2013, nullptr, "SynchronizeParentalControlSettingsAsync"},
+            {2014, nullptr, "FinishSynchronizeParentalControlSettings"},
+            {2015, nullptr, "FinishSynchronizeParentalControlSettingsWithLastUpdated"},
+            {2016, nullptr, "RequestUpdateExemptionListAsync"},
+        };
+        RegisterHandlers(functions);
+    }
+};
 void PCTL_A::CreateService(Kernel::HLERequestContext& ctx) {
     IPC::ResponseBuilder rb{ctx, 2, 0, 1};
     rb.Push(RESULT_SUCCESS);
diff --git a/src/core/hle/service/pctl/pctl_a.h b/src/core/hle/service/pctl/pctl_a.h
index a89c8d07d..3aa8873a9 100644
--- a/src/core/hle/service/pctl/pctl_a.h
+++ b/src/core/hle/service/pctl/pctl_a.h
@@ -15,7 +15,7 @@ public:
     ~PCTL_A() = default;
 
 private:
-    void GetService(Kernel::HLERequestContext& ctx);
+    void CreateService(Kernel::HLERequestContext& ctx);
 };
 
 } // namespace PCTL