--- a/emulator/emulatorbsp/hcr/hcrconfig.h	Fri May 14 16:58:21 2010 +0300
+++ b/emulator/emulatorbsp/hcr/hcrconfig.h	Thu May 27 14:00:44 2010 +0300
@@ -25,7 +25,7 @@
 changes in the hardware consumer component. 
 
 @publishedPartner
-@prototype
+@deprecated Emulator Deprecated
 */
 
 #ifndef HCR_CONFIG_H

--- a/emulator/emulatorbsp/inc/display_chan.h	Fri May 14 16:58:21 2010 +0300
+++ b/emulator/emulatorbsp/inc/display_chan.h	Thu May 27 14:00:44 2010 +0300
@@ -16,7 +16,7 @@
 /**
  @file
  @publishedPartner
- @prototype
+ @deprecated Emulator Deprecated
 */
 
 #ifndef __DISPLAY_CHAN_H__

--- a/emulator/emulatorbsp/inc/display_dev.h	Fri May 14 16:58:21 2010 +0300
+++ b/emulator/emulatorbsp/inc/display_dev.h	Thu May 27 14:00:44 2010 +0300
@@ -16,7 +16,7 @@
 /**
  @file
  @publishedPartner
- @prototype
+ @deprecated Emulator Deprecated
 */
 
 #ifndef __DISPLAY_DEV_H__

--- a/emulator/emulatorbsp/inc/displayhandler.h	Fri May 14 16:58:21 2010 +0300
+++ b/emulator/emulatorbsp/inc/displayhandler.h	Thu May 27 14:00:44 2010 +0300
@@ -16,7 +16,7 @@
 /**
  @file
  @publishedPartner
- @prototype
+ @deprecated Emulator Deprecated
 */
 
 #ifndef __DISPLAYHANDLER_H__

--- a/emulator/emulatorbsp/inc/nand_fbr_offset.h	Fri May 14 16:58:21 2010 +0300
+++ b/emulator/emulatorbsp/inc/nand_fbr_offset.h	Thu May 27 14:00:44 2010 +0300
@@ -24,6 +24,7 @@
 /**
 Defines the sector offset at which the FBR appears in the first block
 @publishedPartner
+@deprecated Emulator Deprecated
 */
 const TInt KNandFbrSectorOffset=0;
 

--- a/emulator/emulatorbsp/inc/nand_plat.h	Fri May 14 16:58:21 2010 +0300
+++ b/emulator/emulatorbsp/inc/nand_plat.h	Thu May 27 14:00:44 2010 +0300
@@ -45,6 +45,7 @@
 The following constants support relocation of the NAND FBR for this platform
 KNandFbrSectorOffset is the third of three constants required - it is defined in nand_fbr_offset.h
 @publishedPartner
+@deprecated Emulator Deprecated
 */
 const TInt KNandMinibootUsed		=	ETrue;
 const TInt KNandCoreldrRelocatable	=	ETrue;

--- a/emulator/emulatorbsp/inc/winsgui.h	Fri May 14 16:58:21 2010 +0300
+++ b/emulator/emulatorbsp/inc/winsgui.h	Thu May 27 14:00:44 2010 +0300
@@ -29,6 +29,7 @@
 	/**
 	Returns the current emulator GUI configuration
 	@publishedPartner
+	@deprecated Emulator Deprecated
 	*/
 	IMPORT_C static TInt CurrentConfiguration();
 	};

--- a/emulator/emulatorbsp/test/bld.inf	Fri May 14 16:58:21 2010 +0300
+++ b/emulator/emulatorbsp/test/bld.inf	Thu May 27 14:00:44 2010 +0300
@@ -30,9 +30,6 @@
 ../../../../kernelhwsrv/kerneltest/e32test/group/bm_pdd					support
 ../../../../kernelhwsrv/kerneltest/e32test/group/d_mstim					support
 
-// Tests
-../../../../kernelhwsrv/kerneltest/e32test/group/t_emul
-
 // Example RTOS personality
 ../../../../kernelhwsrv/kerneltest/e32test/personality/example/example_personality_test	support