Sim I/O and threading that runs more like on target. Tweakable if any genuine slowness imitation is required for any one of them. One point of concern is the sim shutdown on an OS other than Linux just because terminating threads in a manner other than having the do it themselves is kind of dirty IMHO.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@14639 a1c6a512-1295-4272-9138-f99709370657

2 files changed, 12 insertions, 4 deletions

diff --git a/apps/plugins/doom/rockmacros.h b/apps/plugins/doom/rockmacros.h
index 1541ef48fd..b73c965c92 100644
--- a/apps/plugins/doom/rockmacros.h
+++ b/apps/plugins/doom/rockmacros.h
@@ -43,20 +43,24 @@ char *my_strtok( char * s, const char * delim );
 #undef open
 #undef lseek
 #undef filesize
+#undef read
+#undef write
 #define open(a,b)          rb->sim_open((a),(b))
 #define lseek(a,b,c)       rb->sim_lseek((a),(b),(c))
 #define filesize(a)        rb->sim_filesize((a))
+#define read(a,b,c)        rb->sim_read((a),(b),(c))
+#define write(a,b,c)       rb->sim_write((a),(b),(c))
 #else /* !SIMULATOR */
 #define open(a,b)          my_open((a),(b))
 #define close(a)           my_close((a))
 #define lseek(a,b,c)       rb->lseek((a),(b),(c))
 #define filesize(a)        rb->filesize((a))
+#define read(a,b,c)        rb->read((a),(b),(c))
+#define write(a,b,c)       rb->write((a),(b),(c))
 #endif /* !SIMULATOR */
 
 #define strtok(a,b)        my_strtok((a),(b))
 #define strcat(a,b)        rb->strcat((a),(b))
-#define read(a,b,c)        rb->read((a),(b),(c))
-#define write(a,b,c)       rb->write((a),(b),(c))
 #define memset(a,b,c)      rb->memset((a),(b),(c))
 #define memmove(a,b,c)     rb->memmove((a),(b),(c))
 #define memcmp(a,b,c)      rb->memcmp((a),(b),(c))
diff --git a/apps/plugins/rockboy/rockmacros.h b/apps/plugins/rockboy/rockmacros.h
index f5223b01df..83b599897e 100644
--- a/apps/plugins/rockboy/rockmacros.h
+++ b/apps/plugins/rockboy/rockmacros.h
@@ -76,15 +76,19 @@ void dynamic_recompile (struct dynarec_block *newblock);
 #define lseek(a,b,c)    rb->sim_lseek((a),(b),(c))
 #undef close
 #define close(a)        rb->close((a))
+#undef read
+#define read(a,b,c)     rb->sim_read((a),(b),(c))
+#undef write
+#define write(a,b,c)    rb->sim_write((a),(b),(c))
 #else /* !SIMULATOR */
 #define open(a,b)       rb->open((a),(b))
 #define lseek(a,b,c)    rb->lseek((a),(b),(c))
 #define close(a)        rb->close((a))
+#define read(a,b,c)     rb->read((a),(b),(c))
+#define write(a,b,c)    rb->write((a),(b),(c))
 #endif /* !SIMULATOR */
 
 #define strcat(a,b)     rb->strcat((a),(b))
-#define read(a,b,c)     rb->read((a),(b),(c))
-#define write(a,b,c)    rb->write((a),(b),(c))
 #define memset(a,b,c)   rb->memset((a),(b),(c))
 #define strcpy(a,b)     rb->strcpy((a),(b))
 #define strncpy(a,b,c)  rb->strncpy((a),(b),(c))