--- a/brdbootldr/ubootldr/inflate.c	Thu Jan 07 13:38:45 2010 +0200
+++ b/brdbootldr/ubootldr/inflate.c	Mon Jan 18 21:31:10 2010 +0200
@@ -1,19 +1,3 @@
-/*
-* 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 the License "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: 
-*
-*/
 /* inflate.c -- Not copyrighted 1992 by Mark Adler
    version c10p1, 10 January 1993 */
 

--- a/bsptemplate/asspandvariant/template_assp/dma.mmp	Thu Jan 07 13:38:45 2010 +0200
+++ b/bsptemplate/asspandvariant/template_assp/dma.mmp	Mon Jan 18 21:31:10 2010 +0200
@@ -12,7 +12,7 @@
 //
 // Description:
 // template/template_assp/dma.mmp
-// 
+//
 //
 
 #include		<variant.mmh>
@@ -27,17 +27,19 @@
 noexportlibrary
 
 sourcepath		../../../kernel/eka/drivers/dma
-source			dmapil.cpp
+source			dma2_pil.cpp dma2_shared.cpp
 
 sourcepath		.
 source			dmapsl.cpp
 
 library			VariantTarget(katemplate,lib)
 
-deffile			../../../kernel/eka/~/dma.def
+deffile			../../../kernel/eka/~/dma2.def
 
 epocallowdlldata
 
 capability		all
 
 VENDORID 0x70000001
+
+MACRO DMA_APIV2

--- a/bsptemplate/asspandvariant/template_assp/dmapsl.cpp	Thu Jan 07 13:38:45 2010 +0200
+++ b/bsptemplate/asspandvariant/template_assp/dmapsl.cpp	Mon Jan 18 21:31:10 2010 +0200
@@ -11,23 +11,26 @@
 // Contributors:
 //
 // Description:
-// template\template_assp\dmapsl.cpp
+// bsptemplate/asspvariant/template_assp/dmapsl.cpp
 // Template DMA Platform Specific Layer (PSL).
-// 
+//
 //
 
 
 #include <kernel/kern_priv.h>
 #include <template_assp.h>									// /assp/template_assp/
+
 #include <drivers/dma.h>
+#include <drivers/dma_hai.h>
+
 
 // Debug support
-static const char KDmaPanicCat[] = "DMA PSL";
+static const char KDmaPanicCat[] = "DMA PSL - " __FILE__;
 
-static const TInt KMaxTransferLen = 0x1FE0;					// max transfer length for this DMAC
-static const TInt KMemAlignMask = 7;				  // memory addresses passed to DMAC must be multiple of 8
-static const TInt KChannelCount = 16;						// we got 16 channels
-static const TInt KDesCount = 1024;							// DMA descriptor count
+static const TInt KMaxTransferLen = 0x1FE0;	// max transfer length for this DMAC
+static const TInt KMemAlignMask = 7; // memory addresses passed to DMAC must be multiple of 8
+static const TInt KChannelCount = 16;			// we got 16 channels
+static const TInt KDesCount = 160;				// Initial DMA descriptor count
 
 
 class TDmaDesc
@@ -49,6 +52,9 @@
 // Test Support
 //////////////////////////////////////////////////////////////////////////////
 
+/**
+TO DO: Fill in to provide information to the V1 test harness (t_dma.exe)
+*/
 TDmaTestInfo TestInfo =
 	{
 	0,
@@ -71,6 +77,26 @@
 	return TestInfo;
 	}
 
+/**
+TO DO: Fill in to provide information to the V2 test harness (t_dma2.exe)
+*/
+TDmaV2TestInfo TestInfov2 =
+	{
+	0,
+	0,
+	0,
+	0,
+	{0},
+	0,
+	{0},
+	0,
+	{0}
+	};
+
+EXPORT_C const TDmaV2TestInfo& DmaTestInfoV2()
+	{
+	return TestInfov2;
+	}
 
 //////////////////////////////////////////////////////////////////////////////
 // Helper Functions
@@ -85,14 +111,14 @@
 	}
 
 
-static TUint32 DcmdReg(TInt aCount, TUint aFlags, TUint32 aPslInfo)
+static TUint32 DmaCmdReg(TUint aCount, TUint aFlags, TUint32 aSrcPslInfo, TUint32 aDstPslInfo)
 //
 // Returns value to set in DMA command register or in descriptor command field.
 //
 	{
 	// TO DO: Construct CMD word from input values.
 	// The return value should reflect the actual control word.
-	return (aCount | aFlags | aPslInfo);
+	return (aCount | aFlags | aSrcPslInfo | aDstPslInfo);
 	}
 
 
@@ -119,14 +145,15 @@
 	TInt Create();
 private:
 	// from TDmac (PIL pure virtual)
-	virtual void Transfer(const TDmaChannel& aChannel, const SDmaDesHdr& aHdr);
 	virtual void StopTransfer(const TDmaChannel& aChannel);
 	virtual TBool IsIdle(const TDmaChannel& aChannel);
-	virtual TInt MaxTransferSize(TDmaChannel& aChannel, TUint aFlags, TUint32 aPslInfo);
-	virtual TUint MemAlignMask(TDmaChannel& aChannel, TUint aFlags, TUint32 aPslInfo);
+	virtual TUint MaxTransferLength(TDmaChannel& aChannel, TUint aSrcFlags,
+									TUint aDstFlags, TUint32 aPslInfo);
+	virtual TUint AddressAlignMask(TDmaChannel& aChannel, TUint aSrcFlags,
+								   TUint aDstFlags, TUint32 aPslInfo);
 	// from TDmac (PIL virtual)
-	virtual void InitHwDes(const SDmaDesHdr& aHdr, TUint32 aSrc, TUint32 aDest, TInt aCount,
- 						   TUint aFlags, TUint32 aPslInfo, TUint32 aCookie);
+	virtual void Transfer(const TDmaChannel& aChannel, const SDmaDesHdr& aHdr);
+	virtual TInt InitHwDes(const SDmaDesHdr& aHdr, const TDmaTransferArgs& aTransferArgs);
 	virtual void ChainHwDes(const SDmaDesHdr& aHdr, const SDmaDesHdr& aNextHdr);
 	virtual void AppendHwDes(const TDmaChannel& aChannel, const SDmaDesHdr& aLastHdr,
 							 const SDmaDesHdr& aNewHdr);
@@ -140,15 +167,16 @@
 	TTemplateSgChannel iChannels[KChannelCount];
 	};
 
+
 static TTemplateDmac Controller;
 
+
 const TDmac::SCreateInfo TTemplateDmac::KInfo =
 	{
-	KChannelCount,
-	KDesCount,
-	TDmac::KCapsBitHwDes,
-	sizeof(TDmaDesc),
-	EMapAttrSupRw | EMapAttrFullyBlocking
+	ETrue,													// iCapsHwDes
+	KDesCount,												// iDesCount
+	sizeof(TDmaDesc),										// iDesSize
+	EMapAttrSupRw | EMapAttrFullyBlocking					// iDesChunkAttribs
 	};
 
 
