VERY experimental Nintendo Switch 2 emulator
C++
hid: service: Remove outdated field from npad
german775318d8059b0c
diff --git a/src/core/hle/service/hid/controllers/npad.cpp b/src/core/hle/service/hid/controllers/npad.cppindex da3220ddcc..e7d25e86ea 100644--- a/src/core/hle/service/hid/controllers/npad.cpp+++ b/src/core/hle/service/hid/controllers/npad.cpp@@ -193,7 +193,7 @@ void Controller_NPad::InitNewlyAddedController(Core::HID::NpadIdType npad_id) {shared_memory->system_properties.use_minus.Assign(1);shared_memory->system_properties.is_charging_joy_dual.Assign(battery_level.dual.is_charging);- shared_memory->applet_nfc_xcd.applet_footer.type = AppletFooterUiType::SwitchProController;+ shared_memory->applet_footer_type = AppletFooterUiType::SwitchProController;shared_memory->sixaxis_fullkey_properties.is_newly_assigned.Assign(1);break;case Core::HID::NpadStyleIndex::Handheld:@@ -216,8 +216,7 @@ void Controller_NPad::InitNewlyAddedController(Core::HID::NpadIdType npad_id) {shared_memory->system_properties.is_charging_joy_right.Assign(battery_level.right.is_charging);shared_memory->assignment_mode = NpadJoyAssignmentMode::Dual;- shared_memory->applet_nfc_xcd.applet_footer.type =- AppletFooterUiType::HandheldJoyConLeftJoyConRight;+ shared_memory->applet_footer_type = AppletFooterUiType::HandheldJoyConLeftJoyConRight;shared_memory->sixaxis_handheld_properties.is_newly_assigned.Assign(1);break;case Core::HID::NpadStyleIndex::JoyconDual:@@ -247,19 +246,19 @@ void Controller_NPad::InitNewlyAddedController(Core::HID::NpadIdType npad_id) {shared_memory->assignment_mode = NpadJoyAssignmentMode::Dual;if (controller.is_dual_left_connected && controller.is_dual_right_connected) {- shared_memory->applet_nfc_xcd.applet_footer.type = AppletFooterUiType::JoyDual;+ shared_memory->applet_footer_type = AppletFooterUiType::JoyDual;shared_memory->fullkey_color.fullkey = body_colors.left;shared_memory->battery_level_dual = battery_level.left.battery_level;shared_memory->system_properties.is_charging_joy_dual.Assign(battery_level.left.is_charging);} else if (controller.is_dual_left_connected) {- shared_memory->applet_nfc_xcd.applet_footer.type = AppletFooterUiType::JoyDualLeftOnly;+ shared_memory->applet_footer_type = AppletFooterUiType::JoyDualLeftOnly;shared_memory->fullkey_color.fullkey = body_colors.left;shared_memory->battery_level_dual = battery_level.left.battery_level;shared_memory->system_properties.is_charging_joy_dual.Assign(battery_level.left.is_charging);} else {- shared_memory->applet_nfc_xcd.applet_footer.type = AppletFooterUiType::JoyDualRightOnly;+ shared_memory->applet_footer_type = AppletFooterUiType::JoyDualRightOnly;shared_memory->fullkey_color.fullkey = body_colors.right;shared_memory->battery_level_dual = battery_level.right.battery_level;shared_memory->system_properties.is_charging_joy_dual.Assign(@@ -278,7 +277,7 @@ void Controller_NPad::InitNewlyAddedController(Core::HID::NpadIdType npad_id) {shared_memory->system_properties.use_minus.Assign(1);shared_memory->system_properties.is_charging_joy_left.Assign(battery_level.left.is_charging);- shared_memory->applet_nfc_xcd.applet_footer.type = AppletFooterUiType::JoyLeftHorizontal;+ shared_memory->applet_footer_type = AppletFooterUiType::JoyLeftHorizontal;shared_memory->sixaxis_left_properties.is_newly_assigned.Assign(1);break;case Core::HID::NpadStyleIndex::JoyconRight:@@ -293,7 +292,7 @@ void Controller_NPad::InitNewlyAddedController(Core::HID::NpadIdType npad_id) {shared_memory->system_properties.use_plus.Assign(1);shared_memory->system_properties.is_charging_joy_right.Assign(battery_level.right.is_charging);- shared_memory->applet_nfc_xcd.applet_footer.type = AppletFooterUiType::JoyRightHorizontal;+ shared_memory->applet_footer_type = AppletFooterUiType::JoyRightHorizontal;shared_memory->sixaxis_right_properties.is_newly_assigned.Assign(1);break;case Core::HID::NpadStyleIndex::GameCube:@@ -314,12 +313,12 @@ void Controller_NPad::InitNewlyAddedController(Core::HID::NpadIdType npad_id) {case Core::HID::NpadStyleIndex::SNES:shared_memory->style_tag.lucia.Assign(1);shared_memory->device_type.fullkey.Assign(1);- shared_memory->applet_nfc_xcd.applet_footer.type = AppletFooterUiType::Lucia;+ shared_memory->applet_footer_type = AppletFooterUiType::Lucia;break;case Core::HID::NpadStyleIndex::N64:shared_memory->style_tag.lagoon.Assign(1);shared_memory->device_type.fullkey.Assign(1);- shared_memory->applet_nfc_xcd.applet_footer.type = AppletFooterUiType::Lagon;+ shared_memory->applet_footer_type = AppletFooterUiType::Lagon;break;case Core::HID::NpadStyleIndex::SegaGenesis:shared_memory->style_tag.lager.Assign(1);@@ -1120,7 +1119,7 @@ Result Controller_NPad::DisconnectNpad(Core::HID::NpadIdType npad_id) {.left = {},.right = {},};- shared_memory->applet_nfc_xcd.applet_footer.type = AppletFooterUiType::None;+ shared_memory->applet_footer_type = AppletFooterUiType::None;controller.is_dual_left_connected = true;controller.is_dual_right_connected = true;diff --git a/src/core/hle/service/hid/controllers/npad.h b/src/core/hle/service/hid/controllers/npad.hindex 776411261d..09707d2f84 100644--- a/src/core/hle/service/hid/controllers/npad.h+++ b/src/core/hle/service/hid/controllers/npad.h@@ -360,7 +360,7 @@ private:enum class AppletFooterUiType : u8 {None = 0,HandheldNone = 1,- HandheldJoyConLeftOnly = 1,+ HandheldJoyConLeftOnly = 2,HandheldJoyConRightOnly = 3,HandheldJoyConLeftJoyConRight = 4,JoyDual = 5,@@ -382,13 +382,6 @@ private:Lagon = 21,};- struct AppletFooterUi {- AppletFooterUiAttributes attributes{};- AppletFooterUiType type{AppletFooterUiType::None};- INSERT_PADDING_BYTES(0x5B); // Reserved- };- static_assert(sizeof(AppletFooterUi) == 0x60, "AppletFooterUi is an invalid size");-// This is nn::hid::NpadLarkTypeenum class NpadLarkType : u32 {Invalid,@@ -419,13 +412,6 @@ private:U,};- struct AppletNfcXcd {- union {- AppletFooterUi applet_footer{};- Lifo<NfcXcdDeviceHandleStateImpl, 0x2> nfc_xcd_device_lifo;- };- };-// This is nn::hid::detail::NpadInternalStatestruct NpadInternalState {Core::HID::NpadStyleTag style_tag{Core::HID::NpadStyleSet::None};@@ -452,7 +438,9 @@ private:Core::HID::NpadBatteryLevel battery_level_dual{};Core::HID::NpadBatteryLevel battery_level_left{};Core::HID::NpadBatteryLevel battery_level_right{};- AppletNfcXcd applet_nfc_xcd{};+ AppletFooterUiAttributes applet_footer_attributes{};+ AppletFooterUiType applet_footer_type{AppletFooterUiType::None};+ INSERT_PADDING_BYTES(0x5B); // ReservedINSERT_PADDING_BYTES(0x20); // UnknownLifo<NpadGcTriggerState, hid_entry_count> gc_trigger_lifo{};NpadLarkType lark_type_l_and_main{};