6 files changed, 215 insertions, 1 deletions

diff --git a/firmware/target/hosted/sdl/app/load_code-sdl-app.c b/firmware/target/hosted/sdl/app/load_code-sdl-app.c
new file mode 100644
index 0000000000..686944343f
--- /dev/null
+++ b/firmware/target/hosted/sdl/app/load_code-sdl-app.c
@@ -0,0 +1,36 @@
+/***************************************************************************
+ *             __________               __   ___.
+ *   Open      \______   \ ____   ____ |  | _\_ |__   _______  ___
+ *   Source     |       _//  _ \_/ ___\|  |/ /| __ \ /  _ \  \/  /
+ *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
+ *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
+ *                     \/            \/     \/    \/            \/
+ * $Id$
+ *
+ * Copyright (C) 2010 Thomas Martitz
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
+ * KIND, either express or implied.
+ *
+ ****************************************************************************/
+#define RB_FILESYSTEM_OS
+#include "system.h"
+#include "file.h"
+#include "load_code.h"
+
+void *lc_open(const char *filename, unsigned char *buf, size_t buf_size)
+{
+    char realpath[MAX_PATH];
+    const char *fpath = handle_special_dirs(filename, 0, realpath,
+                                            sizeof (realpath));
+    if (!fpath)
+        return NULL;
+
+    return os_lc_open(fpath);
+    (void)buf; (void)buf_size;
+}
diff --git a/firmware/target/hosted/sdl/filesystem-sdl.c b/firmware/target/hosted/sdl/filesystem-sdl.c
new file mode 100644
index 0000000000..5a8e2c417a
--- /dev/null
+++ b/firmware/target/hosted/sdl/filesystem-sdl.c
@@ -0,0 +1,55 @@
+/***************************************************************************
+ *             __________               __   ___.
+ *   Open      \______   \ ____   ____ |  | _\_ |__   _______  ___
+ *   Source     |       _//  _ \_/ ___\|  |/ /| __ \ /  _ \  \/  /
+ *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
+ *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
+ *                     \/            \/     \/    \/            \/
+ * $Id$
+ *
+ * Copyright (C) 2014 by Michael Sevakis
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
+ * KIND, either express or implied.
+ *
+ ****************************************************************************/
+#define RB_FILESYSTEM_OS
+#include "config.h"
+#include "system.h"
+#include "thread-sdl.h"
+#include "mutex.h"
+#include "file.h"
+
+#ifdef HAVE_SDL_THREADS
+#define YIELD_THRESHOLD 512
+static bool initialized = false;
+static struct mutex readwrite_mtx;
+
+/* Allow other threads to run while performing I/O */
+ssize_t os_sdl_readwrite(int osfd, void *buf, size_t nbyte, bool dowrite)
+{
+    if (!initialized)
+    {
+        mutex_init(&readwrite_mtx);
+        initialized = true;
+    }
+
+    mutex_lock(&readwrite_mtx);
+
+    void *mythread = nbyte > YIELD_THRESHOLD ? sim_thread_unlock() : NULL;
+
+    ssize_t rc = dowrite ? write(osfd, buf, nbyte) : read(osfd, buf, nbyte);
+
+    if (mythread)
+        sim_thread_lock(mythread);
+
+    mutex_unlock(&readwrite_mtx);
+    return rc;
+}
+
+#endif /* HAVE_SDL_THREADS */
diff --git a/firmware/target/hosted/sdl/filesystem-sdl.h b/firmware/target/hosted/sdl/filesystem-sdl.h
new file mode 100644
index 0000000000..934b43b34b
--- /dev/null
+++ b/firmware/target/hosted/sdl/filesystem-sdl.h
@@ -0,0 +1,37 @@
+/***************************************************************************
+ *             __________               __   ___.                  
+ *   Open      \______   \ ____   ____ |  | _\_ |__   _______  ___  
+ *   Source     |       _//  _ \_/ ___\|  |/ /| __ \ /  _ \  \/  /  
+ *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <   
+ *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \  
+ *                     \/            \/     \/    \/            \/ 
+ * $Id$
+ *
+ * Copyright (C) 2014 by Michael Sevakis
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
+ * KIND, either express or implied.
+ *
+ ****************************************************************************/
+#ifndef _FILESYSTEM_SDL_H_
+#define _FILESYSTEM_SDL_H_
+
+#ifdef HAVE_SDL_THREADS
+#undef os_read
+#undef os_write
+
+ssize_t os_sdl_readwrite(int osfd, void *buf, size_t nbyte, bool dowrite);
+
+#define os_read(osfd, buf, nbyte) \
+    os_sdl_readwrite((osfd), (buf), (nbyte), false)
+#define os_write(osfd, buf, nbyte) \
+    os_sdl_readwrite((osfd), (void *)(buf), (nbyte), true)
+
+#endif /* HAVE_SDL_THREADS */
+
+#endif /* _FILESYSTEM_SDL_H_ */
diff --git a/firmware/target/hosted/sdl/load_code-sdl.c b/firmware/target/hosted/sdl/load_code-sdl.c
new file mode 100644
index 0000000000..ee29853ab5
--- /dev/null
+++ b/firmware/target/hosted/sdl/load_code-sdl.c
@@ -0,0 +1,52 @@
+/***************************************************************************
+ *             __________               __   ___.
+ *   Open      \______   \ ____   ____ |  | _\_ |__   _______  ___
+ *   Source     |       _//  _ \_/ ___\|  |/ /| __ \ /  _ \  \/  /
+ *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
+ *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
+ *                     \/            \/     \/    \/            \/
+ * $Id$
+ *
+ * Copyright (C) 2002 Daniel Stenberg
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
+ * KIND, either express or implied.
+ *
+ ****************************************************************************/
+#define RB_FILESYSTEM_OS
+#include <SDL_loadso.h>
+#include "system.h"
+#include "load_code.h"
+#include "filesystem-sdl.h"
+#include "debug.h"
+
+void * os_lc_open(const char *ospath)
+{
+    void *handle = SDL_LoadObject(ospath);
+    if (handle == NULL)
+    {
+        DEBUGF("%s(\"%s\") failed\n", __func__, ospath);
+        DEBUGF("  SDL error '%s'\n", SDL_GetError());
+    }
+
+    return handle;
+}
+
+void * lc_get_header(void *handle)
+{
+    char *ret = SDL_LoadFunction(handle, "__header");
+    if (ret == NULL)
+        ret = SDL_LoadFunction(handle, "___header");
+
+    return ret;
+}
+
+void lc_close(void *handle)
+{
+    SDL_UnloadObject(handle);
+}
diff --git a/firmware/target/hosted/sdl/system-sdl.c b/firmware/target/hosted/sdl/system-sdl.c
index fdf79d9333..aa322ddf3a 100644
--- a/firmware/target/hosted/sdl/system-sdl.c
+++ b/firmware/target/hosted/sdl/system-sdl.c
@@ -51,6 +51,8 @@
 
 #endif
 
