We do not need all that space anymore

Makefile

@@ -11,7 +11,7 @@ AS := arm-none-eabi-as
 LD := arm-none-eabi-ld
 OC := arm-none-eabi-objcopy
 
-name := AuReiNand
+name := Luma3DS
 version := $(shell git describe --abbrev=0 --tags)
 
 dir_source := source
@@ -27,7 +27,7 @@ dir_out := out
 ASFLAGS := -mcpu=arm946e-s
 CFLAGS := -Wall -Wextra -MMD -MP -marm $(ASFLAGS) -fno-builtin -fshort-wchar -std=c11 -Wno-main -O2 -flto -ffast-math
 LDFLAGS := -nostartfiles
-FLAGS := name=$(name).dat dir_out=$(abspath $(dir_out)) ICON=$(abspath icon.png) APP_DESCRIPTION="Noob-friendly 3DS CFW." APP_AUTHOR="Reisyukaku/Aurora Wright" --no-print-directory
+FLAGS := name=$(name).dat dir_out=$(abspath $(dir_out)) ICON=$(abspath icon.png) APP_DESCRIPTION="Noob-friendly 3DS CFW." APP_AUTHOR="Aurora Wright" --no-print-directory
 
 objects = $(patsubst $(dir_source)/%.s, $(dir_build)/%.o, \
           $(patsubst $(dir_source)/%.c, $(dir_build)/%.o, \
@@ -48,10 +48,7 @@ a9lh: $(dir_out)/arm9loaderhax.bin
 ninjhax: $(dir_out)/3ds/$(name)
 
 .PHONY: release
-release: $(dir_out)/$(name).zip
+release: $(dir_out)/$(name)$(version).7z
-
-.PHONY: pathchanger
-pathchanger: $(dir_out)/pathchanger
 
 .PHONY: clean
 clean:
@@ -63,10 +60,7 @@ clean:
 	@rm -rf $(dir_out) $(dir_build)
 
 $(dir_out):
-	@mkdir -p "$(dir_out)/aurei/payloads"
+	@mkdir -p "$(dir_out)/luma/payloads"
-
-$(dir_out)/pathchanger: $(dir_out)
-	@cc pathchanger/pathchanger.c -o out/pathchanger
 
 $(dir_out)/$(name).dat: $(dir_build)/main.bin $(dir_out)
 	@$(MAKE) $(FLAGS) -C $(dir_mset) launcher
@@ -80,8 +74,8 @@ $(dir_out)/3ds/$(name): $(dir_out)
 	@$(MAKE) $(FLAGS) -C $(dir_ninjhax)
 	@mv $(dir_out)/$(name).3dsx $(dir_out)/$(name).smdh $@
 
-$(dir_out)/$(name).zip: launcher a9lh ninjhax
+$(dir_out)/$(name)$(version).7z: launcher a9lh ninjhax
-	@cd "$(@D)" && zip -9 -r $(name) *
+	@7z a -mx $@ ./$(@D)/*
 
 $(dir_build)/main.bin: $(dir_build)/main.elf
 	$(OC) -S -O binary $< $@
@@ -107,8 +101,8 @@ $(dir_build)/screeninit.h: $(dir_screeninit)/Makefile
 	@mv $(dir_screeninit)/screeninit.bin $(@D)
 	@bin2c -o $@ -n screeninit $(@D)/screeninit.bin
 
-$(dir_build)/memory.o : CFLAGS += -O3
+$(dir_build)/memory.o: CFLAGS += -O3
-$(dir_build)/config.o : CFLAGS += -DCONFIG_TITLE="\"$(name) $(version) configuration\""
+$(dir_build)/config.o: CFLAGS += -DCONFIG_TITLE="\"$(name) $(version) configuration\""
 
 $(dir_build)/%.o: $(dir_source)/%.c $(bundled)
 	@mkdir -p "$(@D)"
@@ -117,12 +111,4 @@ $(dir_build)/%.o: $(dir_source)/%.c $(bundled)
 $(dir_build)/%.o: $(dir_source)/%.s
 	@mkdir -p "$(@D)"
 	$(COMPILE.s) $(OUTPUT_OPTION) $<
-
-$(dir_build)/fatfs/%.o: $(dir_source)/fatfs/%.c
-	@mkdir -p "$(@D)"
-	$(COMPILE.c) $(OUTPUT_OPTION) $<
-
-$(dir_build)/fatfs/%.o: $(dir_source)/fatfs/%.s
-	@mkdir -p "$(@D)"
-	$(COMPILE.s) $(OUTPUT_OPTION) $<
 include $(call rwildcard, $(dir_build), *.d)

README.md

@@ -1,16 +1,23 @@
-# AuReiNand
+# Luma3DS
-*A modification of the ReiNand custom firmware*
+*Noob-proof (N)3DS "Custom Firmware"*
 
 **Compiling:**
 
-You'll need armips, [bin2c](https://sourceforge.net/projects/bin2c/), and a recent build of [makerom](https://github.com/profi200/Project_CTR) added to your PATH. [HERE](http://www91.zippyshare.com/v/ePGpjk9r/file.html) is a pre-compiled version of armips for Windows.  
+First you need to clone the repository recursively with: 'git clone --recursive https://github.com/AuroraWright/Luma3DS.git'  
-Then, just run "make" and everything should work!  
+To compile, you'll need [armips](https://github.com/Kingcom/armips), [bin2c](https://sourceforge.net/projects/bin2c/), and a recent build of [makerom](https://github.com/profi200/Project_CTR) added to your PATH.  
+For your convenience, here are [Windows](http://www91.zippyshare.com/v/ePGpjk9r/file.html) and [Linux](https://mega.nz/#!uQ1T1IAD!Q91O0e12LXKiaXh_YjXD3D5m8_W3FuMI-hEa6KVMRDQ) builds of armips (thanks to who compiled them!).  
+Finally just run 'make' and everything should work!  
 You can find the compiled files in the 'out' folder.
 
 **Setup / Usage / Features:**
 
-See https://github.com/AuroraWright/AuReiNand/wiki
+See https://github.com/AuroraWright/Luma3DS/wiki
 
 **Credits:**
  
-See https://github.com/AuroraWright/AuReiNand/wiki/Credits
+See https://github.com/AuroraWright/Luma3DS/wiki/Credits
+
+**Licensing:**
+
+This software is licensed under the terms of the GPLv3.  
+You can find a copy of the license in the LICENSE.txt file.

injector/source/patcher.c

@@ -123,7 +123,7 @@ static u32 loadConfig(void)
     if(!config)
     {
         IFile file;
-        if(R_SUCCEEDED(fileOpen(&file, ARCHIVE_SDMC, "/aurei/config.bin", FS_OPEN_READ)))
+        if(R_SUCCEEDED(fileOpen(&file, ARCHIVE_SDMC, "/luma/config.bin", FS_OPEN_READ)))
         {
             u64 total;
             if(R_SUCCEEDED(IFile_Read(&file, &total, &config, 4))) config |= 1 << 4;
@@ -136,14 +136,14 @@ static u32 loadConfig(void)
 
 static int loadTitleLocaleConfig(u64 progId, u8 *regionId, u8 *languageId)
 {
-    /* Here we look for "/aurei/locales/[u64 titleID in hex, uppercase].txt"
+    /* Here we look for "/luma/locales/[u64 titleID in hex, uppercase].txt"
        If it exists it should contain, for example, "EUR IT" */
 
-    char path[] = "/aurei/locales/0000000000000000.txt";
+    char path[] = "/luma/locales/0000000000000000.txt";
 
-    u32 i = 30;
+    u32 i = 29;
 
-    while(progId > 0)
+    while(progId)
     {
         static const char hexDigits[] = "0123456789ABCDEF";
         path[i--] = hexDigits[(u32)(progId & 0xF)];
@@ -336,12 +336,6 @@ void patchCode(u64 progId, u8 *code, u32 size)
             static const u8 blockAutoUpdatesPatch[] = {
                 0xE3, 0xA0
             };
-            static const u8 skipEshopUpdateCheckPattern[] = {
-                0x30, 0xB5, 0xF1, 0xB0
-            };
-            static const u8 skipEshopUpdateCheckPatch[] = {
-                0x00, 0x20, 0x08, 0x60, 0x70, 0x47
-            };
 
             //Block silent auto-updates
             patchMemory(code, size, 
@@ -351,13 +345,24 @@ void patchCode(u64 progId, u8 *code, u32 size)
                 sizeof(blockAutoUpdatesPatch), 1
             );
 
-            //Skip update checks to access the EShop
+            //Apply only if the updated NAND hasn't been booted
-            patchMemory(code, size, 
+            if((BOOTCONFIG(0, 3) != 0) == (BOOTCONFIG(3, 1) && CONFIG(1)))
-                skipEshopUpdateCheckPattern, 
+            {
-                sizeof(skipEshopUpdateCheckPattern), 0, 
+                static const u8 skipEshopUpdateCheckPattern[] = {
-                skipEshopUpdateCheckPatch, 
+                    0x30, 0xB5, 0xF1, 0xB0
-                sizeof(skipEshopUpdateCheckPatch), 1
+                };
-            );
+                static const u8 skipEshopUpdateCheckPatch[] = {
+                    0x00, 0x20, 0x08, 0x60, 0x70, 0x47
+                };
+
+                //Skip update checks to access the EShop
+                patchMemory(code, size, 
+                    skipEshopUpdateCheckPattern, 
+                    sizeof(skipEshopUpdateCheckPattern), 0, 
+                    skipEshopUpdateCheckPatch, 
+                    sizeof(skipEshopUpdateCheckPatch), 1
+                );
+            }
 
             break;
         }
@@ -388,7 +393,7 @@ void patchCode(u64 progId, u8 *code, u32 size)
         case 0x0004001000027000LL: // KOR MSET
         case 0x0004001000028000LL: // TWN MSET
         {
-            if(CONFIG(6))
+            if(CONFIG(5))
             {
                 static const u16 verPattern[] = u"Ver.";
                 const u32 currentNand = BOOTCONFIG(0, 3);
@@ -504,8 +509,8 @@ void patchCode(u64 progId, u8 *code, u32 size)
                         }
                     }
                 }
+            }
 
