Merge pull request #12993 from liamwhite/am-rewrite-part1

am: rewrite part 1

1 files changed, 6 insertions, 12 deletions

diff --git a/src/core/hle/service/am/am.cpp b/src/core/hle/service/am/am.cpp
index 8f90eba34..9dc710ba9 100644
--- a/src/core/hle/service/am/am.cpp
+++ b/src/core/hle/service/am/am.cpp
@@ -2,11 +2,8 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 #include "core/hle/service/am/am.h"
-#include "core/hle/service/am/applet_ae.h"
-#include "core/hle/service/am/applet_oe.h"
-#include "core/hle/service/am/idle.h"
-#include "core/hle/service/am/omm.h"
-#include "core/hle/service/am/spsm.h"
+#include "core/hle/service/am/service/all_system_applet_proxies_service.h"
+#include "core/hle/service/am/service/application_proxy_service.h"
 #include "core/hle/service/server_manager.h"
 
 namespace Service::AM {
@@ -14,13 +11,10 @@ namespace Service::AM {
 void LoopProcess(Nvnflinger::Nvnflinger& nvnflinger, Core::System& system) {
     auto server_manager = std::make_unique<ServerManager>(system);
 
-    server_manager->RegisterNamedService("appletAE",
-                                         std::make_shared<AppletAE>(nvnflinger, system));
-    server_manager->RegisterNamedService("appletOE",
-                                         std::make_shared<AppletOE>(nvnflinger, system));
-    server_manager->RegisterNamedService("idle:sys", std::make_shared<IdleSys>(system));
-    server_manager->RegisterNamedService("omm", std::make_shared<OMM>(system));
-    server_manager->RegisterNamedService("spsm", std::make_shared<SPSM>(system));
+    server_manager->RegisterNamedService(
+        "appletAE", std::make_shared<IAllSystemAppletProxiesService>(system, nvnflinger));
+    server_manager->RegisterNamedService(
+        "appletOE", std::make_shared<IApplicationProxyService>(system, nvnflinger));
     ServerManager::RunServer(std::move(server_manager));
 }