piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-25 07:09:48 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #12491 from lioncash/si

Browse Source 
HW/SI: Remove remaining global system accessors
This commit is contained in:
Tilka
2024-01-08 21:30:47 +00:00
committed by GitHub
parent 63453bda4d 409d2ecad3
commit e7ecc6fc9f
4 changed files with 21 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -112,7 +112,8 @@ void ISIDevice::OnEvent(u64 userdata, s64 cycles_late)
{ {
} }
int SIDevice_GetGBATransferTime(EBufferCommands cmd) int SIDevice_GetGBATransferTime(const SystemTimers::SystemTimersManager& timers,
EBufferCommands cmd)
{ {
u64 gc_bytes_transferred = 1; u64 gc_bytes_transferred = 1;
u64 gba_bytes_transferred = 1; u64 gba_bytes_transferred = 1;
@ -143,7 +144,7 @@ int SIDevice_GetGBATransferTime(EBufferCommands cmd)
} }
} }
const u32 ticks_per_second = Core::System::GetInstance().GetSystemTimers().GetTicksPerSecond(); const u32 ticks_per_second = timers.GetTicksPerSecond();
const u64 cycles = (gba_bytes_transferred * 8 * ticks_per_second / GBA_BITS_PER_SECOND) + const u64 cycles = (gba_bytes_transferred * 8 * ticks_per_second / GBA_BITS_PER_SECOND) +
(gc_bytes_transferred * 8 * ticks_per_second / GC_BITS_PER_SECOND) + (gc_bytes_transferred * 8 * ticks_per_second / GC_BITS_PER_SECOND) +
(stop_bits_ns * ticks_per_second / 1000000000LL); (stop_bits_ns * ticks_per_second / 1000000000LL);

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

@ -12,6 +12,10 @@ namespace Core
{ {
class System; class System;
} }
namespace SystemTimers
{
class SystemTimersManager;
}
namespace SerialInterface namespace SerialInterface
{ {
@ -138,7 +142,8 @@ protected:
SIDevices m_device_type; SIDevices m_device_type;
}; };
int SIDevice_GetGBATransferTime(EBufferCommands cmd); int SIDevice_GetGBATransferTime(const SystemTimers::SystemTimersManager& timers,
EBufferCommands cmd);
bool SIDevice_IsGCController(SIDevices type); bool SIDevice_IsGCController(SIDevices type);
std::unique_ptr<ISIDevice> SIDevice_Create(Core::System& system, SIDevices device, int port_number); std::unique_ptr<ISIDevice> SIDevice_Create(Core::System& system, SIDevices device, int port_number);

4
Source/Core/Core/HW/SI/SI_DeviceGBA.cpp
View File

