More appleting

include/applets/mii_selector.hpp

@@ -1,8 +1,11 @@
 #include "applets/applet.hpp"
 
-class MiiSelectorApplet final : public AppletBase {
-	virtual Result::HorizonResult start() override;
-	virtual void reset() override;
+namespace Applets {
+	class MiiSelectorApplet final : public AppletBase {
+	  public:
+		virtual Result::HorizonResult start() override;
+		virtual void reset() override;
 
-	MiiSelectorApplet(Memory& memory) : AppletBase(memory) {}
-};
+		MiiSelectorApplet(Memory& memory) : AppletBase(memory) {}
+	};
+}  // namespace Applets

include/services/apt.hpp

@@ -6,6 +6,8 @@
 #include "memory.hpp"
 #include "result/result.hpp"
 
+#include "applets/mii_selector.hpp"
+
 // Yay, more circular dependencies
 class Kernel;
 
@@ -24,6 +26,9 @@ class APTService {
 
 	ConsoleModel model = ConsoleModel::Old3DS;
 
+	// Applets here
+	Applets::MiiSelectorApplet miiSelector;
+
 	MAKE_LOG_FUNCTION(log, aptLogger)
 
 	// Service commands
@@ -67,7 +72,7 @@ class APTService {
 	u32 screencapPostPermission;
 
 public:
-	APTService(Memory& mem, Kernel& kernel) : mem(mem), kernel(kernel) {}
+	APTService(Memory& mem, Kernel& kernel) : mem(mem), kernel(kernel), miiSelector(mem) {}
 	void reset();
 	void handleSyncRequest(u32 messagePointer);
 };

src/core/applets/mii_selector.cpp

@@ -1,5 +1,6 @@
 #include "applets/mii_selector.hpp"
 
-void MiiSelectorApplet::reset() {}
+using namespace Applets;
 
+void MiiSelectorApplet::reset() {}
 Result::HorizonResult MiiSelectorApplet::start() { return Result::Success; }

src/core/services/apt.cpp

@@ -58,6 +58,8 @@ void APTService::reset() {
 	lockHandle = std::nullopt;
 	notificationEvent = std::nullopt;
 	resumeEvent = std::nullopt;
+
+	miiSelector.reset();
 }
 
 void APTService::handleSyncRequest(u32 messagePointer) {