nold/Atmosphere
1
0
Fork 0
mirror of https://github.com/Atmosphere-NX/Atmosphere synced 2024-12-22 12:21:18 +00:00
Code Issues Projects Releases Packages Wiki Activity

atmosphere: extract API version management to common folder

Browse source
This commit is contained in:
Michael Scire 2018-10-16 17:54:50 -07:00
parent 412511f32a
commit 6711cd93a8
19 changed files with 92 additions and 57 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
exosphere/src/version.h → common/include/atmosphere/version.h
View file

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

2
exosphere/Makefile
View file

@ -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

12
exosphere/src/configitem.c
View file

@ -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) |
((ATMOSPHERE_RELEASE_VERSION_MINOR & 0xFF) << 16) |
((ATMOSPHERE_RELEASE_VERSION_MICRO & 0x3F) << 10) |
((exosphere_get_target_firmware() & 0x1F) << 6) |
((mkey_get_revision() & 0x1F) << 0);
*p_outvalue = ((uint64_t)(ATMOSPHERE_RELEASE_VERSION_MAJOR & 0xFF) << 32ull) |
((uint64_t)(ATMOSPHERE_RELEASE_VERSION_MINOR & 0xFF) << 24ull) |
((uint64_t)(ATMOSPHERE_RELEASE_VERSION_MICRO & 0xFF) << 16ull) |
((uint64_t)(exosphere_get_target_firmware() & 0xFF) << 8ull) |
((uint64_t)(mkey_get_revision() & 0xFF) << 0ull);
break;
default:
result = 2;

2
fusee/fusee-primary/Makefile
View file

@ -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

2
fusee/fusee-secondary/Makefile
View file

@ -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

2
stratosphere/boot/Makefile
View file

@ -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

2
stratosphere/boot/source/boot_main.cpp
View file

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

2
stratosphere/creport/Makefile
View file

@ -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

2
stratosphere/fs_mitm/Makefile
View file

@ -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

20
stratosphere/fs_mitm/source/fsmitm_main.cpp
View file

@ -76,25 +76,7 @@ void __appInit(void) {
if (R_FAILED(rc)) {
fatalSimple(MAKERESULT(Module_Libnx, LibnxError_InitFail_FS));
}
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();
CheckAtmosphereVersion();
}
void __appExit(void) {

2
stratosphere/libstratosphere/Makefile
View file

@ -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

2
stratosphere/libstratosphere/include/stratosphere.hpp
View file

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

66
stratosphere/libstratosphere/include/stratosphere/version_check.hpp Normal file
View file

@ -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);
}
}

2
stratosphere/loader/Makefile
View file

@ -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

14
stratosphere/loader/source/ldr_main.cpp
View file

@ -80,19 +80,7 @@ void __appInit(void) {
fatalSimple(0xCAFE << 4 | 2);
}
rc = splInitialize();
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();
CheckAtmosphereVersion();
}
void __appExit(void) {

2
stratosphere/pm/Makefile
View file

@ -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

7
stratosphere/pm/source/pm_main.cpp
View file

@ -94,12 +94,7 @@ void __appInit(void) {
fatalSimple(0xCAFE << 4 | 6);
}
/* Check for exosphere API compatibility. */
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. */
}
CheckAtmosphereVersion();
}
void __appExit(void) {

2
stratosphere/sm/Makefile
View file

@ -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

2
thermosphere/Makefile
View file

@ -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