diff options
Diffstat (limited to 'firmware')
-rw-r--r-- | firmware/powermgmt.c | 2 | ||||
-rw-r--r-- | firmware/usb.c | 9 |
2 files changed, 11 insertions, 0 deletions
diff --git a/firmware/powermgmt.c b/firmware/powermgmt.c index 899e103d59..a2017a76fd 100644 --- a/firmware/powermgmt.c +++ b/firmware/powermgmt.c | |||
@@ -1123,6 +1123,7 @@ void powermgmt_init(void) | |||
1123 | 1123 | ||
1124 | void sys_poweroff(void) | 1124 | void sys_poweroff(void) |
1125 | { | 1125 | { |
1126 | #ifndef BOOTLOADER | ||
1126 | logf("sys_poweroff()"); | 1127 | logf("sys_poweroff()"); |
1127 | /* If the main thread fails to shut down the system, we will force a | 1128 | /* If the main thread fails to shut down the system, we will force a |
1128 | power off after an 20 second timeout - 28 seconds if recording */ | 1129 | power off after an 20 second timeout - 28 seconds if recording */ |
@@ -1139,6 +1140,7 @@ void sys_poweroff(void) | |||
1139 | } | 1140 | } |
1140 | 1141 | ||
1141 | queue_broadcast(SYS_POWEROFF, 0); | 1142 | queue_broadcast(SYS_POWEROFF, 0); |
1143 | #endif /* BOOTLOADER */ | ||
1142 | } | 1144 | } |
1143 | 1145 | ||
1144 | void cancel_shutdown(void) | 1146 | void cancel_shutdown(void) |
diff --git a/firmware/usb.c b/firmware/usb.c index 9d4bb00180..f9bfbc4dbf 100644 --- a/firmware/usb.c +++ b/firmware/usb.c | |||
@@ -487,6 +487,7 @@ void usb_init(void) | |||
487 | 487 | ||
488 | void usb_wait_for_disconnect(struct event_queue *q) | 488 | void usb_wait_for_disconnect(struct event_queue *q) |
489 | { | 489 | { |
490 | #ifdef USB_FULL_INIT | ||
490 | struct queue_event ev; | 491 | struct queue_event ev; |
491 | 492 | ||
492 | /* Don't return until we get SYS_USB_DISCONNECTED */ | 493 | /* Don't return until we get SYS_USB_DISCONNECTED */ |
@@ -499,10 +500,14 @@ void usb_wait_for_disconnect(struct event_queue *q) | |||
499 | return; | 500 | return; |
500 | } | 501 | } |
501 | } | 502 | } |
503 | #else | ||
504 | (void)q; | ||
505 | #endif /* USB_FULL_INIT */ | ||
502 | } | 506 | } |
503 | 507 | ||
504 | int usb_wait_for_disconnect_w_tmo(struct event_queue *q, int ticks) | 508 | int usb_wait_for_disconnect_w_tmo(struct event_queue *q, int ticks) |
505 | { | 509 | { |
510 | #ifdef USB_FULL_INIT | ||
506 | struct queue_event ev; | 511 | struct queue_event ev; |
507 | 512 | ||
508 | /* Don't return until we get SYS_USB_DISCONNECTED or SYS_TIMEOUT */ | 513 | /* Don't return until we get SYS_USB_DISCONNECTED or SYS_TIMEOUT */ |
@@ -520,6 +525,10 @@ int usb_wait_for_disconnect_w_tmo(struct event_queue *q, int ticks) | |||
520 | break; | 525 | break; |
521 | } | 526 | } |
522 | } | 527 | } |
528 | #else | ||
529 | (void)q; (void)ticks; | ||
530 | return 0; | ||
531 | #endif /* USB_FULL_INIT */ | ||
523 | } | 532 | } |
524 | 533 | ||
525 | void usb_start_monitoring(void) | 534 | void usb_start_monitoring(void) |