From f00dd05f825521c052867f8f966a18b0b67b42fc Mon Sep 17 00:00:00 2001
From: Michael Scire <SciresM@gmail.com>
Date: Wed, 20 Feb 2019 14:17:51 -0800
Subject: [PATCH] Make stratosphere use new libnx HosVersion API

---
 stratosphere/ams_mitm/source/amsmitm_main.cpp | 2 ++
 stratosphere/boot/source/boot_main.cpp        | 2 ++
 stratosphere/creport/source/creport_main.cpp  | 2 ++
 stratosphere/fatal/source/fatal_main.cpp      | 2 ++
 stratosphere/libstratosphere                  | 2 +-
 stratosphere/loader/source/ldr_main.cpp       | 2 ++
 stratosphere/pm/source/pm_main.cpp            | 2 ++
 stratosphere/sm/source/sm_main.cpp            | 4 +++-
 8 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/stratosphere/ams_mitm/source/amsmitm_main.cpp b/stratosphere/ams_mitm/source/amsmitm_main.cpp
index 8f1a5f84b..54a0bf3d5 100644
--- a/stratosphere/ams_mitm/source/amsmitm_main.cpp
+++ b/stratosphere/ams_mitm/source/amsmitm_main.cpp
@@ -56,6 +56,8 @@ void __libnx_initheap(void) {
 void __appInit(void) {
     Result rc;
     
+    SetFirmwareVersionForLibnx();
+    
     rc = smInitialize();
     if (R_FAILED(rc)) {
         fatalSimple(MAKERESULT(Module_Libnx, LibnxError_InitFail_SM));
diff --git a/stratosphere/boot/source/boot_main.cpp b/stratosphere/boot/source/boot_main.cpp
index 1709654bf..55b8882eb 100644
--- a/stratosphere/boot/source/boot_main.cpp
+++ b/stratosphere/boot/source/boot_main.cpp
@@ -65,6 +65,8 @@ void __libnx_initheap(void) {
 
 void __appInit(void) {
     Result rc;
+    
+    SetFirmwareVersionForLibnx();
 
     /* Initialize services we need (TODO: NCM) */
     rc = smInitialize();
diff --git a/stratosphere/creport/source/creport_main.cpp b/stratosphere/creport/source/creport_main.cpp
index d106268e8..8dd617769 100644
--- a/stratosphere/creport/source/creport_main.cpp
+++ b/stratosphere/creport/source/creport_main.cpp
@@ -54,6 +54,8 @@ void __libnx_initheap(void) {
 
 void __appInit(void) {
     Result rc;
+    
+    SetFirmwareVersionForLibnx();
 
     rc = smInitialize();
     if (R_FAILED(rc)) {
diff --git a/stratosphere/fatal/source/fatal_main.cpp b/stratosphere/fatal/source/fatal_main.cpp
index 3c26538c2..fc2865629 100644
--- a/stratosphere/fatal/source/fatal_main.cpp
+++ b/stratosphere/fatal/source/fatal_main.cpp
@@ -63,6 +63,8 @@ void __libnx_initheap(void) {
 void __appInit(void) {
     Result rc;
     
+    SetFirmwareVersionForLibnx();
+    
     rc = smInitialize();
     if (R_FAILED(rc)) {
         std::abort();
diff --git a/stratosphere/libstratosphere b/stratosphere/libstratosphere
index a2c74f8cd..3de9d6c9d 160000
--- a/stratosphere/libstratosphere
+++ b/stratosphere/libstratosphere
@@ -1 +1 @@
-Subproject commit a2c74f8cd5311f8050bcc5ea7d07b1ba4b697558
+Subproject commit 3de9d6c9d6ec91ac9f056c3683c19f50b6a7016d
diff --git a/stratosphere/loader/source/ldr_main.cpp b/stratosphere/loader/source/ldr_main.cpp
index f4118afc7..8060fdd55 100644
--- a/stratosphere/loader/source/ldr_main.cpp
+++ b/stratosphere/loader/source/ldr_main.cpp
@@ -58,6 +58,8 @@ void __libnx_initheap(void) {
 
 void __appInit(void) {
     Result rc;
+    
+    SetFirmwareVersionForLibnx();
 
     /* Initialize services we need (TODO: SPL) */
     rc = smInitialize();
diff --git a/stratosphere/pm/source/pm_main.cpp b/stratosphere/pm/source/pm_main.cpp
index 42f72fdd4..fae9dc3d1 100644
--- a/stratosphere/pm/source/pm_main.cpp
+++ b/stratosphere/pm/source/pm_main.cpp
@@ -85,6 +85,8 @@ void RegisterPrivilegedProcessesWithFs() {
 
 void __appInit(void) {
     Result rc;
+    
+    SetFirmwareVersionForLibnx();
 
     rc = smInitialize();
     if (R_FAILED(rc)) {
diff --git a/stratosphere/sm/source/sm_main.cpp b/stratosphere/sm/source/sm_main.cpp
index f97c34283..52c266f96 100644
--- a/stratosphere/sm/source/sm_main.cpp
+++ b/stratosphere/sm/source/sm_main.cpp
@@ -55,7 +55,9 @@ void __libnx_initheap(void) {
 }
 
 void __appInit(void) {
-    /* We must do no setup here, because we are sm. */
+    SetFirmwareVersionForLibnx();
+    
+    /* We must do no service setup here, because we are sm. */
 }
 
 void __appExit(void) {