diff options
| author | Mary <me@thog.eu> | 2021-04-14 00:01:24 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-04-14 00:01:24 +0200 |
| commit | 0746b83edf49d1fd668dd337264e942f361b675c (patch) | |
| tree | 37b71396036206252cdc42715d6a3046ee81c795 /Ryujinx.HLE/HOS/Services/Apm | |
| parent | faa654dbaf7cd5262c78c0961a5aa72b1ce8ac33 (diff) | |
Initial support for the new 12.x IPC system (#2182)
* Rename CommandAttribute as CommandHIpcAttribute to prepare for 12.x changes
* Implement inital support for TIPC and adds SM command ids
* *Ipc to *ipc
* Missed a ref in last commit...
* CommandAttributeTIpc to CommandAttributeTipc
* Addresses comment and fixes some bugs around
TIPC doesn't have any padding requirements as buffer C isn't a thing
Fix for RegisterService inverting two argument only on TIPC
Diffstat (limited to 'Ryujinx.HLE/HOS/Services/Apm')
| -rw-r--r-- | Ryujinx.HLE/HOS/Services/Apm/IManager.cs | 6 | ||||
| -rw-r--r-- | Ryujinx.HLE/HOS/Services/Apm/IManagerPrivileged.cs | 2 | ||||
| -rw-r--r-- | Ryujinx.HLE/HOS/Services/Apm/ISession.cs | 6 | ||||
| -rw-r--r-- | Ryujinx.HLE/HOS/Services/Apm/ISystemManager.cs | 6 |
4 files changed, 10 insertions, 10 deletions
diff --git a/Ryujinx.HLE/HOS/Services/Apm/IManager.cs b/Ryujinx.HLE/HOS/Services/Apm/IManager.cs index ae1cfba8..11d28808 100644 --- a/Ryujinx.HLE/HOS/Services/Apm/IManager.cs +++ b/Ryujinx.HLE/HOS/Services/Apm/IManager.cs @@ -8,7 +8,7 @@ namespace Ryujinx.HLE.HOS.Services.Apm protected abstract PerformanceMode GetPerformanceMode(); protected abstract bool IsCpuOverclockEnabled(); - [Command(0)] + [CommandHipc(0)] // OpenSession() -> object<nn::apm::ISession> public ResultCode OpenSession(ServiceCtx context) { @@ -22,7 +22,7 @@ namespace Ryujinx.HLE.HOS.Services.Apm return resultCode; } - [Command(1)] + [CommandHipc(1)] // GetPerformanceMode() -> nn::apm::PerformanceMode public ResultCode GetPerformanceMode(ServiceCtx context) { @@ -31,7 +31,7 @@ namespace Ryujinx.HLE.HOS.Services.Apm return ResultCode.Success; } - [Command(6)] // 7.0.0+ + [CommandHipc(6)] // 7.0.0+ // IsCpuOverclockEnabled() -> bool public ResultCode IsCpuOverclockEnabled(ServiceCtx context) { diff --git a/Ryujinx.HLE/HOS/Services/Apm/IManagerPrivileged.cs b/Ryujinx.HLE/HOS/Services/Apm/IManagerPrivileged.cs index 86d618d8..56a7c5aa 100644 --- a/Ryujinx.HLE/HOS/Services/Apm/IManagerPrivileged.cs +++ b/Ryujinx.HLE/HOS/Services/Apm/IManagerPrivileged.cs @@ -7,7 +7,7 @@ namespace Ryujinx.HLE.HOS.Services.Apm { public IManagerPrivileged(ServiceCtx context) { } - [Command(0)] + [CommandHipc(0)] // OpenSession() -> object<nn::apm::ISession> public ResultCode OpenSession(ServiceCtx context) { diff --git a/Ryujinx.HLE/HOS/Services/Apm/ISession.cs b/Ryujinx.HLE/HOS/Services/Apm/ISession.cs index 95bdf35d..fca01812 100644 --- a/Ryujinx.HLE/HOS/Services/Apm/ISession.cs +++ b/Ryujinx.HLE/HOS/Services/Apm/ISession.cs @@ -8,7 +8,7 @@ namespace Ryujinx.HLE.HOS.Services.Apm protected abstract ResultCode GetPerformanceConfiguration(PerformanceMode performanceMode, out PerformanceConfiguration performanceConfiguration); protected abstract void SetCpuOverclockEnabled(bool enabled); - [Command(0)] + [CommandHipc(0)] // SetPerformanceConfiguration(nn::apm::PerformanceMode, nn::apm::PerformanceConfiguration) public ResultCode SetPerformanceConfiguration(ServiceCtx context) { @@ -18,7 +18,7 @@ namespace Ryujinx.HLE.HOS.Services.Apm return SetPerformanceConfiguration(performanceMode, performanceConfiguration); } - [Command(1)] + [CommandHipc(1)] // GetPerformanceConfiguration(nn::apm::PerformanceMode) -> nn::apm::PerformanceConfiguration public ResultCode GetPerformanceConfiguration(ServiceCtx context) { @@ -31,7 +31,7 @@ namespace Ryujinx.HLE.HOS.Services.Apm return resultCode; } - [Command(2)] // 8.0.0+ + [CommandHipc(2)] // 8.0.0+ // SetCpuOverclockEnabled(bool) public ResultCode SetCpuOverclockEnabled(ServiceCtx context) { diff --git a/Ryujinx.HLE/HOS/Services/Apm/ISystemManager.cs b/Ryujinx.HLE/HOS/Services/Apm/ISystemManager.cs index f7b2f450..1268463b 100644 --- a/Ryujinx.HLE/HOS/Services/Apm/ISystemManager.cs +++ b/Ryujinx.HLE/HOS/Services/Apm/ISystemManager.cs @@ -8,7 +8,7 @@ namespace Ryujinx.HLE.HOS.Services.Apm internal abstract void SetCpuBoostMode(CpuBoostMode cpuBoostMode); protected abstract PerformanceConfiguration GetCurrentPerformanceConfiguration(); - [Command(0)] + [CommandHipc(0)] // RequestPerformanceMode(nn::apm::PerformanceMode) public ResultCode RequestPerformanceMode(ServiceCtx context) { @@ -19,7 +19,7 @@ namespace Ryujinx.HLE.HOS.Services.Apm return ResultCode.Success; } - [Command(6)] // 7.0.0+ + [CommandHipc(6)] // 7.0.0+ // SetCpuBoostMode(nn::apm::CpuBootMode) public ResultCode SetCpuBoostMode(ServiceCtx context) { @@ -30,7 +30,7 @@ namespace Ryujinx.HLE.HOS.Services.Apm return ResultCode.Success; } - [Command(7)] // 7.0.0+ + [CommandHipc(7)] // 7.0.0+ // GetCurrentPerformanceConfiguration() -> nn::apm::PerformanceConfiguration public ResultCode GetCurrentPerformanceConfiguration(ServiceCtx context) { |
