From f804793fdfed28ed1e67cfd7c5fbe4b83cac6505 Mon Sep 17 00:00:00 2001
From: Michael Scire <SciresM@gmail.com>
Date: Tue, 22 Mar 2022 10:21:47 -0700
Subject: [PATCH] pm: hook up the new libnx apis

---
 .../include/stratosphere/pm/pm_shell_api.hpp           |  4 ++--
 libraries/libstratosphere/source/pm/pm_dmnt_api.cpp    |  4 +---
 libraries/libstratosphere/source/pm/pm_info_api.cpp    | 10 ++++------
 libraries/libstratosphere/source/pm/pm_shell_api.cpp   |  9 ++++-----
 4 files changed, 11 insertions(+), 16 deletions(-)

diff --git a/libraries/libstratosphere/include/stratosphere/pm/pm_shell_api.hpp b/libraries/libstratosphere/include/stratosphere/pm/pm_shell_api.hpp
index 6e215222d..b4cd348c4 100644
--- a/libraries/libstratosphere/include/stratosphere/pm/pm_shell_api.hpp
+++ b/libraries/libstratosphere/include/stratosphere/pm/pm_shell_api.hpp
@@ -29,7 +29,7 @@ namespace ams::pm::shell {
     Result GetProcessEventInfo(ProcessEventInfo *out);
     Result GetApplicationProcessIdForShell(os::ProcessId *out);
     Result BoostSystemMemoryResourceLimit(u64 size);
-    Result EnableApplicationExtraThread();
-    Result EnableSystemExtraThread();
+    Result BoostApplicationThreadResourceLimit();
+    Result BoostSystemThreadResourceLimit();
 
 }
diff --git a/libraries/libstratosphere/source/pm/pm_dmnt_api.cpp b/libraries/libstratosphere/source/pm/pm_dmnt_api.cpp
index e72ed069e..ba06a3839 100644
--- a/libraries/libstratosphere/source/pm/pm_dmnt_api.cpp
+++ b/libraries/libstratosphere/source/pm/pm_dmnt_api.cpp
@@ -26,9 +26,7 @@ namespace ams::pm::dmnt {
     }
 
     Result GetProgramId(ncm::ProgramId *out_program_id, os::ProcessId process_id) {
-        /* TODO: return return pmdmntGetProgramId(reinterpret_cast<u64 *>(out_program_id), static_cast<u64>(process_id)); */
-        AMS_UNUSED(out_program_id, process_id);
-        AMS_ABORT("TODO");
+        return pmdmntGetProgramId(reinterpret_cast<u64 *>(out_program_id), static_cast<u64>(process_id));
     }
 
     Result GetProcessId(os::ProcessId *out_process_id, const ncm::ProgramId program_id) {
diff --git a/libraries/libstratosphere/source/pm/pm_info_api.cpp b/libraries/libstratosphere/source/pm/pm_info_api.cpp
index 44c039eba..9eaed8ee7 100644
--- a/libraries/libstratosphere/source/pm/pm_info_api.cpp
+++ b/libraries/libstratosphere/source/pm/pm_info_api.cpp
@@ -29,15 +29,13 @@ namespace ams::pm::info {
     }
 
     Result GetAppletCurrentResourceLimitValues(pm::ResourceLimitValues *out) {
-        /* TODO: return pminfoGetAppletCurrentResourceLimitValues(reinterpret_cast<PmResourceLimitValues *>(out)); */
-        AMS_UNUSED(out);
-        AMS_ABORT("TODO");
+        static_assert(sizeof(pm::ResourceLimitValues) == sizeof(::PmResourceLimitValues));
+        return pminfoGetAppletCurrentResourceLimitValues(reinterpret_cast<PmResourceLimitValues *>(out));
     }
 
     Result GetAppletPeakResourceLimitValues(pm::ResourceLimitValues *out) {
-        /* TODO: return pminfoGetAppletPeakResourceLimitValues(reinterpret_cast<PmResourceLimitValues *>(out)); */
-        AMS_UNUSED(out);
-        AMS_ABORT("TODO");
+        static_assert(sizeof(pm::ResourceLimitValues) == sizeof(::PmResourceLimitValues));
+        return pminfoGetAppletPeakResourceLimitValues(reinterpret_cast<PmResourceLimitValues *>(out));
     }
 
     Result GetProcessInfo(ncm::ProgramLocation *out_loc, cfg::OverrideStatus *out_status, os::ProcessId process_id) {
diff --git a/libraries/libstratosphere/source/pm/pm_shell_api.cpp b/libraries/libstratosphere/source/pm/pm_shell_api.cpp
index dbee04e91..8feaf95bc 100644
--- a/libraries/libstratosphere/source/pm/pm_shell_api.cpp
+++ b/libraries/libstratosphere/source/pm/pm_shell_api.cpp
@@ -50,14 +50,13 @@ namespace ams::pm::shell {
         return ::pmshellBoostSystemMemoryResourceLimit(size);
     }
 
-    Result EnableApplicationExtraThread() {
-        return ::pmshellEnableApplicationExtraThread();
+    Result BoostApplicationThreadResourceLimit() {
+        return ::pmshellBoostApplicationThreadResourceLimit();
     }
     #endif
 
-    Result EnableSystemExtraThread() {
-        /* TODO: return ::pmshellEnableSystemExtraThread(); */
-        AMS_ABORT("TODO");
+    Result BoostSystemThreadResourceLimit() {
+        return ::pmshellBoostSystemThreadResourceLimit();
     }
 
 }