summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Hexagon122018-04-11 14:48:56 +0300
committerGravatar Hexagon122018-04-11 14:48:56 +0300
commitcc89b7bfcbe3448c8ca3e224b8d3fa628214748e (patch)
tree7189a5cc1c44914d55183d76d584c777eb2334a0
parentDecimal change (diff)
downloadyuzu-cc89b7bfcbe3448c8ca3e224b8d3fa628214748e.tar.gz
yuzu-cc89b7bfcbe3448c8ca3e224b8d3fa628214748e.tar.xz
yuzu-cc89b7bfcbe3448c8ca3e224b8d3fa628214748e.zip
Various fixes and clang
Diffstat
-rw-r--r--src/core/hle/service/am/am.cpp2
-rw-r--r--src/core/hle/service/filesystem/fsp_srv.cpp17
-rw-r--r--src/core/hle/service/friend/friend.h2
-rw-r--r--src/core/hle/service/nvdrv/nvmemp.h4
-rw-r--r--src/core/hle/service/pctl/pctl_a.cpp196
-rw-r--r--src/core/hle/service/pctl/pctl_a.h2
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
109 {61, nullptr, "SetMediaPlaybackState"}, 109 {61, nullptr, "SetMediaPlaybackState"},
110 {62, nullptr, "SetIdleTimeDetectionExtension"}, 110 {62, nullptr, "SetIdleTimeDetectionExtension"},
111 {63, nullptr, "GetIdleTimeDetectionExtension"}, 111 {63, nullptr, "GetIdleTimeDetectionExtension"},
112 {64, nullptr, "SetInputDetectionSourceSet"} 112 {64, nullptr, "SetInputDetectionSourceSet"},
113 {65, nullptr, "ReportUserIsActive"}, 113 {65, nullptr, "ReportUserIsActive"},
114 {66, nullptr, "GetCurrentIlluminance"}, 114 {66, nullptr, "GetCurrentIlluminance"},
115 {67, nullptr, "IsIlluminanceAvailable"}, 115 {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:
22 IStorage(std::unique_ptr<FileSys::StorageBackend>&& backend) 22 IStorage(std::unique_ptr<FileSys::StorageBackend>&& backend)
23 : ServiceFramework("IStorage"), backend(std::move(backend)) { 23 : ServiceFramework("IStorage"), backend(std::move(backend)) {
24 static const FunctionInfo functions[] = { 24 static const FunctionInfo functions[] = {
25 {0, &IStorage::Read, "Read"}, 25 {0, &IStorage::Read, "Read"}, {1, nullptr, "Write"}, {2, nullptr, "Flush"},
26 {1, nullptr, "Write"}, 26 {3, nullptr, "SetSize"}, {4, nullptr, "GetSize"}, {5, nullptr, "OperateRange"},
27 {2, nullptr, "Flush"},
28 {3, nullptr, "SetSize"},
29 {4, nullptr, "GetSize"},
30 {5, nullptr, "OperateRange"},
31 }; 27 };
32 RegisterHandlers(functions); 28 RegisterHandlers(functions);
33 } 29 }
@@ -76,12 +72,9 @@ public:
76 explicit IFile(std::unique_ptr<FileSys::StorageBackend>&& backend) 72 explicit IFile(std::unique_ptr<FileSys::StorageBackend>&& backend)
77 : ServiceFramework("IFile"), backend(std::move(backend)) { 73 : ServiceFramework("IFile"), backend(std::move(backend)) {
78 static const FunctionInfo functions[] = { 74 static const FunctionInfo functions[] = {
79 {0, &IFile::Read, "Read"}, 75 {0, &IFile::Read, "Read"}, {1, &IFile::Write, "Write"},
80 {1, &IFile::Write, "Write"}, 76 {2, nullptr, "Flush"}, {3, &IFile::SetSize, "SetSize"},
81 {2, nullptr, "Flush"}, 77 {4, &IFile::GetSize, "GetSize"}, {5, nullptr, "OperateRange"},
82 {3, &IFile::SetSize, "SetSize"},
83 {4, &IFile::GetSize, "GetSize"},
84 {5, nullptr, "OperateRange"},
85 }; 78 };
86 RegisterHandlers(functions); 79 RegisterHandlers(functions);
87 } 80 }
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:
15 public: 15 public:
16 Interface(std::shared_ptr<Module> module, const char* name); 16 Interface(std::shared_ptr<Module> module, const char* name);
17 17
18 void Unknown(Kernel::HLERequestContext& ctx); 18 void CreateFriendService(Kernel::HLERequestContext& ctx);
19 19
20 protected: 20 protected:
21 std::shared_ptr<Module> module; 21 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:
15 ~NVMEMP() = default; 15 ~NVMEMP() = default;
16 16
17private: 17private:
18 void Unknown0(Kernel::HLERequestContext& ctx); 18 void Cmd0(Kernel::HLERequestContext& ctx);
19 void Unknown1(Kernel::HLERequestContext& ctx); 19 void Cmd1(Kernel::HLERequestContext& ctx);
20}; 20};
21 21
22} // namespace Nvidia 22} // 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 {
12class IParentalControlService final : public ServiceFramework<IParentalControlService> { 12class IParentalControlService final : public ServiceFramework<IParentalControlService> {
13public: 13public:
14 IParentalControlService() : ServiceFramework("IParentalControlService") { 14 IParentalControlService() : ServiceFramework("IParentalControlService") {
15 static const FunctionInfo functions[] = { 15 static const FunctionInfo functions[] = {
16 {1, nullptr, "Initialize"}, 16 {1, nullptr, "Initialize"},
17 {1001, nullptr, "CheckFreeCommunicationPermission"}, 17 {1001, nullptr, "CheckFreeCommunicationPermission"},
18 {1002, nullptr, "ConfirmLaunchApplicationPermission"}, 18 {1002, nullptr, "ConfirmLaunchApplicationPermission"},
19 {1003, nullptr, "ConfirmResumeApplicationPermission"}, 19 {1003, nullptr, "ConfirmResumeApplicationPermission"},
20 {1004, nullptr, "ConfirmSnsPostPermission"}, 20 {1004, nullptr, "ConfirmSnsPostPermission"},
21 {1005, nullptr, "ConfirmSystemSettingsPermission"}, 21 {1005, nullptr, "ConfirmSystemSettingsPermission"},
22 {1006, nullptr, "IsRestrictionTemporaryUnlocked"}, 22 {1006, nullptr, "IsRestrictionTemporaryUnlocked"},
23 {1007, nullptr, "RevertRestrictionTemporaryUnlocked"}, 23 {1007, nullptr, "RevertRestrictionTemporaryUnlocked"},
24 {1008, nullptr, "EnterRestrictedSystemSettings"}, 24 {1008, nullptr, "EnterRestrictedSystemSettings"},
25 {1009, nullptr, "LeaveRestrictedSystemSettings"}, 25 {1009, nullptr, "LeaveRestrictedSystemSettings"},
26 {1010, nullptr, "IsRestrictedSystemSettingsEntered"}, 26 {1010, nullptr, "IsRestrictedSystemSettingsEntered"},
27 {1011, nullptr, "RevertRestrictedSystemSettingsEntered"}, 27 {1011, nullptr, "RevertRestrictedSystemSettingsEntered"},
28 {1012, nullptr, "GetRestrictedFeatures"}, 28 {1012, nullptr, "GetRestrictedFeatures"},
29 {1013, nullptr, "ConfirmStereoVisionPermission"}, 29 {1013, nullptr, "ConfirmStereoVisionPermission"},
30 {1014, nullptr, "ConfirmPlayableApplicationVideoOld"}, 30 {1014, nullptr, "ConfirmPlayableApplicationVideoOld"},
31 {1015, nullptr, "ConfirmPlayableApplicationVideo"}, 31 {1015, nullptr, "ConfirmPlayableApplicationVideo"},
32 {1031, nullptr, "IsRestrictionEnabled"}, 32 {1031, nullptr, "IsRestrictionEnabled"},
33 {1032, nullptr, "GetSafetyLevel"}, 33 {1032, nullptr, "GetSafetyLevel"},
34 {1033, nullptr, "SetSafetyLevel"}, 34 {1033, nullptr, "SetSafetyLevel"},
35 {1034, nullptr, "GetSafetyLevelSettings"}, 35 {1034, nullptr, "GetSafetyLevelSettings"},
36 {1035, nullptr, "GetCurrentSettings"}, 36 {1035, nullptr, "GetCurrentSettings"},
37 {1036, nullptr, "SetCustomSafetyLevelSettings"}, 37 {1036, nullptr, "SetCustomSafetyLevelSettings"},
38 {1037, nullptr, "GetDefaultRatingOrganization"}, 38 {1037, nullptr, "GetDefaultRatingOrganization"},
39 {1038, nullptr, "SetDefaultRatingOrganization"}, 39 {1038, nullptr, "SetDefaultRatingOrganization"},
40 {1039, nullptr, "GetFreeCommunicationApplicationListCount"}, 40 {1039, nullptr, "GetFreeCommunicationApplicationListCount"},
41 {1042, nullptr, "AddToFreeCommunicationApplicationList"}, 41 {1042, nullptr, "AddToFreeCommunicationApplicationList"},
42 {1043, nullptr, "DeleteSettings"}, 42 {1043, nullptr, "DeleteSettings"},
43 {1044, nullptr, "GetFreeCommunicationApplicationList"}, 43 {1044, nullptr, "GetFreeCommunicationApplicationList"},
44 {1045, nullptr, "UpdateFreeCommunicationApplicationList"}, 44 {1045, nullptr, "UpdateFreeCommunicationApplicationList"},
45 {1046, nullptr, "DisableFeaturesForReset"}, 45 {1046, nullptr, "DisableFeaturesForReset"},
46 {1047, nullptr, "NotifyApplicationDownloadStarted"}, 46 {1047, nullptr, "NotifyApplicationDownloadStarted"},
47 {1061, nullptr, "ConfirmStereoVisionRestrictionConfigurable"}, 47 {1061, nullptr, "ConfirmStereoVisionRestrictionConfigurable"},
48 {1062, nullptr, "GetStereoVisionRestriction"}, 48 {1062, nullptr, "GetStereoVisionRestriction"},
49 {1063, nullptr, "SetStereoVisionRestriction"}, 49 {1063, nullptr, "SetStereoVisionRestriction"},
50 {1064, nullptr, "ResetConfirmedStereoVisionPermission"}, 50 {1064, nullptr, "ResetConfirmedStereoVisionPermission"},
51 {1065, nullptr, "IsStereoVisionPermitted"}, 51 {1065, nullptr, "IsStereoVisionPermitted"},
52 {1201, nullptr, "UnlockRestrictionTemporarily"}, 52 {1201, nullptr, "UnlockRestrictionTemporarily"},
53 {1202, nullptr, "UnlockSystemSettingsRestriction"}, 53 {1202, nullptr, "UnlockSystemSettingsRestriction"},
54 {1203, nullptr, "SetPinCode"}, 54 {1203, nullptr, "SetPinCode"},
55 {1204, nullptr, "GenerateInquiryCode"}, 55 {1204, nullptr, "GenerateInquiryCode"},
56 {1205, nullptr, "CheckMasterKey"}, 56 {1205, nullptr, "CheckMasterKey"},
57 {1206, nullptr, "GetPinCodeLength"}, 57 {1206, nullptr, "GetPinCodeLength"},
58 {1207, nullptr, "GetPinCodeChangedEvent"}, 58 {1207, nullptr, "GetPinCodeChangedEvent"},
59 {1208, nullptr, "GetPinCode"}, 59 {1208, nullptr, "GetPinCode"},
60 {1403, nullptr, "IsPairingActive"}, 60 {1403, nullptr, "IsPairingActive"},
61 {1406, nullptr, "GetSettingsLastUpdated"}, 61 {1406, nullptr, "GetSettingsLastUpdated"},
62 {1411, nullptr, "GetPairingAccountInfo"}, 62 {1411, nullptr, "GetPairingAccountInfo"},
63 {1421, nullptr, "GetAccountNickname"}, 63 {1421, nullptr, "GetAccountNickname"},
64 {1424, nullptr, "GetAccountState"}, 64 {1424, nullptr, "GetAccountState"},
65 {1432, nullptr, "GetSynchronizationEvent"}, 65 {1432, nullptr, "GetSynchronizationEvent"},
66 {1451, nullptr, "StartPlayTimer"}, 66 {1451, nullptr, "StartPlayTimer"},
67 {1452, nullptr, "StopPlayTimer"}, 67 {1452, nullptr, "StopPlayTimer"},
68 {1453, nullptr, "IsPlayTimerEnabled"}, 68 {1453, nullptr, "IsPlayTimerEnabled"},
69 {1454, nullptr, "GetPlayTimerRemainingTime"}, 69 {1454, nullptr, "GetPlayTimerRemainingTime"},
70 {1455, nullptr, "IsRestrictedByPlayTimer"}, 70 {1455, nullptr, "IsRestrictedByPlayTimer"},
71 {1456, nullptr, "GetPlayTimerSettings"}, 71 {1456, nullptr, "GetPlayTimerSettings"},
72 {1457, nullptr, "GetPlayTimerEventToRequestSuspension"}, 72 {1457, nullptr, "GetPlayTimerEventToRequestSuspension"},
73 {1458, nullptr, "IsPlayTimerAlarmDisabled"}, 73 {1458, nullptr, "IsPlayTimerAlarmDisabled"},
74 {1471, nullptr, "NotifyWrongPinCodeInputManyTimes"}, 74 {1471, nullptr, "NotifyWrongPinCodeInputManyTimes"},
75 {1472, nullptr, "CancelNetworkRequest"}, 75 {1472, nullptr, "CancelNetworkRequest"},
76 {1473, nullptr, "GetUnlinkedEvent"}, 76 {1473, nullptr, "GetUnlinkedEvent"},
77 {1474, nullptr, "ClearUnlinkedEvent"}, 77 {1474, nullptr, "ClearUnlinkedEvent"},
78 {1601, nullptr, "DisableAllFeatures"}, 78 {1601, nullptr, "DisableAllFeatures"},
79 {1602, nullptr, "PostEnableAllFeatures"}, 79 {1602, nullptr, "PostEnableAllFeatures"},
80 {1603, nullptr, "IsAllFeaturesDisabled"}, 80 {1603, nullptr, "IsAllFeaturesDisabled"},
81 {1901, nullptr, "DeleteFromFreeCommunicationApplicationListForDebug"}, 81 {1901, nullptr, "DeleteFromFreeCommunicationApplicationListForDebug"},
82 {1902, nullptr, "ClearFreeCommunicationApplicationListForDebug"}, 82 {1902, nullptr, "ClearFreeCommunicationApplicationListForDebug"},
83 {1903, nullptr, "GetExemptApplicationListCountForDebug"}, 83 {1903, nullptr, "GetExemptApplicationListCountForDebug"},
84 {1904, nullptr, "GetExemptApplicationListForDebug"}, 84 {1904, nullptr, "GetExemptApplicationListForDebug"},
85 {1905, nullptr, "UpdateExemptApplicationListForDebug"}, 85 {1905, nullptr, "UpdateExemptApplicationListForDebug"},
86 {1906, nullptr, "AddToExemptApplicationListForDebug"}, 86 {1906, nullptr, "AddToExemptApplicationListForDebug"},
87 {1907, nullptr, "DeleteFromExemptApplicationListForDebug"}, 87 {1907, nullptr, "DeleteFromExemptApplicationListForDebug"},
88 {1908, nullptr, "ClearExemptApplicationListForDebug"}, 88 {1908, nullptr, "ClearExemptApplicationListForDebug"},
89 {1941, nullptr, "DeletePairing"}, 89 {1941, nullptr, "DeletePairing"},
90 {1951, nullptr, "SetPlayTimerSettingsForDebug"}, 90 {1951, nullptr, "SetPlayTimerSettingsForDebug"},
91 {1952, nullptr, "GetPlayTimerSpentTimeForTest"}, 91 {1952, nullptr, "GetPlayTimerSpentTimeForTest"},
92 {1953, nullptr, "SetPlayTimerAlarmDisabledForDebug"}, 92 {1953, nullptr, "SetPlayTimerAlarmDisabledForDebug"},
93 {2001, nullptr, "RequestPairingAsync"}, 93 {2001, nullptr, "RequestPairingAsync"},
94 {2002, nullptr, "FinishRequestPairing"}, 94 {2002, nullptr, "FinishRequestPairing"},
95 {2003, nullptr, "AuthorizePairingAsync"}, 95 {2003, nullptr, "AuthorizePairingAsync"},
96 {2004, nullptr, "FinishAuthorizePairing"}, 96 {2004, nullptr, "FinishAuthorizePairing"},
97 {2005, nullptr, "RetrievePairingInfoAsync"}, 97 {2005, nullptr, "RetrievePairingInfoAsync"},
98 {2006, nullptr, "FinishRetrievePairingInfo"}, 98 {2006, nullptr, "FinishRetrievePairingInfo"},
99 {2007, nullptr, "UnlinkPairingAsync"}, 99 {2007, nullptr, "UnlinkPairingAsync"},
100 {2008, nullptr, "FinishUnlinkPairing"}, 100 {2008, nullptr, "FinishUnlinkPairing"},
101 {2009, nullptr, "GetAccountMiiImageAsync"}, 101 {2009, nullptr, "GetAccountMiiImageAsync"},
102 {2010, nullptr, "FinishGetAccountMiiImage"}, 102 {2010, nullptr, "FinishGetAccountMiiImage"},
103 {2011, nullptr, "GetAccountMiiImageContentTypeAsync"}, 103 {2011, nullptr, "GetAccountMiiImageContentTypeAsync"},
104 {2012, nullptr, "FinishGetAccountMiiImageContentType"}, 104 {2012, nullptr, "FinishGetAccountMiiImageContentType"},
105 {2013, nullptr, "SynchronizeParentalControlSettingsAsync"}, 105 {2013, nullptr, "SynchronizeParentalControlSettingsAsync"},
106 {2014, nullptr, "FinishSynchronizeParentalControlSettings"}, 106 {2014, nullptr, "FinishSynchronizeParentalControlSettings"},
107 {2015, nullptr, "FinishSynchronizeParentalControlSettingsWithLastUpdated"}, 107 {2015, nullptr, "FinishSynchronizeParentalControlSettingsWithLastUpdated"},
108 {2016, nullptr, "RequestUpdateExemptionListAsync"}, 108 {2016, nullptr, "RequestUpdateExemptionListAsync"},
109 }; 109 };
110 RegisterHandlers(functions); 110 RegisterHandlers(functions);
111} 111 }
112 112};
113void PCTL_A::CreateService(Kernel::HLERequestContext& ctx) { 113void PCTL_A::CreateService(Kernel::HLERequestContext& ctx) {
114 IPC::ResponseBuilder rb{ctx, 2, 0, 1}; 114 IPC::ResponseBuilder rb{ctx, 2, 0, 1};
115 rb.Push(RESULT_SUCCESS); 115 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:
15 ~PCTL_A() = default; 15 ~PCTL_A() = default;
16 16
17private: 17private:
18 void GetService(Kernel::HLERequestContext& ctx); 18 void CreateService(Kernel::HLERequestContext& ctx);
19}; 19};
20 20
21} // namespace PCTL 21} // namespace PCTL
HIC SVNT DRACONES