From 09435c282b377693b75a5c7c341e4d584e051cdc Mon Sep 17 00:00:00 2001 From: Aurora Date: Wed, 8 Jun 2016 14:33:27 +0200 Subject: [PATCH] Added checks for successful mounting of SD/CTRNAND --- source/fs.c | 6 ++---- source/installer.c | 6 ++++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/source/fs.c b/source/fs.c index 78ea049..fc7061c 100644 --- a/source/fs.c +++ b/source/fs.c @@ -10,14 +10,12 @@ static FATFS fs; u32 mountSD(void) { - if(f_mount(&fs, "0:", 1) != FR_OK) return 0; - return 1; + return f_mount(&fs, "0:", 1) == FR_OK; } u32 mountCTRNAND(void) { - if(f_mount(&fs, "1:", 1) != FR_OK) return 0; - return 1; + return f_mount(&fs, "1:", 1) == FR_OK; } u32 fileRead(void *dest, const char *path) diff --git a/source/installer.c b/source/installer.c index 668668c..e1cb312 100755 --- a/source/installer.c +++ b/source/installer.c @@ -59,7 +59,8 @@ void main(void) static inline void installer(u32 a9lhBoot) { - mountSD(); + if(!mountSD()) + shutdown(1, "Error: failed to mount the SD card"); const char *path; u32 updatea9lh = 0; @@ -192,7 +193,8 @@ static inline void uninstaller(void) } else memset32((void *)SECTOR_OFFSET, 0, 0x200); - mountCTRNAND(); + if(!mountCTRNAND()) + shutdown(1, "Error: failed to mount CTRNAND"); switch(firmRead((void *)FIRM0_OFFSET)) {