UISIMULATOR: Give the host OS some needed context switching hints (which _is_ supposed to work on Linux - but I can't tell on VMWare - and does on Windows). I guess I'll know for sure soon. Give sleep() even more genuine behavior. Add some button driver sync with the rockbox threads that should have been there for some time - this is basically interrupt-like processing as any thread not in the kernel pool should be considered. Make the screendump work again by posting the request. Perhaps help out shutting down for some users but not in the way I'd prefer - to think about.

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

1 files changed, 15 insertions, 10 deletions

diff --git a/uisimulator/sdl/button.c b/uisimulator/sdl/button.c
index 1bb9311890..4869dd06b1 100644
--- a/uisimulator/sdl/button.c
+++ b/uisimulator/sdl/button.c
@@ -30,6 +30,11 @@
 
 static intptr_t button_data; /* data value from last message dequeued */
 
+/* Special thread-synced queue_post for button driver or any other preemptive sim thread */
+extern void queue_syncpost(struct event_queue *q, long id, intptr_t data);
+/* Special thread-synced queue_broadcast for button driver or any other preemptive sim thread */
+extern int queue_syncbroadcast(long id, intptr_t data);
+
 /* how long until repeat kicks in */
 #define REPEAT_START      6
 
@@ -110,9 +115,9 @@ void button_event(int key, bool pressed)
         {
             usb_connected = !usb_connected;
             if (usb_connected)
-                queue_post(&button_queue, SYS_USB_CONNECTED, 0);
+                queue_syncpost(&button_queue, SYS_USB_CONNECTED, 0);
             else
-                queue_post(&button_queue, SYS_USB_DISCONNECTED, 0);
+                queue_syncpost(&button_queue, SYS_USB_DISCONNECTED, 0);
         }
         return;
 
@@ -590,7 +595,7 @@ void button_event(int key, bool pressed)
     case SDLK_F5:
         if(pressed)
         {
-            screen_dump();
+            queue_syncbroadcast(SYS_SCREENDUMP, 0);
             return;
         }
         break;
@@ -611,17 +616,17 @@ void button_event(int key, bool pressed)
 #ifdef HAVE_REMOTE_LCD
         if(diff & BUTTON_REMOTE)
             if(!skip_remote_release)
-                queue_post(&button_queue, BUTTON_REL | diff, 0);
+                queue_syncpost(&button_queue, BUTTON_REL | diff, 0);
             else
                 skip_remote_release = false;
         else
 #endif
             if(!skip_release)
-                queue_post(&button_queue, BUTTON_REL | diff, 0);
+                queue_syncpost(&button_queue, BUTTON_REL | diff, 0);
             else
                 skip_release = false;
 #else
-        queue_post(&button_queue, BUTTON_REL | diff, 0);
+        queue_syncpost(&button_queue, BUTTON_REL | diff, 0);
 #endif
     }
 
@@ -673,7 +678,7 @@ void button_event(int key, bool pressed)
                 {
                     if (queue_empty(&button_queue))
                     {
-                        queue_post(&button_queue, BUTTON_REPEAT | btn, 0);
+                        queue_syncpost(&button_queue, BUTTON_REPEAT | btn, 0);
 #ifdef HAVE_BACKLIGHT
 #ifdef HAVE_REMOTE_LCD
                             if(btn & BUTTON_REMOTE)
@@ -695,18 +700,18 @@ void button_event(int key, bool pressed)
 #ifdef HAVE_REMOTE_LCD
                         if (btn & BUTTON_REMOTE) {
                             if (!remote_filter_first_keypress || is_remote_backlight_on())
-                                queue_post(&button_queue, btn, 0);
+                                queue_syncpost(&button_queue, btn, 0);
                             else
                                 skip_remote_release = true;
                         }
                         else
 #endif                                    
                             if (!filter_first_keypress || is_backlight_on())
-                                queue_post(&button_queue, btn, 0);
+                                queue_syncpost(&button_queue, btn, 0);
                             else
                                 skip_release = true;
 #else /* no backlight, nothing to skip */
-                        queue_post(&button_queue, btn, 0);
+                        queue_syncpost(&button_queue, btn, 0);
 #endif
                     post = false;
                 }