diff --git a/src/core/hle/service/am/am_types.h b/src/core/hle/service/am/am_types.h index 46afb39961..a14defb403 100644 --- a/src/core/hle/service/am/am_types.h +++ b/src/core/hle/service/am/am_types.h @@ -48,11 +48,6 @@ enum class SystemButtonType { CaptureButtonLongPressing, }; -enum class SysPlatformRegion : s32 { - Global = 1, - Terra = 2, -}; - struct AppletProcessLaunchReason { u8 flag; INSERT_PADDING_BYTES(3); diff --git a/src/core/hle/service/am/service/common_state_getter.cpp b/src/core/hle/service/am/service/common_state_getter.cpp index 548498e835..a32855ffa3 100644 --- a/src/core/hle/service/am/service/common_state_getter.cpp +++ b/src/core/hle/service/am/service/common_state_getter.cpp @@ -260,9 +260,9 @@ Result ICommonStateGetter::GetAppletLaunchedHistory( } Result ICommonStateGetter::GetSettingsPlatformRegion( - Out out_settings_platform_region) { + Out out_settings_platform_region) { LOG_INFO(Service_AM, "called"); - *out_settings_platform_region = SysPlatformRegion::Global; + *out_settings_platform_region = Set::PlatformRegion::Global; R_SUCCEED(); } diff --git a/src/core/hle/service/am/service/common_state_getter.h b/src/core/hle/service/am/service/common_state_getter.h index 5a8dca3d6e..59a46fa94f 100644 --- a/src/core/hle/service/am/service/common_state_getter.h +++ b/src/core/hle/service/am/service/common_state_getter.h @@ -8,6 +8,7 @@ #include "core/hle/service/cmif_types.h" #include "core/hle/service/pm/pm.h" #include "core/hle/service/service.h" +#include "core/hle/service/set/settings_types.h" namespace Kernel { class KReadableEvent; @@ -50,7 +51,7 @@ private: Result GetOperationModeSystemInfo(Out out_operation_mode_system_info); Result GetAppletLaunchedHistory(Out out_count, OutArray out_applet_ids); - Result GetSettingsPlatformRegion(Out out_settings_platform_region); + Result GetSettingsPlatformRegion(Out out_settings_platform_region); Result SetRequestExitToLibraryAppletAtExecuteNextProgramEnabled(); void SetCpuBoostMode(HLERequestContext& ctx); diff --git a/src/core/hle/service/set/settings_types.h b/src/core/hle/service/set/settings_types.h index 4fd34f46bc..92c2948b00 100644 --- a/src/core/hle/service/set/settings_types.h +++ b/src/core/hle/service/set/settings_types.h @@ -243,6 +243,11 @@ enum class TvResolution : u32 { Resolution480p, }; +enum class PlatformRegion : s32 { + Global = 1, + Terra = 2, +}; + constexpr std::array available_language_codes = {{ LanguageCode::JA, LanguageCode::EN_US, diff --git a/src/core/hle/service/set/system_settings_server.cpp b/src/core/hle/service/set/system_settings_server.cpp index 900d5408f4..0dc8db8212 100644 --- a/src/core/hle/service/set/system_settings_server.cpp +++ b/src/core/hle/service/set/system_settings_server.cpp @@ -272,8 +272,8 @@ ISystemSettingsServer::ISystemSettingsServer(Core::System& system_) {180, nullptr, "SetZoomFlag"}, {181, nullptr, "GetT"}, {182, nullptr, "SetT"}, - {183, nullptr, "GetPlatformRegion"}, - {184, nullptr, "SetPlatformRegion"}, + {183, C<&ISystemSettingsServer::GetPlatformRegion>, "GetPlatformRegion"}, + {184, C<&ISystemSettingsServer::SetPlatformRegion>, "SetPlatformRegion"}, {185, C<&ISystemSettingsServer::GetHomeMenuSchemeModel>, "GetHomeMenuSchemeModel"}, {186, nullptr, "GetMemoryUsageRateFlag"}, {187, C<&ISystemSettingsServer::GetTouchScreenMode>, "GetTouchScreenMode"}, @@ -1250,6 +1250,18 @@ Result ISystemSettingsServer::GetHomeMenuScheme(Out out_home_men R_SUCCEED(); } +Result ISystemSettingsServer::GetPlatformRegion(Out out_platform_region) { + LOG_WARNING(Service_SET, "(STUBBED) called"); + + *out_platform_region = PlatformRegion::Global; + R_SUCCEED(); +} + +Result ISystemSettingsServer::SetPlatformRegion(PlatformRegion platform_region) { + LOG_WARNING(Service_SET, "(STUBBED) called"); + R_SUCCEED(); +} + Result ISystemSettingsServer::GetHomeMenuSchemeModel(Out out_home_menu_scheme_model) { LOG_WARNING(Service_SET, "(STUBBED) called"); diff --git a/src/core/hle/service/set/system_settings_server.h b/src/core/hle/service/set/system_settings_server.h index 9a1154ad65..993e5de7d0 100644 --- a/src/core/hle/service/set/system_settings_server.h +++ b/src/core/hle/service/set/system_settings_server.h @@ -149,6 +149,8 @@ public: Result GetHomeMenuScheme(Out out_home_menu_scheme); Result GetHomeMenuSchemeModel(Out out_home_menu_scheme_model); Result GetTouchScreenMode(Out out_touch_screen_mode); + Result GetPlatformRegion(Out out_platform_region); + Result SetPlatformRegion(PlatformRegion platform_region); Result SetTouchScreenMode(TouchScreenMode touch_screen_mode); Result GetFieldTestingFlag(Out out_field_testing_flag); Result GetPanelCrcMode(Out out_panel_crc_mode);