early-access version 3490

src/core/hle/service/am/applets/applet_controller.cpp

@@ -251,7 +251,8 @@ void Controller::ConfigurationComplete(bool is_success) {
 
     result_info.selected_id = static_cast<u32>(system.HIDCore().GetFirstNpadId());
 
-    result_info.result = is_success ? 0 : 2;
+    result_info.result =
+        is_success ? ControllerSupportResult::Success : ControllerSupportResult::Cancel;
 
     LOG_DEBUG(Service_HID, "Result Info: player_count={}, selected_id={}, result={}",
               result_info.player_count, result_info.selected_id, result_info.result);

src/core/hle/service/am/applets/applet_controller.h

@@ -48,6 +48,11 @@ enum class ControllerSupportCaller : u8 {
     MaxControllerSupportCaller,
 };
 
+enum class ControllerSupportResult : u32 {
+    Success = 0,
+    Cancel = 2,
+};
+
 struct ControllerSupportArgPrivate {
     u32 arg_private_size{};
     u32 arg_size{};
@@ -112,7 +117,7 @@ struct ControllerSupportResultInfo {
     s8 player_count{};
     INSERT_PADDING_BYTES(3);
     u32 selected_id{};
-    u32 result{};
+    ControllerSupportResult result{};
 };
 static_assert(sizeof(ControllerSupportResultInfo) == 0xC,
               "ControllerSupportResultInfo has incorrect size.");

src/core/hle/service/hid/hid.cpp

@@ -1388,7 +1388,7 @@ void Hid::SetNpadJoyAssignmentModeSingleWithDestination(HLERequestContext& ctx)
 
     Core::HID::NpadIdType new_npad_id{};
     auto& controller = GetAppletResource()->GetController<Controller_NPad>(HidController::NPad);
-    const auto is_reasigned =
+    const auto is_reassigned =
         controller.SetNpadMode(new_npad_id, parameters.npad_id, parameters.npad_joy_device_type,
                                Controller_NPad::NpadJoyAssignmentMode::Single);
 
@@ -1398,7 +1398,7 @@ void Hid::SetNpadJoyAssignmentModeSingleWithDestination(HLERequestContext& ctx)
 
     IPC::ResponseBuilder rb{ctx, 4};
     rb.Push(ResultSuccess);
-    rb.Push(is_reasigned);
+    rb.Push(is_reassigned);
     rb.PushEnum(new_npad_id);
 }