# HG changeset patch # User Tom Sutcliffe # Date 1283253079 -3600 # Node ID a45c6889feaecdbe2a90464ffea3825204c5dfc8 # Parent 1c9b53dbf08bedcafd672d5ece4ae7091f11b553# Parent 54effef9f73df6e37dcefb61ef3c3814a4708cd2 merge diff -r 1c9b53dbf08b -r a45c6889feae build/common/common.mmh --- a/build/common/common.mmh Tue Aug 31 12:08:46 2010 +0100 +++ b/build/common/common.mmh Tue Aug 31 12:11:19 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 1c9b53dbf08b -r a45c6889feae build/common/fsh_rombuild_defs.iby --- a/build/common/fsh_rombuild_defs.iby Tue Aug 31 12:08:46 2010 +0100 +++ b/build/common/fsh_rombuild_defs.iby Tue Aug 31 12:11:19 2010 +0100 @@ -22,7 +22,7 @@ #define FSHELL_DATA_FILE(fileNameFrom, fileNameTo) data=##fileNameFrom fileNameTo #define FSHELL_EXECUTABLE_FILE(fileName) file=\epoc32\release\##MAIN##\##BUILD##\##fileName sys\bin\##fileName -#define FSHELL_EXECUTABLE_AS_DATA(fileNameFrom, fileNameTo) data=\epoc32\release\##MAIN##\##BUILD##\fileNameFrom sys\bin\fileNameTo +#define FSHELL_EXECUTABLE_AS_DATA(fileNameFrom, fileNameTo) data=\epoc32\release\##MAIN##\##BUILD##\fileNameFrom sys\bin\##fileNameTo #define FSHELL_DEBUG_EXECUTABLE_FILE(fileName) file=\epoc32\release\##MAIN##\##BUILD##\##fileName sys\bin\##fileName #define FSHELL_RENAMED_EXECUTABLE_FILE(fileNameFrom, fileNameTo) file=\epoc32\release\##MAIN##\##BUILD##\##fileNameFrom sys\bin\##fileNameTo #define FSHELL_DEBUG_RENAMED_EXECUTABLE_FILE(fileNameFrom, fileNameTo) file=\epoc32\release\##MAIN##\##BUILD##\##fileNameFrom sys\bin\##fileNameTo @@ -46,7 +46,7 @@ #define FSHELL_DATA_FILE(fileNameFrom, fileNameTo) data=##fileNameFrom fileNameTo #define FSHELL_EXECUTABLE_FILE(fileName) file=##ABI_DIR##\##DEBUG_DIR##\##fileName sys\bin\##fileName -#define FSHELL_EXECUTABLE_AS_DATA(fileNameFrom, fileNameTo) file=##ABI_DIR##\##DEBUG_DIR##\fileNameFrom sys\bin\fileNameTo +#define FSHELL_EXECUTABLE_AS_DATA(fileNameFrom, fileNameTo) file=##ABI_DIR##\##DEBUG_DIR##\fileNameFrom sys\bin\##fileNameTo #define FSHELL_DEBUG_EXECUTABLE_FILE(fileName) file=##ABI_DIR##\##DEBUG_DIR##\##fileName sys\bin\##fileName #define FSHELL_RENAMED_EXECUTABLE_FILE(fileNameFrom, fileNameTo) file=##ABI_DIR##\##BUILD_DIR\##fileNameFrom sys\bin\##fileNameTo #define FSHELL_DEBUG_RENAMED_EXECUTABLE_FILE(fileNameFrom, fileNameTo) file=##ABI_DIR##\##DEBUG_DIR\##fileNameFrom sys\bin\##fileNameTo diff -r 1c9b53dbf08b -r a45c6889feae build/sf/3tshell/fshell_platform.iby --- a/build/sf/3tshell/fshell_platform.iby Tue Aug 31 12:08:46 2010 +0100 +++ b/build/sf/3tshell/fshell_platform.iby Tue Aug 31 12:11:19 2010 +0100 @@ -21,6 +21,8 @@ #else +#define FSHELL_REPLACE_ECONS + // The minimum that fshell requires to rombuild successfully // Don't ask me... diff -r 1c9b53dbf08b -r a45c6889feae commands/variant/variant.cpp --- a/commands/variant/variant.cpp Tue Aug 31 12:08:46 2010 +0100 +++ b/commands/variant/variant.cpp Tue Aug 31 12:11:19 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 1c9b53dbf08b -r a45c6889feae core/group/comm.script --- a/core/group/comm.script Tue Aug 31 12:08:46 2010 +0100 +++ b/core/group/comm.script Tue Aug 31 12:11:19 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 1c9b53dbf08b -r a45c6889feae core/group/fshell_autoexec.bat --- a/core/group/fshell_autoexec.bat Tue Aug 31 12:08:46 2010 +0100 +++ b/core/group/fshell_autoexec.bat Tue Aug 31 12:11:19 2010 +0100 @@ -1,1 +1,1 @@ -fshell autostart +start fshell autostart diff -r 1c9b53dbf08b -r a45c6889feae core/group/fshell_core.iby --- a/core/group/fshell_core.iby Tue Aug 31 12:08:46 2010 +0100 +++ b/core/group/fshell_core.iby Tue Aug 31 12:11:19 2010 +0100 @@ -170,19 +170,16 @@ #endif #ifdef FSHELL_REPLACE_ECONS -//FSHELL_RENAMED_EXECUTABLE_FILE(iocons.dll, econs.dll) -// New method that doesn't involve removing other occurences of econs.dll from your IBYs. See TODO -FSHELL_EXECUTABLE_AS_DATA(iocons.dll, iocons.dll) +FSHELL_EXECUTABLE_AS_DATA(iocons.dll,iocons.dll) #ifdef FSHELL_USE_BLUETOOTH_CONSOLE -FSHELL_DATA_FILE(ZSYSTEM\console\iosrv.ini.bluetooth, system\console\iosrv.ini) +FSHELL_DATA_FILE(ZSYSTEM\console\iosrv.ini.bluetooth,system\console\iosrv.ini) #else -//TomS: I don't think this should be here any more - the VT100 consoles don't need it and I get by quite happily without it -//FSHELL_DATA_FILE(ZSYSTEM\console\iosrv.ini.econs_fb, system\console\iosrv.ini) +FSHELL_DATA_FILE(ZSYSTEM\console\iosrv.ini.econs_fb,system\console\iosrv.ini) #ifdef FSHELL_WSERV_SUPPORT -FSHELL_RENAMED_EXECUTABLE_FILE(econseik.dll, econs_fb.dll) +FSHELL_RENAMED_EXECUTABLE_FILE(econseik.dll,econs_fb.dll) #else -FSHELL_RENAMED_EXECUTABLE_FILE(econs.dll, econs_fb.dll) +FSHELL_RENAMED_EXECUTABLE_FILE(econs.dll,econs_fb.dll) #endif #endif // FSHELL_USE_BLUETOOTH_CONSOLE diff -r 1c9b53dbf08b -r a45c6889feae documentation/change_history.pod --- a/documentation/change_history.pod Tue Aug 31 12:08:46 2010 +0100 +++ b/documentation/change_history.pod Tue Aug 31 12:11:19 2010 +0100 @@ -46,6 +46,8 @@ fshell's current working directory is now normalised (via new TFileName2::Normalize function) so that the case matches what's on the filesystem). +=back + =head2 Release 000.2-000.5 Test releases with build fixes. diff -r 1c9b53dbf08b -r a45c6889feae plugins/consoles/common/BMARM/consoleextensions.def --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/plugins/consoles/common/BMARM/consoleextensions.def Tue Aug 31 12:11:19 2010 +0100 @@ -0,0 +1,10 @@ +EXPORTS + WriteStdErr__19MIosrvConsoleHelperRC7TDesC16 @ 1 NONAME R3UNUSED ; MIosrvConsoleHelper::WriteStdErr(TDesC16 const &) + Debug__C19MIosrvConsoleHelper @ 2 NONAME R3UNUSED ; MIosrvConsoleHelper::Debug(void) const + HandleConsoleCreationError__19MIosrvConsoleHelperRC7TDesC16i @ 3 NONAME R3UNUSED ; MIosrvConsoleHelper::HandleConsoleCreationError(TDesC16 const &, int) + MIosrvConsoleHelper_Extension__19MIosrvConsoleHelperUiRPvPv @ 4 NONAME ; MIosrvConsoleHelper::MIosrvConsoleHelper_Extension(unsigned int, void *&, void *) + Message__19MIosrvConsoleHelperQ219MIosrvConsoleHelper10TVerbosityGt11TRefByValue1ZC7TDesC16e @ 5 NONAME ; MIosrvConsoleHelper::Message(MIosrvConsoleHelper::TVerbosity, TRefByValue,...) + SetDebug__19MIosrvConsoleHelperi @ 6 NONAME R3UNUSED ; MIosrvConsoleHelper::SetDebug(int) + UnderlyingConsole__C19MIosrvConsoleHelper @ 7 NONAME R3UNUSED ; MIosrvConsoleHelper::UnderlyingConsole(void) const + CleanupUnderlyingConsole__19MIosrvConsoleHelper @ 8 NONAME R3UNUSED ; MIosrvConsoleHelper::CleanupUnderlyingConsole(void) +