diff options
author | Amaury Pouly <amaury.pouly@gmail.com> | 2015-01-02 22:15:31 +0100 |
---|---|---|
committer | Amaury Pouly <amaury.pouly@gmail.com> | 2015-01-08 16:45:32 +0100 |
commit | dc127f213c9b7e60f649bc236602e4f28285c53b (patch) | |
tree | 27c28295e37858755e2b151ca11348f73a791ea0 /apps/plugins | |
parent | 1ab91550e6b7b4cd01350fea531447c1fa7d7250 (diff) | |
download | rockbox-dc127f213c9b7e60f649bc236602e4f28285c53b.tar.gz 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 'apps/plugins')
-rw-r--r-- | apps/plugins/battery_bench.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/apps/plugins/battery_bench.c b/apps/plugins/battery_bench.c index b0976d5e10..289b399e27 100644 --- a/apps/plugins/battery_bench.c +++ b/apps/plugins/battery_bench.c | |||
@@ -358,11 +358,12 @@ static unsigned int charge_state(void) | |||
358 | ret |= BIT_CHARGING; | 358 | ret |= BIT_CHARGING; |
359 | #endif | 359 | #endif |
360 | #endif | 360 | #endif |
361 | /* USB insertion means nothing if USB cannot power the device */ | ||
361 | #ifdef HAVE_USB_POWER | 362 | #ifdef HAVE_USB_POWER |
362 | if (rb->usb_powered()) | 363 | if (rb->usb_inserted()) |
363 | ret |= BIT_USB_POWER; | 364 | ret |= BIT_USB_POWER; |
364 | #endif | 365 | #endif |
365 | return ret; | 366 | return ret; |
366 | } | 367 | } |
367 | #endif | 368 | #endif |
368 | 369 | ||