1 files changed, 22 insertions, 28 deletions
diff --git a/src/core/hle/service/service.cpp b/src/core/hle/service/service.cpp
index 5dce8068e..91f13cd7e 100644
--- a/src/core/hle/service/service.cpp
+++ b/src/core/hle/service/service.cpp
@@ -11,26 +11,17 @@
 #include "core/hle/service/am_app.h"
 #include "core/hle/service/am_net.h"
 #include "core/hle/service/am_sys.h"
-#include "core/hle/service/apt_a.h"
-#include "core/hle/service/apt_s.h"
-#include "core/hle/service/apt_u.h"
 #include "core/hle/service/boss_p.h"
 #include "core/hle/service/boss_u.h"
 #include "core/hle/service/cam_u.h"
 #include "core/hle/service/cecd_u.h"
 #include "core/hle/service/cecd_s.h"
-#include "core/hle/service/cfg/cfg_i.h"
-#include "core/hle/service/cfg/cfg_s.h"
-#include "core/hle/service/cfg/cfg_u.h"
 #include "core/hle/service/csnd_snd.h"
 #include "core/hle/service/dsp_dsp.h"
 #include "core/hle/service/err_f.h"
-#include "core/hle/service/fs/fs_user.h"
 #include "core/hle/service/frd_a.h"
 #include "core/hle/service/frd_u.h"
 #include "core/hle/service/gsp_gpu.h"
-#include "core/hle/service/hid/hid_spvr.h"
-#include "core/hle/service/hid/hid_user.h"
 #include "core/hle/service/gsp_lcd.h"
 #include "core/hle/service/http_c.h"
 #include "core/hle/service/ir_rst.h"
@@ -44,14 +35,17 @@
 #include "core/hle/service/ns_s.h"
 #include "core/hle/service/nwm_uds.h"
 #include "core/hle/service/pm_app.h"
-#include "core/hle/service/ptm_play.h"
-#include "core/hle/service/ptm_u.h"
-#include "core/hle/service/ptm_sysm.h"
 #include "core/hle/service/soc_u.h"
 #include "core/hle/service/srv.h"
 #include "core/hle/service/ssl_c.h"
 #include "core/hle/service/y2r_u.h"
 
+#include "core/hle/service/apt/apt.h"
+#include "core/hle/service/fs/archive.h"
+#include "core/hle/service/cfg/cfg.h"
+#include "core/hle/service/hid/hid.h"
+#include "core/hle/service/ptm/ptm.h"
+
 namespace Service {
 
 std::unordered_map<std::string, Kernel::SharedPtr<Interface>> g_kernel_named_ports;
@@ -60,12 +54,12 @@ std::unordered_map<std::string, Kernel::SharedPtr<Interface>> g_srv_services;
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 // Module interface
 
-static void AddNamedPort(Interface* interface) {
-    g_kernel_named_ports.emplace(interface->GetPortName(), interface);
+static void AddNamedPort(Interface* interface_) {
+    g_kernel_named_ports.emplace(interface_->GetPortName(), interface_);
 }
 
-static void AddService(Interface* interface) {
-    g_srv_services.emplace(interface->GetPortName(), interface);
+void AddService(Interface* interface_) {
+    g_srv_services.emplace(interface_->GetPortName(), interface_);
 }
 
 /// Initialize ServiceManager
@@ -73,31 +67,28 @@ void Init() {
     AddNamedPort(new SRV::Interface);
     AddNamedPort(new ERR_F::Interface);
 
+    Service::FS::ArchiveInit();
+    Service::CFG::CFGInit();
+    Service::APT::APTInit();
+    Service::PTM::PTMInit();
+    Service::HID::HIDInit();
+
     AddService(new AC_U::Interface);
     AddService(new ACT_U::Interface);
     AddService(new AM_APP::Interface);
     AddService(new AM_NET::Interface);
     AddService(new AM_SYS::Interface);
-    AddService(new APT_A::Interface);
-    AddService(new APT_S::Interface);
-    AddService(new APT_U::Interface);
     AddService(new BOSS_P::Interface);
     AddService(new BOSS_U::Interface);
     AddService(new CAM_U::Interface);
     AddService(new CECD_S::Interface);
     AddService(new CECD_U::Interface);
-    AddService(new CFG_I::Interface);
-    AddService(new CFG_S::Interface);
-    AddService(new CFG_U::Interface);
     AddService(new CSND_SND::Interface);
     AddService(new DSP_DSP::Interface);
     AddService(new FRD_A::Interface);
     AddService(new FRD_U::Interface);
-    AddService(new FS::FSUserInterface);
     AddService(new GSP_GPU::Interface);
     AddService(new GSP_LCD::Interface);
-    AddService(new HID_User::Interface);
-    AddService(new HID_SPVR::Interface);
     AddService(new HTTP_C::Interface);
     AddService(new IR_RST::Interface);
     AddService(new IR_U::Interface);
@@ -110,9 +101,6 @@ void Init() {
     AddService(new NS_S::Interface);
     AddService(new NWM_UDS::Interface);
     AddService(new PM_APP::Interface);
-    AddService(new PTM_PLAY::Interface);
-    AddService(new PTM_U::Interface);
-    AddService(new PTM_SYSM::Interface);
     AddService(new SOC_U::Interface);
     AddService(new SSL_C::Interface);
     AddService(new Y2R_U::Interface);
@@ -122,6 +110,12 @@ void Init() {
 
 /// Shutdown ServiceManager
 void Shutdown() {
+    Service::HID::HIDShutdown();
+    Service::PTM::PTMShutdown();
+    Service::APT::APTShutdown();
+    Service::CFG::CFGShutdown();
+    Service::FS::ArchiveShutdown();
+
     g_srv_services.clear();
     g_kernel_named_ports.clear();
     LOG_DEBUG(Service, "shutdown OK");