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

@ -199,7 +199,8 @@ int usb_detect(void);
void usb_status_event(int current_status);
#endif
#ifdef HAVE_USB_POWER
bool usb_powered(void);
/* returns whether the USB is in powered-only state */
bool usb_powered_only(void);
#ifdef HAVE_USB_CHARGING_ENABLE
enum {
USB_CHARGING_DISABLE, /* the USB code will never ask for more than 100mA */

View file

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

View file

@ -769,7 +769,7 @@ int usb_release_exclusive_storage(void)
}
#ifdef HAVE_USB_POWER
bool usb_powered(void)
bool usb_powered_only(void)
{
return usb_state == USB_POWERED;
}