@ -298,7 +298,7 @@ int CSIDevice_GBA::RunBuffer(u8* buffer, int request_length)
{ {
int elapsed_time = static_cast<int>(m_system.GetCoreTiming().GetTicks() - m_timestamp_sent); int elapsed_time = static_cast<int>(m_system.GetCoreTiming().GetTicks() - m_timestamp_sent);
// Tell SI to ask again after TransferInterval() cycles // Tell SI to ask again after TransferInterval() cycles
if (SIDevice_GetGBATransferTime(m_last_cmd) > elapsed_time) if (SIDevice_GetGBATransferTime(m_system.GetSystemTimers(), m_last_cmd) > elapsed_time)
return 0; return 0;
m_next_action = NextAction::ReceiveResponse; m_next_action = NextAction::ReceiveResponse;
[[fallthrough]]; [[fallthrough]];
@ -345,7 +345,7 @@ int CSIDevice_GBA::RunBuffer(u8* buffer, int request_length)
int CSIDevice_GBA::TransferInterval() int CSIDevice_GBA::TransferInterval()
{ {
return SIDevice_GetGBATransferTime(m_last_cmd); return SIDevice_GetGBATransferTime(m_system.GetSystemTimers(), m_last_cmd);
} }
bool CSIDevice_GBA::GetData(u32& hi, u32& low) bool CSIDevice_GBA::GetData(u32& hi, u32& low)

16
Source/Core/Core/HW/SI/SI_DeviceGBAEmu.cpp
View File

@ -22,9 +22,9 @@
namespace SerialInterface namespace SerialInterface
{ {
static s64 GetSyncInterval() static s64 GetSyncInterval(const SystemTimers::SystemTimersManager& timers)
{ {
return Core::System::GetInstance().GetSystemTimers().GetTicksPerSecond() / 1000; return timers.GetTicksPerSecond() / 1000;
} }
CSIDevice_GBAEmu::CSIDevice_GBAEmu(Core::System& system, SIDevices device, int device_number) CSIDevice_GBAEmu::CSIDevice_GBAEmu(Core::System& system, SIDevices device, int device_number)
@ -34,7 +34,8 @@ CSIDevice_GBAEmu::CSIDevice_GBAEmu(Core::System& system, SIDevices device, int d
m_core->Start(system.GetCoreTiming().GetTicks()); m_core->Start(system.GetCoreTiming().GetTicks());
m_gbahost = Host_CreateGBAHost(m_core); m_gbahost = Host_CreateGBAHost(m_core);
m_core->SetHost(m_gbahost); m_core->SetHost(m_gbahost);
system.GetSerialInterface().ScheduleEvent(m_device_number, GetSyncInterval()); system.GetSerialInterface().ScheduleEvent(m_device_number,
GetSyncInterval(system.GetSystemTimers()));
} }
CSIDevice_GBAEmu::~CSIDevice_GBAEmu() CSIDevice_GBAEmu::~CSIDevice_GBAEmu()
@ -61,7 +62,8 @@ int CSIDevice_GBAEmu::RunBuffer(u8* buffer, int request_length)
auto& si = m_system.GetSerialInterface(); auto& si = m_system.GetSerialInterface();
si.RemoveEvent(m_device_number); si.RemoveEvent(m_device_number);
si.ScheduleEvent(m_device_number, TransferInterval() + GetSyncInterval()); si.ScheduleEvent(m_device_number,
TransferInterval() + GetSyncInterval(m_system.GetSystemTimers()));
for (int i = 0; i < MAX_SI_CHANNELS; ++i) for (int i = 0; i < MAX_SI_CHANNELS; ++i)
{ {
if (i == m_device_number || si.GetDeviceType(i) != GetDeviceType()) if (i == m_device_number || si.GetDeviceType(i) != GetDeviceType())
@ -115,7 +117,7 @@ int CSIDevice_GBAEmu::RunBuffer(u8* buffer, int request_length)
int CSIDevice_GBAEmu::TransferInterval() int CSIDevice_GBAEmu::TransferInterval()
{ {
return SIDevice_GetGBATransferTime(m_last_cmd); return SIDevice_GetGBATransferTime(m_system.GetSystemTimers(), m_last_cmd);
} }
bool CSIDevice_GBAEmu::GetData(u32& hi, u32& low) bool CSIDevice_GBAEmu::GetData(u32& hi, u32& low)
@ -165,6 +167,8 @@ void CSIDevice_GBAEmu::DoState(PointerWrap& p)
void CSIDevice_GBAEmu::OnEvent(u64 userdata, s64 cycles_late) void CSIDevice_GBAEmu::OnEvent(u64 userdata, s64 cycles_late)
{ {
m_core->SendJoybusCommand(m_system.GetCoreTiming().GetTicks() + userdata, 0, nullptr, m_keys); m_core->SendJoybusCommand(m_system.GetCoreTiming().GetTicks() + userdata, 0, nullptr, m_keys);
m_system.GetSerialInterface().ScheduleEvent(m_device_number, userdata + GetSyncInterval());
const auto num_cycles = userdata + GetSyncInterval(m_system.GetSystemTimers());
m_system.GetSerialInterface().ScheduleEvent(m_device_number, num_cycles);
} }
} // namespace SerialInterface } // namespace SerialInterface