diff --git a/rpcs3/Emu/Cell/lv2/sys_cond.cpp b/rpcs3/Emu/Cell/lv2/sys_cond.cpp index e6617cc96e..4e10ddc6ff 100644 --- a/rpcs3/Emu/Cell/lv2/sys_cond.cpp +++ b/rpcs3/Emu/Cell/lv2/sys_cond.cpp @@ -30,7 +30,6 @@ error_code sys_cond_create(ppu_thread& ppu, vm::ptr cond_id, u32 mutex_id, { return std::make_shared( _attr.pshared, - _attr.flags, _attr.ipc_key, _attr.name_u64, mutex_id, diff --git a/rpcs3/Emu/Cell/lv2/sys_cond.h b/rpcs3/Emu/Cell/lv2/sys_cond.h index 1b945b1209..281694c512 100644 --- a/rpcs3/Emu/Cell/lv2/sys_cond.h +++ b/rpcs3/Emu/Cell/lv2/sys_cond.h @@ -23,7 +23,6 @@ struct lv2_cond final : lv2_obj static const u32 id_base = 0x86000000; const u32 shared; - const s32 flags; const u64 key; const u64 name; const u32 mtx_id; @@ -32,9 +31,8 @@ struct lv2_cond final : lv2_obj atomic_t waiters{0}; std::deque sq; - lv2_cond(u32 shared, s32 flags, u64 key, u64 name, u32 mtx_id, std::shared_ptr mutex) + lv2_cond(u32 shared, u64 key, u64 name, u32 mtx_id, std::shared_ptr mutex) : shared(shared) - , flags(flags) , key(key) , name(name) , mtx_id(mtx_id) diff --git a/rpcs3/Emu/Cell/lv2/sys_event_flag.cpp b/rpcs3/Emu/Cell/lv2/sys_event_flag.cpp index aaed5f702d..3a216af861 100644 --- a/rpcs3/Emu/Cell/lv2/sys_event_flag.cpp +++ b/rpcs3/Emu/Cell/lv2/sys_event_flag.cpp @@ -48,7 +48,6 @@ error_code sys_event_flag_create(ppu_thread& ppu, vm::ptr id, vm::ptr pattern; std::deque sq; - lv2_event_flag(u32 protocol, u32 shared, u64 key, s32 flags, s32 type, u64 name, u64 pattern) + lv2_event_flag(u32 protocol, u32 shared, u64 key, s32 type, u64 name, u64 pattern) : protocol{protocol} , shared(shared) , key(key) - , flags(flags) , type(type) , name(name) , pattern(pattern) diff --git a/rpcs3/Emu/Cell/lv2/sys_mutex.cpp b/rpcs3/Emu/Cell/lv2/sys_mutex.cpp index 567afbfd2b..fb9a56776d 100644 --- a/rpcs3/Emu/Cell/lv2/sys_mutex.cpp +++ b/rpcs3/Emu/Cell/lv2/sys_mutex.cpp @@ -62,7 +62,6 @@ error_code sys_mutex_create(ppu_thread& ppu, vm::ptr mutex_id, vm::ptr obj_count{}; std::deque sq; - lv2_mutex(u32 protocol, u32 recursive, u32 shared, u32 adaptive, u64 key, s32 flags, u64 name) + lv2_mutex(u32 protocol, u32 recursive, u32 shared, u32 adaptive, u64 key, u64 name) : protocol{protocol} , recursive(recursive) , shared(shared) , adaptive(adaptive) , key(key) , name(name) - , flags(flags) { } diff --git a/rpcs3/Emu/Cell/lv2/sys_rwlock.cpp b/rpcs3/Emu/Cell/lv2/sys_rwlock.cpp index 5ad4e483bb..7140e73fe2 100644 --- a/rpcs3/Emu/Cell/lv2/sys_rwlock.cpp +++ b/rpcs3/Emu/Cell/lv2/sys_rwlock.cpp @@ -34,7 +34,7 @@ error_code sys_rwlock_create(ppu_thread& ppu, vm::ptr rw_lock_id, vm::ptr(_attr.pshared, _attr.ipc_key, _attr.flags, [&] { - return std::make_shared(protocol, _attr.pshared, _attr.ipc_key, _attr.flags, _attr.name_u64); + return std::make_shared(protocol, _attr.pshared, _attr.ipc_key, _attr.name_u64); })) { return error; diff --git a/rpcs3/Emu/Cell/lv2/sys_rwlock.h b/rpcs3/Emu/Cell/lv2/sys_rwlock.h index 8539a6d0fa..db67bfd566 100644 --- a/rpcs3/Emu/Cell/lv2/sys_rwlock.h +++ b/rpcs3/Emu/Cell/lv2/sys_rwlock.h @@ -27,19 +27,17 @@ struct lv2_rwlock final : lv2_obj const u32 shared; const u64 key; const u64 name; - const s32 flags; shared_mutex mutex; atomic_t owner{0}; std::deque rq; std::deque wq; - lv2_rwlock(u32 protocol, u32 shared, u64 key, s32 flags, u64 name) + lv2_rwlock(u32 protocol, u32 shared, u64 key, u64 name) : protocol{protocol} , shared(shared) , key(key) , name(name) - , flags(flags) { } }; diff --git a/rpcs3/Emu/Cell/lv2/sys_semaphore.cpp b/rpcs3/Emu/Cell/lv2/sys_semaphore.cpp index a385f54b5c..f21613687e 100644 --- a/rpcs3/Emu/Cell/lv2/sys_semaphore.cpp +++ b/rpcs3/Emu/Cell/lv2/sys_semaphore.cpp @@ -40,7 +40,7 @@ error_code sys_semaphore_create(ppu_thread& ppu, vm::ptr sem_id, vm::ptr(_attr.pshared, _attr.ipc_key, _attr.flags, [&] { - return std::make_shared(protocol, _attr.pshared, _attr.ipc_key, _attr.flags, _attr.name_u64, max_val, initial_val); + return std::make_shared(protocol, _attr.pshared, _attr.ipc_key, _attr.name_u64, max_val, initial_val); })) { return error; diff --git a/rpcs3/Emu/Cell/lv2/sys_semaphore.h b/rpcs3/Emu/Cell/lv2/sys_semaphore.h index 73e7fa1a0e..af6fd260cd 100644 --- a/rpcs3/Emu/Cell/lv2/sys_semaphore.h +++ b/rpcs3/Emu/Cell/lv2/sys_semaphore.h @@ -27,19 +27,17 @@ struct lv2_sema final : lv2_obj const u32 shared; const u64 key; const u64 name; - const s32 flags; const s32 max; shared_mutex mutex; atomic_t val; std::deque sq; - lv2_sema(u32 protocol, u32 shared, u64 key, s32 flags, u64 name, s32 max, s32 value) + lv2_sema(u32 protocol, u32 shared, u64 key, u64 name, s32 max, s32 value) : protocol{protocol} , shared(shared) , key(key) , name(name) - , flags(flags) , max(max) , val(value) {