Implement missing service calls in pm
(#4210)
* Implement `GetTitleId` Fixes #2516 * Null check + Proper result code * Better comment * Implement `GetApplicationProcessId` * Add TODOs * Update Ryujinx.HLE/HOS/Services/Pm/IInformationInterface.cs Co-authored-by: Ac_K <Acoustik666@gmail.com> * Update Ryujinx.HLE/HOS/Services/Pm/IDebugMonitorInterface.cs Co-authored-by: Ac_K <Acoustik666@gmail.com> * Remove new function from KernelStatic Co-authored-by: Ac_K <Acoustik666@gmail.com>
This commit is contained in:
parent
719dc97bbd
commit
139a930407
4 changed files with 58 additions and 4 deletions
|
@ -1,5 +1,4 @@
|
||||||
using Ryujinx.HLE.HOS.Kernel.Common;
|
using Ryujinx.HLE.HOS.Kernel.Memory;
|
||||||
using Ryujinx.HLE.HOS.Kernel.Memory;
|
|
||||||
using Ryujinx.HLE.HOS.Kernel.Process;
|
using Ryujinx.HLE.HOS.Kernel.Process;
|
||||||
using Ryujinx.HLE.HOS.Kernel.Threading;
|
using Ryujinx.HLE.HOS.Kernel.Threading;
|
||||||
using Ryujinx.Horizon.Common;
|
using Ryujinx.Horizon.Common;
|
||||||
|
|
|
@ -10,6 +10,24 @@ namespace Ryujinx.HLE.HOS.Services.Pm
|
||||||
{
|
{
|
||||||
public IDebugMonitorInterface(ServiceCtx context) { }
|
public IDebugMonitorInterface(ServiceCtx context) { }
|
||||||
|
|
||||||
|
[CommandHipc(4)]
|
||||||
|
// GetProgramId() -> sf::Out<ncm::ProgramId> out_process_id
|
||||||
|
public ResultCode GetApplicationProcessId(ServiceCtx context)
|
||||||
|
{
|
||||||
|
// TODO: Not correct as it shouldn't be directly using kernel objects here
|
||||||
|
foreach (KProcess process in context.Device.System.KernelContext.Processes.Values)
|
||||||
|
{
|
||||||
|
if (process.IsApplication)
|
||||||
|
{
|
||||||
|
context.ResponseData.Write(process.Pid);
|
||||||
|
|
||||||
|
return ResultCode.Success;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return ResultCode.ProcessNotFound;
|
||||||
|
}
|
||||||
|
|
||||||
[CommandHipc(65000)]
|
[CommandHipc(65000)]
|
||||||
// AtmosphereGetProcessInfo(os::ProcessId process_id) -> sf::OutCopyHandle out_process_handle, sf::Out<ncm::ProgramLocation> out_loc, sf::Out<cfg::OverrideStatus> out_status
|
// AtmosphereGetProcessInfo(os::ProcessId process_id) -> sf::OutCopyHandle out_process_handle, sf::Out<ncm::ProgramLocation> out_loc, sf::Out<cfg::OverrideStatus> out_status
|
||||||
public ResultCode GetProcessInfo(ServiceCtx context)
|
public ResultCode GetProcessInfo(ServiceCtx context)
|
||||||
|
|
|
@ -1,8 +1,28 @@
|
||||||
namespace Ryujinx.HLE.HOS.Services.Pm
|
using Ryujinx.HLE.HOS.Kernel;
|
||||||
|
using Ryujinx.HLE.HOS.Kernel.Process;
|
||||||
|
|
||||||
|
namespace Ryujinx.HLE.HOS.Services.Pm
|
||||||
{
|
{
|
||||||
[Service("pm:info")]
|
[Service("pm:info")]
|
||||||
class IInformationInterface : IpcService
|
class IInformationInterface : IpcService
|
||||||
{
|
{
|
||||||
public IInformationInterface(ServiceCtx context) { }
|
public IInformationInterface(ServiceCtx context) { }
|
||||||
|
|
||||||
|
[CommandHipc(0)]
|
||||||
|
// GetProgramId(os::ProcessId process_id) -> sf::Out<ncm::ProgramId> out
|
||||||
|
public ResultCode GetProgramId(ServiceCtx context)
|
||||||
|
{
|
||||||
|
ulong pid = context.RequestData.ReadUInt64();
|
||||||
|
|
||||||
|
// TODO: Not correct as it shouldn't be directly using kernel objects here
|
||||||
|
if (context.Device.System.KernelContext.Processes.TryGetValue(pid, out KProcess process))
|
||||||
|
{
|
||||||
|
context.ResponseData.Write(process.TitleId);
|
||||||
|
|
||||||
|
return ResultCode.Success;
|
||||||
|
}
|
||||||
|
|
||||||
|
return ResultCode.ProcessNotFound;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
17
Ryujinx.HLE/HOS/Services/Pm/ResultCode.cs
Normal file
17
Ryujinx.HLE/HOS/Services/Pm/ResultCode.cs
Normal file
|
@ -0,0 +1,17 @@
|
||||||
|
namespace Ryujinx.HLE.HOS.Services.Pm
|
||||||
|
{
|
||||||
|
enum ResultCode
|
||||||
|
{
|
||||||
|
ModuleId = 15,
|
||||||
|
ErrorCodeShift = 9,
|
||||||
|
|
||||||
|
Success = 0,
|
||||||
|
|
||||||
|
ProcessNotFound = (1 << ErrorCodeShift) | ModuleId,
|
||||||
|
AlreadyStarted = (2 << ErrorCodeShift) | ModuleId,
|
||||||
|
NotTerminated = (3 << ErrorCodeShift) | ModuleId,
|
||||||
|
DebugHookInUse = (4 << ErrorCodeShift) | ModuleId,
|
||||||
|
ApplicationRunning = (5 << ErrorCodeShift) | ModuleId,
|
||||||
|
InvalidSize = (6 << ErrorCodeShift) | ModuleId,
|
||||||
|
}
|
||||||
|
}
|
Reference in a new issue