arm11 branch merge start

Author: Cpasjuste

CMakeLists.txt

@@ -3,7 +3,7 @@ project(CtrBootManager)
 enable_language(ASM)
 
 #set(CMAKE_VERBOSE_MAKEFILE on)
-set(NETLOAD_IP "192.168.1.14")
+set(NETLOAD_IP "172.20.138.31")
 
 # Note that you must copy the cmake folder and the DevkitArm3DS.cmake file in this directory
 list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}/cmake) # Add the cmake folder to the modules paths, so that we can use the tools and find_package for ctrulib
@@ -44,7 +44,7 @@ set(CMAKE_C_FLAGS "-DARM9")
 add_executable(CtrBootManager ${SOURCE_FILES}) # Create the elf file
 set(ARCH "-march=armv6k -mtune=mpcore -mfloat-abi=hard")
 set_target_properties(CtrBootManager PROPERTIES COMPILE_FLAGS
-        "-mword-relocations ${ARCH} -fomit-frame-pointer -ffast-math -O2 -mtp=soft -D_3DS -DARM11 -DHAVE_CONFIG_H")
+        "-mword-relocations ${ARCH} -fomit-frame-pointer -ffast-math -O2 -mtp=soft -D_3DS -DARM11 -DHAVE_CONFIG_H -DINI_USE_STACK")
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${DKA_SUGGESTED_CXX_FLAGS}")
 
 find_package(CTRULIB REQUIRED) # Look for ctrulib

source/config.c

@@ -114,8 +114,10 @@ static int handler(void *user, const char *section, const char *name,
     } else if (MATCH("entry", "offset")) {
         config->entries[config->count].offset = strtoul(item, NULL, 16);
     } else if (MATCH("entry", "key")) {
-        config->entries[config->count].key = atoi(item);
-        config->count++;
+        if(strlen(config->entries[config->count].title) > 0) {
+            config->entries[config->count].key = atoi(item);
+            config->count++;
+        }
     }
     else {
         return 0;
@@ -147,7 +149,7 @@ int configInit() {
     memset(config, 0, sizeof(boot_config_s));
 
     config->timeout = 3;
-    config->autobootfix = 100;
+    config->autobootfix = 8;
     config->index = 0;
     config->recovery = 2;
     config->count = 0;
@@ -158,16 +160,19 @@ int configInit() {
     if (!size) {
         return -1;
     }
+
     char buffer[size];
     memset(buffer, 0, size);
     if (fileRead(CONFIG_PATH, buffer, size) != 0) {
+        debug("Could not read config file, creating one...");
         configSave(); // write new config file
         return -1;
     }
     ctx.ptr = buffer;
     ctx.bytes_left = strlen(ctx.ptr);
 
     if (ini_parse_stream((ini_reader) ini_buffer_reader, &ctx, handler, config) < 0) {
+        debug("Could not parse config file, creating one...");
         configSave(); // write new config file
         return -1;
     }

source/loader.c

@@ -1,7 +1,9 @@
 #ifndef ARM9
+
 #include <string.h>
 #include <3ds.h>
 #include "brahma.h"
+
 #else
 
 #include "gfx.h"
@@ -64,6 +66,7 @@ int load_bin(char *path, long offset) {
 
     return 0;
 }
+
 #endif
 
 int load(char *path, long offset) {
@@ -73,17 +76,17 @@ int load(char *path, long offset) {
     } else if (strcasecmp(path, "shutdown") == 0) {
         poweroff();
 #ifndef ARM9
-        } else if (strcasecmp(path, "homemenu") == 0) {
-            return load_homemenu();
+    } else if (strcasecmp(path, "homemenu") == 0) {
+        return load_homemenu();
 #endif
     } else {
         const char *ext = get_filename_ext(path);
         if (strcasecmp(ext, "bin") == 0
             || strcasecmp(ext, "dat") == 0) {
             return load_bin(path, offset);
 #ifndef ARM9
-            } else if (strcasecmp(ext, "3dsx") == 0) {
-                return load_3dsx(path);
+        } else if (strcasecmp(ext, "3dsx") == 0) {
+            return load_3dsx(path);
 #endif
         } else {
             debug("Invalid file: %s\n", path);

source/menu_boot.c

@@ -108,7 +108,7 @@ int menu_boot() {
                 if(menu_more() == 0) {
                     break;
                 }
-            } else if (boot(boot_index)) {
+            } else if (boot(boot_index) == 0) {
                 break;
             }
         }