2 files changed, 11 insertions, 4 deletions

diff --git a/firmware/mpeg.c b/firmware/mpeg.c
index 50320fc824..4c711db1ef 100644
--- a/firmware/mpeg.c
+++ b/firmware/mpeg.c
@@ -1842,7 +1842,8 @@ static void mpeg_thread(void)
             case MPEG_TRACK_CHANGE:
                 track_change();
                 break;
-                
+
+#ifndef USB_NONE
             case SYS_USB_CONNECTED:
                 is_playing = false;
                 paused = false;
@@ -1857,6 +1858,7 @@ static void mpeg_thread(void)
                 usb_wait_for_disconnect(&mpeg_queue);
 #endif
                 break;
+#endif /* USB_NONE */
                 
 #ifdef HAVE_MAS3587F
             case MPEG_INIT_RECORDING:
diff --git a/firmware/usb.c b/firmware/usb.c
index 431c2954aa..2da2484255 100644
--- a/firmware/usb.c
+++ b/firmware/usb.c
@@ -37,8 +37,7 @@ extern void dbg_ports(void); /* NASTY! defined in apps/ */
 
 #define USB_REALLY_BRAVE
 
-
-#ifndef SIMULATOR
+#if !defined(SIMULATOR) && !defined(USB_NONE)
 
 /* Messages from usb_tick */
 #define USB_INSERTED    1
@@ -338,6 +337,12 @@ bool usb_inserted(void)
 
 #else
 
+#ifdef USB_NONE
+bool usb_inserted(void)
+{
+}
+#endif
+
 /* Dummy simulator functions */
 void usb_acknowledge(int id)
 {
@@ -357,4 +362,4 @@ bool usb_detect(void)
     return false;
 }
 
-#endif
+#endif /* USB_NONE or SIMULATOR */