Merge pull request #13051 from mitaclaw/dead-config-code-2
SI_Device: Remove Dead Config Code
This commit is contained in:
commit
f9f832fa88
|
@ -3,11 +3,8 @@
|
||||||
|
|
||||||
#include "Core/HW/SI/SI_Device.h"
|
#include "Core/HW/SI/SI_Device.h"
|
||||||
|
|
||||||
#include <istream>
|
|
||||||
#include <memory>
|
#include <memory>
|
||||||
#include <ostream>
|
|
||||||
#include <string>
|
#include <string>
|
||||||
#include <type_traits>
|
|
||||||
|
|
||||||
#include <fmt/format.h>
|
#include <fmt/format.h>
|
||||||
|
|
||||||
|
@ -34,28 +31,6 @@ constexpr u64 GBA_BITS_PER_SECOND = 250000;
|
||||||
constexpr u64 GC_STOP_BIT_NS = 6500;
|
constexpr u64 GC_STOP_BIT_NS = 6500;
|
||||||
constexpr u64 GBA_STOP_BIT_NS = 14000;
|
constexpr u64 GBA_STOP_BIT_NS = 14000;
|
||||||
|
|
||||||
std::ostream& operator<<(std::ostream& stream, SIDevices device)
|
|
||||||
{
|
|
||||||
stream << static_cast<std::underlying_type_t<SIDevices>>(device);
|
|
||||||
return stream;
|
|
||||||
}
|
|
||||||
|
|
||||||
std::istream& operator>>(std::istream& stream, SIDevices& device)
|
|
||||||
{
|
|
||||||
std::underlying_type_t<SIDevices> value;
|
|
||||||
|
|
||||||
if (stream >> value)
|
|
||||||
{
|
|
||||||
device = static_cast<SIDevices>(value);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
device = SIDevices::SIDEVICE_NONE;
|
|
||||||
}
|
|
||||||
|
|
||||||
return stream;
|
|
||||||
}
|
|
||||||
|
|
||||||
ISIDevice::ISIDevice(Core::System& system, SIDevices device_type, int device_number)
|
ISIDevice::ISIDevice(Core::System& system, SIDevices device_type, int device_number)
|
||||||
: m_system(system), m_device_number(device_number), m_device_type(device_type)
|
: m_system(system), m_device_number(device_number), m_device_type(device_type)
|
||||||
{
|
{
|
||||||
|
|
|
@ -3,7 +3,6 @@
|
||||||
|
|
||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include <iosfwd>
|
|
||||||
#include <memory>
|
#include <memory>
|
||||||
#include "Common/CommonTypes.h"
|
#include "Common/CommonTypes.h"
|
||||||
|
|
||||||
|
@ -107,9 +106,6 @@ enum SIDevices : int
|
||||||
SIDEVICE_COUNT,
|
SIDEVICE_COUNT,
|
||||||
};
|
};
|
||||||
|
|
||||||
std::ostream& operator<<(std::ostream& stream, SIDevices device);
|
|
||||||
std::istream& operator>>(std::istream& stream, SIDevices& device);
|
|
||||||
|
|
||||||
class ISIDevice
|
class ISIDevice
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
|
|
Loading…
Reference in New Issue