mirrors/Atmosphere
1
0
Fork 0
mirror of https://github.com/Atmosphere-NX/Atmosphere.git synced 2025-04-22 04:24:48 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fusee-primary: split stage2 handling into several functions

Browse source
This commit is contained in:
misson20000 2020-10-18 16:48:44 -07:00
parent 45b170084e
commit 20dc027a23
3 changed files with 24 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
fusee/fusee-primary/src/main.c
View file

@ -147,8 +147,16 @@ int main(void) {
print(SCREEN_LOG_LEVEL_DEBUG | SCREEN_LOG_LEVEL_NO_PREFIX, "Welcome to Atmosph\xe8re Fus\xe9" "e!\n");
print(SCREEN_LOG_LEVEL_DEBUG, "Using color linear framebuffer at 0x%p!\n", g_framebuffer);
/* Run the MTC binary. */
if (!stage2_run_mtc(&bct0)) {
print(SCREEN_LOG_LEVEL_WARNING, "DRAM training failed! Continuing with untrained DRAM.\n");
}
/* Assert that our configuration is sane. */
stage2_validate_config(&bct0);
/* Load the loader payload into DRAM. */
load_stage2(&bct0);
stage2_load(&bct0);
/* Setup argument data. */
strcpy(g_chainloader_arg_data, bct0.stage2_path);

27
fusee/fusee-primary/src/stage2.c
View file

@ -19,12 +19,12 @@
#include "fs_utils.h"
#include "utils.h"
static bool run_mtc(const char *mtc_path, uintptr_t mtc_address) {
bool stage2_run_mtc(const bct0_t *bct0) {
FILINFO info;
size_t size;
/* Check if the MTC binary is present. */
if (f_stat(mtc_path, &info) != FR_OK) {
if (f_stat(bct0->stage2_mtc_path, &info) != FR_OK) {
print(SCREEN_LOG_LEVEL_WARNING, "Stage2's MTC binary not found!\n");
return false;
}
@ -32,8 +32,8 @@ static bool run_mtc(const char *mtc_path, uintptr_t mtc_address) {
size = (size_t)info.fsize;
/* Try to read the MTC binary. */
if (read_from_file((void *)mtc_address, size, mtc_path) != size) {
print(SCREEN_LOG_LEVEL_WARNING, "Failed to read stage2's MTC binary (%s)!\n", mtc_path);
if (read_from_file((void *)bct0->stage2_load_address, size, bct0->stage2_mtc_path) != size) {
print(SCREEN_LOG_LEVEL_WARNING, "Failed to read stage2's MTC binary (%s)!\n", bct0->stage2_mtc_path);
return false;
}
@ -47,19 +47,15 @@ static bool run_mtc(const char *mtc_path, uintptr_t mtc_address) {
memcpy(&mtc_args->log_level, &mtc_log_level, sizeof(mtc_log_level));
/* Run the MTC binary. */
mtc_res = (((int (*)(int, void *))mtc_address)(mtc_argc, mtc_arg_data) == 0);
mtc_res = (((int (*)(int, void *))bct0->stage2_load_address)(mtc_argc, mtc_arg_data) == 0);
/* Cleanup right away. */
memset((void *)mtc_address, 0, size);
memset((void *)bct0->stage2_load_address, 0, size);
return mtc_res;
}
void load_stage2(const bct0_t *bct0) {
FILINFO info;
size_t size;
uintptr_t tmp_addr;
void stage2_validate_config(const bct0_t *bct0) {
if (bct0->stage2_load_address == 0 || bct0->stage2_path[0] == '\x00') {
fatal_error("Failed to determine where to load stage2!\n");
}
@ -81,11 +77,12 @@ void load_stage2(const bct0_t *bct0) {
print(SCREEN_LOG_LEVEL_DEBUG | SCREEN_LOG_LEVEL_NO_PREFIX, " MTC File Path: %s\n", bct0->stage2_mtc_path);
print(SCREEN_LOG_LEVEL_DEBUG | SCREEN_LOG_LEVEL_NO_PREFIX, " Load Address: 0x%08x\n", bct0->stage2_load_address);
print(SCREEN_LOG_LEVEL_DEBUG | SCREEN_LOG_LEVEL_NO_PREFIX, " Entrypoint: 0x%p\n", bct0->stage2_entrypoint);
}
/* Run the MTC binary. */
if (!run_mtc(bct0->stage2_mtc_path, bct0->stage2_load_address)) {
print(SCREEN_LOG_LEVEL_WARNING, "DRAM training failed! Continuing with untrained DRAM.\n");
}
void stage2_load(const bct0_t *bct0) {
FILINFO info;
size_t size;
uintptr_t tmp_addr;
if (f_stat(bct0->stage2_path, &info) != FR_OK) {
fatal_error("Failed to stat stage2 (%s)!\n", bct0->stage2_path);

4
fusee/fusee-primary/src/stage2.h
View file

@ -43,6 +43,8 @@ typedef struct {
ScreenLogLevel log_level;
} stage2_mtc_args_t;
void load_stage2(const bct0_t *bct0);
bool stage2_run_mtc(const bct0_t *bct0);
void stage2_validate_config(const bct0_t *bct0);
void stage2_load(const bct0_t *bct0);
#endif