--- a/memspy/memspy_plat/memspy_api/include/MemSpyEngineClientInterface.h	Wed Sep 15 13:53:27 2010 +0300
+++ b/memspy/memspy_plat/memspy_api/include/MemSpyEngineClientInterface.h	Wed Oct 13 16:17:58 2010 +0300
@@ -45,12 +45,11 @@
 const TInt KMemSpyOpFlagsInclusionMask          = 0xFFFF0000;
 const TInt KMemSpyOpFlagsIncludesThreadId       = 0x00010000;
 const TInt KMemSpyOpFlagsIncludesThreadName     = 0x00020000;
-const TInt KMemSpyOpFlagsAsyncOperation         = 0x00040000;
+
 // Literal constants
 _LIT( KMemSpyServerName, "MemSpyServer" );
-_LIT( KMemSpyProcessName0, "MemSpyServer.exe" );
 _LIT( KMemSpyProcessName1, "MemSpyUI.exe" );
-//_LIT( KMemSpyProcessName2, "MemSpyConsole.exe" );
+_LIT( KMemSpyProcessName2, "MemSpyConsole.exe" );
 
 //
 // Supported MemSpy operation types
@@ -257,143 +256,14 @@
      * [INTERNAL REQUEST]
      */
     EMemSpyClientServerOpSystemWideMemoryTrackingHeapDumpSet,
-        
+    
     /**
      * [INTERNAL REQUEST]
      */
-    EMemSpyClientServerOpSystemWideMemoryTrackingModeSet,        
-    
-    /**
-	 * [INTERNAL REQUEST]
-	 */
-	EMemSpyClientServerOpMarkerUiFirst,
-	
-	EMemSpyClientServerOpGetProcessCount = EMemSpyClientServerOpMarkerUiFirst,
-	
-	EMemSpyClientServerOpGetProcesses,
-	
-	EMemSpyClienServerOpGetProcessIdByName,
-	
-	EMemSpyClientServerOpGetThreadCount,
-	
-	EMemSpyClientServerOpGetThreads,
-	
-	EMemSpyClientServerOpSetThreadPriority,
-	
-	EMemSpyClientServerOpProcessSystemPermanentOrCritical,
-	
-	EMemSpyClientServerOpEndProcess,
-	
-	EMemSpyClientServerOpSwitchToProcess,
-	
-	//Threads operations
-	EMemSpyClientServerOpThreadSystemPermanentOrCritical,
-	
-	EMemSpyClientServerOpEndThread,
-	
-	EMemSpyClientServerOpSwitchToThread,
-	
-	EMemSpyClientServerOpGetInfoItemType,
-	
-	EMemSpyClientServerOpGetProcessIdByThreadId,
-	
-	EMemSpyClientServerOpGetThreadInfoItemsCount,
-	
-	EMemSpyClientServerOpGetThreadInfoItems,
-	
-	EMemSpyClientServerOpOutputInfoHandles,
-	
-	EMemSpyClientServerOpOutputAOList,
-		
-	
-	//Kernel Objects operations
-	EMemSpyClientServerOpGetKernelObjectCount,
-	
-	EMemSpyClientServerOpGetKernelObjects,
-	
-	EMemSpyClientServerOpGetKernelObjectItemCount,
-	
-	EMemSpyClientServerOpGetKernelObjectItems,
-	
-	EMemSpyClientServerOpGetHeap,
-	
-	EMemSpyClientServerOpGetMemoryTrackingCycleCount,
-	
-	EMemSpyClientServerOpGetMemoryTrackingCycles,
-	
-	EMemSpyClientServerOpGetMemoryTrackingMdcaCount,
-	/**
-	 * [INTERNAL REQUEST]
-	 * Register for notifications of device wide operation progress.
-	 */
-	EMemSpyClientServerOpNotifyDeviceWideOperationProgress,
-	
-	/**
-	 * [INTERNAL REQUEST]
-	 * Cancel current device wide operation
-	 */
-	EMemSpyClientServerOpCancelDeviceWideOperation,	
-	
-	EMemSpyClientServerOpOutputAllContainerContents,
-	    
-	EMemSpyClientServerOpDumpKernelHeap,
-	
-	EMemSpyClientServerOpSetSwmtAutoStartProcessList,
-		
-	EMemSpyClientServerOpGetOutputSink,
-	
-	/**
-	 * [INTERNAL REQUEST]
-	 * Check if system wide memory tracking timer is running.
-	 */
-	EMemSpyClientServerOpIsSwmtRunning,
-	
-	EMemSpyClientServerOpSystemWideMemoryTrackingTimerPeriodGet,
-
-	EMemSpyClientServerOpSystemWideMemoryTrackingThreadNameFilterGet,
-    
-    EMemSpyClientServerOpSystemWideMemoryTrackingCategoriesGet,
-    
-    EMemSpyClientServerOpSystemWideMemoryTrackingHeapDumpGet,
-
-    EMemSpyClientServerOpSystemWideMemoryTrackingModeGet,   
-	
-    //Servers methods
-	EMemSpyClientServerOpGetServerCount,
-	
-	EMemSpyClientServerOpGetServers,
-	
-	EMemSpyClientServerOpGetSortedServers,
-	
-	EMemSpyClientServerOpServerListOutputGeneric,
-	
-	EMemSpyClientServerOpGetEComCategoryCount,
-	    
-	EMemSpyClientServerOpGetEComCategories,
-	
-	EMemSpyClientServerOpGetEComInterfaceCount,
-	        
-	EMemSpyClientServerOpGetEComInterfaces,
-	
-	EMemSpyClientServerOpGetEComImplementationCount,
-	            
-	EMemSpyClientServerOpGetEComImplementations,
-	
-	EMemSpyClientServerOpMarkerUiLast,		
-	
-	/**
-	 * [INTERNAL REQUEST]
-	 */
     EMemSpyClientServerOpMarkerLast,
     };
 
 
-enum TMemSpyEndType
-	{
-	ETerminate,
-	EKill,
-	EPanic
-	};