From de58f1986600521423dec50d968fdf8bc2eac189 Mon Sep 17 00:00:00 2001 From: Megamouse Date: Sat, 25 Apr 2020 02:13:06 +0200 Subject: [PATCH] input: add Rock Revolution Drum Controller product info --- rpcs3/Input/product_info.h | 15 +++++++++++---- rpcs3/rpcs3qt/pad_settings_dialog.cpp | 5 +++++ 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/rpcs3/Input/product_info.h b/rpcs3/Input/product_info.h index d17b7ac71..ca1318ae1 100644 --- a/rpcs3/Input/product_info.h +++ b/rpcs3/Input/product_info.h @@ -13,6 +13,7 @@ namespace input dj_hero_turntable, harmonix_rockband_guitar, harmonix_rockband_drum_kit, + rock_revolution_drum_kit }; enum vendor_id @@ -31,14 +32,15 @@ namespace input harmonix_rockband_guitar = 0x0200, // Harmonix Guitar (Rock Band II Guitar Controller) harmonix_rockband_drum_kit = 0x0210, // Harmonix Drum Kit (Rock Band II Drum Controller) playstation_3_controller = 0x0268, // PlayStation 3 Controller + rock_revolution_drum_kit = 0x0300, // Rock Revolution Drum Controller }; struct product_info { product_type type; - uint16_t vendor_id; - uint16_t product_id; - uint32_t pclass_profile; // See CELL_PAD_PCLASS_PROFILE flags + unsigned short vendor_id; + unsigned short product_id; + unsigned int pclass_profile; // See CELL_PAD_PCLASS_PROFILE flags }; static product_info get_product_info(product_type type) @@ -74,6 +76,10 @@ namespace input { return product_info{ type, vendor_id::sony_cea, product_id::red_octane_gh_guitar, 0x000000FF }; } + case product_type::rock_revolution_drum_kit: + { + return product_info{ type, vendor_id::sony_cea, product_id::rock_revolution_drum_kit, 0x000000FB }; + } } } @@ -102,7 +108,8 @@ namespace input return { get_product_info(product_type::red_octane_gh_drum_kit), - get_product_info(product_type::harmonix_rockband_drum_kit) + get_product_info(product_type::harmonix_rockband_drum_kit), + get_product_info(product_type::rock_revolution_drum_kit) }; } case 3: // CELL_PAD_PCLASS_TYPE_DJ diff --git a/rpcs3/rpcs3qt/pad_settings_dialog.cpp b/rpcs3/rpcs3qt/pad_settings_dialog.cpp index 0204c6808..b2c940087 100644 --- a/rpcs3/rpcs3qt/pad_settings_dialog.cpp +++ b/rpcs3/rpcs3qt/pad_settings_dialog.cpp @@ -1281,6 +1281,11 @@ void pad_settings_dialog::HandleDeviceClassChange(int index) ui->chooseProduct->addItem(tr("Guitar Hero", "RedOctane Guitar Hero Guitar"), static_cast(product.type)); break; } + case input::product_type::rock_revolution_drum_kit: + { + ui->chooseProduct->addItem(tr("Rock Revolution", "Rock Revolution Drum Controller"), static_cast(product.type)); + break; + } } } }