From dc127f213c9b7e60f649bc236602e4f28285c53b Mon Sep 17 00:00:00 2001 From: Amaury Pouly Date: Fri, 2 Jan 2015 22:15:31 +0100 Subject: 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 --- apps/plugins/battery_bench.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'apps/plugins') 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 -- cgit v1.1