mirror of
https://github.com/yuzu-mirror/yuzu.git
synced 2024-09-07 05:09:09 +01:00
Rebase
This commit is contained in:
parent
4d220964df
commit
fcdbf0bc53
5 changed files with 21 additions and 20 deletions
|
@ -617,8 +617,7 @@ public:
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
void InstallInterfaces(SM::ServiceManager& service_manager, Core::System& system,
|
void InstallInterfaces(SM::ServiceManager& service_manager, Core::System& system) {
|
||||||
FileSystem::FileSystemController& fsc) {
|
|
||||||
|
|
||||||
std::make_shared<NS>("ns:am2")->InstallAsService(service_manager);
|
std::make_shared<NS>("ns:am2")->InstallAsService(service_manager);
|
||||||
std::make_shared<NS>("ns:ec")->InstallAsService(service_manager);
|
std::make_shared<NS>("ns:ec")->InstallAsService(service_manager);
|
||||||
|
@ -630,7 +629,7 @@ void InstallInterfaces(SM::ServiceManager& service_manager, Core::System& system
|
||||||
std::make_shared<NS_SU>()->InstallAsService(service_manager);
|
std::make_shared<NS_SU>()->InstallAsService(service_manager);
|
||||||
std::make_shared<NS_VM>()->InstallAsService(service_manager);
|
std::make_shared<NS_VM>()->InstallAsService(service_manager);
|
||||||
|
|
||||||
std::make_shared<PL_U>(system, fsc)->InstallAsService(service_manager);
|
std::make_shared<PL_U>(system)->InstallAsService(service_manager);
|
||||||
}
|
}
|
||||||
|
|
||||||
} // namespace Service::NS
|
} // namespace Service::NS
|
||||||
|
|
|
@ -97,8 +97,7 @@ private:
|
||||||
};
|
};
|
||||||
|
|
||||||
/// Registers all NS services with the specified service manager.
|
/// Registers all NS services with the specified service manager.
|
||||||
void InstallInterfaces(SM::ServiceManager& service_manager, Core::System& system,
|
void InstallInterfaces(SM::ServiceManager& service_manager, Core::System& system);
|
||||||
FileSystem::FileSystemController& fsc);
|
|
||||||
|
|
||||||
} // namespace NS
|
} // namespace NS
|
||||||
} // namespace Service
|
} // namespace Service
|
||||||
|
|
|
@ -145,7 +145,7 @@ struct PL_U::Impl {
|
||||||
std::vector<FontRegion> shared_font_regions;
|
std::vector<FontRegion> shared_font_regions;
|
||||||
};
|
};
|
||||||
|
|
||||||
PL_U::PL_U(Core::System& system, FileSystem::FileSystemController& fsc)
|
PL_U::PL_U(Core::System& system)
|
||||||
: ServiceFramework("pl:u"), impl{std::make_unique<Impl>()}, system(system) {
|
: ServiceFramework("pl:u"), impl{std::make_unique<Impl>()}, system(system) {
|
||||||
|
|
||||||
static const FunctionInfo functions[] = {
|
static const FunctionInfo functions[] = {
|
||||||
|
@ -157,6 +157,9 @@ PL_U::PL_U(Core::System& system, FileSystem::FileSystemController& fsc)
|
||||||
{5, &PL_U::GetSharedFontInOrderOfPriority, "GetSharedFontInOrderOfPriority"},
|
{5, &PL_U::GetSharedFontInOrderOfPriority, "GetSharedFontInOrderOfPriority"},
|
||||||
};
|
};
|
||||||
RegisterHandlers(functions);
|
RegisterHandlers(functions);
|
||||||
|
|
||||||
|
auto& fsc = system.GetFileSystemController();
|
||||||
|
|
||||||
// Attempt to load shared font data from disk
|
// Attempt to load shared font data from disk
|
||||||
const auto* nand = fsc.GetSystemNANDContents();
|
const auto* nand = fsc.GetSystemNANDContents();
|
||||||
std::size_t offset = 0;
|
std::size_t offset = 0;
|
||||||
|
|
|
@ -20,7 +20,7 @@ void EncryptSharedFont(const std::vector<u8>& input, Kernel::PhysicalMemory& out
|
||||||
|
|
||||||
class PL_U final : public ServiceFramework<PL_U> {
|
class PL_U final : public ServiceFramework<PL_U> {
|
||||||
public:
|
public:
|
||||||
PL_U(Core::System& system, FileSystem::FileSystemController& fsc);
|
PL_U(Core::System& system);
|
||||||
~PL_U() override;
|
~PL_U() override;
|
||||||
|
|
||||||
private:
|
private:
|
||||||
|
|
|
@ -198,50 +198,50 @@ ResultCode ServiceFrameworkBase::HandleSyncRequest(Kernel::HLERequestContext& co
|
||||||
void Init(std::shared_ptr<SM::ServiceManager>& sm, Core::System& system) {
|
void Init(std::shared_ptr<SM::ServiceManager>& sm, Core::System& system) {
|
||||||
// NVFlinger needs to be accessed by several services like Vi and AppletOE so we instantiate it
|
// NVFlinger needs to be accessed by several services like Vi and AppletOE so we instantiate it
|
||||||
// here and pass it into the respective InstallInterfaces functions.
|
// here and pass it into the respective InstallInterfaces functions.
|
||||||
auto nv_flinger = std::make_shared<NVFlinger::NVFlinger>(system.CoreTiming());
|
auto nv_flinger = std::make_shared<NVFlinger::NVFlinger>(system.CoreTiming(), system);
|
||||||
system.GetFileSystemController().CreateFactories(*system.GetFilesystem(), false);
|
system.GetFileSystemController().CreateFactories(*system.GetFilesystem(), false);
|
||||||
|
|
||||||
SM::ServiceManager::InstallInterfaces(sm);
|
SM::ServiceManager::InstallInterfaces(sm);
|
||||||
|
|
||||||
Account::InstallInterfaces(system);
|
Account::InstallInterfaces(system);
|
||||||
AM::InstallInterfaces(*sm, nv_flinger, system);
|
AM::InstallInterfaces(*sm, nv_flinger, system);
|
||||||
AOC::InstallInterfaces(*sm);
|
AOC::InstallInterfaces(*sm, system);
|
||||||
APM::InstallInterfaces(system);
|
APM::InstallInterfaces(system);
|
||||||
Audio::InstallInterfaces(*sm, system);
|
Audio::InstallInterfaces(*sm, system);
|
||||||
BCAT::InstallInterfaces(*sm);
|
BCAT::InstallInterfaces(*sm);
|
||||||
BPC::InstallInterfaces(*sm);
|
BPC::InstallInterfaces(*sm);
|
||||||
BtDrv::InstallInterfaces(*sm);
|
BtDrv::InstallInterfaces(*sm, system);
|
||||||
BTM::InstallInterfaces(*sm);
|
BTM::InstallInterfaces(*sm, system);
|
||||||
Capture::InstallInterfaces(*sm);
|
Capture::InstallInterfaces(*sm);
|
||||||
ERPT::InstallInterfaces(*sm);
|
ERPT::InstallInterfaces(*sm);
|
||||||
ES::InstallInterfaces(*sm);
|
ES::InstallInterfaces(*sm);
|
||||||
EUPLD::InstallInterfaces(*sm);
|
EUPLD::InstallInterfaces(*sm);
|
||||||
Fatal::InstallInterfaces(*sm);
|
Fatal::InstallInterfaces(*sm, system);
|
||||||
FGM::InstallInterfaces(*sm);
|
FGM::InstallInterfaces(*sm);
|
||||||
FileSystem::InstallInterfaces(system);
|
FileSystem::InstallInterfaces(system);
|
||||||
Friend::InstallInterfaces(*sm);
|
Friend::InstallInterfaces(*sm, system);
|
||||||
Glue::InstallInterfaces(system);
|
Glue::InstallInterfaces(system);
|
||||||
GRC::InstallInterfaces(*sm);
|
GRC::InstallInterfaces(*sm);
|
||||||
HID::InstallInterfaces(*sm);
|
HID::InstallInterfaces(*sm, system);
|
||||||
LBL::InstallInterfaces(*sm);
|
LBL::InstallInterfaces(*sm);
|
||||||
LDN::InstallInterfaces(*sm);
|
LDN::InstallInterfaces(*sm);
|
||||||
LDR::InstallInterfaces(*sm);
|
LDR::InstallInterfaces(*sm, system);
|
||||||
LM::InstallInterfaces(*sm);
|
LM::InstallInterfaces(*sm);
|
||||||
Migration::InstallInterfaces(*sm);
|
Migration::InstallInterfaces(*sm);
|
||||||
Mii::InstallInterfaces(*sm);
|
Mii::InstallInterfaces(*sm);
|
||||||
MM::InstallInterfaces(*sm);
|
MM::InstallInterfaces(*sm);
|
||||||
NCM::InstallInterfaces(*sm);
|
NCM::InstallInterfaces(*sm);
|
||||||
NFC::InstallInterfaces(*sm);
|
NFC::InstallInterfaces(*sm);
|
||||||
NFP::InstallInterfaces(*sm);
|
NFP::InstallInterfaces(*sm, system);
|
||||||
NIFM::InstallInterfaces(*sm);
|
NIFM::InstallInterfaces(*sm, system);
|
||||||
NIM::InstallInterfaces(*sm);
|
NIM::InstallInterfaces(*sm, system);
|
||||||
NPNS::InstallInterfaces(*sm);
|
NPNS::InstallInterfaces(*sm);
|
||||||
NS::InstallInterfaces(*sm, system.GetFileSystemController());
|
NS::InstallInterfaces(*sm, system);
|
||||||
Nvidia::InstallInterfaces(*sm, *nv_flinger, system);
|
Nvidia::InstallInterfaces(*sm, *nv_flinger, system);
|
||||||
PCIe::InstallInterfaces(*sm);
|
PCIe::InstallInterfaces(*sm);
|
||||||
PCTL::InstallInterfaces(*sm);
|
PCTL::InstallInterfaces(*sm);
|
||||||
PCV::InstallInterfaces(*sm);
|
PCV::InstallInterfaces(*sm);
|
||||||
PlayReport::InstallInterfaces(system);
|
PlayReport::InstallInterfaces(*sm, system);
|
||||||
PM::InstallInterfaces(system);
|
PM::InstallInterfaces(system);
|
||||||
PSC::InstallInterfaces(*sm);
|
PSC::InstallInterfaces(*sm);
|
||||||
PSM::InstallInterfaces(*sm);
|
PSM::InstallInterfaces(*sm);
|
||||||
|
|
Loading…
Reference in a new issue