diff options
Diffstat (limited to 'apps/main.c')
-rw-r--r-- | apps/main.c | 22 |
1 files changed, 0 insertions, 22 deletions
diff --git a/apps/main.c b/apps/main.c index 208dced923..fe15675c69 100644 --- a/apps/main.c +++ b/apps/main.c | |||
@@ -418,10 +418,6 @@ static void init(void) | |||
418 | { | 418 | { |
419 | int rc; | 419 | int rc; |
420 | bool mounted = false; | 420 | bool mounted = false; |
421 | #if CONFIG_CHARGING && (CONFIG_CPU == SH7034) | ||
422 | /* if nobody initialized ATA before, I consider this a cold start */ | ||
423 | bool coldstart = (PACR2 & 0x4000) != 0; /* starting from Flash */ | ||
424 | #endif | ||
425 | 421 | ||
426 | system_init(); | 422 | system_init(); |
427 | core_allocator_init(); | 423 | core_allocator_init(); |
@@ -528,24 +524,6 @@ static void init(void) | |||
528 | viewportmanager_init(); | 524 | viewportmanager_init(); |
529 | CHART("<viewportmanager_init"); | 525 | CHART("<viewportmanager_init"); |
530 | 526 | ||
531 | #if CONFIG_CHARGING && (CONFIG_CPU == SH7034) | ||
532 | /* charger_inserted() can't be used here because power_thread() | ||
533 | hasn't checked power_input_status() yet */ | ||
534 | if (coldstart && (power_input_status() & POWER_INPUT_MAIN_CHARGER) | ||
535 | && !global_settings.car_adapter_mode | ||
536 | #ifdef ATA_POWER_PLAYERSTYLE | ||
537 | && !ide_powered() /* relies on probing result from bootloader */ | ||
538 | #endif | ||
539 | ) | ||
540 | { | ||
541 | rc = charging_screen(); /* display a "charging" screen */ | ||
542 | if (rc == 1) /* charger removed */ | ||
543 | power_off(); | ||
544 | /* "On" pressed or USB connected: proceed */ | ||
545 | show_logo(); /* again, to provide better visual feedback */ | ||
546 | } | ||
547 | #endif | ||
548 | |||
549 | CHART(">storage_init"); | 527 | CHART(">storage_init"); |
550 | rc = storage_init(); | 528 | rc = storage_init(); |
551 | CHART("<storage_init"); | 529 | CHART("<storage_init"); |