+#define SIMULATOR_DEFAULT_ROOT "simdisk"
+
 SDL_Surface    *gui_surface;
 
 bool            background = true;          /* use backgrounds by default */
@@ -63,7 +65,7 @@ bool            debug_buttons = false;
 bool            lcd_display_redraw = true;  /* Used for player simulator */
 char            having_new_lcd = true;      /* Used for player simulator */
 bool            sim_alarm_wakeup = false;
-const char     *sim_root_dir = NULL;
+const char     *sim_root_dir = SIMULATOR_DEFAULT_ROOT;
 
 static SDL_Thread *evt_thread = NULL;
 
diff --git a/firmware/target/hosted/sdl/system-sim.h b/firmware/target/hosted/sdl/system-sim.h
new file mode 100644
index 0000000000..16c0cdde52
--- /dev/null
+++ b/firmware/target/hosted/sdl/system-sim.h
@@ -0,0 +1,32 @@
+/***************************************************************************
+ *             __________               __   ___.
+ *   Open      \______   \ ____   ____ |  | _\_ |__   _______  ___
+ *   Source     |       _//  _ \_/ ___\|  |/ /| __ \ /  _ \  \/  /
+ *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
+ *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
+ *                     \/            \/     \/    \/            \/
+ * $Id$
+ *
+ * Copyright (C) 2014 by Michael Sevakis
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
+ * KIND, either express or implied.
+ *
+ ****************************************************************************/
+#ifndef _SYSTEM_SIM_H_
+#define _SYSTEM_SIM_H_
+
+#ifdef WIN32
+#include <time.h>
+struct tm * localtime_r(const time_t *restrict timer,
+                        struct tm *restrict result);
+struct tm * gmtime_r(const time_t *restrict timer,
+                     struct tm *restrict result);
+#endif /* WIN32 */
+
+#endif /* _SYSTEM_SIM_H_ */