Revision: 201002 RCL_3
authorDremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
Fri, 12 Mar 2010 15:50:23 +0200
branchRCL_3
changeset 9 8ffb8a35ea2f
parent 4 03e0f2627e7a
child 10 af762ad247ea
Revision: 201002 Kit: 201008
datasourceadaptation/gpsdatasourceadaptation/group/EPos_PluginFw.mmp
datasourceadaptation/gpsdatasourceadaptation/src/EPos_CPositioner.cpp
datasourceadaptation/gpsdatasourceadaptation/traces/osttracedefinitions.h
locationmgmt/locationcore/LbsClient/LbsApi/group/Lbs.mmp
locationmgmt/locationcore/LbsClient/LbsApi/src/LbsPositioner.cpp
locationmgmt/locationcore/LbsClient/LbsApi/traces/osttracedefinitions.h
locationmgmt/locmonitor/lbslocmonitorserver/inc/clbslocmonitordbengine.h
locationmgmt/locmonitor/lbslocmonitorserver/src/clbslocmonitordbengine.cpp
locationrequestmgmt/locationserver/group/EPos_Server.mmp
locationrequestmgmt/locationserver/src/EPos_CPositionRequest.cpp
locationrequestmgmt/locationserver/traces/osttracedefinitions.h
networkprotocolmodules/common/asn1export/inc/rtpersrc/ASN1CBitStr.h
networkprotocolmodules/common/asn1export/inc/rtpersrc/ASN1CGeneralizedTime.h
networkprotocolmodules/common/asn1export/inc/rtpersrc/ASN1CSeqOfList.h
networkprotocolmodules/common/asn1export/inc/rtpersrc/ASN1CTime.h
networkprotocolmodules/common/asn1export/inc/rtpersrc/ASN1CUTCTime.h
networkprotocolmodules/common/asn1export/inc/rtpersrc/ASN1Context.h
networkprotocolmodules/common/asn1export/inc/rtpersrc/ASN1TObjId.h
networkprotocolmodules/common/asn1export/inc/rtpersrc/ASN1TOctStr.h
networkprotocolmodules/common/asn1export/inc/rtpersrc/ASN1TTime.h
networkprotocolmodules/common/asn1export/inc/rtpersrc/asn1CEvtHndlr.h
networkprotocolmodules/common/asn1export/inc/rtpersrc/asn1CharSet.h
networkprotocolmodules/common/asn1export/inc/rtpersrc/asn1CppEvtHndlr.h
networkprotocolmodules/common/asn1export/inc/rtpersrc/asn1CppTypes.h
networkprotocolmodules/common/asn1export/inc/rtpersrc/asn1ErrCodes.h
networkprotocolmodules/common/asn1export/inc/rtpersrc/asn1PerCppTypes.h
networkprotocolmodules/common/asn1export/inc/rtpersrc/asn1compat.h
networkprotocolmodules/common/asn1export/inc/rtpersrc/asn1intl.h
networkprotocolmodules/common/asn1export/inc/rtpersrc/asn1per.h
networkprotocolmodules/common/asn1export/inc/rtpersrc/asn1tag.h
networkprotocolmodules/common/asn1export/inc/rtpersrc/asn1type.h
networkprotocolmodules/common/asn1export/inc/rtpersrc/asn1version.h
networkprotocolmodules/common/asn1export/inc/rtpersrc/rtBCD.h
networkprotocolmodules/common/asn1export/inc/rtpersrc/rtCompare.h
networkprotocolmodules/common/asn1export/inc/rtpersrc/rtContext.h
networkprotocolmodules/common/asn1export/inc/rtpersrc/rtCopy.h
networkprotocolmodules/common/asn1export/inc/rtpersrc/rtExternDefs.h
networkprotocolmodules/common/asn1export/inc/rtpersrc/rtPrint.h
networkprotocolmodules/common/asn1export/inc/rtpersrc/rtPrintStream.h
networkprotocolmodules/common/asn1export/inc/rtpersrc/rtPrintToStream.h
networkprotocolmodules/common/asn1export/inc/rtpersrc/rtPrintToString.h
networkprotocolmodules/common/asn1export/inc/rtpersrc/rtSocketSelect.h
networkprotocolmodules/common/asn1export/inc/rtpersrc/rtStream.h
networkprotocolmodules/common/asn1export/inc/rtpersrc/rtTable.h
networkprotocolmodules/common/asn1export/inc/rtpersrc/rtToken.h
networkprotocolmodules/common/asn1export/inc/rtpersrc/rtbench.h
networkprotocolmodules/common/asn1export/inc/rtpersrc/rtconv.h
networkprotocolmodules/common/asn1export/inc/rtsrc/ASN1CBitStr.h
networkprotocolmodules/common/asn1export/inc/rtsrc/ASN1CGeneralizedTime.h
networkprotocolmodules/common/asn1export/inc/rtsrc/ASN1CSeqOfList.h
networkprotocolmodules/common/asn1export/inc/rtsrc/ASN1CTime.h
networkprotocolmodules/common/asn1export/inc/rtsrc/ASN1CUTCTime.h
networkprotocolmodules/common/asn1export/inc/rtsrc/ASN1Context.h
networkprotocolmodules/common/asn1export/inc/rtsrc/ASN1TObjId.h
networkprotocolmodules/common/asn1export/inc/rtsrc/ASN1TOctStr.h
networkprotocolmodules/common/asn1export/inc/rtsrc/ASN1TTime.h
networkprotocolmodules/common/asn1export/inc/rtsrc/asn1CEvtHndlr.h
networkprotocolmodules/common/asn1export/inc/rtsrc/asn1CharSet.h
networkprotocolmodules/common/asn1export/inc/rtsrc/asn1CppEvtHndlr.h
networkprotocolmodules/common/asn1export/inc/rtsrc/asn1CppTypes.h
networkprotocolmodules/common/asn1export/inc/rtsrc/asn1ErrCodes.h
networkprotocolmodules/common/asn1export/inc/rtsrc/asn1compat.h
networkprotocolmodules/common/asn1export/inc/rtsrc/asn1intl.h
networkprotocolmodules/common/asn1export/inc/rtsrc/asn1tag.h
networkprotocolmodules/common/asn1export/inc/rtsrc/asn1type.h
networkprotocolmodules/common/asn1export/inc/rtsrc/asn1version.h
networkprotocolmodules/common/asn1export/inc/rtsrc/rtBCD.h
networkprotocolmodules/common/asn1export/inc/rtsrc/rtCompare.h
networkprotocolmodules/common/asn1export/inc/rtsrc/rtContext.h
networkprotocolmodules/common/asn1export/inc/rtsrc/rtCopy.h
networkprotocolmodules/common/asn1export/inc/rtsrc/rtExternDefs.h
networkprotocolmodules/common/asn1export/inc/rtsrc/rtPrint.h
networkprotocolmodules/common/asn1export/inc/rtsrc/rtPrintStream.h
networkprotocolmodules/common/asn1export/inc/rtsrc/rtPrintToStream.h
networkprotocolmodules/common/asn1export/inc/rtsrc/rtPrintToString.h
networkprotocolmodules/common/asn1export/inc/rtsrc/rtSocketSelect.h
networkprotocolmodules/common/asn1export/inc/rtsrc/rtStream.h
networkprotocolmodules/common/asn1export/inc/rtsrc/rtTable.h
networkprotocolmodules/common/asn1export/inc/rtsrc/rtToken.h
networkprotocolmodules/common/asn1export/inc/rtsrc/rtbench.h
networkprotocolmodules/common/asn1export/inc/rtsrc/rtconv.h
networkprotocolmodules/common/asn1export/inc/rtxsrc/OSRTBaseType.h
networkprotocolmodules/common/asn1export/inc/rtxsrc/OSRTContext.h
networkprotocolmodules/common/asn1export/inc/rtxsrc/OSRTCtxtHolder.h
networkprotocolmodules/common/asn1export/inc/rtxsrc/OSRTCtxtHolderIF.h
networkprotocolmodules/common/asn1export/inc/rtxsrc/OSRTFastString.h
networkprotocolmodules/common/asn1export/inc/rtxsrc/OSRTFileInputStream.h
networkprotocolmodules/common/asn1export/inc/rtxsrc/OSRTFileOutputStream.h
networkprotocolmodules/common/asn1export/inc/rtxsrc/OSRTInputStream.h
networkprotocolmodules/common/asn1export/inc/rtxsrc/OSRTInputStreamIF.h
networkprotocolmodules/common/asn1export/inc/rtxsrc/OSRTMemBuf.h
networkprotocolmodules/common/asn1export/inc/rtxsrc/OSRTMemoryInputStream.h
networkprotocolmodules/common/asn1export/inc/rtxsrc/OSRTMemoryOutputStream.h
networkprotocolmodules/common/asn1export/inc/rtxsrc/OSRTMsgBuf.h
networkprotocolmodules/common/asn1export/inc/rtxsrc/OSRTMsgBufIF.h
networkprotocolmodules/common/asn1export/inc/rtxsrc/OSRTOutputStream.h
networkprotocolmodules/common/asn1export/inc/rtxsrc/OSRTOutputStreamIF.h
networkprotocolmodules/common/asn1export/inc/rtxsrc/OSRTSocket.h
networkprotocolmodules/common/asn1export/inc/rtxsrc/OSRTSocketInputStream.h
networkprotocolmodules/common/asn1export/inc/rtxsrc/OSRTSocketOutputStream.h
networkprotocolmodules/common/asn1export/inc/rtxsrc/OSRTStream.h
networkprotocolmodules/common/asn1export/inc/rtxsrc/OSRTStreamIF.h
networkprotocolmodules/common/asn1export/inc/rtxsrc/OSRTString.h
networkprotocolmodules/common/asn1export/inc/rtxsrc/OSRTStringIF.h
networkprotocolmodules/common/asn1export/inc/rtxsrc/OSRTUTF8String.h
networkprotocolmodules/common/asn1export/inc/rtxsrc/osMacros.h
networkprotocolmodules/common/asn1export/inc/rtxsrc/osSysTypes.h
networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxArrayList.h
networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxBase64.h
networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxBigInt.h
networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxBitDecode.h
networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxBitEncode.h
networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxBitString.h
networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxBuffer.h
networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxCharStr.h
networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxClock.h
networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxCommon.h
networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxCommonDefs.h
networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxContext.h
networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxCtype.h
networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxDList.h
networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxDateTime.h
networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxDecimal.h
networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxDiag.h
networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxDiagBitTrace.h
networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxDynBitSet.h
networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxDynPtrArray.h
networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxEnum.h
networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxErrCodes.h
networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxError.h
networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxExternDefs.h
networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxFile.h
networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxFloat.h
networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxHashMap.h
networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxHashMapStr2Int.h
networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxHashMapStr2UInt.h
networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxHashMapUndef.h
networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxMemBuf.h
networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxMemLeakCheck.h
networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxMemory.h
networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxPattern.h
networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxPrint.h
networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxPrintStream.h
networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxPrintToStream.h
networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxReal.h
networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxSList.h
networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxScalarDList.h
networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxSocket.h
networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxStack.h
networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxStream.h
networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxStreamBuffered.h
networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxStreamCtxtBuf.h
networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxStreamFile.h
networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxStreamMemory.h
networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxStreamSocket.h
networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxStreamZlib.h
networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxToken.h
networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxTokenConst.h
networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxUTF8.h
networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxUtil.h
networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxXmlQName.h
networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxXmlStr.h
networkprotocolmodules/common/asn1export/inc/rtxsrc/wceAddon.h
networkprotocolmodules/common/utils/eabi/netpmutilsu.def
networkprotocolmodules/common/utils/group/bld.inf
networkprotocolmodules/common/utils/group/netpmutils.iby
networkprotocolmodules/common/utils/group/netpmutils.mmp
networkprotocolmodules/common/utils/inc/netpmutils.h
networkprotocolmodules/common/utils/src/netpmutils.cpp
networkprotocolmodules/suplcontrolplaneprotocols/common/suplrrlpprotocol/sfgroup/bld.inf
networkprotocolmodules/suplcontrolplaneprotocols/common/suplrrlpprotocol/sfgroup/suplrrlpprotocol.iby
networkprotocolmodules/suplcontrolplaneprotocols/common/suplrrlpprotocol/sfgroup/suplrrlpprotocol.mmp
networkprotocolmodules/suplproxyprotocolmodule/sfgroup/bld.inf
networkprotocolmodules/suplproxyprotocolmodule/sfgroup/lbs_suplproxyprotocolmodule.iby
--- a/datasourceadaptation/gpsdatasourceadaptation/group/EPos_PluginFw.mmp	Sat Feb 20 00:14:00 2010 +0200
+++ b/datasourceadaptation/gpsdatasourceadaptation/group/EPos_PluginFw.mmp	Fri Mar 12 15:50:23 2010 +0200
@@ -33,7 +33,7 @@
 SOURCE              EPos_CPositionerRegistry.cpp
 
 USERINCLUDE         ../inc
-
+USERINCLUDE         ../traces
 
 OS_LAYER_SYSTEMINCLUDE_SYMBIAN
 
--- a/datasourceadaptation/gpsdatasourceadaptation/src/EPos_CPositioner.cpp	Sat Feb 20 00:14:00 2010 +0200
+++ b/datasourceadaptation/gpsdatasourceadaptation/src/EPos_CPositioner.cpp	Fri Mar 12 15:50:23 2010 +0200
@@ -23,6 +23,11 @@
 #include "EPos_PositionerConstructParams.h"
 #include "EPos_CPositionerExtension.h"
 #include "EPos_CPosPsyExtension.h"
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "EPos_CPositionerTraces.h"
+#endif
+
 
 // ================= MEMBER FUNCTIONS =======================
 
@@ -36,6 +41,7 @@
 EXPORT_C CPositioner* CPositioner::NewL(
     TAny* aConstructionParameters)
     {
+    OstTraceFunctionEntry0( CPOSITIONER_NEWL_ENTRY );
     TUid implUid = reinterpret_cast<TPositionerConstructParams*>
             (aConstructionParameters)->iImplementationUid;
 
@@ -68,6 +74,7 @@
     TUid aImplementationUid,
     const CPositioner& aPositioner)
     {
+    OstTraceFunctionEntry0( DUP1_CPOSITIONER_NEWL_ENTRY );
     TPositionerConstructParams params;
 
     params.iImplementationUid = aImplementationUid;
@@ -83,8 +90,10 @@
 */
 EXPORT_C CPositioner::~CPositioner()
     {
+    OstTraceFunctionEntry1( CPOSITIONER_CPOSITIONER_ENTRY, this );
     delete iExtension;
     REComSession::DestroyedImplementation(iDtorIdKey);
+    OstTraceFunctionExit1( CPOSITIONER_CPOSITIONER_EXIT, this );
     }
 
 /**
@@ -92,6 +101,8 @@
 */
 EXPORT_C CPositioner::CPositioner()
     {
+    OstTraceFunctionEntry1( DUP1_CPOSITIONER_CPOSITIONER_ENTRY, this );
+    OstTraceFunctionExit1( DUP1_CPOSITIONER_CPOSITIONER_EXIT, this );
     }
 
 /**
@@ -105,6 +116,7 @@
 */
 EXPORT_C void CPositioner::BaseConstructL(TAny* aConstructionParameters)
     {
+    OstTraceFunctionEntry1( CPOSITIONER_BASECONSTRUCTL_ENTRY, this );
     TPositionerConstructParams* params = 
         reinterpret_cast<TPositionerConstructParams*>(aConstructionParameters);
 
@@ -112,6 +124,7 @@
         params->iImplementationUid, 
         params->iStatusObserver,
         params->iParamObserver);
+    OstTraceFunctionExit1( CPOSITIONER_BASECONSTRUCTL_EXIT, this );
     }
 
 /**
@@ -122,6 +135,7 @@
 */
 EXPORT_C TBool CPositioner::TrackingOverridden() const
     {
+    OstTraceFunctionEntry1( CPOSITIONER_TRACKINGOVERRIDDEN_ENTRY, this );
     return EFalse;
     }
 
@@ -133,7 +147,9 @@
 EXPORT_C void CPositioner::StartTrackingL(
     const TTimeIntervalMicroSeconds& /*aInterval*/)
     {
+    OstTraceFunctionEntry1( CPOSITIONER_STARTTRACKINGL_ENTRY, this );
     User::Leave(KErrNotSupported);
+    OstTraceFunctionExit1( CPOSITIONER_STARTTRACKINGL_EXIT, this );
     }
 
 /**
@@ -142,6 +158,8 @@
 */
 EXPORT_C void CPositioner::StopTracking()
     {
+    OstTraceFunctionEntry1( CPOSITIONER_STOPTRACKING_ENTRY, this );
+    OstTraceFunctionExit1( CPOSITIONER_STOPTRACKING_EXIT, this );
     }
 
 /**
@@ -157,7 +175,9 @@
 */
 EXPORT_C void CPositioner::ServiceL(RMessage2& /*aMessage*/)
     {
+    OstTraceFunctionEntry1( CPOSITIONER_SERVICEL_ENTRY, this );
     User::Leave(KErrNotSupported);
+    OstTraceFunctionExit1( CPOSITIONER_SERVICEL_EXIT, this );
     }
 
 /**
@@ -167,6 +187,7 @@
 */
 EXPORT_C TUid CPositioner::ImplementationUid() const
     {
+    OstTraceFunctionEntry1( CPOSITIONER_IMPLEMENTATIONUID_ENTRY, this );
     return iExtension->iPsyExtension->iImplementationUid;
     }
 
@@ -183,6 +204,7 @@
 EXPORT_C TInt CPositioner::GetRequiredPositionQuality(
     TPositionQuality& aPositionQuality) const
     {
+    OstTraceFunctionEntry1( CPOSITIONER_GETREQUIREDPOSITIONQUALITY_ENTRY, this );
     return iExtension->iParamObserver->GetRequiredPositionQuality(
         aPositionQuality);
     }
@@ -203,7 +225,9 @@
 */
 EXPORT_C void CPositioner::GetMaxAge(TTime& aMaxAge) const
     {
+    OstTraceFunctionEntry1( CPOSITIONER_GETMAXAGE_ENTRY, this );
     iExtension->iParamObserver->GetMaxAge(aMaxAge);
+    OstTraceFunctionExit1( CPOSITIONER_GETMAXAGE_EXIT, this );
     }
 
 /**
@@ -222,6 +246,7 @@
 */
 EXPORT_C TBool CPositioner::IsPartialUpdateAllowed() const
     {
+    OstTraceFunctionEntry1( CPOSITIONER_ISPARTIALUPDATEALLOWED_ENTRY, this );
     return iExtension->iParamObserver->IsPartialUpdateAllowed();
     }
 
@@ -232,6 +257,7 @@
 */
 EXPORT_C MPositionerStatus* CPositioner::PositionerStatus()
     {
+    OstTraceFunctionEntry1( CPOSITIONER_POSITIONERSTATUS_ENTRY, this );
     return iExtension->iPsyExtension;
     }
 
@@ -247,7 +273,9 @@
 
 EXPORT_C void CPositioner::CancelNotifyPositionUpdate(TInt /*aError*/)
     {
+    OstTraceFunctionEntry1( CPOSITIONER_CANCELNOTIFYPOSITIONUPDATE_ENTRY, this );
     CancelNotifyPositionUpdate();
+    OstTraceFunctionExit1( CPOSITIONER_CANCELNOTIFYPOSITIONUPDATE_EXIT, this );
     }
 
 //EXPORT_C void CPositioner::CPositioner_Reserved1()
@@ -259,6 +287,8 @@
  */
 EXPORT_C void CPositioner::CPositioner_Reserved2()
     {
+    OstTraceFunctionEntry1( CPOSITIONER_CPOSITIONER_RESERVED2_ENTRY, this );
+    OstTraceFunctionExit1( CPOSITIONER_CPOSITIONER_RESERVED2_EXIT, this );
     }
 
 /**
@@ -272,7 +302,9 @@
  */
 EXPORT_C void CPositioner::GetUpdateTimeOut(TTimeIntervalMicroSeconds& aUpdateTimeOut) const
 	{
+	OstTraceFunctionEntry1( CPOSITIONER_GETUPDATETIMEOUT_ENTRY, this );
 	iExtension->iParamObserver->GetUpdateTimeOut(aUpdateTimeOut);
+	OstTraceFunctionExit1( CPOSITIONER_GETUPDATETIMEOUT_EXIT, this );
 	}
 
 /**
@@ -287,7 +319,9 @@
  */
 EXPORT_C void CPositioner::SetPsyDefaultUpdateTimeOut(const TTimeIntervalMicroSeconds& aUpdateTimeOut)
 	{
+	OstTraceFunctionEntry1( CPOSITIONER_SETPSYDEFAULTUPDATETIMEOUT_ENTRY, this );
 	iExtension->iParamObserver->SetPsyDefaultUpdateTimeOut(aUpdateTimeOut);
+	OstTraceFunctionExit1( CPOSITIONER_SETPSYDEFAULTUPDATETIMEOUT_EXIT, this );
 	}
 
 /**
@@ -302,7 +336,9 @@
  */
 EXPORT_C void CPositioner::ExtendUpdateTimeOut(const TTimeIntervalMicroSeconds& aAdditionalTime)
 	{
+	OstTraceFunctionEntry1( CPOSITIONER_EXTENDUPDATETIMEOUT_ENTRY, this );
 	iExtension->iParamObserver->ExtendUpdateTimeOut(aAdditionalTime);
+	OstTraceFunctionExit1( CPOSITIONER_EXTENDUPDATETIMEOUT_EXIT, this );
 	}
 
 
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/datasourceadaptation/gpsdatasourceadaptation/traces/osttracedefinitions.h	Fri Mar 12 15:50:23 2010 +0200
@@ -0,0 +1,5 @@
+#ifndef __OSTTRACEDEFINITIONS_H__
+#define __OSTTRACEDEFINITIONS_H__
+
+#include <OpenSystemTrace.h>
+#endif
--- a/locationmgmt/locationcore/LbsClient/LbsApi/group/Lbs.mmp	Sat Feb 20 00:14:00 2010 +0200
+++ b/locationmgmt/locationcore/LbsClient/LbsApi/group/Lbs.mmp	Fri Mar 12 15:50:23 2010 +0200
@@ -42,6 +42,7 @@
 
 USERINCLUDE       ../inc
 USERINCLUDE       ../src
