Hopefully mop-up remaining red.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@19317 a1c6a512-1295-4272-9138-f99709370657

2 files changed, 11 insertions, 0 deletions

diff --git a/firmware/powermgmt.c b/firmware/powermgmt.c
index 899e103..a2017a7 100644
--- a/firmware/powermgmt.c
+++ b/firmware/powermgmt.c
@@ -1123,6 +1123,7 @@ void powermgmt_init(void)
 
 void sys_poweroff(void)
 {
+#ifndef BOOTLOADER
     logf("sys_poweroff()");
     /* If the main thread fails to shut down the system, we will force a
        power off after an 20 second timeout - 28 seconds if recording */
@@ -1139,6 +1140,7 @@ void sys_poweroff(void)
     }
 
     queue_broadcast(SYS_POWEROFF, 0);
+#endif /* BOOTLOADER */
 }
 
 void cancel_shutdown(void)
diff --git a/firmware/usb.c b/firmware/usb.c
index 9d4bb00..f9bfbc4 100644
--- a/firmware/usb.c
+++ b/firmware/usb.c
@@ -487,6 +487,7 @@ void usb_init(void)
 
 void usb_wait_for_disconnect(struct event_queue *q)
 {
+#ifdef USB_FULL_INIT
     struct queue_event ev;
 
     /* Don't return until we get SYS_USB_DISCONNECTED */
@@ -499,10 +500,14 @@ void usb_wait_for_disconnect(struct event_queue *q)
             return;
         }
     }
+#else
+    (void)q;
+#endif /* USB_FULL_INIT */
 }
 
 int usb_wait_for_disconnect_w_tmo(struct event_queue *q, int ticks)
 {
+#ifdef USB_FULL_INIT
     struct queue_event ev;
 
     /* 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)
                 break;
         }
     }
+#else
+    (void)q; (void)ticks;
+    return 0;
+#endif /* USB_FULL_INIT */
 }
 
 void usb_start_monitoring(void)