diff options
author | bunnei <bunneidev@gmail.com> | 2020-11-13 06:55:06 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-11-13 06:55:06 +0100 |
commit | 87f220efff9970440b7535cbb208d310f8c55a7b (patch) | |
tree | 2b87788c581d5a54bc27ee2789b4748bb495e9a8 /src/core/hle/service/am/applets/controller.h | |
parent | Merge pull request #4901 from bunnei/caps-stub (diff) | |
parent | applets: Rename LibraryAppletVersion to ControllerAppletVersion (diff) | |
download | yuzu-87f220efff9970440b7535cbb208d310f8c55a7b.tar yuzu-87f220efff9970440b7535cbb208d310f8c55a7b.tar.gz yuzu-87f220efff9970440b7535cbb208d310f8c55a7b.tar.bz2 yuzu-87f220efff9970440b7535cbb208d310f8c55a7b.tar.lz yuzu-87f220efff9970440b7535cbb208d310f8c55a7b.tar.xz yuzu-87f220efff9970440b7535cbb208d310f8c55a7b.tar.zst yuzu-87f220efff9970440b7535cbb208d310f8c55a7b.zip |
Diffstat (limited to '')
-rw-r--r-- | src/core/hle/service/am/applets/controller.h | 26 |
1 files changed, 19 insertions, 7 deletions
diff --git a/src/core/hle/service/am/applets/controller.h b/src/core/hle/service/am/applets/controller.h index f7bb3fba9..a7a1f2b65 100644 --- a/src/core/hle/service/am/applets/controller.h +++ b/src/core/hle/service/am/applets/controller.h @@ -21,7 +21,7 @@ namespace Service::AM::Applets { using IdentificationColor = std::array<u8, 4>; using ExplainText = std::array<char, 0x81>; -enum class LibraryAppletVersion : u32_le { +enum class ControllerAppletVersion : u32_le { Version3 = 0x3, // 1.0.0 - 2.3.0 Version4 = 0x4, // 3.0.0 - 5.1.0 Version5 = 0x5, // 6.0.0 - 7.0.1 @@ -29,14 +29,18 @@ enum class LibraryAppletVersion : u32_le { }; enum class ControllerSupportMode : u8 { - ShowControllerSupport = 0, - ShowControllerStrapGuide = 1, - ShowControllerFirmwareUpdate = 2, + ShowControllerSupport, + ShowControllerStrapGuide, + ShowControllerFirmwareUpdate, + + MaxControllerSupportMode, }; enum class ControllerSupportCaller : u8 { - Application = 0, - System = 1, + Application, + System, + + MaxControllerSupportCaller, }; struct ControllerSupportArgPrivate { @@ -84,6 +88,13 @@ struct ControllerSupportArgNew { static_assert(sizeof(ControllerSupportArgNew) == 0x430, "ControllerSupportArgNew has incorrect size."); +struct ControllerUpdateFirmwareArg { + bool enable_force_update{}; + INSERT_PADDING_BYTES(3); +}; +static_assert(sizeof(ControllerUpdateFirmwareArg) == 0x4, + "ControllerUpdateFirmwareArg has incorrect size."); + struct ControllerSupportResultInfo { s8 player_count{}; INSERT_PADDING_BYTES(3); @@ -110,10 +121,11 @@ public: private: const Core::Frontend::ControllerApplet& frontend; - LibraryAppletVersion library_applet_version; + ControllerAppletVersion controller_applet_version; ControllerSupportArgPrivate controller_private_arg; ControllerSupportArgOld controller_user_arg_old; ControllerSupportArgNew controller_user_arg_new; + ControllerUpdateFirmwareArg controller_update_arg; bool complete{false}; ResultCode status{RESULT_SUCCESS}; bool is_single_mode{false}; |