Added group & startup directories, which build "stem_" versions of the myriad ssmcmdlist resources in private\2000d75b
authorWilliam Roberts <williamr@symbian.org>
Sun, 10 Oct 2010 16:22:15 +0100
changeset 13 4f959124999b
parent 12 ab7598bdae30
child 14 4331846fc8cb
Added group & startup directories, which build "stem_" versions of the myriad ssmcmdlist resources in private\2000d75b This has a USERINCLUDE into sf\os\devicesrv to get some unpublished header files.
group/bld.inf
startup/ssmcmdlists.mmp
startup/ssmdlldatadefs.rh
startup/stem_alarm_charging.rss
startup/stem_criticalappscmdlist.rss
startup/stem_emergencycallsonlycmdlist.rss
startup/stem_failcmdlist.rss
startup/stem_locod_hw.rss
startup/stem_monitoring.rss
startup/stem_noncriticalcmdlist.rss
startup/stem_noncriticalcmdlist_ext.rss
startup/stem_noncriticalcmdlist_hw.rss
startup/stem_noncriticalswpcmdlists.rss
startup/stem_preuiservicescmdlist.rss
startup/stem_rfswpcmdlists.rss
startup/stem_securitycheckcmdlist.rss
startup/stem_selftestokcmdlist.rss
startup/stem_shutdowncmdlists.rss
startup/stem_uiservicescmdlist.rss
startup/stem_uiservicescmdlist_ext.rss
startup/stem_uiswpcmdlists.rss
startup/stem_usbwatcher_hw.rss
startup/stem_wserv_hw.rss
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/group/bld.inf	Sun Oct 10 16:22:15 2010 +0100
@@ -0,0 +1,23 @@
+/*
+* Copyright (c) 2010 Symbian Foundation Ltd
+* 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:
+* Symbian Foundation Ltd - initial contribution.
+*
+* Contributors:
+*
+* Description:
+* Build information file for the stem kit.
+*
+*/
+
+PRJ_PLATFORMS
+DEFAULT
+
+PRJ_MMPFILES
+..\startup\ssmcmdlists
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/startup/ssmcmdlists.mmp	Sun Oct 10 16:22:15 2010 +0100
@@ -0,0 +1,107 @@
+/*
+* 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:
+* Project definition file for project SsmCmdLists - based on sf/os/devicesrv/sysstatemgmt/ssmcmdlists
+*
+*/
+
+TARGETTYPE      NONE
+
+USERINCLUDE /sf/os/devicesrv/sysstatemgmt/ssmpolicyplugins/inc
+
+// Command lists for startup state(s)
+
+START RESOURCE  stem_preuiservicescmdlist.rss        // Pre-UI-Services startup state
+TARGETPATH      /private/2000d75b/startup/0          // Private directory of sysstatemgr.exe
+END
+
+START RESOURCE  stem_uiservicescmdlist.rss           // Starting UI-Services startup state for minimal bootup
+TARGETPATH      /private/2000d75b/startup/0          // Private directory of sysstatemgr.exe
+END
+
+START RESOURCE  stem_criticalappscmdlist.rss         // Starting Critical Apps startup state
+TARGETPATH      /private/2000d75b/startup/0          // Private directory of sysstatemgr.exe
+END
+
+START RESOURCE  stem_selftestokcmdlist.rss           // Selftest Ok startup state
+TARGETPATH      /private/2000d75b/startup/0          // Private directory of sysstatemgr.exe
+END
+
+START RESOURCE  stem_alarm_charging.rss              // Command lists for alarm, charging and related startup states
+TARGETPATH      /private/2000d75b/startup/0          // Private directory of sysstatemgr.exe
+END
+
+START RESOURCE  stem_securitycheckcmdlist.rss        // Security Check startup state
+TARGETPATH      /private/2000d75b/startup/0          // Private directory of sysstatemgr.exe
+END
+
+START RESOURCE  stem_noncriticalcmdlist.rss          // Non-critical startup state for minimal bootup
+TARGETPATH      /private/2000d75b/startup/0          // Private directory of sysstatemgr.exe
+END
+
+START RESOURCE  stem_emergencycallsonlycmdlist.rss   // Emergency Calls Only startup state
+TARGETPATH      /private/2000d75b/startup/0          // Private directory of sysstatemgr.exe
+END
+
+START RESOURCE  stem_noncriticalcmdlist_ext.rss      // Non-critical startup state for extended bootup
+TARGETPATH      /private/2000d75b/startup/0_ext      // Private directory of sysstatemgr.exe
+END
+
+START RESOURCE  stem_uiservicescmdlist_ext.rss       // Starting UI-Services startup state for extended bootup
+TARGETPATH      /private/2000d75b/startup/0_ext      // Private directory of sysstatemgr.exe
+END
+
+// Command lists specific to HW
+
+START RESOURCE  stem_wserv_hw.rss                    // Window server command list (HW version)
+TARGETPATH      /private/2000d75b/hw                 // Private directory of sysstatemgr.exe
+END
+
+START RESOURCE  stem_usbwatcher_hw.rss               // USB Watcher command list
+TARGETPATH      /private/2000d75b/hw                 // Private directory of sysstatemgr.exe
+END
+
+START RESOURCE  stem_noncriticalcmdlist_hw.rss       // Non-critical startup state (HW-specific additions)
+TARGETPATH      /private/2000d75b/hw                 // Private directory of sysstatemgr.exe
+END
+
+// Command lists for fail state
+
+START RESOURCE  stem_failcmdlist.rss                 // Command list for fail state
+TARGETPATH      /private/2000d75b/fail               // Private directory of sysstatemgr.exe
+END
+
+// Command lists for shutdown states
+
+START RESOURCE  stem_shutdowncmdlists.rss            // Command lists for shutdown states
+TARGETPATH      /private/2000d75b/shutdown           // Private directory of sysstatemgr.exe
+END
+
+// Command lists for SWPs
+
+START RESOURCE  stem_rfswpcmdlists.rss               // RF status SWP
+TARGETPATH      /private/2000d75b/rfstatusswpcmdlist // Private directory of sysstatemgr.exe
+END
+
+START RESOURCE  stem_uiswpcmdlists.rss               // UI phase SWP
+TARGETPATH      /private/2000d75b/swpui              // Private directory of sysstatemgr.exe
+END
+
+START RESOURCE  stem_noncriticalswpcmdlists.rss       // noncritical phase SWP
+TARGETPATH      /private/2000d75b/swpnoncritical      // Private directory of sysstatemgr.exe
+END
+
+OS_LAYER_SYSTEMINCLUDE
+
+SMPSAFE
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/startup/ssmdlldatadefs.rh	Sun Oct 10 16:22:15 2010 +0100
@@ -0,0 +1,60 @@
+/*
+* Copyright (c) 2009 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:
+* Resource definitions for dll data parameters used in SsmCmdLists project.
+*
+*/
+
+#ifndef SSMDLLDATADEFS_H
+#define SSMDLLDATADEFS_H
+
+/**
+* Custom command parameter structure for coop state change command.
+*/
+STRUCT CMD_PARAM_STATE_CHANGE
+    {
+    WORD mainstate = 0;
+    WORD substate  = 0;
+    }
+/**
+* Custom command parameter structure for wait ps key command.
+*/
+STRUCT CMD_PARAM_WAIT_PS
+    {
+    LONG category = 0;
+    LONG key      = 0;
+    LONG target   = 0;
+    }
+
+/**
+* Custom command parameter structure for wait ps key command.
+*/
+STRUCT CMD_PARAM_WAIT_PS_2
+    {
+    LONG category = 0;
+    LONG key      = 0;
+    LONG target1  = 0;
+    LONG target2  = 0;
+    }
+
+/**
+* Custom command parameter structure for timeout data.
+*/    
+STRUCT CMD_PARAM_TIMEOUT
+    {
+    WORD timeout = 0;
+    }
+
+#endif // SSMDLLDATADEFS_H
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/startup/stem_alarm_charging.rss	Sun Oct 10 16:22:15 2010 +0100
@@ -0,0 +1,560 @@
+/*
+* 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 following startup states:
+*   - Alarm
+*   - Charging
+*   - Test
+*   - Alarm to Charging
+*   - Charging to Alarm
+*   - Alarm to Normal
+*   - Charging to Normal
+*
+*/
+
+#include <ssm/conditionresourcetypes.rh>
+#include <ssm/ssmcmd.rh>
+
+#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 = ESsmStateTest;
+            resource_id = r_cmds_test;
+            },
+        SSM_COMMANDLISTID_TO_RESOURCEID
+            {
+            command_list_id = ESsmStateAlarm;
+            resource_id = r_cmds_alarm;
+            },
+        SSM_COMMANDLISTID_TO_RESOURCEID
+            {
+            command_list_id = ESsmStateCharging;
+            resource_id = r_cmds_charging;
+            },
+        SSM_COMMANDLISTID_TO_RESOURCEID
+            {
+            command_list_id = ESsmStateAlarmToCharging;
+            resource_id = r_cmds_alarm_to_charging;
+            },
+        SSM_COMMANDLISTID_TO_RESOURCEID
+            {
+            command_list_id = ESsmStateAlarmToNormal;
+            resource_id = r_cmds_alarm_to_normal;
+            },
+        SSM_COMMANDLISTID_TO_RESOURCEID
+            {
+            command_list_id = ESsmStateChargingToAlarm;
+            resource_id = r_cmds_charging_to_alarm;
+            },
+        SSM_COMMANDLISTID_TO_RESOURCEID
+            {
+            command_list_id = ESsmStateChargingToNormal;
+            resource_id = r_cmds_charging_to_normal;
+            }
+        };
+    }
+
+// ===========================================================================
+// Command lists in alphabetical order
+// ===========================================================================
+//
+
+// ---------------------------------------------------------------------------
+// r_cmds_alarm
+// ---------------------------------------------------------------------------
+//
+RESOURCE SSM_COMMAND_LIST r_cmds_alarm
+    {
+    commands =
+        {
+        r_cmd_sastate_alarm,            // This needs to be the first command in state, prio 0xFFF2
+        r_cmd_publishstate,             // prio 0xFFF1
+        r_cmd_psstate_alarm,            // prio 0xFFF0
+        r_cmd_killsplash                // Last command, prio 0x0000
+        };
+    }
+
+// ---------------------------------------------------------------------------
+// r_cmds_alarm_to_charging
+// ---------------------------------------------------------------------------
+//
+RESOURCE SSM_COMMAND_LIST r_cmds_alarm_to_charging
+    {
+    commands =
+        {
+        r_cmd_sastate_alarmtocharging,  // This needs to be the first command in state, prio 0xFFF2
+        r_cmd_publishstate,             // prio 0xFFF1
+        r_cmd_psstate_alarmtocharging   // prio 0xFFF0
+        };
+    }
+
+// ---------------------------------------------------------------------------
+// r_cmds_alarm_to_normal
+// ---------------------------------------------------------------------------
+//
+RESOURCE SSM_COMMAND_LIST r_cmds_alarm_to_normal
+    {
+    commands =
+        {
+        r_cmd_sastate_alarmtonormal,    // This needs to be the first command in state, prio 0xFFF2
+        r_cmd_publishstate,             // prio 0xFFF1
+        r_cmd_psstate_alarmtonormal,    // prio 0xFFF0
+        r_cmd_splash                    // prio 0xFFE7
+        };
+    }
+
+// ---------------------------------------------------------------------------
+// r_cmds_charging
+// ---------------------------------------------------------------------------
+//
+RESOURCE SSM_COMMAND_LIST r_cmds_charging
+    {
+    commands =
+        {
+        r_cmd_sastate_charging,         // This needs to be the first command in state, prio 0xFFF2
+        r_cmd_publishstate,             // prio 0xFFF1
+        r_cmd_psstate_charging,         // prio 0xFFF0
+        r_cmd_locod,                    // prio 0xFFB7
+        r_cmd_killsplash                // Last command, prio 0x0000
+        };
+    }
+
+
+// ---------------------------------------------------------------------------
+// r_cmds_charging_to_alarm
+// ---------------------------------------------------------------------------
+//
+RESOURCE SSM_COMMAND_LIST r_cmds_charging_to_alarm
+    {
+    commands =
+        {
+        r_cmd_sastate_chargingtoalarm,  // This needs to be the first command in state, prio 0xFFF2
+        r_cmd_publishstate,             // prio 0xFFF1
+        r_cmd_psstate_chargingtoalarm   // prio 0xFFF0
+        };
+    }
+
+
+// ---------------------------------------------------------------------------
+// r_cmds_charging_to_normal
+// ---------------------------------------------------------------------------
+//
+RESOURCE SSM_COMMAND_LIST r_cmds_charging_to_normal
+    {
+    commands =
+        {
+        r_cmd_sastate_chargingtonormal, // This needs to be the first command in state, prio 0xFFF2
+        r_cmd_publishstate,             // prio 0xFFF1
+        r_cmd_psstate_chargingtonormal, // prio 0xFFF0
+        r_cmd_splash                    // prio 0xFFE7
+        };
+    }
+
+// ---------------------------------------------------------------------------
+// r_cmds_test
+// ---------------------------------------------------------------------------
+//
+RESOURCE SSM_COMMAND_LIST r_cmds_test
+    {
+    commands =
+        {
+        r_cmd_sastate_test,             // This needs to be the first command in state, prio 0xFFF2
+        r_cmd_publishstate,             // prio 0xFFF1
+        r_cmd_psstate_test              // prio 0xFFF0
+        };
+    }
+
+// ===========================================================================
+// Command items in alphabetical order
+// ===========================================================================
+//
+
+// ---------------------------------------------------------------------------
+// r_cmd_killsplash
+// ---------------------------------------------------------------------------
+//
+RESOURCE SSM_SET_PUBLISH_AND_SUBSCRIBE r_cmd_killsplash
+    {
+    priority = 0x0000;
+    category = 0x101F8766; // KPSUidStartup
+    key      = 0x00000301; // KPSSplashShutdown
+    value    = 101;        // ESplashShutdown
+    }
+
+// ---------------------------------------------------------------------------
+// r_cmd_locod
+// ---------------------------------------------------------------------------
+//
+RESOURCE SSM_START_PROCESS_INFO r_cmd_locod
+    {
+    priority = 0xFFB7;
+    name = "z:\\sys\\bin\\locod.exe";
+    execution_behaviour = ESsmFireAndForget;
+    monitor_info = r_mon_3_restarts_ignore;
+    conditional_information = r_cond_testatcommand_or_enableisicommunicationinusbchargingmode;
+    }
+
+// ---------------------------------------------------------------------------
+// r_cmd_psstate_alarm
+// ---------------------------------------------------------------------------
+//
+RESOURCE SSM_SET_PUBLISH_AND_SUBSCRIBE r_cmd_psstate_alarm
+    {
+    priority = 0xFFF0;
+    severity = ECmdCriticalSeverity;
+    category = 0x101F8766; // KPSUidStartup
+    key      = 0x00000041; // KPSGlobalSystemState
+    value    = 108;        // ESwStateAlarm
+    }
+
+// ---------------------------------------------------------------------------
+// r_cmd_psstate_alarmtocharging
+// ---------------------------------------------------------------------------
+//
+RESOURCE SSM_SET_PUBLISH_AND_SUBSCRIBE r_cmd_psstate_alarmtocharging
+    {
+    priority = 0xFFF0;
+    severity = ECmdCriticalSeverity;
+    category = 0x101F8766; // KPSUidStartup
+    key      = 0x00000041; // KPSGlobalSystemState
+    value    = 112;        // ESwStateAlarmToCharging
+    }
+
+// ---------------------------------------------------------------------------
+// r_cmd_psstate_alarmtonormal
+// ---------------------------------------------------------------------------
+//
+RESOURCE SSM_SET_PUBLISH_AND_SUBSCRIBE r_cmd_psstate_alarmtonormal
+    {
+    priority = 0xFFF0;
+    severity = ECmdCriticalSeverity;
+    category = 0x101F8766; // KPSUidStartup
+    key      = 0x00000041; // KPSGlobalSystemState
+    value    = 115;        // ESwStateAlarmToNormal
+    }
+
+// ---------------------------------------------------------------------------
+// r_cmd_psstate_charging
+// ---------------------------------------------------------------------------
+//
+RESOURCE SSM_SET_PUBLISH_AND_SUBSCRIBE r_cmd_psstate_charging
+    {
+    priority = 0xFFF0;
+    severity = ECmdCriticalSeverity;
+    category = 0x101F8766; // KPSUidStartup
+    key      = 0x00000041; // KPSGlobalSystemState
+    value    = 107;        // ESwStateCharging
+    }
+
+// ---------------------------------------------------------------------------
+// r_cmd_psstate_chargingtoalarm
+// ---------------------------------------------------------------------------
+//
+RESOURCE SSM_SET_PUBLISH_AND_SUBSCRIBE r_cmd_psstate_chargingtoalarm
+    {
+    priority = 0xFFF0;
+    severity = ECmdCriticalSeverity;
+    category = 0x101F8766; // KPSUidStartup
+    key      = 0x00000041; // KPSGlobalSystemState
+    value    = 113;        // ESwStateChargingToAlarm
+    }
+
+// ---------------------------------------------------------------------------
+// r_cmd_psstate_chargingtonormal
+// ---------------------------------------------------------------------------
+//
+RESOURCE SSM_SET_PUBLISH_AND_SUBSCRIBE r_cmd_psstate_chargingtonormal
+    {
+    priority = 0xFFF0;
+    severity = ECmdCriticalSeverity;
+    category = 0x101F8766; // KPSUidStartup
+    key      = 0x00000041; // KPSGlobalSystemState
+    value    = 114;        // ESwStateChargingToNormal
+    }
+
+// ---------------------------------------------------------------------------
+// r_cmd_psstate_test
+// ---------------------------------------------------------------------------
+//
+RESOURCE SSM_SET_PUBLISH_AND_SUBSCRIBE r_cmd_psstate_test
+    {
+    priority = 0xFFF0;
+    severity = ECmdCriticalSeverity;
+    category = 0x101F8766; // KPSUidStartup
+    key      = 0x00000041; // KPSGlobalSystemState
+    value    = 106;        // ESwStateTest
+    }
+
+// ---------------------------------------------------------------------------
+// r_cmd_publishstate
+// ---------------------------------------------------------------------------
+//
+RESOURCE SSM_PUBLISH_SYSTEM_STATE r_cmd_publishstate
+    {
+    priority = 0xFFF1;
+    severity = ECmdCriticalSeverity;
+    retries = 2;
+    }
+
+// ---------------------------------------------------------------------------
+// r_cmd_sastate_alarm
+// ---------------------------------------------------------------------------
+//
+RESOURCE SSM_START_CUSTOM_COMMAND r_cmd_sastate_alarm
+    {
+    priority = 0xFFF2;
+    severity = ECmdCriticalSeverity;
+    dllname = "customcmds.dll";
+    ordinal = 8;
+    unload_on_finish = ENeverUnload;
+    retries = 2;
+    dll_data = r_dlldata_sastate_alarm;
+    }
+
+// ---------------------------------------------------------------------------
+// r_cmd_sastate_alarmtocharging
+// ---------------------------------------------------------------------------
+//
+RESOURCE SSM_START_CUSTOM_COMMAND r_cmd_sastate_alarmtocharging
+    {
+    priority = 0xFFF2;
+    severity = ECmdCriticalSeverity;
+    dllname = "customcmds.dll";
+    ordinal = 8;
+    unload_on_finish = ENeverUnload;
+    retries = 2;
+    dll_data = r_dlldata_sastate_alarmtocharging;
+    }
+
+// ---------------------------------------------------------------------------
+// r_cmd_sastate_alarmtonormal
+// ---------------------------------------------------------------------------
+//
+RESOURCE SSM_START_CUSTOM_COMMAND r_cmd_sastate_alarmtonormal
+    {
+    priority = 0xFFF2;
+    severity = ECmdCriticalSeverity;
+    dllname = "customcmds.dll";
+    ordinal = 8;
+    unload_on_finish = ENeverUnload;
+    retries = 2;
+    dll_data = r_dlldata_sastate_alarmtonormal;
+    }
+
+// ---------------------------------------------------------------------------
+// r_cmd_sastate_charging
+// ---------------------------------------------------------------------------
+//
+RESOURCE SSM_START_CUSTOM_COMMAND r_cmd_sastate_charging
+    {
+    priority = 0xFFF2;
+    severity = ECmdCriticalSeverity;
+    dllname = "customcmds.dll";
+    ordinal = 8;
+    unload_on_finish = ENeverUnload;
+    retries = 2;
+    dll_data = r_dlldata_sastate_charging;
+    }
+
+// ---------------------------------------------------------------------------
+// r_cmd_sastate_chargingtoalarm
+// ---------------------------------------------------------------------------
+//
+RESOURCE SSM_START_CUSTOM_COMMAND r_cmd_sastate_chargingtoalarm
+    {
+    priority = 0xFFF2;
+    severity = ECmdCriticalSeverity;
+    dllname = "customcmds.dll";
+    ordinal = 8;
+    unload_on_finish = ENeverUnload;
+    retries = 2;
+    dll_data = r_dlldata_sastate_chargingtoalarm;
+    }
+
+// ---------------------------------------------------------------------------
+// r_cmd_sastate_chargingtonormal
+// ---------------------------------------------------------------------------
+//
+RESOURCE SSM_START_CUSTOM_COMMAND r_cmd_sastate_chargingtonormal
+    {
+    priority = 0xFFF2;
+    severity = ECmdCriticalSeverity;
+    dllname = "customcmds.dll";
+    ordinal = 8;
+    unload_on_finish = ENeverUnload;
+    retries = 2;
+    dll_data = r_dlldata_sastate_chargingtonormal;
+    }
+
+// ---------------------------------------------------------------------------
+// r_cmd_sastate_test
+// ---------------------------------------------------------------------------
+//
+RESOURCE SSM_START_CUSTOM_COMMAND r_cmd_sastate_test
+    {
+    priority = 0xFFF2;
+    severity = ECmdCriticalSeverity;
+    dllname = "customcmds.dll";
+    ordinal = 8;
+    unload_on_finish = ENeverUnload;
+    retries = 2;
+    dll_data = r_dlldata_sastate_test;
+    }
+
+// ---------------------------------------------------------------------------
+// r_cmd_splash
+// ---------------------------------------------------------------------------
+//
+RESOURCE SSM_START_PROCESS_INFO r_cmd_splash
+    {
+    priority = 0xFFE7;
+    name = "z:\\sys\\bin\\splashscreen.exe";
+    }
+
+// ===========================================================================
+// DLL data items in alphabetical order
+// ===========================================================================
+//
+
+// ---------------------------------------------------------------------------
+// r_dlldata_sastate_alarm
+// ---------------------------------------------------------------------------
+//
+RESOURCE CMD_PARAM_STATE_CHANGE r_dlldata_sastate_alarm
+    {
+    mainstate = 0; // ESsmStartup
+    substate = ESsmStateAlarm;
+    }
+
+// ---------------------------------------------------------------------------
+// r_dlldata_sastate_alarmtocharging
+// ---------------------------------------------------------------------------
+//
+RESOURCE CMD_PARAM_STATE_CHANGE r_dlldata_sastate_alarmtocharging
+    {
+    mainstate = 0; // ESsmStartup
+    substate = ESsmStateAlarmToCharging;
+    }
+
+// ---------------------------------------------------------------------------
+// r_dlldata_sastate_alarmtonormal
+// ---------------------------------------------------------------------------
+//
+RESOURCE CMD_PARAM_STATE_CHANGE r_dlldata_sastate_alarmtonormal
+    {
+    mainstate = 0; // ESsmStartup
+    substate = ESsmStateAlarmToNormal;
+    }
+
+// ---------------------------------------------------------------------------
+// r_dlldata_sastate_charging
+// ---------------------------------------------------------------------------
+//
+RESOURCE CMD_PARAM_STATE_CHANGE r_dlldata_sastate_charging
+    {
+    mainstate = 0; // ESsmStartup
+    substate = ESsmStateCharging;
+    }
+
+// ---------------------------------------------------------------------------
+// r_dlldata_sastate_chargingtoalarm
+// ---------------------------------------------------------------------------
+//
+RESOURCE CMD_PARAM_STATE_CHANGE r_dlldata_sastate_chargingtoalarm
+    {
+    mainstate = 0; // ESsmStartup
+    substate = ESsmStateChargingToAlarm;
+    }
+
+// ---------------------------------------------------------------------------
+// r_dlldata_sastate_chargingtonormal
+// ---------------------------------------------------------------------------
+//
+RESOURCE CMD_PARAM_STATE_CHANGE r_dlldata_sastate_chargingtonormal
+    {
+    mainstate = 0; // ESsmStartup
+    substate = ESsmStateChargingToNormal;
+    }
+
+// ---------------------------------------------------------------------------
+// r_dlldata_sastate_test
+// ---------------------------------------------------------------------------
+//
+RESOURCE CMD_PARAM_STATE_CHANGE r_dlldata_sastate_test
+    {
+    mainstate = 0; // ESsmStartup
+    substate = ESsmStateTest;
+    }
+
+// ===========================================================================
+// Conditional blocks in alphabetical order
+// ===========================================================================
+//
+
+// ---------------------------------------------------------------------------
+// r_cond_feat_testatcommand
+// ---------------------------------------------------------------------------
+//
+RESOURCE SSM_CND_FEATURE_VALUE r_cond_feat_testatcommand
+    {
+    feature_id = KFeatureIdTestATCommand;
+    }
+
+// ---------------------------------------------------------------------------
+// r_cond_feat_enableisicommunicationinusbchargingmode
+// ---------------------------------------------------------------------------
+//
+RESOURCE SSM_CND_FEATURE_VALUE r_cond_feat_enableisicommunicationinusbchargingmode
+    {
+    feature_id = KFeatureIdEnableIsiCommunicationInUsbChargingMode;
+    }	
+	
+// ---------------------------------------------------------------------------
+// r_cond_testatcommand_or_certtesting
+// ---------------------------------------------------------------------------
+//
+RESOURCE SSM_CND_LOGICAL_OR r_cond_testatcommand_or_enableisicommunicationinusbchargingmode
+    {
+    lhs = r_cond_feat_testatcommand;
+    rhs = r_cond_feat_enableisicommunicationinusbchargingmode;
+    }
+	
+	
+// monitoring.rss contains resource definitions, so it may not be included
+// before entry point.
+#include "stem_monitoring.rss"
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/startup/stem_criticalappscmdlist.rss	Sun Oct 10 16:22:15 2010 +0100
@@ -0,0 +1,217 @@
+/*
+* Copyright (c) 2009 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 Critical Apps startup state.
+*
+*/
+
+#include <ssm/conditionresourcetypes.rh>
+#include <ssm/ssmcmd.rh>
+
+#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 = ESsmStateStartingCriticalApps;
+            resource_id = r_cmds;
+            }
+        };
+    }
+
+// ===========================================================================
+// Command lists in alphabetical order
+// ===========================================================================
+//
+
+// ---------------------------------------------------------------------------
+// r_cmds
+// ---------------------------------------------------------------------------
+//
+RESOURCE SSM_COMMAND_LIST r_cmds
+    {
+    commands =
+        {
+        r_cmd_sastate,          // This needs to be the first command in state, prio 0xFFF2
+        r_cmd_publishstate,     // prio 0xFFF1
+        r_cmd_psstate,          // prio 0xFFF0
+        // prio 0xFFE7
+        r_cmd_selftest,
+        r_cmd_cfserver,
+        r_cmd_sysap,
+        r_cmd_calsrv,
+        r_cmd_profmon,
+        // prio 0xFFE6
+        r_cmd_multiwaitforever
+        };
+    }
+
+// ===========================================================================
+// Command items in alphabetical order
+// ===========================================================================
+//
+
+// ---------------------------------------------------------------------------
+// r_cmd_calsrv
+// ---------------------------------------------------------------------------
+//
+RESOURCE SSM_START_PROCESS_INFO r_cmd_calsrv
+    {
+    priority = 0xFFE7;
+    name = "calensvr.exe";
+    execution_behaviour = ESsmFireAndForget;
+    monitor_info = r_mon_100_restarts_reset;
+    }
+
+// ---------------------------------------------------------------------------
+// r_cmd_cfserver
+// ---------------------------------------------------------------------------
+//
+RESOURCE SSM_START_PROCESS_INFO r_cmd_cfserver
+    {
+    priority = 0xFFE7;
+    name = "Z:\\sys\\bin\\cfserver.exe";
+    execution_behaviour = ESsmDeferredWaitForSignal;
+    monitor_info = r_mon_100_restarts_reset;
+    }
+
+// ---------------------------------------------------------------------------
+// r_cmd_multiwaitforever
+// ---------------------------------------------------------------------------
+//
+RESOURCE SSM_MULTIPLE_WAIT r_cmd_multiwaitforever
+    {
+    priority = 0xFFE6;
+    }
+
+// ---------------------------------------------------------------------------
+// r_cmd_profmon
+// ---------------------------------------------------------------------------
+//
+RESOURCE SSM_START_PROCESS_INFO r_cmd_profmon
+    {
+    priority = 0xFFE7;
+    name = "Z:\\sys\\bin\\profilesettingsmonitor.exe";
+    execution_behaviour = ESsmDeferredWaitForSignal;
+    }
+
+// ---------------------------------------------------------------------------
+// r_cmd_psstate
+// ---------------------------------------------------------------------------
+//
+RESOURCE SSM_SET_PUBLISH_AND_SUBSCRIBE r_cmd_psstate
+    {
+    priority = 0xFFF0;
+    severity = ECmdCriticalSeverity;
+    category = 0x101F8766; // KPSUidStartup
+    key      = 0x00000041; // KPSGlobalSystemState
+    value    = 101;        // ESwStateStartingCriticalApps
+    }
+
+// ---------------------------------------------------------------------------
+// r_cmd_publishstate
+// ---------------------------------------------------------------------------
+//
+RESOURCE SSM_PUBLISH_SYSTEM_STATE r_cmd_publishstate
+    {
+    priority = 0xFFF1;
+    severity = ECmdCriticalSeverity;
+    retries = 2;
+    }
+
+// ---------------------------------------------------------------------------
+// r_cmd_sastate
+// ---------------------------------------------------------------------------
+//
+RESOURCE SSM_START_CUSTOM_COMMAND r_cmd_sastate
+    {
+    priority = 0xFFF2;
+    severity = ECmdCriticalSeverity;
+    dllname = "customcmds.dll";
+    ordinal = 8;
+    unload_on_finish = ENeverUnload;
+    retries = 2;
+    dll_data = r_dlldata_sastate;
+    }
+
+// ---------------------------------------------------------------------------
+// r_cmd_selftest
+// ---------------------------------------------------------------------------
+//
+RESOURCE SSM_START_CUSTOM_COMMAND r_cmd_selftest
+    {
+    priority = 0xFFE7;
+    severity = ECmdCriticalSeverity;
+    dllname = "customcmds.dll";
+    ordinal = 2;
+    unload_on_finish = ENeverUnload;
+    retries = 2;
+    execution_behaviour = ESsmDeferredWaitForSignal;
+    }
+
+// ---------------------------------------------------------------------------
+// r_cmd_sysap
+// ---------------------------------------------------------------------------
+//
+RESOURCE SSM_START_APP_INFO r_cmd_sysap
+    {
+    priority = 0xFFE7;
+    name = "Z:\\sys\\bin\\sysap.exe";
+    execution_behaviour = ESsmDeferredWaitForSignal;
+    severity = ECmdCriticalSeverity;
+    retries = 2;
+    background = 1; // To background
+    monitor_info = r_mon_reset;
+    }
+
+// ===========================================================================
+// DLL data items in alphabetical order
+// ===========================================================================
+//
+
+// ---------------------------------------------------------------------------
+// r_dlldata_sastate
+// ---------------------------------------------------------------------------
+//
+RESOURCE CMD_PARAM_STATE_CHANGE r_dlldata_sastate
+    {
+    mainstate = 0; // ESsmStartup
+    substate = ESsmStateStartingCriticalApps;
+    }
+
+// monitoring.rss contains resource definitions, so it may not be included
+// before entry point.
+#include "stem_monitoring.rss"
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/startup/stem_emergencycallsonlycmdlist.rss	Sun Oct 10 16:22:15 2010 +0100
@@ -0,0 +1,144 @@
+/*
+* Copyright (c) 2009 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 Emergency Calls Only startup state.
+*
+*/
+
+#include <ssm/conditionresourcetypes.rh>
+#include <ssm/ssmcmd.rh>
+
+#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 = ESsmStateEmergencyCallsOnly;
+            resource_id = r_cmds;
+            }
+        };
+    }
+
+// ===========================================================================
+// Command lists in alphabetical order
+// ===========================================================================
+//
+
+// ---------------------------------------------------------------------------
+// r_cmds
+// ---------------------------------------------------------------------------
+//
+RESOURCE SSM_COMMAND_LIST r_cmds
+    {
+    commands =
+        {
+        r_cmd_sastate,          // This needs to be the first command in state, prio 0xFFF2
+        r_cmd_publishstate,     // prio 0xFFF1
+        r_cmd_psstate,          // prio 0xFFF0
+        r_cmd_killsplash        // Last command, prio 0x0000
+        };
+    }
+
+// ===========================================================================
+// Command items in alphabetical order
+// ===========================================================================
+//
+
+// ---------------------------------------------------------------------------
+// r_cmd_killsplash
+// ---------------------------------------------------------------------------
+//
+RESOURCE SSM_SET_PUBLISH_AND_SUBSCRIBE r_cmd_killsplash
+    {
+    priority = 0x0000;
+    category = 0x101F8766; // KPSUidStartup
+    key      = 0x00000301; // KPSSplashShutdown
+    value    = 101;        // ESplashShutdown
+    }
+
+// ---------------------------------------------------------------------------
+// r_cmd_psstate
+// ---------------------------------------------------------------------------
+//
+RESOURCE SSM_SET_PUBLISH_AND_SUBSCRIBE r_cmd_psstate
+    {
+    priority = 0xFFF0;
+    severity = ECmdCriticalSeverity;
+    category = 0x101F8766; // KPSUidStartup
+    key      = 0x00000041; // KPSGlobalSystemState
+    value    = 105;        // ESwStateEmergencyCallsOnly
+    }
+
+// ---------------------------------------------------------------------------
+// r_cmd_publishstate
+// ---------------------------------------------------------------------------
+//
+RESOURCE SSM_PUBLISH_SYSTEM_STATE r_cmd_publishstate
+    {
+    priority = 0xFFF1;
+    severity = ECmdCriticalSeverity;
+    retries = 2;
+    }
+
+// ---------------------------------------------------------------------------
+// r_cmd_sastate
+// ---------------------------------------------------------------------------
+//
+RESOURCE SSM_START_CUSTOM_COMMAND r_cmd_sastate
+    {
+    priority = 0xFFF2;
+    severity = ECmdCriticalSeverity;
+    dllname = "customcmds.dll";
+    ordinal = 8;
+    unload_on_finish = ENeverUnload;
+    retries = 2;
+    dll_data = r_dlldata_sastate;
+    }
+
+// ===========================================================================
+// DLL data items in alphabetical order
+// ===========================================================================
+//
+
+// ---------------------------------------------------------------------------
+// r_dlldata_sastate
+// ---------------------------------------------------------------------------
+//
+RESOURCE CMD_PARAM_STATE_CHANGE r_dlldata_sastate
+    {
+    mainstate = 0; // ESsmStartup
+    substate = ESsmStateEmergencyCallsOnly;
+    }
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/startup/stem_failcmdlist.rss	Sun Oct 10 16:22:15 2010 +0100
@@ -0,0 +1,203 @@
+/*
+* Copyright (c) 2009 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 Selftest OK startup state.
+*
+*/
+
+#include <ssm/conditionresourcetypes.rh>
+#include <ssm/ssmcmd.rh>
+
+#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 = ESsmStateFail;
+            resource_id = r_cmds;
+            }
+        };
+    }
+
+// ===========================================================================
+// Command lists in alphabetical order
+// ===========================================================================
+//
+
+// ---------------------------------------------------------------------------
+// r_cmds
+// ---------------------------------------------------------------------------
+//
+RESOURCE SSM_COMMAND_LIST r_cmds
+    {
+    commands =
+        {
+        r_cmd_sastate,          // This needs to be the first command in state, prio 0xFFF2
+        r_cmd_publishstate,     // prio 0xFFF1
+        r_cmd_psstate,          // prio 0xFFF0
+        r_cmd_cancelmonitoring,	// prio 0xFFE8
+        // prio 0xFFE7	
+        r_cmd_killsplash,
+        r_cmd_contactservice,
+        r_cmd_sysap,
+        // prio 0xFFE6
+        r_cmd_multiwaitforever
+        };
+    }
+
+// ===========================================================================
+// Command items in alphabetical order
+// ===========================================================================
+//
+// ---------------------------------------------------------------------------
+// r_cmd_cancelmonitoring
+// ---------------------------------------------------------------------------
+//
+RESOURCE SSM_START_CUSTOM_COMMAND r_cmd_cancelmonitoring
+	{
+	priority = 0xFFE8;
+	dllname = "cmncustomcmds.dll";
+	ordinal = 3; // Request to the sysmon server to cancel all the outstanding monitors
+	retries = 2;
+	}
+
+// ---------------------------------------------------------------------------
+// r_cmd_contactservice
+// ---------------------------------------------------------------------------
+//
+RESOURCE SSM_START_CUSTOM_COMMAND r_cmd_contactservice
+    {
+    priority = 0xFFE7;
+    severity = ECmdCriticalSeverity;
+    execution_behaviour = ESsmDeferredWaitForSignal;
+    dllname = "syserrcmd.dll";
+    ordinal = 1;
+    retries = 2;
+    }
+
+// ---------------------------------------------------------------------------
+// r_cmd_killsplash
+// ---------------------------------------------------------------------------
+//
+RESOURCE SSM_SET_PUBLISH_AND_SUBSCRIBE r_cmd_killsplash
+    {
+    priority = 0xFFE7;
+    category = 0x101F8766; // KPSUidStartup
+    key      = 0x00000301; // KPSSplashShutdown
+    value    = 101;        // ESplashShutdown
+    }
+
+// ---------------------------------------------------------------------------
+// r_cmd_multiwaitforever
+// ---------------------------------------------------------------------------
+//
+RESOURCE SSM_MULTIPLE_WAIT r_cmd_multiwaitforever
+    {
+    priority = 0xFFE6;
+    }
+
+// ---------------------------------------------------------------------------
+// r_cmd_psstate
+// ---------------------------------------------------------------------------
+//
+RESOURCE SSM_SET_PUBLISH_AND_SUBSCRIBE r_cmd_psstate
+    {
+    priority = 0xFFF0;
+    severity = ECmdCriticalSeverity;
+    category = 0x101F8766; // KPSUidStartup
+    key      = 0x00000041; // KPSGlobalSystemState
+    value    = 116;        // ESWStateFatalStartupError
+    }
+
+// ---------------------------------------------------------------------------
+// r_cmd_publishstate
+// ---------------------------------------------------------------------------
+//
+RESOURCE SSM_PUBLISH_SYSTEM_STATE r_cmd_publishstate
+    {
+    priority = 0xFFF1;
+    severity = ECmdCriticalSeverity;
+    retries = 2;
+    }
+
+// ---------------------------------------------------------------------------
+// r_cmd_sastate
+// ---------------------------------------------------------------------------
+//
+RESOURCE SSM_START_CUSTOM_COMMAND r_cmd_sastate
+    {
+    priority = 0xFFF2;
+    severity = ECmdCriticalSeverity;
+    dllname = "customcmds.dll";
+    ordinal = 8;
+    unload_on_finish = ENeverUnload;
+    retries = 2;
+    dll_data = r_dlldata_sastate;
+    }
+
+// ---------------------------------------------------------------------------
+// r_cmd_sysap
+// ---------------------------------------------------------------------------
+//
+RESOURCE SSM_START_APP_INFO r_cmd_sysap
+    {
+    priority = 0xFFE7;
+    name = "Z:\\sys\\bin\\sysap.exe";
+    execution_behaviour = ESsmDeferredWaitForSignal;
+    severity = ECmdCriticalSeverity;
+    retries = 2;
+    background = 1; // To background
+    monitor_info = r_mon_reset;
+    }
+
+// ===========================================================================
+// DLL data items in alphabetical order
+// ===========================================================================
+//
+
+// ---------------------------------------------------------------------------
+// r_dlldata_sastate
+// ---------------------------------------------------------------------------
+//
+RESOURCE CMD_PARAM_STATE_CHANGE r_dlldata_sastate
+    {
+    mainstate = 3; // ESsmFail
+    substate = 0xFFFF; // KSsmAnySubState, saastateadapataion expects this
+    }
+
+// monitoring.rss contains resource definitions, so it may not be included
+// before entry point.
+#include "stem_monitoring.rss"
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/startup/stem_locod_hw.rss	Sun Oct 10 16:22:15 2010 +0100
@@ -0,0 +1,249 @@
+/*
+* Copyright (c) 2009 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 Locod component
+*
+*/
+
+#include <ssm/conditionresourcetypes.rh>
+#include <ssm/ssmcmd.rh>
+
+#include "ssmsubstateext.hrh"
+
+// 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 = ESsmStateCharging;
+            resource_id = r_cmds_charging;
+            },
+        SSM_COMMANDLISTID_TO_RESOURCEID
+            {
+            command_list_id = ESsmStateNonCritical;
+            resource_id = r_cmds_noncritical;
+            }
+        };
+    }
+
+// ===========================================================================
+// Command lists in alphabetical order
+// ===========================================================================
+//
+
+// ---------------------------------------------------------------------------
+// r_cmds_noncritical
+// ---------------------------------------------------------------------------
+//
+RESOURCE SSM_COMMAND_LIST r_cmds_noncritical
+    {
+    commands =
+        {
+        r_cmd_connlogger,
+        r_cmd_provisioning,
+#ifndef SYMBIAN_EXCLUDE_SIP
+        r_cmd_sipprofilesrv,
+#endif // defined !SYMBIAN_EXCLUDE_SIP
+        r_cmd_remotelock,
+        r_cmd_hotspotsrv
+        };
+    }
+
+// ===========================================================================
+// Command items in alphabetical order
+// ===========================================================================
+//
+
+// ---------------------------------------------------------------------------
+// r_cmd_connlogger
+// ---------------------------------------------------------------------------
+//
+RESOURCE SSM_START_PROCESS_INFO r_cmd_connlogger
+    {
+    priority = 0xFFA7;
+    name = "z:\\sys\\bin\\dataconnectionlogger.exe";
+    execution_behaviour = ESsmFireAndForget;
+    monitor_info = r_mon_3_restarts_ignore;
+    }
+
+
+// ---------------------------------------------------------------------------
+// r_cmd_hotspotsrv
+// ---------------------------------------------------------------------------
+//
+RESOURCE SSM_START_PROCESS_INFO r_cmd_hotspotsrv
+    {
+    priority = 0xFFA7;
+    name = "hotspotserver.exe";
+    execution_behaviour = ESsmWaitForSignal;
+    timeout = 10000;
+    conditional_information = r_cond_protwlan_and_firstboot_or_deeprfs_or_normalrfs;
+    }
+
+// ---------------------------------------------------------------------------
+// r_cmd_provisioning
+// ---------------------------------------------------------------------------
+//
+RESOURCE SSM_START_PROCESS_INFO r_cmd_provisioning
+    {
+    priority = 0xFFA7;
+    name = "z:\\sys\\bin\\provisioningsc.exe";
+    execution_behaviour = ESsmFireAndForget; // -- does not call Rendezvous() --
+    conditional_information = r_cond_feat_smartcardprov;
+    }
+
+// ---------------------------------------------------------------------------
+// r_cmd_remotelock
+// ---------------------------------------------------------------------------
+//
+RESOURCE SSM_START_PROCESS_INFO r_cmd_remotelock
+    {
+    priority = 0xFFA7;
+    name = "z:\\sys\\bin\\rlock.exe";
+    execution_behaviour = ESsmFireAndForget; // -- does not call Rendezvous() --
+    conditional_information = r_cond_feat_remotelock;
+    monitor_info = r_mon_3_restarts_ignore;
+    }
+
+// ---------------------------------------------------------------------------
+// r_cmd_sipprofilesrv
+// ---------------------------------------------------------------------------
+//
+#ifndef SYMBIAN_EXCLUDE_SIP
+RESOURCE SSM_START_PROCESS_INFO r_cmd_sipprofilesrv
+    {
+    priority = 0xFFA7;
+    name = "z:\\sys\\bin\\sipprofilesrv.exe";
+    execution_behaviour = ESsmFireAndForget; // -- does not call Rendezvous() --
+    }
+#endif // !SYMBIAN_EXCLUDE_SIP
+
+// ===========================================================================
+// 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_protocolwlan
+// ---------------------------------------------------------------------------
+//
+RESOURCE SSM_CND_FEATURE_VALUE r_cond_feat_protocolwlan
+    {
+    feature_id = KFeatureIdProtocolWlan;
+    }
+
+// ---------------------------------------------------------------------------
+// r_cond_feat_remotelock
+// ---------------------------------------------------------------------------
+//
+RESOURCE SSM_CND_FEATURE_VALUE r_cond_feat_remotelock
+    {
+    feature_id = KFeatureIdRemoteLock;
+    }
+
+// ---------------------------------------------------------------------------
+// r_cond_feat_smartcardprov
+// ---------------------------------------------------------------------------
+//
+RESOURCE SSM_CND_FEATURE_VALUE r_cond_feat_smartcardprov
+    {
+    feature_id = KFeatureIdSmartCardProv;
+    }
+
+// ---------------------------------------------------------------------------
+// r_cond_firstboot_or_deeprfs
+// ---------------------------------------------------------------------------
+//
+RESOURCE SSM_CND_LOGICAL_OR r_cond_firstboot_or_deeprfs
+    {
+    lhs = r_cond_ps_deep_rfs;
+    rhs = r_cond_ps_firstboot;
+    }
+
+// ---------------------------------------------------------------------------
+// r_cond_firstboot_or_deeprfs_or_normalrfs
+// ---------------------------------------------------------------------------
+//
+RESOURCE SSM_CND_LOGICAL_OR r_cond_firstboot_or_deeprfs_or_normalrfs
+    {
+    lhs = r_cond_ps_normal_rfs;
+    rhs = r_cond_firstboot_or_deeprfs;
+    }
+
+// ---------------------------------------------------------------------------
+// r_cond_ps_normal_rfs
+// ---------------------------------------------------------------------------
+//
+RESOURCE SSM_CND_PUB_SUB_VALUE r_cond_ps_normal_rfs
+    {
+    category = 0x101F8766; // KPSUidStartup
+    key = 0x00000045;      // KPSStartupReason
+    value = ENormalRFSReset;
+    }
+
+// ---------------------------------------------------------------------------
+// r_cond_ps_deep_rfs
+// ---------------------------------------------------------------------------
+//
+RESOURCE SSM_CND_PUB_SUB_VALUE r_cond_ps_deep_rfs
+    {
+    category = 0x101F8766; // KPSUidStartup
+    key = 0x00000045;      // KPSStartupReason
+    value = EDeepRFSReset;
+    }
+
+// ---------------------------------------------------------------------------
+// r_cond_protwlan_and_firstboot_or_deeprfs_or_normalrfs
+// ( protocol WLAN ) AND ( first boot OR deep RFS OR normal RFS )
+// ---------------------------------------------------------------------------
+//
+RESOURCE SSM_CND_LOGICAL_AND r_cond_protwlan_and_firstboot_or_deeprfs_or_normalrfs
+    {
+    lhs = r_cond_feat_protocolwlan;
+    rhs = r_cond_firstboot_or_deeprfs_or_normalrfs;
+    }
+
+// monitoring.rss contains resource definitions, so it may not be included
+// before entry point.
+#include "stem_monitoring.rss"
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/startup/stem_monitoring.rss	Sun Oct 10 16:22:15 2010 +0100
@@ -0,0 +1,88 @@
+/*
+* Copyright (c) 2009 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:
+* Monitoring information definitions.
+*
+*/
+
+#include <ssm/ssmcmd.rh>
+
+// ===========================================================================
+// Monitoring definitions in alphabetical order
+// ===========================================================================
+//
+
+// ---------------------------------------------------------------------------
+// r_mon_3_restarts_ignore
+// ---------------------------------------------------------------------------
+//
+RESOURCE SSM_MONITOR_INFO r_mon_3_restarts_ignore
+    {
+    restart_mode = 0;
+    retries = 3;
+    }
+
+// ---------------------------------------------------------------------------
+// r_mon_3_restarts_reset
+// ---------------------------------------------------------------------------
+//
+RESOURCE SSM_MONITOR_INFO r_mon_3_restarts_reset
+    {
+    restart_policy = ESsmRestartOS;
+    restart_mode = 0;
+    retries = 3;
+    }
+
+// ---------------------------------------------------------------------------
+// r_mon_20_restarts_reset
+// ---------------------------------------------------------------------------
+//
+RESOURCE SSM_MONITOR_INFO r_mon_20_restarts_reset
+    {
+    restart_policy = ESsmRestartOS;
+    restart_mode = 0;
+    retries = 20;
+    }
+
+// ---------------------------------------------------------------------------
+// r_mon_100_restarts_reset
+// ---------------------------------------------------------------------------
+//
+RESOURCE SSM_MONITOR_INFO r_mon_100_restarts_reset
+    {
+    restart_policy = ESsmRestartOS;
+    restart_mode = 0;
+    retries = 100;
+    }
+
+// ---------------------------------------------------------------------------
+// r_mon_max_restarts_ignore
+// ---------------------------------------------------------------------------
+//
+RESOURCE SSM_MONITOR_INFO r_mon_max_restarts_ignore
+    {
+    restart_mode = 0;
+    retries = 32767;
+    }
+
+// ---------------------------------------------------------------------------
+// r_mon_reset
+// ---------------------------------------------------------------------------
+//
+RESOURCE SSM_MONITOR_INFO r_mon_reset
+    {
+    restart_policy = ESsmRestartOS;
+    restart_mode = 0;
+    retries = 0;
+    }
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/startup/stem_noncriticalcmdlist.rss	Sun Oct 10 16:22:15 2010 +0100
@@ -0,0 +1,488 @@
+/*
+* 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 minimal startup mode.
+*
+*/
+
+#include <ssm/conditionresourcetypes.rh>
+#include <ssm/ssmcmd.rh>
+#include <ssm/startupreason.h>
+#include <ssm/clayerswp.hrh>
+
+#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_sastate,          // This needs to be the first command in state, prio 0xFFF2
+        r_cmd_publishstate,     // prio 0xFFF1
+        r_cmd_psstate,          // prio 0xFFF0
+        // prio 0xFFE7
+        r_cmd_simcheck,
+        r_cmd_clearstartupreason,
+        r_cmd_createswp_uiphase,
+        r_cmd_createswp_rfstatus,
+        r_cmd_waitforofflinequery,
+        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_startupready      // Last command, prio 0x0000
+        };
+    }
+
+// ===========================================================================
+// Command items in alphabetical order
+// ===========================================================================
+//
+// ---------------------------------------------------------------------------
+// r_cmd_bsengine
+// ---------------------------------------------------------------------------
+//
+RESOURCE SSM_START_PROCESS_INFO r_cmd_bsengine
+    {
+    priority = 0xFFD3;
+    name = "z:\\sys\\bin\\bsengine.exe";
+    execution_behaviour = ESsmWaitForSignal;
+    timeout = 10000;
+    }
+
+// ---------------------------------------------------------------------------
+// r_cmd_createswp_rfstatus
+// ---------------------------------------------------------------------------
+//
+RESOURCE SSM_CREATE_SYSTEM_WIDE_PROPERTY r_cmd_createswp_rfstatus
+    {
+    priority = 0xFFE7;
+    severity = ECmdCriticalSeverity;
+    key = SWP_UID_SSM_RF_STATUS;
+    filename = "rfstatusswppolicy.dll";
+    }
+
+// ---------------------------------------------------------------------------
+// r_cmd_createswp_uiphase
+// ---------------------------------------------------------------------------
+//
+RESOURCE SSM_CREATE_SYSTEM_WIDE_PROPERTY r_cmd_createswp_uiphase
+    {
+    priority = 0xFFE7;
+    severity = ECmdCriticalSeverity;
+    key = SWP_UID_SSM_UI_PHASE;
+    filename = "ssmuiswppolicy.dll";
+    }
+
+// ---------------------------------------------------------------------------
+// r_cmd_psstate
+// ---------------------------------------------------------------------------
+//
+RESOURCE SSM_SET_PUBLISH_AND_SUBSCRIBE r_cmd_psstate
+    {
+    priority = 0xFFF0;
+    severity = ECmdCriticalSeverity;
+    category = 0x101F8766; // KPSUidStartup
+    key      = 0x00000041; // KPSGlobalSystemState
+    value    = 104;        // ESwStateCriticalPhaseOK
+    }
+
+// ---------------------------------------------------------------------------
+// r_cmd_publishstate
+// ---------------------------------------------------------------------------
+//
+RESOURCE SSM_PUBLISH_SYSTEM_STATE r_cmd_publishstate
+    {
+    priority = 0xFFF1;
+    severity = ECmdCriticalSeverity;
+    retries = 2;
+    }
+
+// ---------------------------------------------------------------------------
+// r_cmd_sastate
+// ---------------------------------------------------------------------------
+//
+RESOURCE SSM_START_CUSTOM_COMMAND r_cmd_sastate
+    {
+    priority = 0xFFF2;
+    severity = ECmdCriticalSeverity;
+    dllname = "customcmds.dll";
+    ordinal = 8;
+    unload_on_finish = ENeverUnload;
+    retries = 2;
+    dll_data = r_dlldata_sastate;
+    }
+
+// ---------------------------------------------------------------------------
+// r_cmd_setswp_rfoff
+// ---------------------------------------------------------------------------
+//
+RESOURCE SSM_REQUEST_SYSTEM_WIDE_PROPERTY r_cmd_setswp_rfoff
+    {
+    priority = 0xFFC7;
+    severity = ECmdCriticalSeverity;
+    key = SWP_UID_SSM_RF_STATUS;
+    value = ESsmRfOff;
+    conditional_information = r_cond_simnotusable_or_bootoffline;
+    }
+
+// ---------------------------------------------------------------------------
+// r_cmd_setswp_rfon
+// ---------------------------------------------------------------------------
+//
+RESOURCE SSM_REQUEST_SYSTEM_WIDE_PROPERTY r_cmd_setswp_rfon
+    {
+    priority = 0xFFC7;
+    severity = ECmdCriticalSeverity;
+    key = SWP_UID_SSM_RF_STATUS;
+    value = ESsmRfOn;
+    conditional_information = r_cond_simusable_and_bootonline;
+    }
+
+// ---------------------------------------------------------------------------
+// r_cmd_setswp_uistart
+// ---------------------------------------------------------------------------
+//
+RESOURCE SSM_REQUEST_SYSTEM_WIDE_PROPERTY r_cmd_setswp_uistart
+    {
+    priority = 0xFFD7;
+    severity = ECmdCriticalSeverity;
+    key = SWP_UID_SSM_UI_PHASE;
+    value = ESsmUiPhaseStarted;
+    }
+
+// ---------------------------------------------------------------------------
+// r_cmd_simcheck
+// ---------------------------------------------------------------------------
+//
+RESOURCE SSM_START_CUSTOM_COMMAND r_cmd_simcheck
+    {
+    priority = 0xFFE7;
+    severity = ECmdCriticalSeverity;
+    dllname = "customcmds.dll";
+    ordinal = 10;
+    unload_on_finish = ENeverUnload;
+    conditional_information = r_cond_ps_simusable;
+    }
+
+// ---------------------------------------------------------------------------
+// r_cmd_startupready
+// ---------------------------------------------------------------------------
+//
+RESOURCE SSM_SET_PUBLISH_AND_SUBSCRIBE r_cmd_startupready
+    {
+    priority = 0x0000;
+    severity = ECmdMediumSeverity;
+    category = 0x100059C9;
+    key = 2;
+    value = 1;
+    }
+
+// ---------------------------------------------------------------------------
+ 
+// ---------------------------------------------------------------------------
+// r_cmd_waitforofflinequery
+// ---------------------------------------------------------------------------
+//
+RESOURCE SSM_START_CUSTOM_COMMAND r_cmd_waitforofflinequery
+    {
+    priority = 0xFFE7;
+    severity = ECmdCriticalSeverity;
+    dllname = "ssmsystemcmds.dll";
+    ordinal = 6; // WaitPsKeyRange
+    dll_data = r_dlldata_waitofflinequery;
+    unload_on_finish = ENeverUnload;
+    retries = 2;
+    execution_behaviour = ESsmWaitForSignal;
+    }
+
+// ---------------------------------------------------------------------------
+// r_cmd_clearstartupreason
+// ---------------------------------------------------------------------------
+//
+RESOURCE SSM_START_CUSTOM_COMMAND r_cmd_clearstartupreason
+    {
+    priority = 0xFFE7;
+    severity = ECmdCriticalSeverity;
+    dllname = "customcmds.dll";
+    ordinal = 16; // Clearstartupreason
+    retries = 2;
+    execution_behaviour = ESsmWaitForSignal;
+    }
+
+// ===========================================================================
+// DLL data items in alphabetical order
+// ===========================================================================
+//
+
+// ---------------------------------------------------------------------------
+// r_dlldata_activitymonitor_timeout
+// ---------------------------------------------------------------------------
+//
+RESOURCE CMD_PARAM_TIMEOUT r_dlldata_activitymonitor_timeout
+    {
+    timeout = 2;
+    }
+
+// ---------------------------------------------------------------------------
+// r_dlldata_sastate
+// ---------------------------------------------------------------------------
+//
+RESOURCE CMD_PARAM_STATE_CHANGE r_dlldata_sastate
+    {
+    mainstate = 0; // ESsmStartup
+    substate = ESsmStateNonCritical;
+    }
+
+// ---------------------------------------------------------------------------
+// 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_waitofflinequery
+// ---------------------------------------------------------------------------
+//
+RESOURCE CMD_PARAM_WAIT_PS_2 r_dlldata_waitofflinequery
+    {
+    category = 0x101F8766;  // KPSUidStartup
+    key = 0x00000011;       // KStartupBootIntoOffline
+    target1 = 101;          // EBootIntoOnlineMode
+    target2 = 102;          // EBootIntoOfflineMode
+    }
+
+// ===========================================================================
+// 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_pnp_mobile_services
+// ---------------------------------------------------------------------------
+//
+RESOURCE SSM_CND_FEATURE_VALUE r_cond_feat_pnp_mobile_services
+    {
+    feature_id = KFeatureIdPlugAndPlayMobileServices;
+    }
+
+// ---------------------------------------------------------------------------
+// r_cond_feat_sdnd
+// ---------------------------------------------------------------------------
+//
+RESOURCE SSM_CND_FEATURE_VALUE r_cond_feat_sdnd
+    {
+    feature_id = KFeatureIdSdnd;
+    }
+
+// ---------------------------------------------------------------------------
+// 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_no_sdnd
+// ---------------------------------------------------------------------------
+//
+RESOURCE SSM_CND_LOGICAL_NOT r_cond_no_sdnd
+    {
+    sub_condition = r_cond_feat_sdnd;
+    }
+
+// ---------------------------------------------------------------------------
+// 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_fotareset
+// ---------------------------------------------------------------------------
+//
+RESOURCE SSM_CND_PUB_SUB_VALUE r_cond_ps_fotareset
+    {
+    category = 0x101F8766; // KPSUidStartup
+    key = 0x00000045;      // KPSStartupReason
+    value = EFirmwareUpdate;
+    }
+
+// ---------------------------------------------------------------------------
+// r_cond_ps_simusable
+// ---------------------------------------------------------------------------
+//
+RESOURCE SSM_CND_PUB_SUB_VALUE r_cond_ps_simusable
+    {
+    category = 0x101F8766; // KPSUidStartup
+    key = 0x00000031;      // KPSSimStatus
+    value = 101;           // ESimUsable
+    }
+
+// ---------------------------------------------------------------------------
+// r_cond_simnotusable
+// ---------------------------------------------------------------------------
+//
+RESOURCE SSM_CND_LOGICAL_NOT r_cond_simnotusable
+    {
+    sub_condition = r_cond_ps_simusable;
+    }
+
+// ---------------------------------------------------------------------------
+// r_cond_simnotusable_or_bootoffline
+// ---------------------------------------------------------------------------
+//
+RESOURCE SSM_CND_LOGICAL_OR r_cond_simnotusable_or_bootoffline
+    {
+    lhs = r_cond_simnotusable;
+    rhs = r_cond_ps_bootoffline;
+    }
+
+// ---------------------------------------------------------------------------
+// r_cond_simusable_and_bootonline
+// ---------------------------------------------------------------------------
+//
+RESOURCE SSM_CND_LOGICAL_AND r_cond_simusable_and_bootonline
+    {
+    lhs = r_cond_ps_simusable;
+    rhs = r_cond_ps_bootonline;
+    }
+
+// ---------------------------------------------------------------------------
+// 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 "stem_monitoring.rss"
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/startup/stem_noncriticalcmdlist_ext.rss	Sun Oct 10 16:22:15 2010 +0100
@@ -0,0 +1,892 @@
+/*
+* 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 <ssm/conditionresourcetypes.rh>
+#include <ssm/ssmcmd.rh>
+#include <ssm/startupreason.h>
+#include <ssm/clayerswp.hrh>
+
+#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_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 0x7F55
+        r_cmd_createswp_noncriticalphase,
+				// prio 0x7F54
+        r_cmd_setswp_noncriticalstart
+        };
+    }
+
+// ===========================================================================
+// Command items in alphabetical order
+// ===========================================================================
+//
+
+// ---------------------------------------------------------------------------
+// r_cmd_amastart
+// ---------------------------------------------------------------------------
+//
+RESOURCE SSM_START_AMA_STARTER r_cmd_amastart
+    {
+    priority = 0x7F97;
+    conditional_information = r_cond_ps_normalboot;
+    }
+
+// ---------------------------------------------------------------------------
+// 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 = 100000;		//  FCOA-87UBXX
+    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_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_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_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_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_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_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_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_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_max_restarts_ignore;
+     }
+
+// ---------------------------------------------------------------------------
+// r_cmd_createswp_noncriticalphase
+// ---------------------------------------------------------------------------
+//
+RESOURCE SSM_CREATE_SYSTEM_WIDE_PROPERTY r_cmd_createswp_noncriticalphase
+    {
+    priority = 0x7F55;
+    severity = ECmdCriticalSeverity;
+    key = SWP_UID_SSM_NONCRITICAL_PHASE;
+    filename = "ssmnoncriticalswppolicy.dll";
+    }
+
+// ---------------------------------------------------------------------------
+// r_cmd_setswp_noncriticalstart
+// ---------------------------------------------------------------------------
+//
+RESOURCE SSM_REQUEST_SYSTEM_WIDE_PROPERTY r_cmd_setswp_noncriticalstart
+    {
+    priority = 0x7F54;
+    key = SWP_UID_SSM_NONCRITICAL_PHASE;
+    value = ESsmNonCriticalPhaseStarted;
+    }
+
+// ---------------------------------------------------------------------------
+// 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_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 "stem_monitoring.rss"
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/startup/stem_noncriticalcmdlist_hw.rss	Sun Oct 10 16:22:15 2010 +0100
@@ -0,0 +1,223 @@
+/*
+* 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 (HW-specific additions).
+*
+*/
+
+#include <ssm/conditionresourcetypes.rh>
+#include <ssm/ssmcmd.rh>
+#include <ssm/startupreason.h>
+
+#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_connlogger,
+        r_cmd_provisioning,
+#ifndef SYMBIAN_EXCLUDE_SIP
+        r_cmd_sipprofilesrv,
+#endif // defined !SYMBIAN_EXCLUDE_SIP
+        r_cmd_remotelock,
+	// prio 0x7EF1
+	r_cmd_activitymonitor1,
+	// prio 0x7EF0
+	r_cmd_devencstarter
+// prio 0x7EEB
+#ifdef  FF_MOBILITY_MANAGEMENT_ERRORS
+	,r_cmd_item_nwnotifier
+#endif // FF_MOBILITY_MANAGEMENT_ERRORS
+        };
+    }
+
+// ===========================================================================
+// Command items in alphabetical order
+// ===========================================================================
+//
+
+// ---------------------------------------------------------------------------
+// r_cmd_activitymonitor1
+// ---------------------------------------------------------------------------
+//
+RESOURCE SSM_START_CUSTOM_COMMAND r_cmd_activitymonitor1
+    {
+    priority = 0x7EF1;
+    severity = ECmdCriticalSeverity;
+    execution_behaviour = ESsmWaitForSignal;
+    dllname = "ssmactivitycmd.dll";
+    ordinal = 1; // SsmActivityCmdNewL
+    retries = 2;
+    dll_data = r_dlldata_activitymonitor_timeout;
+    }
+	
+	
+// ---------------------------------------------------------------------------
+// r_cmd_connlogger
+// ---------------------------------------------------------------------------
+//
+RESOURCE SSM_START_PROCESS_INFO r_cmd_connlogger
+    {
+    priority = 0xFFA7;
+    name = "z:\\sys\\bin\\dataconnectionlogger.exe";
+    execution_behaviour = ESsmFireAndForget;
+    monitor_info = r_mon_3_restarts_ignore;
+    }
+	
+
+// ---------------------------------------------------------------------------
+// r_cmd_devencstarter
+// ---------------------------------------------------------------------------
+//
+RESOURCE SSM_START_APP_INFO r_cmd_devencstarter
+    {
+    priority = 0x7EF0;
+    name = "z:\\sys\\bin\\devencstarter.exe";
+    execution_behaviour = ESsmWaitForSignal;
+    timeout = 10000;
+    background = 1; // To background
+    } 
+	
+	
+// ---------------------------------------------------------------------------
+// r_cmd_provisioning
+// ---------------------------------------------------------------------------
+//
+RESOURCE SSM_START_PROCESS_INFO r_cmd_provisioning
+    {
+    priority = 0xFFA7;
+    name = "z:\\sys\\bin\\provisioningsc.exe";
+    execution_behaviour = ESsmFireAndForget; // -- does not call Rendezvous() --
+    conditional_information = r_cond_feat_smartcardprov;
+    }
+
+// ---------------------------------------------------------------------------
+// r_cmd_remotelock
+// ---------------------------------------------------------------------------
+//
+RESOURCE SSM_START_PROCESS_INFO r_cmd_remotelock
+    {
+    priority = 0xFFA7;
+    name = "z:\\sys\\bin\\rlock.exe";
+    execution_behaviour = ESsmFireAndForget; // -- does not call Rendezvous() --
+    conditional_information = r_cond_feat_remotelock;
+    monitor_info = r_mon_3_restarts_ignore;
+    }
+
+// ---------------------------------------------------------------------------
+// r_cmd_sipprofilesrv
+// ---------------------------------------------------------------------------
+//
+#ifndef SYMBIAN_EXCLUDE_SIP
+RESOURCE SSM_START_PROCESS_INFO r_cmd_sipprofilesrv
+    {
+    priority = 0xFFA7;
+    name = "z:\\sys\\bin\\sipprofilesrv.exe";
+    execution_behaviour = ESsmFireAndForget; // -- does not call Rendezvous() --
+    }
+#endif // !SYMBIAN_EXCLUDE_SIP
+
+	
+#ifdef  FF_MOBILITY_MANAGEMENT_ERRORS
+// ---------------------------------------------------------------------------
+// r_cmd_item_nwnotifier
+// Start list item for network notifier
+// ---------------------------------------------------------------------------
+//
+RESOURCE SSM_START_PROCESS_INFO r_cmd_item_nwnotifier
+    {
+	priority = 0x7EEB;
+    name = "z:\\sys\\bin\\nwnotifier.exe";
+	execution_behaviour = ESsmWaitForSignal;
+    retries = 3;
+    }
+#endif // FF_MOBILITY_MANAGEMENT_ERRORS
+
+
+// ===========================================================================
+// Conditional blocks in alphabetical order
+// ===========================================================================
+//
+
+// ---------------------------------------------------------------------------
+// r_cond_feat_remotelock
+// ---------------------------------------------------------------------------
+//
+RESOURCE SSM_CND_FEATURE_VALUE r_cond_feat_remotelock
+    {
+    feature_id = KFeatureIdRemoteLock;
+    }
+
+// ---------------------------------------------------------------------------
+// r_cond_feat_smartcardprov
+// ---------------------------------------------------------------------------
+//
+RESOURCE SSM_CND_FEATURE_VALUE r_cond_feat_smartcardprov
+    {
+    feature_id = KFeatureIdSmartCardProv;
+    }
+
+// ---------------------------------------------------------------------------
+// r_dlldata_activitymonitor_timeout
+// ---------------------------------------------------------------------------
+//
+RESOURCE CMD_PARAM_TIMEOUT r_dlldata_activitymonitor_timeout
+    {
+    timeout = 2;
+    }
+
+// monitoring.rss contains resource definitions, so it may not be included
+// before entry point.
+#include "stem_monitoring.rss"
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/startup/stem_noncriticalswpcmdlists.rss	Sun Oct 10 16:22:15 2010 +0100
@@ -0,0 +1,439 @@
+/*
+* Copyright (c) 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 lists for the noncritical phase SWP:
+*   - non-critical phase Started
+*
+*/
+
+#include <ssm/conditionresourcetypes.rh>
+#include <ssm/ssmcmd.rh>
+
+#include "ssmswp.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 = ESsmNonCriticalPhaseStarted;
+            resource_id = r_noncriticalphase_commands;
+            }
+        };
+    }
+
+// ===========================================================================
+// Command lists in alphabetical order
+// ===========================================================================
+//
+
+// ---------------------------------------------------------------------------
+// r_started_commands
+// ---------------------------------------------------------------------------
+//
+RESOURCE SSM_COMMAND_LIST r_noncriticalphase_commands
+    {
+    commands =
+        {
+        // prio 0xFFF1
+        r_cmd_publishswp,
+        // 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_clock,	//ESLT-842J9W
+        // 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
+#ifdef FF_ATT_ADDRESS_BK
+        //prio 0x7EEA
+        ,r_cmd_activitymonitor9,
+        //prio 0x7EE9
+        r_cmd_aab
+#endif
+		// prio 0x7EE8
+		,r_cmd_activitymonitor10,
+		// prio 0x7EE7
+		r_cmd_calendar //CR:MMUN-82ZHAD
+    	};
+    }
+
+// -----------------------------------------------------------------------------
+// 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
+// ---------------------------------------------------------------------------
+//
+#ifdef FF_ATT_ADDRESS_BK
+RESOURCE SSM_START_CUSTOM_COMMAND r_cmd_activitymonitor9
+    {
+    priority = 0x7EEA;
+    severity = ECmdCriticalSeverity;
+    execution_behaviour = ESsmWaitForSignal;
+    dllname = "ssmactivitycmd.dll";
+    ordinal = 1; // SsmActivityCmdNewL
+    retries = 2;
+    dll_data = r_dlldata_activitymonitor_timeout;
+    }
+#endif
+
+// ---------------------------------------------------------------------------
+// r_cmd_activitymonitor10
+// ---------------------------------------------------------------------------
+//
+RESOURCE SSM_START_CUSTOM_COMMAND r_cmd_activitymonitor10
+    {
+    priority = 0x7EE8;
+    severity = ECmdCriticalSeverity;
+    execution_behaviour = ESsmWaitForSignal;
+    dllname = "ssmactivitycmd.dll";
+    ordinal = 1; // SsmActivityCmdNewL
+    retries = 2;
+    dll_data = r_dlldata_activitymonitor_timeout;
+    }
+
+// ---------------------------------------------------------------------------
+// r_cmd_autosync
+// ---------------------------------------------------------------------------
+//	
+RESOURCE SSM_START_PROCESS_INFO r_cmd_autosync
+    {
+    priority = 0x7EEE;
+    execution_behaviour = ESsmFireAndForget;
+    retries = 3;
+    name = "cctautosync.exe";
+    }
+
+// ---------------------------------------------------------------------------
+// r_cmd_calendar
+// ---------------------------------------------------------------------------
+//
+RESOURCE SSM_START_APP_INFO r_cmd_calendar
+	{
+   	priority = 0x7EE7;
+	name = "calendar.exe";
+	execution_behaviour = ESsmFireAndForget;
+	retries = 3;
+	background = 1; // To background
+    }
+
+// ---------------------------------------------------------------------------
+// r_cmd_clock
+// ---------------------------------------------------------------------------
+//
+RESOURCE SSM_START_APP_INFO r_cmd_clock
+    {
+    priority = 0x7EF8;
+    name = "clock.exe";
+    execution_behaviour = ESsmWaitForSignal;
+    timeout = 10000;
+    background = 1; // To background
+    }
+
+// ---------------------------------------------------------------------------
+// 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_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_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_publishswp
+// ---------------------------------------------------------------------------
+//
+RESOURCE SSM_PUBLISH_SYSTEM_WIDE_PROPERTY r_cmd_publishswp
+    {
+    priority = 0xFFF1;
+    severity = ECmdCriticalSeverity;
+    }
+
+// ---------------------------------------------------------------------------
+// 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_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_videocenter
+// ---------------------------------------------------------------------------
+//
+RESOURCE SSM_START_PROCESS_INFO r_cmd_videocenter
+    {
+    priority = 0x7EF6;
+    name = "cseschedulerserver.exe";
+    execution_behaviour = ESsmWaitForSignal;
+    timeout = 10000;
+    }
+
+// ===========================================================================
+// Conditional blocks in alphabetical order
+// ===========================================================================
+//
+// ---------------------------------------------------------------------------
+// r_cond_feat_iadv2
+// ---------------------------------------------------------------------------
+//
+RESOURCE SSM_CND_FEATURE_VALUE r_cond_feat_iadv2
+    {
+    feature_id = KFeatureIdFfIaupdatePhase2;
+    }
+
+// ===========================================================================
+// DLL data items in alphabetical order
+// ===========================================================================
+//
+
+// ---------------------------------------------------------------------------
+// r_dlldata_activitymonitor_timeout
+// ---------------------------------------------------------------------------
+//
+RESOURCE CMD_PARAM_TIMEOUT r_dlldata_activitymonitor_timeout
+    {
+    timeout = 2;
+    }
+
+
+// monitoring.rss contains resource definitions, so it may not be included
+// before entry point.
+#include "stem_monitoring.rss"
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/startup/stem_preuiservicescmdlist.rss	Sun Oct 10 16:22:15 2010 +0100
@@ -0,0 +1,200 @@
+/*
+* Copyright (c) 2009 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 Pre-UI-Services startup state.
+*
+*/
+
+#include <ssm/conditionresourcetypes.rh>
+#include <ssm/ssmcmd.rh>
+
+#include "ssmsubstateext.hrh"
+
+// 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 = ESsmStatePreUiServices;
+            resource_id = r_cmds;
+            }
+        };
+    }
+
+// ===========================================================================
+// Command lists in alphabetical order
+// ===========================================================================
+//
+
+// ---------------------------------------------------------------------------
+// r_cmds
+// ---------------------------------------------------------------------------
+//
+RESOURCE SSM_COMMAND_LIST r_cmds
+    {
+    commands =
+        {
+        r_cmd_publishstate, // prio 0xFFF1
+        // prio 0xFE01
+        r_cmd_sysagt,
+        r_cmd_initpskeys,
+        r_cmd_checkuserdrive,
+        r_cmd_deltempfiles,
+        r_cmd_reservedisk,
+        r_cmd_sysmon,
+        r_cmd_ssmutilsrv,
+        r_cmd_multiwaitforever // prio 0xFE00
+        };
+    }
+
+// ===========================================================================
+// Command items in alphabetical order
+// ===========================================================================
+//
+
+// ---------------------------------------------------------------------------
+// r_cmd_checkuserdrive
+// ---------------------------------------------------------------------------
+//
+RESOURCE SSM_START_CUSTOM_COMMAND r_cmd_checkuserdrive
+    {
+    priority = 0xFE01;
+    execution_behaviour = ESsmDeferredWaitForSignal;
+    severity = ECmdCriticalSeverity;
+    dllname = "customcmds.dll";
+    ordinal = 13; // CheckUserDrive
+    unload_on_finish = ENeverUnload;
+    retries = 2;
+    }
+
+// ---------------------------------------------------------------------------
+// r_cmd_deltempfiles
+// ---------------------------------------------------------------------------
+//
+RESOURCE SSM_START_CUSTOM_COMMAND r_cmd_deltempfiles
+    {
+    priority = 0xFE01;
+    execution_behaviour = ESsmDeferredWaitForSignal;
+    severity = ECmdCriticalSeverity;
+    dllname = "customcmds.dll";
+    ordinal = 15; // DeleteTempFiles
+    unload_on_finish = ENeverUnload;
+    retries = 2;
+    }
+
+// ---------------------------------------------------------------------------
+// r_cmd_initpskeys
+// ---------------------------------------------------------------------------
+//
+RESOURCE SSM_START_CUSTOM_COMMAND r_cmd_initpskeys
+    {
+    priority = 0xFE01;
+    execution_behaviour = ESsmDeferredWaitForSignal;
+    severity = ECmdCriticalSeverity;
+    dllname = "ssmsystemcmds.dll";
+    ordinal = 1; // InitPsKeys
+    unload_on_finish = ENeverUnload;
+    retries = 2;
+    }
+
+// ---------------------------------------------------------------------------
+// r_cmd_multiwaitforever
+// ---------------------------------------------------------------------------
+//
+RESOURCE SSM_MULTIPLE_WAIT r_cmd_multiwaitforever
+    {
+    priority = 0xFE00;
+    }
+
+// ---------------------------------------------------------------------------
+// r_cmd_publishstate
+// ---------------------------------------------------------------------------
+//
+RESOURCE SSM_PUBLISH_SYSTEM_STATE r_cmd_publishstate
+    {
+    priority = 0xFFF1;
+    retries = 2;
+    }
+
+// ---------------------------------------------------------------------------
+// r_cmd_reservedisk
+// ---------------------------------------------------------------------------
+//
+RESOURCE SSM_START_PROCESS_INFO r_cmd_reservedisk
+    {
+    priority = 0xFE01;
+    execution_behaviour = ESsmFireAndForget;
+    name = "Z:\\sys\\bin\\ssmdiskreserver.exe";
+    severity = ECmdCriticalSeverity;
+    retries = 2;
+    }
+
+// ---------------------------------------------------------------------------
+// r_cmd_ssmutilsrv
+// ---------------------------------------------------------------------------
+//
+RESOURCE SSM_START_PROCESS_INFO r_cmd_ssmutilsrv
+    {
+    priority = 0xFE01;
+    execution_behaviour = ESsmDeferredWaitForSignal;
+    name = "Z:\\sys\\bin\\ssmutilsrv.exe";
+    severity = ECmdCriticalSeverity;
+    retries = 2;
+    }
+
+// ---------------------------------------------------------------------------
+// r_cmd_sysagt
+// ---------------------------------------------------------------------------
+//
+RESOURCE SSM_START_PROCESS_INFO r_cmd_sysagt
+    {
+    priority = 0xFE01;
+    execution_behaviour = ESsmDeferredWaitForSignal;
+    name = "Z:\\sys\\bin\\sysagt2svr.exe";
+    severity = ECmdCriticalSeverity;
+    retries = 2;
+    }
+
+// ---------------------------------------------------------------------------
+// r_cmd_sysmon
+// ---------------------------------------------------------------------------
+//
+RESOURCE SSM_START_PROCESS_INFO r_cmd_sysmon
+    {
+    priority = 0xFE01;
+    execution_behaviour = ESsmDeferredWaitForSignal;
+    name = "Z:\\sys\\bin\\sysmon.exe";
+    severity = ECmdCriticalSeverity;
+    retries = 2;
+    // It can't monitor itself
+    }
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/startup/stem_rfswpcmdlists.rss	Sun Oct 10 16:22:15 2010 +0100
@@ -0,0 +1,247 @@
+/*
+* Copyright (c) 2009 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 lists for the RF SWP:
+*   - Normal RF On.
+*   - Normal RF Off.
+*   - Normal BT SAP.
+*
+*/
+
+#include <ssm/ssmcmd.rh>
+#include <ssm/clayerswp.hrh>
+
+#include "ssmswp.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 = ESsmRfOn;
+            resource_id = r_online_commands;
+            },
+        SSM_COMMANDLISTID_TO_RESOURCEID
+            {
+            command_list_id = ESsmRfOff;
+            resource_id = r_offline_commands;
+            },
+        SSM_COMMANDLISTID_TO_RESOURCEID
+            {
+            command_list_id = ESsmBtSap;
+            resource_id = r_btsap_commands;
+            }
+        };
+    }
+
+// ===========================================================================
+// Command lists in alphabetical order
+// ===========================================================================
+//
+
+// ---------------------------------------------------------------------------
+// r_btsap_commands
+// ---------------------------------------------------------------------------
+//
+RESOURCE SSM_COMMAND_LIST r_btsap_commands
+    {
+    commands =
+        {
+        r_cmd_sastate_btsap,    // This needs to be the first command in state, prio 0xFFF2
+        r_cmd_publishswp,       // prio 0xFFF1
+        r_cmd_psstate_btsap     // prio 0xFFF0
+        };
+    }
+
+// ---------------------------------------------------------------------------
+// r_offline_commands
+// ---------------------------------------------------------------------------
+//
+RESOURCE SSM_COMMAND_LIST r_offline_commands
+    {
+    commands =
+        {
+        r_cmd_sastate_offline,  // This needs to be the first command in state, prio 0xFFF2
+        r_cmd_publishswp,       // prio 0xFFF1
+        r_cmd_psstate_offline   // prio 0xFFF0
+        };
+    }
+
+// ---------------------------------------------------------------------------
+// r_online_commands
+// ---------------------------------------------------------------------------
+//
+RESOURCE SSM_COMMAND_LIST r_online_commands
+    {
+    commands =
+        {
+        r_cmd_sastate_online,   // This needs to be the first command in state, prio 0xFFF2
+        r_cmd_publishswp,       // prio 0xFFF1
+        r_cmd_psstate_online    // prio 0xFFF0
+        };
+    }
+
+// ===========================================================================
+// Command items in alphabetical order
+// ===========================================================================
+//
+
+// ---------------------------------------------------------------------------
+// r_cmd_psstate_btsap
+// ---------------------------------------------------------------------------
+//
+RESOURCE SSM_SET_PUBLISH_AND_SUBSCRIBE r_cmd_psstate_btsap
+    {
+    priority = 0xFFF0;
+    severity = ECmdCriticalSeverity;
+    category = 0x101F8766; // KPSUidStartup
+    key      = 0x00000041; // KPSGlobalSystemState
+    value    = 111;        // ESwStateNormalBTSap
+    }
+
+// ---------------------------------------------------------------------------
+// r_cmd_psstate_offline
+// ---------------------------------------------------------------------------
+//
+RESOURCE SSM_SET_PUBLISH_AND_SUBSCRIBE r_cmd_psstate_offline
+    {
+    priority = 0xFFF0;
+    severity = ECmdCriticalSeverity;
+    category = 0x101F8766; // KPSUidStartup
+    key      = 0x00000041; // KPSGlobalSystemState
+    value    = 110;        // ESwStateNormalRfOff
+    }
+
+// ---------------------------------------------------------------------------
+// r_cmd_psstate_online
+// ---------------------------------------------------------------------------
+//
+RESOURCE SSM_SET_PUBLISH_AND_SUBSCRIBE r_cmd_psstate_online
+    {
+    priority = 0xFFF0;
+    severity = ECmdCriticalSeverity;
+    category = 0x101F8766; // KPSUidStartup
+    key      = 0x00000041; // KPSGlobalSystemState
+    value    = 109;        // ESwStateNormalRfOn
+    }
+
+// ---------------------------------------------------------------------------
+// r_cmd_publishswp
+// ---------------------------------------------------------------------------
+//
+RESOURCE SSM_PUBLISH_SYSTEM_WIDE_PROPERTY r_cmd_publishswp
+    {
+    priority = 0xFFF1;
+    severity = ECmdCriticalSeverity;
+    }
+
+// ---------------------------------------------------------------------------
+// r_cmd_sastate_btsap
+// ---------------------------------------------------------------------------
+//
+RESOURCE SSM_START_CUSTOM_COMMAND r_cmd_sastate_btsap
+    {
+    priority = 0xFFF2;
+    severity = ECmdCriticalSeverity;
+    dllname = "customcmds.dll";
+    ordinal = 8;
+    unload_on_finish = ENeverUnload;
+    retries = 2;
+    dll_data = r_dlldata_sastate_btsap;
+    }
+
+// ---------------------------------------------------------------------------
+// r_cmd_sastate_offline
+// ---------------------------------------------------------------------------
+//
+RESOURCE SSM_START_CUSTOM_COMMAND r_cmd_sastate_offline
+    {
+    priority = 0xFFF2;
+    severity = ECmdCriticalSeverity;
+    dllname = "customcmds.dll";
+    ordinal = 8;
+    unload_on_finish = ENeverUnload;
+    retries = 2;
+    dll_data = r_dlldata_sastate_offline;
+    }
+
+// ---------------------------------------------------------------------------
+// r_cmd_sastate_online
+// ---------------------------------------------------------------------------
+//
+RESOURCE SSM_START_CUSTOM_COMMAND r_cmd_sastate_online
+    {
+    priority = 0xFFF2;
+    severity = ECmdCriticalSeverity;
+    dllname = "customcmds.dll";
+    ordinal = 8;
+    unload_on_finish = ENeverUnload;
+    retries = 2;
+    dll_data = r_dlldata_sastate_online;
+    }
+
+// ===========================================================================
+// DLL data items in alphabetical order
+// ===========================================================================
+//
+
+// ---------------------------------------------------------------------------
+// r_dlldata_sastate_btsap
+// ---------------------------------------------------------------------------
+//
+RESOURCE CMD_PARAM_STATE_CHANGE r_dlldata_sastate_btsap
+    {
+    mainstate = 1; // ESsmNormal
+    substate = 0x1B;
+    }
+
+// ---------------------------------------------------------------------------
+// r_dlldata_sastate_offline
+// ---------------------------------------------------------------------------
+//
+RESOURCE CMD_PARAM_STATE_CHANGE r_dlldata_sastate_offline
+    {
+    mainstate = 1; // ESsmNormal
+    substate = 0x1A;
+    }
+
+// ---------------------------------------------------------------------------
+// r_dlldata_sastate_online
+// ---------------------------------------------------------------------------
+//
+RESOURCE CMD_PARAM_STATE_CHANGE r_dlldata_sastate_online
+    {
+    mainstate = 1; // ESsmNormal
+    substate = 0x19;
+    }
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/startup/stem_securitycheckcmdlist.rss	Sun Oct 10 16:22:15 2010 +0100
@@ -0,0 +1,346 @@
+/*
+* 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 Security Check startup state.
+*
+*/
+
+#include <ssm/conditionresourcetypes.rh>
+#include <ssm/ssmcmd.rh>
+
+#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 = ESsmStateSecurityCheck;
+            resource_id = r_cmds;
+            }
+        };
+    }
+
+// ===========================================================================
+// Command lists in alphabetical order
+// ===========================================================================
+//
+
+// ---------------------------------------------------------------------------
+// r_cmds
+// ---------------------------------------------------------------------------
+//
+RESOURCE SSM_COMMAND_LIST r_cmds
+    {
+    commands =
+        {
+        r_cmd_sastate,      // This needs to be the first command in state, prio 0xFFF2
+        r_cmd_publishstate, // prio 0xFFF1
+        r_cmd_psstate,      // prio 0xFFF0
+        // prio 0xFFE7
+		r_cmd_menu,
+        r_cmd_idle,
+        // prio 0xFFE6
+        r_cmd_multiwaitforever1,
+        // prio 0xFFE3
+        r_cmd_startup,
+        r_cmd_phone,
+        r_cmd_nitz,
+        // prio 0xFFE2
+        r_cmd_multiwaitforever2,
+        // prio 0xFFDF
+        r_cmd_touchscreen,
+        r_cmd_touchplg,
+        // prio 0xFFDE
+        r_cmd_multiwaitforever3,
+        // prio 0xFFD8
+        r_cmd_createswp_simstatus,
+        // prio 0xFFD7
+        r_cmd_loadsup_simeventobserver,
+        // prio 0xFFD6
+        r_cmd_securitycheck
+        };
+    }
+
+// ===========================================================================
+// Command items in alphabetical order
+// ===========================================================================
+//
+
+// ---------------------------------------------------------------------------
+// r_cmd_createswp_simstatus
+// ---------------------------------------------------------------------------
+//
+RESOURCE SSM_CREATE_SYSTEM_WIDE_PROPERTY r_cmd_createswp_simstatus
+    {
+    priority = 0xFFD8;
+    severity = ECmdCriticalSeverity;
+    key = 0x00000031; // KPSSimStatus
+    filename = "ssm.swp.policy.simstatus.dll";
+    }
+
+// ---------------------------------------------------------------------------
+// r_cmd_idle
+// ---------------------------------------------------------------------------
+//
+RESOURCE SSM_START_PROCESS_INFO r_cmd_idle
+    {
+    priority = 0xFFE7;
+    name = "z:\\sys\\bin\\ailaunch.exe";
+    execution_behaviour = ESsmDeferredWaitForSignal;
+    monitor_info = r_mon_max_restarts_ignore;
+    }
+
+// ---------------------------------------------------------------------------
+// r_cmd_menu
+// ---------------------------------------------------------------------------
+//
+RESOURCE SSM_START_APP_INFO r_cmd_menu
+    {
+    priority = 0xFFE7;
+    name = "z:\\sys\\bin\\matrixmenu.exe";
+    execution_behaviour = ESsmDeferredWaitForSignal;
+    background = 1; // To background
+    }
+
+// ---------------------------------------------------------------------------
+// r_cmd_multiwaitforever1
+// ---------------------------------------------------------------------------
+//
+RESOURCE SSM_MULTIPLE_WAIT r_cmd_multiwaitforever1
+    {
+    priority = 0xFFE6;
+    }
+
+// ---------------------------------------------------------------------------
+// r_cmd_multiwaitforever2
+// ---------------------------------------------------------------------------
+//
+RESOURCE SSM_MULTIPLE_WAIT r_cmd_multiwaitforever2
+    {
+    priority = 0xFFE2;
+    }
+
+// ---------------------------------------------------------------------------
+// r_cmd_multiwaitforever3
+// ---------------------------------------------------------------------------
+//
+RESOURCE SSM_MULTIPLE_WAIT r_cmd_multiwaitforever3
+    {
+    priority = 0xFFDE;
+    }
+
+// ---------------------------------------------------------------------------
+// r_cmd_nitz
+// ---------------------------------------------------------------------------
+//
+RESOURCE SSM_START_PROCESS_INFO r_cmd_nitz
+    {
+    priority = 0xFFE3;
+    name = "z:\\sys\\bin\\clockserver.exe";
+    execution_behaviour = ESsmFireAndForget; // -- does not call Rendezvous() --
+    monitor_info = r_mon_3_restarts_ignore;
+    }
+
+// ---------------------------------------------------------------------------
+// r_cmd_phone
+// ---------------------------------------------------------------------------
+//
+RESOURCE SSM_START_APP_INFO r_cmd_phone
+    {
+    priority = 0xFFE3;
+    name = "z:\\sys\\bin\\phoneui.exe";
+    execution_behaviour = ESsmFireAndForget;
+    retries = 2;
+    background = 1; // To background
+    monitor_info = r_mon_reset;
+    }
+
+// ---------------------------------------------------------------------------
+// r_cmd_loadsup_simeventobserver
+// ---------------------------------------------------------------------------
+//
+RESOURCE SSM_START_SSM_UTILITY_PLUGIN r_cmd_loadsup_simeventobserver
+    {
+    priority = 0xFFD7;
+    severity = ECmdCriticalSeverity;
+    filename = "ssmclayersup.dll";
+    ordinal = 2; // SimEventObserverNewL
+    }
+
+// ---------------------------------------------------------------------------
+// r_cmd_psstate
+// ---------------------------------------------------------------------------
+//
+RESOURCE SSM_SET_PUBLISH_AND_SUBSCRIBE r_cmd_psstate
+    {
+    priority = 0xFFF0;
+    severity = ECmdCriticalSeverity;
+    category = 0x101F8766; // KPSUidStartup
+    key      = 0x00000041; // KPSGlobalSystemState
+    value    = 103;        // ESwStateSecurityCheck
+    }
+
+// ---------------------------------------------------------------------------
+// r_cmd_publishstate
+// ---------------------------------------------------------------------------
+//
+RESOURCE SSM_PUBLISH_SYSTEM_STATE r_cmd_publishstate
+    {
+    priority = 0xFFF1;
+    severity = ECmdCriticalSeverity;
+    retries = 2;
+    }
+
+// ---------------------------------------------------------------------------
+// r_cmd_sastate
+// ---------------------------------------------------------------------------
+//
+RESOURCE SSM_START_CUSTOM_COMMAND r_cmd_sastate
+    {
+    priority = 0xFFF2;
+    severity = ECmdCriticalSeverity;
+    dllname = "customcmds.dll";
+    ordinal = 8;
+    unload_on_finish = ENeverUnload;
+    retries = 2;
+    dll_data = r_dlldata_sastate;
+    }
+
+// ---------------------------------------------------------------------------
+// r_cmd_securitycheck
+// ---------------------------------------------------------------------------
+//
+RESOURCE SSM_START_CUSTOM_COMMAND r_cmd_securitycheck
+    {
+    priority = 0xFFD6;
+    severity = ECmdCriticalSeverity;
+    dllname = "customcmds.dll";
+    ordinal = 1;
+    unload_on_finish = ENeverUnload;
+    }
+
+// ---------------------------------------------------------------------------
+// r_cmd_startup
+// ---------------------------------------------------------------------------
+//
+RESOURCE SSM_START_PROCESS_INFO r_cmd_startup
+    {
+    priority = 0xFFE3;
+    name = "z:\\sys\\bin\\startup.exe";
+    execution_behaviour = ESsmDeferredWaitForSignal;
+    severity = ECmdCriticalSeverity;
+    retries = 2;
+    }
+
+// ---------------------------------------------------------------------------
+// r_cmd_touchplg
+// ---------------------------------------------------------------------------
+//
+RESOURCE SSM_START_CUSTOM_COMMAND r_cmd_touchplg
+    {
+    priority = 0xFFDF;
+    severity = ECmdCriticalSeverity;
+    dllname = "tsccustcmds.dll";
+    ordinal = 1;
+    retries = 2;
+    execution_behaviour = ESsmDeferredWaitForSignal;
+    conditional_information = r_cond_firstboot_and_tscinstartup;
+    }
+
+// ---------------------------------------------------------------------------
+// r_cmd_touchscreen
+// ---------------------------------------------------------------------------
+//
+RESOURCE SSM_START_PROCESS_INFO r_cmd_touchscreen
+    {
+    priority = 0xFFDF;
+    name = "z:\\sys\\bin\\touchscreencalib.exe";
+    execution_behaviour = ESsmDeferredWaitForSignal;
+    conditional_information = r_cond_firstboot_and_tscinstartup;
+    }
+
+// ===========================================================================
+// DLL data items in alphabetical order
+// ===========================================================================
+//
+
+// ---------------------------------------------------------------------------
+// r_dlldata_sastate
+// ---------------------------------------------------------------------------
+//
+RESOURCE CMD_PARAM_STATE_CHANGE r_dlldata_sastate
+    {
+    mainstate = 0; // ESsmStartup
+    substate = ESsmStateSecurityCheck;
+    }
+
+// ===========================================================================
+// 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_tscinstartup
+// ---------------------------------------------------------------------------
+//
+RESOURCE SSM_CND_FEATURE_VALUE r_cond_feat_tscinstartup
+    {
+    feature_id = KFeatureIdTouchscreencalibInStartup;
+    }
+
+// ---------------------------------------------------------------------------
+// r_cond_firstboot_and_tscinstartup
+// ---------------------------------------------------------------------------
+//
+RESOURCE SSM_CND_LOGICAL_AND r_cond_firstboot_and_tscinstartup
+    {
+    lhs = r_cond_feat_tscinstartup;
+    rhs = r_cond_ps_firstboot;
+    }
+
+// monitoring.rss contains resource definitions, so it may not be included
+// before entry point.
+#include "stem_monitoring.rss"
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/startup/stem_selftestokcmdlist.rss	Sun Oct 10 16:22:15 2010 +0100
@@ -0,0 +1,131 @@
+/*
+* Copyright (c) 2009 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 Selftest OK startup state.
+*
+*/
+
+#include <ssm/conditionresourcetypes.rh>
+#include <ssm/ssmcmd.rh>
+
+#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 = ESsmStateSelfTestOK;
+            resource_id = r_cmds;
+            }
+        };
+    }
+
+// ===========================================================================
+// Command lists in alphabetical order
+// ===========================================================================
+//
+
+// ---------------------------------------------------------------------------
+// r_cmds
+// ---------------------------------------------------------------------------
+//
+RESOURCE SSM_COMMAND_LIST r_cmds
+    {
+    commands =
+        {
+        r_cmd_sastate,          // This needs to be the first command in state, prio 0xFFF2
+        r_cmd_publishstate,     // prio 0xFFF1
+        r_cmd_psstate           // prio 0xFFF0
+        };
+    }
+
+// ===========================================================================
+// Command items in alphabetical order
+// ===========================================================================
+//
+
+// ---------------------------------------------------------------------------
+// r_cmd_psstate
+// ---------------------------------------------------------------------------
+//
+RESOURCE SSM_SET_PUBLISH_AND_SUBSCRIBE r_cmd_psstate
+    {
+    priority = 0xFFF0;
+    severity = ECmdCriticalSeverity;
+    category = 0x101F8766; // KPSUidStartup
+    key      = 0x00000041; // KPSGlobalSystemState
+    value    = 102;        // ESwStateSelfTestOK
+    }
+
+// ---------------------------------------------------------------------------
+// r_cmd_publishstate
+// ---------------------------------------------------------------------------
+//
+RESOURCE SSM_PUBLISH_SYSTEM_STATE r_cmd_publishstate
+    {
+    priority = 0xFFF1;
+    severity = ECmdCriticalSeverity;
+    retries = 2;
+    }
+
+// ---------------------------------------------------------------------------
+// r_cmd_sastate
+// ---------------------------------------------------------------------------
+//
+RESOURCE SSM_START_CUSTOM_COMMAND r_cmd_sastate
+    {
+    priority = 0xFFF2;
+    severity = ECmdCriticalSeverity;
+    dllname = "customcmds.dll";
+    ordinal = 8;
+    unload_on_finish = ENeverUnload;
+    retries = 2;
+    dll_data = r_dlldata_sastate;
+    }
+
+// ===========================================================================
+// DLL data items in alphabetical order
+// ===========================================================================
+//
+
+// ---------------------------------------------------------------------------
+// r_dlldata_sastate
+// ---------------------------------------------------------------------------
+//
+RESOURCE CMD_PARAM_STATE_CHANGE r_dlldata_sastate
+    {
+    mainstate = 0; // ESsmStartup
+    substate = ESsmStateSelfTestOK;
+    }
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/startup/stem_shutdowncmdlists.rss	Sun Oct 10 16:22:15 2010 +0100
@@ -0,0 +1,261 @@
+/*
+* 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 Selftest OK startup state.
+*
+*/
+
+#include <ssm/conditionresourcetypes.rh>
+#include <ssm/ssmcmd.rh>
+
+#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 = ESsmErrorShutdown;
+            resource_id = r_initialcmds;
+            },
+        SSM_COMMANDLISTID_TO_RESOURCEID
+            {
+            command_list_id = ESsmNormalShutdown;
+            resource_id = r_initialcmds;
+            },
+        SSM_COMMANDLISTID_TO_RESOURCEID
+            {
+            command_list_id = ESsmShutdownSubStateCritical;
+            resource_id = r_criticalcmds;
+            },
+        SSM_COMMANDLISTID_TO_RESOURCEID
+            {
+            command_list_id = ESsmShutdownSubStateNonCritical;
+            resource_id = r_noncriticalcmds;
+            },
+        SSM_COMMANDLISTID_TO_RESOURCEID
+            {
+            command_list_id = ESsmShutdownSubStatePowerOff;
+            resource_id = r_poweroffcmds;
+            }
+        };
+    }
+
+// ===========================================================================
+// Command lists in alphabetical order
+// ===========================================================================
+//
+
+// ---------------------------------------------------------------------------
+// r_criticalcmds
+// ---------------------------------------------------------------------------
+//
+RESOURCE SSM_COMMAND_LIST r_criticalcmds
+    {
+    commands =
+        {
+        r_cmd_sastate,          // This needs to be the first command in state, prio 0xFFF2
+        r_cmd_publishstate,     // prio 0xFFF1
+        r_cmd_psstate,          // prio 0xFFF0
+        r_cmd_cancelmonitoring, // prio 0xFFE8
+	r_cmd_shutdownapps      // prio 0xFFE7
+        };
+    }
+
+// ---------------------------------------------------------------------------
+// r_initialcmds
+// ---------------------------------------------------------------------------
+//
+RESOURCE SSM_COMMAND_LIST r_initialcmds
+    {
+    commands =
+        {
+        r_cmd_publishstate	// prio 0xFFF1
+        };
+    }
+
+// ---------------------------------------------------------------------------
+// r_noncriticalcmds
+// ---------------------------------------------------------------------------
+//
+RESOURCE SSM_COMMAND_LIST r_noncriticalcmds
+    {
+    commands =
+        {
+        r_cmd_publishstate,     // prio 0xFFF1
+        // prio 0xFFE7
+        r_cmd_killsplash,
+        r_cmd_finalisedrives,
+        r_cmd_sashutdown
+        };
+    }
+
+// ---------------------------------------------------------------------------
+// r_poweroffcmds
+// ---------------------------------------------------------------------------
+//
+RESOURCE SSM_COMMAND_LIST r_poweroffcmds
+    {
+    commands =
+        {
+        r_cmd_publishstate,     // prio 0xFFF1
+        r_cmd_poweroff          // This is always the last command
+        };
+    }
+
+// ===========================================================================
+// Command items in alphabetical order
+// ===========================================================================
+//
+// ---------------------------------------------------------------------------
+// r_cmd_cancelmonitoring
+// This command should be executed before shutdown apps
+// ---------------------------------------------------------------------------
+//
+RESOURCE SSM_START_CUSTOM_COMMAND r_cmd_cancelmonitoring
+	{
+	priority = 0xFFE8;
+	severity = ECmdCriticalSeverity;
+	dllname = "cmncustomcmds.dll";
+	ordinal = 3; // Request to the sysmon server to cancel all the outstanding monitors
+	retries = 2;
+	}
+
+// ---------------------------------------------------------------------------
+// r_cmd_shutdownapps
+// ---------------------------------------------------------------------------
+//
+RESOURCE SSM_START_CUSTOM_COMMAND r_cmd_shutdownapps
+    {
+    priority = 0xFFE7;
+    dllname = "akncustcmds.dll";
+    ordinal = 3; // AknShutdownApps
+    }
+
+// ---------------------------------------------------------------------------
+// r_cmd_finalisedrives
+// ---------------------------------------------------------------------------
+//
+RESOURCE SSM_FINALISE_DRIVES r_cmd_finalisedrives
+    {
+//    priority = 0xFFE7;
+    }
+
+// ---------------------------------------------------------------------------
+// r_cmd_killsplash
+// ---------------------------------------------------------------------------
+//
+RESOURCE SSM_SET_PUBLISH_AND_SUBSCRIBE r_cmd_killsplash
+    {
+    priority = 0xFFE7;
+    category = 0x101F8766; // KPSUidStartup
+    key      = 0x00000301; // KPSSplashShutdown
+    value    = 101;        // ESplashShutdown
+    }
+
+// ---------------------------------------------------------------------------
+// r_cmd_poweroff
+// ---------------------------------------------------------------------------
+//
+RESOURCE SSM_POWER_OFF r_cmd_poweroff
+    {
+    power_state = 1; // EPwStandby
+    }
+
+// ---------------------------------------------------------------------------
+// r_cmd_psstate
+// ---------------------------------------------------------------------------
+//
+RESOURCE SSM_SET_PUBLISH_AND_SUBSCRIBE r_cmd_psstate
+    {
+    priority = 0xFFF0;
+    severity = ECmdCriticalSeverity;
+    category = 0x101F8766; // KPSUidStartup
+    key      = 0x00000041; // KPSGlobalSystemState
+    value    = 117;        // ESwStateShuttingDown
+    }
+
+// ---------------------------------------------------------------------------
+// r_cmd_publishstate
+// ---------------------------------------------------------------------------
+//
+RESOURCE SSM_PUBLISH_SYSTEM_STATE r_cmd_publishstate
+    {
+    priority = 0xFFF1;
+    severity = ECmdCriticalSeverity;
+    direction = 1;  // ETraverseChildrenFirst, Transition children first for graceful shutdown.
+    retries = 2;
+    }
+
+// ---------------------------------------------------------------------------
+// r_cmd_sashutdown
+// ---------------------------------------------------------------------------
+//
+RESOURCE SSM_START_CUSTOM_COMMAND r_cmd_sashutdown
+    {
+    priority = 0xFFE7;
+    dllname = "ssmsystemcmds.dll";
+    ordinal = 7; // SaShutdown
+    retries = 2;
+    }
+
+// ---------------------------------------------------------------------------
+// r_cmd_sastate
+// ---------------------------------------------------------------------------
+//
+RESOURCE SSM_START_CUSTOM_COMMAND r_cmd_sastate
+    {
+    priority = 0xFFF2;
+    severity = ECmdCriticalSeverity;
+    dllname = "customcmds.dll";
+    ordinal = 8;
+    unload_on_finish = ENeverUnload;
+    retries = 2;
+    dll_data = r_dlldata_sastate;
+    }
+
+// ===========================================================================
+// DLL data items in alphabetical order
+// ===========================================================================
+//
+
+// ---------------------------------------------------------------------------
+// r_dlldata_sastate
+// ---------------------------------------------------------------------------
+//
+RESOURCE CMD_PARAM_STATE_CHANGE r_dlldata_sastate
+    {
+    mainstate = 2; // ESsmShutdown
+    substate = 0xFFFF; // KSsmAnySubState, saastateadapataion expects this
+    }
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/startup/stem_uiservicescmdlist.rss	Sun Oct 10 16:22:15 2010 +0100
@@ -0,0 +1,413 @@
+/*
+* 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 minimal startup.
+*
+*/
+
+#include <ssm/conditionresourcetypes.rh>
+#include <ssm/ssmcmd.rh>
+
+#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 =
+        {
+        r_cmd_sastate,          // This needs to be the first command in state, prio 0xFFF2
+        r_cmd_publishstate,     // prio 0xFFF1
+        r_cmd_psstate,          // prio 0xFFF0
+        // prio 0xFFE7
+        r_cmd_startupmode,
+        r_cmd_loadpowersup,
+        // prio 0xFFD7
+        r_cmd_rfsfirstboot,
+        r_cmd_rfsdeep,
+        r_cmd_rfsnormal,
+        // prio 0xFFC7
+        r_cmd_initclkeys,
+        r_cmd_initramdrive,
+        // prio 0xFFA7
+        r_cmd_splash,
+        // prio 0xFF97
+        r_cmd_rtc,
+        // 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_accsrv,
+        r_cmd_selectlanguage,   // Select UI language to use
+        // prio 0xFF86 - accsrv, seleclanguage (dbrecovery has been moved to extended startup list but uses the same multiplewait command)
+        r_cmd_multiwaitforever2,
+        // prio 0xFF85
+        r_cmd_loadlocalesup,    // Observes changes in locale data
+        // prio 0xFF79
+        r_cmd_aknstart,         // UI Framework
+        // prio 0xFF77
+        r_cmd_apparc_init,      // Init application framework
+        // prio 0xFF75
+        r_cmd_rfspostui        // Restore factory settings - after UI framework is up
+        };
+    }
+
+// ===========================================================================
+// Command items in alphabetical order
+// ===========================================================================
+//
+
+// ---------------------------------------------------------------------------
+// r_cmd_accsrv
+// ---------------------------------------------------------------------------
+//
+RESOURCE SSM_START_PROCESS_INFO r_cmd_accsrv
+    {
+    priority = 0xFF87;
+    name = "Z:\\sys\\bin\\accserver.exe";
+    severity = ECmdCriticalSeverity;
+    execution_behaviour = ESsmWaitForSignal;
+    monitor_info = r_mon_3_restarts_reset;
+    }
+
+// ---------------------------------------------------------------------------
+// r_cmd_aknstart
+// ---------------------------------------------------------------------------
+//
+RESOURCE SSM_START_CUSTOM_COMMAND r_cmd_aknstart
+    {
+    priority = 0xFF79;
+    severity = ECmdCriticalSeverity;
+    dllname = "akncustcmds.dll";
+    ordinal = 1; // AknCapServerStart
+    retries = 2;
+    }
+
+// ---------------------------------------------------------------------------
+// r_cmd_apparc_init
+// ---------------------------------------------------------------------------
+//
+RESOURCE SSM_WAIT_FOR_APPARC_INIT r_cmd_apparc_init
+    {
+    priority = 0xFF77;
+    severity = ECmdCriticalSeverity;
+    }
+
+// ---------------------------------------------------------------------------
+// r_cmd_initclkeys
+// ---------------------------------------------------------------------------
+//
+RESOURCE SSM_START_CUSTOM_COMMAND r_cmd_initclkeys
+    {
+    priority = 0xFFC7;
+    severity = ECmdCriticalSeverity;
+    execution_behaviour = ESsmDeferredWaitForSignal;
+    dllname = "ssmsystemcmds.dll";
+    ordinal = 3; // InitCriticalLevels
+    unload_on_finish = ENeverUnload;
+    retries = 2;
+    }
+
+// ---------------------------------------------------------------------------
+// r_cmd_initramdrive
+// ---------------------------------------------------------------------------
+//
+RESOURCE SSM_START_CUSTOM_COMMAND r_cmd_initramdrive
+    {
+    priority = 0xFFC7;
+    severity = ECmdCriticalSeverity;
+    execution_behaviour = ESsmDeferredWaitForSignal;
+    dllname = "customcmds.dll";
+    ordinal = 14; // InitRamDrive
+    unload_on_finish = ENeverUnload;
+    retries = 2;
+    }
+
+// ---------------------------------------------------------------------------
+// r_cmd_loadlocalesup
+// ---------------------------------------------------------------------------
+//
+RESOURCE SSM_START_SSM_UTILITY_PLUGIN r_cmd_loadlocalesup
+    {
+    priority = 0xFF85;
+    filename = "ssmlocaleobserversup.dll";
+    ordinal = 1;
+    }
+
+// ---------------------------------------------------------------------------
+// r_cmd_loadpowersup
+// ---------------------------------------------------------------------------
+//
+RESOURCE SSM_START_SSM_UTILITY_PLUGIN r_cmd_loadpowersup
+    {
+    priority = 0xFFE7;
+    severity = ECmdCriticalSeverity;
+    filename = "ssmpowersup.dll";
+    ordinal = 1;
+    }
+
+// ---------------------------------------------------------------------------
+// r_cmd_multiwaitforever1
+// ---------------------------------------------------------------------------
+//
+RESOURCE SSM_MULTIPLE_WAIT r_cmd_multiwaitforever1
+    {
+    priority = 0xFF96;
+    }
+
+// ---------------------------------------------------------------------------
+// r_cmd_multiwaitforever2
+// ---------------------------------------------------------------------------
+//
+RESOURCE SSM_MULTIPLE_WAIT r_cmd_multiwaitforever2
+    {
+    priority = 0xFF86;
+    }
+
+// ---------------------------------------------------------------------------
+// r_cmd_psstate
+// ---------------------------------------------------------------------------
+//
+RESOURCE SSM_SET_PUBLISH_AND_SUBSCRIBE r_cmd_psstate
+    {
+    priority = 0xFFF0;
+    severity = ECmdCriticalSeverity;
+    category = 0x101F8766; // KPSUidStartup
+    key      = 0x00000041; // KPSGlobalSystemState
+    value    = 100;        // ESwStateStartingUiServices
+    }
+
+// ---------------------------------------------------------------------------
+// r_cmd_publishstate
+// ---------------------------------------------------------------------------
+//
+RESOURCE SSM_PUBLISH_SYSTEM_STATE r_cmd_publishstate
+    {
+    priority = 0xFFF1;
+    severity = ECmdCriticalSeverity;
+    retries = 2;
+    }
+
+// ---------------------------------------------------------------------------
+// r_cmd_rfsdeep
+// ---------------------------------------------------------------------------
+//
+RESOURCE SSM_START_CUSTOM_COMMAND r_cmd_rfsdeep
+    {
+    priority = 0xFFD7;
+    dllname = "rfscustcmd.dll";
+    ordinal = 2; // RfsCustCmdDeepNewL
+    retries = 2;
+    conditional_information = r_cond_cenrep_rfs_deep;
+    }
+
+// ---------------------------------------------------------------------------
+// r_cmd_rfsfirstboot
+// ---------------------------------------------------------------------------
+//
+RESOURCE SSM_START_CUSTOM_COMMAND r_cmd_rfsfirstboot
+    {
+    priority = 0xFFD7;
+    dllname = "rfscustcmd.dll";
+    ordinal = 1; // RfsCustCmdFirstBootNewL
+    retries = 2;
+    conditional_information = r_cond_ps_firstboot;
+    }
+
+// ---------------------------------------------------------------------------
+// r_cmd_rfsnormal
+// ---------------------------------------------------------------------------
+//
+RESOURCE SSM_START_CUSTOM_COMMAND r_cmd_rfsnormal
+    {
+    priority = 0xFFD7;
+    dllname = "rfscustcmd.dll";
+    ordinal = 3; // RfsCustCmdPreUiNewL
+    retries = 2;
+    conditional_information = r_cond_cenrep_rfs_normal;
+    }
+
+// ---------------------------------------------------------------------------
+// r_cmd_rfspostui
+// ---------------------------------------------------------------------------
+//
+RESOURCE SSM_START_CUSTOM_COMMAND r_cmd_rfspostui
+    {
+    priority = 0xFF77;
+    dllname = "rfscustcmd.dll";
+    ordinal = 4; // RfsCustCmdPostUiNewL
+    retries = 2;
+    conditional_information = r_cond_cenrep_rfs_normal;
+    }
+
+// ---------------------------------------------------------------------------
+// r_cmd_rtc
+// ---------------------------------------------------------------------------
+//
+RESOURCE SSM_START_CUSTOM_COMMAND r_cmd_rtc
+    {
+    priority = 0xFF97;
+    severity = ECmdCriticalSeverity;
+    dllname = "customcmds.dll";
+    ordinal = 12;
+    execution_behaviour = ESsmDeferredWaitForSignal;
+    retries = 2;
+    }
+
+// ---------------------------------------------------------------------------
+// r_cmd_sastate
+// ---------------------------------------------------------------------------
+//
+RESOURCE SSM_START_CUSTOM_COMMAND r_cmd_sastate
+    {
+    priority = 0xFFF2;
+    severity = ECmdCriticalSeverity;
+    dllname = "customcmds.dll";
+    ordinal = 8;
+    unload_on_finish = ENeverUnload;
+    retries = 2;
+    dll_data = r_dlldata_sastate;
+    }
+
+// ---------------------------------------------------------------------------
+// r_cmd_selectlanguage
+// ---------------------------------------------------------------------------
+//
+RESOURCE SSM_START_CUSTOM_COMMAND r_cmd_selectlanguage
+    {
+    priority = 0xFF87;
+    severity = ECmdCriticalSeverity;
+    dllname = "ssmlangselcmd.dll";
+    ordinal = 1; // SelectLanguage
+    retries = 2;
+    }
+
+// ---------------------------------------------------------------------------
+// r_cmd_splash
+// ---------------------------------------------------------------------------
+//
+RESOURCE SSM_START_PROCESS_INFO r_cmd_splash
+    {
+    priority = 0xFFA7;
+    name = "Z:\\sys\\bin\\splashscreen.exe";
+    }
+
+// ---------------------------------------------------------------------------
+// r_cmd_startupmode
+// ---------------------------------------------------------------------------
+//
+RESOURCE SSM_START_CUSTOM_COMMAND r_cmd_startupmode
+    {
+    priority = 0xFFE7;
+    severity = ECmdCriticalSeverity;
+    dllname = "customcmds.dll";
+    ordinal = 9; // GetStartupMode
+    unload_on_finish = ENeverUnload;
+    retries = 2;
+    }
+
+// ===========================================================================
+// DLL data items in alphabetical order
+// ===========================================================================
+//
+
+// ---------------------------------------------------------------------------
+// r_dlldata_sastate
+// ---------------------------------------------------------------------------
+//
+RESOURCE CMD_PARAM_STATE_CHANGE r_dlldata_sastate
+    {
+    mainstate = 0; // ESsmStartup
+    substate = ESsmStateStartingUiServices;
+    }
+
+// ===========================================================================
+// 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_cenrep_rfs_deep
+// ---------------------------------------------------------------------------
+//
+RESOURCE SSM_CND_CENT_REP_VALUE r_cond_cenrep_rfs_deep
+    {
+    repository_id = 0x101F8762; // KCRUidStartup
+    key           = 0x00000002; // KStartupReason
+    value         = 103;        // EDeepRFSReset
+    }
+
+// ---------------------------------------------------------------------------
+// r_cond_cenrep_rfs_normal
+// ---------------------------------------------------------------------------
+//
+RESOURCE SSM_CND_CENT_REP_VALUE r_cond_cenrep_rfs_normal
+    {
+    repository_id = 0x101F8762; // KCRUidStartup
+    key           = 0x00000002; // KStartupReason
+    value         = 102;        // ENormalRFSReset
+    }
+
+
+// monitoring.rss contains resource definitions, so it may not be included
+// before entry point.
+#include "stem_monitoring.rss"
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/startup/stem_uiservicescmdlist_ext.rss	Sun Oct 10 16:22:15 2010 +0100
@@ -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 <ssm/conditionresourcetypes.rh>
+#include <ssm/ssmcmd.rh>
+
+#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 "stem_monitoring.rss"
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/startup/stem_uiswpcmdlists.rss	Sun Oct 10 16:22:15 2010 +0100
@@ -0,0 +1,218 @@
+/*
+* 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 lists for the UI phase SWP:
+*   - UI phase Started
+*
+*/
+
+#include <ssm/ssmcmd.rh>
+#include <ssm/clayerswp.hrh>
+
+#include "ssmswp.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 = ESsmUiPhaseStarted;
+            resource_id = r_started_commands;
+            }
+        };
+    }
+
+// ===========================================================================
+// Command lists in alphabetical order
+// ===========================================================================
+//
+
+// ---------------------------------------------------------------------------
+// r_started_commands
+// ---------------------------------------------------------------------------
+//
+RESOURCE SSM_COMMAND_LIST r_started_commands
+    {
+    commands =
+        {
+        r_cmd_publishswp,           // prio 0xFFF1
+        r_cmd_kill_splash,          // prio 0xFFE7 - Remove splash screen
+        r_cmd_devlockcheck,         // prio 0xFFD7 - Security code query, if needed
+        r_cmd_startanim,            // prio 0xFFC7 - Startup animation(s)
+        r_cmd_waitanim,             // prio 0xFFB7 - Wait for the animations to finish
+		r_cmd_adtupdater,			// prio 0xFFAA - Location, date & time queries //CR:ESAH-84JFCU
+        r_cmd_enableappskey,        // prio 0xFFA7 - Enable applications key
+        r_cmd_enableglobalnotes,    // prio 0xFFA7 - Enable global notes
+        r_cmd_swidaemon             // prio 0xFF97 - Initializes pre-installed applications from memory card
+		};
+    }
+
+// ===========================================================================
+// Command items in alphabetical order
+// ===========================================================================
+//
+
+// ---------------------------------------------------------------------------
+// r_cmd_adtupdater
+// ---------------------------------------------------------------------------
+//
+RESOURCE SSM_START_PROCESS_INFO r_cmd_adtupdater
+    {
+    priority = 0xFFAA;
+    name = "adtupdater.exe";
+    execution_behaviour = ESsmFireAndForget;
+    }
+
+// ---------------------------------------------------------------------------
+// r_cmd_devlockcheck
+// ---------------------------------------------------------------------------
+//
+RESOURCE SSM_START_CUSTOM_COMMAND r_cmd_devlockcheck
+    {
+    priority = 0xFFD7;
+    severity = ECmdCriticalSeverity;
+    dllname = "customcmds.dll";
+    ordinal = 11; // Device security check
+    unload_on_finish = ENeverUnload;
+    retries = 2;
+    }
+
+// ---------------------------------------------------------------------------
+// r_cmd_enableappskey
+// ---------------------------------------------------------------------------
+//
+RESOURCE SSM_START_CUSTOM_COMMAND r_cmd_enableappskey
+    {
+    priority = 0xFFA7;
+    severity = ECmdCriticalSeverity;
+    dllname = "akncustcmds.dll";
+    ordinal = 2; // EnableAppsKey
+    retries = 2;
+    }
+
+// ---------------------------------------------------------------------------
+// r_cmd_enableglobalnotes
+// ---------------------------------------------------------------------------
+//
+RESOURCE SSM_SET_PUBLISH_AND_SUBSCRIBE r_cmd_enableglobalnotes
+    {
+    priority = 0xFFA7;
+    severity = ECmdCriticalSeverity;
+    category = 0x101F8773;  // KPSUidUikon
+    key = 0x00000006;       // KUikGlobalNotesAllowed
+    value = 1;
+    }
+
+// ---------------------------------------------------------------------------
+// r_cmd_kill_splash
+// ---------------------------------------------------------------------------
+//
+RESOURCE SSM_SET_PUBLISH_AND_SUBSCRIBE r_cmd_kill_splash
+    {
+    priority = 0xFFE7;
+    category = 0x101F8766; // KPSUidStartup
+    key      = 0x00000301; // KPSSplashShutdown
+    value    = 101;        // ESplashShutdown
+    }
+
+// ---------------------------------------------------------------------------
+// r_cmd_publishswp
+// ---------------------------------------------------------------------------
+//
+RESOURCE SSM_PUBLISH_SYSTEM_WIDE_PROPERTY r_cmd_publishswp
+    {
+    priority = 0xFFF1;
+    severity = ECmdCriticalSeverity;
+    }
+
+// ---------------------------------------------------------------------------
+// r_cmd_startanim
+// ---------------------------------------------------------------------------
+//
+RESOURCE SSM_SET_PUBLISH_AND_SUBSCRIBE r_cmd_startanim
+    {
+    priority = 0xFFC7;
+    severity = ECmdCriticalSeverity;
+    category = 0x100058F4;  // KPSUidStartupApp
+    key = 0x00000001;       // KPSStartupAppState
+    value = 2;              // EStartupAppStateStartAnimations
+    }
+
+// ---------------------------------------------------------------------------
+// r_cmd_swidaemon
+// ---------------------------------------------------------------------------
+//
+RESOURCE SSM_START_PROCESS_INFO r_cmd_swidaemon
+    {
+    priority = 0xFF97;
+    name = "z:\\sys\\bin\\swidaemon.exe";
+    execution_behaviour = ESsmWaitForSignal;
+    monitor_info = r_mon_3_restarts_reset;
+    }
+
+// ---------------------------------------------------------------------------
+// r_cmd_waitanim
+// ---------------------------------------------------------------------------
+//
+RESOURCE SSM_START_CUSTOM_COMMAND r_cmd_waitanim
+    {
+    priority = 0xFFB7;
+    severity = ECmdCriticalSeverity;
+    dllname = "ssmsystemcmds.dll";
+    ordinal = 5; // WaitPsKeyExact
+    dll_data = r_dlldata_waitanim;
+    unload_on_finish = ENeverUnload;
+    retries = 2;
+    execution_behaviour = ESsmWaitForSignal;
+    }
+
+// ===========================================================================
+// DLL data items in alphabetical order
+// ===========================================================================
+//
+
+// ---------------------------------------------------------------------------
+// r_dlldata_waitanim
+// ---------------------------------------------------------------------------
+//
+RESOURCE CMD_PARAM_WAIT_PS r_dlldata_waitanim
+    {
+    category = 0x100058F4;  // KPSUidStartupApp
+    key = 0x00000001;       // KPSStartupAppState
+    target = 3;             // EStartupAppStateFinished
+    }
+
+// monitoring.rss contains resource definitions, so it may not be included
+// before entry point.
+#include "stem_monitoring.rss"
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/startup/stem_usbwatcher_hw.rss	Sun Oct 10 16:22:15 2010 +0100
@@ -0,0 +1,105 @@
+/*
+* Copyright (c) 2009 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 USB Watcher component.
+*
+*/
+
+#include <ssm/conditionresourcetypes.rh>
+#include <ssm/ssmcmd.rh>
+
+#include "ssmsubstateext.hrh"
+
+// 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 = ESsmStateCharging;
+            resource_id = r_cmds_charging;
+            },
+        SSM_COMMANDLISTID_TO_RESOURCEID
+            {
+            command_list_id = ESsmStateNonCritical;
+            resource_id = r_cmds_noncritical;
+            }
+        };
+    }
+
+// ---------------------------------------------------------------------------
+// r_cmds_noncritical
+// ---------------------------------------------------------------------------
+//
+RESOURCE SSM_COMMAND_LIST r_cmds_noncritical
+    {
+    commands =
+        {
+        r_cmd_usbwatcher
+        };
+    }
+
+RESOURCE SSM_COMMAND_LIST r_cmds_charging
+    {
+    commands =
+        {
+#ifdef RD_USB_CHARGING
+        r_cmd_usbwatcher
+#endif //RD_USB_CHARGING
+        };
+    }
+
+// ---------------------------------------------------------------------------
+// r_cmd_usbwatcher
+// ---------------------------------------------------------------------------
+//
+RESOURCE SSM_START_PROCESS_INFO r_cmd_usbwatcher
+    {
+    priority = 0xFFA7; // Same priority can be used in both states
+    name = "z:\\sys\\bin\\usbwatcher.exe";
+    execution_behaviour = ESsmFireAndForget;
+    conditional_information = r_cond_feat_usb;
+    monitor_info = r_mon_3_restarts_ignore;
+    }
+
+// ---------------------------------------------------------------------------
+// r_cond_feat_usb
+// ---------------------------------------------------------------------------
+//
+RESOURCE SSM_CND_FEATURE_VALUE r_cond_feat_usb
+    {
+    feature_id = KFeatureIdUsb;
+    }
+
+// monitoring.rss contains resource definitions, so it may not be included
+// before entry point.
+#include "stem_monitoring.rss"
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/startup/stem_wserv_hw.rss	Sun Oct 10 16:22:15 2010 +0100
@@ -0,0 +1,82 @@
+/*
+* Copyright (c) 2009 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 starting up the Window Server in HW.
+*
+*/
+
+#include <ssm/ssmcmd.rh>
+
+#include "ssmsubstateext.hrh"
+
+// 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 =
+        {
+        r_cmd_wserv
+        };
+    }
+
+// ---------------------------------------------------------------------------
+// r_cmd_wserv
+// ---------------------------------------------------------------------------
+//
+RESOURCE SSM_START_PROCESS_INFO r_cmd_wserv
+    {
+    priority = 0xFFB7; // Reserved for Window server startup
+    name = "Z:\\sys\\bin\\ewsrv.exe";
+    args = "-NoShell";
+    execution_behaviour = ESsmWaitForSignal;
+    severity = ECmdCriticalSeverity;
+    retries = 2;
+    }