2018-10-17 18:15:50 +01:00
|
|
|
using Ryujinx.Common.Logging;
|
2018-08-17 00:47:36 +01:00
|
|
|
using Ryujinx.HLE.HOS.Ipc;
|
2018-12-18 05:33:36 +00:00
|
|
|
using Ryujinx.HLE.HOS.Kernel.Common;
|
|
|
|
using Ryujinx.HLE.HOS.Kernel.Threading;
|
2021-06-28 19:54:45 +01:00
|
|
|
using Ryujinx.HLE.HOS.Services.Settings.Types;
|
vi: Unify resolutions values and accurate implementation of them. (#2640)
* vi: Unify resolutions values and accurate implementation of them.
To continue what was made in #2618, I've REd `vi` service a bit. Now values and checks related to displays are more accurate.
- `am` GetDefaultDisplayResolution / GetDefaultDisplayResolutionChangeEvent have more informations on what the service does.
- `vi:u/vi:m/vi:s` GetDisplayService are now accurate.
- `IApplicationDisplay` GetRelayService, GetSystemDisplayService, GetManagerDisplayService, GetIndirectDisplayTransactionService, ListDisplays, OpenDisplay, OpenDefaultDisplay, CloseDisplay, GetDisplayResolution are now properly implemented.
- Some other calls are cleaned or have extra checks accordingly to RE.
Additionnaly, `IFriendService` have some wrong aligned things, and `pm:info` service placeholder was missing.
* just use _openedDisplayInfo.Remove()
* use context.Memory.Fill()
* fix some casting
* remove unneeded comment
* cleanup
* uses TryAdd
* displayId > ulong
* GetDisplayResolution > ulong
* UL
2021-09-19 11:57:39 +01:00
|
|
|
using Ryujinx.HLE.HOS.Services.Vi.RootService.ApplicationDisplayService;
|
2021-06-28 19:54:45 +01:00
|
|
|
using Ryujinx.HLE.HOS.SystemState;
|
2018-09-23 19:11:46 +01:00
|
|
|
using System;
|
2018-02-10 00:14:55 +00:00
|
|
|
|
2019-09-19 01:45:11 +01:00
|
|
|
namespace Ryujinx.HLE.HOS.Services.Am.AppletAE.AllSystemAppletProxiesService.SystemAppletProxy
|
2018-02-10 00:14:55 +00:00
|
|
|
{
|
2018-03-19 18:58:46 +00:00
|
|
|
class ICommonStateGetter : IpcService
|
2018-02-10 00:14:55 +00: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 21:30:20 +00:00
|
|
|
private Apm.ManagerServer _apmManagerServer;
|
|
|
|
private Apm.SystemManagerServer _apmSystemManagerServer;
|
|
|
|
private Lbl.LblControllerServer _lblControllerServer;
|
2019-08-28 12:02:50 +01:00
|
|
|
|
2020-12-01 23:23:43 +00:00
|
|
|
private bool _vrModeEnabled;
|
2021-03-27 14:41:09 +00:00
|
|
|
#pragma warning disable CS0414
|
2021-02-21 08:21:32 +00:00
|
|
|
private bool _lcdBacklighOffEnabled;
|
2021-03-25 22:25:49 +00:00
|
|
|
private bool _requestExitToLibraryAppletAtExecuteNextProgramEnabled;
|
2021-03-27 14:41:09 +00:00
|
|
|
#pragma warning restore CS0414
|
2021-02-21 08:21:32 +00:00
|
|
|
private int _messageEventHandle;
|
|
|
|
private int _displayResolutionChangedEventHandle;
|
2020-11-08 20:00:54 +00: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 21:30:20 +00:00
|
|
|
_apmManagerServer = new Apm.ManagerServer(context);
|
|
|
|
_apmSystemManagerServer = new Apm.SystemManagerServer(context);
|
|
|
|
_lblControllerServer = new Lbl.LblControllerServer(context);
|
2020-11-08 20:00:54 +00:00
|
|
|
}
|
2018-02-10 00:14:55 +00:00
|
|
|
|
2021-04-13 23:01:24 +01:00
|
|
|
[CommandHipc(0)]
|
2019-07-12 02:13:43 +01:00
|
|
|
// GetEventHandle() -> handle<copy>
|
2019-07-14 20:04:38 +01:00
|
|
|
public ResultCode GetEventHandle(ServiceCtx context)
|
2018-02-10 00:14:55 +00:00
|
|
|
{
|
2020-12-01 23:23:43 +00:00
|
|
|
KEvent messageEvent = context.Device.System.AppletState.MessageEvent;
|
2018-02-10 00:14:55 +00:00
|
|
|
|
2020-12-01 23:23:43 +00:00
|
|
|
if (_messageEventHandle == 0)
|
2018-09-23 19:11:46 +01:00
|
|
|
{
|
2020-12-01 23:23:43 +00:00
|
|
|
if (context.Process.HandleTable.GenerateHandle(messageEvent.ReadableEvent, out _messageEventHandle) != KernelResult.Success)
|
|
|
|
{
|
|
|
|
throw new InvalidOperationException("Out of handles!");
|
|
|
|
}
|
2018-09-23 19:11:46 +01:00
|
|
|
}
|
2018-02-10 00:14:55 +00:00
|
|
|
|
2020-12-01 23:23:43 +00:00
|
|
|
context.Response.HandleDesc = IpcHandleDesc.MakeCopy(_messageEventHandle);
|
2018-02-10 00:14:55 +00:00
|
|
|
|
2019-07-14 20:04:38 +01:00
|
|
|
return ResultCode.Success;
|
2018-02-10 00:14:55 +00:00
|
|
|
}
|
|
|
|
|
2021-04-13 23:01:24 +01:00
|
|
|
[CommandHipc(1)]
|
2019-07-12 02:13:43 +01:00
|
|
|
// ReceiveMessage() -> nn::am::AppletMessage
|
2019-07-14 20:04:38 +01:00
|
|
|
public ResultCode ReceiveMessage(ServiceCtx context)
|
2018-02-10 00:14:55 +00:00
|
|
|
{
|
2021-06-21 17:41:37 +01:00
|
|
|
if (!context.Device.System.AppletState.Messages.TryDequeue(out AppletMessage message))
|
2018-03-19 18:58:46 +00:00
|
|
|
{
|
2019-07-14 20:04:38 +01:00
|
|
|
return ResultCode.NoMessages;
|
2018-03-19 18:58:46 +00:00
|
|
|
}
|
2018-02-10 00:14:55 +00:00
|
|
|
|
2020-12-16 00:41:42 +00:00
|
|
|
KEvent messageEvent = context.Device.System.AppletState.MessageEvent;
|
|
|
|
|
|
|
|
// NOTE: Service checks if current states are different than the stored ones.
|
|
|
|
// Since we don't support any states for now, it's fine to check if there is still messages available.
|
|
|
|
|
|
|
|
if (context.Device.System.AppletState.Messages.IsEmpty)
|
|
|
|
{
|
|
|
|
messageEvent.ReadableEvent.Clear();
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
messageEvent.ReadableEvent.Signal();
|
|
|
|
}
|
|
|
|
|
2018-12-06 11:16:24 +00:00
|
|
|
context.ResponseData.Write((int)message);
|
2018-03-19 18:58:46 +00:00
|
|
|
|
2019-07-14 20:04:38 +01:00
|
|
|
return ResultCode.Success;
|
2018-02-10 00:14:55 +00:00
|
|
|
}
|
|
|
|
|
2021-04-13 23:01:24 +01:00
|
|
|
[CommandHipc(5)]
|
2019-07-12 02:13:43 +01:00
|
|
|
// GetOperationMode() -> u8
|
2019-07-14 20:04:38 +01:00
|
|
|
public ResultCode GetOperationMode(ServiceCtx context)
|
2018-02-10 00:14:55 +00:00
|
|
|
{
|
2018-12-06 11:16:24 +00:00
|
|
|
OperationMode mode = context.Device.System.State.DockedMode
|
2018-08-14 23:02:42 +01:00
|
|
|
? OperationMode.Docked
|
|
|
|
: OperationMode.Handheld;
|
2018-08-11 13:24:55 +01:00
|
|
|
|
2018-12-06 11:16:24 +00:00
|
|
|
context.ResponseData.Write((byte)mode);
|
2018-02-10 00:14:55 +00:00
|
|
|
|
2019-07-14 20:04:38 +01:00
|
|
|
return ResultCode.Success;
|
2018-02-10 00:14:55 +00:00
|
|
|
}
|
|
|
|
|
2021-04-13 23:01:24 +01:00
|
|
|
[CommandHipc(6)]
|
2020-11-08 20:00:54 +00:00
|
|
|
// GetPerformanceMode() -> nn::apm::PerformanceMode
|
2019-07-14 20:04:38 +01:00
|
|
|
public ResultCode GetPerformanceMode(ServiceCtx context)
|
2018-02-10 00:14:55 +00: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 21:30:20 +00:00
|
|
|
return (ResultCode)_apmManagerServer.GetPerformanceMode(context);
|
2018-02-10 00:14:55 +00:00
|
|
|
}
|
|
|
|
|
2021-04-13 23:01:24 +01:00
|
|
|
[CommandHipc(8)]
|
2019-07-12 02:13:43 +01:00
|
|
|
// GetBootMode() -> u8
|
2019-07-14 20:04:38 +01:00
|
|
|
public ResultCode GetBootMode(ServiceCtx context)
|
2018-04-22 00:04:43 +01:00
|
|
|
{
|
2018-12-06 11:16:24 +00:00
|
|
|
context.ResponseData.Write((byte)0); //Unknown value.
|
2018-04-22 00:04:43 +01:00
|
|
|
|
2020-08-04 00:32:53 +01:00
|
|
|
Logger.Stub?.PrintStub(LogClass.ServiceAm);
|
2018-04-22 00:04:43 +01:00
|
|
|
|
2019-07-14 20:04:38 +01:00
|
|
|
return ResultCode.Success;
|
2018-04-22 00:04:43 +01:00
|
|
|
}
|
|
|
|
|
2021-04-13 23:01:24 +01:00
|
|
|
[CommandHipc(9)]
|
2019-07-12 02:13:43 +01:00
|
|
|
// GetCurrentFocusState() -> u8
|
2019-07-14 20:04:38 +01:00
|
|
|
public ResultCode GetCurrentFocusState(ServiceCtx context)
|
2018-02-10 00:14:55 +00:00
|
|
|
{
|
2018-12-06 11:16:24 +00:00
|
|
|
context.ResponseData.Write((byte)context.Device.System.AppletState.FocusState);
|
2018-02-10 00:14:55 +00:00
|
|
|
|
2019-07-14 20:04:38 +01:00
|
|
|
return ResultCode.Success;
|
2018-02-10 00:14:55 +00:00
|
|
|
}
|
2018-06-11 00:53:28 +01:00
|
|
|
|
2021-04-13 23:01:24 +01:00
|
|
|
[CommandHipc(50)] // 3.0.0+
|
2020-05-01 17:51:00 +01:00
|
|
|
// IsVrModeEnabled() -> b8
|
|
|
|
public ResultCode IsVrModeEnabled(ServiceCtx context)
|
|
|
|
{
|
|
|
|
context.ResponseData.Write(_vrModeEnabled);
|
|
|
|
|
|
|
|
return ResultCode.Success;
|
|
|
|
}
|
|
|
|
|
2021-04-13 23:01:24 +01:00
|
|
|
[CommandHipc(51)] // 3.0.0+
|
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 21:30:20 +00:00
|
|
|
// SetVrModeEnabled(b8)
|
|
|
|
public ResultCode SetVrModeEnabled(ServiceCtx context)
|
|
|
|
{
|
|
|
|
bool vrModeEnabled = context.RequestData.ReadBoolean();
|
|
|
|
|
|
|
|
UpdateVrMode(vrModeEnabled);
|
|
|
|
|
|
|
|
return ResultCode.Success;
|
|
|
|
}
|
|
|
|
|
2021-04-13 23:01:24 +01:00
|
|
|
[CommandHipc(52)] // 4.0.0+
|
2021-02-21 08:21:32 +00:00
|
|
|
// SetLcdBacklighOffEnabled(b8)
|
|
|
|
public ResultCode SetLcdBacklighOffEnabled(ServiceCtx context)
|
|
|
|
{
|
|
|
|
// NOTE: Service sets a private field here, maybe this field is used somewhere else to turned off the backlight.
|
|
|
|
// Since we don't support backlight, it's fine to do nothing.
|
|
|
|
|
|
|
|
_lcdBacklighOffEnabled = context.RequestData.ReadBoolean();
|
|
|
|
|
|
|
|
Logger.Stub?.PrintStub(LogClass.ServiceAm);
|
|
|
|
|
|
|
|
return ResultCode.Success;
|
|
|
|
}
|
|
|
|
|
2021-04-13 23:01:24 +01:00
|
|
|
[CommandHipc(53)] // 7.0.0+
|
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 21:30:20 +00:00
|
|
|
// BeginVrModeEx()
|
|
|
|
public ResultCode BeginVrModeEx(ServiceCtx context)
|
|
|
|
{
|
|
|
|
UpdateVrMode(true);
|
|
|
|
|
|
|
|
return ResultCode.Success;
|
|
|
|
}
|
|
|
|
|
2021-04-13 23:01:24 +01:00
|
|
|
[CommandHipc(54)] // 7.0.0+
|
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 21:30:20 +00:00
|
|
|
// 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();
|
|
|
|
}
|
|
|
|
|
2020-12-01 23:23:43 +00:00
|
|
|
// TODO: It signals an internal event of ICommonStateGetter. We have to determine where this event is used.
|
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 21:30:20 +00:00
|
|
|
}
|
|
|
|
|
2021-04-13 23:01:24 +01:00
|
|
|
[CommandHipc(60)] // 3.0.0+
|
2019-07-12 02:13:43 +01:00
|
|
|
// GetDefaultDisplayResolution() -> (u32, u32)
|
2019-07-14 20:04:38 +01:00
|
|
|
public ResultCode GetDefaultDisplayResolution(ServiceCtx context)
|
2018-06-11 00:53:28 +01:00
|
|
|
{
|
vi: Unify resolutions values and accurate implementation of them. (#2640)
* vi: Unify resolutions values and accurate implementation of them.
To continue what was made in #2618, I've REd `vi` service a bit. Now values and checks related to displays are more accurate.
- `am` GetDefaultDisplayResolution / GetDefaultDisplayResolutionChangeEvent have more informations on what the service does.
- `vi:u/vi:m/vi:s` GetDisplayService are now accurate.
- `IApplicationDisplay` GetRelayService, GetSystemDisplayService, GetManagerDisplayService, GetIndirectDisplayTransactionService, ListDisplays, OpenDisplay, OpenDefaultDisplay, CloseDisplay, GetDisplayResolution are now properly implemented.
- Some other calls are cleaned or have extra checks accordingly to RE.
Additionnaly, `IFriendService` have some wrong aligned things, and `pm:info` service placeholder was missing.
* just use _openedDisplayInfo.Remove()
* use context.Memory.Fill()
* fix some casting
* remove unneeded comment
* cleanup
* uses TryAdd
* displayId > ulong
* GetDisplayResolution > ulong
* UL
2021-09-19 11:57:39 +01:00
|
|
|
// NOTE: Original service calls IOperationModeManager::GetDefaultDisplayResolution of omm service.
|
|
|
|
// IOperationModeManager::GetDefaultDisplayResolution of omm service call IManagerDisplayService::GetDisplayResolution of vi service.
|
|
|
|
(ulong width, ulong height) = AndroidSurfaceComposerClient.GetDisplayInfo(context);
|
|
|
|
|
|
|
|
context.ResponseData.Write((uint)width);
|
|
|
|
context.ResponseData.Write((uint)height);
|
2018-06-11 00:53:28 +01:00
|
|
|
|
2019-07-14 20:04:38 +01:00
|
|
|
return ResultCode.Success;
|
2018-06-11 00:53:28 +01:00
|
|
|
}
|
|
|
|
|
2021-04-13 23:01:24 +01:00
|
|
|
[CommandHipc(61)] // 3.0.0+
|
2019-07-12 02:13:43 +01:00
|
|
|
// GetDefaultDisplayResolutionChangeEvent() -> handle<copy>
|
2019-07-14 20:04:38 +01:00
|
|
|
public ResultCode GetDefaultDisplayResolutionChangeEvent(ServiceCtx context)
|
2018-06-11 00:53:28 +01:00
|
|
|
{
|
vi: Unify resolutions values and accurate implementation of them. (#2640)
* vi: Unify resolutions values and accurate implementation of them.
To continue what was made in #2618, I've REd `vi` service a bit. Now values and checks related to displays are more accurate.
- `am` GetDefaultDisplayResolution / GetDefaultDisplayResolutionChangeEvent have more informations on what the service does.
- `vi:u/vi:m/vi:s` GetDisplayService are now accurate.
- `IApplicationDisplay` GetRelayService, GetSystemDisplayService, GetManagerDisplayService, GetIndirectDisplayTransactionService, ListDisplays, OpenDisplay, OpenDefaultDisplay, CloseDisplay, GetDisplayResolution are now properly implemented.
- Some other calls are cleaned or have extra checks accordingly to RE.
Additionnaly, `IFriendService` have some wrong aligned things, and `pm:info` service placeholder was missing.
* just use _openedDisplayInfo.Remove()
* use context.Memory.Fill()
* fix some casting
* remove unneeded comment
* cleanup
* uses TryAdd
* displayId > ulong
* GetDisplayResolution > ulong
* UL
2021-09-19 11:57:39 +01:00
|
|
|
// NOTE: Original service calls IOperationModeManager::GetDefaultDisplayResolutionChangeEvent of omm service.
|
2020-12-01 23:23:43 +00:00
|
|
|
if (_displayResolutionChangedEventHandle == 0)
|
2018-09-23 19:11:46 +01:00
|
|
|
{
|
2020-12-01 23:23:43 +00:00
|
|
|
if (context.Process.HandleTable.GenerateHandle(context.Device.System.DisplayResolutionChangeEvent.ReadableEvent, out _displayResolutionChangedEventHandle) != KernelResult.Success)
|
|
|
|
{
|
|
|
|
throw new InvalidOperationException("Out of handles!");
|
|
|
|
}
|
2018-09-23 19:11:46 +01:00
|
|
|
}
|
2018-06-11 00:53:28 +01:00
|
|
|
|
2020-12-01 23:23:43 +00:00
|
|
|
context.Response.HandleDesc = IpcHandleDesc.MakeCopy(_displayResolutionChangedEventHandle);
|
2018-06-11 00:53:28 +01:00
|
|
|
|
2020-08-04 00:32:53 +01:00
|
|
|
Logger.Stub?.PrintStub(LogClass.ServiceAm);
|
2018-06-11 00:53:28 +01:00
|
|
|
|
2019-07-14 20:04:38 +01:00
|
|
|
return ResultCode.Success;
|
2018-06-11 00:53:28 +01:00
|
|
|
}
|
2019-08-28 12:02:50 +01:00
|
|
|
|
2021-04-13 23:01:24 +01:00
|
|
|
[CommandHipc(66)] // 6.0.0+
|
2019-08-28 12:02:50 +01:00
|
|
|
// SetCpuBoostMode(u32 cpu_boost_mode)
|
|
|
|
public ResultCode SetCpuBoostMode(ServiceCtx context)
|
|
|
|
{
|
|
|
|
uint cpuBoostMode = context.RequestData.ReadUInt32();
|
|
|
|
|
|
|
|
if (cpuBoostMode > 1)
|
|
|
|
{
|
2020-02-11 23:07:13 +00:00
|
|
|
return ResultCode.InvalidParameters;
|
2019-08-28 12:02:50 +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 21:30:20 +00:00
|
|
|
_apmSystemManagerServer.SetCpuBoostMode((Apm.CpuBoostMode)cpuBoostMode);
|
2019-08-28 12:02:50 +01:00
|
|
|
|
2020-12-01 23:23:43 +00:00
|
|
|
// TODO: It signals an internal event of ICommonStateGetter. We have to determine where this event is used.
|
2019-08-28 12:02:50 +01:00
|
|
|
|
|
|
|
return ResultCode.Success;
|
|
|
|
}
|
2020-11-08 20:00:54 +00:00
|
|
|
|
2021-04-13 23:01:24 +01:00
|
|
|
[CommandHipc(91)] // 7.0.0+
|
2020-11-08 20:00:54 +00:00
|
|
|
// 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 21:30:20 +00:00
|
|
|
return (ResultCode)_apmSystemManagerServer.GetCurrentPerformanceConfiguration(context);
|
2020-11-08 20:00:54 +00:00
|
|
|
}
|
2021-03-25 22:25:49 +00:00
|
|
|
|
2021-06-28 19:54:45 +01:00
|
|
|
[CommandHipc(300)] // 9.0.0+
|
|
|
|
// GetSettingsPlatformRegion() -> u8
|
|
|
|
public ResultCode GetSettingsPlatformRegion(ServiceCtx context)
|
|
|
|
{
|
|
|
|
PlatformRegion platformRegion = context.Device.System.State.DesiredRegionCode == (uint)RegionCode.China ? PlatformRegion.China : PlatformRegion.Global;
|
|
|
|
|
|
|
|
// FIXME: Call set:sys GetPlatformRegion
|
|
|
|
context.ResponseData.Write((byte)platformRegion);
|
|
|
|
|
|
|
|
return ResultCode.Success;
|
|
|
|
}
|
|
|
|
|
2021-04-13 23:01:24 +01:00
|
|
|
[CommandHipc(900)] // 11.0.0+
|
2021-03-25 22:25:49 +00:00
|
|
|
// SetRequestExitToLibraryAppletAtExecuteNextProgramEnabled()
|
|
|
|
public ResultCode SetRequestExitToLibraryAppletAtExecuteNextProgramEnabled(ServiceCtx context)
|
|
|
|
{
|
|
|
|
// TODO : Find where the field is used.
|
|
|
|
_requestExitToLibraryAppletAtExecuteNextProgramEnabled = true;
|
|
|
|
|
|
|
|
return ResultCode.Success;
|
|
|
|
}
|
2018-02-10 00:14:55 +00:00
|
|
|
}
|
2019-07-12 02:13:43 +01:00
|
|
|
}
|