Compare commits
9 Commits
android-31
...
android-34
Author | SHA1 | Date | |
---|---|---|---|
81fbbf3182 | |||
85e3575496 | |||
7f55c377b0 | |||
9893a4d918 | |||
bed2fc8707 | |||
8d2f0dc707 | |||
cb0b8442f0 | |||
089e385944 | |||
0d470b57ed |
@ -1,3 +1,11 @@
|
|||||||
|
| Pull Request | Commit | Title | Author | Merged? |
|
||||||
|
|----|----|----|----|----|
|
||||||
|
|
||||||
|
|
||||||
|
End of merge log. You can find the original README.md below the break.
|
||||||
|
|
||||||
|
-----
|
||||||
|
|
||||||
<!--
|
<!--
|
||||||
SPDX-FileCopyrightText: 2018 yuzu Emulator Project
|
SPDX-FileCopyrightText: 2018 yuzu Emulator Project
|
||||||
SPDX-License-Identifier: GPL-2.0-or-later
|
SPDX-License-Identifier: GPL-2.0-or-later
|
||||||
|
@ -22,13 +22,13 @@ AudCtl::AudCtl(Core::System& system_) : ServiceFramework{system_, "audctl"} {
|
|||||||
{9, nullptr, "GetAudioOutputMode"},
|
{9, nullptr, "GetAudioOutputMode"},
|
||||||
{10, nullptr, "SetAudioOutputMode"},
|
{10, nullptr, "SetAudioOutputMode"},
|
||||||
{11, nullptr, "SetForceMutePolicy"},
|
{11, nullptr, "SetForceMutePolicy"},
|
||||||
{12, nullptr, "GetForceMutePolicy"},
|
{12, &AudCtl::GetForceMutePolicy, "GetForceMutePolicy"},
|
||||||
{13, nullptr, "GetOutputModeSetting"},
|
{13, &AudCtl::GetOutputModeSetting, "GetOutputModeSetting"},
|
||||||
{14, nullptr, "SetOutputModeSetting"},
|
{14, nullptr, "SetOutputModeSetting"},
|
||||||
{15, nullptr, "SetOutputTarget"},
|
{15, nullptr, "SetOutputTarget"},
|
||||||
{16, nullptr, "SetInputTargetForceEnabled"},
|
{16, nullptr, "SetInputTargetForceEnabled"},
|
||||||
{17, nullptr, "SetHeadphoneOutputLevelMode"},
|
{17, nullptr, "SetHeadphoneOutputLevelMode"},
|
||||||
{18, nullptr, "GetHeadphoneOutputLevelMode"},
|
{18, &AudCtl::GetHeadphoneOutputLevelMode, "GetHeadphoneOutputLevelMode"},
|
||||||
{19, nullptr, "AcquireAudioVolumeUpdateEventForPlayReport"},
|
{19, nullptr, "AcquireAudioVolumeUpdateEventForPlayReport"},
|
||||||
{20, nullptr, "AcquireAudioOutputDeviceUpdateEventForPlayReport"},
|
{20, nullptr, "AcquireAudioOutputDeviceUpdateEventForPlayReport"},
|
||||||
{21, nullptr, "GetAudioOutputTargetForPlayReport"},
|
{21, nullptr, "GetAudioOutputTargetForPlayReport"},
|
||||||
@ -41,7 +41,7 @@ AudCtl::AudCtl(Core::System& system_) : ServiceFramework{system_, "audctl"} {
|
|||||||
{28, nullptr, "GetAudioOutputChannelCountForPlayReport"},
|
{28, nullptr, "GetAudioOutputChannelCountForPlayReport"},
|
||||||
{29, nullptr, "BindAudioOutputChannelCountUpdateEventForPlayReport"},
|
{29, nullptr, "BindAudioOutputChannelCountUpdateEventForPlayReport"},
|
||||||
{30, nullptr, "SetSpeakerAutoMuteEnabled"},
|
{30, nullptr, "SetSpeakerAutoMuteEnabled"},
|
||||||
{31, nullptr, "IsSpeakerAutoMuteEnabled"},
|
{31, &AudCtl::IsSpeakerAutoMuteEnabled, "IsSpeakerAutoMuteEnabled"},
|
||||||
{32, nullptr, "GetActiveOutputTarget"},
|
{32, nullptr, "GetActiveOutputTarget"},
|
||||||
{33, nullptr, "GetTargetDeviceInfo"},
|
{33, nullptr, "GetTargetDeviceInfo"},
|
||||||
{34, nullptr, "AcquireTargetNotification"},
|
{34, nullptr, "AcquireTargetNotification"},
|
||||||
@ -96,4 +96,42 @@ void AudCtl::GetTargetVolumeMax(HLERequestContext& ctx) {
|
|||||||
rb.Push(target_max_volume);
|
rb.Push(target_max_volume);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void AudCtl::GetForceMutePolicy(HLERequestContext& ctx) {
|
||||||
|
LOG_WARNING(Audio, "(STUBBED) called");
|
||||||
|
|
||||||
|
IPC::ResponseBuilder rb{ctx, 3};
|
||||||
|
rb.Push(ResultSuccess);
|
||||||
|
rb.PushEnum(ForceMutePolicy::Disable);
|
||||||
|
}
|
||||||
|
|
||||||
|
void AudCtl::GetOutputModeSetting(HLERequestContext& ctx) {
|
||||||
|
IPC::RequestParser rp{ctx};
|
||||||
|
const auto value = rp.Pop<u32>();
|
||||||
|
|
||||||
|
LOG_WARNING(Audio, "(STUBBED) called, value={}", value);
|
||||||
|
|
||||||
|
IPC::ResponseBuilder rb{ctx, 3};
|
||||||
|
rb.Push(ResultSuccess);
|
||||||
|
rb.PushEnum(AudioOutputMode::PcmAuto);
|
||||||
|
}
|
||||||
|
|
||||||
|
void AudCtl::GetHeadphoneOutputLevelMode(HLERequestContext& ctx) {
|
||||||
|
LOG_WARNING(Audio, "(STUBBED) called");
|
||||||
|
|
||||||
|
IPC::ResponseBuilder rb{ctx, 3};
|
||||||
|
rb.Push(ResultSuccess);
|
||||||
|
rb.PushEnum(HeadphoneOutputLevelMode::Normal);
|
||||||
|
}
|
||||||
|
|
||||||
|
void AudCtl::IsSpeakerAutoMuteEnabled(HLERequestContext& ctx) {
|
||||||
|
const bool is_speaker_auto_mute_enabled = false;
|
||||||
|
|
||||||
|
LOG_WARNING(Audio, "(STUBBED) called, is_speaker_auto_mute_enabled={}",
|
||||||
|
is_speaker_auto_mute_enabled);
|
||||||
|
|
||||||
|
IPC::ResponseBuilder rb{ctx, 3};
|
||||||
|
rb.Push(ResultSuccess);
|
||||||
|
rb.Push<u8>(is_speaker_auto_mute_enabled);
|
||||||
|
}
|
||||||
|
|
||||||
} // namespace Service::Audio
|
} // namespace Service::Audio
|
||||||
|
@ -17,8 +17,30 @@ public:
|
|||||||
~AudCtl() override;
|
~AudCtl() override;
|
||||||
|
|
||||||
private:
|
private:
|
||||||
|
enum class AudioOutputMode {
|
||||||
|
Invalid,
|
||||||
|
Pcm1ch,
|
||||||
|
Pcm2ch,
|
||||||
|
Pcm6ch,
|
||||||
|
PcmAuto,
|
||||||
|
};
|
||||||
|
|
||||||
|
enum class ForceMutePolicy {
|
||||||
|
Disable,
|
||||||
|
SpeakerMuteOnHeadphoneUnplugged,
|
||||||
|
};
|
||||||
|
|
||||||
|
enum class HeadphoneOutputLevelMode {
|
||||||
|
Normal,
|
||||||
|
HighPower,
|
||||||
|
};
|
||||||
|
|
||||||
void GetTargetVolumeMin(HLERequestContext& ctx);
|
void GetTargetVolumeMin(HLERequestContext& ctx);
|
||||||
void GetTargetVolumeMax(HLERequestContext& ctx);
|
void GetTargetVolumeMax(HLERequestContext& ctx);
|
||||||
|
void GetForceMutePolicy(HLERequestContext& ctx);
|
||||||
|
void GetOutputModeSetting(HLERequestContext& ctx);
|
||||||
|
void GetHeadphoneOutputLevelMode(HLERequestContext& ctx);
|
||||||
|
void IsSpeakerAutoMuteEnabled(HLERequestContext& ctx);
|
||||||
};
|
};
|
||||||
|
|
||||||
} // namespace Service::Audio
|
} // namespace Service::Audio
|
||||||
|
@ -8,15 +8,16 @@
|
|||||||
|
|
||||||
namespace Service::OLSC {
|
namespace Service::OLSC {
|
||||||
|
|
||||||
class OLSC final : public ServiceFramework<OLSC> {
|
class IOlscServiceForApplication final : public ServiceFramework<IOlscServiceForApplication> {
|
||||||
public:
|
public:
|
||||||
explicit OLSC(Core::System& system_) : ServiceFramework{system_, "olsc:u"} {
|
explicit IOlscServiceForApplication(Core::System& system_)
|
||||||
|
: ServiceFramework{system_, "olsc:u"} {
|
||||||
// clang-format off
|
// clang-format off
|
||||||
static const FunctionInfo functions[] = {
|
static const FunctionInfo functions[] = {
|
||||||
{0, &OLSC::Initialize, "Initialize"},
|
{0, &IOlscServiceForApplication::Initialize, "Initialize"},
|
||||||
{10, nullptr, "VerifySaveDataBackupLicenseAsync"},
|
{10, nullptr, "VerifySaveDataBackupLicenseAsync"},
|
||||||
{13, &OLSC::GetSaveDataBackupSetting, "GetSaveDataBackupSetting"},
|
{13, &IOlscServiceForApplication::GetSaveDataBackupSetting, "GetSaveDataBackupSetting"},
|
||||||
{14, &OLSC::SetSaveDataBackupSettingEnabled, "SetSaveDataBackupSettingEnabled"},
|
{14, &IOlscServiceForApplication::SetSaveDataBackupSettingEnabled, "SetSaveDataBackupSettingEnabled"},
|
||||||
{15, nullptr, "SetCustomData"},
|
{15, nullptr, "SetCustomData"},
|
||||||
{16, nullptr, "DeleteSaveDataBackupSetting"},
|
{16, nullptr, "DeleteSaveDataBackupSetting"},
|
||||||
{18, nullptr, "GetSaveDataBackupInfoCache"},
|
{18, nullptr, "GetSaveDataBackupInfoCache"},
|
||||||
@ -72,10 +73,155 @@ private:
|
|||||||
bool initialized{};
|
bool initialized{};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
class INativeHandleHolder final : public ServiceFramework<INativeHandleHolder> {
|
||||||
|
public:
|
||||||
|
explicit INativeHandleHolder(Core::System& system_)
|
||||||
|
: ServiceFramework{system_, "INativeHandleHolder"} {
|
||||||
|
// clang-format off
|
||||||
|
static const FunctionInfo functions[] = {
|
||||||
|
{0, nullptr, "GetNativeHandle"},
|
||||||
|
};
|
||||||
|
// clang-format on
|
||||||
|
|
||||||
|
RegisterHandlers(functions);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
class ITransferTaskListController final : public ServiceFramework<ITransferTaskListController> {
|
||||||
|
public:
|
||||||
|
explicit ITransferTaskListController(Core::System& system_)
|
||||||
|
: ServiceFramework{system_, "ITransferTaskListController"} {
|
||||||
|
// clang-format off
|
||||||
|
static const FunctionInfo functions[] = {
|
||||||
|
{0, nullptr, "Unknown0"},
|
||||||
|
{1, nullptr, "Unknown1"},
|
||||||
|
{2, nullptr, "Unknown2"},
|
||||||
|
{3, nullptr, "Unknown3"},
|
||||||
|
{4, nullptr, "Unknown4"},
|
||||||
|
{5, &ITransferTaskListController::GetNativeHandleHolder , "GetNativeHandleHolder"},
|
||||||
|
{6, nullptr, "Unknown6"},
|
||||||
|
{7, nullptr, "Unknown7"},
|
||||||
|
{8, nullptr, "GetRemoteStorageController"},
|
||||||
|
{9, &ITransferTaskListController::GetNativeHandleHolder, "GetNativeHandleHolder2"},
|
||||||
|
{10, nullptr, "Unknown10"},
|
||||||
|
{11, nullptr, "Unknown11"},
|
||||||
|
{12, nullptr, "Unknown12"},
|
||||||
|
{13, nullptr, "Unknown13"},
|
||||||
|
{14, nullptr, "Unknown14"},
|
||||||
|
{15, nullptr, "Unknown15"},
|
||||||
|
{16, nullptr, "Unknown16"},
|
||||||
|
{17, nullptr, "Unknown17"},
|
||||||
|
{18, nullptr, "Unknown18"},
|
||||||
|
{19, nullptr, "Unknown19"},
|
||||||
|
{20, nullptr, "Unknown20"},
|
||||||
|
{21, nullptr, "Unknown21"},
|
||||||
|
{22, nullptr, "Unknown22"},
|
||||||
|
{23, nullptr, "Unknown23"},
|
||||||
|
{24, nullptr, "Unknown24"},
|
||||||
|
{25, nullptr, "Unknown25"},
|
||||||
|
};
|
||||||
|
// clang-format on
|
||||||
|
|
||||||
|
RegisterHandlers(functions);
|
||||||
|
}
|
||||||
|
|
||||||
|
private:
|
||||||
|
void GetNativeHandleHolder(HLERequestContext& ctx) {
|
||||||
|
LOG_INFO(Service_OLSC, "called");
|
||||||
|
|
||||||
|
IPC::ResponseBuilder rb{ctx, 2, 0, 1};
|
||||||
|
rb.Push(ResultSuccess);
|
||||||
|
rb.PushIpcInterface<INativeHandleHolder>(system);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
class IOlscServiceForSystemService final : public ServiceFramework<IOlscServiceForSystemService> {
|
||||||
|
public:
|
||||||
|
explicit IOlscServiceForSystemService(Core::System& system_)
|
||||||
|
: ServiceFramework{system_, "olsc:s"} {
|
||||||
|
// clang-format off
|
||||||
|
static const FunctionInfo functions[] = {
|
||||||
|
{0, &IOlscServiceForSystemService::OpenTransferTaskListController, "OpenTransferTaskListController"},
|
||||||
|
{1, nullptr, "OpenRemoteStorageController"},
|
||||||
|
{2, nullptr, "OpenDaemonController"},
|
||||||
|
{10, nullptr, "Unknown10"},
|
||||||
|
{11, nullptr, "Unknown11"},
|
||||||
|
{12, nullptr, "Unknown12"},
|
||||||
|
{13, nullptr, "Unknown13"},
|
||||||
|
{100, nullptr, "ListLastTransferTaskErrorInfo"},
|
||||||
|
{101, nullptr, "GetLastErrorInfoCount"},
|
||||||
|
{102, nullptr, "RemoveLastErrorInfoOld"},
|
||||||
|
{103, nullptr, "GetLastErrorInfo"},
|
||||||
|
{104, nullptr, "GetLastErrorEventHolder"},
|
||||||
|
{105, nullptr, "GetLastTransferTaskErrorInfo"},
|
||||||
|
{200, nullptr, "GetDataTransferPolicyInfo"},
|
||||||
|
{201, nullptr, "RemoveDataTransferPolicyInfo"},
|
||||||
|
{202, nullptr, "UpdateDataTransferPolicyOld"},
|
||||||
|
{203, nullptr, "UpdateDataTransferPolicy"},
|
||||||
|
{204, nullptr, "CleanupDataTransferPolicyInfo"},
|
||||||
|
{205, nullptr, "RequestDataTransferPolicy"},
|
||||||
|
{300, nullptr, "GetAutoTransferSeriesInfo"},
|
||||||
|
{301, nullptr, "UpdateAutoTransferSeriesInfo"},
|
||||||
|
{400, nullptr, "CleanupSaveDataArchiveInfoType1"},
|
||||||
|
{900, nullptr, "CleanupTransferTask"},
|
||||||
|
{902, nullptr, "CleanupSeriesInfoType0"},
|
||||||
|
{903, nullptr, "CleanupSaveDataArchiveInfoType0"},
|
||||||
|
{904, nullptr, "CleanupApplicationAutoTransferSetting"},
|
||||||
|
{905, nullptr, "CleanupErrorHistory"},
|
||||||
|
{906, nullptr, "SetLastError"},
|
||||||
|
{907, nullptr, "AddSaveDataArchiveInfoType0"},
|
||||||
|
{908, nullptr, "RemoveSeriesInfoType0"},
|
||||||
|
{909, nullptr, "GetSeriesInfoType0"},
|
||||||
|
{910, nullptr, "RemoveLastErrorInfo"},
|
||||||
|
{911, nullptr, "CleanupSeriesInfoType1"},
|
||||||
|
{912, nullptr, "RemoveSeriesInfoType1"},
|
||||||
|
{913, nullptr, "GetSeriesInfoType1"},
|
||||||
|
{1000, nullptr, "UpdateIssueOld"},
|
||||||
|
{1010, nullptr, "Unknown1010"},
|
||||||
|
{1011, nullptr, "ListIssueInfoOld"},
|
||||||
|
{1012, nullptr, "GetIssueOld"},
|
||||||
|
{1013, nullptr, "GetIssue2Old"},
|
||||||
|
{1014, nullptr, "GetIssue3Old"},
|
||||||
|
{1020, nullptr, "RepairIssueOld"},
|
||||||
|
{1021, nullptr, "RepairIssueWithUserIdOld"},
|
||||||
|
{1022, nullptr, "RepairIssue2Old"},
|
||||||
|
{1023, nullptr, "RepairIssue3Old"},
|
||||||
|
{1024, nullptr, "Unknown1024"},
|
||||||
|
{1100, nullptr, "UpdateIssue"},
|
||||||
|
{1110, nullptr, "Unknown1110"},
|
||||||
|
{1111, nullptr, "ListIssueInfo"},
|
||||||
|
{1112, nullptr, "GetIssue"},
|
||||||
|
{1113, nullptr, "GetIssue2"},
|
||||||
|
{1114, nullptr, "GetIssue3"},
|
||||||
|
{1120, nullptr, "RepairIssue"},
|
||||||
|
{1121, nullptr, "RepairIssueWithUserId"},
|
||||||
|
{1122, nullptr, "RepairIssue2"},
|
||||||
|
{1123, nullptr, "RepairIssue3"},
|
||||||
|
{1124, nullptr, "Unknown1124"},
|
||||||
|
};
|
||||||
|
// clang-format on
|
||||||
|
|
||||||
|
RegisterHandlers(functions);
|
||||||
|
}
|
||||||
|
|
||||||
|
private:
|
||||||
|
void OpenTransferTaskListController(HLERequestContext& ctx) {
|
||||||
|
LOG_INFO(Service_OLSC, "called");
|
||||||
|
|
||||||
|
IPC::ResponseBuilder rb{ctx, 2, 0, 1};
|
||||||
|
rb.Push(ResultSuccess);
|
||||||
|
rb.PushIpcInterface<ITransferTaskListController>(system);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
void LoopProcess(Core::System& system) {
|
void LoopProcess(Core::System& system) {
|
||||||
auto server_manager = std::make_unique<ServerManager>(system);
|
auto server_manager = std::make_unique<ServerManager>(system);
|
||||||
|
|
||||||
server_manager->RegisterNamedService("olsc:u", std::make_shared<OLSC>(system));
|
server_manager->RegisterNamedService("olsc:u",
|
||||||
|
std::make_shared<IOlscServiceForApplication>(system));
|
||||||
|
server_manager->RegisterNamedService("olsc:s",
|
||||||
|
std::make_shared<IOlscServiceForSystemService>(system));
|
||||||
|
|
||||||
ServerManager::RunServer(std::move(server_manager));
|
ServerManager::RunServer(std::move(server_manager));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -6,6 +6,7 @@
|
|||||||
#include "core/file_sys/control_metadata.h"
|
#include "core/file_sys/control_metadata.h"
|
||||||
#include "core/file_sys/patch_manager.h"
|
#include "core/file_sys/patch_manager.h"
|
||||||
#include "core/hle/service/ipc_helpers.h"
|
#include "core/hle/service/ipc_helpers.h"
|
||||||
|
#include "core/hle/service/kernel_helpers.h"
|
||||||
#include "core/hle/service/pctl/pctl.h"
|
#include "core/hle/service/pctl/pctl.h"
|
||||||
#include "core/hle/service/pctl/pctl_module.h"
|
#include "core/hle/service/pctl/pctl_module.h"
|
||||||
#include "core/hle/service/server_manager.h"
|
#include "core/hle/service/server_manager.h"
|
||||||
@ -24,7 +25,8 @@ constexpr Result ResultNoRestrictionEnabled{ErrorModule::PCTL, 181};
|
|||||||
class IParentalControlService final : public ServiceFramework<IParentalControlService> {
|
class IParentalControlService final : public ServiceFramework<IParentalControlService> {
|
||||||
public:
|
public:
|
||||||
explicit IParentalControlService(Core::System& system_, Capability capability_)
|
explicit IParentalControlService(Core::System& system_, Capability capability_)
|
||||||
: ServiceFramework{system_, "IParentalControlService"}, capability{capability_} {
|
: ServiceFramework{system_, "IParentalControlService"}, capability{capability_},
|
||||||
|
service_context{system_, "IParentalControlService"} {
|
||||||
// clang-format off
|
// clang-format off
|
||||||
static const FunctionInfo functions[] = {
|
static const FunctionInfo functions[] = {
|
||||||
{1, &IParentalControlService::Initialize, "Initialize"},
|
{1, &IParentalControlService::Initialize, "Initialize"},
|
||||||
@ -33,7 +35,7 @@ public:
|
|||||||
{1003, nullptr, "ConfirmResumeApplicationPermission"},
|
{1003, nullptr, "ConfirmResumeApplicationPermission"},
|
||||||
{1004, nullptr, "ConfirmSnsPostPermission"},
|
{1004, nullptr, "ConfirmSnsPostPermission"},
|
||||||
{1005, nullptr, "ConfirmSystemSettingsPermission"},
|
{1005, nullptr, "ConfirmSystemSettingsPermission"},
|
||||||
{1006, nullptr, "IsRestrictionTemporaryUnlocked"},
|
{1006, &IParentalControlService::IsRestrictionTemporaryUnlocked, "IsRestrictionTemporaryUnlocked"},
|
||||||
{1007, nullptr, "RevertRestrictionTemporaryUnlocked"},
|
{1007, nullptr, "RevertRestrictionTemporaryUnlocked"},
|
||||||
{1008, nullptr, "EnterRestrictedSystemSettings"},
|
{1008, nullptr, "EnterRestrictedSystemSettings"},
|
||||||
{1009, nullptr, "LeaveRestrictedSystemSettings"},
|
{1009, nullptr, "LeaveRestrictedSystemSettings"},
|
||||||
@ -47,14 +49,14 @@ public:
|
|||||||
{1017, &IParentalControlService::EndFreeCommunication, "EndFreeCommunication"},
|
{1017, &IParentalControlService::EndFreeCommunication, "EndFreeCommunication"},
|
||||||
{1018, &IParentalControlService::IsFreeCommunicationAvailable, "IsFreeCommunicationAvailable"},
|
{1018, &IParentalControlService::IsFreeCommunicationAvailable, "IsFreeCommunicationAvailable"},
|
||||||
{1031, &IParentalControlService::IsRestrictionEnabled, "IsRestrictionEnabled"},
|
{1031, &IParentalControlService::IsRestrictionEnabled, "IsRestrictionEnabled"},
|
||||||
{1032, nullptr, "GetSafetyLevel"},
|
{1032, &IParentalControlService::GetSafetyLevel, "GetSafetyLevel"},
|
||||||
{1033, nullptr, "SetSafetyLevel"},
|
{1033, nullptr, "SetSafetyLevel"},
|
||||||
{1034, nullptr, "GetSafetyLevelSettings"},
|
{1034, nullptr, "GetSafetyLevelSettings"},
|
||||||
{1035, nullptr, "GetCurrentSettings"},
|
{1035, &IParentalControlService::GetCurrentSettings, "GetCurrentSettings"},
|
||||||
{1036, nullptr, "SetCustomSafetyLevelSettings"},
|
{1036, nullptr, "SetCustomSafetyLevelSettings"},
|
||||||
{1037, nullptr, "GetDefaultRatingOrganization"},
|
{1037, nullptr, "GetDefaultRatingOrganization"},
|
||||||
{1038, nullptr, "SetDefaultRatingOrganization"},
|
{1038, nullptr, "SetDefaultRatingOrganization"},
|
||||||
{1039, nullptr, "GetFreeCommunicationApplicationListCount"},
|
{1039, &IParentalControlService::GetFreeCommunicationApplicationListCount, "GetFreeCommunicationApplicationListCount"},
|
||||||
{1042, nullptr, "AddToFreeCommunicationApplicationList"},
|
{1042, nullptr, "AddToFreeCommunicationApplicationList"},
|
||||||
{1043, nullptr, "DeleteSettings"},
|
{1043, nullptr, "DeleteSettings"},
|
||||||
{1044, nullptr, "GetFreeCommunicationApplicationList"},
|
{1044, nullptr, "GetFreeCommunicationApplicationList"},
|
||||||
@ -76,7 +78,7 @@ public:
|
|||||||
{1206, nullptr, "GetPinCodeLength"},
|
{1206, nullptr, "GetPinCodeLength"},
|
||||||
{1207, nullptr, "GetPinCodeChangedEvent"},
|
{1207, nullptr, "GetPinCodeChangedEvent"},
|
||||||
{1208, nullptr, "GetPinCode"},
|
{1208, nullptr, "GetPinCode"},
|
||||||
{1403, nullptr, "IsPairingActive"},
|
{1403, &IParentalControlService::IsPairingActive, "IsPairingActive"},
|
||||||
{1406, nullptr, "GetSettingsLastUpdated"},
|
{1406, nullptr, "GetSettingsLastUpdated"},
|
||||||
{1411, nullptr, "GetPairingAccountInfo"},
|
{1411, nullptr, "GetPairingAccountInfo"},
|
||||||
{1421, nullptr, "GetAccountNickname"},
|
{1421, nullptr, "GetAccountNickname"},
|
||||||
@ -84,18 +86,18 @@ public:
|
|||||||
{1425, nullptr, "RequestPostEvents"},
|
{1425, nullptr, "RequestPostEvents"},
|
||||||
{1426, nullptr, "GetPostEventInterval"},
|
{1426, nullptr, "GetPostEventInterval"},
|
||||||
{1427, nullptr, "SetPostEventInterval"},
|
{1427, nullptr, "SetPostEventInterval"},
|
||||||
{1432, nullptr, "GetSynchronizationEvent"},
|
{1432, &IParentalControlService::GetSynchronizationEvent, "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, &IParentalControlService::GetPlayTimerSettings, "GetPlayTimerSettings"},
|
||||||
{1457, nullptr, "GetPlayTimerEventToRequestSuspension"},
|
{1457, &IParentalControlService::GetPlayTimerEventToRequestSuspension, "GetPlayTimerEventToRequestSuspension"},
|
||||||
{1458, nullptr, "IsPlayTimerAlarmDisabled"},
|
{1458, &IParentalControlService::IsPlayTimerAlarmDisabled, "IsPlayTimerAlarmDisabled"},
|
||||||
{1471, nullptr, "NotifyWrongPinCodeInputManyTimes"},
|
{1471, nullptr, "NotifyWrongPinCodeInputManyTimes"},
|
||||||
{1472, nullptr, "CancelNetworkRequest"},
|
{1472, nullptr, "CancelNetworkRequest"},
|
||||||
{1473, nullptr, "GetUnlinkedEvent"},
|
{1473, &IParentalControlService::GetUnlinkedEvent, "GetUnlinkedEvent"},
|
||||||
{1474, nullptr, "ClearUnlinkedEvent"},
|
{1474, nullptr, "ClearUnlinkedEvent"},
|
||||||
{1601, nullptr, "DisableAllFeatures"},
|
{1601, nullptr, "DisableAllFeatures"},
|
||||||
{1602, nullptr, "PostEnableAllFeatures"},
|
{1602, nullptr, "PostEnableAllFeatures"},
|
||||||
@ -131,6 +133,12 @@ public:
|
|||||||
};
|
};
|
||||||
// clang-format on
|
// clang-format on
|
||||||
RegisterHandlers(functions);
|
RegisterHandlers(functions);
|
||||||
|
|
||||||
|
synchronization_event =
|
||||||
|
service_context.CreateEvent("IParentalControlService::SynchronizationEvent");
|
||||||
|
unlinked_event = service_context.CreateEvent("IParentalControlService::UnlinkedEvent");
|
||||||
|
request_suspension_event =
|
||||||
|
service_context.CreateEvent("IParentalControlService::RequestSuspensionEvent");
|
||||||
}
|
}
|
||||||
|
|
||||||
private:
|
private:
|
||||||
@ -144,7 +152,7 @@ private:
|
|||||||
if (pin_code[0] == '\0') {
|
if (pin_code[0] == '\0') {
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
if (!settings.is_free_communication_default_on) {
|
if (!restriction_settings.is_free_communication_default_on) {
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
// TODO(ogniK): Check for blacklisted/exempted applications. Return false can happen here
|
// TODO(ogniK): Check for blacklisted/exempted applications. Return false can happen here
|
||||||
@ -160,21 +168,21 @@ private:
|
|||||||
if (pin_code[0] == '\0') {
|
if (pin_code[0] == '\0') {
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
if (!settings.is_stero_vision_restricted) {
|
if (!restriction_settings.is_stero_vision_restricted) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
void SetStereoVisionRestrictionImpl(bool is_restricted) {
|
void SetStereoVisionRestrictionImpl(bool is_restricted) {
|
||||||
if (settings.disabled) {
|
if (restriction_settings.disabled) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (pin_code[0] == '\0') {
|
if (pin_code[0] == '\0') {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
settings.is_stero_vision_restricted = is_restricted;
|
restriction_settings.is_stero_vision_restricted = is_restricted;
|
||||||
}
|
}
|
||||||
|
|
||||||
void Initialize(HLERequestContext& ctx) {
|
void Initialize(HLERequestContext& ctx) {
|
||||||
@ -228,6 +236,17 @@ private:
|
|||||||
states.free_communication = true;
|
states.free_communication = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void IsRestrictionTemporaryUnlocked(HLERequestContext& ctx) {
|
||||||
|
const bool is_temporary_unlocked = false;
|
||||||
|
|
||||||
|
LOG_WARNING(Service_PCTL, "(STUBBED) called, is_temporary_unlocked={}",
|
||||||
|
is_temporary_unlocked);
|
||||||
|
|
||||||
|
IPC::ResponseBuilder rb{ctx, 3};
|
||||||
|
rb.Push(ResultSuccess);
|
||||||
|
rb.Push<u8>(is_temporary_unlocked);
|
||||||
|
}
|
||||||
|
|
||||||
void ConfirmStereoVisionPermission(HLERequestContext& ctx) {
|
void ConfirmStereoVisionPermission(HLERequestContext& ctx) {
|
||||||
LOG_DEBUG(Service_PCTL, "called");
|
LOG_DEBUG(Service_PCTL, "called");
|
||||||
states.stereo_vision = true;
|
states.stereo_vision = true;
|
||||||
@ -268,6 +287,34 @@ private:
|
|||||||
rb.Push(pin_code[0] != '\0');
|
rb.Push(pin_code[0] != '\0');
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void GetSafetyLevel(HLERequestContext& ctx) {
|
||||||
|
const u32 safety_level = 0;
|
||||||
|
|
||||||
|
LOG_WARNING(Service_PCTL, "(STUBBED) called, safety_level={}", safety_level);
|
||||||
|
|
||||||
|
IPC::ResponseBuilder rb{ctx, 3};
|
||||||
|
rb.Push(ResultSuccess);
|
||||||
|
rb.Push(safety_level);
|
||||||
|
}
|
||||||
|
|
||||||
|
void GetCurrentSettings(HLERequestContext& ctx) {
|
||||||
|
LOG_INFO(Service_PCTL, "called");
|
||||||
|
|
||||||
|
IPC::ResponseBuilder rb{ctx, 3};
|
||||||
|
rb.Push(ResultSuccess);
|
||||||
|
rb.PushRaw(restriction_settings);
|
||||||
|
}
|
||||||
|
|
||||||
|
void GetFreeCommunicationApplicationListCount(HLERequestContext& ctx) {
|
||||||
|
const u32 count = 4;
|
||||||
|
|
||||||
|
LOG_WARNING(Service_PCTL, "(STUBBED) called, count={}", count);
|
||||||
|
|
||||||
|
IPC::ResponseBuilder rb{ctx, 3};
|
||||||
|
rb.Push(ResultSuccess);
|
||||||
|
rb.Push(count);
|
||||||
|
}
|
||||||
|
|
||||||
void ConfirmStereoVisionRestrictionConfigurable(HLERequestContext& ctx) {
|
void ConfirmStereoVisionRestrictionConfigurable(HLERequestContext& ctx) {
|
||||||
LOG_DEBUG(Service_PCTL, "called");
|
LOG_DEBUG(Service_PCTL, "called");
|
||||||
|
|
||||||
@ -300,6 +347,61 @@ private:
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void IsPairingActive(HLERequestContext& ctx) {
|
||||||
|
const bool is_pairing_active = false;
|
||||||
|
|
||||||
|
LOG_WARNING(Service_PCTL, "(STUBBED) called, is_pairing_active={}", is_pairing_active);
|
||||||
|
|
||||||
|
IPC::ResponseBuilder rb{ctx, 3};
|
||||||
|
rb.Push(ResultSuccess);
|
||||||
|
rb.Push<u8>(is_pairing_active);
|
||||||
|
}
|
||||||
|
|
||||||
|
void GetSynchronizationEvent(HLERequestContext& ctx) {
|
||||||
|
LOG_INFO(Service_PCTL, "called");
|
||||||
|
|
||||||
|
IPC::ResponseBuilder rb{ctx, 2, 1};
|
||||||
|
rb.Push(ResultSuccess);
|
||||||
|
rb.PushCopyObjects(synchronization_event->GetReadableEvent());
|
||||||
|
}
|
||||||
|
|
||||||
|
void GetPlayTimerSettings(HLERequestContext& ctx) {
|
||||||
|
LOG_WARNING(Service_PCTL, "(STUBBED) called");
|
||||||
|
|
||||||
|
const PlayTimerSettings timer_settings{};
|
||||||
|
|
||||||
|
IPC::ResponseBuilder rb{ctx, 15};
|
||||||
|
rb.Push(ResultSuccess);
|
||||||
|
rb.PushRaw(timer_settings);
|
||||||
|
}
|
||||||
|
|
||||||
|
void GetPlayTimerEventToRequestSuspension(HLERequestContext& ctx) {
|
||||||
|
LOG_INFO(Service_PCTL, "called");
|
||||||
|
|
||||||
|
IPC::ResponseBuilder rb{ctx, 2, 1};
|
||||||
|
rb.Push(ResultSuccess);
|
||||||
|
rb.PushCopyObjects(request_suspension_event->GetReadableEvent());
|
||||||
|
}
|
||||||
|
|
||||||
|
void IsPlayTimerAlarmDisabled(HLERequestContext& ctx) {
|
||||||
|
const bool is_play_timer_alarm_disabled = false;
|
||||||
|
|
||||||
|
LOG_INFO(Service_PCTL, "called, is_play_timer_alarm_disabled={}",
|
||||||
|
is_play_timer_alarm_disabled);
|
||||||
|
|
||||||
|
IPC::ResponseBuilder rb{ctx, 3};
|
||||||
|
rb.Push(ResultSuccess);
|
||||||
|
rb.Push<u8>(is_play_timer_alarm_disabled);
|
||||||
|
}
|
||||||
|
|
||||||
|
void GetUnlinkedEvent(HLERequestContext& ctx) {
|
||||||
|
LOG_INFO(Service_PCTL, "called");
|
||||||
|
|
||||||
|
IPC::ResponseBuilder rb{ctx, 2, 1};
|
||||||
|
rb.Push(ResultSuccess);
|
||||||
|
rb.PushCopyObjects(unlinked_event->GetReadableEvent());
|
||||||
|
}
|
||||||
|
|
||||||
void SetStereoVisionRestriction(HLERequestContext& ctx) {
|
void SetStereoVisionRestriction(HLERequestContext& ctx) {
|
||||||
IPC::RequestParser rp{ctx};
|
IPC::RequestParser rp{ctx};
|
||||||
const auto can_use = rp.Pop<bool>();
|
const auto can_use = rp.Pop<bool>();
|
||||||
@ -328,7 +430,7 @@ private:
|
|||||||
}
|
}
|
||||||
|
|
||||||
rb.Push(ResultSuccess);
|
rb.Push(ResultSuccess);
|
||||||
rb.Push(settings.is_stero_vision_restricted);
|
rb.Push(restriction_settings.is_stero_vision_restricted);
|
||||||
}
|
}
|
||||||
|
|
||||||
void ResetConfirmedStereoVisionPermission(HLERequestContext& ctx) {
|
void ResetConfirmedStereoVisionPermission(HLERequestContext& ctx) {
|
||||||
@ -358,16 +460,30 @@ private:
|
|||||||
bool stereo_vision{};
|
bool stereo_vision{};
|
||||||
};
|
};
|
||||||
|
|
||||||
struct ParentalControlSettings {
|
// This is nn::pctl::RestrictionSettings
|
||||||
|
struct RestrictionSettings {
|
||||||
bool is_stero_vision_restricted{};
|
bool is_stero_vision_restricted{};
|
||||||
bool is_free_communication_default_on{};
|
bool is_free_communication_default_on{};
|
||||||
bool disabled{};
|
bool disabled{};
|
||||||
};
|
};
|
||||||
|
static_assert(sizeof(RestrictionSettings) == 0x3, "RestrictionSettings has incorrect size.");
|
||||||
|
|
||||||
|
// This is nn::pctl::PlayTimerSettings
|
||||||
|
struct PlayTimerSettings {
|
||||||
|
// TODO: RE the actual contents of this struct
|
||||||
|
std::array<u8, 0x34> settings;
|
||||||
|
};
|
||||||
|
static_assert(sizeof(PlayTimerSettings) == 0x34, "PlayTimerSettings has incorrect size.");
|
||||||
|
|
||||||
States states{};
|
States states{};
|
||||||
ParentalControlSettings settings{};
|
RestrictionSettings restriction_settings{};
|
||||||
std::array<char, 8> pin_code{};
|
std::array<char, 8> pin_code{};
|
||||||
Capability capability{};
|
Capability capability{};
|
||||||
|
|
||||||
|
Kernel::KEvent* synchronization_event;
|
||||||
|
Kernel::KEvent* unlinked_event;
|
||||||
|
Kernel::KEvent* request_suspension_event;
|
||||||
|
KernelHelpers::ServiceContext service_context;
|
||||||
};
|
};
|
||||||
|
|
||||||
void Module::Interface::CreateService(HLERequestContext& ctx) {
|
void Module::Interface::CreateService(HLERequestContext& ctx) {
|
||||||
|
@ -106,6 +106,43 @@ bool IsASTCSupported() {
|
|||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static bool HasSlowSoftwareAstc(std::string_view vendor_name, std::string_view renderer) {
|
||||||
|
// ifdef for Unix reduces string comparisons for non-Windows drivers, and Intel
|
||||||
|
#ifdef YUZU_UNIX
|
||||||
|
// Sorted vaguely by how likely a vendor is to appear
|
||||||
|
if (vendor_name == "AMD") {
|
||||||
|
// RadeonSI
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
if (vendor_name == "Intel") {
|
||||||
|
// Must be inside YUZU_UNIX ifdef as the Windows driver uses the same vendor string
|
||||||
|
// iris, crocus
|
||||||
|
const bool is_intel_dg = (renderer.find("DG") != std::string_view::npos);
|
||||||
|
return is_intel_dg;
|
||||||
|
}
|
||||||
|
if (vendor_name == "nouveau") {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
if (vendor_name == "X.Org") {
|
||||||
|
// R600
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
if (vendor_name == "Collabora Ltd") {
|
||||||
|
// Zink
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
if (vendor_name == "Microsoft Corporation") {
|
||||||
|
// d3d12
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
if (vendor_name == "Mesa/X.org") {
|
||||||
|
// llvmpipe, softpipe, virgl
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
[[nodiscard]] bool IsDebugToolAttached(std::span<const std::string_view> extensions) {
|
[[nodiscard]] bool IsDebugToolAttached(std::span<const std::string_view> extensions) {
|
||||||
const bool nsight = std::getenv("NVTX_INJECTION64_PATH") || std::getenv("NSIGHT_LAUNCHED");
|
const bool nsight = std::getenv("NVTX_INJECTION64_PATH") || std::getenv("NSIGHT_LAUNCHED");
|
||||||
return nsight || HasExtension(extensions, "GL_EXT_debug_tool") ||
|
return nsight || HasExtension(extensions, "GL_EXT_debug_tool") ||
|
||||||
@ -120,12 +157,16 @@ Device::Device(Core::Frontend::EmuWindow& emu_window) {
|
|||||||
}
|
}
|
||||||
vendor_name = reinterpret_cast<const char*>(glGetString(GL_VENDOR));
|
vendor_name = reinterpret_cast<const char*>(glGetString(GL_VENDOR));
|
||||||
const std::string_view version = reinterpret_cast<const char*>(glGetString(GL_VERSION));
|
const std::string_view version = reinterpret_cast<const char*>(glGetString(GL_VERSION));
|
||||||
|
const std::string_view renderer = reinterpret_cast<const char*>(glGetString(GL_RENDERER));
|
||||||
const std::vector extensions = GetExtensions();
|
const std::vector extensions = GetExtensions();
|
||||||
|
|
||||||
const bool is_nvidia = vendor_name == "NVIDIA Corporation";
|
const bool is_nvidia = vendor_name == "NVIDIA Corporation";
|
||||||
const bool is_amd = vendor_name == "ATI Technologies Inc.";
|
const bool is_amd = vendor_name == "ATI Technologies Inc.";
|
||||||
const bool is_intel = vendor_name == "Intel";
|
const bool is_intel = vendor_name == "Intel";
|
||||||
|
|
||||||
|
const bool has_slow_software_astc =
|
||||||
|
!is_nvidia && !is_amd && HasSlowSoftwareAstc(vendor_name, renderer);
|
||||||
|
|
||||||
#ifdef __unix__
|
#ifdef __unix__
|
||||||
constexpr bool is_linux = true;
|
constexpr bool is_linux = true;
|
||||||
#else
|
#else
|
||||||
@ -152,7 +193,7 @@ Device::Device(Core::Frontend::EmuWindow& emu_window) {
|
|||||||
has_vertex_viewport_layer = GLAD_GL_ARB_shader_viewport_layer_array;
|
has_vertex_viewport_layer = GLAD_GL_ARB_shader_viewport_layer_array;
|
||||||
has_image_load_formatted = HasExtension(extensions, "GL_EXT_shader_image_load_formatted");
|
has_image_load_formatted = HasExtension(extensions, "GL_EXT_shader_image_load_formatted");
|
||||||
has_texture_shadow_lod = HasExtension(extensions, "GL_EXT_texture_shadow_lod");
|
has_texture_shadow_lod = HasExtension(extensions, "GL_EXT_texture_shadow_lod");
|
||||||
has_astc = IsASTCSupported();
|
has_astc = !has_slow_software_astc && IsASTCSupported();
|
||||||
has_variable_aoffi = TestVariableAoffi();
|
has_variable_aoffi = TestVariableAoffi();
|
||||||
has_component_indexing_bug = is_amd;
|
has_component_indexing_bug = is_amd;
|
||||||
has_precise_bug = TestPreciseBug();
|
has_precise_bug = TestPreciseBug();
|
||||||
|
Reference in New Issue
Block a user