From 0746b83edf49d1fd668dd337264e942f361b675c Mon Sep 17 00:00:00 2001 From: Mary Date: Wed, 14 Apr 2021 00:01:24 +0200 Subject: 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 --- Ryujinx.HLE/HOS/Services/Caps/IAlbumApplicationService.cs | 2 +- Ryujinx.HLE/HOS/Services/Caps/IAlbumControlService.cs | 2 +- Ryujinx.HLE/HOS/Services/Caps/IScreenShotApplicationService.cs | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) (limited to 'Ryujinx.HLE/HOS/Services/Caps') diff --git a/Ryujinx.HLE/HOS/Services/Caps/IAlbumApplicationService.cs b/Ryujinx.HLE/HOS/Services/Caps/IAlbumApplicationService.cs index 88803ccc..8abda41c 100644 --- a/Ryujinx.HLE/HOS/Services/Caps/IAlbumApplicationService.cs +++ b/Ryujinx.HLE/HOS/Services/Caps/IAlbumApplicationService.cs @@ -7,7 +7,7 @@ namespace Ryujinx.HLE.HOS.Services.Caps { public IAlbumApplicationService(ServiceCtx context) { } - [Command(32)] // 7.0.0+ + [CommandHipc(32)] // 7.0.0+ // SetShimLibraryVersion(pid, u64, nn::applet::AppletResourceUserId) public ResultCode SetShimLibraryVersion(ServiceCtx context) { diff --git a/Ryujinx.HLE/HOS/Services/Caps/IAlbumControlService.cs b/Ryujinx.HLE/HOS/Services/Caps/IAlbumControlService.cs index 48cb9cab..3b565b67 100644 --- a/Ryujinx.HLE/HOS/Services/Caps/IAlbumControlService.cs +++ b/Ryujinx.HLE/HOS/Services/Caps/IAlbumControlService.cs @@ -5,7 +5,7 @@ namespace Ryujinx.HLE.HOS.Services.Caps { public IAlbumControlService(ServiceCtx context) { } - [Command(33)] // 7.0.0+ + [CommandHipc(33)] // 7.0.0+ // SetShimLibraryVersion(pid, u64, nn::applet::AppletResourceUserId) public ResultCode SetShimLibraryVersion(ServiceCtx context) { diff --git a/Ryujinx.HLE/HOS/Services/Caps/IScreenShotApplicationService.cs b/Ryujinx.HLE/HOS/Services/Caps/IScreenShotApplicationService.cs index 3824e7a3..b907ff35 100644 --- a/Ryujinx.HLE/HOS/Services/Caps/IScreenShotApplicationService.cs +++ b/Ryujinx.HLE/HOS/Services/Caps/IScreenShotApplicationService.cs @@ -8,14 +8,14 @@ namespace Ryujinx.HLE.HOS.Services.Caps { public IScreenShotApplicationService(ServiceCtx context) { } - [Command(32)] // 7.0.0+ + [CommandHipc(32)] // 7.0.0+ // SetShimLibraryVersion(pid, u64, nn::applet::AppletResourceUserId) public ResultCode SetShimLibraryVersion(ServiceCtx context) { return context.Device.System.CaptureManager.SetShimLibraryVersion(context); } - [Command(203)] + [CommandHipc(203)] // SaveScreenShotEx0(bytes<0x40> ScreenShotAttribute, u32 unknown, u64 AppletResourceUserId, pid, buffer ScreenshotData) -> bytes<0x20> ApplicationAlbumEntry public ResultCode SaveScreenShotEx0(ServiceCtx context) { @@ -38,7 +38,7 @@ namespace Ryujinx.HLE.HOS.Services.Caps return resultCode; } - [Command(205)] // 8.0.0+ + [CommandHipc(205)] // 8.0.0+ // SaveScreenShotEx1(bytes<0x40> ScreenShotAttribute, u32 unknown, u64 AppletResourceUserId, pid, buffer ApplicationData, buffer ScreenshotData) -> bytes<0x20> ApplicationAlbumEntry public ResultCode SaveScreenShotEx1(ServiceCtx context) { @@ -67,7 +67,7 @@ namespace Ryujinx.HLE.HOS.Services.Caps return resultCode; } - [Command(210)] + [CommandHipc(210)] // SaveScreenShotEx2(bytes<0x40> ScreenShotAttribute, u32 unknown, u64 AppletResourceUserId, buffer UserIdList, buffer ScreenshotData) -> bytes<0x20> ApplicationAlbumEntry public ResultCode SaveScreenShotEx2(ServiceCtx context) { -- cgit v1.2.3