@@ -173,7 +201,7 @@
 			{
 			TDmaDesc* pD = HdrToHwDes(*iFreeHdr);
 			iChannels[i].iTmpDes = pD;
-			iChannels[i].iTmpDesPhysAddr = DesLinToPhys(pD);
+			iChannels[i].iTmpDesPhysAddr = HwDesLinToPhys(pD);
 			iFreeHdr = iFreeHdr->iNext;
 			}
 		r = Interrupt::Bind(EAsspIntIdDma, Isr, this);
@@ -237,9 +265,10 @@
 	}
 
 
-TInt TTemplateDmac::MaxTransferSize(TDmaChannel& /*aChannel*/, TUint /*aFlags*/, TUint32 /*aPslInfo*/)
+TUint TTemplateDmac::MaxTransferLength(TDmaChannel& /*aChannel*/, TUint /*aSrcFlags*/,
+									   TUint /*aDstFlags*/, TUint32 /*aPslInfo*/)
 //
-// Returns the maximum transfer size for a given transfer.
+// Returns the maximum transfer length in bytes for a given transfer.
 //
 	{
 	// TO DO: Determine the proper return value, based on the arguments.
@@ -249,7 +278,8 @@
 	}
 
 
-TUint TTemplateDmac::MemAlignMask(TDmaChannel& /*aChannel*/, TUint /*aFlags*/, TUint32 /*aPslInfo*/)
+TUint TTemplateDmac::AddressAlignMask(TDmaChannel& aChannel, TUint /*aSrcFlags*/,
+									  TUint /*aDstFlags*/, TUint32 /*aPslInfo*/)
 //
 // Returns the memory buffer alignment restrictions mask for a given transfer.
 //
@@ -261,12 +291,12 @@
 	}
 
 
-void TTemplateDmac::InitHwDes(const SDmaDesHdr& aHdr, TUint32 aSrc, TUint32 aDest, TInt aCount,
-							  TUint aFlags, TUint32 aPslInfo, TUint32 /*aCookie*/)
+TInt TTemplateDmac::InitHwDes(const SDmaDesHdr& aHdr, const TDmaTransferArgs& aTransferArgs)
 //
-// Sets up (from a passed in request) the descriptor with that fragment's source and destination address,
-// the fragment size, and the (driver/DMA controller) specific transfer parameters (mem/peripheral,
-// burst size, transfer width).
+// Sets up (from a passed in request) the descriptor with that fragment's
+// source and destination address, the fragment size, and the (driver/DMA
+// controller) specific transfer parameters (mem/peripheral, burst size,
+// transfer width).
 //
 	{
 	TDmaDesc* pD = HdrToHwDes(aHdr);
@@ -276,10 +306,15 @@
 	// Unaligned descriptor? Bug in generic layer!
 	__DMA_ASSERTD(IsHwDesAligned(pD));
 
-	pD->iSrcAddr = (aFlags & KDmaPhysAddrSrc) ? aSrc : Epoc::LinearToPhysical(aSrc);
-	pD->iDestAddr = (aFlags & KDmaPhysAddrDest) ? aDest : Epoc::LinearToPhysical(aDest);
-	pD->iCmd = DcmdReg(aCount, aFlags, aPslInfo);
+	const TDmaTransferConfig& src = aTransferArgs.iSrcConfig;
+	const TDmaTransferConfig& dst = aTransferArgs.iDstConfig;
+	pD->iSrcAddr  = (src.iFlags & KDmaPhysAddr) ? src.iAddr : Epoc::LinearToPhysical(src.iAddr);
+	pD->iDestAddr = (dst.iFlags & KDmaPhysAddr) ? dst.iAddr : Epoc::LinearToPhysical(dst.iAddr);
+	pD->iCmd = DmaCmdReg(aTransferArgs.iTransferCount, aTransferArgs.iFlags,
+					   src.iPslTargetInfo, dst.iPslTargetInfo);
 	pD->iDescAddr = TDmaDesc::KStopBitMask;
+
+	return KErrNone;
 	}
 
 
@@ -299,7 +334,7 @@
 
 	// TO DO: Modify pD->iCmd so that no end-of-transfer interrupt gets raised any longer.
 
-	pD->iDescAddr = DesLinToPhys(pN);
+	pD->iDescAddr = HwDesLinToPhys(pN);
 	}
 
 
@@ -319,7 +354,7 @@
 	// Unaligned descriptor? Bug in generic layer!
 	__DMA_ASSERTD(IsHwDesAligned(pL) && IsHwDesAligned(pN));
 
-	TPhysAddr newPhys = DesLinToPhys(pN);
+	TPhysAddr newPhys = HwDesLinToPhys(pN);
 
 	const TInt irq = NKern::DisableAllInterrupts();
 	StopTransfer(aChannel);
@@ -363,7 +398,7 @@
 
 	// TO DO: Implement the behaviour described above, call HandleIsr().
 
-	HandleIsr(me.iChannels[5], 0);							// Example
+	HandleIsr(me.iChannels[5], EDmaCallbackRequestCompletion, ETrue); // Example
 
 	}
 
@@ -381,7 +416,7 @@
 // Channel Opening/Closing (Channel Allocator)
 //////////////////////////////////////////////////////////////////////////////
 
-TDmaChannel* DmaChannelMgr::Open(TUint32 aOpenId)
+TDmaChannel* DmaChannelMgr::Open(TUint32 aOpenId, TBool /*aDynChannel*/, TUint /*aPriority*/)
 //
 //
 //
@@ -392,7 +427,9 @@
 
 	TDmaChannel* pC = Controller.iChannels + aOpenId;
 	if (pC->IsOpened())
+		{
 		pC = NULL;
+		}
 	else
 		{
 		pC->iController = &Controller;
@@ -403,7 +440,7 @@
 	}
 
 
-void DmaChannelMgr::Close(TDmaChannel* /* aChannel */)
+void DmaChannelMgr::Close(TDmaChannel* /*aChannel*/)
 //
 //
 //
@@ -412,7 +449,7 @@
 	}
 
 
-TInt DmaChannelMgr::StaticExtension(TInt /* aCmd */, TAny* /* aArg */)
+TInt DmaChannelMgr::StaticExtension(TInt /*aCmd*/, TAny* /*aArg*/)
 //
 //
 //
@@ -432,5 +469,10 @@
 	{
 	__KTRACE_OPT2(KBOOT, KDMA, Kern::Printf("Starting DMA Extension"));
 
+	const TInt r = DmaChannelMgr::Initialise();
+	if (r != KErrNone)
+		{
+		return r;
+		}
 	return Controller.Create();
 	}

