Minor stuff

Prefer OTP from memory to OTP from file

.gitignore

@@ -1,9 +1,10 @@
 out
 build
+loader/build
+arm11/build
 *.bin
 *.3dsx
 *.smdh
 *.o
 *.d
 *.elf
-*.bat

.gitmodules

@@ -4,6 +4,3 @@
 [submodule "CakeHax"]
 	path = CakeHax
 	url = https://github.com/mid-kid/CakeHax.git
-[submodule "2xrsa"]
-	path = 2xrsa
-	url = https://github.com/b1l1s/2xrsa.git

2xrsa

@@ -1 +0,0 @@
-Subproject commit c3f93cb492d61978fd0620d715510932837495dd

CakeBrah

@@ -1 +1 @@
-Subproject commit 42ebe0d0bc075ba98fa631441590de9bd2733d2b
+Subproject commit 1efda4e89476d34aeb307e0acd7a8dbcd1344601

CakeHax

@@ -1 +1 @@
-Subproject commit 6b8fca0b37a370a605f76b34b133da91a0b40f5e
+Subproject commit 329212a8e09d4718e304cb9d94a0e10f66d9813d

Makefile

@@ -1,17 +1,17 @@
 rwildcard = $(foreach d, $(wildcard $1*), $(filter $(subst *, %, $2), $d) $(call rwildcard, $d/, $2))
 
-CC := arm-none-eabi-gcc
+ifeq ($(strip $(DEVKITARM)),)
-AS := arm-none-eabi-as
+$(error "Please set DEVKITARM in your environment. export DEVKITARM=<path to>devkitARM")
-LD := arm-none-eabi-ld
+endif
-OC := arm-none-eabi-objcopy
+
+include $(DEVKITARM)/base_tools
 
 name := SafeA9LHInstaller
 revision := $(shell git describe --tags --match v[0-9]* --abbrev=8 | sed 's/-[0-9]*-g/-/i')
 
 dir_source := source
-dir_mset := CakeHax
+dir_cakehax := CakeHax
-dir_ninjhax := CakeBrah
+dir_cakebrah := CakeBrah
-dir_2xrsa := 2xrsa
 dir_build := build
 dir_out := out
 
@@ -25,7 +25,7 @@ objects= $(patsubst $(dir_source)/%.s, $(dir_build)/%.o, \
 	 $(call rwildcard, $(dir_source), *.s *.c)))
 
 .PHONY: all
-all: launcher a9lh ninjhax 2xrsa
+all: launcher a9lh cakebrah
 
 .PHONY: launcher
 launcher: $(dir_out)/$(name).dat
@@ -33,56 +33,43 @@ launcher: $(dir_out)/$(name).dat
 .PHONY: a9lh
 a9lh: $(dir_out)/arm9loaderhax.bin
 
-.PHONY: 2xrsa
+.PHONY: cakebrah
-2xrsa: $(dir_out)/arm9.bin $(dir_out)/arm11.bin
+cakebrah: $(dir_out)/3ds/$(name)
-
-.PHONY: ninjhax
-ninjhax: $(dir_out)/3ds/$(name)
 
 .PHONY: release
 release: $(dir_out)/$(name)$(revision).7z
 
 .PHONY: clean
 clean:
-	@$(MAKE) $(FLAGS) -C $(dir_mset) clean
+	@$(MAKE) $(FLAGS) -C $(dir_cakehax) clean
-	@$(MAKE) $(FLAGS) -C $(dir_ninjhax) clean
+	@$(MAKE) $(FLAGS) -C $(dir_cakebrah) clean
-	@$(MAKE) -C $(dir_2xrsa) clean
 	@rm -rf $(dir_out) $(dir_build)
 
-$(dir_out):
+$(dir_out) $(dir_build):
-	@mkdir -p "$(dir_out)"
+	@mkdir -p "$@"
 
 $(dir_out)/$(name).dat: $(dir_build)/main.bin $(dir_out)
-	@mkdir -p $(dir_out)
+	@$(MAKE) $(FLAGS) -C $(dir_cakehax) launcher
-	@$(MAKE) $(FLAGS) -C $(dir_mset) launcher
 	dd if=$(dir_build)/main.bin of=$@ bs=512 seek=144
 
 $(dir_out)/arm9loaderhax.bin: $(dir_build)/main.bin $(dir_out)
 	@cp -av $(dir_build)/main.bin $@
 
-$(dir_out)/arm9.bin: $(dir_build)/main.bin $(dir_out)
-	@cp -av $(dir_build)/main.bin $@
-
-$(dir_out)/arm11.bin:
-	@$(MAKE) -C $(dir_2xrsa)
-	@cp -av $(dir_2xrsa)/bin/arm11.bin $@
-
 $(dir_out)/3ds/$(name): $(dir_out)
-	@mkdir -p $(dir_out)/3ds/$(name)
+	@mkdir -p "$@"
-	@$(MAKE) $(FLAGS) -C $(dir_ninjhax)
+	@$(MAKE) $(FLAGS) -C $(dir_cakebrah)
-	@mv $(dir_out)/$(name).3dsx $@
+	@mv $(dir_out)/$(name).3dsx $(dir_out)/$(name).smdh $@
-	@mv $(dir_out)/$(name).smdh $@
 
-$(dir_out)/$(name)$(revision).7z: launcher a9lh ninjhax 2xrsa
+$(dir_out)/$(name)$(revision).7z: all
 	@7z a -mx $@ ./$(@D)/*
 
 $(dir_build)/main.bin: $(dir_build)/main.elf
-	$(OC) -S -O binary $< $@
+	$(OBJCOPY) -S -O binary $< $@
 
 $(dir_build)/main.elf: $(objects)
 	$(LINK.o) -T linker.ld $(OUTPUT_OPTION) $^
 
-$(dir_build)/memory.o:    CFLAGS += -O3
+$(dir_build)/memory.o $(dir_build)/strings.o: CFLAGS += -O3
 $(dir_build)/installer.o: CFLAGS += -DTITLE="\"$(name) $(revision)\""
 
 $(dir_build)/%.o: $(dir_source)/%.c
@@ -92,4 +79,3 @@ $(dir_build)/%.o: $(dir_source)/%.c
 $(dir_build)/%.o: $(dir_source)/%.s
 	@mkdir -p "$(@D)"
 	$(COMPILE.s) $(OUTPUT_OPTION) $<
-include $(call rwildcard, $(dir_build), *.d)

README.md

@@ -1,12 +1,23 @@
 # Safe A9LH Installer
-*A noob-proof ARM9LoaderHax installer/updater*
+*A noob-proof ARM9LoaderHax installer/updater/uninstaller*
 
 **Usage / Features:**
 
-See http://gbatemp.net/threads/safea9lhinstaller.419577
+*DO NOT USE THIS VERSION TO INSTALL ON NEW 3DS UNLESS YOU HAVE AN HARDMOD, CAUSES RANDOM BRICKS! UNINSTALLATION IS FINE*  
+For a comprehensive guide to installing A9LH and to 3DS hacking in general, refer to [Plailect's guide](https://github.com/Plailect/Guide/wiki/Get-Started).  
+For other details about the program, refer to the [GBATemp thread](http://gbatemp.net/threads/safea9lhinstaller.419577/).
 
 **Credits:**
 
-delebile for his A9LH implementation, everyone in #cakey, StandardBus for allowing this to happen by hardmodding my consoles.
+* delebile for his A9LH implementation
-Code for writing to the screens is from CakesFW.
+* Everyone in #cakey
+* StandardBus for allowing this to happen by hardmodding my consoles
+* Everyone who contributed to the discovery and research of OTPless A9LH
+
+Code for writing to the screens is from CakesFW, several other code is from Luma3DS.  
 Original exploit by plutoo.
+
+**Licensing:**
+
+This software is licensed under the terms of the GPLv3.  
+You can find a copy of the license in the LICENSE.txt file.

linker.ld

@@ -1,11 +1,15 @@
+OUTPUT_FORMAT("elf32-littlearm", "elf32-bigarm", "elf32-littlearm")
+OUTPUT_ARCH(arm)
+
 ENTRY(_start)
 SECTIONS
 {
     . = 0x23F00000;
-    .text.start : { *(.text.start) }
+
-    .text : { *(.text) }
+    .text       : ALIGN(4) { *(.text.start) *(.text*); . = ALIGN(4); }
-    .data : { *(.data) }
+    .rodata     : ALIGN(4) { *(.rodata*); . = ALIGN(4); }
-    .bss : { *(.bss COMMON) }
+    .data       : ALIGN(4) { *(.data*); . = ALIGN(4); }
-    .rodata : { *(.rodata) }
+    .bss        : ALIGN(8) { __bss_start = .; *(.bss* COMMON); . = ALIGN(8); __bss_end = .; }
+
     . = ALIGN(4);
 }

source/3dsheaders.h

@@ -0,0 +1,161 @@
+/*
+*   This file is part of Luma3DS
+*   Copyright (C) 2016 Aurora Wright, TuxSH
+*
+*   This program is free software: you can redistribute it and/or modify
+*   it under the terms of the GNU General Public License as published by
+*   the Free Software Foundation, either version 3 of the License, or
+*   (at your option) any later version.
+*
+*   This program is distributed in the hope that it will be useful,
+*   but WITHOUT ANY WARRANTY; without even the implied warranty of
+*   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+*   GNU General Public License for more details.
+*
+*   You should have received a copy of the GNU General Public License
+*   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*
+*   Additional Terms 7.b of GPLv3 applies to this file: Requiring preservation of specified
+*   reasonable legal notices or author attributions in that material or in the Appropriate Legal
+*   Notices displayed by works containing it.
+*/
+
+/*
+*   Adapted from 3DBrew and https://github.com/mid-kid/CakesForeveryWan/blob/master/source/headers.h
+*/
+
+typedef struct __attribute__((packed))
+{
+    u32 address;
+    u32 phyRegionSize;
+    u32 size;
+} CodeSetInfo;
+
+typedef struct __attribute__((packed))
+{
+    u32 saveDataSize[2];
+    u32 jumpID[2];
+    u8 reserved[0x30];
+} SystemInfo;
+
+typedef struct __attribute__((packed))
+{
+    char appTitle[8];
+    u8 reserved1[5];
+    u8 flag;
+    u8 remasterVersion[2];
+    CodeSetInfo textCodeSet;
+    u32 stackSize;
+    CodeSetInfo roCodeSet;
+    u8 reserved2[4];
+    CodeSetInfo dataCodeSet;
+    u32 bssSize;
+    char depends[0x180];
+    SystemInfo systemInfo;
+} SystemControlInfo;
+
+typedef struct __attribute__((packed))
+{
+    SystemControlInfo systemControlInfo;
+    u8 aci[0x200];
+    u8 accessDescSig[0x100];
+    u8 ncchPubKey[0x100];
+    u8 aciLim[0x200];
+} ExHeader;
+
+typedef struct __attribute__((packed))
+{
+    u8 sig[0x100]; //RSA-2048 signature of the NCCH header, using SHA-256
+    char magic[4]; //NCCH
+    u32 contentSize; //Media unit
+    u8 partitionId[8];
+    u8 makerCode[2];
+    u16 version;
+    u8 reserved1[4];
+    u8 programID[8];
+    u8 reserved2[0x10];
+    u8 logoHash[0x20]; //Logo Region SHA-256 hash
+    char productCode[0x10];
+    u8 exHeaderHash[0x20]; //Extended header SHA-256 hash
+    u32 exHeaderSize; //Extended header size
+    u32 reserved3;
+    u8 flags[8];
+    u32 plainOffset; //Media unit
+    u32 plainSize; //Media unit
+    u32 logoOffset; //Media unit
+    u32 logoSize; //Media unit
+    u32 exeFsOffset; //Media unit
+    u32 exeFsSize; //Media unit
+    u32 exeFsHashSize; //Media unit
+    u32 reserved4;
+    u32 romFsOffset; //Media unit
+    u32 romFsSize; //Media unit
+    u32 romFsHashSize; //Media unit
+    u32 reserved5;
+    u8 exeFsHash[0x20]; //ExeFS superblock SHA-256 hash
+    u8 romFsHash[0x20]; //RomFS superblock SHA-256 hash
+} Ncch;
+
+typedef struct __attribute__((packed))
+{
+    Ncch ncch;
+    ExHeader exHeader;
+} Cxi;
+
+typedef struct __attribute__((packed))
+{
+    char sigIssuer[0x40];
+    u8 eccPubKey[0x3C];
+    u8 version;
+    u8 caCrlVersion;
+    u8 signerCrlVersion;
+    u8 titleKey[0x10];
+    u8 reserved1;
+    u8 ticketId[8];
+    u8 consoleId[4];
+    u8 titleId[8];
+    u8 reserved2[2];
+    u16 ticketTitleVersion;
+    u8 reserved3[8];
+    u8 licenseType;
+    u8 ticketCommonKeyYIndex; //Ticket common keyY index, usually 0x1 for retail system titles.
+    u8 reserved4[0x2A];
+    u8 unk[4]; //eShop Account ID?
+    u8 reserved5;
+    u8 audit;
+    u8 reserved6[0x42];
+    u8 limits[0x40];
+    u8 contentIndex[0xAC];
+} Ticket;
+
+typedef struct __attribute__((packed))
+{
+    u32 offset;
+    u8 *address;
+    u32 size;
+    u32 procType;
+    u8 hash[0x20];
+} FirmSection;
+
+typedef struct __attribute__((packed))
+{
+    u32 magic;
+    u32 reserved1;
+    u8 *arm11Entry;
+    u8 *arm9Entry;
+    u8 reserved2[0x30];
+    FirmSection section[4];
+} Firm;
+
+typedef struct __attribute__((packed))
+{
+    u8 keyX[0x10];
+    u8 keyY[0x10];
+    u8 ctr[0x10];
+    char size[8];
+    u8 reserved[8];
+    u8 ctlBlock[0x10];
+    char magic[4];
+    u8 reserved2[0xC];
+    u8 slot0x16keyX[0x10];
+} Arm9Bin;

source/cache.h

@@ -0,0 +1,29 @@
+/*
+*   This file is part of Luma3DS
+*   Copyright (C) 2016 Aurora Wright, TuxSH
+*
+*   This program is free software: you can redistribute it and/or modify
+*   it under the terms of the GNU General Public License as published by
+*   the Free Software Foundation, either version 3 of the License, or
+*   (at your option) any later version.
+*
+*   This program is distributed in the hope that it will be useful,
+*   but WITHOUT ANY WARRANTY; without even the implied warranty of
+*   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+*   GNU General Public License for more details.
+*
+*   You should have received a copy of the GNU General Public License
+*   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*
+*   Additional Terms 7.b of GPLv3 applies to this file: Requiring preservation of specified
+*   reasonable legal notices or author attributions in that material or in the Appropriate Legal
+*   Notices displayed by works containing it.
+*/
+
+#pragma once
+
+#include "types.h"
+
+void flushEntireDCache(void); //actually: "clean and flush"
+void flushDCacheRange(void *startAddress, u32 size);
+void flushEntireICache(void);

source/cache.s

@@ -0,0 +1,74 @@
+@   This file is part of Luma3DS
+@   Copyright (C) 2016 Aurora Wright, TuxSH
+@
+@   This program is free software: you can redistribute it and/or modify
+@   it under the terms of the GNU General Public License as published by
+@   the Free Software Foundation, either version 3 of the License, or
+@   (at your option) any later version.
+@
+@   This program is distributed in the hope that it will be useful,
+@   but WITHOUT ANY WARRANTY; without even the implied warranty of
+@   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+@   GNU General Public License for more details.
+@
+@   You should have received a copy of the GNU General Public License
+@   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+@
+@   Additional Terms 7.b of GPLv3 applies to this file: Requiring preservation of specified
+@   reasonable legal notices or author attributions in that material or in the Appropriate Legal
+@   Notices displayed by works containing it.
+
+.text
+.arm
+.align 4
+
+.global flushEntireDCache
+.type flushEntireDCache, %function
+flushEntireDCache:
+    @ Adapted from http://infocenter.arm.com/help/index.jsp?topic=/com.arm.doc.ddi0155a/ch03s03s05.html,
+    @ and https://github.com/gemarcano/libctr9_io/blob/master/src/ctr_system_ARM.c#L39 as well
+    @ Note: ARM's example is actually for a 8KB DCache (which is what the 3DS has)
+
+    @ Implemented in bootROM at address 0xffff0830
+    mov r1, #0                          @ segment counter
+    outer_loop:
+        mov r0, #0                      @ line counter
+
+        inner_loop:
+            orr r2, r1, r0                  @ generate segment and line address
+            mcr p15, 0, r2, c7, c14, 2      @ clean and flush the line
+            add r0, #0x20                   @ increment to next line
+            cmp r0, #0x400
+            bne inner_loop
+
+        add r1, #0x40000000
+        cmp r1, #0
+        bne outer_loop
+
+    mcr p15, 0, r1, c7, c10, 4              @ drain write buffer
+    bx lr
+
+.global flushDCacheRange
+.type flushDCacheRange, %function
+flushDCacheRange:
+    @ Implemented in bootROM at address 0xffff08a0
+    add r1, r0, r1                      @ end address
+    bic r0, #0x1f                       @ align source address to cache line size (32 bytes)
+
+    flush_dcache_range_loop:
+        mcr p15, 0, r0, c7, c14, 1      @ clean and flush the line corresponding to the address r0 is holding
+        add r0, #0x20
+        cmp r0, r1
+        blo flush_dcache_range_loop
+
+    mov r0, #0
+    mcr p15, 0, r0, c7, c10, 4          @ drain write buffer
+    bx lr
+
+.global flushEntireICache
+.type flushEntireICache, %function
+flushEntireICache:
+    @ Implemented in bootROM at address 0xffff0ab4
+    mov r0, #0
+    mcr p15, 0, r0, c7, c5, 0
+    bx lr

source/crypto.c

@@ -9,301 +9,303 @@
 #include "fatfs/sdmmc/sdmmc.h"
 
 /****************************************************************
-*                   Crypto Libs
+*                  Crypto libs
 ****************************************************************/
 
 /* original version by megazig */
 
 #ifndef __thumb__
 #define BSWAP32(x) {\
-	__asm__\
+    __asm__\
-	(\
+    (\
-		"eor r1, %1, %1, ror #16\n\t"\
+        "eor r1, %1, %1, ror #16\n\t"\
-		"bic r1, r1, #0xFF0000\n\t"\
+        "bic r1, r1, #0xFF0000\n\t"\
-		"mov %0, %1, ror #8\n\t"\
+        "mov %0, %1, ror #8\n\t"\
-		"eor %0, %0, r1, lsr #8\n\t"\
+        "eor %0, %0, r1, lsr #8\n\t"\
-		:"=r"(x)\
+        :"=r"(x)\
-		:"0"(x)\
+        :"0"(x)\
-		:"r1"\
+        :"r1"\
-	);\
+    );\
 };
 
 #define ADD_u128_u32(u128_0, u128_1, u128_2, u128_3, u32_0) {\
 __asm__\
-	(\
+    (\
-		"adds %0, %4\n\t"\
+        "adds %0, %4\n\t"\
-		"addcss %1, %1, #1\n\t"\
+        "addcss %1, %1, #1\n\t"\
-		"addcss %2, %2, #1\n\t"\
+        "addcss %2, %2, #1\n\t"\
-		"addcs %3, %3, #1\n\t"\
+        "addcs %3, %3, #1\n\t"\
-		: "+r"(u128_0), "+r"(u128_1), "+r"(u128_2), "+r"(u128_3)\
+        : "+r"(u128_0), "+r"(u128_1), "+r"(u128_2), "+r"(u128_3)\
-		: "r"(u32_0)\
+        : "r"(u32_0)\
-		: "cc"\
+        : "cc"\
-	);\
+    );\
 }
 #else
 #define BSWAP32(x) {x = __builtin_bswap32(x);}
 
 #define ADD_u128_u32(u128_0, u128_1, u128_2, u128_3, u32_0) {\
 __asm__\
