H3cJP/citra
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Various fixes and clang

Browse Source
This commit is contained in:
Hexagon12 2018-04-11 14:48:56 +03:00
parent a155d3b7ff
commit cc89b7bfcb
6 changed files with 108 additions and 115 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/core/hle/service/am/am.cpp
View File

@ -109,7 +109,7 @@ ISelfController::ISelfController(std::shared_ptr<NVFlinger::NVFlinger> nvflinger
{61, nullptr, "SetMediaPlaybackState"}, {61, nullptr, "SetMediaPlaybackState"},
{62, nullptr, "SetIdleTimeDetectionExtension"}, {62, nullptr, "SetIdleTimeDetectionExtension"},
{63, nullptr, "GetIdleTimeDetectionExtension"}, {63, nullptr, "GetIdleTimeDetectionExtension"},
{64, nullptr, "SetInputDetectionSourceSet"} {64, nullptr, "SetInputDetectionSourceSet"},
{65, nullptr, "ReportUserIsActive"}, {65, nullptr, "ReportUserIsActive"},
{66, nullptr, "GetCurrentIlluminance"}, {66, nullptr, "GetCurrentIlluminance"},
{67, nullptr, "IsIlluminanceAvailable"}, {67, nullptr, "IsIlluminanceAvailable"},

17
src/core/hle/service/filesystem/fsp_srv.cpp
View File

@ -22,12 +22,8 @@ public:
IStorage(std::unique_ptr<FileSys::StorageBackend>&& backend) IStorage(std::unique_ptr<FileSys::StorageBackend>&& backend)
: ServiceFramework("IStorage"), backend(std::move(backend)) { : ServiceFramework("IStorage"), backend(std::move(backend)) {
static const FunctionInfo functions[] = { static const FunctionInfo functions[] = {
{0, &IStorage::Read, "Read"}, {0, &IStorage::Read, "Read"}, {1, nullptr, "Write"}, {2, nullptr, "Flush"},
{1, nullptr, "Write"}, {3, nullptr, "SetSize"}, {4, nullptr, "GetSize"}, {5, nullptr, "OperateRange"},
{2, nullptr, "Flush"},
{3, nullptr, "SetSize"},
{4, nullptr, "GetSize"},
{5, nullptr, "OperateRange"},
}; };
RegisterHandlers(functions); RegisterHandlers(functions);
} }
@ -76,12 +72,9 @@ public:
explicit IFile(std::unique_ptr<FileSys::StorageBackend>&& backend) explicit IFile(std::unique_ptr<FileSys::StorageBackend>&& backend)
: ServiceFramework("IFile"), backend(std::move(backend)) { : ServiceFramework("IFile"), backend(std::move(backend)) {
static const FunctionInfo functions[] = { static const FunctionInfo functions[] = {
{0, &IFile::Read, "Read"}, {0, &IFile::Read, "Read"}, {1, &IFile::Write, "Write"},
{1, &IFile::Write, "Write"}, {2, nullptr, "Flush"}, {3, &IFile::SetSize, "SetSize"},
{2, nullptr, "Flush"}, {4, &IFile::GetSize, "GetSize"}, {5, nullptr, "OperateRange"},
{3, &IFile::SetSize, "SetSize"},
{4, &IFile::GetSize, "GetSize"},
{5, nullptr, "OperateRange"},
}; };
RegisterHandlers(functions); RegisterHandlers(functions);
} }

2
src/core/hle/service/friend/friend.h
View File

@ -15,7 +15,7 @@ public:
public: public:
Interface(std::shared_ptr<Module> module, const char* name); Interface(std::shared_ptr<Module> module, const char* name);
void Unknown(Kernel::HLERequestContext& ctx); void CreateFriendService(Kernel::HLERequestContext& ctx);
protected: protected:
std::shared_ptr<Module> module; std::shared_ptr<Module> module;

4
src/core/hle/service/nvdrv/nvmemp.h
View File

@ -15,8 +15,8 @@ public:
~NVMEMP() = default; ~NVMEMP() = default;
private: private:
void Unknown0(Kernel::HLERequestContext& ctx); void Cmd0(Kernel::HLERequestContext& ctx);
void Unknown1(Kernel::HLERequestContext& ctx); void Cmd1(Kernel::HLERequestContext& ctx);
}; };
} // namespace Nvidia } // namespace Nvidia

196
src/core/hle/service/pctl/pctl_a.cpp
View File

