summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--apps/main.c2
-rw-r--r--apps/screens.c24
-rw-r--r--flash/bootbox/main.c27
3 files changed, 12 insertions, 41 deletions
diff --git a/apps/main.c b/apps/main.c
index 66e046a49c..4dee44421a 100644
--- a/apps/main.c
+++ b/apps/main.c
@@ -198,7 +198,7 @@ void init(void)
)
{
rc = charging_screen(); /* display a "charging" screen */
- if (rc == 1 || rc == 2) /* charger removed or "Off/Stop" pressed */
+ if (rc == 1) /* charger removed */
power_off();
/* "On" pressed or USB connected: proceed */
show_logo(); /* again, to provide better visual feedback */
diff --git a/apps/screens.c b/apps/screens.c
index 0ff88c6e1e..badbdb7272 100644
--- a/apps/screens.c
+++ b/apps/screens.c
@@ -339,11 +339,6 @@ int charging_screen(void)
{
unsigned int button;
int rc = 0;
-#ifdef BUTTON_OFF
- const unsigned int offbutton = BUTTON_OFF;
-#else
- const unsigned int offbutton = BUTTON_STOP;
-#endif
ide_power_enable(false); /* power down the disk, else would be spinning */
@@ -365,21 +360,12 @@ int charging_screen(void)
status_draw(false);
charging_display_info(true);
button = button_get_w_tmo(HZ/3);
-#ifdef BUTTON_ON
- if (button == (BUTTON_ON | BUTTON_REL))
-#else
- if (button == (BUTTON_RIGHT | BUTTON_REL))
-#endif
- rc = 3;
- else if (button == offbutton)
+ if (button == BUTTON_ON)
rc = 2;
- else
- {
- if (usb_detect())
- rc = 4;
- else if (!charger_inserted())
- rc = 1;
- }
+ else if (usb_detect())
+ rc = 3;
+ else if (!charger_inserted())
+ rc = 1;
} while (!rc);
#ifdef HAVE_LCD_CHARCELLS
diff --git a/flash/bootbox/main.c b/flash/bootbox/main.c
index 8c7c398ff8..e5b4ac6634 100644
--- a/flash/bootbox/main.c
+++ b/flash/bootbox/main.c
@@ -42,12 +42,6 @@
#include "usb.h"
#include "powermgmt.h"
-#ifdef BUTTON_OFF
- static const int offbutton = BUTTON_OFF;
-#else
- static const int offbutton = BUTTON_STOP;
-#endif
-
void usb_screen(void)
{
lcd_clear_display();
@@ -88,21 +82,12 @@ int charging_screen(void)
do
{
button = button_get_w_tmo(HZ/2);
-#ifdef BUTTON_ON
if (button == (BUTTON_ON | BUTTON_REL))
-#else
- if (button == (BUTTON_RIGHT | BUTTON_REL))
-#endif
- rc = 3;
- else if (button == offbutton)
rc = 2;
- else
- {
- if (usb_detect())
- rc = 4;
- else if (!charger_inserted())
- rc = 1;
- }
+ else if (usb_detect())
+ rc = 3;
+ else if (!charger_inserted())
+ rc = 1;
} while (!rc);
return rc;
@@ -133,7 +118,7 @@ void prompt_usb(const char* msg1, const char* msg2)
do
{
button = button_get(true);
- if (button == offbutton)
+ if (button == SYS_POWEROFF)
{
power_off();
}
@@ -166,7 +151,7 @@ void main(void)
)
{
rc = charging_screen(); /* display a "charging" screen */
- if (rc == 1 || rc == 2) /* charger removed or "Off/Stop" pressed */
+ if (rc == 1) /* charger removed */
power_off();
/* "On" pressed or USB connected: proceed */
show_logo(); /* again, to provide better visual feedback */