Update original with the imaker output produced from the revised buildrom.pl, and the revised syborg_stem_rom.oby from repair_obyfile.pl
authorWilliam Roberts <williamr@symbian.org>
Fri, 15 Oct 2010 15:51:44 +0100
changeset 58 37bdadebbfc0
parent 57 a44af1db196f
child 59 5c286813b9bb
Update original with the imaker output produced from the revised buildrom.pl, and the revised syborg_stem_rom.oby from repair_obyfile.pl
original/syborg.rom.log
original/syborg.rom.oby
original/syborg.tmp1.oby
original/syborg_core_bldromplugin.log
original/syborg_core_master.oby
original/syborg_flash.log
original/syborg_stem_rom.oby
Binary file original/syborg.rom.log has changed
--- a/original/syborg.rom.oby	Fri Oct 15 15:50:31 2010 +0100
+++ b/original/syborg.rom.oby	Fri Oct 15 15:51:44 2010 +0100
@@ -10,10 +10,10 @@
 REM define which serial port Bluetooth protocol uses
 REM Define whether or not to include USB client support:
 REM processed ROMBUILD_OPTION -no-header 
-REM redefined ROMDATE as 09\10\2010
+REM redefined ROMDATE as 15\10\2010
 unicode
 romsize=0x5000000
-time=09/10/2010 12:00:00
+time=15/10/2010 12:00:00
 REM defaultfeaturedb = epoc32\rom\include\featuredatabase.xml 
 REM ROM version number
 version=0.01(0)
@@ -265,6 +265,7 @@
 REM FLOGGER - logging support
 file=\epoc32\release\ARMV5\urel\flogger.dll 	"sys\bin\FLogger.dll"
 file=\epoc32\release\ARMV5\urel\flogsvr.exe 	"sys\bin\FLogSvr.exe"
+REM processed patchdata Flogger.dll @ KFloggerSTI 0
 patchdata  sys\bin\Flogger.dll addr 0x00009f50 4 0
 REM The Watcher Framework
 REM 'buildrom lubbock -D__NOWATCHER__' will place watcher.exe in z:REM so that it never runs
@@ -367,7 +368,9 @@
 file=\epoc32\release\ARMV5\urel\sysagt2cli.dll 	"sys\bin\sysagt2cli.dll"
 file=\epoc32\release\ARMV5\urel\sysagt2svr.exe 	"sys\bin\sysagt2svr.exe"
 file=\epoc32\release\ARMV5\urel\halsettings.exe 	"sys\bin\halsettings.exe" 
+REM processed patchdata halsettings.exe@KHalPenStatePersistenceDisabled 1 
 patchdata  sys\bin\halsettings.exe addr 0x000086e4 4 1
+REM processed patchdata halsettings.exe@KHalNonSecureOffsetPersistenceDisabled 1 
 patchdata  sys\bin\halsettings.exe addr 0x000086e8 4 1
 REM Scheduled Sending for GT Messaging
 REM Note: Following clashes with schsvr
@@ -423,8 +426,11 @@
 REM faxcli.DLL
 file=\epoc32\release\ARMV5\urel\etel.dll 	"sys\bin\ETel.dll"
 data=\epoc32\data\z\private\101F7988\etel.cmi 	"private\101F7988\etel.cmi"
+REM processed patchdata etel.dll@KPriorityClientSid 0x10281806
 patchdata  sys\bin\etel.dll addr 0x000116a8 4 271063046
+REM processed patchdata etel.dll@KLocationServicesNetworkGatewaySid 0x10281806
 patchdata  sys\bin\etel.dll addr 0x000116ac 4 271063046
+REM processed patchdata etel.dll@KSatEngineSid 0x10281806
 patchdata  sys\bin\etel.dll addr 0x000116b0 4 271063046
 REM Multimode Etel
 file=\epoc32\release\ARMV5\urel\etelmm.dll 	"sys\bin\etelmm.dll"
@@ -898,6 +904,7 @@
 REM Patch for emulator builds by adding "patchdata_cone_dll_KCoeSetControlParentByDefault X"
 REM to epoc.ini where X is either 0 (zero) for "off" or 1 (one) for "on". 
 REM Only valid in Symbian OS 9.3 and 9.4
+REM processed patchdata cone.dll @ KCoeSetControlParentByDefault 1
 patchdata  sys\bin\cone.dll addr 0x00010f00 4 1
 REM #endif
 file=\epoc32\release\ARMV5\urel\sbeclient.dll 	"sys\bin\sbeclient.dll"
@@ -1604,12 +1611,19 @@
 file=\epoc32\release\ARMV5\urel\packetlogger.dll 	"sys\bin\packetlogger.dll"
 REM expanded __ECOM_PLUGIN(\epoc32\release\ARMV5\UDEB,Sys\Bin,\epoc32\data\Z,Resource\Plugins, rawip.dll , rawip.dll ) 
 file=\epoc32\release\ARMV5\UDEB\rawip.dll 	"Sys\Bin\rawip.dll" 
+REM processed patchdata rawip.dll@KMaxSendQueueLen 0x5
 patchdata  Sys\Bin\rawip.dll addr 0x0000da14 4 5
+REM processed patchdata rawip.dll@KMaxTxIPPacketSize 0x57a
 patchdata  Sys\Bin\rawip.dll addr 0x0000da18 4 1402
+REM processed patchdata rawip.dll@KMaxRxIPPacketSize 0x57a
 patchdata  Sys\Bin\rawip.dll addr 0x0000da1c 4 1402
+REM processed patchdata rawip.dll@KMtuIPv4 0x578     	 
 patchdata  Sys\Bin\rawip.dll addr 0x0000d9d0 4 1400
+REM processed patchdata rawip.dll@KRMtuIPv4 0x578		 
 patchdata  Sys\Bin\rawip.dll addr 0x0000d9d4 4 1400
+REM processed patchdata rawip.dll@KMtuIPv6 0x578		 
 patchdata  Sys\Bin\rawip.dll addr 0x0000d9ec 4 1400
