prifak/yuzu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Few fixups for nfc

Browse Source
This commit is contained in:
David Marcec
2018-09-23 21:29:58 +10:00
parent fdea1c5796
commit f2dd80f0b3
3 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/core/core.cpp
View File

@@ -476,11 +476,11 @@ void System::LoadAmiibo(const std::string& filename) {
impl->nfc_activate->Signal(); impl->nfc_activate->Signal();
} }
Kernel::SharedPtr<Kernel::Event>& System::GetNFCEvent() const { const Kernel::SharedPtr<Kernel::Event>& System::GetNFCEvent() const {
return impl->nfc_activate; return impl->nfc_activate;
} }
std::string& System::GetNFCFilename() const { const std::string& System::GetNFCFilename() const {
return impl->nfc_filename; return impl->nfc_filename;
} }

4
src/core/core.h
View File

@@ -225,11 +225,11 @@ public:
std::shared_ptr<FileSys::VfsFilesystem> GetFilesystem() const; std::shared_ptr<FileSys::VfsFilesystem> GetFilesystem() const;
std::string& GetNFCFilename() const; const std::string& GetNFCFilename() const;
void LoadAmiibo(const std::string& path); void LoadAmiibo(const std::string& path);
Kernel::SharedPtr<Kernel::Event>& GetNFCEvent() const; const Kernel::SharedPtr<Kernel::Event>& GetNFCEvent() const;
private: private:
System(); System();

3
src/core/hle/service/nfp/nfp.cpp
View File

@@ -157,7 +157,8 @@ private:
case DeviceState::TagFound: case DeviceState::TagFound:
case DeviceState::TagNearby: case DeviceState::TagNearby:
deactivate_event->Signal(); deactivate_event->Signal();
[[fallthrough]]; device_state = DeviceState::Initialized;
break;
case DeviceState::SearchingForTag: case DeviceState::SearchingForTag:
case DeviceState::TagRemoved: case DeviceState::TagRemoved:
device_state = DeviceState::Initialized; device_state = DeviceState::Initialized;