diff options
author | Thomas Martitz <kugel@rockbox.org> | 2011-11-17 18:40:00 +0000 |
---|---|---|
committer | Thomas Martitz <kugel@rockbox.org> | 2011-11-17 18:40:00 +0000 |
commit | 1645c148e35becff9668cc541be5c850153370eb (patch) | |
tree | ff4af71980a290ed1877facee590b39280940c45 /apps | |
parent | 2a8eacdbfc5d98b016c480ddaddff100301f721f (diff) | |
download | rockbox-1645c148e35becff9668cc541be5c850153370eb.tar.gz rockbox-1645c148e35becff9668cc541be5c850153370eb.zip |
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
Diffstat (limited to 'apps')
-rw-r--r-- | apps/gui/usb_screen.c | 2 | ||||
-rw-r--r-- | apps/playback.c | 4 | ||||
-rw-r--r-- | apps/playlist.c | 2 | ||||
-rw-r--r-- | apps/tagcache.c | 2 |
4 files changed, 0 insertions, 10 deletions
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) | |||
251 | touchscreen_set_mode(TOUCHSCREEN_BUTTON); | 251 | touchscreen_set_mode(TOUCHSCREEN_BUTTON); |
252 | #endif | 252 | #endif |
253 | 253 | ||
254 | #ifndef SIMULATOR | ||
255 | usb_acknowledge(SYS_USB_CONNECTED_ACK); | 254 | usb_acknowledge(SYS_USB_CONNECTED_ACK); |
256 | #endif | ||
257 | 255 | ||
258 | #ifdef USB_ENABLE_HID | 256 | #ifdef USB_ENABLE_HID |
259 | usb_hid = global_settings.usb_hid; | 257 | 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 | |||
190 | STATE_FINISHED, /* all remaining tracks are fully buffered */ | 190 | STATE_FINISHED, /* all remaining tracks are fully buffered */ |
191 | STATE_ENDING, /* audio playback is ending */ | 191 | STATE_ENDING, /* audio playback is ending */ |
192 | STATE_ENDED, /* audio playback is done */ | 192 | STATE_ENDED, /* audio playback is done */ |
193 | #if (CONFIG_PLATFORM & PLATFORM_NATIVE) | ||
194 | STATE_USB, /* USB mode, ignore most messages */ | 193 | STATE_USB, /* USB mode, ignore most messages */ |
195 | #endif | ||
196 | } filling = STATE_IDLE; | 194 | } filling = STATE_IDLE; |
197 | 195 | ||
198 | /* Track info - holds information about each track in the buffer */ | 196 | /* Track info - holds information about each track in the buffer */ |
@@ -3129,7 +3127,6 @@ static void audio_thread(void) | |||
3129 | break; | 3127 | break; |
3130 | #endif /* AUDIO_HAVE_RECORDING */ | 3128 | #endif /* AUDIO_HAVE_RECORDING */ |
3131 | 3129 | ||
3132 | #if (CONFIG_PLATFORM & PLATFORM_NATIVE) | ||
3133 | case SYS_USB_CONNECTED: | 3130 | case SYS_USB_CONNECTED: |
3134 | LOGFQUEUE("audio < SYS_USB_CONNECTED"); | 3131 | LOGFQUEUE("audio < SYS_USB_CONNECTED"); |
3135 | audio_stop_playback(); | 3132 | audio_stop_playback(); |
@@ -3139,7 +3136,6 @@ static void audio_thread(void) | |||
3139 | filling = STATE_USB; | 3136 | filling = STATE_USB; |
3140 | usb_acknowledge(SYS_USB_CONNECTED_ACK); | 3137 | usb_acknowledge(SYS_USB_CONNECTED_ACK); |
3141 | break; | 3138 | break; |
3142 | #endif /* (CONFIG_PLATFORM & PLATFORM_NATIVE) */ | ||
3143 | 3139 | ||
3144 | case SYS_TIMEOUT: | 3140 | case SYS_TIMEOUT: |
3145 | LOGFQUEUE_SYS_TIMEOUT("audio < SYS_TIMEOUT"); | 3141 | 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) | |||
1337 | break ; | 1337 | break ; |
1338 | } | 1338 | } |
1339 | 1339 | ||
1340 | #if (CONFIG_PLATFORM & PLATFORM_NATIVE) | ||
1341 | case SYS_USB_CONNECTED: | 1340 | case SYS_USB_CONNECTED: |
1342 | usb_acknowledge(SYS_USB_CONNECTED_ACK); | 1341 | usb_acknowledge(SYS_USB_CONNECTED_ACK); |
1343 | usb_wait_for_disconnect(&playlist_queue); | 1342 | usb_wait_for_disconnect(&playlist_queue); |
1344 | break ; | 1343 | break ; |
1345 | #endif | ||
1346 | } | 1344 | } |
1347 | } | 1345 | } |
1348 | } | 1346 | } |
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) | |||
4705 | case SYS_POWEROFF: | 4705 | case SYS_POWEROFF: |
4706 | break ; | 4706 | break ; |
4707 | 4707 | ||
4708 | #if (CONFIG_PLATFORM & PLATFORM_NATIVE) | ||
4709 | case SYS_USB_CONNECTED: | 4708 | case SYS_USB_CONNECTED: |
4710 | logf("USB: TagCache"); | 4709 | logf("USB: TagCache"); |
4711 | usb_acknowledge(SYS_USB_CONNECTED_ACK); | 4710 | usb_acknowledge(SYS_USB_CONNECTED_ACK); |
4712 | usb_wait_for_disconnect(&tagcache_queue); | 4711 | usb_wait_for_disconnect(&tagcache_queue); |
4713 | break ; | 4712 | break ; |
4714 | #endif | ||
4715 | } | 4713 | } |
4716 | } | 4714 | } |
4717 | } | 4715 | } |