DataHearth/yuzu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

input_common: Fix nfc detection for joycons

Browse Source
This commit is contained in:
german77 2023-05-09 00:30:25 -06:00
parent 15ec8d3e44
commit cb1487d774
4 changed files with 21 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/input_common/helpers/joycon_protocol/common_protocol.cpp
View File

@ -236,13 +236,13 @@ DriverResult JoyconCommonProtocol::GetMCUDataResponse(ReportMode report_mode,
return DriverResult::Success; return DriverResult::Success;
} }
DriverResult JoyconCommonProtocol::SendMCUData(ReportMode report_mode, SubCommand sc, DriverResult JoyconCommonProtocol::SendMCUData(ReportMode report_mode, MCUSubCommand sc,
std::span<const u8> buffer, std::span<const u8> buffer,
MCUCommandResponse& output) { MCUCommandResponse& output) {
SubCommandPacket packet{ SubCommandPacket packet{
.output_report = OutputReport::MCU_DATA, .output_report = OutputReport::MCU_DATA,
.packet_counter = GetCounter(), .packet_counter = GetCounter(),
.sub_command = sc, .mcu_sub_command = sc,
.command_data = {}, .command_data = {},
}; };
@ -269,8 +269,7 @@ DriverResult JoyconCommonProtocol::WaitSetMCUMode(ReportMode report_mode, MCUMod
std::size_t tries{}; std::size_t tries{};
do { do {
const std::vector<u8> mcu_data{static_cast<u8>(MCUMode::Standby)}; const auto result = SendMCUData(report_mode, MCUSubCommand::SetDeviceMode, {}, output);
const auto result = SendMCUData(report_mode, SubCommand::STATE, mcu_data, output);
if (result != DriverResult::Success) { if (result != DriverResult::Success) {
return result; return result;

2
src/input_common/helpers/joycon_protocol/common_protocol.h
View File

@ -156,7 +156,7 @@ public:
* @param buffer data to be send * @param buffer data to be send
* @returns output buffer containing the response * @returns output buffer containing the response
*/ */
DriverResult SendMCUData(ReportMode report_mode, SubCommand sc, std::span<const u8> buffer, DriverResult SendMCUData(ReportMode report_mode, MCUSubCommand sc, std::span<const u8> buffer,
MCUCommandResponse& output); MCUCommandResponse& output);
/** /**

7
src/input_common/helpers/joycon_protocol/joycon_types.h
View File

@ -575,7 +575,6 @@ struct NFCPollingCommandData {
static_assert(sizeof(NFCPollingCommandData) == 0x05, "NFCPollingCommandData is an invalid size"); static_assert(sizeof(NFCPollingCommandData) == 0x05, "NFCPollingCommandData is an invalid size");
struct NFCRequestState { struct NFCRequestState {
MCUSubCommand sub_command;
NFCReadCommand command_argument; NFCReadCommand command_argument;
u8 packet_id; u8 packet_id;
INSERT_PADDING_BYTES(0x1); INSERT_PADDING_BYTES(0x1);
@ -587,6 +586,7 @@ struct NFCRequestState {
NFCPollingCommandData nfc_polling; NFCPollingCommandData nfc_polling;
}; };
u8 crc; u8 crc;
INSERT_PADDING_BYTES(0x1);
}; };
static_assert(sizeof(NFCRequestState) == 0x26, "NFCRequestState is an invalid size"); static_assert(sizeof(NFCRequestState) == 0x26, "NFCRequestState is an invalid size");
@ -659,7 +659,10 @@ struct SubCommandPacket {
OutputReport output_report; OutputReport output_report;
u8 packet_counter; u8 packet_counter;
INSERT_PADDING_BYTES(0x8); // This contains vibration data INSERT_PADDING_BYTES(0x8); // This contains vibration data
SubCommand sub_command; union {
SubCommand sub_command;
MCUSubCommand mcu_sub_command;
};
std::array<u8, 0x26> command_data; std::array<u8, 0x26> command_data;
}; };
static_assert(sizeof(SubCommandPacket) == 0x31, "SubCommandPacket is an invalid size"); static_assert(sizeof(SubCommandPacket) == 0x31, "SubCommandPacket is an invalid size");

24
src/input_common/helpers/joycon_protocol/nfc.cpp
View File

@ -278,7 +278,6 @@ DriverResult NfcProtocol::GetAmiiboData(std::vector<u8>& ntag_data) {
DriverResult NfcProtocol::SendStartPollingRequest(MCUCommandResponse& output) { DriverResult NfcProtocol::SendStartPollingRequest(MCUCommandResponse& output) {
NFCRequestState request{ NFCRequestState request{
.sub_command = MCUSubCommand::ReadDeviceMode,
.command_argument = NFCReadCommand::StartPolling, .command_argument = NFCReadCommand::StartPolling,
.packet_id = 0x0, .packet_id = 0x0,
.packet_flag = MCUPacketFlag::LastCommandPacket, .packet_flag = MCUPacketFlag::LastCommandPacket,
@ -296,13 +295,13 @@ DriverResult NfcProtocol::SendStartPollingRequest(MCUCommandResponse& output) {
std::array<u8, sizeof(NFCRequestState)> request_data{}; std::array<u8, sizeof(NFCRequestState)> request_data{};
memcpy(request_data.data(), &request, sizeof(NFCRequestState)); memcpy(request_data.data(), &request, sizeof(NFCRequestState));
request_data[37] = CalculateMCU_CRC8(request_data.data() + 1, 36); request_data[36] = CalculateMCU_CRC8(request_data.data(), 36);
return SendMCUData(ReportMode::NFC_IR_MODE_60HZ, SubCommand::STATE, request_data, output); return SendMCUData(ReportMode::NFC_IR_MODE_60HZ, MCUSubCommand::ReadDeviceMode, request_data,
output);
} }
DriverResult NfcProtocol::SendStopPollingRequest(MCUCommandResponse& output) { DriverResult NfcProtocol::SendStopPollingRequest(MCUCommandResponse& output) {
NFCRequestState request{ NFCRequestState request{
.sub_command = MCUSubCommand::ReadDeviceMode,
.command_argument = NFCReadCommand::StopPolling, .command_argument = NFCReadCommand::StopPolling,
.packet_id = 0x0, .packet_id = 0x0,
.packet_flag = MCUPacketFlag::LastCommandPacket, .packet_flag = MCUPacketFlag::LastCommandPacket,
@ -313,13 +312,13 @@ DriverResult NfcProtocol::SendStopPollingRequest(MCUCommandResponse& output) {
std::array<u8, sizeof(NFCRequestState)> request_data{}; std::array<u8, sizeof(NFCRequestState)> request_data{};
memcpy(request_data.data(), &request, sizeof(NFCRequestState)); memcpy(request_data.data(), &request, sizeof(NFCRequestState));
request_data[37] = CalculateMCU_CRC8(request_data.data() + 1, 36); request_data[36] = CalculateMCU_CRC8(request_data.data(), 36);
return SendMCUData(ReportMode::NFC_IR_MODE_60HZ, SubCommand::STATE, request_data, output); return SendMCUData(ReportMode::NFC_IR_MODE_60HZ, MCUSubCommand::ReadDeviceMode, request_data,
output);
} }
DriverResult NfcProtocol::SendStartWaitingRecieveRequest(MCUCommandResponse& output) { DriverResult NfcProtocol::SendStartWaitingRecieveRequest(MCUCommandResponse& output) {
NFCRequestState request{ NFCRequestState request{
.sub_command = MCUSubCommand::ReadDeviceMode,
.command_argument = NFCReadCommand::StartWaitingRecieve, .command_argument = NFCReadCommand::StartWaitingRecieve,
.packet_id = 0x0, .packet_id = 0x0,
.packet_flag = MCUPacketFlag::LastCommandPacket, .packet_flag = MCUPacketFlag::LastCommandPacket,
@ -330,13 +329,13 @@ DriverResult NfcProtocol::SendStartWaitingRecieveRequest(MCUCommandResponse& out
std::vector<u8> request_data(sizeof(NFCRequestState)); std::vector<u8> request_data(sizeof(NFCRequestState));
memcpy(request_data.data(), &request, sizeof(NFCRequestState)); memcpy(request_data.data(), &request, sizeof(NFCRequestState));
request_data[37] = CalculateMCU_CRC8(request_data.data() + 1, 36); request_data[36] = CalculateMCU_CRC8(request_data.data(), 36);
return SendMCUData(ReportMode::NFC_IR_MODE_60HZ, SubCommand::STATE, request_data, output); return SendMCUData(ReportMode::NFC_IR_MODE_60HZ, MCUSubCommand::ReadDeviceMode, request_data,
output);
} }
DriverResult NfcProtocol::SendReadAmiiboRequest(MCUCommandResponse& output, NFCPages ntag_pages) { DriverResult NfcProtocol::SendReadAmiiboRequest(MCUCommandResponse& output, NFCPages ntag_pages) {
NFCRequestState request{ NFCRequestState request{
.sub_command = MCUSubCommand::ReadDeviceMode,
.command_argument = NFCReadCommand::Ntag, .command_argument = NFCReadCommand::Ntag,
.packet_id = 0x0, .packet_id = 0x0,
.packet_flag = MCUPacketFlag::LastCommandPacket, .packet_flag = MCUPacketFlag::LastCommandPacket,
@ -355,8 +354,9 @@ DriverResult NfcProtocol::SendReadAmiiboRequest(MCUCommandResponse& output, NFCP
std::array<u8, sizeof(NFCRequestState)> request_data{}; std::array<u8, sizeof(NFCRequestState)> request_data{};
memcpy(request_data.data(), &request, sizeof(NFCRequestState)); memcpy(request_data.data(), &request, sizeof(NFCRequestState));
request_data[37] = CalculateMCU_CRC8(request_data.data() + 1, 36); request_data[36] = CalculateMCU_CRC8(request_data.data(), 36);
return SendMCUData(ReportMode::NFC_IR_MODE_60HZ, SubCommand::STATE, request_data, output); return SendMCUData(ReportMode::NFC_IR_MODE_60HZ, MCUSubCommand::ReadDeviceMode, request_data,
output);
} }
NFCReadBlockCommand NfcProtocol::GetReadBlockCommand(NFCPages pages) const { NFCReadBlockCommand NfcProtocol::GetReadBlockCommand(NFCPages pages) const {