diff options
author | liamwhite <liamwhite@users.noreply.github.com> | 2023-03-08 15:16:27 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-03-08 15:16:27 +0100 |
commit | f3f57f90fed6d1c3b478c9fceb91a54579b4947d (patch) | |
tree | 3280b90f3b54b6f8f3fca804cab04699897faa3f /src/core/hle/service/am/applets | |
parent | Merge pull request #9904 from liamwhite/ws (diff) | |
parent | hle: rename legacy errors to Results (diff) | |
download | yuzu-f3f57f90fed6d1c3b478c9fceb91a54579b4947d.tar yuzu-f3f57f90fed6d1c3b478c9fceb91a54579b4947d.tar.gz yuzu-f3f57f90fed6d1c3b478c9fceb91a54579b4947d.tar.bz2 yuzu-f3f57f90fed6d1c3b478c9fceb91a54579b4947d.tar.lz yuzu-f3f57f90fed6d1c3b478c9fceb91a54579b4947d.tar.xz yuzu-f3f57f90fed6d1c3b478c9fceb91a54579b4947d.tar.zst yuzu-f3f57f90fed6d1c3b478c9fceb91a54579b4947d.zip |
Diffstat (limited to 'src/core/hle/service/am/applets')
-rw-r--r-- | src/core/hle/service/am/applets/applet_controller.cpp | 7 | ||||
-rw-r--r-- | src/core/hle/service/am/applets/applet_profile_select.cpp | 7 |
2 files changed, 6 insertions, 8 deletions
diff --git a/src/core/hle/service/am/applets/applet_controller.cpp b/src/core/hle/service/am/applets/applet_controller.cpp index b418031de..58484519b 100644 --- a/src/core/hle/service/am/applets/applet_controller.cpp +++ b/src/core/hle/service/am/applets/applet_controller.cpp @@ -19,10 +19,9 @@ namespace Service::AM::Applets { -// This error code (0x183ACA) is thrown when the applet fails to initialize. -[[maybe_unused]] constexpr Result ERR_CONTROLLER_APPLET_3101{ErrorModule::HID, 3101}; -// This error code (0x183CCA) is thrown when the u32 result in ControllerSupportResultInfo is 2. -[[maybe_unused]] constexpr Result ERR_CONTROLLER_APPLET_3102{ErrorModule::HID, 3102}; +[[maybe_unused]] constexpr Result ResultControllerSupportCanceled{ErrorModule::HID, 3101}; +[[maybe_unused]] constexpr Result ResultControllerSupportNotSupportedNpadStyle{ErrorModule::HID, + 3102}; static Core::Frontend::ControllerParameters ConvertToFrontendParameters( ControllerSupportArgPrivate private_arg, ControllerSupportArgHeader header, bool enable_text, diff --git a/src/core/hle/service/am/applets/applet_profile_select.cpp b/src/core/hle/service/am/applets/applet_profile_select.cpp index c738db028..1d69f5447 100644 --- a/src/core/hle/service/am/applets/applet_profile_select.cpp +++ b/src/core/hle/service/am/applets/applet_profile_select.cpp @@ -7,13 +7,12 @@ #include "common/string_util.h" #include "core/core.h" #include "core/frontend/applets/profile_select.h" +#include "core/hle/service/acc/errors.h" #include "core/hle/service/am/am.h" #include "core/hle/service/am/applets/applet_profile_select.h" namespace Service::AM::Applets { -constexpr Result ERR_USER_CANCELLED_SELECTION{ErrorModule::Account, 1}; - ProfileSelect::ProfileSelect(Core::System& system_, LibraryAppletMode applet_mode_, const Core::Frontend::ProfileSelectApplet& frontend_) : Applet{system_, applet_mode_}, frontend{frontend_}, system{system_} {} @@ -63,8 +62,8 @@ void ProfileSelect::SelectionComplete(std::optional<Common::UUID> uuid) { output.result = 0; output.uuid_selected = *uuid; } else { - status = ERR_USER_CANCELLED_SELECTION; - output.result = ERR_USER_CANCELLED_SELECTION.raw; + status = Account::ResultCancelledByUser; + output.result = Account::ResultCancelledByUser.raw; output.uuid_selected = Common::InvalidUUID; } |