--- a/kernel/eka/bld.inf	Thu Jan 07 13:38:45 2010 +0200
+++ b/kernel/eka/bld.inf	Mon Jan 18 21:31:10 2010 +0200
@@ -201,7 +201,14 @@
 include/drivers/ethernet.h						SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(drivers/)
 include/drivers/ethernet.inl					SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(drivers/)
 include/drivers/dma.h							SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(drivers/)
-include/drivers/dma.inl							SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(drivers/)
+include/drivers/dma_v1.h						SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(drivers/)
+include/drivers/dma_v1.inl						SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(drivers/)
+include/drivers/dma_v2.h						SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(drivers/)
+include/drivers/dma_v2.inl						SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(drivers/)
+include/drivers/dmadefs.h						SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(drivers/)
+include/drivers/dma_compat.inl					SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(drivers/)
+include/drivers/dma_hai.h						SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(drivers/)
+include/drivers/dma_hai.inl						SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(drivers/)
 include/drivers/iic.h							SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(drivers/)
 include/drivers/iic.inl							SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(drivers/)
 include/drivers/iic_channel.h					SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(drivers/)
@@ -340,6 +347,7 @@
 include/d32soundsc.inl							SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(d32soundsc.inl)
 include/e32msgqueue.h							SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(e32msgqueue.h)
 include/e32msgqueue.inl							SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(e32msgqueue.inl)
+include/d32public.h								SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(d32public.h)
 include/d32usbcshared.h							SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(d32usbcshared.h)
 include/d32usbcshared.inl						SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(d32usbcshared.inl)
 include/d32usbcsc.h								SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(d32usbcsc.h)

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/kernel/eka/bmarm/dma2u.def	Mon Jan 18 21:31:10 2010 +0200
@@ -0,0 +1,45 @@
+EXPORTS
+	__18TDmaTransferConfigUlUiUiUiiiUiUi13TDmaBurstSizeUiUii @ 1 NONAME ; TDmaTransferConfig::TDmaTransferConfig(unsigned long, unsigned int, unsigned int, unsigned int, int, int, unsigned int, unsigned int, TDmaBurstSize, unsigned int, unsigned int, int)
+	CancelAll__11TDmaChannel @ 2 NONAME R3UNUSED ; TDmaChannel::CancelAll(void)
+	Close__11TDmaChannel @ 3 NONAME R3UNUSED ; TDmaChannel::Close(void)
+	DisableDstElementCounting__11DDmaRequest @ 4 NONAME R3UNUSED ; DDmaRequest::DisableDstElementCounting(void)
+	DisableSrcElementCounting__11DDmaRequest @ 5 NONAME R3UNUSED ; DDmaRequest::DisableSrcElementCounting(void)
+	DmaTestInfoV2__Fv @ 6 NONAME R3UNUSED ; DmaTestInfoV2(void)
+	DmaTestInfo__Fv @ 7 NONAME R3UNUSED ; DmaTestInfo(void)
+	DmacCaps__11TDmaChannel @ 8 NONAME R3UNUSED ; TDmaChannel::DmacCaps(void)
+	DstFragmentCount__11DDmaRequest @ 9 NONAME R3UNUSED ; DDmaRequest::DstFragmentCount(void)
+	EnableDstElementCounting__11DDmaRequesti @ 10 NONAME R3UNUSED ; DDmaRequest::EnableDstElementCounting(int)
+	EnableSrcElementCounting__11DDmaRequesti @ 11 NONAME R3UNUSED ; DDmaRequest::EnableSrcElementCounting(int)
+	ExpandDesList__11DDmaRequesti @ 12 NONAME R3UNUSED ; DDmaRequest::ExpandDesList(int)
+	ExpandDstDesList__11DDmaRequesti @ 13 NONAME R3UNUSED ; DDmaRequest::ExpandDstDesList(int)
+	ExpandSrcDesList__11DDmaRequesti @ 14 NONAME R3UNUSED ; DDmaRequest::ExpandSrcDesList(int)
+	Extension__11TDmaChanneliPv @ 15 NONAME R3UNUSED ; TDmaChannel::Extension(int, void *)
+	FailNext__11TDmaChanneli @ 16 NONAME R3UNUSED ; TDmaChannel::FailNext(int)
+	FragmentCount__11DDmaRequest @ 17 NONAME R3UNUSED ; DDmaRequest::FragmentCount(void)
+	Fragment__11DDmaRequestRC16TDmaTransferArgs @ 18 NONAME R3UNUSED ; DDmaRequest::Fragment(TDmaTransferArgs const &)
+	Fragment__11DDmaRequestUlUliUiUl @ 19 NONAME ; DDmaRequest::Fragment(unsigned long, unsigned long, int, unsigned int, unsigned long)
+	FreeDesList__11DDmaRequest @ 20 NONAME R3UNUSED ; DDmaRequest::FreeDesList(void)
+	FreeDstDesList__11DDmaRequest @ 21 NONAME R3UNUSED ; DDmaRequest::FreeDstDesList(void)
+	FreeSrcDesList__11DDmaRequest @ 22 NONAME R3UNUSED ; DDmaRequest::FreeSrcDesList(void)
+	IsrRedoRequest__11TDmaChannelUlUlUiUli @ 23 NONAME ; TDmaChannel::IsrRedoRequest(unsigned long, unsigned long, unsigned int, unsigned long, int)
+	LinkToChannel__11TDmaChannelP11TDmaChannel @ 24 NONAME R3UNUSED ; TDmaChannel::LinkToChannel(TDmaChannel *)
+	MaxTransferLength__11TDmaChannelUiUiUl @ 25 NONAME ; TDmaChannel::MaxTransferLength(unsigned int, unsigned int, unsigned long)
+	MissNextInterrupts__11TDmaChanneli @ 26 NONAME R3UNUSED ; TDmaChannel::MissNextInterrupts(int)
+	Open__11TDmaChannelRCQ211TDmaChannel11SCreateInfoRP11TDmaChannel @ 27 NONAME R3UNUSED ; TDmaChannel::Open(TDmaChannel::SCreateInfo const &, TDmaChannel *&)
+	Pause__11TDmaChannel @ 28 NONAME R3UNUSED ; TDmaChannel::Pause(void)
+	Queue__11DDmaRequest @ 29 NONAME R3UNUSED ; DDmaRequest::Queue(void)
+	Resume__11TDmaChannel @ 30 NONAME R3UNUSED ; TDmaChannel::Resume(void)
+	SrcFragmentCount__11DDmaRequest @ 31 NONAME R3UNUSED ; DDmaRequest::SrcFragmentCount(void)
+	StaticExtension__11TDmaChanneliPv @ 32 NONAME R3UNUSED ; TDmaChannel::StaticExtension(int, void *)
+	TotalNumDstElementsTransferred__11DDmaRequest @ 33 NONAME R3UNUSED ; DDmaRequest::TotalNumDstElementsTransferred(void)
+	TotalNumSrcElementsTransferred__11DDmaRequest @ 34 NONAME R3UNUSED ; DDmaRequest::TotalNumSrcElementsTransferred(void)
+	"_._11DDmaRequest" @ 35 NONAME R3UNUSED ; DDmaRequest::~DDmaRequest(void)
+	__11DDmaRequestR11TDmaChannelPFQ211DDmaRequest7TResultPv_vPvi @ 36 NONAME ; DDmaRequest::DDmaRequest(TDmaChannel &, void (*)(DDmaRequest::TResult, void *), void *, int)
+	__11DDmaRequestR11TDmaChannelPFUi10TDmaResultPvP10SDmaDesHdr_vPvUi @ 37 NONAME ; DDmaRequest::DDmaRequest(TDmaChannel &, void (*)(unsigned int, TDmaResult, void *, SDmaDesHdr *), void *, unsigned int)
+	__16TDmaTransferArgs @ 38 NONAME R3UNUSED ; TDmaTransferArgs::TDmaTransferArgs(void)
+	__16TDmaTransferArgsRC18TDmaTransferConfigT1UlUiUi15TDmaGraphicsOpsUl @ 39 NONAME ; TDmaTransferArgs::TDmaTransferArgs(TDmaTransferConfig const &, TDmaTransferConfig const &, unsigned long, unsigned int, unsigned int, TDmaGraphicsOps, unsigned long)
+	__16TDmaTransferArgsUiUiUiUiUiUi12TDmaAddrModeUiUi13TDmaBurstSizeUi15TDmaGraphicsOpsUl @ 40 NONAME ; TDmaTransferArgs::TDmaTransferArgs(unsigned int, unsigned int, unsigned int, unsigned int, unsigned int, unsigned int, TDmaAddrMode, unsigned int, unsigned int, TDmaBurstSize, unsigned int, TDmaGraphicsOps, unsigned long)
+	__18TDmaTransferConfig @ 41 NONAME R3UNUSED ; TDmaTransferConfig::TDmaTransferConfig(void)
+	__18TDmaTransferConfigUlUi12TDmaAddrModeUi13TDmaBurstSizeUiUiUii @ 42 NONAME ; TDmaTransferConfig::TDmaTransferConfig(unsigned long, unsigned int, TDmaAddrMode, unsigned int, TDmaBurstSize, unsigned int, unsigned int, unsigned int, int)
+	AddressAlignMask__11TDmaChannelUiUiUl @ 43 NONAME ; TDmaChannel::AddressAlignMask(unsigned int, unsigned int, unsigned long)
+

