core: Eliminate more uses of Core::System::GetInstance(). (#7313)

src/core/hle/service/ptm/ptm.cpp

@@ -20,6 +20,7 @@
 #include "core/hle/service/ptm/ptm_u.h"
 
 SERIALIZE_EXPORT_IMPL(Service::PTM::Module)
+SERVICE_CONSTRUCT_IMPL(Service::PTM::Module)
 
 namespace Service::PTM {
 
@@ -136,7 +137,7 @@ void Module::Interface::CheckNew3DS(Kernel::HLERequestContext& ctx) {
 void Module::Interface::GetSystemTime(Kernel::HLERequestContext& ctx) {
     IPC::RequestParser rp(ctx);
 
-    auto& share_page = Core::System::GetInstance().Kernel().GetSharedPageHandler();
+    auto& share_page = ptm->system.Kernel().GetSharedPageHandler();
     const u64 console_time = share_page.GetSystemTimeSince2000();
 
     IPC::RequestBuilder rb = rp.MakeBuilder(3, 0);
@@ -207,7 +208,7 @@ static GameCoin ReadGameCoinData() {
     return gamecoin_data;
 }
 
-Module::Module() {
+Module::Module(Core::System& system_) : system(system_) {
     // Open the SharedExtSaveData archive 0xF000000B and create the gamecoin.dat file if it doesn't
     // exist
     const std::string& nand_directory = FileUtil::GetUserPath(FileUtil::UserPath::NANDDir);
@@ -221,6 +222,14 @@ Module::Module() {
     }
 }
 
+template <class Archive>
+void Module::serialize(Archive& ar, const unsigned int) {
+    ar& shell_open;
+    ar& battery_is_charging;
+    ar& pedometer_is_counting;
+}
+SERIALIZE_IMPL(Module)
+
 u16 Module::GetPlayCoins() {
     return ReadGameCoinData().total_coins;
 }
@@ -238,7 +247,7 @@ Module::Interface::Interface(std::shared_ptr<Module> ptm, const char* name, u32
 
 void InstallInterfaces(Core::System& system) {
     auto& service_manager = system.ServiceManager();
-    auto ptm = std::make_shared<Module>();
+    auto ptm = std::make_shared<Module>(system);
     std::make_shared<PTM_Gets>(ptm)->InstallAsService(service_manager);
     std::make_shared<PTM_Play>(ptm)->InstallAsService(service_manager);
     std::make_shared<PTM_Sets>(ptm)->InstallAsService(service_manager);

src/core/hle/service/ptm/ptm.h

@@ -47,7 +47,9 @@ void CheckNew3DS(IPC::RequestBuilder& rb);
 
 class Module final {
 public:
-    Module();
+    explicit Module(Core::System& system_);
+    ~Module() = default;
+
     static u16 GetPlayCoins();
     static void SetPlayCoins(u16 play_coins);
 
@@ -150,16 +152,14 @@ public:
     };
 
 private:
+    Core::System& system;
+
     bool shell_open = true;
     bool battery_is_charging = true;
     bool pedometer_is_counting = false;
 
     template <class Archive>
-    void serialize(Archive& ar, const unsigned int) {
-        ar& shell_open;
-        ar& battery_is_charging;
-        ar& pedometer_is_counting;
-    }
+    void serialize(Archive& ar, const unsigned int);
     friend class boost::serialization::access;
 };
 
@@ -168,3 +168,4 @@ void InstallInterfaces(Core::System& system);
 } // namespace Service::PTM
 
 BOOST_CLASS_EXPORT_KEY(Service::PTM::Module)
+SERVICE_CONSTRUCT(Service::PTM::Module)