From 77f19f75eb3661b3e3966da20effa2631ed380f1 Mon Sep 17 00:00:00 2001
From: Thomas Martitz <kugel@rockbox.org>
Date: Fri, 7 Feb 2014 18:12:31 +0100
Subject: storage: Add STORAGE_HOSTFS

CONFIG_STORAGE & STORAGE_HOSTFS allows to use parts of the storage_* API to be
compiled for application targets without compiling storage.c or performing
actually raw storage access. This is primarily to enable application targets to
implement HAVE_MULTIVOMULE/HAVE_HOTSWAP (in a later commit).

SIMULATOR uses the same mechanism without explicitely defining STORAGE_HOSTFS
(how to add a bit to an existing preprocessor token?).

Change-Id: Ib3f8ee0d5231e2ed21ff00842d51e32bc4fc7292
---
 firmware/target/hosted/android/system-android.c      | 12 ++++++++++++
 firmware/target/hosted/samsungypr/ypr0/system-ypr0.c | 14 ++++++++++++++
 firmware/target/hosted/samsungypr/ypr1/system-ypr1.c | 14 ++++++++++++++
 firmware/target/hosted/sdl/button-sdl.c              |  1 +
 firmware/target/hosted/sdl/system-sdl.c              | 18 ++++++++++++++++++
 5 files changed, 59 insertions(+)

(limited to 'firmware/target/hosted')

diff --git a/firmware/target/hosted/android/system-android.c b/firmware/target/hosted/android/system-android.c
index d96edcd637..313bfbcd62 100644
--- a/firmware/target/hosted/android/system-android.c
+++ b/firmware/target/hosted/android/system-android.c
@@ -23,6 +23,7 @@
 #include <setjmp.h>
 #include <jni.h>
 #include <pthread.h>
+#include <unistd.h>
 #include "config.h"
 #include "system.h"
 #include "power.h"
@@ -66,6 +67,17 @@ void system_init(void)
     telephony_init_device();
 }
 
+void hostfs_init(void)
+{
+    /* stub */
+}
+
+int hostfs_flush(void)
+{
+    sync();
+    return 0;
+}
+
 JNIEXPORT jint JNICALL
 JNI_OnLoad(JavaVM *vm, void* reserved)
 {
diff --git a/firmware/target/hosted/samsungypr/ypr0/system-ypr0.c b/firmware/target/hosted/samsungypr/ypr0/system-ypr0.c
index 6232df4a22..477b71c6a2 100644
--- a/firmware/target/hosted/samsungypr/ypr0/system-ypr0.c
+++ b/firmware/target/hosted/samsungypr/ypr0/system-ypr0.c
@@ -21,9 +21,11 @@
 #include <stdlib.h>
 #include <string.h>
 #include <inttypes.h>
+#include <unistd.h>
 #include "system.h"
 #include "panic.h"
 #include "debug.h"
+#include "hostfs.h"
 
 #include "ascodec.h"
 #include "gpio-ypr.h"
@@ -59,6 +61,18 @@ void system_exception_wait(void)
     system_reboot();
 }
 
+void hostfs_init(void)
+{
+    /* stub */
+}
+
+int hostfs_flush(void)
+{
+    sync();
+
+    return 0;
+}
+
 #ifdef HAVE_ADJUSTABLE_CPU_FREQ
 #include <stdio.h>
 #include "file.h"
diff --git a/firmware/target/hosted/samsungypr/ypr1/system-ypr1.c b/firmware/target/hosted/samsungypr/ypr1/system-ypr1.c
index 9aa49786f1..7efa73b273 100644
--- a/firmware/target/hosted/samsungypr/ypr1/system-ypr1.c
+++ b/firmware/target/hosted/samsungypr/ypr1/system-ypr1.c
@@ -21,9 +21,11 @@
 #include <stdlib.h>
 #include <string.h>
 #include <inttypes.h>
+#include <unistd.h>
 #include "system.h"
 #include "panic.h"
 #include "debug.h"
+#include "hostfs.h"
 
 #include "gpio-ypr.h"
 #include "pmu-ypr1.h"
@@ -65,3 +67,15 @@ void system_exception_wait(void)
 {
     system_reboot();
 }
+
+void hostfs_init()
+{
+    /* stub */
+}
+
+int hostfs_flush(void)
+{
+    sync();
+
+    return 0;
+}
diff --git a/firmware/target/hosted/sdl/button-sdl.c b/firmware/target/hosted/sdl/button-sdl.c
index 91338bb0d5..1ed07c153c 100644
--- a/firmware/target/hosted/sdl/button-sdl.c
+++ b/firmware/target/hosted/sdl/button-sdl.c
@@ -36,6 +36,7 @@
 #include "buttonmap.h"
 #include "debug.h"
 #include "powermgmt.h"
+#include "storage.h"
 
 #ifdef HAVE_TOUCHSCREEN
 #include "touchscreen.h"
diff --git a/firmware/target/hosted/sdl/system-sdl.c b/firmware/target/hosted/sdl/system-sdl.c
index 572d6d570a..25e77c22a2 100644
--- a/firmware/target/hosted/sdl/system-sdl.c
+++ b/firmware/target/hosted/sdl/system-sdl.c
@@ -24,6 +24,9 @@
 #include <stdlib.h>
 #include <string.h>
 #include <inttypes.h>
+#ifdef __unix__
+#include <unistd.h>
+#endif
 #include "system.h"
 #include "kernel.h"
 #include "thread-sdl.h"
@@ -286,6 +289,21 @@ void system_exception_wait(void)
     system_reboot();
 }
 
+void hostfs_init(void)
+{
+    /* stub */
+}
+
+#ifdef HAVE_STORAGE_FLUSH
+int hostfs_flush(void)
+{
+#ifdef __unix__
+    sync();
+#endif
+    return 0;
+}
+#endif /* HAVE_STORAGE_FLUSH */
+
 void sys_handle_argv(int argc, char *argv[])
 {
     if (argc >= 1) 
-- 
cgit v1.2.3