mirrors/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-04-21 12:05:23 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Use g_fxo for sysutil_cb_manager

Browse source
This commit is contained in:
Nekotekina 2019-08-24 18:10:46 +03:00
parent a921fe3351
commit 8304043d00
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
rpcs3/Emu/Cell/Modules/cellSysutil.cpp
View file

@ -45,14 +45,15 @@ struct sysutil_cb_manager
extern void sysutil_register_cb(std::function<s32(ppu_thread&)>&& cb)
{
const auto cbm = fxm::get_always<sysutil_cb_manager>();
const auto cbm = g_fxo->get<sysutil_cb_manager>();
cbm->registered.push(std::move(cb));
}
extern void sysutil_send_system_cmd(u64 status, u64 param)
{
if (const auto cbm = fxm::get<sysutil_cb_manager>())
// May be nullptr if emulation is stopped
if (const auto cbm = g_fxo->get<sysutil_cb_manager>())
{
for (sysutil_cb_manager::registered_cb cb : cbm->callbacks)
{
@ -251,7 +252,7 @@ error_code cellSysutilCheckCallback(ppu_thread& ppu)
{
cellSysutil.trace("cellSysutilCheckCallback()");
const auto cbm = fxm::get_always<sysutil_cb_manager>();
const auto cbm = g_fxo->get<sysutil_cb_manager>();
for (auto&& func : cbm->registered.pop_all())
{
@ -279,7 +280,7 @@ s32 cellSysutilRegisterCallback(s32 slot, vm::ptr<CellSysutilCallback> func, vm:
return CELL_SYSUTIL_ERROR_VALUE;
}
const auto cbm = fxm::get_always<sysutil_cb_manager>();
const auto cbm = g_fxo->get<sysutil_cb_manager>();
cbm->callbacks[slot].store({func, userdata});
@ -295,7 +296,7 @@ s32 cellSysutilUnregisterCallback(u32 slot)
return CELL_SYSUTIL_ERROR_VALUE;
}
const auto cbm = fxm::get_always<sysutil_cb_manager>();
const auto cbm = g_fxo->get<sysutil_cb_manager>();
cbm->callbacks[slot].store({});