From 5608ab1cd485083e81cef5cd4bd5132f03d97077 Mon Sep 17 00:00:00 2001 From: Pavel Barabanov Date: Mon, 12 May 2025 03:11:56 +0300 Subject: [PATCH] everything related to the FW 20 has been deleted. --- src/core/hle/service/acc/acc.cpp | 18 +---- src/core/hle/service/acc/acc_su.cpp | 11 --- src/core/hle/service/acc/acc_u1.cpp | 3 - .../all_system_applet_proxies_service.cpp | 22 ------ .../all_system_applet_proxies_service.h | 1 - .../am/service/applet_common_functions.cpp | 2 - .../am/service/process_winding_controller.cpp | 7 +- .../am/service/process_winding_controller.h | 2 +- .../service/am/service/self_controller.cpp | 5 -- .../hle/service/am/service/self_controller.h | 1 - src/core/hle/service/caps/caps_a.cpp | 11 --- src/core/hle/service/caps/caps_a.h | 4 - src/core/hle/service/erpt/erpt.cpp | 2 - .../hle/service/filesystem/fsp/fsp_srv.cpp | 2 - src/core/hle/service/friend/friend.cpp | 15 ++-- src/core/hle/service/hid/hid_debug_server.cpp | 3 - src/core/hle/service/hid/hid_server.cpp | 8 +- src/core/hle/service/hid/hid_server.h | 2 +- .../hle/service/hid/hid_system_server.cpp | 12 --- src/core/hle/service/lm/lm.cpp | 2 - src/core/hle/service/mii/mii.cpp | 2 - src/core/hle/service/nifm/nifm.cpp | 8 +- .../ns/application_manager_interface.cpp | 20 ----- .../ns/application_manager_interface.h | 3 - .../service/ns/platform_service_manager.cpp | 1 - .../service/pctl/parental_control_service.cpp | 39 +--------- .../service/pctl/parental_control_service.h | 2 - .../set/firmware_debug_settings_server.cpp | 1 - .../service/set/system_settings_server.cpp | 8 -- src/core/hle/service/ssl/ssl.cpp | 2 - src/core/hle/service/ssl/ssl_types.h | 76 ++----------------- .../resources/touch_screen/touch_screen.cpp | 4 +- .../resources/touch_screen/touch_screen.h | 2 +- .../touch_screen/touch_screen_resource.cpp | 2 +- .../touch_screen/touch_screen_resource.h | 2 +- 35 files changed, 27 insertions(+), 278 deletions(-) diff --git a/src/core/hle/service/acc/acc.cpp b/src/core/hle/service/acc/acc.cpp index 7e4001ef92..1fff04eead 100644 --- a/src/core/hle/service/acc/acc.cpp +++ b/src/core/hle/service/acc/acc.cpp @@ -104,9 +104,7 @@ public: {160, nullptr, "RequiresUpdateNetworkServiceAccountIdTokenCache"}, {161, nullptr, "RequireReauthenticationOfNetworkServiceAccount"}, {170, nullptr, "CreateDeviceHistoryRequest"}, // 17.0.0+ - {180, nullptr, "GetRequestForNintendoAccountReauthentication"}, // 18.0.0+ - {181, nullptr, "CreateProcedureToReauthenticateNintendoAccount"}, // 20.0.0+ - {182, nullptr, "ResumeProcedureToReauthenticateNintendoAccount"}, // 20.0.0+ + {180, nullptr, "GetRequestForNintendoAccountReauthentication"} // 18.0.0+ }; // clang-format on @@ -196,12 +194,6 @@ public: {161, nullptr, "RequireReauthenticationOfNetworkServiceAccount"}, {170, nullptr, "CreateDeviceHistoryRequest"}, // 17.0.0+ {180, nullptr, "GetRequestForNintendoAccountReauthentication"}, // 18.0.0+ - {181, nullptr, "CreateProcedureToReauthenticateNintendoAccount"}, // 20.0.0+ - {182, nullptr, "ResumeProcedureToReauthenticateNintendoAccount"}, // 20.0.0+ - {183, nullptr, "GetNintendoAccountReauthenticationRequest"}, // 20.0.0+ - {190, nullptr, "GetDeviceMigrationInfo"}, // 20.0.0+ - {191, nullptr, "CheckDeviceMigrationAvailabilityAsync"}, // 20.0.0+ - {192, nullptr, "StartDeviceMigrationAsync"}, // 20.0.0+ {200, nullptr, "IsRegistered"}, {201, nullptr, "RegisterAsync"}, {202, nullptr, "UnregisterAsync"}, @@ -309,11 +301,6 @@ public: {101, nullptr, "IsNetworkServiceAccountReplaced"}, {199, nullptr, "GetUrlForIntroductionOfExtraMembership"}, // 2.0.0 - 5.1.0 {200, nullptr, "ApplyAsyncWithAuthorizedToken"}, - {210, nullptr, "IsProfileAvailable"}, // 17.0.0+ - {220, nullptr, "RegisterUserAsyncWithoutProfile"}, // 17.0.0+ - {221, nullptr, "RegisterUserWithProfileAsync"}, // 17.0.0+ - {230, nullptr, "RegisterUserWithLargeImageProfileAsync"}, // 18.0.0+ - {240, nullptr, "RegisterUserWithReauthenticationAsync"}, // 20.0.0+ }; // clang-format on @@ -768,8 +755,7 @@ public: {210, nullptr, "IsProfileAvailable"}, // 17.0.0+ {220, nullptr, "RegisterUserAsyncWithoutProfile"}, // 17.0.0+ {221, nullptr, "RegisterUserWithProfileAsync"}, // 17.0.0+ - {230, nullptr, "RegisterUserWithLargeImageProfileAsync"}, // 18.0.0+ - {240, nullptr, "RegisterUserWithReauthenticationAsync"}, // 20.0.0+ + {230, nullptr, "RegisterUserWithLargeImageProfileAsync"} // 18.0.0+ }; // clang-format on diff --git a/src/core/hle/service/acc/acc_su.cpp b/src/core/hle/service/acc/acc_su.cpp index 92662ade29..3a737341f8 100644 --- a/src/core/hle/service/acc/acc_su.cpp +++ b/src/core/hle/service/acc/acc_su.cpp @@ -53,26 +53,15 @@ ACC_SU::ACC_SU(std::shared_ptr module_, std::shared_ptr {212, nullptr, "ResumeProcedureToRegisterUserWithNintendoAccount"}, {230, nullptr, "AuthenticateServiceAsync"}, {250, nullptr, "GetBaasAccountAdministrator"}, - {251, nullptr, "SynchronizeNetworkServiceAccountsSnapshotAsync"}, // 20.0.0+ {290, nullptr, "ProxyProcedureForGuestLoginWithNintendoAccount"}, {291, nullptr, "ProxyProcedureForFloatingRegistrationWithNintendoAccount"}, - {292, nullptr, "ProxyProcedureForDeviceMigrationAuthenticatingOperatingUser"}, // 20.0.0+ - {293, nullptr, "ProxyProcedureForDeviceMigrationDownload"}, // 20.0.0+ {299, nullptr, "SuspendBackgroundDaemon"}, - {350, nullptr, "CreateDeviceMigrationUserExportRequest"}, // 20.0.0+ - {351, nullptr, "UploadNasCredential"}, // 20.0.0+ - {352, nullptr, "CreateDeviceMigrationUserImportRequest"}, // 20.0.0+ - {353, nullptr, "DeleteUserMigrationSaveData"}, // 20.0.0+ {400, nullptr, "SetPinCode"}, // 18.0.0+ {401, nullptr, "GetPinCodeLength"}, // 18.0.0+ {402, nullptr, "GetPinCode"}, // 18.0.0+ - {403, nullptr, "GetPinCodeParity"}, // 20.0.0+ - {404, nullptr, "VerifyPinCode"}, // 20.0.0+ - {405, nullptr, "IsPinCodeVerificationForbidden"}, // 20.0.0+ {410, nullptr, "GetPinCodeErrorCount"}, // 18.0.0+ {411, nullptr, "ResetPinCodeErrorCount"}, // 18.0.0+ {412, nullptr, "IncrementPinCodeErrorCount"}, // 18.0.0+ - {413, nullptr, "SetPinCodeErrorCount"}, // 20.0.0+ {900, nullptr, "SetUserUnqualifiedForDebug"}, {901, nullptr, "UnsetUserUnqualifiedForDebug"}, {902, nullptr, "ListUsersUnqualifiedForDebug"}, diff --git a/src/core/hle/service/acc/acc_u1.cpp b/src/core/hle/service/acc/acc_u1.cpp index ecc17ef31b..3832f5216d 100644 --- a/src/core/hle/service/acc/acc_u1.cpp +++ b/src/core/hle/service/acc/acc_u1.cpp @@ -42,9 +42,6 @@ ACC_U1::ACC_U1(std::shared_ptr module_, std::shared_ptr {191, nullptr, "ActivateOpenContextHolder"}, {401, nullptr, "GetPinCodeLength"}, // 18.0.0+ {402, nullptr, "GetPinCode"}, // 18.0.0+ - {403, nullptr, "GetPinCodeParity"}, // 20.0.0+ - {404, nullptr, "VerifyPinCode"}, // 20.0.0+ - {405, nullptr, "IsPinCodeVerificationForbidden"}, // 20.0.0+ {997, nullptr, "DebugInvalidateTokenCacheForUser"}, {998, nullptr, "DebugSetUserStateClose"}, {999, nullptr, "DebugSetUserStateOpen"}, diff --git a/src/core/hle/service/am/service/all_system_applet_proxies_service.cpp b/src/core/hle/service/am/service/all_system_applet_proxies_service.cpp index fc9c77fc36..5a787494a8 100644 --- a/src/core/hle/service/am/service/all_system_applet_proxies_service.cpp +++ b/src/core/hle/service/am/service/all_system_applet_proxies_service.cpp @@ -18,7 +18,6 @@ IAllSystemAppletProxiesService::IAllSystemAppletProxiesService(Core::System& sys // clang-format off static const FunctionInfo functions[] = { {100, D<&IAllSystemAppletProxiesService::OpenSystemAppletProxy>, "OpenSystemAppletProxy"}, - {110, D<&IAllSystemAppletProxiesService::OpenSystemAppletProxyForDebug>, "OpenSystemAppletProxyForDebug"}, {200, D<&IAllSystemAppletProxiesService::OpenLibraryAppletProxyOld>, "OpenLibraryAppletProxyOld"}, {201, D<&IAllSystemAppletProxiesService::OpenLibraryAppletProxy>, "OpenLibraryAppletProxy"}, {300, nullptr, "OpenOverlayAppletProxy"}, @@ -26,7 +25,6 @@ IAllSystemAppletProxiesService::IAllSystemAppletProxiesService(Core::System& sys {400, nullptr, "CreateSelfLibraryAppletCreatorForDevelop"}, {410, nullptr, "GetSystemAppletControllerForDebug"}, {450, D<&IAllSystemAppletProxiesService::GetSystemProcessCommonFunctions>, "GetSystemProcessCommonFunctions"}, // 19.0.0+ - {460, nullptr, "Unknown460"}, {1000, nullptr, "GetDebugFunctions"}, }; // clang-format on @@ -51,26 +49,6 @@ Result IAllSystemAppletProxiesService::OpenSystemAppletProxy( } } -Result IAllSystemAppletProxiesService::OpenSystemAppletProxyForDebug( - Out> out_proxy, ClientProcessId pid) { - LOG_DEBUG(Service_AM, "OpenSystemAppletProxyForDebug called"); - - auto process = system.ApplicationProcess(); - if (!process) { - LOG_ERROR(Service_AM, "No application process available"); - R_THROW(ResultUnknown); - } - - if (const auto applet = GetAppletFromProcessId(pid)) { - *out_proxy = std::make_shared( - system, applet, process, m_window_system); - R_SUCCEED(); - } - - LOG_ERROR(Service_AM, "Applet not found for pid={}", pid.pid); - R_THROW(ResultUnknown); -} - Result IAllSystemAppletProxiesService::OpenLibraryAppletProxy( Out> out_library_applet_proxy, ClientProcessId pid, InCopyHandle process_handle, diff --git a/src/core/hle/service/am/service/all_system_applet_proxies_service.h b/src/core/hle/service/am/service/all_system_applet_proxies_service.h index 72730ea55a..a3111c4c9b 100644 --- a/src/core/hle/service/am/service/all_system_applet_proxies_service.h +++ b/src/core/hle/service/am/service/all_system_applet_proxies_service.h @@ -27,7 +27,6 @@ private: Result OpenSystemAppletProxy(Out> out_system_applet_proxy, ClientProcessId pid, InCopyHandle process_handle); - Result OpenSystemAppletProxyForDebug(Out> out_proxy, ClientProcessId pid); Result OpenLibraryAppletProxy(Out> out_library_applet_proxy, ClientProcessId pid, InCopyHandle process_handle, diff --git a/src/core/hle/service/am/service/applet_common_functions.cpp b/src/core/hle/service/am/service/applet_common_functions.cpp index ed203e979a..1c9cd74533 100644 --- a/src/core/hle/service/am/service/applet_common_functions.cpp +++ b/src/core/hle/service/am/service/applet_common_functions.cpp @@ -33,10 +33,8 @@ IAppletCommonFunctions::IAppletCommonFunctions(Core::System& system_, {100, nullptr, "SetApplicationCoreUsageMode"}, {300, D<&IAppletCommonFunctions::GetCurrentApplicationId>, "GetCurrentApplicationId"}, {310, nullptr, "IsSystemAppletHomeMenu"}, //19.0.0+ - {311, nullptr, "Unknown311"}, {320, nullptr, "SetGpuTimeSliceBoost"}, //19.0.0+ {321, nullptr, "SetGpuTimeSliceBoostDueToApplication"}, //19.0.0+ - {350, nullptr, "Unknown350"}, }; // clang-format on diff --git a/src/core/hle/service/am/service/process_winding_controller.cpp b/src/core/hle/service/am/service/process_winding_controller.cpp index a150248e71..10df830d70 100644 --- a/src/core/hle/service/am/service/process_winding_controller.cpp +++ b/src/core/hle/service/am/service/process_winding_controller.cpp @@ -15,7 +15,7 @@ IProcessWindingController::IProcessWindingController(Core::System& system_, static const FunctionInfo functions[] = { {0, D<&IProcessWindingController::GetLaunchReason>, "GetLaunchReason"}, {11, D<&IProcessWindingController::OpenCallingLibraryApplet>, "OpenCallingLibraryApplet"}, - {21, D<&IProcessWindingController::PushContext>, "PushContext"}, + {21, nullptr, "PushContext"}, {22, nullptr, "PopContext"}, {23, nullptr, "CancelWindingReservation"}, {30, nullptr, "WindAndDoReserved"}, @@ -51,9 +51,4 @@ Result IProcessWindingController::OpenCallingLibraryApplet( R_SUCCEED(); } -Result IProcessWindingController::PushContext() { - LOG_WARNING(Service_AM, "(STUBBED) called"); - R_SUCCEED(); -} - } // namespace Service::AM diff --git a/src/core/hle/service/am/service/process_winding_controller.h b/src/core/hle/service/am/service/process_winding_controller.h index bcf341d94c..4408af1f1d 100644 --- a/src/core/hle/service/am/service/process_winding_controller.h +++ b/src/core/hle/service/am/service/process_winding_controller.h @@ -21,7 +21,7 @@ private: Result GetLaunchReason(Out out_launch_reason); Result OpenCallingLibraryApplet( Out> out_calling_library_applet); - Result PushContext(); + const std::shared_ptr m_applet; }; diff --git a/src/core/hle/service/am/service/self_controller.cpp b/src/core/hle/service/am/service/self_controller.cpp index fa36c93060..1db02b88fd 100644 --- a/src/core/hle/service/am/service/self_controller.cpp +++ b/src/core/hle/service/am/service/self_controller.cpp @@ -67,7 +67,6 @@ ISelfController::ISelfController(Core::System& system_, std::shared_ptr {110, nullptr, "SetApplicationAlbumUserData"}, {120, D<&ISelfController::SaveCurrentScreenshot>, "SaveCurrentScreenshot"}, {130, D<&ISelfController::SetRecordVolumeMuted>, "SetRecordVolumeMuted"}, - {230, D<&ISelfController::Unknown230>, "Unknown230"}, {1000, nullptr, "GetDebugStorageChannel"}, }; // clang-format on @@ -395,10 +394,6 @@ Result ISelfController::SaveCurrentScreenshot(Capture::AlbumReportOption album_r R_SUCCEED(); } -Result ISelfController::Unknown230() { - LOG_WARNING(Service_AM, "(STUBBED) called - function 230 (0xE6)"); - R_SUCCEED(); -} Result ISelfController::SetRecordVolumeMuted(bool muted) { LOG_WARNING(Service_AM, "(STUBBED) called. muted={}", muted); diff --git a/src/core/hle/service/am/service/self_controller.h b/src/core/hle/service/am/service/self_controller.h index a384846231..eca083cfe5 100644 --- a/src/core/hle/service/am/service/self_controller.h +++ b/src/core/hle/service/am/service/self_controller.h @@ -62,7 +62,6 @@ private: Result GetAccumulatedSuspendedTickChangedEvent(OutCopyHandle out_event); Result SetAlbumImageTakenNotificationEnabled(bool enabled); Result SaveCurrentScreenshot(Capture::AlbumReportOption album_report_option); - Result Unknown230(); Result SetRecordVolumeMuted(bool muted); Kernel::KProcess* const m_process; diff --git a/src/core/hle/service/caps/caps_a.cpp b/src/core/hle/service/caps/caps_a.cpp index 588cf2f09b..52228b830a 100644 --- a/src/core/hle/service/caps/caps_a.cpp +++ b/src/core/hle/service/caps/caps_a.cpp @@ -53,8 +53,6 @@ IAlbumAccessorService::IAlbumAccessorService(Core::System& system_, {8021, nullptr, "GetAlbumEntryFromApplicationAlbumEntryAruid"}, {10011, nullptr, "SetInternalErrorConversionEnabled"}, {50000, nullptr, "LoadMakerNoteInfoForDebug"}, - {50011, C<&IAlbumAccessorService::GetAlbumAccessResultForDebug>, "GetAlbumAccessResultForDebug"}, - {50012, C<&IAlbumAccessorService::SetAlbumAccessResultForDebug>, "SetAlbumAccessResultForDebug"}, {60002, nullptr, "OpenAccessorSession"}, }; // clang-format on @@ -139,15 +137,6 @@ Result IAlbumAccessorService::LoadAlbumScreenShotThumbnailImageEx1( R_RETURN(TranslateResult(result)); } -Result IAlbumAccessorService::GetAlbumAccessResultForDebug() { - LOG_DEBUG(Service_Capture, "(STUBBED) called."); - R_SUCCEED(); -} - -Result IAlbumAccessorService::SetAlbumAccessResultForDebug() { - LOG_DEBUG(Service_Capture, "(STUBBED) called."); - R_SUCCEED(); -} Result IAlbumAccessorService::TranslateResult(Result in_result) { if (in_result.IsSuccess()) { return in_result; diff --git a/src/core/hle/service/caps/caps_a.h b/src/core/hle/service/caps/caps_a.h index 9590e71e70..c7a5208e32 100644 --- a/src/core/hle/service/caps/caps_a.h +++ b/src/core/hle/service/caps/caps_a.h @@ -50,10 +50,6 @@ private: OutArray out_image, OutArray out_buffer); - Result GetAlbumAccessResultForDebug(); - - Result SetAlbumAccessResultForDebug(); - Result TranslateResult(Result in_result); std::shared_ptr manager = nullptr; diff --git a/src/core/hle/service/erpt/erpt.cpp b/src/core/hle/service/erpt/erpt.cpp index 627ef72973..6b7eab5efd 100644 --- a/src/core/hle/service/erpt/erpt.cpp +++ b/src/core/hle/service/erpt/erpt.cpp @@ -30,8 +30,6 @@ public: {10, nullptr, "CreateReportWithAttachments"}, {11, C<&ErrorReportContext::CreateReportV1>, "CreateReportV1"}, {12, C<&ErrorReportContext::CreateReport>, "CreateReport"}, - {13, nullptr, "SubmitAttachmentWithLz4Compression"}, // 20.0.0+ - {14, nullptr, "CreateReportWithSpecifiedReprotId"}, // 20.0.0+ {20, nullptr, "RegisterRunningApplet"}, {21, nullptr, "UnregisterRunningApplet"}, {22, nullptr, "UpdateAppletSuspendedDuration"}, diff --git a/src/core/hle/service/filesystem/fsp/fsp_srv.cpp b/src/core/hle/service/filesystem/fsp/fsp_srv.cpp index f95c83259c..005caf6562 100644 --- a/src/core/hle/service/filesystem/fsp/fsp_srv.cpp +++ b/src/core/hle/service/filesystem/fsp/fsp_srv.cpp @@ -76,7 +76,6 @@ FSP_SRV::FSP_SRV(Core::System& system_) {34, D<&FSP_SRV::GetCacheStorageSize>, "GetCacheStorageSize"}, {35, nullptr, "CreateSaveDataFileSystemByHashSalt"}, {36, nullptr, "OpenHostFileSystemWithOption"}, - {38, nullptr, "DetachSdCard"}, // 20.0.0+ {51, D<&FSP_SRV::OpenSaveDataFileSystem>, "OpenSaveDataFileSystem"}, {52, D<&FSP_SRV::OpenSaveDataFileSystemBySystemSaveDataId>, "OpenSaveDataFileSystemBySystemSaveDataId"}, {53, D<&FSP_SRV::OpenReadOnlySaveDataFileSystem>, "OpenReadOnlySaveDataFileSystem"}, @@ -118,7 +117,6 @@ FSP_SRV::FSP_SRV(Core::System& system_) {400, nullptr, "OpenDeviceOperator"}, {500, nullptr, "OpenSdCardDetectionEventNotifier"}, {501, nullptr, "OpenGameCardDetectionEventNotifier"}, - {502, nullptr, "OpenSdCardAwakenReadyEventNotifier"}, // 20.0.0+ {510, nullptr, "OpenSystemDataUpdateEventNotifier"}, {511, nullptr, "NotifySystemDataUpdateEvent"}, {520, nullptr, "SimulateGameCardDetectionEvent"}, diff --git a/src/core/hle/service/friend/friend.cpp b/src/core/hle/service/friend/friend.cpp index e4a6251dcc..84c73e9d6f 100644 --- a/src/core/hle/service/friend/friend.cpp +++ b/src/core/hle/service/friend/friend.cpp @@ -50,19 +50,16 @@ public: {20102, nullptr, "GetFriendDetailedInfo"}, {20103, nullptr, "SyncFriendList"}, {20104, &IFriendService::RequestSyncFriendList, "RequestSyncFriendList"}, - {20107, nullptr, "GetFriendDetailedInfoV2"}, // 20.0.0+ {20110, nullptr, "LoadFriendSetting"}, {20200, &IFriendService::GetReceivedFriendRequestCount, "GetReceivedFriendRequestCount"}, - {20201, nullptr, "GetFriendRequestListV1"}, // 20.0.0+ (1.0.0-19.0.1 GetFriendRequestList) - {20202, nullptr, "GetFriendRequestListV2"}, // 20.0.0+ + {20201, nullptr, "GetFriendRequestList"}, {20300, nullptr, "GetFriendCandidateList"}, {20301, nullptr, "GetNintendoNetworkIdInfo"}, {20302, nullptr, "GetSnsAccountLinkage"}, {20303, nullptr, "GetSnsAccountProfile"}, {20304, nullptr, "GetSnsAccountFriendList"}, - {20400, nullptr, "GetBlockedUserListV1"}, // 20.0.0+ (1.0.0-19.0.1 GetBlockedUserList) + {20400, nullptr, "GetBlockedUserList"}, {20401, nullptr, "SyncBlockedUserList"}, - {20402, nullptr, "GetBlockedUserListV2"}, // 20.0.0+ {20500, nullptr, "GetProfileExtraList"}, {20501, nullptr, "GetRelationship"}, {20600, &IFriendService::GetUserPresenceView, "GetUserPresenceView"}, @@ -81,7 +78,7 @@ public: {30120, nullptr, "ChangeFriendFavoriteFlag"}, {30121, nullptr, "ChangeFriendOnlineNotificationFlag"}, {30200, nullptr, "SendFriendRequest"}, - {30201, nullptr, "SendFriendRequestWithApplicationInfoV1"}, // 20.0.0+ (1.0.0-19.0.1 SendFriendRequestWithApplicationInfo) + {30201, nullptr, "SendFriendRequestWithApplicationInfo"}, {30202, nullptr, "CancelFriendRequest"}, {30203, nullptr, "AcceptFriendRequest"}, {30204, nullptr, "RejectFriendRequest"}, @@ -94,13 +91,11 @@ public: {30215, nullptr, "SendFriendRequestWithExternalApplicationCatalogId"}, {30216, nullptr, "ResendFacedFriendRequest"}, {30217, nullptr, "SendFriendRequestWithNintendoNetworkIdInfo"}, - {30218, nullptr, "SendFriendRequestWithApplicationInfoV2"}, // 20.0.0+ {30300, nullptr, "GetSnsAccountLinkPageUrl"}, {30301, nullptr, "UnlinkSnsAccount"}, {30400, nullptr, "BlockUser"}, - {30401, nullptr, "BlockUserWithApplicationInfoV1"}, // 20.0.0+ (1.0.0-19.0.1 BlockUserWithApplicationInfo) + {30401, nullptr, "BlockUserWithApplicationInfo"}, {30402, nullptr, "UnblockUser"}, - {30403, nullptr, "BlockUserWithApplicationInfoV2"}, // 20.0.0+ {30500, nullptr, "GetProfileExtraFromFriendCode"}, {30700, nullptr, "DeletePlayHistory"}, {30810, nullptr, "ChangePresencePermission"}, @@ -478,4 +473,4 @@ void LoopProcess(Core::System& system) { ServerManager::RunServer(std::move(server_manager)); } -} // namespace Service::Friend \ No newline at end of file +} // namespace Service::Friend diff --git a/src/core/hle/service/hid/hid_debug_server.cpp b/src/core/hle/service/hid/hid_debug_server.cpp index 1547192b1b..4e26636725 100644 --- a/src/core/hle/service/hid/hid_debug_server.cpp +++ b/src/core/hle/service/hid/hid_debug_server.cpp @@ -86,8 +86,6 @@ IHidDebugServer::IHidDebugServer(Core::System& system_, std::shared_ptr r {134, C<&IHidServer::SetNpadAnalogStickUseCenterClamp>, "SetNpadAnalogStickUseCenterClamp"}, {135, C<&IHidServer::SetNpadCaptureButtonAssignment>, "SetNpadCaptureButtonAssignment"}, {136, C<&IHidServer::ClearNpadCaptureButtonAssignment>, "ClearNpadCaptureButtonAssignment"}, - {137, nullptr, "SetNpadGcAnalogStick8bitRawValue"}, // 20.0.0+ {200, C<&IHidServer::GetVibrationDeviceInfo>, "GetVibrationDeviceInfo"}, {201, C<&IHidServer::SendVibrationValue>, "SendVibrationValue"}, {202, C<&IHidServer::GetActualVibrationValue>, "GetActualVibrationValue"}, @@ -184,8 +183,7 @@ IHidServer::IHidServer(Core::System& system_, std::shared_ptr r {1001, C<&IHidServer::GetNpadCommunicationMode>, "GetNpadCommunicationMode"}, {1002, C<&IHidServer::SetTouchScreenConfiguration>, "SetTouchScreenConfiguration"}, {1003, C<&IHidServer::IsFirmwareUpdateNeededForNotification>, "IsFirmwareUpdateNeededForNotification"}, - {1004, C<&IHidServer::SetTouchScreenOutputRanges>, "SetTouchScreenOutputRanges"}, // 20.0.0+ (17.0.0-19.0.1 SetTouchScreenResolution) - {1005, nullptr, "EnableNxTouchScreenEmulationForTouchEnter"}, // 20.0.0+ + {1004, C<&IHidServer::SetTouchScreenResolution>, "SetTouchScreenResolution"}, {2000, nullptr, "ActivateDigitizer"}, }; // clang-format on @@ -1434,12 +1432,12 @@ Result IHidServer::IsFirmwareUpdateNeededForNotification(Out out_is_firmwa R_SUCCEED(); } -Result IHidServer::SetTouchScreenOutputRanges(u32 width, u32 height, +Result IHidServer::SetTouchScreenResolution(u32 width, u32 height, ClientAppletResourceUserId aruid) { LOG_INFO(Service_HID, "called, width={}, height={}, applet_resource_user_id={}", width, height, aruid.pid); - GetResourceManager()->GetTouchScreen()->SetTouchScreenOutputRanges(width, height, aruid.pid); + GetResourceManager()->GetTouchScreen()->SetTouchScreenResolution(width, height, aruid.pid); R_SUCCEED(); } diff --git a/src/core/hle/service/hid/hid_server.h b/src/core/hle/service/hid/hid_server.h index 11884c8db3..9fdb25d5ca 100644 --- a/src/core/hle/service/hid/hid_server.h +++ b/src/core/hle/service/hid/hid_server.h @@ -258,7 +258,7 @@ private: ClientAppletResourceUserId aruid); Result IsFirmwareUpdateNeededForNotification(Out out_is_firmware_update_needed, s32 unknown, ClientAppletResourceUserId aruid); - Result SetTouchScreenOutputRanges(u32 width, u32 height, ClientAppletResourceUserId aruid); + Result SetTouchScreenResolution(u32 width, u32 height, ClientAppletResourceUserId aruid); std::shared_ptr resource_manager; std::shared_ptr firmware_settings; diff --git a/src/core/hle/service/hid/hid_system_server.cpp b/src/core/hle/service/hid/hid_system_server.cpp index 9edfc045bf..b0cd63d725 100644 --- a/src/core/hle/service/hid/hid_system_server.cpp +++ b/src/core/hle/service/hid/hid_system_server.cpp @@ -67,8 +67,6 @@ IHidSystemServer::IHidSystemServer(Core::System& system_, std::shared_ptr, "Unknown4022"}, - {4023, D<&IApplicationManagerInterface::Unknown4023>, "Unknown4023"}, - {4088, D<&IApplicationManagerInterface::Unknown4088>, "Unknown4088"}, {9999, nullptr, "GetApplicationCertificate"}, }; // clang-format on @@ -512,23 +509,6 @@ Result IApplicationManagerInterface::CheckApplicationLaunchVersion(u64 applicati R_SUCCEED(); } -Result IApplicationManagerInterface::Unknown4022(Out out_unknown) { - LOG_WARNING(Service_NS, "(STUBBED) Unknown4022 called"); - *out_unknown = 0; - R_SUCCEED(); -} - -Result IApplicationManagerInterface::Unknown4023(Out out_unknown) { - LOG_WARNING(Service_NS, "(STUBBED) Unknown4022 called"); - - *out_unknown = 0; - R_SUCCEED(); -} -Result IApplicationManagerInterface::Unknown4088() { - LOG_WARNING(Service_NS, "(STUBBED) Unknown4088 called"); - R_SUCCEED(); -} - Result IApplicationManagerInterface::GetApplicationTerminateResult(Out out_result, u64 application_id) { LOG_WARNING(Service_NS, "(STUBBED) called. application_id={:016X}", application_id); diff --git a/src/core/hle/service/ns/application_manager_interface.h b/src/core/hle/service/ns/application_manager_interface.h index e96e50c8e1..f33d269b35 100644 --- a/src/core/hle/service/ns/application_manager_interface.h +++ b/src/core/hle/service/ns/application_manager_interface.h @@ -48,9 +48,6 @@ public: Result IsApplicationUpdateRequested(Out out_update_required, Out out_update_version, u64 application_id); Result CheckApplicationLaunchVersion(u64 application_id); - Result Unknown4022(Out out_unknown); - Result Unknown4023(Out out_unknown); - Result Unknown4088(); Result GetApplicationTerminateResult(Out out_result, u64 application_id); private: diff --git a/src/core/hle/service/ns/platform_service_manager.cpp b/src/core/hle/service/ns/platform_service_manager.cpp index fd144a4dff..23cf05005c 100644 --- a/src/core/hle/service/ns/platform_service_manager.cpp +++ b/src/core/hle/service/ns/platform_service_manager.cpp @@ -147,7 +147,6 @@ IPlatformServiceManager::IPlatformServiceManager(Core::System& system_, const ch {104, nullptr, "RequestApplicationFunctionAuthorizationByProgramId"}, {105, nullptr, "GetFunctionBlackListSystemVersionToAuthorize"}, {106, nullptr, "GetFunctionBlackListVersion"}, - {108, nullptr, "GetRequiredApplicationVersion"}, // 20.0.0+ {1000, nullptr, "LoadNgWordDataForPlatformRegionChina"}, {1001, nullptr, "GetNgWordDataSizeForPlatformRegionChina"}, }; diff --git a/src/core/hle/service/pctl/parental_control_service.cpp b/src/core/hle/service/pctl/parental_control_service.cpp index a65088de9c..3483ea30d9 100644 --- a/src/core/hle/service/pctl/parental_control_service.cpp +++ b/src/core/hle/service/pctl/parental_control_service.cpp @@ -35,8 +35,6 @@ IParentalControlService::IParentalControlService(Core::System& system_, Capabili {1016, nullptr, "ConfirmShowNewsPermission"}, {1017, D<&IParentalControlService::EndFreeCommunication>, "EndFreeCommunication"}, {1018, D<&IParentalControlService::IsFreeCommunicationAvailable>, "IsFreeCommunicationAvailable"}, - {1019, nullptr, "ConfirmLaunchApplicationPermission"}, // 20.0.0+ - {1020, nullptr, "ConfirmLaunchSharedApplicationPermission"}, // 20.0.0+ {1031, D<&IParentalControlService::IsRestrictionEnabled>, "IsRestrictionEnabled"}, {1032, D<&IParentalControlService::GetSafetyLevel>, "GetSafetyLevel"}, {1033, nullptr, "SetSafetyLevel"}, @@ -51,11 +49,9 @@ IParentalControlService::IParentalControlService(Core::System& system_, Capabili {1044, nullptr, "GetFreeCommunicationApplicationList"}, {1045, nullptr, "UpdateFreeCommunicationApplicationList"}, {1046, nullptr, "DisableFeaturesForReset"}, - {1047, nullptr, "NotifyApplicationDownloadStartedOld"}, // 20.0.0+ (3.0.0-19.0.1 NotifyApplicationDownloadStarted) + {1047, nullptr, "NotifyApplicationDownloadStarted"}, {1048, nullptr, "NotifyNetworkProfileCreated"}, {1049, nullptr, "ResetFreeCommunicationApplicationList"}, - {1050, nullptr, "AddToFreeCommunicationApplicationList"}, // 20.0.0+ - {1051, nullptr, "NotifyApplicationDownloadStarted"}, // 20.0.0+ {1061, D<&IParentalControlService::ConfirmStereoVisionRestrictionConfigurable>, "ConfirmStereoVisionRestrictionConfigurable"}, {1062, D<&IParentalControlService::GetStereoVisionRestriction>, "GetStereoVisionRestriction"}, {1063, D<&IParentalControlService::SetStereoVisionRestriction>, "SetStereoVisionRestriction"}, @@ -81,18 +77,16 @@ IParentalControlService::IParentalControlService(Core::System& system_, Capabili {1451, D<&IParentalControlService::StartPlayTimer>, "StartPlayTimer"}, {1452, D<&IParentalControlService::StopPlayTimer>, "StopPlayTimer"}, {1453, D<&IParentalControlService::IsPlayTimerEnabled>, "IsPlayTimerEnabled"}, - {1454, D<&IParentalControlService::GetPlayTimerRemainingTime>, "GetPlayTimerRemainingTime"}, + {1454, nullptr, "GetPlayTimerRemainingTime"}, {1455, D<&IParentalControlService::IsRestrictedByPlayTimer>, "IsRestrictedByPlayTimer"}, {1456, D<&IParentalControlService::GetPlayTimerSettingsOld>, "GetPlayTimerSettingsOld"}, {1457, D<&IParentalControlService::GetPlayTimerEventToRequestSuspension>, "GetPlayTimerEventToRequestSuspension"}, {1458, D<&IParentalControlService::IsPlayTimerAlarmDisabled>, "IsPlayTimerAlarmDisabled"}, - {1459, D<&IParentalControlService::GetPlayTimerRemainingTimeDisplayInfo>, "GetPlayTimerRemainingTimeDisplayInfo"}, // 20.0.0+ {1471, nullptr, "NotifyWrongPinCodeInputManyTimes"}, {1472, nullptr, "CancelNetworkRequest"}, {1473, D<&IParentalControlService::GetUnlinkedEvent>, "GetUnlinkedEvent"}, {1474, nullptr, "ClearUnlinkedEvent"}, {1475, nullptr, "GetExtendedPlayTimerEvent"}, // 18.0.0+ - {1501, nullptr, "SetTimerEventEnabled"}, // 20.0.0+ {1601, nullptr, "DisableAllFeatures"}, {1602, nullptr, "PostEnableAllFeatures"}, {1603, nullptr, "IsAllFeaturesDisabled"}, @@ -112,9 +106,6 @@ IParentalControlService::IParentalControlService(Core::System& system_, Capabili {1955, nullptr, "GetBedtimeAlarmTime"}, // 18.0.0+ {1956, nullptr, "GetBedtimeAlarmTimeHour"}, // 18.0.0+ {1957, nullptr, "GetBedtimeAlarmTimeMinute"}, // 18.0.0+ - {1958, nullptr, "GetBedtimeAlarmResetTimeHour"}, // 20.0.0+ - {1959, nullptr, "GetBedtimeAlarmResetTimeMinute"}, // 20.0.0+ - {1960, nullptr, "GetExtraPlayingTimeForDebug"}, // 20.0.0+ {2001, nullptr, "RequestPairingAsync"}, {2002, nullptr, "FinishRequestPairing"}, {2003, nullptr, "AuthorizePairingAsync"}, @@ -131,15 +122,6 @@ IParentalControlService::IParentalControlService(Core::System& system_, Capabili {2014, nullptr, "FinishSynchronizeParentalControlSettings"}, {2015, nullptr, "FinishSynchronizeParentalControlSettingsWithLastUpdated"}, {2016, nullptr, "RequestUpdateExemptionListAsync"}, - {2021, nullptr, "RequestCopyPairingAsync"}, // 20.0.0+ - {2022, nullptr, "FinishRequestCopyPairing"}, // 20.0.0+ - {2023, nullptr, "IsFromPairingActiveDevice"}, // 20.0.0+ - {3001, nullptr, "GetErrorContextChangedEvent"}, // 20.0.0+ - {9401, nullptr, "GetEvents"}, // 20.0.0+ - {9402, nullptr, "GetEventsWithJson"}, // 20.0.0+ - {9403, nullptr, "RequestPostEvents"}, // 20.0.0+ - {9404, nullptr, "GetPostEventInterval"}, // 20.0.0+ - {9405, nullptr, "SetPostEventInterval"}, // 20.0.0+ {145601, D<&IParentalControlService::GetPlayTimerSettings>, "GetPlayTimerSettings"} // 18.0.0+ }; // clang-format on @@ -388,12 +370,6 @@ Result IParentalControlService::IsPlayTimerEnabled(Out out_is_play_timer_e R_SUCCEED(); } -Result IParentalControlService::GetPlayTimerRemainingTime(Out out_remaining_minutes) { - *out_remaining_minutes = 0; - LOG_WARNING(Service_PCTL, "(STUBBED) called, remaining_minutes={}", *out_remaining_minutes); - R_SUCCEED(); -} - Result IParentalControlService::IsRestrictedByPlayTimer(Out out_is_restricted_by_play_timer) { *out_is_restricted_by_play_timer = false; LOG_WARNING(Service_PCTL, "(STUBBED) called, restricted={}", *out_is_restricted_by_play_timer); @@ -428,15 +404,6 @@ Result IParentalControlService::IsPlayTimerAlarmDisabled(Out out_play_time R_SUCCEED(); } -Result IParentalControlService::GetPlayTimerRemainingTimeDisplayInfo( - Out out_remaining_minutes, Out out_unknown) { - *out_remaining_minutes = 0; - *out_unknown = 0; - LOG_WARNING(Service_PCTL, "(STUBBED) called, remaining_minutes={}, unknown={}", - *out_remaining_minutes, *out_unknown); - R_SUCCEED(); -} - Result IParentalControlService::GetUnlinkedEvent(OutCopyHandle out_event) { LOG_INFO(Service_PCTL, "called"); *out_event = unlinked_event.GetHandle(); @@ -477,4 +444,4 @@ Result IParentalControlService::ResetConfirmedStereoVisionPermission() { R_SUCCEED(); } -} // namespace Service::PCTL \ No newline at end of file +} // namespace Service::PCTL diff --git a/src/core/hle/service/pctl/parental_control_service.h b/src/core/hle/service/pctl/parental_control_service.h index 5b72ed1f03..d58c75f380 100644 --- a/src/core/hle/service/pctl/parental_control_service.h +++ b/src/core/hle/service/pctl/parental_control_service.h @@ -45,12 +45,10 @@ private: Result StartPlayTimer(); Result StopPlayTimer(); Result IsPlayTimerEnabled(Out out_is_play_timer_enabled); - Result GetPlayTimerRemainingTime(Out out_remaining_minutes); Result IsRestrictedByPlayTimer(Out out_is_restricted_by_play_timer); Result GetPlayTimerSettingsOld(Out out_play_timer_settings); Result GetPlayTimerEventToRequestSuspension(OutCopyHandle out_event); Result IsPlayTimerAlarmDisabled(Out out_play_timer_alarm_disabled); - Result GetPlayTimerRemainingTimeDisplayInfo(Out out_remaining_minutes, Out out_unknown); Result GetUnlinkedEvent(OutCopyHandle out_event); Result GetStereoVisionRestriction(Out out_stereo_vision_restriction); Result SetStereoVisionRestriction(bool stereo_vision_restriction); diff --git a/src/core/hle/service/set/firmware_debug_settings_server.cpp b/src/core/hle/service/set/firmware_debug_settings_server.cpp index a2b087b371..b3a5e623b6 100644 --- a/src/core/hle/service/set/firmware_debug_settings_server.cpp +++ b/src/core/hle/service/set/firmware_debug_settings_server.cpp @@ -18,7 +18,6 @@ IFirmwareDebugSettingsServer::IFirmwareDebugSettingsServer(Core::System& system_ {21, nullptr, "SetAllowedSslHosts"}, {22, nullptr, "SetHostFsMountPoint"}, {23, nullptr, "SetMemoryUsageRateFlag"}, - {24, nullptr, "CommitSettings"}, // 20.0.0+ }; // clang-format on diff --git a/src/core/hle/service/set/system_settings_server.cpp b/src/core/hle/service/set/system_settings_server.cpp index f327432daa..d246b95d0e 100644 --- a/src/core/hle/service/set/system_settings_server.cpp +++ b/src/core/hle/service/set/system_settings_server.cpp @@ -304,14 +304,6 @@ ISystemSettingsServer::ISystemSettingsServer(Core::System& system_) {222, nullptr, "SetForceMonauralOutputFlag"}, //17.0.0+ {251, nullptr, "GetAccountIdentificationSettings"}, //18.0.0+ {252, nullptr, "SetAccountIdentificationSettings"}, //18.0.0+ - {264, nullptr, "GetVphymDirtyFlags"}, // 20.0.0+ - {282, nullptr, "ConvertToProductModel"}, // 20.0.0+ - {283, nullptr, "ConvertToProductModelName"}, // 20.0.0+ - {289, nullptr, "GetDefaultAccountIdentificationFlagSet"}, // 20.0.0+ - {300, nullptr, "AcquirePushNotificationDirtyFlagEventHandle"}, // 20.0.0+ - {301, nullptr, "GetPushNotificationDirtyFlags"}, // 20.0.0+ - {306, nullptr, "GetPinCodeReregistrationGuideAccounts"}, // 20.0.0+ - {307, nullptr, "SetPinCodeReregistrationGuideAccounts"}, // 20.0.0+ }; // clang-format on diff --git a/src/core/hle/service/ssl/ssl.cpp b/src/core/hle/service/ssl/ssl.cpp index c9c3edf2a6..67e37e0823 100644 --- a/src/core/hle/service/ssl/ssl.cpp +++ b/src/core/hle/service/ssl/ssl.cpp @@ -106,8 +106,6 @@ public: {33, nullptr, "ExportKeyingMaterial"}, {34, nullptr, "SetIoTimeout"}, {35, nullptr, "GetIoTimeout"}, - {36, nullptr, "GetSessionTicket"}, // 20.0.0+ - {37, nullptr, "SetSessionTicket"}, // 20.0.0+ }; // clang-format on diff --git a/src/core/hle/service/ssl/ssl_types.h b/src/core/hle/service/ssl/ssl_types.h index 9a9793f4f3..16623c0fc5 100644 --- a/src/core/hle/service/ssl/ssl_types.h +++ b/src/core/hle/service/ssl/ssl_types.h @@ -11,7 +11,7 @@ enum class CaCertificateId : s32 { All = -1, NintendoCAG3 = 1, NintendoClass2CAG3 = 2, - NintendoRootCAG4 = 3, // [16.0.0+] + NintendoRootCAG4 = 3, AmazonRootCA1 = 1000, StarfieldServicesRootCertificateAuthorityG2 = 1001, AddTrustExternalCARoot = 1002, @@ -29,10 +29,10 @@ enum class CaCertificateId : s32 { EntrustnetCertificationAuthority2048 = 1014, EntrustRootCertificationAuthority = 1015, EntrustRootCertificationAuthorityG2 = 1016, - GeoTrustGlobalCA2 = 1017, // [8.0.0+] TrustedCertStatus is EnabledNotTrusted - GeoTrustGlobalCA = 1018, // [8.0.0+] TrustedCertStatus is EnabledNotTrusted - GeoTrustPrimaryCertificationAuthorityG3 = 1019, // [8.0.0+] TrustedCertStatus is EnabledNotTrusted - GeoTrustPrimaryCertificationAuthority = 1020, // [8.0.0+] TrustedCertStatus is EnabledNotTrusted + GeoTrustGlobalCA2 = 1017, + GeoTrustGlobalCA = 1018, + GeoTrustPrimaryCertificationAuthorityG3 = 1019, + GeoTrustPrimaryCertificationAuthority = 1020, GlobalSignRootCA = 1021, GlobalSignRootCAR2 = 1022, GlobalSignRootCAR3 = 1023, @@ -73,72 +73,6 @@ enum class CaCertificateId : s32 { DigiCertTLSECCP384RootG5 = 1058, // [16.0.0+] DigiCertTLSRSA4096RootG5 = 1059, // [16.0.0+] NintendoTempRootCAG4 = 65536, // [16.0.0+] ([19.0.0+] Removed) - - // Nintendo round-robin certificates [20.0.0+] - NintendoRR01 = 32801, - NintendoRR02 = 32802, - NintendoRR03 = 32803, - NintendoRR04 = 32804, - NintendoRR05 = 32805, - NintendoRR06 = 32806, - NintendoRR07 = 32807, - NintendoRR08 = 32808, - NintendoRR09 = 32809, - NintendoRR10 = 32810, - NintendoRR11 = 32811, - NintendoRR12 = 32812, - NintendoRR13 = 32813, - NintendoRR14 = 32814, - NintendoRR15 = 32815, - NintendoRR16 = 32816, - NintendoRR17 = 32817, - NintendoRR18 = 32818, - NintendoRR19 = 32819, - NintendoRR20 = 32820, - NintendoRR21 = 32821, - NintendoRR22 = 32822, - NintendoRR23 = 32823, - NintendoRR24 = 32824, - NintendoRR25 = 32825, - NintendoRR26 = 32826, - NintendoRR27 = 32827, - NintendoRR28 = 32828, - NintendoRR29 = 32829, - NintendoRR30 = 32830, - NintendoRR31 = 32831, - NintendoRR32 = 32832, - NintendoRR33 = 32833, - NintendoRR34 = 32834, - NintendoRR35 = 32835, - NintendoRR36 = 32836, - NintendoRR37 = 32837, - NintendoRR38 = 32838, - NintendoRR39 = 32839, - NintendoRR40 = 32840, - NintendoRR41 = 32841, - NintendoRR42 = 32842, - NintendoRR43 = 32843, - NintendoRR44 = 32844, - NintendoRR45 = 32845, - NintendoRR46 = 32846, - NintendoRR47 = 32847, - NintendoRR48 = 32848, - NintendoRR49 = 32849, - NintendoRR50 = 32850, - NintendoRR51 = 32851, - NintendoRR52 = 32852, - NintendoRR53 = 32853, - NintendoRR54 = 32854, - NintendoRR55 = 32855, - NintendoRR56 = 32856, - NintendoRR57 = 32857, - NintendoRR58 = 32858, - NintendoRR59 = 32859, - NintendoRR60 = 32860, - NintendoRR61 = 32861, - NintendoRR62 = 32862, - NintendoRR63 = 32863, - NintendoRR64 = 32864, }; enum class TrustedCertStatus : s32 { diff --git a/src/hid_core/resources/touch_screen/touch_screen.cpp b/src/hid_core/resources/touch_screen/touch_screen.cpp index e9b1fdba51..35efb1786a 100644 --- a/src/hid_core/resources/touch_screen/touch_screen.cpp +++ b/src/hid_core/resources/touch_screen/touch_screen.cpp @@ -82,9 +82,9 @@ Result TouchScreen::SetTouchScreenMagnification(f32 point1_x, f32 point1_y, f32 return ResultSuccess; } -Result TouchScreen::SetTouchScreenOutputRanges(u32 width, u32 height, u64 aruid) { +Result TouchScreen::SetTouchScreenResolution(u32 width, u32 height, u64 aruid) { std::scoped_lock lock{mutex}; - return touch_resource->SetTouchScreenOutputRanges(width, height, aruid); + return touch_resource->SetTouchScreenResolution(width, height, aruid); } Result TouchScreen::SetTouchScreenConfiguration( diff --git a/src/hid_core/resources/touch_screen/touch_screen.h b/src/hid_core/resources/touch_screen/touch_screen.h index 8a08280ac5..2fcb6247f1 100644 --- a/src/hid_core/resources/touch_screen/touch_screen.h +++ b/src/hid_core/resources/touch_screen/touch_screen.h @@ -42,7 +42,7 @@ public: Result ProcessTouchScreenAutoTune(); Result SetTouchScreenMagnification(f32 point1_x, f32 point1_y, f32 point2_x, f32 point2_y); - Result SetTouchScreenOutputRanges(u32 width, u32 height, u64 aruid); + Result SetTouchScreenResolution(u32 width, u32 height, u64 aruid); Result SetTouchScreenConfiguration(const Core::HID::TouchScreenConfigurationForNx& mode, u64 aruid); diff --git a/src/hid_core/resources/touch_screen/touch_screen_resource.cpp b/src/hid_core/resources/touch_screen/touch_screen_resource.cpp index 7c949be7fe..79ddaa4dfa 100644 --- a/src/hid_core/resources/touch_screen/touch_screen_resource.cpp +++ b/src/hid_core/resources/touch_screen/touch_screen_resource.cpp @@ -296,7 +296,7 @@ void TouchResource::SetTouchScreenMagnification(f32 point1_x, f32 point1_y, f32 }; } -Result TouchResource::SetTouchScreenOutputRanges(u32 width, u32 height, u64 aruid) { +Result TouchResource::SetTouchScreenResolution(u32 width, u32 height, u64 aruid) { std::scoped_lock lock{*shared_mutex}; for (std::size_t aruid_index = 0; aruid_index < AruidIndexMax; aruid_index++) { diff --git a/src/hid_core/resources/touch_screen/touch_screen_resource.h b/src/hid_core/resources/touch_screen/touch_screen_resource.h index 84fa5eb0b6..095cddd762 100644 --- a/src/hid_core/resources/touch_screen/touch_screen_resource.h +++ b/src/hid_core/resources/touch_screen/touch_screen_resource.h @@ -66,7 +66,7 @@ public: Result ProcessTouchScreenAutoTune(); void SetTouchScreenMagnification(f32 point1_x, f32 point1_y, f32 point2_x, f32 point2_y); - Result SetTouchScreenOutputRanges(u32 width, u32 height, u64 aruid); + Result SetTouchScreenResolution(u32 width, u32 height, u64 aruid); Result SetTouchScreenConfiguration( const Core::HID::TouchScreenConfigurationForNx& touch_configuration, u64 aruid);