+REM processed patchdata rawip.dll@KRMtuIPv6 0x578		 
 patchdata  Sys\Bin\rawip.dll addr 0x0000d9f0 4 1400
 REM Feature DHCP is not included in this ROM
 file=\epoc32\release\ARMV5\urel\umtsif.dll 	"sys\bin\umtsif.dll"
@@ -2242,6 +2256,7 @@
 file=\epoc32\release\ARMV5\urel\viewcli.dll 	"sys\bin\viewcli.dll"
 file=\epoc32\release\ARMV5\urel\updatesystemcolorlist.exe 	"Sys\Bin\updatesystemcolorlist.exe"
 REM Test code for Uikon Subsystem - kept in \uikon\groupREM #include "uikon_subsytem_unit_test.iby"
+REM processed patchdata eiksrv.dll @ KEikAlarmDefaultSnoozeInMinutes 5
 patchdata  sys\bin\eiksrv.dll addr 0x0000c944 4 5
 file=\epoc32\release\ARMV5\urel\uloggerserver.exe 	"Sys\Bin\uloggerserver.exe"
 file=\epoc32\release\ARMV5\urel\uloggersysstart.exe 	"Sys\Bin\uloggersysstart.exe"
@@ -7908,7 +7923,7 @@
 data=\epoc32\data\Z\resource\apps\anomaly.RSC 	"resource\apps\anomaly.rsc" 
 data=\epoc32\data\Z\private\10003a3f\import\Apps\anomaly_reg.rsc 	"private\10003a3f\import\apps\anomaly_reg.rsc"
 romname syborg.rom.img
-time=09/10/2010
+time=15/10/2010
 romchecksum=0x12345678
 data=\epoc32\rombuild\syborg\core\features.dat 	"private\10205054\features.dat"
 data=\epoc32\rombuild\syborg\core\ecom-0-0.spi 	"private\10009d8f\ecom-0-0.spi"
--- a/original/syborg.tmp1.oby	Fri Oct 15 15:50:31 2010 +0100
+++ b/original/syborg.tmp1.oby	Fri Oct 15 15:51:44 2010 +0100
@@ -11219,7 +11219,7 @@
 
 
 define  ROMMEGS F8
-define  ROMDATE 09/10/2010
+define  ROMDATE 15/10/2010
 # 1 "..\\..\\..\\include\\data_caging_paths_for_iby.hrh" 1
  
 
@@ -99178,6 +99178,6 @@
 # 35 "/epoc32/rombuild/syborg/core/syborg_core_master.oby" 2
 
 romname syborg.rom.img
-time=09/10/2010
+time=15/10/2010
 romchecksum=0x12345678
 }
--- a/original/syborg_core_bldromplugin.log	Fri Oct 15 15:50:31 2010 +0100
+++ b/original/syborg_core_bldromplugin.log	Fri Oct 15 15:51:44 2010 +0100
@@ -3,7 +3,7 @@
 override.pm: ------------------------------------------------------------------
 Finding overrides...
 #30: `OVERRIDE_REPLACE/WARN'
-#15697: `REM ROM_IMAGE[1]'
+#15727: `REM ROM_IMAGE[1]'
 No override entries found
 override.pm: Duration: 0 seconds ----------------------------------------------
 obyparse.pm: ------------------------------------------------------------------
--- a/original/syborg_core_master.oby	Fri Oct 15 15:50:31 2010 +0100
+++ b/original/syborg_core_master.oby	Fri Oct 15 15:51:44 2010 +0100
@@ -25,7 +25,7 @@
 #undef  SECTION
 #define SECTION
 define  ROMMEGS F8
-define  ROMDATE 09/10/2010
+define  ROMDATE 15/10/2010
 #include <data_caging_paths_for_iby.hrh>
 
 // Core ROM
@@ -34,6 +34,6 @@
 #include "../../../rom/config/sf_refhw/bigrom.oby"
 #include "syborg_core_collected.oby"
 romname syborg.rom.img
-time=09/10/2010
+time=15/10/2010
 romchecksum=0x12345678
 }
--- a/original/syborg_flash.log	Fri Oct 15 15:50:31 2010 +0100
+++ b/original/syborg_flash.log	Fri Oct 15 15:51:44 2010 +0100
@@ -1,17 +1,17 @@
 ===============================================================================
-TIME: Sat Oct  9 18:11:16 2010, USER: williamr, HOST: UK-1086
+TIME: Fri Oct 15 15:21:10 2010, USER: williamr, HOST: UK-1086
 C:\Perl\bin\perl.exe (v5.12.1-MSWin32)
 WriteFile: `>/epoc32/rombuild/syborg/log/syborg_flash.log'
 ChangeDir: `/epoc32/rombuild/syborg'
 ReadFile: `/epoc32/rombuild/syborg/syborg_flash.icmd'
 # IMAKER_VERSION   = `iMaker 09.06.01, 05-Feb-2009.'
-# IMAKER_CMDARG    = `--file=/epoc32/rom/config/sf_refhw/syborg/image_conf_syborg.mk  flash'
-# IMAKER_MAKECMD   = `\epoc32\tools\rom\imaker\mingw_make.exe -R --no-print-directory SHELL="C:\Windows\system32\cmd.exe" -I M:/epoc32/rom/config -f M:/epoc32/tools/rom/imaker/imaker.mk TIMESTAMP=2010100918111641  --file=/epoc32/rom/config/sf_refhw/syborg/image_conf_syborg.mk  -f M:/epoc32/tools/rom/imaker/imaker.mk flash'
+# IMAKER_CMDARG    = `--file=/epoc32/rom/config/sf_refhw/syborg/image_conf_syborg.mk flash'
+# IMAKER_MAKECMD   = `\epoc32\tools\rom\imaker\mingw_make.exe -R --no-print-directory SHELL="C:\Windows\system32\cmd.exe" -I M:/epoc32/rom/config -f M:/epoc32/tools/rom/imaker/imaker.mk TIMESTAMP=2010101515211042  --file=/epoc32/rom/config/sf_refhw/syborg/image_conf_syborg.mk  -f M:/epoc32/tools/rom/imaker/imaker.mk flash'
 # IMAKER_PERLCMD   = `perl -x M:/epoc32/tools/rom/imaker/imaker.pl --cmdfile "/epoc32/rombuild/syborg/syborg_flash.icmd" --logfile "/epoc32/rombuild/syborg/log/syborg_flash.log"  --step "IMAKERPRE:cbk-COREPRE:cb-CORE:cb-COREPOST:cb" --verbose "1" --workdir "/epoc32/rombuild/syborg"'
 # IMAKER_EXITSHELL = `'
 # SHELL            = `C:/Windows/system32/cmd.exe'
 # MAKE             = `M:/epoc32/tools/rom/imaker/mingw_make'
