aboutsummaryrefslogtreecommitdiff
path: root/src/input_common/helpers/joycon_protocol/common_protocol.cpp
diff options
context:
space:
mode:
authorgerman77 <juangerman-13@hotmail.com>2023-05-09 00:30:25 -0600
committergerman77 <juangerman-13@hotmail.com>2023-05-09 00:32:53 -0600
commitcb1487d77468c7dd7ca49779d9f9010ed925e3fc (patch)
treea69db23a78becd18acc75630da1929b086c44181 /src/input_common/helpers/joycon_protocol/common_protocol.cpp
parent15ec8d3e44ca93365ae709166516e6678f8fe52f (diff)
input_common: Fix nfc detection for joycons
Diffstat (limited to 'src/input_common/helpers/joycon_protocol/common_protocol.cpp')
-rw-r--r--src/input_common/helpers/joycon_protocol/common_protocol.cpp7
1 files changed, 3 insertions, 4 deletions
diff --git a/src/input_common/helpers/joycon_protocol/common_protocol.cpp b/src/input_common/helpers/joycon_protocol/common_protocol.cpp
index 2b42a4555a..077d72cd03 100644
--- a/src/input_common/helpers/joycon_protocol/common_protocol.cpp
+++ b/src/input_common/helpers/joycon_protocol/common_protocol.cpp
@@ -236,13 +236,13 @@ DriverResult JoyconCommonProtocol::GetMCUDataResponse(ReportMode report_mode,
return DriverResult::Success;
}
-DriverResult JoyconCommonProtocol::SendMCUData(ReportMode report_mode, SubCommand sc,
+DriverResult JoyconCommonProtocol::SendMCUData(ReportMode report_mode, MCUSubCommand sc,
std::span<const u8> buffer,
MCUCommandResponse& output) {
SubCommandPacket packet{
.output_report = OutputReport::MCU_DATA,
.packet_counter = GetCounter(),
- .sub_command = sc,
+ .mcu_sub_command = sc,
.command_data = {},
};
@@ -269,8 +269,7 @@ DriverResult JoyconCommonProtocol::WaitSetMCUMode(ReportMode report_mode, MCUMod
std::size_t tries{};
do {
- const std::vector<u8> mcu_data{static_cast<u8>(MCUMode::Standby)};
- const auto result = SendMCUData(report_mode, SubCommand::STATE, mcu_data, output);
+ const auto result = SendMCUData(report_mode, MCUSubCommand::SetDeviceMode, {}, output);
if (result != DriverResult::Success) {
return result;