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 /firmware | |
| parent | 1ab91550e6b7b4cd01350fea531447c1fa7d7250 (diff) | |
| download | rockbox-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 'firmware')
| -rw-r--r-- | firmware/export/usb.h | 3 | ||||
| -rw-r--r-- | firmware/powermgmt.c | 4 | ||||
| -rw-r--r-- | firmware/usb.c | 2 |
3 files changed, 5 insertions, 4 deletions
diff --git a/firmware/export/usb.h b/firmware/export/usb.h index 62bcffe..74c4826 100644 --- a/firmware/export/usb.h +++ b/firmware/export/usb.h @@ -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 */ diff --git a/firmware/powermgmt.c b/firmware/powermgmt.c index a4b260b..61cf1b3 100644 --- a/firmware/powermgmt.c +++ b/firmware/powermgmt.c @@ -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 ) { diff --git a/firmware/usb.c b/firmware/usb.c index fc89df7..a736f31 100644 --- a/firmware/usb.c +++ b/firmware/usb.c @@ -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; } |