From 96b1ca54384740a1b7bc2bf23620e350f655c670 Mon Sep 17 00:00:00 2001
From: zagor <zagor@a1c6a512-1295-4272-9138-f99709370657>
Date: Mon, 24 Nov 2008 20:32:57 +0000
Subject: [PATCH] Renamed simulator disk directory from 'archos' to 'simdisk'.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@19204 a1c6a512-1295-4272-9138-f99709370657
---
 tools/buildzip.pl       | 2 +-
 tools/configure         | 8 ++++----
 tools/root.make         | 4 ++--
 uisimulator/common/io.c | 6 +++---
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/tools/buildzip.pl b/tools/buildzip.pl
index 6e25f79e8..73902541b 100755
--- a/tools/buildzip.pl
+++ b/tools/buildzip.pl
@@ -423,7 +423,7 @@ sub runone {
     }
 
     if($sim) {
-        system("cp -r .rockbox archos/ >/dev/null");
+        system("cp -r .rockbox simdisk/ >/dev/null");
     }
     else {
         system("$ziptool $output .rockbox $target >/dev/null");
diff --git a/tools/configure b/tools/configure
index 952ed17de..9b3f10818 100755
--- a/tools/configure
+++ b/tools/configure
@@ -2132,11 +2132,11 @@ if [ "yes" = "$simulator" ]; then
   # setup compiler and things for simulator
   simcc
 
-  if [ -d "archos" ]; then
-    echo "sub directory archos already present"
+  if [ -d "simdisk" ]; then
+    echo "Subdirectory 'simdisk' already present"
   else
-    mkdir archos
-    echo "created an archos subdirectory for simulating the hard disk"
+    mkdir simdisk
+    echo "Created a 'simdisk' subdirectory for simulating the hard disk"
   fi
 fi
 
diff --git a/tools/root.make b/tools/root.make
index 154b734a7..54da3159b 100644
--- a/tools/root.make
+++ b/tools/root.make
@@ -252,12 +252,12 @@ endif
 ifdef SIMVER
 
 install:
-	@echo "Installing your build in your archos dir"
+	@echo "Installing your build in your 'simdisk' dir"
 	$(SILENT)for f in `cat $(BUILDDIR)/apps/features`; do feat="$$feat:$$f" ; done; \
 	$(TOOLSDIR)/buildzip.pl $(VERBOSEOPT) -t \"$(MODELNAME)$$feat\" -i \"$(TARGET_ID)\" -s -r "$(ROOTDIR)" -f 0 $(TARGET) $(BINARY)
 
 fullinstall:
-	@echo "Installing a full setup in your archos dir"
+	@echo "Installing a full setup in your 'simdisk' dir"
 	$(SILENT)for f in `cat $(BUILDDIR)/apps/features`; do feat="$$feat:$$f" ; done; \
 	$(TOOLSDIR)/buildzip.pl $(VERBOSEOPT) -t \"$(MODELNAME)$$feat\" -i \"$(TARGET_ID)\" -s -r "$(ROOTDIR)" -f 2 $(TARGET) $(BINARY)
 
diff --git a/uisimulator/common/io.c b/uisimulator/common/io.c
index 5827508d9..52df94901 100644
--- a/uisimulator/common/io.c
+++ b/uisimulator/common/io.c
@@ -144,7 +144,7 @@ void dircache_rename(const char *oldpath, const char *newpath);
 #endif
 
 
-#define SIMULATOR_DEFAULT_ROOT "archos"
+#define SIMULATOR_DEFAULT_ROOT "simdisk"
 extern const char *sim_root_dir;
 
 static int num_openfiles = 0;
@@ -585,7 +585,7 @@ int sim_fsync(int fd)
 #include <dlfcn.h>
 #endif
 
-#define TEMP_CODEC_FILE "archos/_temp_codec%d.dll"
+#define TEMP_CODEC_FILE SIMULATOR_DEFAULT_ROOT "/_temp_codec%d.dll"
 
 void *sim_codec_load_ram(char* codecptr, int size, void **pd)
 {
@@ -657,7 +657,7 @@ void *sim_plugin_load(char *plugin, void **pd)
     char buf[MAX_PATH];
 #endif
 
-    snprintf(path, sizeof(path), "archos%s", plugin);
+    snprintf(path, sizeof(path), SIMULATOR_DEFAULT_ROOT "%s", plugin);
 
     *pd = NULL;
 
-- 
2.11.4.GIT