--- a/bluetooth/btstack/avdtp/avdtpDirectChannel.cpp Wed Sep 15 13:27:26 2010 +0300
+++ b/bluetooth/btstack/avdtp/avdtpDirectChannel.cpp Wed Oct 13 15:48:34 2010 +0300
@@ -45,28 +45,20 @@
LOG_FUNC
}
-TInt CDirectChannel::AttachTransportSession(CUserPlaneTransportSession& aSession, TAvdtpTransportSessionType /*aType*/, TL2CapConfig::TChannelPriority aPriority)
+CDirectChannel::~CDirectChannel()
+ {
+ LOG_FUNC
+ }
+
+TInt CDirectChannel::AttachTransportSession(CUserPlaneTransportSession& aSession, TAvdtpTransportSessionType /*aType*/)
{
LOG_FUNC
__ASSERT_DEBUG(!iTransportSession, Panic(EAVDTPBadSessionAttachToTransportChannel));
+ // don't care about session type for direct channels
iTransportSession = &aSession;
- iChannelPriority = aPriority;
- UpdateChannelPriority();
return KErrNone;
}
-void CDirectChannel::UpdateChannelPriority()
- {
- LOG_FUNC
-
- if(iLogicalChannel)
- {
- TPckgBuf<TL2CapConfig> configBuf;
- configBuf().ConfigureChannelPriority(iChannelPriority);
- (void)iLogicalChannel->SetOption(KSolBtL2CAP, KL2CAPUpdateChannelConfig, configBuf);
- }
- }
-
TBool CDirectChannel::CouldAttachSession(const TAvdtpSockAddr& /*aAddr*/)
{
LOG_FUNC
@@ -149,10 +141,6 @@
LOG_FUNC
__ASSERT_DEBUG(&aSession == iTransportSession, Panic(EAVDTPBadSessionDetachFromTransportChannel));
iTransportSession = NULL;
- iChannelPriority = TL2CapConfig::ELow;
-
- UpdateChannelPriority();
-
// closing logical channel is async - we die on CanClose
// but we're invalid, so tell protocol
Protocol().TransportChannelClosing(*this);