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

Merge pull request #5229 from lioncash/si-id 

SI_Devices: Get rid of pointer casts for ID assignment in RunBuffer
This commit is contained in:
Matthew Parlane 2017-04-09 20:09:44 +12:00 committed by GitHub
parent db79c8db29 069b70b2b4
commit 394b847b6c
4 changed files with 25 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Source/Core/Core/HW/SI/SI_DeviceDanceMat.cpp
View File

@ -4,6 +4,8 @@
#include "Core/HW/SI/SI_DeviceDanceMat.h"
#include <cstring>
#include "Common/CommonTypes.h"
#include "InputCommon/GCPadStatus.h"
@ -22,7 +24,9 @@ int CSIDevice_DanceMat::RunBuffer(u8* buffer, int length)
if (command == CMD_RESET)
{
ISIDevice::RunBuffer(buffer, length);
*(u32*)&buffer[0] = SI_DANCEMAT;
constexpr u32 id = SI_DANCEMAT;
std::memcpy(buffer, &id, sizeof(id));
}
else
{

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

@ -4,6 +4,8 @@
#include "Core/HW/SI/SI_DeviceGCController.h"
#include <cstring>
#include "Common/ChunkFile.h"
#include "Common/CommonTypes.h"
#include "Common/Logging/Log.h"
@ -53,8 +55,11 @@ int CSIDevice_GCController::RunBuffer(u8* buffer, int length)
{
case CMD_RESET:
case CMD_ID:
*(u32*)&buffer[0] = SI_GC_CONTROLLER;
{
constexpr u32 id = SI_GC_CONTROLLER;
std::memcpy(buffer, &id, sizeof(id));
break;
}
case CMD_DIRECT:
{

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

@ -4,6 +4,8 @@
#include "Core/HW/SI/SI_DeviceGCSteeringWheel.h"
#include <cstring>
#include "Common/CommonTypes.h"
#include "Common/Logging/Log.h"
#include "Core/HW/GCPad.h"
@ -28,15 +30,14 @@ int CSIDevice_GCSteeringWheel::RunBuffer(u8* buffer, int length)
{
case CMD_RESET:
case CMD_ID:
*(u32*)&buffer[0] = SI_GC_STEERING;
break;
// DEFAULT
default:
{
return CSIDevice_GCController::RunBuffer(buffer, length);
constexpr u32 id = SI_GC_STEERING;
std::memcpy(buffer, &id, sizeof(id));
break;
}
break;
default:
return CSIDevice_GCController::RunBuffer(buffer, length);
}
return length;

7
Source/Core/Core/HW/SI/SI_DeviceKeyboard.cpp
View File

@ -4,6 +4,8 @@
#include "Core/HW/SI/SI_DeviceKeyboard.h"
#include <cstring>
#include "Common/ChunkFile.h"
#include "Common/CommonTypes.h"
#include "Common/Logging/Log.h"
@ -31,8 +33,11 @@ int CSIDevice_Keyboard::RunBuffer(u8* buffer, int length)
{
case CMD_RESET:
case CMD_ID:
*(u32*)&buffer[0] = SI_GC_KEYBOARD;
{
constexpr u32 id = SI_GC_KEYBOARD;
std::memcpy(buffer, &id, sizeof(id));
break;
}
case CMD_DIRECT:
{