pm: address review comments.

stratosphere/sm/source/impl/sm_service_manager.cpp

@@ -459,6 +459,17 @@ namespace sts::sm::impl {
         return ResultSuccess;
     }
 
+    Result WaitService(ServiceName service) {
+        bool has_service = false;
+        R_TRY(impl::HasService(&has_service, service));
+
+        /* Wait until we have the service. */
+        if (!has_service) {
+            return ResultServiceFrameworkRequestDeferredByUser;
+        }
+        return ResultSuccess;
+    }
+
     Result GetServiceHandle(Handle *out, u64 pid, ServiceName service) {
         /* Validate service name. */
         R_TRY(ValidateServiceName(service));
@@ -564,6 +575,17 @@ namespace sts::sm::impl {
         return ResultSuccess;
     }
 
+    Result WaitMitm(ServiceName service) {
+        bool has_mitm = false;
+        R_TRY(impl::HasMitm(&has_mitm, service));
+
+        /* Wait until we have the mitm. */
+        if (!has_mitm) {
+            return ResultServiceFrameworkRequestDeferredByUser;
+        }
+        return ResultSuccess;
+    }
+
     Result InstallMitm(Handle *out, Handle *out_query, u64 pid, ServiceName service) {
         /* Validate service name. */
         R_TRY(ValidateServiceName(service));

stratosphere/sm/source/impl/sm_service_manager.hpp

@@ -26,6 +26,7 @@ namespace sts::sm::impl {
 
     /* Service management. */
     Result HasService(bool *out, ServiceName service);
+    Result WaitService(ServiceName service);
     Result GetServiceHandle(Handle *out, u64 pid, ServiceName service);
     Result RegisterService(Handle *out, u64 pid, ServiceName service, size_t max_sessions, bool is_light);
     Result RegisterServiceForSelf(Handle *out, ServiceName service, size_t max_sessions);
@@ -33,6 +34,7 @@ namespace sts::sm::impl {
 
     /* Mitm extensions. */
     Result HasMitm(bool *out, ServiceName service);
+    Result WaitMitm(ServiceName service);
     Result InstallMitm(Handle *out, Handle *out_query, u64 pid, ServiceName service);
     Result UninstallMitm(u64 pid, ServiceName service);
     Result AcknowledgeMitmSession(u64 *out_pid, Handle *out_hnd, u64 pid, ServiceName service);