From 995c4f27ad9bb05e51aa7edd18b9473bb80fab09 Mon Sep 17 00:00:00 2001 From: Megamouse Date: Wed, 8 Jan 2025 14:50:50 +0100 Subject: [PATCH] Fix some warnings --- rpcs3/Emu/Cell/SPUThread.cpp | 2 +- rpcs3/Emu/Io/PadHandler.cpp | 2 +- rpcs3/Emu/Io/pad_types.cpp | 2 +- rpcs3/Emu/Io/pad_types.h | 2 +- rpcs3/Input/ps_move_handler.cpp | 12 ++++++------ 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/rpcs3/Emu/Cell/SPUThread.cpp b/rpcs3/Emu/Cell/SPUThread.cpp index 8804d93138..54679dee41 100644 --- a/rpcs3/Emu/Cell/SPUThread.cpp +++ b/rpcs3/Emu/Cell/SPUThread.cpp @@ -5481,7 +5481,7 @@ bool spu_thread::reservation_check(u32 addr, u32 hash, atomic_t* range_ usz spu_thread::register_cache_line_waiter(u32 addr) { - const u64 value = u64{compute_rdata_hash32(rdata)} << 32 | raddr; + const u64 value = u64{compute_rdata_hash32(rdata)} << 32 | addr; for (usz i = 0; i < std::size(g_spu_waiters_by_value); i++) { diff --git a/rpcs3/Emu/Io/PadHandler.cpp b/rpcs3/Emu/Io/PadHandler.cpp index 4dc9bcb546..44648f252f 100644 --- a/rpcs3/Emu/Io/PadHandler.cpp +++ b/rpcs3/Emu/Io/PadHandler.cpp @@ -883,7 +883,7 @@ void PadHandlerBase::get_orientation(const pad_ensemble& binding) const return; } - if (!pad->move_data.orientation_enabled || pad->get_orientation_reset_button_active(pad->m_player_id)) + if (!pad->move_data.orientation_enabled || pad->get_orientation_reset_button_active()) { // This can be called extensively in quick succession, so let's just reset the pointer instead of creating a new object. device->ahrs.reset(); diff --git a/rpcs3/Emu/Io/pad_types.cpp b/rpcs3/Emu/Io/pad_types.cpp index 0e9c41bcaa..46d1f284d7 100644 --- a/rpcs3/Emu/Io/pad_types.cpp +++ b/rpcs3/Emu/Io/pad_types.cpp @@ -253,7 +253,7 @@ bool Pad::get_analog_limiter_button_active(bool is_toggle_mode, u32 player_id) return analog_limiter_button.m_pressed; } -bool Pad::get_orientation_reset_button_active(u32 player_id) +bool Pad::get_orientation_reset_button_active() { if (m_orientation_reset_button_index < 0) { diff --git a/rpcs3/Emu/Io/pad_types.h b/rpcs3/Emu/Io/pad_types.h index 966b1a6b28..f48fbf7850 100644 --- a/rpcs3/Emu/Io/pad_types.h +++ b/rpcs3/Emu/Io/pad_types.h @@ -518,7 +518,7 @@ struct Pad bool get_analog_limiter_button_active(bool is_toggle_mode, u32 player_id); s32 m_orientation_reset_button_index{-1}; // Special button index. -1 if not set. - bool get_orientation_reset_button_active(u32 player_id); + bool get_orientation_reset_button_active(); // Cable State: 0 - 1 plugged in ? u8 m_cable_state{0}; diff --git a/rpcs3/Input/ps_move_handler.cpp b/rpcs3/Input/ps_move_handler.cpp index d405775764..b53b4bcd7e 100644 --- a/rpcs3/Input/ps_move_handler.cpp +++ b/rpcs3/Input/ps_move_handler.cpp @@ -679,12 +679,12 @@ void ps_move_handler::get_extended_info(const pad_ensemble& binding) if (dev->model == ps_move_model::ZCM1) { - accel_x -= zero_shift; - accel_y -= zero_shift; - accel_z -= zero_shift; - gyro_x -= zero_shift; - gyro_y -= zero_shift; - gyro_z -= zero_shift; + accel_x -= static_cast(zero_shift); + accel_y -= static_cast(zero_shift); + accel_z -= static_cast(zero_shift); + gyro_x -= static_cast(zero_shift); + gyro_y -= static_cast(zero_shift); + gyro_z -= static_cast(zero_shift); } if (!device->config || !device->config->orientation_enabled)