--- a/bluetooth/btstack/avdtp/avdtpMuxChannel.h Wed Sep 15 13:27:26 2010 +0300
+++ b/bluetooth/btstack/avdtp/avdtpMuxChannel.h Wed Oct 13 15:48:34 2010 +0300
@@ -134,7 +134,7 @@
TTCID aRemotelyAssignedTCID);
// management path
- virtual TInt AttachTransportSession(CUserPlaneTransportSession& aSession, TAvdtpTransportSessionType aType, TL2CapConfig::TChannelPriority aPriority = TL2CapConfig::ELow);
+ virtual TInt AttachTransportSession(CUserPlaneTransportSession& aSession, TAvdtpTransportSessionType aType);
virtual void DetachTransportSession(CUserPlaneTransportSession& aSession, TAvdtpTransportSessionType aType);
virtual TBool CouldAttachSession(const TAvdtpSockAddr& aAddr);
virtual TTCID TCID() const;
@@ -153,9 +153,7 @@
private:
CMuxChannel(CAvdtpProtocol& aProtocol, const TBTDevAddr& aRemoteDevice);
-
- void UpdateChannelPriority();
-
+
static TInt MuxSendIntervalCb(TAny* aCMuxChannel);
void CheckForClose();
TUint DoSend();
@@ -173,15 +171,13 @@
// receive path
struct TUserPlaneTransportSessionState
{
- inline TUserPlaneTransportSessionState(CUserPlaneTransportSession& aSession, TL2CapConfig::TChannelPriority aChannelPriority);
+ inline TUserPlaneTransportSessionState(CUserPlaneTransportSession& aSession);
CUserPlaneTransportSession& iSession;
TBool iIsBlocked;
- TL2CapConfig::TChannelPriority iChannelPriority;
+
};
- static void MaxChannelPriority(TL2CapConfig::TChannelPriority& aMaxPriority, const RArray<TUserPlaneTransportSessionState>& aSessions);
-
RArray<TUserPlaneTransportSessionState> iMediaSessions;
RArray<TUserPlaneTransportSessionState> iReportingSessions;
RArray<TUserPlaneTransportSessionState> iRecoverySessions; // recall not from same streams as other sessions
@@ -206,10 +202,8 @@
};
inline CMuxChannel::TUserPlaneTransportSessionState::TUserPlaneTransportSessionState(
- CUserPlaneTransportSession& aSession,
- TL2CapConfig::TChannelPriority aChannelPriority)
- : iSession(aSession)
- , iChannelPriority(aChannelPriority)
+ CUserPlaneTransportSession& aSession)
+: iSession(aSession)
{
}