From e68e99ef7118cb73fde1f2ac9ec95b1a20c37909 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Tue, 14 Mar 2017 17:46:09 -0400 Subject: [PATCH] SI_DeviceDanceMat: Amend variable naming --- Source/Core/Core/HW/SI/SI_DeviceDanceMat.cpp | 22 ++++++++++---------- Source/Core/Core/HW/SI/SI_DeviceDanceMat.h | 6 +++--- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/Source/Core/Core/HW/SI/SI_DeviceDanceMat.cpp b/Source/Core/Core/HW/SI/SI_DeviceDanceMat.cpp index 46291038b1..922dbffe12 100644 --- a/Source/Core/Core/HW/SI/SI_DeviceDanceMat.cpp +++ b/Source/Core/Core/HW/SI/SI_DeviceDanceMat.cpp @@ -7,27 +7,27 @@ #include "Common/CommonTypes.h" #include "InputCommon/GCPadStatus.h" -CSIDevice_DanceMat::CSIDevice_DanceMat(SIDevices device, int _iDeviceNumber) - : CSIDevice_GCController(device, _iDeviceNumber) +CSIDevice_DanceMat::CSIDevice_DanceMat(SIDevices device, int device_number) + : CSIDevice_GCController(device, device_number) { } -int CSIDevice_DanceMat::RunBuffer(u8* _pBuffer, int _iLength) +int CSIDevice_DanceMat::RunBuffer(u8* buffer, int length) { // Read the command - EBufferCommands command = static_cast(_pBuffer[3]); + EBufferCommands command = static_cast(buffer[3]); if (command == CMD_RESET) { - ISIDevice::RunBuffer(_pBuffer, _iLength); - *(u32*)&_pBuffer[0] = SI_DANCEMAT; + ISIDevice::RunBuffer(buffer, length); + *(u32*)&buffer[0] = SI_DANCEMAT; } else { - return CSIDevice_GCController::RunBuffer(_pBuffer, _iLength); + return CSIDevice_GCController::RunBuffer(buffer, length); } - return _iLength; + return length; } u32 CSIDevice_DanceMat::MapPadStatus(const GCPadStatus& pad_status) @@ -59,12 +59,12 @@ u32 CSIDevice_DanceMat::MapPadStatus(const GCPadStatus& pad_status) return (u32)(map << 16) | 0x8080; } -bool CSIDevice_DanceMat::GetData(u32& _Hi, u32& _Low) +bool CSIDevice_DanceMat::GetData(u32& hi, u32& low) { - CSIDevice_GCController::GetData(_Hi, _Low); + CSIDevice_GCController::GetData(hi, low); // Identifies the dance mat - _Low = 0x8080ffff; + low = 0x8080ffff; return true; } diff --git a/Source/Core/Core/HW/SI/SI_DeviceDanceMat.h b/Source/Core/Core/HW/SI/SI_DeviceDanceMat.h index fcaf14b86a..fa08d5ac79 100644 --- a/Source/Core/Core/HW/SI/SI_DeviceDanceMat.h +++ b/Source/Core/Core/HW/SI/SI_DeviceDanceMat.h @@ -12,9 +12,9 @@ struct GCPadStatus; class CSIDevice_DanceMat : public CSIDevice_GCController { public: - CSIDevice_DanceMat(SIDevices device, int _iDeviceNumber); + CSIDevice_DanceMat(SIDevices device, int device_number); - int RunBuffer(u8* _pBuffer, int _iLength) override; + int RunBuffer(u8* buffer, int length) override; u32 MapPadStatus(const GCPadStatus& pad_status) override; - bool GetData(u32& _Hi, u32& _Low) override; + bool GetData(u32& hi, u32& low) override; };