--- a/bluetooth/btstack/linkmgr/physicallinks.cpp Tue Apr 27 17:48:21 2010 +0300
+++ b/bluetooth/btstack/linkmgr/physicallinks.cpp Tue May 11 17:15:36 2010 +0300
@@ -556,6 +556,10 @@
{
iDevice.SetClockOffset(jle.iClockOffset);
}
+ if(juice->IsCoDFromHCI())
+ {
+ iDevice.SetDeviceClass(jle.iCoD);
+ }
}
void CPhysicalLink::StoreDeviceL( TBool aPreventDeviceAddition )
@@ -2302,6 +2306,14 @@
LOG_FUNC
TInt err = KErrNone;
+ __ASSERT_DEBUG(aReason == EAuthenticationFailure
+ || aReason == ERemoteUserEndedConnection
+ || aReason == ERemoteLowResources
+ || aReason == ERemoteAboutToPowerOff
+ || aReason == EUnsupportedRemoteLMPFeature
+ || aReason == EPairingWithUnitKeyNotSupported,
+ Panic (EInvalidDisconnectReason)); // Check the error code is valid with the spec
+
if (iLinkState.LinkState() == TBTBasebandLinkState::ELinkPending)
{
// If the Link is not yet up then we cannot know the correct connection handle
@@ -2898,6 +2910,13 @@
return iAuthStateMask & ELinkKeyRequestPending;
}
+TBool CPhysicalLink::IsAuthenticationRequestPending() const
+ {
+ LOG_FUNC
+ return iAuthStateMask & EAuthenticationRequestPending;
+ }
+
+
void CPhysicalLink::SetAuthenticationPending(TUint8 aState)
{
LOG_FUNC