2018-10-17 19:15:50 +02:00
|
|
|
using Ryujinx.Common.Logging;
|
2018-08-17 01:47:36 +02:00
|
|
|
using Ryujinx.HLE.HOS.Ipc;
|
2018-12-18 06:33:36 +01:00
|
|
|
using Ryujinx.HLE.HOS.Kernel.Common;
|
|
|
|
using Ryujinx.HLE.HOS.Kernel.Threading;
|
2018-09-23 20:11:46 +02:00
|
|
|
using System;
|
2018-02-10 01:14:55 +01:00
|
|
|
|
2019-09-19 02:45:11 +02:00
|
|
|
namespace Ryujinx.HLE.HOS.Services.Am.AppletAE.AllSystemAppletProxiesService.SystemAppletProxy
|
2018-02-10 01:14:55 +01:00
|
|
|
{
|
2018-03-19 19:58:46 +01:00
|
|
|
class ICommonStateGetter : IpcService
|
2018-02-10 01:14:55 +01:00
|
|
|
{
|
am/lbl/hid/pctl: Enabled VR Rendering (#1688)
* am/lbl/hid/pctl: Enabled VR Rendering
This PR enable VR rendering on games which support it through the Toy-Con VR Goggles.
Please remember Ryujinx currently don't support console SixAxis sensor and for now, in some games, the view can't be moved.
Everything is implemented accordingly to RE:
- am: ICommonStateGetter: SetVrModeEnabled, BeginVrModeEx, EndVrModeEx.
- lbl: ILblController: SetBrightnessReflectionDelayLevel, GetBrightnessReflectionDelayLevel, SetCurrentAmbientLightSensorMapping, GetCurrentAmbientLightSensorMapping, SetCurrentBrightnessSettingForVrMode, GetCurrentBrightnessSettingForVrMode, EnableVrMode, DisableVrMode, IsVrModeEnabled.
- pctl: IParentalControlService: ConfirmStereoVisionPermission, ConfirmStereoVisionRestrictionConfigurable, GetStereoVisionRestriction, SetStereoVisionRestriction, ResetConfirmedStereoVisionPermission, IsStereoVisionPermitted.
- hid: IHidServer: ResetSevenSixAxisSensorTimestamp is stubbed because we don't support console SixAxisSensor for now.
Maybe we could add a setting later to enable or disable VR. But I think it's fine to keep this always available since you have to enable it in games.
* Fix permission flag check
* Address gdkchan feedback
2020-11-15 22:30:20 +01:00
|
|
|
private Apm.ManagerServer _apmManagerServer;
|
|
|
|
private Apm.SystemManagerServer _apmSystemManagerServer;
|
|
|
|
private Lbl.LblControllerServer _lblControllerServer;
|
2019-08-28 13:02:50 +02:00
|
|
|
|
am/lbl/hid/pctl: Enabled VR Rendering (#1688)
* am/lbl/hid/pctl: Enabled VR Rendering
This PR enable VR rendering on games which support it through the Toy-Con VR Goggles.
Please remember Ryujinx currently don't support console SixAxis sensor and for now, in some games, the view can't be moved.
Everything is implemented accordingly to RE:
- am: ICommonStateGetter: SetVrModeEnabled, BeginVrModeEx, EndVrModeEx.
- lbl: ILblController: SetBrightnessReflectionDelayLevel, GetBrightnessReflectionDelayLevel, SetCurrentAmbientLightSensorMapping, GetCurrentAmbientLightSensorMapping, SetCurrentBrightnessSettingForVrMode, GetCurrentBrightnessSettingForVrMode, EnableVrMode, DisableVrMode, IsVrModeEnabled.
- pctl: IParentalControlService: ConfirmStereoVisionPermission, ConfirmStereoVisionRestrictionConfigurable, GetStereoVisionRestriction, SetStereoVisionRestriction, ResetConfirmedStereoVisionPermission, IsStereoVisionPermitted.
- hid: IHidServer: ResetSevenSixAxisSensorTimestamp is stubbed because we don't support console SixAxisSensor for now.
Maybe we could add a setting later to enable or disable VR. But I think it's fine to keep this always available since you have to enable it in games.
* Fix permission flag check
* Address gdkchan feedback
2020-11-15 22:30:20 +01:00
|
|
|
private bool _vrModeEnabled = true;
|
2020-11-08 21:00:54 +01:00
|
|
|
|
|
|
|
public ICommonStateGetter(ServiceCtx context)
|
|
|
|
{
|
am/lbl/hid/pctl: Enabled VR Rendering (#1688)
* am/lbl/hid/pctl: Enabled VR Rendering
This PR enable VR rendering on games which support it through the Toy-Con VR Goggles.
Please remember Ryujinx currently don't support console SixAxis sensor and for now, in some games, the view can't be moved.
Everything is implemented accordingly to RE:
- am: ICommonStateGetter: SetVrModeEnabled, BeginVrModeEx, EndVrModeEx.
- lbl: ILblController: SetBrightnessReflectionDelayLevel, GetBrightnessReflectionDelayLevel, SetCurrentAmbientLightSensorMapping, GetCurrentAmbientLightSensorMapping, SetCurrentBrightnessSettingForVrMode, GetCurrentBrightnessSettingForVrMode, EnableVrMode, DisableVrMode, IsVrModeEnabled.
- pctl: IParentalControlService: ConfirmStereoVisionPermission, ConfirmStereoVisionRestrictionConfigurable, GetStereoVisionRestriction, SetStereoVisionRestriction, ResetConfirmedStereoVisionPermission, IsStereoVisionPermitted.
- hid: IHidServer: ResetSevenSixAxisSensorTimestamp is stubbed because we don't support console SixAxisSensor for now.
Maybe we could add a setting later to enable or disable VR. But I think it's fine to keep this always available since you have to enable it in games.
* Fix permission flag check
* Address gdkchan feedback
2020-11-15 22:30:20 +01:00
|
|
|
_apmManagerServer = new Apm.ManagerServer(context);
|
|
|
|
_apmSystemManagerServer = new Apm.SystemManagerServer(context);
|
|
|
|
_lblControllerServer = new Lbl.LblControllerServer(context);
|
2020-11-08 21:00:54 +01:00
|
|
|
}
|
2018-02-10 01:14:55 +01:00
|
|
|
|
2019-07-12 03:13:43 +02:00
|
|
|
[Command(0)]
|
|
|
|
// GetEventHandle() -> handle<copy>
|
2019-07-14 21:04:38 +02:00
|
|
|
public ResultCode GetEventHandle(ServiceCtx context)
|
2018-02-10 01:14:55 +01:00
|
|
|
{
|
2018-12-06 12:16:24 +01:00
|
|
|
KEvent Event = context.Device.System.AppletState.MessageEvent;
|
2018-02-10 01:14:55 +01:00
|
|
|
|
2018-12-06 12:16:24 +01:00
|
|
|
if (context.Process.HandleTable.GenerateHandle(Event.ReadableEvent, out int handle) != KernelResult.Success)
|
2018-09-23 20:11:46 +02:00
|
|
|
{
|
|
|
|
throw new InvalidOperationException("Out of handles!");
|
|
|
|
}
|
2018-02-10 01:14:55 +01:00
|
|
|
|
2018-12-06 12:16:24 +01:00
|
|
|
context.Response.HandleDesc = IpcHandleDesc.MakeCopy(handle);
|
2018-02-10 01:14:55 +01:00
|
|
|
|
2019-07-14 21:04:38 +02:00
|
|
|
return ResultCode.Success;
|
2018-02-10 01:14:55 +01:00
|
|
|
}
|
|
|
|
|
2019-07-12 03:13:43 +02:00
|
|
|
[Command(1)]
|
|
|
|
// ReceiveMessage() -> nn::am::AppletMessage
|
2019-07-14 21:04:38 +02:00
|
|
|
public ResultCode ReceiveMessage(ServiceCtx context)
|
2018-02-10 01:14:55 +01:00
|
|
|
{
|
2018-12-06 12:16:24 +01:00
|
|
|
if (!context.Device.System.AppletState.TryDequeueMessage(out MessageInfo message))
|
2018-03-19 19:58:46 +01:00
|
|
|
{
|
2019-07-14 21:04:38 +02:00
|
|
|
return ResultCode.NoMessages;
|
2018-03-19 19:58:46 +01:00
|
|
|
}
|
2018-02-10 01:14:55 +01:00
|
|
|
|
2018-12-06 12:16:24 +01:00
|
|
|
context.ResponseData.Write((int)message);
|
2018-03-19 19:58:46 +01:00
|
|
|
|
2019-07-14 21:04:38 +02:00
|
|
|
return ResultCode.Success;
|
2018-02-10 01:14:55 +01:00
|
|
|
}
|
|
|
|
|
2019-07-12 03:13:43 +02:00
|
|
|
[Command(5)]
|
|
|
|
// GetOperationMode() -> u8
|
2019-07-14 21:04:38 +02:00
|
|
|
public ResultCode GetOperationMode(ServiceCtx context)
|
2018-02-10 01:14:55 +01:00
|
|
|
{
|
2018-12-06 12:16:24 +01:00
|
|
|
OperationMode mode = context.Device.System.State.DockedMode
|
2018-08-15 00:02:42 +02:00
|
|
|
? OperationMode.Docked
|
|
|
|
: OperationMode.Handheld;
|
2018-08-11 14:24:55 +02:00
|
|
|
|
2018-12-06 12:16:24 +01:00
|
|
|
context.ResponseData.Write((byte)mode);
|
2018-02-10 01:14:55 +01:00
|
|
|
|
2019-07-14 21:04:38 +02:00
|
|
|
return ResultCode.Success;
|
2018-02-10 01:14:55 +01:00
|
|
|
}
|
|
|
|
|
2019-07-12 03:13:43 +02:00
|
|
|
[Command(6)]
|
2020-11-08 21:00:54 +01:00
|
|
|
// GetPerformanceMode() -> nn::apm::PerformanceMode
|
2019-07-14 21:04:38 +02:00
|
|
|
public ResultCode GetPerformanceMode(ServiceCtx context)
|
2018-02-10 01:14:55 +01:00
|
|
|
{
|
am/lbl/hid/pctl: Enabled VR Rendering (#1688)
* am/lbl/hid/pctl: Enabled VR Rendering
This PR enable VR rendering on games which support it through the Toy-Con VR Goggles.
Please remember Ryujinx currently don't support console SixAxis sensor and for now, in some games, the view can't be moved.
Everything is implemented accordingly to RE:
- am: ICommonStateGetter: SetVrModeEnabled, BeginVrModeEx, EndVrModeEx.
- lbl: ILblController: SetBrightnessReflectionDelayLevel, GetBrightnessReflectionDelayLevel, SetCurrentAmbientLightSensorMapping, GetCurrentAmbientLightSensorMapping, SetCurrentBrightnessSettingForVrMode, GetCurrentBrightnessSettingForVrMode, EnableVrMode, DisableVrMode, IsVrModeEnabled.
- pctl: IParentalControlService: ConfirmStereoVisionPermission, ConfirmStereoVisionRestrictionConfigurable, GetStereoVisionRestriction, SetStereoVisionRestriction, ResetConfirmedStereoVisionPermission, IsStereoVisionPermitted.
- hid: IHidServer: ResetSevenSixAxisSensorTimestamp is stubbed because we don't support console SixAxisSensor for now.
Maybe we could add a setting later to enable or disable VR. But I think it's fine to keep this always available since you have to enable it in games.
* Fix permission flag check
* Address gdkchan feedback
2020-11-15 22:30:20 +01:00
|
|
|
return (ResultCode)_apmManagerServer.GetPerformanceMode(context);
|
2018-02-10 01:14:55 +01:00
|
|
|
}
|
|
|
|
|
2019-07-12 03:13:43 +02:00
|
|
|
[Command(8)]
|
|
|
|
// GetBootMode() -> u8
|
2019-07-14 21:04:38 +02:00
|
|
|
public ResultCode GetBootMode(ServiceCtx context)
|
2018-04-22 01:04:43 +02:00
|
|
|
{
|
2018-12-06 12:16:24 +01:00
|
|
|
context.ResponseData.Write((byte)0); //Unknown value.
|
2018-04-22 01:04:43 +02:00
|
|
|
|
2020-08-04 01:32:53 +02:00
|
|
|
Logger.Stub?.PrintStub(LogClass.ServiceAm);
|
2018-04-22 01:04:43 +02:00
|
|
|
|
2019-07-14 21:04:38 +02:00
|
|
|
return ResultCode.Success;
|
2018-04-22 01:04:43 +02:00
|
|
|
}
|
|
|
|
|
2019-07-12 03:13:43 +02:00
|
|
|
[Command(9)]
|
|
|
|
// GetCurrentFocusState() -> u8
|
2019-07-14 21:04:38 +02:00
|
|
|
public ResultCode GetCurrentFocusState(ServiceCtx context)
|
2018-02-10 01:14:55 +01:00
|
|
|
{
|
2018-12-06 12:16:24 +01:00
|
|
|
context.ResponseData.Write((byte)context.Device.System.AppletState.FocusState);
|
2018-02-10 01:14:55 +01:00
|
|
|
|
2019-07-14 21:04:38 +02:00
|
|
|
return ResultCode.Success;
|
2018-02-10 01:14:55 +01:00
|
|
|
}
|
2018-06-11 01:53:28 +02:00
|
|
|
|
2020-05-01 18:51:00 +02:00
|
|
|
[Command(50)] // 3.0.0+
|
|
|
|
// IsVrModeEnabled() -> b8
|
|
|
|
public ResultCode IsVrModeEnabled(ServiceCtx context)
|
|
|
|
{
|
|
|
|
context.ResponseData.Write(_vrModeEnabled);
|
|
|
|
|
|
|
|
return ResultCode.Success;
|
|
|
|
}
|
|
|
|
|
am/lbl/hid/pctl: Enabled VR Rendering (#1688)
* am/lbl/hid/pctl: Enabled VR Rendering
This PR enable VR rendering on games which support it through the Toy-Con VR Goggles.
Please remember Ryujinx currently don't support console SixAxis sensor and for now, in some games, the view can't be moved.
Everything is implemented accordingly to RE:
- am: ICommonStateGetter: SetVrModeEnabled, BeginVrModeEx, EndVrModeEx.
- lbl: ILblController: SetBrightnessReflectionDelayLevel, GetBrightnessReflectionDelayLevel, SetCurrentAmbientLightSensorMapping, GetCurrentAmbientLightSensorMapping, SetCurrentBrightnessSettingForVrMode, GetCurrentBrightnessSettingForVrMode, EnableVrMode, DisableVrMode, IsVrModeEnabled.
- pctl: IParentalControlService: ConfirmStereoVisionPermission, ConfirmStereoVisionRestrictionConfigurable, GetStereoVisionRestriction, SetStereoVisionRestriction, ResetConfirmedStereoVisionPermission, IsStereoVisionPermitted.
- hid: IHidServer: ResetSevenSixAxisSensorTimestamp is stubbed because we don't support console SixAxisSensor for now.
Maybe we could add a setting later to enable or disable VR. But I think it's fine to keep this always available since you have to enable it in games.
* Fix permission flag check
* Address gdkchan feedback
2020-11-15 22:30:20 +01:00
|
|
|
[Command(51)] // 3.0.0+
|
|
|
|
// SetVrModeEnabled(b8)
|
|
|
|
public ResultCode SetVrModeEnabled(ServiceCtx context)
|
|
|
|
{
|
|
|
|
bool vrModeEnabled = context.RequestData.ReadBoolean();
|
|
|
|
|
|
|
|
UpdateVrMode(vrModeEnabled);
|
|
|
|
|
|
|
|
return ResultCode.Success;
|
|
|
|
}
|
|
|
|
|
|
|
|
[Command(53)] // 7.0.0+
|
|
|
|
// BeginVrModeEx()
|
|
|
|
public ResultCode BeginVrModeEx(ServiceCtx context)
|
|
|
|
{
|
|
|
|
UpdateVrMode(true);
|
|
|
|
|
|
|
|
return ResultCode.Success;
|
|
|
|
}
|
|
|
|
|
|
|
|
[Command(54)] // 7.0.0+
|
|
|
|
// EndVrModeEx()
|
|
|
|
public ResultCode EndVrModeEx(ServiceCtx context)
|
|
|
|
{
|
|
|
|
UpdateVrMode(false);
|
|
|
|
|
|
|
|
return ResultCode.Success;
|
|
|
|
}
|
|
|
|
|
|
|
|
private void UpdateVrMode(bool vrModeEnabled)
|
|
|
|
{
|
|
|
|
if (_vrModeEnabled == vrModeEnabled)
|
|
|
|
{
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
_vrModeEnabled = vrModeEnabled;
|
|
|
|
|
|
|
|
if (vrModeEnabled)
|
|
|
|
{
|
|
|
|
_lblControllerServer.EnableVrMode();
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
_lblControllerServer.DisableVrMode();
|
|
|
|
}
|
|
|
|
|
|
|
|
// TODO: It signals an internal event of ICommonStateGetter. We have to determine where this event is used.
|
|
|
|
}
|
|
|
|
|
2019-07-12 03:13:43 +02:00
|
|
|
[Command(60)] // 3.0.0+
|
|
|
|
// GetDefaultDisplayResolution() -> (u32, u32)
|
2019-07-14 21:04:38 +02:00
|
|
|
public ResultCode GetDefaultDisplayResolution(ServiceCtx context)
|
2018-06-11 01:53:28 +02:00
|
|
|
{
|
2018-12-06 12:16:24 +01:00
|
|
|
context.ResponseData.Write(1280);
|
|
|
|
context.ResponseData.Write(720);
|
2018-06-11 01:53:28 +02:00
|
|
|
|
2019-07-14 21:04:38 +02:00
|
|
|
return ResultCode.Success;
|
2018-06-11 01:53:28 +02:00
|
|
|
}
|
|
|
|
|
2019-07-12 03:13:43 +02:00
|
|
|
[Command(61)] // 3.0.0+
|
|
|
|
// GetDefaultDisplayResolutionChangeEvent() -> handle<copy>
|
2019-07-14 21:04:38 +02:00
|
|
|
public ResultCode GetDefaultDisplayResolutionChangeEvent(ServiceCtx context)
|
2018-06-11 01:53:28 +02:00
|
|
|
{
|
2020-04-23 13:59:11 +02:00
|
|
|
if (context.Process.HandleTable.GenerateHandle(context.Device.System.DisplayResolutionChangeEvent.ReadableEvent, out int handle) != KernelResult.Success)
|
2018-09-23 20:11:46 +02:00
|
|
|
{
|
|
|
|
throw new InvalidOperationException("Out of handles!");
|
|
|
|
}
|
2018-06-11 01:53:28 +02:00
|
|
|
|
2018-12-06 12:16:24 +01:00
|
|
|
context.Response.HandleDesc = IpcHandleDesc.MakeCopy(handle);
|
2018-06-11 01:53:28 +02:00
|
|
|
|
2020-08-04 01:32:53 +02:00
|
|
|
Logger.Stub?.PrintStub(LogClass.ServiceAm);
|
2018-06-11 01:53:28 +02:00
|
|
|
|
2019-07-14 21:04:38 +02:00
|
|
|
return ResultCode.Success;
|
2018-06-11 01:53:28 +02:00
|
|
|
}
|
2019-08-28 13:02:50 +02:00
|
|
|
|
|
|
|
[Command(66)] // 6.0.0+
|
|
|
|
// SetCpuBoostMode(u32 cpu_boost_mode)
|
|
|
|
public ResultCode SetCpuBoostMode(ServiceCtx context)
|
|
|
|
{
|
|
|
|
uint cpuBoostMode = context.RequestData.ReadUInt32();
|
|
|
|
|
|
|
|
if (cpuBoostMode > 1)
|
|
|
|
{
|
2020-02-12 00:07:13 +01:00
|
|
|
return ResultCode.InvalidParameters;
|
2019-08-28 13:02:50 +02:00
|
|
|
}
|
|
|
|
|
am/lbl/hid/pctl: Enabled VR Rendering (#1688)
* am/lbl/hid/pctl: Enabled VR Rendering
This PR enable VR rendering on games which support it through the Toy-Con VR Goggles.
Please remember Ryujinx currently don't support console SixAxis sensor and for now, in some games, the view can't be moved.
Everything is implemented accordingly to RE:
- am: ICommonStateGetter: SetVrModeEnabled, BeginVrModeEx, EndVrModeEx.
- lbl: ILblController: SetBrightnessReflectionDelayLevel, GetBrightnessReflectionDelayLevel, SetCurrentAmbientLightSensorMapping, GetCurrentAmbientLightSensorMapping, SetCurrentBrightnessSettingForVrMode, GetCurrentBrightnessSettingForVrMode, EnableVrMode, DisableVrMode, IsVrModeEnabled.
- pctl: IParentalControlService: ConfirmStereoVisionPermission, ConfirmStereoVisionRestrictionConfigurable, GetStereoVisionRestriction, SetStereoVisionRestriction, ResetConfirmedStereoVisionPermission, IsStereoVisionPermitted.
- hid: IHidServer: ResetSevenSixAxisSensorTimestamp is stubbed because we don't support console SixAxisSensor for now.
Maybe we could add a setting later to enable or disable VR. But I think it's fine to keep this always available since you have to enable it in games.
* Fix permission flag check
* Address gdkchan feedback
2020-11-15 22:30:20 +01:00
|
|
|
_apmSystemManagerServer.SetCpuBoostMode((Apm.CpuBoostMode)cpuBoostMode);
|
2019-08-28 13:02:50 +02:00
|
|
|
|
2020-11-08 21:00:54 +01:00
|
|
|
// TODO: It signals an internal event of ICommonStateGetter. We have to determine where this event is used.
|
2019-08-28 13:02:50 +02:00
|
|
|
|
|
|
|
return ResultCode.Success;
|
|
|
|
}
|
2020-11-08 21:00:54 +01:00
|
|
|
|
|
|
|
[Command(91)] // 7.0.0+
|
|
|
|
// GetCurrentPerformanceConfiguration() -> nn::apm::PerformanceConfiguration
|
|
|
|
public ResultCode GetCurrentPerformanceConfiguration(ServiceCtx context)
|
|
|
|
{
|
am/lbl/hid/pctl: Enabled VR Rendering (#1688)
* am/lbl/hid/pctl: Enabled VR Rendering
This PR enable VR rendering on games which support it through the Toy-Con VR Goggles.
Please remember Ryujinx currently don't support console SixAxis sensor and for now, in some games, the view can't be moved.
Everything is implemented accordingly to RE:
- am: ICommonStateGetter: SetVrModeEnabled, BeginVrModeEx, EndVrModeEx.
- lbl: ILblController: SetBrightnessReflectionDelayLevel, GetBrightnessReflectionDelayLevel, SetCurrentAmbientLightSensorMapping, GetCurrentAmbientLightSensorMapping, SetCurrentBrightnessSettingForVrMode, GetCurrentBrightnessSettingForVrMode, EnableVrMode, DisableVrMode, IsVrModeEnabled.
- pctl: IParentalControlService: ConfirmStereoVisionPermission, ConfirmStereoVisionRestrictionConfigurable, GetStereoVisionRestriction, SetStereoVisionRestriction, ResetConfirmedStereoVisionPermission, IsStereoVisionPermitted.
- hid: IHidServer: ResetSevenSixAxisSensorTimestamp is stubbed because we don't support console SixAxisSensor for now.
Maybe we could add a setting later to enable or disable VR. But I think it's fine to keep this always available since you have to enable it in games.
* Fix permission flag check
* Address gdkchan feedback
2020-11-15 22:30:20 +01:00
|
|
|
return (ResultCode)_apmSystemManagerServer.GetCurrentPerformanceConfiguration(context);
|
2020-11-08 21:00:54 +01:00
|
|
|
}
|
2018-02-10 01:14:55 +01:00
|
|
|
}
|
2019-07-12 03:13:43 +02:00
|
|
|
}
|