summaryrefslogtreecommitdiff
path: root/flash/bootbox
diff options
context:
space:
mode:
Diffstat (limited to 'flash/bootbox')
-rw-r--r--flash/bootbox/main.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/flash/bootbox/main.c b/flash/bootbox/main.c
index ef215c092b..4f5efdd7c6 100644
--- a/flash/bootbox/main.c
+++ b/flash/bootbox/main.c
@@ -65,7 +65,7 @@ int show_logo(void)
65 return 0; 65 return 0;
66} 66}
67 67
68#ifdef HAVE_CHARGING 68#ifdef CONFIG_CHARGING
69/* 69/*
70bool backlight_get_on_when_charging(void) 70bool backlight_get_on_when_charging(void)
71{ 71{
@@ -83,12 +83,12 @@ void charging_screen(void)
83 83
84 do 84 do
85 { 85 {
86#ifdef HAVE_CHARGE_CTRL 86#if CONFIG_CHARGING == CHARGING_CONTROL
87 if (charge_state == 1) 87 if (charge_state == CHARGING)
88 msg = "charging"; 88 msg = "charging";
89 else if (charge_state == 2) 89 else if (charge_state == TOPOFF)
90 msg = "topoff charge"; 90 msg = "topoff charge";
91 else if (charge_state == 3) 91 else if (charge_state == TRICKLE)
92 msg = "trickle charge"; 92 msg = "trickle charge";
93 else 93 else
94 msg = "not charging"; 94 msg = "not charging";
@@ -130,7 +130,7 @@ void charging_screen(void)
130 } 130 }
131 } while (1); 131 } while (1);
132} 132}
133#endif /* HAVE_CHARGING */ 133#endif /* CONFIG_CHARGING */
134 134
135/* prompt user to plug USB and fix a problem */ 135/* prompt user to plug USB and fix a problem */
136void prompt_usb(const char* msg1, const char* msg2) 136void prompt_usb(const char* msg1, const char* msg2)
@@ -172,7 +172,7 @@ void main(void)
172 button_init(); 172 button_init();
173 powermgmt_init(); 173 powermgmt_init();
174 174
175#if defined(HAVE_CHARGING) && (CONFIG_CPU == SH7034) 175#if defined(CONFIG_CHARGING) && (CONFIG_CPU == SH7034)
176 if (charger_inserted() 176 if (charger_inserted()
177#ifdef ATA_POWER_PLAYERSTYLE 177#ifdef ATA_POWER_PLAYERSTYLE
178 && !ide_powered() /* relies on probing result from bootloader */ 178 && !ide_powered() /* relies on probing result from bootloader */