INSANEMODE/yuzu-android
1
0
Fork 0
mirror of https://github.com/yuzu-emu/yuzu-android.git synced 2025-06-17 07:57:57 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1569 from lioncash/amiibo

Browse Source 
yuzu/main: Notify user of loading errors with Amiibo data
This commit is contained in:
bunnei
2018-10-25 22:10:08 -04:00
committed by GitHub
parent 476b9f8fc5 bed2d6c425
commit debabf1fa6
3 changed files with 40 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -328,13 +328,15 @@ void Module::Interface::CreateUserInterface(Kernel::HLERequestContext& ctx) {
rb.PushIpcInterface<IUser>(*this);
}
void Module::Interface::LoadAmiibo(const std::vector<u8>& buffer) {
bool Module::Interface::LoadAmiibo(const std::vector<u8>& buffer) {
std::lock_guard<std::recursive_mutex> lock(HLE::g_hle_lock);
if (buffer.size() < sizeof(AmiiboFile)) {
return; // Failed to load file
return false;
}
std::memcpy(&amiibo, buffer.data(), sizeof(amiibo));
nfc_tag_load->Signal();
return true;
}
const Kernel::SharedPtr<Kernel::Event>& Module::Interface::GetNFCEvent() const {
return nfc_tag_load;

2
src/core/hle/service/nfp/nfp.h
View File

@ -32,7 +32,7 @@ public:
static_assert(sizeof(AmiiboFile) == 0x94, "AmiiboFile is an invalid size");
void CreateUserInterface(Kernel::HLERequestContext& ctx);
void LoadAmiibo(const std::vector<u8>& buffer);
bool LoadAmiibo(const std::vector<u8>& buffer);
const Kernel::SharedPtr<Kernel::Event>& GetNFCEvent() const;
const AmiiboFile& GetAmiiboBuffer() const;