Impaczus/rpcs3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compilation fix

Browse Source
This commit is contained in:
Nekotekina
2015-03-09 05:05:53 +03:00
parent 1653991b9d
commit 2709dc2e36
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
rpcs3/Emu/SysCalls/lv2/sys_timer.cpp
+7 -7
View File
@@ -16,7 +16,7 @@ s32 sys_timer_create(vm::ptr<u32> timer_id)
{ {
sys_timer.Warning("sys_timer_create(timer_id=*0x%x)", timer_id); sys_timer.Warning("sys_timer_create(timer_id=*0x%x)", timer_id);
std::shared_ptr<timer_t> timer(new timer_t); std::shared_ptr<lv2_timer_t> timer(new lv2_timer_t);
thread_t(fmt::format("Timer[%d] Thread", (*timer_id = Emu.GetIdManager().GetNewID(timer, TYPE_TIMER))), [timer]() thread_t(fmt::format("Timer[%d] Thread", (*timer_id = Emu.GetIdManager().GetNewID(timer, TYPE_TIMER))), [timer]()
{ {
@@ -63,7 +63,7 @@ s32 sys_timer_destroy(u32 timer_id)
LV2_LOCK; LV2_LOCK;
std::shared_ptr<timer_t> timer; std::shared_ptr<lv2_timer_t> timer;
if (!Emu.GetIdManager().GetIDData(timer_id, timer)) if (!Emu.GetIdManager().GetIDData(timer_id, timer))
{ {
return CELL_ESRCH; return CELL_ESRCH;
@@ -85,7 +85,7 @@ s32 sys_timer_get_information(u32 timer_id, vm::ptr<sys_timer_information_t> inf
LV2_LOCK; LV2_LOCK;
std::shared_ptr<timer_t> timer; std::shared_ptr<lv2_timer_t> timer;
if (!Emu.GetIdManager().GetIDData(timer_id, timer)) if (!Emu.GetIdManager().GetIDData(timer_id, timer))
{ {
return CELL_ESRCH; return CELL_ESRCH;
@@ -108,7 +108,7 @@ s32 _sys_timer_start(u32 timer_id, u64 base_time, u64 period)
LV2_LOCK; LV2_LOCK;
std::shared_ptr<timer_t> timer; std::shared_ptr<lv2_timer_t> timer;
if (!Emu.GetIdManager().GetIDData(timer_id, timer)) if (!Emu.GetIdManager().GetIDData(timer_id, timer))
{ {
return CELL_ESRCH; return CELL_ESRCH;
@@ -159,7 +159,7 @@ s32 sys_timer_stop(u32 timer_id)
LV2_LOCK; LV2_LOCK;
std::shared_ptr<timer_t> timer; std::shared_ptr<lv2_timer_t> timer;
if (!Emu.GetIdManager().GetIDData(timer_id, timer)) if (!Emu.GetIdManager().GetIDData(timer_id, timer))
{ {
return CELL_ESRCH; return CELL_ESRCH;
@@ -176,7 +176,7 @@ s32 sys_timer_connect_event_queue(u32 timer_id, u32 queue_id, u64 name, u64 data
LV2_LOCK; LV2_LOCK;
std::shared_ptr<timer_t> timer; std::shared_ptr<lv2_timer_t> timer;
std::shared_ptr<event_queue_t> queue; std::shared_ptr<event_queue_t> queue;
if (!Emu.GetIdManager().GetIDData(timer_id, timer) || !Emu.GetIdManager().GetIDData(queue_id, queue)) if (!Emu.GetIdManager().GetIDData(timer_id, timer) || !Emu.GetIdManager().GetIDData(queue_id, queue))
@@ -203,7 +203,7 @@ s32 sys_timer_disconnect_event_queue(u32 timer_id)
LV2_LOCK; LV2_LOCK;
std::shared_ptr<timer_t> timer; std::shared_ptr<lv2_timer_t> timer;
if (!Emu.GetIdManager().GetIDData(timer_id, timer)) if (!Emu.GetIdManager().GetIDData(timer_id, timer))
{ {
return CELL_ESRCH; return CELL_ESRCH;
rpcs3/Emu/SysCalls/lv2/sys_timer.h
+2 -2
View File
@@ -15,7 +15,7 @@ struct sys_timer_information_t
be_t<u32> pad; be_t<u32> pad;
}; };
struct timer_t struct lv2_timer_t
{ {
std::weak_ptr<event_queue_t> port; // event queue std::weak_ptr<event_queue_t> port; // event queue
u64 source; // event source u64 source; // event source
@@ -28,7 +28,7 @@ struct timer_t
std::atomic<u32> state; // timer state std::atomic<u32> state; // timer state
std::condition_variable cv; std::condition_variable cv;
timer_t() lv2_timer_t()
: start(0) : start(0)
, period(0) , period(0)
, state(SYS_TIMER_STATE_STOP) , state(SYS_TIMER_STATE_STOP)