stop overriding user config on update

fusee/fusee-primary/src/main.c

@@ -13,7 +13,7 @@
  * 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 "utils.h"
 #include "exception_handlers.h"
 #include "panic.h"
@@ -37,35 +37,40 @@ static char g_bct0_buffer[BCTO_MAX_SIZE];
 
 #define CONFIG_LOG_LEVEL_KEY "log_level"
 
-#define DEFAULT_BCT0_FOR_DEBUG \
+#define DEFAULT_BCT0 \
 "BCT0\n"\
 "[stage1]\n"\
 "stage2_path = atmosphere/fusee-secondary.bin\n"\
 "stage2_mtc_path = atmosphere/fusee-mtc.bin\n"\
 "stage2_addr = 0xF0000000\n"\
-"stage2_entrypoint = 0xF0000000\n"
+"stage2_entrypoint = 0xF0000000\n"\
+"[exosphere]\n"\
+"debugmode = 1\n"\
+"debugmode_user = 0\n"\
+"disable_user_exception_handlers = 0\n"\
+"[stratosphere]\n"
 
 static const char *load_config(void) {
     if (!read_from_file(g_bct0_buffer, BCTO_MAX_SIZE, "atmosphere/BCT.ini")) {
         print(SCREEN_LOG_LEVEL_DEBUG, "Failed to read BCT0 from SD!\n");
         print(SCREEN_LOG_LEVEL_DEBUG, "Using default BCT0!\n");
-        memcpy(g_bct0_buffer, DEFAULT_BCT0_FOR_DEBUG, sizeof(DEFAULT_BCT0_FOR_DEBUG));
+        memcpy(g_bct0_buffer, DEFAULT_BCT0, sizeof(DEFAULT_BCT0));
     }
 
     if (memcmp(g_bct0_buffer, "BCT0", 4) != 0) {
         fatal_error("Unexpected magic in BCT.ini!\n");
     }
-    
+
     /* Return pointer to first line of the ini. */
     const char *bct0 = g_bct0_buffer;
     while (*bct0 && *bct0 != '\n') {
         bct0++;
     }
-    
+
     if (!bct0) {
         fatal_error("BCT.ini has no newline!\n");
     }
-    
+
     return bct0;
 }
 
@@ -87,7 +92,7 @@ static int config_ini_handler(void *user, const char *section, const char *name,
 
 static void setup_display(void) {
     g_framebuffer = (void *)0xC0000000;
-    
+
     /* Zero-fill the framebuffer and register it as printk provider. */
     video_init(g_framebuffer);
 
@@ -105,7 +110,7 @@ static void setup_display(void) {
 static void cleanup_display(void) {
     /* Turn off the backlight. */
     display_backlight(false);
-    
+
     /* Terminate the display. */
     display_end();
 }
@@ -116,7 +121,7 @@ static void setup_env(void) {
 
     /* Set up the exception handlers. */
     setup_exception_handlers();
-        
+
     /* Mount the SD card. */
     mount_sd();
 }
@@ -137,13 +142,13 @@ int main(void) {
     stage2_args_t *stage2_args;
     uint32_t stage2_version = 0;
     ScreenLogLevel log_level = SCREEN_LOG_LEVEL_NONE;
-        
+
     /* Initialize the boot environment. */
     setup_env();
 
     /* Check for panics. */
     check_and_display_panic();
-    
+
     /* Load the BCT0 configuration ini off of the SD. */
     bct0 = load_config();
 
@@ -151,19 +156,19 @@ int main(void) {
     if (ini_parse_string(bct0, config_ini_handler, &log_level) < 0) {
         fatal_error("Failed to parse BCT.ini!\n");
     }
-    
+
     /* Override the global logging level. */
     log_set_log_level(log_level);
-    
+
     if (log_level != SCREEN_LOG_LEVEL_NONE) {
         /* Initialize the display for debugging. */
         setup_display();
     }
-    
+
     /* Say hello. */
     print(SCREEN_LOG_LEVEL_DEBUG | SCREEN_LOG_LEVEL_NO_PREFIX, "Welcome to Atmosph\xe8re Fus\xe9" "e!\n");
     print(SCREEN_LOG_LEVEL_DEBUG, "Using color linear framebuffer at 0x%p!\n", g_framebuffer);
-    
+
     /* Load the loader payload into DRAM. */
     load_stage2(bct0);
 
@@ -175,14 +180,14 @@ int main(void) {
     memcpy(&stage2_args->log_level, &log_level, sizeof(log_level));
     strcpy(stage2_args->bct0, bct0);
     g_chainloader_argc = 2;
-    
+
     /* Terminate the boot environment. */
     cleanup_env();
-    
+
     if (log_level != SCREEN_LOG_LEVEL_NONE) {
         /* Wait a while for debugging. */
         mdelay(1000);
-        
+
         /* Terminate the display for debugging. */
         cleanup_display();
     }