-            break;
+        break;
-        }
     }
 }

loader/Makefile

@@ -44,12 +44,4 @@ $(dir_build)/%.o: $(dir_source)/%.c
 $(dir_build)/%.o: $(dir_source)/%.s
 	@mkdir -p "$(@D)"
 	$(COMPILE.s) $(OUTPUT_OPTION) $<
-
-$(dir_build)/fatfs/%.o: $(dir_source)/fatfs/%.c
-	@mkdir -p "$(@D)"
-	$(COMPILE.c) $(OUTPUT_OPTION) $<
-
-$(dir_build)/fatfs/%.o: $(dir_source)/fatfs/%.s
-	@mkdir -p "$(@D)"
-	$(COMPILE.s) $(OUTPUT_OPTION) $<
 include $(call rwildcard, $(dir_build), *.d)

loader/source/buttons.h

@@ -1,13 +0,0 @@
-#pragma once
-
-#include "types.h"
-
-#define HID_PAD       (*(vu32 *)0x10146000 ^ 0xFFF)
-#define BUTTON_RIGHT  (1 << 4)
-#define BUTTON_LEFT   (1 << 5)
-#define BUTTON_UP     (1 << 6)
-#define BUTTON_DOWN   (1 << 7)
-#define BUTTON_X      (1 << 10)
-#define BUTTON_Y      (1 << 11)
-#define BUTTON_R1     (1 << 8)
-#define BUTTON_SELECT (1 << 2)

