4 files changed, 29 insertions, 22 deletions

diff --git a/firmware/include/dir.h b/firmware/include/dir.h
index 9ff96e3419..d143ed2664 100644
--- a/firmware/include/dir.h
+++ b/firmware/include/dir.h
@@ -41,6 +41,15 @@
 
 #endif
 
+#define ATTR_READ_ONLY   0x01
+#define ATTR_HIDDEN      0x02
+#define ATTR_SYSTEM      0x04
+#define ATTR_VOLUME_ID   0x08
+#define ATTR_DIRECTORY   0x10
+#define ATTR_ARCHIVE     0x20
+#define ATTR_VOLUME      0x40 /* this is a volume, not a real directory */
+
+#if (CONFIG_PLATFORM & (PLATFORM_NATIVE|PLATFORM_SDL))
 #ifdef HAVE_DIRCACHE
 # include "dircache.h"
 # define DIR DIR_CACHED
@@ -62,5 +71,9 @@
 # define mkdir mkdir_uncached
 # define rmdir rmdir_uncached
 #endif
+#else
+#include "dir_uncached.h"
+#include "dir-target.h"
+#endif
 
 #endif
diff --git a/firmware/include/dir_uncached.h b/firmware/include/dir_uncached.h
index f225cf8e39..5c7ed14658 100644
--- a/firmware/include/dir_uncached.h
+++ b/firmware/include/dir_uncached.h
@@ -21,18 +21,20 @@
 #ifndef _DIR_UNCACHED_H_
 #define _DIR_UNCACHED_H_
 
+#include "config.h"
+
+struct dirinfo {
+    int attribute;
+    long size;
+    unsigned short wrtdate;
+    unsigned short wrttime;
+};
+
+#ifndef APPLICATION
 #include <stdbool.h>
 #include "file.h"
 
-#define ATTR_READ_ONLY   0x01
-#define ATTR_HIDDEN      0x02
-#define ATTR_SYSTEM      0x04
-#define ATTR_VOLUME_ID   0x08
-#define ATTR_DIRECTORY   0x10
-#define ATTR_ARCHIVE     0x20
-#define ATTR_VOLUME      0x40 /* this is a volume, not a real directory */
-
-#if (CONFIG_PLATFORM & PLATFORM_HOSTED)
+#if (CONFIG_PLATFORM & PLATFORM_SDL)
 #define dirent_uncached sim_dirent
 #define DIR_UNCACHED SIM_DIR
 #define opendir_uncached sim_opendir
@@ -46,11 +48,8 @@
 
 struct dirent_uncached {
     unsigned char d_name[MAX_PATH];
-    int attribute;
-    long size;
+    struct dirinfo info;
     long startcluster;
-    unsigned short wrtdate; /*  Last write date */ 
-    unsigned short wrttime; /*  Last write time */
 };
 #endif
 
@@ -92,5 +91,6 @@ extern struct dirent_uncached* readdir_uncached(DIR_UNCACHED* dir);
 extern int release_dirs(int volume);
 
 #endif /* DIRFUNCTIONS_DEFINED */
+#endif
 
 #endif
diff --git a/firmware/include/dircache.h b/firmware/include/dircache.h
index 650b92632d..37a803c63c 100644
--- a/firmware/include/dircache.h
+++ b/firmware/include/dircache.h
@@ -63,25 +63,19 @@ struct fdbind_queue {
 
 /* Exported structures. */
 struct dircache_entry {
+    struct dirinfo info;
     struct dircache_entry *next;
     struct dircache_entry *up;
     struct dircache_entry *down;
-    int attribute;
-    long size;
     long startcluster;
-    unsigned short wrtdate;
-    unsigned short wrttime;
     unsigned long name_len;
     char *d_name;
 };
 
 struct dirent_cached {
+    struct dirinfo info;
     char *d_name;
-    int attribute;
-    long size;
     long startcluster;
-    unsigned short wrtdate; /*  Last write date */ 
-    unsigned short wrttime; /*  Last write time */
 };
 
 typedef struct {
diff --git a/firmware/include/file.h b/firmware/include/file.h
index 8a084d6f39..8711124391 100644
--- a/firmware/include/file.h
+++ b/firmware/include/file.h
@@ -37,7 +37,7 @@
 #define MAX_OPEN_FILES 11
 
 #if !defined(PLUGIN) && !defined(CODEC)
-#if (CONFIG_PLATFORM & PLATFORM_HOSTED)
+#if (CONFIG_PLATFORM & PLATFORM_SDL)
 #define open(x, ...) sim_open(x, __VA_ARGS__)
 #define creat(x,m) sim_creat(x,m)
 #define remove(x) sim_remove(x)