-	(\
+    (\
-		"mov r4, #0\n\t"\
+        "mov r4, #0\n\t"\
-		"add %0, %0, %4\n\t"\
+        "add %0, %0, %4\n\t"\
-		"adc %1, %1, r4\n\t"\
+        "adc %1, %1, r4\n\t"\
-		"adc %2, %2, r4\n\t"\
+        "adc %2, %2, r4\n\t"\
-		"adc %3, %3, r4\n\t"\
+        "adc %3, %3, r4\n\t"\
-		: "+r"(u128_0), "+r"(u128_1), "+r"(u128_2), "+r"(u128_3)\
+        : "+r"(u128_0), "+r"(u128_1), "+r"(u128_2), "+r"(u128_3)\
-		: "r"(u32_0)\
+        : "r"(u32_0)\
-		: "cc", "r4"\
+        : "cc", "r4"\
-	);\
+    );\
 }
 #endif /*__thumb__*/
 
 static void aes_setkey(u8 keyslot, const void *key, u32 keyType, u32 mode)
 {
-	if(keyslot <= 0x03) return; // Ignore TWL keys for now
+    if(keyslot <= 0x03) return; //Ignore TWL keys for now
-	u32 *key32 = (u32 *)key;
+    u32 *key32 = (u32 *)key;
-	*REG_AESCNT = (*REG_AESCNT & ~(AES_CNT_INPUT_ENDIAN | AES_CNT_INPUT_ORDER)) | mode;
+    *REG_AESCNT = (*REG_AESCNT & ~(AES_CNT_INPUT_ENDIAN | AES_CNT_INPUT_ORDER)) | mode;
-	*REG_AESKEYCNT = (*REG_AESKEYCNT >> 6 << 6) | keyslot | AES_KEYCNT_WRITE;
+    *REG_AESKEYCNT = (*REG_AESKEYCNT >> 6 << 6) | keyslot | AES_KEYCNT_WRITE;
 
-	REG_AESKEYFIFO[keyType] = key32[0];
+    REG_AESKEYFIFO[keyType] = key32[0];
-	REG_AESKEYFIFO[keyType] = key32[1];
+    REG_AESKEYFIFO[keyType] = key32[1];
-	REG_AESKEYFIFO[keyType] = key32[2];
+    REG_AESKEYFIFO[keyType] = key32[2];
-	REG_AESKEYFIFO[keyType] = key32[3];
+    REG_AESKEYFIFO[keyType] = key32[3];
 }
 
 static void aes_use_keyslot(u8 keyslot)
 {
-	if(keyslot > 0x3F)
+    if(keyslot > 0x3F)
-		return;
+        return;
 
-	*REG_AESKEYSEL = keyslot;
+    *REG_AESKEYSEL = keyslot;
-	*REG_AESCNT = *REG_AESCNT | 0x04000000; /* mystery bit */
+    *REG_AESCNT = *REG_AESCNT | 0x04000000; /* mystery bit */
 }
 
 static void aes_setiv(const void *iv, u32 mode)
 {
-	const u32 *iv32 = (const u32 *)iv;
+    const u32 *iv32 = (const u32 *)iv;
-	*REG_AESCNT = (*REG_AESCNT & ~(AES_CNT_INPUT_ENDIAN | AES_CNT_INPUT_ORDER)) | mode;
+    *REG_AESCNT = (*REG_AESCNT & ~(AES_CNT_INPUT_ENDIAN | AES_CNT_INPUT_ORDER)) | mode;
 
-	// Word order for IV can't be changed in REG_AESCNT and always default to reversed
+    //Word order for IV can't be changed in REG_AESCNT and always default to reversed
-	if(mode & AES_INPUT_NORMAL)
+    if(mode & AES_INPUT_NORMAL)
-	{
+    {
-		REG_AESCTR[0] = iv32[3];
+        REG_AESCTR[0] = iv32[3];
-		REG_AESCTR[1] = iv32[2];
+        REG_AESCTR[1] = iv32[2];
-		REG_AESCTR[2] = iv32[1];
+        REG_AESCTR[2] = iv32[1];
-		REG_AESCTR[3] = iv32[0];
+        REG_AESCTR[3] = iv32[0];
-	}
+    }
-	else
+    else
-	{
+    {
-		REG_AESCTR[0] = iv32[0];
+        REG_AESCTR[0] = iv32[0];
-		REG_AESCTR[1] = iv32[1];
+        REG_AESCTR[1] = iv32[1];
-		REG_AESCTR[2] = iv32[2];
+        REG_AESCTR[2] = iv32[2];
-		REG_AESCTR[3] = iv32[3];
+        REG_AESCTR[3] = iv32[3];
-	}
+    }
 }
 
 static void aes_advctr(void *ctr, u32 val, u32 mode)
 {
-	u32 *ctr32 = (u32 *)ctr;
+    u32 *ctr32 = (u32 *)ctr;
 
-	int i;
+    int i;
-	if(mode & AES_INPUT_BE)
+    if(mode & AES_INPUT_BE)
-	{
+    {
-		for(i = 0; i < 4; ++i) // Endian swap
+        for(i = 0; i < 4; ++i) //Endian swap
-			BSWAP32(ctr32[i]);
+            BSWAP32(ctr32[i]);
-	}
+    }
 
-	if(mode & AES_INPUT_NORMAL)
+    if(mode & AES_INPUT_NORMAL)
-	{
+    {
-		ADD_u128_u32(ctr32[3], ctr32[2], ctr32[1], ctr32[0], val);
+        ADD_u128_u32(ctr32[3], ctr32[2], ctr32[1], ctr32[0], val);
-	}
+    }
-	else
+    else
-	{
+    {
-		ADD_u128_u32(ctr32[0], ctr32[1], ctr32[2], ctr32[3], val);
+        ADD_u128_u32(ctr32[0], ctr32[1], ctr32[2], ctr32[3], val);
-	}
+    }
 
-	if(mode & AES_INPUT_BE)
+    if(mode & AES_INPUT_BE)
-	{
+    {
-		for(i = 0; i < 4; ++i) // Endian swap
+        for(i = 0; i < 4; ++i) //Endian swap
-			BSWAP32(ctr32[i]);
+            BSWAP32(ctr32[i]);
-	}
+    }
 }
 
 static void aes_change_ctrmode(void *ctr, u32 fromMode, u32 toMode)
 {
-	u32 *ctr32 = (u32 *)ctr;
+    u32 *ctr32 = (u32 *)ctr;
-	int i;
+    int i;
-	if((fromMode ^ toMode) & AES_CNT_INPUT_ENDIAN)
+    if((fromMode ^ toMode) & AES_CNT_INPUT_ENDIAN)
-	{
+    {
-		for(i = 0; i < 4; ++i)
+        for(i = 0; i < 4; ++i)
-			BSWAP32(ctr32[i]);
+            BSWAP32(ctr32[i]);
-	}
+    }
 
-	if((fromMode ^ toMode) & AES_CNT_INPUT_ORDER)
+    if((fromMode ^ toMode) & AES_CNT_INPUT_ORDER)
-	{
+    {
-		u32 temp = ctr32[0];
+        u32 temp = ctr32[0];
-		ctr32[0] = ctr32[3];
+        ctr32[0] = ctr32[3];
-		ctr32[3] = temp;
+        ctr32[3] = temp;
 
-		temp = ctr32[1];
+        temp = ctr32[1];
-		ctr32[1] = ctr32[2];
+        ctr32[1] = ctr32[2];
-		ctr32[2] = temp;
+        ctr32[2] = temp;
-	}
+    }
 }
 
 static void aes_batch(void *dst, const void *src, u32 blockCount)
 {
-	*REG_AESBLKCNT = blockCount << 16;
+    *REG_AESBLKCNT = blockCount << 16;
-	*REG_AESCNT |=	AES_CNT_START;
+    *REG_AESCNT |=  AES_CNT_START;
 
-	const u32 *src32	= (const u32 *)src;
+    const u32 *src32    = (const u32 *)src;
-	u32 *dst32			= (u32 *)dst;
+    u32 *dst32          = (u32 *)dst;
 
-	u32 wbc = blockCount;
+    u32 wbc = blockCount;
-	u32 rbc = blockCount;
+    u32 rbc = blockCount;
 
-	while(rbc)
+    while(rbc)
-	{
+    {
-		if(wbc && ((*REG_AESCNT & 0x1F) <= 0xC)) // There's space for at least 4 ints
+        if(wbc && ((*REG_AESCNT & 0x1F) <= 0xC)) //There's space for at least 4 ints
-		{
+        {
-			*REG_AESWRFIFO = *src32++;
+            *REG_AESWRFIFO = *src32++;
-			*REG_AESWRFIFO = *src32++;
+            *REG_AESWRFIFO = *src32++;
-			*REG_AESWRFIFO = *src32++;
+            *REG_AESWRFIFO = *src32++;
-			*REG_AESWRFIFO = *src32++;
+            *REG_AESWRFIFO = *src32++;
-			wbc--;
+            wbc--;
-		}
+        }
 
-		if(rbc && ((*REG_AESCNT & (0x1F << 0x5)) >= (0x4 << 0x5))) // At least 4 ints available for read
+        if(rbc && ((*REG_AESCNT & (0x1F << 0x5)) >= (0x4 << 0x5))) //At least 4 ints available for read
-		{
+        {
-			*dst32++ = *REG_AESRDFIFO;
+            *dst32++ = *REG_AESRDFIFO;
-			*dst32++ = *REG_AESRDFIFO;
+            *dst32++ = *REG_AESRDFIFO;
-			*dst32++ = *REG_AESRDFIFO;
+            *dst32++ = *REG_AESRDFIFO;
-			*dst32++ = *REG_AESRDFIFO;
+            *dst32++ = *REG_AESRDFIFO;
-			rbc--;
+            rbc--;
-		}
+        }
-	}
+    }
 }
 
 static void aes(void *dst, const void *src, u32 blockCount, void *iv, u32 mode, u32 ivMode)
 {
-	*REG_AESCNT =	mode |
+    *REG_AESCNT =   mode |
-					AES_CNT_INPUT_ORDER | AES_CNT_OUTPUT_ORDER |
+                    AES_CNT_INPUT_ORDER | AES_CNT_OUTPUT_ORDER |
-					AES_CNT_INPUT_ENDIAN | AES_CNT_OUTPUT_ENDIAN |
+                    AES_CNT_INPUT_ENDIAN | AES_CNT_OUTPUT_ENDIAN |
-					AES_CNT_FLUSH_READ | AES_CNT_FLUSH_WRITE;
+                    AES_CNT_FLUSH_READ | AES_CNT_FLUSH_WRITE;
 
-	u32 blocks;
+    u32 blocks;
-	while(blockCount != 0)
+    while(blockCount != 0)
-	{
+    {
-		if((mode & AES_ALL_MODES) != AES_ECB_ENCRYPT_MODE
+        if((mode & AES_ALL_MODES) != AES_ECB_ENCRYPT_MODE
-		&& (mode & AES_ALL_MODES) != AES_ECB_DECRYPT_MODE)
+        && (mode & AES_ALL_MODES) != AES_ECB_DECRYPT_MODE)
-			aes_setiv(iv, ivMode);
+            aes_setiv(iv, ivMode);
 
-		blocks = (blockCount >= 0xFFFF) ? 0xFFFF : blockCount;
+        blocks = (blockCount >= 0xFFFF) ? 0xFFFF : blockCount;
 
-		// Save the last block for the next decryption CBC batch's iv
+        //Save the last block for the next decryption CBC batch's iv
-		if((mode & AES_ALL_MODES) == AES_CBC_DECRYPT_MODE)
+        if((mode & AES_ALL_MODES) == AES_CBC_DECRYPT_MODE)
-		{
+        {
-			memcpy(iv, src + (blocks - 1) * AES_BLOCK_SIZE, AES_BLOCK_SIZE);
+            memcpy(iv, src + (blocks - 1) * AES_BLOCK_SIZE, AES_BLOCK_SIZE);
-			aes_change_ctrmode(iv, AES_INPUT_BE | AES_INPUT_NORMAL, ivMode);
+            aes_change_ctrmode(iv, AES_INPUT_BE | AES_INPUT_NORMAL, ivMode);
-		}
+        }
 
-		// Process the current batch
+        //Process the current batch
-		aes_batch(dst, src, blocks);
+        aes_batch(dst, src, blocks);
 
-		// Save the last block for the next encryption CBC batch's iv
+        //Save the last block for the next encryption CBC batch's iv
-		if((mode & AES_ALL_MODES) == AES_CBC_ENCRYPT_MODE)
+        if((mode & AES_ALL_MODES) == AES_CBC_ENCRYPT_MODE)
-		{
+        {
-			memcpy(iv, dst + (blocks - 1) * AES_BLOCK_SIZE, AES_BLOCK_SIZE);
+            memcpy(iv, dst + (blocks - 1) * AES_BLOCK_SIZE, AES_BLOCK_SIZE);
-			aes_change_ctrmode(iv, AES_INPUT_BE | AES_INPUT_NORMAL, ivMode);
+            aes_change_ctrmode(iv, AES_INPUT_BE | AES_INPUT_NORMAL, ivMode);
-		}
+        }
 
-		// Advance counter for CTR mode
+        //Advance counter for CTR mode
-		else if((mode & AES_ALL_MODES) == AES_CTR_MODE)
+        else if((mode & AES_ALL_MODES) == AES_CTR_MODE)
-			aes_advctr(iv, blocks, ivMode);
+            aes_advctr(iv, blocks, ivMode);
 
-		src += blocks * AES_BLOCK_SIZE;
+        src += blocks * AES_BLOCK_SIZE;
-		dst += blocks * AES_BLOCK_SIZE;
+        dst += blocks * AES_BLOCK_SIZE;
-		blockCount -= blocks;
+        blockCount -= blocks;
-	}
+    }
 }
 
-void sha_wait_idle()
+static void sha_wait_idle()
 {
-	while(*REG_SHA_CNT & 1);
+    while(*REG_SHA_CNT & 1);
 }
 
-void sha(void *res, const void *src, u32 size, u32 mode)
+static void sha(void *res, const void *src, u32 size, u32 mode)
 {
-	sha_wait_idle();
+    sha_wait_idle();
-	*REG_SHA_CNT = mode | SHA_CNT_OUTPUT_ENDIAN | SHA_NORMAL_ROUND;
+    *REG_SHA_CNT = mode | SHA_CNT_OUTPUT_ENDIAN | SHA_NORMAL_ROUND;
 
-	const u32 *src32 = (const u32 *)src;
+    const u32 *src32 = (const u32 *)src;
-	int i;
+    int i;
-	while(size >= 0x40)
+    while(size >= 0x40)
-	{
+    {
-		sha_wait_idle();
+        sha_wait_idle();
-		for(i = 0; i < 4; ++i)
+        for(i = 0; i < 4; ++i)
-		{
+        {
-			*REG_SHA_INFIFO = *src32++;
+            *REG_SHA_INFIFO = *src32++;
-			*REG_SHA_INFIFO = *src32++;
+            *REG_SHA_INFIFO = *src32++;
-			*REG_SHA_INFIFO = *src32++;
+            *REG_SHA_INFIFO = *src32++;
-			*REG_SHA_INFIFO = *src32++;
+            *REG_SHA_INFIFO = *src32++;
-		}
+        }
 
-		size -= 0x40;
+        size -= 0x40;
-	}
+    }
 
-	sha_wait_idle();
+    sha_wait_idle();
-	memcpy((void *)REG_SHA_INFIFO, src32, size);
+    memcpy((void *)REG_SHA_INFIFO, src32, size);
 
-	*REG_SHA_CNT = (*REG_SHA_CNT & ~SHA_NORMAL_ROUND) | SHA_FINAL_ROUND;
+    *REG_SHA_CNT = (*REG_SHA_CNT & ~SHA_NORMAL_ROUND) | SHA_FINAL_ROUND;
 
-	while(*REG_SHA_CNT & SHA_FINAL_ROUND);
+    while(*REG_SHA_CNT & SHA_FINAL_ROUND);
-	sha_wait_idle();
+    sha_wait_idle();
 
-	u32 hashSize = SHA_256_HASH_SIZE;
+    u32 hashSize = SHA_256_HASH_SIZE;
-	if(mode == SHA_224_MODE)
+    if(mode == SHA_224_MODE)
-		hashSize = SHA_224_HASH_SIZE;
+        hashSize = SHA_224_HASH_SIZE;
-	else if(mode == SHA_1_MODE)
+    else if(mode == SHA_1_MODE)
-		hashSize = SHA_1_HASH_SIZE;
+        hashSize = SHA_1_HASH_SIZE;
 
-	memcpy(res, (void *)REG_SHA_HASH, hashSize);
+    memcpy(res, (void *)REG_SHA_HASH, hashSize);
 }
 
-/****************************************************************
+/*****************************************************************/
-*                   Nand/FIRM Crypto stuff
-****************************************************************/
-
-static u8 nandSlot, nandCTR[0x10];
 
+static u8 __attribute__((aligned(4))) nandCtr[AES_BLOCK_SIZE];
+static u8 nandSlot;
 static u32 fatStart;
-
+__attribute__((aligned(4))) const u8 key2s[5][AES_BLOCK_SIZE] = {
-const u8 key2s[3][0x10] = {
     {0x42, 0x3F, 0x81, 0x7A, 0x23, 0x52, 0x58, 0x31, 0x6E, 0x75, 0x8E, 0x3A, 0x39, 0x43, 0x2E, 0xD0},
+    {0xA5, 0x25, 0x87, 0x11, 0x8F, 0x42, 0x9F, 0x3D, 0x65, 0x1D, 0xDD, 0x58, 0x0B, 0x6D, 0xF2, 0x17},
+    {0x65, 0x29, 0x3E, 0x12, 0x56, 0x0C, 0x0B, 0xD1, 0xDD, 0xB5, 0x63, 0x1C, 0xB6, 0xD9, 0x52, 0x75},
     {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3B, 0xF5, 0xF6},
-    {0x65, 0x29, 0x3E, 0x12, 0x56, 0x0C, 0x0B, 0xD1, 0xDD, 0xB5, 0x63, 0x1C, 0xB6, 0xD9, 0x52, 0x75}
+    {0x08, 0x24, 0xD3, 0xCB, 0x4A, 0xE9, 0x4D, 0x62, 0x4D, 0xAA, 0x52, 0x60, 0x47, 0xC5, 0x93, 0x94}
+},
+                                     devKey2s[2][AES_BLOCK_SIZE] = {
+    {0xFF, 0x77, 0xA0, 0x9A, 0x99, 0x81, 0xE9, 0x48, 0xEC, 0x51, 0xC9, 0x32, 0x5D, 0x14, 0xEC, 0x25},
+    {0x59, 0x5B, 0x98, 0x5B, 0xD7, 0x74, 0x58, 0x7F, 0x89, 0x30, 0x85, 0x70, 0xD6, 0x24, 0x49, 0x1E}
 };
 
-//Get Nand CTR key
+void getNandCtr(void)
-void getNandCTR(void)
 {
-    u8 cid[0x10];
+    __attribute__((aligned(4))) u8 cid[AES_BLOCK_SIZE],
-    u8 shaSum[0x20];
+                                   shaSum[SHA_256_HASH_SIZE];
 
     sdmmc_get_cid(1, (u32 *)cid);
-    sha(shaSum, cid, 0x10, SHA_256_MODE);
+    sha(shaSum, cid, sizeof(cid), SHA_256_MODE);
-    memcpy(nandCTR, shaSum, 0x10);
+    memcpy(nandCtr, shaSum, sizeof(nandCtr));
 }
 
-//Initialize the CTRNAND crypto
 void ctrNandInit(void)
 {
-    getNandCTR();
+    getNandCtr();
 
-    if(console)
+    if(ISN3DS)
     {
-        u8 keyY0x5[0x10] = {0x4D, 0x80, 0x4F, 0x4E, 0x99, 0x90, 0x19, 0x46, 0x13, 0xA2, 0x04, 0xAC, 0x58, 0x44, 0x60, 0xBE};
+        __attribute__((aligned(4))) u8 keyY0x5[AES_BLOCK_SIZE] = {0x4D, 0x80, 0x4F, 0x4E, 0x99, 0x90, 0x19, 0x46, 0x13, 0xA2, 0x04, 0xAC, 0x58, 0x44, 0x60, 0xBE};
         aes_setkey(0x05, keyY0x5, AES_KEYY, AES_INPUT_BE | AES_INPUT_NORMAL);
+
         nandSlot = 0x05;
         fatStart = 0x5CAD7;
     }
@@ -314,121 +316,129 @@ void ctrNandInit(void)
     }
 }
 
-//Read and decrypt from CTRNAND
+int ctrNandRead(u32 sector, u32 sectorCount, u8 *outbuf)
-u32 ctrNandRead(u32 sector, u32 sectorCount, u8 *outbuf)
 {
-    u8 tmpCTR[0x10];
+    __attribute__((aligned(4))) u8 tmpCtr[sizeof(nandCtr)];
-    memcpy(tmpCTR, nandCTR, 0x10);
+    memcpy(tmpCtr, nandCtr, sizeof(nandCtr));
-    aes_advctr(tmpCTR, ((sector + fatStart) * 0x200) / AES_BLOCK_SIZE, AES_INPUT_BE | AES_INPUT_NORMAL);
+    aes_advctr(tmpCtr, ((sector + fatStart) * 0x200) / AES_BLOCK_SIZE, AES_INPUT_BE | AES_INPUT_NORMAL);
 
-    //Read
+    //Read from NAND
-    u32 result = sdmmc_nand_readsectors(sector + fatStart, sectorCount, outbuf);
+    int result = sdmmc_nand_readsectors(sector + fatStart, sectorCount, outbuf);
 
     //Decrypt
     aes_use_keyslot(nandSlot);
-    aes(outbuf, outbuf, sectorCount * 0x200 / AES_BLOCK_SIZE, tmpCTR, AES_CTR_MODE, AES_INPUT_BE | AES_INPUT_NORMAL);
+    aes(outbuf, outbuf, sectorCount * 0x200 / AES_BLOCK_SIZE, tmpCtr, AES_CTR_MODE, AES_INPUT_BE | AES_INPUT_NORMAL);
 
     return result;
 }
 
-//Read and decrypt from the FIRM0 partition on NAND
 void readFirm0(u8 *outbuf, u32 size)
 {
-    u8 CTRtmp[0x10];
+    __attribute__((aligned(4))) u8 tmpCtr[sizeof(nandCtr)];
-    memcpy(CTRtmp, nandCTR, 0x10);
+    memcpy(tmpCtr, nandCtr, sizeof(nandCtr));
+    aes_advctr(tmpCtr, 0x0B130000 / AES_BLOCK_SIZE, AES_INPUT_BE | AES_INPUT_NORMAL);
 
-    //Read FIRM0 data
+    //Read from NAND
     sdmmc_nand_readsectors(0x0B130000 / 0x200, size / 0x200, outbuf);
 
     //Decrypt
-    aes_advctr(CTRtmp, 0x0B130000 / 0x10, AES_INPUT_BE | AES_INPUT_NORMAL);
     aes_use_keyslot(0x06);
-    aes(outbuf, outbuf, size / AES_BLOCK_SIZE, CTRtmp, AES_CTR_MODE, AES_INPUT_BE | AES_INPUT_NORMAL);
+    aes(outbuf, outbuf, size / AES_BLOCK_SIZE, tmpCtr, AES_CTR_MODE, AES_INPUT_BE | AES_INPUT_NORMAL);
 }
 
-//Encrypt and write a FIRM partition to NAND
+void writeFirm(u8 *inbuf, bool isFirm1, u32 size)
-void writeFirm(u8 *inbuf, u32 firm, u32 size)
 {
-    u32 offset = firm ? 0x0B530000 : 0x0B130000;
+    u32 offset = isFirm1 ? 0x0B530000 : 0x0B130000;
-    u8 CTRtmp[0x10];
+    __attribute__((aligned(4))) u8 tmpCtr[sizeof(nandCtr)];
-    memcpy(CTRtmp, nandCTR, 0x10);
+    memcpy(tmpCtr, nandCtr, sizeof(nandCtr));
+    aes_advctr(tmpCtr, offset / AES_BLOCK_SIZE, AES_INPUT_BE | AES_INPUT_NORMAL);
 
-    //Encrypt FIRM data
+    //Encrypt
-    aes_advctr(CTRtmp, offset / 0x10, AES_INPUT_BE | AES_INPUT_NORMAL);
     aes_use_keyslot(0x06);
-    aes(inbuf, inbuf, size / AES_BLOCK_SIZE, CTRtmp, AES_CTR_MODE, AES_INPUT_BE | AES_INPUT_NORMAL);
+    aes(inbuf, inbuf, size / AES_BLOCK_SIZE, tmpCtr, AES_CTR_MODE, AES_INPUT_BE | AES_INPUT_NORMAL);
 
     //Write to NAND
     sdmmc_nand_writesectors(offset / 0x200, size / 0x200, inbuf);
 }
 
-//Setup keyslot 0x11 for key sector de/encryption
+void setupKeyslot0x11(const void *otp)
-void setupKeyslot0x11(u32 a9lhBoot, const void *otp)
 {
-    u8 shasum[0x20];
+    __attribute__((aligned(4))) u8 shasum[SHA_256_HASH_SIZE];
-    u8 keyX[0x10];
-    u8 keyY[0x10];
 
     //If booting via A9LH, use the leftover contents of the SHA register
-    if(a9lhBoot) memcpy((void *)shasum, (void *)REG_SHA_HASH, 0x20);
+    if(ISA9LH) memcpy(shasum, (void *)REG_SHA_HASH, sizeof(shasum));
-    //Else calculate the otp.bin hash
+
+    //Otherwise, calculate the otp.bin hash
     else sha(shasum, otp, 0x90, SHA_256_MODE);
 
     //Set keyX and keyY
-    memcpy(keyX, shasum, 0x10);
+    aes_setkey(0x11, shasum, AES_KEYX, AES_INPUT_BE | AES_INPUT_NORMAL);
-    memcpy(keyY, shasum + 0x10, 0x10);
+    aes_setkey(0x11, shasum + AES_BLOCK_SIZE, AES_KEYY, AES_INPUT_BE | AES_INPUT_NORMAL);
-    aes_setkey(0x11, keyX, AES_KEYX, AES_INPUT_BE | AES_INPUT_NORMAL);
-    aes_setkey(0x11, keyY, AES_KEYY, AES_INPUT_BE | AES_INPUT_NORMAL);
 }
 
-//Generate and encrypt an A9LH key sector
 void generateSector(u8 *keySector, u32 mode)
 {
     //Inject key2
-    memcpy(keySector + 0x10, mode ? key2s[0] : key2s[2], 0x10);
+    switch(mode)
+    {
+        case 0:
+            memcpy(keySector + AES_BLOCK_SIZE, !ISDEVUNIT ? key2s[1] : devKey2s[1], AES_BLOCK_SIZE);
+            break;
+        case 1:
+            memcpy(keySector + AES_BLOCK_SIZE, keySector, AES_BLOCK_SIZE);
+            return;
+        case 2:
+            memcpy(keySector + AES_BLOCK_SIZE, !ISDEVUNIT ? key2s[0] : devKey2s[0], AES_BLOCK_SIZE);
+            break;
+    }
 
     //Encrypt key sector
     aes_use_keyslot(0x11);
     for(u32 i = 0; i < 32; i++)
-        aes(keySector + (0x10 * i), keySector + (0x10 * i), 1, NULL, AES_ECB_ENCRYPT_MODE, 0);
+        aes(keySector + (AES_BLOCK_SIZE * i), keySector + (AES_BLOCK_SIZE * i), 1, NULL, AES_ECB_ENCRYPT_MODE, 0);
 }
 
-//Read and decrypt the NAND key sector
 void getSector(u8 *keySector)
 {
     //Read keysector from NAND
     sdmmc_nand_readsectors(0x96, 1, keySector);
 
+    if(!ISA9LH && !ISDEVUNIT) return;
+
     //Decrypt key sector
     aes_use_keyslot(0x11);
     for(u32 i = 0; i < 32; i++)
-        aes(keySector + (0x10 * i), keySector + (0x10 * i), 1, NULL, AES_ECB_DECRYPT_MODE, 0);
+        aes(keySector + (AES_BLOCK_SIZE * i), keySector + (AES_BLOCK_SIZE * i), 1, NULL, AES_ECB_DECRYPT_MODE, 0);
 }
 
-//Check SHA256 hash
+bool verifyHash(const void *data, u32 size, const u8 *hash)
-u32 verifyHash(const void *data, u32 size, const u8 *hash)
 {
-    u8 shasum[0x20];
+    __attribute__((aligned(4))) u8 shasum[SHA_256_HASH_SIZE];
     sha(shasum, data, size, SHA_256_MODE);
 
-    return memcmp(shasum, hash, 0x20) == 0;
+    return memcmp(shasum, hash, sizeof(shasum)) == 0;
 }
 
-//Decrypt a FIRM ExeFS
+u32 decryptExeFs(Cxi *cxi)
-u32 decryptExeFs(u8 *inbuf)
 {
-    u8 *exeFsOffset = inbuf + *(u32 *)(inbuf + 0x1A0) * 0x200;
+    u32 exeFsSize = 0;
-    u32 exeFsSize = *(u32 *)(inbuf + 0x1A4) * 0x200;
+
-    u8 ncchCTR[0x10] = {0};
+    if(memcmp(cxi->ncch.magic, "NCCH", 4) != 0) return exeFsSize;
+
+    u8 *exeFsOffset = (u8 *)cxi + (cxi->ncch.exeFsOffset + 1) * 0x200;
+    exeFsSize = (cxi->ncch.exeFsSize - 1) * 0x200;
+    __attribute__((aligned(4))) u8 ncchCtr[AES_BLOCK_SIZE] = {0};
 
     for(u32 i = 0; i < 8; i++)
-        ncchCTR[7 - i] = *(inbuf + 0x108 + i);
+        ncchCtr[7 - i] = cxi->ncch.partitionId[i];
-    ncchCTR[8] = 2;
+    ncchCtr[8] = 2;
 
-    aes_setkey(0x2C, inbuf, AES_KEYY, AES_INPUT_BE | AES_INPUT_NORMAL);
+    aes_setkey(0x2C, cxi, AES_KEYY, AES_INPUT_BE | AES_INPUT_NORMAL);
-    aes_setiv(ncchCTR, AES_INPUT_BE | AES_INPUT_NORMAL);
+    aes_advctr(ncchCtr, 0x200 / AES_BLOCK_SIZE, AES_INPUT_BE | AES_INPUT_NORMAL);
     aes_use_keyslot(0x2C);
-    aes(inbuf - 0x200, exeFsOffset, exeFsSize / AES_BLOCK_SIZE, ncchCTR, AES_CTR_MODE, AES_INPUT_BE | AES_INPUT_NORMAL);
+    aes(cxi, exeFsOffset, exeFsSize / AES_BLOCK_SIZE, ncchCtr, AES_CTR_MODE, AES_INPUT_BE | AES_INPUT_NORMAL);
 
-    return exeFsSize - 0x200;
+    if(memcmp(cxi, "FIRM", 4) != 0) exeFsSize = 0;
+
+    return exeFsSize;
 }

