- 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

3 files changed, 2 insertions, 22 deletions

diff --git a/uisimulator/common/io.c b/uisimulator/common/io.c
index cddb19c9a8..bdcc7e6ca1 100644
--- a/uisimulator/common/io.c
+++ b/uisimulator/common/io.c
@@ -233,7 +233,7 @@ static ssize_t io_trigger_and_wait(int cmd)
     {
         /* Allow other rockbox threads to run */
         io.accum = 0;
-        mythread = thread_sdl_thread_unlock();
+        mythread = sim_thread_unlock();
     }
 
     switch (cmd)
@@ -249,7 +249,7 @@ static ssize_t io_trigger_and_wait(int cmd)
     /* Regain our status as current */
     if (mythread != NULL)
     {
-        thread_sdl_thread_lock(mythread);
+        sim_thread_lock(mythread);
     }
 
     return result;
diff --git a/uisimulator/common/powermgmt-sim.c b/uisimulator/common/powermgmt-sim.c
index e2ce8c10d2..dbd3149fbb 100644
--- a/uisimulator/common/powermgmt-sim.c
+++ b/uisimulator/common/powermgmt-sim.c
@@ -157,10 +157,6 @@ void shutdown_hw(void)
 {
 }
 
-void sys_poweroff(void)
-{
-}
-
 void cancel_shutdown(void)
 {
 }
diff --git a/uisimulator/common/stubs.c b/uisimulator/common/stubs.c
index d1ec4ec6c2..d4a9af126c 100644
--- a/uisimulator/common/stubs.c
+++ b/uisimulator/common/stubs.c
@@ -314,25 +314,9 @@ void cpu_sleep(bool enabled)
     (void)enabled;
 }
 
-void button_set_flip(bool yesno)
-{
-    (void)yesno;
-}
-
 #ifdef HAVE_TOUCHPAD_SENSITIVITY_SETTING
 void touchpad_set_sensitivity(int level)
 {
     (void)level;
 }
 #endif
-
-void system_exception_wait(void)
-{
-    thread_sdl_exception_wait();
-}
-
-void system_reboot(void)
-{
-    thread_sdl_exception_wait();
-}
-