--- a/kernel/eka/compsupp/bld.inf	Thu Jan 07 13:38:45 2010 +0200
+++ b/kernel/eka/compsupp/bld.inf	Mon Jan 18 21:31:10 2010 +0200
@@ -1,21 +1,19 @@
-/*
-* Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* 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: 
-* Compiler runtime support.
-*
-*/
-
+// Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of the License "ARM EABI LICENCE.txt"
+// which accompanies this distribution, and is available
+// in kernel/eka/compsupp.
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+// Compiler runtime support.
+// 
+//
 
 PRJ_PLATFORMS
 

--- a/kernel/eka/compsupp/compsupp.iby	Thu Jan 07 13:38:45 2010 +0200
+++ b/kernel/eka/compsupp/compsupp.iby	Mon Jan 18 21:31:10 2010 +0200
@@ -1,21 +1,21 @@
-/*
-* 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 the License "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: 
-* This file contains the compiler's run-time support libraries.
-*
-*/
+// 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 the License "ARM EABI LICENCE.txt"
+// which accompanies this distribution, and is available
+// in kernel/eka/compsupp.
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+// This file contains the compiler's run-time support libraries.
+// 
+//
 
+// Make the file acceptable to "e32/rombuild/rom.bat."
 #if defined(COMPSUPP_DIR) && defined(BUILD)
 #   define ABI_DIR      \Epoc32\Release\##COMPSUPP_DIR
 #   define DEBUG_DIR    BUILD

--- a/kernel/eka/compsupp/gcce/gcce.h	Thu Jan 07 13:38:45 2010 +0200
+++ b/kernel/eka/compsupp/gcce/gcce.h	Mon Jan 18 21:31:10 2010 +0200
@@ -1,23 +1,21 @@
-/*
-* Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* 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: 
-* e32\compsupp\gcce\gcce.h
-* This is the preinclude file for the GCC-E compiler
-* It contains all the compiler specific definitions required by the SOS source
-*
-*/
-
+// Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of the License "ARM EABI LICENCE.txt"
+// which accompanies this distribution, and is available
+// in kernel/eka/compsupp.
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+// e32\compsupp\gcce\gcce.h
+// This is the preinclude file for the GCC-E compiler
+// It contains all the compiler specific definitions required by the SOS source
+// 
+//
 
 /**
  @file

--- a/kernel/eka/compsupp/rvct.h	Thu Jan 07 13:38:45 2010 +0200
+++ b/kernel/eka/compsupp/rvct.h	Mon Jan 18 21:31:10 2010 +0200
@@ -1,22 +1,20 @@
-/*
-* 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 the License "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: 
-* This is the preinclude file for the RVCT compiler. It contains all the compiler
-* specific definitions required by the Symbian OS source code.
-*
-*/
-
+// 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 the License "ARM EABI LICENCE.txt"
+// which accompanies this distribution, and is available
+// in kernel/eka/compsupp.
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+// This is the preinclude file for the RVCT compiler. It contains all the compiler
+// specific definitions required by the Symbian OS source code.
+// 
+//
 
 /**
  @file

--- a/kernel/eka/compsupp/rvct/aeabidiv0.cpp	Thu Jan 07 13:38:45 2010 +0200
+++ b/kernel/eka/compsupp/rvct/aeabidiv0.cpp	Mon Jan 18 21:31:10 2010 +0200
@@ -1,21 +1,19 @@
-/*
-* 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 the License "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: 
-* This file is part of drtaeabi.dll.
-*
-*/
-
+// 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 the License "ARM EABI LICENCE.txt"
+// which accompanies this distribution, and is available
+// in kernel/eka/compsupp.
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+// This file is part of drtaeabi.dll.
+// 
+//
 
 #include <e32std.h>
 

--- a/kernel/eka/compsupp/rvct/aeabimem.cpp	Thu Jan 07 13:38:45 2010 +0200
+++ b/kernel/eka/compsupp/rvct/aeabimem.cpp	Mon Jan 18 21:31:10 2010 +0200
@@ -1,21 +1,19 @@
-/*
-* 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 the License "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: 
-* This file is part of drtaeabi.dll.
-*
-*/
-
+// 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 the License "ARM EABI LICENCE.txt"
+// which accompanies this distribution, and is available
+// in kernel/eka/compsupp.
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+// This file is part of drtaeabi.dll.
+// 
+//
 
 #include <e32cmn.h>
 

