diff options
Diffstat (limited to 'Ryujinx.HLE/HOS/Services/Time/StaticService')
3 files changed, 15 insertions, 6 deletions
diff --git a/Ryujinx.HLE/HOS/Services/Time/StaticService/ISteadyClock.cs b/Ryujinx.HLE/HOS/Services/Time/StaticService/ISteadyClock.cs index a5ce8d6a..1e517713 100644 --- a/Ryujinx.HLE/HOS/Services/Time/StaticService/ISteadyClock.cs +++ b/Ryujinx.HLE/HOS/Services/Time/StaticService/ISteadyClock.cs @@ -1,4 +1,5 @@ using Ryujinx.Common; +using Ryujinx.Cpu; using Ryujinx.HLE.HOS.Services.Time.Clock; namespace Ryujinx.HLE.HOS.Services.Time.StaticService @@ -25,7 +26,9 @@ namespace Ryujinx.HLE.HOS.Services.Time.StaticService return ResultCode.UninitializedClock; } - SteadyClockTimePoint currentTimePoint = _steadyClock.GetCurrentTimePoint(context.Thread); + ITickSource tickSource = context.Device.System.TickSource; + + SteadyClockTimePoint currentTimePoint = _steadyClock.GetCurrentTimePoint(tickSource); context.ResponseData.WriteStruct(currentTimePoint); diff --git a/Ryujinx.HLE/HOS/Services/Time/StaticService/ISystemClock.cs b/Ryujinx.HLE/HOS/Services/Time/StaticService/ISystemClock.cs index 1d9f7873..085cc71d 100644 --- a/Ryujinx.HLE/HOS/Services/Time/StaticService/ISystemClock.cs +++ b/Ryujinx.HLE/HOS/Services/Time/StaticService/ISystemClock.cs @@ -1,4 +1,5 @@ using Ryujinx.Common; +using Ryujinx.Cpu; using Ryujinx.HLE.HOS.Ipc; using Ryujinx.HLE.HOS.Kernel.Common; using Ryujinx.HLE.HOS.Kernel.Threading; @@ -31,7 +32,9 @@ namespace Ryujinx.HLE.HOS.Services.Time.StaticService return ResultCode.UninitializedClock; } - ResultCode result = _clockCore.GetCurrentTime(context.Thread, out long posixTime); + ITickSource tickSource = context.Device.System.TickSource; + + ResultCode result = _clockCore.GetCurrentTime(tickSource, out long posixTime); if (result == ResultCode.Success) { @@ -57,7 +60,9 @@ namespace Ryujinx.HLE.HOS.Services.Time.StaticService long posixTime = context.RequestData.ReadInt64(); - return _clockCore.SetCurrentTime(context.Thread, posixTime); + ITickSource tickSource = context.Device.System.TickSource; + + return _clockCore.SetCurrentTime(tickSource, posixTime); } [CommandHipc(2)] @@ -69,7 +74,9 @@ namespace Ryujinx.HLE.HOS.Services.Time.StaticService return ResultCode.UninitializedClock; } - ResultCode result = _clockCore.GetClockContext(context.Thread, out SystemClockContext clockContext); + ITickSource tickSource = context.Device.System.TickSource; + + ResultCode result = _clockCore.GetClockContext(tickSource, out SystemClockContext clockContext); if (result == ResultCode.Success) { diff --git a/Ryujinx.HLE/HOS/Services/Time/StaticService/ITimeZoneServiceForPsc.cs b/Ryujinx.HLE/HOS/Services/Time/StaticService/ITimeZoneServiceForPsc.cs index 83d745e3..202099b0 100644 --- a/Ryujinx.HLE/HOS/Services/Time/StaticService/ITimeZoneServiceForPsc.cs +++ b/Ryujinx.HLE/HOS/Services/Time/StaticService/ITimeZoneServiceForPsc.cs @@ -7,7 +7,6 @@ using Ryujinx.HLE.Utilities; using System; using System.Diagnostics; using System.IO; -using System.Text; namespace Ryujinx.HLE.HOS.Services.Time.StaticService { @@ -44,7 +43,7 @@ namespace Ryujinx.HLE.HOS.Services.Time.StaticService { return ResultCode.PermissionDenied; } - + return ResultCode.NotImplemented; } |