diff options
Diffstat (limited to '')
| -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: | |||
| 792 | 792 | ||
| 793 | const Common::Input::CallbackStatus status{ | 793 | const Common::Input::CallbackStatus status{ |
| 794 | .type = Common::Input::InputType::Nfc, | 794 | .type = Common::Input::InputType::Nfc, |
| 795 | .nfc_status = nfc_status.state, | 795 | .nfc_status = nfc_status, |
| 796 | .raw_data = nfc_status.data, | ||
| 797 | }; | 796 | }; |
| 798 | 797 | ||
| 799 | TriggerOnChange(status); | 798 | TriggerOnChange(status); |
| @@ -836,10 +835,31 @@ public: | |||
| 836 | return input_engine->SupportsNfc(identifier); | 835 | return input_engine->SupportsNfc(identifier); |
| 837 | } | 836 | } |
| 838 | 837 | ||
| 838 | Common::Input::NfcState StartNfcPolling() { | ||
| 839 | return input_engine->StartNfcPolling(identifier); | ||
| 840 | } | ||
| 841 | |||
| 842 | Common::Input::NfcState StopNfcPolling() { | ||
| 843 | return input_engine->StopNfcPolling(identifier); | ||
| 844 | } | ||
| 845 | |||
| 846 | Common::Input::NfcState ReadAmiiboData(std::vector<u8>& out_data) { | ||
| 847 | return input_engine->ReadAmiiboData(identifier, out_data); | ||
| 848 | } | ||
| 849 | |||
| 839 | Common::Input::NfcState WriteNfcData(const std::vector<u8>& data) override { | 850 | Common::Input::NfcState WriteNfcData(const std::vector<u8>& data) override { |
| 840 | return input_engine->WriteNfcData(identifier, data); | 851 | return input_engine->WriteNfcData(identifier, data); |
| 841 | } | 852 | } |
| 842 | 853 | ||
| 854 | Common::Input::NfcState ReadMifareData(const Common::Input::MifareRequest& request, | ||
| 855 | Common::Input::MifareRequest& out_data) { | ||
| 856 | return input_engine->ReadMifareData(identifier, request, out_data); | ||
| 857 | } | ||
| 858 | |||
| 859 | Common::Input::NfcState WriteMifareData(const Common::Input::MifareRequest& request) { | ||
| 860 | return input_engine->WriteMifareData(identifier, request); | ||
| 861 | } | ||
| 862 | |||
| 843 | private: | 863 | private: |
| 844 | const PadIdentifier identifier; | 864 | const PadIdentifier identifier; |
| 845 | InputEngine* input_engine; | 865 | InputEngine* input_engine; |