OmniNX/Atmosphere
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fusee stage 2: Fix up loader (no stage 3!). Skeleton chainload behavior.

Browse Source
This commit is contained in:
Michael Scire
2018-04-09 15:34:23 -06:00
parent b85567dff3
commit a05bf5b4ce
5 changed files with 66 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
fusee/fusee-secondary/src/main.c
View File

@@ -2,6 +2,7 @@
#include "hwinit.h"
#include "loader.h"
#include "stage2.h"
#include "nxboot.h"
#include "lib/printk.h"
#include "display/video_fb.h"
@@ -10,8 +11,8 @@
#pragma GCC diagnostic ignored "-Wmain"
int main(int argc, void **argv) {
entrypoint_t entrypoint;
stage2_args_t *args;
loader_ctx_t *loader_ctx;
if (argc != STAGE2_ARGC || ((args = (stage2_args_t *)argv[STAGE2_ARGV_ARGUMENT_STRUCT])->version != 0)) {
generic_panic();
@@ -26,10 +27,16 @@ int main(int argc, void **argv) {
printk("Stage 2 executing from: %s\n", (const char *)argv[STAGE2_ARGV_PROGRAM_PATH]);
/* This will load all remaining binaries off of the SD. */
entrypoint = load_payload(args->bct0);
load_payload(args->bct0);
loader_ctx = get_loader_ctx();
/* TODO: What do we want to do in terms of argc/argv? */
entrypoint(0, NULL);
if (loader_ctx->chainload_entrypoint != NULL) {
/* TODO: What do we want to do in terms of argc/argv? */
loader_ctx->chainload_entrypoint(0, NULL);
} else {
/* If we don't have a chainload entrypoint set, we're booting Horizon. */
nxboot_main();
}
return 0;
}