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

PM: Embed boot2 logic in PM.

Browse source
This commit is contained in:
Michael Scire 2018-07-27 02:23:53 -07:00
parent 6adcb483e5
commit 9f16062767
4 changed files with 30 additions and 259 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

185
stratosphere/boot2/Makefile
View file

@ -1,185 +0,0 @@
#---------------------------------------------------------------------------------
.SUFFIXES:
#---------------------------------------------------------------------------------
ifeq ($(strip $(DEVKITPRO)),)
$(error "Please set DEVKITPRO in your environment. export DEVKITPRO=<path to>/devkitpro")
endif
TOPDIR ?= $(CURDIR)
include $(DEVKITPRO)/libnx/switch_rules
#---------------------------------------------------------------------------------
# TARGET is the name of the output
# BUILD is the directory where object files & intermediate files will be placed
# SOURCES is a list of directories containing source code
# DATA is a list of directories containing data files
# INCLUDES is a list of directories containing header files
# EXEFS_SRC is the optional input directory containing data copied into exefs, if anything this normally should only contain "main.npdm".
#
# NO_ICON: if set to anything, do not use icon.
# NO_NACP: if set to anything, no .nacp file is generated.
# APP_TITLE is the name of the app stored in the .nacp file (Optional)
# APP_AUTHOR is the author of the app stored in the .nacp file (Optional)
# APP_VERSION is the version of the app stored in the .nacp file (Optional)
# APP_TITLEID is the titleID of the app stored in the .nacp file (Optional)
# ICON is the filename of the icon (.jpg), relative to the project folder.
# If not set, it attempts to use one of the following (in this order):
# - <Project name>.jpg
# - icon.jpg
# - <libnx folder>/default_icon.jpg
#---------------------------------------------------------------------------------
TARGET := $(notdir $(CURDIR))
BUILD := build
SOURCES := source
DATA := data
INCLUDES := include
EXEFS_SRC := exefs_src
DEFINES := -DDISABLE_IPC
#---------------------------------------------------------------------------------
# options for code generation
#---------------------------------------------------------------------------------
ARCH := -march=armv8-a -mtune=cortex-a57 -mtp=soft -fPIE
CFLAGS := -g -Wall -O2 -ffunction-sections \
$(ARCH) $(DEFINES)
CFLAGS += $(INCLUDE) -D__SWITCH__
CXXFLAGS := $(CFLAGS) -fno-rtti -fno-exceptions -std=gnu++17
ASFLAGS := -g $(ARCH)
LDFLAGS = -specs=$(DEVKITPRO)/libnx/switch.specs -g $(ARCH) -Wl,-Map,$(notdir $*.map)
LIBS := -lstratosphere -lnx
#---------------------------------------------------------------------------------
# list of directories containing libraries, this must be the top level containing
# include and lib
#---------------------------------------------------------------------------------
LIBDIRS := $(PORTLIBS) $(LIBNX) $(CURDIR)/../libstratosphere
#---------------------------------------------------------------------------------
# no real need to edit anything past this point unless you need to add additional
# rules for different file extensions
#---------------------------------------------------------------------------------
ifneq ($(BUILD),$(notdir $(CURDIR)))
#---------------------------------------------------------------------------------
export OUTPUT := $(CURDIR)/$(TARGET)
export TOPDIR := $(CURDIR)
export VPATH := $(foreach dir,$(SOURCES),$(CURDIR)/$(dir)) \
$(foreach dir,$(DATA),$(CURDIR)/$(dir))
export DEPSDIR := $(CURDIR)/$(BUILD)
CFILES := $(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.c)))
CPPFILES := $(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.cpp)))
SFILES := $(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.s)))
BINFILES := $(foreach dir,$(DATA),$(notdir $(wildcard $(dir)/*.*)))
#---------------------------------------------------------------------------------
# use CXX for linking C++ projects, CC for standard C
#---------------------------------------------------------------------------------
ifeq ($(strip $(CPPFILES)),)
#---------------------------------------------------------------------------------
export LD := $(CC)
#---------------------------------------------------------------------------------
else
#---------------------------------------------------------------------------------
export LD := $(CXX)
#---------------------------------------------------------------------------------
endif
#---------------------------------------------------------------------------------
export OFILES := $(addsuffix .o,$(BINFILES)) \
$(CPPFILES:.cpp=.o) $(CFILES:.c=.o) $(SFILES:.s=.o)
export INCLUDE := $(foreach dir,$(INCLUDES),-I$(CURDIR)/$(dir)) \
$(foreach dir,$(LIBDIRS),-I$(dir)/include) \
-I$(CURDIR)/$(BUILD)
export LIBPATHS := $(foreach dir,$(LIBDIRS),-L$(dir)/lib)
export BUILD_EXEFS_SRC := $(TOPDIR)/$(EXEFS_SRC)
ifeq ($(strip $(ICON)),)
icons := $(wildcard *.jpg)
ifneq (,$(findstring $(TARGET).jpg,$(icons)))
export APP_ICON := $(TOPDIR)/$(TARGET).jpg
else
ifneq (,$(findstring icon.jpg,$(icons)))
export APP_ICON := $(TOPDIR)/icon.jpg
endif
endif
else
export APP_ICON := $(TOPDIR)/$(ICON)
endif
ifeq ($(strip $(NO_ICON)),)
export NROFLAGS += --icon=$(APP_ICON)
endif
ifeq ($(strip $(NO_NACP)),)
export NROFLAGS += --nacp=$(CURDIR)/$(TARGET).nacp
endif
ifneq ($(APP_TITLEID),)
export NACPFLAGS += --titleid=$(APP_TITLEID)
endif
.PHONY: $(BUILD) clean all
#---------------------------------------------------------------------------------
all: $(BUILD)
$(BUILD):
@[ -d $@ ] || mkdir -p $@
@$(MAKE) --no-print-directory -C $(BUILD) -f $(CURDIR)/Makefile
#---------------------------------------------------------------------------------
clean:
@echo clean ...
@rm -fr $(BUILD) $(TARGET).pfs0 $(TARGET).nso $(TARGET).nro $(TARGET).nacp $(TARGET).elf
#---------------------------------------------------------------------------------
else
.PHONY: all
DEPENDS := $(OFILES:.o=.d)
#---------------------------------------------------------------------------------
# main targets
#---------------------------------------------------------------------------------
all : $(OUTPUT).pfs0 $(OUTPUT).nro
$(OUTPUT).pfs0 : $(OUTPUT).nso
$(OUTPUT).nso : $(OUTPUT).elf
ifeq ($(strip $(NO_NACP)),)
$(OUTPUT).nro : $(OUTPUT).elf $(OUTPUT).nacp
else
$(OUTPUT).nro : $(OUTPUT).elf
endif
$(OUTPUT).elf : $(OFILES)
#---------------------------------------------------------------------------------
# you need a rule like this for each extension you use as binary data
#---------------------------------------------------------------------------------
%.bin.o : %.bin
#---------------------------------------------------------------------------------
@echo $(notdir $<)
@$(bin2o)
-include $(DEPENDS)
#---------------------------------------------------------------------------------------
endif
#---------------------------------------------------------------------------------------

90
stratosphere/boot2/source/boot2_main.cpp → stratosphere/pm/source/pm_boot2.cpp
View file

@ -5,61 +5,13 @@
#include <switch.h> #include <switch.h>
#include <stratosphere.hpp> #include <stratosphere.hpp>
#include "pm_boot2.hpp"
#include "pm_registration.hpp"
#define PMC_BASE 0x7000E400 static void LaunchTitle(u64 title_id, FsStorageId storage_id, u32 launch_flags, u64 *pid) {
extern "C" {
extern u32 __start__;
u32 __nx_applet_type = AppletType_None;
#define INNER_HEAP_SIZE 0x200000
size_t nx_inner_heap_size = INNER_HEAP_SIZE;
char nx_inner_heap[INNER_HEAP_SIZE];
void __libnx_initheap(void);
void __appInit(void);
void __appExit(void);
}
void __libnx_initheap(void) {
void* addr = nx_inner_heap;
size_t size = nx_inner_heap_size;
/* Newlib */
extern char* fake_heap_start;
extern char* fake_heap_end;
fake_heap_start = (char*)addr;
fake_heap_end = (char*)addr + size;
}
void __appInit(void) {
Result rc;
rc = smInitialize();
if (R_FAILED(rc))
fatalSimple(MAKERESULT(Module_Libnx, LibnxError_InitFail_SM));
rc = fsInitialize();
if (R_FAILED(rc))
fatalSimple(MAKERESULT(Module_Libnx, LibnxError_InitFail_FS));
rc = pmshellInitialize();
if (R_FAILED(rc))
fatalSimple(0xCAFE << 4 | 1);
}
void __appExit(void) {
/* Cleanup services. */
pmshellExit();
fsExit();
smExit();
}
void LaunchTitle(u64 title_id, u64 storage_id, u32 launch_flags, u64 *pid) {
u64 local_pid; u64 local_pid;
Result rc = pmshellLaunchProcess(launch_flags, title_id, storage_id, &local_pid);
Result rc = Registration::LaunchProcessByTidSid(Registration::TidSid{title_id, storage_id}, launch_flags, &local_pid);
switch (rc) { switch (rc) {
case 0xCE01: case 0xCE01:
/* Out of resource! */ /* Out of resource! */
@ -82,7 +34,7 @@ void LaunchTitle(u64 title_id, u64 storage_id, u32 launch_flags, u64 *pid) {
} }
} }
bool ShouldForceMaintenanceMode() { static bool ShouldForceMaintenanceMode() {
/* TODO: Contact set:sys, retrieve boot!force_maintenance, read plus/minus buttons. */ /* TODO: Contact set:sys, retrieve boot!force_maintenance, read plus/minus buttons. */
return false; return false;
} }
@ -128,34 +80,28 @@ static const std::tuple<u64, bool> g_additional_launch_programs[] = {
{0x0100000000000035, true}, /* grc */ {0x0100000000000035, true}, /* grc */
}; };
int main(int argc, char **argv) void EmbeddedBoot2::Main() {
{ /* TODO: Modify initial program launch order, to get SD card mounted faster. */
consoleDebugInit(debugDevice_SVC);
/* NOTE: Order for initial programs is modified. */
/* This is to launch things required for Loader to mount SD card ASAP. */
/* Launch psc. */ /* Launch psc. */
LaunchTitle(0x0100000000000021, 3, 0, NULL); LaunchTitle(0x0100000000000021, FsStorageId_NandSystem, 0, NULL);
/* Launch bus. */
LaunchTitle(0x010000000000000A, 3, 0, NULL);
/* Launch pcv. */
LaunchTitle(0x010000000000001A, 3, 0, NULL);
/* Launch settings. */ /* Launch settings. */
LaunchTitle(0x0100000000000009, 3, 0, NULL); LaunchTitle(0x0100000000000009, FsStorageId_NandSystem, 0, NULL);
/* Launch usb. */ /* Launch usb. */
LaunchTitle(0x0100000000000006, 3, 0, NULL); LaunchTitle(0x0100000000000006, FsStorageId_NandSystem, 0, NULL);
/* Launch pcie. */ /* Launch pcie. */
LaunchTitle(0x010000000000001D, 3, 0, NULL); LaunchTitle(0x010000000000001D, FsStorageId_NandSystem, 0, NULL);
/* Launch bus. */
LaunchTitle(0x010000000000000A, FsStorageId_NandSystem, 0, NULL);
/* Launch tma. */ /* Launch tma. */
LaunchTitle(0x0100000000000007, 3, 0, NULL); LaunchTitle(0x0100000000000007, FsStorageId_NandSystem, 0, NULL);
/* Launch pcv. */
LaunchTitle(0x010000000000001A, FsStorageId_NandSystem, 0, NULL);
bool maintenance = ShouldForceMaintenanceMode(); bool maintenance = ShouldForceMaintenanceMode();
for (auto &launch_program : g_additional_launch_programs) { for (auto &launch_program : g_additional_launch_programs) {
if (!maintenance || std::get<bool>(launch_program)) { if (!maintenance || std::get<bool>(launch_program)) {
LaunchTitle(std::get<u64>(launch_program), 3, 0, NULL); LaunchTitle(std::get<u64>(launch_program), FsStorageId_NandSystem, 0, NULL);
} }
} }
return 0;
} }

10
stratosphere/pm/source/pm_boot2.hpp Normal file
View file

@ -0,0 +1,10 @@
#pragma once
enum class TitleId : u64 {
x = 0UL,
};
class EmbeddedBoot2 {
public:
static void Main();
};

4
stratosphere/pm/source/pm_shell.cpp
View file

@ -3,6 +3,7 @@
#include "pm_registration.hpp" #include "pm_registration.hpp"
#include "pm_resource_limits.hpp" #include "pm_resource_limits.hpp"
#include "pm_shell.hpp" #include "pm_shell.hpp"
#include "pm_boot2.hpp"
static bool g_has_boot_finished = false; static bool g_has_boot_finished = false;
@ -148,10 +149,9 @@ std::tuple<Result> ShellService::clear_process_notification_flag(u64 pid) {
} }
std::tuple<Result> ShellService::notify_boot_finished() { std::tuple<Result> ShellService::notify_boot_finished() {
u64 boot2_pid;
if (!g_has_boot_finished) { if (!g_has_boot_finished) {
g_has_boot_finished = true; g_has_boot_finished = true;
return {Registration::LaunchProcess(BOOT2_TITLE_ID, FsStorageId_NandSystem, 0, &boot2_pid)}; EmbeddedBoot2::Main();
} }
return {0}; return {0};
} }