mirror of
https://github.com/yuzu-emu/yuzu-android.git
synced 2025-06-24 00:27:51 -05:00
core: Relocate g_service_manager to the System class
Converts the service manager from a global into an instance-based variable.
This commit is contained in:
@ -23,7 +23,7 @@ namespace Service::SM {
|
||||
class SM final : public ServiceFramework<SM> {
|
||||
public:
|
||||
SM(std::shared_ptr<ServiceManager> service_manager);
|
||||
~SM() = default;
|
||||
~SM() override;
|
||||
|
||||
private:
|
||||
void Initialize(Kernel::HLERequestContext& ctx);
|
||||
@ -44,6 +44,8 @@ class ServiceManager {
|
||||
public:
|
||||
static void InstallInterfaces(std::shared_ptr<ServiceManager> self);
|
||||
|
||||
~ServiceManager();
|
||||
|
||||
ResultVal<Kernel::SharedPtr<Kernel::ServerPort>> RegisterService(std::string name,
|
||||
unsigned int max_sessions);
|
||||
ResultVal<Kernel::SharedPtr<Kernel::ClientPort>> GetServicePort(const std::string& name);
|
||||
@ -59,6 +61,4 @@ private:
|
||||
std::unordered_map<std::string, Kernel::SharedPtr<Kernel::ClientPort>> registered_services;
|
||||
};
|
||||
|
||||
extern std::shared_ptr<ServiceManager> g_service_manager;
|
||||
|
||||
} // namespace Service::SM
|
||||
|
Reference in New Issue
Block a user