From a24ede4f40ec177c68ef26e7aadaea45012825df Mon Sep 17 00:00:00 2001 From: Ani Date: Sat, 20 Apr 2019 22:41:25 +0100 Subject: [PATCH] cellPad: Update vendor and product IDs - Used IDs were not from the Guitar Hero instruments but in fact from the Rock Band ones. Sets the correct Guitar Hero IDs and adds the Rock Band ones on comments. TODO: Allow selecting the specific devices on the PAD Settings. - Adds DJ Hero Turntable VID/PID. - Adds Dance Dance Revolution Mat VID/PID. --- rpcs3/Emu/Cell/Modules/cellPad.cpp | 29 +++++++++++++++++++++++++---- 1 file changed, 25 insertions(+), 4 deletions(-) diff --git a/rpcs3/Emu/Cell/Modules/cellPad.cpp b/rpcs3/Emu/Cell/Modules/cellPad.cpp index 62c720bce4..5eae26b405 100644 --- a/rpcs3/Emu/Cell/Modules/cellPad.cpp +++ b/rpcs3/Emu/Cell/Modules/cellPad.cpp @@ -580,20 +580,41 @@ error_code cellPadGetInfo(vm::ptr info) pads[i]->m_port_status &= ~CELL_PAD_STATUS_ASSIGN_CHANGES; // TODO: should ASSIGN flags be cleared here? info->status[i] = pads[i]->m_port_status; + // TODO: Allow selecting different product IDs switch (pads[i]->m_class_type) { case CELL_PAD_PCLASS_TYPE_GUITAR: - // Guitar Hero Guitar + // Sony Computer Entertainment America info->vendor_id[i] = 0x12BA; - info->product_id[i] = 0x0200; + // RedOctane Guitar (Guitar Hero) + info->product_id[i] = 0x0100; + // Harmonix Guitar (Rock Band) + // info->product_id[i] = 0x0200; break; case CELL_PAD_PCLASS_TYPE_DRUM: - // Guitar Hero Drum + // Sony Computer Entertainment America info->vendor_id[i] = 0x12BA; - info->product_id[i] = 0x0210; + // RedOctane Drum Kit (Guitar Hero) + info->product_id[i] = 0x0120; + // Harmonix Drum Kit (Rock Band) + // info->product_id[i] = 0x0210; + break; + case CELL_PAD_PCLASS_TYPE_DJ: + // Sony Computer Entertainment America + info->vendor_id[i] = 0x12BA; + // DJ Hero Turntable + info->product_id[i] = 0x0140; + break; + case CELL_PAD_PCLASS_TYPE_DANCEMAT: + // Konami Digital Entertainment + info->vendor_id[i] = 0x1CCF; + // Dance Dance Revolution Mat + info->product_id[i] = 0x0140; break; default: + // Sony Corp. info->vendor_id[i] = 0x054C; + // PlayStation 3 Controller info->product_id[i] = 0x0268; break; }