mirrors/Atmosphere
1
0
Fork 0
mirror of https://github.com/Atmosphere-NX/Atmosphere.git synced 2024-12-23 02:42:09 +00:00
Code Issues Releases Activity

Fusee Stage 2: Make references to external (stage 1) memory internal.

Browse source
This commit is contained in:
Michael Scire 2018-04-09 15:44:59 -06:00
parent a05bf5b4ce
commit d6806517c8
1 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
fusee/fusee-secondary/src/main.c
View file

@ -6,29 +6,34 @@
#include "lib/printk.h" #include "lib/printk.h"
#include "display/video_fb.h" #include "display/video_fb.h"
/* TODO: Add a #define for this size, somewhere. Also, primary can only actually load 0x7000. */
char g_bct0[0x8000];
/* Allow for main(int argc, void **argv) signature. */ /* Allow for main(int argc, void **argv) signature. */
#pragma GCC diagnostic ignored "-Wmain" #pragma GCC diagnostic ignored "-Wmain"
int main(int argc, void **argv) { int main(int argc, void **argv) {
stage2_args_t *args; stage2_args_t args;
loader_ctx_t *loader_ctx; loader_ctx_t *loader_ctx = get_loader_ctx();
if (argc != STAGE2_ARGC || ((args = (stage2_args_t *)argv[STAGE2_ARGV_ARGUMENT_STRUCT])->version != 0)) { if (argc != STAGE2_ARGC || ((args = *((stage2_args_t *)argv[STAGE2_ARGV_ARGUMENT_STRUCT])).version != 0)) {
generic_panic(); generic_panic();
} }
/* Copy the BCT0 from unsafe primary memory into our memory. */
strncpy(g_bct0, args.bct0, sizeof(g_bct0));
/* TODO: What other hardware init should we do here? */ /* TODO: What other hardware init should we do here? */
/* Setup LFB. */ /* Setup LFB. */
video_resume(args->lfb, args->console_row, args->console_col); video_resume(args.lfb, args.console_row, args.console_col);
printk("Welcome to Atmosph\xe8re Fus\xe9" "e Stage 2!\n"); printk("Welcome to Atmosph\xe8re Fus\xe9" "e Stage 2!\n");
printk("Stage 2 executing from: %s\n", (const char *)argv[STAGE2_ARGV_PROGRAM_PATH]); printk("Stage 2 executing from: %s\n", (const char *)argv[STAGE2_ARGV_PROGRAM_PATH]);
/* This will load all remaining binaries off of the SD. */ /* This will load all remaining binaries off of the SD. */
load_payload(args->bct0); load_payload(g_bct0);
loader_ctx = get_loader_ctx();
if (loader_ctx->chainload_entrypoint != NULL) { if (loader_ctx->chainload_entrypoint != NULL) {
/* TODO: What do we want to do in terms of argc/argv? */ /* TODO: What do we want to do in terms of argc/argv? */