summaryrefslogtreecommitdiffstats
path: root/firmware/powermgmt.c
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 /firmware/powermgmt.c
parent1ab91550e6b7b4cd01350fea531447c1fa7d7250 (diff)
downloadrockbox-dc127f213c9b7e60f649bc236602e4f28285c53b.tar.gz
rockbox-dc127f213c9b7e60f649bc236602e4f28285c53b.tar.bz2
rockbox-dc127f213c9b7e60f649bc236602e4f28285c53b.zip
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 'firmware/powermgmt.c')
-rw-r--r--firmware/powermgmt.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/firmware/powermgmt.c b/firmware/powermgmt.c
index a4b260b315..61cf1b34c4 100644
--- a/firmware/powermgmt.c
+++ b/firmware/powermgmt.c
@@ -329,9 +329,9 @@ static int runcurrent(void)
if (usb_inserted()
#ifdef HAVE_USB_POWER
#if (CURRENT_USB < CURRENT_NORMAL)
- || usb_powered()
+ || usb_powered_only()
#else
- && !usb_powered()
+ && !usb_powered_only()
#endif
#endif
) {