From 1645c148e35becff9668cc541be5c850153370eb Mon Sep 17 00:00:00 2001
From: Thomas Martitz <kugel@rockbox.org>
Date: Thu, 17 Nov 2011 18:40:00 +0000
Subject: Simulate usb plugging on the sim better using sim_tasks.

Now all threads need to ack the connection like on real target, dircache is unloaded and playback stops accordingly.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@31009 a1c6a512-1295-4272-9138-f99709370657
---
 apps/gui/usb_screen.c | 2 --
 apps/playback.c       | 4 ----
 apps/playlist.c       | 2 --
 apps/tagcache.c       | 2 --
 4 files changed, 10 deletions(-)

(limited to 'apps')

diff --git a/apps/gui/usb_screen.c b/apps/gui/usb_screen.c
index 80b24c150c..32c0773ed6 100644
--- a/apps/gui/usb_screen.c
+++ b/apps/gui/usb_screen.c
@@ -251,9 +251,7 @@ void gui_usb_screen_run(bool early_usb)
     touchscreen_set_mode(TOUCHSCREEN_BUTTON);
 #endif
 
-#ifndef SIMULATOR
     usb_acknowledge(SYS_USB_CONNECTED_ACK);
-#endif
 
 #ifdef USB_ENABLE_HID
     usb_hid = global_settings.usb_hid;
diff --git a/apps/playback.c b/apps/playback.c
index d591998bec..b20237cc7c 100644
--- a/apps/playback.c
+++ b/apps/playback.c
@@ -190,9 +190,7 @@ static enum filling_state
     STATE_FINISHED, /* all remaining tracks are fully buffered */
     STATE_ENDING,   /* audio playback is ending */
     STATE_ENDED,    /* audio playback is done */
-#if (CONFIG_PLATFORM & PLATFORM_NATIVE)
     STATE_USB,      /* USB mode, ignore most messages */
-#endif
 } filling = STATE_IDLE;
 
 /* Track info - holds information about each track in the buffer */
@@ -3129,7 +3127,6 @@ static void audio_thread(void)
             break;
 #endif /* AUDIO_HAVE_RECORDING */
 
-#if (CONFIG_PLATFORM & PLATFORM_NATIVE)
         case SYS_USB_CONNECTED:
             LOGFQUEUE("audio < SYS_USB_CONNECTED");
             audio_stop_playback();
@@ -3139,7 +3136,6 @@ static void audio_thread(void)
             filling = STATE_USB;
             usb_acknowledge(SYS_USB_CONNECTED_ACK);
             break;
-#endif /* (CONFIG_PLATFORM & PLATFORM_NATIVE) */
 
         case SYS_TIMEOUT:
             LOGFQUEUE_SYS_TIMEOUT("audio < SYS_TIMEOUT");
diff --git a/apps/playlist.c b/apps/playlist.c
index 61432eb851..4588548d54 100644
--- a/apps/playlist.c
+++ b/apps/playlist.c
@@ -1337,12 +1337,10 @@ static void playlist_thread(void)
                 break ;
             }
             
-#if (CONFIG_PLATFORM & PLATFORM_NATIVE)
             case SYS_USB_CONNECTED:
                 usb_acknowledge(SYS_USB_CONNECTED_ACK);
                 usb_wait_for_disconnect(&playlist_queue);
                 break ;
-#endif
         }
     }
 }
diff --git a/apps/tagcache.c b/apps/tagcache.c
index 8d522b1536..058ab85f16 100644
--- a/apps/tagcache.c
+++ b/apps/tagcache.c
@@ -4705,13 +4705,11 @@ static void tagcache_thread(void)
             case SYS_POWEROFF:
                 break ;
                 
-#if (CONFIG_PLATFORM & PLATFORM_NATIVE)
             case SYS_USB_CONNECTED:
                 logf("USB: TagCache");
                 usb_acknowledge(SYS_USB_CONNECTED_ACK);
                 usb_wait_for_disconnect(&tagcache_queue);
                 break ;
-#endif
         }
     }
 }
-- 
cgit v1.2.3