# HG changeset patch # User Tom Pritchard # Date 1287487050 -3600 # Node ID dccd79965400d7c8b13fb5e87344320cc9db9acb # Parent cfa28163141e360a62a88797fa0af0eea7ccfa72 Tidying up the startup config, no function changes diff -r cfa28163141e -r dccd79965400 startup/ssmcmdlists.mmp --- a/startup/ssmcmdlists.mmp Tue Oct 19 10:39:36 2010 +0100 +++ b/startup/ssmcmdlists.mmp Tue Oct 19 12:17:30 2010 +0100 @@ -34,33 +34,12 @@ TARGETPATH /private/2000d75b/startup/0 // Private directory of sysstatemgr.exe END -START RESOURCE stem_selftestokcmdlist.rss // Selftest Ok startup state -TARGETPATH /private/2000d75b/startup/0 // Private directory of sysstatemgr.exe -END - -START RESOURCE stem_alarm_charging.rss // Command lists for alarm, charging and related startup states -TARGETPATH /private/2000d75b/startup/0 // Private directory of sysstatemgr.exe -END - -START RESOURCE stem_securitycheckcmdlist.rss // Security Check startup state -TARGETPATH /private/2000d75b/startup/0 // Private directory of sysstatemgr.exe -END - START RESOURCE stem_noncriticalcmdlist.rss // Non-critical startup state for minimal bootup TARGETPATH /private/2000d75b/startup/0 // Private directory of sysstatemgr.exe END -START RESOURCE stem_emergencycallsonlycmdlist.rss // Emergency Calls Only startup state -TARGETPATH /private/2000d75b/startup/0 // Private directory of sysstatemgr.exe -END -START RESOURCE stem_noncriticalcmdlist_ext.rss // Non-critical startup state for extended bootup -TARGETPATH /private/2000d75b/startup/0_ext // Private directory of sysstatemgr.exe -END -START RESOURCE stem_uiservicescmdlist_ext.rss // Starting UI-Services startup state for extended bootup -TARGETPATH /private/2000d75b/startup/0_ext // Private directory of sysstatemgr.exe -END // Command lists specific to HW @@ -68,19 +47,6 @@ TARGETPATH /private/2000d75b/hw // Private directory of sysstatemgr.exe END -START RESOURCE stem_usbwatcher_hw.rss // USB Watcher command list -TARGETPATH /private/2000d75b/hw // Private directory of sysstatemgr.exe -END - -START RESOURCE stem_noncriticalcmdlist_hw.rss // Non-critical startup state (HW-specific additions) -TARGETPATH /private/2000d75b/hw // Private directory of sysstatemgr.exe -END - -// Command lists for fail state - -START RESOURCE stem_failcmdlist.rss // Command list for fail state -TARGETPATH /private/2000d75b/fail // Private directory of sysstatemgr.exe -END // Command lists for shutdown states @@ -88,19 +54,6 @@ TARGETPATH /private/2000d75b/shutdown // Private directory of sysstatemgr.exe END -// Command lists for SWPs - -START RESOURCE stem_rfswpcmdlists.rss // RF status SWP -TARGETPATH /private/2000d75b/rfstatusswpcmdlist // Private directory of sysstatemgr.exe -END - -START RESOURCE stem_uiswpcmdlists.rss // UI phase SWP -TARGETPATH /private/2000d75b/swpui // Private directory of sysstatemgr.exe -END - -START RESOURCE stem_noncriticalswpcmdlists.rss // noncritical phase SWP -TARGETPATH /private/2000d75b/swpnoncritical // Private directory of sysstatemgr.exe -END OS_LAYER_SYSTEMINCLUDE diff -r cfa28163141e -r dccd79965400 startup/stem_criticalappscmdlist.rss --- a/startup/stem_criticalappscmdlist.rss Tue Oct 19 10:39:36 2010 +0100 +++ b/startup/stem_criticalappscmdlist.rss Tue Oct 19 12:17:30 2010 +0100 @@ -68,13 +68,7 @@ r_cmd_sastate, // This needs to be the first command in state, prio 0xFFF2 r_cmd_publishstate, // prio 0xFFF1 r_cmd_psstate, // prio 0xFFF0 - // prio 0xFFE7 - //TomP r_cmd_selftest, - //TomP r_cmd_cfserver, - //TomP r_cmd_sysap, - //TomP r_cmd_calsrv, - //TomP r_cmd_profmon, - r_cmd_menu, // TomP - moved from the Security command list + r_cmd_menu, // TomP - moved from the Security command list as this is now the only thing that we really do in this state. // prio 0xFFE6 r_cmd_multiwaitforever }; @@ -98,32 +92,6 @@ } // --------------------------------------------------------------------------- -// r_cmd_calsrv -// --------------------------------------------------------------------------- -// -/* -RESOURCE SSM_START_PROCESS_INFO r_cmd_calsrv - { - priority = 0xFFE7; - name = "calensvr.exe"; - execution_behaviour = ESsmFireAndForget; - monitor_info = r_mon_100_restarts_reset; - } - -// --------------------------------------------------------------------------- -// r_cmd_cfserver -// --------------------------------------------------------------------------- -// -RESOURCE SSM_START_PROCESS_INFO r_cmd_cfserver - { - priority = 0xFFE7; - name = "Z:\\sys\\bin\\cfserver.exe"; - execution_behaviour = ESsmDeferredWaitForSignal; - monitor_info = r_mon_100_restarts_reset; - } -*/ - -// --------------------------------------------------------------------------- // r_cmd_multiwaitforever // --------------------------------------------------------------------------- // @@ -132,18 +100,6 @@ priority = 0xFFE6; } -// --------------------------------------------------------------------------- -// r_cmd_profmon -// --------------------------------------------------------------------------- -// -/* -RESOURCE SSM_START_PROCESS_INFO r_cmd_profmon - { - priority = 0xFFE7; - name = "Z:\\sys\\bin\\profilesettingsmonitor.exe"; - execution_behaviour = ESsmDeferredWaitForSignal; - } -*/ // --------------------------------------------------------------------------- // r_cmd_psstate @@ -184,11 +140,6 @@ dll_data = r_dlldata_sastate; } -// --------------------------------------------------------------------------- -// r_cmd_selftest -// --------------------------------------------------------------------------- -// -/* RESOURCE SSM_START_CUSTOM_COMMAND r_cmd_selftest { priority = 0xFFE7; @@ -212,9 +163,9 @@ severity = ECmdCriticalSeverity; retries = 2; background = 1; // To background - monitor_info = r_mon_reset; +//TomP - monitor_info = r_mon_reset; } -*/ + // =========================================================================== // DLL data items in alphabetical order // =========================================================================== @@ -232,4 +183,4 @@ // monitoring.rss contains resource definitions, so it may not be included // before entry point. -#include "stem_monitoring.rss" +//#include "stem_monitoring.rss" diff -r cfa28163141e -r dccd79965400 startup/stem_noncriticalcmdlist.rss --- a/startup/stem_noncriticalcmdlist.rss Tue Oct 19 10:39:36 2010 +0100 +++ b/startup/stem_noncriticalcmdlist.rss Tue Oct 19 12:17:30 2010 +0100 @@ -71,17 +71,6 @@ r_cmd_sastate, // This needs to be the first command in state, prio 0xFFF2 r_cmd_publishstate, // prio 0xFFF1 r_cmd_psstate, // prio 0xFFF0 - // prio 0xFFE7 - //TomP r_cmd_simcheck, - //TomP r_cmd_clearstartupreason, - //TomP r_cmd_createswp_uiphase, - //TomP r_cmd_createswp_rfstatus, - //TomP r_cmd_waitforofflinequery, - //TomP r_cmd_setswp_uistart, // After offline query has been made // prio 0xFFD7 - //TomP r_cmd_bsengine, // prio 0xFFD3 - // prio 0xFFC7 - //TomP r_cmd_setswp_rfon, - //TomP r_cmd_setswp_rfoff, r_cmd_startupready // Last command, prio 0x0000 }; } @@ -90,11 +79,7 @@ // Command items in alphabetical order // =========================================================================== // -// --------------------------------------------------------------------------- -// r_cmd_bsengine -// --------------------------------------------------------------------------- -// -/* + RESOURCE SSM_START_PROCESS_INFO r_cmd_bsengine { priority = 0xFFD3; @@ -126,7 +111,7 @@ key = SWP_UID_SSM_UI_PHASE; filename = "ssmuiswppolicy.dll"; } -*/ + // --------------------------------------------------------------------------- // r_cmd_psstate // --------------------------------------------------------------------------- @@ -166,11 +151,6 @@ dll_data = r_dlldata_sastate; } -// --------------------------------------------------------------------------- -// r_cmd_setswp_rfoff -// --------------------------------------------------------------------------- -// -/* RESOURCE SSM_REQUEST_SYSTEM_WIDE_PROPERTY r_cmd_setswp_rfoff { priority = 0xFFC7; @@ -218,7 +198,7 @@ unload_on_finish = ENeverUnload; conditional_information = r_cond_ps_simusable; } -*/ + // --------------------------------------------------------------------------- // r_cmd_startupready // --------------------------------------------------------------------------- @@ -234,11 +214,6 @@ // --------------------------------------------------------------------------- -// --------------------------------------------------------------------------- -// r_cmd_waitforofflinequery -// --------------------------------------------------------------------------- -// -/* RESOURCE SSM_START_CUSTOM_COMMAND r_cmd_waitforofflinequery { priority = 0xFFE7; @@ -264,7 +239,7 @@ retries = 2; execution_behaviour = ESsmWaitForSignal; } -*/ + // =========================================================================== // DLL data items in alphabetical order // =========================================================================== @@ -488,4 +463,4 @@ // monitoring.rss contains resource definitions, so it may not be included // before entry point. -#include "stem_monitoring.rss" +//#include "stem_monitoring.rss" diff -r cfa28163141e -r dccd79965400 startup/stem_preuiservicescmdlist.rss --- a/startup/stem_preuiservicescmdlist.rss Tue Oct 19 10:39:36 2010 +0100 +++ b/startup/stem_preuiservicescmdlist.rss Tue Oct 19 12:17:30 2010 +0100 @@ -68,9 +68,7 @@ // prio 0xFE01 r_cmd_sysagt, r_cmd_initpskeys, - //TomP r_cmd_checkuserdrive, r_cmd_deltempfiles, - //TomP r_cmd_reservedisk, r_cmd_sysmon, r_cmd_ssmutilsrv, r_cmd_multiwaitforever // prio 0xFE00 @@ -82,22 +80,7 @@ // =========================================================================== // -// --------------------------------------------------------------------------- -// r_cmd_checkuserdrive -// --------------------------------------------------------------------------- -// -/* -RESOURCE SSM_START_CUSTOM_COMMAND r_cmd_checkuserdrive - { - priority = 0xFE01; - execution_behaviour = ESsmDeferredWaitForSignal; - severity = ECmdCriticalSeverity; - dllname = "customcmds.dll"; - ordinal = 13; // CheckUserDrive - unload_on_finish = ENeverUnload; - retries = 2; - } -*/ + // --------------------------------------------------------------------------- // r_cmd_deltempfiles // --------------------------------------------------------------------------- @@ -147,11 +130,6 @@ retries = 2; } -// --------------------------------------------------------------------------- -// r_cmd_reservedisk -// --------------------------------------------------------------------------- -// -/* RESOURCE SSM_START_PROCESS_INFO r_cmd_reservedisk { priority = 0xFE01; @@ -160,7 +138,7 @@ severity = ECmdCriticalSeverity; retries = 2; } -*/ + // --------------------------------------------------------------------------- // r_cmd_ssmutilsrv // --------------------------------------------------------------------------- diff -r cfa28163141e -r dccd79965400 startup/stem_uiservicescmdlist.rss --- a/startup/stem_uiservicescmdlist.rss Tue Oct 19 10:39:36 2010 +0100 +++ b/startup/stem_uiservicescmdlist.rss Tue Oct 19 12:17:30 2010 +0100 @@ -71,32 +71,17 @@ // prio 0xFFE7 r_cmd_startupmode, r_cmd_loadpowersup, - // prio 0xFFD7 - //TomP r_cmd_rfsfirstboot, - //TomP r_cmd_rfsdeep, - //TomP r_cmd_rfsnormal, - // prio 0xFFC7 - //TomP r_cmd_initclkeys, - //TomP r_cmd_initramdrive, // prio 0xFFA7 r_cmd_splash, - // prio 0xFF97 - //TomP r_cmd_rtc, - // prio 0xFF96 - rtc (tzsrv, cntsrv, mediator & hwrmsrv have been moved to extended startup list but use the same multiplewait command) + // prio 0xFF96 - r_cmd_multiwaitforever1, - // prio 0xFF87 - //TomP r_cmd_accsrv, - //TomP r_cmd_selectlanguage, // Select UI language to use - // prio 0xFF86 - accsrv, seleclanguage (dbrecovery has been moved to extended startup list but uses the same multiplewait command) + // prio 0xFF86 r_cmd_multiwaitforever2, // prio 0xFF85 - //TomP r_cmd_loadlocalesup, // Observes changes in locale data // prio 0xFF79 r_cmd_aknstart, // UI Framework // prio 0xFF77 r_cmd_apparc_init // Init application framework - // prio 0xFF75 - //TomP r_cmd_rfspostui // Restore factory settings - after UI framework is up }; } @@ -106,20 +91,6 @@ // // --------------------------------------------------------------------------- -// r_cmd_accsrv -// --------------------------------------------------------------------------- -// -/* -RESOURCE SSM_START_PROCESS_INFO r_cmd_accsrv - { - priority = 0xFF87; - name = "Z:\\sys\\bin\\accserver.exe"; - severity = ECmdCriticalSeverity; - execution_behaviour = ESsmWaitForSignal; - monitor_info = r_mon_3_restarts_reset; - } -*/ -// --------------------------------------------------------------------------- // r_cmd_aknstart // --------------------------------------------------------------------------- // @@ -142,50 +113,8 @@ severity = ECmdCriticalSeverity; } -// --------------------------------------------------------------------------- -// r_cmd_initclkeys -// --------------------------------------------------------------------------- -// -/* -RESOURCE SSM_START_CUSTOM_COMMAND r_cmd_initclkeys - { - priority = 0xFFC7; - severity = ECmdCriticalSeverity; - execution_behaviour = ESsmDeferredWaitForSignal; - dllname = "ssmsystemcmds.dll"; - ordinal = 3; // InitCriticalLevels - unload_on_finish = ENeverUnload; - retries = 2; - } // --------------------------------------------------------------------------- -// r_cmd_initramdrive -// --------------------------------------------------------------------------- -// -RESOURCE SSM_START_CUSTOM_COMMAND r_cmd_initramdrive - { - priority = 0xFFC7; - severity = ECmdCriticalSeverity; - execution_behaviour = ESsmDeferredWaitForSignal; - dllname = "customcmds.dll"; - ordinal = 14; // InitRamDrive - unload_on_finish = ENeverUnload; - retries = 2; - } -*/ -// --------------------------------------------------------------------------- -// r_cmd_loadlocalesup -// --------------------------------------------------------------------------- -// -/* -RESOURCE SSM_START_SSM_UTILITY_PLUGIN r_cmd_loadlocalesup - { - priority = 0xFF85; - filename = "ssmlocaleobserversup.dll"; - ordinal = 1; - } -*/ -// --------------------------------------------------------------------------- // r_cmd_loadpowersup // --------------------------------------------------------------------------- // @@ -252,11 +181,6 @@ conditional_information = r_cond_cenrep_rfs_deep; } -// --------------------------------------------------------------------------- -// r_cmd_rfsfirstboot -// --------------------------------------------------------------------------- -// -/* RESOURCE SSM_START_CUSTOM_COMMAND r_cmd_rfsfirstboot { priority = 0xFFD7; @@ -305,7 +229,7 @@ execution_behaviour = ESsmDeferredWaitForSignal; retries = 2; } -*/ + // --------------------------------------------------------------------------- // r_cmd_sastate // --------------------------------------------------------------------------- @@ -321,11 +245,6 @@ dll_data = r_dlldata_sastate; } -// --------------------------------------------------------------------------- -// r_cmd_selectlanguage -// --------------------------------------------------------------------------- -// -/* RESOURCE SSM_START_CUSTOM_COMMAND r_cmd_selectlanguage { priority = 0xFF87; @@ -334,7 +253,7 @@ ordinal = 1; // SelectLanguage retries = 2; } -*/ + // --------------------------------------------------------------------------- // r_cmd_splash // --------------------------------------------------------------------------- @@ -415,4 +334,4 @@ // monitoring.rss contains resource definitions, so it may not be included // before entry point. -#include "stem_monitoring.rss" +//#include "stem_monitoring.rss" diff -r cfa28163141e -r dccd79965400 syborg_stem/rom_content.csv --- a/syborg_stem/rom_content.csv Tue Oct 19 10:39:36 2010 +0100 +++ b/syborg_stem/rom_content.csv Tue Oct 19 12:17:30 2010 +0100 @@ -813,7 +813,7 @@ private\2000B187\cenrep\102818E8.xml,/epoc32/data/z/private/2000b187/cenrep/102818e8.xml,core/mw/psln.iby,mw/classicui,,, private\2000B4D8\backup_registration.xml,/epoc32/data/z/private/2000b4d8/backup_registration.xml,core/mw/WidgetBackupRestore.iby,mw/web,,, private\2000D75B\fail\failcmdlist.rsc,/epoc32/data/z/private/2000d75b/fail/failcmdlist.rsc,core/os/ssmcmdlists.iby,os/devicesrv,out,TomP,Stripped down startup -private\2000D75B\startup\0\noncriticalcmdlist_hw.rsc,/epoc32/data/z/private/2000d75b/hw/noncriticalcmdlist_hw.rsc,core/os/ssmcmdlists.iby,os/devicesrv,stem,WR,Startup script +private\2000D75B\startup\0\noncriticalcmdlist_hw.rsc,/epoc32/data/z/private/2000d75b/hw/noncriticalcmdlist_hw.rsc,core/os/ssmcmdlists.iby,os/devicesrv,out,TomP,Stripped down startup private\2000D75B\startup\0\usbwatcher.rsc,/epoc32/data/z/private/2000d75b/hw/usbwatcher_hw.rsc,core/os/ssmcmdlists.iby,os/devicesrv,out,TomP,Stripped down startup private\2000D75B\startup\0\wserv.rsc,/epoc32/data/z/private/2000d75b/hw/wserv_hw.rsc,core/os/ssmcmdlists.iby,os/devicesrv,stem,WR,Startup script private\2000d75b\normal\gsanormalcmdlist.rsc,/epoc32/data/z/private/2000d75b/normal/gsanormalcmdlist.rsc,core/os/ssmcompatibility.iby,os/devicesrv,,,