# HG changeset patch # User Iain Williamson # Date 1267195279 0 # Node ID b30e816f1d398f7eb23599697c6a85d57824725f # Parent c72bd1c6fd4e1dcfaacac92dced913b40caa795b# Parent ba02dc2ff2146df9e1d924750bd4b626d4178be2 Remerge - OSTv2 in test code diff -r ba02dc2ff214 -r b30e816f1d39 sbsv2/raptor/test/smoke_suite/test_resources/tracecompiler/TC_featurevariant/group/HelloWorld.mmp --- a/sbsv2/raptor/test/smoke_suite/test_resources/tracecompiler/TC_featurevariant/group/HelloWorld.mmp Fri Feb 26 12:14:12 2010 +0000 +++ b/sbsv2/raptor/test/smoke_suite/test_resources/tracecompiler/TC_featurevariant/group/HelloWorld.mmp Fri Feb 26 14:41:19 2010 +0000 @@ -14,7 +14,7 @@ USERINCLUDE ..\inc USERINCLUDE ..\traces SYSTEMINCLUDE \epoc32\include -SYSTEMINCLUDE \epoc32\include\internal +SYSTEMINCLUDE \epoc32\include\platform SOURCEPATH ..\src SOURCE HelloWorld.cpp diff -r ba02dc2ff214 -r b30e816f1d39 sbsv2/raptor/test/smoke_suite/test_resources/tracecompiler/TC_featurevariant/traces/OstTraceDefinitions.h --- a/sbsv2/raptor/test/smoke_suite/test_resources/tracecompiler/TC_featurevariant/traces/OstTraceDefinitions.h Fri Feb 26 12:14:12 2010 +0000 +++ b/sbsv2/raptor/test/smoke_suite/test_resources/tracecompiler/TC_featurevariant/traces/OstTraceDefinitions.h Fri Feb 26 14:41:19 2010 +0000 @@ -1,7 +1,7 @@ -#ifndef __OSTTRACEDEFINITIONS_H__ -#define __OSTTRACEDEFINITIONS_H__ -// OST_TRACE_COMPILER_IN_USE flag has been added by Trace Compiler -// REMOVE BEFORE CHECK-IN TO VERSION CONTROL -// #define OST_TRACE_COMPILER_IN_USE -#include -#endif +#ifndef __OSTTRACEDEFINITIONS_H__ +#define __OSTTRACEDEFINITIONS_H__ +// OST_TRACE_COMPILER_IN_USE flag has been added by Trace Compiler +// REMOVE BEFORE CHECK-IN TO VERSION CONTROL +#define OST_TRACE_COMPILER_IN_USE +#include +#endif diff -r ba02dc2ff214 -r b30e816f1d39 sbsv2/raptor/test/smoke_suite/test_resources/tracecompiler/TC_winscw/tcwinsStaticDLL.mmp --- a/sbsv2/raptor/test/smoke_suite/test_resources/tracecompiler/TC_winscw/tcwinsStaticDLL.mmp Fri Feb 26 12:14:12 2010 +0000 +++ b/sbsv2/raptor/test/smoke_suite/test_resources/tracecompiler/TC_winscw/tcwinsStaticDLL.mmp Fri Feb 26 14:41:19 2010 +0000 @@ -1,5 +1,5 @@ /* -* Copyright (c) 2000-2009 Nokia Corporation and/or its subsidiary(-ies). +* Copyright (c) 2000-2010 Nokia Corporation and/or its subsidiary(-ies). * All rights reserved. * This component and the accompanying materials are made available * under the terms of the License "Eclipse Public License v1.0" @@ -30,7 +30,7 @@ USERINCLUDE . SYSTEMINCLUDE /epoc32/include -SYSTEMINCLUDE /epoc32/include/internal +SYSTEMINCLUDE /epoc32/include/platform USERINCLUDE traces LIBRARY euser.lib diff -r ba02dc2ff214 -r b30e816f1d39 sbsv2/raptor/test/smoke_suite/test_resources/tracecompiler/TC_winscw/traces/OstTraceDefinitions.h --- a/sbsv2/raptor/test/smoke_suite/test_resources/tracecompiler/TC_winscw/traces/OstTraceDefinitions.h Fri Feb 26 12:14:12 2010 +0000 +++ b/sbsv2/raptor/test/smoke_suite/test_resources/tracecompiler/TC_winscw/traces/OstTraceDefinitions.h Fri Feb 26 14:41:19 2010 +0000 @@ -3,5 +3,5 @@ // OST_TRACE_COMPILER_IN_USE flag has been added by Trace Compiler // REMOVE BEFORE CHECK-IN TO VERSION CONTROL #define OST_TRACE_COMPILER_IN_USE -#include +#include #endif diff -r ba02dc2ff214 -r b30e816f1d39 sbsv2/raptor/test/smoke_suite/test_resources/tracecompiler/multiple_variants/group/tc_variants.mmp --- a/sbsv2/raptor/test/smoke_suite/test_resources/tracecompiler/multiple_variants/group/tc_variants.mmp Fri Feb 26 12:14:12 2010 +0000 +++ b/sbsv2/raptor/test/smoke_suite/test_resources/tracecompiler/multiple_variants/group/tc_variants.mmp Fri Feb 26 14:41:19 2010 +0000 @@ -5,7 +5,7 @@ UID 0x100039ce 0x10000004 LIBRARY euser.lib SYSTEMINCLUDE /epoc32/include -SYSTEMINCLUDE /epoc32/include/internal +SYSTEMINCLUDE /epoc32/include/platform SOURCEPATH ../src SOURCE tc_main.cpp diff -r ba02dc2ff214 -r b30e816f1d39 sbsv2/raptor/test/smoke_suite/test_resources/tracecompiler/multiple_variants/traces/OstTraceDefinitions.h --- a/sbsv2/raptor/test/smoke_suite/test_resources/tracecompiler/multiple_variants/traces/OstTraceDefinitions.h Fri Feb 26 12:14:12 2010 +0000 +++ b/sbsv2/raptor/test/smoke_suite/test_resources/tracecompiler/multiple_variants/traces/OstTraceDefinitions.h Fri Feb 26 14:41:19 2010 +0000 @@ -1,7 +1,7 @@ -#ifndef __OSTTRACEDEFINITIONS_H__ -#define __OSTTRACEDEFINITIONS_H__ -// OST_TRACE_COMPILER_IN_USE flag has been added by Trace Compiler -// REMOVE BEFORE CHECK-IN TO VERSION CONTROL -// #define OST_TRACE_COMPILER_IN_USE -#include -#endif +#ifndef __OSTTRACEDEFINITIONS_H__ +#define __OSTTRACEDEFINITIONS_H__ +// OST_TRACE_COMPILER_IN_USE flag has been added by Trace Compiler +// REMOVE BEFORE CHECK-IN TO VERSION CONTROL +#define OST_TRACE_COMPILER_IN_USE +#include +#endif diff -r ba02dc2ff214 -r b30e816f1d39 sbsv2/raptor/test/smoke_suite/test_resources/tracecompiler/mum_children_mmps/group/child1.mmp --- a/sbsv2/raptor/test/smoke_suite/test_resources/tracecompiler/mum_children_mmps/group/child1.mmp Fri Feb 26 12:14:12 2010 +0000 +++ b/sbsv2/raptor/test/smoke_suite/test_resources/tracecompiler/mum_children_mmps/group/child1.mmp Fri Feb 26 14:41:19 2010 +0000 @@ -5,7 +5,7 @@ UID 0x100039ce 0x11100001 LIBRARY euser.lib SYSTEMINCLUDE /epoc32/include -SYSTEMINCLUDE /epoc32/include/internal +SYSTEMINCLUDE /epoc32/include/platform SOURCEPATH ../src SOURCE child1.cpp diff -r ba02dc2ff214 -r b30e816f1d39 sbsv2/raptor/test/smoke_suite/test_resources/tracecompiler/mum_children_mmps/group/child2.mmp --- a/sbsv2/raptor/test/smoke_suite/test_resources/tracecompiler/mum_children_mmps/group/child2.mmp Fri Feb 26 12:14:12 2010 +0000 +++ b/sbsv2/raptor/test/smoke_suite/test_resources/tracecompiler/mum_children_mmps/group/child2.mmp Fri Feb 26 14:41:19 2010 +0000 @@ -5,7 +5,7 @@ UID 0x100039ce 0x11100002 LIBRARY euser.lib SYSTEMINCLUDE /epoc32/include -SYSTEMINCLUDE /epoc32/include/internal +SYSTEMINCLUDE /epoc32/include/platform SOURCEPATH ../src SOURCE child2.cpp diff -r ba02dc2ff214 -r b30e816f1d39 sbsv2/raptor/test/smoke_suite/test_resources/tracecompiler/mum_children_mmps/group/child3.mmp --- a/sbsv2/raptor/test/smoke_suite/test_resources/tracecompiler/mum_children_mmps/group/child3.mmp Fri Feb 26 12:14:12 2010 +0000 +++ b/sbsv2/raptor/test/smoke_suite/test_resources/tracecompiler/mum_children_mmps/group/child3.mmp Fri Feb 26 14:41:19 2010 +0000 @@ -4,7 +4,7 @@ UID 0x100039ce 0x11100002 LIBRARY euser.lib SYSTEMINCLUDE /epoc32/include -SYSTEMINCLUDE /epoc32/include/internal +SYSTEMINCLUDE /epoc32/include/platform SOURCEPATH ../src SOURCE child3.cpp diff -r ba02dc2ff214 -r b30e816f1d39 sbsv2/raptor/test/smoke_suite/test_resources/tracecompiler/mum_children_mmps/traces_child1_exe/OstTraceDefinitions.h --- a/sbsv2/raptor/test/smoke_suite/test_resources/tracecompiler/mum_children_mmps/traces_child1_exe/OstTraceDefinitions.h Fri Feb 26 12:14:12 2010 +0000 +++ b/sbsv2/raptor/test/smoke_suite/test_resources/tracecompiler/mum_children_mmps/traces_child1_exe/OstTraceDefinitions.h Fri Feb 26 14:41:19 2010 +0000 @@ -1,7 +1,7 @@ -#ifndef __OSTTRACEDEFINITIONS_H__ -#define __OSTTRACEDEFINITIONS_H__ -// OST_TRACE_COMPILER_IN_USE flag has been added by Trace Compiler -// REMOVE BEFORE CHECK-IN TO VERSION CONTROL -// #define OST_TRACE_COMPILER_IN_USE -#include -#endif +#ifndef __OSTTRACEDEFINITIONS_H__ +#define __OSTTRACEDEFINITIONS_H__ +// OST_TRACE_COMPILER_IN_USE flag has been added by Trace Compiler +// REMOVE BEFORE CHECK-IN TO VERSION CONTROL +#define OST_TRACE_COMPILER_IN_USE +#include +#endif diff -r ba02dc2ff214 -r b30e816f1d39 sbsv2/raptor/test/smoke_suite/test_resources/tracecompiler/mum_children_mmps/traces_child2_exe/OstTraceDefinitions.h --- a/sbsv2/raptor/test/smoke_suite/test_resources/tracecompiler/mum_children_mmps/traces_child2_exe/OstTraceDefinitions.h Fri Feb 26 12:14:12 2010 +0000 +++ b/sbsv2/raptor/test/smoke_suite/test_resources/tracecompiler/mum_children_mmps/traces_child2_exe/OstTraceDefinitions.h Fri Feb 26 14:41:19 2010 +0000 @@ -1,7 +1,7 @@ -#ifndef __OSTTRACEDEFINITIONS_H__ -#define __OSTTRACEDEFINITIONS_H__ -// OST_TRACE_COMPILER_IN_USE flag has been added by Trace Compiler -// REMOVE BEFORE CHECK-IN TO VERSION CONTROL -// #define OST_TRACE_COMPILER_IN_USE -#include -#endif +#ifndef __OSTTRACEDEFINITIONS_H__ +#define __OSTTRACEDEFINITIONS_H__ +// OST_TRACE_COMPILER_IN_USE flag has been added by Trace Compiler +// REMOVE BEFORE CHECK-IN TO VERSION CONTROL +#define OST_TRACE_COMPILER_IN_USE +#include +#endif diff -r ba02dc2ff214 -r b30e816f1d39 sbsv2/raptor/test/smoke_suite/test_resources/tracecompiler/mum_children_mmps/traces_child3_exe/OstTraceDefinitions.h --- a/sbsv2/raptor/test/smoke_suite/test_resources/tracecompiler/mum_children_mmps/traces_child3_exe/OstTraceDefinitions.h Fri Feb 26 12:14:12 2010 +0000 +++ b/sbsv2/raptor/test/smoke_suite/test_resources/tracecompiler/mum_children_mmps/traces_child3_exe/OstTraceDefinitions.h Fri Feb 26 14:41:19 2010 +0000 @@ -1,7 +1,7 @@ -#ifndef __OSTTRACEDEFINITIONS_H__ -#define __OSTTRACEDEFINITIONS_H__ -// OST_TRACE_COMPILER_IN_USE flag has been added by Trace Compiler -// REMOVE BEFORE CHECK-IN TO VERSION CONTROL -// #define OST_TRACE_COMPILER_IN_USE -#include -#endif +#ifndef __OSTTRACEDEFINITIONS_H__ +#define __OSTTRACEDEFINITIONS_H__ +// OST_TRACE_COMPILER_IN_USE flag has been added by Trace Compiler +// REMOVE BEFORE CHECK-IN TO VERSION CONTROL +#define OST_TRACE_COMPILER_IN_USE +#include +#endif diff -r ba02dc2ff214 -r b30e816f1d39 sbsv2/raptor/test/smoke_suite/test_resources/tracecompiler/testTC/group/testTC.mmp --- a/sbsv2/raptor/test/smoke_suite/test_resources/tracecompiler/testTC/group/testTC.mmp Fri Feb 26 12:14:12 2010 +0000 +++ b/sbsv2/raptor/test/smoke_suite/test_resources/tracecompiler/testTC/group/testTC.mmp Fri Feb 26 14:41:19 2010 +0000 @@ -1,5 +1,5 @@ /* -* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). +* Copyright (c) 2009-2010 Nokia Corporation and/or its subsidiary(-ies). * All rights reserved. * This component and the accompanying materials are made available * under the terms of the License "Eclipse Public License v1.0" @@ -36,6 +36,7 @@ OS_LAYER_SYSTEMINCLUDE SYSTEMINCLUDE /epoc32/include/libc SYSTEMINCLUDE /epoc32/include/internal +SYSTEMINCLUDE /epoc32/include/platform LIBRARY euser.lib LIBRARY iscapi.lib diff -r ba02dc2ff214 -r b30e816f1d39 sbsv2/raptor/test/smoke_suite/test_resources/tracecompiler/testTC/src/wlanhwinit.cpp --- a/sbsv2/raptor/test/smoke_suite/test_resources/tracecompiler/testTC/src/wlanhwinit.cpp Fri Feb 26 12:14:12 2010 +0000 +++ b/sbsv2/raptor/test/smoke_suite/test_resources/tracecompiler/testTC/src/wlanhwinit.cpp Fri Feb 26 14:41:19 2010 +0000 @@ -1,5 +1,5 @@ /* -* Copyright (c) 2002-2006 Nokia Corporation and/or its subsidiary(-ies). +* Copyright (c) 2002-2010 Nokia Corporation and/or its subsidiary(-ies). * All rights reserved. * This component and the accompanying materials are made available * under the terms of the License "Eclipse Public License v1.0" @@ -43,7 +43,7 @@ EXPORT_C CWlanHwInit* CWlanHwInit::NewL() { - OstTrace0( TRACE_API, CWLANHWINIT_NEWL, "CWlanHwInit::NewL()" ); + OstTrace0( TRACE_BORDER, CWLANHWINIT_NEWL, "CWlanHwInit::NewL()" ); OstTrace0( TRACE_NORMAL, DUP1_CWLANHWINIT_NEWL, "CWlanHwInit::NewL()" ); CWlanHwInit* self = new( ELeave ) CWlanHwInit; CleanupStack::PushL( self ); @@ -55,7 +55,7 @@ EXPORT_C CWlanHwInit::~CWlanHwInit() { TraceDump( INFO_LEVEL, ( _L( "CWlanHwInit::~CWlanHwInit()" ) ) ); - OstTrace0( TRACE_API, DUP1_CWLANHWINIT_CWLANHWINIT, "CWlanHwInit::~CWlanHwInit()" ); + OstTrace0( TRACE_BORDER, DUP1_CWLANHWINIT_CWLANHWINIT, "CWlanHwInit::~CWlanHwInit()" ); OstTrace0( TRACE_NORMAL, DUP2_CWLANHWINIT_CWLANHWINIT, "CWlanHwInit::~CWlanHwInit()" ); delete iMain; iMain = NULL; @@ -72,7 +72,7 @@ TUint& aFwLength ) { TraceDump( INFO_LEVEL, ( _L( "CWlanHwInit::GetHwInitData()" ) ) ); - OstTrace0( TRACE_API, DUP1_CWLANHWINIT_GETHWINITDATA, "CWlanHwInit::GetHwInitData()" ); + OstTrace0( TRACE_BORDER, DUP1_CWLANHWINIT_GETHWINITDATA, "CWlanHwInit::GetHwInitData()" ); OstTrace0( TRACE_NORMAL, CWLANHWINIT_GETHWINITDATA, "CWlanHwInit::GetHwInitData()" ); //BOB10d initialization data block is in one piece (NVS + FW) @@ -97,7 +97,7 @@ TMacAddr& aMacAddress ) { TraceDump( INFO_LEVEL, ( _L( "CWlanHwInit::GetMacAddress()" ) ) ); - OstTrace0( TRACE_API, CWLANHWINIT_GETMACADDRESS, "CWlanHwInit::GetMacAddress()" ); + OstTrace0( TRACE_BORDER, CWLANHWINIT_GETMACADDRESS, "CWlanHwInit::GetMacAddress()" ); OstTrace0( TRACE_NORMAL, DUP1_CWLANHWINIT_GETMACADDRESS, "CWlanHwInit::GetMacAddress()" ); return iMain->GetMacAddress( aMacAddress ); } @@ -113,7 +113,7 @@ TUint& aFwLength ) { TraceDump( INFO_LEVEL, ( _L( "CWlanHwInit::GetHwTestInitData()" ) ) ); - OstTrace0( TRACE_API, CWLANHWINIT_GETHWTESTINITDATA, "CWlanHwInit::GetHwTestInitData()" ); + OstTrace0( TRACE_BORDER, CWLANHWINIT_GETHWTESTINITDATA, "CWlanHwInit::GetHwTestInitData()" ); OstTrace0( TRACE_NORMAL, DUP1_CWLANHWINIT_GETHWTESTINITDATA, "CWlanHwInit::GetHwTestInitData()" ); //BOB10d initialization data block is in one piece (NVS + FW) @@ -139,7 +139,7 @@ TDes8& aData ) { TraceDump( INFO_LEVEL, ( _L( "CWlanHwInit::GetHwTestData()" ) ) ); - OstTrace0( TRACE_API, DUP1_CWLANHWINIT_GETHWTESTDATA, "CWlanHwInit::GetHwTestData()" ); + OstTrace0( TRACE_BORDER, DUP1_CWLANHWINIT_GETHWTESTDATA, "CWlanHwInit::GetHwTestData()" ); OstTrace0( TRACE_NORMAL, CWLANHWINIT_GETHWTESTDATA, "CWlanHwInit::GetHwTestData()" ); return iMain->GetHwTestData( aId, aData ); } @@ -153,7 +153,7 @@ TDesC8& aData ) { TraceDump( INFO_LEVEL, ( _L( "CWlanHwInit::SetHwTestData()" ) ) ); - OstTrace0( TRACE_API, DUP1_CWLANHWINIT_SETHWTESTDATA, "CWlanHwInit::SetHwTestData()" ); + OstTrace0( TRACE_BORDER, DUP1_CWLANHWINIT_SETHWTESTDATA, "CWlanHwInit::SetHwTestData()" ); OstTrace0( TRACE_NORMAL, CWLANHWINIT_SETHWTESTDATA, "CWlanHwInit::SetHwTestData()" ); return iMain->SetHwTestData( aId, aData ); } diff -r ba02dc2ff214 -r b30e816f1d39 sbsv2/raptor/test/smoke_suite/test_resources/tracecompiler/testTC/traces/OstTraceDefinitions.h --- a/sbsv2/raptor/test/smoke_suite/test_resources/tracecompiler/testTC/traces/OstTraceDefinitions.h Fri Feb 26 12:14:12 2010 +0000 +++ b/sbsv2/raptor/test/smoke_suite/test_resources/tracecompiler/testTC/traces/OstTraceDefinitions.h Fri Feb 26 14:41:19 2010 +0000 @@ -1,7 +1,7 @@ -#ifndef __OSTTRACEDEFINITIONS_H__ -#define __OSTTRACEDEFINITIONS_H__ -// OST_TRACE_COMPILER_IN_USE flag has been added by Trace Compiler -// REMOVE BEFORE CHECK-IN TO VERSION CONTROL -// #define OST_TRACE_COMPILER_IN_USE -#include -#endif +#ifndef __OSTTRACEDEFINITIONS_H__ +#define __OSTTRACEDEFINITIONS_H__ +// OST_TRACE_COMPILER_IN_USE flag has been added by Trace Compiler +// REMOVE BEFORE CHECK-IN TO VERSION CONTROL +#define OST_TRACE_COMPILER_IN_USE +#include +#endif diff -r ba02dc2ff214 -r b30e816f1d39 sbsv2/raptor/test/smoke_suite/test_resources/tracecompiler/variant_source/group/invariant_source.mmp --- a/sbsv2/raptor/test/smoke_suite/test_resources/tracecompiler/variant_source/group/invariant_source.mmp Fri Feb 26 12:14:12 2010 +0000 +++ b/sbsv2/raptor/test/smoke_suite/test_resources/tracecompiler/variant_source/group/invariant_source.mmp Fri Feb 26 14:41:19 2010 +0000 @@ -4,7 +4,7 @@ UID 0x100039ce 0x10000002 LIBRARY euser.lib SYSTEMINCLUDE /epoc32/include -SYSTEMINCLUDE /epoc32/include/internal +SYSTEMINCLUDE /epoc32/include/platform SOURCEPATH ../src SOURCE inv_source.cpp diff -r ba02dc2ff214 -r b30e816f1d39 sbsv2/raptor/test/smoke_suite/test_resources/tracecompiler/variant_source/group/variant_source.mmp --- a/sbsv2/raptor/test/smoke_suite/test_resources/tracecompiler/variant_source/group/variant_source.mmp Fri Feb 26 12:14:12 2010 +0000 +++ b/sbsv2/raptor/test/smoke_suite/test_resources/tracecompiler/variant_source/group/variant_source.mmp Fri Feb 26 14:41:19 2010 +0000 @@ -6,7 +6,7 @@ UID 0x100039ce 0x10000003 LIBRARY euser.lib SYSTEMINCLUDE /epoc32/include -SYSTEMINCLUDE /epoc32/include/internal +SYSTEMINCLUDE /epoc32/include/platform SOURCEPATH ../src SOURCE var_source1.cpp diff -r ba02dc2ff214 -r b30e816f1d39 sbsv2/raptor/test/smoke_suite/test_resources/tracecompiler/variant_source/traces/OstTraceDefinitions.h --- a/sbsv2/raptor/test/smoke_suite/test_resources/tracecompiler/variant_source/traces/OstTraceDefinitions.h Fri Feb 26 12:14:12 2010 +0000 +++ b/sbsv2/raptor/test/smoke_suite/test_resources/tracecompiler/variant_source/traces/OstTraceDefinitions.h Fri Feb 26 14:41:19 2010 +0000 @@ -1,7 +1,7 @@ -#ifndef __OSTTRACEDEFINITIONS_H__ -#define __OSTTRACEDEFINITIONS_H__ -// OST_TRACE_COMPILER_IN_USE flag has been added by Trace Compiler -// REMOVE BEFORE CHECK-IN TO VERSION CONTROL -// #define OST_TRACE_COMPILER_IN_USE -#include -#endif +#ifndef __OSTTRACEDEFINITIONS_H__ +#define __OSTTRACEDEFINITIONS_H__ +// OST_TRACE_COMPILER_IN_USE flag has been added by Trace Compiler +// REMOVE BEFORE CHECK-IN TO VERSION CONTROL +#define OST_TRACE_COMPILER_IN_USE +#include +#endif