+USERINCLUDE       ../traces
 
 OS_LAYER_SYSTEMINCLUDE_SYMBIAN
 
--- a/locationmgmt/locationcore/LbsClient/LbsApi/src/LbsPositioner.cpp	Sat Feb 20 00:14:00 2010 +0200
+++ b/locationmgmt/locationcore/LbsClient/LbsApi/src/LbsPositioner.cpp	Fri Mar 12 15:50:23 2010 +0200
@@ -22,6 +22,11 @@
 
 #include "lbslocservermessageenums.h"
 #include "LbsPtrHolder.h"
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "LbsPositionerTraces.h"
+#endif
+
 
 #ifdef _DEBUG
     #include <e32debug.h>
@@ -39,6 +44,8 @@
     iPtrHolder(NULL),
     iReserved(NULL)
 	{
+	OstTraceFunctionEntry1( RPOSITIONSERVER_RPOSITIONSERVER_ENTRY, this );
+	OstTraceFunctionExit1( RPOSITIONSERVER_RPOSITIONSERVER_EXIT, this );
 	}
 
 /**
@@ -47,9 +54,11 @@
 */
 void RPositionServer::ConstructL()
 	{
+	OstTraceFunctionEntry1( RPOSITIONSERVER_CONSTRUCTL_ENTRY, this );
 	__ASSERT_ALWAYS(iPtrHolder == NULL, User::Panic(KPosClientFault, EPositionServerHandleNotClosed));
 
 	iPtrHolder = CServerPositioningPtrHolder::NewL(1, 1);
+	OstTraceFunctionExit1( RPOSITIONSERVER_CONSTRUCTL_EXIT, this );
 	}
 
 /**
@@ -58,8 +67,10 @@
 */
 void RPositionServer::Destruct()
 	{
+	OstTraceFunctionEntry1( RPOSITIONSERVER_DESTRUCT_ENTRY, this );
 	delete iPtrHolder;
 	iPtrHolder = NULL;
+	OstTraceFunctionExit1( RPOSITIONSERVER_DESTRUCT_EXIT, this );
 	}
 
 /**
@@ -73,6 +84,7 @@
 */
 EXPORT_C TInt RPositionServer::Connect()
 	{
+	OstTraceFunctionEntry1( RPOSITIONSERVER_CONNECT_ENTRY, this );
 	TRAPD(ret, ConstructL());
 
 	if (ret == KErrNone)
@@ -107,6 +119,7 @@
 		Destruct();
 		}
 
+	OstTraceFunctionExitExt( RPOSITIONSERVER_CONNECT_EXIT, this, ret );
 	return ret;
 	}
 
