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

Refactor stage1's and stage2's main.c files

Browse Source
This commit is contained in:
TuxSH
2018-05-08 16:51:43 +02:00
parent 50498e3b20
commit 70bb496388
6 changed files with 121 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
fusee/fusee-secondary/src/chainloader.c
View File

@@ -1,5 +1,6 @@
#include "chainloader.h"
int g_chainloader_argc = 0;
char g_chainloader_arg_data[CHAINLOADER_ARG_DATA_MAX_SIZE] = {0};
chainloader_entry_t g_chainloader_entries[CHAINLOADER_MAX_ENTRIES] = {0}; /* keep them sorted */
size_t g_chainloader_num_entries = 0;
@@ -24,11 +25,11 @@ static void *xmemmove(void *dst, const void *src, size_t len)
return dst;
}
void relocate_and_chainload_main(int argc) {
void relocate_and_chainload_main(void) {
for(size_t i = 0; i < g_chainloader_num_entries; i++) {
chainloader_entry_t *entry = &g_chainloader_entries[i];
xmemmove((void *)entry->load_address, (const void *)entry->src_address, entry->size);
}
((void (*)(int, void *))g_chainloader_entrypoint)(argc, g_chainloader_arg_data);
((void (*)(int, void *))g_chainloader_entrypoint)(g_chainloader_argc, g_chainloader_arg_data);
}

3
fusee/fusee-secondary/src/chainloader.h
View File

@@ -14,12 +14,13 @@ typedef struct chainloader_entry_t {
size_t num;
} chainloader_entry_t;
extern int g_chainloader_argc;
extern chainloader_entry_t g_chainloader_entries[CHAINLOADER_MAX_ENTRIES]; /* keep them sorted */
extern size_t g_chainloader_num_entries;
extern uintptr_t g_chainloader_entrypoint;
extern char g_chainloader_arg_data[CHAINLOADER_ARG_DATA_MAX_SIZE];
void relocate_and_chainload(int argc);
void relocate_and_chainload(void);
#endif

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

@@ -13,32 +13,71 @@
#include "fs_dev.h"
#include "display/video_fb.h"
extern void (*__program_exit_callback)(int rc);
static stage2_args_t *g_stage2_args;
static void *g_framebuffer;
static bool g_do_nxboot;
static void setup_env(void) {
g_framebuffer = memalign(0x1000, CONFIG_VIDEO_VISIBLE_ROWS * CONFIG_VIDEO_COLS * CONFIG_VIDEO_PIXEL_SIZE);
/* Note: the framebuffer needs to be >= 0xC0000000, this is fine because of where our heap is. */
if (g_framebuffer == NULL) {
generic_panic();
}
/* Zero-fill the framebuffer and set the console up. */
console_init(g_framebuffer);
/* Initialize the display. */
display_init();
/* Set the framebuffer. */
display_init_framebuffer(g_framebuffer);
/* Turn on the backlight after initializing the lfb */
/* to avoid flickering. */
display_enable_backlight(true);
initialize_sd();
if(fsdev_mount_all() == -1) {
perror("Failed to mount at least one FAT parition");
generic_panic();
}
fsdev_set_default_device("sdmc");
/* TODO: What other hardware init should we do here? */
}
static void cleanup_env(void) {
/* Unmount everything (this causes all open files to be flushed and closed) */
fsdev_unmount_all();
/* Deinitialize the framebuffer and display */
/*display_enable_backlight(false);
display_end();
free(g_framebuffer);
g_framebuffer = NULL;*/
}
static void exit_callback(int rc) {
(void)rc;
if (g_do_nxboot) {
/* TODO: halt */
} else {
relocate_and_chainload();
}
}
/* Allow for main(int argc, void **argv) signature. */
#pragma GCC diagnostic ignored "-Wmain"
int main(int argc, void **argv) {
loader_ctx_t *loader_ctx = get_loader_ctx();
void *framebuffer = memalign(0x1000, CONFIG_VIDEO_VISIBLE_ROWS * CONFIG_VIDEO_COLS * CONFIG_VIDEO_PIXEL_SIZE);
/* Note: the framebuffer needs to be >= 0xC0000000, this is fine because of where our heap is. */
if (framebuffer == NULL) {
generic_panic();
}
/* Zero-fill the framebuffer and set the console up. */
console_init(framebuffer);
/* Initialize the display. */
display_init();
/* Set the framebuffer. */
display_init_framebuffer(framebuffer);
/* Turn on the backlight after initializing the lfb */
/* to avoid flickering. */
display_enable_backlight(true);
/* Initialize the display, console, FS, etc. */
setup_env();
if (argc != STAGE2_ARGC) {
printf("Error: Invalid argc (expected %d, got %d)!\n", STAGE2_ARGC, argc);
@@ -47,18 +86,10 @@ int main(int argc, void **argv) {
g_stage2_args = (stage2_args_t *)argv[STAGE2_ARGV_ARGUMENT_STRUCT];
if(g_stage2_args->version != 0) {
printf("Error: Incorrect Stage2 args version (expected %lu, got %lu)!\n", 0lu, g_stage2_args->version);
printf("Error: Incorrect Stage2 args version (expected %lu, got %lu)!\n", 0ul, g_stage2_args->version);
generic_panic();
}
initialize_sd();
if(fsdev_mount_all() == -1) {
perror("Failed to mount at least one FAT parition");
}
fsdev_set_default_device("sdmc");
/* TODO: What other hardware init should we do here? */
printf(u8"Welcome to Atmosphère Fusée Stage 2!\n");
printf("Stage 2 executing from: %s\n", (const char *)argv[STAGE2_ARGV_PROGRAM_PATH]);
@@ -67,22 +98,21 @@ int main(int argc, void **argv) {
printf("Loaded payloads!\n");
/* Unmount everything (this causes all open files to be flushed and closed) */
fsdev_unmount_all();
/* Deinitialize the framebuffer and display */
/*display_enable_backlight(false);
display_end();
free(framebuffer);*/
if (loader_ctx->chainload_entrypoint != 0) {
g_do_nxboot = loader_ctx->chainload_entrypoint == 0;
if (g_do_nxboot) {
nxboot_main();
} else {
/* TODO: What else do we want to do in terms of argc/argv? */
const char *path = get_loader_ctx()->file_paths[get_loader_ctx()->file_id_of_entrypoint];
g_chainloader_argc = 1;
strcpy(g_chainloader_arg_data, path);
relocate_and_chainload(1);
} else {
/* If we don't have a chainload entrypoint set, we're booting Horizon. */
nxboot_main();
}
/* Deinitialize the display, console, FS, etc. */
cleanup_env();
/* Finally, after the cleanup routines (__libc_fini_array, etc.) are called, chainload or halt ourselves. */
__program_exit_callback = exit_callback;
return 0;
}