--- a/telephonyserverplugins/common_tsy/commontsy/inc/mmtsy/cmmphonetsy.h	Thu Aug 19 11:03:36 2010 +0300
+++ b/telephonyserverplugins/common_tsy/commontsy/inc/mmtsy/cmmphonetsy.h	Tue Aug 31 16:23:08 2010 +0300
@@ -31,7 +31,6 @@
 #include "cmmmessagemanagerbase.h"
 #include "MmTsy_timeoutdefs.h"
 #include <ctsy/serviceapi/mmtsy_defaults.h>
-#include <ctsy/tflogger.h>
 #include "CMmPrivateUtility.h"
 #include <ctsy/serviceapi/ctsydomainpskeys.h>
 #include <ctsy/serviceapi/mctsysatservice.h>
@@ -124,13 +123,10 @@
             EMultimodePhoneNotifyNWSelectionSettingChange, 
             EMultimodePhoneNotifyNWTimeInfoChange, //15
             EMultimodePhoneSelectNetwork, 
-            EMultimodePhoneSetNWSelectionSetting,
-            EMultimodePhoneGetPreferredNetworksPhase1,
-            EMultimodePhoneStorePreferredNetworksList,
-            EMultimodePhoneNotifyStorePreferredNetworksListChange, // 20
+            EMultimodePhoneSetNWSelectionSetting, 
             EMultimodePhoneSetCallForwardingStatus, 
             EMultimodePhoneGetIdentityServiceStatus,
-            EMultimodePhoneSetCallBarringStatus,
+            EMultimodePhoneSetCallBarringStatus, //20
             EMultimodePhoneSetSSPassword,
             EMultimodePhoneSetCallWaitingStatus,
             EMultimodePhoneSetFdnSetting,
@@ -205,6 +201,7 @@
             EMultimodePhoneNotifyAllSendNetworkServiceRequest,
             EMultimodePhoneGetCurrentActiveUSimApplication,             
             EMultimodePhoneTerminateAllCalls,
+            EMultimodePhoneTerminateActiveCalls,
             EMultimodePhoneNotifyDtmfEvent, 
             // ATTENTION:: Declare constant for those requests that need
             // own request handle record in iTsyReqHandleStore above the
@@ -1417,6 +1414,13 @@
         void CompleteTerminateAllCallsReq(TInt aErrorCode);
         
         /**
+         * Complete TerminateActiveCalls request
+         * 
+         * @param aErrorCode The result of the request
+         */
+        void CompleteTerminateActiveCallsReq(TInt aErrorCode);
+        
+        /**
         * Notify change of battery info
         *          
         * @param aErrorCode error code
@@ -2177,6 +2181,14 @@
           */
         TInt TerminateAllCallsL(const TTsyReqHandle aTsyReqHandle);
 
+        /**
+          * Terminate all active calls simultaneously
+          * 
+          * @param aTsyReqHandle TSY req handle
+          * @return Error value
+          */
+        TInt TerminateActiveCallsL(const TTsyReqHandle aTsyReqHandle);
+        
         /*
          * This function return availability of Hareware Resource Manager in the current ROM
          *