caps(su): Updated for new-ipc. Updated for using AccountUid.

nx/include/switch/services/caps.h

@@ -123,7 +123,7 @@ typedef struct {
 
 /// UserIdList
 typedef struct {
-    union { u128 userIDs[ACC_USER_LIST_SIZE]; } PACKED;   ///< userIDs.
+    AccountUid userIDs[ACC_USER_LIST_SIZE];               ///< \ref AccountUid
     u8 count;                                             ///< Total userIDs.
     u8 pad[7];                                            ///< Padding.
 } CapsUserIdList;

nx/include/switch/services/capssu.h

@@ -6,7 +6,8 @@
  */
 #pragma once
 #include "../types.h"
-#include "../services/sm.h"
+#include "../sf/service.h"
+#include "../services/acc.h"
 #include "../services/caps.h"
 
 /// Initialize caps:su. Only available on [4.0.0+].
@@ -51,11 +52,11 @@ Result capssuSaveScreenShotWithUserData(const void* buffer, size_t size, AlbumRe
  * @param[in] size Size of the buffer.
  * @param[in] reportoption \ref AlbumReportOption
  * @param[in] orientation \ref AlbumImageOrientation
- * @param[in] userIDs Input array of account userIDs. If NULL, the \ref CapsUserIdList will be empty.
+ * @param[in] userIDs Input array of \ref AccountUid. If NULL, the \ref CapsUserIdList will be empty.
  * @param[in] userID_count Size of the userID array in entries, must be within bounds for CapsUserIdList::userIDs. If 0, the \ref CapsUserIdList will be empty.
  * @param[out] out \ref CapsApplicationAlbumEntry. Optional, can be NULL.
  */
-Result capssuSaveScreenShotWithUserIds(const void* buffer, size_t size, AlbumReportOption reportoption, AlbumImageOrientation orientation, const u128* userIDs, size_t userID_count, CapsApplicationAlbumEntry *out);
+Result capssuSaveScreenShotWithUserIds(const void* buffer, size_t size, AlbumReportOption reportoption, AlbumImageOrientation orientation, const AccountUid* userIDs, size_t userID_count, CapsApplicationAlbumEntry *out);
 
 /**
  * @brief Saves an Album screenshot using the specified gfx data in the buffer, with the specified \ref CapsScreenShotAttribute.

nx/source/services/capssu.c

@@ -1,28 +1,21 @@
+#define NX_SERVICE_ASSUME_NON_DOMAIN
 #include <string.h>
-#include "types.h"
+#include "service_guard.h"
-#include "result.h"
-#include "arm/atomics.h"
-#include "kernel/ipc.h"
 #include "runtime/hosversion.h"
 #include "services/applet.h"
 #include "services/caps.h"
 #include "services/capssu.h"
 #include "services/acc.h"
-#include "services/sm.h"
 
 static Service g_capssuSrv;
-static u64 g_capssuRefCnt;
 
 static Result _capssuSetShimLibraryVersion(u64 version);
 
-Result capssuInitialize(void) {
+NX_GENERATE_SERVICE_GUARD(capssu);
+
+Result _capssuInitialize(void) {
     Result rc=0;
 
-    atomicIncrement64(&g_capssuRefCnt);
-
-    if (serviceIsActive(&g_capssuSrv))
-        return 0;
-
     if (hosversionBefore(4,0,0))
         rc = MAKERESULT(Module_Libnx, LibnxError_IncompatSysVer);
 
@@ -30,14 +23,11 @@ Result capssuInitialize(void) {
 
     if (R_SUCCEEDED(rc) && hosversionAtLeast(7,0,0)) rc = _capssuSetShimLibraryVersion(capsGetShimLibraryVersion());
 
-    if (R_FAILED(rc)) capssuExit();
-
     return rc;
 }
 
-void capssuExit(void) {
+void _capssuCleanup(void) {
-    if (atomicDecrement64(&g_capssuRefCnt) == 0)
+    serviceClose(&g_capssuSrv);
-        serviceClose(&g_capssuSrv);
 }
 
 Service* capssuGetServiceSession(void) {
@@ -51,136 +41,54 @@ static Result _capssuSetShimLibraryVersion(u64 version) {
     u64 AppletResourceUserId = 0;
     appletGetAppletResourceUserId(&AppletResourceUserId);
 
-    IpcCommand c;
+    const struct {
-    ipcInitialize(&c);
-
-    struct {
-        u64 magic;
-        u64 cmd_id;
         u64 version;
         u64 AppletResourceUserId;
-    } *raw;
+    } in = { version, AppletResourceUserId };
 
-    ipcSendPid(&c);
+    return serviceDispatchIn(&g_capssuSrv, 32, in,
-
+        .in_send_pid = true,
-    raw = serviceIpcPrepareHeader(&g_capssuSrv, &c, sizeof(*raw));
+    );
-
-    raw->magic = SFCI_MAGIC;
-    raw->cmd_id = 32;
-    raw->version = version;
-    raw->AppletResourceUserId = AppletResourceUserId;
-
-    Result rc = serviceIpcDispatch(&g_capssuSrv);
-
-    if (R_SUCCEEDED(rc)) {
-        IpcParsedCommand r;
-        struct {
-            u64 magic;
-            u64 result;
-        } *resp;
-
-        serviceIpcParse(&g_capssuSrv, &r, sizeof(*resp));
-        resp = r.Raw;
-
-        rc = resp->result;
-    }
-
-    return rc;
 }
 
 static Result _capssuSaveScreenShotEx0(const void* buffer, size_t size, const CapsScreenShotAttribute *attr, AlbumReportOption reportoption, CapsApplicationAlbumEntry *out) {
     u64 AppletResourceUserId = 0;
     appletGetAppletResourceUserId(&AppletResourceUserId);
 
-    IpcCommand c;
+    const struct {
-    ipcInitialize(&c);
-
-    struct {
-        u64 magic;
-        u64 cmd_id;
         CapsScreenShotAttribute attr;
         u32 reportoption;
         u64 AppletResourceUserId;
-    } *raw;
+    } in = { *attr, reportoption, AppletResourceUserId };
 
-    ipcSendPid(&c);
+    return serviceDispatchInOut(&g_capssuSrv, 203, in, *out,
-    ipcAddSendBuffer(&c, buffer, size, BufferType_Type1);
+        .buffer_attrs = { SfBufferAttr_HipcMapTransferAllowsNonSecure | SfBufferAttr_HipcMapAlias | SfBufferAttr_In },
-
+        .buffers = { { buffer, size } },
-    raw = serviceIpcPrepareHeader(&g_capssuSrv, &c, sizeof(*raw));
+        .in_send_pid = true,
-
+    );
-    raw->magic = SFCI_MAGIC;
-    raw->cmd_id = 203;
-    raw->attr = *attr;
-    raw->reportoption = reportoption;
-    raw->AppletResourceUserId = AppletResourceUserId;
-
-    Result rc = serviceIpcDispatch(&g_capssuSrv);
-
-    if (R_SUCCEEDED(rc)) {
-        IpcParsedCommand r;
-        struct {
-            u64 magic;
-            u64 result;
-            CapsApplicationAlbumEntry out;
-        } *resp;
-
-        serviceIpcParse(&g_capssuSrv, &r, sizeof(*resp));
-        resp = r.Raw;
-
-        rc = resp->result;
-
-        if (R_SUCCEEDED(rc) && out) *out = resp->out;
-    }
-
-    return rc;
 }
 
-static Result _capssuSaveScreenShotEx(u64 cmd_id, bool pid, const void* argbuf, size_t argbuf_size, const void* buffer, size_t size, const CapsScreenShotAttribute *attr, AlbumReportOption reportoption, CapsApplicationAlbumEntry *out) {
+static Result _capssuSaveScreenShotEx(u32 cmd_id, bool pid, const void* argbuf, size_t argbuf_size, const void* buffer, size_t size, const CapsScreenShotAttribute *attr, AlbumReportOption reportoption, CapsApplicationAlbumEntry *out) {
     u64 AppletResourceUserId = 0;
     appletGetAppletResourceUserId(&AppletResourceUserId);
 
-    IpcCommand c;
+    const struct {
-    ipcInitialize(&c);
-
-    struct {
-        u64 magic;
-        u64 cmd_id;
         CapsScreenShotAttribute attr;
         u32 reportoption;
         u64 AppletResourceUserId;
-    } *raw;
+    } in = { *attr, reportoption, AppletResourceUserId };
 
-    if (pid) ipcSendPid(&c);
+    return serviceDispatchInOut(&g_capssuSrv, cmd_id, in, *out,
-    ipcAddSendBuffer(&c, argbuf, argbuf_size, BufferType_Normal);
+        .buffer_attrs = {
-    ipcAddSendBuffer(&c, buffer, size, BufferType_Type1);
+            SfBufferAttr_HipcMapAlias | SfBufferAttr_In,
-
+            SfBufferAttr_HipcMapTransferAllowsNonSecure | SfBufferAttr_HipcMapAlias | SfBufferAttr_In,
-    raw = serviceIpcPrepareHeader(&g_capssuSrv, &c, sizeof(*raw));
+        },
-
+        .buffers = {
-    raw->magic = SFCI_MAGIC;
+            { argbuf, argbuf_size },
-    raw->cmd_id = cmd_id;
+            { buffer, size },
-    raw->attr = *attr;
+        },
-    raw->reportoption = reportoption;
+        .in_send_pid = pid,
-    raw->AppletResourceUserId = AppletResourceUserId;
+    );
-
-    Result rc = serviceIpcDispatch(&g_capssuSrv);
-
-    if (R_SUCCEEDED(rc)) {
-        IpcParsedCommand r;
-        struct {
-            u64 magic;
-            u64 result;
-            CapsApplicationAlbumEntry out;
-        } *resp;
-
-        serviceIpcParse(&g_capssuSrv, &r, sizeof(*resp));
-        resp = r.Raw;
-
-        rc = resp->result;
-
-        if (R_SUCCEEDED(rc) && out) *out = resp->out;
-    }
-
-    return rc;
 }
 
 Result capssuSaveScreenShot(const void* buffer, size_t size, AlbumReportOption reportoption, AlbumImageOrientation orientation, CapsApplicationAlbumEntry *out) {
@@ -211,7 +119,7 @@ Result capssuSaveScreenShotWithUserData(const void* buffer, size_t size, AlbumRe
     return capssuSaveScreenShotEx1(buffer, size, &attr, reportoption, &appdata, out);
 }
 
-Result capssuSaveScreenShotWithUserIds(const void* buffer, size_t size, AlbumReportOption reportoption, AlbumImageOrientation orientation, const u128* userIDs, size_t userID_count, CapsApplicationAlbumEntry *out) {
+Result capssuSaveScreenShotWithUserIds(const void* buffer, size_t size, AlbumReportOption reportoption, AlbumImageOrientation orientation, const AccountUid* userIDs, size_t userID_count, CapsApplicationAlbumEntry *out) {
     CapsScreenShotAttribute attr;
     CapsUserIdList list;
 
@@ -223,7 +131,7 @@ Result capssuSaveScreenShotWithUserIds(const void* buffer, size_t size, AlbumRep
     attr.unk_xc = 1;
 
     memset(&list, 0, sizeof(list));
-    if (userIDs && userID_count) memcpy(list.userIDs, userIDs, userID_count*sizeof(u128));
+    if (userIDs && userID_count) memcpy(list.userIDs, userIDs, userID_count*sizeof(AccountUid));
     list.count = userID_count;
 
     return capssuSaveScreenShotEx2(buffer, size, &attr, reportoption, &list, out);