From: chaoskagami <chaos.kagami@gmail.com>
Date: Sun, 10 Jul 2016 05:38:19 +0000 (-0400)
Subject: Fix up NAND code, we have 0x05 init'd now
X-Git-Tag: v0.2.0~24^2~1
X-Git-Url: https://chaos.moe/g/?a=commitdiff_plain;h=8fbfee083d0c275df116ef3427f1b71878e8d6d6;p=corbenik%2Fcorbenik.git

Fix up NAND code, we have 0x05 init'd now
---

diff --git a/external/libctr9_io b/external/libctr9_io
index f1e4074..0e8bb5d 160000
--- a/external/libctr9_io
+++ b/external/libctr9_io
@@ -1 +1 @@
-Subproject commit f1e407450e658883343d0877c4afcffe3bb697cc
+Subproject commit 0e8bb5d3c55b3cab5eb704da1c25e4321423039d
diff --git a/source/firm/firm.c b/source/firm/firm.c
index cb63a09..273eb42 100644
--- a/source/firm/firm.c
+++ b/source/firm/firm.c
@@ -5,7 +5,6 @@
 
 #include "../common.h"
 #include "../misc/sha256.h"
-#include "../fatfs/sdmmc.h"
 
 firm_h *firm_loc = (firm_h *)FCRAM_FIRM_LOC;
 uint32_t firm_size = FCRAM_SPACING;
diff --git a/source/std/fs.c b/source/std/fs.c
index d261197..b2a13f1 100644
--- a/source/std/fs.c
+++ b/source/std/fs.c
@@ -6,10 +6,10 @@
 #include "memory.h"
 #include "../config.h"
 
-// ctr_nand_interface nand_io;
 // ctr_nand_crypto_interface ctr_io;
 // ctr_nand_crypto_interface twl_io;
-static ctr_sd_interface sd_io;
+static ctr_sd_interface   sd_io;
+static ctr_nand_interface nand_io;
 static FATFS fs;
 static int set_up_fs = 0;
 
@@ -65,7 +65,7 @@ rrmdir(char *name)
 int
 fmount(void)
 {
-    if(!set_up_fs && ctr_fatfs_initialize(NULL, NULL, NULL, &sd_io))
+    if(!set_up_fs && ctr_fatfs_initialize(&nand_io, NULL, NULL, &sd_io))
         return 1;
 
     set_up_fs = 1;