@ -12,104 +12,104 @@ namespace PCTL {
class IParentalControlService final : public ServiceFramework<IParentalControlService> { class IParentalControlService final : public ServiceFramework<IParentalControlService> {
public: public:
IParentalControlService() : ServiceFramework("IParentalControlService") { IParentalControlService() : ServiceFramework("IParentalControlService") {
static const FunctionInfo functions[] = { static const FunctionInfo functions[] = {
{1, nullptr, "Initialize"}, {1, nullptr, "Initialize"},
{1001, nullptr, "CheckFreeCommunicationPermission"}, {1001, nullptr, "CheckFreeCommunicationPermission"},
{1002, nullptr, "ConfirmLaunchApplicationPermission"}, {1002, nullptr, "ConfirmLaunchApplicationPermission"},
{1003, nullptr, "ConfirmResumeApplicationPermission"}, {1003, nullptr, "ConfirmResumeApplicationPermission"},
{1004, nullptr, "ConfirmSnsPostPermission"}, {1004, nullptr, "ConfirmSnsPostPermission"},
{1005, nullptr, "ConfirmSystemSettingsPermission"}, {1005, nullptr, "ConfirmSystemSettingsPermission"},
{1006, nullptr, "IsRestrictionTemporaryUnlocked"}, {1006, nullptr, "IsRestrictionTemporaryUnlocked"},
{1007, nullptr, "RevertRestrictionTemporaryUnlocked"}, {1007, nullptr, "RevertRestrictionTemporaryUnlocked"},
{1008, nullptr, "EnterRestrictedSystemSettings"}, {1008, nullptr, "EnterRestrictedSystemSettings"},
{1009, nullptr, "LeaveRestrictedSystemSettings"}, {1009, nullptr, "LeaveRestrictedSystemSettings"},
{1010, nullptr, "IsRestrictedSystemSettingsEntered"}, {1010, nullptr, "IsRestrictedSystemSettingsEntered"},
{1011, nullptr, "RevertRestrictedSystemSettingsEntered"}, {1011, nullptr, "RevertRestrictedSystemSettingsEntered"},
{1012, nullptr, "GetRestrictedFeatures"}, {1012, nullptr, "GetRestrictedFeatures"},
{1013, nullptr, "ConfirmStereoVisionPermission"}, {1013, nullptr, "ConfirmStereoVisionPermission"},
{1014, nullptr, "ConfirmPlayableApplicationVideoOld"}, {1014, nullptr, "ConfirmPlayableApplicationVideoOld"},
{1015, nullptr, "ConfirmPlayableApplicationVideo"}, {1015, nullptr, "ConfirmPlayableApplicationVideo"},
{1031, nullptr, "IsRestrictionEnabled"}, {1031, nullptr, "IsRestrictionEnabled"},
{1032, nullptr, "GetSafetyLevel"}, {1032, nullptr, "GetSafetyLevel"},
{1033, nullptr, "SetSafetyLevel"}, {1033, nullptr, "SetSafetyLevel"},
{1034, nullptr, "GetSafetyLevelSettings"}, {1034, nullptr, "GetSafetyLevelSettings"},
{1035, nullptr, "GetCurrentSettings"}, {1035, nullptr, "GetCurrentSettings"},
{1036, nullptr, "SetCustomSafetyLevelSettings"}, {1036, nullptr, "SetCustomSafetyLevelSettings"},
{1037, nullptr, "GetDefaultRatingOrganization"}, {1037, nullptr, "GetDefaultRatingOrganization"},
{1038, nullptr, "SetDefaultRatingOrganization"}, {1038, nullptr, "SetDefaultRatingOrganization"},
{1039, nullptr, "GetFreeCommunicationApplicationListCount"}, {1039, nullptr, "GetFreeCommunicationApplicationListCount"},
{1042, nullptr, "AddToFreeCommunicationApplicationList"}, {1042, nullptr, "AddToFreeCommunicationApplicationList"},
{1043, nullptr, "DeleteSettings"}, {1043, nullptr, "DeleteSettings"},
{1044, nullptr, "GetFreeCommunicationApplicationList"}, {1044, nullptr, "GetFreeCommunicationApplicationList"},
{1045, nullptr, "UpdateFreeCommunicationApplicationList"}, {1045, nullptr, "UpdateFreeCommunicationApplicationList"},
{1046, nullptr, "DisableFeaturesForReset"}, {1046, nullptr, "DisableFeaturesForReset"},
{1047, nullptr, "NotifyApplicationDownloadStarted"}, {1047, nullptr, "NotifyApplicationDownloadStarted"},
{1061, nullptr, "ConfirmStereoVisionRestrictionConfigurable"}, {1061, nullptr, "ConfirmStereoVisionRestrictionConfigurable"},
{1062, nullptr, "GetStereoVisionRestriction"}, {1062, nullptr, "GetStereoVisionRestriction"},
{1063, nullptr, "SetStereoVisionRestriction"}, {1063, nullptr, "SetStereoVisionRestriction"},
{1064, nullptr, "ResetConfirmedStereoVisionPermission"}, {1064, nullptr, "ResetConfirmedStereoVisionPermission"},
{1065, nullptr, "IsStereoVisionPermitted"}, {1065, nullptr, "IsStereoVisionPermitted"},
{1201, nullptr, "UnlockRestrictionTemporarily"}, {1201, nullptr, "UnlockRestrictionTemporarily"},
{1202, nullptr, "UnlockSystemSettingsRestriction"}, {1202, nullptr, "UnlockSystemSettingsRestriction"},
{1203, nullptr, "SetPinCode"}, {1203, nullptr, "SetPinCode"},
{1204, nullptr, "GenerateInquiryCode"}, {1204, nullptr, "GenerateInquiryCode"},
{1205, nullptr, "CheckMasterKey"}, {1205, nullptr, "CheckMasterKey"},
{1206, nullptr, "GetPinCodeLength"}, {1206, nullptr, "GetPinCodeLength"},
{1207, nullptr, "GetPinCodeChangedEvent"}, {1207, nullptr, "GetPinCodeChangedEvent"},
{1208, nullptr, "GetPinCode"}, {1208, nullptr, "GetPinCode"},
{1403, nullptr, "IsPairingActive"}, {1403, nullptr, "IsPairingActive"},
{1406, nullptr, "GetSettingsLastUpdated"}, {1406, nullptr, "GetSettingsLastUpdated"},
{1411, nullptr, "GetPairingAccountInfo"}, {1411, nullptr, "GetPairingAccountInfo"},
{1421, nullptr, "GetAccountNickname"}, {1421, nullptr, "GetAccountNickname"},
{1424, nullptr, "GetAccountState"}, {1424, nullptr, "GetAccountState"},
{1432, nullptr, "GetSynchronizationEvent"}, {1432, nullptr, "GetSynchronizationEvent"},
{1451, nullptr, "StartPlayTimer"}, {1451, nullptr, "StartPlayTimer"},
{1452, nullptr, "StopPlayTimer"}, {1452, nullptr, "StopPlayTimer"},
{1453, nullptr, "IsPlayTimerEnabled"}, {1453, nullptr, "IsPlayTimerEnabled"},
{1454, nullptr, "GetPlayTimerRemainingTime"}, {1454, nullptr, "GetPlayTimerRemainingTime"},
{1455, nullptr, "IsRestrictedByPlayTimer"}, {1455, nullptr, "IsRestrictedByPlayTimer"},
{1456, nullptr, "GetPlayTimerSettings"}, {1456, nullptr, "GetPlayTimerSettings"},
{1457, nullptr, "GetPlayTimerEventToRequestSuspension"}, {1457, nullptr, "GetPlayTimerEventToRequestSuspension"},
{1458, nullptr, "IsPlayTimerAlarmDisabled"}, {1458, nullptr, "IsPlayTimerAlarmDisabled"},
{1471, nullptr, "NotifyWrongPinCodeInputManyTimes"}, {1471, nullptr, "NotifyWrongPinCodeInputManyTimes"},
{1472, nullptr, "CancelNetworkRequest"}, {1472, nullptr, "CancelNetworkRequest"},
{1473, nullptr, "GetUnlinkedEvent"}, {1473, nullptr, "GetUnlinkedEvent"},
{1474, nullptr, "ClearUnlinkedEvent"}, {1474, nullptr, "ClearUnlinkedEvent"},
{1601, nullptr, "DisableAllFeatures"}, {1601, nullptr, "DisableAllFeatures"},
{1602, nullptr, "PostEnableAllFeatures"}, {1602, nullptr, "PostEnableAllFeatures"},
{1603, nullptr, "IsAllFeaturesDisabled"}, {1603, nullptr, "IsAllFeaturesDisabled"},
{1901, nullptr, "DeleteFromFreeCommunicationApplicationListForDebug"}, {1901, nullptr, "DeleteFromFreeCommunicationApplicationListForDebug"},
{1902, nullptr, "ClearFreeCommunicationApplicationListForDebug"}, {1902, nullptr, "ClearFreeCommunicationApplicationListForDebug"},
{1903, nullptr, "GetExemptApplicationListCountForDebug"}, {1903, nullptr, "GetExemptApplicationListCountForDebug"},
{1904, nullptr, "GetExemptApplicationListForDebug"}, {1904, nullptr, "GetExemptApplicationListForDebug"},
{1905, nullptr, "UpdateExemptApplicationListForDebug"}, {1905, nullptr, "UpdateExemptApplicationListForDebug"},
{1906, nullptr, "AddToExemptApplicationListForDebug"}, {1906, nullptr, "AddToExemptApplicationListForDebug"},
{1907, nullptr, "DeleteFromExemptApplicationListForDebug"}, {1907, nullptr, "DeleteFromExemptApplicationListForDebug"},
{1908, nullptr, "ClearExemptApplicationListForDebug"}, {1908, nullptr, "ClearExemptApplicationListForDebug"},
{1941, nullptr, "DeletePairing"}, {1941, nullptr, "DeletePairing"},
{1951, nullptr, "SetPlayTimerSettingsForDebug"}, {1951, nullptr, "SetPlayTimerSettingsForDebug"},
{1952, nullptr, "GetPlayTimerSpentTimeForTest"}, {1952, nullptr, "GetPlayTimerSpentTimeForTest"},
{1953, nullptr, "SetPlayTimerAlarmDisabledForDebug"}, {1953, nullptr, "SetPlayTimerAlarmDisabledForDebug"},
{2001, nullptr, "RequestPairingAsync"}, {2001, nullptr, "RequestPairingAsync"},
{2002, nullptr, "FinishRequestPairing"}, {2002, nullptr, "FinishRequestPairing"},
{2003, nullptr, "AuthorizePairingAsync"}, {2003, nullptr, "AuthorizePairingAsync"},
{2004, nullptr, "FinishAuthorizePairing"}, {2004, nullptr, "FinishAuthorizePairing"},
{2005, nullptr, "RetrievePairingInfoAsync"}, {2005, nullptr, "RetrievePairingInfoAsync"},
{2006, nullptr, "FinishRetrievePairingInfo"}, {2006, nullptr, "FinishRetrievePairingInfo"},
{2007, nullptr, "UnlinkPairingAsync"}, {2007, nullptr, "UnlinkPairingAsync"},
{2008, nullptr, "FinishUnlinkPairing"}, {2008, nullptr, "FinishUnlinkPairing"},
{2009, nullptr, "GetAccountMiiImageAsync"}, {2009, nullptr, "GetAccountMiiImageAsync"},
{2010, nullptr, "FinishGetAccountMiiImage"}, {2010, nullptr, "FinishGetAccountMiiImage"},
{2011, nullptr, "GetAccountMiiImageContentTypeAsync"}, {2011, nullptr, "GetAccountMiiImageContentTypeAsync"},
{2012, nullptr, "FinishGetAccountMiiImageContentType"}, {2012, nullptr, "FinishGetAccountMiiImageContentType"},
{2013, nullptr, "SynchronizeParentalControlSettingsAsync"}, {2013, nullptr, "SynchronizeParentalControlSettingsAsync"},
{2014, nullptr, "FinishSynchronizeParentalControlSettings"}, {2014, nullptr, "FinishSynchronizeParentalControlSettings"},
{2015, nullptr, "FinishSynchronizeParentalControlSettingsWithLastUpdated"}, {2015, nullptr, "FinishSynchronizeParentalControlSettingsWithLastUpdated"},
{2016, nullptr, "RequestUpdateExemptionListAsync"}, {2016, nullptr, "RequestUpdateExemptionListAsync"},
}; };
RegisterHandlers(functions); RegisterHandlers(functions);
} }
};
void PCTL_A::CreateService(Kernel::HLERequestContext& ctx) { void PCTL_A::CreateService(Kernel::HLERequestContext& ctx) {
IPC::ResponseBuilder rb{ctx, 2, 0, 1}; IPC::ResponseBuilder rb{ctx, 2, 0, 1};
rb.Push(RESULT_SUCCESS); rb.Push(RESULT_SUCCESS);

2
src/core/hle/service/pctl/pctl_a.h
View File

@ -15,7 +15,7 @@ public:
~PCTL_A() = default; ~PCTL_A() = default;
private: private:
void GetService(Kernel::HLERequestContext& ctx); void CreateService(Kernel::HLERequestContext& ctx);
}; };
} // namespace PCTL } // namespace PCTL