loader/source/fatfs/ffconf.h

@@ -15,7 +15,7 @@
 /  and optional writing functions as well. */
 
 
-#define _FS_MINIMIZE	1
+#define _FS_MINIMIZE	3
 /* This option defines minimization level to remove some basic API functions.
 /
 /   0: All basic functions are enabled.
@@ -34,7 +34,7 @@
 /  2: Enable with LF-CRLF conversion. */
 
 
-#define _USE_FIND		1
+#define _USE_FIND		0
 /* This option switches filtered directory read functions, f_findfirst() and
 /  f_findnext(). (0:Disable, 1:Enable 2:Enable with matching altname[] too) */
 

loader/source/fatfs/sdmmc/common.h

@@ -1,4 +1,15 @@
 #pragma once
 
 #include <stdbool.h>
-#include "../../types.h"
+#include <stdint.h>
+#include <stdlib.h>
+
+//Common data types
+typedef uint8_t u8;
+typedef uint16_t u16;
+typedef uint32_t u32;
+typedef uint64_t u64;
+typedef volatile u8 vu8;
+typedef volatile u16 vu16;
+typedef volatile u32 vu32;
+typedef volatile u64 vu64;

loader/source/main.c

@@ -1,39 +1,6 @@
-#include "types.h"
-#include "buttons.h"
 #include "fatfs/ff.h"
 
 #define PAYLOAD_ADDRESS	0x23F00000
-#define LOAD_PAYLOAD(a) loadPayload(a "_*.bin")
-
-static u32 loadPayload(const char *pattern)
-{
-    char path[30] = "/aurei/payloads";
-
-    DIR dir;
-    FILINFO info;
-
-    FRESULT result = f_findfirst(&dir, &info, path, pattern);
-
-    f_closedir(&dir);
-
-    if(result != FR_OK || !info.fname[0])
-        return 0;
-
-    path[15] = '/';
-    u32 i;
-    for(i = 0; info.fname[i]; i++)
-        path[16 + i] = info.fname[i];
-    path[16 + i] = '\0';
-
-    FIL payload;
-    unsigned int br;
-
-    f_open(&payload, path, FA_READ);
-    f_read(&payload, (void *)PAYLOAD_ADDRESS, f_size(&payload), &br);
-    f_close(&payload);
-
-    return 1;
-}
 
 void main(void)
 {
@@ -41,17 +8,12 @@ void main(void)
 
     f_mount(&fs, "0:", 1);
 
-    //Get pressed buttons
+    FIL payload;
-    u32 pressed = HID_PAD;
+    unsigned int read;
 
-    if(((pressed & BUTTON_RIGHT) && LOAD_PAYLOAD("right")) ||
+    f_open(&payload, (char *)0x24F00004, FA_READ);
-       ((pressed & BUTTON_LEFT) && LOAD_PAYLOAD("left")) ||
+    f_read(&payload, (void *)PAYLOAD_ADDRESS, f_size(&payload), &read);
-       ((pressed & BUTTON_UP) && LOAD_PAYLOAD("up")) ||
+    f_close(&payload);
-       ((pressed & BUTTON_DOWN) && LOAD_PAYLOAD("down")) ||
+
-       ((pressed & BUTTON_X) && LOAD_PAYLOAD("x")) ||
+    ((void (*)())PAYLOAD_ADDRESS)();
-       ((pressed & BUTTON_Y) && LOAD_PAYLOAD("y")) ||
-       ((pressed & BUTTON_R1) && LOAD_PAYLOAD("r")) ||
-       ((pressed & BUTTON_SELECT) && LOAD_PAYLOAD("sel")) ||
-       LOAD_PAYLOAD("def"))
-        ((void (*)())PAYLOAD_ADDRESS)();
 }

loader/source/start.s

@@ -2,6 +2,11 @@
 .align 4
 .global _start
 _start:
+    b start
+
+    .word 0, 0, 0, 0, 0, 0, 0
+
+start:
     @ Flush caches
     mov r0, #0
     mcr p15, 0, r0, c7, c5, 0  @ flush I-cache

loader/source/types.h

@@ -1,20 +0,0 @@
-/*
-*   types.h
-*       by Reisyukaku
-*   Copyright (c) 2015 All Rights Reserved
-*/
-
-#pragma once
-
-#include <stdint.h>
-#include <stdlib.h>
-
-//Common data types
-typedef uint8_t u8;
-typedef uint16_t u16;
-typedef uint32_t u32;
-typedef uint64_t u64;
-typedef volatile u8 vu8;
-typedef volatile u16 vu16;
-typedef volatile u32 vu32;
-typedef volatile u64 vu64;

patches/reboot.s

@@ -80,7 +80,7 @@ fopen: .ascii "OPEN"
 .pool
 bin_fname:     .dcw "sdmc:/arm9loaderhax.bin"
 	       .word 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
-dat_fname:     .dcw "sdmc:/AuReiNand.dat"
+dat_fname:     .dcw "sdmc:/Luma3DS.dat"
 	       .word 0
 
 .align 4

pathchanger/pathchanger.c

@@ -43,7 +43,7 @@ static int fsize(FILE *fp)
 static void error(FILE *payload, const char *message)
 {
     fclose(payload);
-    printf("%s, are you sure you're using an AuReiNand payload?\n", message);
+    printf("%s, are you sure you're using a Luma3DS payload?\n", message);
     exit(0);
 }
 
