diff options
| author | bunnei <bunneidev@gmail.com> | 2023-05-18 18:10:38 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-05-18 18:10:38 -0700 |
| commit | 1e398e6c36bf8839ca530497fee3772f51d62126 (patch) | |
| tree | 9bc394d7aaf886b65ee18ba18088e0f057ae8225 /src/input_common/helpers/joycon_protocol/nfc.h | |
| parent | 55d740fffa540ffae483a46b4a3b907b40fc3b15 (diff) | |
| parent | 5693434b8ad74a5c46155f1e60fa0d3f475aa153 (diff) | |
Merge pull request #10344 from german77/pro-amiibomainline-0-1439
input_common: Fix pro controller amiibo support
Diffstat (limited to 'src/input_common/helpers/joycon_protocol/nfc.h')
| -rw-r--r-- | src/input_common/helpers/joycon_protocol/nfc.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/input_common/helpers/joycon_protocol/nfc.h b/src/input_common/helpers/joycon_protocol/nfc.h index 4cb992d1d3..c9e9af03fa 100644 --- a/src/input_common/helpers/joycon_protocol/nfc.h +++ b/src/input_common/helpers/joycon_protocol/nfc.h @@ -42,9 +42,9 @@ private: DriverResult WaitUntilNfcIsReady(); - DriverResult StartPolling(TagFoundData& data, std::size_t timeout_limit = 1); + DriverResult WaitUntilNfcIsPolling(); - DriverResult ReadTag(const TagFoundData& data); + DriverResult IsTagInRange(TagFoundData& data, std::size_t timeout_limit = 1); DriverResult GetAmiiboData(std::vector<u8>& data); @@ -52,7 +52,7 @@ private: DriverResult SendStopPollingRequest(MCUCommandResponse& output); - DriverResult SendStartWaitingRecieveRequest(MCUCommandResponse& output); + DriverResult SendNextPackageRequest(MCUCommandResponse& output, u8 packet_id); DriverResult SendReadAmiiboRequest(MCUCommandResponse& output, NFCPages ntag_pages); |