-# MAKEFLAGS        = ` --no-print-directory -RrI M:/epoc32/rom/config -- TIMESTAMP=2010100918111641 SHELL=C:/Windows/system32/cmd.exe'
+# MAKEFLAGS        = ` --no-print-directory -RrI M:/epoc32/rom/config -- TIMESTAMP=2010101515211042 SHELL=C:/Windows/system32/cmd.exe'
 # MAKECMDGOALS     = `flash'
 # $@               = `flash'
 # MAKELEVEL        = `0'
@@ -24,7 +24,7 @@
 # ITOOL_DIR        = `M:/epoc32/tools/rom'
 # IMAKER_DIR       = `M:/epoc32/tools/rom/imaker'
 # ITOOL_PATH       = `M:\epoc32\tools\rom;M:\epoc32\tools;M:\epoc32\gcc\bin'
-# PATH             = `M:\epoc32\tools\rom;M:\epoc32\tools;M:\epoc32\gcc\bin;C:\apps\CodeSourcery\bin;C:\Apps\arm\RVCT\Programs\2.2\686\win_32-pentium;C:\Apps\arm\RVCT\Programs\4.0\650\win_32-pentium;C:\Python26\Scripts;C:\Python26\;C:\Perl\site\bin;C:\Perl\bin;C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem;C:\Windows\System32\WindowsPowerShell\v1.0\;C:\Program Files\WIDCOMM\Bluetooth Software\;C:\Program Files\WIDCOMM\Bluetooth Software\syswow64;C:\Program Files\Intel\WiFi\bin\;C:\Program Files\Common Files\Intel\WirelessCommon\;c:\Program Files (x86)\ATI Technologies\ATI.ACE\Core-Static;C:\Symbian\Tools\PDT_1.7;C:\Symbian\Tools\PDT_1.7\raptor\bin;C:\Symbian\Tools\PDT_1.7\helium;C:\Symbian\Tools\PDT_1.7\ConE;C:\Symbian\Tools\PDT_1.7\utilities\bin;C:\Symbian\Tools\PDT_1.7\bootstrap;C:\Symbian\Tools\PDT_1.7\helium\runtime\7zip;C:\Symbian\Tools\PDT_1.7\Carbide.c++\x86Build\Symbian_Tools\Command_Line_Tools;C:\Program Files (x86)\TortoiseHg\;C:\Program Files (x86)\7-Zip\;\epoc32\tools;C:\Users\williamr\AppData\Roaming\Python\Scripts;C:\Program Files (x86)\7-Zip\'
+# PATH             = `M:\epoc32\tools\rom;M:\epoc32\tools;M:\epoc32\gcc\bin;C:\apps\CodeSourcery\bin;C:\Apps\arm\RVCT\Programs\2.2\686\win_32-pentium;C:\Apps\arm\RVCT\Programs\4.0\650\win_32-pentium;C:\Python26\Scripts;C:\Python26\;C:\Perl\site\bin;C:\Perl\bin;C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem;C:\Windows\System32\WindowsPowerShell\v1.0\;C:\Program Files\WIDCOMM\Bluetooth Software\;C:\Program Files\WIDCOMM\Bluetooth Software\syswow64;C:\Program Files\Intel\WiFi\bin\;C:\Program Files\Common Files\Intel\WirelessCommon\;c:\Program Files (x86)\ATI Technologies\ATI.ACE\Core-Static;C:\Symbian\Tools\PDT_1.7;C:\Symbian\Tools\PDT_1.7\raptor\bin;C:\Symbian\Tools\PDT_1.7\helium;C:\Symbian\Tools\PDT_1.7\ConE;C:\Symbian\Tools\PDT_1.7\utilities\bin;C:\Symbian\Tools\PDT_1.7\bootstrap;C:\Symbian\Tools\PDT_1.7\helium\runtime\7zip;C:\Symbian\Tools\PDT_1.7\Carbide.c++\x86Build\Symbian_Tools\Command_Line_Tools;C:\Program Files (x86)\TortoiseHg\;C:\Program Files (x86)\7-Zip\;\epoc32\tools;\epoc32\gcc\bin'
 Steps: CLEAN_IMAKERPRE, BUILD_IMAKERPRE, CLEAN_COREPRE, BUILD_COREPRE, CLEAN_CORE, BUILD_CORE, CLEAN_COREPOST, BUILD_COREPOST (empty)
 ===============================================================================
 ENTER: `S:IMAKERPRE,C:1,B:1,K:1,V:1'
@@ -72,12 +72,9 @@
 	(Maybe you should just omit the defined()?)
 defined(%hash) is deprecated at M:\epoc32\tools\/E32Plat.pm line 591.
 	(Maybe you should just omit the defined()?)
-defined(@array) is deprecated at M:\epoc32\tools\/buildrom.pm line 3146.
-	(Maybe you should just omit the defined()?)
-defined(@array) is deprecated at M:\epoc32\tools\/buildrom.pm line 3172.
-	(Maybe you should just omit the defined()?)
-defined(@array) is deprecated at M:\epoc32\tools\/buildrom.pm line 3225.
-	(Maybe you should just omit the defined()?)
+** process_cmdline_arguments
+** image_content_processing_phase
+** processobyfiles
 * cpp -o tmp1.oby -nostdinc -undef -D_IMAGE_TYPE_CORE -D_IMAGE_TYPE_RND -D_EABI=ARMV5 -IM:/epoc32/tools/rom/../../rom/include/core/mw -IM:/epoc32/tools/rom/../../rom/include/core/app -DSYBORG -DSECTION -IM:/epoc32/rom/config -IM:/epoc32/rom -I "..\..\..\include\" -include "..\..\..\include\bldvariant.hrh" -DROM_FEATURE_MANAGEMENT  -I. -I../../../../epoc32/rom/include
 In file included from syborg_core_collected.oby:898,
                  from /epoc32/rombuild/syborg/core/syborg_core_master.oby:35:
@@ -86,9 +83,9 @@
 override.pm: Initializing; logfile = `/epoc32/rombuild/syborg/core/syborg_core_bldromplugin.log', debug = 0
 obyparse.pm: Initializing; logfile = `/epoc32/rombuild/syborg/core/syborg_core_bldromplugin.log', debug = 0
 configpaging.pm: Initializing with configpaging_stressed.cfg
-ERROR: Invalid patchable value at "PlatformEnv.dll@KDriveInfoDefaultRemovableMassStorage FF_DEFAULT_REMOVABLE_MASS_STORAGE"
-ERROR: Invalid patchable value at "PlatformEnv.dll@KDriveInfoLogicallyRemovableDrive1 FF_LOGICALLY_REMOVABLE_DRIVE1"
-ERROR: Invalid patchable value at "PlatformEnv.dll@KDriveInfoUsbDrivesStart FF_USB_DRIVE_START"
+..\..\..\rom\include\core\os\PlatformEnv.iby(25): ERROR: Invalid patchable value : PlatformEnv.dll@KDriveInfoDefaultRemovableMassStorage FF_DEFAULT_REMOVABLE_MASS_STORAGE
+..\..\..\rom\include\core\os\PlatformEnv.iby(26): ERROR: Invalid patchable value : PlatformEnv.dll@KDriveInfoLogicallyRemovableDrive1 FF_LOGICALLY_REMOVABLE_DRIVE1
+..\..\..\rom\include\core\os\PlatformEnv.iby(29): ERROR: Invalid patchable value : PlatformEnv.dll@KDriveInfoUsbDrivesStart FF_USB_DRIVE_START
 * Writing tmp2.oby - result of substitution phase
 * Writing tmp3.oby - result of reorganisation phase
 * Invalid image file name: \epoc32\data\Z\resource/apps\CSC.mbm or .mif
@@ -353,6 +350,7 @@
 * Writing tmp9.oby - result of cleaning phase
 * Writing syborg.oby - final OBY file
 * Writing syborg.dir - ROM directory listing
+** suppress_image_generation
 * Executing rombuild -slog  -loglevel1    -no-header -type-safe-link  syborg.oby
 The number of processors (2) is used as the number of concurrent jobs.
 
@@ -376,13 +374,13 @@
 
  Directory of M:\epoc32\rombuild\syborg\core
 
-09/10/2010  18:11           860,139 syborg.dir
-09/10/2010  18:11         5,708,165 syborg.log
-09/10/2010  18:11           723,002 syborg.oby
-09/10/2010  18:11       124,739,584 syborg.rom.img
-               4 File(s)    132,030,890 bytes
-               0 Dir(s)   9,378,553,856 bytes free
-==========>8==========>8==========>8==========>8==========>8===00:32===[END]<<<
+15/10/2010  15:21           860,139 syborg.dir
+15/10/2010  15:21         5,708,119 syborg.log
+15/10/2010  15:21           723,951 syborg.oby
+15/10/2010  15:21       124,739,584 syborg.rom.img
+               4 File(s)    132,031,793 bytes
+               0 Dir(s)  13,359,902,720 bytes free
+==========>8==========>8==========>8==========>8==========>8===00:26===[END]<<<
 
 Missing file(s):
  1) ..\..\..\..\epoc32\rom\include\csc_plugin.iby(3): Missing file: '\epoc32\release\ARMV5\urel\10286506.dll' in statement 'file='
@@ -486,9 +484,9 @@
 10) WARNING: File \epoc32\data\Z\Resource\java\security\trustroots\midprootslist does not exist or is 0 bytes in length.
 
 Error(s):
-1) ERROR: Invalid patchable value at "PlatformEnv.dll@KDriveInfoDefaultRemovableMassStorage FF_DEFAULT_REMOVABLE_MASS_STORAGE"
-2) ERROR: Invalid patchable value at "PlatformEnv.dll@KDriveInfoLogicallyRemovableDrive1 FF_LOGICALLY_REMOVABLE_DRIVE1"
-3) ERROR: Invalid patchable value at "PlatformEnv.dll@KDriveInfoUsbDrivesStart FF_USB_DRIVE_START"
+1) ..\..\..\rom\include\core\os\PlatformEnv.iby(25): ERROR: Invalid patchable value : PlatformEnv.dll@KDriveInfoDefaultRemovableMassStorage FF_DEFAULT_REMOVABLE_MASS_STORAGE
+2) ..\..\..\rom\include\core\os\PlatformEnv.iby(26): ERROR: Invalid patchable value : PlatformEnv.dll@KDriveInfoLogicallyRemovableDrive1 FF_LOGICALLY_REMOVABLE_DRIVE1
+3) ..\..\..\rom\include\core\os\PlatformEnv.iby(29): ERROR: Invalid patchable value : PlatformEnv.dll@KDriveInfoUsbDrivesStart FF_USB_DRIVE_START
 CopyFile: `/epoc32/rombuild/syborg/core/tmp1.oby' => `/epoc32/rombuild/syborg/core/syborg.tmp1.oby'
 DeleteFile: `/epoc32/rombuild/syborg/core/tmp1.oby'
 DeleteFile: `/epoc32/rombuild/syborg/core/tmp2.oby'