source/crypto.h

@@ -79,17 +79,13 @@
 #define SHA_224_HASH_SIZE	(224 / 8)
 #define SHA_1_HASH_SIZE		(160 / 8)
 
-//NAND/FIRM stuff
+void getNandCtr(void);
-extern u32 console;
-const u8 key2s[3][0x10];
-
-void getNandCTR(void);
 void ctrNandInit(void);
-u32 ctrNandRead(u32 sector, u32 sectorCount, u8 *outbuf);
+int ctrNandRead(u32 sector, u32 sectorCount, u8 *outbuf);
 void readFirm0(u8 *outbuf, u32 size);
-void writeFirm(u8 *inbuf, u32 offset, u32 size);
+void writeFirm(u8 *inbuf, bool isFirm1, u32 size);
-void setupKeyslot0x11(u32 a9lhBoot, const void *otp);
+void setupKeyslot0x11(const void *otp);
 void generateSector(u8 *keySector, u32 mode);
 void getSector(u8 *keySector);
-u32 verifyHash(const void *data, u32 size, const u8 *hash);
+bool verifyHash(const void *data, u32 size, const u8 *hash);
-u32 decryptExeFs(u8 *inbuf);
+u32 decryptExeFs(Cxi *cxi);

source/draw.c

@@ -1,47 +1,47 @@
 /*
-*   draw.c
+*   This file is part of Luma3DS
+*   Copyright (C) 2016 Aurora Wright, TuxSH
 *
+*   This program is free software: you can redistribute it and/or modify
+*   it under the terms of the GNU General Public License as published by
+*   the Free Software Foundation, either version 3 of the License, or
+*   (at your option) any later version.
+*
+*   This program is distributed in the hope that it will be useful,
+*   but WITHOUT ANY WARRANTY; without even the implied warranty of
+*   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+*   GNU General Public License for more details.
+*
+*   You should have received a copy of the GNU General Public License
+*   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*
+*   Additional Terms 7.b of GPLv3 applies to this file: Requiring preservation of specified
+*   reasonable legal notices or author attributions in that material or in the Appropriate Legal
+*   Notices displayed by works containing it.
+*/
+
+/*
 *   Code to print to the screen by mid-kid @CakesFW
+*   https://github.com/mid-kid/CakesForeveryWan
 */
 
 #include "draw.h"
-#include "memory.h"
+#include "screen.h"
+#include "strings.h"
 #include "font.h"
 
-static const struct fb {
+static void drawCharacter(char character, u32 posX, u32 posY, u32 color)
-    u8 *top_left;
-    u8 *top_right;
-    u8 *bottom;
-} *const fb = (struct fb *)0x23FFFE00;
-
-static inline int strlen(const char *string)
 {
-    char *stringEnd = (char *)string;
+    u8 *select = fb->top_left;
 
-    while(*stringEnd) stringEnd++;
+    for(u32 y = 0; y < 8; y++)
-
-    return stringEnd - string;
-}
-
-void clearScreens(void)
-{
-    memset32(fb->top_left, 0, 0x46500);
-    memset32(fb->top_right, 0, 0x46500);
-    memset32(fb->bottom, 0, 0x38400);
-}
-
-void drawCharacter(char character, int posX, int posY, u32 color)
-{
-    u8 *const select = fb->top_left;
-
-    for(int y = 0; y < 8; y++)
     {
         char charPos = font[character * 8 + y];
 
-        for(int x = 7; x >= 0; x--)
+        for(u32 x = 0; x < 8; x++)
-            if ((charPos >> x) & 1)
+            if(((charPos >> (7 - x)) & 1) == 1)
             {
-                int screenPos = (posX * SCREEN_TOP_HEIGHT * 3 + (SCREEN_TOP_HEIGHT - y - posY - 1) * 3) + (7 - x) * 3 * SCREEN_TOP_HEIGHT;
+                u32 screenPos = (posX * SCREEN_HEIGHT * 3 + (SCREEN_HEIGHT - y - posY - 1) * 3) + x * 3 * SCREEN_HEIGHT;
 
                 select[screenPos] = color >> 16;
                 select[screenPos + 1] = color >> 8;
@@ -50,26 +50,34 @@ void drawCharacter(char character, int posX, int posY, u32 color)
     }
 }
 
-int drawString(const char *string, int posX, int posY, u32 color)
+u32 drawString(const char *string, u32 posX, u32 posY, u32 color)
 {
-    for(int i = 0, line_i = 0; i < strlen(string); i++, line_i++)
+    for(u32 i = 0, line_i = 0; i < strlen(string); i++)
-    {
+        switch(string[i])
-        if(string[i] == '\n')
         {
-            posY += SPACING_Y;
+            case '\n':
-            line_i = 0;
+                posY += SPACING_Y;
-            i++;
+                line_i = 0;
-        }
+                break;
-        else if(line_i >= (SCREEN_TOP_WIDTH - posX) / SPACING_X)
-        {
-            // Make sure we never get out of the screen.
-            posY += SPACING_Y;
-            line_i = 2; //Little offset so we know the same string continues.
-            if(string[i] == ' ') i++; //Spaces at the start look weird
-        }
 
-        drawCharacter(string[i], posX + line_i * SPACING_X, posY, color);
+            case '\t':
-    }
+                line_i += 2;
+                break;
+
+            default:
+                //Make sure we never get out of the screen
+                if(line_i >= (SCREEN_TOP_WIDTH - posX) / SPACING_X)
+                {
+                    posY += SPACING_Y;
+                    line_i = 1; //Little offset so we know the same string continues
+                    if(string[i] == ' ') break; //Spaces at the start look weird
+                }
+
+                drawCharacter(string[i], posX + line_i * SPACING_X, posY, color);
+
+                line_i++;
+                break;
+        }
 
     return posY + SPACING_Y;
 }

source/draw.h

@@ -1,19 +1,35 @@
 /*
-*   draw.h
+*   This file is part of Luma3DS
+*   Copyright (C) 2016 Aurora Wright, TuxSH
 *
+*   This program is free software: you can redistribute it and/or modify
+*   it under the terms of the GNU General Public License as published by
+*   the Free Software Foundation, either version 3 of the License, or
+*   (at your option) any later version.
+*
+*   This program is distributed in the hope that it will be useful,
+*   but WITHOUT ANY WARRANTY; without even the implied warranty of
+*   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+*   GNU General Public License for more details.
+*
+*   You should have received a copy of the GNU General Public License
+*   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*
+*   Additional Terms 7.b of GPLv3 applies to this file: Requiring preservation of specified
+*   reasonable legal notices or author attributions in that material or in the Appropriate Legal
+*   Notices displayed by works containing it.
+*/
+
+/*
 *   Code to print to the screen by mid-kid @CakesFW
+*   https://github.com/mid-kid/CakesForeveryWan
 */
 
 #pragma once
 
 #include "types.h"
 
-#define SCREEN_TOP_WIDTH  400
-#define SCREEN_TOP_HEIGHT 240
-
 #define SPACING_Y 10
 #define SPACING_X 8
 
-void clearScreens(void);
+u32 drawString(const char *string, u32 posX, u32 posY, u32 color);
-void drawCharacter(char character, int pos_x, int pos_y, u32 color);
-int drawString(const char *string, int pos_x, int pos_y, u32 color);

source/fatfs/00history.txt

@@ -10,7 +10,7 @@ R0.00 (February 26, 2006)
 
 R0.01 (April 29, 2006)
 
-  First stable version.
+  The first release.
 
 
 
@@ -212,7 +212,7 @@ R0.10a (January 15, 2014)
 R0.10b (May 19, 2014)
 
   Fixed a hard error in the disk I/O layer can collapse the directory entry.
-  Fixed LFN entry is not deleted on delete/rename an object with lossy converted SFN. (appeared at R0.07)
+  Fixed LFN entry is not deleted when delete/rename an object with lossy converted SFN. (appeared at R0.07)
 
 
 
@@ -246,9 +246,43 @@ R0.11a (September 05, 2015)
 
 R0.12 (April 12, 2016)
 
-  Added support of exFAT file system. (_FS_EXFAT)
+  Added support for exFAT file system. (_FS_EXFAT)
   Added f_expand(). (_USE_EXPAND)
   Changed some members in FINFO structure and behavior of f_readdir().
-  Added an option _USE_CHMOD and removed an option _WORD_ACCESS.
+  Added an option _USE_CHMOD.
-  Fixed errors in the case conversion teble of Unicode (cc*.c).
+  Removed an option _WORD_ACCESS.
+  Fixed errors in the case conversion table of Unicode (cc*.c).
+
+
+
+R0.12a (July 10, 2016)
+
+  Added support for creating exFAT volume with some changes of f_mkfs().
+  Added a file open method FA_OPEN_APPEND. An f_lseek() following f_open() is no longer needed.
+  f_forward() is available regardless of _FS_TINY.
+  Fixed f_mkfs() creates wrong volume. (appeared at R0.12)
+  Fixed wrong memory read in create_name(). (appeared at R0.12)
+  Fixed compilation fails at some configurations, _USE_FASTSEEK and _USE_FORWARD.
+
+
+
+R0.12b (September 04, 2016)
+
+  Made f_rename() be able to rename objects with the same name but case.
+  Fixed an error in the case conversion teble of code page 866. (ff.c)
+  Fixed writing data is truncated at the file offset 4GiB on the exFAT volume. (appeared at R0.12)
+  Fixed creating a file in the root directory of exFAT volume can fail. (appeared at R0.12)
+  Fixed f_mkfs() creating exFAT volume with too small cluster size can collapse unallocated memory. (appeared at R0.12)
+  Fixed wrong object name can be returned when read directory at Unicode cfg. (appeared at R0.12)
+  Fixed large file allocation/removing on the exFAT volume collapses allocation bitmap. (appeared at R0.12)
+  Fixed some internal errors in f_expand() and f_lseek(). (appeared at R0.12)
+
+
+
+R0.12c (March 04, 2017)
+
+  Improved write throughput at the fragmented file on the exFAT volume.
+  Made memory usage for exFAT be able to be reduced as decreasing _MAX_LFN.
+  Fixed successive f_getfree() can return wrong count on the FAT12/16 volume. (appeared at R0.12)
+  Fixed configuration option _VOLUMES cannot be set 10. (appeared at R0.10c)
 

source/fatfs/00readme.txt

@@ -1,21 +1,21 @@
-FatFs Module Source Files R0.12
+FatFs Module Source Files R0.12c
 
 
 FILES
 
-  00readme.txt This file.
+  00readme.txt   This file.
-  history.txt  Revision history.
+  00history.txt  Revision history.
-  ffconf.h     Configuration file for FatFs module.
+  ff.c           FatFs module.
-  ff.h         Common include file for FatFs and application module.
+  ffconf.h       Configuration file of FatFs module.
-  ff.c         FatFs module.
+  ff.h           Common include file for FatFs and application module.
-  diskio.h     Common include file for FatFs and disk I/O module.
+  diskio.h       Common include file for FatFs and disk I/O module.
-  diskio.c     An example of glue function to attach existing disk I/O module to FatFs.
+  diskio.c       An example of glue function to attach existing disk I/O module to FatFs.
-  integer.h    Integer type definitions for FatFs.
+  integer.h      Integer type definitions for FatFs.
-  option       Optional external functions.
+  option         Optional external modules.
 
 
   Low level disk I/O module is not included in this archive because the FatFs
-  module is only a generic file system layer and not depend on any specific
+  module is only a generic file system layer and it does not depend on any specific
-  storage device. You have to provide a low level disk I/O module that written
+  storage device. You have to provide a low level disk I/O module written to
-  to control the target storage device.
+  control the storage device that attached to the target system.
 

source/fatfs/diskio.c

@@ -37,11 +37,9 @@ DSTATUS disk_initialize (
 	BYTE pdrv				/* Physical drive nmuber to identify the drive */
 )
 {
+        if(pdrv == CTRNAND) ctrNandInit();
 
-        if(pdrv == CTRNAND)
+	return 0;
-            ctrNandInit();
-
-	return RES_OK;
 }
 
 
@@ -57,19 +55,8 @@ DRESULT disk_read (
 	UINT count		/* Number of sectors to read */
 )
 {
-        switch(pdrv)
+        return ((pdrv == SDCARD && !sdmmc_sdcard_readsectors(sector, count, buff)) ||
-        {
+                (pdrv == CTRNAND && !ctrNandRead(sector, count, buff))) ? RES_OK : RES_PARERR;
-            case SDCARD:
-                if(sdmmc_sdcard_readsectors(sector, count, (BYTE *)buff))
-		    return RES_PARERR;
-                break;
-            case CTRNAND:
-                if(ctrNandRead(sector, count, (BYTE *)buff))
-		    return RES_PARERR;
-                break;
-        }
-
-        return RES_OK;
 }
 
 
@@ -86,10 +73,7 @@ DRESULT disk_write (
 	UINT count			/* Number of sectors to write */
 )
 {
-        if(pdrv == SDCARD && sdmmc_sdcard_writesectors(sector, count, (BYTE *)buff))
+        return (pdrv == SDCARD && !sdmmc_sdcard_writesectors(sector, count, buff)) ? RES_OK : RES_PARERR;
-            return RES_PARERR;
-
-        return RES_OK;
 }
 #endif
 

source/fatfs/ff.h

@@ -1,11 +1,13 @@
-/*---------------------------------------------------------------------------/
+/*----------------------------------------------------------------------------/
-/  FatFs - FAT file system module include R0.12     (C)ChaN, 2016
+/  FatFs - Generic FAT file system module  R0.12c                             /
-/----------------------------------------------------------------------------/
+/-----------------------------------------------------------------------------/
-/ FatFs module is a free software that opened under license policy of
-/ following conditions.
 /
-/ Copyright (C) 2016, ChaN, all right reserved.
+/ Copyright (C) 2017, ChaN, all right reserved.
 /
+/ FatFs module is an open source software. Redistribution and use of FatFs in
+/ source and binary forms, with or without modification, are permitted provided
+/ that the following condition is met:
+
 / 1. Redistributions of source code must retain the above copyright notice,
 /    this condition and the following disclaimer.
 /
@@ -13,11 +15,11 @@
 / and any warranties related to this software are DISCLAIMED.
 / The copyright owner or contributors be NOT LIABLE for any damages caused
 / by use of this software.
-/---------------------------------------------------------------------------*/
+/----------------------------------------------------------------------------*/
 
 
 #ifndef _FATFS
