# HG changeset patch
# User Tom Sutcliffe <thomas.sutcliffe@accenture.com>
# Date 1283014260 -3600
# Node ID 4df672617228c7023a9bab6815596618c353931a
# Parent  96bfe2624d23701d3bdc924bfdd7a89d3db7c1c2# Parent  a83fed0e0b9a119cbfdac8641cc84f4dfc19e39a
merge

diff -r a83fed0e0b9a -r 4df672617228 build/common/common.mmh
--- a/build/common/common.mmh	Sat Aug 28 17:50:09 2010 +0100
+++ b/build/common/common.mmh	Sat Aug 28 17:51:00 2010 +0100
@@ -277,7 +277,9 @@
 #endif
 
 #if defined(FSHELL_PLATFORM_S60) && FSHELL_PLATFORM_S60 >= 5
+#ifdef FSHELL_COMMS_SUPPORT
 #define FSHELL_CORE_SUPPORT_SYSINFO_WLAN
+#endif
 #define FSHELL_CORE_SUPPORT_SECURE_TIME
 #endif
 
diff -r a83fed0e0b9a -r 4df672617228 commands/variant/variant.cpp
--- a/commands/variant/variant.cpp	Sat Aug 28 17:50:09 2010 +0100
+++ b/commands/variant/variant.cpp	Sat Aug 28 17:51:00 2010 +0100
@@ -67,6 +67,7 @@
 	{ 0x2000DA56, DESC("5800") },
 	{ 0x2001F0A1, DESC("satio") }, // I assume this is what it shipped with...
 	{ 0x20029a73, DESC("n8") }, // Likewise...
+	{ 0x102734e3, DESC("qemu") },
 	};
 const TInt KMachineIdVariantCount = sizeof(KMachineIdVariants) / sizeof(TVariant);
 
diff -r a83fed0e0b9a -r 4df672617228 core/group/comm.script
--- a/core/group/comm.script	Sat Aug 28 17:50:09 2010 +0100
+++ b/core/group/comm.script	Sat Aug 28 17:51:00 2010 +0100
@@ -26,6 +26,9 @@
 # OPP Mid-Size Prototype, requires a special USB cable with a UART bridge built into it (normally covered in heat shrink) or a "black box".
 variant opp-mid-size && export ARGS "--console vt100busdevcons --console-title pdd=euart1,ldd=ecomm,rate=115200,port=4"
 
+# QEMU simulator - assumes you're using 2nd emulated serial port for fshell, ie with options similar to "-serial file:rdebug.txt -serial COMx"
+variant qemu && export ARGS "--console vt100busdevcons --console-title pdd=eserial,ldd=ecomm,rate=115200,port=1"
+
 # Add new variants here
 
 # And finally, start fshell with the given configuration
diff -r a83fed0e0b9a -r 4df672617228 core/group/fshell_autoexec.bat
--- a/core/group/fshell_autoexec.bat	Sat Aug 28 17:50:09 2010 +0100
+++ b/core/group/fshell_autoexec.bat	Sat Aug 28 17:51:00 2010 +0100
@@ -1,1 +1,1 @@
-fshell autostart
+start fshell autostart