summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Martitz <kugel@rockbox.org>2014-02-23 23:03:18 +0100
committerThomas Martitz <kugel@rockbox.org>2014-02-23 23:03:18 +0100
commit3b7057fdae3cc47b61f0a3b14443a56cd52f4c2e (patch)
treee10b0bb2a655aaaa1f9f3491592e9943fce35c21
parentd7ba70de41902639a0b95bbdf0d7ec6452523db8 (diff)
downloadrockbox-3b7057f.tar.gz
rockbox-3b7057f.tar.bz2
rockbox-3b7057f.zip
Second try at undefing STORAGE_GET_INFO, the previous one was too hasty, sorry.
Change-Id: If938c132d46efcb531227d9fde8cce91104566e0
-rw-r--r--firmware/export/config.h2
-rw-r--r--firmware/export/config/sim.h1
2 files changed, 2 insertions, 1 deletions
diff --git a/firmware/export/config.h b/firmware/export/config.h
index b3616ad3d3..1998720f87 100644
--- a/firmware/export/config.h
+++ b/firmware/export/config.h
@@ -1109,9 +1109,11 @@ Lyre prototype 1 */
#define INCLUDE_TIMEOUT_API
#endif /* HAVE_GUI_BOOST && HAVE_ADJUSTABLE_CPU_FREQ */
+#ifndef SIMULATOR
#if defined(HAVE_USBSTACK) || (CONFIG_STORAGE & STORAGE_NAND)
#define STORAGE_GET_INFO
#endif
+#endif
#ifdef CPU_MIPS
#include <stdbool.h> /* MIPS GCC fix? */
diff --git a/firmware/export/config/sim.h b/firmware/export/config/sim.h
index 0d075b0fcd..2f819b733e 100644
--- a/firmware/export/config/sim.h
+++ b/firmware/export/config/sim.h
@@ -33,7 +33,6 @@
#undef HAVE_STORAGE_FLUSH
#undef CONFIG_NAND
-#undef HAVE_STORAGE_GET_INFO
#if defined(CONFIG_CHARGING) && CONFIG_CHARGING > CHARGING_MONITOR
#undef CONFIG_CHARGING