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

60
Ryujinx.HLE/HOS/Services/Am/IApplicationFunctions.cs
View file

@ -6,13 +6,13 @@ namespace Ryujinx.HLE.HOS.Services.Am
{
class IApplicationFunctions : 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 IApplicationFunctions()
{
_commands = new Dictionary<int, ServiceProcessRequest>
m_Commands = new Dictionary<int, ServiceProcessRequest>()
{
{ 1, PopLaunchParameter },
{ 20, EnsureSaveData },
@ -26,88 +26,88 @@ namespace Ryujinx.HLE.HOS.Services.Am
};
}
public long PopLaunchParameter(ServiceCtx context)
public long PopLaunchParameter(ServiceCtx Context)
{
//Only the first 0x18 bytes of the Data seems to be actually used.
MakeObject(context, new IStorage(StorageHelper.MakeLaunchParams()));
MakeObject(Context, new IStorage(StorageHelper.MakeLaunchParams()));
return 0;
}
public long EnsureSaveData(ServiceCtx context)
public long EnsureSaveData(ServiceCtx Context)
{
long uIdLow = context.RequestData.ReadInt64();
long uIdHigh = context.RequestData.ReadInt64();
long UIdLow = Context.RequestData.ReadInt64();
long UIdHigh = Context.RequestData.ReadInt64();
Logger.PrintStub(LogClass.ServiceAm, "Stubbed.");
context.ResponseData.Write(0L);
Context.ResponseData.Write(0L);
return 0;
}
public long GetDesiredLanguage(ServiceCtx context)
public long GetDesiredLanguage(ServiceCtx Context)
{
context.ResponseData.Write(context.Device.System.State.DesiredLanguageCode);
Context.ResponseData.Write(Context.Device.System.State.DesiredLanguageCode);
return 0;
}
public long SetTerminateResult(ServiceCtx context)
public long SetTerminateResult(ServiceCtx Context)
{
int errorCode = context.RequestData.ReadInt32();
int ErrorCode = Context.RequestData.ReadInt32();
string result = GetFormattedErrorCode(errorCode);
string Result = GetFormattedErrorCode(ErrorCode);
Logger.PrintInfo(LogClass.ServiceAm, $"Result = 0x{errorCode:x8} ({result}).");
Logger.PrintInfo(LogClass.ServiceAm, $"Result = 0x{ErrorCode:x8} ({Result}).");
return 0;
}
private string GetFormattedErrorCode(int errorCode)
private string GetFormattedErrorCode(int ErrorCode)
{
int module = (errorCode >> 0) & 0x1ff;
int description = (errorCode >> 9) & 0x1fff;
int Module = (ErrorCode >> 0) & 0x1ff;
int Description = (ErrorCode >> 9) & 0x1fff;
return $"{(2000 + module):d4}-{description:d4}";
return $"{(2000 + Module):d4}-{Description:d4}";
}
public long GetDisplayVersion(ServiceCtx context)
public long GetDisplayVersion(ServiceCtx Context)
{
//FIXME: Need to check correct version on a switch.
context.ResponseData.Write(1L);
context.ResponseData.Write(0L);
Context.ResponseData.Write(1L);
Context.ResponseData.Write(0L);
return 0;
}
public long NotifyRunning(ServiceCtx context)
public long NotifyRunning(ServiceCtx Context)
{
context.ResponseData.Write(1);
Context.ResponseData.Write(1);
return 0;
}
public long GetPseudoDeviceId(ServiceCtx context)
public long GetPseudoDeviceId(ServiceCtx Context)
{
Logger.PrintStub(LogClass.ServiceAm, "Stubbed.");
context.ResponseData.Write(0L);
context.ResponseData.Write(0L);
Context.ResponseData.Write(0L);
Context.ResponseData.Write(0L);
return 0;
}
public long InitializeGamePlayRecording(ServiceCtx context)
public long InitializeGamePlayRecording(ServiceCtx Context)
{
Logger.PrintStub(LogClass.ServiceAm, "Stubbed.");
return 0;
}
public long SetGamePlayRecordingState(ServiceCtx context)
public long SetGamePlayRecordingState(ServiceCtx Context)
{
int state = context.RequestData.ReadInt32();
int State = Context.RequestData.ReadInt32();
Logger.PrintStub(LogClass.ServiceAm, "Stubbed.");