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/export/usb.h | |
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 'firmware/export/usb.h')
-rw-r--r-- | firmware/export/usb.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/firmware/export/usb.h b/firmware/export/usb.h index 62bcffe666..74c4826006 100644 --- a/firmware/export/usb.h +++ b/firmware/export/usb.h | |||
@@ -199,7 +199,8 @@ int usb_detect(void); | |||
199 | void usb_status_event(int current_status); | 199 | void usb_status_event(int current_status); |
200 | #endif | 200 | #endif |
201 | #ifdef HAVE_USB_POWER | 201 | #ifdef HAVE_USB_POWER |
202 | bool usb_powered(void); | 202 | /* returns whether the USB is in powered-only state */ |
203 | bool usb_powered_only(void); | ||
203 | #ifdef HAVE_USB_CHARGING_ENABLE | 204 | #ifdef HAVE_USB_CHARGING_ENABLE |
204 | enum { | 205 | enum { |
205 | USB_CHARGING_DISABLE, /* the USB code will never ask for more than 100mA */ | 206 | USB_CHARGING_DISABLE, /* the USB code will never ask for more than 100mA */ |