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

[Applets] Properly expose nextParameter

Browse source
This commit is contained in:
wheremyfoodat 2023-11-11 20:35:10 +02:00
parent 135c8cb508
commit 60b565273e
5 changed files with 15 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
include/applets/applet.hpp
View file

@ -72,7 +72,9 @@ namespace Applets {
}; };
class AppletBase { class AppletBase {
protected:
Memory& mem; Memory& mem;
std::optional<Parameter>& nextParameter;
public: public:
virtual const char* name() = 0; virtual const char* name() = 0;
@ -83,6 +85,6 @@ namespace Applets {
virtual Result::HorizonResult receiveParameter() = 0; virtual Result::HorizonResult receiveParameter() = 0;
virtual void reset() = 0; virtual void reset() = 0;
AppletBase(Memory& mem) : mem(mem) {} AppletBase(Memory& mem, std::optional<Parameter>& nextParam) : mem(mem), nextParameter(nextParam) {}
}; };
} // namespace Applets } // namespace Applets

2
include/applets/mii_selector.hpp
View file

@ -8,6 +8,6 @@ namespace Applets {
virtual Result::HorizonResult receiveParameter() override; virtual Result::HorizonResult receiveParameter() override;
virtual void reset() override; virtual void reset() override;
MiiSelectorApplet(Memory& memory) : AppletBase(memory) {} MiiSelectorApplet(Memory& memory, std::optional<Parameter>& nextParam) : AppletBase(memory, nextParam) {}
}; };
} // namespace Applets } // namespace Applets

2
include/applets/software_keyboard.hpp
View file

@ -8,6 +8,6 @@ namespace Applets {
virtual Result::HorizonResult receiveParameter() override; virtual Result::HorizonResult receiveParameter() override;
virtual void reset() override; virtual void reset() override;
SoftwareKeyboardApplet(Memory& memory) : AppletBase(memory) {} SoftwareKeyboardApplet(Memory& memory, std::optional<Parameter>& nextParam) : AppletBase(memory, nextParam) {}
}; };
} // namespace Applets } // namespace Applets

2
src/core/applets/applet_manager.cpp
View file

@ -4,7 +4,7 @@
using namespace Applets; using namespace Applets;
AppletManager::AppletManager(Memory& mem) : miiSelector(mem), swkbd(mem) {} AppletManager::AppletManager(Memory& mem) : miiSelector(mem, nextParameter), swkbd(mem, nextParameter) {}
void AppletManager::reset() { void AppletManager::reset() {
miiSelector.reset(); miiSelector.reset();

9
src/core/applets/software_keyboard.cpp
View file

@ -7,5 +7,14 @@ Result::HorizonResult SoftwareKeyboardApplet::start() { return Result::Success;
Result::HorizonResult SoftwareKeyboardApplet::receiveParameter() { Result::HorizonResult SoftwareKeyboardApplet::receiveParameter() {
Helpers::warn("Software keyboard: Unimplemented ReceiveParameter"); Helpers::warn("Software keyboard: Unimplemented ReceiveParameter");
Applets::Parameter param = Applets::Parameter{
.senderID = AppletIDs::SoftwareKeyboard,
.destID = AppletIDs::Application,
.signal = APTSignal::Response,
.data = {},
};
nextParameter = param;
return Result::Success; return Result::Success;
} }