Instead of passing FatFS structs around, unmount; other changes

This commit is contained in:
TuxSH
2018-05-05 17:33:49 +02:00
parent 0fca6c2296
commit 67b76cc8f1
12 changed files with 54 additions and 76 deletions

View File

@@ -19,7 +19,7 @@ static int loadlist_entry_ini_handler(void *user, const char *section, const cha
load_file_t *load_file_ctx = (load_file_t *)user;
uintptr_t x = 0;
const char *ext = NULL;
if (strcmp(section, "stage2") == 0) {
if (strstr(name, load_file_ctx->key) == name) {
ext = name + strlen(load_file_ctx->key);
@@ -51,33 +51,33 @@ bool validate_load_address(uintptr_t load_addr) {
void load_list_entry(const char *key) {
load_file_t load_file_ctx = {0};
load_file_ctx.key = key;
printk("Loading %s\n", key);
if (ini_parse_string(get_loader_ctx()->bct0, loadlist_entry_ini_handler, &load_file_ctx) < 0) {
printk("Error: Failed to parse BCT.ini!\n");
generic_panic();
}
if (load_file_ctx.load_address == 0 || load_file_ctx.path[0] == '\x00') {
printk("Error: Failed to determine where to load %s!\n", key);
generic_panic();
}
printk("Loading %s from %s to 0x%08x\n", key, load_file_ctx.path, load_file_ctx.load_address);
if (!validate_load_address(load_file_ctx.load_address)) {
printk("Error: Load address 0x%08x is invalid!\n");
generic_panic();
}
/* Read file off of SD. */
load_file_ctx.load_size = read_sd_file((void *)load_file_ctx.load_address, LOADER_FILESIZE_MAX, load_file_ctx.path);
if (load_file_ctx.load_size == 0) {
printk("Error: Failed to read %s!\n", load_file_ctx.path);
generic_panic();
}
/* Check for special keys. */
if (strcmp(key, LOADER_PACKAGE2_KEY) == 0) {
get_loader_ctx()->package2_loadfile = load_file_ctx;
@@ -92,26 +92,26 @@ void load_list_entry(const char *key) {
void parse_loadlist(const char *ll) {
printk("Parsing load list: %s\n", ll);
char load_list[0x200] = {0};
strncpy(load_list, ll, 0x200);
char *entry, *p;
/* entry will point to the start of the current entry. p will point to the current location in the list. */
entry = load_list;
p = load_list;
while (*p) {
if (*p == ' ' || *p == '\t') {
/* We're at the end of an entry. */
*p = '\x00';
/* Load the entry. */
load_list_entry(entry);
/* Skip to the next delimiter. */
for (; *p == ' ' || *p == '\t' || *p == '\x00'; p++) { }
if (*p != '|') {
if (*p != '|') {
printk("Error: Load list is malformed!\n");
generic_panic();
} else {
@@ -132,7 +132,7 @@ void parse_loadlist(const char *ll) {
static int loadlist_ini_handler(void *user, const char *section, const char *name, const char *value) {
loader_ctx_t *loader_ctx = (loader_ctx_t *)user;
uintptr_t x = 0;
if (strcmp(section, "stage2") == 0) {
if (strcmp(name, LOADER_LOADLIST_KEY) == 0) {
parse_loadlist(value);
@@ -153,12 +153,12 @@ static int loadlist_ini_handler(void *user, const char *section, const char *nam
void load_payload(const char *bct0) {
loader_ctx_t *ctx = get_loader_ctx();
/* Set BCT0 global. */
ctx->bct0 = bct0;
if (ini_parse_string(ctx->bct0, loadlist_ini_handler, ctx) < 0) {
printk("Error: Failed to parse BCT.ini!\n");
generic_panic();
}
}
}