From de30047a24a5d1d854cc03d0213695779db6dfff Mon Sep 17 00:00:00 2001 From: langerhans Date: Fri, 4 May 2018 22:04:52 +0200 Subject: [PATCH] fusee: fix sd carry over from stage 1 to 2 --- fusee/fusee-primary/src/sd_utils.c | 2 +- fusee/fusee-secondary/src/main.c | 4 ++-- fusee/fusee-secondary/src/sd_utils.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/fusee/fusee-primary/src/sd_utils.c b/fusee/fusee-primary/src/sd_utils.c index 965ad2f01..ede4d5643 100644 --- a/fusee/fusee-primary/src/sd_utils.c +++ b/fusee/fusee-primary/src/sd_utils.c @@ -12,7 +12,7 @@ static int mounted_sd = 0; void save_sd_state(void **mmc, void **ff) { *mmc = &sd_mmc; - *ff = &ff; + *ff = &sd_fs; } void resume_sd_state(void *mmc, void *ff) { sd_mmc = *(struct mmc *)mmc; diff --git a/fusee/fusee-secondary/src/main.c b/fusee/fusee-secondary/src/main.c index 38cb78f42..9a1e9b0f2 100644 --- a/fusee/fusee-secondary/src/main.c +++ b/fusee/fusee-secondary/src/main.c @@ -30,11 +30,11 @@ int main(int argc, void **argv) { generic_panic(); } - resume_sd_state((struct mmc *)args.sd_mmc, (FATFS *)args.sd_fs); - /* Copy the BCT0 from unsafe primary memory into our memory. */ strncpy(g_bct0, args.bct0, sizeof(g_bct0)); + resume_sd_state((struct mmc *)args.sd_mmc, (FATFS *)args.sd_fs); + /* TODO: What other hardware init should we do here? */ /* Setup LFB. */ diff --git a/fusee/fusee-secondary/src/sd_utils.c b/fusee/fusee-secondary/src/sd_utils.c index 965ad2f01..ede4d5643 100644 --- a/fusee/fusee-secondary/src/sd_utils.c +++ b/fusee/fusee-secondary/src/sd_utils.c @@ -12,7 +12,7 @@ static int mounted_sd = 0; void save_sd_state(void **mmc, void **ff) { *mmc = &sd_mmc; - *ff = &ff; + *ff = &sd_fs; } void resume_sd_state(void *mmc, void *ff) { sd_mmc = *(struct mmc *)mmc;