Diamond75/Panda3DS
1
0
Fork 0
mirror of https://github.com/wheremyfoodat/Panda3DS.git synced 2025-04-08 23:25:40 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions

Handle Amiibo tag events better

Browse source
This commit is contained in:
wheremyfoodat 2023-09-09 01:56:39 +03:00
parent cf54fd6d1d
commit 5930a3d843
2 changed files with 17 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
include/kernel/kernel.hpp
View file

@ -72,7 +72,15 @@ public:
// Signals an event, returns true on success or false if the event does not exist // Signals an event, returns true on success or false if the event does not exist
bool signalEvent(Handle e); bool signalEvent(Handle e);
private:
void clearEvent(Handle e) {
KernelObject* object = getObject(e, KernelObjectType::Event);
if (object != nullptr) {
object->getData<Event>()->fired = false;
}
}
private:
void signalArbiter(u32 waitingAddress, s32 threadCount); void signalArbiter(u32 waitingAddress, s32 threadCount);
void sleepThread(s64 ns); void sleepThread(s64 ns);
void sleepThreadOnArbiter(u32 waitingAddress); void sleepThreadOnArbiter(u32 waitingAddress);

8
src/core/services/nfc.cpp
View file

@ -70,6 +70,14 @@ bool NFCService::loadAmiibo(const std::filesystem::path& path) {
return false; return false;
} }
if (tagOutOfRangeEvent.has_value()) {
kernel.clearEvent(tagOutOfRangeEvent.value());
}
if (tagInRangeEvent.has_value()) {
kernel.signalEvent(tagInRangeEvent.value());
}
file.close(); file.close();
return true; return true;
} }