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

SI_Device: Move implementation details into the cpp file 

Any changes to the base class' default behavior now won't require
all SI device source files to be recompiled.
This commit is contained in:
Lioncash 2017-01-22 22:25:24 -05:00
parent fb8f19f553
commit 0adb0dfeef
2 changed files with 27 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
Source/Core/Core/HW/SI/SI_Device.cpp
View File

@ -18,6 +18,23 @@
#include "Core/HW/SI/SI_DeviceKeyboard.h" #include "Core/HW/SI/SI_DeviceKeyboard.h"
#include "Core/HW/SI/SI_DeviceNull.h" #include "Core/HW/SI/SI_DeviceNull.h"
ISIDevice::ISIDevice(SIDevices device_type, int device_number)
: m_device_number(device_number), m_device_type(device_type)
{
}
ISIDevice::~ISIDevice() = default;
int ISIDevice::GetDeviceNumber() const
{
return m_device_number;
}
SIDevices ISIDevice::GetDeviceType() const
{
return m_device_type;
}
int ISIDevice::RunBuffer(u8* buffer, int length) int ISIDevice::RunBuffer(u8* buffer, int length)
{ {
#ifdef _DEBUG #ifdef _DEBUG
@ -48,6 +65,10 @@ int ISIDevice::TransferInterval()
return 0; return 0;
} }
void ISIDevice::DoState(PointerWrap& p)
{
}
// Check if a device class is inheriting from CSIDevice_GCController // Check if a device class is inheriting from CSIDevice_GCController
// The goal of this function is to avoid special casing a long list of // The goal of this function is to avoid special casing a long list of
// device types when there is no "real" input device, e.g. when playing // device types when there is no "real" input device, e.g. when playing

16
Source/Core/Core/HW/SI/SI_Device.h
View File

@ -73,14 +73,12 @@ enum SIDevices : int
class ISIDevice class ISIDevice
{ {
public: public:
// Constructor ISIDevice(SIDevices device_type, int device_number);
ISIDevice(SIDevices device_type, int device_number) virtual ~ISIDevice();
: m_device_number(device_number), m_device_type(device_type)
{ int GetDeviceNumber() const;
} SIDevices GetDeviceType() const;
// Destructor
virtual ~ISIDevice() {}
// Run the SI Buffer // Run the SI Buffer
virtual int RunBuffer(u8* buffer, int length); virtual int RunBuffer(u8* buffer, int length);
virtual int TransferInterval(); virtual int TransferInterval();
@ -92,9 +90,7 @@ public:
virtual void SendCommand(u32 command, u8 poll) = 0; virtual void SendCommand(u32 command, u8 poll) = 0;
// Savestate support // Savestate support
virtual void DoState(PointerWrap& p) {} virtual void DoState(PointerWrap& p);
int GetDeviceNumber() const { return m_device_number; }
SIDevices GetDeviceType() const { return m_device_type; }
protected: protected:
int m_device_number; int m_device_number;