-#define _FATFS	88100	/* Revision ID */
+#define _FATFS	68300	/* Revision ID */
 
 #ifdef __cplusplus
 extern "C" {
@@ -25,6 +27,7 @@ extern "C" {
 
 #include "integer.h"	/* Basic integer types */
 #include "ffconf.h"		/* FatFs configuration options */
+
 #if _FATFS != _FFCONF
 #error Wrong configuration file (ffconf.h).
 #endif
@@ -39,20 +42,13 @@ typedef struct {
 	BYTE pt;	/* Partition: 0:Auto detect, 1-4:Forced partition) */
 } PARTITION;
 extern PARTITION VolToPart[];	/* Volume - Partition resolution table */
-#define LD2PD(vol) (VolToPart[vol].pd)	/* Get physical drive number */
-#define LD2PT(vol) (VolToPart[vol].pt)	/* Get partition index */
-
-#else							/* Single partition configuration */
-#define LD2PD(vol) (BYTE)(vol)	/* Each logical drive is bound to the same physical drive number */
-#define LD2PT(vol) 0			/* Find first valid partition or in SFD */
-
 #endif
 
 
 
 /* Type of path name strings on FatFs API */
 
-#if _LFN_UNICODE			/* Unicode string */
+#if _LFN_UNICODE			/* Unicode (UTF-16) string */
 #if _USE_LFN == 0
 #error _LFN_UNICODE must be 0 at non-LFN cfg.
 #endif
@@ -61,14 +57,25 @@ typedef WCHAR TCHAR;
 #define _T(x) L ## x
 #define _TEXT(x) L ## x
 #endif
-
 #else						/* ANSI/OEM string */
 #ifndef _INC_TCHAR
 typedef char TCHAR;
 #define _T(x) x
 #define _TEXT(x) x
 #endif
+#endif
 
+
+
+/* Type of file size variables */
+
+#if _FS_EXFAT
+#if _USE_LFN == 0
+#error LFN must be enabled when enable exFAT
+#endif
+typedef QWORD FSIZE_t;
+#else
+typedef DWORD FSIZE_t;
 #endif
 
 
@@ -87,6 +94,9 @@ typedef struct {
 #if _MAX_SS != _MIN_SS
 	WORD	ssize;			/* Sector size (512, 1024, 2048 or 4096) */
 #endif
+#if _USE_LFN != 0
+	WCHAR*	lfnbuf;			/* LFN working buffer */
+#endif
 #if _FS_EXFAT
 	BYTE*	dirbuf;			/* Directory entry block scratchpad buffer */
 #endif
@@ -117,33 +127,21 @@ typedef struct {
 
 
 
-/* Type of file size variables and object identifier */
-
-#if _FS_EXFAT
-#if _USE_LFN == 0
-#error LFN must be enabled when enable exFAT
-#endif
-typedef QWORD FSIZE_t;
-#else
-typedef DWORD FSIZE_t;
-#endif
-
-
-
 /* Object ID and allocation information (_FDID) */
 
 typedef struct {
 	FATFS*	fs;			/* Pointer to the owner file system object */
 	WORD	id;			/* Owner file system mount ID */
 	BYTE	attr;		/* Object attribute */
-	BYTE	stat;		/* Object chain status (b1-0: =0:not contiguous, =2:contiguous (no data on FAT), =3:got flagmented, b2:sub-directory stretched) */
+	BYTE	stat;		/* Object chain status (b1-0: =0:not contiguous, =2:contiguous (no data on FAT), =3:flagmented in this session, b2:sub-directory stretched) */
 	DWORD	sclust;		/* Object start cluster (0:no cluster or root directory) */
 	FSIZE_t	objsize;	/* Object size (valid when sclust != 0) */
 #if _FS_EXFAT
-	DWORD	n_cont;		/* Size of coutiguous part, clusters - 1 (valid when stat == 3) */
+	DWORD	n_cont;		/* Size of first fragment, clusters - 1 (valid when stat == 3) */
+	DWORD	n_frag;		/* Size of last fragment needs to be written (valid when not zero) */
 	DWORD	c_scl;		/* Containing directory start cluster (valid when sclust != 0) */
 	DWORD	c_size;		/* b31-b8:Size of containing directory, b7-b0: Chain status (valid when c_scl != 0) */
-	DWORD	c_ofs;		/* Offset in the containing directory (valid when sclust != 0) */
+	DWORD	c_ofs;		/* Offset in the containing directory (valid when sclust != 0 and non-directory object) */
 #endif
 #if _FS_LOCK != 0
 	UINT	lockid;		/* File lock ID origin from 1 (index of file semaphore table Files[]) */
@@ -155,18 +153,18 @@ typedef struct {
 /* File object structure (FIL) */
 
 typedef struct {
-	_FDID	obj;			/* Object identifier */
+	_FDID	obj;			/* Object identifier (must be the 1st member to detect invalid object pointer) */
 	BYTE	flag;			/* File status flags */
 	BYTE	err;			/* Abort flag (error code) */
 	FSIZE_t	fptr;			/* File read/write pointer (Zeroed on file open) */
-	DWORD	clust;			/* Current cluster of fpter (not valid when fprt is 0) */
+	DWORD	clust;			/* Current cluster of fpter (invalid when fptr is 0) */
 	DWORD	sect;			/* Sector number appearing in buf[] (0:invalid) */
 #if !_FS_READONLY
 	DWORD	dir_sect;		/* Sector number containing the directory entry */
 	BYTE*	dir_ptr;		/* Pointer to the directory entry in the win[] */
 #endif
 #if _USE_FASTSEEK
-	DWORD*	cltbl;			/* Pointer to the cluster link map table (Nulled on file open) */
+	DWORD*	cltbl;			/* Pointer to the cluster link map table (nulled on open, set by application) */
 #endif
 #if !_FS_TINY
 	BYTE	buf[_MAX_SS];	/* File private data read/write window */
@@ -181,12 +179,11 @@ typedef struct {
 	_FDID	obj;			/* Object identifier */
 	DWORD	dptr;			/* Current read/write offset */
 	DWORD	clust;			/* Current cluster */
-	DWORD	sect;			/* Current sector */
+	DWORD	sect;			/* Current sector (0:Read operation has terminated) */
 	BYTE*	dir;			/* Pointer to the directory item in the win[] */
-	BYTE*	fn;				/* Pointer to the SFN (in/out) {body[8],ext[3],status[1]} */
+	BYTE	fn[12];			/* SFN (in/out) {body[8],ext[3],status[1]} */
 #if _USE_LFN != 0
 	DWORD	blk_ofs;		/* Offset of current entry block being processed (0xFFFFFFFF:Invalid) */
-	WCHAR*	lfn;			/* Pointer to the LFN working buffer */
 #endif
 #if _USE_FIND
 	const TCHAR* pat;		/* Pointer to the name matching pattern */
@@ -229,7 +226,7 @@ typedef enum {
 	FR_INVALID_DRIVE,		/* (11) The logical drive number is invalid */
 	FR_NOT_ENABLED,			/* (12) The volume has no work area */
 	FR_NO_FILESYSTEM,		/* (13) There is no valid FAT volume */
-	FR_MKFS_ABORTED,		/* (14) The f_mkfs() aborted due to any parameter error */
+	FR_MKFS_ABORTED,		/* (14) The f_mkfs() aborted due to any problem */
 	FR_TIMEOUT,				/* (15) Could not get a grant to access the volume within defined period */
 	FR_LOCKED,				/* (16) The operation is rejected according to the file sharing policy */
 	FR_NOT_ENOUGH_CORE,		/* (17) LFN working buffer could not be allocated */
@@ -244,11 +241,11 @@ typedef enum {
 
 FRESULT f_open (FIL* fp, const TCHAR* path, BYTE mode);				/* Open or create a file */
 FRESULT f_close (FIL* fp);											/* Close an open file object */
-FRESULT f_read (FIL* fp, void* buff, UINT btr, UINT* br);			/* Read data from a file */
+FRESULT f_read (FIL* fp, void* buff, UINT btr, UINT* br);			/* Read data from the file */
-FRESULT f_write (FIL* fp, const void* buff, UINT btw, UINT* bw);	/* Write data to a file */
+FRESULT f_write (FIL* fp, const void* buff, UINT btw, UINT* bw);	/* Write data to the file */
-FRESULT f_lseek (FIL* fp, FSIZE_t ofs);								/* Move file pointer of a file object */
+FRESULT f_lseek (FIL* fp, FSIZE_t ofs);								/* Move file pointer of the file object */
-FRESULT f_truncate (FIL* fp);										/* Truncate file */
+FRESULT f_truncate (FIL* fp);										/* Truncate the file */
-FRESULT f_sync (FIL* fp);											/* Flush cached data of a writing file */
+FRESULT f_sync (FIL* fp);											/* Flush cached data of the writing file */
 FRESULT f_opendir (DIR* dp, const TCHAR* path);						/* Open a directory */
 FRESULT f_closedir (DIR* dp);										/* Close an open directory */
 FRESULT f_readdir (DIR* dp, FILINFO* fno);							/* Read a directory item */
@@ -258,8 +255,8 @@ FRESULT f_mkdir (const TCHAR* path);								/* Create a sub directory */
 FRESULT f_unlink (const TCHAR* path);								/* Delete an existing file or directory */
 FRESULT f_rename (const TCHAR* path_old, const TCHAR* path_new);	/* Rename/Move a file or directory */
 FRESULT f_stat (const TCHAR* path, FILINFO* fno);					/* Get file status */
-FRESULT f_chmod (const TCHAR* path, BYTE attr, BYTE mask);			/* Change attribute of the file/dir */
+FRESULT f_chmod (const TCHAR* path, BYTE attr, BYTE mask);			/* Change attribute of a file/dir */
-FRESULT f_utime (const TCHAR* path, const FILINFO* fno);			/* Change timestamp of the file/dir */
+FRESULT f_utime (const TCHAR* path, const FILINFO* fno);			/* Change timestamp of a file/dir */
 FRESULT f_chdir (const TCHAR* path);								/* Change current directory */
 FRESULT f_chdrive (const TCHAR* path);								/* Change current drive */
 FRESULT f_getcwd (TCHAR* buff, UINT len);							/* Get current directory */
@@ -269,8 +266,8 @@ FRESULT f_setlabel (const TCHAR* label);							/* Set volume label */
 FRESULT f_forward (FIL* fp, UINT(*func)(const BYTE*,UINT), UINT btf, UINT* bf);	/* Forward data to the stream */
 FRESULT f_expand (FIL* fp, FSIZE_t szf, BYTE opt);					/* Allocate a contiguous block to the file */
 FRESULT f_mount (FATFS* fs, const TCHAR* path, BYTE opt);			/* Mount/Unmount a logical drive */
-FRESULT f_mkfs (const TCHAR* path, BYTE sfd, UINT au);				/* Create a file system on the volume */
+FRESULT f_mkfs (const TCHAR* path, BYTE opt, DWORD au, void* work, UINT len);	/* Create a FAT volume */
-FRESULT f_fdisk (BYTE pdrv, const DWORD szt[], void* work);			/* Divide a physical drive into some partitions */
+FRESULT f_fdisk (BYTE pdrv, const DWORD* szt, void* work);			/* Divide a physical drive into some partitions */
 int f_putc (TCHAR c, FIL* fp);										/* Put a character to the file */
 int f_puts (const TCHAR* str, FIL* cp);								/* Put a string to the file */
 int f_printf (FIL* fp, const TCHAR* str, ...);						/* Put a formatted string to the file */
@@ -282,6 +279,7 @@ TCHAR* f_gets (TCHAR* buff, int len, FIL* fp);						/* Get a string from the fil
 #define f_size(fp) ((fp)->obj.objsize)
 #define f_rewind(fp) f_lseek((fp), 0)
 #define f_rewinddir(dp) f_readdir((dp), 0)
+#define f_rmdir(path) f_unlink(path)
 
 #ifndef EOF
 #define EOF (-1)
@@ -323,40 +321,37 @@ int ff_del_syncobj (_SYNC_t sobj);				/* Delete a sync object */
 /* Flags and offset address                                     */
 
 
-/* File access control and file status flags (FIL.flag) */
+/* File access mode and open method flags (3rd argument of f_open) */
-
 #define	FA_READ				0x01
 #define	FA_WRITE			0x02
 #define	FA_OPEN_EXISTING	0x00
 #define	FA_CREATE_NEW		0x04
 #define	FA_CREATE_ALWAYS	0x08
 #define	FA_OPEN_ALWAYS		0x10
-#define _FA_MODIFIED		0x20
+#define	FA_OPEN_APPEND		0x30
-#define _FA_DIRTY			0x40
 
+/* Fast seek controls (2nd argument of f_lseek) */
+#define CREATE_LINKMAP	((FSIZE_t)0 - 1)
 
-/* FAT sub type (FATFS.fs_type) */
+/* Format options (2nd argument of f_mkfs) */
+#define FM_FAT		0x01
+#define FM_FAT32	0x02
+#define FM_EXFAT	0x04
+#define FM_ANY		0x07
+#define FM_SFD		0x08
 
+/* Filesystem type (FATFS.fs_type) */
 #define FS_FAT12	1
 #define FS_FAT16	2
 #define FS_FAT32	3
 #define FS_EXFAT	4
 
-
+/* File attribute bits for directory entry (FILINFO.fattrib) */
-/* File attribute bits for directory entry */
-
 #define	AM_RDO	0x01	/* Read only */
 #define	AM_HID	0x02	/* Hidden */
 #define	AM_SYS	0x04	/* System */
-#define	AM_VOL	0x08	/* Volume label */
-#define AM_LFN	0x0F	/* LFN entry */
 #define AM_DIR	0x10	/* Directory */
 #define AM_ARC	0x20	/* Archive */
-#define AM_MASK	0x3F	/* Mask of defined bits */
-
-
-/* Fast seek controls */
-#define CREATE_LINKMAP	((FSIZE_t)0 - 1)
 
 
 #ifdef __cplusplus

source/fatfs/ffconf.h

@@ -1,8 +1,8 @@
 /*---------------------------------------------------------------------------/
-/  FatFs - FAT file system module configuration file  R0.12  (C)ChaN, 2016
+/  FatFs - FAT file system module configuration file
 /---------------------------------------------------------------------------*/
 
-#define _FFCONF 88100	/* Revision ID */
+#define _FFCONF 68300	/* Revision ID */
 
 /*---------------------------------------------------------------------------/
 / Function Configurations
@@ -15,7 +15,7 @@
 /  and optional writing functions as well. */
 
 
-#define _FS_MINIMIZE	1
+#define _FS_MINIMIZE	0
 /* This option defines minimization level to remove some basic API functions.
 /
 /   0: All basic functions are enabled.
@@ -62,8 +62,7 @@
 
 
 #define	_USE_FORWARD	0
-/* This option switches f_forward() function. (0:Disable or 1:Enable)
+/* This option switches f_forward() function. (0:Disable or 1:Enable) */
-/  To enable it, also _FS_TINY need to be 1. */
 
 
 /*---------------------------------------------------------------------------/
@@ -74,7 +73,7 @@
 /* This option specifies the OEM code page to be used on the target system.
 /  Incorrect setting of the code page can cause a file open failure.
 /
-/   1   - ASCII (No extended character. Non-LFN cfg. only)
+/   1   - ASCII (No support of extended character. Non-LFN cfg. only)
 /   437 - U.S.
 /   720 - Arabic
 /   737 - Greek
@@ -118,13 +117,13 @@
 
 
 #define	_LFN_UNICODE	0
-/* This option switches character encoding on the API. (0:ANSI/OEM or 1:Unicode)
+/* This option switches character encoding on the API. (0:ANSI/OEM or 1:UTF-16)
 /  To use Unicode string for the path name, enable LFN and set _LFN_UNICODE = 1.
 /  This option also affects behavior of string I/O functions. */
 
 
 #define _STRF_ENCODE	3
-/* When _LFN_UNICODE == 1, this option selects the character encoding on the file to
+/* When _LFN_UNICODE == 1, this option selects the character encoding ON THE FILE to
 /  be read/written via string I/O functions, f_gets(), f_putc(), f_puts and f_printf().
 /
 /  0: ANSI/OEM
@@ -149,11 +148,11 @@
 /---------------------------------------------------------------------------*/
 
 #define _VOLUMES	2
-/* Number of volumes (logical drives) to be used. */
+/* Number of volumes (logical drives) to be used. (1-10) */
 
 
 #define _STR_VOLUME_ID	0
-#define _VOLUME_STRS	"RAM","NAND","CF","SD1","SD2","USB1","USB2","USB3"
+#define _VOLUME_STRS	"RAM","NAND","CF","SD","SD2","USB","USB2","USB3"
 /* _STR_VOLUME_ID switches string support of volume ID.
 /  When _STR_VOLUME_ID is set to 1, also pre-defined strings can be used as drive
 /  number in the path name. _VOLUME_STRS defines the drive ID strings for each
@@ -173,11 +172,11 @@
 #define	_MIN_SS		512
 #define	_MAX_SS		512
 /* These options configure the range of sector size to be supported. (512, 1024,
-/  2048 or 4096) Always set both 512 for most systems, all type of memory cards and
+/  2048 or 4096) Always set both 512 for most systems, generic memory card and
 /  harddisk. But a larger value may be required for on-board flash memory and some
 /  type of optical media. When _MAX_SS is larger than _MIN_SS, FatFs is configured
-/  to variable sector size and GET_SECTOR_SIZE command must be implemented to the
+/  to variable sector size and GET_SECTOR_SIZE command needs to be implemented to
-/  disk_ioctl() function. */
+/  the disk_ioctl() function. */
 
 
 #define	_USE_TRIM	0
@@ -205,21 +204,21 @@
 
 #define	_FS_TINY	0
 /* This option switches tiny buffer configuration. (0:Normal or 1:Tiny)
-/  At the tiny configuration, size of the file object (FIL) is reduced _MAX_SS bytes.
+/  At the tiny configuration, size of file object (FIL) is shrinked _MAX_SS bytes.
 /  Instead of private sector buffer eliminated from the file object, common sector
 /  buffer in the file system object (FATFS) is used for the file data transfer. */
 
 
 #define _FS_EXFAT	0
-/* This option switches support of exFAT file system in addition to the traditional
+/* This option switches support of exFAT file system. (0:Disable or 1:Enable)
-/  FAT file system. (0:Disable or 1:Enable) To enable exFAT, also LFN must be enabled.
+/  When enable exFAT, also LFN needs to be enabled. (_USE_LFN >= 1)
-/  Note that enabling exFAT discards C89 compatibility. */
+/  Note that enabling exFAT discards ANSI C (C89) compatibility. */
 
 
 #define _FS_NORTC	1
-#define _NORTC_MON	3
+#define _NORTC_MON	1
 #define _NORTC_MDAY	1
-#define _NORTC_YEAR	2016
+#define _NORTC_YEAR	2017
 /* The option _FS_NORTC switches timestamp functiton. If the system does not have
 /  any RTC function or valid timestamp is not needed, set _FS_NORTC = 1 to disable
 /  the timestamp function. All objects modified by FatFs will have a fixed timestamp
@@ -259,8 +258,11 @@
 /
 /  The _FS_TIMEOUT defines timeout period in unit of time tick.
 /  The _SYNC_t defines O/S dependent sync object type. e.g. HANDLE, ID, OS_EVENT*,
-/  SemaphoreHandle_t and etc.. A header file for O/S definitions needs to be
+/  SemaphoreHandle_t and etc. A header file for O/S definitions needs to be
-/  included somewhere in the scope of ff.c. */
+/  included somewhere in the scope of ff.h. */
+
+/* #include <windows.h>	// O/S definitions  */
+
 
 
 /*--- End of configuration options ---*/

source/fatfs/integer.h

@@ -30,7 +30,7 @@ typedef unsigned short	WCHAR;
 typedef long			LONG;
 typedef unsigned long	DWORD;
 
-/* This type MUST be 64-bit (Remove this for C89 compatibility) */
+/* This type MUST be 64-bit (Remove this for ANSI C (C89) compatibility) */
 typedef unsigned long long QWORD;
 
 #endif

source/fatfs/sdmmc/common.h

@@ -1,4 +0,0 @@
-#pragma once
-
-#include <stdbool.h>
-#include "../../types.h"

source/fatfs/sdmmc/delay.h

@@ -1,9 +1,5 @@
-// Copyright 2014 Normmatt
-// Licensed under GPLv2 or any later version
-// Refer to the license.txt file included.
-
 #pragma once
 
-#include "common.h"
+#include "../../types.h"
 
-void ioDelay(u32 us);
+void waitcycles(u32 us);

source/fatfs/sdmmc/delay.s

@@ -1,17 +1,16 @@
-// Copyright 2014 Normmatt
+.text
-// Licensed under GPLv2 or any later version
-// Refer to the license.txt file included.
-
 .arm
-.global ioDelay
+.align 4
-.type   ioDelay STT_FUNC
 
-@ioDelay ( u32 us )
+.global waitcycles
-ioDelay:
+.type waitcycles, %function
-	ldr r1, =0x18000000  @ VRAM
+waitcycles:
-1:
+    push {r0-r2, lr}
-	@ Loop doing uncached reads from VRAM to make loop timing more reliable
+    str r0, [sp, #4]
-	ldr r2, [r1]
+    waitcycles_loop:
-	subs r0, #1
+        ldr r3, [sp, #4]
-	bgt 1b
+        subs r2, r3, #1
-	bx lr
+        str r2, [sp, #4]
+        cmp r3, #0
+        bne waitcycles_loop
+    pop {r0-r2, pc}

source/fatfs/sdmmc/sdmmc.c

@@ -1,30 +1,55 @@
-// Copyright 2014 Normmatt
+/*
-// Licensed under GPLv2 or any later version
+ * This Source Code Form is subject to the terms of the Mozilla Public
-// Refer to the license.txt file included.
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file, 
+ * You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * Copyright (c) 2014-2015, Normmatt
+ *
+ * Alternatively, the contents of this file may be used under the terms
+ * of the GNU General Public License Version 2, as described below:
+ *
+ * This file is free software: you may copy, redistribute and/or modify
+ * it under the terms of the GNU General Public License as published by the
+ * Free Software Foundation, either version 2 of the License, or (at your
+ * option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
+ * Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see http://www.gnu.org/licenses/.
+ */
 
 #include "sdmmc.h"
 #include "delay.h"
 
-struct mmcdevice handleNAND;
+static struct mmcdevice handleNAND;
-struct mmcdevice handleSD;
+static struct mmcdevice handleSD;
 
-static inline u16 sdmmc_read16(u16 reg) {
+static inline u16 sdmmc_read16(u16 reg)
-    return *(vu16*)(SDMMC_BASE + reg);
+{
+    return *(vu16 *)(SDMMC_BASE + reg);
 }
 
-static inline void sdmmc_write16(u16 reg, u16 val) {
+static inline void sdmmc_write16(u16 reg, u16 val)
-    *(vu16*)(SDMMC_BASE + reg) = val;
+{
+    *(vu16 *)(SDMMC_BASE + reg) = val;
 }
 
-static inline u32 sdmmc_read32(u16 reg) {
+static inline u32 sdmmc_read32(u16 reg)
-    return *(vu32*)(SDMMC_BASE + reg);
+{
+    return *(vu32 *)(SDMMC_BASE + reg);
 }
 
-static inline void sdmmc_write32(u16 reg, u32 val) {
+static inline void sdmmc_write32(u16 reg, u32 val)
-    *(vu32*)(SDMMC_BASE + reg) = val;
+{
+    *(vu32 *)(SDMMC_BASE + reg) = val;
 }
 
-static inline void sdmmc_mask16(u16 reg, const u16 clear, const u16 set) {
+static inline void sdmmc_mask16(u16 reg, const u16 clear, const u16 set)
+{
     u16 val = sdmmc_read16(reg);
     val &= ~clear;
     val |= set;
@@ -38,208 +63,259 @@ static inline void setckl(u32 data)
     sdmmc_mask16(REG_SDCLKCTL, 0x0, 0x100);
 }
 
-
+/*
 mmcdevice *getMMCDevice(int drive)
 {
-    if(drive==0) return &handleNAND;
+    if(drive == 0) return &handleNAND;
     return &handleSD;
 }
+*/
 
-static u32 __attribute__((noinline)) geterror(struct mmcdevice *ctx)
+static int geterror(struct mmcdevice *ctx)
 {
-    return (ctx->error << 29) >> 31;
+    return (int)((ctx->error << 29) >> 31);
 }
 
-static void __attribute__((noinline)) inittarget(struct mmcdevice *ctx)
+static void inittarget(struct mmcdevice *ctx)
 {
-    sdmmc_mask16(REG_SDPORTSEL,0x3,(u16)ctx->devicenumber);
+    sdmmc_mask16(REG_SDPORTSEL, 0x3, (u16)ctx->devicenumber);
     setckl(ctx->clk);
-    if (ctx->SDOPT == 0) {
+    if(ctx->SDOPT == 0) sdmmc_mask16(REG_SDOPT, 0, 0x8000);
-        sdmmc_mask16(REG_SDOPT, 0, 0x8000);
+    else sdmmc_mask16(REG_SDOPT, 0x8000, 0);
-    } else {
-        sdmmc_mask16(REG_SDOPT, 0x8000, 0);
-    }
-
 }
 
 static void __attribute__((noinline)) sdmmc_send_command(struct mmcdevice *ctx, u32 cmd, u32 args)
 {
-    bool getSDRESP = (cmd << 15) >> 31;
+    u32 getSDRESP = (cmd << 15) >> 31;
     u16 flags = (cmd << 15) >> 31;
-    const bool readdata = cmd & 0x20000;
+    const int readdata = cmd & 0x20000;
-    const bool writedata = cmd & 0x40000;
+    const int writedata = cmd & 0x40000;
 
-    if (readdata || writedata)
+    if(readdata || writedata)
         flags |= TMIO_STAT0_DATAEND;
 
     ctx->error = 0;
-    while (sdmmc_read16(REG_SDSTATUS1) & TMIO_STAT1_CMD_BUSY); //mmc working?
+    while((sdmmc_read16(REG_SDSTATUS1) & TMIO_STAT1_CMD_BUSY)); //mmc working?
-    sdmmc_write16(REG_SDIRMASK0,0);
+    sdmmc_write16(REG_SDIRMASK0, 0);
-    sdmmc_write16(REG_SDIRMASK1,0);
+    sdmmc_write16(REG_SDIRMASK1, 0);
-    sdmmc_write16(REG_SDSTATUS0,0);
+    sdmmc_write16(REG_SDSTATUS0, 0);
-    sdmmc_write16(REG_SDSTATUS1,0);
+    sdmmc_write16(REG_SDSTATUS1, 0);
-    sdmmc_mask16(REG_SDDATACTL32,0x1800,0);
+    sdmmc_mask16(REG_DATACTL32, 0x1800, 0);
-
+    sdmmc_write16(REG_SDCMDARG0, args & 0xFFFF);
-    sdmmc_write16(REG_SDCMDARG0,args &0xFFFF);
+    sdmmc_write16(REG_SDCMDARG1, args >> 16);
-    sdmmc_write16(REG_SDCMDARG1,args >> 16);
+    sdmmc_write16(REG_SDCMD, cmd & 0xFFFF);
-    sdmmc_write16(REG_SDCMD,cmd &0xFFFF);
 
     u32 size = ctx->size;
-    vu8 *dataPtr = ctx->data;
+    u8 *rDataPtr = ctx->rData;
+    const u8 *tDataPtr = ctx->tData;
 
-    bool useBuf = ( NULL != dataPtr );
+    bool rUseBuf = rDataPtr != NULL;
+    bool tUseBuf = tDataPtr != NULL;
 
     u16 status0 = 0;
-    while(true) {
+    while(true)
-        u16 status1 = sdmmc_read16(REG_SDSTATUS1);
+    {
-        if (status1 & TMIO_STAT1_RXRDY) {
+        vu16 status1 = sdmmc_read16(REG_SDSTATUS1);
-            if (readdata && useBuf) {
+        vu16 ctl32 = sdmmc_read16(REG_DATACTL32);
-                sdmmc_mask16(REG_SDSTATUS1, TMIO_STAT1_RXRDY, 0);
+        if((ctl32 & 0x100))
-                //sdmmc_write16(REG_SDSTATUS1,~TMIO_STAT1_RXRDY);
+        {
-                if (size > 0x1FF) {
+            if(readdata)
-                    for(int i = 0; i<0x200; i+=2) {
+            {
-                        u16 data = sdmmc_read16(REG_SDFIFO);
+                if(rUseBuf)
-                        *dataPtr++ = data & 0xFF;
+                {
-                        *dataPtr++ = data >> 8;
+                    sdmmc_mask16(REG_SDSTATUS1, TMIO_STAT1_RXRDY, 0);
+                    if(size > 0x1FF)
+                    {
+                        //Gabriel Marcano: This implementation doesn't assume alignment.
+                        //I've removed the alignment check doen with former rUseBuf32 as a result
+                        for(int i = 0; i < 0x200; i += 4)
+                        {
+                            u32 data = sdmmc_read32(REG_SDFIFO32);
+                            *rDataPtr++ = data;
+                            *rDataPtr++ = data >> 8;
+                            *rDataPtr++ = data >> 16;
+                            *rDataPtr++ = data >> 24;
+                        }
+                        size -= 0x200;
                     }
-                    size -= 0x200;
                 }
-            }
-        }
 
-        if (status1 & TMIO_STAT1_TXRQ) {
+                sdmmc_mask16(REG_DATACTL32, 0x800, 0);
-            if (writedata && useBuf) {
-                sdmmc_mask16(REG_SDSTATUS1, TMIO_STAT1_TXRQ, 0);
-                //sdmmc_write16(REG_SDSTATUS1,~TMIO_STAT1_TXRQ);
-                if (size > 0x1FF) {
-                    for (int i = 0; i<0x200; i+=2) {
-                        u16 data = *dataPtr++;
-                        data |= *dataPtr++ << 8;
-                        sdmmc_write16(REG_SDFIFO, data);
-                    }
-                    size -= 0x200;
-                }
             }
         }
-        if (status1 & TMIO_MASK_GW) {
+        if(!(ctl32 & 0x200))
+        {
+            if(writedata)
+            {
+                if(tUseBuf)
+                {
+                    sdmmc_mask16(REG_SDSTATUS1, TMIO_STAT1_TXRQ, 0);
+                    if(size > 0x1FF)
+                    {
+                        for(int i = 0; i < 0x200; i += 4)
+                        {
+                            u32 data = *tDataPtr++;
+                            data |= (u32)*tDataPtr++ << 8;
+                            data |= (u32)*tDataPtr++ << 16;
+                            data |= (u32)*tDataPtr++ << 24;
+                            sdmmc_write32(REG_SDFIFO32, data);
+                        }
+                        size -= 0x200;
+                    }
+                }
+
+                sdmmc_mask16(REG_DATACTL32, 0x1000, 0);
+            }
+        }
+        if(status1 & TMIO_MASK_GW)
+        {
             ctx->error |= 4;
             break;
         }
 
-        if (!(status1 & TMIO_STAT1_CMD_BUSY)) {
+        if(!(status1 & TMIO_STAT1_CMD_BUSY))
+        {
             status0 = sdmmc_read16(REG_SDSTATUS0);
-            if (sdmmc_read16(REG_SDSTATUS0) & TMIO_STAT0_CMDRESPEND)
+            if(sdmmc_read16(REG_SDSTATUS0) & TMIO_STAT0_CMDRESPEND)
+            {
                 ctx->error |= 0x1;
-            if (status0 & TMIO_STAT0_DATAEND)
+            }
+            if(status0 & TMIO_STAT0_DATAEND)
+            {
                 ctx->error |= 0x2;
+            }
 
-            if ((status0 & flags) == flags)
+            if((status0 & flags) == flags)
                 break;
         }
     }
     ctx->stat0 = sdmmc_read16(REG_SDSTATUS0);
     ctx->stat1 = sdmmc_read16(REG_SDSTATUS1);
-    sdmmc_write16(REG_SDSTATUS0,0);
+    sdmmc_write16(REG_SDSTATUS0, 0);
-    sdmmc_write16(REG_SDSTATUS1,0);
+    sdmmc_write16(REG_SDSTATUS1, 0);
 
-    if (getSDRESP != 0) {
+    if(getSDRESP != 0)
-        ctx->ret[0] = (u32)sdmmc_read16(REG_SDRESP0) | (u32)(sdmmc_read16(REG_SDRESP1) << 16);
+    {
-        ctx->ret[1] = (u32)sdmmc_read16(REG_SDRESP2) | (u32)(sdmmc_read16(REG_SDRESP3) << 16);
+        ctx->ret[0] = (u32)(sdmmc_read16(REG_SDRESP0) | (sdmmc_read16(REG_SDRESP1) << 16));
-        ctx->ret[2] = (u32)sdmmc_read16(REG_SDRESP4) | (u32)(sdmmc_read16(REG_SDRESP5) << 16);
+        ctx->ret[1] = (u32)(sdmmc_read16(REG_SDRESP2) | (sdmmc_read16(REG_SDRESP3) << 16));
-        ctx->ret[3] = (u32)sdmmc_read16(REG_SDRESP6) | (u32)(sdmmc_read16(REG_SDRESP7) << 16);
+        ctx->ret[2] = (u32)(sdmmc_read16(REG_SDRESP4) | (sdmmc_read16(REG_SDRESP5) << 16));
+        ctx->ret[3] = (u32)(sdmmc_read16(REG_SDRESP6) | (sdmmc_read16(REG_SDRESP7) << 16));
     }
 }
 
-u32 __attribute__((noinline)) sdmmc_sdcard_writesectors(u32 sector_no, u32 numsectors, vu8 *in)
+int __attribute__((noinline)) sdmmc_sdcard_writesectors(u32 sector_no, u32 numsectors, const u8 *in)
 {
-    if (handleSD.isSDHC == 0)
+    if(handleSD.isSDHC == 0) sector_no <<= 9;
-        sector_no <<= 9;
     inittarget(&handleSD);
-    sdmmc_write16(REG_SDSTOP,0x100);
+    sdmmc_write16(REG_SDSTOP, 0x100);
-
+    sdmmc_write16(REG_SDBLKCOUNT32, numsectors);
-    sdmmc_write16(REG_SDBLKCOUNT,numsectors);
+    sdmmc_write16(REG_SDBLKLEN32, 0x200);
-    handleSD.data = in;
+    sdmmc_write16(REG_SDBLKCOUNT, numsectors);
+    handleSD.tData = in;
     handleSD.size = numsectors << 9;
-    sdmmc_send_command(&handleSD,0x52C19,sector_no);
+    sdmmc_send_command(&handleSD, 0x52C19, sector_no);
     return geterror(&handleSD);
 }
 
-u32 __attribute__((noinline)) sdmmc_sdcard_readsectors(u32 sector_no, u32 numsectors, vu8 *out)
+int __attribute__((noinline)) sdmmc_sdcard_readsectors(u32 sector_no, u32 numsectors, u8 *out)
 {
-    if (handleSD.isSDHC == 0)
+    if(handleSD.isSDHC == 0) sector_no <<= 9;
-        sector_no <<= 9;
     inittarget(&handleSD);
-    sdmmc_write16(REG_SDSTOP,0x100);
+    sdmmc_write16(REG_SDSTOP, 0x100);
-
+    sdmmc_write16(REG_SDBLKCOUNT32, numsectors);
-    sdmmc_write16(REG_SDBLKCOUNT,numsectors);
+    sdmmc_write16(REG_SDBLKLEN32, 0x200);
-    handleSD.data = out;
+    sdmmc_write16(REG_SDBLKCOUNT, numsectors);
+    handleSD.rData = out;
     handleSD.size = numsectors << 9;
-    sdmmc_send_command(&handleSD,0x33C12,sector_no);
+    sdmmc_send_command(&handleSD, 0x33C12, sector_no);
     return geterror(&handleSD);
 }
 
-u32 __attribute__((noinline)) sdmmc_nand_readsectors(u32 sector_no, u32 numsectors, vu8 *out)
+int __attribute__((noinline)) sdmmc_nand_readsectors(u32 sector_no, u32 numsectors, u8 *out)
 {
-    if (handleNAND.isSDHC == 0)
+    if(handleNAND.isSDHC == 0) sector_no <<= 9;
-        sector_no <<= 9;
     inittarget(&handleNAND);
-    sdmmc_write16(REG_SDSTOP,0x100);
+    sdmmc_write16(REG_SDSTOP, 0x100);
-
+    sdmmc_write16(REG_SDBLKCOUNT32, numsectors);
-    sdmmc_write16(REG_SDBLKCOUNT,numsectors);
+    sdmmc_write16(REG_SDBLKLEN32, 0x200);
-
+    sdmmc_write16(REG_SDBLKCOUNT, numsectors);
-    handleNAND.data = out;
+    handleNAND.rData = out;
     handleNAND.size = numsectors << 9;
-    sdmmc_send_command(&handleNAND,0x33C12,sector_no);
+    sdmmc_send_command(&handleNAND, 0x33C12, sector_no);
     inittarget(&handleSD);
     return geterror(&handleNAND);
 }
 
-u32 __attribute__((noinline)) sdmmc_nand_writesectors(u32 sector_no, u32 numsectors, vu8 *in) //experimental
+int __attribute__((noinline)) sdmmc_nand_writesectors(u32 sector_no, u32 numsectors, const u8 *in) //experimental
 {
-    if (handleNAND.isSDHC == 0)
+    if(handleNAND.isSDHC == 0) sector_no <<= 9;
-        sector_no <<= 9;
     inittarget(&handleNAND);
-    sdmmc_write16(REG_SDSTOP,0x100);
+    sdmmc_write16(REG_SDSTOP, 0x100);
-
+    sdmmc_write16(REG_SDBLKCOUNT32, numsectors);
-    sdmmc_write16(REG_SDBLKCOUNT,numsectors);
+    sdmmc_write16(REG_SDBLKLEN32, 0x200);
-
+    sdmmc_write16(REG_SDBLKCOUNT, numsectors);
-    handleNAND.data = in;
+    handleNAND.tData = in;
     handleNAND.size = numsectors << 9;
-    sdmmc_send_command(&handleNAND,0x52C19,sector_no);
+    sdmmc_send_command(&handleNAND, 0x52C19, sector_no);
     inittarget(&handleSD);
     return geterror(&handleNAND);
 }
 
-static u32 calcSDSize(u8* csd, int type)
+static u32 calcSDSize(u8 *csd, int type)
 {
     u32 result = 0;
-    if (type == -1) type = csd[14] >> 6;
+    if(type == -1) type = csd[14] >> 6;
-    switch (type) {
+    switch(type)
+    {
         case 0:
-            {
+        {
-                u32 block_len = csd[9] & 0xf;
+            u32 block_len = csd[9] & 0xF;
-                block_len = 1u << block_len;
+            block_len = 1u << block_len;
-                u32 mult = (u32)(csd[4] >> 7) | (u32)((csd[5] & 3) << 1);
+            u32 mult = (u32)((csd[4] >> 7) | ((csd[5] & 3) << 1));
-                mult = 1u << (mult + 2);
+            mult = 1u << (mult + 2);
-                result = csd[8] & 3;
+            result = csd[8] & 3;
-                result = (result << 8) | csd[7];
+            result = (result << 8) | csd[7];
-                result = (result << 2) | (csd[6] >> 6);
+            result = (result << 2) | (csd[6] >> 6);
-                result = (result + 1) * mult * block_len / 512;
+            result = (result + 1) * mult * block_len / 512;
-            }
             break;
+        }
         case 1:
-            result = csd[7] & 0x3f;
+            result = csd[7] & 0x3F;
             result = (result << 8) | csd[6];
             result = (result << 8) | csd[5];
             result = (result + 1) * 1024;
             break;
-    default:
+        default:
-        break; //Do nothing otherwise
+            break; //Do nothing otherwise FIXME perhaps return some error?
     }
     return result;
 }
 
 static void InitSD()
+{
+    *(vu16 *)0x10006100 &= 0xF7FFu; //SDDATACTL32
+    *(vu16 *)0x10006100 &= 0xEFFFu; //SDDATACTL32
+    *(vu16 *)0x10006100 |= 0x402u; //SDDATACTL32
+    *(vu16 *)0x100060D8 = (*(vu16 *)0x100060D8 & 0xFFDD) | 2;
+    *(vu16 *)0x10006100 &= 0xFFFFu; //SDDATACTL32
+    *(vu16 *)0x100060D8 &= 0xFFDFu; //SDDATACTL
+    *(vu16 *)0x10006104 = 512; //SDBLKLEN32
+    *(vu16 *)0x10006108 = 1; //SDBLKCOUNT32
+    *(vu16 *)0x100060E0 &= 0xFFFEu; //SDRESET
+    *(vu16 *)0x100060E0 |= 1u; //SDRESET
+    *(vu16 *)0x10006020 |= TMIO_MASK_ALL; //SDIR_MASK0
+    *(vu16 *)0x10006022 |= TMIO_MASK_ALL>>16; //SDIR_MASK1
+    *(vu16 *)0x100060FC |= 0xDBu; //SDCTL_RESERVED7
+    *(vu16 *)0x100060FE |= 0xDBu; //SDCTL_RESERVED8
+    *(vu16 *)0x10006002 &= 0xFFFCu; //SDPORTSEL
+    *(vu16 *)0x10006024 = 0x20;
+    *(vu16 *)0x10006028 = 0x40EE;
+    *(vu16 *)0x10006002 &= 0xFFFCu; ////SDPORTSEL
+    *(vu16 *)0x10006026 = 512; //SDBLKLEN
+    *(vu16 *)0x10006008 = 0; //SDSTOP
+}
+
+static int Nand_Init()
 {
     //NAND
     handleNAND.isSDHC = 0;
@@ -249,80 +325,50 @@ static void InitSD()
     handleNAND.clk = 0x80;
     handleNAND.devicenumber = 1;
 
-    //SD
-    handleSD.isSDHC = 0;
-    handleSD.SDOPT = 0;
-    handleSD.res = 0;
-    handleSD.initarg = 0;
-    handleSD.clk = 0x80;
-    handleSD.devicenumber = 0;
-
-    *(vu16*)0x10006100 &= 0xF7FFu; //SDDATACTL32
-    *(vu16*)0x10006100 &= 0xEFFFu; //SDDATACTL32
-    *(vu16*)0x10006100 |= 0x402u; //SDDATACTL32
-    *(vu16*)0x100060D8 = (*(vu16*)0x100060D8 & 0xFFDD) | 2;
-    *(vu16*)0x10006100 &= 0xFFFDu; //SDDATACTL32
-    *(vu16*)0x100060D8 &= 0xFFDDu; //SDDATACTL
-    *(vu16*)0x10006104 = 0; //SDBLKLEN32
-    *(vu16*)0x10006108 = 1; //SDBLKCOUNT32
-    *(vu16*)0x100060E0 &= 0xFFFEu; //SDRESET
-    *(vu16*)0x100060E0 |= 1u; //SDRESET
-    *(vu16*)0x10006020 |= TMIO_MASK_ALL; //SDIR_MASK0
-    *(vu16*)0x10006022 |= TMIO_MASK_ALL>>16; //SDIR_MASK1
-    *(vu16*)0x100060FC |= 0xDBu; //SDCTL_RESERVED7
-    *(vu16*)0x100060FE |= 0xDBu; //SDCTL_RESERVED8
-    *(vu16*)0x10006002 &= 0xFFFCu; //SDPORTSEL
-    *(vu16*)0x10006024 = 0x40; //Nintendo sets this to 0x20
-    *(vu16*)0x10006028 = 0x40EB; //Nintendo sets this to 0x40EE
-    *(vu16*)0x10006002 &= 0xFFFCu; ////SDPORTSEL
-    *(vu16*)0x10006026 = 512; //SDBLKLEN
-    *(vu16*)0x10006008 = 0; //SDSTOP
-
-    inittarget(&handleSD);
-}
-
-static int Nand_Init()
-{
     inittarget(&handleNAND);
-    ioDelay(0xF000);
+    waitcycles(0xF000);
 
-    sdmmc_send_command(&handleNAND,0,0);
+    sdmmc_send_command(&handleNAND, 0, 0);
 
-    do {
+    do
-        do {
+    {
-            sdmmc_send_command(&handleNAND,0x10701,0x100000);
+        do
-        } while ( !(handleNAND.error & 1) );
+        {
-    } while((handleNAND.ret[0] & 0x80000000) == 0);
+            sdmmc_send_command(&handleNAND, 0x10701, 0x100000);
+        }
+        while(!(handleNAND.error & 1));
+    }
+    while((handleNAND.ret[0] & 0x80000000) == 0);
 
-    sdmmc_send_command(&handleNAND,0x10602,0x0);
+    sdmmc_send_command(&handleNAND, 0x10602, 0x0);
-    if (handleNAND.error & 0x4) return -1;
+    if((handleNAND.error & 0x4)) return -1;
 
-    sdmmc_send_command(&handleNAND,0x10403,handleNAND.initarg << 0x10);
+    sdmmc_send_command(&handleNAND, 0x10403, handleNAND.initarg << 0x10);
-    if (handleNAND.error & 0x4) return -1;
+    if((handleNAND.error & 0x4)) return -1;
 
-    sdmmc_send_command(&handleNAND,0x10609,handleNAND.initarg << 0x10);
+    sdmmc_send_command(&handleNAND, 0x10609, handleNAND.initarg << 0x10);
-    if (handleNAND.error & 0x4) return -1;
+    if((handleNAND.error & 0x4)) return -1;
 
-    handleNAND.total_size = calcSDSize((u8*)&handleNAND.ret[0],0);
+    handleNAND.total_size = calcSDSize((u8*)&handleNAND.ret[0], 0);
     handleNAND.clk = 1;
     setckl(1);
 
-    sdmmc_send_command(&handleNAND,0x10407,handleNAND.initarg << 0x10);
+    sdmmc_send_command(&handleNAND, 0x10407, handleNAND.initarg << 0x10);
-    if (handleNAND.error & 0x4) return -1;
+    if((handleNAND.error & 0x4)) return -1;
 
     handleNAND.SDOPT = 1;
 
-    sdmmc_send_command(&handleNAND,0x10506,0x3B70100);
+    sdmmc_send_command(&handleNAND, 0x10506, 0x3B70100);
-    if (handleNAND.error & 0x4) return -1;
+    if((handleNAND.error & 0x4)) return -1;
 
-    sdmmc_send_command(&handleNAND,0x10506,0x3B90100);
+    sdmmc_send_command(&handleNAND, 0x10506, 0x3B90100);
-    if (handleNAND.error & 0x4) return -1;
+    if((handleNAND.error & 0x4)) return -1;
 
-    sdmmc_send_command(&handleNAND,0x1040D,handleNAND.initarg << 0x10);
+    sdmmc_send_command(&handleNAND, 0x1040D, handleNAND.initarg << 0x10);
-    if (handleNAND.error & 0x4) return -1;
+    if((handleNAND.error & 0x4)) return -1;
 
-    sdmmc_send_command(&handleNAND,0x10410,0x200);
+    sdmmc_send_command(&handleNAND, 0x10410, 0x200);
-    if (handleNAND.error & 0x4) return -1;
+    if((handleNAND.error & 0x4)) return -1;
 
     handleNAND.clk |= 0x200;
 
@@ -333,113 +379,104 @@ static int Nand_Init()
 
 static int SD_Init()
 {
+    //SD
+    handleSD.isSDHC = 0;
+    handleSD.SDOPT = 0;
+    handleSD.res = 0;
+    handleSD.initarg = 0;
+    handleSD.clk = 0x80;
+    handleSD.devicenumber = 0;
+
     inittarget(&handleSD);
 
-    ioDelay(1u << 18); //Card needs a little bit of time to be detected, it seems
+    waitcycles(1u << 22); //Card needs a little bit of time to be detected, it seems FIXME test again to see what a good number is for the delay
 
     //If not inserted
-    if (!(*((vu16*)0x1000601c) & TMIO_STAT0_SIGSTATE)) return -1;
+    if(!(*((vu16 *)(SDMMC_BASE + REG_SDSTATUS0)) & TMIO_STAT0_SIGSTATE)) return 5;
 
-    sdmmc_send_command(&handleSD,0,0);
+    sdmmc_send_command(&handleSD, 0, 0);
-    sdmmc_send_command(&handleSD,0x10408,0x1AA);
+    sdmmc_send_command(&handleSD, 0x10408, 0x1AA);
-    //u32 temp = (handleSD.ret[0] == 0x1AA) << 0x1E;
     u32 temp = (handleSD.error & 0x1) << 0x1E;
 
-    //int count = 0;
     u32 temp2 = 0;
-    do {
+    do
-        do {
+    {
-            sdmmc_send_command(&handleSD,0x10437,handleSD.initarg << 0x10);
+        do
-            sdmmc_send_command(&handleSD,0x10769,0x00FF8000 | temp);
+        {
+            sdmmc_send_command(&handleSD, 0x10437, handleSD.initarg << 0x10);
+            sdmmc_send_command(&handleSD, 0x10769, 0x00FF8000 | temp);
             temp2 = 1;
-        } while ( !(handleSD.error & 1) );
+        }
-
+        while(!(handleSD.error & 1));
-    } while((handleSD.ret[0] & 0x80000000) == 0);
+    }
+    while((handleSD.ret[0] & 0x80000000) == 0);
 
     if(!((handleSD.ret[0] >> 30) & 1) || !temp)
         temp2 = 0;
 
     handleSD.isSDHC = temp2;
 
-    sdmmc_send_command(&handleSD,0x10602,0);
+    sdmmc_send_command(&handleSD, 0x10602, 0);
-    if (handleSD.error & 0x4) return -1;
+    if((handleSD.error & 0x4)) return -1;
 
-    sdmmc_send_command(&handleSD,0x10403,0);
+    sdmmc_send_command(&handleSD, 0x10403, 0);
-    if (handleSD.error & 0x4) return -1;
+    if((handleSD.error & 0x4)) return -2;
     handleSD.initarg = handleSD.ret[0] >> 0x10;
 
-    sdmmc_send_command(&handleSD,0x10609,handleSD.initarg << 0x10);
+    sdmmc_send_command(&handleSD, 0x10609, handleSD.initarg << 0x10);
-    if (handleSD.error & 0x4) return -1;
+    if((handleSD.error & 0x4)) return -3;
 
-    handleSD.total_size = calcSDSize((u8*)&handleSD.ret[0],-1);
+    handleSD.total_size = calcSDSize((u8*)&handleSD.ret[0], -1);
     handleSD.clk = 1;
     setckl(1);
 
-    sdmmc_send_command(&handleSD,0x10507,handleSD.initarg << 0x10);
+    sdmmc_send_command(&handleSD, 0x10507, handleSD.initarg << 0x10);
-    if (handleSD.error & 0x4) return -1;
+    if((handleSD.error & 0x4)) return -4;
 
-    sdmmc_send_command(&handleSD,0x10437,handleSD.initarg << 0x10);
+    sdmmc_send_command(&handleSD, 0x10437, handleSD.initarg << 0x10);
-    if (handleSD.error & 0x4) return -1;
+    if((handleSD.error & 0x4)) return -5;
 
     handleSD.SDOPT = 1;
-    sdmmc_send_command(&handleSD,0x10446,0x2);
+    sdmmc_send_command(&handleSD, 0x10446, 0x2);
-    if (handleSD.error & 0x4) return -1;
+    if((handleSD.error & 0x4)) return -6;
 
-    sdmmc_send_command(&handleSD,0x1040D,handleSD.initarg << 0x10);
+    sdmmc_send_command(&handleSD, 0x1040D, handleSD.initarg << 0x10);
-    if (handleSD.error & 0x4) return -1;
+    if((handleSD.error & 0x4)) return -7;
 
-    sdmmc_send_command(&handleSD,0x10410,0x200);
+    sdmmc_send_command(&handleSD, 0x10410, 0x200);
-    if (handleSD.error & 0x4) return -1;
+    if((handleSD.error & 0x4)) return -8;
     handleSD.clk |= 0x200;
 
     return 0;
 }
 
-int sdmmc_sdcard_init()
+void sdmmc_get_cid(bool isNand, u32 *info)
+{
+    struct mmcdevice *device = isNand ? &handleNAND : &handleSD;
+
+    inittarget(device);
+
+    // use cmd7 to put sd card in standby mode
+    // CMD7
+    sdmmc_send_command(device, 0x10507, 0);
+
+    // get sd card info
+    // use cmd10 to read CID
+    sdmmc_send_command(device, 0x1060A, device->initarg << 0x10);
+
+    for(int i = 0; i < 4; ++i)
+        info[i] = device->ret[i];
+
+    // put sd card back to transfer mode
+    // CMD7
+    sdmmc_send_command(device, 0x10507, device->initarg << 0x10);
+}
+
+bool sdmmc_sdcard_init(bool initSd, bool initNand)
 {
     InitSD();
-    int result = Nand_Init();
+    int ret = 0;
-    return result | SD_Init();
+    if(initNand) ret |= Nand_Init();
-}
+    if(initSd) ret |= SD_Init();
-
+    return ret == 0;
-int sdmmc_get_cid( int isNand, uint32_t *info)
-{
-	struct mmcdevice *device;
-	if(isNand)
-		device = &handleNAND;
-	else
-		device = &handleSD;
-	
-	inittarget(device);
-	// use cmd7 to put sd card in standby mode
-	// CMD7
-	{
-		sdmmc_send_command(device,0x10507,0);
-		//if((device->error & 0x4)) return -1;
-	}
-
-	// get sd card info
-	// use cmd10 to read CID
-	{
-		sdmmc_send_command(device,0x1060A,device->initarg << 0x10);
-		//if((device->error & 0x4)) return -2;
-
-		for( int i = 0; i < 4; ++i ) {
-			info[i] = device->ret[i];
-		}
-	}
-
-	// put sd card back to transfer mode
-	// CMD7
-	{
-		sdmmc_send_command(device,0x10507,device->initarg << 0x10);
-		//if((device->error & 0x4)) return -3;
-	}
-
-	if(isNand)
-	{
-		inittarget(&handleSD);
-	}
-	
-	return 0;
 }

source/fatfs/sdmmc/sdmmc.h

@@ -1,52 +1,48 @@
-// Copyright 2014 Normmatt
-// Licensed under GPLv2 or any later version
-// Refer to the license.txt file included.
-
 #pragma once
 
-#include "common.h"
+#include "../../types.h"
 
-#define SDMMC_BASE              0x10006000u
+#define SDMMC_BASE		0x10006000
 
-#define REG_SDCMD               0x00
+#define REG_SDCMD		0x00
-#define REG_SDPORTSEL           0x02
+#define REG_SDPORTSEL		0x02
-#define REG_SDCMDARG            0x04
+#define REG_SDCMDARG		0x04
-#define REG_SDCMDARG0           0x04
+#define REG_SDCMDARG0		0x04
-#define REG_SDCMDARG1           0x06
+#define REG_SDCMDARG1		0x06
-#define REG_SDSTOP              0x08
+#define REG_SDSTOP		0x08
-#define REG_SDBLKCOUNT          0x0a
+#define REG_SDBLKCOUNT		0x0A
 
-#define REG_SDRESP0             0x0c
+#define REG_SDRESP0		0x0C
-#define REG_SDRESP1             0x0e
+#define REG_SDRESP1		0x0E
-#define REG_SDRESP2             0x10
+#define REG_SDRESP2		0x10
-#define REG_SDRESP3             0x12
+#define REG_SDRESP3		0x12
-#define REG_SDRESP4             0x14
+#define REG_SDRESP4		0x14
-#define REG_SDRESP5             0x16
+#define REG_SDRESP5		0x16
-#define REG_SDRESP6             0x18
+#define REG_SDRESP6		0x18
-#define REG_SDRESP7             0x1a
+#define REG_SDRESP7		0x1A
 
-#define REG_SDSTATUS0           0x1c
+#define REG_SDSTATUS0		0x1C
-#define REG_SDSTATUS1           0x1e
+#define REG_SDSTATUS1		0x1E
 
-#define REG_SDIRMASK0           0x20
+#define REG_SDIRMASK0		0x20
-#define REG_SDIRMASK1           0x22
+#define REG_SDIRMASK1		0x22
-#define REG_SDCLKCTL            0x24
+#define REG_SDCLKCTL		0x24
 
-#define REG_SDBLKLEN            0x26
+#define REG_SDBLKLEN		0x26
-#define REG_SDOPT               0x28
+#define REG_SDOPT		0x28
-#define REG_SDFIFO              0x30
+#define REG_SDFIFO		0x30
 
-#define REG_SDDATACTL           0xd8
+#define REG_DATACTL 		0xD8
-#define REG_SDRESET             0xe0
+#define REG_SDRESET		0xE0
-#define REG_SDPROTECTED         0xf6 //bit 0 determines if sd is protected or not?
+#define REG_SDPROTECTED		0xF6 //bit 0 determines if sd is protected or not?
 
-#define REG_SDDATACTL32         0x100
+#define REG_DATACTL32 		0x100
-#define REG_SDBLKLEN32          0x104
+#define REG_SDBLKLEN32		0x104
-#define REG_SDBLKCOUNT32        0x108
+#define REG_SDBLKCOUNT32	0x108
-#define REG_SDFIFO32            0x10C
+#define REG_SDFIFO32		0x10C
 
-#define REG_CLK_AND_WAIT_CTL    0x138
+#define REG_CLK_AND_WAIT_CTL	0x138
-#define REG_RESET_SDIO          0x1e0
+#define REG_RESET_SDIO		0x1E0
 
 #define TMIO_STAT0_CMDRESPEND    0x0001
 #define TMIO_STAT0_DATAEND       0x0004
@@ -70,31 +66,7 @@
 #define TMIO_STAT1_CMD_BUSY      0x4000
 #define TMIO_STAT1_ILL_ACCESS    0x8000
 
-//Comes from TWLSDK mongoose.tef DWARF info
+#define TMIO_MASK_ALL           0x837F031D
-#define SDMC_NORMAL              0x00000000
-#define SDMC_ERR_COMMAND         0x00000001
-#define SDMC_ERR_CRC             0x00000002
-#define SDMC_ERR_END             0x00000004
-#define SDMC_ERR_TIMEOUT         0x00000008
-#define SDMC_ERR_FIFO_OVF        0x00000010
-#define SDMC_ERR_FIFO_UDF        0x00000020
-#define SDMC_ERR_WP              0x00000040
-#define SDMC_ERR_ABORT           0x00000080
-#define SDMC_ERR_FPGA_TIMEOUT    0x00000100
-#define SDMC_ERR_PARAM           0x00000200
-#define SDMC_ERR_R1_STATUS       0x00000800
-#define SDMC_ERR_NUM_WR_SECTORS  0x00001000
-#define SDMC_ERR_RESET           0x00002000
-#define SDMC_ERR_ILA             0x00004000
-#define SDMC_ERR_INFO_DETECT     0x00008000
-
-#define SDMC_STAT_ERR_UNKNOWN    0x00080000
-#define SDMC_STAT_ERR_CC         0x00100000
-#define SDMC_STAT_ERR_ECC_FAILED 0x00200000
-#define SDMC_STAT_ERR_CRC        0x00800000
-#define SDMC_STAT_ERR_OTHER      0xf9c70008
-
-#define TMIO_MASK_ALL           0x837f031d
 
 #define TMIO_MASK_GW            (TMIO_STAT1_ILL_ACCESS | TMIO_STAT1_CMDTIMEOUT | TMIO_STAT1_TXUNDERRUN | TMIO_STAT1_RXOVERFLOW | \
                                  TMIO_STAT1_DATATIMEOUT | TMIO_STAT1_STOPBIT_ERR | TMIO_STAT1_CRCFAIL | TMIO_STAT1_CMD_IDX_ERR)
@@ -103,7 +75,8 @@
 #define TMIO_MASK_WRITEOP (TMIO_STAT1_TXRQ | TMIO_STAT1_DATAEND)
 
 typedef struct mmcdevice {
-    vu8* data;
+    u8 *rData;
+    const u8 *tData;
     u32 size;
     u32 error;
     u16 stat0;
@@ -118,11 +91,10 @@ typedef struct mmcdevice {
     u32 res;
 } mmcdevice;
 
-int sdmmc_sdcard_init();
+bool sdmmc_sdcard_init(bool initSd, bool initNand);
-u32 sdmmc_sdcard_readsectors(u32 sector_no, u32 numsectors, vu8 *out);
+int sdmmc_sdcard_readsectors(u32 sector_no, u32 numsectors, u8 *out);
-u32 sdmmc_sdcard_writesectors(u32 sector_no, u32 numsectors, vu8 *in);
+int sdmmc_sdcard_writesectors(u32 sector_no, u32 numsectors, const u8 *in);
-mmcdevice *getMMCDevice(int drive);
+int sdmmc_nand_readsectors(u32 sector_no, u32 numsectors, u8 *out);
-int sdmmc_get_cid( int isNand, uint32_t *info);
+int sdmmc_nand_writesectors(u32 sector_no, u32 numsectors, const u8 *in);
-
+void sdmmc_get_cid(bool isNand, u32 *info);
-u32 sdmmc_nand_readsectors(u32 sector_no, u32 numsectors, vu8 *out);
+//mmcdevice *getMMCDevice(int drive);
-u32 sdmmc_nand_writesectors(u32 sector_no, u32 numsectors, vu8 *in);

source/fs.c

@@ -1,110 +1,141 @@
 /*
-*   fs.c
+*   This file is part of Luma3DS
+*   Copyright (C) 2016 Aurora Wright, TuxSH
+*
+*   This program is free software: you can redistribute it and/or modify
+*   it under the terms of the GNU General Public License as published by
+*   the Free Software Foundation, either version 3 of the License, or
+*   (at your option) any later version.
+*
+*   This program is distributed in the hope that it will be useful,
+*   but WITHOUT ANY WARRANTY; without even the implied warranty of
+*   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+*   GNU General Public License for more details.
+*
+*   You should have received a copy of the GNU General Public License
+*   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*
+*   Additional Terms 7.b of GPLv3 applies to this file: Requiring preservation of specified
+*   reasonable legal notices or author attributions in that material or in the Appropriate Legal
+*   Notices displayed by works containing it.
 */
 
 #include "fs.h"
 #include "memory.h"
+#include "strings.h"
 #include "fatfs/ff.h"
 
 static FATFS fs;
 
-u32 mountSD(void)
+bool mountFs(bool isSd)
 {
-    return f_mount(&fs, "0:", 1) == FR_OK;
+    return isSd ? f_mount(&fs, "0:", 1) == FR_OK : f_mount(&fs, "1:", 1) == FR_OK;
 }
 
-u32 mountCTRNAND(void)
+u32 fileRead(void *dest, const char *path, u32 maxSize)
-{
-    return f_mount(&fs, "1:", 1) == FR_OK;
-}
-
-u32 fileRead(void *dest, const char *path)
 {
     FIL file;
-    u32 size;
+    u32 ret = 0;
 
-    if(f_open(&file, path, FA_READ) == FR_OK)
+    if(f_open(&file, path, FA_READ) != FR_OK) return ret;
-    {
-        unsigned int read;
-        size = f_size(&file);
-        f_read(&file, dest, size, &read);
-        f_close(&file);
-    }
-    else size = 0;
 
-    return size;
+    u32 size = f_size(&file);
+    if(size <= maxSize)
+        f_read(&file, dest, size, (unsigned int *)&ret);
+    f_close(&file);
+
+    return ret;
 }
 
-void fileWrite(const void *buffer, const char *path, u32 size)
+bool fileWrite(const void *buffer, const char *path, u32 size)
 {
     FIL file;
 
-    if(f_open(&file, path, FA_WRITE | FA_OPEN_ALWAYS) == FR_OK)
+    switch(f_open(&file, path, FA_WRITE | FA_OPEN_ALWAYS))
     {
-        unsigned int written;
+        case FR_OK:
-        f_write(&file, buffer, size, &written);
+        {
-        f_close(&file);
+            unsigned int written;
+            f_write(&file, buffer, size, &written);
+            f_truncate(&file);
+            f_close(&file);
+
+            return (u32)written == size;
+        }
+        case FR_NO_PATH:
+            for(u32 i = 1; path[i] != 0; i++)
+                if(path[i] == '/')
+                {
+                    char folder[i + 1];
+                    memcpy(folder, path, i);
+                    folder[i] = 0;
+                    f_mkdir(folder);
+                }
+
+            return fileWrite(buffer, path, size);
+        default:
+            return false;
     }
 }
 
+void fileDelete(const char *path)
+{
+    f_unlink(path);
+}
+
+void fileRename(const char *oldPath, const char *newPath)
+{
+    f_rename(oldPath, newPath);
+}
+
 u32 firmRead(void *dest)
 {
-    const char *firmFolders[] = { "00000002", "20000002" };
+    const char *firmFolders[] = {"00000002", "20000002"};
-    char path[48] = "1:/title/00040138/00000000/content";
+    char path[48] = "1:/title/00040138/";
-    memcpy(&path[18], firmFolders[console], 8);
+    concatenateStrings(path, firmFolders[ISN3DS ? 1 : 0]);
+    concatenateStrings(path, "/content");
 
     DIR dir;
-    FILINFO info;
 
-    f_opendir(&dir, path);
+    u32 firmVersion = 0xFFFFFFFF,
-
-    u32 id = 0xFFFFFFFF,
         ret = 0;
 
+    if(f_opendir(&dir, path) != FR_OK) goto exit;
+
+    FILINFO info;
+
     //Parse the target directory
-    while(f_readdir(&dir, &info) == FR_OK && info.fname[0])
+    while(f_readdir(&dir, &info) == FR_OK && info.fname[0] != 0)
     {
         //Not a cxi
-        if(info.altname[9] != 'A') continue;
+        if(info.fname[9] != 'a' || strlen(info.fname) != 12) continue;
 
         //Multiple cxis were found
-        if(id != 0xFFFFFFFF) ret = 1;
+        if(firmVersion != 0xFFFFFFFF) ret = 1;
 
-        //Convert the .app name to an integer
+        u32 tempVersion = hexAtoi(info.altname, 8);
-        u32 tempId = 0;
-        for(char *tmp = info.altname; *tmp != '.'; tmp++)
-        {
-            tempId <<= 4;
-            tempId += *tmp > '9' ? *tmp - 'A' + 10 : *tmp - '0';
-        }
 
-        //FIRM is equal or newer than 11.0
+        //FIRM is newer than 11.3
-        if(tempId >= (console ? 0x21 : 0x52)) ret = 2;
+        if(!ISDEVUNIT && tempVersion > (ISN3DS ? 0x2D : 0x5C)) ret = 2;
 
         //Found an older cxi
-        if(tempId < id) id = tempId;
+        if(tempVersion < firmVersion) firmVersion = tempVersion;
     }
 
     f_closedir(&dir);
 
-    if(!ret)
+    if(ret == 1 || firmVersion == 0xFFFFFFFF) goto exit;
-    {
-        //Complete the string with the .app name
-        memcpy(&path[34], "/00000000.app", 14);
 
-        //Last digit of the .app
+    //Complete the string with the .app name
-        u32 i = 42;
+    concatenateStrings(path, "/00000000.app");
 
-        //Convert back the .app name from integer to array
+    //Convert back the .app name from integer to array
-        while(id)
+    hexItoa(firmVersion, path + 35, 8);
-        {
-            static const char hexDigits[] = "0123456789ABCDEF";
-            path[i--] = hexDigits[id & 0xF];
-            id >>= 4;
-        }
 
-        fileRead(dest, path);
+    if(!fileRead(dest, path, 0x100000)) ret = 3;
-    }
+
+exit:
+    if(firmVersion == 0xFFFFFFFF) ret = 4;
 
     return ret;
 }

source/fs.h

@@ -1,15 +1,32 @@
 /*
-*   fs.h
+*   This file is part of Luma3DS
+*   Copyright (C) 2016 Aurora Wright, TuxSH
+*
+*   This program is free software: you can redistribute it and/or modify
+*   it under the terms of the GNU General Public License as published by
+*   the Free Software Foundation, either version 3 of the License, or
+*   (at your option) any later version.
+*
+*   This program is distributed in the hope that it will be useful,
+*   but WITHOUT ANY WARRANTY; without even the implied warranty of
+*   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+*   GNU General Public License for more details.
+*
+*   You should have received a copy of the GNU General Public License
+*   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*
+*   Additional Terms 7.b of GPLv3 applies to this file: Requiring preservation of specified
+*   reasonable legal notices or author attributions in that material or in the Appropriate Legal
+*   Notices displayed by works containing it.
 */
 
 #pragma once
 
 #include "types.h"
 
-extern u32 console;
+bool mountFs(bool isSd);
-
+u32 fileRead(void *dest, const char *path, u32 maxSize);
-u32 mountSD(void);
+bool fileWrite(const void *buffer, const char *path, u32 size);
-u32 mountCTRNAND(void);
+void fileDelete(const char *path);
-u32 fileRead(void *dest, const char *path);
+void fileRename(const char *oldPath, const char *newPath);
-void fileWrite(const void *buffer, const char *path, u32 size);
 u32 firmRead(void *dest);

source/i2c.c

@@ -10,50 +10,58 @@ static const struct { u8 bus_id, reg_addr; } dev_data[] = {
     {2, 0xA4}, {2, 0x9A}, {2, 0xA0},
 };
 
-static inline u8 i2cGetDeviceBusId(u8 device_id) {
+static inline u8 i2cGetDeviceBusId(u8 device_id)
+{
     return dev_data[device_id].bus_id;
 }
 
-static inline u8 i2cGetDeviceRegAddr(u8 device_id) {
+static inline u8 i2cGetDeviceRegAddr(u8 device_id)
+{
     return dev_data[device_id].reg_addr;
 }
 
 //-----------------------------------------------------------------------------
 
-static vu8* reg_data_addrs[] = {
+static vu8 *reg_data_addrs[] = {
-    (vu8*)(I2C1_REG_OFF + I2C_REG_DATA),
+    (vu8 *)(I2C1_REG_OFF + I2C_REG_DATA),
-    (vu8*)(I2C2_REG_OFF + I2C_REG_DATA),
+    (vu8 *)(I2C2_REG_OFF + I2C_REG_DATA),
-    (vu8*)(I2C3_REG_OFF + I2C_REG_DATA),
+    (vu8 *)(I2C3_REG_OFF + I2C_REG_DATA),
 };
 
-static inline vu8* i2cGetDataReg(u8 bus_id) {
+static inline vu8 *i2cGetDataReg(u8 bus_id)
+{
     return reg_data_addrs[bus_id];
 }
 
 //-----------------------------------------------------------------------------
 
-static vu8* reg_cnt_addrs[] = {
+static vu8 *reg_cnt_addrs[] = {
-    (vu8*)(I2C1_REG_OFF + I2C_REG_CNT),
+    (vu8 *)(I2C1_REG_OFF + I2C_REG_CNT),
-    (vu8*)(I2C2_REG_OFF + I2C_REG_CNT),
+    (vu8 *)(I2C2_REG_OFF + I2C_REG_CNT),
-    (vu8*)(I2C3_REG_OFF + I2C_REG_CNT),
+    (vu8 *)(I2C3_REG_OFF + I2C_REG_CNT),
 };
 
-static inline vu8* i2cGetCntReg(u8 bus_id) {
+static inline vu8 *i2cGetCntReg(u8 bus_id)
+{
     return reg_cnt_addrs[bus_id];
 }
 
 //-----------------------------------------------------------------------------
 
-static inline void i2cWaitBusy(u8 bus_id) {
+static inline void i2cWaitBusy(u8 bus_id)
+{
     while (*i2cGetCntReg(bus_id) & 0x80);
 }
 
-static inline u32 i2cGetResult(u8 bus_id) {
+static inline bool i2cGetResult(u8 bus_id)
+{
     i2cWaitBusy(bus_id);
+
     return (*i2cGetCntReg(bus_id) >> 4) & 1;
 }
 
-static void i2cStop(u8 bus_id, u8 arg0) {
+static void i2cStop(u8 bus_id, u8 arg0)
+{
     *i2cGetCntReg(bus_id) = (arg0 << 5) | 0xC0;
     i2cWaitBusy(bus_id);
     *i2cGetCntReg(bus_id) = 0xC5;
@@ -61,38 +69,45 @@ static void i2cStop(u8 bus_id, u8 arg0) {
 
 //-----------------------------------------------------------------------------
 
-static u32 i2cSelectDevice(u8 bus_id, u8 dev_reg) {
+static bool i2cSelectDevice(u8 bus_id, u8 dev_reg)
+{
     i2cWaitBusy(bus_id);
     *i2cGetDataReg(bus_id) = dev_reg;
     *i2cGetCntReg(bus_id) = 0xC2;
+
     return i2cGetResult(bus_id);
 }
 
-static u32 i2cSelectRegister(u8 bus_id, u8 reg) {
+static bool i2cSelectRegister(u8 bus_id, u8 reg)
+{
     i2cWaitBusy(bus_id);
     *i2cGetDataReg(bus_id) = reg;
     *i2cGetCntReg(bus_id) = 0xC0;
+
     return i2cGetResult(bus_id);
 }
 
 //-----------------------------------------------------------------------------
 
-u32 i2cWriteRegister(u8 dev_id, u8 reg, u8 data) {
+bool i2cWriteRegister(u8 dev_id, u8 reg, u8 data)
-    u8 bus_id = i2cGetDeviceBusId(dev_id);
+{
-    u8 dev_addr = i2cGetDeviceRegAddr(dev_id);
+    u8 bus_id = i2cGetDeviceBusId(dev_id),
+       dev_addr = i2cGetDeviceRegAddr(dev_id);
 
-    for (int i = 0; i < 8; i++) {
+    for(u32 i = 0; i < 8; i++)
-        if (i2cSelectDevice(bus_id, dev_addr) && i2cSelectRegister(bus_id, reg)) {
+    {
+        if(i2cSelectDevice(bus_id, dev_addr) && i2cSelectRegister(bus_id, reg))
+        {
             i2cWaitBusy(bus_id);
             *i2cGetDataReg(bus_id) = data;
             *i2cGetCntReg(bus_id) = 0xC1;
             i2cStop(bus_id, 0);
-            if (i2cGetResult(bus_id))
+
-                return 1;
+            if(i2cGetResult(bus_id)) return true;
         }
         *i2cGetCntReg(bus_id) = 0xC5;
         i2cWaitBusy(bus_id);
     }
 
-    return 0;
+    return false;
 }

source/i2c.h

@@ -15,4 +15,4 @@
 #define I2C_DEV_GYRO 10
 #define I2C_DEV_IR   13
 
-u32 i2cWriteRegister(u8 dev_id, u8 reg, u8 data);
+bool i2cWriteRegister(u8 dev_id, u8 reg, u8 data);

source/installer.c

@@ -2,216 +2,352 @@
 *   installer.c
 */
 
-#include "installer.h"
 #include "memory.h"
 #include "fs.h"
 #include "crypto.h"
-#include "screeninit.h"
+#include "screen.h"
 #include "draw.h"
 #include "utils.h"
+#include "types.h"
+#include "installer.h"
 #include "fatfs/sdmmc/sdmmc.h"
 
-static const u8 sectorHash[0x20] = {
+static const u8 sectorHashRetail[SHA_256_HASH_SIZE] = {
     0x82, 0xF2, 0x73, 0x0D, 0x2C, 0x2D, 0xA3, 0xF3, 0x01, 0x65, 0xF9, 0x87, 0xFD, 0xCC, 0xAC, 0x5C,
     0xBA, 0xB2, 0x4B, 0x4E, 0x5F, 0x65, 0xC9, 0x81, 0xCD, 0x7B, 0xE6, 0xF4, 0x38, 0xE6, 0xD9, 0xD3
-};
+},
-
+                firm0HashRetail[SHA_256_HASH_SIZE] = {
-static const u8 firm0Hash[0x20] = {
     0x6E, 0x4D, 0x14, 0xAD, 0x51, 0x50, 0xA5, 0x9A, 0x87, 0x59, 0x62, 0xB7, 0x09, 0x0A, 0x3C, 0x74,
     0x4F, 0x72, 0x4B, 0xBD, 0x97, 0x39, 0x33, 0xF2, 0x11, 0xC9, 0x35, 0x22, 0xC8, 0xBB, 0x1C, 0x7D
-};
+},
-
+                firm0A9lhHashRetail[SHA_256_HASH_SIZE] = {
-static const u8 firm0A9lhHash[0x20] = {
     0x79, 0x3D, 0x35, 0x7B, 0x8F, 0xF1, 0xFC, 0xF0, 0x8F, 0xB6, 0xDB, 0x51, 0x31, 0xD4, 0xA7, 0x74,
     0x8E, 0xF0, 0x4A, 0xB1, 0xA6, 0x7F, 0xCD, 0xAB, 0x0C, 0x0A, 0xC0, 0x69, 0xA7, 0x9D, 0xC5, 0x04
+},
+                firm090A9lhHash[SHA_256_HASH_SIZE] = {
+    0x68, 0x52, 0xCC, 0x21, 0x89, 0xAE, 0x28, 0x38, 0x1A, 0x75, 0x90, 0xE7, 0x38, 0x23, 0x48, 0x41,
+    0x8E, 0x80, 0x78, 0x75, 0x27, 0x64, 0x04, 0xD6, 0x28, 0xD6, 0xFA, 0x39, 0xA8, 0x6F, 0xB0, 0x3F
+},
+                firm1HashRetail[SHA_256_HASH_SIZE] = {
+    0xD8, 0x2D, 0xB7, 0xB4, 0x38, 0x2B, 0x07, 0x88, 0x99, 0x77, 0x91, 0x0C, 0xC6, 0xEC, 0x6D, 0x87,
+    0x7D, 0x21, 0x79, 0x23, 0xD7, 0x60, 0xAF, 0x4E, 0x8B, 0x3A, 0xAB, 0xB2, 0x63, 0xE4, 0x21, 0xC6
+},
+                sectorHashDev[SHA_256_HASH_SIZE] = {
+    0xB2, 0x91, 0xD9, 0xB1, 0x33, 0x05, 0x79, 0x0D, 0x47, 0xC6, 0x06, 0x98, 0x4C, 0x67, 0xC3, 0x70, 
+    0x09, 0x54, 0xE3, 0x85, 0xDE, 0x47, 0x55, 0xAF, 0xC6, 0xCB, 0x1D, 0x8D, 0xC7, 0x84, 0x5A, 0x64
+},
+                firm0HashDev[SHA_256_HASH_SIZE] = {
+    0xCD, 0x62, 0xA6, 0x58, 0x40, 0x1B, 0x8B, 0x8F, 0xD3, 0x2C, 0x72, 0x58, 0xD8, 0x24, 0x21, 0x36,
+    0xCF, 0x83, 0x40, 0xA3, 0x34, 0x8E, 0xED, 0x33, 0x0A, 0x1A, 0x16, 0x04, 0x49, 0xC9, 0x74, 0x3E
+},
+                firm0A9lhHashDev[SHA_256_HASH_SIZE] = {
+    0x60, 0xBB, 0xD1, 0x35, 0x44, 0x2F, 0xBD, 0x47, 0x69, 0xBF, 0x36, 0x4B, 0x0B, 0x79, 0x6E, 0x4C,
+    0xE1, 0xB2, 0xDB, 0x7A, 0xAD, 0xF0, 0x04, 0x31, 0xCB, 0xBD, 0x54, 0xD3, 0x99, 0x8C, 0x9C, 0xD2
+},
+                firm1HashDev[SHA_256_HASH_SIZE] = {
+    0xCD, 0x87, 0x85, 0x33, 0x76, 0xCA, 0x2A, 0x3F, 0xFC, 0x24, 0x4C, 0x29, 0x95, 0x8B, 0xA8, 0x34,
+    0xF2, 0x38, 0x14, 0x58, 0x10, 0x83, 0x56, 0x4F, 0x0D, 0x5A, 0xDB, 0x29, 0x12, 0xD8, 0xA9, 0x84
 };
 
-static const u8 firm1Hash[0x20] = {
+u32 posY;
-    0xD2, 0x53, 0xC1, 0xCC, 0x0A, 0x5F, 0xFA, 0xC6, 0xB3, 0x83, 0xDA, 0xC1, 0x82, 0x7C, 0xFB, 0x3B,
-    0x2D, 0x3D, 0x56, 0x6C, 0x6A, 0x1A, 0x8E, 0x52, 0x54, 0xE3, 0x89, 0xC2, 0x95, 0x06, 0x23, 0xE5
-};
 
-int posY;
+static void drawTitle(void)
+{
+    initScreens();
 
-u32 console;
+    posY = drawString(TITLE, 10, 10, COLOR_TITLE);
+    posY = drawString("Thanks to delebile, #cakey and StandardBus", 10, posY + SPACING_Y, COLOR_WHITE);
+}
 
 void main(void)
 {
-    initScreens();
+    bool isOtpless = ISA9LH && *(vu32 *)0x80FD0FC == 0xEAFE4AA3 && magic == 0xDEADCAFE;
-    sdmmc_sdcard_init();
 
-    //Determine if booting with A9LH
+    if(!isOtpless) drawTitle();
-    u32 a9lhBoot = !PDN_SPI_CNT;
-    //Detect the console being used
-    console = PDN_MPCORE_CFG == 7;
 
-    drawString(TITLE, 10, 10, COLOR_TITLE);
+    if(!sdmmc_sdcard_init(!isOtpless, true) && !isOtpless)
-    posY = drawString("Thanks to delebile, #cakey and StandardBus", 10, 40, COLOR_WHITE);
+        shutdown(1, "Error: failed to initialize SD and NAND");
-    posY = drawString(a9lhBoot ? "Press SELECT to update A9LH, START to uninstall" : "Press SELECT for a full install", 10, posY + SPACING_Y, COLOR_WHITE);
-    posY = drawString("Press any other button to shutdown", 10, posY, COLOR_WHITE);
 
-    u32 pressed = waitInput();
+    u32 pressed;
-    if(pressed == BUTTON_SELECT) installer(a9lhBoot);
+
-    if(pressed == BUTTON_START && a9lhBoot) uninstaller();
+    if(!isOtpless)
+    {
+        posY = drawString(ISA9LH ? "Press SELECT to update A9LH, START to uninstall" : "Press SELECT for a full install", 10, posY + SPACING_Y, COLOR_WHITE);
+        posY = drawString("Press any other button to shutdown", 10, posY, COLOR_WHITE);
+        pressed = waitInput();
+    }
+
+    if(isOtpless || pressed == BUTTON_SELECT) installer(isOtpless);
+    if(pressed == BUTTON_START && ISA9LH) uninstaller();
 
     shutdown(0, NULL);
 }
 
-static inline void installer(u32 a9lhBoot)
+static inline void installer(bool isOtpless)
 {
-    if(!mountSD())
+    bool updateKey2 = false,
+         updateFirm0 = false,
+         updateFirm1 = false;
+    u8 otp[256] = {0},
+       keySector[512];
+
+    if(!isOtpless && !mountFs(true))
         shutdown(1, "Error: failed to mount the SD card");
 
-    const char *path;
+    //If making a first install on O3DS, we need the OTP
-    u32 updatea9lh = 0;
+    if(!ISA9LH && (!ISN3DS || ISDEVUNIT))
-
-    //If making a first install, we need the OTP
-    if(!a9lhBoot)
     {
-        //Read OTP
+        const char otpPath[] = "a9lh/otp.bin";
-        path = "a9lh/otp.bin";
-        if(fileRead((void *)OTP_OFFSET, path) != 256)
-        {
-            u8 zeroes[256] = {0};
-            if(memcmp((void *)OTP_FROM_MEM, zeroes, 256) == 0)
-                shutdown(1, "Error: otp.bin doesn't exist and can't be dumped");
 
-            fileWrite((void *)OTP_FROM_MEM, path, 256);
+        //Prefer OTP from memory if available
-            memcpy((void *)OTP_OFFSET, (void *)OTP_FROM_MEM, 256);
+        if(memcmp((void *)OTP_FROM_MEM, otp, sizeof(otp)) == 0)
+        {
+            // Read OTP from file
+            if(fileRead(otp, otpPath, sizeof(otp)) != sizeof(otp))
+                shutdown(1, "Error: otp.bin doesn't exist and can't be dumped");
+        }
+        else
+        {
+            //Write OTP from memory to file
+            fileWrite((void *)OTP_FROM_MEM, otpPath, sizeof(otp));
+            memcpy(otp, (void *)OTP_FROM_MEM, sizeof(otp));
         }
     }
 
     //Setup the key sector de/encryption with the SHA register or otp.bin
-    setupKeyslot0x11(a9lhBoot, (void *)OTP_OFFSET);
+    if(ISA9LH || !ISN3DS || ISDEVUNIT) setupKeyslot0x11(otp);
 
     //Calculate the CTR for the 3DS partitions
-    getNandCTR();
+    getNandCtr();
 
     //Get NAND FIRM0 and test that the CTR is correct
-    readFirm0((u8 *)FIRM0_OFFSET, FIRM0_SIZE);
+    if(!isOtpless)
-    if(memcmp((void *)FIRM0_OFFSET, "FIRM", 4) != 0)
+    {
-        shutdown(1, "Error: failed to setup FIRM encryption");
+        readFirm0((u8 *)FIRM0_OFFSET, FIRM0_SIZE);
+        if(memcmp((void *)FIRM0_OFFSET, "FIRM", 4) != 0)
+            shutdown(1, "Error: failed to setup FIRM encryption");
+    }
 
     //If booting from A9LH or on N3DS, we can use the key sector from NAND
-    if(a9lhBoot || console)
+    if(ISA9LH || ISN3DS) getSector(keySector);
-    {
-         getSector((u8 *)SECTOR_OFFSET);
-
-         u32 i;
-         for(i = 0; i < 3; i++)
-             if(memcmp((void *)(SECTOR_OFFSET + 0x10), key2s[i], 0x10) == 0) break;
-
-         if(i == 3) shutdown(1, a9lhBoot ? "Error: the OTP hash or the NAND key sector\nare invalid" :
-                                           "Error: the otp.bin or the NAND key sector\nare invalid");
-         else if(i == 1) updatea9lh = 1;
-    }
     else
     {
          //Read decrypted key sector
-         path = "a9lh/secret_sector.bin";
+         if(fileRead(keySector, "a9lh/secret_sector.bin", sizeof(keySector)) != sizeof(keySector))
-         if(fileRead((void *)SECTOR_OFFSET, path) != 0x200)
              shutdown(1, "Error: secret_sector.bin doesn't exist or has\na wrong size");
-         if(!verifyHash((void *)SECTOR_OFFSET, 0x200, sectorHash))
+         if(!verifyHash(keySector, sizeof(keySector), !ISDEVUNIT ? sectorHashRetail : sectorHashDev))
              shutdown(1, "Error: secret_sector.bin is invalid or corrupted");
     }
 
-    if(!a9lhBoot || updatea9lh)
+    if(ISA9LH && !isOtpless)
     {
-        //Generate and encrypt a per-console A9LH key sector
+        u32 i;
-        generateSector((u8 *)SECTOR_OFFSET, 0);
 
+        if(!ISDEVUNIT)
+        {
+            for(i = 1; i < 5; i++)
+                if(memcmp(keySector + AES_BLOCK_SIZE, key2s[i], AES_BLOCK_SIZE) == 0) break;
+        }
+        else i = memcmp(keySector + AES_BLOCK_SIZE, devKey2s[1], AES_BLOCK_SIZE) == 0 ? 1 : 5;
+
+        switch(i)
+        {
+            case 5:
+                shutdown(1, "Error: the OTP hash or the NAND key sector\nare invalid");
+                break;
+            case 2:
+            case 3:
+            case 4:
+                updateFirm1 = true;
+                updateKey2 = true;
+                break;
+            case 1:
+                break;
+        }
+
+        if(!verifyHash((void *)FIRM0_OFFSET, SECTION2_POSITION, !ISDEVUNIT ? firm0A9lhHashRetail : firm0A9lhHashDev))
+        {
+            if(ISDEVUNIT || !verifyHash((void *)FIRM0_OFFSET, SECTION2_POSITION, firm090A9lhHash))
+                shutdown(1, "Error: NAND FIRM0 is invalid");
+
+            updateFirm0 = true;
+        }
+    }
+
+    if(!ISA9LH || updateKey2 || isOtpless) generateSector(keySector, (!ISA9LH && ISN3DS && !ISDEVUNIT) ? 1 : 0);
+
+    if(!ISA9LH || updateFirm0)
+    {
         //Read FIRM0
-        path = "a9lh/firm0.bin";
+        if(fileRead((void *)FIRM0_OFFSET, "a9lh/firm0.bin", FIRM0_SIZE) != FIRM0_SIZE)
-        if(fileRead((void *)FIRM0_OFFSET, path) != FIRM0_SIZE)
             shutdown(1, "Error: firm0.bin doesn't exist or has a wrong size");
-
+        if(!verifyHash((void *)FIRM0_OFFSET, FIRM0_SIZE, !ISDEVUNIT ? firm0HashRetail : firm0HashDev))
-        if(!verifyHash((void *)FIRM0_OFFSET, FIRM0_SIZE, firm0Hash))
             shutdown(1, "Error: firm0.bin is invalid or corrupted");
     }
-    else if(!verifyHash((void *)FIRM0_OFFSET, SECTION2_POSITION, firm0A9lhHash))
-        shutdown(1, "Error: NAND FIRM0 is invalid");
 
-    if(!a9lhBoot)
+    if(!ISA9LH || updateFirm1)
     {
         //Read FIRM1
-        path = "a9lh/firm1.bin";
+        if(fileRead((void *)FIRM1_OFFSET, "a9lh/firm1.bin", FIRM1_SIZE) != FIRM1_SIZE)
-        if(fileRead((void *)FIRM1_OFFSET, path) != FIRM1_SIZE)
             shutdown(1, "Error: firm1.bin doesn't exist or has a wrong size");
-
+        if(!verifyHash((void *)FIRM1_OFFSET, FIRM1_SIZE, !ISDEVUNIT ? firm1HashRetail : firm1HashDev))
-        if(!verifyHash((void *)FIRM1_OFFSET, FIRM1_SIZE, firm1Hash))
             shutdown(1, "Error: firm1.bin is invalid or corrupted");
     }
 
-    //Inject stage1
+    if(!ISA9LH && ISN3DS && !ISDEVUNIT)
-    memset32((void *)STAGE1_OFFSET, 0, MAX_STAGE1_SIZE);
+    {
-    path = "a9lh/payload_stage1.bin";
+        magic = 0xDEADCAFE;
-    u32 size = fileRead((void *)STAGE1_OFFSET, path);
-    if(!size || size > MAX_STAGE1_SIZE)
-        shutdown(1, "Error: payload_stage1.bin doesn't exist or\nexceeds max size");
 
-    //Read stage2
+        fileRename("arm9loaderhax.bin", "arm9loaderhax.bak");
-    memset32((void *)STAGE2_OFFSET, 0, MAX_STAGE2_SIZE);
-    path = "a9lh/payload_stage2.bin";
-    size = fileRead((void *)STAGE2_OFFSET, path);
-    if(!size || size > MAX_STAGE2_SIZE)
-        shutdown(1, "Error: payload_stage2.bin doesn't exist or\nexceeds max size");
 
-    posY = drawString("All checks passed, installing...", 10, posY + SPACING_Y, COLOR_WHITE);
+        if(!fileWrite((void *)0x23F00000, "arm9loaderhax.bin", 0x10000))
+            shutdown(1, "Error: couldn't write arm9loaderhax.bin");
+    }
 
-    //Point of no return, install stuff in the safest order
+    if(!isOtpless)
-    sdmmc_nand_writesectors(0x5C000, 0x20, (vu8 *)STAGE2_OFFSET);
+    {
-    if(!a9lhBoot) writeFirm((u8 *)FIRM1_OFFSET, 1, FIRM1_SIZE);
+        bool missingStage1Hash,
-    if(!a9lhBoot || updatea9lh) sdmmc_nand_writesectors(0x96, 1, (vu8 *)SECTOR_OFFSET);
+             missingStage2Hash;
-    writeFirm((u8 *)FIRM0_OFFSET, 0, FIRM0_SIZE);
+        u8 stageHash[SHA_256_HASH_SIZE];
 
-    shutdown(2, a9lhBoot ? "Update: success!" : "Full install: success!");
+        //Inject stage1
+        memset32((void *)STAGE1_OFFSET, 0, MAX_STAGE1_SIZE);
+        u32 stageSize = fileRead((void *)STAGE1_OFFSET, "a9lh/payload_stage1.bin", MAX_STAGE1_SIZE);
+        if(!stageSize)
+            shutdown(1, "Error: payload_stage1.bin doesn't exist or\nexceeds max size");
+
+        const u8 zeroes[688] = {0};
+        if(memcmp(zeroes, (void *)STAGE1_OFFSET, 688) == 0)
+            shutdown(1, "Error: the payload_stage1.bin you're attempting\nto install is not compatible");
+
+        //Verify stage1
+        if(fileRead(stageHash, "a9lh/payload_stage1.bin.sha", sizeof(stageHash)) == sizeof(stageHash))
+        {
+            if(!verifyHash((void *)STAGE1_OFFSET, stageSize, stageHash))
+                shutdown(1, "Error: payload_stage1.bin is invalid\nor corrupted");
+
+            missingStage1Hash = false;
+        }
+        else missingStage1Hash = true;
+
+        //Read stage2
+        memset32((void *)STAGE2_OFFSET, 0, MAX_STAGE2_SIZE);
+        stageSize = fileRead((void *)STAGE2_OFFSET, "a9lh/payload_stage2.bin", MAX_STAGE2_SIZE);
+        if(!stageSize)
+            shutdown(1, "Error: payload_stage2.bin doesn't exist or\nexceeds max size");
+
+        //Verify stage2
+        if(fileRead(stageHash, "a9lh/payload_stage2.bin.sha", sizeof(stageHash)) == sizeof(stageHash))
+        {
+            if(!verifyHash((void *)STAGE2_OFFSET, stageSize, stageHash))
+                shutdown(1, "Error: payload_stage2.bin is invalid\nor corrupted");
+
+            missingStage2Hash = false;
+        }
+        else missingStage2Hash = true;
+
+        if(missingStage1Hash || missingStage2Hash)
+        {
+            posY = drawString("Couldn't verify stage1 and/or stage2 integrity!", 10, posY + SPACING_Y, COLOR_RED);
+            posY = drawString("Continuing might be dangerous!", 10, posY, COLOR_RED);
+            inputSequence();
+        }
+
+        posY = drawString("All checks passed, installing...", 10, posY + SPACING_Y, COLOR_WHITE);
+
+        sdmmc_nand_writesectors(0x5C000, MAX_STAGE2_SIZE / 0x200, (u8 *)STAGE2_OFFSET);
+    }
+
+    if(!ISA9LH || updateFirm1) writeFirm((u8 *)FIRM1_OFFSET, true, FIRM1_SIZE);
+    if(!ISA9LH || updateKey2 || isOtpless) sdmmc_nand_writesectors(0x96, 1, keySector);
+    if(!isOtpless) writeFirm((u8 *)FIRM0_OFFSET, false, FIRM0_SIZE);
+    else
+    {
+        *(vu32 *)0x80FD0FC = 0;
+
+        drawTitle();
+
+        if(sdmmc_sdcard_init(true, false) && mountFs(true))
+        {
+            fileDelete("arm9loaderhax.bin");
+            fileRename("arm9loaderhax.bak", "arm9loaderhax.bin");
+        }
+        else
+        {
+            posY = drawString("Couldn't remove arm9loaderhax.bin!", 10, posY + SPACING_Y, COLOR_RED);
+            posY = drawString("Do it yourself after the install ends", 10, posY, COLOR_RED);
+        }
+    }
+
+    if(!ISA9LH && ISN3DS && !ISDEVUNIT)
+    {
+        *(vu32 *)0x80FD0FC = 0xEAFE4AA3;
+
+        mcuReboot();
+    }
+
+    shutdown(2, ISA9LH && !isOtpless ? "Update: success!" : "Full install: success!");
 }
 
 static inline void uninstaller(void)
 {
-    posY = drawString("You are about to uninstall A9LH!", 10, posY + 10, COLOR_RED);
+    u8 keySector[512];
-    posY = drawString("Doing this will require having 9.0 to reinstall!", 10, posY, COLOR_RED);
-    posY = drawString("If you would like to continue, press:", 10, posY, COLOR_WHITE);
-    posY = drawString("Up, Down, Left, Right, B, A, START, SELECT", 10, posY, COLOR_WHITE);
-
-    u32 unlockSequence[] = { BUTTON_UP, BUTTON_DOWN, BUTTON_LEFT, BUTTON_RIGHT, BUTTON_B, BUTTON_A, BUTTON_START, BUTTON_SELECT },
-        sequenceSize = sizeof(unlockSequence) / sizeof(u32);
-
-    for(u32 correctPresses = 0; correctPresses < sequenceSize; correctPresses++)
-    {
-        if(waitInput() != unlockSequence[correctPresses])
-            shutdown(1, "Button sequence not entered correctly");
-    }
 
     //New 3DSes need a key sector with a proper key2, Old 3DSes have a blank key sector
-    if(console)
+    if(ISN3DS)
     {
-        setupKeyslot0x11(1, NULL);
+        setupKeyslot0x11(NULL);
-        getSector((u8 *)SECTOR_OFFSET);
+        getSector(keySector);
-        if(memcmp((void *)(SECTOR_OFFSET + 0x10), key2s[1], 0x10) != 0 && memcmp((void *)(SECTOR_OFFSET + 0x10), key2s[2], 0x10) != 0)
-            shutdown(1, "Error: the OTP hash or the NAND key sector\nare invalid");
-        generateSector((u8 *)SECTOR_OFFSET, 1);
-    }
-    else memset32((void *)SECTOR_OFFSET, 0, 0x200);
 
-    if(!mountCTRNAND())
+        u32 i;
+
+        if(!ISDEVUNIT)
+        {
+            for(i = 1; i < 5; i++)
+                if(memcmp(keySector + AES_BLOCK_SIZE, key2s[i], AES_BLOCK_SIZE) == 0) break;
+        }
+        else i = memcmp(keySector + AES_BLOCK_SIZE, devKey2s[1], AES_BLOCK_SIZE) == 0 ? 1 : 5;
+
+        if(i == 5) shutdown(1, "Error: the OTP hash or the NAND key sector\nare invalid");
+
+        generateSector(keySector, 2);
+    }
+    else memset32(keySector, 0, sizeof(keySector));
+
+    if(!mountFs(false))
         shutdown(1, "Error: failed to mount CTRNAND");
 
     //Read FIRM cxi from CTRNAND
-    switch(firmRead((void *)FIRM0_OFFSET))
+    u32 firmSize = 0,
+        result = firmRead((void *)FIRM0_OFFSET);
+
+    switch(result)
     {
         case 1:
-            shutdown(1, "Error: more than one FIRM cxi has been detected");
+            shutdown(1, "Error: more than one FIRM has been detected");
             break;
         case 2:
-            shutdown(1, "Error: a FIRM equal or newer than 11.0\nhas been detected");
+            posY = drawString("A FIRM newer than 11.3 has been detected!", 10, posY + SPACING_Y, COLOR_RED);
+            posY = drawString("You are about to uninstall A9LH!", 10, posY + SPACING_Y, COLOR_RED);
+            posY = drawString("To reinstall you'll need hardmod + NAND backup!", 10, posY, COLOR_RED);
+            break;
+        case 3:
+            shutdown(1, "Error: the CTRNAND FIRM is too large");
+            break;
+        case 4:
+            shutdown(1, "Error: couldn't read FIRM from CTRNAND");
             break;
         default:
+            posY = drawString("You are about to uninstall A9LH!", 10, posY + SPACING_Y, COLOR_RED);
+            posY = drawString("To reinstall you'll need 9.2 or lower!", 10, posY, COLOR_RED);
             break;
     }
 
+    inputSequence();
+
     //Decrypt it and get its size
-    u32 firmSize = decryptExeFs((void *)FIRM0_OFFSET);
+    firmSize = decryptExeFs((Cxi *)FIRM0_OFFSET);
+    if(firmSize == 0) shutdown(1, "Error: couldn't decrypt the CTRNAND FIRM");
 
     //writeFirm encrypts in-place, so we need two copies
     memcpy((void *)FIRM1_OFFSET, (void *)FIRM0_OFFSET, firmSize);
@@ -222,10 +358,10 @@ static inline void uninstaller(void)
     posY = drawString("All checks passed, uninstalling...", 10, posY + SPACING_Y, COLOR_WHITE);
 
     //Point of no return, install stuff in the safest order
-    sdmmc_nand_writesectors(0x96, 1, (vu8 *)SECTOR_OFFSET);
+    sdmmc_nand_writesectors(0x96, 1, keySector);
-    writeFirm((u8 *)FIRM0_OFFSET, 0, firmSize);
+    writeFirm((u8 *)FIRM0_OFFSET, false, firmSize);
-    writeFirm((u8 *)FIRM1_OFFSET, 1, firmSize);
+    writeFirm((u8 *)FIRM1_OFFSET, true, firmSize);
-    sdmmc_nand_writesectors(0x5C000, 0x20, (vu8 *)STAGE2_OFFSET);
+    sdmmc_nand_writesectors(0x5C000, MAX_STAGE2_SIZE / 0x200, (u8 *)STAGE2_OFFSET);
 
     shutdown(2, "Uninstall: success!");
 }

source/installer.h

@@ -6,22 +6,22 @@
 
 #include "types.h"
 
-#define PDN_MPCORE_CFG     (*(vu8 *)0x10140FFC)
-#define PDN_SPI_CNT        (*(vu8 *)0x101401C0)
-
 #define OTP_FROM_MEM      0x10012000
-#define OTP_OFFSET        0x24000000
+#define FIRM0_OFFSET      0x24000000
-#define SECTOR_OFFSET     0x24100000
-#define FIRM0_OFFSET      0x24200000
-#define FIRM1_OFFSET      0x24300000
-#define FIRM0_SIZE        0xF3000
 #define SECTION2_POSITION 0x66A00
+#define FIRM1_OFFSET      0x24100000
+#define FIRM0_SIZE        0xF3000
 #define FIRM1_SIZE        0xF2000
 #define STAGE1_POSITION   0xF0590
 #define STAGE1_OFFSET     FIRM0_OFFSET + STAGE1_POSITION
-#define STAGE2_OFFSET     0x24400000
+#define STAGE2_OFFSET     0x24200000
 #define MAX_STAGE1_SIZE   0x1E70
-#define MAX_STAGE2_SIZE   0x2800
+#define MAX_STAGE2_SIZE   0x89A00
 
-static inline void installer(u32 a9lhBoot);
+extern u32 magic;
+
+extern const u8 key2s[5][AES_BLOCK_SIZE],
+                devKey2s[2][AES_BLOCK_SIZE];
+
+static inline void installer(bool isOtpless);
 static inline void uninstaller(void);

source/memory.c

@@ -1,5 +1,7 @@
 /*
 *   memory.c
+*
+*   memcpy, memset32 and memcmp adapted from https://github.com/mid-kid/CakesForeveryWan/blob/557a8e8605ab3ee173af6497486e8f22c261d0e2/source/memfuncs.c
 */
 
 #include "memory.h"
@@ -17,19 +19,19 @@ void memset32(void *dest, u32 filler, u32 size)
 {
     u32 *dest32 = (u32 *)dest;
 
-    for (u32 i = 0; i < size / 4; i++)
+    for(u32 i = 0; i < size / 4; i++)
         dest32[i] = filler;
 }
 
 int memcmp(const void *buf1, const void *buf2, u32 size)
 {
-    const u8 *buf1c = (const u8 *)buf1;
+    const u8 *buf1c = (const u8 *)buf1,
-    const u8 *buf2c = (const u8 *)buf2;
+             *buf2c = (const u8 *)buf2;
 
     for(u32 i = 0; i < size; i++)
     {
         int cmp = buf1c[i] - buf2c[i];
-        if(cmp) return cmp;
+        if(cmp != 0) return cmp;
     }
 
     return 0;

source/memory.h

@@ -1,5 +1,7 @@
 /*
 *   memory.h
+*
+*   memcpy, memset32 and memcmp adapted from https://github.com/mid-kid/CakesForeveryWan/blob/557a8e8605ab3ee173af6497486e8f22c261d0e2/source/memfuncs.c
 */
 
 #pragma once

source/screen.c

@@ -0,0 +1,196 @@
+/*
+*   This file is part of Luma3DS
+*   Copyright (C) 2016 Aurora Wright, TuxSH
+*
+*   This program is free software: you can redistribute it and/or modify
+*   it under the terms of the GNU General Public License as published by
+*   the Free Software Foundation, either version 3 of the License, or
+*   (at your option) any later version.
+*
+*   This program is distributed in the hope that it will be useful,
+*   but WITHOUT ANY WARRANTY; without even the implied warranty of
+*   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+*   GNU General Public License for more details.
+*
+*   You should have received a copy of the GNU General Public License
+*   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*
+*   Additional Terms 7.b of GPLv3 applies to this file: Requiring preservation of specified
+*   reasonable legal notices or author attributions in that material or in the Appropriate Legal
+*   Notices displayed by works containing it.
+*/
+
+/*
+*   Screen init code by dark_samus, bil1s, Normmatt, delebile and others
+*/
+
+/*
+*   About cache coherency:
+*
+*   Flushing the data cache for all memory regions read from/written to by both processors is mandatory on the ARM9 processor.
+*   Thus, we make sure there'll be a cache miss on the ARM9 next time it's read.
+*   Otherwise the ARM9 won't see the changes made and things will break.
+*
+*   On the ARM11, in the environment we're in, the MMU isn't enabled and nothing is cached.
+*/
+
+#include "screen.h"
+#include "cache.h"
+#include "utils.h"
+#include "memory.h"
+#include "i2c.h"
+
+vu32 *arm11Entry = (vu32 *)BRAHMA_ARM11_ENTRY;
+
+static void invokeArm11Function(void (*func)())
+{
+    *arm11Entry = (u32)func;
+    while(*arm11Entry);
+}
+
+void clearScreens(void)
+{
+    void __attribute__((naked)) ARM11(void)
+    {
+        //Setting up two simultaneous memory fills using the GPU
+
+        vu32 *REGs_PSC0 = (vu32 *)0x10400010,
+             *REGs_PSC1 = (vu32 *)0x10400020;
+
+        REGs_PSC0[0] = (u32)fb->top_left >> 3; //Start address
+        REGs_PSC0[1] = (u32)(fb->top_left + SCREEN_TOP_FBSIZE) >> 3; //End address
+        REGs_PSC0[2] = 0; //Fill value
+        REGs_PSC0[3] = (2 << 8) | 1; //32-bit pattern; start
+
+        REGs_PSC1[0] = (u32)fb->bottom >> 3; //Start address
+        REGs_PSC1[1] = (u32)(fb->bottom + SCREEN_BOTTOM_FBSIZE) >> 3; //End address
+        REGs_PSC1[2] = 0; //Fill value
+        REGs_PSC1[3] = (2 << 8) | 1; //32-bit pattern; start
+
+        while(!((REGs_PSC0[3] & 2) && (REGs_PSC1[3] & 2)));
+
+        WAIT_FOR_ARM9();
+    }
+
+    invokeArm11Function(ARM11);
+}
+
+void initScreens(void)
+{
+    void __attribute__((naked)) initSequence(void)
+    {
+        //Disable interrupts
+        __asm(".word 0xF10C01C0");
+
+        *(vu32 *)0x10141200 = 0x1007F;
+        *(vu32 *)0x10202014 = 0x00000001;
+        *(vu32 *)0x1020200C &= 0xFFFEFFFE;
+        *(vu32 *)0x10202240 = 0x4C;
+        *(vu32 *)0x10202A40 = 0x4C;
+        *(vu32 *)0x10202244 = 0x1023E;
+        *(vu32 *)0x10202A44 = 0x1023E;
+
+        //Top screen
+        *(vu32 *)0x10400400 = 0x000001c2;
+        *(vu32 *)0x10400404 = 0x000000d1;
+        *(vu32 *)0x10400408 = 0x000001c1;
+        *(vu32 *)0x1040040c = 0x000001c1;
+        *(vu32 *)0x10400410 = 0x00000000;
+        *(vu32 *)0x10400414 = 0x000000cf;
+        *(vu32 *)0x10400418 = 0x000000d1;
+        *(vu32 *)0x1040041c = 0x01c501c1;
+        *(vu32 *)0x10400420 = 0x00010000;
+        *(vu32 *)0x10400424 = 0x0000019d;
+        *(vu32 *)0x10400428 = 0x00000002;
+        *(vu32 *)0x1040042c = 0x00000192;
+        *(vu32 *)0x10400430 = 0x00000192;
+        *(vu32 *)0x10400434 = 0x00000192;
+        *(vu32 *)0x10400438 = 0x00000001;
+        *(vu32 *)0x1040043c = 0x00000002;
+        *(vu32 *)0x10400440 = 0x01960192;
+        *(vu32 *)0x10400444 = 0x00000000;
+        *(vu32 *)0x10400448 = 0x00000000;
+        *(vu32 *)0x1040045C = 0x00f00190;
+        *(vu32 *)0x10400460 = 0x01c100d1;
+        *(vu32 *)0x10400464 = 0x01920002;
+        *(vu32 *)0x10400468 = 0x18300000;
+        *(vu32 *)0x10400470 = 0x80341;
+        *(vu32 *)0x10400474 = 0x00010501;
+        *(vu32 *)0x10400478 = 0;
+        *(vu32 *)0x10400490 = 0x000002D0;
+        *(vu32 *)0x1040049C = 0x00000000;
+
+        //Disco register
+        for(u32 i = 0; i < 256; i++)
+           *(vu32 *)0x10400484 = 0x10101 * i;
+
+        //Bottom screen
+        *(vu32 *)0x10400500 = 0x000001c2;
+        *(vu32 *)0x10400504 = 0x000000d1;
+        *(vu32 *)0x10400508 = 0x000001c1;
+        *(vu32 *)0x1040050c = 0x000001c1;
+        *(vu32 *)0x10400510 = 0x000000cd;
+        *(vu32 *)0x10400514 = 0x000000cf;
+        *(vu32 *)0x10400518 = 0x000000d1;
+        *(vu32 *)0x1040051c = 0x01c501c1;
+        *(vu32 *)0x10400520 = 0x00010000;
+        *(vu32 *)0x10400524 = 0x0000019d;
+        *(vu32 *)0x10400528 = 0x00000052;
+        *(vu32 *)0x1040052c = 0x00000192;
+        *(vu32 *)0x10400530 = 0x00000192;
+        *(vu32 *)0x10400534 = 0x0000004f;
+        *(vu32 *)0x10400538 = 0x00000050;
+        *(vu32 *)0x1040053c = 0x00000052;
+        *(vu32 *)0x10400540 = 0x01980194;
+        *(vu32 *)0x10400544 = 0x00000000;
+        *(vu32 *)0x10400548 = 0x00000011;
+        *(vu32 *)0x1040055C = 0x00f00140;
+        *(vu32 *)0x10400560 = 0x01c100d1;
+        *(vu32 *)0x10400564 = 0x01920052;
+        *(vu32 *)0x10400568 = 0x18300000 + 0x46500;
+        *(vu32 *)0x10400570 = 0x80301;
+        *(vu32 *)0x10400574 = 0x00010501;
+        *(vu32 *)0x10400578 = 0;
+        *(vu32 *)0x10400590 = 0x000002D0;
+        *(vu32 *)0x1040059C = 0x00000000;
+
+        //Disco register
+        for(u32 i = 0; i < 256; i++)
+           *(vu32 *)0x10400584 = 0x10101 * i;
+
+        WAIT_FOR_ARM9();
+    }
+
+    //Set CakeBrah framebuffers
+    void __attribute__((naked)) setupFramebuffers(void)
+    {
+        //Disable interrupts
+        __asm(".word 0xF10C01C0");
+
+        fb->top_left = (u8 *)0x18300000;
+        fb->top_right = (u8 *)0x18300000;
+        fb->bottom = (u8 *)0x18346500;
+
+        *(vu32 *)0x10400468 = (u32)fb->top_left;
+        *(vu32 *)0x1040046c = (u32)fb->top_left;
+        *(vu32 *)0x10400494 = (u32)fb->top_right;
+        *(vu32 *)0x10400498 = (u32)fb->top_right;
+        *(vu32 *)0x10400568 = (u32)fb->bottom;
+        *(vu32 *)0x1040056c = (u32)fb->bottom;
+
+        WAIT_FOR_ARM9();
+    }
+
+    if(!ARESCREENSINITED)
+    {
+        invokeArm11Function(initSequence);
+
+        //Turn on backlight
+        i2cWriteRegister(I2C_DEV_MCU, 0x22, 0x2A);
+    }
+
+    flushDCacheRange((void *)fb, sizeof(struct fb));
+    invokeArm11Function(setupFramebuffers);
+
+    clearScreens();
+}

source/screen.h

@@ -0,0 +1,51 @@
+/*
+*   This file is part of Luma3DS
+*   Copyright (C) 2016 Aurora Wright, TuxSH
+*
+*   This program is free software: you can redistribute it and/or modify
+*   it under the terms of the GNU General Public License as published by
+*   the Free Software Foundation, either version 3 of the License, or
+*   (at your option) any later version.
+*
+*   This program is distributed in the hope that it will be useful,
+*   but WITHOUT ANY WARRANTY; without even the implied warranty of
+*   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+*   GNU General Public License for more details.
+*
+*   You should have received a copy of the GNU General Public License
+*   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*
+*   Additional Terms 7.b of GPLv3 applies to this file: Requiring preservation of specified
+*   reasonable legal notices or author attributions in that material or in the Appropriate Legal
+*   Notices displayed by works containing it.
+*/
+
+/*
+*   Screen init code by dark_samus, bil1s, Normmatt, delebile and others
+*/
+
+#pragma once
+
+#include "types.h"
+
+#define PDN_GPU_CNT (*(vu8 *)0x10141200)
+
+#define ARESCREENSINITED (PDN_GPU_CNT != 1)
+
+#define BRAHMA_ARM11_ENTRY 0x1FFFFFF8
+#define WAIT_FOR_ARM9()    *arm11Entry = 0; while(!*arm11Entry); ((void (*)())*arm11Entry)();
+
+#define SCREEN_TOP_WIDTH     400
+#define SCREEN_BOTTOM_WIDTH  320
+#define SCREEN_HEIGHT        240
+#define SCREEN_TOP_FBSIZE    (3 * SCREEN_TOP_WIDTH * SCREEN_HEIGHT)
+#define SCREEN_BOTTOM_FBSIZE (3 * SCREEN_BOTTOM_WIDTH * SCREEN_HEIGHT)
+
+static struct fb {
+    u8 *top_left;
+    u8 *top_right;
+    u8 *bottom;
+} *const fb = (struct fb *)0x23FFFE00;
+
+void clearScreens(void);
+void initScreens(void);

source/screeninit.c

@@ -1,122 +0,0 @@
-/*
-*   screeninit.c
-*
-*   Screen init code by dark_samus, bil1s, Normmatt, delebile and others.
-*/
-
-#include "screeninit.h"
-#include "draw.h"
-#include "i2c.h"
-
-void initScreens(void)
-{
-    vu32 *const arm11 = (u32 *)0x1FFFFFF8;
-
-    void __attribute__((naked)) ARM11(void)
-    {
-        __asm(".word 0xF10C01C0");
-        *(vu32 *)0x10141200 = 0x1007F;
-        *(vu32 *)0x10202014 = 0x00000001;
-        *(vu32 *)0x1020200C &= 0xFFFEFFFE;
-        *(vu32 *)0x10202240 = 0x45;
-        *(vu32 *)0x10202A40 = 0x45;
-        *(vu32 *)0x10202244 = 0x1023E;
-        *(vu32 *)0x10202A44 = 0x1023E;
-
-        // Top screen
-        *(vu32 *)0x10400400 = 0x000001c2;
-        *(vu32 *)0x10400404 = 0x000000d1;
-        *(vu32 *)0x10400408 = 0x000001c1;
-        *(vu32 *)0x1040040c = 0x000001c1;
-        *(vu32 *)0x10400410 = 0x00000000;
-        *(vu32 *)0x10400414 = 0x000000cf;
-        *(vu32 *)0x10400418 = 0x000000d1;
-        *(vu32 *)0x1040041c = 0x01c501c1;
-        *(vu32 *)0x10400420 = 0x00010000;
-        *(vu32 *)0x10400424 = 0x0000019d;
-        *(vu32 *)0x10400428 = 0x00000002;
-        *(vu32 *)0x1040042c = 0x00000192;
-        *(vu32 *)0x10400430 = 0x00000192;
-        *(vu32 *)0x10400434 = 0x00000192;
-        *(vu32 *)0x10400438 = 0x00000001;
-        *(vu32 *)0x1040043c = 0x00000002;
-        *(vu32 *)0x10400440 = 0x01960192;
-        *(vu32 *)0x10400444 = 0x00000000;
-        *(vu32 *)0x10400448 = 0x00000000;
-        *(vu32 *)0x1040045C = 0x00f00190;
-        *(vu32 *)0x10400460 = 0x01c100d1;
-        *(vu32 *)0x10400464 = 0x01920002;
-        *(vu32 *)0x10400468 = 0x18300000;
-        *(vu32 *)0x10400470 = 0x80341;
-        *(vu32 *)0x10400474 = 0x00010501;
-        *(vu32 *)0x10400478 = 0;
-        *(vu32 *)0x10400490 = 0x000002D0;
-        *(vu32 *)0x1040049C = 0x00000000;
-
-        // Disco register
-        for(vu32 i = 0; i < 256; i++)
-            *(vu32 *)0x10400484 = 0x10101 * i;
-
-        // Bottom screen
-        *(vu32 *)0x10400500 = 0x000001c2;
-        *(vu32 *)0x10400504 = 0x000000d1;
-        *(vu32 *)0x10400508 = 0x000001c1;
-        *(vu32 *)0x1040050c = 0x000001c1;
-        *(vu32 *)0x10400510 = 0x000000cd;
-        *(vu32 *)0x10400514 = 0x000000cf;
-        *(vu32 *)0x10400518 = 0x000000d1;
-        *(vu32 *)0x1040051c = 0x01c501c1;
-        *(vu32 *)0x10400520 = 0x00010000;
-        *(vu32 *)0x10400524 = 0x0000019d;
-        *(vu32 *)0x10400528 = 0x00000052;
-        *(vu32 *)0x1040052c = 0x00000192;
-        *(vu32 *)0x10400530 = 0x00000192;
-        *(vu32 *)0x10400534 = 0x0000004f;
-        *(vu32 *)0x10400538 = 0x00000050;
-        *(vu32 *)0x1040053c = 0x00000052;
-        *(vu32 *)0x10400540 = 0x01980194;
-        *(vu32 *)0x10400544 = 0x00000000;
-        *(vu32 *)0x10400548 = 0x00000011;
-        *(vu32 *)0x1040055C = 0x00f00140;
-        *(vu32 *)0x10400560 = 0x01c100d1;
-        *(vu32 *)0x10400564 = 0x01920052;
-        *(vu32 *)0x10400568 = 0x18300000 + 0x46500;
-        *(vu32 *)0x10400570 = 0x80301;
-        *(vu32 *)0x10400574 = 0x00010501;
-        *(vu32 *)0x10400578 = 0;
-        *(vu32 *)0x10400590 = 0x000002D0;
-        *(vu32 *)0x1040059C = 0x00000000;
-
-        // Disco register
-        for(vu32 i = 0; i < 256; i++)
-            *(vu32 *)0x10400584 = 0x10101 * i;
-
-        // Enable backlight
-        i2cWriteRegister(I2C_DEV_MCU, 0x22, 0x2A);
-
-        *(vu32 *)0x10400468 = 0x18300000;
-        *(vu32 *)0x1040046c = 0x18300000;
-        *(vu32 *)0x10400494 = 0x18300000;
-        *(vu32 *)0x10400498 = 0x18300000;
-        *(vu32 *)0x10400568 = 0x18346500;
-        *(vu32 *)0x1040056c = 0x18346500;
-
-        //Set CakeBrah framebuffers
-        *((vu32 *)0x23FFFE00) = 0x18300000;
-        *((vu32 *)0x23FFFE04) = 0x18300000;
-        *((vu32 *)0x23FFFE08) = 0x18346500;
-
-        //Clear ARM11 entry offset
-        *arm11 = 0;
-
-        while(1);
-    }
-
-    if(PDN_GPU_CNT == 1)
-    {
-        *arm11 = (u32)ARM11;
-        while(*arm11);
-    }
-
-    clearScreens();
-}

source/screeninit.h

@@ -1,13 +0,0 @@
-/*
-*   screeninit.h
-*
-*   Screen init code by dark_samus, bil1s, Normmatt, delebile and others.
-*/
-
-#pragma once
-
-#include "types.h"
-
-#define PDN_GPU_CNT (*(vu8 *)0x10141200)
-
-void initScreens(void);

source/start.s

@@ -1,25 +1,70 @@
+@   This file is part of Luma3DS
+@   Copyright (C) 2016 Aurora Wright, TuxSH
+@
+@   This program is free software: you can redistribute it and/or modify
+@   it under the terms of the GNU General Public License as published by
+@   the Free Software Foundation, either version 3 of the License, or
+@   (at your option) any later version.
+@
+@   This program is distributed in the hope that it will be useful,
+@   but WITHOUT ANY WARRANTY; without even the implied warranty of
+@   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+@   GNU General Public License for more details.
+@
+@   You should have received a copy of the GNU General Public License
+@   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+@
+@   Additional Terms 7.b of GPLv3 applies to this file: Requiring preservation of specified
+@   reasonable legal notices or author attributions in that material or in the Appropriate Legal
+@   Notices displayed by works containing it.
+
+@   Thanks to the numerous people who took part in writing this file
+
 .section .text.start
 .align 4
 .global _start
 _start:
+    b start
+
+.global magic
+magic:
+    .word 0
+
+start:
+    @ Disable interrupts
+    mrs r0, cpsr
+    orr r0, #0x1C0
+    msr cpsr_cx, r0
+
     @ Change the stack pointer
     mov sp, #0x27000000
 
+    @ Disable caches / MPU
+    mrc p15, 0, r0, c1, c0, 0  @ read control register
+    bic r0, #(1<<12)           @ - instruction cache disable
+    bic r0, #(1<<2)            @ - data cache disable
+    bic r0, #(1<<0)            @ - mpu disable
+    mcr p15, 0, r0, c1, c0, 0  @ write control register
+
+    @ Flush caches
+    bl flushEntireDCache
+    bl flushEntireICache
+
     @ Give read/write access to all the memory regions
-    ldr r0, =0x33333333
+    ldr r0, =0x3333333
     mcr p15, 0, r0, c5, c0, 2 @ write data access
     mcr p15, 0, r0, c5, c0, 3 @ write instruction access
 
     @ Set MPU permissions and cache settings
-    ldr r0, =0xFFFF001D	@ ffff0000 32k  | bootrom (unprotected part)
+    ldr r0, =0xFFFF001D @ ffff0000 32k  | bootrom (unprotected part)
-    ldr r1, =0x3000801B	@ fff00000 16k  | dtcm
+    ldr r1, =0x01FF801D @ 01ff8000 32k  | itcm
-    ldr r2, =0x01FF801D	@ 01ff8000 32k  | itcm
+    ldr r2, =0x08000029 @ 08000000 2M   | arm9 mem (O3DS / N3DS) 
-    ldr r3, =0x08000029	@ 08000000 2M   | arm9 mem (O3DS / N3DS) 
+    ldr r3, =0x10000029 @ 10000000 2M   | io mem (ARM9 / first 2MB)
-    ldr r4, =0x10000029	@ 10000000 2M   | io mem (ARM9 / first 2MB)
+    ldr r4, =0x20000037 @ 20000000 256M | fcram (O3DS / N3DS)
-    ldr r5, =0x20000037	@ 20000000 256M | fcram (O3DS / N3DS)
+    ldr r5, =0x1FF00027 @ 1FF00000 1M   | dsp / axi wram
-    ldr r6, =0x1FF00027	@ 1FF00000 1M   | dsp / axi wram
+    ldr r6, =0x1800002D @ 18000000 8M   | vram (+ 2MB)
-    ldr r7, =0x1800002D	@ 18000000 8M   | vram (+ 2MB)
+    mov r7, #0
-    mov r8, #0x25
+    mov r8, #0x15
     mcr p15, 0, r0, c6, c0, 0
     mcr p15, 0, r1, c6, c1, 0
     mcr p15, 0, r2, c6, c2, 0
@@ -28,26 +73,29 @@ _start:
     mcr p15, 0, r5, c6, c5, 0
     mcr p15, 0, r6, c6, c6, 0
     mcr p15, 0, r7, c6, c7, 0
-    mcr p15, 0, r8, c3, c0, 0	@ Write bufferable 0, 2, 5
+    mcr p15, 0, r8, c3, c0, 0   @ Write bufferable 0, 2, 4
-    mcr p15, 0, r8, c2, c0, 0	@ Data cacheable 0, 2, 5
+    mcr p15, 0, r8, c2, c0, 0   @ Data cacheable 0, 2, 4
-    mcr p15, 0, r8, c2, c0, 1	@ Inst cacheable 0, 2, 5
+    mcr p15, 0, r8, c2, c0, 1   @ Inst cacheable 0, 2, 4
 
-    @ Enable caches
+    @ Enable caches / MPU / ITCM
     mrc p15, 0, r0, c1, c0, 0  @ read control register
+    orr r0, r0, #(1<<18)       @ - ITCM enable
+    orr r0, r0, #(1<<13)       @ - alternate exception vectors enable
     orr r0, r0, #(1<<12)       @ - instruction cache enable
     orr r0, r0, #(1<<2)        @ - data cache enable
     orr r0, r0, #(1<<0)        @ - mpu enable
     mcr p15, 0, r0, c1, c0, 0  @ write control register
 
-    @ Flush caches
-    mov r0, #0
-    mcr p15, 0, r0, c7, c5, 0  @ flush I-cache
-    mcr p15, 0, r0, c7, c6, 0  @ flush D-cache
-    mcr p15, 0, r0, c7, c10, 4 @ drain write buffer
-
     @ Fix mounting of SDMC
     ldr r0, =0x10000020
     mov r1, #0x340
     str r1, [r0]
 
+    @ Clear BSS
+    ldr r0, =__bss_start
+    mov r1, #0
+    ldr r2, =__bss_end
+    sub r2, r0
+    bl memset32
+
     b main

source/strings.c

@@ -0,0 +1,64 @@
+/*
+*   This file is part of Luma3DS
+*   Copyright (C) 2016 Aurora Wright, TuxSH
+*
+*   This program is free software: you can redistribute it and/or modify
+*   it under the terms of the GNU General Public License as published by
+*   the Free Software Foundation, either version 3 of the License, or
+*   (at your option) any later version.
+*
+*   This program is distributed in the hope that it will be useful,
+*   but WITHOUT ANY WARRANTY; without even the implied warranty of
+*   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+*   GNU General Public License for more details.
+*
+*   You should have received a copy of the GNU General Public License
+*   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*
+*   Additional Terms 7.b of GPLv3 applies to this file: Requiring preservation of specified
+*   reasonable legal notices or author attributions in that material or in the Appropriate Legal
+*   Notices displayed by works containing it.
+*/
+
+#include "strings.h"
+#include "memory.h"
+
+u32 strlen(const char *string)
+{
+    char *stringEnd = (char *)string;
+
+    while(*stringEnd != 0) stringEnd++;
+
+    return stringEnd - string;
+}
+
+void concatenateStrings(char *destination, const char *source)
+{
+    u32 i = strlen(source),
+        j = strlen(destination);
+
+    memcpy(&destination[j], source, i + 1);
+}
+
+void hexItoa(u32 number, char *out, u32 digits)
+{
+    const char hexDigits[] = "0123456789ABCDEF";
+    u32 i;
+
+    for(i = 0; number > 0; i++)
+    {
+        out[digits - 1 - i] = hexDigits[number & 0xF];
+        number >>= 4;
+    }
+}
+
+u32 hexAtoi(const char *in, u32 digits)
+{
+    u32 res = 0;
+    char *tmp = (char *)in;
+
+    for(u32 i = 0; i < digits && *tmp != 0; tmp++, i++)
+        res = (*tmp > '9' ? *tmp - 'A' + 10 : *tmp - '0') + (res << 4);
+
+    return res;
+}

source/strings.h

@@ -0,0 +1,30 @@
+/*
+*   This file is part of Luma3DS
+*   Copyright (C) 2016 Aurora Wright, TuxSH
+*
+*   This program is free software: you can redistribute it and/or modify
+*   it under the terms of the GNU General Public License as published by
+*   the Free Software Foundation, either version 3 of the License, or
+*   (at your option) any later version.
+*
+*   This program is distributed in the hope that it will be useful,
+*   but WITHOUT ANY WARRANTY; without even the implied warranty of
+*   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+*   GNU General Public License for more details.
+*
+*   You should have received a copy of the GNU General Public License
+*   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*
+*   Additional Terms 7.b of GPLv3 applies to this file: Requiring preservation of specified
+*   reasonable legal notices or author attributions in that material or in the Appropriate Legal
+*   Notices displayed by works containing it.
+*/
+
+#pragma once
+
+#include "types.h"
+
+u32 strlen(const char *string);
+void concatenateStrings(char *destination, const char *source);
+void hexItoa(u32 number, char *out, u32 digits);
+u32 hexAtoi(const char *in, u32 digits);

source/types.h

@@ -6,6 +6,7 @@
 
 #include <stdint.h>
 #include <stdlib.h>
+#include <stdbool.h>
 
 //Common data types
 typedef uint8_t u8;
@@ -16,3 +17,13 @@ typedef volatile u8 vu8;
 typedef volatile u16 vu16;
 typedef volatile u32 vu32;
 typedef volatile u64 vu64;
+
+#define CFG_UNITINFO   (*(vu8  *)0x10010010)
+#define PDN_MPCORE_CFG (*(vu32 *)0x10140FFC)
+#define PDN_SPI_CNT    (*(vu32 *)0x101401C0)
+
+#define ISN3DS    (PDN_MPCORE_CFG == 7)
+#define ISDEVUNIT (CFG_UNITINFO != 0)
+#define ISA9LH    (!PDN_SPI_CNT)
+
+#include "3dsheaders.h"

source/utils.c

@@ -4,43 +4,76 @@
 
 #include "utils.h"
 #include "draw.h"
+#include "screen.h"
+#include "cache.h"
 #include "i2c.h"
 
 u32 waitInput(void)
 {
-    u32 pressedKey = 0,
+    u32 key,
-        key;
+        oldKey = HID_PAD;
 
-    //Wait for no keys to be pressed
+    while(true)
-    while(HID_PAD);
-
-    do
     {
-        //Wait for a key to be pressed
-        while(!HID_PAD);
-
         key = HID_PAD;
 
-        //Make sure it's pressed
+        if(!key)
-        for(u32 i = 0x13000; i; i--)
         {
-            if(key != HID_PAD) break;
+            oldKey = 0;
-            if(i == 1) pressedKey = 1;
+            continue;
         }
+
+        if(key == oldKey) continue;
+
+        //Make sure the key is pressed
+        u32 i;
+        for(i = 0; i < 0x13000 && key == HID_PAD; i++);
+        if(i == 0x13000) break;
     }
-    while(!pressedKey);
 
     return key;
 }
 
+void mcuReboot(void)
+{
+    clearScreens();
+
+    //Ensure that all memory transfers have completed and that the data cache has been flushed
+    flushEntireDCache();
+
+    i2cWriteRegister(I2C_DEV_MCU, 0x20, 1 << 2);
+    while(true);
+}
+
+void inputSequence(void)
+{
+    posY = drawString("If you would like to continue, press:", 10, posY, COLOR_WHITE);
+    posY = drawString("Up, Down, Left, Right, B, A, START, SELECT", 10, posY, COLOR_WHITE);
+
+    u32 unlockSequence[] = { BUTTON_UP, BUTTON_DOWN, BUTTON_LEFT, BUTTON_RIGHT, BUTTON_B, BUTTON_A, BUTTON_START, BUTTON_SELECT },
+        sequenceSize = sizeof(unlockSequence) / sizeof(u32);
+
+    for(u32 correctPresses = 0; correctPresses < sequenceSize; correctPresses++)
+    {
+        if(waitInput() != unlockSequence[correctPresses])
+            shutdown(1, "Button sequence not entered correctly");
+    }
+}
+
 void shutdown(u32 mode, const char *message)
 {
-    if(mode)
+    if(mode != 0)
     {
         posY = drawString(message, 10, posY + SPACING_Y, mode == 1 ? COLOR_RED : COLOR_GREEN);
         drawString("Press any button to shutdown", 10, posY, COLOR_WHITE);
         waitInput();
     }
-    i2cWriteRegister(I2C_DEV_MCU, 0x20, 1);
+
-    while(1);
+    clearScreens();
+
+    //Ensure that all memory transfers have completed and that the data cache has been flushed
+    flushEntireDCache();
+
+    i2cWriteRegister(I2C_DEV_MCU, 0x20, 1 << 0);
+    while(true);
 }

source/utils.h

@@ -21,7 +21,13 @@
 #define COLOR_RED   0x0000FF
 #define COLOR_GREEN 0x00FF00
 
-extern int posY;
+#define TICKS_PER_SEC       67027964ULL
+#define REG_TIMER_CNT(i)    *(vu16 *)(0x10003002 + 4 * i)
+#define REG_TIMER_VAL(i)    *(vu16 *)(0x10003000 + 4 * i)
+
+extern u32 posY;
 
 u32 waitInput(void);
+void mcuReboot(void);
+void inputSequence(void);
 void shutdown(u32 mode, const char *message);