# HG changeset patch
# User hgs
# Date 1286973243 -3600
# Node ID 55a0a1279a7ed9c6817d507daab30027f218c797
# Parent  ddfd5aa0d58ffdfdf0ae68477a3971f097b06861
201041_02

diff -r ddfd5aa0d58f -r 55a0a1279a7e kernel/eka/include/e32ver.h
--- a/kernel/eka/include/e32ver.h	Mon Oct 11 19:11:06 2010 +0100
+++ b/kernel/eka/include/e32ver.h	Wed Oct 13 13:34:03 2010 +0100
@@ -28,7 +28,7 @@
 
 const TInt KE32MajorVersionNumber=2;
 const TInt KE32MinorVersionNumber=0;
-const TInt KE32BuildVersionNumber=4009;
+const TInt KE32BuildVersionNumber=4010;
 
 const TInt KMachineConfigurationMajorVersionNumber=1;
 const TInt KMachineConfigurationMinorVersionNumber=0;
diff -r ddfd5aa0d58f -r 55a0a1279a7e kernel/eka/include/opensystemtrace.h
--- a/kernel/eka/include/opensystemtrace.h	Mon Oct 11 19:11:06 2010 +0100
+++ b/kernel/eka/include/opensystemtrace.h	Wed Oct 13 13:34:03 2010 +0100
@@ -22,7 +22,7 @@
 /**
 This macro defines the version of the Open System Trace instrumentation API.
 */
-#define OST_INSTRUMENTATION_API_VERSION 2.1.0
+#define OST_INSTRUMENTATION_API_VERSION 2.2.0
 
 
 /**
@@ -130,8 +130,9 @@
 
 /**
 Preprocessor category for RnD traces
+@deprecated Use OST_TRACE_CATEGORY_PRODUCTION
 */
-#define OST_TRACE_CATEGORY_RND 0x00000002
+#define OST_TRACE_CATEGORY_RND OST_TRACE_CATEGORY_PRODUCTION
 
 /**
 Preprocessor category for performance measurement traces
@@ -360,7 +361,7 @@
                   The text itself is not sent in the trace packet
 */
 #define OstTrace0( aGroupName, aTraceName, aTraceText ) \
-    OstTraceDef0( OST_TRACE_CATEGORY_RND, aGroupName, aTraceName, aTraceText )
+    OstTraceDef0( OST_TRACE_CATEGORY_PRODUCTION, aGroupName, aTraceName, aTraceText )
 
 
 /**
@@ -375,7 +376,7 @@
 @param aParam The 32-bit value to be traced
 */
 #define OstTrace1( aGroupName, aTraceName, aTraceText, aParam ) \
-    OstTraceDef1( OST_TRACE_CATEGORY_RND, aGroupName, aTraceName, aTraceText, aParam )
+    OstTraceDef1( OST_TRACE_CATEGORY_PRODUCTION, aGroupName, aTraceName, aTraceText, aParam )
 
 
 /**
@@ -391,7 +392,7 @@
 @param aLength Length of the data to be traced
 */
 #define OstTraceData( aGroupName, aTraceName, aTraceText, aPtr, aLength ) \
-    OstTraceDefData( OST_TRACE_CATEGORY_RND, aGroupName, aTraceName, aTraceText, aPtr, aLength )
+    OstTraceDefData( OST_TRACE_CATEGORY_PRODUCTION, aGroupName, aTraceName, aTraceText, aPtr, aLength )
 
 
 /**
@@ -408,7 +409,7 @@
 @param aParam The parameter to be traced
 */
 #define OstTraceExt1( aGroupName, aTraceName, aTraceText, aParam ) \
-    OstTraceDefExt1( OST_TRACE_CATEGORY_RND, aGroupName, aTraceName, aTraceText, aParam )
+    OstTraceDefExt1( OST_TRACE_CATEGORY_PRODUCTION, aGroupName, aTraceName, aTraceText, aParam )
 
 
 /**
@@ -426,7 +427,7 @@
 @param aParam2 The second parameter to be traced
 */
 #define OstTraceExt2( aGroupName, aTraceName, aTraceText, aParam1, aParam2 ) \
-    OstTraceDefExt2( OST_TRACE_CATEGORY_RND, aGroupName, aTraceName, aTraceText, aParam1, aParam2 )
+    OstTraceDefExt2( OST_TRACE_CATEGORY_PRODUCTION, aGroupName, aTraceName, aTraceText, aParam1, aParam2 )
 
 
 /**
@@ -445,7 +446,7 @@
 @param aParam3 The third parameter to be traced
 */
 #define OstTraceExt3( aGroupName, aTraceName, aTraceText, aParam1, aParam2, aParam3 ) \
