--- a/bluetooth/btexample/test/group/bld.inf Fri Apr 16 16:09:25 2010 +0300
+++ b/bluetooth/btexample/test/group/bld.inf Mon May 03 13:34:38 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 1999-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 1999-2010 Nokia Corporation and/or its subsidiary(-ies).
// All rights reserved.
// This component and the accompanying materials are made available
// under the terms of "Eclipse Public License v1.0"
@@ -19,7 +19,7 @@
@file
*/
-#include "../TestConsole/Bld.inf"
+#include "../TestConsole/bld.inf"
#include "../cit/ROMConfig/group/bld.inf"
--- a/bluetooth/btlogger/group/BLD.INF Fri Apr 16 16:09:25 2010 +0300
+++ b/bluetooth/btlogger/group/BLD.INF Mon May 03 13:34:38 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2005-2010 Nokia Corporation and/or its subsidiary(-ies).
// All rights reserved.
// This component and the accompanying materials are made available
// under the terms of "Eclipse Public License v1.0"
@@ -17,5 +17,5 @@
@file
*/
-#include "../generic/group/BLD.INF"
+#include "../generic/group/bld.inf"
#include "../btsnoophcilogger/group/bld.inf"
--- a/bluetooth/btstack/avctp/avctpPacketMgr.cpp Fri Apr 16 16:09:25 2010 +0300
+++ b/bluetooth/btstack/avctp/avctpPacketMgr.cpp Mon May 03 13:34:38 2010 +0300
@@ -31,10 +31,6 @@
_LIT8(KLogComponent, LOG_COMPONENT_AVCTP);
#endif
-#ifdef _DEBUG
-PANICCATEGORY("pktmgr");
-#endif
-
using namespace SymbianAvctp;
/**
--- a/bluetooth/btstack/avctp/avctpmuxer.cpp Fri Apr 16 16:09:25 2010 +0300
+++ b/bluetooth/btstack/avctp/avctpmuxer.cpp Mon May 03 13:34:38 2010 +0300
@@ -37,10 +37,6 @@
_LIT8(KLogComponent, LOG_COMPONENT_AVCTP);
#endif
-#ifdef _DEBUG
-PANICCATEGORY("avctpmux");
-#endif
-
using namespace SymbianAvctp;
#ifdef __FLOG_ACTIVE
--- a/bluetooth/btstack/avdtp/avdtpSignallingChannel.h Fri Apr 16 16:09:25 2010 +0300
+++ b/bluetooth/btstack/avdtp/avdtpSignallingChannel.h Mon May 03 13:34:38 2010 +0300
@@ -53,7 +53,7 @@
#ifdef _OOM_TEST
static const TInt KAvdtpSignallingChannelIdleTimeout = 800;
#else
-static const TInt KAvdtpSignallingChannelIdleTimeout = 3000000; // 3s
+static const TInt KAvdtpSignallingChannelIdleTimeout = 1000000; // 1s
#endif
NONSHARABLE_CLASS(CSignallingChannel) : public CBase, public MSocketNotify, public XLogicalChannelFactoryClient
--- a/bluetooth/btstack/linkmgr/physicallinks.cpp Fri Apr 16 16:09:25 2010 +0300
+++ b/bluetooth/btstack/linkmgr/physicallinks.cpp Mon May 03 13:34:38 2010 +0300
@@ -818,7 +818,7 @@
if (!aEncrypted)
{
iLinksMan.LinkManagerProtocol().ACLController().SetParked(iHandle, ETrue);
- iEncryptionEnforcer->EncryptionDisabled(SimplePairingMode()== EPhySimplePairingEnabled);
+ iEncryptionEnforcer->EncryptionDisabled(IsEncryptionPauseResumeSupported());
}
else
{
@@ -4162,12 +4162,12 @@
}
}
-void CEncryptionEnforcer::EncryptionDisabled(TBool aSecurityModeFour)
+void CEncryptionEnforcer::EncryptionDisabled(TBool aEncryptionPauseResumeSupported)
{
LOG_FUNC
LOG1(_L("CEncryptionEnforcer::EncryptionDisabled() : current status = %d"), iState);
- if(aSecurityModeFour)
+ if(aEncryptionPauseResumeSupported)
{
Stop();
ChangeState(EForcingInProgress);
--- a/bluetooth/btstack/linkmgr/physicallinks.h Fri Apr 16 16:09:25 2010 +0300
+++ b/bluetooth/btstack/linkmgr/physicallinks.h Mon May 03 13:34:38 2010 +0300
@@ -206,7 +206,7 @@
static CEncryptionEnforcer* NewLC(CPhysicalLink& aLink, THCIEncryptModeFlag aEncryptionMode);
void EncryptionEnabled();
- void EncryptionDisabled(TBool aSecurityModeFour);
+ void EncryptionDisabled(TBool aEncryptionPauseResumeSupported);
void RoleSwitchEvent();
private:
--- a/bluetoothmgmt/bluetoothclientlib/avlib/avdtpTypes.cpp Fri Apr 16 16:09:25 2010 +0300
+++ b/bluetoothmgmt/bluetoothclientlib/avlib/avdtpTypes.cpp Mon May 03 13:34:38 2010 +0300
@@ -37,7 +37,7 @@
// const TInt KMinMediaCodecLOSC = 2; // mediatype, codectype - see figure8-50 AVDTP
// const TInt KMinContentProtectionLOSC = 2; // protectiontype
-static const TUint KAvdtpSockAddrLocalMask = static_cast<TUint>(1<<31);
+static const TUint KAvdtpSockAddrLocalMask = static_cast<TUint>(1U<<31U);
/**
Default constructor using 0 as the parameter for setPort()
--- a/bluetoothmgmt/btcommon/bld.inf Fri Apr 16 16:09:25 2010 +0300
+++ b/bluetoothmgmt/btcommon/bld.inf Mon May 03 13:34:38 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 1999-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 1999-2010 Nokia Corporation and/or its subsidiary(-ies).
// All rights reserved.
// This component and the accompanying materials are made available
// under the terms of "Eclipse Public License v1.0"
@@ -25,7 +25,7 @@
#include "../btconfig/bld.inf"
// Logging code
-#include "../../bluetooth/btlogger/group/BLD.INF"
+#include "../../bluetooth/btlogger/group/bld.inf"
// User code
#include "../bluetoothclientlib/bld.inf"
@@ -45,7 +45,7 @@
// Profiles
#include "../../bluetooth/gavdp/group/bld.inf"
-#include "../../bluetoothcommsprofiles/btpan/group/BLD.INF"
+#include "../../bluetoothcommsprofiles/btpan/group/bld.inf"
// CSY
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/bthci/hci2implementations/group/hci_implementation_reference.iby Mon May 03 13:34:38 2010 +0300
@@ -0,0 +1,45 @@
+// Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
+
+#ifndef HCI_IMPLEMENTATION_REFERENCE_IBY
+#define HCI_IMPLEMENTATION_REFERENCE_IBY
+
+// If __HCI_DEBUG__ is defined pull in debug versions of the
+// HCI DLLs and Plugins regardless of the ROM type
+#ifdef __HCI_DEBUG__
+define HCI_DIR UDEB
+#define HCI_PLUGIN ECOM_PLUGIN_UDEB
+#else
+define HCI_DIR BUILD_DIR
+#define HCI_PLUGIN ECOM_PLUGIN
+#endif
+
+#include <corehci_symbian.iby>
+#include <commandsevents_symbian.iby>
+#include <hci_qdp_symbian.iby>
+
+#ifdef HCI_TI
+
+#include <hctl_ti.iby>
+#include <hci_initialisor_ti.iby>
+
+#else // CSR + Default
+
+#include <hctl_bcsp.iby>
+#include <initialisor_symbian.iby>
+
+#endif
+
+#endif // HCI_IMPLEMENTATION_REFERENCE_IBY