From 25b0f5581b6d1cfc38e898af1d968a49e277e715 Mon Sep 17 00:00:00 2001
From: Reiko Asakura
Date: Fri, 12 Mar 2021 16:19:42 -0500
Subject: Refactor structs in common/appmgr.h

sceAppMgrDrm{Open,Close} has been moved to the common header because
they are also available as user functions.
---
 include/common/appmgr.h | 27 +++++++++++++--------------
 include/kernel/appmgr.h |  4 ----
 2 files changed, 13 insertions(+), 18 deletions(-)

(limited to 'include')

diff --git a/include/common/appmgr.h b/include/common/appmgr.h
index 0d83089..ce49a80 100644
--- a/include/common/appmgr.h
+++ b/include/common/appmgr.h
@@ -7,29 +7,28 @@
 
 #include_next <appmgr.h>
 
+#include <apputil.h>
+
 #if defined(_LANGUAGE_C_PLUS_PLUS)||defined(__cplusplus)||defined(c_plusplus)
 extern "C" {
 #endif
 
-#define SCE_APPMGR_MOUNTPOINT_DATA_MAXSIZE 16
-
-#define SCE_APPMGR_NP_DRM_ADDCONT_ID_SIZE 17
-
-typedef struct SceAppMgrMountPoint {
-	SceChar8 data[SCE_APPMGR_MOUNTPOINT_DATA_MAXSIZE];
-} SceAppMgrMountPoint;
-
-typedef struct SceAppMgrDrmAddcontId {
-	SceChar8 data[SCE_APPMGR_NP_DRM_ADDCONT_ID_SIZE];
-	SceChar8 padding[3];
-} SceAppMgrDrmAddcontId;
+/*J 構造体 -------------------------------------------------------------------------------- */
+/*E Structures ---------------------------------------------------------------------------- */
 
 typedef struct SceAppMgrDrmAddcontParam {
 	SceSize size;
-	SceAppMgrDrmAddcontId dirName;
-	SceAppMgrMountPoint mountPoint;
+	SceAppUtilDrmAddcontId dirName;
+	SceAppUtilMountPoint mountPoint;
 } SceAppMgrDrmAddcontParam;
 
+/*J 関数 -------------------------------------------------------------------------------- */
+/*E Functions --------------------------------------------------------------------------- */
+
+SceInt32 sceAppMgrDrmOpen(const SceAppMgrDrmAddcontParam *pParam);
+
+SceInt32 sceAppMgrDrmClose(const SceAppMgrDrmAddcontParam *pParam);
+
 #if defined(_LANGUAGE_C_PLUS_PLUS)||defined(__cplusplus)||defined(c_plusplus)
 }
 #endif
diff --git a/include/kernel/appmgr.h b/include/kernel/appmgr.h
index d5f4674..0e26a95 100644
--- a/include/kernel/appmgr.h
+++ b/include/kernel/appmgr.h
@@ -49,10 +49,6 @@ typedef struct
  */
 int sceAppMgrLaunchAppByPath(const char *path, const char *args, SceSize arg_size, unsigned int type, const SceAppMgrLaunchParam *param, void *unk);
 
-SceInt32 sceAppMgrDrmOpen(const SceAppMgrDrmAddcontParam *pParam);
-
-SceInt32 sceAppMgrDrmClose(const SceAppMgrDrmAddcontParam *pParam);
-
 #ifdef __cplusplus
 }
 #endif
-- 
cgit v1.2.3