-    OstTraceDefExt3( OST_TRACE_CATEGORY_RND, aGroupName, aTraceName, aTraceText, aParam1, aParam2, aParam3 )
+    OstTraceDefExt3( OST_TRACE_CATEGORY_PRODUCTION, aGroupName, aTraceName, aTraceText, aParam1, aParam2, aParam3 )
 
 
 /**
@@ -465,7 +466,7 @@
 @param aParam4 The fourth parameter to be traced
 */
 #define OstTraceExt4( aGroupName, aTraceName, aTraceText, aParam1, aParam2, aParam3, aParam4 ) \
-    OstTraceDefExt4( OST_TRACE_CATEGORY_RND, aGroupName, aTraceName, aTraceText, aParam1, aParam2, aParam3, aParam4 )
+    OstTraceDefExt4( OST_TRACE_CATEGORY_PRODUCTION, aGroupName, aTraceName, aTraceText, aParam1, aParam2, aParam3, aParam4 )
 
 
 /**
@@ -486,7 +487,7 @@
 @param aParam5 The fifth parameter to be traced
 */
 #define OstTraceExt5( aGroupName, aTraceName, aTraceText, aParam1, aParam2, aParam3, aParam4, aParam5 ) \
-    OstTraceDefExt5( OST_TRACE_CATEGORY_RND, aGroupName, aTraceName, aTraceText, aParam1, aParam2, aParam3, aParam4, aParam5 )
+    OstTraceDefExt5( OST_TRACE_CATEGORY_PRODUCTION, aGroupName, aTraceName, aTraceText, aParam1, aParam2, aParam3, aParam4, aParam5 )
 
 
 /**
@@ -496,7 +497,7 @@
 @param aTraceName Name of the trace. The name is mapped to a 32-bit identifier and thus must be unique
 */
 #define OstTraceFunctionEntry0( aTraceName ) \
