From 29d8e637d8ced79d8630d52b9d8b7644d49f0f13 Mon Sep 17 00:00:00 2001
From: Aurora <davidone92@katamail.com>
Date: Fri, 1 Jul 2016 20:36:43 +0200
Subject: [PATCH] One-liners ftw

---
 source/cache.h  |  2 +-
 source/cache.s  | 28 ++++++++++++----------------
 source/config.c |  2 +-
 3 files changed, 14 insertions(+), 18 deletions(-)

diff --git a/source/cache.h b/source/cache.h
index 0176c94..4ba7615 100644
--- a/source/cache.h
+++ b/source/cache.h
@@ -4,6 +4,7 @@
 */
 
 #pragma once
+
 #include "types.h"
 
 /***
@@ -17,6 +18,5 @@
 
 void flushEntireDCache(void); //actually: "clean and flush"
 void flushDCacheRange(void *startAddress, u32 size);
-
 void flushEntireICache(void);
 void flushICacheRange(void *startAddress, u32 size);
\ No newline at end of file
diff --git a/source/cache.s b/source/cache.s
index d241726..45a0773 100644
--- a/source/cache.s
+++ b/source/cache.s
@@ -12,69 +12,65 @@
 .global flushEntireDCache
 .type flushEntireDCache, %function
 flushEntireDCache:
-    @ Adpated from http://infocenter.arm.com/help/index.jsp?topic=/com.arm.doc.ddi0155a/ch03s03s05.html ,
+    @ 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
-    
+
 .global flushICacheRange
 .type flushICacheRange, %function
 flushICacheRange:
     @ Implemented in bootROM at address 0xffff0ac0
-    
     add r1, r0, r1                      @ end address
     bic r0, #0x1f                       @ align source address to cache line size (32 bytes)
-    
+
     flush_icache_range_loop:
         mcr p15, 0, r0, c7, c5, 1      @ flush the line corresponding to the address r0 is holding
         add r0, #0x20
         cmp r0, r1
         blo flush_icache_range_loop
-    
+
     bx lr
-    
\ No newline at end of file
diff --git a/source/config.c b/source/config.c
index 8df501e..a11bcb8 100644
--- a/source/config.c
+++ b/source/config.c
@@ -24,7 +24,7 @@ void configureCFW(const char *configPath)
                                         "( ) SysNAND is updated (A9LH-only)",
                                         "( ) Force A9LH detection",
                                         "( ) Use second EmuNAND as default",
-                                        "( ) Enable region/language emu. and external       .code loading",
+                                        "( ) Enable region/language emu. and ext. .code",
                                         "( ) Show current NAND in System Settings",
                                         "( ) Show GBA boot screen in patched AGB_FIRM",
                                         "( ) Enable splash screen with no screen-init" };