--- a/bluetooth/btexample/example/btproperties/BTProperties.cpp Wed Aug 18 10:54:44 2010 +0300
+++ b/bluetooth/btexample/example/btproperties/BTProperties.cpp Fri Sep 17 08:36:02 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"
@@ -200,7 +200,7 @@
{
Start();
- TBuf16<KHCILocalDeviceNameMaxLength> val;
+ TBuf16<KMaxBluetoothNameLen> val;
iProperty.Get(val);
iTest.Printf(_L("%S = %S\n"), &iString, &val);
--- a/bluetooth/btextnotifiers/bld.inf Wed Aug 18 10:54:44 2010 +0300
+++ b/bluetooth/btextnotifiers/bld.inf Fri Sep 17 08:36:02 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2009-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"
@@ -15,9 +15,9 @@
PRJ_EXPORTS
-inc/BTExtNotifiers.h SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(btextnotifiers.h)
-inc/BTExtNotifiersPartner.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(btextnotifierspartner.h)
-inc/BTExtNotifiersConsts.h SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(btextnotifiersconsts.h)
+inc/BTExtNotifiers.h OS_LAYER_PUBLIC_EXPORT_PATH(btextnotifiers.h)
+inc/BTExtNotifiersPartner.h OS_LAYER_PLATFORM_EXPORT_PATH(btextnotifierspartner.h)
+inc/BTExtNotifiersConsts.h OS_LAYER_PUBLIC_EXPORT_PATH(btextnotifiersconsts.h)
PRJ_MMPFILES
src/BTExtNotifiers.mmp
--- a/bluetooth/btlogger/btsnoophcilogger/group/bld.inf Wed Aug 18 10:54:44 2010 +0300
+++ b/bluetooth/btlogger/btsnoophcilogger/group/bld.inf Fri Sep 17 08:36:02 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"
@@ -16,7 +16,7 @@
#include "../test/headercheck/group/bld.inf"
PRJ_EXPORTS
-../public/hciframelogger.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hciframelogger.h)
+../public/hciframelogger.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hciframelogger.h)
btsnoophcilogger.iby /epoc32/rom/include/btsnoophcilogger.iby
PRJ_MMPFILES
--- a/bluetooth/btlogger/generic/group/BLD.INF Wed Aug 18 10:54:44 2010 +0300
+++ b/bluetooth/btlogger/generic/group/BLD.INF Fri Sep 17 08:36:02 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"
@@ -20,9 +20,9 @@
#include "../test/headercheck/group/bld.inf"
PRJ_EXPORTS
-../public/logger.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/logger.h)
-../public/components.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/logger/components.h)
-btlogger.mmh SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(bluetooth/btlogger.mmh)
+../public/logger.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/logger.h)
+../public/components.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/logger/components.h)
+btlogger.mmh OS_LAYER_PUBLIC_EXPORT_PATH(bluetooth/btlogger.mmh)
btlogger.iby /epoc32/rom/include/btlogger.iby
--- a/bluetooth/btsdp/bld.inf Wed Aug 18 10:54:44 2010 +0300
+++ b/bluetooth/btsdp/bld.inf Fri Sep 17 08:36:02 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2009-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"
@@ -14,7 +14,7 @@
// Bld.inf file for bluetooth service discovery protocol
PRJ_EXPORTS
-inc/btsdp.h SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(btsdp.h)
+inc/btsdp.h OS_LAYER_PUBLIC_EXPORT_PATH(btsdp.h)
PRJ_MMPFILES
database/sdpdatabase.mmp
--- a/bluetooth/btstack/HCIShared/group/bld.inf Wed Aug 18 10:54:44 2010 +0300
+++ b/bluetooth/btstack/HCIShared/group/bld.inf Fri Sep 17 08:36:02 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2008-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"
@@ -14,7 +14,7 @@
//
PRJ_EXPORTS
-../interface/hcishared.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/hcishared.h)
+../interface/hcishared.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/hcishared.h)
PRJ_MMPFILES
hcishared.mmp
--- a/bluetooth/btstack/bld.inf Wed Aug 18 10:54:44 2010 +0300
+++ b/bluetooth/btstack/bld.inf Fri Sep 17 08:36:02 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"
@@ -29,23 +29,21 @@
common/bt_v2.mmp
PRJ_EXPORTS
-linkmgr/interface/LinkMuxNotifier.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/linkmuxnotifier.h)
-linkmgr/interface/PhysicalLinksState.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/physicallinksstate.h)
-linkmgr/interface/HardResetInitiator.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hardresetinitiator.h)
-eirman/interface/eirmanshared.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/eirmanshared.h)
-secman/public/pairingservershared.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/pairingservershared.h)
+linkmgr/interface/LinkMuxNotifier.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/linkmuxnotifier.h)
+linkmgr/interface/PhysicalLinksState.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/physicallinksstate.h)
+linkmgr/interface/HardResetInitiator.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hardresetinitiator.h)
+eirman/interface/eirmanshared.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/eirmanshared.h)
+
+secman/public/pairingservershared.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/pairingservershared.h)
+
+l2cap/l2capdebuginfo.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/l2capdebuginfo.h)
// Stack configuration file
-
-bluetooth_stack.ini /epoc32/data/z/private/101f7989/bluetooth/bluetooth_stack.ini
-bluetooth_stack.ini /epoc32/release/winscw/udeb/z/private/101f7989/bluetooth/bluetooth_stack.ini
-bluetooth_stack.ini /epoc32/release/winscw/urel/z/private/101f7989/bluetooth/bluetooth_stack.ini
-
-PRJ_EXPORTS
-l2cap/l2capdebuginfo.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/l2capdebuginfo.h)
+bluetooth_stack.ini z:/private/101f7989/bluetooth/bluetooth_stack.ini
+
--- a/bluetooth/btstack/l2cap/l2capSigStates.cpp Wed Aug 18 10:54:44 2010 +0300
+++ b/bluetooth/btstack/l2cap/l2capSigStates.cpp Fri Sep 17 08:36:02 2010 +0300
@@ -898,6 +898,9 @@
void TL2CAPSigStateWaitConfig::Enter(CL2CapSAPSignalHandler& aSignalHandler) const
{
LOG_FUNC
+ // Cancel the Config timer if it's running
+ aSignalHandler.CancelTimer();
+
// First start the ConfigReq sending delay timer (see DelayConfigRequest() for why).
// It's short lived, we'll start the proper L2CAP config timer when it expires.
aSignalHandler.StartConfigRequestDelayTimer();
--- a/bluetooth/btstack/linkmgr/hostmbufpool.cpp Wed Aug 18 10:54:44 2010 +0300
+++ b/bluetooth/btstack/linkmgr/hostmbufpool.cpp Fri Sep 17 08:36:02 2010 +0300
@@ -20,6 +20,7 @@
#include <bluetooth/hci/hcievents.h>
#include <bluetooth/hci/commandcompleteevent.h>
#include <bluetooth/hci/hciutil.h>
+#include <bluetooth/hci/hciconsts.h>
#include "linkconsts.h"
#include "linkutil.h"
--- a/bluetooth/btstack/secman/pairingserver.cpp Wed Aug 18 10:54:44 2010 +0300
+++ b/bluetooth/btstack/secman/pairingserver.cpp Fri Sep 17 08:36:02 2010 +0300
@@ -639,7 +639,6 @@
}
}
-
void COobDataSession::XoldoLocalOobDataRetrieved(TInt aResult, const TBluetoothSimplePairingHash& aHash, const TBluetoothSimplePairingRandomizer& aRandomizer)
{
LOG_FUNC
@@ -702,8 +701,8 @@
{
LOG_FUNC
iPhysicalLinksManager.SecMan().CancelRequest(*this);
- delete iProxySap;
- if(iStartBondingMsg.Handle())
+ delete iProxySap; // cannot do an immediate shutdown as the semantics for that kill the phy
+ if(!iStartBondingMsg.IsNull())
{
iStartBondingMsg.Complete(KErrCancel);
}
@@ -718,6 +717,7 @@
case EPairingServerStartDedicatedBond:
StartBondingL(aMessage);
break;
+
default:
CPairingSubSession::DispatchSubSessMessageL(aMessage);
break;
@@ -727,9 +727,18 @@
void CDedicatedBondingSession::Complete(TInt aError)
{
LOG_FUNC
- iState = EShutdown;
- iAsyncShutdown->CallBack();
- iStartBondingMsg.Complete(aError);
+ if(!iStartBondingMsg.IsNull())
+ {
+ __ASSERT_DEBUG(!ShuttingDown(), PANIC(KPairingServerFaultCat, EPairingServerBadShutdownState));
+ iState = EShutdownRequested;
+ iAsyncShutdown->CallBack();
+ iPhysicalLinksManager.SecMan().CancelRequest(*this); // we don't want the result anymore (if it's still pending).
+ iStartBondingMsg.Complete(aError);
+ }
+ else
+ {
+ __ASSERT_DEBUG(ShuttingDown(), PANIC(KPairingServerFaultCat, EPairingServerBadShutdownState));
+ }
}
TInt CDedicatedBondingSession::StaticShutdown(TAny* aDedBond)
@@ -742,42 +751,49 @@
void CDedicatedBondingSession::Shutdown()
{
LOG_FUNC
- __ASSERT_DEBUG(iState == EShutdown, PANIC(KPairingServerFaultCat, EPairingServerBadShutdownState));
- iState = EInvalid;
+ __ASSERT_DEBUG(iState == EShutdownRequested, PANIC(KPairingServerFaultCat, EPairingServerBadShutdownState));
+ __ASSERT_DEBUG(iStartBondingMsg.IsNull(), PANIC(KPairingServerFaultCat, EPairingServerMessageShouldBeNull));
+ iState = EShutdownPending;
iProxySap->Shutdown(CServProviderBase::ENormal);
}
+
+TBool CDedicatedBondingSession::ShuttingDown() const
+ {
+ return iState == EShutdownRequested || iState == EShutdownPending;
+ }
void CDedicatedBondingSession::StartBondingL(const RMessage2& aMessage)
{
LOG_FUNC
- if(!iStartBondingMsg.IsNull() || iState != EInvalid)
+ if(iState != EMintCondition)
{
aMessage.Panic(KPairingServerPanicCat, EPairingServerDedicatedBondAlreadyInProgress);
return;
}
-
+ __ASSERT_DEBUG(iStartBondingMsg.IsNull(), PANIC(KPairingServerFaultCat, EPairingServerMessageShouldBeNull));
+
+ // Now we've been initiated, no turning back for this object.
+ iState = EInitiated;
+
TPckgBuf<TBTDevAddr> addrBuf;
TInt addrLen = aMessage.GetDesLengthL(0);
if(addrLen != sizeof(TBTDevAddr))
{
- // If the length is correct then the address has been packaged incorrect for the
+ // If the length is incorrect then the address has been packaged incorrectly for the
// IPC operation.
LEAVEL(KErrBadDescriptor);
}
aMessage.ReadL(0, addrBuf);
- iStartBondingMsg = aMessage;
- CleanupStack::PushL(TCleanupItem(CleanupStartMessage, this));
-
TBTSockAddr addr;
addr.SetBTAddr(addrBuf());
iProxySap = CBTProxySAP::NewL(iPhysicalLinksManager, NULL);
-
- CleanupStack::Pop(this); // the start message cleaner
+ iStartBondingMsg = aMessage;
// Now we've entered the realm of not leaving with an error, since the connection
// process has started. Errors from now on must be via the Error() function call.
+
iState = EInitialConnectionPending;
iProxySap->SetNotify(this);
iProxySap->SetRemName(addr);
@@ -789,13 +805,6 @@
}
}
-void CDedicatedBondingSession::CleanupStartMessage(TAny* aPtr)
- {
- LOG_STATIC_FUNC
- CDedicatedBondingSession* session = reinterpret_cast<CDedicatedBondingSession*>(aPtr);
- session->iStartBondingMsg = RMessage2(); // blat the old one
- }
-
void CDedicatedBondingSession::DoAccessRequestL()
{
LOG_FUNC
@@ -833,7 +842,7 @@
// fall-through...
case EInitialConnection:
ASSERT_DEBUG(aResult != EBTSecManAccessDeferred); // Should have been disconnected if we receive
- // this - I don't expect this to happen.
+ // this - I don't expect this to happen.
// fall-through...
case EFinalConnection:
completed = ETrue; // in the final connection any complete is errored.
@@ -842,12 +851,15 @@
err = KErrAccessDenied;
}
break;
+
case EInitialConnectionPending:
+ // fall-through deliberate
case EFinalConnectionPending:
// Access request shouldn't successfully complete if the connection is still pending
__ASSERT_DEBUG(aResult != EBTSecManAccessGranted, PANIC(KPairingServerFaultCat, EPairingServerUnexpectedAccessCallback));
// We should get the MSocketNotify::Error callback, so don't do anything else
break;
+
default:
LOG1(_L("Unexpected Access Request Complete in state %d"), iState);
__ASSERT_DEBUG(EFalse, PANIC(KPairingServerFaultCat, EPairingServerUnexpectedAccessCallback));
@@ -885,15 +897,21 @@
case EFinalConnectionPending:
iState = EFinalConnection;
break;
+
case EInitialConnection:
+ // fall-through deliberate
case EFinalConnection:
// Apparently multiple connect completes are allowed by CSocket
break;
- case EShutdown:
+
+ case EShutdownRequested:
+ // fall-through deliberate
+ case EShutdownPending:
// If an error occurred just after the connection request then we
// might receive a connection complete before the async shutdown request
- // has been executed.
+ // has been executed or completed.
break;
+
default:
LOG1(_L("Unexpected Connect Complete in state %d"), iState);
__ASSERT_DEBUG(EFalse, PANIC(KPairingServerFaultCat, EPairingServerUnexpectedSocketCallback));
@@ -924,6 +942,9 @@
void CDedicatedBondingSession::CanClose(TDelete aDelete)
{
LOG_FUNC
+ __ASSERT_DEBUG(iState == EShutdownPending, PANIC(KPairingServerFaultCat, EPairingServerUnexpectedSocketCallback));
+ __ASSERT_DEBUG(iStartBondingMsg.IsNull(), PANIC(KPairingServerFaultCat, EPairingServerMessageShouldBeNull));
+ iState = EShutdown;
if (aDelete == EDelete)
{
delete iProxySap; iProxySap = NULL;
@@ -951,12 +972,17 @@
// enter the zombie state and wait for the access requester to complete.
iState = EZombie;
break;
+
case EFinalConnection:
Error(KErrDisconnected);
break;
- case EShutdown:
+
+ case EShutdownRequested:
+ // fall-through deliberate
+ case EShutdownPending:
// Already closing down.
break;
+
default:
LOG1(_L("Unexpected Disconnect in state %d"), iState);
__ASSERT_DEBUG(EFalse, PANIC(KPairingServerFaultCat, EPairingServerUnexpectedSocketCallback));
--- a/bluetooth/btstack/secman/pairingserver.h Wed Aug 18 10:54:44 2010 +0300
+++ b/bluetooth/btstack/secman/pairingserver.h Fri Sep 17 08:36:02 2010 +0300
@@ -218,8 +218,8 @@
void Complete(TInt aError);
- static void CleanupStartMessage(TAny* aPtr);
static TInt StaticShutdown(TAny* aPtr);
+ TBool ShuttingDown() const;
private: // from CPairingSubSession
void DispatchSubSessMessageL(const RMessage2& aMessage);
@@ -246,12 +246,15 @@
private:
enum TState
{
- EInvalid,
+ EMintCondition,
+ EInitiated,
EInitialConnectionPending,
EInitialConnection,
EZombie,
EFinalConnectionPending,
EFinalConnection,
+ EShutdownRequested,
+ EShutdownPending,
EShutdown,
};
--- a/bluetooth/btstack/secman/public/pairingservershared.h Wed Aug 18 10:54:44 2010 +0300
+++ b/bluetooth/btstack/secman/public/pairingservershared.h Fri Sep 17 08:36:02 2010 +0300
@@ -71,6 +71,7 @@
EPairingServerUnexpectedSocketCallback,
EPairingServerUnexpectedAccessCallback,
EPairingServerBadShutdownState,
+ EPairingServerMessageShouldBeNull,
};
#endif // PAIRINGSERVERSHARED_H
--- a/bluetooth/btstack/test/util/hcemulator/hcemulator.cpp Wed Aug 18 10:54:44 2010 +0300
+++ b/bluetooth/btstack/test/util/hcemulator/hcemulator.cpp Fri Sep 17 08:36:02 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"
@@ -21,7 +21,9 @@
#include <f32file.h>
#include <e32test.h>
#include <c32comm.h>
-//#include <log.h>
+#include <bluetooth/hci/hciopcodes.h>
+#include <bluetooth/hci/hciconsts.h>
+#include <bluetooth/hci/aclpacketconsts.h>
#include "hcemulator.h"
--- a/bluetooth/btstack/test/util/hcemulator/hcemulator.h Wed Aug 18 10:54:44 2010 +0300
+++ b/bluetooth/btstack/test/util/hcemulator/hcemulator.h Fri Sep 17 08:36:02 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"
@@ -23,6 +23,7 @@
#include <bt_sock.h>
#include <c32comm.h>
#include <bluetooth/hci/hcierrors.h>
+#include <bluetooth/hci/hcitypes.h>
const TInt KReadBufSize =258;
const TInt KWriteBufSize =258;
--- a/bluetooth/gavdp/group/bld.inf Wed Aug 18 10:54:44 2010 +0300
+++ b/bluetooth/gavdp/group/bld.inf Fri Sep 17 08:36:02 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2009-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"
@@ -16,7 +16,7 @@
PRJ_EXPORTS
-../public/gavdp.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(gavdp.h)
+../public/gavdp.h OS_LAYER_PLATFORM_EXPORT_PATH(gavdp.h)
PRJ_MMPFILES
gavdp.mmp
--- a/bluetoothcommsprofiles/btpan/group/BLD.INF Wed Aug 18 10:54:44 2010 +0300
+++ b/bluetoothcommsprofiles/btpan/group/BLD.INF Fri Sep 17 08:36:02 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2004-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"
@@ -26,19 +26,19 @@
PRJ_EXPORTS
-../inc/panprog.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(panprog.h)
-../inc/panctrl.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(panctrl.h)
-../inc/panerr.h SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(panerr.h)
-../inc/BnepPacketNotifier.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/pan/bneppacketnotifier.h)
-../inc/panuiinterfaces.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(networking/panuiinterfaces.h)
-../inc/panroles.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(networking/panroles.h)
-../group/btpan.iby /epoc32/rom/include/btpan.iby
+../inc/panprog.h OS_LAYER_PLATFORM_EXPORT_PATH(panprog.h)
+../inc/panctrl.h OS_LAYER_PLATFORM_EXPORT_PATH(panctrl.h)
+../inc/panerr.h OS_LAYER_PUBLIC_EXPORT_PATH(panerr.h)
+../inc/BnepPacketNotifier.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/pan/bneppacketnotifier.h)
+../inc/panuiinterfaces.h OS_LAYER_PLATFORM_EXPORT_PATH(networking/panuiinterfaces.h)
+../inc/panroles.h OS_LAYER_PLATFORM_EXPORT_PATH(networking/panroles.h)
+../group/btpan.iby /epoc32/rom/include/btpan.iby
PRJ_MMPFILES
-../group/bnep.mmp
-../group/panagt.mmp
-../group/panhelper.mmp
+bnep.mmp
+panagt.mmp
+panhelper.mmp
// PAN NAP IP Hook
#include "../pannapiphook/group/bld.inf"
--- a/bluetoothcommsprofiles/btpan/group/bnep.mmp Wed Aug 18 10:54:44 2010 +0300
+++ b/bluetoothcommsprofiles/btpan/group/bnep.mmp Fri Sep 17 08:36:02 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2004-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"
@@ -11,7 +11,7 @@
// Contributors:
//
// Description:
-// MACRO __INSTRUMENT_FUNCTION_ENTRY_EXIT
+// BNEP protocol implementation project file
//
//
@@ -52,7 +52,6 @@
USERINCLUDE ../inc
OS_LAYER_SYSTEMINCLUDE_SYMBIAN
-USERINCLUDE /epoc32/include/networking // This is a temporary fix pending the full solution of DEF50710
LIBRARY euser.lib
LIBRARY mbufmgr.lib
--- a/bluetoothmgmt/bluetoothclientlib/bld.inf Wed Aug 18 10:54:44 2010 +0300
+++ b/bluetoothmgmt/bluetoothclientlib/bld.inf Fri Sep 17 08:36:02 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2009-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"
@@ -16,40 +16,36 @@
PRJ_EXPORTS
//
-inc/bttypes.h SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(bttypes.h)
-inc/bt_sock.h SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(bt_sock.h)
-inc/btsocketoptionlevels.h SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(btsocketoptionlevels.h)
-inc/btsockaddr.h SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(btsockaddr.h)
-inc/btsecurity.h SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(btsecurity.h)
-inc/btbasebandpolicy.h SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(btbasebandpolicy.h)
-inc/btsyncbandwidth.h SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(btsyncbandwidth.h)
-inc/bt_subscribe_sec.h SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(bt_subscribe.h)
-inc/bt_subscribe_keybase.h SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(bt_subscribe_keybase.h)
-inc/btbaseband.h SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(bluetooth/btbaseband.h)
-inc/btscoparams.h SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(bluetooth/btscoparams.h)
-inc/lmoptions.h SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(bluetooth/lmoptions.h)
+inc/bttypes.h OS_LAYER_PUBLIC_EXPORT_PATH(bttypes.h)
+inc/bt_sock.h OS_LAYER_PUBLIC_EXPORT_PATH(bt_sock.h)
+inc/btsocketoptionlevels.h OS_LAYER_PUBLIC_EXPORT_PATH(btsocketoptionlevels.h)
+inc/btsockaddr.h OS_LAYER_PUBLIC_EXPORT_PATH(btsockaddr.h)
+inc/btsecurity.h OS_LAYER_PUBLIC_EXPORT_PATH(btsecurity.h)
+inc/btbasebandpolicy.h OS_LAYER_PUBLIC_EXPORT_PATH(btbasebandpolicy.h)
+inc/btsyncbandwidth.h OS_LAYER_PUBLIC_EXPORT_PATH(btsyncbandwidth.h)
+inc/bt_subscribe_sec.h OS_LAYER_PUBLIC_EXPORT_PATH(bt_subscribe.h)
+inc/bt_subscribe_keybase.h OS_LAYER_PUBLIC_EXPORT_PATH(bt_subscribe_keybase.h)
+inc/btbaseband.h OS_LAYER_PUBLIC_EXPORT_PATH(bluetooth/btbaseband.h)
+inc/btscoparams.h OS_LAYER_PUBLIC_EXPORT_PATH(bluetooth/btscoparams.h)
+inc/lmoptions.h OS_LAYER_PUBLIC_EXPORT_PATH(bluetooth/lmoptions.h)
-inc/bttypespartner.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bttypespartner.h)
-inc/bthci.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bthci.h)
-inc/bluetoothAV.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetoothav.h)
-inc/avctptypes.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/avctptypes.h)
-inc/avctpservices.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(avctpservices.h)
-inc/bt_subscribe_partner.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bt_subscribe_partner.h)
-inc/pairing.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/pairing.h)
-inc/eirpublisherbase.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/eirpublisherbase.h)
-inc/eirpublishermanufacturerspecificdata.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/eirpublishermanufacturerspecificdata.h)
-inc/aclsockaddr.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/aclsockaddr.h)
+inc/bttypespartner.h OS_LAYER_PLATFORM_EXPORT_PATH(bttypespartner.h)
+inc/bthci.h OS_LAYER_PLATFORM_EXPORT_PATH(bthci.h)
+inc/bluetoothAV.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetoothav.h)
+inc/avctptypes.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/avctptypes.h)
+inc/avctpservices.h OS_LAYER_PLATFORM_EXPORT_PATH(avctpservices.h)
+inc/bt_subscribe_partner.h OS_LAYER_PLATFORM_EXPORT_PATH(bt_subscribe_partner.h)
+inc/pairing.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/pairing.h)
+inc/eirpublisherbase.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/eirpublisherbase.h)
+inc/eirpublishermanufacturerspecificdata.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/eirpublishermanufacturerspecificdata.h)
+inc/aclsockaddr.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/aclsockaddr.h)
+inc/a2dpoptimisation.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/a2dpoptimisation.h)
+inc/a2dpoptimisationparams.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/a2dpoptimisationparams.h)
-
-inc/a2dpoptimisation.h /epoc32/include/bluetooth/a2dpoptimisation.h
-inc/a2dpoptimisationparams.h /epoc32/include/bluetooth/a2dpoptimisationparams.h
PRJ_MMPFILES
//
btlib/bluetooth.mmp
avlib/bluetoothAV.mmp
avctpservices/avctpservices.mmp
a2dpoptimisation/a2dpoptimisation.mmp
-
-PRJ_TESTMMPFILES
-//
--- a/bluetoothmgmt/bluetoothclientlib/inc/a2dpoptimisation.h Wed Aug 18 10:54:44 2010 +0300
+++ b/bluetoothmgmt/bluetoothclientlib/inc/a2dpoptimisation.h Fri Sep 17 08:36:02 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2009-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"
@@ -22,7 +22,7 @@
#define A2DP_OPTIMISATION_H
#include <e32base.h>
-#include <bluetooth/hci/hcitypes.h>
+#include <bttypes.h>
class RHCIServerSession;
--- a/bluetoothmgmt/bluetoothclientlib/inc/bt_sock.h Wed Aug 18 10:54:44 2010 +0300
+++ b/bluetoothmgmt/bluetoothclientlib/inc/bt_sock.h Fri Sep 17 08:36:02 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"
@@ -36,7 +36,7 @@
#include <es_sock.h>
#include <bttypes.h>
-#include <d32comm.h> // for RS232 signal names for RFCOMM
+#include <d32public.h> // for RFCOMM API
#include <bluetooth/hci/hcierrors.h>
#include <btmanclient.h>
#include <bt_subscribe.h>
--- a/bluetoothmgmt/btmgr/Inc/btdevice.h Wed Aug 18 10:54:44 2010 +0300
+++ b/bluetoothmgmt/btmgr/Inc/btdevice.h Fri Sep 17 08:36:02 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"
@@ -20,14 +20,13 @@
#include <e32base.h>
#include <s32mem.h>
-#include <bluetooth/hci/hciopcodes.h>
-#include <bluetooth/hci/hciconsts.h>
+#include <bttypes.h>
/** The maximum length of a bluetooth device name, as stored in CBTDevice.
@publishedAll
@released
**/
-static const TInt KMaxBluetoothNameLen = KHCILocalDeviceNameMaxLength;
+static const TInt KMaxBluetoothNameLen = 248;
/** The maximum length of the user-assinged friendly name for a bluetooth device, as stored in CBTDevice.
@publishedAll
--- a/bluetoothmgmt/btmgr/bld.inf Wed Aug 18 10:54:44 2010 +0300
+++ b/bluetoothmgmt/btmgr/bld.inf Fri Sep 17 08:36:02 2010 +0300
@@ -16,9 +16,9 @@
//
PRJ_EXPORTS
-Inc/BTDefCommPort.h SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(btdefcommport.h)
-Inc/btdevice.h SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(btdevice.h)
-Inc/btmanclient.h SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(btmanclient.h)
+Inc/BTDefCommPort.h OS_LAYER_PUBLIC_EXPORT_PATH(btdefcommport.h)
+Inc/btdevice.h OS_LAYER_PUBLIC_EXPORT_PATH(btdevice.h)
+Inc/btmanclient.h OS_LAYER_PUBLIC_EXPORT_PATH(btmanclient.h)
// Export the compiled DBMS policy file for the Bluetooth Manager DB...
BTManServer/100069CC.SPD z:/private/100012a5/policy/100069cc.spd
--- a/bluetoothmgmt/btmgr/eirclient/group/bld.inf Wed Aug 18 10:54:44 2010 +0300
+++ b/bluetoothmgmt/btmgr/eirclient/group/bld.inf Fri Sep 17 08:36:02 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2007-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"
@@ -14,9 +14,9 @@
//
PRJ_EXPORTS
-../interface/eirclient.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/eirclient.h)
-../interface/eirpublisher.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/eirpublisher.h)
-../interface/eirdatacodec.h SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(bluetooth/eirdatacodec.h)
+../interface/eirclient.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/eirclient.h)
+../interface/eirpublisher.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/eirpublisher.h)
+../interface/eirdatacodec.h OS_LAYER_PUBLIC_EXPORT_PATH(bluetooth/eirdatacodec.h)
PRJ_MMPFILES
eirclient.mmp
--- a/bthci/bthci2/CommandsEvents/group/bld.inf Wed Aug 18 10:54:44 2010 +0300
+++ b/bthci/bthci2/CommandsEvents/group/bld.inf Fri Sep 17 08:36:02 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2007-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"
@@ -16,13 +16,13 @@
PRJ_EXPORTS
// Base classes and utilities for commands and events.
-../interface/Command.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/command.h)
-../interface/Event.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/event.h)
-../interface/commandcompleteevent.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/commandcompleteevent.h)
-../interface/VendorDebugCommand.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/vendordebugcommand.h)
-../interface/VendorDebugEvent.H SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/vendordebugevent.h)
-../interface/VendorDebugCompleteEvent.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/vendordebugcompleteevent.h)
-../interface/completingeventquery.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/completingeventquery.h)
+../interface/Command.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/command.h)
+../interface/Event.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/event.h)
+../interface/commandcompleteevent.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/commandcompleteevent.h)
+../interface/VendorDebugCommand.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/vendordebugcommand.h)
+../interface/VendorDebugEvent.H OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/vendordebugevent.h)
+../interface/VendorDebugCompleteEvent.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/vendordebugcompleteevent.h)
+../interface/completingeventquery.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/completingeventquery.h)
// The actual commands and events classes.
@@ -31,347 +31,347 @@
//
// Link Control Commands
//
-../interface/inquirycommand.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/inquirycommand.h)
-../interface/inquirycancelcommand.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/inquirycancelcommand.h)
-../interface/periodicinquirymodecommand.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/periodicinquirymodecommand.h)
-../interface/exitperiodicinquirymodecommand.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/exitperiodicinquirymodecommand.h)
-../interface/createaclconnectioncommand.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/createaclconnectioncommand.h)
-../interface/disconnectcommand.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/disconnectcommand.h)
-../interface/createconnectioncancelcommand.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/createconnectioncancelcommand.h)
-../interface/acceptconnectionrequestcommand.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/acceptconnectionrequestcommand.h)
-../interface/rejectconnectionrequestcommand.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/rejectconnectionrequestcommand.h)
-../interface/linkkeyrequestreplycommand.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/linkkeyrequestreplycommand.h)
-../interface/linkkeyrequestreplynegativecommand.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/linkkeyrequestreplynegativecommand.h)
-../interface/pincoderequestreplycommand.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/pincoderequestreplycommand.h)
-../interface/pincoderequestreplynegativecommand.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/pincoderequestreplynegativecommand.h)
-../interface/changeconnectionpackettypecommand.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/changeconnectionpackettypecommand.h)
-../interface/authenticationrequestedcommand.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/authenticationrequestedcommand.h)
-../interface/setconnectionencryptioncommand.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/setconnectionencryptioncommand.h)
-../interface/changelinkkeycommand.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/changelinkkeycommand.h)
-../interface/masterlinkkeycommand.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/masterlinkkeycommand.h)
-../interface/remotenamerequestcommand.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/remotenamerequestcommand.h)
-../interface/remotenamerequestcancelcommand.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/remotenamerequestcancelcommand.h)
-../interface/readremotesupportedfeaturescommand.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readremotesupportedfeaturescommand.h)
-../interface/readremoteextendedfeaturescommand.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readremoteextendedfeaturescommand.h)
-../interface/readremoteversioninfocommand.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readremoteversioninfocommand.h)
-../interface/readclockoffsetcommand.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readclockoffsetcommand.h)
-../interface/readlmphandlecommand.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readlmphandlecommand.h)
-../interface/setupsynchronousconnectioncommand.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/setupsynchronousconnectioncommand.h)
-../interface/acceptsynchronousconnectionrequestcommand.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/acceptsynchronousconnectionrequestcommand.h)
-../interface/rejectsynchronousconnectionrequestcommand.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/rejectsynchronousconnectionrequestcommand.h)
-../interface/iocapabilityrequestreplycommand.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/iocapabilityrequestreplycommand.h)
-../interface/userconfirmationrequestreplycommand.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/userconfirmationrequestreplycommand.h)
-../interface/userconfirmationrequestnegativereplycommand.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/userconfirmationrequestnegativereplycommand.h)
-../interface/userpasskeyrequestreplycommand.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/userpasskeyrequestreplycommand.h)
-../interface/userpasskeyrequestnegativereplycommand.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/userpasskeyrequestnegativereplycommand.h)
-../interface/remoteoobdatarequestreplycommand.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/remoteoobdatarequestreplycommand.h)
-../interface/remoteoobdatarequestnegativereplycommand.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/remoteoobdatarequestnegativereplycommand.h)
-../interface/iocapabilityrequestnegativereplycommand.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/iocapabilityrequestnegativereplycommand.h)
+../interface/inquirycommand.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/inquirycommand.h)
+../interface/inquirycancelcommand.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/inquirycancelcommand.h)
+../interface/periodicinquirymodecommand.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/periodicinquirymodecommand.h)
+../interface/exitperiodicinquirymodecommand.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/exitperiodicinquirymodecommand.h)
+../interface/createaclconnectioncommand.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/createaclconnectioncommand.h)
+../interface/disconnectcommand.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/disconnectcommand.h)
+../interface/createconnectioncancelcommand.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/createconnectioncancelcommand.h)
+../interface/acceptconnectionrequestcommand.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/acceptconnectionrequestcommand.h)
+../interface/rejectconnectionrequestcommand.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/rejectconnectionrequestcommand.h)
+../interface/linkkeyrequestreplycommand.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/linkkeyrequestreplycommand.h)
+../interface/linkkeyrequestreplynegativecommand.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/linkkeyrequestreplynegativecommand.h)
+../interface/pincoderequestreplycommand.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/pincoderequestreplycommand.h)
+../interface/pincoderequestreplynegativecommand.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/pincoderequestreplynegativecommand.h)
+../interface/changeconnectionpackettypecommand.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/changeconnectionpackettypecommand.h)
+../interface/authenticationrequestedcommand.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/authenticationrequestedcommand.h)
+../interface/setconnectionencryptioncommand.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/setconnectionencryptioncommand.h)
+../interface/changelinkkeycommand.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/changelinkkeycommand.h)
+../interface/masterlinkkeycommand.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/masterlinkkeycommand.h)
+../interface/remotenamerequestcommand.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/remotenamerequestcommand.h)
+../interface/remotenamerequestcancelcommand.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/remotenamerequestcancelcommand.h)
+../interface/readremotesupportedfeaturescommand.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readremotesupportedfeaturescommand.h)
+../interface/readremoteextendedfeaturescommand.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readremoteextendedfeaturescommand.h)
+../interface/readremoteversioninfocommand.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readremoteversioninfocommand.h)
+../interface/readclockoffsetcommand.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readclockoffsetcommand.h)
+../interface/readlmphandlecommand.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readlmphandlecommand.h)
+../interface/setupsynchronousconnectioncommand.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/setupsynchronousconnectioncommand.h)
+../interface/acceptsynchronousconnectionrequestcommand.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/acceptsynchronousconnectionrequestcommand.h)
+../interface/rejectsynchronousconnectionrequestcommand.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/rejectsynchronousconnectionrequestcommand.h)
+../interface/iocapabilityrequestreplycommand.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/iocapabilityrequestreplycommand.h)
+../interface/userconfirmationrequestreplycommand.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/userconfirmationrequestreplycommand.h)
+../interface/userconfirmationrequestnegativereplycommand.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/userconfirmationrequestnegativereplycommand.h)
+../interface/userpasskeyrequestreplycommand.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/userpasskeyrequestreplycommand.h)
+../interface/userpasskeyrequestnegativereplycommand.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/userpasskeyrequestnegativereplycommand.h)
+../interface/remoteoobdatarequestreplycommand.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/remoteoobdatarequestreplycommand.h)
+../interface/remoteoobdatarequestnegativereplycommand.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/remoteoobdatarequestnegativereplycommand.h)
+../interface/iocapabilityrequestnegativereplycommand.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/iocapabilityrequestnegativereplycommand.h)
//
// Link Policy Commands
//
-../interface/holdmodecommand.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/holdmodecommand.h)
-../interface/sniffmodecommand.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/sniffmodecommand.h)
-../interface/exitsniffmodecommand.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/exitsniffmodecommand.h)
-../interface/parkmodecommand.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/parkmodecommand.h)
-../interface/exitparkmodecommand.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/exitparkmodecommand.h)
-../interface/qossetupcommand.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/qossetupcommand.h)
-../interface/rolediscoverycommand.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/rolediscoverycommand.h)
-../interface/switchrolecommand.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/switchrolecommand.h)
-../interface/readlinkpolicysettingscommand.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readlinkpolicysettingscommand.h)
-../interface/writelinkpolicysettingscommand.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/writelinkpolicysettingscommand.h)
-../interface/readdefaultlinkpolicysettingscommand.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readdefaultlinkpolicysettingscommand.h)
-../interface/writedefaultlinkpolicysettingscommand.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/writedefaultlinkpolicysettingscommand.h)
-../interface/flowspecificationcommand.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/flowspecificationcommand.h)
-../interface/sniffsubratingcommand.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/sniffsubratingcommand.h)
+../interface/holdmodecommand.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/holdmodecommand.h)
+../interface/sniffmodecommand.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/sniffmodecommand.h)
+../interface/exitsniffmodecommand.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/exitsniffmodecommand.h)
+../interface/parkmodecommand.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/parkmodecommand.h)
+../interface/exitparkmodecommand.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/exitparkmodecommand.h)
+../interface/qossetupcommand.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/qossetupcommand.h)
+../interface/rolediscoverycommand.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/rolediscoverycommand.h)
+../interface/switchrolecommand.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/switchrolecommand.h)
+../interface/readlinkpolicysettingscommand.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readlinkpolicysettingscommand.h)
+../interface/writelinkpolicysettingscommand.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/writelinkpolicysettingscommand.h)
+../interface/readdefaultlinkpolicysettingscommand.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readdefaultlinkpolicysettingscommand.h)
+../interface/writedefaultlinkpolicysettingscommand.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/writedefaultlinkpolicysettingscommand.h)
+../interface/flowspecificationcommand.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/flowspecificationcommand.h)
+../interface/sniffsubratingcommand.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/sniffsubratingcommand.h)
//
// Controller and Baseband Commands
//
-../interface/seteventmaskcommand.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/seteventmaskcommand.h)
-../interface/resetcommand.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/resetcommand.h)
-../interface/seteventfiltercommand.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/seteventfiltercommand.h)
-../interface/flushcommand.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/flushcommand.h)
-../interface/readpintypecommand.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readpintypecommand.h)
-../interface/writepintypecommand.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/writepintypecommand.h)
-../interface/createnewunitkeycommand.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/createnewunitkeycommand.h)
-../interface/readstoredlinkkeycommand.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readstoredlinkkeycommand.h)
-../interface/writestoredlinkkeycommand.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/writestoredlinkkeycommand.h)
-../interface/deletestoredlinkkeycommand.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/deletestoredlinkkeycommand.h)
-../interface/WriteLocalNameCommand.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/writelocalnamecommand.h)
-../interface/ReadLocalNameCommand.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readlocalnamecommand.h)
-../interface/readconnectionaccepttimeoutcommand.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readconnectionaccepttimeoutcommand.h)
-../interface/writeconnectionaccepttimeoutcommand.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/writeconnectionaccepttimeoutcommand.h)
-../interface/readpagetimeoutcommand.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readpagetimeoutcommand.h)
-../interface/writepagetimeoutcommand.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/writepagetimeoutcommand.h)
-../interface/readscanenablecommand.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readscanenablecommand.h)
-../interface/writescanenablecommand.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/writescanenablecommand.h)
-../interface/readpagescanactivitycommand.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readpagescanactivitycommand.h)
-../interface/writepagescanactivitycommand.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/writepagescanactivitycommand.h)
-../interface/readinquiryscanactivitycommand.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readinquiryscanactivitycommand.h)
-../interface/writeinquiryscanactivitycommand.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/writeinquiryscanactivitycommand.h)
-../interface/readauthenticationenablecommand.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readauthenticationenablecommand.h)
-../interface/writeauthenticationenablecommand.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/writeauthenticationenablecommand.h)
-../interface/readclassofdevicecommand.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readclassofdevicecommand.h)
-../interface/writeclassofdevicecommand.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/writeclassofdevicecommand.h)
-../interface/readvoicesettingcommand.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readvoicesettingcommand.h)
-../interface/writevoicesettingcommand.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/writevoicesettingcommand.h)
-../interface/readautomaticflushtimeoutcommand.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readautomaticflushtimeoutcommand.h)
-../interface/writeautomaticflushtimeoutcommand.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/writeautomaticflushtimeoutcommand.h)
-../interface/readnumbroadcastretransmissionscommand.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readnumbroadcastretransmissionscommand.h)
-../interface/writenumbroadcastretransmissionscommand.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/writenumbroadcastretransmissionscommand.h)
-../interface/readholdmodeactivitycommand.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readholdmodeactivitycommand.h)
-../interface/writeholdmodeactivitycommand.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/writeholdmodeactivitycommand.h)
-../interface/readtransmitpowerlevelcommand.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readtransmitpowerlevelcommand.h)
-../interface/readsynchronousflowcontrolenablecommand.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readsynchronousflowcontrolenablecommand.h)
-../interface/writesynchronousflowcontrolenablecommand.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/writesynchronousflowcontrolenablecommand.h)
-../interface/setcontrollertohostflowcontrolcommand.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/setcontrollertohostflowcontrolcommand.h)
-../interface/hostbuffersizecommand.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/hostbuffersizecommand.h)
-../interface/hostnumberofcompletedpacketscommand.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/hostnumberofcompletedpacketscommand.h)
-../interface/readlinksupervisiontimeoutcommand.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readlinksupervisiontimeoutcommand.h)
-../interface/writelinksupervisiontimeoutcommand.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/writelinksupervisiontimeoutcommand.h)
-../interface/readnumberofsupportediaccommand.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readnumberofsupportediaccommand.h)
-../interface/readcurrentiaclapcommand.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readcurrentiaclapcommand.h)
-../interface/writecurrentiaclapcommand.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/writecurrentiaclapcommand.h)
-../interface/setafhhostchannelclassificationcommand.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/setafhhostchannelclassificationcommand.h)
-../interface/readinquiryscantypecommand.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readinquiryscantypecommand.h)
-../interface/writeinquiryscantypecommand.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/writeinquiryscantypecommand.h)
-../interface/readinquirymodecommand.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readinquirymodecommand.h)
-../interface/writeinquirymodecommand.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/writeinquirymodecommand.h)
-../interface/readpagescantypecommand.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readpagescantypecommand.h)
-../interface/writepagescantypecommand.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/writepagescantypecommand.h)
-../interface/readafhchannelassessmentmodecommand.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readafhchannelassessmentmodecommand.h)
-../interface/writeafhchannelassessmentmodecommand.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/writeafhchannelassessmentmodecommand.h)
-../interface/readextendedinquiryresponsecommand.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readextendedinquiryresponsecommand.h)
-../interface/writeextendedinquiryresponsecommand.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/writeextendedinquiryresponsecommand.h)
-../interface/refreshencryptionkeycommand.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/refreshencryptionkeycommand.h)
-../interface/readsimplepairingmodecommand.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readsimplepairingmodecommand.h)
-../interface/writesimplepairingmodecommand.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/writesimplepairingmodecommand.h)
-../interface/readlocaloobdatacommand.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readlocaloobdatacommand.h)
-../interface/readinquiryresponsetransmitpowerlevelcommand.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readinquiryresponsetransmitpowerlevelcommand.h)
-../interface/writeinquiryresponsetransmitpowerlevelcommand.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/writeinquiryresponsetransmitpowerlevelcommand.h)
-../interface/sendkeypressnotificationcommand.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/sendkeypressnotificationcommand.h)
-../interface/readdefaulterroneousdatareportingcommand.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readdefaulterroneousdatareportingcommand.h)
-../interface/writedefaulterroneousdatareportingcommand.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/writedefaulterroneousdatareportingcommand.h)
-../interface/enhancedflushcommand.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/enhancedflushcommand.h)
+../interface/seteventmaskcommand.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/seteventmaskcommand.h)
+../interface/resetcommand.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/resetcommand.h)
+../interface/seteventfiltercommand.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/seteventfiltercommand.h)
+../interface/flushcommand.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/flushcommand.h)
+../interface/readpintypecommand.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readpintypecommand.h)
+../interface/writepintypecommand.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/writepintypecommand.h)
+../interface/createnewunitkeycommand.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/createnewunitkeycommand.h)
+../interface/readstoredlinkkeycommand.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readstoredlinkkeycommand.h)
+../interface/writestoredlinkkeycommand.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/writestoredlinkkeycommand.h)
+../interface/deletestoredlinkkeycommand.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/deletestoredlinkkeycommand.h)
+../interface/WriteLocalNameCommand.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/writelocalnamecommand.h)
+../interface/ReadLocalNameCommand.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readlocalnamecommand.h)
+../interface/readconnectionaccepttimeoutcommand.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readconnectionaccepttimeoutcommand.h)
+../interface/writeconnectionaccepttimeoutcommand.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/writeconnectionaccepttimeoutcommand.h)
+../interface/readpagetimeoutcommand.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readpagetimeoutcommand.h)
+../interface/writepagetimeoutcommand.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/writepagetimeoutcommand.h)
+../interface/readscanenablecommand.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readscanenablecommand.h)
+../interface/writescanenablecommand.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/writescanenablecommand.h)
+../interface/readpagescanactivitycommand.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readpagescanactivitycommand.h)
+../interface/writepagescanactivitycommand.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/writepagescanactivitycommand.h)
+../interface/readinquiryscanactivitycommand.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readinquiryscanactivitycommand.h)
+../interface/writeinquiryscanactivitycommand.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/writeinquiryscanactivitycommand.h)
+../interface/readauthenticationenablecommand.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readauthenticationenablecommand.h)
+../interface/writeauthenticationenablecommand.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/writeauthenticationenablecommand.h)
+../interface/readclassofdevicecommand.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readclassofdevicecommand.h)
+../interface/writeclassofdevicecommand.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/writeclassofdevicecommand.h)
+../interface/readvoicesettingcommand.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readvoicesettingcommand.h)
+../interface/writevoicesettingcommand.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/writevoicesettingcommand.h)
+../interface/readautomaticflushtimeoutcommand.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readautomaticflushtimeoutcommand.h)
+../interface/writeautomaticflushtimeoutcommand.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/writeautomaticflushtimeoutcommand.h)
+../interface/readnumbroadcastretransmissionscommand.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readnumbroadcastretransmissionscommand.h)
+../interface/writenumbroadcastretransmissionscommand.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/writenumbroadcastretransmissionscommand.h)
+../interface/readholdmodeactivitycommand.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readholdmodeactivitycommand.h)
+../interface/writeholdmodeactivitycommand.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/writeholdmodeactivitycommand.h)
+../interface/readtransmitpowerlevelcommand.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readtransmitpowerlevelcommand.h)
+../interface/readsynchronousflowcontrolenablecommand.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readsynchronousflowcontrolenablecommand.h)
+../interface/writesynchronousflowcontrolenablecommand.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/writesynchronousflowcontrolenablecommand.h)
+../interface/setcontrollertohostflowcontrolcommand.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/setcontrollertohostflowcontrolcommand.h)
+../interface/hostbuffersizecommand.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/hostbuffersizecommand.h)
+../interface/hostnumberofcompletedpacketscommand.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/hostnumberofcompletedpacketscommand.h)
+../interface/readlinksupervisiontimeoutcommand.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readlinksupervisiontimeoutcommand.h)
+../interface/writelinksupervisiontimeoutcommand.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/writelinksupervisiontimeoutcommand.h)
+../interface/readnumberofsupportediaccommand.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readnumberofsupportediaccommand.h)
+../interface/readcurrentiaclapcommand.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readcurrentiaclapcommand.h)
+../interface/writecurrentiaclapcommand.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/writecurrentiaclapcommand.h)
+../interface/setafhhostchannelclassificationcommand.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/setafhhostchannelclassificationcommand.h)
+../interface/readinquiryscantypecommand.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readinquiryscantypecommand.h)
+../interface/writeinquiryscantypecommand.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/writeinquiryscantypecommand.h)
+../interface/readinquirymodecommand.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readinquirymodecommand.h)
+../interface/writeinquirymodecommand.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/writeinquirymodecommand.h)
+../interface/readpagescantypecommand.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readpagescantypecommand.h)
+../interface/writepagescantypecommand.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/writepagescantypecommand.h)
+../interface/readafhchannelassessmentmodecommand.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readafhchannelassessmentmodecommand.h)
+../interface/writeafhchannelassessmentmodecommand.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/writeafhchannelassessmentmodecommand.h)
+../interface/readextendedinquiryresponsecommand.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readextendedinquiryresponsecommand.h)
+../interface/writeextendedinquiryresponsecommand.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/writeextendedinquiryresponsecommand.h)
+../interface/refreshencryptionkeycommand.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/refreshencryptionkeycommand.h)
+../interface/readsimplepairingmodecommand.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readsimplepairingmodecommand.h)
+../interface/writesimplepairingmodecommand.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/writesimplepairingmodecommand.h)
+../interface/readlocaloobdatacommand.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readlocaloobdatacommand.h)
+../interface/readinquiryresponsetransmitpowerlevelcommand.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readinquiryresponsetransmitpowerlevelcommand.h)
+../interface/writeinquiryresponsetransmitpowerlevelcommand.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/writeinquiryresponsetransmitpowerlevelcommand.h)
+../interface/sendkeypressnotificationcommand.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/sendkeypressnotificationcommand.h)
+../interface/readdefaulterroneousdatareportingcommand.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readdefaulterroneousdatareportingcommand.h)
+../interface/writedefaulterroneousdatareportingcommand.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/writedefaulterroneousdatareportingcommand.h)
+../interface/enhancedflushcommand.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/enhancedflushcommand.h)
//
// Informational Parameters
//
-../interface/readlocalversioninfocommand.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readlocalversioninfocommand.h)
-../interface/readlocalsupportedcommandscommand.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readlocalsupportedcommandscommand.h)
-../interface/readlocalsupportedfeaturescommand.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readlocalsupportedfeaturescommand.h)
-../interface/readlocalextendedfeaturescommand.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readlocalextendedfeaturescommand.h)
-../interface/readbuffersizecommand.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readbuffersizecommand.h)
-../interface/readbdaddrcommand.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readbdaddrcommand.h)
+../interface/readlocalversioninfocommand.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readlocalversioninfocommand.h)
+../interface/readlocalsupportedcommandscommand.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readlocalsupportedcommandscommand.h)
+../interface/readlocalsupportedfeaturescommand.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readlocalsupportedfeaturescommand.h)
+../interface/readlocalextendedfeaturescommand.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readlocalextendedfeaturescommand.h)
+../interface/readbuffersizecommand.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readbuffersizecommand.h)
+../interface/readbdaddrcommand.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readbdaddrcommand.h)
//
// Status Parameters
//
-../interface/readfailedcontactcountercommand.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readfailedcontactcountercommand.h)
-../interface/resetfailedcontactcountercommand.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/resetfailedcontactcountercommand.h)
-../interface/readlinkqualitycommand.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readlinkqualitycommand.h)
-../interface/readrssicommand.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readrssicommand.h)
-../interface/readafhchannelmapcommand.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readafhchannelmapcommand.h)
-../interface/readclockcommand.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readclockcommand.h)
+../interface/readfailedcontactcountercommand.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readfailedcontactcountercommand.h)
+../interface/resetfailedcontactcountercommand.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/resetfailedcontactcountercommand.h)
+../interface/readlinkqualitycommand.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readlinkqualitycommand.h)
+../interface/readrssicommand.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readrssicommand.h)
+../interface/readafhchannelmapcommand.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readafhchannelmapcommand.h)
+../interface/readclockcommand.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readclockcommand.h)
//
// Testing Commands
//
-../interface/readloopbackmodecommand.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readloopbackmodecommand.h)
-../interface/writeloopbackmodecommand.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/writeloopbackmodecommand.h)
-../interface/enabledeviceundertestmodecommand.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/enabledeviceundertestmodecommand.h)
-../interface/writesimplepairingdebugmodecommand.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/writesimplepairingdebugmodecommand.h)
+../interface/readloopbackmodecommand.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readloopbackmodecommand.h)
+../interface/writeloopbackmodecommand.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/writeloopbackmodecommand.h)
+../interface/enabledeviceundertestmodecommand.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/enabledeviceundertestmodecommand.h)
+../interface/writesimplepairingdebugmodecommand.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/writesimplepairingdebugmodecommand.h)
// Command Complete Events
// Nop
-../interface/nopcompleteevent.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/nopcompleteevent.h)
+../interface/nopcompleteevent.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/nopcompleteevent.h)
//
// Link Control Commands
//
-../interface/inquirycancelcompleteevent.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/inquirycancelcompleteevent.h)
-../interface/periodicinquirymodecompleteevent.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/periodicinquirymodecompleteevent.h)
-../interface/exitperiodicinquirymodecompleteevent.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/exitperiodicinquirymodecompleteevent.h)
-../interface/createconnectioncancelcompleteevent.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/createconnectioncancelcompleteevent.h)
-../interface/linkkeyrequestreplycompleteevent.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/linkkeyrequestreplycompleteevent.h)
-../interface/linkkeyrequestreplynegativecompleteevent.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/linkkeyrequestreplynegativecompleteevent.h)
-../interface/pincoderequestreplycompleteevent.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/pincoderequestreplycompleteevent.h)
-../interface/pincoderequestreplynegativecompleteevent.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/pincoderequestreplynegativecompleteevent.h)
-../interface/remotenamerequestcancelcompleteevent.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/remotenamerequestcancelcompleteevent.h)
-../interface/readlmphandlecompleteevent.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readlmphandlecompleteevent.h)
-../interface/iocapabilityrequestreplycompleteevent.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/iocapabilityrequestreplycompleteevent.h)
-../interface/userconfirmationrequestreplycompleteevent.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/userconfirmationrequestreplycompleteevent.h)
-../interface/userconfirmationrequestnegativereplycompleteevent.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/userconfirmationrequestnegativereplycompleteevent.h)
-../interface/userpasskeyrequestreplycompleteevent.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/userpasskeyrequestreplycompleteevent.h)
-../interface/userpasskeyrequestnegativereplycompleteevent.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/userpasskeyrequestnegativereplycompleteevent.h)
-../interface/remoteoobdatarequestreplycompleteevent.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/remoteoobdatarequestreplycompleteevent.h)
-../interface/remoteoobdatarequestnegativereplycompleteevent.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/remoteoobdatarequestnegativereplycompleteevent.h)
-../interface/iocapabilityrequestnegativereplycompleteevent.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/iocapabilityrequestnegativereplycompleteevent.h)
+../interface/inquirycancelcompleteevent.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/inquirycancelcompleteevent.h)
+../interface/periodicinquirymodecompleteevent.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/periodicinquirymodecompleteevent.h)
+../interface/exitperiodicinquirymodecompleteevent.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/exitperiodicinquirymodecompleteevent.h)
+../interface/createconnectioncancelcompleteevent.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/createconnectioncancelcompleteevent.h)
+../interface/linkkeyrequestreplycompleteevent.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/linkkeyrequestreplycompleteevent.h)
+../interface/linkkeyrequestreplynegativecompleteevent.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/linkkeyrequestreplynegativecompleteevent.h)
+../interface/pincoderequestreplycompleteevent.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/pincoderequestreplycompleteevent.h)
+../interface/pincoderequestreplynegativecompleteevent.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/pincoderequestreplynegativecompleteevent.h)
+../interface/remotenamerequestcancelcompleteevent.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/remotenamerequestcancelcompleteevent.h)
+../interface/readlmphandlecompleteevent.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readlmphandlecompleteevent.h)
+../interface/iocapabilityrequestreplycompleteevent.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/iocapabilityrequestreplycompleteevent.h)
+../interface/userconfirmationrequestreplycompleteevent.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/userconfirmationrequestreplycompleteevent.h)
+../interface/userconfirmationrequestnegativereplycompleteevent.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/userconfirmationrequestnegativereplycompleteevent.h)
+../interface/userpasskeyrequestreplycompleteevent.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/userpasskeyrequestreplycompleteevent.h)
+../interface/userpasskeyrequestnegativereplycompleteevent.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/userpasskeyrequestnegativereplycompleteevent.h)
+../interface/remoteoobdatarequestreplycompleteevent.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/remoteoobdatarequestreplycompleteevent.h)
+../interface/remoteoobdatarequestnegativereplycompleteevent.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/remoteoobdatarequestnegativereplycompleteevent.h)
+../interface/iocapabilityrequestnegativereplycompleteevent.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/iocapabilityrequestnegativereplycompleteevent.h)
//
// Link Policy Commands
//
-../interface/rolediscoverycompleteevent.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/rolediscoverycompleteevent.h)
-../interface/readlinkpolicysettingscompleteevent.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readlinkpolicysettingscompleteevent.h)
-../interface/writelinkpolicysettingscompleteevent.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/writelinkpolicysettingscompleteevent.h)
-../interface/readdefaultlinkpolicysettingscompleteevent.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readdefaultlinkpolicysettingscompleteevent.h)
-../interface/writedefaultlinkpolicysettingscompleteevent.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/writedefaultlinkpolicysettingscompleteevent.h)
-../interface/sniffsubratingcompleteevent.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/sniffsubratingcompleteevent.h)
+../interface/rolediscoverycompleteevent.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/rolediscoverycompleteevent.h)
+../interface/readlinkpolicysettingscompleteevent.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readlinkpolicysettingscompleteevent.h)
+../interface/writelinkpolicysettingscompleteevent.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/writelinkpolicysettingscompleteevent.h)
+../interface/readdefaultlinkpolicysettingscompleteevent.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readdefaultlinkpolicysettingscompleteevent.h)
+../interface/writedefaultlinkpolicysettingscompleteevent.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/writedefaultlinkpolicysettingscompleteevent.h)
+../interface/sniffsubratingcompleteevent.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/sniffsubratingcompleteevent.h)
//
// Controller and Baseband Commands
//
-../interface/seteventmaskcompleteevent.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/seteventmaskcompleteevent.h)
-../interface/resetcompleteevent.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/resetcompleteevent.h)
-../interface/seteventfiltercompleteevent.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/seteventfiltercompleteevent.h)
-../interface/flushcompleteevent.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/flushcompleteevent.h)
-../interface/readpintypecompleteevent.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readpintypecompleteevent.h)
-../interface/writepintypecompleteevent.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/writepintypecompleteevent.h)
-../interface/createnewunitkeycompleteevent.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/createnewunitkeycompleteevent.h)
-../interface/readstoredlinkkeycompleteevent.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readstoredlinkkeycompleteevent.h)
-../interface/writestoredlinkkeycompleteevent.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/writestoredlinkkeycompleteevent.h)
-../interface/deletestoredlinkkeycompleteevent.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/deletestoredlinkkeycompleteevent.h)
-../interface/writelocalnamecompleteevent.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/writelocalnamecompleteevent.h)
-../interface/ReadLocalNameCompleteEvent.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readlocalnamecompleteevent.h)
-../interface/readconnectionaccepttimeoutcompleteevent.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readconnectionaccepttimeoutcompleteevent.h)
-../interface/writeconnectionaccepttimeoutcompleteevent.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/writeconnectionaccepttimeoutcompleteevent.h)
-../interface/readpagetimeoutcompleteevent.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readpagetimeoutcompleteevent.h)
-../interface/writepagetimeoutcompleteevent.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/writepagetimeoutcompleteevent.h)
-../interface/readscanenablecompleteevent.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readscanenablecompleteevent.h)
-../interface/writescanenablecompleteevent.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/writescanenablecompleteevent.h)
-../interface/readpagescanactivitycompleteevent.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readpagescanactivitycompleteevent.h)
-../interface/writepagescanactivitycompleteevent.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/writepagescanactivitycompleteevent.h)
-../interface/readinquiryscanactivitycompleteevent.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readinquiryscanactivitycompleteevent.h)
-../interface/writeinquiryscanactivitycompleteevent.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/writeinquiryscanactivitycompleteevent.h)
-../interface/readauthenticationenablecompleteevent.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readauthenticationenablecompleteevent.h)
-../interface/writeauthenticationenablecompleteevent.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/writeauthenticationenablecompleteevent.h)
-../interface/readclassofdevicecompleteevent.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readclassofdevicecompleteevent.h)
-../interface/writeclassofdevicecompleteevent.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/writeclassofdevicecompleteevent.h)
-../interface/readvoicesettingcompleteevent.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readvoicesettingcompleteevent.h)
-../interface/writevoicesettingcompleteevent.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/writevoicesettingcompleteevent.h)
-../interface/readautomaticflushtimeoutcompleteevent.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readautomaticflushtimeoutcompleteevent.h)
-../interface/writeautomaticflushtimeoutcompleteevent.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/writeautomaticflushtimeoutcompleteevent.h)
-../interface/readnumbroadcastretransmissionscompleteevent.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readnumbroadcastretransmissionscompleteevent.h)
-../interface/writenumbroadcastretransmissionscompleteevent.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/writenumbroadcastretransmissionscompleteevent.h)
-../interface/readholdmodeactivitycompleteevent.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readholdmodeactivitycompleteevent.h)
-../interface/writeholdmodeactivitycompleteevent.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/writeholdmodeactivitycompleteevent.h)
-../interface/readtransmitpowerlevelcompleteevent.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readtransmitpowerlevelcompleteevent.h)
-../interface/readsynchronousflowcontrolenablecompleteevent.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readsynchronousflowcontrolenablecompleteevent.h)
-../interface/writesynchronousflowcontrolenablecompleteevent.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/writesynchronousflowcontrolenablecompleteevent.h)
-../interface/setcontrollertohostflowcontrolcompleteevent.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/setcontrollertohostflowcontrolcompleteevent.h)
-../interface/hostbuffersizecompleteevent.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/hostbuffersizecompleteevent.h)
-../interface/hostnumberofcompletedpacketscompleteevent.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/hostnumberofcompletedpacketscompleteevent.h)
-../interface/readlinksupervisiontimeoutcompleteevent.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readlinksupervisiontimeoutcompleteevent.h)
-../interface/writelinksupervisiontimeoutcompleteevent.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/writelinksupervisiontimeoutcompleteevent.h)
-../interface/readnumberofsupportediaccompleteevent.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readnumberofsupportediaccompleteevent.h)
-../interface/readcurrentiaclapcompleteevent.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readcurrentiaclapcompleteevent.h)
-../interface/writecurrentiaclapcompleteevent.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/writecurrentiaclapcompleteevent.h)
-../interface/setafhhostchannelclassificationcompleteevent.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/setafhhostchannelclassificationcompleteevent.h)
-../interface/readinquiryscantypecompleteevent.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readinquiryscantypecompleteevent.h)
-../interface/writeinquiryscantypecompleteevent.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/writeinquiryscantypecompleteevent.h)
-../interface/readinquirymodecompleteevent.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readinquirymodecompleteevent.h)
-../interface/writeinquirymodecompleteevent.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/writeinquirymodecompleteevent.h)
-../interface/readpagescantypecompleteevent.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readpagescantypecompleteevent.h)
-../interface/writepagescantypecompleteevent.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/writepagescantypecompleteevent.h)
-../interface/readafhchannelassessmentmodecompleteevent.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readafhchannelassessmentmodecompleteevent.h)
-../interface/writeafhchannelassessmentmodecompleteevent.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/writeafhchannelassessmentmodecompleteevent.h)
-../interface/readextendedinquiryresponsecompleteevent.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readextendedinquiryresponsecompleteevent.h)
-../interface/writeextendedinquiryresponsecompleteevent.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/writeextendedinquiryresponsecompleteevent.h)
-../interface/readsimplepairingmodecompleteevent.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readsimplepairingmodecompleteevent.h)
-../interface/writesimplepairingmodecompleteevent.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/writesimplepairingmodecompleteevent.h)
-../interface/readlocaloobdatacompleteevent.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readlocaloobdatacompleteevent.h)
-../interface/readinquiryresponsetransmitpowerlevelcompleteevent.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readinquiryresponsetransmitpowerlevelcompleteevent.h)
-../interface/writeinquiryresponsetransmitpowerlevelcompleteevent.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/writeinquiryresponsetransmitpowerlevelcompleteevent.h)
-../interface/sendkeypressnotificationcompleteevent.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/sendkeypressnotificationcompleteevent.h)
-../interface/readdefaulterroneousdatareportingcompleteevent.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readdefaulterroneousdatareportingcompleteevent.h)
-../interface/writedefaulterroneousdatareportingcompleteevent.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/writedefaulterroneousdatareportingcompleteevent.h)
+../interface/seteventmaskcompleteevent.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/seteventmaskcompleteevent.h)
+../interface/resetcompleteevent.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/resetcompleteevent.h)
+../interface/seteventfiltercompleteevent.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/seteventfiltercompleteevent.h)
+../interface/flushcompleteevent.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/flushcompleteevent.h)
+../interface/readpintypecompleteevent.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readpintypecompleteevent.h)
+../interface/writepintypecompleteevent.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/writepintypecompleteevent.h)
+../interface/createnewunitkeycompleteevent.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/createnewunitkeycompleteevent.h)
+../interface/readstoredlinkkeycompleteevent.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readstoredlinkkeycompleteevent.h)
+../interface/writestoredlinkkeycompleteevent.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/writestoredlinkkeycompleteevent.h)
+../interface/deletestoredlinkkeycompleteevent.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/deletestoredlinkkeycompleteevent.h)
+../interface/writelocalnamecompleteevent.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/writelocalnamecompleteevent.h)
+../interface/ReadLocalNameCompleteEvent.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readlocalnamecompleteevent.h)
+../interface/readconnectionaccepttimeoutcompleteevent.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readconnectionaccepttimeoutcompleteevent.h)
+../interface/writeconnectionaccepttimeoutcompleteevent.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/writeconnectionaccepttimeoutcompleteevent.h)
+../interface/readpagetimeoutcompleteevent.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readpagetimeoutcompleteevent.h)
+../interface/writepagetimeoutcompleteevent.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/writepagetimeoutcompleteevent.h)
+../interface/readscanenablecompleteevent.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readscanenablecompleteevent.h)
+../interface/writescanenablecompleteevent.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/writescanenablecompleteevent.h)
+../interface/readpagescanactivitycompleteevent.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readpagescanactivitycompleteevent.h)
+../interface/writepagescanactivitycompleteevent.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/writepagescanactivitycompleteevent.h)
+../interface/readinquiryscanactivitycompleteevent.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readinquiryscanactivitycompleteevent.h)
+../interface/writeinquiryscanactivitycompleteevent.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/writeinquiryscanactivitycompleteevent.h)
+../interface/readauthenticationenablecompleteevent.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readauthenticationenablecompleteevent.h)
+../interface/writeauthenticationenablecompleteevent.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/writeauthenticationenablecompleteevent.h)
+../interface/readclassofdevicecompleteevent.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readclassofdevicecompleteevent.h)
+../interface/writeclassofdevicecompleteevent.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/writeclassofdevicecompleteevent.h)
+../interface/readvoicesettingcompleteevent.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readvoicesettingcompleteevent.h)
+../interface/writevoicesettingcompleteevent.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/writevoicesettingcompleteevent.h)
+../interface/readautomaticflushtimeoutcompleteevent.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readautomaticflushtimeoutcompleteevent.h)
+../interface/writeautomaticflushtimeoutcompleteevent.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/writeautomaticflushtimeoutcompleteevent.h)
+../interface/readnumbroadcastretransmissionscompleteevent.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readnumbroadcastretransmissionscompleteevent.h)
+../interface/writenumbroadcastretransmissionscompleteevent.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/writenumbroadcastretransmissionscompleteevent.h)
+../interface/readholdmodeactivitycompleteevent.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readholdmodeactivitycompleteevent.h)
+../interface/writeholdmodeactivitycompleteevent.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/writeholdmodeactivitycompleteevent.h)
+../interface/readtransmitpowerlevelcompleteevent.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readtransmitpowerlevelcompleteevent.h)
+../interface/readsynchronousflowcontrolenablecompleteevent.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readsynchronousflowcontrolenablecompleteevent.h)
+../interface/writesynchronousflowcontrolenablecompleteevent.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/writesynchronousflowcontrolenablecompleteevent.h)
+../interface/setcontrollertohostflowcontrolcompleteevent.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/setcontrollertohostflowcontrolcompleteevent.h)
+../interface/hostbuffersizecompleteevent.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/hostbuffersizecompleteevent.h)
+../interface/hostnumberofcompletedpacketscompleteevent.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/hostnumberofcompletedpacketscompleteevent.h)
+../interface/readlinksupervisiontimeoutcompleteevent.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readlinksupervisiontimeoutcompleteevent.h)
+../interface/writelinksupervisiontimeoutcompleteevent.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/writelinksupervisiontimeoutcompleteevent.h)
+../interface/readnumberofsupportediaccompleteevent.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readnumberofsupportediaccompleteevent.h)
+../interface/readcurrentiaclapcompleteevent.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readcurrentiaclapcompleteevent.h)
+../interface/writecurrentiaclapcompleteevent.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/writecurrentiaclapcompleteevent.h)
+../interface/setafhhostchannelclassificationcompleteevent.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/setafhhostchannelclassificationcompleteevent.h)
+../interface/readinquiryscantypecompleteevent.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readinquiryscantypecompleteevent.h)
+../interface/writeinquiryscantypecompleteevent.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/writeinquiryscantypecompleteevent.h)
+../interface/readinquirymodecompleteevent.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readinquirymodecompleteevent.h)
+../interface/writeinquirymodecompleteevent.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/writeinquirymodecompleteevent.h)
+../interface/readpagescantypecompleteevent.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readpagescantypecompleteevent.h)
+../interface/writepagescantypecompleteevent.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/writepagescantypecompleteevent.h)
+../interface/readafhchannelassessmentmodecompleteevent.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readafhchannelassessmentmodecompleteevent.h)
+../interface/writeafhchannelassessmentmodecompleteevent.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/writeafhchannelassessmentmodecompleteevent.h)
+../interface/readextendedinquiryresponsecompleteevent.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readextendedinquiryresponsecompleteevent.h)
+../interface/writeextendedinquiryresponsecompleteevent.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/writeextendedinquiryresponsecompleteevent.h)
+../interface/readsimplepairingmodecompleteevent.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readsimplepairingmodecompleteevent.h)
+../interface/writesimplepairingmodecompleteevent.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/writesimplepairingmodecompleteevent.h)
+../interface/readlocaloobdatacompleteevent.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readlocaloobdatacompleteevent.h)
+../interface/readinquiryresponsetransmitpowerlevelcompleteevent.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readinquiryresponsetransmitpowerlevelcompleteevent.h)
+../interface/writeinquiryresponsetransmitpowerlevelcompleteevent.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/writeinquiryresponsetransmitpowerlevelcompleteevent.h)
+../interface/sendkeypressnotificationcompleteevent.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/sendkeypressnotificationcompleteevent.h)
+../interface/readdefaulterroneousdatareportingcompleteevent.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readdefaulterroneousdatareportingcompleteevent.h)
+../interface/writedefaulterroneousdatareportingcompleteevent.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/writedefaulterroneousdatareportingcompleteevent.h)
//
// Informational Parameters
//
-../interface/readlocalversioninfocompleteevent.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readlocalversioninfocompleteevent.h)
-../interface/readlocalsupportedcommandscompleteevent.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readlocalsupportedcommandscompleteevent.h)
-../interface/readlocalsupportedfeaturescompleteevent.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readlocalsupportedfeaturescompleteevent.h)
-../interface/readlocalextendedfeaturescompleteevent.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readlocalextendedfeaturescompleteevent.h)
-../interface/readbuffersizecompleteevent.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readbuffersizecompleteevent.h)
-../interface/readbdaddrcompleteevent.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readbdaddrcompleteevent.h)
+../interface/readlocalversioninfocompleteevent.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readlocalversioninfocompleteevent.h)
+../interface/readlocalsupportedcommandscompleteevent.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readlocalsupportedcommandscompleteevent.h)
+../interface/readlocalsupportedfeaturescompleteevent.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readlocalsupportedfeaturescompleteevent.h)
+../interface/readlocalextendedfeaturescompleteevent.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readlocalextendedfeaturescompleteevent.h)
+../interface/readbuffersizecompleteevent.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readbuffersizecompleteevent.h)
+../interface/readbdaddrcompleteevent.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readbdaddrcompleteevent.h)
//
// Status Parameters
//
-../interface/readfailedcontactcountercompleteevent.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readfailedcontactcountercompleteevent.h)
-../interface/resetfailedcontactcountercompleteevent.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/resetfailedcontactcountercompleteevent.h)
-../interface/readlinkqualitycompleteevent.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readlinkqualitycompleteevent.h)
-../interface/readrssicompleteevent.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readrssicompleteevent.h)
-../interface/readafhchannelmapcompleteevent.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readafhchannelmapcompleteevent.h)
-../interface/readclockcompleteevent.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readclockcompleteevent.h)
+../interface/readfailedcontactcountercompleteevent.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readfailedcontactcountercompleteevent.h)
+../interface/resetfailedcontactcountercompleteevent.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/resetfailedcontactcountercompleteevent.h)
+../interface/readlinkqualitycompleteevent.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readlinkqualitycompleteevent.h)
+../interface/readrssicompleteevent.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readrssicompleteevent.h)
+../interface/readafhchannelmapcompleteevent.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readafhchannelmapcompleteevent.h)
+../interface/readclockcompleteevent.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readclockcompleteevent.h)
//
// Testing Commands
//
-../interface/readloopbackmodecompleteevent.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readloopbackmodecompleteevent.h)
-../interface/writeloopbackmodecompleteevent.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/writeloopbackmodecompleteevent.h)
-../interface/enabledeviceundertestmodecompleteevent.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/enabledeviceundertestmodecompleteevent.h)
-../interface/writesimplepairingdebugmodecompleteevent.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/writesimplepairingdebugmodecompleteevent.h)
+../interface/readloopbackmodecompleteevent.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readloopbackmodecompleteevent.h)
+../interface/writeloopbackmodecompleteevent.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/writeloopbackmodecompleteevent.h)
+../interface/enabledeviceundertestmodecompleteevent.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/enabledeviceundertestmodecompleteevent.h)
+../interface/writesimplepairingdebugmodecompleteevent.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/writesimplepairingdebugmodecompleteevent.h)
// Events
-../interface/inquirycompleteevent.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/inquirycompleteevent.h)
-../interface/inquiryresultevent.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/inquiryresultevent.h)
-../interface/connectioncompleteevent.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/connectioncompleteevent.h)
-../interface/connectionrequestevent.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/connectionrequestevent.h)
-../interface/disconnectioncompleteevent.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/disconnectioncompleteevent.h)
-../interface/authenticationcompleteevent.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/authenticationcompleteevent.h)
-../interface/remotenamereqcompleteevent.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/remotenamereqcompleteevent.h)
-../interface/encryptionchangeevent.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/encryptionchangeevent.h)
-../interface/changelinkkeyevent.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/changelinkkeyevent.h)
-../interface/masterlinkkeyevent.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/masterlinkkeyevent.h)
-../interface/readremsuppfeatcompleteevent.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readremsuppfeatcompleteevent.h)
-../interface/readremverinfocompleteevent.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readremverinfocompleteevent.h)
-../interface/qossetupcompleteevent.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/qossetupcompleteevent.h)
-../interface/commandstatusevent.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/commandstatusevent.h)
-../interface/hardwareerrorevent.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/hardwareerrorevent.h)
-../interface/flushoccurredevent.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/flushoccurredevent.h)
-../interface/rolechangeevent.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/rolechangeevent.h)
-../interface/numberofcompletedpacketsevent.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/numberofcompletedpacketsevent.h)
-../interface/modechangeevent.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/modechangeevent.h)
-../interface/returnlinkkeysevent.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/returnlinkkeysevent.h)
-../interface/pincoderequestevent.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/pincoderequestevent.h)
-../interface/linkkeyrequestevent.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/linkkeyrequestevent.h)
-../interface/linkkeynotificationevent.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/linkkeynotificationevent.h)
-../interface/loopbackcommandevent.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/loopbackcommandevent.h)
-../interface/databufferoverflowevent.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/databufferoverflowevent.h)
-../interface/maxslotschangeevent.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/maxslotschangeevent.h)
-../interface/readclockoffsetevent.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readclockoffsetevent.h)
-../interface/connectionpackettypechangedevent.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/connectionpackettypechangedevent.h)
-../interface/qosviolationevent.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/qosviolationevent.h)
-../interface/pagescanrepetitionmodechangeevent.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/pagescanrepetitionmodechangeevent.h)
-../interface/flowspecificationcompleteevent.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/flowspecificationcompleteevent.h)
-../interface/inquiryresultwithrssievent.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/inquiryresultwithrssievent.h)
-../interface/readremoteextendedfeaturescompleteevent.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readremoteextendedfeaturescompleteevent.h)
-../interface/synchronousconnectioncompleteevent.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/synchronousconnectioncompleteevent.h)
-../interface/synchronousconnectionchangedevent.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/synchronousconnectionchangedevent.h)
-../interface/sniffsubratingevent.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/sniffsubratingevent.h)
-../interface/extendedinquiryresultevent.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/extendedinquiryresultevent.h)
-../interface/encryptionkeyrefreshcompleteevent.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/encryptionkeyrefreshcompleteevent.h)
-../interface/iocapabilityrequestevent.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/iocapabilityrequestevent.h)
-../interface/iocapabilityresponseevent.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/iocapabilityresponseevent.h)
-../interface/userconfirmationrequestevent.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/userconfirmationrequestevent.h)
-../interface/userpasskeyrequestevent.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/userpasskeyrequestevent.h)
-../interface/remoteoobdatarequestevent.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/remoteoobdatarequestevent.h)
-../interface/simplepairingcompleteevent.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/simplepairingcompleteevent.h)
-../interface/linksupervisiontimeoutchangedevent.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/linksupervisiontimeoutchangedevent.h)
-../interface/enhancedflushcompleteevent.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/enhancedflushcompleteevent.h)
-../interface/userpasskeynotificationevent.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/userpasskeynotificationevent.h)
-../interface/keypressnotificationevent.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/keypressnotificationevent.h)
-../interface/remotehostsupportedfeaturesnotificationevent.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/remotehostsupportedfeaturesnotificationevent.h)
+../interface/inquirycompleteevent.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/inquirycompleteevent.h)
+../interface/inquiryresultevent.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/inquiryresultevent.h)
+../interface/connectioncompleteevent.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/connectioncompleteevent.h)
+../interface/connectionrequestevent.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/connectionrequestevent.h)
+../interface/disconnectioncompleteevent.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/disconnectioncompleteevent.h)
+../interface/authenticationcompleteevent.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/authenticationcompleteevent.h)
+../interface/remotenamereqcompleteevent.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/remotenamereqcompleteevent.h)
+../interface/encryptionchangeevent.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/encryptionchangeevent.h)
+../interface/changelinkkeyevent.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/changelinkkeyevent.h)
+../interface/masterlinkkeyevent.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/masterlinkkeyevent.h)
+../interface/readremsuppfeatcompleteevent.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readremsuppfeatcompleteevent.h)
+../interface/readremverinfocompleteevent.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readremverinfocompleteevent.h)
+../interface/qossetupcompleteevent.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/qossetupcompleteevent.h)
+../interface/commandstatusevent.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/commandstatusevent.h)
+../interface/hardwareerrorevent.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/hardwareerrorevent.h)
+../interface/flushoccurredevent.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/flushoccurredevent.h)
+../interface/rolechangeevent.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/rolechangeevent.h)
+../interface/numberofcompletedpacketsevent.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/numberofcompletedpacketsevent.h)
+../interface/modechangeevent.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/modechangeevent.h)
+../interface/returnlinkkeysevent.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/returnlinkkeysevent.h)
+../interface/pincoderequestevent.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/pincoderequestevent.h)
+../interface/linkkeyrequestevent.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/linkkeyrequestevent.h)
+../interface/linkkeynotificationevent.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/linkkeynotificationevent.h)
+../interface/loopbackcommandevent.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/loopbackcommandevent.h)
+../interface/databufferoverflowevent.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/databufferoverflowevent.h)
+../interface/maxslotschangeevent.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/maxslotschangeevent.h)
+../interface/readclockoffsetevent.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readclockoffsetevent.h)
+../interface/connectionpackettypechangedevent.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/connectionpackettypechangedevent.h)
+../interface/qosviolationevent.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/qosviolationevent.h)
+../interface/pagescanrepetitionmodechangeevent.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/pagescanrepetitionmodechangeevent.h)
+../interface/flowspecificationcompleteevent.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/flowspecificationcompleteevent.h)
+../interface/inquiryresultwithrssievent.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/inquiryresultwithrssievent.h)
+../interface/readremoteextendedfeaturescompleteevent.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readremoteextendedfeaturescompleteevent.h)
+../interface/synchronousconnectioncompleteevent.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/synchronousconnectioncompleteevent.h)
+../interface/synchronousconnectionchangedevent.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/synchronousconnectionchangedevent.h)
+../interface/sniffsubratingevent.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/sniffsubratingevent.h)
+../interface/extendedinquiryresultevent.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/extendedinquiryresultevent.h)
+../interface/encryptionkeyrefreshcompleteevent.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/encryptionkeyrefreshcompleteevent.h)
+../interface/iocapabilityrequestevent.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/iocapabilityrequestevent.h)
+../interface/iocapabilityresponseevent.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/iocapabilityresponseevent.h)
+../interface/userconfirmationrequestevent.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/userconfirmationrequestevent.h)
+../interface/userpasskeyrequestevent.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/userpasskeyrequestevent.h)
+../interface/remoteoobdatarequestevent.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/remoteoobdatarequestevent.h)
+../interface/simplepairingcompleteevent.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/simplepairingcompleteevent.h)
+../interface/linksupervisiontimeoutchangedevent.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/linksupervisiontimeoutchangedevent.h)
+../interface/enhancedflushcompleteevent.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/enhancedflushcompleteevent.h)
+../interface/userpasskeynotificationevent.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/userpasskeynotificationevent.h)
+../interface/keypressnotificationevent.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/keypressnotificationevent.h)
+../interface/remotehostsupportedfeaturesnotificationevent.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/remotehostsupportedfeaturesnotificationevent.h)
// Deprecated Commands and Events
-../interface/readpagescanperiodcommand.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readpagescanperiodcommand.h)
-../interface/readpagescanperiodcompleteevent.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readpagescanperiodcompleteevent.h)
-../interface/writepagescanperiodcommand.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/writepagescanperiodcommand.h)
-../interface/writepagescanperiodcompleteevent.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/writepagescanperiodcompleteevent.h)
-../interface/addscoconnectioncommand.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/addscoconnectioncommand.h)
-../interface/pagescanmodechangeevent.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/pagescanmodechangeevent.h)
-../interface/readencryptionmodecommand.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readencryptionmodecommand.h)
-../interface/readencryptionmodecompleteevent.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readencryptionmodecompleteevent.h)
-../interface/writeencryptionmodecommand.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/writeencryptionmodecommand.h)
-../interface/writeencryptionmodecompleteevent.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/writeencryptionmodecompleteevent.h)
+../interface/readpagescanperiodcommand.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readpagescanperiodcommand.h)
+../interface/readpagescanperiodcompleteevent.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readpagescanperiodcompleteevent.h)
+../interface/writepagescanperiodcommand.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/writepagescanperiodcommand.h)
+../interface/writepagescanperiodcompleteevent.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/writepagescanperiodcompleteevent.h)
+../interface/addscoconnectioncommand.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/addscoconnectioncommand.h)
+../interface/pagescanmodechangeevent.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/pagescanmodechangeevent.h)
+../interface/readencryptionmodecommand.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readencryptionmodecommand.h)
+../interface/readencryptionmodecompleteevent.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readencryptionmodecompleteevent.h)
+../interface/writeencryptionmodecommand.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/writeencryptionmodecommand.h)
+../interface/writeencryptionmodecompleteevent.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/writeencryptionmodecompleteevent.h)
// DEF files for the implementation to use.
-../BWINS/commandseventsU.def /epoc32/include/bluetooth/hci/bwins/commandseventsu.def
-../EABI/commandseventsU.def /epoc32/include/bluetooth/hci/eabi/commandseventsu.def
+../BWINS/commandseventsU.def OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/bwins/commandseventsu.def)
+../EABI/commandseventsU.def OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/eabi/commandseventsu.def)
PRJ_MMPFILES
commandsevents_base.mmp
--- a/bthci/bthci2/btpowercontrol/group/bld.inf Wed Aug 18 10:54:44 2010 +0300
+++ b/bthci/bthci2/btpowercontrol/group/bld.inf Fri Sep 17 08:36:02 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"
@@ -16,13 +16,9 @@
//
//
-/**
- @file
-*/
-
PRJ_EXPORTS
-../interface/btpowercontrol.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/btpowercontrol.h)
-../interface/btpowercontrolmessages.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/btpowercontrolmessages.h)
+../interface/btpowercontrol.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/btpowercontrol.h)
+../interface/btpowercontrolmessages.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/btpowercontrolmessages.h)
PRJ_MMPFILES
btpowercontrol.mmp
--- a/bthci/bthci2/dutmode/group/bld.inf Wed Aug 18 10:54:44 2010 +0300
+++ b/bthci/bthci2/dutmode/group/bld.inf Fri Sep 17 08:36:02 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2009-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"
@@ -16,7 +16,7 @@
//
PRJ_EXPORTS
-../interface/dutmode.h /epoc32/include/bluetooth/dutmode.h
+../interface/dutmode.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/dutmode.h)
PRJ_MMPFILES
--- a/bthci/bthci2/dutmode/interface/dutmode.h Wed Aug 18 10:54:44 2010 +0300
+++ b/bthci/bthci2/dutmode/interface/dutmode.h Fri Sep 17 08:36:02 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2009-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"
@@ -22,7 +22,6 @@
#define BLUETOOTH_DUT_MODE_H
#include <e32base.h>
-#include <bluetooth/hci/hcitypes.h>
class RHCIServerSession;
--- a/bthci/bthci2/group/bld.inf Wed Aug 18 10:54:44 2010 +0300
+++ b/bthci/bthci2/group/bld.inf Fri Sep 17 08:36:02 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies).
+// 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"
@@ -32,25 +32,25 @@
hci_framework.iby /epoc32/rom/include/hci_framework.iby
PRJ_EXPORTS
-../corehci/interface/aclpacketconsts.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/aclpacketconsts.h)
-../corehci/interface/basebandpacketconsts.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/basebandpacketconsts.h)
-../corehci/interface/CoreHCI.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/corehci.h)
-../corehci/interface/corehciplugin.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/corehciplugin.h)
-../corehci/interface/hcibase.hrh /epoc32/include/bluetooth/hci/hcibase.hrh
-../corehci/interface/hciconsts.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/hciconsts.h)
-../corehci/interface/HciCommandAllocator.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/hcicommandallocator.h)
-../corehci/interface/HciDataEventObserver.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/hcidataeventobserver.h)
-../corehci/interface/HciCommandEventObserver.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hcicommandeventobserver.h)
-../corehci/interface/HciDataFramer.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/hcidataframer.h)
-../corehci/interface/HciDataObserver.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/hcidataobserver.h)
-../corehci/interface/hcierrors.h SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(bluetooth/hci/hcierrors.h)
-../corehci/interface/hcievents.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/hcievents.h)
-../corehci/interface/hciframe.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/hciframe.h)
-../corehci/interface/hcitypes.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/hcitypes.h)
-../corehci/interface/hciclientusage.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/hciclientusage.h)
+../corehci/interface/aclpacketconsts.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/aclpacketconsts.h)
+../corehci/interface/basebandpacketconsts.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/basebandpacketconsts.h)
+../corehci/interface/CoreHCI.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/corehci.h)
+../corehci/interface/corehciplugin.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/corehciplugin.h)
+../corehci/interface/hcibase.hrh OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/hcibase.hrh)
+../corehci/interface/hciconsts.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/hciconsts.h)
+../corehci/interface/HciCommandAllocator.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/hcicommandallocator.h)
+../corehci/interface/HciDataEventObserver.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/hcidataeventobserver.h)
+../corehci/interface/HciCommandEventObserver.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hcicommandeventobserver.h)
+../corehci/interface/HciDataFramer.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/hcidataframer.h)
+../corehci/interface/HciDataObserver.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/hcidataobserver.h)
+../corehci/interface/hcierrors.h OS_LAYER_PUBLIC_EXPORT_PATH(bluetooth/hci/hcierrors.h)
+../corehci/interface/hcievents.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/hcievents.h)
+../corehci/interface/hciframe.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/hciframe.h)
+../corehci/interface/hcitypes.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/hcitypes.h)
+../corehci/interface/hciclientusage.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/hciclientusage.h)
-../CommandsEvents/interface/hciopcodes.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/hciopcodes.h)
+../CommandsEvents/interface/hciopcodes.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/hciopcodes.h)
-../hctl/interface/hctlchannelobserver.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/hctlchannelobserver.h)
+../hctl/interface/hctlchannelobserver.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/hctlchannelobserver.h)
-../hciserverclient/interface/hciipc.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/hciipc.h)
+../hciserverclient/interface/hciipc.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/hciipc.h)
--- a/bthci/bthci2/hcicmdq/group/bld.inf Wed Aug 18 10:54:44 2010 +0300
+++ b/bthci/bthci2/hcicmdq/group/bld.inf Fri Sep 17 08:36:02 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies).
+// 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"
@@ -14,16 +14,13 @@
//
PRJ_EXPORTS
-../interface/HciCommandQItem.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hcicommandqitem.h)
-../interface/HCICommandQueue.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hcicommandqueue.h)
-../interface/HciCommandQueueClient.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hcicommandqueueclient.h)
-../interface/HciCmdQController.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hcicmdqcontroller.h)
+../interface/HciCommandQItem.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hcicommandqitem.h)
+../interface/HCICommandQueue.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hcicommandqueue.h)
+../interface/HciCommandQueueClient.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hcicommandqueueclient.h)
+../interface/HciCmdQController.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hcicmdqcontroller.h)
-cmdq.ini /epoc32/data/z/private/101f7989/bluetooth/cmdq.ini
-cmdq.ini /epoc32/release/winscw/udeb/z/private/101f7989/bluetooth/cmdq.ini // for winscw UDEB
-cmdq.ini /epoc32/release/winscw/urel/z/private/101f7989/bluetooth/cmdq.ini // for winscw UREL
+cmdq.ini z:/private/101f7989/bluetooth/cmdq.ini
PRJ_MMPFILES
HCICmdQ.mmp
-PRJ_TESTMMPFILES
--- a/bthci/bthci2/hciserverclient/group/bld.inf Wed Aug 18 10:54:44 2010 +0300
+++ b/bthci/bthci2/hciserverclient/group/bld.inf Fri Sep 17 08:36:02 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies).
+// 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"
@@ -14,7 +14,7 @@
//
PRJ_EXPORTS
-../interface/hciserverclient.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hciserverclient.h)
+../interface/hciserverclient.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hciserverclient.h)
PRJ_MMPFILES
hciserverclient.mmp
--- a/bthci/bthci2/hciutil/group/bld.inf Wed Aug 18 10:54:44 2010 +0300
+++ b/bthci/bthci2/hciutil/group/bld.inf Fri Sep 17 08:36:02 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies).
+// 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"
@@ -14,8 +14,8 @@
//
PRJ_EXPORTS
-../interface/hciutil.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/hciutil.h)
-../interface/hciinifile.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/hciinifile.h)
+../interface/hciutil.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/hciutil.h)
+../interface/hciinifile.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/hciinifile.h)
PRJ_MMPFILES
hciutil.mmp
--- a/bthci/bthci2/hctl/group/bld.inf Wed Aug 18 10:54:44 2010 +0300
+++ b/bthci/bthci2/hctl/group/bld.inf Fri Sep 17 08:36:02 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies).
+// 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"
@@ -14,19 +14,19 @@
//
PRJ_EXPORTS
-../interface/delay.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/delay.h)
-../interface/hctlbase.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/hctlbase.h)
-../interface/hctlbase.hrh /epoc32/include/bluetooth/hci/hctlbase.hrh
-../interface/hctldataobserver.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/hctldataobserver.h)
-../interface/hctleventobserver.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/hctleventobserver.h)
-../interface/hctlinterface.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/hctlinterface.h)
-../interface/hctluartbase.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/hctluartbase.h)
-../interface/QdpPluginInterfaceFinder.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/qdpplugininterfacefinder.h)
-../interface/HctlPowerInterface.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/hctlpowerinterface.h)
-../interface/hctluartpowermanager.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/hctluartpowermanager.h)
-../interface/hctluartpowerobserver.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/hctluartpowerobserver.h)
+../interface/delay.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/delay.h)
+../interface/hctlbase.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/hctlbase.h)
+../interface/hctlbase.hrh OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/hctlbase.hrh)
+../interface/hctldataobserver.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/hctldataobserver.h)
+../interface/hctleventobserver.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/hctleventobserver.h)
+../interface/hctlinterface.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/hctlinterface.h)
+../interface/hctluartbase.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/hctluartbase.h)
+../interface/QdpPluginInterfaceFinder.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/qdpplugininterfacefinder.h)
+../interface/HctlPowerInterface.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/hctlpowerinterface.h)
+../interface/hctluartpowermanager.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/hctluartpowermanager.h)
+../interface/hctluartpowerobserver.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/hctluartpowerobserver.h)
// NB The interface in this file is re-used by observers of the HCI also.
-../interface/controllerstateobserver.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/controllerstateobserver.h)
+../interface/controllerstateobserver.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/controllerstateobserver.h)
PRJ_MMPFILES
hctl_base.mmp
--- a/bthci/bthci2/initialisor/group/bld.inf Wed Aug 18 10:54:44 2010 +0300
+++ b/bthci/bthci2/initialisor/group/bld.inf Fri Sep 17 08:36:02 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies).
+// 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"
@@ -14,10 +14,10 @@
//
PRJ_EXPORTS
-../interface/ControllerInitialisationInterface.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/controllerinitialisationinterface.h)
-../interface/ControllerInitialisationPlugin.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/controllerinitialisationplugin.h)
-../interface/initialisorbase.hrh /epoc32/include/bluetooth/hci/initialisorbase.hrh
-../interface/ControllerInitialisationObserver.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/controllerinitialisationobserver.h)
+../interface/ControllerInitialisationInterface.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/controllerinitialisationinterface.h)
+../interface/ControllerInitialisationPlugin.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/controllerinitialisationplugin.h)
+../interface/initialisorbase.hrh OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/initialisorbase.hrh)
+../interface/ControllerInitialisationObserver.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/controllerinitialisationobserver.h)
PRJ_MMPFILES
initialisor_base.mmp
--- a/bthci/bthci2/qdp/group/bld.inf Wed Aug 18 10:54:44 2010 +0300
+++ b/bthci/bthci2/qdp/group/bld.inf Fri Sep 17 08:36:02 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies).
+// 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"
@@ -14,9 +14,9 @@
//
PRJ_EXPORTS
-../interface/HciCmdQueueDecisionInterface.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/hcicmdqueuedecisioninterface.h)
-../interface/HciCmdQueueDecisionPlugin.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/hcicmdqueuedecisionplugin.h)
-../interface/qdpbase.hrh /epoc32/include/bluetooth/hci/qdpbase.hrh
+../interface/HciCmdQueueDecisionInterface.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/hcicmdqueuedecisioninterface.h)
+../interface/HciCmdQueueDecisionPlugin.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/hcicmdqueuedecisionplugin.h)
+../interface/qdpbase.hrh OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/qdpbase.hrh)
PRJ_MMPFILES
qdp_base.mmp
--- a/bthci/hci2implementations/CommandsEvents/symbian/group/bld.inf Wed Aug 18 10:54:44 2010 +0300
+++ b/bthci/hci2implementations/CommandsEvents/symbian/group/bld.inf Fri Sep 17 08:36:02 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2007-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"
@@ -14,9 +14,9 @@
//
PRJ_EXPORTS
-commandsevents_symbian.iby /epoc32/rom/include/commandsevents_symbian.iby
-../inc/commandbaseextension.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/commandbaseextension.h)
-../inc/completingeventqueryhelper.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/completingeventqueryhelper.h)
+commandsevents_symbian.iby /epoc32/rom/include/commandsevents_symbian.iby
+../inc/commandbaseextension.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/commandbaseextension.h)
+../inc/completingeventqueryhelper.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/completingeventqueryhelper.h)
PRJ_MMPFILES
commandsevents_symbian.mmp
--- a/bthci/hci2implementations/CommandsEvents/symbian/group/commandsevents_symbian.mmp Wed Aug 18 10:54:44 2010 +0300
+++ b/bthci/hci2implementations/CommandsEvents/symbian/group/commandsevents_symbian.mmp Fri Sep 17 08:36:02 2010 +0300
@@ -353,9 +353,9 @@
// against the exported .def files (which define the ordinals the .lib file is expecting of the implemenation).
NOEXPORTLIBRARY
#ifdef WINS
-DEFFILE /epoc32/include/bluetooth/hci/bwins/commandsevents.def
+DEFFILE OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/bwins/commandsevents.def)
#else
-DEFFILE /epoc32/include/bluetooth/hci/eabi/commandsevents.def
+DEFFILE OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/eabi/commandsevents.def)
#endif
OPTION cw -strict on -w pedantic,unused,hidevirtual,padding,ptrintconv
--- a/bthci/hci2implementations/hctls/ti/group/bld.inf Wed Aug 18 10:54:44 2010 +0300
+++ b/bthci/hci2implementations/hctls/ti/group/bld.inf Fri Sep 17 08:36:02 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies).
+// 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"
@@ -14,12 +14,9 @@
//
PRJ_EXPORTS
-../inc/HCTLConfigInterface.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/hctlconfiginterface.h)
+../inc/HCTLConfigInterface.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/hctlconfiginterface.h)
-hctl_ti.ini /epoc32/data/z/private/101f7989/bluetooth/hctl_ti.ini
-
-hctl_ti.ini /epoc32/release/winscw/udeb/z/private/101f7989/bluetooth/hctl_ti.ini // For WINSCW UDEB builds
-hctl_ti.ini /epoc32/release/winscw/urel/z/private/101f7989/bluetooth/hctl_ti.ini // For WINSCW UREL builds
+hctl_ti.ini z:/private/101f7989/bluetooth/hctl_ti.ini
hctl_ti.iby /epoc32/rom/include/hctl_ti.iby
--- a/bthci/hciextensioninterface/bld.inf Wed Aug 18 10:54:44 2010 +0300
+++ b/bthci/hciextensioninterface/bld.inf Fri Sep 17 08:36:02 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2009-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"
@@ -14,7 +14,7 @@
//
PRJ_EXPORTS
-inc/hciproxy.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(hciproxy.h)
+inc/hciproxy.h OS_LAYER_PLATFORM_EXPORT_PATH(hciproxy.h)
HCIProxy.iby /epoc32/rom/include/hciproxy.iby
PRJ_MMPFILES
--- a/bthci/hciextensioninterface/tsrc/tproxy.cpp Wed Aug 18 10:54:44 2010 +0300
+++ b/bthci/hciextensioninterface/tsrc/tproxy.cpp Fri Sep 17 08:36:02 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"
@@ -20,10 +20,11 @@
#include <f32file.h>
#include <bt_sock.h>
#include <c32comm.h>
-#include "btmanclient.h"
+#include <btmanclient.h>
#include "debug.h"
#include <btsdp.h>
#include <hciproxy.h>
+#include <bluetooth/hci/hciopcodes.h>
#if defined (__WINS__)
#define PDD_NAME _L("ECDRV")
--- a/bthci/hciextensioninterface/tsrc/tproxycorehci/group/bld.inf Wed Aug 18 10:54:44 2010 +0300
+++ b/bthci/hciextensioninterface/tsrc/tproxycorehci/group/bld.inf Fri Sep 17 08:36:02 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2008-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,16 +17,10 @@
//
PRJ_TESTEXPORTS
-../inc/HCICOREPLUGINIMPL.H SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(HCICOREPLUGINIMPL.H)
-
-bluetooth_stack.ini /epoc32/data/z/private/101f7989/bluetooth/bluetooth_stack.ini //For ARMV5
-corehci_tproxy.ini /epoc32/data/z/private/101f7989/bluetooth/corehci_tproxy.ini
+../inc/HCICOREPLUGINIMPL.H OS_LAYER_PLATFORM_EXPORT_PATH(HCICOREPLUGINIMPL.H)
-bluetooth_stack.ini /epoc32/release/winscw/udeb/z/private/101f7989/bluetooth/bluetooth_stack.ini // For WINSCW debugging
-corehci_tproxy.ini /epoc32/release/winscw/udeb/z/private/101f7989/bluetooth/corehci_tproxy.ini
-
-bluetooth_stack.ini /epoc32/release/winscw/urel/z/private/101f7989/bluetooth/bluetooth_stack.ini // For WINSCW debugging
-corehci_tproxy.ini /epoc32/release/winscw/urel/z/private/101f7989/bluetooth/corehci_tproxy.ini
+bluetooth_stack.ini z:/private/101f7989/bluetooth/bluetooth_stack.ini
+corehci_tproxy.ini z:/private/101f7989/bluetooth/corehci_tproxy.ini
corehci_tproxy.iby /epoc32/rom/include/corehci_tproxy.iby
--- a/irda/irdastack/group/BLD.INF Wed Aug 18 10:54:44 2010 +0300
+++ b/irda/irdastack/group/BLD.INF Fri Sep 17 08:36:02 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"
@@ -15,26 +15,21 @@
//
//
-/**
- @file
-*/
-
-
PRJ_EXPORTS
-../INC/IR_SOCK.H SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(ir_sock.h)
+../INC/IR_SOCK.H OS_LAYER_PUBLIC_EXPORT_PATH(ir_sock.h)
-../INC/irdaextensions.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(irdaextensions.h)
+../INC/irdaextensions.h OS_LAYER_PLATFORM_EXPORT_PATH(irdaextensions.h)
-../irtranp/tranp.h SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(tranp.h)
+../irtranp/tranp.h OS_LAYER_PUBLIC_EXPORT_PATH(tranp.h)
-../INC/irerr.ra /epoc32/include/errors/generic/irerr.ra
-../INC/irerr.rls /epoc32/include/errors/generic/irerr.rls
+../INC/irerr.ra OS_LAYER_PUBLIC_EXPORT_PATH(errors/generic/irerr.ra)
+../INC/irerr.rls OS_LAYER_PUBLIC_EXPORT_PATH(errors/generic/irerr.rls)
-../INC/irda.rh SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(irda.rh)
+../INC/irda.rh OS_LAYER_PLATFORM_EXPORT_PATH(irda.rh)
-../group/irda.iby /epoc32/rom/include/irda.iby
+../group/irda.iby /epoc32/rom/include/irda.iby
PRJ_MMPFILES
--- a/irda/irdastack/group/irda.iby Wed Aug 18 10:54:44 2010 +0300
+++ b/irda/irdastack/group/irda.iby Fri Sep 17 08:36:02 2010 +0300
@@ -31,8 +31,6 @@
#include <commsdebugutility.iby>
#endif
-#include <obexprotocol.iby>
-
REM *** irda.dll and irtranp.dll (Infrared Transfer Picture) are
REM *** client side dlls. They are always included in the ROM whether
REM *** IRDA is supported by the device or not, so that client