- Move uisimulator/sdl/*.[ch] into the target tree, under firmware/target/hosted/sdl, uisdl.c is split up across button-sdl.c and system-sdl.c.

- Refactor the program startup. main() is now in main.c like on target, and the implicit application thread will now act as our main thread (previously a separate one was created for this in thread initialization).

This is part of Rockbox as an application and is the first step to make an application port from the uisimulator. In a further step the sim bits from the sdl build will be separated out.

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

1 files changed, 4 insertions, 5 deletions

diff --git a/firmware/drivers/button.c b/firmware/drivers/button.c
index 100957b77a..f116ad646e 100644
--- a/firmware/drivers/button.c
+++ b/firmware/drivers/button.c
@@ -429,7 +429,6 @@ void button_init(void)
     tick_add_task(button_tick);
 }
 
-#ifndef SIMULATOR
 #ifdef BUTTON_DRIVER_CLOSE
 void button_close(void)
 {
@@ -443,9 +442,10 @@ void button_close(void)
  */
 static int button_flip(int button)
 {
-    int newbutton;
+    int newbutton = button;
 
-    newbutton = button &
+#ifndef SIMULATOR
+    newbutton &=
         ~(BUTTON_LEFT | BUTTON_RIGHT
 #if defined(BUTTON_UP) && defined(BUTTON_DOWN)
         | BUTTON_UP | BUTTON_DOWN
@@ -503,7 +503,7 @@ static int button_flip(int button)
     if (button & BUTTON_PREV)
         newbutton |= BUTTON_NEXT;
 #endif
-
+#endif /* !SIMULATOR */
     return newbutton;
 }
 
@@ -523,7 +523,6 @@ void button_set_flip(bool flip)
     }
 }
 #endif /* HAVE_LCD_FLIP */
-#endif /* SIMULATOR */
 
 #ifdef HAVE_BACKLIGHT
 void set_backlight_filter_keypress(bool value)