@@ -51,7 +51,7 @@ int main(int argc, char **argv)
 {
     if(argc == 1)
     {
-        printf("Usage: %s <AuReiNand payload path>\n", argv[0]);
+        printf("Usage: %s <Luma3DS payload path>\n", argv[0]);
         exit(0);
     }
 

pathchanger/pathchanger.py

@@ -0,0 +1,40 @@
+#!/usr/bin/env python
+# Requires Python >= 3.2 or >= 2.7
+
+# This is part of Luma3DS
+
+__author__    = "TuxSH"
+__copyright__ = "Copyright (c) 2016 TuxSH" 
+__license__   = "GPLv3"
+__version__   = "v1.0"
+
+import argparse
+
+if __name__ == "__main__":
+    parser = argparse.ArgumentParser(description="Changes the path to Luma3DS for reboot patches")
+    parser.add_argument("payload", help="Path to the Luma3DS payload")
+    parser.add_argument("new_path", help="New Luma3DS payload path")
+    args = parser.parse_args()
+    data = b""
+
+    if len(args.new_path) > 37:
+        raise SystemExit("The new payload path is too large (37 characters max.)")
+
+    with open(args.payload, "rb") as f: data = bytearray(f.read())
+
+    if len(data) == 0: raise SystemExit("Could not read {0}".format(args.payload))
+
+    if len(data) > 0x20000: 
+        raise SystemExit("The input file is too large, are you sure you're using a Luma3DS payload?")
+
+    found_index = data.find("sdmc:/".encode("utf-16-le"))
+
+    if found_index == -1: 
+        raise SystemExit("The pattern was not found, are you sure you're usinga a Luma3DS payload?")
+
+    namebuf = args.new_path.encode("utf-16-le")
+    namebuf += b'\x00' * (74 - len(namebuf))
+
+    data[found_index + 12 : found_index + 12 + 74] = namebuf
+
+    with open(args.payload, "wb+") as f: f.write(data)

screeninit/linker.ld

@@ -1,7 +1,7 @@
 ENTRY(_start)
 SECTIONS
 {
-    . = 0x24F03000;
+    . = 0x24F02000;
     .text.start : { *(.text.start) }
     .text : { *(.text) }
     .data : { *(.data) }

screeninit/source/main.c

@@ -3,7 +3,7 @@
 void main(void)
 {
    const u32 brightness[4] = {0x5F, 0x4C, 0x39, 0x26};
-   u32 brightnessLevel = *(vu32 *)0x24F03008;
+   u32 brightnessLevel = *(vu32 *)0x24F02008;
    vu32 *const arm11 = (u32 *)0x1FFFFFF8;
 
    *(vu32 *)0x10141200 = 0x1007F;

screeninit/source/types.h

@@ -1,9 +1,3 @@
-/*
-*   types.h
-*       by Reisyukaku
-*   Copyright (c) 2015 All Rights Reserved
-*/
-
 #pragma once
 
 #include <stdint.h>

source/buttons.h

@@ -1,7 +1,5 @@
 /*
 *   buttons.h
-*       by Aurora Wright
-*   Copyright (c) 2016 All Rights Reserved
 */
 
 #pragma once
@@ -21,9 +19,8 @@
 #define BUTTON_LEFT            (1 << 5)
 #define BUTTON_UP              (1 << 6)
 #define BUTTON_DOWN            (1 << 7)
-#define BUTTON_L1R1            (BUTTON_R1 | BUTTON_L1)
+#define SAFE_MODE              (BUTTON_R1 | BUTTON_L1 | BUTTON_A | BUTTON_UP)
-#define SAFE_MODE              (BUTTON_L1R1 | BUTTON_A | BUTTON_UP)
 #define OVERRIDE_BUTTONS       (BUTTON_B ^ 0xFFF)
 #define SINGLE_PAYLOAD_BUTTONS (BUTTON_LEFT | BUTTON_RIGHT | BUTTON_UP | BUTTON_DOWN | BUTTON_START | BUTTON_X | BUTTON_Y)
-#define L_PAYLOAD_BUTTONS      (BUTTON_R1 | BUTTON_SELECT)
+#define L_PAYLOAD_BUTTONS      (BUTTON_R1 | BUTTON_A | BUTTON_SELECT)
 #define MENU_BUTTONS           (BUTTON_LEFT | BUTTON_RIGHT | BUTTON_UP | BUTTON_DOWN | BUTTON_A | BUTTON_START)

source/config.c

@@ -1,7 +1,5 @@
 /*
 *   config.c
-*       by Aurora Wright
-*   Copyright (c) 2016 All Rights Reserved
 */
 
 #include "config.h"
@@ -22,11 +20,10 @@ void configureCFW(const char *configPath)
                                         "New 3DS CPU: Off( ) Clock( ) L2( ) Clock+L2( )" };
 
     const char *singleOptionsText[] = { "( ) Autoboot SysNAND",
-                                        "( ) Use SysNAND FIRM as default (A9LH-only)",
+                                        "( ) SysNAND is updated (A9LH-only)",
                                         "( ) Force A9LH detection",
                                         "( ) Use second EmuNAND as default",
                                         "( ) Enable region/language emulation",
-                                        "( ) Use developer UNITINFO",
                                         "( ) Show current NAND in System Settings",
                                         "( ) Show GBA boot screen in patched AGB_FIRM",
                                         "( ) Enable splash screen with no screen-init" };

source/config.h

@@ -1,7 +1,5 @@
 /*
 *   config.h
-*       by Aurora Wright
-*   Copyright (c) 2016 All Rights Reserved
 */
 
 #pragma once
@@ -14,6 +12,6 @@
 #define MULTICONFIG(a) ((config >> (a * 2 + 6)) & 3)
 #define BOOTCONFIG(a, b) ((config >> a) & b)
 
-extern u32 config; 
+extern u32 config;
 
-void configureCFW(const char *configPath);
+void configureCFW(const char *configPath);

source/crypto.c

@@ -1,9 +1,7 @@
 /*
 *   crypto.c
-*       by Reisyukaku / Aurora Wright
-*   Crypto libs from http://github.com/b1l1s/ctr
 *
-*   Copyright (c) 2016 All Rights Reserved
+*   Crypto libs from http://github.com/b1l1s/ctr
 */
 
 #include "crypto.h"
@@ -11,7 +9,7 @@
 #include "fatfs/sdmmc/sdmmc.h"
 
 /****************************************************************
-*                   Crypto Libs
+*                   Crypto libs
 ****************************************************************/
 
 /* original version by megazig */
@@ -273,7 +271,7 @@ static void sha(void *res, const void *src, u32 size, u32 mode)
 }
 
 /****************************************************************
-*                   Nand/FIRM Crypto stuff
+*                   NAND/FIRM crypto
 ****************************************************************/
 
 static u8 nandCTR[0x10],
@@ -350,9 +348,9 @@ void decryptExeFs(u8 *inbuf)
 void arm9Loader(u8 *arm9Section, u32 mode)
 {
     //Firm keys
-    u8 keyY[0x10];
+    u8 keyY[0x10],
-    u8 arm9BinCTR[0x10];
+       arm9BinCTR[0x10],
-    u8 arm9BinSlot = mode ? 0x16 : 0x15;
+       arm9BinSlot = mode ? 0x16 : 0x15;
 
     //Setup keys needed for arm9bin decryption
     memcpy(keyY, arm9Section + 0x10, 0x10);
@@ -386,8 +384,8 @@ void arm9Loader(u8 *arm9Section, u32 mode)
     //Set >=9.6 KeyXs
     if(mode)
     {
-        u8 keyData[] = {0xDD, 0xDA, 0xA4, 0xC6, 0x2C, 0xC4, 0x50, 0xE9, 0xDA, 0xB6, 0x9B, 0x0D, 0x9D, 0x2A, 0x21, 0x98};
+        u8 keyData[0x10] = {0xDD, 0xDA, 0xA4, 0xC6, 0x2C, 0xC4, 0x50, 0xE9, 0xDA, 0xB6, 0x9B, 0x0D, 0x9D, 0x2A, 0x21, 0x98},
-        u8 decKey[0x10];
+           decKey[0x10];
 
         //Set keys 0x19..0x1F keyXs
         aes_use_keyslot(0x11);

source/crypto.h

@@ -1,9 +1,7 @@
 /*
 *   crypto.h
-*       by Reisyukaku / Aurora Wright
-*   Crypto libs from http://github.com/b1l1s/ctr
 *
-*   Copyright (c) 2016 All Rights Reserved
+*   Crypto libs from http://github.com/b1l1s/ctr
 */
 
 #pragma once

source/draw.c

@@ -1,9 +1,7 @@
 /*
 *   draw.c
-*       by Reisyukaku / Aurora Wright
-*   Code to print to the screen by mid-kid @CakesFW
 *
-*   Copyright (c) 2016 All Rights Reserved
+*   Code to print to the screen by mid-kid @CakesFW
 */
 
 #include "draw.h"
@@ -24,6 +22,7 @@ static const struct fb {
 static inline int strlen(const char *string)
 {
     char *stringEnd = (char *)string;
+
     while(*stringEnd) stringEnd++;
 
     return stringEnd - string;
@@ -41,11 +40,11 @@ void loadSplash(void)
     initScreens();
 
     //Don't delay boot if no splash image is on the SD
-    if(fileRead(fb->top_left, "/aurei/splash.bin", 0x46500) +
+    if(!(fileRead(fb->top_left, "/luma/splash.bin", 0x46500) +
-       fileRead(fb->bottom, "/aurei/splashbottom.bin", 0x38400))
+       fileRead(fb->bottom, "/luma/splashbottom.bin", 0x38400)))
     {
         u64 i = 0x1400000;
-        while(--i) __asm("mov r0, r0"); //Less Ghetto sleep func
+        while(i--) __asm("mov r0, r0"); //Less Ghetto sleep func
     }
 }
 

source/draw.h

@@ -1,9 +1,7 @@
 /*
 *   draw.h
-*       by Reisyukaku / Aurora Wright
-*   Code to print to the screen by mid-kid @CakesFW
 *
-*   Copyright (c) 2016 All Rights Reserved
+*   Code to print to the screen by mid-kid @CakesFW
 */
 
 #pragma once

source/emunand.c

@@ -1,7 +1,5 @@
 /*
 *   emunand.c
-*       by Reisyukaku / Aurora Wright
-*   Copyright (c) 2016 All Rights Reserved
 */
 
 #include "emunand.h"

source/emunand.h

@@ -1,14 +1,12 @@
 /*
 *   emunand.h
-*       by Reisyukaku / Aurora Wright
-*   Copyright (c) 2016 All Rights Reserved
 */
 
 #pragma once
 
 #include "types.h"
 
-#define NCSD_MAGIC (0x4453434E)
+#define NCSD_MAGIC 0x4453434E
 
 void getEmunandSect(u32 *off, u32 *head, u32 *emuNAND);
 u32 getSDMMC(u8 *pos, u32 size);

source/firm.c

@@ -1,7 +1,5 @@
 /*
 *   firm.c
-*       by Reisyukaku / Aurora Wright
-*   Copyright (c) 2016 All Rights Reserved
 */
 
 #include "firm.h"
@@ -14,7 +12,6 @@
 #include "crypto.h"
 #include "draw.h"
 #include "screeninit.h"
-#include "loader.h"
 #include "buttons.h"
 #include "../build/patches.h"
 
@@ -44,8 +41,8 @@ void main(void)
     mountFs();
 
     //Attempt to read the configuration file
-    const char configPath[] = "/aurei/config.bin";
+    const char configPath[] = "/luma/config.bin";
-    if(fileRead(&config, configPath, 4)) needConfig = 1;
+    if(!fileRead(&config, configPath, 4)) needConfig = 1;
     else
     {
         config = 0;
@@ -80,9 +77,6 @@ void main(void)
 
         //Get pressed buttons
         u32 pressed = HID_PAD;
- 
-        //Determine if we need to autoboot sysNAND
-        u32 autoBootSys = CONFIG(0);
 
         //Determine if A9LH is installed and the user has an updated sysNAND
         if(a9lhBoot || CONFIG(2))
@@ -134,14 +128,16 @@ void main(void)
                the Safe Mode combo is not pressed, chainload an external payload */
             if(((pressed & SINGLE_PAYLOAD_BUTTONS) || ((pressed & BUTTON_L1) && (pressed & L_PAYLOAD_BUTTONS)))
                && pressed != SAFE_MODE)
-                loadPayload();
+                loadPayload(pressed);
 
             //If no configuration file exists or SELECT is held, load configuration menu
             if(needConfig == 2 || (pressed & BUTTON_SELECT))
                 configureCFW(configPath);
 
             //If screens are inited or the corresponding option is set, load splash screen
-            if(PDN_GPU_CNT != 1 || CONFIG(8)) loadSplash();
+            if(PDN_GPU_CNT != 1 || CONFIG(7)) loadSplash();
+
+            u32 autoBootSys = CONFIG(0);
 
             //Determine if we need to boot an emuNAND or sysNAND
             nandType = (pressed & BUTTON_L1) ? autoBootSys : ((pressed & BUTTON_R1) ? updatedSys : !autoBootSys);
@@ -189,29 +185,17 @@ void main(void)
     launchFirm(bootType);
 }
 
-//Load FIRM into FCRAM
 static inline void loadFirm(u32 firmType, u32 externalFirm)
 {
     section = firm->section;
 
-    u32 firmSize;
+    u32 externalFirmLoaded = externalFirm &&
+                             !fileRead(firm, "/luma/firmware.bin", 0) &&
+                             (((u32)section[2].address >> 8) & 0xFF) == (console ? 0x60 : 0x68);
 
-    if(externalFirm)
+    /* If the conditions to load the external FIRM aren't met, or reading fails, or the FIRM
-    {
+       doesn't match the console, load FIRM from CTRNAND */
-        const char path[] = "/aurei/firmware.bin";
+    if(!externalFirmLoaded)
-        firmSize = fileSize(path);
-
-        if(firmSize)
-        {
-            fileRead(firm, path, firmSize);
-
-            //Check that the loaded FIRM matches the console
-            if((((u32)section[2].address >> 8) & 0xFF) != (console ? 0x60 : 0x68)) firmSize = 0;
-        }
-    }
-    else firmSize = 0;
-
-    if(!firmSize)
     {
         const char *firmFolders[3][2] = {{ "00000002", "20000002" },
                                          { "00000102", "20000102" },
@@ -273,13 +257,6 @@ static inline void patchNativeFirm(u32 nandType, u32 emuHeader, u32 a9lhInstalle
     *(u16 *)sigOffset2 = sigPatch[0];
     *((u16 *)sigOffset2 + 1) = sigPatch[1];
 
-    if(CONFIG(5))
-    {
-        //Apply UNITINFO patch
-        u8 *unitInfoOffset = getUnitInfoValueSet(arm9Section, section[2].size);
-        *unitInfoOffset = unitInfoPatch;
-    }
-
     //Replace the FIRM loader with the injector
     injectLoader();
 }
@@ -383,7 +360,8 @@ static inline void patchTwlAgbFirm(u32 firmType)
 
     /* Calculate the amount of patches to apply. Only count the boot screen patch for AGB_FIRM
        if the matching option was enabled (keep it as last) */
-    u32 numPatches = firmType == 1 ? (sizeof(twlPatches) / sizeof(patchData)) : (sizeof(agbPatches) / sizeof(patchData) - !CONFIG(7));
+    u32 numPatches = firmType == 1 ? (sizeof(twlPatches) / sizeof(patchData)) :
+                                     (sizeof(agbPatches) / sizeof(patchData) - !CONFIG(6));
     const patchData *patches = firmType == 1 ? twlPatches : agbPatches;
 
     //Patch
@@ -405,7 +383,7 @@ static inline void patchTwlAgbFirm(u32 firmType)
 
 static inline void launchFirm(u32 bootType)
 {
-    //Copy firm partitions to respective memory locations
+    //Copy FIRM sections to respective memory locations
     for(u32 i = 0; i < 4 && section[i].size; i++)
         memcpy(section[i].address, (u8 *)firm + section[i].offset, section[i].size);
 
@@ -421,6 +399,6 @@ static inline void launchFirm(u32 bootType)
     //Set ARM11 kernel entrypoint
     *arm11 = (u32)firm->arm11Entry;
 
-    //Final jump to arm9 kernel
+    //Final jump to ARM9 kernel
     ((void (*)())firm->arm9Entry)();
 }

source/firm.h

@@ -1,7 +1,5 @@
 /*
 *   firm.h
-*       by Reisyukaku / Aurora Wright
-*   Copyright (c) 2016 All Rights Reserved
 */
 
 #pragma once

source/fs.c

@@ -1,12 +1,16 @@
 /*
 *   fs.c
-*       by Reisyukaku / Aurora Wright
-*   Copyright (c) 2016 All Rights Reserved
 */
 
 #include "fs.h"
 #include "memory.h"
+#include "screeninit.h"
 #include "fatfs/ff.h"
+#include "buttons.h"
+#include "../build/loader.h"
+
+#define PAYLOAD_ADDRESS	0x24F00000
+#define PATTERN(a) a "_*.bin"
 
 static FATFS sdFs,
              nandFs;
@@ -21,59 +25,73 @@ u32 mountFs(void)
 
 u32 fileRead(void *dest, const char *path, u32 size)
 {
-    FRESULT fr;
+    FRESULT result;
-    FIL fp;
+    FIL file;
-    unsigned int br = 0;
 
-    fr = f_open(&fp, path, FA_READ);
+    result = f_open(&file, path, FA_READ);
-    if(fr == FR_OK)
+    if(result == FR_OK)
     {
-        if(!size) size = f_size(&fp);
+        unsigned int read;
-        fr = f_read(&fp, dest, size, &br);
+        if(!size) size = f_size(&file);
+        result = f_read(&file, dest, size, &read);
     }
 
-    f_close(&fp);
+    f_close(&file);
 
-    return fr ? 0 : 1;
+    return result;
 }
 
 u32 fileWrite(const void *buffer, const char *path, u32 size)
 {
-    FRESULT fr;
+    FRESULT result;
-    FIL fp;
+    FIL file;
-    unsigned int br = 0;
 
-    fr = f_open(&fp, path, FA_WRITE | FA_OPEN_ALWAYS);
+    result = f_open(&file, path, FA_WRITE | FA_OPEN_ALWAYS);
-    if(fr == FR_OK) fr = f_write(&fp, buffer, size, &br);
+    if(result == FR_OK)
+    {
+        unsigned int read;
+        result = f_write(&file, buffer, size, &read);
+    }
 
-    f_close(&fp);
+    f_close(&file);
 
-    return fr ? 0 : 1;
+    return result;
 }
 
-u32 fileSize(const char *path)
+void loadPayload(u32 pressed)
 {
-    FIL fp;
+    const char *pattern;
-    u32 size = 0;
 
-    if(f_open(&fp, path, FA_READ) == FR_OK)
+    if(pressed & BUTTON_RIGHT) pattern = PATTERN("right");
-        size = f_size(&fp);
+    else if(pressed & BUTTON_LEFT) pattern = PATTERN("left");
+    else if(pressed & BUTTON_UP) pattern = PATTERN("up");
+    else if(pressed & BUTTON_DOWN) pattern = PATTERN("down");
+    else if(pressed & BUTTON_X) pattern = PATTERN("x");
+    else if(pressed & BUTTON_Y) pattern = PATTERN("y");
+    else if(pressed & BUTTON_R1) pattern = PATTERN("r");
+    else if(pressed & BUTTON_A) pattern = PATTERN("a");
+    else if(pressed & BUTTON_START) pattern = PATTERN("start");
+    else pattern = PATTERN("select");
 
-    f_close(&fp);
-
-    return size;
-}
-
-u32 defPayloadExists(void)
-{
     DIR dir;
     FILINFO info;
+    char path[] = "/luma/payloads";
 
-    FRESULT result = f_findfirst(&dir, &info, "/aurei/payloads", "def_*.bin");
+    FRESULT result = f_findfirst(&dir, &info, path, pattern);
 
     f_closedir(&dir);
 
-    return (result == FR_OK && info.fname[0]);
+    if(result == FR_OK && info.fname[0])
+    {
+        initScreens();
+        memcpy((void *)PAYLOAD_ADDRESS, loader, loader_size);
+
+        path[sizeof(path) - 1] = '/';
+        memcpy((void *)(PAYLOAD_ADDRESS + 4), path, sizeof(path));
+        memcpy((void *)(PAYLOAD_ADDRESS + 4 + sizeof(path)), info.altname, 13);
+
+        ((void (*)())PAYLOAD_ADDRESS)();
+    }
 }
 
 void firmRead(void *dest, const char *firmFolder)
@@ -86,14 +104,11 @@ void firmRead(void *dest, const char *firmFolder)
 
     f_opendir(&dir, path);
 
-    u32 id = 0;
+    u32 id = 0xFFFFFFFF;
 
     //Parse the target directory
-    while(f_readdir(&dir, &info) == FR_OK)
+    while(f_readdir(&dir, &info) == FR_OK && info.fname[0])
     {
-        //We've parsed the whole folder
-        if(!info.fname[0]) break;
-
         //Not a cxi
         if(info.altname[9] != 'A') continue;
 
@@ -105,8 +120,8 @@ void firmRead(void *dest, const char *firmFolder)
             tempId += *tmp > '9' ? *tmp - 'A' + 10 : *tmp - '0';
         }
 
-        //Found a newer cxi
+        //Found an older cxi
-        if(tempId > id) id = tempId;
+        if(tempId < id) id = tempId;
     }
 
     f_closedir(&dir);
@@ -114,12 +129,12 @@ void firmRead(void *dest, const char *firmFolder)
     //Complete the string with the .app name
     memcpy(&path[34], "/00000000.app", 14);
 
+    //Last digit of the .app
     u32 i = 42;
 
     //Convert back the .app name from integer to array
-    while(id > 0)
+    while(id)
     {
-        //Last digit of the .app
         static const char hexDigits[] = "0123456789ABCDEF";
         path[i--] = hexDigits[id & 0xF];
         id >>= 4;

source/fs.h

@@ -1,7 +1,5 @@
 /*
 *   fs.h
-*       by Reisyukaku / Aurora Wright
-*   Copyright (c) 2016 All Rights Reserved
 */
 
 #pragma once
@@ -11,6 +9,5 @@
 u32 mountFs(void);
 u32 fileRead(void *dest, const char *path, u32 size);
 u32 fileWrite(const void *buffer, const char *path, u32 size);
-u32 fileSize(const char *path);
+void loadPayload(u32 pressed);
-u32 defPayloadExists(void);
 void firmRead(void *dest, const char *firmFolder);

source/i2c.c

@@ -22,26 +22,26 @@ static inline u8 i2cGetDeviceRegAddr(u8 device_id)
 
 //-----------------------------------------------------------------------------
 
-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];
 }
@@ -94,16 +94,16 @@ u32 i2cWriteRegister(u8 dev_id, u8 reg, u8 data)
     u8 bus_id = i2cGetDeviceBusId(dev_id);
     u8 dev_addr = i2cGetDeviceRegAddr(dev_id);
 
-    for (u32 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))
+            if(i2cGetResult(bus_id))
                 return 1;
         }
         *i2cGetCntReg(bus_id) = 0xC5;

source/loader.c

@@ -1,23 +0,0 @@
-/*
-*   loader.c
-*       by Aurora Wright
-*   Copyright (c) 2016 All Rights Reserved
-*/
-
-#include "loader.h"
-#include "fs.h"
-#include "memory.h"
-#include "screeninit.h"
-#include "../build/loader.h"
-
-#define PAYLOAD_ADDRESS	0x24F00000
-
-void loadPayload(void)
-{
-    if(defPayloadExists())
-    {
-        initScreens();
-        memcpy((void *)PAYLOAD_ADDRESS, loader, loader_size);
-        ((void (*)())PAYLOAD_ADDRESS)();
-    }
-}

source/loader.h

@@ -1,11 +0,0 @@
-/*
-*   loader.h
-*       by Aurora Wright
-*   Copyright (c) 2016 All Rights Reserved
-*/
-
-#pragma once
-
-#include "types.h"
-
-void loadPayload(void);

source/memory.c

@@ -1,7 +1,5 @@
 /*
 *   memory.c
-*       by Reisyukaku / Aurora Wright
-*   Copyright (c) 2016 All Rights Reserved
 *
 *   Quick Search algorithm adapted from http://igm.univ-mlv.fr/~lecroq/string/node19.html#SECTION00190
 */

source/memory.h

@@ -1,7 +1,5 @@
 /*
 *   memory.h
-*       by Reisyukaku / Aurora Wright
-*   Copyright (c) 2016 All Rights Reserved
 *
 *   Quick Search algorithm adapted from http://igm.univ-mlv.fr/~lecroq/string/node19.html#SECTION00190
 */

source/patches.c

@@ -1,7 +1,5 @@
 /*
 *   patches.c
-*       by Reisyukaku / Aurora Wright
-*   Copyright (c) 2016 All Rights Reserved
 */
 
 #include "patches.h"
@@ -13,13 +11,9 @@
 
 const u32 mpuPatch[3] = {0x00360003, 0x00200603, 0x001C0603};
 
-const u16 nandRedir[2] = {0x4C00, 0x47A0};
+const u16 nandRedir[2] = {0x4C00, 0x47A0},
-
+          sigPatch[2] = {0x2000, 0x4770},
-const u16 sigPatch[2] = {0x2000, 0x4770};
+          writeBlock[2] = {0x2000, 0x46C0};
-
-const u16 writeBlock[2] = {0x2000, 0x46C0};
-
-const u8 unitInfoPatch = 0xE3;
 
 /**************************************************
 *                   Functions
@@ -69,14 +63,6 @@ u16 *getFirmWrite(u8 *pos, u32 size)
     return (u16 *)memsearch(off - 0x100, pattern, 0x100, 4);
 }
 
-u8 *getUnitInfoValueSet(u8 *pos, u32 size)
-{
-    //Look for UNITINFO value being set
-    const u8 pattern[] = {0x01, 0x10, 0xA0, 0x13};
-
-    return memsearch(pos, pattern, size, 4) + 3;
-}
-
 void *getLoader(u8 *pos, u32 size, u32 *loaderSize)
 {
     u8 *const off = memsearch(pos, "loade", size, 5);

source/patches.h

@@ -1,7 +1,5 @@
 /*
 *   patches.h
-*       by Reisyukaku / Aurora Wright
-*   Copyright (c) 2016 All Rights Reserved
 */
 
 #pragma once
@@ -12,10 +10,9 @@
 *                   Patches
 **************************************************/
 const u32 mpuPatch[3];       
-const u16 nandRedir[2];
+const u16 nandRedir[2],
-const u16 sigPatch[2];
+          sigPatch[2],
-const u16 writeBlock[2];
+          writeBlock[2];
-const u8 unitInfoPatch;
 
 /**************************************************
 *                   Functions
@@ -25,5 +22,4 @@ void getSigChecks(u8 *pos, u32 size, u32 *off, u32 *off2);
 void *getReboot(u8 *pos, u32 size);
 u32 getfOpen(u8 *proc9Offset, void *rebootOffset);
 u16 *getFirmWrite(u8 *pos, u32 size);
-u8 *getUnitInfoValueSet(u8 *pos, u32 size);
 void *getLoader(u8 *pos, u32 size, u32 *loaderSize);

source/screeninit.c

@@ -1,10 +1,8 @@
 /*
 *   screeninit.c
-*       by Aurora Wright
+*
 *   Screen init code by dark_samus, bil1s, Normmatt, delebile and others.
 *   Screen deinit code by tiniVi.
-*
-*   Copyright (c) 2016 All Rights Reserved
 */
 
 #include "screeninit.h"
@@ -14,7 +12,7 @@
 #include "i2c.h"
 #include "../build/screeninit.h"
 
-#define SCREENINIT_ADDRESS 0x24F03000
+#define SCREENINIT_ADDRESS 0x24F02000
 
 vu32 *arm11Entry = (u32 *)0x1FFFFFF8;
 

source/screeninit.h

@@ -1,10 +1,8 @@
 /*
 *   screeninit.h
-*       by Aurora Wright
+*
 *   Screen init code by dark_samus, bil1s, Normmatt, delebile and others.
 *   Screen deinit code by tiniVi.
-*
-*   Copyright (c) 2016 All Rights Reserved
 */
 
 #pragma once

source/types.h

@@ -1,7 +1,5 @@
 /*
 *   types.h
-*       by Reisyukaku
-*   Copyright (c) 2015 All Rights Reserved
 */
 
 #pragma once

source/utils.c

@@ -1,7 +1,5 @@
 /*
 *   utils.c
-*       by Aurora Wright
-*   Copyright (c) 2016 All Rights Reserved
 */
 
 #include "utils.h"

source/utils.h

@@ -1,7 +1,5 @@
 /*
 *   utils.h
-*       by Aurora Wright
-*   Copyright (c) 2016 All Rights Reserved
 */
 
 #pragma once