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 /apps/main.c | |
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 'apps/main.c')
-rw-r--r-- | apps/main.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/apps/main.c b/apps/main.c index 60164515fa..211f7f1b3c 100644 --- a/apps/main.c +++ b/apps/main.c | |||
@@ -586,7 +586,8 @@ static void init(void) | |||
586 | mounted = true; /* mounting done @ end of USB mode */ | 586 | mounted = true; /* mounting done @ end of USB mode */ |
587 | } | 587 | } |
588 | #ifdef HAVE_USB_POWER | 588 | #ifdef HAVE_USB_POWER |
589 | if (usb_powered()) /* avoid deadlock */ | 589 | /* if there is no host or user requested no USB, skip this */ |
590 | if (usb_powered_only()) | ||
590 | break; | 591 | break; |
591 | #endif | 592 | #endif |
592 | } | 593 | } |