ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SI_DeviceKeyboard: Remove superfluous virtual specifiers. 

Removes an unnecessary memset as well.
This commit is contained in:
Lioncash 2015-01-20 21:03:55 -05:00
parent 5cd8a80553
commit 566a7a4829
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Source/Core/Core/HW/SI_DeviceKeyboard.cpp
View File

@ -51,8 +51,7 @@ int CSIDevice_Keyboard::RunBuffer(u8* _pBuffer, int _iLength)
KeyboardStatus CSIDevice_Keyboard::GetKeyboardStatus()
{
KeyboardStatus KeyStatus;
memset(&KeyStatus, 0, sizeof(KeyStatus));
KeyboardStatus KeyStatus = {};
Keyboard::GetStatus(ISIDevice::m_iDeviceNumber, &KeyStatus);
return KeyStatus;
}

12
Source/Core/Core/HW/SI_DeviceKeyboard.h
View File

@ -50,17 +50,17 @@ public:
CSIDevice_Keyboard(SIDevices device, int _iDeviceNumber);
// Run the SI Buffer
virtual int RunBuffer(u8* _pBuffer, int _iLength) override;
int RunBuffer(u8* _pBuffer, int _iLength) override;
// Return true on new data
virtual bool GetData(u32& _Hi, u32& _Low) override;
bool GetData(u32& _Hi, u32& _Low) override;
virtual KeyboardStatus GetKeyboardStatus();
virtual void MapKeys(KeyboardStatus& KeyStatus, u8* key);
KeyboardStatus GetKeyboardStatus();
void MapKeys(KeyboardStatus& KeyStatus, u8* key);
// Send a command directly
virtual void SendCommand(u32 _Cmd, u8 _Poll) override;
void SendCommand(u32 _Cmd, u8 _Poll) override;
// Savestate support
virtual void DoState(PointerWrap& p) override;
void DoState(PointerWrap& p) override;
};