@@ -123,8 +136,10 @@
 */
 EXPORT_C void RPositionServer::Close()
 	{
+	OstTraceFunctionEntry1( RPOSITIONSERVER_CLOSE_ENTRY, this );
 	RSessionBase::Close();
 	Destruct();
+	OstTraceFunctionExit1( RPOSITIONSERVER_CLOSE_EXIT, this );
 	}
 
 /**
@@ -144,6 +159,7 @@
 */
 EXPORT_C TInt RPositionServer::CancelRequest(TRequestId aRequestId)
 	{
+	OstTraceFunctionEntry1( RPOSITIONSERVER_CANCELREQUEST_ENTRY, this );
 	__ASSERT_ALWAYS(Handle(), User::Panic(KPosClientFault, EPositionServerBadHandle));
 
 	if (aRequestId != KServerNotifyModuleStatusEventSymbian &&
@@ -152,6 +168,7 @@
 		aRequestId != EReqEmptyLastKnownPositionStore
 		)
 		{
+        OstTraceFunctionExitExt( RPOSITIONSERVER_CANCELREQUEST_EXIT, this, KErrNotSupported );
         return KErrNotSupported;
         }
 	
@@ -183,6 +200,7 @@
 */
 EXPORT_C TVersion RPositionServer::Version() const
 	{
+	OstTraceFunctionEntry1( RPOSITIONSERVER_VERSION_ENTRY, this );
 	return TVersion(
 		KPosMajorVersionNumber,
 		KPosMinorVersionNumber,
@@ -206,6 +224,7 @@
 */
 EXPORT_C TInt RPositionServer::GetDefaultModuleId(TPositionModuleId& aModuleId) const
 	{
+	OstTraceFunctionEntry1( RPOSITIONSERVER_GETDEFAULTMODULEID_ENTRY, this );
 	__ASSERT_ALWAYS(Handle(), User::Panic(KPosClientFault, EPositionServerBadHandle));
 
     TPckg<TPositionModuleId> moduleId(aModuleId);
@@ -225,6 +244,7 @@
 */
 EXPORT_C TInt RPositionServer::GetNumModules(TUint& aNumModules) const
 	{
+	OstTraceFunctionEntry1( RPOSITIONSERVER_GETNUMMODULES_ENTRY, this );
 	__ASSERT_ALWAYS(Handle(), User::Panic(KPosClientFault, EPositionServerBadHandle));
 
     TPckg<TUint> numModules(aNumModules);
@@ -248,6 +268,7 @@
 	TInt aModuleIndex,
 	TPositionModuleInfoBase& aModuleInfo) const
 	{
+	OstTraceFunctionEntry1( RPOSITIONSERVER_GETMODULEINFOBYINDEX_ENTRY, this );
 	__ASSERT_ALWAYS(Handle(), User::Panic(KPosClientFault, EPositionServerBadHandle));
 
 	TPtr8 ptr(reinterpret_cast<TUint8*>(&aModuleInfo),
@@ -275,6 +296,7 @@
 EXPORT_C TInt RPositionServer::GetModuleInfoById(TPositionModuleId aModuleId,
                                                  TPositionModuleInfoBase& aModuleInfo) const
 	{
+	OstTraceFunctionEntry1( RPOSITIONSERVER_GETMODULEINFOBYID_ENTRY, this );
 	__ASSERT_ALWAYS(Handle(), User::Panic(KPosClientFault, EPositionServerBadHandle));
 
     TPckg<TPositionModuleId> moduleId(aModuleId);
@@ -297,6 +319,7 @@
 EXPORT_C TInt RPositionServer::GetModuleStatus(TPositionModuleStatusBase& aPosModuleStatus,
                                                TPositionModuleId aModuleId) const
 	{
+	OstTraceFunctionEntry1( RPOSITIONSERVER_GETMODULESTATUS_ENTRY, this );
 	__ASSERT_ALWAYS(Handle(), User::Panic(KPosClientFault, EPositionServerBadHandle));
 
     TPckg<TPositionModuleId> moduleId(aModuleId);
@@ -337,6 +360,7 @@
                                                        TRequestStatus& aStatus,
                                                        const TPositionModuleId aModuleId) const
 	{
+	OstTraceFunctionEntry1( RPOSITIONSERVER_NOTIFYMODULESTATUSEVENT_ENTRY, this );
 	__ASSERT_ALWAYS(Handle(), User::Panic(KPosClientFault, EPositionServerBadHandle));
 	__ASSERT_ALWAYS(iPtrHolder != NULL, User::Panic(KPosClientFault, EPositionNullPointerHolder));
 
@@ -349,6 +373,7 @@
 
 	SendReceive(ELbsNotifyModuleStatusEvent, 
         TIpcArgs(&iPtrHolder->Ptr(0), &iPtrHolder->PtrC(0)), aStatus);
+	OstTraceFunctionExit1( RPOSITIONSERVER_NOTIFYMODULESTATUSEVENT_EXIT, this );
 	}
 
 /**
@@ -366,6 +391,7 @@
 */
 EXPORT_C void RPositionServer::EmptyLastKnownPositionStore(TRequestStatus& aStatus)
 	{
+	OstTraceFunctionEntry1( RPOSITIONSERVER_EMPTYLASTKNOWNPOSITIONSTORE_ENTRY, this );
 	__ASSERT_ALWAYS(Handle(), User::Panic(KPosClientFault, EPositionServerBadHandle));
 	__ASSERT_ALWAYS(iPtrHolder != NULL, User::Panic(KPosClientFault, EPositionNullPointerHolder));
 	
@@ -384,6 +410,8 @@
   : RSubSessionBase(),
     iReserved(NULL)
     {
+	OstTraceFunctionEntry1( RPOSITIONERSUBSESSIONBASE_RPOSITIONERSUBSESSIONBASE_ENTRY, this );
+	OstTraceFunctionExit1( RPOSITIONERSUBSESSIONBASE_RPOSITIONERSUBSESSIONBASE_EXIT, this );
 	}
 
 
@@ -406,6 +434,7 @@
 */
 EXPORT_C TInt RPositionerSubSessionBase::CancelRequest(TRequestId aRequestId)
 	{
+	OstTraceFunctionEntry1( RPOSITIONERSUBSESSIONBASE_CANCELREQUEST_ENTRY, this );
 	__ASSERT_ALWAYS(SubSessionHandle(), User::Panic(KPosClientFault, EPositionServerBadHandle));
 
 	if (aRequestId != KGetLastKnownPositionSymbian &&
@@ -416,6 +445,7 @@
 		aRequestId != EReqNotifyPositionUpdate &&
 		aRequestId != EReqGetLastKnownPositionArea)
         {
+        OstTraceFunctionExitExt( RPOSITIONERSUBSESSIONBASE_CANCELREQUEST_EXIT, this, KErrNotSupported );
         return KErrNotSupported;
         }
 
@@ -447,6 +477,8 @@
 */
 EXPORT_C TInt RPositionerSubSessionBase::CompleteRequest(TInt /*aRequestId*/)
 	{
+	OstTraceFunctionEntry1( RPOSITIONERSUBSESSIONBASE_COMPLETEREQUEST_ENTRY, this );
+	OstTraceFunctionExitExt( RPOSITIONERSUBSESSIONBASE_COMPLETEREQUEST_EXIT, this, KErrNotSupported );
 	return KErrNotSupported;
 	}
 
@@ -462,6 +494,8 @@
                                                             TAny* /*aPtr1*/,
                                                             TAny* /*aPtr2*/)
 	{
+	OstTraceFunctionEntry1( RPOSITIONERSUBSESSIONBASE_EXTENDEDINTERFACE_ENTRY, this );
+	OstTraceFunctionExitExt( RPOSITIONERSUBSESSIONBASE_EXTENDEDINTERFACE_EXIT, this, ( TUint )( NULL ) );
 	return NULL;
 	}
 
@@ -477,6 +511,8 @@
     iPtrHolder(NULL),
     iReserved(NULL)
 	{
+	OstTraceFunctionEntry1( RPOSITIONER_RPOSITIONER_ENTRY, this );
+	OstTraceFunctionExit1( RPOSITIONER_RPOSITIONER_EXIT, this );
 	}
 
 /**
@@ -484,10 +520,12 @@
 */
 EXPORT_C void RPositioner::ConstructL()
 	{
+	OstTraceFunctionEntry1( RPOSITIONER_CONSTRUCTL_ENTRY, this );
 	__ASSERT_ALWAYS(iPtrHolder == NULL, User::Panic(KPosClientFault, EPositionServerHandleNotClosed));
 	
 	// Pointers to as many messages/requests as can be supported concurrently (currently 4)
 	iPtrHolder = CPositioningPtrHolder::NewL(4, 0);
+	OstTraceFunctionExit1( RPOSITIONER_CONSTRUCTL_EXIT, this );
 	}
 
 /**
@@ -495,8 +533,10 @@
 */
 EXPORT_C void RPositioner::Destruct()
 	{
+	OstTraceFunctionEntry1( RPOSITIONER_DESTRUCT_ENTRY, this );
 	delete iPtrHolder;
 	iPtrHolder = NULL;
+	OstTraceFunctionExit1( RPOSITIONER_DESTRUCT_EXIT, this );
 	}
 
 /**
@@ -518,6 +558,7 @@
 */
 EXPORT_C TInt RPositioner::Open(RPositionServer& aPosServer)
 	{
+	OstTraceFunctionEntry1( RPOSITIONER_OPEN_ENTRY, this );
 	__ASSERT_ALWAYS(aPosServer.Handle() != 0,
 		User::Panic(KPosClientFault, EPositionServerBadHandle));
 
@@ -530,6 +571,7 @@
 		{
 		Destruct();
 		}
+	OstTraceFunctionExitExt( RPOSITIONER_OPEN_EXIT, this, ret );
 	return ret;
 	}
 
@@ -557,6 +599,7 @@
 EXPORT_C TInt RPositioner::Open(RPositionServer& aPosServer,
                                 TPositionModuleId aModuleId)
 	{
+	OstTraceFunctionEntry1( DUP1_RPOSITIONER_OPEN_ENTRY, this );
 	__ASSERT_ALWAYS(aPosServer.Handle() != 0,
 		User::Panic(KPosClientFault, EPositionServerBadHandle));
 
@@ -570,6 +613,7 @@
 		{
 		Destruct();
 		}
+	OstTraceFunctionExitExt( DUP1_RPOSITIONER_OPEN_EXIT, this, ret );
 	return ret;
 	}
 
@@ -587,6 +631,7 @@
 EXPORT_C TInt RPositioner::Open(RPositionServer& aPosServer,
                                 const TPositionCriteriaBase& aCriteria)
 	{
+	OstTraceFunctionEntry1( DUP2_RPOSITIONER_OPEN_ENTRY, this );
 	__ASSERT_ALWAYS(aPosServer.Handle() != 0,
 		User::Panic(KPosClientFault, EPositionServerBadHandle));
 
@@ -601,6 +646,7 @@
 		{
 		Destruct();
 		}
+	OstTraceFunctionExitExt( DUP2_RPOSITIONER_OPEN_EXIT, this, ret );
 	return ret;
 	}
 
@@ -617,8 +663,10 @@
 */
 EXPORT_C void RPositioner::Close()
 	{
+	OstTraceFunctionEntry1( RPOSITIONER_CLOSE_ENTRY, this );
 	CloseSubSession(ELbsPositionerClose);
 	Destruct();
+	OstTraceFunctionExit1( RPOSITIONER_CLOSE_EXIT, this );
 	}
 
 /**
@@ -640,8 +688,10 @@
                                         CRequestor::TRequestorFormat /*aFormat*/,
                                         const TDesC& /*aData*/)
 	{
+	OstTraceFunctionEntry1( RPOSITIONER_SETREQUESTOR_ENTRY, this );
 	__ASSERT_ALWAYS(SubSessionHandle(), User::Panic(KPosClientFault, EPositionServerBadHandle));
 	
+	OstTraceFunctionExitExt( RPOSITIONER_SETREQUESTOR_EXIT, this, KErrNone );
 	return KErrNone;
 	}
 
@@ -661,8 +711,10 @@
 */
 EXPORT_C TInt RPositioner::SetRequestor(const RRequestorStack& /*aRequestorStack*/)
 	{
+	OstTraceFunctionEntry1( DUP1_RPOSITIONER_SETREQUESTOR_ENTRY, this );
 	__ASSERT_ALWAYS(SubSessionHandle(), User::Panic(KPosClientFault, EPositionServerBadHandle));
 	
+	OstTraceFunctionExitExt( DUP1_RPOSITIONER_SETREQUESTOR_EXIT, this, KErrNone );
 	return KErrNone;
 	}
 
@@ -701,6 +753,7 @@
 EXPORT_C void RPositioner::GetLastKnownPosition(TPositionInfoBase& aPosInfo,
                                                 TRequestStatus& aStatus) const
 	{
+	OstTraceFunctionEntry1( RPOSITIONER_GETLASTKNOWNPOSITION_ENTRY, this );
 	__ASSERT_ALWAYS(SubSessionHandle(), User::Panic(KPosClientFault, EPositionServerBadHandle));
 	__ASSERT_ALWAYS(iPtrHolder != NULL, User::Panic(KPosClientFault, EPositionNullPointerHolder));
 
@@ -712,6 +765,7 @@
 	SendReceive(ELbsGetLastKnownPosition, 
 				TIpcArgs(&iPtrHolder->Ptr(0), aPosInfo.PositionClassType(), aPosInfo.PositionClassSize()), 
 				aStatus);
+	OstTraceFunctionExit1( RPOSITIONER_GETLASTKNOWNPOSITION_EXIT, this );
 	}
 
 /**
@@ -775,6 +829,7 @@
 					      				 TPositionAreaInfoBase& aAreaInfo,
 	                                   	 TRequestStatus& aStatus) const
 	{
+	 OstTraceFunctionEntry1( RPOSITIONER_GETLASTKNOWNPOSITIONAREA_ENTRY, this );
 	 
 	__ASSERT_ALWAYS(SubSessionHandle(), User::Panic(KPosClientFault, EPositionServerBadHandle));
 	__ASSERT_ALWAYS(iPtrHolder != NULL, User::Panic(KPosClientFault, EPositionNullPointerHolder));
@@ -791,6 +846,7 @@
 	SendReceive(ELbsGetLastKnownPositionArea, 
 				TIpcArgs(&iPtrHolder->Ptr(2),&iPtrHolder->Ptr(3)), 
 				aStatus);
+	OstTraceFunctionExit1( RPOSITIONER_GETLASTKNOWNPOSITIONAREA_EXIT, this );
 	}
 	
 /**
@@ -838,6 +894,7 @@
 EXPORT_C void RPositioner::NotifyPositionUpdate(TPositionInfoBase& aPosInfo,
                                                 TRequestStatus& aStatus) const
 	{
+	OstTraceFunctionEntry1( RPOSITIONER_NOTIFYPOSITIONUPDATE_ENTRY, this );
 	__ASSERT_ALWAYS(SubSessionHandle(), User::Panic(KPosClientFault, EPositionServerBadHandle));
 	__ASSERT_ALWAYS(iPtrHolder != NULL, User::Panic(KPosClientFault, EPositionNullPointerHolder));
 
@@ -848,6 +905,7 @@
 
 	SendReceive(ELbsPosNotifyPositionUpdate, TIpcArgs(&iPtrHolder->Ptr(1)), aStatus);
 
+	OstTraceFunctionExit1( RPOSITIONER_NOTIFYPOSITIONUPDATE_EXIT, this );
 	}
 
 /**
@@ -872,6 +930,7 @@
 */
 EXPORT_C TInt RPositioner::SetUpdateOptions(const TPositionUpdateOptionsBase& aPosOption)
 	{
+	OstTraceFunctionEntry1( RPOSITIONER_SETUPDATEOPTIONS_ENTRY, this );
 	__ASSERT_ALWAYS(SubSessionHandle(), User::Panic(KPosClientFault, EPositionServerBadHandle));
 
 	TPtrC8 ptr(
@@ -895,6 +954,7 @@
 */
 EXPORT_C TInt RPositioner::GetUpdateOptions(TPositionUpdateOptionsBase& aPosOption) const
 	{
+	OstTraceFunctionEntry1( RPOSITIONER_GETUPDATEOPTIONS_ENTRY, this );
 	__ASSERT_ALWAYS(SubSessionHandle(), User::Panic(KPosClientFault, EPositionServerBadHandle));
 
 	TPtr8 ptr(
@@ -918,5 +978,6 @@
                                               TAny* aPtr1,
                                               TAny* aPtr2)
 	{
+	OstTraceFunctionEntry1( RPOSITIONER_EXTENDEDINTERFACE_ENTRY, this );
 	return RPositionerSubSessionBase::ExtendedInterface(aFunctionNumber, aPtr1, aPtr2);
 	}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/locationmgmt/locationcore/LbsClient/LbsApi/traces/osttracedefinitions.h	Fri Mar 12 15:50:23 2010 +0200
@@ -0,0 +1,5 @@
+#ifndef __OSTTRACEDEFINITIONS_H__
+#define __OSTTRACEDEFINITIONS_H__
+
+#include <OpenSystemTrace.h>
+#endif
--- a/locationmgmt/locmonitor/lbslocmonitorserver/inc/clbslocmonitordbengine.h	Sat Feb 20 00:14:00 2010 +0200
+++ b/locationmgmt/locmonitor/lbslocmonitorserver/inc/clbslocmonitordbengine.h	Fri Mar 12 15:50:23 2010 +0200
@@ -68,6 +68,7 @@
 	RSqlStatement iSqlSaveStatement;
 	TRequestStatus* iClientStatus;
 	
+	TBool iDBInitialised;
 	TInt iLastMcc;
 	TInt iLastMnc;
 	TInt iLastLac;
--- a/locationmgmt/locmonitor/lbslocmonitorserver/src/clbslocmonitordbengine.cpp	Sat Feb 20 00:14:00 2010 +0200
+++ b/locationmgmt/locmonitor/lbslocmonitorserver/src/clbslocmonitordbengine.cpp	Fri Mar 12 15:50:23 2010 +0200
@@ -51,27 +51,34 @@
 	TInt error = iDatabase.Open(KSecureLocMonDB);
 	if(KErrNotFound == error)
 		{		
-	    RSqlSecurityPolicy securityPolicy;
-	    User::LeaveIfError(securityPolicy.Create(TSecurityPolicy(TSecurityPolicy::EAlwaysPass)));
-	    CleanupClosePushL(securityPolicy);
-	    User::LeaveIfError(securityPolicy.SetDbPolicy(RSqlSecurityPolicy::EWritePolicy, TSecurityPolicy(TSecurityPolicy::EAlwaysPass)));
-	    #ifdef LBS_LOCMONITORDB_TEST
-	    User::LeaveIfError(iDatabase.Create(KSecureLocMonDB));
-	    #else
-	    User::LeaveIfError(iDatabase.Create(KSecureLocMonDB, securityPolicy));
+		RSqlSecurityPolicy securityPolicy;
+		User::LeaveIfError(securityPolicy.Create(TSecurityPolicy(TSecurityPolicy::EAlwaysPass)));
+		CleanupClosePushL(securityPolicy);
+		User::LeaveIfError(securityPolicy.SetDbPolicy(RSqlSecurityPolicy::EWritePolicy, TSecurityPolicy(TSecurityPolicy::EAlwaysPass)));
+		#ifdef LBS_LOCMONITORDB_TEST
+		User::LeaveIfError(iDatabase.Create(KSecureLocMonDB));
+		#else
+		User::LeaveIfError(iDatabase.Create(KSecureLocMonDB, securityPolicy));
 		#endif
-	    CleanupStack::PopAndDestroy(&securityPolicy);
+		CleanupStack::PopAndDestroy(&securityPolicy);
+		iDBInitialised = ETrue;
 		User::LeaveIfError(iDatabase.Exec(KCreateTable));
 		User::LeaveIfError(iDatabase.Exec(KCreateIndex4));
 		User::LeaveIfError(iDatabase.Exec(KCreateIndex3));
 		}
+	else
+		{
+		User::LeaveIfError(error);
+		iDBInitialised = ETrue;
+		}
 	User::LeaveIfError(iDatabase.Exec(KCreateTempTable));
 	User::LeaveIfError(iDatabase.Exec(KCreateTempIndex4));
 	}
 
 
 CLbsLocMonitorDbEngine::CLbsLocMonitorDbEngine():
-CActive(EPriorityStandard)
+CActive(EPriorityStandard),
+iDBInitialised(EFalse)
 	{
 	LBSLOG(ELogP1,"->CLbsLocMonitorDbEngine::CLbsLocMonitorDbEngine");
 	CActiveScheduler::Add(this);
@@ -82,16 +89,23 @@
 	{
 	LBSLOG(ELogP1,"->CLbsLocMonitorDbEngine::~CLbsLocMonitorDbEngine");
 	Cancel();
-	iPeriodic->Cancel();
-	delete iPeriodic;
-	iSqlSaveStatement.Close();
-	if(iIsLastValid)
+	if(iPeriodic)
+		{
+		iPeriodic->Cancel();
+		delete iPeriodic;
+		}
+	if(iDBInitialised)
 		{
-		Insert(ETrue);
+		iSqlSaveStatement.Close();
+		if(iIsLastValid)
+			{
+			Insert(ETrue);
+			}
+
+		Flush(ETrue);
+		
+		iDatabase.Close();
 		}
-	Flush(ETrue);
-	
-	iDatabase.Close();
 	}
 
 
--- a/locationrequestmgmt/locationserver/group/EPos_Server.mmp	Sat Feb 20 00:14:00 2010 +0200
+++ b/locationrequestmgmt/locationserver/group/EPos_Server.mmp	Fri Mar 12 15:50:23 2010 +0200
@@ -67,6 +67,7 @@
 USERINCLUDE		../../../locationmgmt/locationcore/LbsLocCommon/ServerFramework/inc 
 USERINCLUDE		../../../locationmgmt/locationcore/LbsNetRegStatusInt/inc
 USERINCLUDE		../../../locationmgmt/locationcore/inc 
+USERINCLUDE         ../traces
 
 OS_LAYER_SYSTEMINCLUDE_SYMBIAN
 
--- a/locationrequestmgmt/locationserver/src/EPos_CPositionRequest.cpp	Sat Feb 20 00:14:00 2010 +0200
+++ b/locationrequestmgmt/locationserver/src/EPos_CPositionRequest.cpp	Fri Mar 12 15:50:23 2010 +0200
@@ -30,6 +30,11 @@
 
 //TODO Verify
 #include "EPos_CPosLocMonitorReqHandlerHub.h"
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "EPos_CPositionRequestTraces.h"
+#endif
+
 
 
 
@@ -435,6 +440,7 @@
  */
 void CPositionRequest::DoCancel()
     {
+    OstTraceFunctionEntry1( CPOSITIONREQUEST_DOCANCEL_ENTRY, this );
     LBS_RDEBUG_VAR_INT("CPositionRequest::DoCancel() iRequestPhase", iRequestPhase);
     iTimeoutTimer->Cancel();
 
@@ -482,6 +488,7 @@
         }
 
     iRequestPhase = EPosReqInactive;
+    OstTraceFunctionExit1( CPOSITIONREQUEST_DOCANCEL_EXIT, this );
     }
 
 
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/locationrequestmgmt/locationserver/traces/osttracedefinitions.h	Fri Mar 12 15:50:23 2010 +0200
@@ -0,0 +1,5 @@
+#ifndef __OSTTRACEDEFINITIONS_H__
+#define __OSTTRACEDEFINITIONS_H__
+
+#include <OpenSystemTrace.h>
+#endif
--- a/networkprotocolmodules/common/asn1export/inc/rtpersrc/ASN1CBitStr.h	Sat Feb 20 00:14:00 2010 +0200
+++ b/networkprotocolmodules/common/asn1export/inc/rtpersrc/ASN1CBitStr.h	Fri Mar 12 15:50:23 2010 +0200
@@ -1,7 +1,7 @@
 // Copyright (c) 2001-2009 Objective Systems, Inc. (http://www.obj-sys.com) 
 // All rights reserved.
 // This component and the accompanying materials are made available
-// under the terms of the License "Eclipse Public License v1.0"
+// under the terms of "Eclipse Public License v1.0"
 // which accompanies this distribution, and is available 
 // at the URL "http://www.eclipse.org/legal/epl-v10.html".
 //
--- a/networkprotocolmodules/common/asn1export/inc/rtpersrc/ASN1CGeneralizedTime.h	Sat Feb 20 00:14:00 2010 +0200
+++ b/networkprotocolmodules/common/asn1export/inc/rtpersrc/ASN1CGeneralizedTime.h	Fri Mar 12 15:50:23 2010 +0200
@@ -1,7 +1,7 @@
 // Copyright (c) 2001-2009 Objective Systems, Inc. (http://www.obj-sys.com) 
 // All rights reserved.
 // This component and the accompanying materials are made available
-// under the terms of the License "Eclipse Public License v1.0"
+// under the terms of "Eclipse Public License v1.0"
 // which accompanies this distribution, and is available 
 // at the URL "http://www.eclipse.org/legal/epl-v10.html".
 //
--- a/networkprotocolmodules/common/asn1export/inc/rtpersrc/ASN1CSeqOfList.h	Sat Feb 20 00:14:00 2010 +0200
+++ b/networkprotocolmodules/common/asn1export/inc/rtpersrc/ASN1CSeqOfList.h	Fri Mar 12 15:50:23 2010 +0200
@@ -1,7 +1,7 @@
 // Copyright (c) 2001-2009 Objective Systems, Inc. (http://www.obj-sys.com) 
 // All rights reserved.
 // This component and the accompanying materials are made available
-// under the terms of the License "Eclipse Public License v1.0"
+// under the terms of "Eclipse Public License v1.0"
 // which accompanies this distribution, and is available 
 // at the URL "http://www.eclipse.org/legal/epl-v10.html".
 //
--- a/networkprotocolmodules/common/asn1export/inc/rtpersrc/ASN1CTime.h	Sat Feb 20 00:14:00 2010 +0200
+++ b/networkprotocolmodules/common/asn1export/inc/rtpersrc/ASN1CTime.h	Fri Mar 12 15:50:23 2010 +0200
@@ -1,7 +1,7 @@
 // Copyright (c) 2001-2009 Objective Systems, Inc. (http://www.obj-sys.com) 
 // All rights reserved.
 // This component and the accompanying materials are made available
-// under the terms of the License "Eclipse Public License v1.0"
+// under the terms of "Eclipse Public License v1.0"
 // which accompanies this distribution, and is available 
 // at the URL "http://www.eclipse.org/legal/epl-v10.html".
 //
--- a/networkprotocolmodules/common/asn1export/inc/rtpersrc/ASN1CUTCTime.h	Sat Feb 20 00:14:00 2010 +0200
+++ b/networkprotocolmodules/common/asn1export/inc/rtpersrc/ASN1CUTCTime.h	Fri Mar 12 15:50:23 2010 +0200
@@ -1,7 +1,7 @@
 // Copyright (c) 2001-2009 Objective Systems, Inc. (http://www.obj-sys.com) 
 // All rights reserved.
 // This component and the accompanying materials are made available
-// under the terms of the License "Eclipse Public License v1.0"
+// under the terms of "Eclipse Public License v1.0"
 // which accompanies this distribution, and is available 
 // at the URL "http://www.eclipse.org/legal/epl-v10.html".
 //
--- a/networkprotocolmodules/common/asn1export/inc/rtpersrc/ASN1Context.h	Sat Feb 20 00:14:00 2010 +0200
+++ b/networkprotocolmodules/common/asn1export/inc/rtpersrc/ASN1Context.h	Fri Mar 12 15:50:23 2010 +0200
@@ -1,7 +1,7 @@
 // Copyright (c) 2001-2009 Objective Systems, Inc. (http://www.obj-sys.com) 
 // All rights reserved.
 // This component and the accompanying materials are made available
-// under the terms of the License "Eclipse Public License v1.0"
+// under the terms of "Eclipse Public License v1.0"
 // which accompanies this distribution, and is available 
 // at the URL "http://www.eclipse.org/legal/epl-v10.html".
 //
--- a/networkprotocolmodules/common/asn1export/inc/rtpersrc/ASN1TObjId.h	Sat Feb 20 00:14:00 2010 +0200
+++ b/networkprotocolmodules/common/asn1export/inc/rtpersrc/ASN1TObjId.h	Fri Mar 12 15:50:23 2010 +0200
@@ -1,7 +1,7 @@
 // Copyright (c) 2001-2009 Objective Systems, Inc. (http://www.obj-sys.com) 
 // All rights reserved.
 // This component and the accompanying materials are made available
-// under the terms of the License "Eclipse Public License v1.0"
+// under the terms of "Eclipse Public License v1.0"
 // which accompanies this distribution, and is available 
 // at the URL "http://www.eclipse.org/legal/epl-v10.html".
 //
--- a/networkprotocolmodules/common/asn1export/inc/rtpersrc/ASN1TOctStr.h	Sat Feb 20 00:14:00 2010 +0200
+++ b/networkprotocolmodules/common/asn1export/inc/rtpersrc/ASN1TOctStr.h	Fri Mar 12 15:50:23 2010 +0200
@@ -1,7 +1,7 @@
 // Copyright (c) 2001-2009 Objective Systems, Inc. (http://www.obj-sys.com) 
 // All rights reserved.
 // This component and the accompanying materials are made available
-// under the terms of the License "Eclipse Public License v1.0"
+// under the terms of "Eclipse Public License v1.0"
 // which accompanies this distribution, and is available 
 // at the URL "http://www.eclipse.org/legal/epl-v10.html".
 //
--- a/networkprotocolmodules/common/asn1export/inc/rtpersrc/ASN1TTime.h	Sat Feb 20 00:14:00 2010 +0200
+++ b/networkprotocolmodules/common/asn1export/inc/rtpersrc/ASN1TTime.h	Fri Mar 12 15:50:23 2010 +0200
@@ -1,7 +1,7 @@
 // Copyright (c) 2001-2009 Objective Systems, Inc. (http://www.obj-sys.com) 
 // All rights reserved.
 // This component and the accompanying materials are made available
-// under the terms of the License "Eclipse Public License v1.0"
+// under the terms of "Eclipse Public License v1.0"
 // which accompanies this distribution, and is available 
 // at the URL "http://www.eclipse.org/legal/epl-v10.html".
 //
--- a/networkprotocolmodules/common/asn1export/inc/rtpersrc/asn1CEvtHndlr.h	Sat Feb 20 00:14:00 2010 +0200
+++ b/networkprotocolmodules/common/asn1export/inc/rtpersrc/asn1CEvtHndlr.h	Fri Mar 12 15:50:23 2010 +0200
@@ -1,7 +1,7 @@
 // Copyright (c) 2001-2009 Objective Systems, Inc. (http://www.obj-sys.com) 
 // All rights reserved.
 // This component and the accompanying materials are made available
-// under the terms of the License "Eclipse Public License v1.0"
+// under the terms of "Eclipse Public License v1.0"
 // which accompanies this distribution, and is available 
 // at the URL "http://www.eclipse.org/legal/epl-v10.html".
 //
--- a/networkprotocolmodules/common/asn1export/inc/rtpersrc/asn1CharSet.h	Sat Feb 20 00:14:00 2010 +0200
+++ b/networkprotocolmodules/common/asn1export/inc/rtpersrc/asn1CharSet.h	Fri Mar 12 15:50:23 2010 +0200
@@ -1,7 +1,7 @@
 // Copyright (c) 2001-2009 Objective Systems, Inc. (http://www.obj-sys.com) 
 // All rights reserved.
 // This component and the accompanying materials are made available
-// under the terms of the License "Eclipse Public License v1.0"
+// under the terms of "Eclipse Public License v1.0"
 // which accompanies this distribution, and is available 
 // at the URL "http://www.eclipse.org/legal/epl-v10.html".
 //
--- a/networkprotocolmodules/common/asn1export/inc/rtpersrc/asn1CppEvtHndlr.h	Sat Feb 20 00:14:00 2010 +0200
+++ b/networkprotocolmodules/common/asn1export/inc/rtpersrc/asn1CppEvtHndlr.h	Fri Mar 12 15:50:23 2010 +0200
@@ -1,7 +1,7 @@
 // Copyright (c) 2001-2009 Objective Systems, Inc. (http://www.obj-sys.com) 
 // All rights reserved.
 // This component and the accompanying materials are made available
-// under the terms of the License "Eclipse Public License v1.0"
+// under the terms of "Eclipse Public License v1.0"
 // which accompanies this distribution, and is available 
 // at the URL "http://www.eclipse.org/legal/epl-v10.html".
 //
--- a/networkprotocolmodules/common/asn1export/inc/rtpersrc/asn1CppTypes.h	Sat Feb 20 00:14:00 2010 +0200
+++ b/networkprotocolmodules/common/asn1export/inc/rtpersrc/asn1CppTypes.h	Fri Mar 12 15:50:23 2010 +0200
@@ -1,7 +1,7 @@
 // Copyright (c) 2001-2009 Objective Systems, Inc. (http://www.obj-sys.com) 
 // All rights reserved.
 // This component and the accompanying materials are made available
-// under the terms of the License "Eclipse Public License v1.0"
+// under the terms of "Eclipse Public License v1.0"
 // which accompanies this distribution, and is available 
 // at the URL "http://www.eclipse.org/legal/epl-v10.html".
 //
--- a/networkprotocolmodules/common/asn1export/inc/rtpersrc/asn1ErrCodes.h	Sat Feb 20 00:14:00 2010 +0200
+++ b/networkprotocolmodules/common/asn1export/inc/rtpersrc/asn1ErrCodes.h	Fri Mar 12 15:50:23 2010 +0200
@@ -1,7 +1,7 @@
 // Copyright (c) 2001-2009 Objective Systems, Inc. (http://www.obj-sys.com) 
 // All rights reserved.
 // This component and the accompanying materials are made available
-// under the terms of the License "Eclipse Public License v1.0"
+// under the terms of "Eclipse Public License v1.0"
 // which accompanies this distribution, and is available 
 // at the URL "http://www.eclipse.org/legal/epl-v10.html".
 //
--- a/networkprotocolmodules/common/asn1export/inc/rtpersrc/asn1PerCppTypes.h	Sat Feb 20 00:14:00 2010 +0200
+++ b/networkprotocolmodules/common/asn1export/inc/rtpersrc/asn1PerCppTypes.h	Fri Mar 12 15:50:23 2010 +0200
@@ -1,7 +1,7 @@
 // Copyright (c) 2001-2009 Objective Systems, Inc. (http://www.obj-sys.com) 
 // All rights reserved.
 // This component and the accompanying materials are made available
-// under the terms of the License "Eclipse Public License v1.0"
+// under the terms of "Eclipse Public License v1.0"
 // which accompanies this distribution, and is available 
 // at the URL "http://www.eclipse.org/legal/epl-v10.html".
 //
@@ -20,7 +20,7 @@
 // 10/31/03     CZ      Class descriptions
 // 11/04/03     CZ      Augment Documentation 
 //
-////////////////////////////////////////////////////////////////////////////
+//
 
 /** 
  * @file asn1PerCppTypes.h 
--- a/networkprotocolmodules/common/asn1export/inc/rtpersrc/asn1compat.h	Sat Feb 20 00:14:00 2010 +0200
+++ b/networkprotocolmodules/common/asn1export/inc/rtpersrc/asn1compat.h	Fri Mar 12 15:50:23 2010 +0200
@@ -1,7 +1,7 @@
 // Copyright (c) 2001-2009 Objective Systems, Inc. (http://www.obj-sys.com) 
 // All rights reserved.
 // This component and the accompanying materials are made available
-// under the terms of the License "Eclipse Public License v1.0"
+// under the terms of "Eclipse Public License v1.0"
 // which accompanies this distribution, and is available 
 // at the URL "http://www.eclipse.org/legal/epl-v10.html".
 //
--- a/networkprotocolmodules/common/asn1export/inc/rtpersrc/asn1intl.h	Sat Feb 20 00:14:00 2010 +0200
+++ b/networkprotocolmodules/common/asn1export/inc/rtpersrc/asn1intl.h	Fri Mar 12 15:50:23 2010 +0200
@@ -1,7 +1,7 @@
 // Copyright (c) 2001-2009 Objective Systems, Inc. (http://www.obj-sys.com) 
 // All rights reserved.
 // This component and the accompanying materials are made available
-// under the terms of the License "Eclipse Public License v1.0"
+// under the terms of "Eclipse Public License v1.0"
 // which accompanies this distribution, and is available 
 // at the URL "http://www.eclipse.org/legal/epl-v10.html".
 //
--- a/networkprotocolmodules/common/asn1export/inc/rtpersrc/asn1per.h	Sat Feb 20 00:14:00 2010 +0200
+++ b/networkprotocolmodules/common/asn1export/inc/rtpersrc/asn1per.h	Fri Mar 12 15:50:23 2010 +0200
@@ -1,7 +1,7 @@
 // Copyright (c) 2001-2009 Objective Systems, Inc. (http://www.obj-sys.com) 
 // All rights reserved.
 // This component and the accompanying materials are made available
-// under the terms of the License "Eclipse Public License v1.0"
+// under the terms of "Eclipse Public License v1.0"
 // which accompanies this distribution, and is available 
 // at the URL "http://www.eclipse.org/legal/epl-v10.html".
 //
@@ -25,7 +25,7 @@
 // 11/06/02     AB      PD_BYTE_ALIGN0 added
 // 10/31/03     CZ      Expand mainpage text.
 //
-////////////////////////////////////////////////////////////////////////////
+//
 */
 /** 
  * @file rtpersrc/asn1per.h 
--- a/networkprotocolmodules/common/asn1export/inc/rtpersrc/asn1tag.h	Sat Feb 20 00:14:00 2010 +0200
+++ b/networkprotocolmodules/common/asn1export/inc/rtpersrc/asn1tag.h	Fri Mar 12 15:50:23 2010 +0200
@@ -1,7 +1,7 @@
 // Copyright (c) 2001-2009 Objective Systems, Inc. (http://www.obj-sys.com) 
 // All rights reserved.
 // This component and the accompanying materials are made available
-// under the terms of the License "Eclipse Public License v1.0"
+// under the terms of "Eclipse Public License v1.0"
 // which accompanies this distribution, and is available 
 // at the URL "http://www.eclipse.org/legal/epl-v10.html".
 //
--- a/networkprotocolmodules/common/asn1export/inc/rtpersrc/asn1type.h	Sat Feb 20 00:14:00 2010 +0200
+++ b/networkprotocolmodules/common/asn1export/inc/rtpersrc/asn1type.h	Fri Mar 12 15:50:23 2010 +0200
@@ -1,7 +1,7 @@
 // Copyright (c) 2001-2009 Objective Systems, Inc. (http://www.obj-sys.com) 
 // All rights reserved.
 // This component and the accompanying materials are made available
-// under the terms of the License "Eclipse Public License v1.0"
+// under the terms of "Eclipse Public License v1.0"
 // which accompanies this distribution, and is available 
 // at the URL "http://www.eclipse.org/legal/epl-v10.html".
 //
--- a/networkprotocolmodules/common/asn1export/inc/rtpersrc/asn1version.h	Sat Feb 20 00:14:00 2010 +0200
+++ b/networkprotocolmodules/common/asn1export/inc/rtpersrc/asn1version.h	Fri Mar 12 15:50:23 2010 +0200
@@ -1,7 +1,7 @@
 // Copyright (c) 2001-2009 Objective Systems, Inc. (http://www.obj-sys.com) 
 // All rights reserved.
 // This component and the accompanying materials are made available
-// under the terms of the License "Eclipse Public License v1.0"
+// under the terms of "Eclipse Public License v1.0"
 // which accompanies this distribution, and is available 
 // at the URL "http://www.eclipse.org/legal/epl-v10.html".
 //
--- a/networkprotocolmodules/common/asn1export/inc/rtpersrc/rtBCD.h	Sat Feb 20 00:14:00 2010 +0200
+++ b/networkprotocolmodules/common/asn1export/inc/rtpersrc/rtBCD.h	Fri Mar 12 15:50:23 2010 +0200
@@ -1,7 +1,7 @@
 // Copyright (c) 2001-2009 Objective Systems, Inc. (http://www.obj-sys.com) 
 // All rights reserved.
 // This component and the accompanying materials are made available
-// under the terms of the License "Eclipse Public License v1.0"
+// under the terms of "Eclipse Public License v1.0"
 // which accompanies this distribution, and is available 
 // at the URL "http://www.eclipse.org/legal/epl-v10.html".
 //
--- a/networkprotocolmodules/common/asn1export/inc/rtpersrc/rtCompare.h	Sat Feb 20 00:14:00 2010 +0200
+++ b/networkprotocolmodules/common/asn1export/inc/rtpersrc/rtCompare.h	Fri Mar 12 15:50:23 2010 +0200
@@ -1,7 +1,7 @@
 // Copyright (c) 2001-2009 Objective Systems, Inc. (http://www.obj-sys.com) 
 // All rights reserved.
 // This component and the accompanying materials are made available
-// under the terms of the License "Eclipse Public License v1.0"
+// under the terms of "Eclipse Public License v1.0"
 // which accompanies this distribution, and is available 
 // at the URL "http://www.eclipse.org/legal/epl-v10.html".
 //
--- a/networkprotocolmodules/common/asn1export/inc/rtpersrc/rtContext.h	Sat Feb 20 00:14:00 2010 +0200
+++ b/networkprotocolmodules/common/asn1export/inc/rtpersrc/rtContext.h	Fri Mar 12 15:50:23 2010 +0200
@@ -1,7 +1,7 @@
 // Copyright (c) 2001-2009 Objective Systems, Inc. (http://www.obj-sys.com) 
 // All rights reserved.
 // This component and the accompanying materials are made available
-// under the terms of the License "Eclipse Public License v1.0"
+// under the terms of "Eclipse Public License v1.0"
 // which accompanies this distribution, and is available 
 // at the URL "http://www.eclipse.org/legal/epl-v10.html".
 //
--- a/networkprotocolmodules/common/asn1export/inc/rtpersrc/rtCopy.h	Sat Feb 20 00:14:00 2010 +0200
+++ b/networkprotocolmodules/common/asn1export/inc/rtpersrc/rtCopy.h	Fri Mar 12 15:50:23 2010 +0200
@@ -1,7 +1,7 @@
 // Copyright (c) 2001-2009 Objective Systems, Inc. (http://www.obj-sys.com) 
 // All rights reserved.
 // This component and the accompanying materials are made available
-// under the terms of the License "Eclipse Public License v1.0"
+// under the terms of "Eclipse Public License v1.0"
 // which accompanies this distribution, and is available 
 // at the URL "http://www.eclipse.org/legal/epl-v10.html".
 //
--- a/networkprotocolmodules/common/asn1export/inc/rtpersrc/rtExternDefs.h	Sat Feb 20 00:14:00 2010 +0200
+++ b/networkprotocolmodules/common/asn1export/inc/rtpersrc/rtExternDefs.h	Fri Mar 12 15:50:23 2010 +0200
@@ -1,7 +1,7 @@
 // Copyright (c) 2001-2009 Objective Systems, Inc. (http://www.obj-sys.com) 
 // All rights reserved.
 // This component and the accompanying materials are made available
-// under the terms of the License "Eclipse Public License v1.0"
+// under the terms of "Eclipse Public License v1.0"
 // which accompanies this distribution, and is available 
 // at the URL "http://www.eclipse.org/legal/epl-v10.html".
 //
--- a/networkprotocolmodules/common/asn1export/inc/rtpersrc/rtPrint.h	Sat Feb 20 00:14:00 2010 +0200
+++ b/networkprotocolmodules/common/asn1export/inc/rtpersrc/rtPrint.h	Fri Mar 12 15:50:23 2010 +0200
@@ -1,7 +1,7 @@
 // Copyright (c) 2001-2009 Objective Systems, Inc. (http://www.obj-sys.com) 
 // All rights reserved.
 // This component and the accompanying materials are made available
-// under the terms of the License "Eclipse Public License v1.0"
+// under the terms of "Eclipse Public License v1.0"
 // which accompanies this distribution, and is available 
 // at the URL "http://www.eclipse.org/legal/epl-v10.html".
 //
--- a/networkprotocolmodules/common/asn1export/inc/rtpersrc/rtPrintStream.h	Sat Feb 20 00:14:00 2010 +0200
+++ b/networkprotocolmodules/common/asn1export/inc/rtpersrc/rtPrintStream.h	Fri Mar 12 15:50:23 2010 +0200
@@ -1,7 +1,7 @@
 // Copyright (c) 2001-2009 Objective Systems, Inc. (http://www.obj-sys.com) 
 // All rights reserved.
 // This component and the accompanying materials are made available
-// under the terms of the License "Eclipse Public License v1.0"
+// under the terms of "Eclipse Public License v1.0"
 // which accompanies this distribution, and is available 
 // at the URL "http://www.eclipse.org/legal/epl-v10.html".
 //
--- a/networkprotocolmodules/common/asn1export/inc/rtpersrc/rtPrintToStream.h	Sat Feb 20 00:14:00 2010 +0200
+++ b/networkprotocolmodules/common/asn1export/inc/rtpersrc/rtPrintToStream.h	Fri Mar 12 15:50:23 2010 +0200
@@ -1,7 +1,7 @@
 // Copyright (c) 2001-2009 Objective Systems, Inc. (http://www.obj-sys.com) 
 // All rights reserved.
 // This component and the accompanying materials are made available
-// under the terms of the License "Eclipse Public License v1.0"
+// under the terms of "Eclipse Public License v1.0"
 // which accompanies this distribution, and is available 
 // at the URL "http://www.eclipse.org/legal/epl-v10.html".
 //
--- a/networkprotocolmodules/common/asn1export/inc/rtpersrc/rtPrintToString.h	Sat Feb 20 00:14:00 2010 +0200
+++ b/networkprotocolmodules/common/asn1export/inc/rtpersrc/rtPrintToString.h	Fri Mar 12 15:50:23 2010 +0200
@@ -1,7 +1,7 @@
 // Copyright (c) 2001-2009 Objective Systems, Inc. (http://www.obj-sys.com) 
 // All rights reserved.
 // This component and the accompanying materials are made available
-// under the terms of the License "Eclipse Public License v1.0"
+// under the terms of "Eclipse Public License v1.0"
 // which accompanies this distribution, and is available 
 // at the URL "http://www.eclipse.org/legal/epl-v10.html".
 //
--- a/networkprotocolmodules/common/asn1export/inc/rtpersrc/rtSocketSelect.h	Sat Feb 20 00:14:00 2010 +0200
+++ b/networkprotocolmodules/common/asn1export/inc/rtpersrc/rtSocketSelect.h	Fri Mar 12 15:50:23 2010 +0200
@@ -1,7 +1,7 @@
 // Copyright (c) 2001-2009 Objective Systems, Inc. (http://www.obj-sys.com) 
 // All rights reserved.
 // This component and the accompanying materials are made available
-// under the terms of the License "Eclipse Public License v1.0"
+// under the terms of "Eclipse Public License v1.0"
 // which accompanies this distribution, and is available 
 // at the URL "http://www.eclipse.org/legal/epl-v10.html".
 //
--- a/networkprotocolmodules/common/asn1export/inc/rtpersrc/rtStream.h	Sat Feb 20 00:14:00 2010 +0200
+++ b/networkprotocolmodules/common/asn1export/inc/rtpersrc/rtStream.h	Fri Mar 12 15:50:23 2010 +0200
@@ -1,7 +1,7 @@
 // Copyright (c) 2001-2009 Objective Systems, Inc. (http://www.obj-sys.com) 
 // All rights reserved.
 // This component and the accompanying materials are made available
-// under the terms of the License "Eclipse Public License v1.0"
+// under the terms of "Eclipse Public License v1.0"
 // which accompanies this distribution, and is available 
 // at the URL "http://www.eclipse.org/legal/epl-v10.html".
 //
--- a/networkprotocolmodules/common/asn1export/inc/rtpersrc/rtTable.h	Sat Feb 20 00:14:00 2010 +0200
+++ b/networkprotocolmodules/common/asn1export/inc/rtpersrc/rtTable.h	Fri Mar 12 15:50:23 2010 +0200
@@ -1,7 +1,7 @@
 // Copyright (c) 2001-2009 Objective Systems, Inc. (http://www.obj-sys.com) 
 // All rights reserved.
 // This component and the accompanying materials are made available
-// under the terms of the License "Eclipse Public License v1.0"
+// under the terms of "Eclipse Public License v1.0"
 // which accompanies this distribution, and is available 
 // at the URL "http://www.eclipse.org/legal/epl-v10.html".
 //
--- a/networkprotocolmodules/common/asn1export/inc/rtpersrc/rtToken.h	Sat Feb 20 00:14:00 2010 +0200
+++ b/networkprotocolmodules/common/asn1export/inc/rtpersrc/rtToken.h	Fri Mar 12 15:50:23 2010 +0200
@@ -1,7 +1,7 @@
 // Copyright (c) 2001-2009 Objective Systems, Inc. (http://www.obj-sys.com) 
 // All rights reserved.
 // This component and the accompanying materials are made available
-// under the terms of the License "Eclipse Public License v1.0"
+// under the terms of "Eclipse Public License v1.0"
 // which accompanies this distribution, and is available 
 // at the URL "http://www.eclipse.org/legal/epl-v10.html".
 //
--- a/networkprotocolmodules/common/asn1export/inc/rtpersrc/rtbench.h	Sat Feb 20 00:14:00 2010 +0200
+++ b/networkprotocolmodules/common/asn1export/inc/rtpersrc/rtbench.h	Fri Mar 12 15:50:23 2010 +0200
@@ -1,7 +1,7 @@
 // Copyright (c) 2001-2009 Objective Systems, Inc. (http://www.obj-sys.com) 
 // All rights reserved.
 // This component and the accompanying materials are made available
-// under the terms of the License "Eclipse Public License v1.0"
+// under the terms of "Eclipse Public License v1.0"
 // which accompanies this distribution, and is available 
 // at the URL "http://www.eclipse.org/legal/epl-v10.html".
 //
--- a/networkprotocolmodules/common/asn1export/inc/rtpersrc/rtconv.h	Sat Feb 20 00:14:00 2010 +0200
+++ b/networkprotocolmodules/common/asn1export/inc/rtpersrc/rtconv.h	Fri Mar 12 15:50:23 2010 +0200
@@ -1,7 +1,7 @@
 // Copyright (c) 2001-2009 Objective Systems, Inc. (http://www.obj-sys.com) 
 // All rights reserved.
 // This component and the accompanying materials are made available
-// under the terms of the License "Eclipse Public License v1.0"
+// under the terms of "Eclipse Public License v1.0"
 // which accompanies this distribution, and is available 
 // at the URL "http://www.eclipse.org/legal/epl-v10.html".
 //
--- a/networkprotocolmodules/common/asn1export/inc/rtsrc/ASN1CBitStr.h	Sat Feb 20 00:14:00 2010 +0200
+++ b/networkprotocolmodules/common/asn1export/inc/rtsrc/ASN1CBitStr.h	Fri Mar 12 15:50:23 2010 +0200
@@ -1,7 +1,7 @@
 // Copyright (c) 2001-2009 Objective Systems, Inc. (http://www.obj-sys.com) 
 // All rights reserved.
 // This component and the accompanying materials are made available
-// under the terms of the License "Eclipse Public License v1.0"
+// under the terms of "Eclipse Public License v1.0"
 // which accompanies this distribution, and is available 
 // at the URL "http://www.eclipse.org/legal/epl-v10.html".
 //
@@ -30,7 +30,7 @@
  * @addtogroup asn1ctrl 
  * @{
  */
-//////////////////////////////////////////////////////////////////////
+//
 //
 // ASN1CBitStr
 // 
--- a/networkprotocolmodules/common/asn1export/inc/rtsrc/ASN1CGeneralizedTime.h	Sat Feb 20 00:14:00 2010 +0200
+++ b/networkprotocolmodules/common/asn1export/inc/rtsrc/ASN1CGeneralizedTime.h	Fri Mar 12 15:50:23 2010 +0200
@@ -1,7 +1,7 @@
 // Copyright (c) 2001-2009 Objective Systems, Inc. (http://www.obj-sys.com) 
 // All rights reserved.
 // This component and the accompanying materials are made available
-// under the terms of the License "Eclipse Public License v1.0"
+// under the terms of "Eclipse Public License v1.0"
 // which accompanies this distribution, and is available 
 // at the URL "http://www.eclipse.org/legal/epl-v10.html".
 //
@@ -36,7 +36,7 @@
  * @addtogroup asn1ctime 
  * @{
  */
-//////////////////////////////////////////////////////////////////////
+//
 //
 // ASN1CGeneralizedTime
 // 
--- a/networkprotocolmodules/common/asn1export/inc/rtsrc/ASN1CSeqOfList.h	Sat Feb 20 00:14:00 2010 +0200
+++ b/networkprotocolmodules/common/asn1export/inc/rtsrc/ASN1CSeqOfList.h	Fri Mar 12 15:50:23 2010 +0200
@@ -1,7 +1,7 @@
 // Copyright (c) 2001-2009 Objective Systems, Inc. (http://www.obj-sys.com) 
 // All rights reserved.
 // This component and the accompanying materials are made available
-// under the terms of the License "Eclipse Public License v1.0"
+// under the terms of "Eclipse Public License v1.0"
 // which accompanies this distribution, and is available 
 // at the URL "http://www.eclipse.org/legal/epl-v10.html".
 //
@@ -37,7 +37,7 @@
  * @{
  */
 
-//////////////////////////////////////////////////////////////////////
+//
 //
 // ASN1CSeqOfList
 //
@@ -60,7 +60,7 @@
 
 class EXTRTCLASS ASN1CSeqOfList;
 
-//////////////////////////////////////////////////////////////////////
+//
 //
 // ASN1CSeqOfListIterator
 //
@@ -193,7 +193,7 @@
 } ;
 
 
-//////////////////////////////////////////////////////////////////////
+//
 //
 // ASN1CSeqOfList
 //
--- a/networkprotocolmodules/common/asn1export/inc/rtsrc/ASN1CTime.h	Sat Feb 20 00:14:00 2010 +0200
+++ b/networkprotocolmodules/common/asn1export/inc/rtsrc/ASN1CTime.h	Fri Mar 12 15:50:23 2010 +0200
@@ -1,7 +1,7 @@
 // Copyright (c) 2001-2009 Objective Systems, Inc. (http://www.obj-sys.com) 
 // All rights reserved.
 // This component and the accompanying materials are made available
-// under the terms of the License "Eclipse Public License v1.0"
+// under the terms of "Eclipse Public License v1.0"
 // which accompanies this distribution, and is available 
 // at the URL "http://www.eclipse.org/legal/epl-v10.html".
 //
@@ -44,7 +44,7 @@
  * @{
  */
 
-//////////////////////////////////////////////////////////////////////
+//
 //
 // ASN1CTime
 // 
--- a/networkprotocolmodules/common/asn1export/inc/rtsrc/ASN1CUTCTime.h	Sat Feb 20 00:14:00 2010 +0200
+++ b/networkprotocolmodules/common/asn1export/inc/rtsrc/ASN1CUTCTime.h	Fri Mar 12 15:50:23 2010 +0200
@@ -1,7 +1,7 @@
 // Copyright (c) 2001-2009 Objective Systems, Inc. (http://www.obj-sys.com) 
 // All rights reserved.
 // This component and the accompanying materials are made available
-// under the terms of the License "Eclipse Public License v1.0"
+// under the terms of "Eclipse Public License v1.0"
 // which accompanies this distribution, and is available 
 // at the URL "http://www.eclipse.org/legal/epl-v10.html".
 //
@@ -24,7 +24,7 @@
 
 #include "rtsrc/ASN1CTime.h"
 
-//////////////////////////////////////////////////////////////////////
+//
 //
 // ASN1CUTCTime
 // 
--- a/networkprotocolmodules/common/asn1export/inc/rtsrc/ASN1Context.h	Sat Feb 20 00:14:00 2010 +0200
+++ b/networkprotocolmodules/common/asn1export/inc/rtsrc/ASN1Context.h	Fri Mar 12 15:50:23 2010 +0200
@@ -1,7 +1,7 @@
 // Copyright (c) 2001-2009 Objective Systems, Inc. (http://www.obj-sys.com) 
 // All rights reserved.
 // This component and the accompanying materials are made available
-// under the terms of the License "Eclipse Public License v1.0"
+// under the terms of "Eclipse Public License v1.0"
 // which accompanies this distribution, and is available 
 // at the URL "http://www.eclipse.org/legal/epl-v10.html".
 //
--- a/networkprotocolmodules/common/asn1export/inc/rtsrc/ASN1TObjId.h	Sat Feb 20 00:14:00 2010 +0200
+++ b/networkprotocolmodules/common/asn1export/inc/rtsrc/ASN1TObjId.h	Fri Mar 12 15:50:23 2010 +0200
@@ -1,7 +1,7 @@
 // Copyright (c) 2001-2009 Objective Systems, Inc. (http://www.obj-sys.com) 
 // All rights reserved.
 // This component and the accompanying materials are made available
-// under the terms of the License "Eclipse Public License v1.0"
+// under the terms of "Eclipse Public License v1.0"
 // which accompanies this distribution, and is available 
 // at the URL "http://www.eclipse.org/legal/epl-v10.html".
 //
@@ -17,7 +17,7 @@
 // CHANGE LOG
 // Date         Init    Description
 //
-////////////////////////////////////////////////////////////////////////////
+//
 /** 
  * @file rtsrc/ASN1TObjId.h 
  * ASN.1 object identifier class definition.
--- a/networkprotocolmodules/common/asn1export/inc/rtsrc/ASN1TOctStr.h	Sat Feb 20 00:14:00 2010 +0200
+++ b/networkprotocolmodules/common/asn1export/inc/rtsrc/ASN1TOctStr.h	Fri Mar 12 15:50:23 2010 +0200
@@ -1,7 +1,7 @@
 // Copyright (c) 2001-2009 Objective Systems, Inc. (http://www.obj-sys.com) 
 // All rights reserved.
 // This component and the accompanying materials are made available
-// under the terms of the License "Eclipse Public License v1.0"
+// under the terms of "Eclipse Public License v1.0"
 // which accompanies this distribution, and is available 
 // at the URL "http://www.eclipse.org/legal/epl-v10.html".
 //
@@ -17,7 +17,7 @@
 // CHANGE LOG
 // Date         Init    Description
 //
-////////////////////////////////////////////////////////////////////////////
+//
 /** 
  * @file rtsrc/ASN1TOctStr.h 
  * ASN.1 OCTET string class definition.
--- a/networkprotocolmodules/common/asn1export/inc/rtsrc/ASN1TTime.h	Sat Feb 20 00:14:00 2010 +0200
+++ b/networkprotocolmodules/common/asn1export/inc/rtsrc/ASN1TTime.h	Fri Mar 12 15:50:23 2010 +0200
@@ -1,7 +1,7 @@
 // Copyright (c) 2001-2009 Objective Systems, Inc. (http://www.obj-sys.com) 
 // All rights reserved.
 // This component and the accompanying materials are made available
-// under the terms of the License "Eclipse Public License v1.0"
+// under the terms of "Eclipse Public License v1.0"
 // which accompanies this distribution, and is available 
 // at the URL "http://www.eclipse.org/legal/epl-v10.html".
 //
@@ -31,7 +31,7 @@
 #define LOG_TTMERR(stat) (mStatus = stat, stat)
 
 
-//////////////////////////////////////////////////////////////////////
+//
 //
 // ASN1TTime
 // 
--- a/networkprotocolmodules/common/asn1export/inc/rtsrc/asn1CEvtHndlr.h	Sat Feb 20 00:14:00 2010 +0200
+++ b/networkprotocolmodules/common/asn1export/inc/rtsrc/asn1CEvtHndlr.h	Fri Mar 12 15:50:23 2010 +0200
@@ -1,7 +1,7 @@
 // Copyright (c) 2001-2009 Objective Systems, Inc. (http://www.obj-sys.com) 
 // All rights reserved.
 // This component and the accompanying materials are made available
-// under the terms of the License "Eclipse Public License v1.0"
+// under the terms of "Eclipse Public License v1.0"
 // which accompanies this distribution, and is available 
 // at the URL "http://www.eclipse.org/legal/epl-v10.html".
 //
--- a/networkprotocolmodules/common/asn1export/inc/rtsrc/asn1CharSet.h	Sat Feb 20 00:14:00 2010 +0200
+++ b/networkprotocolmodules/common/asn1export/inc/rtsrc/asn1CharSet.h	Fri Mar 12 15:50:23 2010 +0200
@@ -1,7 +1,7 @@
 // Copyright (c) 2001-2009 Objective Systems, Inc. (http://www.obj-sys.com) 
 // All rights reserved.
 // This component and the accompanying materials are made available
-// under the terms of the License "Eclipse Public License v1.0"
+// under the terms of "Eclipse Public License v1.0"
 // which accompanies this distribution, and is available 
 // at the URL "http://www.eclipse.org/legal/epl-v10.html".
 //
@@ -20,7 +20,7 @@
 // CHANGE LOG
 // Date         Init    Description
 //
-////////////////////////////////////////////////////////////////////////////
+//
 */
 /* asn1CharSet.h - ASN.1 character set definitions */
 
--- a/networkprotocolmodules/common/asn1export/inc/rtsrc/asn1CppEvtHndlr.h	Sat Feb 20 00:14:00 2010 +0200
+++ b/networkprotocolmodules/common/asn1export/inc/rtsrc/asn1CppEvtHndlr.h	Fri Mar 12 15:50:23 2010 +0200
@@ -1,7 +1,7 @@
 // Copyright (c) 2001-2009 Objective Systems, Inc. (http://www.obj-sys.com) 
 // All rights reserved.
 // This component and the accompanying materials are made available
-// under the terms of the License "Eclipse Public License v1.0"
+// under the terms of "Eclipse Public License v1.0"
 // which accompanies this distribution, and is available 
 // at the URL "http://www.eclipse.org/legal/epl-v10.html".
 //
--- a/networkprotocolmodules/common/asn1export/inc/rtsrc/asn1CppTypes.h	Sat Feb 20 00:14:00 2010 +0200
+++ b/networkprotocolmodules/common/asn1export/inc/rtsrc/asn1CppTypes.h	Fri Mar 12 15:50:23 2010 +0200
@@ -1,7 +1,7 @@
 // Copyright (c) 2001-2009 Objective Systems, Inc. (http://www.obj-sys.com) 
 // All rights reserved.
 // This component and the accompanying materials are made available
-// under the terms of the License "Eclipse Public License v1.0"
+// under the terms of "Eclipse Public License v1.0"
 // which accompanies this distribution, and is available 
 // at the URL "http://www.eclipse.org/legal/epl-v10.html".
 //
@@ -26,7 +26,7 @@
 // 07/16/02     AB      added 'const' to RTLError::getStatus
 // 10/29/02     CZ      Added/modified doxygen code for groups.
 //
-////////////////////////////////////////////////////////////////////////////
+//
 
 /** 
  * @file rtsrc/asn1CppTypes.h 
--- a/networkprotocolmodules/common/asn1export/inc/rtsrc/asn1ErrCodes.h	Sat Feb 20 00:14:00 2010 +0200
+++ b/networkprotocolmodules/common/asn1export/inc/rtsrc/asn1ErrCodes.h	Fri Mar 12 15:50:23 2010 +0200
@@ -1,7 +1,7 @@
 // Copyright (c) 2001-2009 Objective Systems, Inc. (http://www.obj-sys.com) 
 // All rights reserved.
 // This component and the accompanying materials are made available
-// under the terms of the License "Eclipse Public License v1.0"
+// under the terms of "Eclipse Public License v1.0"
 // which accompanies this distribution, and is available 
 // at the URL "http://www.eclipse.org/legal/epl-v10.html".
 //
--- a/networkprotocolmodules/common/asn1export/inc/rtsrc/asn1compat.h	Sat Feb 20 00:14:00 2010 +0200
+++ b/networkprotocolmodules/common/asn1export/inc/rtsrc/asn1compat.h	Fri Mar 12 15:50:23 2010 +0200
@@ -1,7 +1,7 @@
 // Copyright (c) 2001-2009 Objective Systems, Inc. (http://www.obj-sys.com) 
 // All rights reserved.
 // This component and the accompanying materials are made available
-// under the terms of the License "Eclipse Public License v1.0"
+// under the terms of "Eclipse Public License v1.0"
 // which accompanies this distribution, and is available 
 // at the URL "http://www.eclipse.org/legal/epl-v10.html".
 //
--- a/networkprotocolmodules/common/asn1export/inc/rtsrc/asn1intl.h	Sat Feb 20 00:14:00 2010 +0200
+++ b/networkprotocolmodules/common/asn1export/inc/rtsrc/asn1intl.h	Fri Mar 12 15:50:23 2010 +0200
@@ -1,7 +1,7 @@
 // Copyright (c) 2001-2009 Objective Systems, Inc. (http://www.obj-sys.com) 
 // All rights reserved.
 // This component and the accompanying materials are made available
-// under the terms of the License "Eclipse Public License v1.0"
+// under the terms of "Eclipse Public License v1.0"
 // which accompanies this distribution, and is available 
 // at the URL "http://www.eclipse.org/legal/epl-v10.html".
 //
--- a/networkprotocolmodules/common/asn1export/inc/rtsrc/asn1tag.h	Sat Feb 20 00:14:00 2010 +0200
+++ b/networkprotocolmodules/common/asn1export/inc/rtsrc/asn1tag.h	Fri Mar 12 15:50:23 2010 +0200
@@ -1,7 +1,7 @@
 // Copyright (c) 2001-2009 Objective Systems, Inc. (http://www.obj-sys.com) 
 // All rights reserved.
 // This component and the accompanying materials are made available
-// under the terms of the License "Eclipse Public License v1.0"
+// under the terms of "Eclipse Public License v1.0"
 // which accompanies this distribution, and is available 
 // at the URL "http://www.eclipse.org/legal/epl-v10.html".
 //
--- a/networkprotocolmodules/common/asn1export/inc/rtsrc/asn1type.h	Sat Feb 20 00:14:00 2010 +0200
+++ b/networkprotocolmodules/common/asn1export/inc/rtsrc/asn1type.h	Fri Mar 12 15:50:23 2010 +0200
@@ -1,7 +1,7 @@
 // Copyright (c) 2001-2009 Objective Systems, Inc. (http://www.obj-sys.com) 
 // All rights reserved.
 // This component and the accompanying materials are made available
-// under the terms of the License "Eclipse Public License v1.0"
+// under the terms of "Eclipse Public License v1.0"
 // which accompanies this distribution, and is available 
 // at the URL "http://www.eclipse.org/legal/epl-v10.html".
 //
--- a/networkprotocolmodules/common/asn1export/inc/rtsrc/asn1version.h	Sat Feb 20 00:14:00 2010 +0200
+++ b/networkprotocolmodules/common/asn1export/inc/rtsrc/asn1version.h	Fri Mar 12 15:50:23 2010 +0200
@@ -1,7 +1,7 @@
 // Copyright (c) 2001-2009 Objective Systems, Inc. (http://www.obj-sys.com) 
 // All rights reserved.
 // This component and the accompanying materials are made available
-// under the terms of the License "Eclipse Public License v1.0"
+// under the terms of "Eclipse Public License v1.0"
 // which accompanies this distribution, and is available 
 // at the URL "http://www.eclipse.org/legal/epl-v10.html".
 //
--- a/networkprotocolmodules/common/asn1export/inc/rtsrc/rtBCD.h	Sat Feb 20 00:14:00 2010 +0200
+++ b/networkprotocolmodules/common/asn1export/inc/rtsrc/rtBCD.h	Fri Mar 12 15:50:23 2010 +0200
@@ -1,7 +1,7 @@
 // Copyright (c) 2001-2009 Objective Systems, Inc. (http://www.obj-sys.com) 
 // All rights reserved.
 // This component and the accompanying materials are made available
-// under the terms of the License "Eclipse Public License v1.0"
+// under the terms of "Eclipse Public License v1.0"
 // which accompanies this distribution, and is available 
 // at the URL "http://www.eclipse.org/legal/epl-v10.html".
 //
--- a/networkprotocolmodules/common/asn1export/inc/rtsrc/rtCompare.h	Sat Feb 20 00:14:00 2010 +0200
+++ b/networkprotocolmodules/common/asn1export/inc/rtsrc/rtCompare.h	Fri Mar 12 15:50:23 2010 +0200
@@ -1,7 +1,7 @@
 // Copyright (c) 2001-2009 Objective Systems, Inc. (http://www.obj-sys.com) 
 // All rights reserved.
 // This component and the accompanying materials are made available
-// under the terms of the License "Eclipse Public License v1.0"
+// under the terms of "Eclipse Public License v1.0"
 // which accompanies this distribution, and is available 
 // at the URL "http://www.eclipse.org/legal/epl-v10.html".
 //
--- a/networkprotocolmodules/common/asn1export/inc/rtsrc/rtContext.h	Sat Feb 20 00:14:00 2010 +0200
+++ b/networkprotocolmodules/common/asn1export/inc/rtsrc/rtContext.h	Fri Mar 12 15:50:23 2010 +0200
@@ -1,7 +1,7 @@
 // Copyright (c) 2001-2009 Objective Systems, Inc. (http://www.obj-sys.com) 
 // All rights reserved.
 // This component and the accompanying materials are made available
-// under the terms of the License "Eclipse Public License v1.0"
+// under the terms of "Eclipse Public License v1.0"
 // which accompanies this distribution, and is available 
 // at the URL "http://www.eclipse.org/legal/epl-v10.html".
 //
--- a/networkprotocolmodules/common/asn1export/inc/rtsrc/rtCopy.h	Sat Feb 20 00:14:00 2010 +0200
+++ b/networkprotocolmodules/common/asn1export/inc/rtsrc/rtCopy.h	Fri Mar 12 15:50:23 2010 +0200
@@ -1,7 +1,7 @@
 // Copyright (c) 2001-2009 Objective Systems, Inc. (http://www.obj-sys.com) 
 // All rights reserved.
 // This component and the accompanying materials are made available
-// under the terms of the License "Eclipse Public License v1.0"
+// under the terms of "Eclipse Public License v1.0"
 // which accompanies this distribution, and is available 
 // at the URL "http://www.eclipse.org/legal/epl-v10.html".
 //
--- a/networkprotocolmodules/common/asn1export/inc/rtsrc/rtExternDefs.h	Sat Feb 20 00:14:00 2010 +0200
+++ b/networkprotocolmodules/common/asn1export/inc/rtsrc/rtExternDefs.h	Fri Mar 12 15:50:23 2010 +0200
@@ -1,7 +1,7 @@
 // Copyright (c) 2001-2009 Objective Systems, Inc. (http://www.obj-sys.com) 
 // All rights reserved.
 // This component and the accompanying materials are made available
-// under the terms of the License "Eclipse Public License v1.0"
+// under the terms of "Eclipse Public License v1.0"
 // which accompanies this distribution, and is available 
 // at the URL "http://www.eclipse.org/legal/epl-v10.html".
 //
--- a/networkprotocolmodules/common/asn1export/inc/rtsrc/rtPrint.h	Sat Feb 20 00:14:00 2010 +0200
+++ b/networkprotocolmodules/common/asn1export/inc/rtsrc/rtPrint.h	Fri Mar 12 15:50:23 2010 +0200
@@ -1,7 +1,7 @@
 // Copyright (c) 2001-2009 Objective Systems, Inc. (http://www.obj-sys.com) 
 // All rights reserved.
 // This component and the accompanying materials are made available
-// under the terms of the License "Eclipse Public License v1.0"
+// under the terms of "Eclipse Public License v1.0"
 // which accompanies this distribution, and is available 
 // at the URL "http://www.eclipse.org/legal/epl-v10.html".
 //
--- a/networkprotocolmodules/common/asn1export/inc/rtsrc/rtPrintStream.h	Sat Feb 20 00:14:00 2010 +0200
+++ b/networkprotocolmodules/common/asn1export/inc/rtsrc/rtPrintStream.h	Fri Mar 12 15:50:23 2010 +0200
@@ -1,7 +1,7 @@
 // Copyright (c) 2001-2009 Objective Systems, Inc. (http://www.obj-sys.com) 
 // All rights reserved.
 // This component and the accompanying materials are made available
-// under the terms of the License "Eclipse Public License v1.0"
+// under the terms of "Eclipse Public License v1.0"
 // which accompanies this distribution, and is available 
 // at the URL "http://www.eclipse.org/legal/epl-v10.html".
 //
--- a/networkprotocolmodules/common/asn1export/inc/rtsrc/rtPrintToStream.h	Sat Feb 20 00:14:00 2010 +0200
+++ b/networkprotocolmodules/common/asn1export/inc/rtsrc/rtPrintToStream.h	Fri Mar 12 15:50:23 2010 +0200
@@ -1,7 +1,7 @@
 // Copyright (c) 2001-2009 Objective Systems, Inc. (http://www.obj-sys.com) 
 // All rights reserved.
 // This component and the accompanying materials are made available
-// under the terms of the License "Eclipse Public License v1.0"
+// under the terms of "Eclipse Public License v1.0"
 // which accompanies this distribution, and is available 
 // at the URL "http://www.eclipse.org/legal/epl-v10.html".
 //
--- a/networkprotocolmodules/common/asn1export/inc/rtsrc/rtPrintToString.h	Sat Feb 20 00:14:00 2010 +0200
+++ b/networkprotocolmodules/common/asn1export/inc/rtsrc/rtPrintToString.h	Fri Mar 12 15:50:23 2010 +0200
@@ -1,7 +1,7 @@
 // Copyright (c) 2001-2009 Objective Systems, Inc. (http://www.obj-sys.com) 
 // All rights reserved.
 // This component and the accompanying materials are made available
-// under the terms of the License "Eclipse Public License v1.0"
+// under the terms of "Eclipse Public License v1.0"
 // which accompanies this distribution, and is available 
 // at the URL "http://www.eclipse.org/legal/epl-v10.html".
 //
--- a/networkprotocolmodules/common/asn1export/inc/rtsrc/rtSocketSelect.h	Sat Feb 20 00:14:00 2010 +0200
+++ b/networkprotocolmodules/common/asn1export/inc/rtsrc/rtSocketSelect.h	Fri Mar 12 15:50:23 2010 +0200
@@ -1,7 +1,7 @@
 // Copyright (c) 2001-2009 Objective Systems, Inc. (http://www.obj-sys.com) 
 // All rights reserved.
 // This component and the accompanying materials are made available
-// under the terms of the License "Eclipse Public License v1.0"
+// under the terms of "Eclipse Public License v1.0"
 // which accompanies this distribution, and is available 
 // at the URL "http://www.eclipse.org/legal/epl-v10.html".
 //
--- a/networkprotocolmodules/common/asn1export/inc/rtsrc/rtStream.h	Sat Feb 20 00:14:00 2010 +0200
+++ b/networkprotocolmodules/common/asn1export/inc/rtsrc/rtStream.h	Fri Mar 12 15:50:23 2010 +0200
@@ -1,7 +1,7 @@
 // Copyright (c) 2001-2009 Objective Systems, Inc. (http://www.obj-sys.com) 
 // All rights reserved.
 // This component and the accompanying materials are made available
-// under the terms of the License "Eclipse Public License v1.0"
+// under the terms of "Eclipse Public License v1.0"
 // which accompanies this distribution, and is available 
 // at the URL "http://www.eclipse.org/legal/epl-v10.html".
 //
--- a/networkprotocolmodules/common/asn1export/inc/rtsrc/rtTable.h	Sat Feb 20 00:14:00 2010 +0200
+++ b/networkprotocolmodules/common/asn1export/inc/rtsrc/rtTable.h	Fri Mar 12 15:50:23 2010 +0200
@@ -1,7 +1,7 @@
 // Copyright (c) 2001-2009 Objective Systems, Inc. (http://www.obj-sys.com) 
 // All rights reserved.
 // This component and the accompanying materials are made available
-// under the terms of the License "Eclipse Public License v1.0"
+// under the terms of "Eclipse Public License v1.0"
 // which accompanies this distribution, and is available 
 // at the URL "http://www.eclipse.org/legal/epl-v10.html".
 //
--- a/networkprotocolmodules/common/asn1export/inc/rtsrc/rtToken.h	Sat Feb 20 00:14:00 2010 +0200
+++ b/networkprotocolmodules/common/asn1export/inc/rtsrc/rtToken.h	Fri Mar 12 15:50:23 2010 +0200
@@ -1,7 +1,7 @@
 // Copyright (c) 2001-2009 Objective Systems, Inc. (http://www.obj-sys.com) 
 // All rights reserved.
 // This component and the accompanying materials are made available
-// under the terms of the License "Eclipse Public License v1.0"
+// under the terms of "Eclipse Public License v1.0"
 // which accompanies this distribution, and is available 
 // at the URL "http://www.eclipse.org/legal/epl-v10.html".
 //
--- a/networkprotocolmodules/common/asn1export/inc/rtsrc/rtbench.h	Sat Feb 20 00:14:00 2010 +0200
+++ b/networkprotocolmodules/common/asn1export/inc/rtsrc/rtbench.h	Fri Mar 12 15:50:23 2010 +0200
@@ -1,7 +1,7 @@
 // Copyright (c) 2001-2009 Objective Systems, Inc. (http://www.obj-sys.com) 
 // All rights reserved.
 // This component and the accompanying materials are made available
-// under the terms of the License "Eclipse Public License v1.0"
+// under the terms of "Eclipse Public License v1.0"
 // which accompanies this distribution, and is available 
 // at the URL "http://www.eclipse.org/legal/epl-v10.html".
 //
--- a/networkprotocolmodules/common/asn1export/inc/rtsrc/rtconv.h	Sat Feb 20 00:14:00 2010 +0200
+++ b/networkprotocolmodules/common/asn1export/inc/rtsrc/rtconv.h	Fri Mar 12 15:50:23 2010 +0200
@@ -1,7 +1,7 @@
 // Copyright (c) 2001-2009 Objective Systems, Inc. (http://www.obj-sys.com) 
 // All rights reserved.
 // This component and the accompanying materials are made available
-// under the terms of the License "Eclipse Public License v1.0"
+// under the terms of "Eclipse Public License v1.0"
 // which accompanies this distribution, and is available 
 // at the URL "http://www.eclipse.org/legal/epl-v10.html".
 //
--- a/networkprotocolmodules/common/asn1export/inc/rtxsrc/OSRTBaseType.h	Sat Feb 20 00:14:00 2010 +0200
+++ b/networkprotocolmodules/common/asn1export/inc/rtxsrc/OSRTBaseType.h	Fri Mar 12 15:50:23 2010 +0200
@@ -1,7 +1,7 @@
 // Copyright (c) 2001-2009 Objective Systems, Inc. (http://www.obj-sys.com) 
 // All rights reserved.
 // This component and the accompanying materials are made available
-// under the terms of the License "Eclipse Public License v1.0"
+// under the terms of "Eclipse Public License v1.0"
 // which accompanies this distribution, and is available 
 // at the URL "http://www.eclipse.org/legal/epl-v10.html".
 //
--- a/networkprotocolmodules/common/asn1export/inc/rtxsrc/OSRTContext.h	Sat Feb 20 00:14:00 2010 +0200
+++ b/networkprotocolmodules/common/asn1export/inc/rtxsrc/OSRTContext.h	Fri Mar 12 15:50:23 2010 +0200
@@ -1,7 +1,7 @@
 // Copyright (c) 2001-2009 Objective Systems, Inc. (http://www.obj-sys.com) 
 // All rights reserved.
 // This component and the accompanying materials are made available
-// under the terms of the License "Eclipse Public License v1.0"
+// under the terms of "Eclipse Public License v1.0"
 // which accompanies this distribution, and is available 
 // at the URL "http://www.eclipse.org/legal/epl-v10.html".
 //
--- a/networkprotocolmodules/common/asn1export/inc/rtxsrc/OSRTCtxtHolder.h	Sat Feb 20 00:14:00 2010 +0200
+++ b/networkprotocolmodules/common/asn1export/inc/rtxsrc/OSRTCtxtHolder.h	Fri Mar 12 15:50:23 2010 +0200
@@ -1,7 +1,7 @@
 // Copyright (c) 2001-2009 Objective Systems, Inc. (http://www.obj-sys.com) 
 // All rights reserved.
 // This component and the accompanying materials are made available
-// under the terms of the License "Eclipse Public License v1.0"
+// under the terms of "Eclipse Public License v1.0"
 // which accompanies this distribution, and is available 
 // at the URL "http://www.eclipse.org/legal/epl-v10.html".
 //
--- a/networkprotocolmodules/common/asn1export/inc/rtxsrc/OSRTCtxtHolderIF.h	Sat Feb 20 00:14:00 2010 +0200
+++ b/networkprotocolmodules/common/asn1export/inc/rtxsrc/OSRTCtxtHolderIF.h	Fri Mar 12 15:50:23 2010 +0200
@@ -1,7 +1,7 @@
 // Copyright (c) 2001-2009 Objective Systems, Inc. (http://www.obj-sys.com) 
 // All rights reserved.
 // This component and the accompanying materials are made available
-// under the terms of the License "Eclipse Public License v1.0"
+// under the terms of "Eclipse Public License v1.0"
 // which accompanies this distribution, and is available 
 // at the URL "http://www.eclipse.org/legal/epl-v10.html".
 //
--- a/networkprotocolmodules/common/asn1export/inc/rtxsrc/OSRTFastString.h	Sat Feb 20 00:14:00 2010 +0200
+++ b/networkprotocolmodules/common/asn1export/inc/rtxsrc/OSRTFastString.h	Fri Mar 12 15:50:23 2010 +0200
@@ -1,7 +1,7 @@
 // Copyright (c) 2001-2009 Objective Systems, Inc. (http://www.obj-sys.com) 
 // All rights reserved.
 // This component and the accompanying materials are made available
-// under the terms of the License "Eclipse Public License v1.0"
+// under the terms of "Eclipse Public License v1.0"
 // which accompanies this distribution, and is available 
 // at the URL "http://www.eclipse.org/legal/epl-v10.html".
 //
--- a/networkprotocolmodules/common/asn1export/inc/rtxsrc/OSRTFileInputStream.h	Sat Feb 20 00:14:00 2010 +0200
+++ b/networkprotocolmodules/common/asn1export/inc/rtxsrc/OSRTFileInputStream.h	Fri Mar 12 15:50:23 2010 +0200
@@ -1,7 +1,7 @@
 // Copyright (c) 2001-2009 Objective Systems, Inc. (http://www.obj-sys.com) 
 // All rights reserved.
 // This component and the accompanying materials are made available
-// under the terms of the License "Eclipse Public License v1.0"
+// under the terms of "Eclipse Public License v1.0"
 // which accompanies this distribution, and is available 
 // at the URL "http://www.eclipse.org/legal/epl-v10.html".
 //
--- a/networkprotocolmodules/common/asn1export/inc/rtxsrc/OSRTFileOutputStream.h	Sat Feb 20 00:14:00 2010 +0200
+++ b/networkprotocolmodules/common/asn1export/inc/rtxsrc/OSRTFileOutputStream.h	Fri Mar 12 15:50:23 2010 +0200
@@ -1,7 +1,7 @@
 // Copyright (c) 2001-2009 Objective Systems, Inc. (http://www.obj-sys.com) 
 // All rights reserved.
 // This component and the accompanying materials are made available
-// under the terms of the License "Eclipse Public License v1.0"
+// under the terms of "Eclipse Public License v1.0"
 // which accompanies this distribution, and is available 
 // at the URL "http://www.eclipse.org/legal/epl-v10.html".
 //
--- a/networkprotocolmodules/common/asn1export/inc/rtxsrc/OSRTInputStream.h	Sat Feb 20 00:14:00 2010 +0200
+++ b/networkprotocolmodules/common/asn1export/inc/rtxsrc/OSRTInputStream.h	Fri Mar 12 15:50:23 2010 +0200
@@ -1,7 +1,7 @@
 // Copyright (c) 2001-2009 Objective Systems, Inc. (http://www.obj-sys.com) 
 // All rights reserved.
 // This component and the accompanying materials are made available
-// under the terms of the License "Eclipse Public License v1.0"
+// under the terms of "Eclipse Public License v1.0"
 // which accompanies this distribution, and is available 
 // at the URL "http://www.eclipse.org/legal/epl-v10.html".
 //
--- a/networkprotocolmodules/common/asn1export/inc/rtxsrc/OSRTInputStreamIF.h	Sat Feb 20 00:14:00 2010 +0200
+++ b/networkprotocolmodules/common/asn1export/inc/rtxsrc/OSRTInputStreamIF.h	Fri Mar 12 15:50:23 2010 +0200
@@ -1,7 +1,7 @@
 // Copyright (c) 2001-2009 Objective Systems, Inc. (http://www.obj-sys.com) 
 // All rights reserved.
 // This component and the accompanying materials are made available
-// under the terms of the License "Eclipse Public License v1.0"
+// under the terms of "Eclipse Public License v1.0"
 // which accompanies this distribution, and is available 
 // at the URL "http://www.eclipse.org/legal/epl-v10.html".
 //
--- a/networkprotocolmodules/common/asn1export/inc/rtxsrc/OSRTMemBuf.h	Sat Feb 20 00:14:00 2010 +0200
+++ b/networkprotocolmodules/common/asn1export/inc/rtxsrc/OSRTMemBuf.h	Fri Mar 12 15:50:23 2010 +0200
@@ -1,7 +1,7 @@
 // Copyright (c) 2001-2009 Objective Systems, Inc. (http://www.obj-sys.com) 
 // All rights reserved.
 // This component and the accompanying materials are made available
-// under the terms of the License "Eclipse Public License v1.0"
+// under the terms of "Eclipse Public License v1.0"
 // which accompanies this distribution, and is available 
 // at the URL "http://www.eclipse.org/legal/epl-v10.html".
 //
--- a/networkprotocolmodules/common/asn1export/inc/rtxsrc/OSRTMemoryInputStream.h	Sat Feb 20 00:14:00 2010 +0200
+++ b/networkprotocolmodules/common/asn1export/inc/rtxsrc/OSRTMemoryInputStream.h	Fri Mar 12 15:50:23 2010 +0200
@@ -1,7 +1,7 @@
 // Copyright (c) 2001-2009 Objective Systems, Inc. (http://www.obj-sys.com) 
 // All rights reserved.
 // This component and the accompanying materials are made available
-// under the terms of the License "Eclipse Public License v1.0"
+// under the terms of "Eclipse Public License v1.0"
 // which accompanies this distribution, and is available 
 // at the URL "http://www.eclipse.org/legal/epl-v10.html".
 //
--- a/networkprotocolmodules/common/asn1export/inc/rtxsrc/OSRTMemoryOutputStream.h	Sat Feb 20 00:14:00 2010 +0200
+++ b/networkprotocolmodules/common/asn1export/inc/rtxsrc/OSRTMemoryOutputStream.h	Fri Mar 12 15:50:23 2010 +0200
@@ -1,7 +1,7 @@
 // Copyright (c) 2001-2009 Objective Systems, Inc. (http://www.obj-sys.com) 
 // All rights reserved.
 // This component and the accompanying materials are made available
-// under the terms of the License "Eclipse Public License v1.0"
+// under the terms of "Eclipse Public License v1.0"
 // which accompanies this distribution, and is available 
 // at the URL "http://www.eclipse.org/legal/epl-v10.html".
 //
--- a/networkprotocolmodules/common/asn1export/inc/rtxsrc/OSRTMsgBuf.h	Sat Feb 20 00:14:00 2010 +0200
+++ b/networkprotocolmodules/common/asn1export/inc/rtxsrc/OSRTMsgBuf.h	Fri Mar 12 15:50:23 2010 +0200
@@ -1,7 +1,7 @@
 // Copyright (c) 2001-2009 Objective Systems, Inc. (http://www.obj-sys.com) 
 // All rights reserved.
 // This component and the accompanying materials are made available
-// under the terms of the License "Eclipse Public License v1.0"
+// under the terms of "Eclipse Public License v1.0"
 // which accompanies this distribution, and is available 
 // at the URL "http://www.eclipse.org/legal/epl-v10.html".
 //
--- a/networkprotocolmodules/common/asn1export/inc/rtxsrc/OSRTMsgBufIF.h	Sat Feb 20 00:14:00 2010 +0200
+++ b/networkprotocolmodules/common/asn1export/inc/rtxsrc/OSRTMsgBufIF.h	Fri Mar 12 15:50:23 2010 +0200
@@ -1,7 +1,7 @@
 // Copyright (c) 2001-2009 Objective Systems, Inc. (http://www.obj-sys.com) 
 // All rights reserved.
 // This component and the accompanying materials are made available
-// under the terms of the License "Eclipse Public License v1.0"
+// under the terms of "Eclipse Public License v1.0"
 // which accompanies this distribution, and is available 
 // at the URL "http://www.eclipse.org/legal/epl-v10.html".
 //
--- a/networkprotocolmodules/common/asn1export/inc/rtxsrc/OSRTOutputStream.h	Sat Feb 20 00:14:00 2010 +0200
+++ b/networkprotocolmodules/common/asn1export/inc/rtxsrc/OSRTOutputStream.h	Fri Mar 12 15:50:23 2010 +0200
@@ -1,7 +1,7 @@
 // Copyright (c) 2001-2009 Objective Systems, Inc. (http://www.obj-sys.com) 
 // All rights reserved.
 // This component and the accompanying materials are made available
-// under the terms of the License "Eclipse Public License v1.0"
+// under the terms of "Eclipse Public License v1.0"
 // which accompanies this distribution, and is available 
 // at the URL "http://www.eclipse.org/legal/epl-v10.html".
 //
--- a/networkprotocolmodules/common/asn1export/inc/rtxsrc/OSRTOutputStreamIF.h	Sat Feb 20 00:14:00 2010 +0200
+++ b/networkprotocolmodules/common/asn1export/inc/rtxsrc/OSRTOutputStreamIF.h	Fri Mar 12 15:50:23 2010 +0200
@@ -1,7 +1,7 @@
 // Copyright (c) 2001-2009 Objective Systems, Inc. (http://www.obj-sys.com) 
 // All rights reserved.
 // This component and the accompanying materials are made available
-// under the terms of the License "Eclipse Public License v1.0"
+// under the terms of "Eclipse Public License v1.0"
 // which accompanies this distribution, and is available 
 // at the URL "http://www.eclipse.org/legal/epl-v10.html".
 //
--- a/networkprotocolmodules/common/asn1export/inc/rtxsrc/OSRTSocket.h	Sat Feb 20 00:14:00 2010 +0200
+++ b/networkprotocolmodules/common/asn1export/inc/rtxsrc/OSRTSocket.h	Fri Mar 12 15:50:23 2010 +0200
@@ -1,7 +1,7 @@
 // Copyright (c) 2001-2009 Objective Systems, Inc. (http://www.obj-sys.com) 
 // All rights reserved.
 // This component and the accompanying materials are made available
-// under the terms of the License "Eclipse Public License v1.0"
+// under the terms of "Eclipse Public License v1.0"
 // which accompanies this distribution, and is available 
 // at the URL "http://www.eclipse.org/legal/epl-v10.html".
 //
@@ -44,10 +44,10 @@
  */
 class EXTRTCLASS OSRTSocket {
  protected:
-   OSRTSOCKET mSocket;  ///< handle of the socket
+   OSRTSOCKET mSocket;  //< handle of the socket
    int        mInitStatus;
    int        mStatus;
-   OSBOOL     mOwner;   ///< indicates this class owns the socket
+   OSBOOL     mOwner;   //< indicates this class owns the socket
 
    inline OSBOOL isInitialized () { return mInitStatus == 0; }
 
--- a/networkprotocolmodules/common/asn1export/inc/rtxsrc/OSRTSocketInputStream.h	Sat Feb 20 00:14:00 2010 +0200
+++ b/networkprotocolmodules/common/asn1export/inc/rtxsrc/OSRTSocketInputStream.h	Fri Mar 12 15:50:23 2010 +0200
@@ -1,7 +1,7 @@
 // Copyright (c) 2001-2009 Objective Systems, Inc. (http://www.obj-sys.com) 
 // All rights reserved.
 // This component and the accompanying materials are made available
-// under the terms of the License "Eclipse Public License v1.0"
+// under the terms of "Eclipse Public License v1.0"
 // which accompanies this distribution, and is available 
 // at the URL "http://www.eclipse.org/legal/epl-v10.html".
 //
@@ -35,7 +35,7 @@
  */
 class EXTRTCLASS OSRTSocketInputStream : public OSRTInputStream {
  protected:
-   OSRTSocket mSocket; ///< a socket 
+   OSRTSocket mSocket; //< a socket 
  public:
    /**
     * Creates and initializes a socket input stream using the OSRTSocket 
--- a/networkprotocolmodules/common/asn1export/inc/rtxsrc/OSRTSocketOutputStream.h	Sat Feb 20 00:14:00 2010 +0200
+++ b/networkprotocolmodules/common/asn1export/inc/rtxsrc/OSRTSocketOutputStream.h	Fri Mar 12 15:50:23 2010 +0200
@@ -1,7 +1,7 @@
 // Copyright (c) 2001-2009 Objective Systems, Inc. (http://www.obj-sys.com) 
 // All rights reserved.
 // This component and the accompanying materials are made available
-// under the terms of the License "Eclipse Public License v1.0"
+// under the terms of "Eclipse Public License v1.0"
 // which accompanies this distribution, and is available 
 // at the URL "http://www.eclipse.org/legal/epl-v10.html".
 //
@@ -35,7 +35,7 @@
  */
 class EXTRTCLASS OSRTSocketOutputStream : public OSRTOutputStream {
  protected:
-   OSRTSocket mSocket; ///< a socket 
+   OSRTSocket mSocket; //< a socket 
  public:
    /**
     * Creates and initializes a socket output stream using the OSRTSocket 
--- a/networkprotocolmodules/common/asn1export/inc/rtxsrc/OSRTStream.h	Sat Feb 20 00:14:00 2010 +0200
+++ b/networkprotocolmodules/common/asn1export/inc/rtxsrc/OSRTStream.h	Fri Mar 12 15:50:23 2010 +0200
@@ -1,7 +1,7 @@
 // Copyright (c) 2001-2009 Objective Systems, Inc. (http://www.obj-sys.com) 
 // All rights reserved.
 // This component and the accompanying materials are made available
-// under the terms of the License "Eclipse Public License v1.0"
+// under the terms of "Eclipse Public License v1.0"
 // which accompanies this distribution, and is available 
 // at the URL "http://www.eclipse.org/legal/epl-v10.html".
 //
@@ -41,9 +41,9 @@
  */
 class EXTRTCLASS OSRTStream : public OSRTCtxtHolder, public OSRTStreamIF {
  protected:
-   OSBOOL mbAttached;   ///< Flag, TRUE for "attached" streams
-   int mStatus;         ///< Last stream operation status
-   int mInitStatus; ///< Initialization status. 0 if initialized successfully
+   OSBOOL mbAttached;   //< Flag, TRUE for "attached" streams
+   int mStatus;         //< Last stream operation status
+   int mInitStatus; //< Initialization status. 0 if initialized successfully
 
    EXTRTMETHOD OSRTStream (OSRTContext* pContext, OSBOOL attachStream = FALSE);
    EXTRTMETHOD OSRTStream (OSRTStream& original);
--- a/networkprotocolmodules/common/asn1export/inc/rtxsrc/OSRTStreamIF.h	Sat Feb 20 00:14:00 2010 +0200
+++ b/networkprotocolmodules/common/asn1export/inc/rtxsrc/OSRTStreamIF.h	Fri Mar 12 15:50:23 2010 +0200
@@ -1,7 +1,7 @@
 // Copyright (c) 2001-2009 Objective Systems, Inc. (http://www.obj-sys.com) 
 // All rights reserved.
 // This component and the accompanying materials are made available
-// under the terms of the License "Eclipse Public License v1.0"
+// under the terms of "Eclipse Public License v1.0"
 // which accompanies this distribution, and is available 
 // at the URL "http://www.eclipse.org/legal/epl-v10.html".
 //
--- a/networkprotocolmodules/common/asn1export/inc/rtxsrc/OSRTString.h	Sat Feb 20 00:14:00 2010 +0200
+++ b/networkprotocolmodules/common/asn1export/inc/rtxsrc/OSRTString.h	Fri Mar 12 15:50:23 2010 +0200
@@ -1,7 +1,7 @@
 // Copyright (c) 2001-2009 Objective Systems, Inc. (http://www.obj-sys.com) 
 // All rights reserved.
 // This component and the accompanying materials are made available
-// under the terms of the License "Eclipse Public License v1.0"
+// under the terms of "Eclipse Public License v1.0"
 // which accompanies this distribution, and is available 
 // at the URL "http://www.eclipse.org/legal/epl-v10.html".
 //
--- a/networkprotocolmodules/common/asn1export/inc/rtxsrc/OSRTStringIF.h	Sat Feb 20 00:14:00 2010 +0200
+++ b/networkprotocolmodules/common/asn1export/inc/rtxsrc/OSRTStringIF.h	Fri Mar 12 15:50:23 2010 +0200
@@ -1,7 +1,7 @@
 // Copyright (c) 2001-2009 Objective Systems, Inc. (http://www.obj-sys.com) 
 // All rights reserved.
 // This component and the accompanying materials are made available
-// under the terms of the License "Eclipse Public License v1.0"
+// under the terms of "Eclipse Public License v1.0"
 // which accompanies this distribution, and is available 
 // at the URL "http://www.eclipse.org/legal/epl-v10.html".
 //
--- a/networkprotocolmodules/common/asn1export/inc/rtxsrc/OSRTUTF8String.h	Sat Feb 20 00:14:00 2010 +0200
+++ b/networkprotocolmodules/common/asn1export/inc/rtxsrc/OSRTUTF8String.h	Fri Mar 12 15:50:23 2010 +0200
@@ -1,7 +1,7 @@
 // Copyright (c) 2001-2009 Objective Systems, Inc. (http://www.obj-sys.com) 
 // All rights reserved.
 // This component and the accompanying materials are made available
-// under the terms of the License "Eclipse Public License v1.0"
+// under the terms of "Eclipse Public License v1.0"
 // which accompanies this distribution, and is available 
 // at the URL "http://www.eclipse.org/legal/epl-v10.html".
 //
--- a/networkprotocolmodules/common/asn1export/inc/rtxsrc/osMacros.h	Sat Feb 20 00:14:00 2010 +0200
+++ b/networkprotocolmodules/common/asn1export/inc/rtxsrc/osMacros.h	Fri Mar 12 15:50:23 2010 +0200
@@ -1,7 +1,7 @@
 // Copyright (c) 2001-2009 Objective Systems, Inc. (http://www.obj-sys.com) 
 // All rights reserved.
 // This component and the accompanying materials are made available
-// under the terms of the License "Eclipse Public License v1.0"
+// under the terms of "Eclipse Public License v1.0"
 // which accompanies this distribution, and is available 
 // at the URL "http://www.eclipse.org/legal/epl-v10.html".
 //
--- a/networkprotocolmodules/common/asn1export/inc/rtxsrc/osSysTypes.h	Sat Feb 20 00:14:00 2010 +0200
+++ b/networkprotocolmodules/common/asn1export/inc/rtxsrc/osSysTypes.h	Fri Mar 12 15:50:23 2010 +0200
@@ -1,7 +1,7 @@
 // Copyright (c) 2001-2009 Objective Systems, Inc. (http://www.obj-sys.com) 
 // All rights reserved.
 // This component and the accompanying materials are made available
-// under the terms of the License "Eclipse Public License v1.0"
+// under the terms of "Eclipse Public License v1.0"
 // which accompanies this distribution, and is available 
 // at the URL "http://www.eclipse.org/legal/epl-v10.html".
 //
--- a/networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxArrayList.h	Sat Feb 20 00:14:00 2010 +0200
+++ b/networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxArrayList.h	Fri Mar 12 15:50:23 2010 +0200
@@ -1,7 +1,7 @@
 // Copyright (c) 2001-2009 Objective Systems, Inc. (http://www.obj-sys.com) 
 // All rights reserved.
 // This component and the accompanying materials are made available
-// under the terms of the License "Eclipse Public License v1.0"
+// under the terms of "Eclipse Public License v1.0"
 // which accompanies this distribution, and is available 
 // at the URL "http://www.eclipse.org/legal/epl-v10.html".
 //
--- a/networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxBase64.h	Sat Feb 20 00:14:00 2010 +0200
+++ b/networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxBase64.h	Fri Mar 12 15:50:23 2010 +0200
@@ -1,7 +1,7 @@
 // Copyright (c) 2001-2009 Objective Systems, Inc. (http://www.obj-sys.com) 
 // All rights reserved.
 // This component and the accompanying materials are made available
-// under the terms of the License "Eclipse Public License v1.0"
+// under the terms of "Eclipse Public License v1.0"
 // which accompanies this distribution, and is available 
 // at the URL "http://www.eclipse.org/legal/epl-v10.html".
 //
--- a/networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxBigInt.h	Sat Feb 20 00:14:00 2010 +0200
+++ b/networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxBigInt.h	Fri Mar 12 15:50:23 2010 +0200
@@ -1,7 +1,7 @@
 // Copyright (c) 2001-2009 Objective Systems, Inc. (http://www.obj-sys.com) 
 // All rights reserved.
 // This component and the accompanying materials are made available
-// under the terms of the License "Eclipse Public License v1.0"
+// under the terms of "Eclipse Public License v1.0"
 // which accompanies this distribution, and is available 
 // at the URL "http://www.eclipse.org/legal/epl-v10.html".
 //
--- a/networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxBitDecode.h	Sat Feb 20 00:14:00 2010 +0200
+++ b/networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxBitDecode.h	Fri Mar 12 15:50:23 2010 +0200
@@ -1,7 +1,7 @@
 // Copyright (c) 2001-2009 Objective Systems, Inc. (http://www.obj-sys.com) 
 // All rights reserved.
 // This component and the accompanying materials are made available
-// under the terms of the License "Eclipse Public License v1.0"
+// under the terms of "Eclipse Public License v1.0"
 // which accompanies this distribution, and is available 
 // at the URL "http://www.eclipse.org/legal/epl-v10.html".
 //
--- a/networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxBitEncode.h	Sat Feb 20 00:14:00 2010 +0200
+++ b/networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxBitEncode.h	Fri Mar 12 15:50:23 2010 +0200
@@ -1,7 +1,7 @@
 // Copyright (c) 2001-2009 Objective Systems, Inc. (http://www.obj-sys.com) 
 // All rights reserved.
 // This component and the accompanying materials are made available
-// under the terms of the License "Eclipse Public License v1.0"
+// under the terms of "Eclipse Public License v1.0"
 // which accompanies this distribution, and is available 
 // at the URL "http://www.eclipse.org/legal/epl-v10.html".
 //
--- a/networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxBitString.h	Sat Feb 20 00:14:00 2010 +0200
+++ b/networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxBitString.h	Fri Mar 12 15:50:23 2010 +0200
@@ -1,7 +1,7 @@
 // Copyright (c) 2001-2009 Objective Systems, Inc. (http://www.obj-sys.com) 
 // All rights reserved.
 // This component and the accompanying materials are made available
-// under the terms of the License "Eclipse Public License v1.0"
+// under the terms of "Eclipse Public License v1.0"
 // which accompanies this distribution, and is available 
 // at the URL "http://www.eclipse.org/legal/epl-v10.html".
 //
--- a/networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxBuffer.h	Sat Feb 20 00:14:00 2010 +0200
+++ b/networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxBuffer.h	Fri Mar 12 15:50:23 2010 +0200
@@ -1,7 +1,7 @@
 // Copyright (c) 2001-2009 Objective Systems, Inc. (http://www.obj-sys.com) 
 // All rights reserved.
 // This component and the accompanying materials are made available
-// under the terms of the License "Eclipse Public License v1.0"
+// under the terms of "Eclipse Public License v1.0"
 // which accompanies this distribution, and is available 
 // at the URL "http://www.eclipse.org/legal/epl-v10.html".
 //
--- a/networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxCharStr.h	Sat Feb 20 00:14:00 2010 +0200
+++ b/networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxCharStr.h	Fri Mar 12 15:50:23 2010 +0200
@@ -1,7 +1,7 @@
 // Copyright (c) 2001-2009 Objective Systems, Inc. (http://www.obj-sys.com) 
 // All rights reserved.
 // This component and the accompanying materials are made available
-// under the terms of the License "Eclipse Public License v1.0"
+// under the terms of "Eclipse Public License v1.0"
 // which accompanies this distribution, and is available 
 // at the URL "http://www.eclipse.org/legal/epl-v10.html".
 //
--- a/networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxClock.h	Sat Feb 20 00:14:00 2010 +0200
+++ b/networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxClock.h	Fri Mar 12 15:50:23 2010 +0200
@@ -1,7 +1,7 @@
 // Copyright (c) 2001-2009 Objective Systems, Inc. (http://www.obj-sys.com) 
 // All rights reserved.
 // This component and the accompanying materials are made available
-// under the terms of the License "Eclipse Public License v1.0"
+// under the terms of "Eclipse Public License v1.0"
 // which accompanies this distribution, and is available 
 // at the URL "http://www.eclipse.org/legal/epl-v10.html".
 //
--- a/networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxCommon.h	Sat Feb 20 00:14:00 2010 +0200
+++ b/networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxCommon.h	Fri Mar 12 15:50:23 2010 +0200
@@ -1,7 +1,7 @@
 // Copyright (c) 2001-2009 Objective Systems, Inc. (http://www.obj-sys.com) 
 // All rights reserved.
 // This component and the accompanying materials are made available
-// under the terms of the License "Eclipse Public License v1.0"
+// under the terms of "Eclipse Public License v1.0"
 // which accompanies this distribution, and is available 
 // at the URL "http://www.eclipse.org/legal/epl-v10.html".
 //
--- a/networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxCommonDefs.h	Sat Feb 20 00:14:00 2010 +0200
+++ b/networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxCommonDefs.h	Fri Mar 12 15:50:23 2010 +0200
@@ -1,7 +1,7 @@
 // Copyright (c) 2001-2009 Objective Systems, Inc. (http://www.obj-sys.com) 
 // All rights reserved.
 // This component and the accompanying materials are made available
-// under the terms of the License "Eclipse Public License v1.0"
+// under the terms of "Eclipse Public License v1.0"
 // which accompanies this distribution, and is available 
 // at the URL "http://www.eclipse.org/legal/epl-v10.html".
 //
--- a/networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxContext.h	Sat Feb 20 00:14:00 2010 +0200
+++ b/networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxContext.h	Fri Mar 12 15:50:23 2010 +0200
@@ -1,7 +1,7 @@
 // Copyright (c) 2001-2009 Objective Systems, Inc. (http://www.obj-sys.com) 
 // All rights reserved.
 // This component and the accompanying materials are made available
-// under the terms of the License "Eclipse Public License v1.0"
+// under the terms of "Eclipse Public License v1.0"
 // which accompanies this distribution, and is available 
 // at the URL "http://www.eclipse.org/legal/epl-v10.html".
 //
--- a/networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxCtype.h	Sat Feb 20 00:14:00 2010 +0200
+++ b/networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxCtype.h	Fri Mar 12 15:50:23 2010 +0200
@@ -1,7 +1,7 @@
 // Copyright (c) 2001-2009 Objective Systems, Inc. (http://www.obj-sys.com) 
 // All rights reserved.
 // This component and the accompanying materials are made available
-// under the terms of the License "Eclipse Public License v1.0"
+// under the terms of "Eclipse Public License v1.0"
 // which accompanies this distribution, and is available 
 // at the URL "http://www.eclipse.org/legal/epl-v10.html".
 //
--- a/networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxDList.h	Sat Feb 20 00:14:00 2010 +0200
+++ b/networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxDList.h	Fri Mar 12 15:50:23 2010 +0200
@@ -1,7 +1,7 @@
 // Copyright (c) 2001-2009 Objective Systems, Inc. (http://www.obj-sys.com) 
 // All rights reserved.
 // This component and the accompanying materials are made available
-// under the terms of the License "Eclipse Public License v1.0"
+// under the terms of "Eclipse Public License v1.0"
 // which accompanies this distribution, and is available 
 // at the URL "http://www.eclipse.org/legal/epl-v10.html".
 //
--- a/networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxDateTime.h	Sat Feb 20 00:14:00 2010 +0200
+++ b/networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxDateTime.h	Fri Mar 12 15:50:23 2010 +0200
@@ -1,7 +1,7 @@
 // Copyright (c) 2001-2009 Objective Systems, Inc. (http://www.obj-sys.com) 
 // All rights reserved.
 // This component and the accompanying materials are made available
-// under the terms of the License "Eclipse Public License v1.0"
+// under the terms of "Eclipse Public License v1.0"
 // which accompanies this distribution, and is available 
 // at the URL "http://www.eclipse.org/legal/epl-v10.html".
 //
--- a/networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxDecimal.h	Sat Feb 20 00:14:00 2010 +0200
+++ b/networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxDecimal.h	Fri Mar 12 15:50:23 2010 +0200
@@ -1,7 +1,7 @@
 // Copyright (c) 2001-2009 Objective Systems, Inc. (http://www.obj-sys.com) 
 // All rights reserved.
 // This component and the accompanying materials are made available
-// under the terms of the License "Eclipse Public License v1.0"
+// under the terms of "Eclipse Public License v1.0"
 // which accompanies this distribution, and is available 
 // at the URL "http://www.eclipse.org/legal/epl-v10.html".
 //
--- a/networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxDiag.h	Sat Feb 20 00:14:00 2010 +0200
+++ b/networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxDiag.h	Fri Mar 12 15:50:23 2010 +0200
@@ -1,7 +1,7 @@
 // Copyright (c) 2001-2009 Objective Systems, Inc. (http://www.obj-sys.com) 
 // All rights reserved.
 // This component and the accompanying materials are made available
-// under the terms of the License "Eclipse Public License v1.0"
+// under the terms of "Eclipse Public License v1.0"
 // which accompanies this distribution, and is available 
 // at the URL "http://www.eclipse.org/legal/epl-v10.html".
 //
--- a/networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxDiagBitTrace.h	Sat Feb 20 00:14:00 2010 +0200
+++ b/networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxDiagBitTrace.h	Fri Mar 12 15:50:23 2010 +0200
@@ -1,7 +1,7 @@
 // Copyright (c) 2001-2009 Objective Systems, Inc. (http://www.obj-sys.com) 
 // All rights reserved.
 // This component and the accompanying materials are made available
-// under the terms of the License "Eclipse Public License v1.0"
+// under the terms of "Eclipse Public License v1.0"
 // which accompanies this distribution, and is available 
 // at the URL "http://www.eclipse.org/legal/epl-v10.html".
 //
--- a/networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxDynBitSet.h	Sat Feb 20 00:14:00 2010 +0200
+++ b/networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxDynBitSet.h	Fri Mar 12 15:50:23 2010 +0200
@@ -1,7 +1,7 @@
 // Copyright (c) 2001-2009 Objective Systems, Inc. (http://www.obj-sys.com) 
 // All rights reserved.
 // This component and the accompanying materials are made available
-// under the terms of the License "Eclipse Public License v1.0"
+// under the terms of "Eclipse Public License v1.0"
 // which accompanies this distribution, and is available 
 // at the URL "http://www.eclipse.org/legal/epl-v10.html".
 //
--- a/networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxDynPtrArray.h	Sat Feb 20 00:14:00 2010 +0200
+++ b/networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxDynPtrArray.h	Fri Mar 12 15:50:23 2010 +0200
@@ -1,7 +1,7 @@
 // Copyright (c) 2001-2009 Objective Systems, Inc. (http://www.obj-sys.com) 
 // All rights reserved.
 // This component and the accompanying materials are made available
-// under the terms of the License "Eclipse Public License v1.0"
+// under the terms of "Eclipse Public License v1.0"
 // which accompanies this distribution, and is available 
 // at the URL "http://www.eclipse.org/legal/epl-v10.html".
 //
--- a/networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxEnum.h	Sat Feb 20 00:14:00 2010 +0200
+++ b/networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxEnum.h	Fri Mar 12 15:50:23 2010 +0200
@@ -1,7 +1,7 @@
 // Copyright (c) 2001-2009 Objective Systems, Inc. (http://www.obj-sys.com) 
 // All rights reserved.
 // This component and the accompanying materials are made available
-// under the terms of the License "Eclipse Public License v1.0"
+// under the terms of "Eclipse Public License v1.0"
 // which accompanies this distribution, and is available 
 // at the URL "http://www.eclipse.org/legal/epl-v10.html".
 //
--- a/networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxErrCodes.h	Sat Feb 20 00:14:00 2010 +0200
+++ b/networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxErrCodes.h	Fri Mar 12 15:50:23 2010 +0200
@@ -1,7 +1,7 @@
 // Copyright (c) 2001-2009 Objective Systems, Inc. (http://www.obj-sys.com) 
 // All rights reserved.
 // This component and the accompanying materials are made available
-// under the terms of the License "Eclipse Public License v1.0"
+// under the terms of "Eclipse Public License v1.0"
 // which accompanies this distribution, and is available 
 // at the URL "http://www.eclipse.org/legal/epl-v10.html".
 //
--- a/networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxError.h	Sat Feb 20 00:14:00 2010 +0200
+++ b/networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxError.h	Fri Mar 12 15:50:23 2010 +0200
@@ -1,7 +1,7 @@
 // Copyright (c) 2001-2009 Objective Systems, Inc. (http://www.obj-sys.com) 
 // All rights reserved.
 // This component and the accompanying materials are made available
-// under the terms of the License "Eclipse Public License v1.0"
+// under the terms of "Eclipse Public License v1.0"
 // which accompanies this distribution, and is available 
 // at the URL "http://www.eclipse.org/legal/epl-v10.html".
 //
--- a/networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxExternDefs.h	Sat Feb 20 00:14:00 2010 +0200
+++ b/networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxExternDefs.h	Fri Mar 12 15:50:23 2010 +0200
@@ -1,7 +1,7 @@
 // Copyright (c) 2001-2009 Objective Systems, Inc. (http://www.obj-sys.com) 
 // All rights reserved.
 // This component and the accompanying materials are made available
-// under the terms of the License "Eclipse Public License v1.0"
+// under the terms of "Eclipse Public License v1.0"
 // which accompanies this distribution, and is available 
 // at the URL "http://www.eclipse.org/legal/epl-v10.html".
 //
--- a/networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxFile.h	Sat Feb 20 00:14:00 2010 +0200
+++ b/networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxFile.h	Fri Mar 12 15:50:23 2010 +0200
@@ -1,7 +1,7 @@
 // Copyright (c) 2001-2009 Objective Systems, Inc. (http://www.obj-sys.com) 
 // All rights reserved.
 // This component and the accompanying materials are made available
-// under the terms of the License "Eclipse Public License v1.0"
+// under the terms of "Eclipse Public License v1.0"
 // which accompanies this distribution, and is available 
 // at the URL "http://www.eclipse.org/legal/epl-v10.html".
 //
--- a/networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxFloat.h	Sat Feb 20 00:14:00 2010 +0200
+++ b/networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxFloat.h	Fri Mar 12 15:50:23 2010 +0200
@@ -1,7 +1,7 @@
 // Copyright (c) 2001-2009 Objective Systems, Inc. (http://www.obj-sys.com) 
 // All rights reserved.
 // This component and the accompanying materials are made available
-// under the terms of the License "Eclipse Public License v1.0"
+// under the terms of "Eclipse Public License v1.0"
 // which accompanies this distribution, and is available 
 // at the URL "http://www.eclipse.org/legal/epl-v10.html".
 //
--- a/networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxHashMap.h	Sat Feb 20 00:14:00 2010 +0200
+++ b/networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxHashMap.h	Fri Mar 12 15:50:23 2010 +0200
@@ -1,7 +1,7 @@
 // Copyright (c) 2001-2009 Objective Systems, Inc. (http://www.obj-sys.com) 
 // All rights reserved.
 // This component and the accompanying materials are made available
-// under the terms of the License "Eclipse Public License v1.0"
+// under the terms of "Eclipse Public License v1.0"
 // which accompanies this distribution, and is available 
 // at the URL "http://www.eclipse.org/legal/epl-v10.html".
 //
--- a/networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxHashMapStr2Int.h	Sat Feb 20 00:14:00 2010 +0200
+++ b/networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxHashMapStr2Int.h	Fri Mar 12 15:50:23 2010 +0200
@@ -1,7 +1,7 @@
 // Copyright (c) 2001-2009 Objective Systems, Inc. (http://www.obj-sys.com) 
 // All rights reserved.
 // This component and the accompanying materials are made available
-// under the terms of the License "Eclipse Public License v1.0"
+// under the terms of "Eclipse Public License v1.0"
 // which accompanies this distribution, and is available 
 // at the URL "http://www.eclipse.org/legal/epl-v10.html".
 //
--- a/networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxHashMapStr2UInt.h	Sat Feb 20 00:14:00 2010 +0200
+++ b/networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxHashMapStr2UInt.h	Fri Mar 12 15:50:23 2010 +0200
@@ -1,7 +1,7 @@
 // Copyright (c) 2001-2009 Objective Systems, Inc. (http://www.obj-sys.com) 
 // All rights reserved.
 // This component and the accompanying materials are made available
-// under the terms of the License "Eclipse Public License v1.0"
+// under the terms of "Eclipse Public License v1.0"
 // which accompanies this distribution, and is available 
 // at the URL "http://www.eclipse.org/legal/epl-v10.html".
 //
--- a/networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxHashMapUndef.h	Sat Feb 20 00:14:00 2010 +0200
+++ b/networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxHashMapUndef.h	Fri Mar 12 15:50:23 2010 +0200
@@ -1,7 +1,7 @@
 // Copyright (c) 2001-2009 Objective Systems, Inc. (http://www.obj-sys.com) 
 // All rights reserved.
 // This component and the accompanying materials are made available
-// under the terms of the License "Eclipse Public License v1.0"
+// under the terms of "Eclipse Public License v1.0"
 // which accompanies this distribution, and is available 
 // at the URL "http://www.eclipse.org/legal/epl-v10.html".
 //
--- a/networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxMemBuf.h	Sat Feb 20 00:14:00 2010 +0200
+++ b/networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxMemBuf.h	Fri Mar 12 15:50:23 2010 +0200
@@ -1,7 +1,7 @@
 // Copyright (c) 2001-2009 Objective Systems, Inc. (http://www.obj-sys.com) 
 // All rights reserved.
 // This component and the accompanying materials are made available
-// under the terms of the License "Eclipse Public License v1.0"
+// under the terms of "Eclipse Public License v1.0"
 // which accompanies this distribution, and is available 
 // at the URL "http://www.eclipse.org/legal/epl-v10.html".
 //
--- a/networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxMemLeakCheck.h	Sat Feb 20 00:14:00 2010 +0200
+++ b/networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxMemLeakCheck.h	Fri Mar 12 15:50:23 2010 +0200
@@ -1,7 +1,7 @@
 // Copyright (c) 2001-2009 Objective Systems, Inc. (http://www.obj-sys.com) 
 // All rights reserved.
 // This component and the accompanying materials are made available
-// under the terms of the License "Eclipse Public License v1.0"
+// under the terms of "Eclipse Public License v1.0"
 // which accompanies this distribution, and is available 
 // at the URL "http://www.eclipse.org/legal/epl-v10.html".
 //
--- a/networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxMemory.h	Sat Feb 20 00:14:00 2010 +0200
+++ b/networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxMemory.h	Fri Mar 12 15:50:23 2010 +0200
@@ -1,7 +1,7 @@
 // Copyright (c) 2001-2009 Objective Systems, Inc. (http://www.obj-sys.com) 
 // All rights reserved.
 // This component and the accompanying materials are made available
-// under the terms of the License "Eclipse Public License v1.0"
+// under the terms of "Eclipse Public License v1.0"
 // which accompanies this distribution, and is available 
 // at the URL "http://www.eclipse.org/legal/epl-v10.html".
 //
--- a/networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxPattern.h	Sat Feb 20 00:14:00 2010 +0200
+++ b/networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxPattern.h	Fri Mar 12 15:50:23 2010 +0200
@@ -1,7 +1,7 @@
 // Copyright (c) 2001-2009 Objective Systems, Inc. (http://www.obj-sys.com) 
 // All rights reserved.
 // This component and the accompanying materials are made available
-// under the terms of the License "Eclipse Public License v1.0"
+// under the terms of "Eclipse Public License v1.0"
 // which accompanies this distribution, and is available 
 // at the URL "http://www.eclipse.org/legal/epl-v10.html".
 //
--- a/networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxPrint.h	Sat Feb 20 00:14:00 2010 +0200
+++ b/networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxPrint.h	Fri Mar 12 15:50:23 2010 +0200
@@ -1,7 +1,7 @@
 // Copyright (c) 2001-2009 Objective Systems, Inc. (http://www.obj-sys.com) 
 // All rights reserved.
 // This component and the accompanying materials are made available
-// under the terms of the License "Eclipse Public License v1.0"
+// under the terms of "Eclipse Public License v1.0"
 // which accompanies this distribution, and is available 
 // at the URL "http://www.eclipse.org/legal/epl-v10.html".
 //
--- a/networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxPrintStream.h	Sat Feb 20 00:14:00 2010 +0200
+++ b/networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxPrintStream.h	Fri Mar 12 15:50:23 2010 +0200
@@ -1,7 +1,7 @@
 // Copyright (c) 2001-2009 Objective Systems, Inc. (http://www.obj-sys.com) 
 // All rights reserved.
 // This component and the accompanying materials are made available
-// under the terms of the License "Eclipse Public License v1.0"
+// under the terms of "Eclipse Public License v1.0"
 // which accompanies this distribution, and is available 
 // at the URL "http://www.eclipse.org/legal/epl-v10.html".
 //
--- a/networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxPrintToStream.h	Sat Feb 20 00:14:00 2010 +0200
+++ b/networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxPrintToStream.h	Fri Mar 12 15:50:23 2010 +0200
@@ -1,7 +1,7 @@
 // Copyright (c) 2001-2009 Objective Systems, Inc. (http://www.obj-sys.com) 
 // All rights reserved.
 // This component and the accompanying materials are made available
-// under the terms of the License "Eclipse Public License v1.0"
+// under the terms of "Eclipse Public License v1.0"
 // which accompanies this distribution, and is available 
 // at the URL "http://www.eclipse.org/legal/epl-v10.html".
 //
--- a/networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxReal.h	Sat Feb 20 00:14:00 2010 +0200
+++ b/networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxReal.h	Fri Mar 12 15:50:23 2010 +0200
@@ -1,7 +1,7 @@
 // Copyright (c) 2001-2009 Objective Systems, Inc. (http://www.obj-sys.com) 
 // All rights reserved.
 // This component and the accompanying materials are made available
-// under the terms of the License "Eclipse Public License v1.0"
+// under the terms of "Eclipse Public License v1.0"
 // which accompanies this distribution, and is available 
 // at the URL "http://www.eclipse.org/legal/epl-v10.html".
 //
--- a/networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxSList.h	Sat Feb 20 00:14:00 2010 +0200
+++ b/networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxSList.h	Fri Mar 12 15:50:23 2010 +0200
@@ -1,7 +1,7 @@
 // Copyright (c) 2001-2009 Objective Systems, Inc. (http://www.obj-sys.com) 
 // All rights reserved.
 // This component and the accompanying materials are made available
-// under the terms of the License "Eclipse Public License v1.0"
+// under the terms of "Eclipse Public License v1.0"
 // which accompanies this distribution, and is available 
 // at the URL "http://www.eclipse.org/legal/epl-v10.html".
 //
--- a/networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxScalarDList.h	Sat Feb 20 00:14:00 2010 +0200
+++ b/networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxScalarDList.h	Fri Mar 12 15:50:23 2010 +0200
@@ -1,7 +1,7 @@
 // Copyright (c) 2001-2009 Objective Systems, Inc. (http://www.obj-sys.com) 
 // All rights reserved.
 // This component and the accompanying materials are made available
-// under the terms of the License "Eclipse Public License v1.0"
+// under the terms of "Eclipse Public License v1.0"
 // which accompanies this distribution, and is available 
 // at the URL "http://www.eclipse.org/legal/epl-v10.html".
 //
--- a/networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxSocket.h	Sat Feb 20 00:14:00 2010 +0200
+++ b/networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxSocket.h	Fri Mar 12 15:50:23 2010 +0200
@@ -1,7 +1,7 @@
 // Copyright (c) 2001-2009 Objective Systems, Inc. (http://www.obj-sys.com) 
 // All rights reserved.
 // This component and the accompanying materials are made available
-// under the terms of the License "Eclipse Public License v1.0"
+// under the terms of "Eclipse Public License v1.0"
 // which accompanies this distribution, and is available 
 // at the URL "http://www.eclipse.org/legal/epl-v10.html".
 //
--- a/networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxStack.h	Sat Feb 20 00:14:00 2010 +0200
+++ b/networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxStack.h	Fri Mar 12 15:50:23 2010 +0200
@@ -1,7 +1,7 @@
 // Copyright (c) 2001-2009 Objective Systems, Inc. (http://www.obj-sys.com) 
 // All rights reserved.
 // This component and the accompanying materials are made available
-// under the terms of the License "Eclipse Public License v1.0"
+// under the terms of "Eclipse Public License v1.0"
 // which accompanies this distribution, and is available 
 // at the URL "http://www.eclipse.org/legal/epl-v10.html".
 //
--- a/networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxStream.h	Sat Feb 20 00:14:00 2010 +0200
+++ b/networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxStream.h	Fri Mar 12 15:50:23 2010 +0200
@@ -1,7 +1,7 @@
 // Copyright (c) 2001-2009 Objective Systems, Inc. (http://www.obj-sys.com) 
 // All rights reserved.
 // This component and the accompanying materials are made available
-// under the terms of the License "Eclipse Public License v1.0"
+// under the terms of "Eclipse Public License v1.0"
 // which accompanies this distribution, and is available 
 // at the URL "http://www.eclipse.org/legal/epl-v10.html".
 //
--- a/networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxStreamBuffered.h	Sat Feb 20 00:14:00 2010 +0200
+++ b/networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxStreamBuffered.h	Fri Mar 12 15:50:23 2010 +0200
@@ -1,7 +1,7 @@
 // Copyright (c) 2001-2009 Objective Systems, Inc. (http://www.obj-sys.com) 
 // All rights reserved.
 // This component and the accompanying materials are made available
-// under the terms of the License "Eclipse Public License v1.0"
+// under the terms of "Eclipse Public License v1.0"
 // which accompanies this distribution, and is available 
 // at the URL "http://www.eclipse.org/legal/epl-v10.html".
 //
--- a/networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxStreamCtxtBuf.h	Sat Feb 20 00:14:00 2010 +0200
+++ b/networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxStreamCtxtBuf.h	Fri Mar 12 15:50:23 2010 +0200
@@ -1,7 +1,7 @@
 // Copyright (c) 2001-2009 Objective Systems, Inc. (http://www.obj-sys.com) 
 // All rights reserved.
 // This component and the accompanying materials are made available
-// under the terms of the License "Eclipse Public License v1.0"
+// under the terms of "Eclipse Public License v1.0"
 // which accompanies this distribution, and is available 
 // at the URL "http://www.eclipse.org/legal/epl-v10.html".
 //
--- a/networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxStreamFile.h	Sat Feb 20 00:14:00 2010 +0200
+++ b/networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxStreamFile.h	Fri Mar 12 15:50:23 2010 +0200
@@ -1,7 +1,7 @@
 // Copyright (c) 2001-2009 Objective Systems, Inc. (http://www.obj-sys.com) 
 // All rights reserved.
 // This component and the accompanying materials are made available
-// under the terms of the License "Eclipse Public License v1.0"
+// under the terms of "Eclipse Public License v1.0"
 // which accompanies this distribution, and is available 
 // at the URL "http://www.eclipse.org/legal/epl-v10.html".
 //
--- a/networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxStreamMemory.h	Sat Feb 20 00:14:00 2010 +0200
+++ b/networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxStreamMemory.h	Fri Mar 12 15:50:23 2010 +0200
@@ -1,7 +1,7 @@
 // Copyright (c) 2001-2009 Objective Systems, Inc. (http://www.obj-sys.com) 
 // All rights reserved.
 // This component and the accompanying materials are made available
-// under the terms of the License "Eclipse Public License v1.0"
+// under the terms of "Eclipse Public License v1.0"
 // which accompanies this distribution, and is available 
 // at the URL "http://www.eclipse.org/legal/epl-v10.html".
 //
--- a/networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxStreamSocket.h	Sat Feb 20 00:14:00 2010 +0200
+++ b/networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxStreamSocket.h	Fri Mar 12 15:50:23 2010 +0200
@@ -1,7 +1,7 @@
 // Copyright (c) 2001-2009 Objective Systems, Inc. (http://www.obj-sys.com) 
 // All rights reserved.
 // This component and the accompanying materials are made available
-// under the terms of the License "Eclipse Public License v1.0"
+// under the terms of "Eclipse Public License v1.0"
 // which accompanies this distribution, and is available 
 // at the URL "http://www.eclipse.org/legal/epl-v10.html".
 //
--- a/networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxStreamZlib.h	Sat Feb 20 00:14:00 2010 +0200
+++ b/networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxStreamZlib.h	Fri Mar 12 15:50:23 2010 +0200
@@ -1,7 +1,7 @@
 // Copyright (c) 2001-2009 Objective Systems, Inc. (http://www.obj-sys.com) 
 // All rights reserved.
 // This component and the accompanying materials are made available
-// under the terms of the License "Eclipse Public License v1.0"
+// under the terms of "Eclipse Public License v1.0"
 // which accompanies this distribution, and is available 
 // at the URL "http://www.eclipse.org/legal/epl-v10.html".
 //
--- a/networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxToken.h	Sat Feb 20 00:14:00 2010 +0200
+++ b/networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxToken.h	Fri Mar 12 15:50:23 2010 +0200
@@ -1,7 +1,7 @@
 // Copyright (c) 2001-2009 Objective Systems, Inc. (http://www.obj-sys.com) 
 // All rights reserved.
 // This component and the accompanying materials are made available
-// under the terms of the License "Eclipse Public License v1.0"
+// under the terms of "Eclipse Public License v1.0"
 // which accompanies this distribution, and is available 
 // at the URL "http://www.eclipse.org/legal/epl-v10.html".
 //
--- a/networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxTokenConst.h	Sat Feb 20 00:14:00 2010 +0200
+++ b/networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxTokenConst.h	Fri Mar 12 15:50:23 2010 +0200
@@ -1,7 +1,7 @@
 // Copyright (c) 2001-2009 Objective Systems, Inc. (http://www.obj-sys.com) 
 // All rights reserved.
 // This component and the accompanying materials are made available
-// under the terms of the License "Eclipse Public License v1.0"
+// under the terms of "Eclipse Public License v1.0"
 // which accompanies this distribution, and is available 
 // at the URL "http://www.eclipse.org/legal/epl-v10.html".
 //
--- a/networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxUTF8.h	Sat Feb 20 00:14:00 2010 +0200
+++ b/networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxUTF8.h	Fri Mar 12 15:50:23 2010 +0200
@@ -1,7 +1,7 @@
 // Copyright (c) 2001-2009 Objective Systems, Inc. (http://www.obj-sys.com) 
 // All rights reserved.
 // This component and the accompanying materials are made available
-// under the terms of the License "Eclipse Public License v1.0"
+// under the terms of "Eclipse Public License v1.0"
 // which accompanies this distribution, and is available 
 // at the URL "http://www.eclipse.org/legal/epl-v10.html".
 //
--- a/networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxUtil.h	Sat Feb 20 00:14:00 2010 +0200
+++ b/networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxUtil.h	Fri Mar 12 15:50:23 2010 +0200
@@ -1,7 +1,7 @@
 // Copyright (c) 2001-2009 Objective Systems, Inc. (http://www.obj-sys.com) 
 // All rights reserved.
 // This component and the accompanying materials are made available
-// under the terms of the License "Eclipse Public License v1.0"
+// under the terms of "Eclipse Public License v1.0"
 // which accompanies this distribution, and is available 
 // at the URL "http://www.eclipse.org/legal/epl-v10.html".
 //
--- a/networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxXmlQName.h	Sat Feb 20 00:14:00 2010 +0200
+++ b/networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxXmlQName.h	Fri Mar 12 15:50:23 2010 +0200
@@ -1,7 +1,7 @@
 // Copyright (c) 2001-2009 Objective Systems, Inc. (http://www.obj-sys.com) 
 // All rights reserved.
 // This component and the accompanying materials are made available
-// under the terms of the License "Eclipse Public License v1.0"
+// under the terms of "Eclipse Public License v1.0"
 // which accompanies this distribution, and is available 
 // at the URL "http://www.eclipse.org/legal/epl-v10.html".
 //
--- a/networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxXmlStr.h	Sat Feb 20 00:14:00 2010 +0200
+++ b/networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxXmlStr.h	Fri Mar 12 15:50:23 2010 +0200
@@ -1,7 +1,7 @@
 // Copyright (c) 2001-2009 Objective Systems, Inc. (http://www.obj-sys.com) 
 // All rights reserved.
 // This component and the accompanying materials are made available
-// under the terms of the License "Eclipse Public License v1.0"
+// under the terms of "Eclipse Public License v1.0"
 // which accompanies this distribution, and is available 
 // at the URL "http://www.eclipse.org/legal/epl-v10.html".
 //
--- a/networkprotocolmodules/common/asn1export/inc/rtxsrc/wceAddon.h	Sat Feb 20 00:14:00 2010 +0200
+++ b/networkprotocolmodules/common/asn1export/inc/rtxsrc/wceAddon.h	Fri Mar 12 15:50:23 2010 +0200
@@ -1,7 +1,7 @@
 // Copyright (c) 2001-2009 Objective Systems, Inc. (http://www.obj-sys.com) 
 // All rights reserved.
 // This component and the accompanying materials are made available
-// under the terms of the License "Eclipse Public License v1.0"
+// under the terms of "Eclipse Public License v1.0"
 // which accompanies this distribution, and is available 
 // at the URL "http://www.eclipse.org/legal/epl-v10.html".
 //
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/networkprotocolmodules/common/utils/eabi/netpmutilsu.def	Fri Mar 12 15:50:23 2010 +0200
@@ -0,0 +1,5 @@
+EXPORTS
+	_ZN10NetPmUtils11UncertaintyERKf @ 1 NONAME
+	_ZN10NetPmUtils14EncodeAltitudeERKf @ 2 NONAME
+	_ZN10NetPmUtils19UncertaintyAltitudeERKf @ 3 NONAME
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/networkprotocolmodules/common/utils/group/bld.inf	Fri Mar 12 15:50:23 2010 +0200
@@ -0,0 +1,26 @@
+// Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
+
+PRJ_EXPORTS
+
+netpmutils.iby			/epoc32/rom/include/netpmutils.iby
+
+//../inc/netpmutils.h			SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(lbs/netpmutils.h)
+
+PRJ_MMPFILES
+netpmutils.mmp
+
+PRJ_TESTEXPORTS
+PRJ_TESTMMPFILES
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/networkprotocolmodules/common/utils/group/netpmutils.iby	Fri Mar 12 15:50:23 2010 +0200
@@ -0,0 +1,22 @@
+// Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+// An iby file for the network PM utilities library
+// 
+
+#ifndef __NETPM_UTILS_IBY__
+#define __NETPM_UTILS_IBY__
+
+file=ABI_DIR\DEBUG_DIR\netpmutils.dll		System\libs\netpmutils.dll
+
+#endif	//__NETPM_UTILS_IBY__
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/networkprotocolmodules/common/utils/group/netpmutils.mmp	Fri Mar 12 15:50:23 2010 +0200
@@ -0,0 +1,35 @@
+// Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
+
+TARGET		netpmutils.dll
+TARGETTYPE	dll
+CAPABILITY	ALL -TCB
+UID		0x1000008d 0x102871F4
+VENDORID	0x70000001
+
+MACRO ENABLE_SUPL_DEV_LOGGER
+
+SOURCEPATH		../src
+SOURCE			netpmutils.cpp
+
+OS_LAYER_SYSTEMINCLUDE_SYMBIAN
+
+USERINCLUDE		../inc
+
+// Standard Libraries
+LIBRARY		euser.lib
+LIBRARY		estlib.lib
+
+SMPSAFE
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/networkprotocolmodules/common/utils/inc/netpmutils.h	Fri Mar 12 15:50:23 2010 +0200
@@ -0,0 +1,57 @@
+// Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
+
+/**
+ @file
+ @internalTechnology
+ 
+*/
+
+#ifndef NET_PM_UTILS_H
+#define NET_PM_UTILS_H
+
+//************************************************************************************************************
+#include <e32base.h>
+
+// Literals used
+_LIT(KNetPMUtils, "NetPMUtils");
+
+/**
+Constants used in the encoding of position values.
+*/
+const TReal KLbsLatitudeConst  = (8388608 / 90);  // 2^23 / 90
+const TReal KLbsLongitudeConst = (16777216 / 360);  // 2^24 / 360
+const TInt  KLbsMaxAltitude    = 32767;          	// 2^15 - 1
+
+/**
+Constants used in velocity conversion
+1 meter per second = 3.6 kilometers per hour
+*/
+const TReal KLbsMpsKmphConstant = 3.6;
+
+class NetPmUtils
+    {
+	public:
+	
+	public: // New functions
+        IMPORT_C static TInt NetPmUtils::Uncertainty(const TReal32& aDistance);
+        IMPORT_C static TInt EncodeAltitude(const TReal32& aAltitude);
+        IMPORT_C static TInt UncertaintyAltitude(const TReal32& aDistance);
+	private:
+    	NetPmUtils( const NetPmUtils& );
+    };
+
+
+#endif //NET_PM_UTILS_H
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/networkprotocolmodules/common/utils/src/netpmutils.cpp	Fri Mar 12 15:50:23 2010 +0200
@@ -0,0 +1,129 @@
+// Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+// System
+// 
+//
+
+/**
+ @file
+ @internalTechnology
+ 
+*/
+
+#include <e32base.h>
+#include <e32math.h>
+
+// Component
+#include "netpmutils.h"
+
+/**
+Constants used in encoding of uncertainty data
+
+@see CSuplStart::Uncertainty()
+@see CSuplStart::UncertaintyAltitude()
+*/
+const TReal KLbsLogOnePointOne = 0.095310179804324860043952123280765;
+const TReal KLbsLogOnePointZeroTwoFive = 0.02469261259037150101430767543669;
+const TInt  KLbsMaxUncert = 127;
+
+/**
+ * TODO: update asn1 code to use this version and delete the CSuplMessageBase version?
+Uncertainty()
+
+Converts a minumum accuracy value in meters to an uncertainty value K as 
+described in 3GPP 23.032 (Universal Geographical Area Description) section 6.2.
+
+r = C((1+x)^K - 1)
+
+where r = distance in meters
+      C = 10
+      x = 0.1
+      K = uncertainty value
+      
+hence K = ln(r/C + 1) / ln(1.1)
+
+@param aDistance - distance measurement in meters
+@return uncertainty value K
+*/
+EXPORT_C TInt NetPmUtils::Uncertainty(const TReal32& aDistance)
+	{
+	TReal uncert;
+	Math::Ln(uncert,  (aDistance/10) + 1 );
+	uncert /= KLbsLogOnePointOne;
+	if (uncert>KLbsMaxUncert)
+		{
+		uncert = KLbsMaxUncert;
+		}
+
+	// round to nearest whole number
+	TReal uncertRounded;
+	Math::Round(uncertRounded, uncert, 0);
+	
+	return (TInt)uncertRounded;
+	}
+
+
+/**
+UncertaintyAltitude()
+
+Converts a minumum accuracy value in meters to an uncertainty altitude value K as 
+described in 3GPP 23.032 (Universal Geographical Area Description) section 6.4.
+
+r = C((1+x)^K - 1)
+
+where r = distance in meters
+      C = 45
+      x = 0.1
+      K = uncertainty value
+      
+hence K = ln(r/C + 1) / ln(1.1)
+
+@param aDistance - altitude accuracy in meters
+@return uncertainty altitude value K
+*/
+EXPORT_C TInt NetPmUtils::UncertaintyAltitude(const TReal32& aDistance)
+	{
+	
+	TReal uncert;
+	Math::Ln(uncert,  (aDistance/45) + 1 );
+	uncert /= KLbsLogOnePointZeroTwoFive;
+	if (uncert>KLbsMaxUncert)
+		{
+		uncert = KLbsMaxUncert;
+		}
+	// round to nearest whole number
+	TReal uncertRounded;
+	Math::Round(uncertRounded, uncert, 0);
+	
+	return (TInt)uncertRounded;
+	}
+
+/**
+EncodeAltitude()
+
+Converts an value for altiutude to an 15 bit binary coded number N
+
+@param aAltitude - altitude in meters
+@return uncertainty altitude value K
+*/
+EXPORT_C TInt NetPmUtils::EncodeAltitude(const TReal32& aAltitude)
+	{
+	TInt altEncoded = (TInt)aAltitude;
+	if (altEncoded>KLbsMaxAltitude)
+		{
+		altEncoded = KLbsMaxAltitude;
+		}
+
+	return altEncoded;
+	}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/networkprotocolmodules/suplcontrolplaneprotocols/common/suplrrlpprotocol/sfgroup/bld.inf	Fri Mar 12 15:50:23 2010 +0200
@@ -0,0 +1,24 @@
+// Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
+
+PRJ_PLATFORMS
+DEFAULT
+
+PRJ_EXPORTS
+suplrrlpprotocol.iby	/epoc32/rom/include/suplrrlpprotocol.iby
+
+PRJ_MMPFILES
+suplrrlpprotocol.mmp
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/networkprotocolmodules/suplcontrolplaneprotocols/common/suplrrlpprotocol/sfgroup/suplrrlpprotocol.iby	Fri Mar 12 15:50:23 2010 +0200
@@ -0,0 +1,29 @@
+// Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
+
+#ifndef __SUPL_RRLP_PROTOCOL_IBY__
+#define __SUPL_RRLP_PROTOCOL_IBY__
+
+
+#if !defined(SYMBIAN_EXCLUDE_LOCATION)
+#if defined(SYMBIAN_INCLUDE_LOCATION_SUPLv10) || defined(SYMBIAN_INCLUDE_LOCATION_SUPL_PROXY)
+
+file=ABI_DIR\DEBUG_DIR\suplrrlpprotocol.dll	System\libs\suplrrlpprotocol.dll
+
+#endif // SYMBIAN_INCLUDE_LOCATION_SUPLv10 || SYMBIAN_INCLUDE_LOCATION_SUPL_PROXY
+#endif // SYMBIAN_EXCLUDE_LOCATION
+
+
+#endif // __SUPL_RRLP_PROTOCOL_IBY__
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/networkprotocolmodules/suplcontrolplaneprotocols/common/suplrrlpprotocol/sfgroup/suplrrlpprotocol.mmp	Fri Mar 12 15:50:23 2010 +0200
@@ -0,0 +1,49 @@
+
+// Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description: suplrrlpprotocol.mmp - This is the project specification file for SuplRRLPProtocol.
+// 
+//
+
+TARGET		  suplrrlpprotocol.dll
+TARGETTYPE	  DLL
+UID 0 0x10283764
+
+CAPABILITY ALL -TCB
+
+// Sources
+SOURCEPATH		../src
+SOURCE			suplrrlpstatemachine.cpp
+SOURCE			dllmain.cpp
+
+// 
+OS_LAYER_SYSTEMINCLUDE_SYMBIAN
+OS_LAYER_LIBC_SYSTEMINCLUDE
+
+// Includes
+USERINCLUDE		../inc 
+USERINCLUDE		../../suplpositioningprotbase/inc/
+USERINCLUDE		../../../../common/suplrrlpasn1/inc/
+USERINCLUDE     ../../../../../locationmgmt/locationcore/LbsPartnerCommon/inc
+USERINCLUDE		../../../../common/supldevlogger/inc
+
+// Libraries
+LIBRARY		lbspartnercommon.lib 
+LIBRARY		euser.lib 
+LIBRARY 	lbsnetprotocol.lib 
+LIBRARY		lbsassistancedata.lib 
+LIBRARY		lbs.lib 
+LIBRARY		suplrrlpasn1.lib
+LIBRARY		supldevlogger.lib
+
+SMPSAFE
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/networkprotocolmodules/suplproxyprotocolmodule/sfgroup/bld.inf	Fri Mar 12 15:50:23 2010 +0200
@@ -0,0 +1,35 @@
+// Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
+
+// common components:
+#include "../../common/supldevlogger/group/bld.inf"
+#include "../../common/utils/group/bld.inf"
+#include "../../common/suplrrlpasn1/group/bld.inf"
+
+// RRLP protocol:
+#include "../../suplcontrolplaneprotocols/common/suplrrlpprotocol/sfgroup/bld.inf"
+
+
+// SUPL Proxy Protocol Module specific:
+#include "../clientapi/common/posmsgapi/group/bld.inf"
+#include "../clientapi/suplposmsgpluginapi/group/bld.inf"
+#include "../clientapi/suplposmsgplugin/group/bld.inf"
+#include "../supltiapi/group/bld.inf"
+#include "../suplproxyprotocolmodule/group/bld.inf"
+
+#include "../test/group/bld.inf"
+
+PRJ_EXPORTS
+lbs_suplproxyprotocolmodule.iby /epoc32/rom/include/lbs_suplproxyprotocolmodule.iby
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/networkprotocolmodules/suplproxyprotocolmodule/sfgroup/lbs_suplproxyprotocolmodule.iby	Fri Mar 12 15:50:23 2010 +0200
@@ -0,0 +1,40 @@
+/*
+* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+#ifndef __LBS_SUPLPROXYPROTOCOLMODULE_IBY__
+#define __LBS_SUPLPROXYPROTOCOLMODULE_IBY__
+
+REM LBS SUPL Proxy Protocol Module
+
+#if !defined(SYMBIAN_EXCLUDE_LOCATION)
+#include "lbsnetworkprivacy.iby"
+#include "lbsprivacyrequest.iby"
+
+#include "suplproxyclientpossession.iby"
+#include "epos_omasuplposmsgpluginimpl.iby"
+#include "netpmutils.iby"
+#include "epos_omasuplposmessageplugin.iby"
+#include "supltiapi.iby"
+#include "suplrrlpprotocol.iby"
+#include "suplrrlpasn1.iby"
+#include "asn1export.iby"
+#include "asn1supl.iby"
+#include "asn1rrlp.iby"
+
+#include "lbssuplproxyprotocolmodule.iby"
+
+#endif // SYMBIAN_EXCLUDE_LOCATION
+#endif