git subrepo clone https://github.com/Atmosphere-NX/Atmosphere-libs libraries

subrepo:
  subdir:   "libraries"
  merged:   "07af583b"
upstream:
  origin:   "https://github.com/Atmosphere-NX/Atmosphere-libs"
  branch:   "master"
  commit:   "07af583b"
git-subrepo:
  version:  "0.4.0"
  origin:   "https://github.com/ingydotnet/git-subrepo"
  commit:   "5d6aba9"

libraries/libstratosphere/include/stratosphere/sm/sm_api.hpp

@@ -0,0 +1,45 @@
+/*
+ * Copyright (c) 2018-2019 Atmosphère-NX
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms and conditions of the GNU General Public License,
+ * version 2, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include "sm_types.hpp"
+
+namespace ams::sm {
+
+    /* Ordinary SM API. */
+    Result GetService(Service *out, ServiceName name);
+    Result RegisterService(Handle *out, ServiceName name, size_t max_sessions, bool is_light);
+    Result UnregisterService(ServiceName name);
+
+    /* Atmosphere extensions. */
+    Result HasService(bool *out, ServiceName name);
+    Result WaitService(ServiceName name);
+
+    /* Scoped session access. */
+    namespace impl {
+
+        void DoWithSessionImpl(void (*Invoker)(void *), void *Function);
+
+    }
+
+    template<typename F>
+    NX_CONSTEXPR void DoWithSession(F f) {
+        auto invoker = +[](void *func) { (*(F *)func)(); };
+        impl::DoWithSessionImpl(invoker, &f);
+    }
+
+}

libraries/libstratosphere/include/stratosphere/sm/sm_manager_api.hpp

@@ -0,0 +1,33 @@
+/*
+ * Copyright (c) 2018-2019 Atmosphère-NX
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms and conditions of the GNU General Public License,
+ * version 2, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include "sm_types.hpp"
+#include "../ncm/ncm_types.hpp"
+#include "../os/os_common_types.hpp"
+
+namespace ams::sm::manager {
+
+    /* Manager API. */
+    Result RegisterProcess(os::ProcessId process_id, ncm::ProgramId program_id, cfg::OverrideStatus status, const void *acid, size_t acid_size, const void *aci, size_t aci_size);
+    Result UnregisterProcess(os::ProcessId process_id);
+
+    /* Atmosphere extensions. */
+    Result EndInitialDefers();
+    Result HasMitm(bool *out, ServiceName name);
+
+}

libraries/libstratosphere/include/stratosphere/sm/sm_mitm_api.hpp

@@ -0,0 +1,31 @@
+/*
+ * Copyright (c) 2018-2019 Atmosphère-NX
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms and conditions of the GNU General Public License,
+ * version 2, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include "sm_types.hpp"
+
+namespace ams::sm::mitm {
+
+    /* Mitm API. */
+    Result InstallMitm(Handle *out_port, Handle *out_query, ServiceName name);
+    Result UninstallMitm(ServiceName name);
+    Result DeclareFutureMitm(ServiceName name);
+    Result AcknowledgeSession(Service *out_service, MitmProcessInfo *out_info, ServiceName name);
+    Result HasMitm(bool *out, ServiceName name);
+    Result WaitMitm(ServiceName name);
+
+}

libraries/libstratosphere/include/stratosphere/sm/sm_scoped_holder.hpp

