VERY experimental Nintendo Switch 2 emulator
C++
input_common: Add amiibo applet functions
german777328e78385a7
diff --git a/src/input_common/drivers/virtual_amiibo.cpp b/src/input_common/drivers/virtual_amiibo.cppindex 0cd5129da5..252c660d8b 100644--- a/src/input_common/drivers/virtual_amiibo.cpp+++ b/src/input_common/drivers/virtual_amiibo.cpp@@ -60,6 +60,8 @@ Common::Input::NfcState VirtualAmiibo::WriteNfcData(return Common::Input::NfcState::WriteFailed;}+ amiibo_data = data;+return Common::Input::NfcState::Success;}@@ -91,6 +93,15 @@ VirtualAmiibo::Info VirtualAmiibo::LoadAmiibo(const std::string& filename) {return Info::Success;}+VirtualAmiibo::Info VirtualAmiibo::ReloadAmiibo() {+ if (state == State::AmiiboIsOpen) {+ SetNfc(identifier, {Common::Input::NfcState::NewAmiibo, amiibo_data});+ return Info::Success;+ }++ return LoadAmiibo(file_path);+}+VirtualAmiibo::Info VirtualAmiibo::CloseAmiibo() {state = polling_mode == Common::Input::PollingMode::NFC ? State::WaitingForAmiibo: State::Initialized;@@ -98,4 +109,8 @@ VirtualAmiibo::Info VirtualAmiibo::CloseAmiibo() {return Info::Success;}+std::string VirtualAmiibo::GetLastFilePath() {+ return file_path;+}+} // namespace InputCommondiff --git a/src/input_common/drivers/virtual_amiibo.h b/src/input_common/drivers/virtual_amiibo.hindex 9eac075445..f2294b8b08 100644--- a/src/input_common/drivers/virtual_amiibo.h+++ b/src/input_common/drivers/virtual_amiibo.h@@ -47,8 +47,11 @@ public:State GetCurrentState() const;Info LoadAmiibo(const std::string& amiibo_file);+ Info ReloadAmiibo();Info CloseAmiibo();+ std::string GetLastFilePath();+private:static constexpr std::size_t amiibo_size = 0x21C;static constexpr std::size_t amiibo_size_without_password = amiibo_size - 0x8;diff --git a/src/input_common/input_engine.h b/src/input_common/input_engine.hindex d4c264a8eb..6cbcf5207e 100644--- a/src/input_common/input_engine.h+++ b/src/input_common/input_engine.h@@ -133,7 +133,7 @@ public:return Common::Input::CameraError::NotSupported;}- // Request nfc data from a controller+ // Returns success if nfc is supportedvirtual Common::Input::NfcState SupportsNfc([[maybe_unused]] const PadIdentifier& identifier) const {return Common::Input::NfcState::NotSupported;