diff options
author | liamwhite <liamwhite@users.noreply.github.com> | 2023-06-23 15:27:00 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-06-23 15:27:00 +0200 |
commit | 87b9b5d10fa4a30c8eb56f9de44ba0c24d57ae77 (patch) | |
tree | 4239b5df2c866aa26e123719fe838bd6eb0e0394 /src/input_common/input_poller.cpp | |
parent | Merge pull request #10884 from liamwhite/spaghetti-vfs (diff) | |
parent | input_common: Implement native mifare support (diff) | |
download | yuzu-87b9b5d10fa4a30c8eb56f9de44ba0c24d57ae77.tar yuzu-87b9b5d10fa4a30c8eb56f9de44ba0c24d57ae77.tar.gz yuzu-87b9b5d10fa4a30c8eb56f9de44ba0c24d57ae77.tar.bz2 yuzu-87b9b5d10fa4a30c8eb56f9de44ba0c24d57ae77.tar.lz yuzu-87b9b5d10fa4a30c8eb56f9de44ba0c24d57ae77.tar.xz yuzu-87b9b5d10fa4a30c8eb56f9de44ba0c24d57ae77.tar.zst yuzu-87b9b5d10fa4a30c8eb56f9de44ba0c24d57ae77.zip |
Diffstat (limited to 'src/input_common/input_poller.cpp')
-rw-r--r-- | src/input_common/input_poller.cpp | 24 |
1 files changed, 22 insertions, 2 deletions
diff --git a/src/input_common/input_poller.cpp b/src/input_common/input_poller.cpp index 380a01542..870e76ab0 100644 --- a/src/input_common/input_poller.cpp +++ b/src/input_common/input_poller.cpp @@ -792,8 +792,7 @@ public: const Common::Input::CallbackStatus status{ .type = Common::Input::InputType::Nfc, - .nfc_status = nfc_status.state, - .raw_data = nfc_status.data, + .nfc_status = nfc_status, }; TriggerOnChange(status); @@ -836,10 +835,31 @@ public: return input_engine->SupportsNfc(identifier); } + Common::Input::NfcState StartNfcPolling() { + return input_engine->StartNfcPolling(identifier); + } + + Common::Input::NfcState StopNfcPolling() { + return input_engine->StopNfcPolling(identifier); + } + + Common::Input::NfcState ReadAmiiboData(std::vector<u8>& out_data) { + return input_engine->ReadAmiiboData(identifier, out_data); + } + Common::Input::NfcState WriteNfcData(const std::vector<u8>& data) override { return input_engine->WriteNfcData(identifier, data); } + Common::Input::NfcState ReadMifareData(const Common::Input::MifareRequest& request, + Common::Input::MifareRequest& out_data) { + return input_engine->ReadMifareData(identifier, request, out_data); + } + + Common::Input::NfcState WriteMifareData(const Common::Input::MifareRequest& request) { + return input_engine->WriteMifareData(identifier, request); + } + private: const PadIdentifier identifier; InputEngine* input_engine; |