From 31ff6a1da820500914b4a7a76a463f9e61981ad2 Mon Sep 17 00:00:00 2001
From: TuxSH <tuxsh@sfr.fr>
Date: Tue, 20 Jun 2017 17:39:11 +0200
Subject: [PATCH] Clarify option

---
 k11_extension/include/config.h                    | 2 +-
 k11_extension/source/fatalExceptionHandlersMain.c | 2 +-
 source/config.c                                   | 6 +++---
 source/config.h                                   | 2 +-
 sysmodules/loader/source/patcher.h                | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/k11_extension/include/config.h b/k11_extension/include/config.h
index 1374e48..cfe0485 100644
--- a/k11_extension/include/config.h
+++ b/k11_extension/include/config.h
@@ -32,5 +32,5 @@ enum singleOptions
     SHOWGBABOOT,
     PATCHACCESS,
     PATCHUNITINFO,
-    DISABLEVECTORS
+    DISABLEARM11EXCHANDLERS
 };
diff --git a/k11_extension/source/fatalExceptionHandlersMain.c b/k11_extension/source/fatalExceptionHandlersMain.c
index ddbfafb..66ae07d 100644
--- a/k11_extension/source/fatalExceptionHandlersMain.c
+++ b/k11_extension/source/fatalExceptionHandlersMain.c
@@ -35,7 +35,7 @@
 
 bool isExceptionFatal(u32 spsr, u32 *regs, u32 index)
 {
-    if(CONFIG(DISABLEVECTORS)) return false;
+    if(CONFIG(DISABLEARM11EXCHANDLERS)) return false;
 
     if((spsr & 0x1f) != 0x10) return true;
 
diff --git a/source/config.c b/source/config.c
index 34cfc4f..1da4b64 100644
--- a/source/config.c
+++ b/source/config.c
@@ -94,7 +94,7 @@ void configMenu(bool oldPinStatus, u32 oldPinMode)
                                         "( ) Show GBA boot screen in patched AGB_FIRM",
                                         "( ) Patch ARM9 access",
                                         "( ) Set developer UNITINFO",
-                                        "( ) Disable Exception Vectors",
+                                        "( ) Disable ARM11 exception handlers",
                                       };
 
     const char *optionsDescription[]  = { "Select the default EmuNAND.\n\n"
@@ -190,8 +190,8 @@ void configMenu(bool oldPinStatus, u32 oldPinMode)
                                           "are doing!",
 
                                           "Disables the fatal error exception\n"
-                                          "vectors for the ARM11 CPU\n"
-                                          "Note: Disabling the exception vectors\n"
+                                          "handlers for the ARM11 CPU.\n\n"
+                                          "Note: Disabling the exception handlers\n"
                                           "will disqualify you from submitting\n"
                                           "issues or bug reports to the Luma3DS\n"
                                           "GitHub repository!"
diff --git a/source/config.h b/source/config.h
index 3257df3..de86c20 100644
--- a/source/config.h
+++ b/source/config.h
@@ -59,7 +59,7 @@ enum singleOptions
     SHOWGBABOOT,
     PATCHACCESS,
     PATCHUNITINFO,
-    DISABLEVECTORS
+    DISABLEARM11EXCHANDLERS
 };
 
 typedef enum ConfigurationStatus
diff --git a/sysmodules/loader/source/patcher.h b/sysmodules/loader/source/patcher.h
index cb90c74..1e2bf5b 100644
--- a/sysmodules/loader/source/patcher.h
+++ b/sysmodules/loader/source/patcher.h
@@ -32,7 +32,7 @@ enum singleOptions
     SHOWGBABOOT,
     PATCHACCESS,
     PATCHUNITINFO,
-    DISABLEVECTORS
+    DISABLEARM11EXCHANDLERS
 };
 
 void patchCode(u64 progId, u16 progVer, u8 *code, u32 size, u32 textSize, u32 roSize, u32 dataSize, u32 roAddress, u32 dataAddress);