@@ -502,7 +500,7 @@
 MoveFile: `/epoc32/rombuild/syborg/core/syborg.log' => `/epoc32/rombuild/syborg/core/syborg.rom.log'
 MoveFile: `/epoc32/rombuild/syborg/core/syborg.oby' => `/epoc32/rombuild/syborg/core/syborg.rom.oby'
 TestFile: `/epoc32/rombuild/syborg/core/syborg.rom.img'
-EXIT: `S:CORE,C:1,B:1,K:0,V:1', duration: 00:33
+EXIT: `S:CORE,C:1,B:1,K:0,V:1', duration: 00:26
 ChangeDir: `/epoc32/rombuild/syborg'
 ===============================================================================
 ENTER: `S:COREPOST,C:1,B:1,K:0,V:1'
@@ -512,7 +510,7 @@
 ============ ===================== 
 1. IMAKERPRE 00:00                 
 2. COREPRE   00:02                 
-3. CORE      00:33 (00:32 + 00:01) 
+3. CORE      00:26 (00:26 + 00:00) 
 4. COREPOST  00:00                 
 ------------ --------------------- 
-Total        00:35                 
+Total        00:28                 
--- a/original/syborg_stem_rom.oby	Fri Oct 15 15:50:31 2010 +0100
+++ b/original/syborg_stem_rom.oby	Fri Oct 15 15:51:44 2010 +0100
@@ -12,7 +12,7 @@
 REM define which serial port Bluetooth protocol uses
 REM Define whether or not to include USB client support:
 ROMBUILD_OPTION -no-header 
-REM redefined ROMDATE as 09\10\2010
+REM redefined ROMDATE as 15\10\2010
 unicode
 romsize=0x5000000
 time=##TODAY## 12:00:00
@@ -253,7 +253,7 @@
 REM FLOGGER - logging support
 file=\epoc32\release\ARMV5\urel\flogger.dll 	"sys\bin\FLogger.dll"
 file=\epoc32\release\ARMV5\urel\flogsvr.exe 	"sys\bin\FLogSvr.exe"
-patchdata  sys\bin\Flogger.dll addr 0x00009f50 4 0
+patchdata Flogger.dll @ KFloggerSTI 0
 REM The Watcher Framework
 REM 'buildrom lubbock -D__NOWATCHER__' will place watcher.exe in z:REM so that it never runs
 file=\epoc32\release\ARMV5\urel\watcher.exe 	"sys\bin\watcher.exe"
@@ -348,8 +348,8 @@
 file=\epoc32\release\ARMV5\urel\sysagt2cli.dll 	"sys\bin\sysagt2cli.dll"
 file=\epoc32\release\ARMV5\urel\sysagt2svr.exe 	"sys\bin\sysagt2svr.exe"
 file=\epoc32\release\ARMV5\urel\halsettings.exe 	"sys\bin\halsettings.exe" 
-patchdata  sys\bin\halsettings.exe addr 0x000086e4 4 1
-patchdata  sys\bin\halsettings.exe addr 0x000086e8 4 1
+patchdata halsettings.exe@KHalPenStatePersistenceDisabled 1 
+patchdata halsettings.exe@KHalNonSecureOffsetPersistenceDisabled 1 
 REM Scheduled Sending for GT Messaging
 REM Note: Following clashes with schsvr
 file=\epoc32\release\ARMV5\urel\schsendexe.exe 	"sys\bin\schsendexe.exe"
@@ -401,9 +401,9 @@
 REM faxcli.DLL
 file=\epoc32\release\ARMV5\urel\etel.dll 	"sys\bin\ETel.dll"
 data=\epoc32\data\z\private\101F7988\etel.cmi 	"private\101F7988\etel.cmi"
-patchdata  sys\bin\etel.dll addr 0x000116a8 4 271063046
-patchdata  sys\bin\etel.dll addr 0x000116ac 4 271063046
-patchdata  sys\bin\etel.dll addr 0x000116b0 4 271063046
+patchdata etel.dll@KPriorityClientSid 0x10281806
+patchdata etel.dll@KLocationServicesNetworkGatewaySid 0x10281806
+patchdata etel.dll@KSatEngineSid 0x10281806
 REM Multimode Etel
 file=\epoc32\release\ARMV5\urel\etelmm.dll 	"sys\bin\etelmm.dll"
 file=\epoc32\release\ARMV5\urel\GsmU.dll 	"sys\bin\GsmU.dll"
@@ -790,7 +790,7 @@
 REM Patch for emulator builds by adding "patchdata_cone_dll_KCoeSetControlParentByDefault X"
 REM to epoc.ini where X is either 0 (zero) for "off" or 1 (one) for "on". 
 REM Only valid in Symbian OS 9.3 and 9.4
-patchdata  sys\bin\cone.dll addr 0x00010f00 4 1
+patchdata cone.dll @ KCoeSetControlParentByDefault 1
 REM #endif
 file=\epoc32\release\ARMV5\urel\sbeclient.dll 	"sys\bin\sbeclient.dll"
 file=\epoc32\release\ARMV5\urel\abclient.dll 	"sys\bin\abclient.dll"
@@ -1419,13 +1419,13 @@
 file=\epoc32\release\ARMV5\urel\predcomp.dll 	"sys\bin\PredComp.dll"
 file=\epoc32\release\ARMV5\urel\packetlogger.dll 	"sys\bin\packetlogger.dll"
 __ECOM_PLUGIN(\epoc32\release\ARMV5\UDEB,Sys\Bin,\epoc32\data\Z,Resource\Plugins, rawip.dll , rawip.dll ) 
-patchdata  Sys\Bin\rawip.dll addr 0x0000da14 4 5
-patchdata  Sys\Bin\rawip.dll addr 0x0000da18 4 1402
-patchdata  Sys\Bin\rawip.dll addr 0x0000da1c 4 1402
-patchdata  Sys\Bin\rawip.dll addr 0x0000d9d0 4 1400
-patchdata  Sys\Bin\rawip.dll addr 0x0000d9d4 4 1400
-patchdata  Sys\Bin\rawip.dll addr 0x0000d9ec 4 1400
-patchdata  Sys\Bin\rawip.dll addr 0x0000d9f0 4 1400
+patchdata rawip.dll@KMaxSendQueueLen 0x5
+patchdata rawip.dll@KMaxTxIPPacketSize 0x57a
+patchdata rawip.dll@KMaxRxIPPacketSize 0x57a
+patchdata rawip.dll@KMtuIPv4 0x578     	 
+patchdata rawip.dll@KRMtuIPv4 0x578		 
+patchdata rawip.dll@KMtuIPv6 0x578		 
+patchdata rawip.dll@KRMtuIPv6 0x578		 
 REM Feature DHCP is not included in this ROM
 file=\epoc32\release\ARMV5\urel\umtsif.dll 	"sys\bin\umtsif.dll"
 REM Feature QoS is not included in this ROM 
@@ -1924,11 +1924,11 @@
 data=\epoc32\data\Z\Private\101F413C\backup_registration.xml 	"private\101F413C\backup_registration.xml"
 REM SQLITE3
 file=\epoc32\release\ARMV5\urel\sqlite3.dll 	"sys\bin\sqlite3.dll" 
-file=\epoc32\release\ARMV5\UDEB\ssmcmn.dll 	"sys\bin\ssmcmn.dll"
-file=\epoc32\release\ARMV5\UDEB\ssmcmd.dll 	"sys\bin\ssmcmd.dll"
-file=\epoc32\release\ARMV5\UDEB\sysstatemgr.exe 	"sys\bin\sysstatemgr.exe"
-file=\epoc32\release\ARMV5\UDEB\ssmstartsafe.dll 	"sys\bin\ssmstartsafe.dll"
-file=\epoc32\release\ARMV5\UDEB\domainpolicy2.dll 	"sys\bin\domainpolicy2.dll"
+file=\epoc32\release\ARMV5\urel\ssmcmn.dll 	"sys\bin\ssmcmn.dll"
+file=\epoc32\release\ARMV5\urel\ssmcmd.dll 	"sys\bin\ssmcmd.dll"
+file=\epoc32\release\ARMV5\urel\sysstatemgr.exe 	"sys\bin\sysstatemgr.exe"
+file=\epoc32\release\ARMV5\urel\ssmstartsafe.dll 	"sys\bin\ssmstartsafe.dll"
+file=\epoc32\release\ARMV5\urel\domainpolicy2.dll 	"sys\bin\domainpolicy2.dll"
 file=\epoc32\release\ARMV5\urel\subtitlegraphic.dll 	"sys\bin\subtitlegraphic.dll"
 __ECOM_PLUGIN(\epoc32\release\ARMV5\urel,Sys\Bin,\epoc32\data\Z,Resource\Plugins, subtitlegraphicdrawer.dll , subtitlegraphicdrawer.dll ) 
 REM surface update client\server
@@ -2023,7 +2023,7 @@
 file=\epoc32\release\ARMV5\urel\viewcli.dll 	"sys\bin\viewcli.dll"
 file=\epoc32\release\ARMV5\urel\updatesystemcolorlist.exe 	"Sys\Bin\updatesystemcolorlist.exe"
 REM Test code for Uikon Subsystem - kept in \uikon\groupREM #include "uikon_subsytem_unit_test.iby"
-patchdata  sys\bin\eiksrv.dll addr 0x0000c944 4 5
+patchdata eiksrv.dll @ KEikAlarmDefaultSnoozeInMinutes 5
 file=\epoc32\release\ARMV5\urel\uloggerserver.exe 	"Sys\Bin\uloggerserver.exe"
 file=\epoc32\release\ARMV5\urel\uloggersysstart.exe 	"Sys\Bin\uloggersysstart.exe"
 file=\epoc32\release\ARMV5\urel\uloggercommand.dll 	"Sys\Bin\uloggercommand.dll"
@@ -5842,52 +5842,52 @@
 file=\epoc32\release\ARMV5\urel\libssl.dll 	"sys\bin\libssl.dll"
 data=\epoc32\data\Z\System\INSTALL\openc_ssl_stub.sis 	"System\Install\openc_ssl_stub.sis"
 data=\epoc32\data\Z\System\INSTALL\openc_libzcore_stub.sis 	"System\Install\openc_libzcore_stub.sis"
-data=\epoc32\data\Z\private\2000D75B\startup\0\stem_preuiservicescmdlist.rsc 	"private\2000D75B\startup\0\preuiservicescmdlist.rsc"
-data=\epoc32\data\Z\private\2000D75B\startup\0\stem_uiservicescmdlist.rsc 	"private\2000D75B\startup\0\uiservicescmdlist.rsc"
-data=\epoc32\data\Z\private\2000D75B\startup\0\stem_criticalappscmdlist.rsc 	"private\2000D75B\startup\0\criticalappscmdlist.rsc"
-//data=\epoc32\data\Z\private\2000D75B\startup\0\stem_selftestokcmdlist.rsc 	"private\2000D75B\startup\0\selftestokcmdlist.rsc"
-//data=\epoc32\data\Z\private\2000D75B\startup\0\stem_alarm_charging.rsc 	"private\2000D75B\startup\0\alarm_charging.rsc"
-//data=\epoc32\data\Z\private\2000D75B\startup\0\stem_securitycheckcmdlist.rsc 	"private\2000D75B\startup\0\securitycheckcmdlist.rsc"
-data=\epoc32\data\Z\private\2000D75B\startup\0\stem_noncriticalcmdlist.rsc 	"private\2000D75B\startup\0\noncriticalcmdlist.rsc"
-//data=\epoc32\data\Z\private\2000D75B\startup\0\stem_emergencycallsonlycmdlist.rsc 	"private\2000D75B\startup\0\emergencycallsonlycmdlist.rsc"
-//data=\epoc32\data\Z\private\2000D75B\startup\0_ext\stem_uiservicescmdlist_ext.rsc 	"private\2000D75B\startup\0\uiservicescmdlist_ext.rsc"
-//data=\epoc32\data\Z\private\2000D75B\startup\0_ext\stem_noncriticalcmdlist_ext.rsc 	"private\2000D75B\startup\0\noncriticalcmdlist_ext.rsc"
-data=\epoc32\data\Z\private\2000D75B\hw\stem_wserv_hw.rsc 	"private\2000D75B\startup\0\wserv.rsc"
-//data=\epoc32\data\Z\private\2000D75B\hw\stem_noncriticalcmdlist_hw.rsc 	"private\2000D75B\startup\0\noncriticalcmdlist_hw.rsc"
-data=\epoc32\data\Z\private\2000D75B\hw\stem_usbwatcher_hw.rsc 	"private\2000D75B\startup\0\usbwatcher.rsc"
-data=\epoc32\data\Z\private\2000D75B\fail\stem_failcmdlist.rsc 	"private\2000D75B\fail\failcmdlist.rsc"
-data=\epoc32\data\Z\private\2000D75B\shutdown\stem_shutdowncmdlists.rsc 	"private\2000D75B\shutdown\shutdowncmdlists.rsc"
-//data=\epoc32\data\Z\private\2000D75B\rfstatusswpcmdlist\stem_rfswpcmdlists.rsc 	"private\2000D75B\rfstatusswpcmdlist\rfswpcmdlists.rsc"
-//data=\epoc32\data\Z\private\2000D75B\swpui\stem_uiswpcmdlists.rsc 	"private\2000D75B\swpui\uiswpcmdlists.rsc"
-//data=\epoc32\data\Z\private\2000D75B\swpnoncritical\stem_noncriticalswpcmdlists.rsc 	"private\2000D75B\swpnoncritical\noncriticalswpcmdlists.rsc"
+data=\epoc32\data\Z\private\2000D75B\startup\0\preuiservicescmdlist.rsc 	"private\2000D75B\startup\0\preuiservicescmdlist.rsc"
+data=\epoc32\data\Z\private\2000D75B\startup\0\uiservicescmdlist.rsc 	"private\2000D75B\startup\0\uiservicescmdlist.rsc"
+data=\epoc32\data\Z\private\2000D75B\startup\0\criticalappscmdlist.rsc 	"private\2000D75B\startup\0\criticalappscmdlist.rsc"
+data=\epoc32\data\Z\private\2000D75B\startup\0\selftestokcmdlist.rsc 	"private\2000D75B\startup\0\selftestokcmdlist.rsc"
+data=\epoc32\data\Z\private\2000D75B\startup\0\alarm_charging.rsc 	"private\2000D75B\startup\0\alarm_charging.rsc"
+data=\epoc32\data\Z\private\2000D75B\startup\0\securitycheckcmdlist.rsc 	"private\2000D75B\startup\0\securitycheckcmdlist.rsc"
+data=\epoc32\data\Z\private\2000D75B\startup\0\noncriticalcmdlist.rsc 	"private\2000D75B\startup\0\noncriticalcmdlist.rsc"
+data=\epoc32\data\Z\private\2000D75B\startup\0\emergencycallsonlycmdlist.rsc 	"private\2000D75B\startup\0\emergencycallsonlycmdlist.rsc"
+data=\epoc32\data\Z\private\2000D75B\startup\0_ext\uiservicescmdlist_ext.rsc 	"private\2000D75B\startup\0\uiservicescmdlist_ext.rsc"
+data=\epoc32\data\Z\private\2000D75B\startup\0_ext\noncriticalcmdlist_ext.rsc 	"private\2000D75B\startup\0\noncriticalcmdlist_ext.rsc"
+data=\epoc32\data\Z\private\2000D75B\hw\wserv_hw.rsc 	"private\2000D75B\startup\0\wserv.rsc"
+data=\epoc32\data\Z\private\2000D75B\hw\noncriticalcmdlist_hw.rsc 	"private\2000D75B\startup\0\noncriticalcmdlist_hw.rsc"
+data=\epoc32\data\Z\private\2000D75B\hw\usbwatcher_hw.rsc 	"private\2000D75B\startup\0\usbwatcher.rsc"
+data=\epoc32\data\Z\private\2000D75B\fail\failcmdlist.rsc 	"private\2000D75B\fail\failcmdlist.rsc"
+data=\epoc32\data\Z\private\2000D75B\shutdown\shutdowncmdlists.rsc 	"private\2000D75B\shutdown\shutdowncmdlists.rsc"
+data=\epoc32\data\Z\private\2000D75B\rfstatusswpcmdlist\rfswpcmdlists.rsc 	"private\2000D75B\rfstatusswpcmdlist\rfswpcmdlists.rsc"
+data=\epoc32\data\Z\private\2000D75B\swpui\uiswpcmdlists.rsc 	"private\2000D75B\swpui\uiswpcmdlists.rsc"
+data=\epoc32\data\Z\private\2000D75B\swpnoncritical\noncriticalswpcmdlists.rsc 	"private\2000D75B\swpnoncritical\noncriticalswpcmdlists.rsc"
 file=\epoc32\release\ARMV5\urel\saaemergencycallrfadaptation.dll 	"sys\bin\emergencycallrfadaptation.dll"
 file=\epoc32\release\ARMV5\urel\saastateadaptation.dll 	"sys\bin\stateadaptation.dll"
 file=\epoc32\release\ARMV5\urel\saasimadaptation.dll 	"sys\bin\simadaptation.dll"
 file=\epoc32\release\ARMV5\urel\saamiscadaptation.dll 	"sys\bin\miscadaptation.dll"
 file=\epoc32\release\ARMV5\urel\saartcadaptation.dll 	"sys\bin\rtcadaptation.dll"
-file=\epoc32\release\ARMV5\UDEB\starterclient.dll 	"sys\bin\starterclient.dll"
-file=\epoc32\release\ARMV5\UDEB\startupadaptationadapter.dll 	"sys\bin\startupadaptationadapter.dll"
-file=\epoc32\release\ARMV5\UDEB\ssmclayersup.dll 	"sys\bin\ssmclayersup.dll"
-file=\epoc32\release\ARMV5\UDEB\rfstatusswppolicy.dll 	"sys\bin\rfstatusswppolicy.dll"
-file=\epoc32\release\ARMV5\UDEB\ssm.state.policy.0001.dll 	"sys\bin\ssm.state.policy.0001.dll"
+file=\epoc32\release\ARMV5\urel\starterclient.dll 	"sys\bin\starterclient.dll"
+file=\epoc32\release\ARMV5\urel\startupadaptationadapter.dll 	"sys\bin\startupadaptationadapter.dll"
+file=\epoc32\release\ARMV5\urel\ssmclayersup.dll 	"sys\bin\ssmclayersup.dll"
+file=\epoc32\release\ARMV5\urel\rfstatusswppolicy.dll 	"sys\bin\rfstatusswppolicy.dll"
+file=\epoc32\release\ARMV5\urel\ssm.state.policy.0001.dll 	"sys\bin\ssm.state.policy.0001.dll"
 data=\epoc32\data\Z\private\2000d75b\normal\gsanormalcmdlist.rsc 	"private\2000d75b\normal\gsanormalcmdlist.rsc"
-file=\epoc32\release\ARMV5\UDEB\customcmds.dll 	"sys\bin\customcmds.dll"
-file=\epoc32\release\ARMV5\UDEB\ssm.swp.policy.simstatus.dll 	"sys\bin\ssm.swp.policy.simstatus.dll"
+file=\epoc32\release\ARMV5\urel\customcmds.dll 	"sys\bin\customcmds.dll"
+file=\epoc32\release\ARMV5\urel\ssm.swp.policy.simstatus.dll 	"sys\bin\ssm.swp.policy.simstatus.dll"
 data=\epoc32\data\Z\private\10202be9\2001d2aa.txt 	"private\10202be9\2001d2aa.txt"
-file=\epoc32\release\ARMV5\UDEB\ssmactivitycmd.dll 	"sys\bin\ssmactivitycmd.dll"
-file=\epoc32\release\ARMV5\UDEB\ssmsystemcmds.dll 	"sys\bin\ssmsystemcmds.dll"
+file=\epoc32\release\ARMV5\urel\ssmactivitycmd.dll 	"sys\bin\ssmactivitycmd.dll"
+file=\epoc32\release\ARMV5\urel\ssmsystemcmds.dll 	"sys\bin\ssmsystemcmds.dll"
 file=\epoc32\release\ARMV5\urel\ssmdiskreserver.exe 	"sys\bin\ssmdiskreserver.exe"
 file=\epoc32\release\ARMV5\urel\ssmmapperutility.dll 	"sys\bin\ssmmapperutility.dll"
-file=\epoc32\release\ARMV5\UDEB\ssmpolicybase.dll 	"sys\bin\ssmpolicybase.dll"
-file=\epoc32\release\ARMV5\UDEB\ssmstatepolicybase.dll 	"sys\bin\ssmstatepolicybase.dll"
-file=\epoc32\release\ARMV5\UDEB\ssmswppolicybase.dll 	"sys\bin\ssmswppolicybase.dll"
-file=\epoc32\release\ARMV5\UDEB\stem_ssm.state.policy.0000.dll 	"sys\bin\ssm.state.policy.0000.dll"
+file=\epoc32\release\ARMV5\urel\ssmpolicybase.dll 	"sys\bin\ssmpolicybase.dll"
+file=\epoc32\release\ARMV5\urel\ssmstatepolicybase.dll 	"sys\bin\ssmstatepolicybase.dll"
+file=\epoc32\release\ARMV5\urel\ssmswppolicybase.dll 	"sys\bin\ssmswppolicybase.dll"
+file=\epoc32\release\ARMV5\urel\ssm.state.policy.0000.dll 	"sys\bin\ssm.state.policy.0000.dll"
 file=\epoc32\release\ARMV5\urel\ssm.state.policy.0002.dll 	"sys\bin\ssm.state.policy.0002.dll"
 file=\epoc32\release\ARMV5\urel\ssm.state.policy.0003.dll 	"sys\bin\ssm.state.policy.0003.dll"
-file=\epoc32\release\ARMV5\UDEB\ssmuiswppolicy.dll 	"sys\bin\ssmuiswppolicy.dll"
-file=\epoc32\release\ARMV5\UDEB\ssmnoncriticalswppolicy.dll 	"sys\bin\ssmnoncriticalswppolicy.dll"
-file=\epoc32\release\ARMV5\UDEB\ssmpowersup.dll 	"sys\bin\ssmpowersup.dll"
-file=\epoc32\release\ARMV5\UDEB\ssmlocaleobserversup.dll 	"sys\bin\ssmlocaleobserversup.dll"
+file=\epoc32\release\ARMV5\urel\ssmuiswppolicy.dll 	"sys\bin\ssmuiswppolicy.dll"
+file=\epoc32\release\ARMV5\urel\ssmnoncriticalswppolicy.dll 	"sys\bin\ssmnoncriticalswppolicy.dll"
+file=\epoc32\release\ARMV5\urel\ssmpowersup.dll 	"sys\bin\ssmpowersup.dll"
+file=\epoc32\release\ARMV5\urel\ssmlocaleobserversup.dll 	"sys\bin\ssmlocaleobserversup.dll"
 data=\epoc32\data\Z\private\2000d766\backup_registration.xml 	"private\2000d766\backup_registration.xml"
 __ECOM_PLUGIN(\epoc32\release\ARMV5\urel,Sys\Bin,\epoc32\data\Z,Resource\Plugins, ssyreferenceplugin.dll , ssyreferenceplugin.dll ) 
 data=\epoc32\data\Z\Private\1020507E\reference\SsyReferenceConfig.xml 	"private\1020507E\reference\SsyReferenceConfig.xml"