diff options
| author | 2022-11-20 00:48:39 -0800 | |
|---|---|---|
| committer | 2022-11-20 00:48:39 -0800 | |
| commit | 57a05b1653b316412492b7cf83738b702865b47e (patch) | |
| tree | cb76a9aead5f545250301eb7928ecfb03e706931 /src/input_common/drivers/virtual_amiibo.cpp | |
| parent | Merge pull request #9249 from goldenx86/available-vram (diff) | |
| parent | general: Address review comments (diff) | |
| download | yuzu-57a05b1653b316412492b7cf83738b702865b47e.tar.gz yuzu-57a05b1653b316412492b7cf83738b702865b47e.tar.xz yuzu-57a05b1653b316412492b7cf83738b702865b47e.zip | |
Merge pull request #9238 from german77/cabinet_applet
service: am: Implement cabinet applet
Diffstat (limited to 'src/input_common/drivers/virtual_amiibo.cpp')
| -rw-r--r-- | src/input_common/drivers/virtual_amiibo.cpp | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/src/input_common/drivers/virtual_amiibo.cpp b/src/input_common/drivers/virtual_amiibo.cpp index 0cd5129da..564a188e5 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( | |||
| 60 | return Common::Input::NfcState::WriteFailed; | 60 | return Common::Input::NfcState::WriteFailed; |
| 61 | } | 61 | } |
| 62 | 62 | ||
| 63 | amiibo_data = data; | ||
| 64 | |||
| 63 | return Common::Input::NfcState::Success; | 65 | return Common::Input::NfcState::Success; |
| 64 | } | 66 | } |
| 65 | 67 | ||
| @@ -91,6 +93,15 @@ VirtualAmiibo::Info VirtualAmiibo::LoadAmiibo(const std::string& filename) { | |||
| 91 | return Info::Success; | 93 | return Info::Success; |
| 92 | } | 94 | } |
| 93 | 95 | ||
| 96 | VirtualAmiibo::Info VirtualAmiibo::ReloadAmiibo() { | ||
| 97 | if (state == State::AmiiboIsOpen) { | ||
| 98 | SetNfc(identifier, {Common::Input::NfcState::NewAmiibo, amiibo_data}); | ||
| 99 | return Info::Success; | ||
| 100 | } | ||
| 101 | |||
| 102 | return LoadAmiibo(file_path); | ||
| 103 | } | ||
| 104 | |||
| 94 | VirtualAmiibo::Info VirtualAmiibo::CloseAmiibo() { | 105 | VirtualAmiibo::Info VirtualAmiibo::CloseAmiibo() { |
| 95 | state = polling_mode == Common::Input::PollingMode::NFC ? State::WaitingForAmiibo | 106 | state = polling_mode == Common::Input::PollingMode::NFC ? State::WaitingForAmiibo |
| 96 | : State::Initialized; | 107 | : State::Initialized; |
| @@ -98,4 +109,8 @@ VirtualAmiibo::Info VirtualAmiibo::CloseAmiibo() { | |||
| 98 | return Info::Success; | 109 | return Info::Success; |
| 99 | } | 110 | } |
| 100 | 111 | ||
| 112 | std::string VirtualAmiibo::GetLastFilePath() const { | ||
| 113 | return file_path; | ||
| 114 | } | ||
| 115 | |||
| 101 | } // namespace InputCommon | 116 | } // namespace InputCommon |