archive/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-07-06 23:11:25 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions

Bugfixes

Browse source
This commit is contained in:
Nekotekina 2015-04-12 23:16:30 +03:00
parent ea5110cec3
commit fea6fd1a70
14 changed files with 323 additions and 303 deletions
Download patch file Download diff file Expand all files Collapse all files

28
rpcs3/Emu/SysCalls/lv2/sys_timer.cpp
View file

@ -28,7 +28,7 @@ s32 sys_timer_create(vm::ptr<u32> timer_id)
{
if (get_system_time() >= timer->start)
{
std::shared_ptr<event_queue_t> queue = timer->port.lock();
const auto queue = timer->port.lock();
if (queue)
{
@ -62,9 +62,9 @@ s32 sys_timer_destroy(u32 timer_id)
LV2_LOCK;
std::shared_ptr<lv2_timer_t> timer;
const auto timer = Emu.GetIdManager().GetIDData<lv2_timer_t>(timer_id);
if (!Emu.GetIdManager().GetIDData(timer_id, timer))
if (!timer)
{
return CELL_ESRCH;
}
@ -85,9 +85,9 @@ s32 sys_timer_get_information(u32 timer_id, vm::ptr<sys_timer_information_t> inf
LV2_LOCK;
std::shared_ptr<lv2_timer_t> timer;
const auto timer = Emu.GetIdManager().GetIDData<lv2_timer_t>(timer_id);
if (!Emu.GetIdManager().GetIDData(timer_id, timer))
if (!timer)
{
return CELL_ESRCH;
}
@ -108,9 +108,9 @@ s32 _sys_timer_start(u32 timer_id, u64 base_time, u64 period)
LV2_LOCK;
std::shared_ptr<lv2_timer_t> timer;
const auto timer = Emu.GetIdManager().GetIDData<lv2_timer_t>(timer_id);
if (!Emu.GetIdManager().GetIDData(timer_id, timer))
if (!timer)
{
return CELL_ESRCH;
}
@ -160,9 +160,9 @@ s32 sys_timer_stop(u32 timer_id)
LV2_LOCK;
std::shared_ptr<lv2_timer_t> timer;
const auto timer = Emu.GetIdManager().GetIDData<lv2_timer_t>(timer_id);
if (!Emu.GetIdManager().GetIDData(timer_id, timer))
if (!timer)
{
return CELL_ESRCH;
}
@ -178,10 +178,10 @@ s32 sys_timer_connect_event_queue(u32 timer_id, u32 queue_id, u64 name, u64 data
LV2_LOCK;
std::shared_ptr<lv2_timer_t> timer;
std::shared_ptr<event_queue_t> queue;
const auto timer = Emu.GetIdManager().GetIDData<lv2_timer_t>(timer_id);
const auto queue = Emu.GetIdManager().GetIDData<event_queue_t>(queue_id);
if (!Emu.GetIdManager().GetIDData(timer_id, timer) || !Emu.GetIdManager().GetIDData(queue_id, queue))
if (!timer || !queue)
{
return CELL_ESRCH;
}
@ -205,9 +205,9 @@ s32 sys_timer_disconnect_event_queue(u32 timer_id)
LV2_LOCK;
std::shared_ptr<lv2_timer_t> timer;
const auto timer = Emu.GetIdManager().GetIDData<lv2_timer_t>(timer_id);
if (!Emu.GetIdManager().GetIDData(timer_id, timer))
if (!timer)
{
return CELL_ESRCH;
}