Code style fixes and nits on the HLE project (#355)
* Some style fixes and nits on ITimeZoneService * Remove some unneeded usings * Remove the Ryujinx.HLE.OsHle.Handles namespace * Remove hbmenu automatic load on process exit * Rename Ns to Device, rename Os to System, rename SystemState to State * Move Exceptions and Utilities out of OsHle * Rename OsHle to HOS * Rename OsHle folder to HOS * IManagerDisplayService and ISystemDisplayService style fixes * BsdError shouldn't be public * Add a empty new line before using static * Remove unused file * Some style fixes on NPDM * Exit gracefully when the application is closed * Code style fixes on IGeneralService * Add 0x prefix on values printed as hex * Small improvements on finalization code * Move ProcessId and ThreadId out of AThreadState * Rename VFs to FileSystem * FsAccessHeader shouldn't be public. Also fix file names casing * More case changes on NPDM * Remove unused files * Move using to the correct place on NPDM * Use properties on KernelAccessControlMmio * Address PR feedback
This commit is contained in:
parent
182d716867
commit
521751795a
258 changed files with 1574 additions and 1546 deletions
|
@ -1,107 +0,0 @@
|
|||
using Ryujinx.HLE.OsHle.Ipc;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
|
||||
namespace Ryujinx.HLE.OsHle.Services.Time
|
||||
{
|
||||
class ISystemClock : IpcService
|
||||
{
|
||||
private Dictionary<int, ServiceProcessRequest> m_Commands;
|
||||
|
||||
public override IReadOnlyDictionary<int, ServiceProcessRequest> Commands => m_Commands;
|
||||
|
||||
private static readonly DateTime Epoch = new DateTime(1970, 1, 1, 0, 0, 0, DateTimeKind.Utc);
|
||||
|
||||
private SystemClockType ClockType;
|
||||
|
||||
private DateTime SystemClockContextEpoch;
|
||||
|
||||
private long SystemClockTimePoint;
|
||||
|
||||
private byte[] SystemClockContextEnding;
|
||||
|
||||
private long TimeOffset;
|
||||
|
||||
public ISystemClock(SystemClockType ClockType)
|
||||
{
|
||||
m_Commands = new Dictionary<int, ServiceProcessRequest>()
|
||||
{
|
||||
{ 0, GetCurrentTime },
|
||||
{ 1, SetCurrentTime },
|
||||
{ 2, GetSystemClockContext },
|
||||
{ 3, SetSystemClockContext }
|
||||
};
|
||||
|
||||
this.ClockType = ClockType;
|
||||
SystemClockContextEpoch = System.Diagnostics.Process.GetCurrentProcess().StartTime;
|
||||
SystemClockContextEnding = new byte[0x10];
|
||||
TimeOffset = 0;
|
||||
|
||||
if (ClockType == SystemClockType.User ||
|
||||
ClockType == SystemClockType.Network)
|
||||
{
|
||||
SystemClockContextEpoch = SystemClockContextEpoch.ToUniversalTime();
|
||||
}
|
||||
|
||||
SystemClockTimePoint = (long)(SystemClockContextEpoch - Epoch).TotalSeconds;
|
||||
}
|
||||
|
||||
public long GetCurrentTime(ServiceCtx Context)
|
||||
{
|
||||
DateTime CurrentTime = DateTime.Now;
|
||||
|
||||
if (ClockType == SystemClockType.User ||
|
||||
ClockType == SystemClockType.Network)
|
||||
{
|
||||
CurrentTime = CurrentTime.ToUniversalTime();
|
||||
}
|
||||
|
||||
Context.ResponseData.Write((long)((CurrentTime - Epoch).TotalSeconds) + TimeOffset);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
public long SetCurrentTime(ServiceCtx Context)
|
||||
{
|
||||
DateTime CurrentTime = DateTime.Now;
|
||||
|
||||
if (ClockType == SystemClockType.User ||
|
||||
ClockType == SystemClockType.Network)
|
||||
{
|
||||
CurrentTime = CurrentTime.ToUniversalTime();
|
||||
}
|
||||
|
||||
TimeOffset = (Context.RequestData.ReadInt64() - (long)(CurrentTime - Epoch).TotalSeconds);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
public long GetSystemClockContext(ServiceCtx Context)
|
||||
{
|
||||
Context.ResponseData.Write((long)(SystemClockContextEpoch - Epoch).TotalSeconds);
|
||||
|
||||
// The point in time, TODO: is there a link between epoch and this?
|
||||
Context.ResponseData.Write(SystemClockTimePoint);
|
||||
|
||||
// This seems to be some kind of identifier?
|
||||
for (int i = 0; i < 0x10; i++)
|
||||
{
|
||||
Context.ResponseData.Write(SystemClockContextEnding[i]);
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
public long SetSystemClockContext(ServiceCtx Context)
|
||||
{
|
||||
long NewSystemClockEpoch = Context.RequestData.ReadInt64();
|
||||
long NewSystemClockTimePoint = Context.RequestData.ReadInt64();
|
||||
|
||||
SystemClockContextEpoch = Epoch.Add(TimeSpan.FromSeconds(NewSystemClockEpoch));
|
||||
SystemClockTimePoint = NewSystemClockTimePoint;
|
||||
SystemClockContextEnding = Context.RequestData.ReadBytes(0x10);
|
||||
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
}
|
Loading…
Add table
Add a link
Reference in a new issue