# HG changeset patch # User Dremov Kirill (Nokia-D-MSW/Tampere) # Date 1268649937 -7200 # Node ID 6bb05bdcbe09079b0097c07b4d1607b9a4765841 # Parent 1a73e8f1b64d7bc8115aa0232bd05c926e4314b4 Revision: 201009 Kit: 201010 diff -r 1a73e8f1b64d -r 6bb05bdcbe09 accessoryservices/pluggeddisplay/pluggeddisplayengine/inc/tvoutconfigforhdmi.h --- a/accessoryservices/pluggeddisplay/pluggeddisplayengine/inc/tvoutconfigforhdmi.h Fri Mar 12 15:50:01 2010 +0200 +++ b/accessoryservices/pluggeddisplay/pluggeddisplayengine/inc/tvoutconfigforhdmi.h Mon Mar 15 12:45:37 2010 +0200 @@ -23,7 +23,7 @@ #include #include "multifinitestatemachine.h" #include "myasynconeshottimercallback.h" - +#include "pdengine.h" // CONSTANTS diff -r 1a73e8f1b64d -r 6bb05bdcbe09 accessoryservices/pluggeddisplay/pluggeddisplayengine/src/pdengine.cpp --- a/accessoryservices/pluggeddisplay/pluggeddisplayengine/src/pdengine.cpp Fri Mar 12 15:50:01 2010 +0200 +++ b/accessoryservices/pluggeddisplay/pluggeddisplayengine/src/pdengine.cpp Mon Mar 15 12:45:37 2010 +0200 @@ -129,7 +129,7 @@ if( iFSMPtr[EPDEFSMIdCompositeCableStatus]->CurrentStateID() != ECompositeCableStateIdle ) { // Forcefully transit CompositeCable FSM to Idle state - ((CCompositeCableStatusFSM*)iFSMPtr[EPDEFSMIdCompositeCableStatus])->Transit(ECompositeCableStateIdle); + ((CCompositeCableStatusFSM*)iFSMPtr[EPDEFSMIdCompositeCableStatus])->Input(EPDEIfAccessoryConnection, EPDEIfAccessoryConnectionEventCableDisconnected); } iFSMPtr[ aFSMId ]->Input( aInterfaceId, aEvent ); } diff -r 1a73e8f1b64d -r 6bb05bdcbe09 accessoryservices/pluggeddisplay/pluggeddisplayengine/src/tvoutconfigforhdmi.cpp --- a/accessoryservices/pluggeddisplay/pluggeddisplayengine/src/tvoutconfigforhdmi.cpp Fri Mar 12 15:50:01 2010 +0200 +++ b/accessoryservices/pluggeddisplay/pluggeddisplayengine/src/tvoutconfigforhdmi.cpp Mon Mar 15 12:45:37 2010 +0200 @@ -34,6 +34,11 @@ // CONSTANTS // MACROS +#define SEND_VIA_PDENGINE(event) \ + ((CHDMICableStatusFSM*)&iFSM)->GetPDEngine()->Input( \ + EPDEFSMIdHDMICableStatus, \ + EPDEIfTVOutConfig, \ + event ) // LOCAL CONSTANTS AND MACROS @@ -435,9 +440,8 @@ } else if ( iTvConfig->HdmiCableConnected() ) { - iFSM.Input( - EPDEIfTVOutConfig, - EIfTVOutConfigEventCableConnected ); + // Send connected event to FSM via PDEngine where the multiple connection(analog and hdmi) logic is handled. + SEND_VIA_PDENGINE(EIfTVOutConfigEventCableConnected); } else { diff -r 1a73e8f1b64d -r 6bb05bdcbe09 devicesrv_plat/tv_out_config_api/inc/tvoutconfig.h --- a/devicesrv_plat/tv_out_config_api/inc/tvoutconfig.h Fri Mar 12 15:50:01 2010 +0200 +++ b/devicesrv_plat/tv_out_config_api/inc/tvoutconfig.h Mon Mar 15 12:45:37 2010 +0200 @@ -124,18 +124,18 @@ //-- Standby Figure --------------------------------------------------- - /** Returns maximum size of TStandByFigure.iTable in bytes. + /** Returns maximum size of TStandByFigure.iTable in bytes. Deprecated since TB10.2. @param aMaxFigureSize Max size of standByFigure in bytes @return KErrNotSupported if not supported. */ virtual TInt StandByFigureMaxSizeInBytes(TUint& aMaxFigureSize) = 0; - /** Sets user defined figure to show on tv. + /** Sets user defined figure to show on tv. Deprecated since TB10.2. @pre SetConfig() is called without errors. @param aStandByFigure TStandByFigure object. @return KErrNone if all success */ virtual TInt StandByFigure(const TStandByFigure& aStandByFigure) = 0; - /** Gets user defined figure to show on tv. + /** Gets user defined figure to show on tv. Deprecated since TB10.2. @see CTvOutConfig::StandByFigureMaxSizeInBytes for getting size of TStandByFigure.iTable. @pre StandByFigure() is called without errors. @param aStandByFigure TStandByFigure object. diff -r 1a73e8f1b64d -r 6bb05bdcbe09 devicesrv_plat/tv_out_config_api/inc/tvoutconfigdef.h --- a/devicesrv_plat/tv_out_config_api/inc/tvoutconfigdef.h Fri Mar 12 15:50:01 2010 +0200 +++ b/devicesrv_plat/tv_out_config_api/inc/tvoutconfigdef.h Mon Mar 15 12:45:37 2010 +0200 @@ -431,11 +431,11 @@ ///ETrue if iLeftTopCorner&iRightBottomCorner are used instead of iHorizontalOverScan&iVerticalOverScan TBool iCornerPointsUsed; - /** Overscan in pixels. Set Left Top corner point. Zero when Tv supports overscan (0=underscan enabled) + /** Overscan in pixels. Set Left Top corner point. Zero when Tv supports underscan (0=underscan enabled) This should be "point" to active image area. Cannot point out of active image area. Cannot across with iRightBottomCorner. And this allows overscan and position tuning. */ TPoint iLeftTopCorner; - /** Overscan in pixels. Set Right Bottom corner point (offset from left top corner). + /** Overscan in pixels. Set Right Bottom corner point (offset from Tv's left top corner). @see iLeftTopCorner Driver returns KErrExtensionNotSupported if driver does not support this settings. If driver supports centralizing only, then this has to be same as iLeftTopCorner. */ @@ -571,17 +571,18 @@ ///Vertical sync polarity, EFalse=Negative, ETrue=Positive. With CEA mode 1 this is EFalse. TBool iVerticalSyncPolarity; /** Wanted pixel repeat, can be used if mode supports. Otherwise horisontal resolution can be increased also. + Value minus one. 0 -> sent once. 9 -> pixel sent 10 times. 0 when repeat is disabled. With CEA mode 1 this is 0. */ TUint8 iPixelRepeat; /** ETrue if Tv supports underscan, and it is enabled (to be always enabled when supported/possible), EFalse otherwise */ TBool iUnderscanEnabled; - /** Overscan in pixels. Set Left Top corner point. Zero when Tv supports overscan (0=underscan enabled) + /** Overscan in pixels. Set Left Top corner point. Zero when Tv supports underscan (0=underscan enabled) This should be "point" to active image area. Cannot point out of active image area. Cannot across with iRightBottomCorner. And this allows overscan and position tuning. */ TPoint iLeftTopCorner; - /** Overscan in pixels. Set Right Bottom corner point (offset from left top corner). + /** Overscan in pixels. Set Right Bottom corner point (offset from Tv's left top corner). @see iLeftTopCorner. Has not affect if iCentralizingOnly==ETrue. */ TPoint iRightBottomCorner; @@ -614,7 +615,13 @@ }; /** -Standby Figure Format +Standby Figure Format. Fully deprecated since TB10.2. +Note for TB9.2 and TB10.1: +- iLeftTopColumn & iLeftTopRow are deprecated and those can be ignored. +- the icon of iColumns x iRows is scaled by (iScaleNumeratorWidth/iScaleDenominatorWidth) and (iScaleNumeratorHeight/iScaleDenominatorHeight) +- the resulting icon is centered to the layer's extent which contained the protected surface +- the scaled and centered icon is clipped against layer extent and screen size. +- pixels inside the layer's extent not covered by the scaled and centered icon are filled with iBackGroundColor. */ class TStandByFigure { @@ -659,9 +666,9 @@ TUint16 iScaleNumeratorHeight; ///Height scaler denominator TUint16 iScaleDenominatorHeight; - ///Start column + ///Start column. Deprecated! TUint16 iLeftTopColumn; - ///Start row + ///Start row. Deprecated! TUint16 iLeftTopRow; ///Back ground color. Input RGB565 RRRR RGGG GGGB BBBB. TUint16 iBackGroundColor; diff -r 1a73e8f1b64d -r 6bb05bdcbe09 sensorservices/orientationssy/src/SsyChannel.cpp --- a/sensorservices/orientationssy/src/SsyChannel.cpp Fri Mar 12 15:50:01 2010 +0200 +++ b/sensorservices/orientationssy/src/SsyChannel.cpp Mon Mar 15 12:45:37 2010 +0200 @@ -808,7 +808,9 @@ { aChannelPropertyList.Append( channelProperties[index] ); } - + + channelProperties.Close(); + SSY_TRACE_OUT(); } diff -r 1a73e8f1b64d -r 6bb05bdcbe09 sysstatemgmt/ssmcmdlists/data/noncriticalcmdlist.rss --- a/sysstatemgmt/ssmcmdlists/data/noncriticalcmdlist.rss Fri Mar 12 15:50:01 2010 +0200 +++ b/sysstatemgmt/ssmcmdlists/data/noncriticalcmdlist.rss Mon Mar 15 12:45:37 2010 +0200 @@ -12,7 +12,7 @@ * Contributors: * * Description: -* Command list for the Non-critical startup state. +* Command list for the Non-critical startup state in minimal startup mode. * */ @@ -73,102 +73,16 @@ r_cmd_psstate, // prio 0xFFF0 // prio 0xFFE7 r_cmd_simcheck, - r_cmd_clearstartupreason, + r_cmd_clearstartupreason, r_cmd_createswp_uiphase, r_cmd_createswp_rfstatus, r_cmd_waitforofflinequery, - // prio 0xFFD7 - r_cmd_setswp_uistart, // After offline query has been made - r_cmd_adtupdater, // Location, date & time queries - r_cmd_bsengine, - r_cmd_waitforphone, + r_cmd_setswp_uistart, // After offline query has been made // prio 0xFFD7 + r_cmd_bsengine, // prio 0xFFD3 // prio 0xFFC7 r_cmd_setswp_rfon, r_cmd_setswp_rfoff, - r_cmd_waitidle, - // prio 0xFFB7 -#ifdef __JAVA - r_cmd_javacaptain, -#endif // __JAVA - r_cmd_watcher, - r_cmd_dmutilsrv, - // prio 0xFFA7 - r_cmd_contentharvester, - r_cmd_mdswatchdog, - r_cmd_predefinedcontacts, - r_cmd_xnthemesrv, - r_cmd_ncnlist, - r_cmd_satsrv, - r_cmd_cbssrv, - r_cmd_schedsrv, - r_cmd_aosrv, - r_cmd_ippushman, - r_cmd_remotefe, - r_cmd_supllistener, - r_cmd_autolock, - r_cmd_pocstarter, - r_cmd_gsserver, - r_cmd_vcommandmgr, - r_cmd_dmallreasons, - r_cmd_locod, -#ifdef FF_LBT_ENGINE - r_cmd_lbtsrv, -#endif // FF_LBT_ENGINE - r_cmd_emailsrvrmon, - r_cmd_taskswitcher, - // prio 0xFFA6 - r_cmd_dmfirstbootreason, - r_cmd_fota, - // prio 0x7F87 - r_cmd_waitcleanbootinfo, - // prio 0x7F97 - r_cmd_dcmo, - r_cmd_amastart, - // prio 0x7F96 - r_cmd_multiple_wait, - // prio 0x7EFF - r_cmd_activitymonitor1, - // prio 0x7EFE - r_cmd_logs, - // prio 0x7EFD - r_cmd_activitymonitor2, - // prio 0x7EFC - r_cmd_pbk2, - // prio 0x7EFB - r_cmd_activitymonitor3, - // prio 0x7EFA - r_cmd_mce, - // prio 0x7EF9 - r_cmd_activitymonitor4, - // prio 0x7EF8 - r_cmd_clockapp, - // prio 0x7EF7 - r_cmd_activitymonitor5, - // prio 0x7EF6 - r_cmd_videocenter, - // prio 0x7EF5 - r_cmd_activitymonitor6, - // prio 0x7EF4 - r_cmd_iaupdatebg, - // prio 0x7EF3 - r_cmd_activitymonitor7, - // prio 0x7EF2 - r_cmd_screensaver, - // prio 0x7EEF - r_cmd_activitymonitor8, - // prio 0x7EEE - r_cmd_autosync, - // prio 0x7EED - r_cmd_activitymonitor9, - // prio 0x7EEC - r_cmd_mylocationsengine, -#ifdef FF_ATT_ADDRESS_BK - //prio 0x7EEA - r_cmd_activitymonitor10, - //prio 0x7EE9 - r_cmd_aab, -#endif - r_cmd_startupready // Last command, prio 0x0000 + r_cmd_startupready // Last command, prio 0x0000 }; } @@ -176,273 +90,19 @@ // Command items in alphabetical order // =========================================================================== // - -// ----------------------------------------------------------------------------- -// r_cmd_aab -// ----------------------------------------------------------------------------- -// -#ifdef FF_ATT_ADDRESS_BK -RESOURCE SSM_START_APP_INFO r_cmd_aab - { - priority = 0x7EE9; - name = "z:\\sys\\bin\\AABPhonebookapp.exe"; - retries = 2; - background = 1; // To background - monitor_info = r_mon_3_restarts_ignore; - } -#endif - -// --------------------------------------------------------------------------- -// r_cmd_activitymonitor1 -// --------------------------------------------------------------------------- -// -RESOURCE SSM_START_CUSTOM_COMMAND r_cmd_activitymonitor1 - { - priority = 0x7EFF; - severity = ECmdCriticalSeverity; - execution_behaviour = ESsmWaitForSignal; - dllname = "ssmactivitycmd.dll"; - ordinal = 1; // SsmActivityCmdNewL - retries = 2; - dll_data = r_dlldata_activitymonitor_timeout; - } - -// --------------------------------------------------------------------------- -// r_cmd_activitymonitor2 -// --------------------------------------------------------------------------- -// -RESOURCE SSM_START_CUSTOM_COMMAND r_cmd_activitymonitor2 - { - priority = 0x7EFD; - severity = ECmdCriticalSeverity; - execution_behaviour = ESsmWaitForSignal; - dllname = "ssmactivitycmd.dll"; - ordinal = 1; // SsmActivityCmdNewL - retries = 2; - dll_data = r_dlldata_activitymonitor_timeout; - } - -// --------------------------------------------------------------------------- -// r_cmd_activitymonitor3 -// --------------------------------------------------------------------------- -// -RESOURCE SSM_START_CUSTOM_COMMAND r_cmd_activitymonitor3 - { - priority = 0x7EFB; - severity = ECmdCriticalSeverity; - execution_behaviour = ESsmWaitForSignal; - dllname = "ssmactivitycmd.dll"; - ordinal = 1; // SsmActivityCmdNewL - retries = 2; - dll_data = r_dlldata_activitymonitor_timeout; - } - -// --------------------------------------------------------------------------- -// r_cmd_activitymonitor4 -// --------------------------------------------------------------------------- -// -RESOURCE SSM_START_CUSTOM_COMMAND r_cmd_activitymonitor4 - { - priority = 0x7EF9; - severity = ECmdCriticalSeverity; - execution_behaviour = ESsmWaitForSignal; - dllname = "ssmactivitycmd.dll"; - ordinal = 1; // SsmActivityCmdNewL - retries = 2; - dll_data = r_dlldata_activitymonitor_timeout; - } - -// --------------------------------------------------------------------------- -// r_cmd_activitymonitor5 -// --------------------------------------------------------------------------- -// -RESOURCE SSM_START_CUSTOM_COMMAND r_cmd_activitymonitor5 - { - priority = 0x7EF7; - severity = ECmdCriticalSeverity; - execution_behaviour = ESsmWaitForSignal; - dllname = "ssmactivitycmd.dll"; - ordinal = 1; // SsmActivityCmdNewL - retries = 2; - dll_data = r_dlldata_activitymonitor_timeout; - } - -// --------------------------------------------------------------------------- -// r_cmd_activitymonitor6 -// --------------------------------------------------------------------------- -// -RESOURCE SSM_START_CUSTOM_COMMAND r_cmd_activitymonitor6 - { - priority = 0x7EF5; - severity = ECmdCriticalSeverity; - execution_behaviour = ESsmWaitForSignal; - dllname = "ssmactivitycmd.dll"; - ordinal = 1; // SsmActivityCmdNewL - retries = 2; - dll_data = r_dlldata_activitymonitor_timeout; - } - -// --------------------------------------------------------------------------- -// r_cmd_activitymonitor7 -// --------------------------------------------------------------------------- -// -RESOURCE SSM_START_CUSTOM_COMMAND r_cmd_activitymonitor7 - { - priority = 0x7EF3; - severity = ECmdCriticalSeverity; - execution_behaviour = ESsmWaitForSignal; - dllname = "ssmactivitycmd.dll"; - ordinal = 1; // SsmActivityCmdNewL - retries = 2; - dll_data = r_dlldata_activitymonitor_timeout; - } - -// --------------------------------------------------------------------------- -// r_cmd_activitymonitor8 -// --------------------------------------------------------------------------- -// -RESOURCE SSM_START_CUSTOM_COMMAND r_cmd_activitymonitor8 - { - priority = 0x7EEF; - severity = ECmdCriticalSeverity; - execution_behaviour = ESsmWaitForSignal; - dllname = "ssmactivitycmd.dll"; - ordinal = 1; // SsmActivityCmdNewL - retries = 2; - dll_data = r_dlldata_activitymonitor_timeout; - } - -// --------------------------------------------------------------------------- -// r_cmd_activitymonitor9 -// --------------------------------------------------------------------------- -// -RESOURCE SSM_START_CUSTOM_COMMAND r_cmd_activitymonitor9 - { - priority = 0x7EED; - severity = ECmdCriticalSeverity; - execution_behaviour = ESsmWaitForSignal; - dllname = "ssmactivitycmd.dll"; - ordinal = 1; // SsmActivityCmdNewL - retries = 2; - dll_data = r_dlldata_activitymonitor_timeout; - } - -// --------------------------------------------------------------------------- -// r_cmd_activitymonitor10 -// --------------------------------------------------------------------------- -// -#ifdef FF_ATT_ADDRESS_BK -RESOURCE SSM_START_CUSTOM_COMMAND r_cmd_activitymonitor10 - { - priority = 0x7EEA; - severity = ECmdCriticalSeverity; - execution_behaviour = ESsmWaitForSignal; - dllname = "ssmactivitycmd.dll"; - ordinal = 1; // SsmActivityCmdNewL - retries = 2; - dll_data = r_dlldata_activitymonitor_timeout; - } -#endif - -// --------------------------------------------------------------------------- -// r_cmd_adtupdater -// --------------------------------------------------------------------------- -// -RESOURCE SSM_START_PROCESS_INFO r_cmd_adtupdater - { - priority = 0xFFD7; - name = "adtupdater.exe"; - execution_behaviour = ESsmFireAndForget; - } - -// --------------------------------------------------------------------------- -// r_cmd_amastart -// --------------------------------------------------------------------------- -// -RESOURCE SSM_START_AMA_STARTER r_cmd_amastart - { - priority = 0x7F97; - conditional_information = r_cond_ps_normalboot; - } - -// --------------------------------------------------------------------------- -// r_cmd_autosync -// --------------------------------------------------------------------------- -// -RESOURCE SSM_START_PROCESS_INFO r_cmd_autosync - { - priority = 0x7EEE; - execution_behaviour = ESsmFireAndForget; - retries = 3; - name = "cctautosync.exe"; - } - -// --------------------------------------------------------------------------- -// r_cmd_aosrv -// --------------------------------------------------------------------------- -// -RESOURCE SSM_START_PROCESS_INFO r_cmd_aosrv - { - priority = 0xFFA7; - name = "z:\\sys\\bin\\alwaysonlinestarter.exe"; - execution_behaviour = ESsmFireAndForget; - conditional_information = r_cond_feat_alwaysonline; - monitor_info = r_mon_3_restarts_ignore; - } - // --------------------------------------------------------------------------- // r_cmd_bsengine // --------------------------------------------------------------------------- // RESOURCE SSM_START_PROCESS_INFO r_cmd_bsengine { - priority = 0xFFD7; + priority = 0xFFD3; name = "z:\\sys\\bin\\bsengine.exe"; execution_behaviour = ESsmWaitForSignal; timeout = 10000; } // --------------------------------------------------------------------------- -// r_cmd_autolock -// --------------------------------------------------------------------------- -// -RESOURCE SSM_START_APP_INFO r_cmd_autolock - { - priority = 0xFFA7; - name = "z:\\sys\\bin\\lockapp.exe"; - execution_behaviour = ESsmWaitForSignal; - timeout = 10000; - background = 1; // To background - monitor_info = r_mon_3_restarts_ignore; - } - -// --------------------------------------------------------------------------- -// r_cmd_cbssrv -// --------------------------------------------------------------------------- -// -RESOURCE SSM_START_PROCESS_INFO r_cmd_cbssrv - { - priority = 0xFFA7; - name = "z:\\sys\\bin\\cbsserver.exe"; - execution_behaviour = ESsmFireAndForget; - conditional_information = r_cond_feat_cellbroadcast; - monitor_info = r_mon_3_restarts_ignore; - } - -// --------------------------------------------------------------------------- -// r_cmd_clockapp -// --------------------------------------------------------------------------- -// -RESOURCE SSM_START_APP_INFO r_cmd_clockapp - { - priority = 0x7EF8; - name = "z:\\sys\\bin\\clockapp.exe"; - execution_behaviour = ESsmWaitForSignal; - timeout = 10000; - background = 1; // To background - } - -// --------------------------------------------------------------------------- // r_cmd_createswp_rfstatus // --------------------------------------------------------------------------- // @@ -467,253 +127,6 @@ } // --------------------------------------------------------------------------- -// r_cmd_contentharvester -// --------------------------------------------------------------------------- -// -RESOURCE SSM_START_PROCESS_INFO r_cmd_contentharvester - { - priority = 0xFFA7; - name = "z:\\sys\\bin\\contentharvester.exe"; - execution_behaviour = ESsmFireAndForget; //behavior changed from ESsmWaitForSignal as part of SCB CR MSOI-7XARNT - monitor_info = r_mon_3_restarts_ignore; - } - -// --------------------------------------------------------------------------- -// r_cmd_dcmo -// --------------------------------------------------------------------------- -// -RESOURCE SSM_START_CUSTOM_COMMAND r_cmd_dcmo - { - priority = 0x7F97; - execution_behaviour = ESsmFireAndForget; - dllname = "dcmostartupcustcmd.dll"; - ordinal = 1; // DCMO command - conditional_information = r_cond_feat_runtime_dcmo; - } - -// --------------------------------------------------------------------------- -// r_cmd_dmallreasons -// --------------------------------------------------------------------------- -// -RESOURCE SSM_START_CUSTOM_COMMAND r_cmd_dmallreasons - { - priority = 0xFFA7; - execution_behaviour = ESsmWaitForSignal; - dllname = "fotacustcmds.dll"; - ordinal = 1; // AllReasons command - retries = 2; - conditional_information = r_cond_syncml_dm_or_pnp_mobile_services; - } - -// --------------------------------------------------------------------------- -// r_cmd_dmfirstbootreason -// --------------------------------------------------------------------------- -// -RESOURCE SSM_START_CUSTOM_COMMAND r_cmd_dmfirstbootreason - { - priority = 0xFFA6; - execution_behaviour = ESsmWaitForSignal; - dllname = "fotacustcmds.dll"; - ordinal = 3; // FirstBoot command - retries = 2; - conditional_information = r_cond_pnp_mobile_services_and_firstboot; - } - -// --------------------------------------------------------------------------- -// r_cmd_dmutilsrv -// --------------------------------------------------------------------------- -// -RESOURCE SSM_START_PROCESS_INFO r_cmd_dmutilsrv - { - priority = 0xFFB7; - name = "z:\\sys\\bin\\dmutilserver.exe"; - execution_behaviour = ESsmWaitForSignal; - timeout = 10000; - monitor_info = r_mon_3_restarts_reset; - conditional_information = r_cond_feat_sappolicymgmt; - } - -// --------------------------------------------------------------------------- -// r_cmd_fota -// --------------------------------------------------------------------------- -// -RESOURCE SSM_START_CUSTOM_COMMAND r_cmd_fota - { - priority = 0xFFA6; - execution_behaviour = ESsmWaitForSignal; - dllname = "fotacustcmds.dll"; - ordinal = 2; // Fota command - retries = 2; - conditional_information = r_cond_syncml_dm_fota_and_fotareset; - } - -// --------------------------------------------------------------------------- -// r_cmd_emailsrvrmon -// --------------------------------------------------------------------------- -// -RESOURCE SSM_START_APP_INFO r_cmd_emailsrvrmon - { - priority = 0xFFA7; - name = "emailservermonitor.exe"; - execution_behaviour = ESsmFireAndForget; - conditional_information = r_cond_feat_emailfw; - } - -// --------------------------------------------------------------------------- -// r_cmd_gsserver -// --------------------------------------------------------------------------- -// -RESOURCE SSM_START_PROCESS_INFO r_cmd_gsserver - { - priority = 0xFFA7; - name = "z:\\sys\\bin\\gsserver.exe"; - execution_behaviour = ESsmWaitForSignal; - timeout = 10000; - monitor_info = r_mon_3_restarts_ignore; - conditional_information = r_cond_feat_tvout; - } - -// --------------------------------------------------------------------------- -// r_cmd_mdswatchdog -// --------------------------------------------------------------------------- -// -RESOURCE SSM_START_PROCESS_INFO r_cmd_mdswatchdog - { - priority = 0xFFA7; - name = "mdswatchdog.exe"; - execution_behaviour = ESsmFireAndForget; - } - -// --------------------------------------------------------------------------- -// r_cmd_iaupdatebg -// --------------------------------------------------------------------------- -// -RESOURCE SSM_START_PROCESS_INFO r_cmd_iaupdatebg - { - priority = 0x7EF4; - name = "iaupdatebg.exe"; - execution_behaviour = ESsmWaitForSignal; - timeout = 10000; - conditional_information = r_cond_feat_iadv2; - } - -// --------------------------------------------------------------------------- -// r_cmd_loadsup_ippushman -// --------------------------------------------------------------------------- -// -RESOURCE SSM_START_PROCESS_INFO r_cmd_ippushman - { - priority = 0xFFA7; - name = "z:\\sys\\bin\\ippushman.exe"; - execution_behaviour = ESsmFireAndForget; // -- does not call Rendezvous() -- - conditional_information = r_cond_feat_ippush; - } - -// --------------------------------------------------------------------------- -// r_cmd_lbtsrv -// --------------------------------------------------------------------------- -// -#ifdef FF_LBT_ENGINE -RESOURCE SSM_START_PROCESS_INFO r_cmd_lbtsrv - { - priority = 0xFFA7; - name = "z:\\sys\\bin\\lbtserver.exe"; - execution_behaviour = ESsmWaitForSignal; - timeout = 10000; - } -#endif // FF_LBT_ENGINE - -// --------------------------------------------------------------------------- -// r_cmd_locod -// --------------------------------------------------------------------------- -// -RESOURCE SSM_START_PROCESS_INFO r_cmd_locod - { - priority = 0xFFA7; - name = "z:\\sys\\bin\\locod.exe"; - execution_behaviour = ESsmFireAndForget; - monitor_info = r_mon_3_restarts_ignore; - } - -// --------------------------------------------------------------------------- -// r_cmd_logs -// --------------------------------------------------------------------------- -// -RESOURCE SSM_START_APP_INFO r_cmd_logs - { - priority = 0x7EFE; - name = "z:\\sys\\bin\\logs.exe"; - execution_behaviour = ESsmWaitForSignal; - timeout = 10000; - background = 1; // To background - } - -// --------------------------------------------------------------------------- -// r_cmd_mce -// --------------------------------------------------------------------------- -// -RESOURCE SSM_START_APP_INFO r_cmd_mce - { - priority = 0x7EFA; - name = "mce.exe"; - execution_behaviour = ESsmWaitForSignal; - timeout = 10000; - background = 1; // To background - } - -// --------------------------------------------------------------------------- -// r_cmd_ncnlist -// --------------------------------------------------------------------------- -// -RESOURCE SSM_START_PROCESS_INFO r_cmd_ncnlist - { - priority = 0xFFA7; - name = "z:\\sys\\bin\\ncnlist.exe"; - execution_behaviour = ESsmWaitForSignal; - timeout = 10000; - monitor_info = r_mon_3_restarts_ignore; - } - -// --------------------------------------------------------------------------- -// r_cmd_pbk2 -// --------------------------------------------------------------------------- -// -RESOURCE SSM_START_APP_INFO r_cmd_pbk2 - { - priority = 0x7EFC; - name = "z:\\sys\\bin\\phonebook2.exe"; - execution_behaviour = ESsmWaitForSignal; - timeout = 10000; - background = 1; // To background - } - -// --------------------------------------------------------------------------- -// r_cmd_pocstarter -// --------------------------------------------------------------------------- -// -RESOURCE SSM_START_PROCESS_INFO r_cmd_pocstarter - { - priority = 0xFFA7; - name = "z:\\sys\\bin\\pocstarter.exe"; - execution_behaviour = ESsmWaitForSignal; - timeout = 10000; - conditional_information = r_cond_feat_omapoc; - } - -// --------------------------------------------------------------------------- -// r_cmd_predefinedcontacts -// --------------------------------------------------------------------------- -// -RESOURCE SSM_START_PROCESS_INFO r_cmd_predefinedcontacts - { - priority = 0xFFA7; - name = "z:\\sys\\bin\\predefinedcontacts.exe"; - execution_behaviour = ESsmWaitForSignal; - retries = 2; - conditional_information = r_cond_firstboot_or_fotareset_or_deeprfsreset; - } - -// --------------------------------------------------------------------------- // r_cmd_psstate // --------------------------------------------------------------------------- // @@ -738,19 +151,6 @@ } // --------------------------------------------------------------------------- -// r_cmd_remotefe -// --------------------------------------------------------------------------- -// -RESOURCE SSM_START_PROCESS_INFO r_cmd_remotefe - { - priority = 0xFFA7; - name = "z:\\sys\\bin\\rsfwbootmounter.exe"; - execution_behaviour = ESsmWaitForSignal; - timeout = 10000; - conditional_information = r_cond_feat_remotestoragefw; - } - -// --------------------------------------------------------------------------- // r_cmd_sastate // --------------------------------------------------------------------------- // @@ -766,46 +166,6 @@ } // --------------------------------------------------------------------------- -// r_cmd_satsrv -// --------------------------------------------------------------------------- -// -RESOURCE SSM_START_PROCESS_INFO r_cmd_satsrv - { - priority = 0xFFA7; - name = "z:\\sys\\bin\\satserver.exe"; - execution_behaviour = ESsmWaitForSignal; - timeout = 10000; - monitor_info = r_mon_3_restarts_ignore; - conditional_information = r_cond_feat_simcard; - } - -// --------------------------------------------------------------------------- -// r_cmd_schedsrv -// --------------------------------------------------------------------------- -// -RESOURCE SSM_START_PROCESS_INFO r_cmd_schedsrv - { - priority = 0xFFA7; - name = "z:\\sys\\bin\\schexe.exe"; - execution_behaviour = ESsmWaitForSignal; - timeout = 10000; - } - -// --------------------------------------------------------------------------- -// r_cmd_screensaver -// --------------------------------------------------------------------------- -// -RESOURCE SSM_START_APP_INFO r_cmd_screensaver - { - priority = 0x7EF2; - name = "z:\\sys\\bin\\screensaver.exe"; - background = 1; // To background - execution_behaviour = ESsmWaitForSignal; - timeout = 10000; - monitor_info = r_mon_3_restarts_ignore; - } - -// --------------------------------------------------------------------------- // r_cmd_setswp_rfoff // --------------------------------------------------------------------------- // @@ -871,88 +231,7 @@ } // --------------------------------------------------------------------------- -// r_cmd_supllistener -// --------------------------------------------------------------------------- -// -RESOURCE SSM_START_PROCESS_INFO r_cmd_supllistener - { - priority = 0xFFA7; - name = "z:\\sys\\bin\\epos_omasupllistener.exe"; - execution_behaviour = ESsmWaitForSignal; - timeout = 10000; - monitor_info = r_mon_3_restarts_ignore; - conditional_information = r_cond_feat_omasuplplugins; - } - -// --------------------------------------------------------------------------- -// r_cmd_systemams -// --------------------------------------------------------------------------- -// -#ifdef __JAVA -RESOURCE SSM_START_PROCESS_INFO r_cmd_javacaptain - { - priority = 0xFFB7; - name = "javacaptain.exe"; - execution_behaviour = ESsmWaitForSignal; - timeout = 10000; - } -#endif // __JAVA -// --------------------------------------------------------------------------- -// r_cmd_vcommandmgr -// --------------------------------------------------------------------------- -// -RESOURCE SSM_START_APP_INFO r_cmd_vcommandmgr - { - priority = 0xFFA7; - name = "z:\\sys\\bin\\vcommandmanager.exe"; - background = 1; // To background - execution_behaviour = ESsmFireAndForget; // -- does not call Rendezvous() -- - conditional_information = r_cond_sind_and_no_sdnd; - } - -// --------------------------------------------------------------------------- -// r_cmd_videocenter -// --------------------------------------------------------------------------- -// -RESOURCE SSM_START_PROCESS_INFO r_cmd_videocenter - { - priority = 0x7EF6; - name = "cseschedulerserver.exe"; - execution_behaviour = ESsmWaitForSignal; - timeout = 10000; - } - -// --------------------------------------------------------------------------- -// r_cmd_waitcleanbootinfo -// --------------------------------------------------------------------------- -// -RESOURCE SSM_START_CUSTOM_COMMAND r_cmd_waitcleanbootinfo - { - priority = 0x7F87; - severity = ECmdCriticalSeverity; - dllname = "ssmsystemcmds.dll"; - ordinal = 6; // WaitPsKeyRange - dll_data = r_dlldata_waitcleanbootinfo; - retries = 2; - execution_behaviour = ESsmWaitForSignal; - } - -// --------------------------------------------------------------------------- -// r_cmd_waitforidle -// --------------------------------------------------------------------------- -// -RESOURCE SSM_START_CUSTOM_COMMAND r_cmd_waitidle - { - priority = 0xFFC7; - severity = ECmdCriticalSeverity; - dllname = "ssmsystemcmds.dll"; - ordinal = 5; // WaitPsKeyExact - dll_data = r_dlldata_waitidle; - unload_on_finish = ENeverUnload; - retries = 2; - execution_behaviour = ESsmWaitForSignal; - } - + // --------------------------------------------------------------------------- // r_cmd_waitforofflinequery // --------------------------------------------------------------------------- @@ -970,46 +249,6 @@ } // --------------------------------------------------------------------------- -// r_cmd_waitforphone -// --------------------------------------------------------------------------- -// -RESOURCE SSM_START_CUSTOM_COMMAND r_cmd_waitforphone - { - priority = 0xFFD7; - severity = ECmdCriticalSeverity; - dllname = "ssmsystemcmds.dll"; - ordinal = 5; // WaitPsKeyExact - dll_data = r_dlldata_waitphone; - unload_on_finish = ENeverUnload; - retries = 2; - execution_behaviour = ESsmWaitForSignal; - } - -// --------------------------------------------------------------------------- -// r_cmd_watcher -// --------------------------------------------------------------------------- -// -RESOURCE SSM_START_PROCESS_INFO r_cmd_watcher - { - priority = 0xFFB7; - name = "z:\\sys\\bin\\watcher.exe"; - monitor_info = r_mon_3_restarts_ignore; - } - -// --------------------------------------------------------------------------- -// r_cmd_xnthemesrv -// --------------------------------------------------------------------------- -// -RESOURCE SSM_START_PROCESS_INFO r_cmd_xnthemesrv - { - priority = 0xFFA7; - name = "z:\\sys\\bin\\xnthemeserver.exe"; - execution_behaviour = ESsmWaitForSignal; - timeout = 10000; - monitor_info = r_mon_3_restarts_ignore; - } - -// --------------------------------------------------------------------------- // r_cmd_clearstartupreason // --------------------------------------------------------------------------- // @@ -1023,7 +262,6 @@ execution_behaviour = ESsmWaitForSignal; } - // =========================================================================== // DLL data items in alphabetical order // =========================================================================== @@ -1061,17 +299,6 @@ } // --------------------------------------------------------------------------- -// r_dlldata_waitidle -// --------------------------------------------------------------------------- -// -RESOURCE CMD_PARAM_WAIT_PS r_dlldata_waitidle - { - category = 0x101F8766; // KPSUidStartup - key = 0x00000043; // KPSIdlePhase1Ok - target = 101; // EIdlePhase1Ok - } - -// --------------------------------------------------------------------------- // r_dlldata_waitofflinequery // --------------------------------------------------------------------------- // @@ -1083,50 +310,6 @@ target2 = 102; // EBootIntoOfflineMode } -// --------------------------------------------------------------------------- -// r_dlldata_waitphone -// --------------------------------------------------------------------------- -// -RESOURCE CMD_PARAM_WAIT_PS r_dlldata_waitphone - { - category = 0x101F8766; // KPSUidStartup - key = 0x00000044; // KPSPhonePhase1Ok - target = 101; // EPhonePhase1Ok - } - - -// --------------------------------------------------------------------------- -// r_cmd_mylocationsengine -// --------------------------------------------------------------------------- -// -RESOURCE SSM_START_PROCESS_INFO r_cmd_mylocationsengine - { - priority = 0x7EEC; - name = "z:\\sys\\bin\\mylocationsengine.exe"; - execution_behaviour = ESsmFireAndForget; - } - -// --------------------------------------------------------------------------- -// r_cmd_item_taskswitcher -// --------------------------------------------------------------------------- -RESOURCE SSM_START_APP_INFO r_cmd_taskswitcher - { - priority = 0xFFA7; - name = "z:\\sys\\bin\\taskswitcher.exe"; - execution_behaviour = ESsmDeferredWaitForSignal; - background = 1; // To background - monitor_info = r_mon_3_restarts_ignore; - } - -// --------------------------------------------------------------------------- -// r_cmd_multiple_wait -// --------------------------------------------------------------------------- -// -RESOURCE SSM_MULTIPLE_WAIT r_cmd_multiple_wait - { - priority = 0x7F96; - } - // =========================================================================== // Conditional blocks in alphabetical order // =========================================================================== @@ -1144,69 +327,6 @@ } // --------------------------------------------------------------------------- -// r_cond_feat_alwaysonline -// --------------------------------------------------------------------------- -// -RESOURCE SSM_CND_FEATURE_VALUE r_cond_feat_alwaysonline - { - feature_id = KFeatureIdAlwaysOnLine; - } - -// --------------------------------------------------------------------------- -// r_cond_feat_cellbroadcast -// --------------------------------------------------------------------------- -// -RESOURCE SSM_CND_FEATURE_VALUE r_cond_feat_cellbroadcast - { - feature_id = KFeatureIdCellBroadcast; - } - -// --------------------------------------------------------------------------- -// r_cond_feat_emailfw -// --------------------------------------------------------------------------- -// -RESOURCE SSM_CND_FEATURE_VALUE r_cond_feat_emailfw - { - feature_id = KFeatureIdFfEmailFramework; - } - -// --------------------------------------------------------------------------- -// r_cond_feat_iadv2 -// --------------------------------------------------------------------------- -// -RESOURCE SSM_CND_FEATURE_VALUE r_cond_feat_iadv2 - { - feature_id = KFeatureIdFfIaupdatePhase2; - } - -// --------------------------------------------------------------------------- -// r_cond_feat_ippush -// --------------------------------------------------------------------------- -// -RESOURCE SSM_CND_FEATURE_VALUE r_cond_feat_ippush - { - feature_id = KFeatureIdIpPush; - } - -// --------------------------------------------------------------------------- -// r_cond_feat_omapoc -// --------------------------------------------------------------------------- -// -RESOURCE SSM_CND_FEATURE_VALUE r_cond_feat_omapoc - { - feature_id = KFeatureIdOmaPoc; - } - -// --------------------------------------------------------------------------- -// r_cond_feat_omasuplplugins -// --------------------------------------------------------------------------- -// -RESOURCE SSM_CND_FEATURE_VALUE r_cond_feat_omasuplplugins - { - feature_id = KFeatureIdOmaSuplPlugins; - } - -// --------------------------------------------------------------------------- // r_cond_feat_pnp_mobile_services // --------------------------------------------------------------------------- // @@ -1216,33 +336,6 @@ } // --------------------------------------------------------------------------- -// r_cond_feat_remotestoragefw -// --------------------------------------------------------------------------- -// -RESOURCE SSM_CND_FEATURE_VALUE r_cond_feat_remotestoragefw - { - feature_id = KFeatureIdRemoteStorageFw; - } - -// --------------------------------------------------------------------------- -// r_cond_feat_runtime_dcmo; -// --------------------------------------------------------------------------- -// -RESOURCE SSM_CND_FEATURE_VALUE r_cond_feat_runtime_dcmo - { - feature_id = KFeatureIdFfRuntimeDeviceCapabilityConfiguration; - } - -// --------------------------------------------------------------------------- -// r_cond_feat_sappolicymgmt -// --------------------------------------------------------------------------- -// -RESOURCE SSM_CND_FEATURE_VALUE r_cond_feat_sappolicymgmt - { - feature_id = KFeatureIdSapPolicyManagement; - } - -// --------------------------------------------------------------------------- // r_cond_feat_sdnd // --------------------------------------------------------------------------- // @@ -1252,15 +345,6 @@ } // --------------------------------------------------------------------------- -// r_cond_feat_simcard -// --------------------------------------------------------------------------- -// -RESOURCE SSM_CND_FEATURE_VALUE r_cond_feat_simcard - { - feature_id = KFeatureIdSimCard; - } - -// --------------------------------------------------------------------------- // r_cond_feat_sind // --------------------------------------------------------------------------- // @@ -1288,35 +372,6 @@ } // --------------------------------------------------------------------------- -// r_cond_feat_tvout -// --------------------------------------------------------------------------- -// -RESOURCE SSM_CND_FEATURE_VALUE r_cond_feat_tvout - { - feature_id = KFeatureIdTvOut; - } - -// --------------------------------------------------------------------------- -// r_cond_firstboot_or_fotareset_or_deeprfsreset -// --------------------------------------------------------------------------- -// -RESOURCE SSM_CND_LOGICAL_OR r_cond_firstboot_or_fotareset_or_deeprfsreset - { - lhs = r_cond_fotareset_or_deeprfsreset; - rhs = r_cond_ps_firstboot; - } - -// --------------------------------------------------------------------------- -// r_cond_fotareset_or_deeprfsreset -// --------------------------------------------------------------------------- -// -RESOURCE SSM_CND_LOGICAL_OR r_cond_fotareset_or_deeprfsreset - { - lhs = r_cond_ps_fotareset; - rhs = r_cond_ps_deeprfsreset; - } - -// --------------------------------------------------------------------------- // r_cond_no_sdnd // --------------------------------------------------------------------------- // @@ -1326,16 +381,6 @@ } // --------------------------------------------------------------------------- -// r_cond_pnp_mobile_services_and_firstboot -// --------------------------------------------------------------------------- -// -RESOURCE SSM_CND_LOGICAL_AND r_cond_pnp_mobile_services_and_firstboot - { - lhs = r_cond_feat_pnp_mobile_services; - rhs = r_cond_ps_firstboot; - } - -// --------------------------------------------------------------------------- // r_cond_ps_bootoffline // --------------------------------------------------------------------------- // @@ -1358,17 +403,6 @@ } // --------------------------------------------------------------------------- -// r_cond_ps_deeprfsreset -// --------------------------------------------------------------------------- -// -RESOURCE SSM_CND_PUB_SUB_VALUE r_cond_ps_deeprfsreset - { - category = 0x101F8766; // KPSUidStartup - key = 0x00000045; // KPSStartupReason - value = EDeepRFSReset; - } - -// --------------------------------------------------------------------------- // r_cond_ps_fotareset // --------------------------------------------------------------------------- // @@ -1380,17 +414,6 @@ } // --------------------------------------------------------------------------- -// r_cond_ps_normalboot -// --------------------------------------------------------------------------- -// -RESOURCE SSM_CND_PUB_SUB_VALUE r_cond_ps_normalboot - { - category = 0x101F8766; // KPSUidStartup - key = 0x00000012; // KStartupCleanBoot - value = 101; // EStartupNormalBoot - } - -// --------------------------------------------------------------------------- // r_cond_ps_simusable // --------------------------------------------------------------------------- // diff -r 1a73e8f1b64d -r 6bb05bdcbe09 sysstatemgmt/ssmcmdlists/data/noncriticalcmdlist_ext.rss --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sysstatemgmt/ssmcmdlists/data/noncriticalcmdlist_ext.rss Mon Mar 15 12:45:37 2010 +0200 @@ -0,0 +1,1218 @@ +/* +* Copyright (c) 2009-2010 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* Command list for the Non-critical startup state in extended startup mode. +* +*/ + +#include +#include +#include +#include + +#include "ssmswp.hrh" +#include "ssmsubstateext.hrh" +#include "ssmdlldatadefs.rh" + +// Identify command list type +UID2 KUidSsmCommandListResourceFile + +// --------------------------------------------------------------------------- +// r_entry_point +// This must be the first resource +// --------------------------------------------------------------------------- +// +RESOURCE SSM_COMMAND_LIST_ROOT r_entry_point + { + command_list_mapping = r_map; + } + +// --------------------------------------------------------------------------- +// r_map +// Mapping of command list ids to resource ids. +// --------------------------------------------------------------------------- +// +RESOURCE SSM_COMMAND_LIST_MAPPING r_map + { + mappings = + { + SSM_COMMANDLISTID_TO_RESOURCEID + { + command_list_id = ESsmStateNonCritical; + resource_id = r_cmds; + } + }; + } + +// =========================================================================== +// Command lists in alphabetical order +// =========================================================================== +// + +// --------------------------------------------------------------------------- +// r_cmds +// --------------------------------------------------------------------------- +// +RESOURCE SSM_COMMAND_LIST r_cmds + { + commands = + { + r_cmd_adtupdater, // Location, date & time queries ,prio 0xFFD5 + r_cmd_waitforphone, // prio 0xFFD1 + r_cmd_waitidle, // prio 0xFFC5 + // prio 0xFFB7 +#ifdef __JAVA + r_cmd_javacaptain, +#endif // __JAVA + r_cmd_watcher, + r_cmd_dmutilsrv, + // prio 0xFFA7 + r_cmd_contentharvester, + r_cmd_mdswatchdog, + r_cmd_predefinedcontacts, + r_cmd_xnthemesrv, + r_cmd_ncnlist, + r_cmd_satsrv, + r_cmd_cbssrv, + r_cmd_schedsrv, + r_cmd_aosrv, + r_cmd_ippushman, + r_cmd_remotefe, + r_cmd_supllistener, + r_cmd_autolock, + r_cmd_pocstarter, + r_cmd_gsserver, + r_cmd_vcommandmgr, + r_cmd_dmallreasons, + r_cmd_locod, +#ifdef FF_LBT_ENGINE + r_cmd_lbtsrv, +#endif // FF_LBT_ENGINE + r_cmd_emailsrvrmon, + r_cmd_taskswitcher, + // prio 0xFFA6 + r_cmd_dmfirstbootreason, + r_cmd_fota, + // prio 0x7F87 + r_cmd_waitcleanbootinfo, + // prio 0x7F97 + r_cmd_dcmo, + r_cmd_amastart, + // prio 0x7F96 + r_cmd_multiple_wait, + // prio 0x7EFF + r_cmd_activitymonitor1, + // prio 0x7EFE + r_cmd_logs, + // prio 0x7EFD + r_cmd_activitymonitor2, + // prio 0x7EFC + r_cmd_pbk2, + // prio 0x7EFB + r_cmd_activitymonitor3, + // prio 0x7EFA + r_cmd_mce, + // prio 0x7EF9 + r_cmd_activitymonitor4, + // prio 0x7EF8 + r_cmd_clockapp, + // prio 0x7EF7 + r_cmd_activitymonitor5, + // prio 0x7EF6 + r_cmd_videocenter, + // prio 0x7EF5 + r_cmd_activitymonitor6, + // prio 0x7EF4 + r_cmd_iaupdatebg, + // prio 0x7EF3 + r_cmd_activitymonitor7, + // prio 0x7EF2 + r_cmd_screensaver, + // prio 0x7EEF + r_cmd_activitymonitor8, + // prio 0x7EEE + r_cmd_autosync, + // prio 0x7EED + r_cmd_activitymonitor9, + // prio 0x7EEC + r_cmd_mylocationsengine +#ifdef FF_ATT_ADDRESS_BK + //prio 0x7EEA + ,r_cmd_activitymonitor10, + //prio 0x7EE9 + r_cmd_aab +#endif + }; + } + +// =========================================================================== +// Command items in alphabetical order +// =========================================================================== +// + +// ----------------------------------------------------------------------------- +// r_cmd_aab +// ----------------------------------------------------------------------------- +// +#ifdef FF_ATT_ADDRESS_BK +RESOURCE SSM_START_APP_INFO r_cmd_aab + { + priority = 0x7EE9; + name = "z:\\sys\\bin\\AABPhonebookapp.exe"; + retries = 2; + background = 1; // To background + monitor_info = r_mon_3_restarts_ignore; + } +#endif + +// --------------------------------------------------------------------------- +// r_cmd_activitymonitor1 +// --------------------------------------------------------------------------- +// +RESOURCE SSM_START_CUSTOM_COMMAND r_cmd_activitymonitor1 + { + priority = 0x7EFF; + severity = ECmdCriticalSeverity; + execution_behaviour = ESsmWaitForSignal; + dllname = "ssmactivitycmd.dll"; + ordinal = 1; // SsmActivityCmdNewL + retries = 2; + dll_data = r_dlldata_activitymonitor_timeout; + } + +// --------------------------------------------------------------------------- +// r_cmd_activitymonitor2 +// --------------------------------------------------------------------------- +// +RESOURCE SSM_START_CUSTOM_COMMAND r_cmd_activitymonitor2 + { + priority = 0x7EFD; + severity = ECmdCriticalSeverity; + execution_behaviour = ESsmWaitForSignal; + dllname = "ssmactivitycmd.dll"; + ordinal = 1; // SsmActivityCmdNewL + retries = 2; + dll_data = r_dlldata_activitymonitor_timeout; + } + +// --------------------------------------------------------------------------- +// r_cmd_activitymonitor3 +// --------------------------------------------------------------------------- +// +RESOURCE SSM_START_CUSTOM_COMMAND r_cmd_activitymonitor3 + { + priority = 0x7EFB; + severity = ECmdCriticalSeverity; + execution_behaviour = ESsmWaitForSignal; + dllname = "ssmactivitycmd.dll"; + ordinal = 1; // SsmActivityCmdNewL + retries = 2; + dll_data = r_dlldata_activitymonitor_timeout; + } + +// --------------------------------------------------------------------------- +// r_cmd_activitymonitor4 +// --------------------------------------------------------------------------- +// +RESOURCE SSM_START_CUSTOM_COMMAND r_cmd_activitymonitor4 + { + priority = 0x7EF9; + severity = ECmdCriticalSeverity; + execution_behaviour = ESsmWaitForSignal; + dllname = "ssmactivitycmd.dll"; + ordinal = 1; // SsmActivityCmdNewL + retries = 2; + dll_data = r_dlldata_activitymonitor_timeout; + } + +// --------------------------------------------------------------------------- +// r_cmd_activitymonitor5 +// --------------------------------------------------------------------------- +// +RESOURCE SSM_START_CUSTOM_COMMAND r_cmd_activitymonitor5 + { + priority = 0x7EF7; + severity = ECmdCriticalSeverity; + execution_behaviour = ESsmWaitForSignal; + dllname = "ssmactivitycmd.dll"; + ordinal = 1; // SsmActivityCmdNewL + retries = 2; + dll_data = r_dlldata_activitymonitor_timeout; + } + +// --------------------------------------------------------------------------- +// r_cmd_activitymonitor6 +// --------------------------------------------------------------------------- +// +RESOURCE SSM_START_CUSTOM_COMMAND r_cmd_activitymonitor6 + { + priority = 0x7EF5; + severity = ECmdCriticalSeverity; + execution_behaviour = ESsmWaitForSignal; + dllname = "ssmactivitycmd.dll"; + ordinal = 1; // SsmActivityCmdNewL + retries = 2; + dll_data = r_dlldata_activitymonitor_timeout; + } + +// --------------------------------------------------------------------------- +// r_cmd_activitymonitor7 +// --------------------------------------------------------------------------- +// +RESOURCE SSM_START_CUSTOM_COMMAND r_cmd_activitymonitor7 + { + priority = 0x7EF3; + severity = ECmdCriticalSeverity; + execution_behaviour = ESsmWaitForSignal; + dllname = "ssmactivitycmd.dll"; + ordinal = 1; // SsmActivityCmdNewL + retries = 2; + dll_data = r_dlldata_activitymonitor_timeout; + } + +// --------------------------------------------------------------------------- +// r_cmd_activitymonitor8 +// --------------------------------------------------------------------------- +// +RESOURCE SSM_START_CUSTOM_COMMAND r_cmd_activitymonitor8 + { + priority = 0x7EEF; + severity = ECmdCriticalSeverity; + execution_behaviour = ESsmWaitForSignal; + dllname = "ssmactivitycmd.dll"; + ordinal = 1; // SsmActivityCmdNewL + retries = 2; + dll_data = r_dlldata_activitymonitor_timeout; + } + +// --------------------------------------------------------------------------- +// r_cmd_activitymonitor9 +// --------------------------------------------------------------------------- +// +RESOURCE SSM_START_CUSTOM_COMMAND r_cmd_activitymonitor9 + { + priority = 0x7EED; + severity = ECmdCriticalSeverity; + execution_behaviour = ESsmWaitForSignal; + dllname = "ssmactivitycmd.dll"; + ordinal = 1; // SsmActivityCmdNewL + retries = 2; + dll_data = r_dlldata_activitymonitor_timeout; + } + +// --------------------------------------------------------------------------- +// r_cmd_activitymonitor10 +// --------------------------------------------------------------------------- +// +#ifdef FF_ATT_ADDRESS_BK +RESOURCE SSM_START_CUSTOM_COMMAND r_cmd_activitymonitor10 + { + priority = 0x7EEA; + severity = ECmdCriticalSeverity; + execution_behaviour = ESsmWaitForSignal; + dllname = "ssmactivitycmd.dll"; + ordinal = 1; // SsmActivityCmdNewL + retries = 2; + dll_data = r_dlldata_activitymonitor_timeout; + } +#endif + +// --------------------------------------------------------------------------- +// r_cmd_adtupdater +// --------------------------------------------------------------------------- +// +RESOURCE SSM_START_PROCESS_INFO r_cmd_adtupdater + { + priority = 0xFFD5; + name = "adtupdater.exe"; + execution_behaviour = ESsmFireAndForget; + } + +// --------------------------------------------------------------------------- +// r_cmd_amastart +// --------------------------------------------------------------------------- +// +RESOURCE SSM_START_AMA_STARTER r_cmd_amastart + { + priority = 0x7F97; + conditional_information = r_cond_ps_normalboot; + } + +// --------------------------------------------------------------------------- +// r_cmd_autosync +// --------------------------------------------------------------------------- +// +RESOURCE SSM_START_PROCESS_INFO r_cmd_autosync + { + priority = 0x7EEE; + execution_behaviour = ESsmFireAndForget; + retries = 3; + name = "cctautosync.exe"; + } + +// --------------------------------------------------------------------------- +// r_cmd_aosrv +// --------------------------------------------------------------------------- +// +RESOURCE SSM_START_PROCESS_INFO r_cmd_aosrv + { + priority = 0xFFA7; + name = "z:\\sys\\bin\\alwaysonlinestarter.exe"; + execution_behaviour = ESsmFireAndForget; + conditional_information = r_cond_feat_alwaysonline; + monitor_info = r_mon_3_restarts_ignore; + } + +// --------------------------------------------------------------------------- +// r_cmd_autolock +// --------------------------------------------------------------------------- +// +RESOURCE SSM_START_APP_INFO r_cmd_autolock + { + priority = 0xFFA7; + name = "z:\\sys\\bin\\lockapp.exe"; + execution_behaviour = ESsmWaitForSignal; + timeout = 10000; + background = 1; // To background + monitor_info = r_mon_3_restarts_ignore; + } + +// --------------------------------------------------------------------------- +// r_cmd_cbssrv +// --------------------------------------------------------------------------- +// +RESOURCE SSM_START_PROCESS_INFO r_cmd_cbssrv + { + priority = 0xFFA7; + name = "z:\\sys\\bin\\cbsserver.exe"; + execution_behaviour = ESsmFireAndForget; + conditional_information = r_cond_feat_cellbroadcast; + monitor_info = r_mon_3_restarts_ignore; + } + +// --------------------------------------------------------------------------- +// r_cmd_clockapp +// --------------------------------------------------------------------------- +// +RESOURCE SSM_START_APP_INFO r_cmd_clockapp + { + priority = 0x7EF8; + name = "z:\\sys\\bin\\clockapp.exe"; + execution_behaviour = ESsmWaitForSignal; + timeout = 10000; + background = 1; // To background + } + +// --------------------------------------------------------------------------- +// r_cmd_contentharvester +// --------------------------------------------------------------------------- +// +RESOURCE SSM_START_PROCESS_INFO r_cmd_contentharvester + { + priority = 0xFFA7; + name = "z:\\sys\\bin\\contentharvester.exe"; + execution_behaviour = ESsmFireAndForget; //behavior changed from ESsmWaitForSignal as part of SCB CR MSOI-7XARNT + monitor_info = r_mon_3_restarts_ignore; + } + +// --------------------------------------------------------------------------- +// r_cmd_dcmo +// --------------------------------------------------------------------------- +// +RESOURCE SSM_START_CUSTOM_COMMAND r_cmd_dcmo + { + priority = 0x7F97; + execution_behaviour = ESsmFireAndForget; + dllname = "dcmostartupcustcmd.dll"; + ordinal = 1; // DCMO command + conditional_information = r_cond_feat_runtime_dcmo; + } + +// --------------------------------------------------------------------------- +// r_cmd_dmallreasons +// --------------------------------------------------------------------------- +// +RESOURCE SSM_START_CUSTOM_COMMAND r_cmd_dmallreasons + { + priority = 0xFFA7; + execution_behaviour = ESsmWaitForSignal; + dllname = "fotacustcmds.dll"; + ordinal = 1; // AllReasons command + retries = 2; + conditional_information = r_cond_syncml_dm_or_pnp_mobile_services; + } + +// --------------------------------------------------------------------------- +// r_cmd_dmfirstbootreason +// --------------------------------------------------------------------------- +// +RESOURCE SSM_START_CUSTOM_COMMAND r_cmd_dmfirstbootreason + { + priority = 0xFFA6; + execution_behaviour = ESsmWaitForSignal; + dllname = "fotacustcmds.dll"; + ordinal = 3; // FirstBoot command + retries = 2; + conditional_information = r_cond_pnp_mobile_services_and_firstboot; + } + +// --------------------------------------------------------------------------- +// r_cmd_dmutilsrv +// --------------------------------------------------------------------------- +// +RESOURCE SSM_START_PROCESS_INFO r_cmd_dmutilsrv + { + priority = 0xFFB7; + name = "z:\\sys\\bin\\dmutilserver.exe"; + execution_behaviour = ESsmWaitForSignal; + timeout = 10000; + monitor_info = r_mon_3_restarts_reset; + conditional_information = r_cond_feat_sappolicymgmt; + } + +// --------------------------------------------------------------------------- +// r_cmd_fota +// --------------------------------------------------------------------------- +// +RESOURCE SSM_START_CUSTOM_COMMAND r_cmd_fota + { + priority = 0xFFA6; + execution_behaviour = ESsmWaitForSignal; + dllname = "fotacustcmds.dll"; + ordinal = 2; // Fota command + retries = 2; + conditional_information = r_cond_syncml_dm_fota_and_fotareset; + } + +// --------------------------------------------------------------------------- +// r_cmd_emailsrvrmon +// --------------------------------------------------------------------------- +// +RESOURCE SSM_START_APP_INFO r_cmd_emailsrvrmon + { + priority = 0xFFA7; + name = "emailservermonitor.exe"; + execution_behaviour = ESsmFireAndForget; + conditional_information = r_cond_feat_emailfw; + } + +// --------------------------------------------------------------------------- +// r_cmd_gsserver +// --------------------------------------------------------------------------- +// +RESOURCE SSM_START_PROCESS_INFO r_cmd_gsserver + { + priority = 0xFFA7; + name = "z:\\sys\\bin\\gsserver.exe"; + execution_behaviour = ESsmWaitForSignal; + timeout = 10000; + monitor_info = r_mon_3_restarts_ignore; + conditional_information = r_cond_feat_tvout; + } + +// --------------------------------------------------------------------------- +// r_cmd_mdswatchdog +// --------------------------------------------------------------------------- +// +RESOURCE SSM_START_PROCESS_INFO r_cmd_mdswatchdog + { + priority = 0xFFA7; + name = "mdswatchdog.exe"; + execution_behaviour = ESsmFireAndForget; + } + +// --------------------------------------------------------------------------- +// r_cmd_iaupdatebg +// --------------------------------------------------------------------------- +// +RESOURCE SSM_START_PROCESS_INFO r_cmd_iaupdatebg + { + priority = 0x7EF4; + name = "iaupdatebg.exe"; + execution_behaviour = ESsmWaitForSignal; + timeout = 10000; + conditional_information = r_cond_feat_iadv2; + } + +// --------------------------------------------------------------------------- +// r_cmd_loadsup_ippushman +// --------------------------------------------------------------------------- +// +RESOURCE SSM_START_PROCESS_INFO r_cmd_ippushman + { + priority = 0xFFA7; + name = "z:\\sys\\bin\\ippushman.exe"; + execution_behaviour = ESsmFireAndForget; // -- does not call Rendezvous() -- + conditional_information = r_cond_feat_ippush; + } + +// --------------------------------------------------------------------------- +// r_cmd_lbtsrv +// --------------------------------------------------------------------------- +// +#ifdef FF_LBT_ENGINE +RESOURCE SSM_START_PROCESS_INFO r_cmd_lbtsrv + { + priority = 0xFFA7; + name = "z:\\sys\\bin\\lbtserver.exe"; + execution_behaviour = ESsmWaitForSignal; + timeout = 10000; + } +#endif // FF_LBT_ENGINE + +// --------------------------------------------------------------------------- +// r_cmd_locod +// --------------------------------------------------------------------------- +// +RESOURCE SSM_START_PROCESS_INFO r_cmd_locod + { + priority = 0xFFA7; + name = "z:\\sys\\bin\\locod.exe"; + execution_behaviour = ESsmFireAndForget; + monitor_info = r_mon_3_restarts_ignore; + } + +// --------------------------------------------------------------------------- +// r_cmd_logs +// --------------------------------------------------------------------------- +// +RESOURCE SSM_START_APP_INFO r_cmd_logs + { + priority = 0x7EFE; + name = "z:\\sys\\bin\\logs.exe"; + execution_behaviour = ESsmWaitForSignal; + timeout = 10000; + background = 1; // To background + } + +// --------------------------------------------------------------------------- +// r_cmd_mce +// --------------------------------------------------------------------------- +// +RESOURCE SSM_START_APP_INFO r_cmd_mce + { + priority = 0x7EFA; + name = "mce.exe"; + execution_behaviour = ESsmWaitForSignal; + timeout = 10000; + background = 1; // To background + } + +// --------------------------------------------------------------------------- +// r_cmd_ncnlist +// --------------------------------------------------------------------------- +// +RESOURCE SSM_START_PROCESS_INFO r_cmd_ncnlist + { + priority = 0xFFA7; + name = "z:\\sys\\bin\\ncnlist.exe"; + execution_behaviour = ESsmWaitForSignal; + timeout = 10000; + monitor_info = r_mon_3_restarts_ignore; + } + +// --------------------------------------------------------------------------- +// r_cmd_pbk2 +// --------------------------------------------------------------------------- +// +RESOURCE SSM_START_APP_INFO r_cmd_pbk2 + { + priority = 0x7EFC; + name = "z:\\sys\\bin\\phonebook2.exe"; + execution_behaviour = ESsmWaitForSignal; + timeout = 10000; + background = 1; // To background + } + +// --------------------------------------------------------------------------- +// r_cmd_pocstarter +// --------------------------------------------------------------------------- +// +RESOURCE SSM_START_PROCESS_INFO r_cmd_pocstarter + { + priority = 0xFFA7; + name = "z:\\sys\\bin\\pocstarter.exe"; + execution_behaviour = ESsmWaitForSignal; + timeout = 10000; + conditional_information = r_cond_feat_omapoc; + } + +// --------------------------------------------------------------------------- +// r_cmd_predefinedcontacts +// --------------------------------------------------------------------------- +// +RESOURCE SSM_START_PROCESS_INFO r_cmd_predefinedcontacts + { + priority = 0xFFA7; + name = "z:\\sys\\bin\\predefinedcontacts.exe"; + execution_behaviour = ESsmWaitForSignal; + retries = 2; + conditional_information = r_cond_firstboot_or_fotareset_or_deeprfsreset; + } + +// --------------------------------------------------------------------------- +// r_cmd_remotefe +// --------------------------------------------------------------------------- +// +RESOURCE SSM_START_PROCESS_INFO r_cmd_remotefe + { + priority = 0xFFA7; + name = "z:\\sys\\bin\\rsfwbootmounter.exe"; + execution_behaviour = ESsmWaitForSignal; + timeout = 10000; + conditional_information = r_cond_feat_remotestoragefw; + } + +// --------------------------------------------------------------------------- +// r_cmd_satsrv +// --------------------------------------------------------------------------- +// +RESOURCE SSM_START_PROCESS_INFO r_cmd_satsrv + { + priority = 0xFFA7; + name = "z:\\sys\\bin\\satserver.exe"; + execution_behaviour = ESsmWaitForSignal; + timeout = 10000; + monitor_info = r_mon_3_restarts_ignore; + conditional_information = r_cond_feat_simcard; + } + +// --------------------------------------------------------------------------- +// r_cmd_schedsrv +// --------------------------------------------------------------------------- +// +RESOURCE SSM_START_PROCESS_INFO r_cmd_schedsrv + { + priority = 0xFFA7; + name = "z:\\sys\\bin\\schexe.exe"; + execution_behaviour = ESsmWaitForSignal; + timeout = 10000; + } + +// --------------------------------------------------------------------------- +// r_cmd_screensaver +// --------------------------------------------------------------------------- +// +RESOURCE SSM_START_APP_INFO r_cmd_screensaver + { + priority = 0x7EF2; + name = "z:\\sys\\bin\\screensaver.exe"; + background = 1; // To background + execution_behaviour = ESsmWaitForSignal; + timeout = 10000; + monitor_info = r_mon_3_restarts_ignore; + } + +// --------------------------------------------------------------------------- +// r_cmd_supllistener +// --------------------------------------------------------------------------- +// +RESOURCE SSM_START_PROCESS_INFO r_cmd_supllistener + { + priority = 0xFFA7; + name = "z:\\sys\\bin\\epos_omasupllistener.exe"; + execution_behaviour = ESsmWaitForSignal; + timeout = 10000; + monitor_info = r_mon_3_restarts_ignore; + conditional_information = r_cond_feat_omasuplplugins; + } + +// --------------------------------------------------------------------------- +// r_cmd_javacaptain +// --------------------------------------------------------------------------- +// +#ifdef __JAVA +RESOURCE SSM_START_PROCESS_INFO r_cmd_javacaptain + { + priority = 0xFFB7; + name = "javacaptain.exe"; + execution_behaviour = ESsmWaitForSignal; + timeout = 10000; + } +#endif // __JAVA +// --------------------------------------------------------------------------- +// r_cmd_vcommandmgr +// --------------------------------------------------------------------------- +// +RESOURCE SSM_START_APP_INFO r_cmd_vcommandmgr + { + priority = 0xFFA7; + name = "z:\\sys\\bin\\vcommandmanager.exe"; + background = 1; // To background + execution_behaviour = ESsmFireAndForget; // -- does not call Rendezvous() -- + conditional_information = r_cond_sind_and_no_sdnd; + } + +// --------------------------------------------------------------------------- +// r_cmd_videocenter +// --------------------------------------------------------------------------- +// +RESOURCE SSM_START_PROCESS_INFO r_cmd_videocenter + { + priority = 0x7EF6; + name = "cseschedulerserver.exe"; + execution_behaviour = ESsmWaitForSignal; + timeout = 10000; + } + +// --------------------------------------------------------------------------- +// r_cmd_waitcleanbootinfo +// --------------------------------------------------------------------------- +// +RESOURCE SSM_START_CUSTOM_COMMAND r_cmd_waitcleanbootinfo + { + priority = 0x7F87; + severity = ECmdCriticalSeverity; + dllname = "ssmsystemcmds.dll"; + ordinal = 6; // WaitPsKeyRange + dll_data = r_dlldata_waitcleanbootinfo; + retries = 2; + execution_behaviour = ESsmWaitForSignal; + } + +// --------------------------------------------------------------------------- +// r_cmd_waitforidle +// --------------------------------------------------------------------------- +// +RESOURCE SSM_START_CUSTOM_COMMAND r_cmd_waitidle + { + priority = 0xFFC5; + severity = ECmdCriticalSeverity; + dllname = "ssmsystemcmds.dll"; + ordinal = 5; // WaitPsKeyExact + dll_data = r_dlldata_waitidle; + unload_on_finish = ENeverUnload; + retries = 2; + execution_behaviour = ESsmWaitForSignal; + } + +// --------------------------------------------------------------------------- +// r_cmd_waitforphone +// --------------------------------------------------------------------------- +// +RESOURCE SSM_START_CUSTOM_COMMAND r_cmd_waitforphone + { + priority = 0xFFD1; + severity = ECmdCriticalSeverity; + dllname = "ssmsystemcmds.dll"; + ordinal = 5; // WaitPsKeyExact + dll_data = r_dlldata_waitphone; + unload_on_finish = ENeverUnload; + retries = 2; + execution_behaviour = ESsmWaitForSignal; + } + +// --------------------------------------------------------------------------- +// r_cmd_watcher +// --------------------------------------------------------------------------- +// +RESOURCE SSM_START_PROCESS_INFO r_cmd_watcher + { + priority = 0xFFB7; + name = "z:\\sys\\bin\\watcher.exe"; + monitor_info = r_mon_3_restarts_ignore; + } + +// --------------------------------------------------------------------------- +// r_cmd_xnthemesrv +// --------------------------------------------------------------------------- +// +RESOURCE SSM_START_PROCESS_INFO r_cmd_xnthemesrv + { + priority = 0xFFA7; + name = "z:\\sys\\bin\\xnthemeserver.exe"; + execution_behaviour = ESsmWaitForSignal; + timeout = 10000; + monitor_info = r_mon_3_restarts_ignore; + } + +// =========================================================================== +// DLL data items in alphabetical order +// =========================================================================== +// + +// --------------------------------------------------------------------------- +// r_dlldata_activitymonitor_timeout +// --------------------------------------------------------------------------- +// +RESOURCE CMD_PARAM_TIMEOUT r_dlldata_activitymonitor_timeout + { + timeout = 2; + } + +// --------------------------------------------------------------------------- +// r_dlldata_waitcleanbootinfo +// --------------------------------------------------------------------------- +// +RESOURCE CMD_PARAM_WAIT_PS_2 r_dlldata_waitcleanbootinfo + { + category = 0x101F8766; // KPSUidStartup + key = 0x00000012; // KStartupCleanBoot + target1 = 101; // EStartupNormalBoot + target2 = 102; // EStartupCleanBoot + } + +// --------------------------------------------------------------------------- +// r_dlldata_waitidle +// --------------------------------------------------------------------------- +// +RESOURCE CMD_PARAM_WAIT_PS r_dlldata_waitidle + { + category = 0x101F8766; // KPSUidStartup + key = 0x00000043; // KPSIdlePhase1Ok + target = 101; // EIdlePhase1Ok + } + + +// --------------------------------------------------------------------------- +// r_dlldata_waitphone +// --------------------------------------------------------------------------- +// +RESOURCE CMD_PARAM_WAIT_PS r_dlldata_waitphone + { + category = 0x101F8766; // KPSUidStartup + key = 0x00000044; // KPSPhonePhase1Ok + target = 101; // EPhonePhase1Ok + } + + +// --------------------------------------------------------------------------- +// r_cmd_mylocationsengine +// --------------------------------------------------------------------------- +// +RESOURCE SSM_START_PROCESS_INFO r_cmd_mylocationsengine + { + priority = 0x7EEC; + name = "z:\\sys\\bin\\mylocationsengine.exe"; + execution_behaviour = ESsmFireAndForget; + } + +// --------------------------------------------------------------------------- +// r_cmd_item_taskswitcher +// --------------------------------------------------------------------------- +RESOURCE SSM_START_APP_INFO r_cmd_taskswitcher + { + priority = 0xFFA7; + name = "z:\\sys\\bin\\taskswitcher.exe"; + execution_behaviour = ESsmDeferredWaitForSignal; + background = 1; // To background + monitor_info = r_mon_3_restarts_ignore; + } + +// --------------------------------------------------------------------------- +// r_cmd_multiple_wait +// --------------------------------------------------------------------------- +// +RESOURCE SSM_MULTIPLE_WAIT r_cmd_multiple_wait + { + priority = 0x7F96; + } + +// =========================================================================== +// Conditional blocks in alphabetical order +// =========================================================================== +// + +// --------------------------------------------------------------------------- +// r_cond_ps_firstboot +// --------------------------------------------------------------------------- +// +RESOURCE SSM_CND_PUB_SUB_VALUE r_cond_ps_firstboot + { + category = 0x101F8766; // KPSUidStartup + key = 0x00000013; // KPSStartupFirstBoot + value = 101; // EPSStartupFirstBoot + } + +// --------------------------------------------------------------------------- +// r_cond_feat_alwaysonline +// --------------------------------------------------------------------------- +// +RESOURCE SSM_CND_FEATURE_VALUE r_cond_feat_alwaysonline + { + feature_id = KFeatureIdAlwaysOnLine; + } + +// --------------------------------------------------------------------------- +// r_cond_feat_cellbroadcast +// --------------------------------------------------------------------------- +// +RESOURCE SSM_CND_FEATURE_VALUE r_cond_feat_cellbroadcast + { + feature_id = KFeatureIdCellBroadcast; + } + +// --------------------------------------------------------------------------- +// r_cond_feat_emailfw +// --------------------------------------------------------------------------- +// +RESOURCE SSM_CND_FEATURE_VALUE r_cond_feat_emailfw + { + feature_id = KFeatureIdFfEmailFramework; + } + +// --------------------------------------------------------------------------- +// r_cond_feat_iadv2 +// --------------------------------------------------------------------------- +// +RESOURCE SSM_CND_FEATURE_VALUE r_cond_feat_iadv2 + { + feature_id = KFeatureIdFfIaupdatePhase2; + } + +// --------------------------------------------------------------------------- +// r_cond_feat_ippush +// --------------------------------------------------------------------------- +// +RESOURCE SSM_CND_FEATURE_VALUE r_cond_feat_ippush + { + feature_id = KFeatureIdIpPush; + } + +// --------------------------------------------------------------------------- +// r_cond_feat_omapoc +// --------------------------------------------------------------------------- +// +RESOURCE SSM_CND_FEATURE_VALUE r_cond_feat_omapoc + { + feature_id = KFeatureIdOmaPoc; + } + +// --------------------------------------------------------------------------- +// r_cond_feat_omasuplplugins +// --------------------------------------------------------------------------- +// +RESOURCE SSM_CND_FEATURE_VALUE r_cond_feat_omasuplplugins + { + feature_id = KFeatureIdOmaSuplPlugins; + } + +// --------------------------------------------------------------------------- +// r_cond_feat_pnp_mobile_services +// --------------------------------------------------------------------------- +// +RESOURCE SSM_CND_FEATURE_VALUE r_cond_feat_pnp_mobile_services + { + feature_id = KFeatureIdPlugAndPlayMobileServices; + } + +// --------------------------------------------------------------------------- +// r_cond_feat_remotestoragefw +// --------------------------------------------------------------------------- +// +RESOURCE SSM_CND_FEATURE_VALUE r_cond_feat_remotestoragefw + { + feature_id = KFeatureIdRemoteStorageFw; + } + +// --------------------------------------------------------------------------- +// r_cond_feat_runtime_dcmo; +// --------------------------------------------------------------------------- +// +RESOURCE SSM_CND_FEATURE_VALUE r_cond_feat_runtime_dcmo + { + feature_id = KFeatureIdFfRuntimeDeviceCapabilityConfiguration; + } + +// --------------------------------------------------------------------------- +// r_cond_feat_sappolicymgmt +// --------------------------------------------------------------------------- +// +RESOURCE SSM_CND_FEATURE_VALUE r_cond_feat_sappolicymgmt + { + feature_id = KFeatureIdSapPolicyManagement; + } + +// --------------------------------------------------------------------------- +// r_cond_feat_sdnd +// --------------------------------------------------------------------------- +// +RESOURCE SSM_CND_FEATURE_VALUE r_cond_feat_sdnd + { + feature_id = KFeatureIdSdnd; + } + +// --------------------------------------------------------------------------- +// r_cond_feat_simcard +// --------------------------------------------------------------------------- +// +RESOURCE SSM_CND_FEATURE_VALUE r_cond_feat_simcard + { + feature_id = KFeatureIdSimCard; + } + +// --------------------------------------------------------------------------- +// r_cond_feat_sind +// --------------------------------------------------------------------------- +// +RESOURCE SSM_CND_FEATURE_VALUE r_cond_feat_sind + { + feature_id = KFeatureIdSind; + } + +// --------------------------------------------------------------------------- +// r_cond_feat_syncml_dm +// --------------------------------------------------------------------------- +// +RESOURCE SSM_CND_FEATURE_VALUE r_cond_feat_syncml_dm + { + feature_id = KFeatureIdSyncMlDm; + } + +// --------------------------------------------------------------------------- +// r_cond_feat_syncml_dm_fota +// --------------------------------------------------------------------------- +// +RESOURCE SSM_CND_FEATURE_VALUE r_cond_feat_syncml_dm_fota + { + feature_id = KFeatureIdSyncMlDmFota; + } + +// --------------------------------------------------------------------------- +// r_cond_feat_tvout +// --------------------------------------------------------------------------- +// +RESOURCE SSM_CND_FEATURE_VALUE r_cond_feat_tvout + { + feature_id = KFeatureIdTvOut; + } + +// --------------------------------------------------------------------------- +// r_cond_firstboot_or_fotareset_or_deeprfsreset +// --------------------------------------------------------------------------- +// +RESOURCE SSM_CND_LOGICAL_OR r_cond_firstboot_or_fotareset_or_deeprfsreset + { + lhs = r_cond_fotareset_or_deeprfsreset; + rhs = r_cond_ps_firstboot; + } + +// --------------------------------------------------------------------------- +// r_cond_fotareset_or_deeprfsreset +// --------------------------------------------------------------------------- +// +RESOURCE SSM_CND_LOGICAL_OR r_cond_fotareset_or_deeprfsreset + { + lhs = r_cond_ps_fotareset; + rhs = r_cond_ps_deeprfsreset; + } + +// --------------------------------------------------------------------------- +// r_cond_no_sdnd +// --------------------------------------------------------------------------- +// +RESOURCE SSM_CND_LOGICAL_NOT r_cond_no_sdnd + { + sub_condition = r_cond_feat_sdnd; + } + +// --------------------------------------------------------------------------- +// r_cond_pnp_mobile_services_and_firstboot +// --------------------------------------------------------------------------- +// +RESOURCE SSM_CND_LOGICAL_AND r_cond_pnp_mobile_services_and_firstboot + { + lhs = r_cond_feat_pnp_mobile_services; + rhs = r_cond_ps_firstboot; + } + +// --------------------------------------------------------------------------- +// r_cond_ps_bootoffline +// --------------------------------------------------------------------------- +// +RESOURCE SSM_CND_PUB_SUB_VALUE r_cond_ps_bootoffline + { + category = 0x101F8766; // KPSUidStartup + key = 0x00000011; // KStartupBootIntoOffline + value = 102; // EBootIntoOfflineMode + } + +// --------------------------------------------------------------------------- +// r_cond_ps_bootonline +// --------------------------------------------------------------------------- +// +RESOURCE SSM_CND_PUB_SUB_VALUE r_cond_ps_bootonline + { + category = 0x101F8766; // KPSUidStartup + key = 0x00000011; // KStartupBootIntoOffline + value = 101; // EBootIntoOnlineMode + } + +// --------------------------------------------------------------------------- +// r_cond_ps_deeprfsreset +// --------------------------------------------------------------------------- +// +RESOURCE SSM_CND_PUB_SUB_VALUE r_cond_ps_deeprfsreset + { + category = 0x101F8766; // KPSUidStartup + key = 0x00000045; // KPSStartupReason + value = EDeepRFSReset; + } + +// --------------------------------------------------------------------------- +// r_cond_ps_fotareset +// --------------------------------------------------------------------------- +// +RESOURCE SSM_CND_PUB_SUB_VALUE r_cond_ps_fotareset + { + category = 0x101F8766; // KPSUidStartup + key = 0x00000045; // KPSStartupReason + value = EFirmwareUpdate; + } + +// --------------------------------------------------------------------------- +// r_cond_ps_normalboot +// --------------------------------------------------------------------------- +// +RESOURCE SSM_CND_PUB_SUB_VALUE r_cond_ps_normalboot + { + category = 0x101F8766; // KPSUidStartup + key = 0x00000012; // KStartupCleanBoot + value = 101; // EStartupNormalBoot + } + + +// --------------------------------------------------------------------------- +// r_cond_sind_and_no_sdnd +// --------------------------------------------------------------------------- +// +RESOURCE SSM_CND_LOGICAL_AND r_cond_sind_and_no_sdnd + { + lhs = r_cond_feat_sind; + rhs = r_cond_no_sdnd; + } + +// --------------------------------------------------------------------------- +// r_cond_syncml_dm_fota_and_fotareset +// --------------------------------------------------------------------------- +// +RESOURCE SSM_CND_LOGICAL_AND r_cond_syncml_dm_fota_and_fotareset + { + lhs = r_cond_feat_syncml_dm_fota; + rhs = r_cond_ps_fotareset; + } + +// --------------------------------------------------------------------------- +// r_cond_syncml_dm_or_pnp_mobile_services +// --------------------------------------------------------------------------- +// +RESOURCE SSM_CND_LOGICAL_OR r_cond_syncml_dm_or_pnp_mobile_services + { + lhs = r_cond_feat_syncml_dm; + rhs = r_cond_feat_pnp_mobile_services; + } + +// monitoring.rss contains resource definitions, so it may not be included +// before entry point. +#include "monitoring.rss" diff -r 1a73e8f1b64d -r 6bb05bdcbe09 sysstatemgmt/ssmcmdlists/data/securitycheckcmdlist.rss --- a/sysstatemgmt/ssmcmdlists/data/securitycheckcmdlist.rss Fri Mar 12 15:50:01 2010 +0200 +++ b/sysstatemgmt/ssmcmdlists/data/securitycheckcmdlist.rss Mon Mar 15 12:45:37 2010 +0200 @@ -1,5 +1,5 @@ /* -* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). +* Copyright (c) 2009-2010 Nokia Corporation and/or its subsidiary(-ies). * All rights reserved. * This component and the accompanying materials are made available * under the terms of "Eclipse Public License v1.0" @@ -181,8 +181,7 @@ { priority = 0xFFE3; name = "z:\\sys\\bin\\phoneui.exe"; - execution_behaviour = ESsmDeferredWaitForSignal; - severity = ECmdCriticalSeverity; + execution_behaviour = ESsmFireAndForget; retries = 2; background = 1; // To background monitor_info = r_mon_reset; diff -r 1a73e8f1b64d -r 6bb05bdcbe09 sysstatemgmt/ssmcmdlists/data/uiservicescmdlist.rss --- a/sysstatemgmt/ssmcmdlists/data/uiservicescmdlist.rss Fri Mar 12 15:50:01 2010 +0200 +++ b/sysstatemgmt/ssmcmdlists/data/uiservicescmdlist.rss Mon Mar 15 12:45:37 2010 +0200 @@ -12,7 +12,7 @@ * Contributors: * * Description: -* Command list for the UI-Services startup state (UI shell version). +* Command list for the UI-Services startup state (UI shell version) for minimal startup. * */ @@ -81,18 +81,13 @@ // prio 0xFFA7 r_cmd_splash, // prio 0xFF97 - r_cmd_tzsrv, - r_cmd_cntsrv, - r_cmd_mediator, - r_cmd_hwrmsrv, r_cmd_rtc, - // prio 0xFF96 - tzsrv, cntsrv, mediator, hwrmsrv + // prio 0xFF96 - rtc (tzsrv, cntsrv, mediator & hwrmsrv have been moved to extended startup list but use the same multiplewait command) r_cmd_multiwaitforever1, // prio 0xFF87 - r_cmd_dbrecovery, r_cmd_accsrv, r_cmd_selectlanguage, // Select UI language to use - // prio 0xFF86 - dbrecovery, accsrv, seleclanguage + // prio 0xFF86 - accsrv, seleclanguage (dbrecovery has been moved to extended startup list but uses the same multiplewait command) r_cmd_multiwaitforever2, // prio 0xFF85 r_cmd_loadlocalesup, // Observes changes in locale data @@ -147,57 +142,6 @@ } // --------------------------------------------------------------------------- -// r_cmd_cntsrv -// --------------------------------------------------------------------------- -// -RESOURCE SSM_START_PROCESS_INFO r_cmd_cntsrv - { - priority = 0xFF97; - name = "Z:\\sys\\bin\\cntsrv.exe"; - args = "-nontransient"; - severity = ECmdCriticalSeverity; - execution_behaviour = ESsmDeferredWaitForSignal; - } - -// --------------------------------------------------------------------------- -// r_cmd_dbrecovery -// --------------------------------------------------------------------------- -// -RESOURCE SSM_START_PROCESS_INFO r_cmd_dbrecovery - { - priority = 0xFF87; - name = "z:\\sys\\bin\\dbrecovery.exe"; - execution_behaviour = ESsmDeferredWaitForSignal; - } - -// --------------------------------------------------------------------------- -// r_cmd_hwrmsrv -// --------------------------------------------------------------------------- -// -RESOURCE SSM_START_PROCESS_INFO r_cmd_hwrmsrv - { - priority = 0xFF97; - name = "Z:\\sys\\bin\\hwrmserver.exe"; - severity = ECmdCriticalSeverity; - execution_behaviour = ESsmDeferredWaitForSignal; - retries = 2; - } - -// --------------------------------------------------------------------------- -// r_cmd_mediator -// --------------------------------------------------------------------------- -// -RESOURCE SSM_START_PROCESS_INFO r_cmd_mediator - { - priority = 0xFF97; - name = "Z:\\sys\\bin\\mediatorserver.exe"; - severity = ECmdCriticalSeverity; - execution_behaviour = ESsmDeferredWaitForSignal; - monitor_info = r_mon_3_restarts_reset; - conditional_information = r_cond_feat_mediator; - } - -// --------------------------------------------------------------------------- // r_cmd_initclkeys // --------------------------------------------------------------------------- // @@ -410,18 +354,6 @@ retries = 2; } -// --------------------------------------------------------------------------- -// r_cmd_tzsrv -// --------------------------------------------------------------------------- -// -RESOURCE SSM_START_PROCESS_INFO r_cmd_tzsrv - { - priority = 0xFF97; - name = "Z:\\sys\\bin\\tzserver.exe"; - severity = ECmdCriticalSeverity; - execution_behaviour = ESsmDeferredWaitForSignal; - } - // =========================================================================== // DLL data items in alphabetical order // =========================================================================== @@ -475,14 +407,6 @@ value = 102; // ENormalRFSReset } -// --------------------------------------------------------------------------- -// r_cond_feat_mediator -// --------------------------------------------------------------------------- -// -RESOURCE SSM_CND_FEATURE_VALUE r_cond_feat_mediator - { - feature_id = KFeatureIdMediator; - } // monitoring.rss contains resource definitions, so it may not be included // before entry point. diff -r 1a73e8f1b64d -r 6bb05bdcbe09 sysstatemgmt/ssmcmdlists/data/uiservicescmdlist_ext.rss --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sysstatemgmt/ssmcmdlists/data/uiservicescmdlist_ext.rss Mon Mar 15 12:45:37 2010 +0200 @@ -0,0 +1,162 @@ +/* +* Copyright (c) 2009-2010 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* Command list for the UI-Services startup state (UI shell version) for extended startup. +* +*/ + +#include +#include + +#include "ssmsubstateext.hrh" +#include "ssmdlldatadefs.rh" + +// Identify command list type +UID2 KUidSsmCommandListResourceFile + +// --------------------------------------------------------------------------- +// r_entry_point +// This must be the first resource +// --------------------------------------------------------------------------- +// +RESOURCE SSM_COMMAND_LIST_ROOT r_entry_point + { + command_list_mapping = r_map; + } + +// --------------------------------------------------------------------------- +// r_map +// Mapping of command list ids to resource ids. +// --------------------------------------------------------------------------- +// +RESOURCE SSM_COMMAND_LIST_MAPPING r_map + { + mappings = + { + SSM_COMMANDLISTID_TO_RESOURCEID + { + command_list_id = ESsmStateStartingUiServices; + resource_id = r_cmds; + } + }; + } + +// =========================================================================== +// Command lists in alphabetical order +// =========================================================================== +// + +// --------------------------------------------------------------------------- +// r_cmds +// --------------------------------------------------------------------------- +// +RESOURCE SSM_COMMAND_LIST r_cmds + { + commands = + { + // prio 0xFFA3 + r_cmd_tzsrv, + r_cmd_cntsrv, + r_cmd_mediator, + r_cmd_hwrmsrv, + // prio 0xFF89 + r_cmd_dbrecovery + }; + } + +// =========================================================================== +// Command items in alphabetical order +// =========================================================================== +// + + +// --------------------------------------------------------------------------- +// r_cmd_cntsrv +// --------------------------------------------------------------------------- +// +RESOURCE SSM_START_PROCESS_INFO r_cmd_cntsrv + { + priority = 0xFFA3; + name = "Z:\\sys\\bin\\cntsrv.exe"; + args = "-nontransient"; + severity = ECmdCriticalSeverity; + execution_behaviour = ESsmDeferredWaitForSignal; + } + +// --------------------------------------------------------------------------- +// r_cmd_dbrecovery +// --------------------------------------------------------------------------- +// +RESOURCE SSM_START_PROCESS_INFO r_cmd_dbrecovery + { + priority = 0xFF89; + name = "z:\\sys\\bin\\dbrecovery.exe"; + execution_behaviour = ESsmDeferredWaitForSignal; + } + +// --------------------------------------------------------------------------- +// r_cmd_hwrmsrv +// --------------------------------------------------------------------------- +// +RESOURCE SSM_START_PROCESS_INFO r_cmd_hwrmsrv + { + priority = 0xFFA3; + name = "Z:\\sys\\bin\\hwrmserver.exe"; + severity = ECmdCriticalSeverity; + execution_behaviour = ESsmDeferredWaitForSignal; + retries = 2; + } + +// --------------------------------------------------------------------------- +// r_cmd_mediator +// --------------------------------------------------------------------------- +// +RESOURCE SSM_START_PROCESS_INFO r_cmd_mediator + { + priority = 0xFFA3; + name = "Z:\\sys\\bin\\mediatorserver.exe"; + severity = ECmdCriticalSeverity; + execution_behaviour = ESsmDeferredWaitForSignal; + monitor_info = r_mon_3_restarts_reset; + conditional_information = r_cond_feat_mediator; + } + +// --------------------------------------------------------------------------- +// r_cmd_tzsrv +// --------------------------------------------------------------------------- +// +RESOURCE SSM_START_PROCESS_INFO r_cmd_tzsrv + { + priority = 0xFFA3; + name = "Z:\\sys\\bin\\tzserver.exe"; + severity = ECmdCriticalSeverity; + execution_behaviour = ESsmDeferredWaitForSignal; + } + +// =========================================================================== +// DLL data items in alphabetical order +// =========================================================================== +// + +// --------------------------------------------------------------------------- +// r_cond_feat_mediator +// --------------------------------------------------------------------------- +// +RESOURCE SSM_CND_FEATURE_VALUE r_cond_feat_mediator + { + feature_id = KFeatureIdMediator; + } +// monitoring.rss contains resource definitions, so it may not be included +// before entry point. +#include "monitoring.rss" diff -r 1a73e8f1b64d -r 6bb05bdcbe09 sysstatemgmt/ssmcmdlists/group/ssmcmdlists.mmp --- a/sysstatemgmt/ssmcmdlists/group/ssmcmdlists.mmp Fri Mar 12 15:50:01 2010 +0200 +++ b/sysstatemgmt/ssmcmdlists/group/ssmcmdlists.mmp Mon Mar 15 12:45:37 2010 +0200 @@ -29,7 +29,7 @@ TARGETPATH /private/2000d75b/startup/0 // Private directory of sysstatemgr.exe END -START RESOURCE uiservicescmdlist.rss // Starting UI-Services startup state +START RESOURCE uiservicescmdlist.rss // Starting UI-Services startup state for minimal bootup TARGETPATH /private/2000d75b/startup/0 // Private directory of sysstatemgr.exe END @@ -49,7 +49,7 @@ TARGETPATH /private/2000d75b/startup/0 // Private directory of sysstatemgr.exe END -START RESOURCE noncriticalcmdlist.rss // Non-critical startup state +START RESOURCE noncriticalcmdlist.rss // Non-critical startup state for minimal bootup TARGETPATH /private/2000d75b/startup/0 // Private directory of sysstatemgr.exe END @@ -57,6 +57,14 @@ TARGETPATH /private/2000d75b/startup/0 // Private directory of sysstatemgr.exe END +START RESOURCE noncriticalcmdlist_ext.rss // Non-critical startup state for extended bootup +TARGETPATH /private/2000d75b/startup/0_ext // Private directory of sysstatemgr.exe +END + +START RESOURCE 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 START RESOURCE wserv_hw.rss // Window server command list (HW version) diff -r 1a73e8f1b64d -r 6bb05bdcbe09 sysstatemgmt/ssmcmdlists/rom/ssmcmdlists.iby --- a/sysstatemgmt/ssmcmdlists/rom/ssmcmdlists.iby Fri Mar 12 15:50:01 2010 +0200 +++ b/sysstatemgmt/ssmcmdlists/rom/ssmcmdlists.iby Mon Mar 15 12:45:37 2010 +0200 @@ -27,6 +27,8 @@ data=DATAZ_\private\2000D75B\startup\0\securitycheckcmdlist.rsc \private\2000D75B\startup\0\securitycheckcmdlist.rsc data=DATAZ_\private\2000D75B\startup\0\noncriticalcmdlist.rsc \private\2000D75B\startup\0\noncriticalcmdlist.rsc data=DATAZ_\private\2000D75B\startup\0\emergencycallsonlycmdlist.rsc \private\2000D75B\startup\0\emergencycallsonlycmdlist.rsc +data=DATAZ_\private\2000D75B\startup\0_ext\uiservicescmdlist_ext.rsc \private\2000D75B\startup\0\uiservicescmdlist_ext.rsc +data=DATAZ_\private\2000D75B\startup\0_ext\noncriticalcmdlist_ext.rsc \private\2000D75B\startup\0\noncriticalcmdlist_ext.rsc data=DATAZ_\private\2000D75B\hw\wserv_hw.rsc \private\2000D75B\startup\0\wserv.rsc data=DATAZ_\private\2000D75B\hw\noncriticalcmdlist_hw.rsc \private\2000D75B\startup\0\noncriticalcmdlist_hw.rsc data=DATAZ_\private\2000D75B\hw\usbwatcher_hw.rsc \private\2000D75B\startup\0\usbwatcher.rsc diff -r 1a73e8f1b64d -r 6bb05bdcbe09 sysstatemgmt/ssmcustcmds/rom/ssmcompatibility.iby --- a/sysstatemgmt/ssmcustcmds/rom/ssmcompatibility.iby Fri Mar 12 15:50:01 2010 +0200 +++ b/sysstatemgmt/ssmcustcmds/rom/ssmcompatibility.iby Mon Mar 15 12:45:37 2010 +0200 @@ -38,4 +38,8 @@ data=DATAZ_\private\10202be9\2001d2aa.txt \private\10202be9\2001d2aa.txt +#ifdef FF_SIM_CONSECUTIVE_6F00_ERRORS_HANDLING +patchdata ssmcmn.dll @ KSsmInvalidSim 0xFFFFFFFF //enable the feature to check whether sim is invalid +#endif //FF_SIM_CONSECUTIVE_6F00_ERRORS_HANDLING + #endif // SSMCOMPATIBILITY_IBY diff -r 1a73e8f1b64d -r 6bb05bdcbe09 sysstatemgmt/systemstatemgr/cle/src/cmdlistexecutor.cpp --- a/sysstatemgmt/systemstatemgr/cle/src/cmdlistexecutor.cpp Fri Mar 12 15:50:01 2010 +0200 +++ b/sysstatemgmt/systemstatemgr/cle/src/cmdlistexecutor.cpp Mon Mar 15 12:45:37 2010 +0200 @@ -1,4 +1,4 @@ -// Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2009-2010 Nokia Corporation and/or its subsidiary(-ies). // All rights reserved. // This component and the accompanying materials are made available // under the terms of "Eclipse Public License v1.0" @@ -198,6 +198,7 @@ if (iCommandList) { iCommandList->DeferredDelete(); + iCommandList = NULL; } } diff -r 1a73e8f1b64d -r 6bb05bdcbe09 sysstatemgmt/systemstatemgr/cmd/src/ssmcommandfactory.cpp --- a/sysstatemgmt/systemstatemgr/cmd/src/ssmcommandfactory.cpp Fri Mar 12 15:50:01 2010 +0200 +++ b/sysstatemgmt/systemstatemgr/cmd/src/ssmcommandfactory.cpp Mon Mar 15 12:45:37 2010 +0200 @@ -333,6 +333,7 @@ { CSsmCommandBase* cmd = NULL; TSsmCommandType const cmdType = aSsmCommand.Type(); + DEBUGPRINT2A("Adding command type in CLE commandlist: %d", cmdType); switch(cmdType) {