2 files changed, 9 insertions, 3 deletions

diff --git a/firmware/export/thread.h b/firmware/export/thread.h
index 2915d23207..19bf9e12fc 100644
--- a/firmware/export/thread.h
+++ b/firmware/export/thread.h
@@ -76,7 +76,13 @@ struct regs
     void         *start; /* Thread start address, or NULL when started */
 };
 # endif
-
+#else
+struct regs
+{
+    void *t;             /* Simulator OS thread */
+    void *c;             /* Condition for blocking and sync */
+    void (*start)(void); /* Start function */
+};
 #endif /* !SIMULATOR */
 
 #define STATE_RUNNING             0x00000000
@@ -97,9 +103,7 @@ struct regs
 #define SET_BOOST_STATE(var)      (var |= STATE_BOOSTED)
 
 struct thread_entry {
-#ifndef SIMULATOR
     struct regs context;
-#endif
     const char *name;
     void *stack;
     unsigned long statearg;
diff --git a/firmware/include/file.h b/firmware/include/file.h
index 989f50a283..9a94e91263 100644
--- a/firmware/include/file.h
+++ b/firmware/include/file.h
@@ -55,6 +55,8 @@
 #define fsync(x) sim_fsync(x)
 #define ftruncate(x,y) sim_ftruncate(x,y)
 #define lseek(x,y,z) sim_lseek(x,y,z)
+#define read(x,y,z) sim_read(x,y,z)
+#define write(x,y,z) sim_write(x,y,z)
 #endif
 
 typedef int (*open_func)(const char* pathname, int flags);