@@ -0,0 +1,86 @@
+/*
+ * Copyright (c) 2018-2019 Atmosphère-NX
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms and conditions of the GNU General Public License,
+ * version 2, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include "sm_api.hpp"
+
+namespace ams::sm {
+
+    /* Utility, for scoped access to libnx services. */
+    template<auto Initializer(), void Finalizer()>
+    class ScopedServiceHolder {
+        NON_COPYABLE(ScopedServiceHolder);
+        private:
+            Result result;
+            bool has_initialized;
+        public:
+            ScopedServiceHolder(bool initialize = true) : result(ResultSuccess()), has_initialized(false) {
+                if (initialize) {
+                    this->Initialize();
+                }
+            }
+
+            ~ScopedServiceHolder() {
+                if (this->has_initialized) {
+                    this->Finalize();
+                }
+            }
+
+            ScopedServiceHolder(ScopedServiceHolder&& rhs) {
+                this->result = rhs.result;
+                this->has_initialized = rhs.has_initialized;
+                rhs.result = ResultSuccess();
+                rhs.has_initialized = false;
+            }
+
+            ScopedServiceHolder& operator=(ScopedServiceHolder&& rhs) {
+                rhs.Swap(*this);
+                return *this;
+            }
+
+            void Swap(ScopedServiceHolder& rhs) {
+                std::swap(this->result, rhs.result);
+                std::swap(this->has_initialized, rhs.has_initialized);
+            }
+
+            explicit operator bool() const {
+                return this->has_initialized;
+            }
+
+            Result Initialize() {
+                AMS_ASSERT(!this->has_initialized);
+
+                sm::DoWithSession([&]() {
+                    this->result = Initializer();
+                });
+
+                this->has_initialized = R_SUCCEEDED(this->result);
+                return this->result;
+            }
+
+            void Finalize() {
+                AMS_ASSERT(this->has_initialized);
+                Finalizer();
+                this->has_initialized = false;
+            }
+
+            Result GetResult() const {
+                return this->result;
+            }
+    };
+
+}

libraries/libstratosphere/include/stratosphere/sm/sm_types.hpp

@@ -0,0 +1,78 @@
+/*
+ * Copyright (c) 2018-2019 Atmosphère-NX
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms and conditions of the GNU General Public License,
+ * version 2, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+#include <vapours.hpp>
+#include "../ncm/ncm_types.hpp"
+#include "../cfg/cfg_types.hpp"
+
+namespace ams::sm {
+
+    struct ServiceName {
+        static constexpr size_t MaxLength = 8;
+
+        char name[MaxLength];
+
+        static constexpr ServiceName Encode(const char *name, size_t name_size) {
+            ServiceName out{};
+
+            for (size_t i = 0; i < MaxLength; i++) {
+                if (i < name_size) {
+                    out.name[i] = name[i];
+                } else {
+                    out.name[i] = 0;
+                }
+            }
+
+            return out;
+        }
+
+        static constexpr ServiceName Encode(const char *name) {
+            return Encode(name, std::strlen(name));
+        }
+    };
+    static constexpr ServiceName InvalidServiceName = ServiceName::Encode("");
+    static_assert(alignof(ServiceName) == 1, "ServiceName definition!");
+
+    inline bool operator==(const ServiceName &lhs, const ServiceName &rhs) {
+        return std::memcmp(&lhs, &rhs, sizeof(ServiceName)) == 0;
+    }
+
+    inline bool operator!=(const ServiceName &lhs, const ServiceName &rhs) {
+        return !(lhs == rhs);
+    }
+
+    /* For Debug Monitor extensions. */
+    struct ServiceRecord {
+        ServiceName service;
+        os::ProcessId owner_process_id;
+        u64 max_sessions;
+        os::ProcessId mitm_process_id;
+        os::ProcessId mitm_waiting_ack_process_id;
+        bool is_light;
+        bool mitm_waiting_ack;
+    };
+    static_assert(sizeof(ServiceRecord) == 0x30, "ServiceRecord definition!");
+
+    /* For Mitm extensions. */
+    struct MitmProcessInfo {
+        os::ProcessId process_id;
+        ncm::ProgramId program_id;
+        cfg::OverrideStatus override_status;
+    };
+    static_assert(std::is_trivial<MitmProcessInfo>::value && sizeof(MitmProcessInfo) == 0x20, "MitmProcessInfo definition!");
+
+}