drashna/ryujinx
1
0
Fork 0
Code Activity Actions

Revert "Adjust naming conventions and general refactoring in HLE Project (#490)" (#526)

Browse source 
This reverts commit 85dbb9559a.
This commit is contained in:
gdkchan 2018-12-04 22:52:39 -02:00 • committed by GitHub
parent 85dbb9559a
commit 3615a70cae
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
299 changed files with 12276 additions and 12268 deletions
Download patch file Download diff file Expand all files Collapse all files

22
Ryujinx.HLE/HOS/Services/Nifm/IGeneralService.cs
View file

@ -13,44 +13,44 @@ namespace Ryujinx.HLE.HOS.Services.Nifm
{
class IGeneralService : IpcService
{
private Dictionary<int, ServiceProcessRequest> _commands;
private Dictionary<int, ServiceProcessRequest> m_Commands;
public override IReadOnlyDictionary<int, ServiceProcessRequest> Commands => _commands;
public override IReadOnlyDictionary<int, ServiceProcessRequest> Commands => m_Commands;
public IGeneralService()
{
_commands = new Dictionary<int, ServiceProcessRequest>
m_Commands = new Dictionary<int, ServiceProcessRequest>()
{
{ 4, CreateRequest },
{ 12, GetCurrentIpAddress }
};
}
public long CreateRequest(ServiceCtx context)
public long CreateRequest(ServiceCtx Context)
{
int unknown = context.RequestData.ReadInt32();
int Unknown = Context.RequestData.ReadInt32();
MakeObject(context, new IRequest(context.Device.System));
MakeObject(Context, new IRequest(Context.Device.System));
Logger.PrintStub(LogClass.ServiceNifm, "Stubbed.");
return 0;
}
public long GetCurrentIpAddress(ServiceCtx context)
public long GetCurrentIpAddress(ServiceCtx Context)
{
if (!NetworkInterface.GetIsNetworkAvailable())
{
return MakeError(ErrorModule.Nifm, NifmErr.NoInternetConnection);
}
IPHostEntry host = Dns.GetHostEntry(Dns.GetHostName());
IPHostEntry Host = Dns.GetHostEntry(Dns.GetHostName());
IPAddress address = host.AddressList.FirstOrDefault(a => a.AddressFamily == AddressFamily.InterNetwork);
IPAddress Address = Host.AddressList.FirstOrDefault(A => A.AddressFamily == AddressFamily.InterNetwork);
context.ResponseData.Write(BitConverter.ToUInt32(address.GetAddressBytes()));
Context.ResponseData.Write(BitConverter.ToUInt32(Address.GetAddressBytes()));
Logger.PrintInfo(LogClass.ServiceNifm, $"Console's local IP is \"{address}\".");
Logger.PrintInfo(LogClass.ServiceNifm, $"Console's local IP is \"{Address}\".");
return 0;
}

36
Ryujinx.HLE/HOS/Services/Nifm/IRequest.cs
View file

@ -8,16 +8,16 @@ namespace Ryujinx.HLE.HOS.Services.Nifm
{
class IRequest : IpcService
{
private Dictionary<int, ServiceProcessRequest> _commands;
private Dictionary<int, ServiceProcessRequest> m_Commands;
public override IReadOnlyDictionary<int, ServiceProcessRequest> Commands => _commands;
public override IReadOnlyDictionary<int, ServiceProcessRequest> Commands => m_Commands;
private KEvent _event0;
private KEvent _event1;
private KEvent Event0;
private KEvent Event1;
public IRequest(Horizon system)
public IRequest(Horizon System)
{
_commands = new Dictionary<int, ServiceProcessRequest>
m_Commands = new Dictionary<int, ServiceProcessRequest>()
{
{ 0, GetRequestState },
{ 1, GetResult },
@ -27,58 +27,58 @@ namespace Ryujinx.HLE.HOS.Services.Nifm
{ 11, SetConnectionConfirmationOption }
};
_event0 = new KEvent(system);
_event1 = new KEvent(system);
Event0 = new KEvent(System);
Event1 = new KEvent(System);
}
public long GetRequestState(ServiceCtx context)
public long GetRequestState(ServiceCtx Context)
{
context.ResponseData.Write(1);
Context.ResponseData.Write(1);
Logger.PrintStub(LogClass.ServiceNifm, "Stubbed.");
return 0;
}
public long GetResult(ServiceCtx context)
public long GetResult(ServiceCtx Context)
{
Logger.PrintStub(LogClass.ServiceNifm, "Stubbed.");
return 0;
}
public long GetSystemEventReadableHandles(ServiceCtx context)
public long GetSystemEventReadableHandles(ServiceCtx Context)
{
if (context.Process.HandleTable.GenerateHandle(_event0.ReadableEvent, out int handle0) != KernelResult.Success)
if (Context.Process.HandleTable.GenerateHandle(Event0.ReadableEvent, out int Handle0) != KernelResult.Success)
{
throw new InvalidOperationException("Out of handles!");
}
if (context.Process.HandleTable.GenerateHandle(_event1.ReadableEvent, out int handle1) != KernelResult.Success)
if (Context.Process.HandleTable.GenerateHandle(Event1.ReadableEvent, out int Handle1) != KernelResult.Success)
{
throw new InvalidOperationException("Out of handles!");
}
context.Response.HandleDesc = IpcHandleDesc.MakeCopy(handle0, handle1);
Context.Response.HandleDesc = IpcHandleDesc.MakeCopy(Handle0, Handle1);
return 0;
}
public long Cancel(ServiceCtx context)
public long Cancel(ServiceCtx Context)
{
Logger.PrintStub(LogClass.ServiceNifm, "Stubbed.");
return 0;
}
public long Submit(ServiceCtx context)
public long Submit(ServiceCtx Context)
{
Logger.PrintStub(LogClass.ServiceNifm, "Stubbed.");
return 0;
}
public long SetConnectionConfirmationOption(ServiceCtx context)
public long SetConnectionConfirmationOption(ServiceCtx Context)
{
Logger.PrintStub(LogClass.ServiceNifm, "Stubbed.");

14
Ryujinx.HLE/HOS/Services/Nifm/IStaticService.cs
View file

@ -5,29 +5,29 @@ namespace Ryujinx.HLE.HOS.Services.Nifm
{
class IStaticService : IpcService
{
private Dictionary<int, ServiceProcessRequest> _commands;
private Dictionary<int, ServiceProcessRequest> m_Commands;
public override IReadOnlyDictionary<int, ServiceProcessRequest> Commands => _commands;
public override IReadOnlyDictionary<int, ServiceProcessRequest> Commands => m_Commands;
public IStaticService()
{
_commands = new Dictionary<int, ServiceProcessRequest>
m_Commands = new Dictionary<int, ServiceProcessRequest>()
{
{ 4, CreateGeneralServiceOld },
{ 5, CreateGeneralService }
};
}
public long CreateGeneralServiceOld(ServiceCtx context)
public long CreateGeneralServiceOld(ServiceCtx Context)
{
MakeObject(context, new IGeneralService());
MakeObject(Context, new IGeneralService());
return 0;
}
public long CreateGeneralService(ServiceCtx context)
public long CreateGeneralService(ServiceCtx Context)
{
MakeObject(context, new IGeneralService());
MakeObject(Context, new IGeneralService());
return 0;
}