diff options
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 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 */ |
diff --git a/firmware/powermgmt.c b/firmware/powermgmt.c index a4b260b315..61cf1b34c4 100644 --- a/firmware/powermgmt.c +++ b/firmware/powermgmt.c | |||
@@ -329,9 +329,9 @@ static int runcurrent(void) | |||
329 | if (usb_inserted() | 329 | if (usb_inserted() |
330 | #ifdef HAVE_USB_POWER | 330 | #ifdef HAVE_USB_POWER |
331 | #if (CURRENT_USB < CURRENT_NORMAL) | 331 | #if (CURRENT_USB < CURRENT_NORMAL) |
332 | || usb_powered() | 332 | || usb_powered_only() |
333 | #else | 333 | #else |
334 | && !usb_powered() | 334 | && !usb_powered_only() |
335 | #endif | 335 | #endif |
336 | #endif | 336 | #endif |
337 | ) { | 337 | ) { |
diff --git a/firmware/usb.c b/firmware/usb.c index fc89df709c..a736f31ca5 100644 --- a/firmware/usb.c +++ b/firmware/usb.c | |||
@@ -769,7 +769,7 @@ int usb_release_exclusive_storage(void) | |||
769 | } | 769 | } |
770 | 770 | ||
771 | #ifdef HAVE_USB_POWER | 771 | #ifdef HAVE_USB_POWER |
772 | bool usb_powered(void) | 772 | bool usb_powered_only(void) |
773 | { | 773 | { |
774 | return usb_state == USB_POWERED; | 774 | return usb_state == USB_POWERED; |
775 | } | 775 | } |