summaryrefslogtreecommitdiff
path: root/apps/gui
diff options
context:
space:
mode:
authorAmaury Pouly <amaury.pouly@gmail.com>2015-01-02 22:15:31 +0100
committerAmaury Pouly <amaury.pouly@gmail.com>2015-01-08 16:45:32 +0100
commitdc127f213c9b7e60f649bc236602e4f28285c53b (patch)
tree27c28295e37858755e2b151ca11348f73a791ea0 /apps/gui
parent1ab91550e6b7b4cd01350fea531447c1fa7d7250 (diff)
Clarify usb_powered() and fix some code.
Either by mistake or because its meaning changed, usb_powered() doesn't mean what the name suggest, so clarify its meaning by renaming it to usb_powered_only. So use of usb_powered() are replaced by usb_inserted() when it makes more sense. Change-Id: I112887e2d8560e84587bee5f55c826dde8c806d8 Reviewed-on: http://gerrit.rockbox.org/1097 Reviewed-by: Amaury Pouly <amaury.pouly@gmail.com>
Diffstat (limited to 'apps/gui')
-rw-r--r--apps/gui/skin_engine/skin_tokens.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/apps/gui/skin_engine/skin_tokens.c b/apps/gui/skin_engine/skin_tokens.c
index e58393e19c..934085c707 100644
--- a/apps/gui/skin_engine/skin_tokens.c
+++ b/apps/gui/skin_engine/skin_tokens.c
@@ -1149,12 +1149,10 @@ const char *get_token_value(struct gui_wps *gwps,
}
}
#endif
-#ifdef HAVE_USB_POWER
- case SKIN_TOKEN_USB_POWERED:
- if (usb_powered())
+ case SKIN_TOKEN_USB_INSERTED:
+ if (usb_inserted())
return "u";
return NULL;
-#endif
case SKIN_TOKEN_BATTERY_SLEEPTIME:
{
if (get_sleep_timer() == 0)