-    do {if ( OST_TRACE_CATEGORY_RND & OST_TRACE_CATEGORY ) \
+    do {if ( OST_TRACE_CATEGORY_PRODUCTION & OST_TRACE_CATEGORY ) \
     BTraceFilteredContext8( EXTRACT_GROUP_ID(aTraceName), \
                         EOstTrace, \
                         KOstTraceComponentID, \
@@ -511,7 +512,7 @@
 @param aInstance The instance identifier, for example "this" pointer
 */
 #define OstTraceFunctionEntry1( aTraceName, aInstance ) \
-    do {if ( OST_TRACE_CATEGORY_RND & OST_TRACE_CATEGORY ) \
+    do {if ( OST_TRACE_CATEGORY_PRODUCTION & OST_TRACE_CATEGORY ) \
     BTraceFilteredContext12( EXTRACT_GROUP_ID(aTraceName), \
                          EOstTrace, \
                          KOstTraceComponentID, \
@@ -527,7 +528,7 @@
 @param aInstance Name of the instance identifier
 */
 #define OstTraceFunctionEntryExt( aTraceName, aInstance ) \
-    do {if ( OST_TRACE_CATEGORY_RND & OST_TRACE_CATEGORY ) \
+    do {if ( OST_TRACE_CATEGORY_PRODUCTION & OST_TRACE_CATEGORY ) \
         OstTraceGenExt( aTraceName, ( TUint )aInstance );} while (0)
 
 
@@ -538,7 +539,7 @@
 @param aTraceName Name of the trace. The name is mapped to a 32-bit identifier and thus must be unique
 */
 #define OstTraceFunctionExit0( aTraceName ) \
-    do {if ( OST_TRACE_CATEGORY_RND & OST_TRACE_CATEGORY ) \
+    do {if ( OST_TRACE_CATEGORY_PRODUCTION & OST_TRACE_CATEGORY ) \
     BTraceFilteredContext8( EXTRACT_GROUP_ID(aTraceName), \
                         EOstTrace, \
                         KOstTraceComponentID, \
@@ -553,7 +554,7 @@
 @param aInstance The instance identifier, for example "this" pointer
 */
 #define OstTraceFunctionExit1( aTraceName, aInstance ) \
-    do {if ( OST_TRACE_CATEGORY_RND & OST_TRACE_CATEGORY ) \
+    do {if ( OST_TRACE_CATEGORY_PRODUCTION & OST_TRACE_CATEGORY ) \
     BTraceFilteredContext12( EXTRACT_GROUP_ID(aTraceName), \
                          EOstTrace, \
                          KOstTraceComponentID, \
@@ -570,7 +571,7 @@
 @param aRetval The function return value
 */
 #define OstTraceFunctionExitExt( aTraceName, aInstance, aRetval ) \
-    do {if ( OST_TRACE_CATEGORY_RND & OST_TRACE_CATEGORY ) \
+    do {if ( OST_TRACE_CATEGORY_PRODUCTION & OST_TRACE_CATEGORY ) \
         OstTraceGen2( aTraceName, ( TUint )aInstance, aRetval );} while (0)
 
 
@@ -582,7 +583,7 @@
 @param aEventName The name of the event. A corresponding OstTraceEventStop call must be made later in code
 */
 #define OstTraceEventStart0( aTraceName, aEventName ) \
-        OstTraceDef1( OST_TRACE_CATEGORY_RND, "TRACE_PERFORMANCE", aTraceName, null, (TInt32)1 )
+        OstTraceDef1( OST_TRACE_CATEGORY_PRODUCTION, "TRACE_PERFORMANCE", aTraceName, null, (TInt32)1 )
 
 
 /**
@@ -594,7 +595,7 @@
 @param aParam The parameter to be associated to the event
 */
 #define OstTraceEventStart1( aTraceName, aEventName, aParam ) \
-        OstTraceDef1( OST_TRACE_CATEGORY_RND, "TRACE_PERFORMANCE", aTraceName, null, aParam )
+        OstTraceDef1( OST_TRACE_CATEGORY_PRODUCTION, "TRACE_PERFORMANCE", aTraceName, null, aParam )
 
 
 /**
@@ -606,7 +607,7 @@
 @param aStartTraceName Event start trace name. Must match a Trace Name of OstTraceEventStart trace
 */
 #define OstTraceEventStop( aTraceName, aEventName, aStartTraceName ) \
-        OstTraceDefExt2( OST_TRACE_CATEGORY_RND, "TRACE_PERFORMANCE", aTraceName, null, (TInt32)0, (TUint32)(aStartTraceName & 0xFFFF) ) 
+        OstTraceDefExt2( OST_TRACE_CATEGORY_PRODUCTION, "TRACE_PERFORMANCE", aTraceName, null, (TInt32)0, (TUint32)(aStartTraceName & 0xFFFF) ) 
 
 
 /**
@@ -618,7 +619,7 @@
 @param aNewState The new value for the state, literal string (for example "value")
 */
 #define OstTraceState0( aTraceName, aStateName, aNewState ) \
-        OstTraceDefExt2( OST_TRACE_CATEGORY_RND, "TRACE_STATE", aTraceName, null, _L8(aStateName), _L8(aNewState) ) 
+        OstTraceDefExt2( OST_TRACE_CATEGORY_PRODUCTION, "TRACE_STATE", aTraceName, null, _L8(aStateName), _L8(aNewState) ) 
 
 
 /**
@@ -631,7 +632,7 @@
 @param aInstance The instance identifier, for example "this" pointer
 */
 #define OstTraceState1( aTraceName, aStateName, aNewState, aInstance ) \
-        OstTraceDefExt3( OST_TRACE_CATEGORY_RND, "TRACE_STATE", aTraceName, null, _L8(aStateName), _L8(aNewState), (TUint32) aInstance ) 
+        OstTraceDefExt3( OST_TRACE_CATEGORY_PRODUCTION, "TRACE_STATE", aTraceName, null, _L8(aStateName), _L8(aNewState), (TUint32) aInstance ) 
        
 #else // OST_TRACE_COMPILER_IN_USE
 
diff -r ddfd5aa0d58f -r 55a0a1279a7e kernel/eka/release.txt
--- a/kernel/eka/release.txt	Mon Oct 11 19:11:06 2010 +0100
+++ b/kernel/eka/release.txt	Wed Oct 13 13:34:03 2010 +0100
@@ -1,16 +1,27 @@
+Version 2.00.4009
+=================
+(Made by fadhliM 11/10/2010)
+
+1.	naushahm
+	1.	ou1cimx1#586151 OST_TRACE_CATEGORY_RND is redundant
+
+
 Version 2.00.4009
 =================
 (Made by fadhliM 07/10/2010)
 
 1.	hengrant
-	1.	RP 531855	eMMC 4.4 User Data Partitions
+	1.	RP 531855 eMMC 4.4 User Data Partitions
 		REQ 417-54821	MMC v4.4 support for eMMC (Bridge M4)
 		SUB 417-73300	eMMC V4.4
 		SUB 417-73303	eMMC v4.4 - User-Data partitions with Enhanced Attributes Support
-	2.	RP 529139	eMMC 4.4 RPMB
+	2.	RP 531864 eMMC 4.4 (TRIM - NOT BRIDGE M4)
+		REQ 417-54821	MMC v4.4 support for eMMC (Bridge M4)
+		SUB 417-73302	eMMC v4.4 - TRIM Support
+	3.	RP 529139 eMMC 4.4 RPMB
 		REQ 417-75165	MMC v4.4 support for eMMC (Bridge M5)
 		SUB 417-59932	eMMC v4.4 - Replay Protected Memory Block (RPMB) support 
-	3.	RP 543420
+	4.	RP 543420
 		REQ 417-75165	MMC v4.4 support for eMMC (Bridge M5)
 		SUB 417-73302	eMMC v4.4 - TRIM Support