diff options
Diffstat (limited to 'firmware')
-rw-r--r-- | firmware/powermgmt.c | 2 | ||||
-rw-r--r-- | firmware/usb.c | 5 | ||||
-rw-r--r-- | firmware/usb.h | 1 |
3 files changed, 8 insertions, 0 deletions
diff --git a/firmware/powermgmt.c b/firmware/powermgmt.c index 9d3bf721aa..0af7d63a26 100644 --- a/firmware/powermgmt.c +++ b/firmware/powermgmt.c | |||
@@ -31,6 +31,7 @@ | |||
31 | #include "button.h" | 31 | #include "button.h" |
32 | #include "ata.h" | 32 | #include "ata.h" |
33 | #include "mpeg.h" | 33 | #include "mpeg.h" |
34 | #include "usb.h" | ||
34 | #include "powermgmt.h" | 35 | #include "powermgmt.h" |
35 | 36 | ||
36 | #ifdef SIMULATOR | 37 | #ifdef SIMULATOR |
@@ -127,6 +128,7 @@ static void handle_auto_poweroff(void) | |||
127 | last_charge_time = current_tick; | 128 | last_charge_time = current_tick; |
128 | 129 | ||
129 | if(timeout && | 130 | if(timeout && |
131 | !usb_inserted() && | ||
130 | (mpeg_stat == 0 || | 132 | (mpeg_stat == 0 || |
131 | mpeg_stat == (MPEG_STATUS_PLAY | MPEG_STATUS_PAUSE))) | 133 | mpeg_stat == (MPEG_STATUS_PLAY | MPEG_STATUS_PAUSE))) |
132 | { | 134 | { |
diff --git a/firmware/usb.c b/firmware/usb.c index 2e978ff54e..962e373a67 100644 --- a/firmware/usb.c +++ b/firmware/usb.c | |||
@@ -297,6 +297,11 @@ void usb_start_monitoring(void) | |||
297 | usb_monitor_enabled = true; | 297 | usb_monitor_enabled = true; |
298 | } | 298 | } |
299 | 299 | ||
300 | bool usb_inserted(void) | ||
301 | { | ||
302 | return usb_state == USB_INSERTED; | ||
303 | } | ||
304 | |||
300 | #else | 305 | #else |
301 | 306 | ||
302 | /* Dummy simulator functions */ | 307 | /* Dummy simulator functions */ |
diff --git a/firmware/usb.h b/firmware/usb.h index a29ff9832c..455775c1d2 100644 --- a/firmware/usb.h +++ b/firmware/usb.h | |||
@@ -26,5 +26,6 @@ void usb_start_monitoring(void); | |||
26 | void usb_acknowledge(int id); | 26 | void usb_acknowledge(int id); |
27 | void usb_wait_for_disconnect(struct event_queue *q); | 27 | void usb_wait_for_disconnect(struct event_queue *q); |
28 | void usb_display_info(void); | 28 | void usb_display_info(void); |
29 | bool usb_inserted(void); | ||
29 | 30 | ||
30 | #endif | 31 | #endif |