diff -r 6b1d113cdff3 -r 6638e7f4bd8f telephonyprotocols/gprsumtsqosinterface/bmarm/UMTSIFU.DEF
--- a/telephonyprotocols/gprsumtsqosinterface/bmarm/UMTSIFU.DEF	Mon May 03 13:37:20 2010 +0300
+++ b/telephonyprotocols/gprsumtsqosinterface/bmarm/UMTSIFU.DEF	Thu May 06 15:10:38 2010 +0100
@@ -1,35 +1,35 @@
-EXPORTS
-	__8TTFTInfo @ 1 NONAME R3UNUSED ; TTFTInfo::TTFTInfo(void)
-	FilterCount__8TTFTInfo @ 2 NONAME R3UNUSED ; TTFTInfo::FilterCount(void)
-	GetAccessPointName__C14TContextConfigRt5TBuf81i252 @ 3 NONAME R3UNUSED ; TContextConfig::GetAccessPointName(TBuf8<252> &) const
-	GetContextConfig__C14TContextConfigRQ214RPacketContext18TContextConfigGPRS @ 4 NONAME R3UNUSED ; TContextConfig::GetContextConfig(RPacketContext::TContextConfigGPRS &) const
-	GetPacketFilter__8TTFTInfoRQ214RPacketContext15TPacketFilterV2 @ 5 NONAME R3UNUSED ; TTFTInfo::GetPacketFilter(RPacketContext::TPacketFilterV2 &)
-	GetPdpAddress__C14TContextConfigRt5TBuf81i50 @ 6 NONAME R3UNUSED ; TContextConfig::GetPdpAddress(TBuf8<50> &) const
-	GetPdpCompression__C14TContextConfigRUi @ 7 NONAME R3UNUSED ; TContextConfig::GetPdpCompression(unsigned int &) const
-	GetPdpType__C14TContextConfigRQ214RPacketContext13TProtocolType @ 8 NONAME R3UNUSED ; TContextConfig::GetPdpType(RPacketContext::TProtocolType &) const
-	GetTFTInfo__C14TContextConfigR8TTFTInfo @ 9 NONAME R3UNUSED ; TContextConfig::GetTFTInfo(TTFTInfo &) const
-	GetUMTSQoSNeg__C14TContextConfigRQ210RPacketQoS20TQoSR99_R4Negotiated @ 10 NONAME R3UNUSED ; TContextConfig::GetUMTSQoSNeg(RPacketQoS::TQoSR99_R4Negotiated &) const
-	GetUMTSQoSReq__C14TContextConfigRQ210RPacketQoS19TQoSR99_R4Requested @ 11 NONAME R3UNUSED ; TContextConfig::GetUMTSQoSReq(RPacketQoS::TQoSR99_R4Requested &) const
-	NextPacketFilter__8TTFTInfoRQ214RPacketContext15TPacketFilterV2 @ 12 NONAME R3UNUSED ; TTFTInfo::NextPacketFilter(RPacketContext::TPacketFilterV2 &)
-	RemovePacketFilter__8TTFTInfoGQ214RPacketContext15TPacketFilterV2 @ 13 NONAME ; TTFTInfo::RemovePacketFilter(RPacketContext::TPacketFilterV2)
-	Reset__14TContextConfig @ 14 NONAME R3UNUSED ; TContextConfig::Reset(void)
-	SetAccessPointName__14TContextConfigRCt5TBuf81i252 @ 15 NONAME R3UNUSED ; TContextConfig::SetAccessPointName(TBuf8<252> const &)
-	SetContextConfig__14TContextConfigRCQ214RPacketContext18TContextConfigGPRS @ 16 NONAME R3UNUSED ; TContextConfig::SetContextConfig(RPacketContext::TContextConfigGPRS const &)
-	SetPdpAddress__14TContextConfigRCt5TBuf81i50 @ 17 NONAME R3UNUSED ; TContextConfig::SetPdpAddress(TBuf8<50> const &)
-	SetPdpCompression__14TContextConfigUi @ 18 NONAME R3UNUSED ; TContextConfig::SetPdpCompression(unsigned int)
-	SetPdpType__14TContextConfigQ214RPacketContext13TProtocolType @ 19 NONAME R3UNUSED ; TContextConfig::SetPdpType(RPacketContext::TProtocolType)
-	SetTFTInfo__14TContextConfigRC8TTFTInfo @ 20 NONAME R3UNUSED ; TContextConfig::SetTFTInfo(TTFTInfo const &)
-	SetToFirst__8TTFTInfo @ 21 NONAME R3UNUSED ; TTFTInfo::SetToFirst(void)
-	SetUMTSQoSNeg__14TContextConfigRCQ210RPacketQoS20TQoSR99_R4Negotiated @ 22 NONAME R3UNUSED ; TContextConfig::SetUMTSQoSNeg(RPacketQoS::TQoSR99_R4Negotiated const &)
-	SetUMTSQoSReq__14TContextConfigRCQ210RPacketQoS19TQoSR99_R4Requested @ 23 NONAME R3UNUSED ; TContextConfig::SetUMTSQoSReq(RPacketQoS::TQoSR99_R4Requested const &)
-	Set__14TContextConfigRC14TContextConfig @ 24 NONAME R3UNUSED ; TContextConfig::Set(TContextConfig const &)
-	Set__8TTFTInfoRC8TTFTInfo @ 25 NONAME R3UNUSED ; TTFTInfo::Set(TTFTInfo const &)
-	"_._14TContextConfig" @ 26 NONAME R3UNUSED ; TContextConfig::~TContextConfig(void)
-	"_._8TTFTInfo" @ 27 NONAME R3UNUSED ; TTFTInfo::~TTFTInfo(void)
-	__14TContextConfig @ 28 NONAME R3UNUSED ; TContextConfig::TContextConfig(void)
-	__18TContextParameters @ 29 NONAME R3UNUSED ; TContextParameters::TContextParameters(void)
-	AddPacketFilter__8TTFTInfoGQ214RPacketContext15TPacketFilterV2 @ 30 NONAME ; TTFTInfo::AddPacketFilter(RPacketContext::TPacketFilterV2)
-	AddSblpToken__8TTFTInfoGt5TBuf81i255Gt6RArray1ZQ314RPacketContext24CTFTMediaAuthorizationV315TFlowIdentifier @ 31 NONAME ; TTFTInfo::AddSblpToken(TBuf8<255>, RArray<RPacketContext::CTFTMediaAuthorizationV3::TFlowIdentifier>)
-	GetSblpToken__C8TTFTInfoRQ214RPacketContext24CTFTMediaAuthorizationV3 @ 32 NONAME R3UNUSED ; TTFTInfo::GetSblpToken(RPacketContext::CTFTMediaAuthorizationV3 &) const
-	RemovSblpToken__8TTFTInfo @ 33 NONAME R3UNUSED ; TTFTInfo::RemovSblpToken(void)
-
+EXPORTS
+	__8TTFTInfo @ 1 NONAME R3UNUSED ; TTFTInfo::TTFTInfo(void)
+	FilterCount__8TTFTInfo @ 2 NONAME R3UNUSED ; TTFTInfo::FilterCount(void)
+	GetAccessPointName__C14TContextConfigRt5TBuf81i252 @ 3 NONAME R3UNUSED ; TContextConfig::GetAccessPointName(TBuf8<252> &) const
+	GetContextConfig__C14TContextConfigRQ214RPacketContext18TContextConfigGPRS @ 4 NONAME R3UNUSED ; TContextConfig::GetContextConfig(RPacketContext::TContextConfigGPRS &) const
+	GetPacketFilter__8TTFTInfoRQ214RPacketContext15TPacketFilterV2 @ 5 NONAME R3UNUSED ; TTFTInfo::GetPacketFilter(RPacketContext::TPacketFilterV2 &)
+	GetPdpAddress__C14TContextConfigRt5TBuf81i50 @ 6 NONAME R3UNUSED ; TContextConfig::GetPdpAddress(TBuf8<50> &) const
+	GetPdpCompression__C14TContextConfigRUi @ 7 NONAME R3UNUSED ; TContextConfig::GetPdpCompression(unsigned int &) const
+	GetPdpType__C14TContextConfigRQ214RPacketContext13TProtocolType @ 8 NONAME R3UNUSED ; TContextConfig::GetPdpType(RPacketContext::TProtocolType &) const
+	GetTFTInfo__C14TContextConfigR8TTFTInfo @ 9 NONAME R3UNUSED ; TContextConfig::GetTFTInfo(TTFTInfo &) const
+	GetUMTSQoSNeg__C14TContextConfigRQ210RPacketQoS20TQoSR99_R4Negotiated @ 10 NONAME R3UNUSED ; TContextConfig::GetUMTSQoSNeg(RPacketQoS::TQoSR99_R4Negotiated &) const
+	GetUMTSQoSReq__C14TContextConfigRQ210RPacketQoS19TQoSR99_R4Requested @ 11 NONAME R3UNUSED ; TContextConfig::GetUMTSQoSReq(RPacketQoS::TQoSR99_R4Requested &) const
+	NextPacketFilter__8TTFTInfoRQ214RPacketContext15TPacketFilterV2 @ 12 NONAME R3UNUSED ; TTFTInfo::NextPacketFilter(RPacketContext::TPacketFilterV2 &)
+	RemovePacketFilter__8TTFTInfoGQ214RPacketContext15TPacketFilterV2 @ 13 NONAME ; TTFTInfo::RemovePacketFilter(RPacketContext::TPacketFilterV2)
+	Reset__14TContextConfig @ 14 NONAME R3UNUSED ; TContextConfig::Reset(void)
+	SetAccessPointName__14TContextConfigRCt5TBuf81i252 @ 15 NONAME R3UNUSED ; TContextConfig::SetAccessPointName(TBuf8<252> const &)
+	SetContextConfig__14TContextConfigRCQ214RPacketContext18TContextConfigGPRS @ 16 NONAME R3UNUSED ; TContextConfig::SetContextConfig(RPacketContext::TContextConfigGPRS const &)
+	SetPdpAddress__14TContextConfigRCt5TBuf81i50 @ 17 NONAME R3UNUSED ; TContextConfig::SetPdpAddress(TBuf8<50> const &)
+	SetPdpCompression__14TContextConfigUi @ 18 NONAME R3UNUSED ; TContextConfig::SetPdpCompression(unsigned int)
+	SetPdpType__14TContextConfigQ214RPacketContext13TProtocolType @ 19 NONAME R3UNUSED ; TContextConfig::SetPdpType(RPacketContext::TProtocolType)
+	SetTFTInfo__14TContextConfigRC8TTFTInfo @ 20 NONAME R3UNUSED ; TContextConfig::SetTFTInfo(TTFTInfo const &)
+	SetToFirst__8TTFTInfo @ 21 NONAME R3UNUSED ; TTFTInfo::SetToFirst(void)
+	SetUMTSQoSNeg__14TContextConfigRCQ210RPacketQoS20TQoSR99_R4Negotiated @ 22 NONAME R3UNUSED ; TContextConfig::SetUMTSQoSNeg(RPacketQoS::TQoSR99_R4Negotiated const &)
+	SetUMTSQoSReq__14TContextConfigRCQ210RPacketQoS19TQoSR99_R4Requested @ 23 NONAME R3UNUSED ; TContextConfig::SetUMTSQoSReq(RPacketQoS::TQoSR99_R4Requested const &)
+	Set__14TContextConfigRC14TContextConfig @ 24 NONAME R3UNUSED ; TContextConfig::Set(TContextConfig const &)
+	Set__8TTFTInfoRC8TTFTInfo @ 25 NONAME R3UNUSED ; TTFTInfo::Set(TTFTInfo const &)
+	"_._14TContextConfig" @ 26 NONAME R3UNUSED ; TContextConfig::~TContextConfig(void)
+	"_._8TTFTInfo" @ 27 NONAME R3UNUSED ; TTFTInfo::~TTFTInfo(void)
+	__14TContextConfig @ 28 NONAME R3UNUSED ; TContextConfig::TContextConfig(void)
+	__18TContextParameters @ 29 NONAME R3UNUSED ; TContextParameters::TContextParameters(void)
+	AddPacketFilter__8TTFTInfoGQ214RPacketContext15TPacketFilterV2 @ 30 NONAME ; TTFTInfo::AddPacketFilter(RPacketContext::TPacketFilterV2)
+	AddSblpToken__8TTFTInfoGt5TBuf81i255Gt6RArray1ZQ314RPacketContext24CTFTMediaAuthorizationV315TFlowIdentifier @ 31 NONAME ; TTFTInfo::AddSblpToken(TBuf8<255>, RArray<RPacketContext::CTFTMediaAuthorizationV3::TFlowIdentifier>)
+	GetSblpToken__C8TTFTInfoRQ214RPacketContext24CTFTMediaAuthorizationV3 @ 32 NONAME R3UNUSED ; TTFTInfo::GetSblpToken(RPacketContext::CTFTMediaAuthorizationV3 &) const
+	RemovSblpToken__8TTFTInfo @ 33 NONAME R3UNUSED ; TTFTInfo::RemovSblpToken(void)
+