Adjust naming conventions and general refactoring in HLE Project (#490)
* Rename enum fields
* Naming conventions
* Remove unneeded ".this"
* Remove unneeded semicolons
* Remove unused Usings
* Don't use var
* Remove unneeded enum underlying types
* Explicitly label class visibility
* Remove unneeded @ prefixes
* Remove unneeded commas
* Remove unneeded if expressions
* Method doesn't use unsafe code
* Remove unneeded casts
* Initialized objects don't need an empty constructor
* Remove settings from DotSettings
* Revert "Explicitly label class visibility"
This reverts commit ad5eb5787c
.
* Small changes
* Revert external enum renaming
* Changes from feedback
* Remove unneeded property setters
This commit is contained in:
@ -5,26 +5,26 @@ namespace Ryujinx.HLE.HOS.Services.Hid
|
||||
public enum HidNpadJoyAssignmentMode
|
||||
{
|
||||
Dual,
|
||||
Single,
|
||||
Single
|
||||
}
|
||||
|
||||
public enum HidNpadHandheldActivationMode
|
||||
{
|
||||
Dual,
|
||||
Single,
|
||||
None,
|
||||
None
|
||||
}
|
||||
|
||||
public enum HidNpadJoyDeviceType
|
||||
{
|
||||
Left,
|
||||
Right,
|
||||
Right
|
||||
}
|
||||
|
||||
public enum HidNpadJoyHoldType
|
||||
{
|
||||
Vertical,
|
||||
Horizontal,
|
||||
Horizontal
|
||||
}
|
||||
|
||||
[Flags]
|
||||
@ -36,6 +36,6 @@ namespace Ryujinx.HLE.HOS.Services.Hid
|
||||
Dual = 1 << 2,
|
||||
Left = 1 << 3,
|
||||
Right = 1 << 4,
|
||||
Invalid = 1 << 5,
|
||||
Invalid = 1 << 5
|
||||
}
|
||||
}
|
||||
|
@ -10,7 +10,7 @@
|
||||
{
|
||||
None,
|
||||
Left,
|
||||
Right,
|
||||
Right
|
||||
}
|
||||
|
||||
public struct HidVibrationDeviceValue
|
||||
|
@ -5,21 +5,21 @@ namespace Ryujinx.HLE.HOS.Services.Hid
|
||||
{
|
||||
class IActiveApplicationDeviceList : IpcService
|
||||
{
|
||||
private Dictionary<int, ServiceProcessRequest> m_Commands;
|
||||
private Dictionary<int, ServiceProcessRequest> _commands;
|
||||
|
||||
public override IReadOnlyDictionary<int, ServiceProcessRequest> Commands => m_Commands;
|
||||
public override IReadOnlyDictionary<int, ServiceProcessRequest> Commands => _commands;
|
||||
|
||||
public IActiveApplicationDeviceList()
|
||||
{
|
||||
m_Commands = new Dictionary<int, ServiceProcessRequest>()
|
||||
_commands = new Dictionary<int, ServiceProcessRequest>
|
||||
{
|
||||
{ 0, ActivateVibrationDevice }
|
||||
};
|
||||
}
|
||||
|
||||
public long ActivateVibrationDevice(ServiceCtx Context)
|
||||
public long ActivateVibrationDevice(ServiceCtx context)
|
||||
{
|
||||
int VibrationDeviceHandle = Context.RequestData.ReadInt32();
|
||||
int vibrationDeviceHandle = context.RequestData.ReadInt32();
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
@ -7,30 +7,30 @@ namespace Ryujinx.HLE.HOS.Services.Hid
|
||||
{
|
||||
class IAppletResource : IpcService
|
||||
{
|
||||
private Dictionary<int, ServiceProcessRequest> m_Commands;
|
||||
private Dictionary<int, ServiceProcessRequest> _commands;
|
||||
|
||||
public override IReadOnlyDictionary<int, ServiceProcessRequest> Commands => m_Commands;
|
||||
public override IReadOnlyDictionary<int, ServiceProcessRequest> Commands => _commands;
|
||||
|
||||
private KSharedMemory HidSharedMem;
|
||||
private KSharedMemory _hidSharedMem;
|
||||
|
||||
public IAppletResource(KSharedMemory HidSharedMem)
|
||||
public IAppletResource(KSharedMemory hidSharedMem)
|
||||
{
|
||||
m_Commands = new Dictionary<int, ServiceProcessRequest>()
|
||||
_commands = new Dictionary<int, ServiceProcessRequest>
|
||||
{
|
||||
{ 0, GetSharedMemoryHandle }
|
||||
};
|
||||
|
||||
this.HidSharedMem = HidSharedMem;
|
||||
_hidSharedMem = hidSharedMem;
|
||||
}
|
||||
|
||||
public long GetSharedMemoryHandle(ServiceCtx Context)
|
||||
public long GetSharedMemoryHandle(ServiceCtx context)
|
||||
{
|
||||
if (Context.Process.HandleTable.GenerateHandle(HidSharedMem, out int Handle) != KernelResult.Success)
|
||||
if (context.Process.HandleTable.GenerateHandle(_hidSharedMem, out int handle) != KernelResult.Success)
|
||||
{
|
||||
throw new InvalidOperationException("Out of handles!");
|
||||
}
|
||||
|
||||
Context.Response.HandleDesc = IpcHandleDesc.MakeCopy(Handle);
|
||||
context.Response.HandleDesc = IpcHandleDesc.MakeCopy(handle);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
File diff suppressed because it is too large
Load Diff
Reference in New Issue
Block a user