summaryrefslogtreecommitdiff
path: root/apps/main.c
diff options
context:
space:
mode:
Diffstat (limited to 'apps/main.c')
-rw-r--r--apps/main.c14
1 files changed, 9 insertions, 5 deletions
diff --git a/apps/main.c b/apps/main.c
index d590790a85..a3fe8ef64f 100644
--- a/apps/main.c
+++ b/apps/main.c
@@ -338,9 +338,17 @@ void init(void)
338 panicf("ata: %d", rc); 338 panicf("ata: %d", rc);
339 } 339 }
340 340
341#ifdef HAVE_EEPROM
342 eeprom_settings_init();
343#endif
344
341 usb_start_monitoring(); 345 usb_start_monitoring();
342 while (usb_detect()) 346 while (usb_detect())
343 { /* enter USB mode early, before trying to mount */ 347 {
348#ifdef HAVE_EEPROM
349 firmware_settings.disk_clean = false;
350#endif
351 /* enter USB mode early, before trying to mount */
344 if (button_get_w_tmo(HZ/10) == SYS_USB_CONNECTED) 352 if (button_get_w_tmo(HZ/10) == SYS_USB_CONNECTED)
345#ifdef HAVE_MMC 353#ifdef HAVE_MMC
346 if (!mmc_touched() || (mmc_remove_request() == SYS_MMC_EXTRACTED)) 354 if (!mmc_touched() || (mmc_remove_request() == SYS_MMC_EXTRACTED))
@@ -374,10 +382,6 @@ void init(void)
374 } 382 }
375 } 383 }
376 384
377#ifdef HAVE_EEPROM
378 eeprom_settings_init();
379#endif
380
381 settings_calc_config_sector(); 385 settings_calc_config_sector();
382 386
383#if defined(SETTINGS_RESET) || (CONFIG_KEYPAD == IPOD_4G_PAD) 387#if defined(SETTINGS_RESET) || (CONFIG_KEYPAD == IPOD_4G_PAD)