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>
This commit is contained in:
Amaury Pouly 2015-01-02 22:15:31 +01:00
parent 1ab91550e6
commit dc127f213c
11 changed files with 20 additions and 22 deletions

View file

@ -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