atmosphere: extract API version management to common folder

common/include/atmosphere/version.h

@@ -14,8 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
  
-#ifndef EXOSPHERE_VERSION_H
+#ifndef ATMOSPHERE_VERSION_H
-#define EXOSPHERE_VERSION_H
+#define ATMOSPHERE_VERSION_H
 
 #define ATMOSPHERE_RELEASE_VERSION_MAJOR 0
 #define ATMOSPHERE_RELEASE_VERSION_MINOR 7

exosphere/Makefile

@@ -20,7 +20,7 @@ TARGET		:=	$(notdir $(CURDIR))
 BUILD		:=	build
 SOURCES		:=	src src/dbg
 DATA		:=	data
-INCLUDES	:=	include
+INCLUDES	:=	include ../common/include
 
 #---------------------------------------------------------------------------------
 # options for code generation

exosphere/src/configitem.c

@@ -15,6 +15,7 @@
  */
  
 #include <stdint.h>
+#include <atmosphere/version.h>
 
 #include "bootconfig.h"
 #include "configitem.h"
@@ -25,7 +26,6 @@
 #include "utils.h"
 #include "masterkey.h"
 #include "exocfg.h"
-#include "version.h"
 
 static bool g_battery_profile = false;
 
@@ -151,11 +151,11 @@ uint32_t configitem_get(ConfigItem item, uint64_t *p_outvalue) {
             break;
         case CONFIGITEM_EXOSPHERE_VERSION:
             /* UNOFFICIAL: Gets information about the current exosphere version. */
-            *p_outvalue = ((ATMOSPHERE_RELEASE_VERSION_MAJOR & 0xFF) << 24) | 
+            *p_outvalue = ((uint64_t)(ATMOSPHERE_RELEASE_VERSION_MAJOR & 0xFF) << 32ull) | 
-                          ((ATMOSPHERE_RELEASE_VERSION_MINOR & 0xFF) << 16) |
+                          ((uint64_t)(ATMOSPHERE_RELEASE_VERSION_MINOR & 0xFF) << 24ull) |
-                          ((ATMOSPHERE_RELEASE_VERSION_MICRO & 0x3F) << 10) |
+                          ((uint64_t)(ATMOSPHERE_RELEASE_VERSION_MICRO & 0xFF) << 16ull) |
-                          ((exosphere_get_target_firmware() & 0x1F) << 6) |
+                          ((uint64_t)(exosphere_get_target_firmware() & 0xFF) << 8ull) |
-                          ((mkey_get_revision() & 0x1F) << 0);
+                          ((uint64_t)(mkey_get_revision() & 0xFF) << 0ull);
             break;
         default:
             result = 2;

fusee/fusee-primary/Makefile

@@ -20,7 +20,7 @@ TARGET		:=	$(notdir $(CURDIR))
 BUILD		:=	build
 SOURCES		:=	src src/sdmmc src/lib src/lib/fatfs src/display
 DATA		:=	data
-INCLUDES	:=	include
+INCLUDES	:=	include  ../../common/include
 
 #---------------------------------------------------------------------------------
 # options for code generation

fusee/fusee-secondary/Makefile

@@ -23,7 +23,7 @@ TARGET		:=	$(notdir $(CURDIR))
 BUILD		:=	build
 SOURCES		:=	src src/sdmmc src/lib src/lib/fatfs src/display
 DATA		:=	data
-INCLUDES	:=	include
+INCLUDES	:=	include ../../common/include
 
 #---------------------------------------------------------------------------------
 # options for code generation

stratosphere/boot/Makefile

@@ -21,7 +21,7 @@ TARGET		:=	$(notdir $(CURDIR))
 BUILD		:=	build
 SOURCES		:=	source
 DATA		:=	data
-INCLUDES	:=	include
+INCLUDES	:=	include ../../common/include
 EXEFS_SRC	:=	exefs_src
 
 DEFINES	:=	-DDISABLE_IPC

stratosphere/boot/source/boot_main.cpp

@@ -83,6 +83,8 @@ void __appInit(void) {
         fatalSimple(0xCAFE << 4 | 2);
     
     fsdevMountSdmc();
+    
+    CheckAtmosphereVersion();
 }
 
 void __appExit(void) {

stratosphere/creport/Makefile

@@ -21,7 +21,7 @@ TARGET		:=	$(notdir $(CURDIR))
 BUILD		:=	build
 SOURCES		:=	source
 DATA		:=	data
-INCLUDES	:=	include
+INCLUDES	:=	include ../../common/include
 EXEFS_SRC	:=	exefs_src
 
 DEFINES	:=	-DDISABLE_IPC

stratosphere/fs_mitm/Makefile

@@ -21,7 +21,7 @@ TARGET		:=	$(notdir $(CURDIR))
 BUILD		:=	build
 SOURCES		:=	source
 DATA		:=	data
-INCLUDES	:=	include
+INCLUDES	:=	include ../../common/include
 EXEFS_SRC	:=	exefs_src
 
 DEFINES	:=	-DDISABLE_IPC

stratosphere/fs_mitm/source/fsmitm_main.cpp

@@ -76,25 +76,7 @@ void __appInit(void) {
     if (R_FAILED(rc)) {
         fatalSimple(MAKERESULT(Module_Libnx, LibnxError_InitFail_FS));
     }
-    
+    CheckAtmosphereVersion();
-    rc = splInitialize();
-    if (R_FAILED(rc))  {
-        fatalSimple(0xCAFE << 4 | 3);
-    }
-    
-    /* Check for exosphere API compatibility. */
-    u64 exosphere_cfg;
-    if (R_SUCCEEDED(splGetConfig((SplConfigItem)65000, &exosphere_cfg))) {
-        /* MitM requires Atmosphere API 0.1. */
-        u16 api_version = (exosphere_cfg >> 16) & 0xFFFF;
-        if (api_version < 0x0001) {
-            fatalSimple(0xCAFE << 4 | 0xFE);
-        }
-    } else {
-        fatalSimple(0xCAFE << 4 | 0xFF);
-    }
-    
-    //splExit();
 }
 
 void __appExit(void) {

stratosphere/libstratosphere/Makefile

@@ -18,7 +18,7 @@ include $(DEVKITPRO)/libnx/switch_rules
 TARGET		:=	$(notdir $(CURDIR))
 SOURCES		:=	source
 DATA		:=	data
-INCLUDES	:=  include
+INCLUDES	:=  include ../../common/include
 
 #---------------------------------------------------------------------------------
 # options for code generation

stratosphere/libstratosphere/include/stratosphere.hpp

@@ -33,3 +33,5 @@
 
 #include "stratosphere/waitablemanager.hpp"
 #include "stratosphere/multithreadedwaitablemanager.hpp"
+
+#include "stratosphere/version_check.hpp"

stratosphere/libstratosphere/include/stratosphere/version_check.hpp

@@ -0,0 +1,66 @@
+/*
+ * Copyright (c) 2018 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 <switch.h>
+#include <atmosphere/version.h>
+
+static inline void GetAtmosphereApiVersion(u32 *major, u32 *minor, u32 *micro, u32 *target_fw, u32 *mkey_rev) {
+    if (R_FAILED(splInitialize())) {
+        fatalSimple(0xCAFE << 4 | 0xD);
+    }
+    
+    /* Check for exosphere API compatibility. */
+    u64 exosphere_cfg;
+    if (R_FAILED(splGetConfig((SplConfigItem)65000, &exosphere_cfg))) {
+        fatalSimple(0xCAFE << 4 | 0xE);
+    }
+    
+    if (mkey_rev) {
+        *mkey_rev  = (u32)((exosphere_cfg >> 0x00) & 0xFF);
+    }
+    
+    if (target_fw) {
+        *target_fw = (u32)((exosphere_cfg >> 0x08) & 0xFF);
+    }
+    
+    if (micro) {
+        *micro     = (u32)((exosphere_cfg >> 0x10) & 0xFF);
+    }
+    
+    if (minor) {
+        *minor     = (u32)((exosphere_cfg >> 0x18) & 0xFF);
+    }
+    
+    if (major) {
+        *major     = (u32)((exosphere_cfg >> 0x20) & 0xFF);
+    }
+    
+    splExit();
+}
+
+static inline u32 MakeAtmosphereVersion(u32 major, u32 minor, u32 micro) {
+    return (major << 16) | (minor << 8) | micro;
+}
+
+static inline void CheckAtmosphereVersion() {
+    u32 major, minor, micro;
+    GetAtmosphereApiVersion(&major, &minor, &micro, nullptr, nullptr);
+    
+    if (MakeAtmosphereVersion(major, minor, micro) < MakeAtmosphereVersion(ATMOSPHERE_RELEASE_VERSION_MAJOR, ATMOSPHERE_RELEASE_VERSION_MINOR, ATMOSPHERE_RELEASE_VERSION_MICRO)) {
+        fatalSimple(0xCAFE << 4 | 0xF);
+    }
+}

stratosphere/loader/Makefile

@@ -21,7 +21,7 @@ TARGET		:=	$(notdir $(CURDIR))
 BUILD		:=	build
 SOURCES		:=	source
 DATA		:=	data
-INCLUDES	:=	include
+INCLUDES	:=	include ../../common/include
 EXEFS_SRC	:=	exefs_src
 
 DEFINES	:=	-DDISABLE_IPC

stratosphere/loader/source/ldr_main.cpp

@@ -80,19 +80,7 @@ void __appInit(void) {
         fatalSimple(0xCAFE << 4 | 2);
     }
     
-    rc = splInitialize();
+    CheckAtmosphereVersion();
-    if (R_FAILED(rc))  {
-        fatalSimple(0xCAFE << 4 | 3);
-    }
-    
-    /* Check for exosphere API compatibility. */
-    u64 exosphere_cfg;
-    if (R_FAILED(splGetConfig((SplConfigItem)65000, &exosphere_cfg))) {
-        //fatalSimple(0xCAFE << 4 | 0xFF);
-        /* TODO: Does Loader need to know about target firmware/master key revision? If so, extract from exosphere_cfg. */
-    }
-    
-    //splExit();
 }
 
 void __appExit(void) {

stratosphere/pm/Makefile

@@ -21,7 +21,7 @@ TARGET		:=	$(notdir $(CURDIR))
 BUILD		:=	build
 SOURCES		:=	source
 DATA		:=	data
-INCLUDES	:=	include
+INCLUDES	:=	include ../../common/include
 EXEFS_SRC	:=	exefs_src
 
 DEFINES	:=	-DDISABLE_IPC

stratosphere/pm/source/pm_main.cpp

@@ -94,12 +94,7 @@ void __appInit(void) {
         fatalSimple(0xCAFE << 4 | 6);
     }
     
-    /* Check for exosphere API compatibility. */
+    CheckAtmosphereVersion();
-    u64 exosphere_cfg;
-    if (R_FAILED(splGetConfig((SplConfigItem)65000, &exosphere_cfg))) {
-        fatalSimple(0xCAFE << 4 | 0xFF);
-        /* TODO: Does PM need to know about target firmware/master key revision? If so, extract from exosphere_cfg. */
-    }
 }
 
 void __appExit(void) {

stratosphere/sm/Makefile

@@ -21,7 +21,7 @@ TARGET		:=	$(notdir $(CURDIR))
 BUILD		:=	build
 SOURCES		:=	source
 DATA		:=	data
-INCLUDES	:=	include
+INCLUDES	:=	include ../../common/include
 EXEFS_SRC	:=	exefs_src
 
 DEFINES	:=	-DDISABLE_IPC

thermosphere/Makefile

@@ -20,7 +20,7 @@ TARGET		:=	$(notdir $(CURDIR))
 BUILD		:=	build
 SOURCES		:=	src src/lib
 DATA		:=	data
-INCLUDES	:=	include
+INCLUDES	:=	include ../common/include
 
 #---------------------------------------------------------------------------------
 # options for code generation