mirror of
https://github.com/ryujinx-mirror/ryujinx.git
synced 2024-12-05 08:17:25 +00:00
27179d0218
* Initial commit Enable proper LED patterns Toggle Hotkeys only on focus Ignore Handheld on Docked mode Remove PrimaryController Validate NpadIdType Rewrite NpadDevices to process config in update loop Cleanup * Notify in log periodically when no matched controllers * Remove duplicate StructArrayHelpers in favor of Common.Memory Fix struct padding CS0169 warns in Touchscreen * Remove GTK markup from Controller Applet Use IList instead of List Explicit list capacity in 1ms loop Fix formatting * Restrict ControllerWindow to show valid controller types Add selected player name to ControllerWindow title * ControllerWindow: Fix controller type initial value NpadDevices: Simplify default battery charge * Address AcK's comments Use explicit types and fix formatting * Remove HashSet for SupportedPlayers Fixes potential exceptions due to race * Fix ControllerSupportArg struct packing Also comes with two revisions of struct for 4/8 players max.
138 lines
5.3 KiB
C#
138 lines
5.3 KiB
C#
using System;
|
|
using System.IO;
|
|
using System.Runtime.CompilerServices;
|
|
using System.Runtime.InteropServices;
|
|
using Ryujinx.Common.Logging;
|
|
using Ryujinx.HLE.HOS.Services.Hid;
|
|
using Ryujinx.HLE.HOS.Services.Am.AppletAE;
|
|
|
|
using static Ryujinx.HLE.HOS.Services.Hid.HidServer.HidUtils;
|
|
|
|
namespace Ryujinx.HLE.HOS.Applets
|
|
{
|
|
internal class ControllerApplet : IApplet
|
|
{
|
|
private Horizon _system;
|
|
|
|
private AppletSession _normalSession;
|
|
|
|
public event EventHandler AppletStateChanged;
|
|
|
|
public ControllerApplet(Horizon system)
|
|
{
|
|
_system = system;
|
|
}
|
|
|
|
unsafe public ResultCode Start(AppletSession normalSession,
|
|
AppletSession interactiveSession)
|
|
{
|
|
_normalSession = normalSession;
|
|
|
|
byte[] launchParams = _normalSession.Pop();
|
|
byte[] controllerSupportArgPrivate = _normalSession.Pop();
|
|
ControllerSupportArgPrivate privateArg = IApplet.ReadStruct<ControllerSupportArgPrivate>(controllerSupportArgPrivate);
|
|
|
|
Logger.Stub?.PrintStub(LogClass.ServiceHid, $"ControllerApplet ArgPriv {privateArg.PrivateSize} {privateArg.ArgSize} {privateArg.Mode} " +
|
|
$"HoldType:{(NpadJoyHoldType)privateArg.NpadJoyHoldType} StyleSets:{(ControllerType)privateArg.NpadStyleSet}");
|
|
|
|
if (privateArg.Mode != ControllerSupportMode.ShowControllerSupport)
|
|
{
|
|
_normalSession.Push(BuildResponse()); // Dummy response for other modes
|
|
AppletStateChanged?.Invoke(this, null);
|
|
|
|
return ResultCode.Success;
|
|
}
|
|
|
|
byte[] controllerSupportArg = _normalSession.Pop();
|
|
|
|
ControllerSupportArgHeader argHeader;
|
|
|
|
if (privateArg.ArgSize == Marshal.SizeOf<ControllerSupportArgV7>())
|
|
{
|
|
ControllerSupportArgV7 arg = IApplet.ReadStruct<ControllerSupportArgV7>(controllerSupportArg);
|
|
argHeader = arg.Header;
|
|
|
|
Logger.Stub?.PrintStub(LogClass.ServiceHid, $"ControllerSupportArg Version 7 EnableExplainText={arg.EnableExplainText != 0}");
|
|
// Read enable text here?
|
|
}
|
|
else if (privateArg.ArgSize == Marshal.SizeOf<ControllerSupportArgVPre7>())
|
|
{
|
|
ControllerSupportArgVPre7 arg = IApplet.ReadStruct<ControllerSupportArgVPre7>(controllerSupportArg);
|
|
argHeader = arg.Header;
|
|
|
|
Logger.Stub?.PrintStub(LogClass.ServiceHid, $"ControllerSupportArg Version Pre-7 EnableExplainText={arg.EnableExplainText != 0}");
|
|
// Read enable text here?
|
|
}
|
|
else
|
|
{
|
|
Logger.Stub?.PrintStub(LogClass.ServiceHid, $"ControllerSupportArg Version Unknown");
|
|
|
|
argHeader = IApplet.ReadStruct<ControllerSupportArgHeader>(controllerSupportArg); // Read just the header
|
|
}
|
|
|
|
int playerMin = argHeader.PlayerCountMin;
|
|
int playerMax = argHeader.PlayerCountMax;
|
|
|
|
Logger.Stub?.PrintStub(LogClass.ServiceHid, $"ControllerApplet Arg {playerMin} {playerMax} {argHeader.EnableTakeOverConnection} {argHeader.EnableSingleMode}");
|
|
|
|
int configuredCount = 0;
|
|
PlayerIndex primaryIndex = PlayerIndex.Unknown;
|
|
while (!_system.Device.Hid.Npads.Validate(playerMin, playerMax, (ControllerType)privateArg.NpadStyleSet, out configuredCount, out primaryIndex))
|
|
{
|
|
ControllerAppletUiArgs uiArgs = new ControllerAppletUiArgs
|
|
{
|
|
PlayerCountMin = playerMin,
|
|
PlayerCountMax = playerMax,
|
|
SupportedStyles = (ControllerType)privateArg.NpadStyleSet,
|
|
SupportedPlayers = _system.Device.Hid.Npads.GetSupportedPlayers(),
|
|
IsDocked = _system.State.DockedMode
|
|
};
|
|
|
|
if (!_system.Device.UiHandler.DisplayMessageDialog(uiArgs))
|
|
{
|
|
break;
|
|
}
|
|
}
|
|
|
|
ControllerSupportResultInfo result = new ControllerSupportResultInfo
|
|
{
|
|
PlayerCount = (sbyte)configuredCount,
|
|
SelectedId = (uint)GetNpadIdTypeFromIndex(primaryIndex)
|
|
};
|
|
|
|
Logger.Stub?.PrintStub(LogClass.ServiceHid, $"ControllerApplet ReturnResult {result.PlayerCount} {result.SelectedId}");
|
|
|
|
_normalSession.Push(BuildResponse(result));
|
|
AppletStateChanged?.Invoke(this, null);
|
|
|
|
return ResultCode.Success;
|
|
}
|
|
|
|
public ResultCode GetResult()
|
|
{
|
|
return ResultCode.Success;
|
|
}
|
|
|
|
private byte[] BuildResponse(ControllerSupportResultInfo result)
|
|
{
|
|
using (MemoryStream stream = new MemoryStream())
|
|
using (BinaryWriter writer = new BinaryWriter(stream))
|
|
{
|
|
writer.Write(MemoryMarshal.AsBytes(MemoryMarshal.CreateReadOnlySpan(ref result, Unsafe.SizeOf<ControllerSupportResultInfo>())));
|
|
|
|
return stream.ToArray();
|
|
}
|
|
}
|
|
|
|
private byte[] BuildResponse()
|
|
{
|
|
using (MemoryStream stream = new MemoryStream())
|
|
using (BinaryWriter writer = new BinaryWriter(stream))
|
|
{
|
|
writer.Write((ulong)ResultCode.Success);
|
|
|
|
return stream.ToArray();
|
|
}
|
|
}
|
|
}
|
|
}
|