summaryrefslogtreecommitdiff
path: root/apps/plugins
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/plugins
parent1ab91550e6b7b4cd01350fea531447c1fa7d7250 (diff)
downloadrockbox-dc127f213c9b7e60f649bc236602e4f28285c53b.zip
rockbox-dc127f213c9b7e60f649bc236602e4f28285c53b.tar.gz
rockbox-dc127f213c9b7e60f649bc236602e4f28285c53b.tar.bz2
rockbox-dc127f213c9b7e60f649bc236602e4f28285c53b.tar.xz
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/plugins')
-rw-r--r--apps/plugins/battery_bench.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/apps/plugins/battery_bench.c b/apps/plugins/battery_bench.c
index b0976d5..289b399 100644
--- a/apps/plugins/battery_bench.c
+++ b/apps/plugins/battery_bench.c
@@ -358,11 +358,12 @@ static unsigned int charge_state(void)
ret |= BIT_CHARGING;
#endif
#endif
+ /* USB insertion means nothing if USB cannot power the device */
#ifdef HAVE_USB_POWER
- if (rb->usb_powered())
+ if (rb->usb_inserted())
ret |= BIT_USB_POWER;
#endif
- return ret;
+ return ret;
}
#endif