From 1a98682ea0d1289337beab006d439f2a47f9c34c Mon Sep 17 00:00:00 2001 From: Megamouse Date: Sun, 21 May 2023 13:43:27 +0200 Subject: [PATCH] input: add enum count for enumeration --- rpcs3/Emu/Cell/Modules/cellGem.cpp | 2 ++ rpcs3/Emu/Io/Buzz.cpp | 2 ++ rpcs3/Emu/Io/GHLtar.cpp | 2 ++ rpcs3/Emu/Io/Turntable.cpp | 2 ++ rpcs3/Emu/Io/buzz_config.h | 4 +++- rpcs3/Emu/Io/gem_config.h | 2 ++ rpcs3/Emu/Io/ghltar_config.h | 4 +++- rpcs3/Emu/Io/turntable_config.h | 4 +++- rpcs3/Emu/Io/usio.cpp | 2 ++ rpcs3/Emu/Io/usio_config.h | 4 +++- 10 files changed, 24 insertions(+), 4 deletions(-) diff --git a/rpcs3/Emu/Cell/Modules/cellGem.cpp b/rpcs3/Emu/Cell/Modules/cellGem.cpp index 29943fc30e..47a70bb22a 100644 --- a/rpcs3/Emu/Cell/Modules/cellGem.cpp +++ b/rpcs3/Emu/Cell/Modules/cellGem.cpp @@ -687,6 +687,8 @@ static void ds3_input_to_pad(const u32 port_no, be_t& digital_buttons, be_t digital_buttons |= CELL_GEM_CTRL_T; analog_t = std::max(analog_t, button.m_value); break; + case gem_btn::count: + break; } } } diff --git a/rpcs3/Emu/Io/Buzz.cpp b/rpcs3/Emu/Io/Buzz.cpp index f4532779ae..5eeaa6f4e4 100644 --- a/rpcs3/Emu/Io/Buzz.cpp +++ b/rpcs3/Emu/Io/Buzz.cpp @@ -111,6 +111,8 @@ void usb_device_buzz::interrupt_transfer(u32 buf_size, u8* buf, u32 /*endpoint*/ case buzz_btn::blue: buf[2 + (4 + 5 * index) / 8] |= 1 << ((4 + 5 * index) % 8); // Blue break; + case buzz_btn::count: + break; } } } diff --git a/rpcs3/Emu/Io/GHLtar.cpp b/rpcs3/Emu/Io/GHLtar.cpp index 3da1753e6e..a69a31dacf 100644 --- a/rpcs3/Emu/Io/GHLtar.cpp +++ b/rpcs3/Emu/Io/GHLtar.cpp @@ -168,6 +168,8 @@ void usb_device_ghltar::interrupt_transfer(u32 buf_size, u8* buf, u32 /*endpoint case ghltar_btn::ghtv: buf[1] += 0x04; // GHTV Button break; + case ghltar_btn::count: + break; } } } diff --git a/rpcs3/Emu/Io/Turntable.cpp b/rpcs3/Emu/Io/Turntable.cpp index a934fd6795..c0cc19fabb 100644 --- a/rpcs3/Emu/Io/Turntable.cpp +++ b/rpcs3/Emu/Io/Turntable.cpp @@ -235,6 +235,8 @@ void usb_device_turntable::interrupt_transfer(u32 buf_size, u8* buf, u32 /*endpo case turntable_btn::select: buf[1] |= 0x01; // Select break; + case turntable_btn::count: + break; } } } diff --git a/rpcs3/Emu/Io/buzz_config.h b/rpcs3/Emu/Io/buzz_config.h index 44d64e71b5..d3d3680202 100644 --- a/rpcs3/Emu/Io/buzz_config.h +++ b/rpcs3/Emu/Io/buzz_config.h @@ -10,7 +10,9 @@ enum class buzz_btn yellow, green, orange, - blue + blue, + + count }; struct cfg_buzzer final : public emulated_pad_config diff --git a/rpcs3/Emu/Io/gem_config.h b/rpcs3/Emu/Io/gem_config.h index 9153b4e439..c6a99b75a9 100644 --- a/rpcs3/Emu/Io/gem_config.h +++ b/rpcs3/Emu/Io/gem_config.h @@ -14,6 +14,8 @@ enum class gem_btn square, move, t, + + count }; struct cfg_gem final : public emulated_pad_config diff --git a/rpcs3/Emu/Io/ghltar_config.h b/rpcs3/Emu/Io/ghltar_config.h index 7534eeeb4f..0d97153f5d 100644 --- a/rpcs3/Emu/Io/ghltar_config.h +++ b/rpcs3/Emu/Io/ghltar_config.h @@ -18,7 +18,9 @@ enum class ghltar_btn strum_down, strum_up, dpad_left, - dpad_right + dpad_right, + + count }; struct cfg_ghltar final : public emulated_pad_config diff --git a/rpcs3/Emu/Io/turntable_config.h b/rpcs3/Emu/Io/turntable_config.h index 1b3f6e2b58..80b4ddb13d 100644 --- a/rpcs3/Emu/Io/turntable_config.h +++ b/rpcs3/Emu/Io/turntable_config.h @@ -18,7 +18,9 @@ enum class turntable_btn square, circle, cross, - triangle + triangle, + + count }; struct cfg_turntable final : public emulated_pad_config diff --git a/rpcs3/Emu/Io/usio.cpp b/rpcs3/Emu/Io/usio.cpp index 0590133d46..fe329b7e51 100644 --- a/rpcs3/Emu/Io/usio.cpp +++ b/rpcs3/Emu/Io/usio.cpp @@ -245,6 +245,8 @@ void usb_device_usio::translate_input() if (button.m_pressed) std::memcpy(input_buf.data() + 38 + offset, &c_small_hit, sizeof(u16)); break; + case usio_btn::count: + break; } } } diff --git a/rpcs3/Emu/Io/usio_config.h b/rpcs3/Emu/Io/usio_config.h index 4b00a19dd6..f7038a5ff1 100644 --- a/rpcs3/Emu/Io/usio_config.h +++ b/rpcs3/Emu/Io/usio_config.h @@ -19,7 +19,9 @@ enum class usio_btn small_hit_side_left, small_hit_side_right, small_hit_center_left, - small_hit_center_right + small_hit_center_right, + + count }; struct cfg_usio final : public emulated_pad_config