--- a/bluetooth/btstack/linkmgr/physicallinksmanager.cpp Wed Sep 15 13:27:26 2010 +0300
+++ b/bluetooth/btstack/linkmgr/physicallinksmanager.cpp Wed Oct 13 15:48:34 2010 +0300
@@ -23,7 +23,7 @@
#include "ProxySAP.h"
#include <bt_sock.h>
-#include "roleswitchhelper.h"
+#include "PhysicalLinkHelper.h"
#include "hostresolver.h"
#include <bluetooth/hci/writepagetimeoutcommand.h>
@@ -583,13 +583,6 @@
found->MaxSlotsChange(aConnH, aSlots);
}
-void CPhysicalLinksManager::EncryptionKeyRefreshComplete(THCIErrorCode aErr, THCIConnHandle aConnH)
- {
- CPhysicalLink* found = FindPhysicalLink(aConnH);
- RETURN_IF_NULL_CONNECTION(found);
- found->EncryptionKeyRefreshComplete(aErr, aConnH);
- }
-
void CPhysicalLinksManager::ModeChange(THCIErrorCode aErr, THCIConnHandle aConnH, TBTLinkMode aMode, TBasebandTime aInterval)
{
CPhysicalLink* found = FindPhysicalLink(aConnH);
@@ -1003,7 +996,7 @@
// this the only role request, it's safe to kick off the state machine
// first suspend host resolver
LinkManagerProtocol().InquiryMgr().Suspend();
- aRoleSwitcher.StartHelper();
+ aRoleSwitcher.Start();
}
}
@@ -1023,7 +1016,7 @@
if (startNextRoleSwitcher && !iRoleSwitchersQ.IsEmpty())
{
- iRoleSwitchersQ.First()->StartHelper();
+ iRoleSwitchersQ.First()->Start();
}
else
{