franklinblanco/yuzu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Addressed issues

Browse Source
This commit is contained in:
David Marcec 2019-06-17 08:17:26 +10:00
parent 50e3269f3b
commit 6ca20ad7ba
4 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/core/file_sys/control_metadata.cpp
View File

@ -88,7 +88,7 @@ u64 NACP::GetDefaultJournalSaveSize() const {
} }
bool NACP::GetUserAccountSwitchLock() const { bool NACP::GetUserAccountSwitchLock() const {
return raw.user_account_switch_lock == 1; return raw.user_account_switch_lock != 0;
} }
u32 NACP::GetSupportedLanguages() const { u32 NACP::GetSupportedLanguages() const {

17
src/core/hle/service/acc/acc.cpp
View File

@ -243,6 +243,8 @@ void Module::Interface::IsUserAccountSwitchLocked(Kernel::HLERequestContext& ctx
if (nacp_unique != nullptr) { if (nacp_unique != nullptr) {
is_locked = nacp_unique->GetUserAccountSwitchLock(); is_locked = nacp_unique->GetUserAccountSwitchLock();
} else {
LOG_ERROR(Service_ACC, "nacp_unique is null!");
} }
} else { } else {
is_locked = nacp.GetUserAccountSwitchLock(); is_locked = nacp.GetUserAccountSwitchLock();
@ -285,15 +287,18 @@ Module::Interface::Interface(std::shared_ptr<Module> module,
Module::Interface::~Interface() = default; Module::Interface::~Interface() = default;
void InstallInterfaces(SM::ServiceManager& service_manager) { void InstallInterfaces(Core::System& system) {
auto module = std::make_shared<Module>(); auto module = std::make_shared<Module>();
auto profile_manager = std::make_shared<ProfileManager>(); auto profile_manager = std::make_shared<ProfileManager>();
Core::System& system = Core::System::GetInstance();
std::make_shared<ACC_AA>(module, profile_manager, system)->InstallAsService(service_manager); std::make_shared<ACC_AA>(module, profile_manager, system)
std::make_shared<ACC_SU>(module, profile_manager, system)->InstallAsService(service_manager); ->InstallAsService(system.ServiceManager());
std::make_shared<ACC_U0>(module, profile_manager, system)->InstallAsService(service_manager); std::make_shared<ACC_SU>(module, profile_manager, system)
std::make_shared<ACC_U1>(module, profile_manager, system)->InstallAsService(service_manager); ->InstallAsService(system.ServiceManager());
std::make_shared<ACC_U0>(module, profile_manager, system)
->InstallAsService(system.ServiceManager());
std::make_shared<ACC_U1>(module, profile_manager, system)
->InstallAsService(system.ServiceManager());
} }
} // namespace Service::Account } // namespace Service::Account

2
src/core/hle/service/acc/acc.h
View File

@ -39,6 +39,6 @@ public:
}; };
/// Registers all ACC services with the specified service manager. /// Registers all ACC services with the specified service manager.
void InstallInterfaces(SM::ServiceManager& service_manager); void InstallInterfaces(Core::System& system);
} // namespace Service::Account } // namespace Service::Account

2
src/core/hle/service/service.cpp
View File

@ -200,7 +200,7 @@ void Init(std::shared_ptr<SM::ServiceManager>& sm, Core::System& system,
SM::ServiceManager::InstallInterfaces(sm); SM::ServiceManager::InstallInterfaces(sm);
Account::InstallInterfaces(*sm); Account::InstallInterfaces(system);
AM::InstallInterfaces(*sm, nv_flinger); AM::InstallInterfaces(*sm, nv_flinger);
AOC::InstallInterfaces(*sm); AOC::InstallInterfaces(*sm);
APM::InstallInterfaces(*sm); APM::InstallInterfaces(*sm);