mirror/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-02-01 12:32:48 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

SI_DeviceGCController: Amend variable names

Browse Source
This commit is contained in:
Lioncash 2017-03-14 04:51:05 -04:00
parent 890f799fdd
commit 46fd06b956
3 changed files with 158 additions and 152 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

237
Source/Core/Core/HW/SI/SI_DeviceGCController.cpp
View File

@ -18,51 +18,51 @@
#include "InputCommon/GCPadStatus.h" #include "InputCommon/GCPadStatus.h"
// --- standard GameCube controller --- // --- standard GameCube controller ---
CSIDevice_GCController::CSIDevice_GCController(SIDevices device, int _iDeviceNumber) CSIDevice_GCController::CSIDevice_GCController(SIDevices device, int device_number)
: ISIDevice(device, _iDeviceNumber) : ISIDevice(device, device_number)
{ {
} }
void CSIDevice_GCController::Calibrate() void CSIDevice_GCController::Calibrate()
{ {
GCPadStatus pad_origin = GetPadStatus(); GCPadStatus pad_origin = GetPadStatus();
memset(&m_Origin, 0, sizeof(SOrigin)); memset(&m_origin, 0, sizeof(SOrigin));
m_Origin.uButton = pad_origin.button; m_origin.button = pad_origin.button;
m_Origin.uOriginStickX = pad_origin.stickX; m_origin.origin_stick_x = pad_origin.stickX;
m_Origin.uOriginStickY = pad_origin.stickY; m_origin.origin_stick_y = pad_origin.stickY;
m_Origin.uSubStickStickX = pad_origin.substickX; m_origin.substick_x = pad_origin.substickX;
m_Origin.uSubStickStickY = pad_origin.substickY; m_origin.substick_y = pad_origin.substickY;
m_Origin.uTrigger_L = pad_origin.triggerLeft; m_origin.trigger_left = pad_origin.triggerLeft;
m_Origin.uTrigger_R = pad_origin.triggerRight; m_origin.trigger_right = pad_origin.triggerRight;
m_Calibrated = true; m_calibrated = true;
} }
int CSIDevice_GCController::RunBuffer(u8* _pBuffer, int _iLength) int CSIDevice_GCController::RunBuffer(u8* buffer, int length)
{ {
// For debug logging only // For debug logging only
ISIDevice::RunBuffer(_pBuffer, _iLength); ISIDevice::RunBuffer(buffer, length);
// Read the command // Read the command
EBufferCommands command = static_cast<EBufferCommands>(_pBuffer[3]); EBufferCommands command = static_cast<EBufferCommands>(buffer[3]);
// Handle it // Handle it
switch (command) switch (command)
{ {
case CMD_RESET: case CMD_RESET:
case CMD_ID: case CMD_ID:
*(u32*)&_pBuffer[0] = SI_GC_CONTROLLER; *(u32*)&buffer[0] = SI_GC_CONTROLLER;
break; break;
case CMD_DIRECT: case CMD_DIRECT:
{ {
INFO_LOG(SERIALINTERFACE, "PAD - Direct (Length: %d)", _iLength); INFO_LOG(SERIALINTERFACE, "PAD - Direct (Length: %d)", length);
u32 high, low; u32 high, low;
GetData(high, low); GetData(high, low);
for (int i = 0; i < (_iLength - 1) / 2; i++) for (int i = 0; i < (length - 1) / 2; i++)
{ {
_pBuffer[i + 0] = (high >> (i * 8)) & 0xff; buffer[i + 0] = (high >> (i * 8)) & 0xff;
_pBuffer[i + 4] = (low >> (i * 8)) & 0xff; buffer[i + 4] = (low >> (i * 8)) & 0xff;
} }
} }
break; break;
@ -71,13 +71,13 @@ int CSIDevice_GCController::RunBuffer(u8* _pBuffer, int _iLength)
{ {
INFO_LOG(SERIALINTERFACE, "PAD - Get Origin"); INFO_LOG(SERIALINTERFACE, "PAD - Get Origin");
if (!m_Calibrated) if (!m_calibrated)
Calibrate(); Calibrate();
u8* pCalibration = reinterpret_cast<u8*>(&m_Origin); u8* calibration = reinterpret_cast<u8*>(&m_origin);
for (int i = 0; i < (int)sizeof(SOrigin); i++) for (int i = 0; i < (int)sizeof(SOrigin); i++)
{ {
_pBuffer[i ^ 3] = *pCalibration++; buffer[i ^ 3] = *calibration++;
} }
} }
break; break;
@ -87,13 +87,13 @@ int CSIDevice_GCController::RunBuffer(u8* _pBuffer, int _iLength)
{ {
INFO_LOG(SERIALINTERFACE, "PAD - Recalibrate"); INFO_LOG(SERIALINTERFACE, "PAD - Recalibrate");
if (!m_Calibrated) if (!m_calibrated)
Calibrate(); Calibrate();
u8* pCalibration = reinterpret_cast<u8*>(&m_Origin); u8* calibration = reinterpret_cast<u8*>(&m_origin);
for (int i = 0; i < (int)sizeof(SOrigin); i++) for (int i = 0; i < (int)sizeof(SOrigin); i++)
{ {
_pBuffer[i ^ 3] = *pCalibration++; buffer[i ^ 3] = *calibration++;
} }
} }
break; break;
@ -107,30 +107,30 @@ int CSIDevice_GCController::RunBuffer(u8* _pBuffer, int _iLength)
break; break;
} }
return _iLength; return length;
} }
void CSIDevice_GCController::HandleMoviePadStatus(GCPadStatus* PadStatus) void CSIDevice_GCController::HandleMoviePadStatus(GCPadStatus* pad_status)
{ {
Movie::CallGCInputManip(PadStatus, m_device_number); Movie::CallGCInputManip(pad_status, m_device_number);
Movie::SetPolledDevice(); Movie::SetPolledDevice();
if (NetPlay_GetInput(m_device_number, PadStatus)) if (NetPlay_GetInput(m_device_number, pad_status))
{ {
} }
else if (Movie::IsPlayingInput()) else if (Movie::IsPlayingInput())
{ {
Movie::PlayController(PadStatus, m_device_number); Movie::PlayController(pad_status, m_device_number);
Movie::InputUpdate(); Movie::InputUpdate();
} }
else if (Movie::IsRecordingInput()) else if (Movie::IsRecordingInput())
{ {
Movie::RecordInput(PadStatus, m_device_number); Movie::RecordInput(pad_status, m_device_number);
Movie::InputUpdate(); Movie::InputUpdate();
} }
else else
{ {
Movie::CheckPadStatus(PadStatus, m_device_number); Movie::CheckPadStatus(pad_status, m_device_number);
} }
} }
@ -155,64 +155,64 @@ GCPadStatus CSIDevice_GCController::GetPadStatus()
// [00?SYXBA] [1LRZUDRL] [x] [y] [cx] [cy] [l] [r] // [00?SYXBA] [1LRZUDRL] [x] [y] [cx] [cy] [l] [r]
// |\_ ERR_LATCH (error latched - check SISR) // |\_ ERR_LATCH (error latched - check SISR)
// |_ ERR_STATUS (error on last GetData or SendCmd?) // |_ ERR_STATUS (error on last GetData or SendCmd?)
bool CSIDevice_GCController::GetData(u32& _Hi, u32& _Low) bool CSIDevice_GCController::GetData(u32& hi, u32& low)
{ {
GCPadStatus PadStatus = GetPadStatus(); GCPadStatus pad_status = GetPadStatus();
if (HandleButtonCombos(PadStatus) == COMBO_ORIGIN) if (HandleButtonCombos(pad_status) == COMBO_ORIGIN)
PadStatus.button |= PAD_GET_ORIGIN; pad_status.button |= PAD_GET_ORIGIN;
_Hi = MapPadStatus(PadStatus); hi = MapPadStatus(pad_status);
// Low bits are packed differently per mode // Low bits are packed differently per mode
if (m_Mode == 0 || m_Mode == 5 || m_Mode == 6 || m_Mode == 7) if (m_mode == 0 || m_mode == 5 || m_mode == 6 || m_mode == 7)
{ {
_Low = (u8)(PadStatus.analogB >> 4); // Top 4 bits low = (u8)(pad_status.analogB >> 4); // Top 4 bits
_Low |= (u32)((u8)(PadStatus.analogA >> 4) << 4); // Top 4 bits low |= (u32)((u8)(pad_status.analogA >> 4) << 4); // Top 4 bits
_Low |= (u32)((u8)(PadStatus.triggerRight >> 4) << 8); // Top 4 bits low |= (u32)((u8)(pad_status.triggerRight >> 4) << 8); // Top 4 bits
_Low |= (u32)((u8)(PadStatus.triggerLeft >> 4) << 12); // Top 4 bits low |= (u32)((u8)(pad_status.triggerLeft >> 4) << 12); // Top 4 bits
_Low |= (u32)((u8)(PadStatus.substickY) << 16); // All 8 bits low |= (u32)((u8)(pad_status.substickY) << 16); // All 8 bits
_Low |= (u32)((u8)(PadStatus.substickX) << 24); // All 8 bits low |= (u32)((u8)(pad_status.substickX) << 24); // All 8 bits
} }
else if (m_Mode == 1) else if (m_mode == 1)
{ {
_Low = (u8)(PadStatus.analogB >> 4); // Top 4 bits low = (u8)(pad_status.analogB >> 4); // Top 4 bits
_Low |= (u32)((u8)(PadStatus.analogA >> 4) << 4); // Top 4 bits low |= (u32)((u8)(pad_status.analogA >> 4) << 4); // Top 4 bits
_Low |= (u32)((u8)PadStatus.triggerRight << 8); // All 8 bits low |= (u32)((u8)pad_status.triggerRight << 8); // All 8 bits
_Low |= (u32)((u8)PadStatus.triggerLeft << 16); // All 8 bits low |= (u32)((u8)pad_status.triggerLeft << 16); // All 8 bits
_Low |= (u32)((u8)PadStatus.substickY << 24); // Top 4 bits low |= (u32)((u8)pad_status.substickY << 24); // Top 4 bits
_Low |= (u32)((u8)PadStatus.substickX << 28); // Top 4 bits low |= (u32)((u8)pad_status.substickX << 28); // Top 4 bits
} }
else if (m_Mode == 2) else if (m_mode == 2)
{ {
_Low = (u8)(PadStatus.analogB); // All 8 bits low = (u8)(pad_status.analogB); // All 8 bits
_Low |= (u32)((u8)(PadStatus.analogA) << 8); // All 8 bits low |= (u32)((u8)(pad_status.analogA) << 8); // All 8 bits
_Low |= (u32)((u8)(PadStatus.triggerRight >> 4) << 16); // Top 4 bits low |= (u32)((u8)(pad_status.triggerRight >> 4) << 16); // Top 4 bits
_Low |= (u32)((u8)(PadStatus.triggerLeft >> 4) << 20); // Top 4 bits low |= (u32)((u8)(pad_status.triggerLeft >> 4) << 20); // Top 4 bits
_Low |= (u32)((u8)PadStatus.substickY << 24); // Top 4 bits low |= (u32)((u8)pad_status.substickY << 24); // Top 4 bits
_Low |= (u32)((u8)PadStatus.substickX << 28); // Top 4 bits low |= (u32)((u8)pad_status.substickX << 28); // Top 4 bits
} }
else if (m_Mode == 3) else if (m_mode == 3)
{ {
// Analog A/B are always 0 // Analog A/B are always 0
_Low = (u8)PadStatus.triggerRight; // All 8 bits low = (u8)pad_status.triggerRight; // All 8 bits
_Low |= (u32)((u8)PadStatus.triggerLeft << 8); // All 8 bits low |= (u32)((u8)pad_status.triggerLeft << 8); // All 8 bits
_Low |= (u32)((u8)PadStatus.substickY << 16); // All 8 bits low |= (u32)((u8)pad_status.substickY << 16); // All 8 bits
_Low |= (u32)((u8)PadStatus.substickX << 24); // All 8 bits low |= (u32)((u8)pad_status.substickX << 24); // All 8 bits
} }
else if (m_Mode == 4) else if (m_mode == 4)
{ {
_Low = (u8)(PadStatus.analogB); // All 8 bits low = (u8)(pad_status.analogB); // All 8 bits
_Low |= (u32)((u8)(PadStatus.analogA) << 8); // All 8 bits low |= (u32)((u8)(pad_status.analogA) << 8); // All 8 bits
// triggerLeft/Right are always 0 // triggerLeft/Right are always 0
_Low |= (u32)((u8)PadStatus.substickY << 16); // All 8 bits low |= (u32)((u8)pad_status.substickY << 16); // All 8 bits
_Low |= (u32)((u8)PadStatus.substickX << 24); // All 8 bits low |= (u32)((u8)pad_status.substickX << 24); // All 8 bits
} }
// Unset all bits except those that represent // Unset all bits except those that represent
// A, B, X, Y, Start and the error bits, as they // A, B, X, Y, Start and the error bits, as they
// are not used. // are not used.
if (m_simulate_konga) if (m_simulate_konga)
_Hi &= ~0x20FFFFFF; hi &= ~0x20FFFFFF;
return true; return true;
} }
@ -220,48 +220,53 @@ bool CSIDevice_GCController::GetData(u32& _Hi, u32& _Low)
u32 CSIDevice_GCController::MapPadStatus(const GCPadStatus& pad_status) u32 CSIDevice_GCController::MapPadStatus(const GCPadStatus& pad_status)
{ {
// Thankfully changing mode does not change the high bits ;) // Thankfully changing mode does not change the high bits ;)
u32 _Hi = 0; u32 hi = 0;
_Hi = (u32)((u8)pad_status.stickY); hi = (u32)((u8)pad_status.stickY);
_Hi |= (u32)((u8)pad_status.stickX << 8); hi |= (u32)((u8)pad_status.stickX << 8);
_Hi |= (u32)((u16)(pad_status.button | PAD_USE_ORIGIN) << 16); hi |= (u32)((u16)(pad_status.button | PAD_USE_ORIGIN) << 16);
return _Hi; return hi;
} }
CSIDevice_GCController::EButtonCombo CSIDevice_GCController::EButtonCombo
CSIDevice_GCController::HandleButtonCombos(const GCPadStatus& pad_status) CSIDevice_GCController::HandleButtonCombos(const GCPadStatus& pad_status)
{ {
// Keep track of the special button combos (embedded in controller hardware... :( ) // Keep track of the special button combos (embedded in controller hardware... :( )
EButtonCombo tempCombo; EButtonCombo temp_combo;
if ((pad_status.button & 0xff00) == (PAD_BUTTON_Y | PAD_BUTTON_X | PAD_BUTTON_START)) if ((pad_status.button & 0xff00) == (PAD_BUTTON_Y | PAD_BUTTON_X | PAD_BUTTON_START))
tempCombo = COMBO_ORIGIN; temp_combo = COMBO_ORIGIN;
else if ((pad_status.button & 0xff00) == (PAD_BUTTON_B | PAD_BUTTON_X | PAD_BUTTON_START)) else if ((pad_status.button & 0xff00) == (PAD_BUTTON_B | PAD_BUTTON_X | PAD_BUTTON_START))
tempCombo = COMBO_RESET; temp_combo = COMBO_RESET;
else else
tempCombo = COMBO_NONE; temp_combo = COMBO_NONE;
if (tempCombo != m_LastButtonCombo)
if (temp_combo != m_last_button_combo)
{ {
m_LastButtonCombo = tempCombo; m_last_button_combo = temp_combo;
if (m_LastButtonCombo != COMBO_NONE) if (m_last_button_combo != COMBO_NONE)
m_TButtonComboStart = CoreTiming::GetTicks(); m_timer_button_combo_start = CoreTiming::GetTicks();
} }
if (m_LastButtonCombo != COMBO_NONE)
if (m_last_button_combo != COMBO_NONE)
{ {
m_TButtonCombo = CoreTiming::GetTicks(); m_timer_button_combo = CoreTiming::GetTicks();
if ((m_TButtonCombo - m_TButtonComboStart) > SystemTimers::GetTicksPerSecond() * 3) if ((m_timer_button_combo - m_timer_button_combo_start) > SystemTimers::GetTicksPerSecond() * 3)
{
if (m_last_button_combo == COMBO_RESET)
{ {
if (m_LastButtonCombo == COMBO_RESET)
ProcessorInterface::ResetButton_Tap(); ProcessorInterface::ResetButton_Tap();
else if (m_LastButtonCombo == COMBO_ORIGIN)
{
m_Origin.uOriginStickX = pad_status.stickX;
m_Origin.uOriginStickY = pad_status.stickY;
m_Origin.uSubStickStickX = pad_status.substickX;
m_Origin.uSubStickStickY = pad_status.substickY;
m_Origin.uTrigger_L = pad_status.triggerLeft;
m_Origin.uTrigger_R = pad_status.triggerRight;
} }
m_LastButtonCombo = COMBO_NONE; else if (m_last_button_combo == COMBO_ORIGIN)
return tempCombo; {
m_origin.origin_stick_x = pad_status.stickX;
m_origin.origin_stick_y = pad_status.stickY;
m_origin.substick_x = pad_status.substickX;
m_origin.substick_y = pad_status.substickY;
m_origin.trigger_left = pad_status.triggerLeft;
m_origin.trigger_right = pad_status.triggerRight;
}
m_last_button_combo = COMBO_NONE;
return temp_combo;
} }
} }
@ -269,11 +274,11 @@ CSIDevice_GCController::HandleButtonCombos(const GCPadStatus& pad_status)
} }
// SendCommand // SendCommand
void CSIDevice_GCController::SendCommand(u32 _Cmd, u8 _Poll) void CSIDevice_GCController::SendCommand(u32 command, u8 poll)
{ {
UCommand command(_Cmd); UCommand controller_command(command);
switch (command.Command) switch (controller_command.command)
{ {
// Costis sent it in some demos :) // Costis sent it in some demos :)
case 0x00: case 0x00:
@ -281,31 +286,31 @@ void CSIDevice_GCController::SendCommand(u32 _Cmd, u8 _Poll)
case CMD_WRITE: case CMD_WRITE:
{ {
unsigned int uType = command.Parameter1; // 0 = stop, 1 = rumble, 2 = stop hard unsigned int type = controller_command.parameter1; // 0 = stop, 1 = rumble, 2 = stop hard
unsigned int uStrength = command.Parameter2; unsigned int strength = controller_command.parameter2;
// get the correct pad number that should rumble locally when using netplay // get the correct pad number that should rumble locally when using netplay
const int numPAD = NetPlay_InGamePadToLocalPad(m_device_number); const int pad_num = NetPlay_InGamePadToLocalPad(m_device_number);
if (numPAD < 4) if (pad_num < 4)
{ {
if (uType == 1 && uStrength > 2) if (type == 1 && strength > 2)
CSIDevice_GCController::Rumble(numPAD, 1.0); CSIDevice_GCController::Rumble(pad_num, 1.0);
else else
CSIDevice_GCController::Rumble(numPAD, 0.0); CSIDevice_GCController::Rumble(pad_num, 0.0);
} }
if (!_Poll) if (!poll)
{ {
m_Mode = command.Parameter2; m_mode = controller_command.parameter2;
INFO_LOG(SERIALINTERFACE, "PAD %i set to mode %i", m_device_number, m_Mode); INFO_LOG(SERIALINTERFACE, "PAD %i set to mode %i", m_device_number, m_mode);
} }
} }
break; break;
default: default:
{ {
ERROR_LOG(SERIALINTERFACE, "Unknown direct command (0x%x)", _Cmd); ERROR_LOG(SERIALINTERFACE, "Unknown direct command (0x%x)", command);
PanicAlert("SI: Unknown direct command"); PanicAlert("SI: Unknown direct command");
} }
break; break;
@ -315,10 +320,10 @@ void CSIDevice_GCController::SendCommand(u32 _Cmd, u8 _Poll)
// Savestate support // Savestate support
void CSIDevice_GCController::DoState(PointerWrap& p) void CSIDevice_GCController::DoState(PointerWrap& p)
{ {
p.Do(m_Calibrated); p.Do(m_calibrated);
p.Do(m_Origin); p.Do(m_origin);
p.Do(m_Mode); p.Do(m_mode);
p.Do(m_TButtonComboStart); p.Do(m_timer_button_combo_start);
p.Do(m_TButtonCombo); p.Do(m_timer_button_combo);
p.Do(m_LastButtonCombo); p.Do(m_last_button_combo);
} }

56
Source/Core/Core/HW/SI/SI_DeviceGCController.h
View File

@ -23,13 +23,13 @@ protected:
struct SOrigin struct SOrigin
{ {
u16 uButton; u16 button;
u8 uOriginStickX; u8 origin_stick_x;
u8 uOriginStickY; u8 origin_stick_y;
u8 uSubStickStickX; u8 substick_x;
u8 uSubStickStickY; u8 substick_y;
u8 uTrigger_L; u8 trigger_left;
u8 uTrigger_R; u8 trigger_right;
u8 unk_4; u8 unk_4;
u8 unk_5; u8 unk_5;
u8 unk_6; u8 unk_6;
@ -43,16 +43,16 @@ protected:
union UCommand union UCommand
{ {
u32 Hex = 0; u32 hex = 0;
struct struct
{ {
u32 Parameter1 : 8; u32 parameter1 : 8;
u32 Parameter2 : 8; u32 parameter2 : 8;
u32 Command : 8; u32 command : 8;
u32 : 8; u32 : 8;
}; };
UCommand() = default; UCommand() = default;
UCommand(u32 _iValue) { Hex = _iValue; } UCommand(u32 value) : hex{value} {}
}; };
enum EButtonCombo enum EButtonCombo
@ -64,38 +64,38 @@ protected:
// struct to compare input against // struct to compare input against
// Set on connection and (standard pad only) on button combo // Set on connection and (standard pad only) on button combo
SOrigin m_Origin; SOrigin m_origin;
bool m_Calibrated = false; bool m_calibrated = false;
// PADAnalogMode // PADAnalogMode
// Dunno if we need to do this, game/lib should set it? // Dunno if we need to do this, game/lib should set it?
u8 m_Mode = 0x3; u8 m_mode = 0x3;
// Timer to track special button combos: // Timer to track special button combos:
// y, X, start for 3 seconds updates origin with current status // y, X, start for 3 seconds updates origin with current status
// Technically, the above is only on standard pad, wavebird does not support it for example // Technically, the above is only on standard pad, wavebird does not support it for example
// b, x, start for 3 seconds triggers reset (PI reset button interrupt) // b, x, start for 3 seconds triggers reset (PI reset button interrupt)
u64 m_TButtonComboStart = 0; u64 m_timer_button_combo_start = 0;
u64 m_TButtonCombo = 0; u64 m_timer_button_combo = 0;
// Type of button combo from the last/current poll // Type of button combo from the last/current poll
EButtonCombo m_LastButtonCombo = COMBO_NONE; EButtonCombo m_last_button_combo = COMBO_NONE;
// Set this if we want to simulate the "TaruKonga" DK Bongo controller // Set this if we want to simulate the "TaruKonga" DK Bongo controller
bool m_simulate_konga = false; bool m_simulate_konga = false;
public: public:
// Constructor // Constructor
CSIDevice_GCController(SIDevices device, int _iDeviceNumber); CSIDevice_GCController(SIDevices device, int device_number);
// Run the SI Buffer // Run the SI Buffer
int RunBuffer(u8* _pBuffer, int _iLength) override; int RunBuffer(u8* buffer, int length) override;
// Return true on new data // Return true on new data
bool GetData(u32& _Hi, u32& _Low) override; bool GetData(u32& hi, u32& low) override;
// Send a command directly // Send a command directly
void SendCommand(u32 _Cmd, u8 _Poll) override; void SendCommand(u32 command, u8 poll) override;
// Savestate support // Savestate support
void DoState(PointerWrap& p) override; void DoState(PointerWrap& p) override;
@ -105,23 +105,23 @@ public:
virtual EButtonCombo HandleButtonCombos(const GCPadStatus& pad_status); virtual EButtonCombo HandleButtonCombos(const GCPadStatus& pad_status);
// Send and Receive pad input from network // Send and Receive pad input from network
static bool NetPlay_GetInput(int numPAD, GCPadStatus* status); static bool NetPlay_GetInput(int pad_num, GCPadStatus* status);
static int NetPlay_InGamePadToLocalPad(int numPAD); static int NetPlay_InGamePadToLocalPad(int pad_num);
// Direct rumble to the right GC Controller // Direct rumble to the right GC Controller
static void Rumble(int numPad, ControlState strength); static void Rumble(int pad_num, ControlState strength);
protected: protected:
void Calibrate(); void Calibrate();
void HandleMoviePadStatus(GCPadStatus* PadStatus); void HandleMoviePadStatus(GCPadStatus* pad_status);
}; };
// "TaruKonga", the DK Bongo controller // "TaruKonga", the DK Bongo controller
class CSIDevice_TaruKonga : public CSIDevice_GCController class CSIDevice_TaruKonga : public CSIDevice_GCController
{ {
public: public:
CSIDevice_TaruKonga(SIDevices device, int _iDeviceNumber) CSIDevice_TaruKonga(SIDevices device, int device_number)
: CSIDevice_GCController(device, _iDeviceNumber) : CSIDevice_GCController(device, device_number)
{ {
m_simulate_konga = true; m_simulate_konga = true;
} }

17
Source/Core/Core/HW/SI/SI_DeviceGCSteeringWheel.cpp
View File

@ -42,7 +42,7 @@ int CSIDevice_GCSteeringWheel::RunBuffer(u8* _pBuffer, int _iLength)
bool CSIDevice_GCSteeringWheel::GetData(u32& _Hi, u32& _Low) bool CSIDevice_GCSteeringWheel::GetData(u32& _Hi, u32& _Low)
{ {
if (m_Mode == 6) if (m_mode == 6)
{ {
GCPadStatus PadStatus = GetPadStatus(); GCPadStatus PadStatus = GetPadStatus();
@ -75,12 +75,13 @@ void CSIDevice_GCSteeringWheel::SendCommand(u32 _Cmd, u8 _Poll)
{ {
UCommand command(_Cmd); UCommand command(_Cmd);
if (command.Command == CMD_FORCE) if (command.command == CMD_FORCE)
{ {
unsigned int uStrength = // 0 = left strong, 127 = left weak, 128 = right weak, 255 = right strong
command unsigned int uStrength = command.parameter1;
.Parameter1; // 0 = left strong, 127 = left weak, 128 = right weak, 255 = right strong
unsigned int uType = command.Parameter2; // 06 = motor on, 04 = motor off // 06 = motor on, 04 = motor off
unsigned int uType = command.parameter2;
// get the correct pad number that should rumble locally when using netplay // get the correct pad number that should rumble locally when using netplay
const int numPAD = NetPlay_InGamePadToLocalPad(m_device_number); const int numPAD = NetPlay_InGamePadToLocalPad(m_device_number);
@ -101,8 +102,8 @@ void CSIDevice_GCSteeringWheel::SendCommand(u32 _Cmd, u8 _Poll)
if (!_Poll) if (!_Poll)
{ {
m_Mode = command.Parameter2; m_mode = command.parameter2;
INFO_LOG(SERIALINTERFACE, "PAD %i set to mode %i", m_device_number, m_Mode); INFO_LOG(SERIALINTERFACE, "PAD %i set to mode %i", m_device_number, m_mode);
} }
} }
else else