--- a/kernel/eka/compsupp/rvct/call_via_rx/r0.cpp	Thu Jan 07 13:38:45 2010 +0200
+++ b/kernel/eka/compsupp/rvct/call_via_rx/r0.cpp	Mon Jan 18 21:31:10 2010 +0200
@@ -1,21 +1,19 @@
-/*
-* 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 the License "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: 
-* This file is part of usrt.lib and ksrt.lib.
-*
-*/
-
+// 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 the License "ARM EABI LICENCE.txt"
+// which accompanies this distribution, and is available
+// in kernel/eka/compsupp.
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+// This file is part of usrt.lib and ksrt.lib.
+// 
+//
 
 extern "C"
 {       

--- a/kernel/eka/compsupp/rvct/call_via_rx/r1.cpp	Thu Jan 07 13:38:45 2010 +0200
+++ b/kernel/eka/compsupp/rvct/call_via_rx/r1.cpp	Mon Jan 18 21:31:10 2010 +0200
@@ -1,21 +1,19 @@
-/*
-* 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 the License "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: 
-* This file is part of usrt.lib and ksrt.lib.
-*
-*/
-
+// 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 the License "ARM EABI LICENCE.txt"
+// which accompanies this distribution, and is available
+// in kernel/eka/compsupp.
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+// This file is part of usrt.lib and ksrt.lib.
+// 
+//
 
 extern "C"
 {       

--- a/kernel/eka/compsupp/rvct/call_via_rx/r2.cpp	Thu Jan 07 13:38:45 2010 +0200
+++ b/kernel/eka/compsupp/rvct/call_via_rx/r2.cpp	Mon Jan 18 21:31:10 2010 +0200
@@ -1,21 +1,19 @@
-/*
-* 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 the License "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: 
-* This file is part of usrt.lib and ksrt.lib.
-*
-*/
-
+// 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 the License "ARM EABI LICENCE.txt"
+// which accompanies this distribution, and is available
+// in kernel/eka/compsupp.
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+// This file is part of usrt.lib and ksrt.lib.
+// 
+//
 
 extern "C"
 {       

--- a/kernel/eka/compsupp/rvct/call_via_rx/r3.cpp	Thu Jan 07 13:38:45 2010 +0200
+++ b/kernel/eka/compsupp/rvct/call_via_rx/r3.cpp	Mon Jan 18 21:31:10 2010 +0200
@@ -1,21 +1,19 @@
-/*
-* 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 the License "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: 
-* This file is part of usrt.lib and ksrt.lib.
-*
-*/
-
+// 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 the License "ARM EABI LICENCE.txt"
+// which accompanies this distribution, and is available
+// in kernel/eka/compsupp.
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+// This file is part of usrt.lib and ksrt.lib.
+// 
+//
 
 extern "C"
 {       

--- a/kernel/eka/compsupp/rvct/call_via_rx/r4.cpp	Thu Jan 07 13:38:45 2010 +0200
+++ b/kernel/eka/compsupp/rvct/call_via_rx/r4.cpp	Mon Jan 18 21:31:10 2010 +0200
@@ -1,21 +1,19 @@
-/*
-* 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 the License "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: 
-* This file is part of usrt.lib and ksrt.lib.
-*
-*/
-
+// 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 the License "ARM EABI LICENCE.txt"
+// which accompanies this distribution, and is available
+// in kernel/eka/compsupp.
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+// This file is part of usrt.lib and ksrt.lib.
+// 
+//
 
 extern "C"
 {       

--- a/kernel/eka/compsupp/rvct/call_via_rx/r5.cpp	Thu Jan 07 13:38:45 2010 +0200
+++ b/kernel/eka/compsupp/rvct/call_via_rx/r5.cpp	Mon Jan 18 21:31:10 2010 +0200
@@ -1,21 +1,19 @@
-/*
-* 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 the License "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: 
-* This file is part of usrt.lib and ksrt.lib.
-*
-*/
-
+// 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 the License "ARM EABI LICENCE.txt"
+// which accompanies this distribution, and is available
+// in kernel/eka/compsupp.
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+// This file is part of usrt.lib and ksrt.lib.
+// 
+//
 
 extern "C"
 {       

--- a/kernel/eka/compsupp/rvct/call_via_rx/r6.cpp	Thu Jan 07 13:38:45 2010 +0200
+++ b/kernel/eka/compsupp/rvct/call_via_rx/r6.cpp	Mon Jan 18 21:31:10 2010 +0200
@@ -1,21 +1,19 @@
-/*
-* 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 the License "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: 
-* This file is part of usrt.lib and ksrt.lib.
-*
-*/
-
+// 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 the License "ARM EABI LICENCE.txt"
+// which accompanies this distribution, and is available
+// in kernel/eka/compsupp.
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+// This file is part of usrt.lib and ksrt.lib.
+// 
+//
 
 extern "C"
 {       

--- a/kernel/eka/compsupp/rvct/call_via_rx/r7.cpp	Thu Jan 07 13:38:45 2010 +0200
+++ b/kernel/eka/compsupp/rvct/call_via_rx/r7.cpp	Mon Jan 18 21:31:10 2010 +0200
@@ -1,21 +1,19 @@
-/*
-* 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 the License "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: 
-* This file is part of usrt.lib and ksrt.lib.
-*
-*/
-
+// 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 the License "ARM EABI LICENCE.txt"
+// which accompanies this distribution, and is available
+// in kernel/eka/compsupp.
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+// This file is part of usrt.lib and ksrt.lib.
+// 
+//
 
 extern "C"
 {       

--- a/kernel/eka/compsupp/rvct/dfpaeabi.mmp	Thu Jan 07 13:38:45 2010 +0200
+++ b/kernel/eka/compsupp/rvct/dfpaeabi.mmp	Mon Jan 18 21:31:10 2010 +0200
@@ -1,20 +1,17 @@
-/*
-* 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 the License "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: 
-*
-*/
-
+// 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 the License "ARM EABI LICENCE.txt"
+// which accompanies this distribution, and is available
+// in kernel/eka/compsupp.
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
 
 #include "dfpaeabi_common.mmh"
 
@@ -22,7 +19,7 @@
 target          dfpaeabi.dll
 
 start armcc
-    #if defined(ARMCC_3_1)
+    #if defined(ARMCC_3_1) || defined(ARMCC_4_0)
     ARMLIBS     fj_5s.l
 
     #else

--- a/kernel/eka/compsupp/rvct/dfpaeabi_common.mmh	Thu Jan 07 13:38:45 2010 +0200
+++ b/kernel/eka/compsupp/rvct/dfpaeabi_common.mmh	Mon Jan 18 21:31:10 2010 +0200
@@ -1,20 +1,17 @@
-/*
-* 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 the License "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: 
-*
-*/
-
+// 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 the License "ARM EABI LICENCE.txt"
+// which accompanies this distribution, and is available
+// in kernel/eka/compsupp.
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
 
 targettype      dll
 
@@ -26,7 +23,7 @@
     armrt
     arminc
 
-    #if defined(ARMCC_3_1)
+    #if defined(ARMCC_3_1) || defined(ARMCC_4_0)
     armlibs     c_5.l
 
     #else

--- a/kernel/eka/compsupp/rvct/dfpaeabi_vfpv2.mmp	Thu Jan 07 13:38:45 2010 +0200
+++ b/kernel/eka/compsupp/rvct/dfpaeabi_vfpv2.mmp	Mon Jan 18 21:31:10 2010 +0200
@@ -1,20 +1,17 @@
-/*
-* 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 the License "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: 
-*
-*/
-
+// 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 the License "ARM EABI LICENCE.txt"
+// which accompanies this distribution, and is available
+// in kernel/eka/compsupp.
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
 
 #include "dfpaeabi_common.mmh"
 
@@ -24,7 +21,7 @@
 noexportlibrary
 
 start armcc
-    #if defined (ARMCC_3_1)
+    #if defined (ARMCC_3_1) || defined(ARMCC_4_0)
     armlibs     fj_5v.l
 
     #else

--- a/kernel/eka/compsupp/rvct/dfprvct-thunk.cpp	Thu Jan 07 13:38:45 2010 +0200
+++ b/kernel/eka/compsupp/rvct/dfprvct-thunk.cpp	Mon Jan 18 21:31:10 2010 +0200
@@ -1,20 +1,20 @@
-/*
-* Copyright (c) 2004-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* 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: 
-*
-*/
+// Copyright (c) 2004-2009 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of the License "ARM EABI LICENCE.txt"
+// which accompanies this distribution, and is available
+// in kernel/eka/compsupp.
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
 
+// This file is part of dfprvct-thunk.dll.
+//
 
 
 extern "C"

--- a/kernel/eka/compsupp/rvct/dfprvct-thunk.mmp	Thu Jan 07 13:38:45 2010 +0200
+++ b/kernel/eka/compsupp/rvct/dfprvct-thunk.mmp	Mon Jan 18 21:31:10 2010 +0200
@@ -1,20 +1,18 @@
-/*
-* Copyright (c) 2004-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* 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: 
-*
-*/
-
+// Copyright (c) 2004-2009 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of the License "ARM EABI LICENCE.txt"
+// which accompanies this distribution, and is available
+// in kernel/eka/compsupp.
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+// 
+//
 
 target 			dfprvct-thunk.dll
 targettype		dll

--- a/kernel/eka/compsupp/rvct/dfprvct.cpp	Thu Jan 07 13:38:45 2010 +0200
+++ b/kernel/eka/compsupp/rvct/dfprvct.cpp	Mon Jan 18 21:31:10 2010 +0200
@@ -1,21 +1,18 @@
-/*
-* 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 the License "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: 
-* This file is part of dfprvct.dll.
-*
-*/
-
+// 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 the License "ARM EABI LICENCE.txt"
+// which accompanies this distribution, and is available
+// in kernel/eka/compsupp.
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+// This file is part of dfprvct.dll.
+//
 
 #if __ARMCC_VERSION > 300000
 

--- a/kernel/eka/compsupp/rvct/dfprvct.mmp	Thu Jan 07 13:38:45 2010 +0200
+++ b/kernel/eka/compsupp/rvct/dfprvct.mmp	Mon Jan 18 21:31:10 2010 +0200
@@ -1,20 +1,17 @@
-/*
-* 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 the License "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: 
-*
-*/
-
+// 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 the License "ARM EABI LICENCE.txt"
+// which accompanies this distribution, and is available
+// in kernel/eka/compsupp.
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
 
 #include "dfprvct_common.mmh"
 

--- a/kernel/eka/compsupp/rvct/dfprvct_common.mmh	Thu Jan 07 13:38:45 2010 +0200
+++ b/kernel/eka/compsupp/rvct/dfprvct_common.mmh	Mon Jan 18 21:31:10 2010 +0200
@@ -1,20 +1,17 @@
-/*
-* 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 the License "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: 
-*
-*/
-
+// 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 the License "ARM EABI LICENCE.txt"
+// which accompanies this distribution, and is available
+// in kernel/eka/compsupp.
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
 
 
 targettype      dll

--- a/kernel/eka/compsupp/rvct/dfprvct_vfpv2.mmp	Thu Jan 07 13:38:45 2010 +0200
+++ b/kernel/eka/compsupp/rvct/dfprvct_vfpv2.mmp	Mon Jan 18 21:31:10 2010 +0200
@@ -1,20 +1,17 @@
-/*
-* 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 the License "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: 
-*
-*/
-
+// 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 the License "ARM EABI LICENCE.txt"
+// which accompanies this distribution, and is available
+// in kernel/eka/compsupp.
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
 
 #include "dfprvct_common.mmh"
 

--- a/kernel/eka/compsupp/rvct/dllexp.cpp	Thu Jan 07 13:38:45 2010 +0200
+++ b/kernel/eka/compsupp/rvct/dllexp.cpp	Mon Jan 18 21:31:10 2010 +0200
@@ -1,21 +1,19 @@
-/*
-* 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 the License "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: 
-* This file is part of usrt.lib and ksrt.lib.
-*
-*/
-
+// 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 the License "ARM EABI LICENCE.txt"
+// which accompanies this distribution, and is available
+// in kernel/eka/compsupp.
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+// This file is part of usrt.lib and ksrt.lib.
+// 
+//
 
 
 extern "C" void __DLL_Export_Table__() { }  // This function (and the whole file)

--- a/kernel/eka/compsupp/rvct/drtaeabi.cpp	Thu Jan 07 13:38:45 2010 +0200
+++ b/kernel/eka/compsupp/rvct/drtaeabi.cpp	Mon Jan 18 21:31:10 2010 +0200
@@ -1,21 +1,19 @@
-/*
-* 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 the License "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: 
-* This file is part of drtaeabi.dll.
-*
-*/
-
+// 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 the License "ARM EABI LICENCE.txt"
+// which accompanies this distribution, and is available
+// in kernel/eka/compsupp.
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+// This file is part of drtaeabi.dll.
+// 
+//
 
 
 #include <e32std.h>

--- a/kernel/eka/compsupp/rvct/drtaeabi.mmp	Thu Jan 07 13:38:45 2010 +0200
+++ b/kernel/eka/compsupp/rvct/drtaeabi.mmp	Mon Jan 18 21:31:10 2010 +0200
@@ -1,20 +1,17 @@
-/*
-* 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 the License "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: 
-*
-*/
-
+// 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 the License "ARM EABI LICENCE.txt"
+// which accompanies this distribution, and is available
+// in kernel/eka/compsupp.
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
 
 target          drtaeabi.dll
 targettype      dll
@@ -38,7 +35,7 @@
     armrt
     arminc
 
-    #if defined(ARMCC_3_1)
+    #if defined(ARMCC_3_1) || defined(ARMCC_4_0)
     armlibs     c_5.l cpprt_5.l h_5.l
 
     #elif defined(ARMCC_2_2)

--- a/kernel/eka/compsupp/rvct/drtrvct.mmp	Thu Jan 07 13:38:45 2010 +0200
+++ b/kernel/eka/compsupp/rvct/drtrvct.mmp	Mon Jan 18 21:31:10 2010 +0200
@@ -1,20 +1,17 @@
-/*
-* 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 the License "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: 
-*
-*/
-
+// 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 the License "ARM EABI LICENCE.txt"
+// which accompanies this distribution, and is available
+// in kernel/eka/compsupp.
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
 
 #include "drtrvct_common.mmh"
 

--- a/kernel/eka/compsupp/rvct/drtrvct_common.mmh	Thu Jan 07 13:38:45 2010 +0200
+++ b/kernel/eka/compsupp/rvct/drtrvct_common.mmh	Mon Jan 18 21:31:10 2010 +0200
@@ -1,20 +1,17 @@
-/*
-* 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 the License "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: 
-*
-*/
-
+// 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 the License "ARM EABI LICENCE.txt"
+// which accompanies this distribution, and is available
+// in kernel/eka/compsupp.
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
 
 targettype      dll
 

--- a/kernel/eka/compsupp/rvct/drtrvct_vfpv2.mmp	Thu Jan 07 13:38:45 2010 +0200
+++ b/kernel/eka/compsupp/rvct/drtrvct_vfpv2.mmp	Mon Jan 18 21:31:10 2010 +0200
@@ -1,20 +1,17 @@
-/*
-* 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 the License "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: 
-*
-*/
-
+// 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 the License "ARM EABI LICENCE.txt"
+// which accompanies this distribution, and is available
+// in kernel/eka/compsupp.
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
 
 #include "drtrvct_common.mmh"
 

--- a/kernel/eka/compsupp/rvct/ksrt.mmp	Thu Jan 07 13:38:45 2010 +0200
+++ b/kernel/eka/compsupp/rvct/ksrt.mmp	Mon Jan 18 21:31:10 2010 +0200
@@ -1,20 +1,17 @@
-/*
-* 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 the License "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: 
-*
-*/
-
+// 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 the License "ARM EABI LICENCE.txt"
+// which accompanies this distribution, and is available
+// in kernel/eka/compsupp.
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
 
 #if defined(ARMCC_2_2)
 target          ksrt2_2.lib

--- a/kernel/eka/compsupp/rvct/no_extras.cpp	Thu Jan 07 13:38:45 2010 +0200
+++ b/kernel/eka/compsupp/rvct/no_extras.cpp	Mon Jan 18 21:31:10 2010 +0200
@@ -1,22 +1,20 @@
-/*
-* 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 the License "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: 
-* This file is part of all compsupp DLLs. It makes the linker issue an error
-* message if semihosting or heap functions get pulled in from RVCT's libraries.
-*
-*/
-
+// 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 the License "ARM EABI LICENCE.txt"
+// which accompanies this distribution, and is available
+// in kernel/eka/compsupp.
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+// This file is part of all compsupp DLLs. It makes the linker issue an error
+// message if semihosting or heap functions get pulled in from RVCT's libraries.
+// 
+//
 
 #if __ARMCC_VERSION > 300000
 #pragma import(__use_no_semihosting)

--- a/kernel/eka/compsupp/rvct/rtabort.cpp	Thu Jan 07 13:38:45 2010 +0200
+++ b/kernel/eka/compsupp/rvct/rtabort.cpp	Mon Jan 18 21:31:10 2010 +0200
@@ -1,21 +1,19 @@
-/*
-* 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 the License "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: 
-* This file is part of drtrvct.dll and drtrvct_vfpv2.dll
-*
-*/
-
+// 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 the License "ARM EABI LICENCE.txt"
+// which accompanies this distribution, and is available
+// in kernel/eka/compsupp.
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+// This file is part of drtrvct.dll and drtrvct_vfpv2.dll
+// 
+//
 
 #include <e32std.h>
 

--- a/kernel/eka/compsupp/rvct/rtdiv0.cpp	Thu Jan 07 13:38:45 2010 +0200
+++ b/kernel/eka/compsupp/rvct/rtdiv0.cpp	Mon Jan 18 21:31:10 2010 +0200
@@ -1,21 +1,19 @@
-/*
-* 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 the License "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: 
-* This file is part of drtrvct.dll and drtrvct_vfpv2.dll.
-*
-*/
-
+// 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 the License "ARM EABI LICENCE.txt"
+// which accompanies this distribution, and is available
+// in kernel/eka/compsupp.
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+// This file is part of drtrvct.dll and drtrvct_vfpv2.dll.
+// 
+//
 
 #include <e32std.h>
 

--- a/kernel/eka/compsupp/rvct/rtexit.cpp	Thu Jan 07 13:38:45 2010 +0200
+++ b/kernel/eka/compsupp/rvct/rtexit.cpp	Mon Jan 18 21:31:10 2010 +0200
@@ -1,21 +1,19 @@
-/*
-* 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 the License "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: 
-* This file is part of drtrvct.dll and drtrvct_vfpv2.dll
-*
-*/
-
+// 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 the License "ARM EABI LICENCE.txt"
+// which accompanies this distribution, and is available
+// in kernel/eka/compsupp.
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+// This file is part of drtrvct.dll and drtrvct_vfpv2.dll
+// 
+//
 
 #include <e32std.h>
 

--- a/kernel/eka/compsupp/rvct/rtlib.cpp	Thu Jan 07 13:38:45 2010 +0200
+++ b/kernel/eka/compsupp/rvct/rtlib.cpp	Mon Jan 18 21:31:10 2010 +0200
@@ -1,21 +1,18 @@
-/*
-* Copyright (c) 2002-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* 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: 
-* This file is part of drtrvct.dll and drtrvct_vfpv2.dll.
-*
-*/
-
+// Copyright (c) 2002-2009 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of the License "ARM EABI LICENCE.txt"
+// which accompanies this distribution, and is available
+// in kernel/eka/compsupp.
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+// This file is part of drtrvct.dll and drtrvct_vfpv2.dll.
+//
 
 #include <e32std.h>
 

--- a/kernel/eka/compsupp/rvct/rtraise.cpp	Thu Jan 07 13:38:45 2010 +0200
+++ b/kernel/eka/compsupp/rvct/rtraise.cpp	Mon Jan 18 21:31:10 2010 +0200
@@ -1,21 +1,19 @@
-/*
-* 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 the License "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: 
-* This file is part of drtrvct.dll and drtrvct_vfpv2.dll.
-*
-*/
-
+// 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 the License "ARM EABI LICENCE.txt"
+// which accompanies this distribution, and is available
+// in kernel/eka/compsupp.
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+// This file is part of drtrvct.dll and drtrvct_vfpv2.dll.
+// 
+//
 
 #include <e32std.h>
 #include <signal.h> // Will be found among RVCT's header files.

--- a/kernel/eka/compsupp/rvct/sftfpini.cpp	Thu Jan 07 13:38:45 2010 +0200
+++ b/kernel/eka/compsupp/rvct/sftfpini.cpp	Mon Jan 18 21:31:10 2010 +0200
@@ -1,21 +1,19 @@
-/*
-* 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 the License "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: 
-* This file is part of drtrvct.dll and drtrvct_vfpv2.dll.
-*
-*/
-
+// 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 the License "ARM EABI LICENCE.txt"
+// which accompanies this distribution, and is available
+// in kernel/eka/compsupp.
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+// This file is part of drtrvct.dll and drtrvct_vfpv2.dll.
+// 
+//
 
 #include <e32std.h>
 

--- a/kernel/eka/compsupp/rvct/type_info.cpp	Thu Jan 07 13:38:45 2010 +0200
+++ b/kernel/eka/compsupp/rvct/type_info.cpp	Mon Jan 18 21:31:10 2010 +0200
@@ -1,21 +1,19 @@
-/*
-* 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 the License "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: 
-* This file is part of drtaeabi.dll.
-*
-*/
-
+// 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 the License "ARM EABI LICENCE.txt"
+// which accompanies this distribution, and is available
+// in kernel/eka/compsupp.
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+// This file is part of drtaeabi.dll.
+// 
+//
 
 
 #include <typeinfo>

--- a/kernel/eka/compsupp/rvct/ucppfini.cpp	Thu Jan 07 13:38:45 2010 +0200
+++ b/kernel/eka/compsupp/rvct/ucppfini.cpp	Mon Jan 18 21:31:10 2010 +0200
@@ -1,21 +1,19 @@
-/*
-* 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 the License "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: 
-* This file is part of usrt.lib (but not ksrt.lib).
-*
-*/
-
+// 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 the License "ARM EABI LICENCE.txt"
+// which accompanies this distribution, and is available
+// in kernel/eka/compsupp.
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+// This file is part of usrt.lib (but not ksrt.lib).
+// 
+//
 
 
 extern "C" {

--- a/kernel/eka/compsupp/rvct/ucppinit.cpp	Thu Jan 07 13:38:45 2010 +0200
+++ b/kernel/eka/compsupp/rvct/ucppinit.cpp	Mon Jan 18 21:31:10 2010 +0200
@@ -1,21 +1,19 @@
-/*
-* 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 the License "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: 
-* This file is part of usrt.lib and ksrt.lib.
-*
-*/
-
+// 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 the License "ARM EABI LICENCE.txt"
+// which accompanies this distribution, and is available
+// in kernel/eka/compsupp.
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+// This file is part of usrt.lib and ksrt.lib.
+// 
+//
 
 
 extern "C" __asm void __cpp_initialize__aeabi_()

--- a/kernel/eka/compsupp/rvct/usrt.mmp	Thu Jan 07 13:38:45 2010 +0200
+++ b/kernel/eka/compsupp/rvct/usrt.mmp	Mon Jan 18 21:31:10 2010 +0200
@@ -1,21 +1,20 @@
-/*
-* 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 the License "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: 
-* usrt.mpp
-*
-*/
-
+// 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 the License "ARM EABI LICENCE.txt"
+// which accompanies this distribution, and is available
+// in kernel/eka/compsupp.
+//
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+// usrt.mpp
+// 
+//
 
 #if defined(ARMCC_2_2)
 target          usrt2_2.lib

--- a/kernel/eka/compsupp/rvct2_0/callviar0.cpp	Thu Jan 07 13:38:45 2010 +0200
+++ b/kernel/eka/compsupp/rvct2_0/callviar0.cpp	Mon Jan 18 21:31:10 2010 +0200
@@ -1,20 +1,17 @@
-/*
-* Copyright (c) 2002-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* 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: 
-*
-*/
-
+// Copyright (c) 2002-2009 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of the License "ARM EABI LICENCE.txt"
+// which accompanies this distribution, and is available
+// in kernel/eka/compsupp.
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
 
 extern "C"
 {		

--- a/kernel/eka/compsupp/rvct2_0/callviar1.cpp	Thu Jan 07 13:38:45 2010 +0200
+++ b/kernel/eka/compsupp/rvct2_0/callviar1.cpp	Mon Jan 18 21:31:10 2010 +0200
@@ -1,20 +1,17 @@
-/*
-* Copyright (c) 2002-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* 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: 
-*
-*/
-
+// Copyright (c) 2002-2009 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of the License "ARM EABI LICENCE.txt"
+// which accompanies this distribution, and is available
+// in kernel/eka/compsupp.
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
 
 extern "C"
 {		

--- a/kernel/eka/compsupp/rvct2_0/callviar2.cpp	Thu Jan 07 13:38:45 2010 +0200
+++ b/kernel/eka/compsupp/rvct2_0/callviar2.cpp	Mon Jan 18 21:31:10 2010 +0200
@@ -1,20 +1,17 @@
-/*
-* Copyright (c) 2002-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* 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: 
-*
-*/
-
+// Copyright (c) 2002-2009 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of the License "ARM EABI LICENCE.txt"
+// which accompanies this distribution, and is available
+// in kernel/eka/compsupp.
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
 
 extern "C"
 {		

--- a/kernel/eka/compsupp/rvct2_0/callviar3.cpp	Thu Jan 07 13:38:45 2010 +0200
+++ b/kernel/eka/compsupp/rvct2_0/callviar3.cpp	Mon Jan 18 21:31:10 2010 +0200
@@ -1,20 +1,17 @@
-/*
-* Copyright (c) 2002-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* 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: 
-*
-*/
-
+// Copyright (c) 2002-2009 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of the License "ARM EABI LICENCE.txt"
+// which accompanies this distribution, and is available
+// in kernel/eka/compsupp.
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
 
 extern "C"
 {		

--- a/kernel/eka/compsupp/rvct2_0/callviar4.cpp	Thu Jan 07 13:38:45 2010 +0200
+++ b/kernel/eka/compsupp/rvct2_0/callviar4.cpp	Mon Jan 18 21:31:10 2010 +0200
@@ -1,20 +1,17 @@
-/*
-* Copyright (c) 2002-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* 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: 
-*
-*/
-
+// Copyright (c) 2002-2009 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of the License "ARM EABI LICENCE.txt"
+// which accompanies this distribution, and is available
+// in kernel/eka/compsupp.
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
 
 extern "C"
 {