Exverge/suyu
3
0
Fork 0
forked from suyu/suyu
Code Pull requests Activity

applets: Rename LibraryAppletVersion to ControllerAppletVersion

Browse source
This commit is contained in:
Morph 2020-11-08 09:34:53 -05:00
parent 9efbf5309f
commit a6ecdf42bc
2 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
src/core/hle/service/am/applets/controller.cpp
View file

@ -62,7 +62,7 @@ void Controller::Initialize() {
common_args.play_startup_sound, common_args.size, common_args.system_tick, common_args.play_startup_sound, common_args.size, common_args.system_tick,
common_args.theme_color); common_args.theme_color);
library_applet_version = LibraryAppletVersion{common_args.library_version}; controller_applet_version = ControllerAppletVersion{common_args.library_version};
const auto private_arg_storage = broker.PopNormalDataToApplet(); const auto private_arg_storage = broker.PopNormalDataToApplet();
ASSERT(private_arg_storage != nullptr); ASSERT(private_arg_storage != nullptr);
@ -73,7 +73,7 @@ void Controller::Initialize() {
std::memcpy(&controller_private_arg, private_arg.data(), private_arg.size()); std::memcpy(&controller_private_arg, private_arg.data(), private_arg.size());
ASSERT_MSG(controller_private_arg.arg_private_size == sizeof(ControllerSupportArgPrivate), ASSERT_MSG(controller_private_arg.arg_private_size == sizeof(ControllerSupportArgPrivate),
"Unknown ControllerSupportArgPrivate revision={} with size={}", "Unknown ControllerSupportArgPrivate revision={} with size={}",
library_applet_version, controller_private_arg.arg_private_size); controller_applet_version, controller_private_arg.arg_private_size);
// Some games such as Cave Story+ set invalid values for the ControllerSupportMode. // Some games such as Cave Story+ set invalid values for the ControllerSupportMode.
// Defer to arg_size to set the ControllerSupportMode. // Defer to arg_size to set the ControllerSupportMode.
@ -112,20 +112,20 @@ void Controller::Initialize() {
ASSERT(user_arg_storage != nullptr); ASSERT(user_arg_storage != nullptr);
const auto& user_arg = user_arg_storage->GetData(); const auto& user_arg = user_arg_storage->GetData();
switch (library_applet_version) { switch (controller_applet_version) {
case LibraryAppletVersion::Version3: case ControllerAppletVersion::Version3:
case LibraryAppletVersion::Version4: case ControllerAppletVersion::Version4:
case LibraryAppletVersion::Version5: case ControllerAppletVersion::Version5:
ASSERT(user_arg.size() == sizeof(ControllerSupportArgOld)); ASSERT(user_arg.size() == sizeof(ControllerSupportArgOld));
std::memcpy(&controller_user_arg_old, user_arg.data(), user_arg.size()); std::memcpy(&controller_user_arg_old, user_arg.data(), user_arg.size());
break; break;
case LibraryAppletVersion::Version7: case ControllerAppletVersion::Version7:
ASSERT(user_arg.size() == sizeof(ControllerSupportArgNew)); ASSERT(user_arg.size() == sizeof(ControllerSupportArgNew));
std::memcpy(&controller_user_arg_new, user_arg.data(), user_arg.size()); std::memcpy(&controller_user_arg_new, user_arg.data(), user_arg.size());
break; break;
default: default:
UNIMPLEMENTED_MSG("Unknown ControllerSupportArg revision={} with size={}", UNIMPLEMENTED_MSG("Unknown ControllerSupportArg revision={} with size={}",
library_applet_version, controller_private_arg.arg_size); controller_applet_version, controller_private_arg.arg_size);
ASSERT(user_arg.size() >= sizeof(ControllerSupportArgNew)); ASSERT(user_arg.size() >= sizeof(ControllerSupportArgNew));
std::memcpy(&controller_user_arg_new, user_arg.data(), sizeof(ControllerSupportArgNew)); std::memcpy(&controller_user_arg_new, user_arg.data(), sizeof(ControllerSupportArgNew));
break; break;
@ -165,10 +165,10 @@ void Controller::Execute() {
switch (controller_private_arg.mode) { switch (controller_private_arg.mode) {
case ControllerSupportMode::ShowControllerSupport: { case ControllerSupportMode::ShowControllerSupport: {
const auto parameters = [this] { const auto parameters = [this] {
switch (library_applet_version) { switch (controller_applet_version) {
case LibraryAppletVersion::Version3: case ControllerAppletVersion::Version3:
case LibraryAppletVersion::Version4: case ControllerAppletVersion::Version4:
case LibraryAppletVersion::Version5: case ControllerAppletVersion::Version5:
return ConvertToFrontendParameters( return ConvertToFrontendParameters(
controller_private_arg, controller_user_arg_old.header, controller_private_arg, controller_user_arg_old.header,
controller_user_arg_old.enable_explain_text, controller_user_arg_old.enable_explain_text,
@ -177,7 +177,7 @@ void Controller::Execute() {
controller_user_arg_old.identification_colors.end()), controller_user_arg_old.identification_colors.end()),
std::vector<ExplainText>(controller_user_arg_old.explain_text.begin(), std::vector<ExplainText>(controller_user_arg_old.explain_text.begin(),
controller_user_arg_old.explain_text.end())); controller_user_arg_old.explain_text.end()));
case LibraryAppletVersion::Version7: case ControllerAppletVersion::Version7:
default: default:
return ConvertToFrontendParameters( return ConvertToFrontendParameters(
controller_private_arg, controller_user_arg_new.header, controller_private_arg, controller_user_arg_new.header,

4
src/core/hle/service/am/applets/controller.h
View file

@ -21,7 +21,7 @@ namespace Service::AM::Applets {
using IdentificationColor = std::array<u8, 4>; using IdentificationColor = std::array<u8, 4>;
using ExplainText = std::array<char, 0x81>; using ExplainText = std::array<char, 0x81>;
enum class LibraryAppletVersion : u32_le { enum class ControllerAppletVersion : u32_le {
Version3 = 0x3, // 1.0.0 - 2.3.0 Version3 = 0x3, // 1.0.0 - 2.3.0
Version4 = 0x4, // 3.0.0 - 5.1.0 Version4 = 0x4, // 3.0.0 - 5.1.0
Version5 = 0x5, // 6.0.0 - 7.0.1 Version5 = 0x5, // 6.0.0 - 7.0.1
@ -121,7 +121,7 @@ public:
private: private:
const Core::Frontend::ControllerApplet& frontend; const Core::Frontend::ControllerApplet& frontend;
LibraryAppletVersion library_applet_version; ControllerAppletVersion controller_applet_version;
ControllerSupportArgPrivate controller_private_arg; ControllerSupportArgPrivate controller_private_arg;
ControllerSupportArgOld controller_user_arg_old; ControllerSupportArgOld controller_user_arg_old;
ControllerSupportArgNew controller_user_arg_new; ControllerSupportArgNew controller_user_arg_new;