--- a/bearermanagement/S60MCPR/inc/s60mcprstates.h Wed Sep 15 12:38:40 2010 +0300
+++ b/bearermanagement/S60MCPR/inc/s60mcprstates.h Wed Oct 13 14:59:48 2010 +0300
@@ -30,6 +30,7 @@
#include "s60mcpr.h"
#include "s60mpmrequests.h"
+#include "s60mcpractivityids.h"
/**
* S60McprState namespace packages all S60 specific state, forks and
@@ -58,6 +59,7 @@
const TInt KConsumeRejectedMsg = 11054;
const TInt KInformMigrationCompleted = 11055;
const TInt KRequestReConnectToCurrentSP = 11056;
+ const TInt KStopActivityNotRunning = 11057;
/**
* Execution context
@@ -117,6 +119,17 @@
TContext )
virtual void DoL();
DECLARE_SMELEMENT_FOOTER( TProcessError )
+
+ /**
+ * TRANSITION/ACTION: Error no bearer request while in gone down recovery.
+ */
+ DECLARE_SMELEMENT_HEADER( THandleNoBearerDuringGoneDownRecovery,
+ MeshMachine::TStateTransition<TContext>,
+ NetStateMachine::MStateTransition,
+ TContext )
+ virtual void DoL();
+ DECLARE_SMELEMENT_FOOTER( THandleNoBearerDuringGoneDownRecovery )
+
/**
* STATE: Waits for valid select or error message.
@@ -163,6 +176,18 @@
DECLARE_SMELEMENT_FOOTER( TAwaitingServiceIdRequest )
/**
+ * STATE: Waits for NoBearer request while in gone down recovery.
+ * @return ETrue if message is accepted.
+ */
+ DECLARE_SMELEMENT_HEADER( TAwaitingNoBearerInGoneDownRecovery,
+ MeshMachine::TState<TContext>,
+ NetStateMachine::MState,
+ TContext )
+ virtual TBool Accept();
+ DECLARE_SMELEMENT_FOOTER( TAwaitingNoBearerInGoneDownRecovery )
+
+
+ /**
* TRANSITION/ACTION: Retrieve ServiceId.
*/
DECLARE_SMELEMENT_HEADER( TRetrieveServiceId,
@@ -204,6 +229,35 @@
TContext )
virtual TBool Accept();
DECLARE_SMELEMENT_FOOTER( TAwaitingStoppedOrError )
+
+
+ /**
+ * STATE: Waits for TIdle
+ */
+ DECLARE_SMELEMENT_HEADER( TAwaitingDataClientIdle,
+ MeshMachine::TState<TContext>,
+ NetStateMachine::MState,
+ TContext )
+ virtual TBool Accept();
+ DECLARE_SMELEMENT_FOOTER( TAwaitingDataClientIdle )
+
+ /**
+ * STATE: Waits for TDataClientStatusChange
+ */
+ DECLARE_SMELEMENT_HEADER( TAwaitingDataClientStatusChange,
+ MeshMachine::TState<TContext>,
+ NetStateMachine::MState,
+ TContext )
+ virtual TBool Accept();
+ DECLARE_SMELEMENT_FOOTER( TAwaitingDataClientStatusChange )
+
+
+ /**
+ * FORK/MUTEX: Waits for StopIAPActivity to complete
+ */
+ DECLARE_SERIALIZABLE_STATE( TStopActivityNotRunning,
+ MeshMachine::TActivityIdMutex<ECFActivityS60McprStopIAP>,
+ MeshMachine::TTag<S60MCprStates::KStopActivityNotRunning> )
class CS60ErrorRecoveryActivity : public MeshMachine::CNodeRetryActivity
{