--- a/atext/client/src/atextcommon.cpp	Mon May 03 13:34:38 2010 +0300
+++ b/atext/client/src/atextcommon.cpp	Mon Jul 12 07:03:47 2010 +0300
@@ -55,7 +55,7 @@
         Close();
         }
     TRACE_FUNC_EXIT
-    return KErrNone;
+    return retVal;
     }
 
 // ---------------------------------------------------------------------------

--- a/atext/server/group/extsrv.mmp	Mon May 03 13:34:38 2010 +0300
+++ b/atext/server/group/extsrv.mmp	Mon Jul 12 07:03:47 2010 +0300
@@ -47,7 +47,7 @@
 EPOCSTACKSIZE           0x5000 // Hack for plugins using RCmManager; remove this line when RCmManager becomes client-server
 EPOCHEAPSIZE            0x1000 0x2000000  // Use same as MCE
 
-CAPABILITY              CAP_SERVER NetworkControl CommDD
+CAPABILITY              CAP_SERVER NetworkControl CommDD PowerMgmt
 VENDORID                VID_DEFAULT
 
 SOURCEPATH              ../src

--- a/atext/server/inc/atextcommonsession.h	Mon May 03 13:34:38 2010 +0300
+++ b/atext/server/inc/atextcommonsession.h	Mon Jul 12 07:03:47 2010 +0300
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2008 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"
@@ -253,7 +253,7 @@
     /**
      * Session to ECOM
      */
-    REComSession iEComSession;
+    REComSession* iEComSession;
 
     /**
      * Instance of plugin

--- a/atext/server/inc/atextmetadata.h	Mon May 03 13:34:38 2010 +0300
+++ b/atext/server/inc/atextmetadata.h	Mon Jul 12 07:03:47 2010 +0300
@@ -302,6 +302,13 @@
      */
     CATExtPluginBase* iOldHandler;
 
+    /**
+     * Pointer to editor handler; set when editor mode started,
+     * NULL when editor mode not active.
+     * Not own.
+     */
+    TATExtPluginEntry* iEditorHandler;
+
     };
 
 /**
@@ -521,6 +528,22 @@
                                  TBool aMultiPart );
 
     /**
+     * Writes multipart or single part reply buffer to client for handle.
+     * Used for creating a reply for HandleCommand().
+     *
+     * @since S60 5.0
+     * @param aMultiPart ETrue (default behavior) if multipart reply wanted,
+     *                   EFalse otherwise.
+     *                   For multipart replies the reply may be over
+     *                   KDefaultCmdBufLength.
+     * @param aStartOfEditor ETrue if start of editor mode,
+     *                       EFalse otherwise
+     * @return Symbian error code on error, KErrNone otherwise
+     */
+    TInt WriteHandleCmdReplyBuffer( TBool aMultiPart,
+                                    TBool aStartOfEditor );
+
+    /**
      * Clears internal initialized command handler data. This is currently used
      * only by CompleteCommandMessage() and is called when the data is not
      * needed anymore. It also prepares the internal data for a new

--- a/atext/server/inc/atextsession.h	Mon May 03 13:34:38 2010 +0300
+++ b/atext/server/inc/atextsession.h	Mon Jul 12 07:03:47 2010 +0300
@@ -1,5 +1,5 @@
 /*
-* 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"
@@ -418,7 +418,7 @@
     /**
      * Session to ECOM
      */
-    REComSession iEComSession;
+    REComSession* iEComSession;
 
     /**
      * ECOM listener

--- a/atext/server/src/atextcommonsession.cpp	Mon May 03 13:34:38 2010 +0300
+++ b/atext/server/src/atextcommonsession.cpp	Mon Jul 12 07:03:47 2010 +0300
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2008 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"
@@ -11,7 +11,7 @@
 *
 * Contributors:
 *
-* Description: 
+* Description:
 *
 */
 
@@ -132,6 +132,7 @@
 CATExtCommonSession::CATExtCommonSession( CATExtSrvCommon& aServer,
                                           const TVersion& aVersion ) :
     iServer( aServer ),
+    iEComSession( NULL ),
     iVersion( aVersion )
     {
     }
@@ -158,13 +159,12 @@
         TRACE_FUNC_EXIT
         User::Leave( retTemp );
         }
-    REComSession& ecomSession = REComSession::OpenL();
-    CleanupClosePushL( ecomSession );
+    iEComSession = &REComSession::OpenL();
     RImplInfoPtrArray implementations;
     CleanupResetDestroyClosePushL( implementations );
     TUid ifUid = TUid::Uid( ATEXT_INTERFACE_COM_UID );
-    iEComSession.ListImplementationsL( ifUid,
-                                       implementations );
+    iEComSession->ListImplementationsL( ifUid,
+                                        implementations );
     if ( implementations.Count() != 1 )
         {
         TRACE_FUNC_EXIT
@@ -173,9 +173,7 @@
     TUid pluginUid = implementations[0]->ImplementationUid();
     iCommonBase = CATExtCommonBase::NewL( pluginUid, *this, connectionName );
     CleanupStack::PopAndDestroy( &implementations );
-    CleanupStack::Pop( &ecomSession );
     CleanupStack::PopAndDestroy( &connectionName );
-    iEComSession = ecomSession;
     TRACE_FUNC_EXIT
     }
 
@@ -488,7 +486,10 @@
         }
     delete iCommonBase;
     iCommonBase = NULL;
-    iEComSession.Close();
+    if ( iEComSession )
+        {
+        iEComSession->Close();
+        }
     if ( !aSyncClose )
         {
         REComSession::FinalClose();

--- a/atext/server/src/atextmetadata.cpp	Mon May 03 13:34:38 2010 +0300
+++ b/atext/server/src/atextmetadata.cpp	Mon Jul 12 07:03:47 2010 +0300
@@ -211,6 +211,22 @@
         TRACE_FUNC_EXIT
         return retTemp;
         }
+    // First check if in editor mode
+    if ( iCmdData.iEditorHandler )
+        {
+        iCmdData.iReplyExpected = EFalse;
+        iCmdData.iHandler = iCmdData.iEditorHandler;
+        iCmdData.iHandler->iInstance->HandleCommand( iCmdData.iCmdBuffer,
+                                                     iCmdData.iCmdReplyBuffer,
+                                                     EFalse );
+        aComplInfo.iProcessed = ETrue;
+        aComplInfo.iReplyExpected = ETrue;
+        // Note: The aComplInfo.iReplyExpected is used only for normal mode and
+        // is set to ETrue here to skip a check in CATExtSession::IpcHandleCommand().
+        TRACE_FUNC_EXIT
+        return KErrNone;
+        }
+    // Not in editor so handle in normal mode
     TRACE_INFO(( _L8("Received command '%S'"), &iCmdData.iCmdBuffer ));
     // Now the command exists. Load the plugins for a command and check support.
     TRAPD( retTrap, CreateAndFindSupportL(iCmdData.iCmdBuffer,
@@ -327,20 +343,42 @@
         TRACE_FUNC_EXIT
         return KErrInUse;
         }
+    if ( !iCmdData.iCmdMessage.Handle() )
+        {
+        TRACE_FUNC_EXIT
+        return KErrBadHandle;
+        }
+    TBool startOfEditor = EFalse;
+    if ( aReplyType == EReplyTypeEditor)
+        {
+        // If completion is for editor command then set iCmdData.iEditorHandler
+        // for the first time only
+        if ( !iCmdData.iEditorHandler )
+            {
+            iCmdData.iEditorHandler = FindInstanceFromPlugindata( aPlugin );
+            iCmdData.iReplyExpected = ETrue;  // reply expected when first reply in editor mode
+            startOfEditor = ETrue;
+            }
+        }
+    else
+        {
+        // If completion was something else than EReplyTypeEditor then just end
+        // editor mode (no need to check iEditorHandler)
+        if ( iCmdData.iEditorHandler )
+            {
+            iCmdData.iReplyExpected = ETrue;  // reply expected when last reply in editor mode
+            }
+        iCmdData.iEditorHandler = NULL;
+        }
     // Next check if aPlugin is set (the call comes from a plugin and not from
     // ATEXT) and a reply is not needed. In this case do nothing as it is wrong
     // behavior from the plugin (a plugin must not complete messages where no
     // reply is expected; this is done by ATEXT)
-    if ( aPlugin && !iCmdData.iReplyExpected )
+    if ( aPlugin && !iCmdData.iReplyExpected && !iCmdData.iEditorHandler )
         {
         TRACE_FUNC_EXIT
         return KErrAlreadyExists;
         }
-    if ( !iCmdData.iCmdMessage.Handle() )
-        {
-        TRACE_FUNC_EXIT
-        return KErrBadHandle;
-        }
     // Finally write the data and complete the message
     TPckg<TATExtensionReplyType> replyType( aReplyType );
     TInt writeError = iCmdData.iCmdMessage.Write( EATExtHandleCmdParamReplyType,
@@ -356,20 +394,7 @@
             {
             CreateEmptyOrErrorBuffer( iCmdData.iCmdReplyBuffer, aErrorReply );
             }
-        if ( aMultiPart )
-            {
-            WriteReplyBufferToClient( iCmdData.iCmdReplyBuffer,
-                                      EATExtHandleCmdParamReply,
-                                      iCmdData.iCmdMessage,
-                                      ETrue,
-                                      EATExtHandleCmdParamLength );
-            }
-        else
-            {
-            WriteReplyBufferToClient( iCmdData.iCmdReplyBuffer,
-                                      EATExtHandleCmdParamReply,
-                                      iCmdData.iCmdMessage );
-            }
+        WriteHandleCmdReplyBuffer( aMultiPart, startOfEditor );
         }
     iCmdData.iCmdStarted = EFalse;
     iCmdData.iReplyExpected = EFalse;
@@ -380,6 +405,38 @@
     }
 
 // ---------------------------------------------------------------------------
+// Writes multipart or single part reply buffer to client for handle.
+// Used for creating a reply for HandleCommand().
+// ---------------------------------------------------------------------------
+//
+TInt CATExtMetadata::WriteHandleCmdReplyBuffer( TBool aMultiPart,
+                                                TBool aStartOfEditor )
+    {
+    TRACE_FUNC_ENTRY
+    if ( iCmdData.iEditorHandler && !aStartOfEditor )
+        {
+        TRACE_FUNC_EXIT
+        return KErrNotReady;
+        }
+    if ( aMultiPart )
+        {
+        WriteReplyBufferToClient( iCmdData.iCmdReplyBuffer,
+                                  EATExtHandleCmdParamReply,
+                                  iCmdData.iCmdMessage,
+                                  ETrue,
+                                  EATExtHandleCmdParamLength );
+        }
+    else
+        {
+        WriteReplyBufferToClient( iCmdData.iCmdReplyBuffer,
+                                  EATExtHandleCmdParamReply,
+                                  iCmdData.iCmdMessage );
+        }
+    TRACE_FUNC_EXIT
+    return KErrNone;
+    }
+
+// ---------------------------------------------------------------------------
 // Clears internal initialized command handler data. This is currently used
 // only by CompleteCommandMessage() and is called when the data is not needed
 // anymore. It also prepares the internal data for a new HandleCommand() call.
@@ -964,6 +1021,7 @@
     iCmdData.iReplyExpected = EFalse;
     iCmdData.iHandler = NULL;
     iCmdData.iOldHandler = NULL;
+    iCmdData.iEditorHandler = NULL;
     iCarriageReturn = KDefaultCarriageReturn;
     iLineFeed = KDefaultLineFeed;
     iQuietMode = EFalse;
@@ -1185,7 +1243,7 @@
     TRACE_FUNC_ENTRY
     if ( iCmdData.iCmdStarted ||
         (iCmdData.iCmdMessage.Handle() && iCmdData.iCmdBuffer.Length()>0) ||
-        iCmdData.iCmdReplyBuffer.Length()>0 )
+         iCmdData.iCmdReplyBuffer.Length()>0 )
         {
         TRACE_FUNC_EXIT
         return ETrue;
@@ -1227,6 +1285,7 @@
     iPluginData = NULL;
     iCmdData.iHandler = NULL;
     iCmdData.iOldHandler = NULL;
+    iCmdData.iEditorHandler = NULL;
     TRACE_FUNC_EXIT
     return KErrNone;
     }
@@ -1248,6 +1307,7 @@
     if ( iCmdData.iHandler && iCmdData.iHandler->iInstance )
         {
         iCmdData.iHandler->iInstance->HandleCommandCancel();
+        iCmdData.iEditorHandler = NULL;
         }
     CompleteCommandMessage( NULL,
                             aError,
@@ -2336,6 +2396,7 @@
         iCmdData.iCmdStarted = ETrue;
         iCmdData.iCmdMessage = aEntrySupport.iMessage;
         iCmdData.iHandler = aEntrySupport.iEntry;
+        iCmdData.iEditorHandler = NULL;
         }
     // No "else" here as HandleCommandL() is used also with observer plugins
     if ( !aAtCmdFull )
@@ -2372,6 +2433,12 @@
         TRACE_FUNC_EXIT
         User::Leave( KErrGeneral );
         }
+    if ( !aEntrySupport.iSupportFound )
+        {
+        // No initial support found -> do nothing
+        TRACE_FUNC_EXIT
+        return;
+        }
     TInt i;
     TInt count = aEntrySupport.iSupport->Count();
     for ( i=aEntrySupport.iStartIndex; i<count; i++ )
@@ -2382,11 +2449,7 @@
             continue;
             }
         aEntrySupport.iEntry = &(*iPluginData)[oneCmdSupport.iEntryIndex];
-        TBool supported = EFalse;
-        if ( !aEntrySupport.iSupportFound )
-            {
-            supported = HandleCommandSupportL( aEntrySupport, aAtCmdFull );
-            }
+        TBool supported = HandleCommandSupportL( aEntrySupport, aAtCmdFull );
         if ( supported )
             {
             HandleCommandL( aEntrySupport, EFalse, aAtCmdFull );

--- a/atext/server/src/atextsession.cpp	Mon May 03 13:34:38 2010 +0300
+++ b/atext/server/src/atextsession.cpp	Mon Jul 12 07:03:47 2010 +0300
@@ -11,7 +11,7 @@
 *
 * Contributors:
 *
-* Description: 
+* Description:
 *
 */
 
@@ -199,6 +199,7 @@
 //
 CATExtSession::CATExtSession( CATExtSrv& aServer, const TVersion& aVersion ) :
     iServer( aServer ),
+    iEComSession( NULL ),
     iListener( NULL ),
     iMetadata( NULL ),
     iVersion( aVersion )
@@ -217,8 +218,7 @@
         TRACE_FUNC_EXIT
         User::Leave( KErrGeneral );
         }
-    REComSession& ecomSession = REComSession::OpenL();
-    CleanupClosePushL( ecomSession );
+    iEComSession = &REComSession::OpenL();
     TPckgBuf<TUid> ifUidPckgBuf;
     TInt retTemp = ReadStructFromMessage( ifUidPckgBuf,
                                           EATExtConnectParamUid,
@@ -239,10 +239,10 @@
         User::Leave( retTemp );
         }
     // Create listener
-    CATExtListen* listener = CATExtListen::NewLC( ecomSession, this );
+    CATExtListen* listener = CATExtListen::NewLC( *iEComSession, this );
     listener->AddInterfaceUid( ifUidPckgBuf() );
     // Create metadata. Pass iListener to add the UIDs
-    CATExtMetadata* metadata = CATExtMetadata::NewLC( ecomSession,
+    CATExtMetadata* metadata = CATExtMetadata::NewLC( *iEComSession,
                                                       listener,
                                                       *this );
     metadata->CreateImplementationMetadataL( ifUidPckgBuf(), connectionName );
@@ -250,8 +250,6 @@
     CleanupStack::Pop( metadata );
     CleanupStack::Pop( listener );
     CleanupStack::PopAndDestroy( &connectionName );
-    CleanupStack::Pop( &ecomSession );
-    iEComSession = ecomSession;
     iListener = listener;
     iMetadata = metadata;
     TRACE_FUNC_EXIT
@@ -322,6 +320,7 @@
         }
     // Third, check a case where there is support but reply is not
     // expected. In this case "" must be returned to complete processing.
+    // Note: The EFalse setting is used only for normal mode.
     if ( !complInfo.iReplyExpected )
         {
         // Return ""
@@ -334,8 +333,8 @@
         TRACE_FUNC_EXIT
         return retTemp;
         }
-    // The rest are for known command with reply. This case is handled in
-    // HandleCommand().
+    // The rest are for known command with reply or data in editor mode.
+    // This case is handled in HandleCommand().
     TRACE_INFO(( _L8("Command handled: wait for asynchronous reply or do nothing") ));
     TRACE_FUNC_EXIT
     return KErrNone;
@@ -896,7 +895,10 @@
     iListener = NULL;
     delete iMetadata;
     iMetadata = NULL;
-    iEComSession.Close();
+    if ( iEComSession )
+        {
+        iEComSession->Close();
+        }
     if ( !aSyncClose )
         {
         REComSession::FinalClose();

--- a/bluetooth/btexample/test/TestConsole/Bld.inf	Mon May 03 13:34:38 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,20 +0,0 @@
-// Copyright (c) 2000-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-// Component description file
-// 
-//
-
-PRJ_TESTMMPFILES
-
-BTTestConsole.mmp

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/bluetooth/btexample/test/TestConsole/bld.inf	Mon Jul 12 07:03:47 2010 +0300
@@ -0,0 +1,20 @@
+// Copyright (c) 2000-2009 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+// Component description file
+// 
+//
+
+PRJ_TESTMMPFILES
+
+BTTestConsole.mmp

--- a/bluetooth/btexample/test/cit/ROMConfig/scripts/BT_CIT_P581_BtExcluded.script	Mon May 03 13:34:38 2010 +0300
+++ b/bluetooth/btexample/test/cit/ROMConfig/scripts/BT_CIT_P581_BtExcluded.script	Mon Jul 12 07:03:47 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 @@
 //
 
 // Run all the BT_ROMCONFIG_* tests
-// Expects a ROM to be built without BT i.e. SYMBIAN_EXCLUDE_BLUETOOTH has been specified
+// Expects a ROM to be built without BT i.e. __BT has NOT been specified
 
 RUN_SCRIPT c:\scripts\btromconfig\BT_ROMCONFIG_MANAGER_001.script
 

--- a/bluetooth/btexample/test/cit/ROMConfig/scripts/BT_CIT_P581_BtIncluded.script	Mon May 03 13:34:38 2010 +0300
+++ b/bluetooth/btexample/test/cit/ROMConfig/scripts/BT_CIT_P581_BtIncluded.script	Mon Jul 12 07:03:47 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 @@
 //
 
 // Run all the BT_INC_ROMCONFIG_* tests
-// Expects a ROM to be built with BT i.e. SYMBIAN_EXCLUDE_BLUETOOTH has NOT been specified
+// Expects a ROM to be built with BT i.e. __BT has been specified
 
 RUN_SCRIPT c:\scripts\btromconfig\BT_INC_ROMCONFIG_MANAGER_001.script
 

--- a/bluetooth/btexample/test/cit/ROMConfig/scripts/BT_INC_ROMCONFIG_RSOCKETSERV_002.script	Mon May 03 13:34:38 2010 +0300
+++ b/bluetooth/btexample/test/cit/ROMConfig/scripts/BT_INC_ROMCONFIG_RSOCKETSERV_002.script	Mon Jul 12 07:03:47 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"
@@ -18,7 +18,7 @@
 START_TESTCASE BT-INC-ROMCONFIG-RSocketServ-002
 //! @SYMTestCaseID BT-INC-ROMCONFIG-RSocketServ-002
 //! @SYMTestCaseDesc RSocketServ::StartProtocol should succeed for Bluetooth protocols
-//! on a SYMBIAN_EXCLUDE_BLUETOOTH ROM
+//! on a __BT ROM
 //! @SYMREQ 5413
 //! @SYMTestType CIT
 //! @SYMTestPriority 3

--- a/bluetooth/btexample/test/cit/ROMConfig/scripts/BT_ROMCONFIG_MANAGER_001.script	Mon May 03 13:34:38 2010 +0300
+++ b/bluetooth/btexample/test/cit/ROMConfig/scripts/BT_ROMCONFIG_MANAGER_001.script	Mon Jul 12 07:03:47 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"
@@ -18,7 +18,7 @@
 START_TESTCASE BT-ROMCONFIG-MANAGER-001
 //! @SYMTestCaseID BT-ROMCONFIG-MANAGER-001
 //! @SYMTestCaseDesc Cannot conenct to RBTMan
-//! on a SYMBIAN_EXCLUDE_BLUETOOTH ROM
+//! on a !__BT ROM
 //! @SYMREQ 5413
 //! @SYMTestType CIT
 //! @SYMTestPriority 1

--- a/bluetooth/btexample/test/cit/ROMConfig/scripts/BT_ROMCONFIG_MANAGER_002.script	Mon May 03 13:34:38 2010 +0300
+++ b/bluetooth/btexample/test/cit/ROMConfig/scripts/BT_ROMCONFIG_MANAGER_002.script	Mon Jul 12 07:03:47 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"
@@ -18,7 +18,7 @@
 START_TESTCASE BT-ROMCONFIG-MANAGER-002
 //! @SYMTestCaseID BT-ROMCONFIG-MANAGER-002
 //! @SYMTestCaseDesc Cannot connect to RBTRegServ
-//! on a SYMBIAN_EXCLUDE_BLUETOOTH ROM
+//! on a !__BT ROM
 //! @SYMREQ 5413
 //! @SYMTestType CIT
 //! @SYMTestPriority 1

--- a/bluetooth/btexample/test/cit/ROMConfig/scripts/BT_ROMCONFIG_PAN_001.script	Mon May 03 13:34:38 2010 +0300
+++ b/bluetooth/btexample/test/cit/ROMConfig/scripts/BT_ROMCONFIG_PAN_001.script	Mon Jul 12 07:03:47 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"
@@ -24,7 +24,7 @@
 START_TESTCASE BT-ROMCONFIG-PAN-001
 //! @SYMTestCaseID BT-ROMCONFIG-PAN-001
 //! @SYMTestCaseDesc Cannot start a BT PAN RConnection
-//! on a SYMBIAN_EXCLUDE_BLUETOOTH ROM
+//! on a !__BT ROM
 //! @SYMREQ 5413
 //! @SYMTestType CIT
 //! @SYMTestPriority 1

--- a/bluetooth/btexample/test/cit/ROMConfig/scripts/BT_ROMCONFIG_RBTPHYLNKADAPT_001.script	Mon May 03 13:34:38 2010 +0300
+++ b/bluetooth/btexample/test/cit/ROMConfig/scripts/BT_ROMCONFIG_RBTPHYLNKADAPT_001.script	Mon Jul 12 07:03:47 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"
@@ -18,7 +18,7 @@
 START_TESTCASE BT-ROMCONFIG-RBTPHYLNKADAPT-001
 //! @SYMTestCaseID BT-ROMCONFIG-RBTPHYLNKADAPT-001
 //! @SYMTestCaseDesc Cannot open RBTPhysicalLinkAdapter
-//! on a SYMBIAN_EXCLUDE_BLUETOOTH ROM
+//! on a !__BT ROM
 //! @SYMREQ 5413
 //! @SYMTestType CIT
 //! @SYMTestPriority 1

--- a/bluetooth/btexample/test/cit/ROMConfig/scripts/BT_ROMCONFIG_RCOMMSERV_001.script	Mon May 03 13:34:38 2010 +0300
+++ b/bluetooth/btexample/test/cit/ROMConfig/scripts/BT_ROMCONFIG_RCOMMSERV_001.script	Mon Jul 12 07:03:47 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"
@@ -18,7 +18,7 @@
 START_TESTCASE BT-ROMCONFIG-RCommServ-001
 //! @SYMTestCaseID BT-ROMCONFIG-RCommServ-001
 //! @SYMTestCaseDesc RCommServ::LoadCommModule should fail for Bluetooth
-//! on a SYMBIAN_EXCLUDE_INFRARED ROM
+//! on a !__BT ROM
 //! @SYMREQ 5413
 //! @SYMTestType CIT
 //! @SYMTestPriority 1

--- a/bluetooth/btexample/test/cit/ROMConfig/scripts/BT_ROMCONFIG_REMCON_001.script	Mon May 03 13:34:38 2010 +0300
+++ b/bluetooth/btexample/test/cit/ROMConfig/scripts/BT_ROMCONFIG_REMCON_001.script	Mon Jul 12 07:03:47 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"
@@ -18,7 +18,7 @@
 START_TESTCASE BT-ROMCONFIG-REMCON-001
 //! @SYMTestCaseID BT-ROMCONFIG-REMCON-001
 //! @SYMTestCaseDesc Cannot open CRemConInterfaceSelector as Controller
-//! on a SYMBIAN_EXCLUDE_BLUETOOTH ROM
+//! on a !__BT ROM
 //! @SYMREQ 5413
 //! @SYMTestType CIT
 //! @SYMTestPriority 1

--- a/bluetooth/btexample/test/cit/ROMConfig/scripts/BT_ROMCONFIG_REMCON_002.script	Mon May 03 13:34:38 2010 +0300
+++ b/bluetooth/btexample/test/cit/ROMConfig/scripts/BT_ROMCONFIG_REMCON_002.script	Mon Jul 12 07:03:47 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"
@@ -18,7 +18,7 @@
 START_TESTCASE BT-ROMCONFIG-REMCON-002
 //! @SYMTestCaseID BT-ROMCONFIG-REMCON-002
 //! @SYMTestCaseDesc Cannot open CRemConInterfaceSelector as Target
-//! on a SYMBIAN_EXCLUDE_BLUETOOTH ROM
+//! on a !__BT ROM
 //! @SYMREQ 5413
 //! @SYMTestType CIT
 //! @SYMTestPriority 1

--- a/bluetooth/btexample/test/cit/ROMConfig/scripts/BT_ROMCONFIG_RHOSTRESOLVER_001.script	Mon May 03 13:34:38 2010 +0300
+++ b/bluetooth/btexample/test/cit/ROMConfig/scripts/BT_ROMCONFIG_RHOSTRESOLVER_001.script	Mon Jul 12 07:03:47 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"
@@ -18,7 +18,7 @@
 START_TESTCASE BT-ROMCONFIG-RHostResolver-001
 //! @SYMTestCaseID BT-ROMCONFIG-RHostResolver-001
 //! @SYMTestCaseDesc RHostResolver::Open should fail for Bluetooth protocols
-//! on a SYMBIAN_EXCLUDE_BLUETOOTH ROM
+//! on a !__BT ROM
 //! @SYMREQ 5413
 //! @SYMTestType CIT
 //! @SYMTestPriority 1

--- a/bluetooth/btexample/test/cit/ROMConfig/scripts/BT_ROMCONFIG_RSOCKETSERV_001.script	Mon May 03 13:34:38 2010 +0300
+++ b/bluetooth/btexample/test/cit/ROMConfig/scripts/BT_ROMCONFIG_RSOCKETSERV_001.script	Mon Jul 12 07:03:47 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"
@@ -18,7 +18,7 @@
 START_TESTCASE BT-ROMCONFIG-RSocketServ-001
 //! @SYMTestCaseID BT-ROMCONFIG-RSocketServ-001
 //! @SYMTestCaseDesc RSocketServ::FindProtocol should fail for Bluetooth protocols
-//! on a SYMBIAN_EXCLUDE_BLUETOOTH ROM
+//! on a !__BT ROM
 //! @SYMREQ 5413
 //! @SYMTestType CIT
 //! @SYMTestPriority 1

--- a/bluetooth/btexample/test/cit/ROMConfig/scripts/BT_ROMCONFIG_RSOCKETSERV_002.script	Mon May 03 13:34:38 2010 +0300
+++ b/bluetooth/btexample/test/cit/ROMConfig/scripts/BT_ROMCONFIG_RSOCKETSERV_002.script	Mon Jul 12 07:03:47 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"
@@ -18,7 +18,7 @@
 START_TESTCASE BT-ROMCONFIG-RSocketServ-002
 //! @SYMTestCaseID BT-ROMCONFIG-RSocketServ-002
 //! @SYMTestCaseDesc RSocketServ::StartProtocol should fail for Bluetooth protocols
-//! on a SYMBIAN_EXCLUDE_BLUETOOTH ROM
+//! on a !__BT ROM
 //! @SYMREQ 5413
 //! @SYMTestType CIT
 //! @SYMTestPriority 1

--- a/bluetooth/btexample/test/cit/ROMConfig/scripts/BT_ROMCONFIG_RSOCKETSERV_003.script	Mon May 03 13:34:38 2010 +0300
+++ b/bluetooth/btexample/test/cit/ROMConfig/scripts/BT_ROMCONFIG_RSOCKETSERV_003.script	Mon Jul 12 07:03:47 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"
@@ -18,7 +18,7 @@
 START_TESTCASE BT-ROMCONFIG-RSocketServ-003
 //! @SYMTestCaseID BT-ROMCONFIG-RSocketServ-003
 //! @SYMTestCaseDesc RSocketServ::GetProtocolInfo should not find Bluetooth protocols
-//! on a SYMBIAN_EXCLUDE_BLUETOOTH ROM
+//! on a !__BT ROM
 //! @SYMREQ 5413
 //! @SYMTestType CIT
 //! @SYMTestPriority 1

--- a/bluetooth/btexample/test/cit/ROMConfig/scripts/BT_ROMCONFIG_RSOCKET_001.script	Mon May 03 13:34:38 2010 +0300
+++ b/bluetooth/btexample/test/cit/ROMConfig/scripts/BT_ROMCONFIG_RSOCKET_001.script	Mon Jul 12 07:03:47 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"
@@ -18,7 +18,7 @@
 START_TESTCASE BT-ROMCONFIG-RSocket-001
 //! @SYMTestCaseID BT-ROMCONFIG-RSocket-0001
 //! @SYMTestCaseDesc RSocket::Open should fail for Infra-Red protocols
-//! on a SYMBIAN_EXCLUDE_BLUETOOTH ROM
+//! on a !__BT ROM
 //! @SYMREQ 5413
 //! @SYMTestType CIT
 //! @SYMTestPriority 1

--- a/bluetooth/btexample/test/cit/ROMConfig/scripts/BT_ROMCONFIG_SDPAGENT_001.script	Mon May 03 13:34:38 2010 +0300
+++ b/bluetooth/btexample/test/cit/ROMConfig/scripts/BT_ROMCONFIG_SDPAGENT_001.script	Mon Jul 12 07:03:47 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"
@@ -18,7 +18,7 @@
 START_TESTCASE BT-ROMCONFIG-SDPAGENT-001
 //! @SYMTestCaseID BT-ROMCONFIG-SDPAGENT-001
 //! @SYMTestCaseDesc Cannot use SdpAgent
-//! on a SYMBIAN_EXCLUDE_BLUETOOTH ROM
+//! on a !__BT ROM
 //! @SYMREQ 5413
 //! @SYMTestType CIT
 //! @SYMTestPriority 1

--- a/bluetooth/btexample/test/cit/ROMConfig/scripts/BT_ROMCONFIG_SDP_001.script	Mon May 03 13:34:38 2010 +0300
+++ b/bluetooth/btexample/test/cit/ROMConfig/scripts/BT_ROMCONFIG_SDP_001.script	Mon Jul 12 07:03:47 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"
@@ -18,7 +18,7 @@
 START_TESTCASE BT-ROMCONFIG-SDP-001
 //! @SYMTestCaseID BT-ROMCONFIG-SDP-001
 //! @SYMTestCaseDesc Cannot connect to RSdp
-//! on a SYMBIAN_EXCLUDE_BLUETOOTH ROM
+//! on a !__BT ROM
 //! @SYMREQ 5413
 //! @SYMTestType CIT
 //! @SYMTestPriority 1

--- a/bluetooth/btexample/test/cit/ROMConfig/scripts/BT_ROMCONFIG_USER_001.script	Mon May 03 13:34:38 2010 +0300
+++ b/bluetooth/btexample/test/cit/ROMConfig/scripts/BT_ROMCONFIG_USER_001.script	Mon Jul 12 07:03:47 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"
@@ -18,7 +18,7 @@
 START_TESTCASE BT-ROMCONFIG-USER-001
 //! @SYMTestCaseID BT-ROMCONFIG-USER-001
 //! @SYMTestCaseDesc CBluetoothPhysicalLinks cannot be constructed
-//! on a SYMBIAN_EXCLUDE_BLUETOOTH ROM
+//! on a !__BT ROM
 //! @SYMREQ 5413
 //! @SYMTestType CIT
 //! @SYMTestPriority 1

--- a/bluetooth/btexample/test/cit/ROMConfig/scripts/BT_ROMCONFIG_USER_002.script	Mon May 03 13:34:38 2010 +0300
+++ b/bluetooth/btexample/test/cit/ROMConfig/scripts/BT_ROMCONFIG_USER_002.script	Mon Jul 12 07:03:47 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"
@@ -18,7 +18,7 @@
 START_TESTCASE BT-ROMCONFIG-USER-002
 //! @SYMTestCaseID BT-ROMCONFIG-USER-002
 //! @SYMTestCaseDesc CBluetoothSocket cannot be constructed
-//! on a SYMBIAN_EXCLUDE_BLUETOOTH ROM
+//! on a !__BT ROM
 //! @SYMREQ 5413
 //! @SYMTestType CIT
 //! @SYMTestPriority 1

--- a/bluetooth/btexample/test/cit/ROMConfig/scripts/BT_ROMCONFIG_USER_003.script	Mon May 03 13:34:38 2010 +0300
+++ b/bluetooth/btexample/test/cit/ROMConfig/scripts/BT_ROMCONFIG_USER_003.script	Mon Jul 12 07:03:47 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"
@@ -18,7 +18,7 @@
 START_TESTCASE BT-ROMCONFIG-USER-003
 //! @SYMTestCaseID BT-ROMCONFIG-USER-003
 //! @SYMTestCaseDesc CBluetoothSynchronousLink cannot be used
-//! on a SYMBIAN_EXCLUDE_BLUETOOTH ROM
+//! on a !__BT ROM
 //! @SYMREQ 5413
 //! @SYMTestType CIT
 //! @SYMTestPriority 1

--- a/bluetooth/btexample/test/cit/ROMConfig/scripts/BT_ROMCONFIG_USER_004.script	Mon May 03 13:34:38 2010 +0300
+++ b/bluetooth/btexample/test/cit/ROMConfig/scripts/BT_ROMCONFIG_USER_004.script	Mon Jul 12 07:03:47 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"
@@ -18,7 +18,7 @@
 START_TESTCASE BT-ROMCONFIG-USER-004
 //! @SYMTestCaseID BT-ROMCONFIG-USER-004
 //! @SYMTestCaseDesc RHCIDirectAccess cannot be opened
-//! on a SYMBIAN_EXCLUDE_BLUETOOTH ROM
+//! on a !__BT ROM
 //! @SYMREQ 5413
 //! @SYMTestType CIT
 //! @SYMTestPriority 1

--- a/bluetooth/btextnotifiers/inc/BTExtNotifiersPartner.h	Mon May 03 13:34:38 2010 +0300
+++ b/bluetooth/btextnotifiers/inc/BTExtNotifiersPartner.h	Mon Jul 12 07:03:47 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2001-2010 Nokia Corporation and/or its subsidiary(-ies).
 // All rights reserved.
 // This component and the accompanying materials are made available
 // under the terms of "Eclipse Public License v1.0"
@@ -19,6 +19,7 @@
 #include <btextnotifiersconsts.h>
 #include <bttypes.h>
 #include <btdevice.h>
+#include <bluetooth/hci/hcitypes.h>
 
 /**
 @publishedPartner

--- a/bluetooth/btlogger/generic/group/BLD.INF	Mon May 03 13:34:38 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,30 +0,0 @@
-// Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-//
-
-/**
- @file
-*/
-
-#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)
-
-btlogger.iby        /epoc32/rom/include/btlogger.iby
-
-PRJ_MMPFILES
-logger.MMP

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/bluetooth/btlogger/generic/group/bld.inf	Mon Jul 12 07:03:47 2010 +0300
@@ -0,0 +1,30 @@
+// Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
+
+/**
+ @file
+*/
+
+#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)
+
+btlogger.iby        /epoc32/rom/include/btlogger.iby
+
+PRJ_MMPFILES
+logger.MMP

--- a/bluetooth/btlogger/group/BLD.INF	Mon May 03 13:34:38 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,21 +0,0 @@
-// 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"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-//
-
-/**
- @file
-*/
-
-#include "../generic/group/bld.inf"
-#include "../btsnoophcilogger/group/bld.inf"

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/bluetooth/btlogger/group/bld.inf	Mon Jul 12 07:03:47 2010 +0300
@@ -0,0 +1,21 @@
+// 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"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
+
+/**
+ @file
+*/
+
+#include "../generic/group/bld.inf"
+#include "../btsnoophcilogger/group/bld.inf"

--- a/bluetooth/btstack/common/bt_v2.mmp	Mon May 03 13:34:38 2010 +0300
+++ b/bluetooth/btstack/common/bt_v2.mmp	Mon Jul 12 07:03:47 2010 +0300
@@ -69,6 +69,7 @@
 SOURCE Subscribers.cpp
 SOURCE btcommands.cpp
 SOURCE AclDataQ.cpp
+SOURCE hostmbufpool.cpp
 SOURCE AclDataQController.cpp
 SOURCE bredrcontrollerconfiguration.cpp
 
@@ -231,6 +232,7 @@
 MACRO CONNECTION_PREEMPTS_INQUIRY
 //MACRO KEEP_L2CAP_DEBUG_STATISTICS
 MACRO BT_LINKMGR_V2
+MACRO HOSTCONTROLLER_TO_HOST_FLOW_CONTROL
 
 OPTION		cw -strict on -w pedantic,unused,hidevirtual,padding,ptrintconv
 

--- a/bluetooth/btstack/eirman/eirmanager.cpp	Mon May 03 13:34:38 2010 +0300
+++ b/bluetooth/btstack/eirman/eirmanager.cpp	Mon Jul 12 07:03:47 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"
@@ -169,7 +169,7 @@
 		}
 	}
 
-TInt CEirManager::SetData(TEirTag aTag, TDesC8& aData, TEirDataMode aEirDataMode)
+TInt CEirManager::SetData(TEirTag aTag, const TDesC8& aData, TEirDataMode aEirDataMode)
 	{
 	LOG_FUNC
 	LOG1(_L("CEirManager::SetData tag = %d"), aTag);

--- a/bluetooth/btstack/eirman/eirmanager.h	Mon May 03 13:34:38 2010 +0300
+++ b/bluetooth/btstack/eirman/eirmanager.h	Mon Jul 12 07:03:47 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"
@@ -89,7 +89,7 @@
 
 	TInt RegisterTag(TEirTag aTag, MEirManagerNotifiee& aNotifiee);
 	void DeregisterTag(TEirTag aTag);
-	TInt SetData(TEirTag aTag, TDesC8& aData, TEirDataMode aEirDataMode);
+	TInt SetData(TEirTag aTag, const TDesC8& aData, TEirDataMode aEirDataMode);
 	
 	// from MHCICommandQueueClient
 	void MhcqcCommandEventReceived(const THCIEventBase& aEvent, const CHCICommandBase* aRelatedCommand);

--- a/bluetooth/btstack/eirman/eirmanserver.cpp	Mon May 03 13:34:38 2010 +0300
+++ b/bluetooth/btstack/eirman/eirmanserver.cpp	Mon Jul 12 07:03:47 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"
@@ -58,9 +58,11 @@
 	: CPolicyServer(CActive::EPriorityStandard, KEirManServerPolicy)
 	, iCommandQueue(aCommandQueue)
 	, iLinkMgrProtocol(aLinkMgrProtocol)
-	, iSessionCount(0)
+	, iInternalSessionCount(0)
+	, iExternalSessionCount(0)
 	, iIsFeaturesReady(EFalse)
 	, iIsEirSupported(EFalse)
+	, iSessions(_FOFF(CEirManSession, iLink))
 	{
 	LOG_FUNC
 	}
@@ -93,28 +95,63 @@
 	
 	CEirManServer* ncThis = const_cast<CEirManServer*>(this);
 	
-	CEirManSession* sess = CEirManSession::NewL(*ncThis);
+	CEirManExternalSession* sess = CEirManExternalSession::NewL(*ncThis);
 	LOG1(_L("\tsess = 0x%08x"), sess);
 	return sess;
 	}
 
-void CEirManServer::AddSession()
+CEirManInternalSession* CEirManServer::NewInternalSessionL(MEirInternalSessionNotifier& aParent)
+	{
+	LOG_FUNC
+	// Server will refuse to create any more session if we have found out eir isn't supported.
+	if(iIsFeaturesReady && !iIsEirSupported)
+		{
+		User::Leave(KErrNotSupported);
+		}
+	CEirManInternalSession* sess = CEirManInternalSession::NewL(*this, aParent);
+	return sess;
+	}
+
+void CEirManServer::AddSession(CEirManSession& aSession, TBool aInternalSession)
 	{
 	LOG_FUNC
-	if(iSessionCount++ == 0)
+	
+	iSessions.AddLast(aSession);
+	
+	if (aInternalSession)
 		{
-		// While we have clients we need to make sure that the protocol remains alive.
-		iLinkMgrProtocol.LocalOpen();
+		if(iInternalSessionCount++ == 0)
+			{
+			// While we have clients we need to make sure that the protocol remains alive.
+			iLinkMgrProtocol.LocalOpen();
+			}
+		}
+	else
+		{
+		if(iExternalSessionCount++ == 0)
+			{
+			// While we have clients we need to make sure that the protocol remains alive.
+			iLinkMgrProtocol.Open();
+			}
 		}
 	}
 
-void CEirManServer::DropSession()
+void CEirManServer::DropSession(TBool aInternalSession)
 	{
 	LOG_FUNC
-	if(--iSessionCount == 0)
+	if (aInternalSession)
 		{
-		// There are no long 
-		iLinkMgrProtocol.LocalClose();
+		if(--iInternalSessionCount == 0)
+			{
+			iLinkMgrProtocol.LocalClose();
+			}
+		}
+	else
+		{
+		if(--iExternalSessionCount == 0)
+			{
+			iLinkMgrProtocol.Close();
+			}		
 		}
 	}
 
@@ -126,8 +163,10 @@
 		TRAPD(err, iEirManager = CEirManager::NewL(iCommandQueue, iLinkMgrProtocol));
 		iIsFeaturesReady = ETrue;
 		
-		iSessionIter.SetToFirst();
-		CSession2* sessionPtr;
+		TDblQueIter<CEirManSession> sessionIter(iSessions);
+		
+		sessionIter.SetToFirst();
+		CEirManSession* sessionPtr;
 		if(iLinkMgrProtocol.IsExtendedInquiryResponseSupportedLocally() && err == KErrNone)
 			{
 			iIsEirSupported = ETrue;
@@ -137,10 +176,9 @@
 			err = ((err != KErrNone) ? KErrNoMemory : KErrNotSupported);
 			}
 		
-		while((sessionPtr = iSessionIter++) != NULL)
+		while((sessionPtr = sessionIter++) != NULL)
 			{
-			CEirManSession* eirSession = static_cast<CEirManSession*>(sessionPtr);
-			eirSession->NotifyEirFeatureState(err);
+			sessionPtr->NotifyEirFeatureState(err);
 			}
 		}
 	}
@@ -171,42 +209,46 @@
 	_LIT_SECURITY_POLICY_S0(KSDPSecurityPolicy, KSDPServerID);
 	_LIT_SECURITY_POLICY_S0(KStackSecurityPolicy, KStackID);
 	_LIT_SECURITY_POLICY_C1(KVendorSpecificDataSecurityPolicy, ECapabilityWriteDeviceData);
-	if(function == EEirManRegisterTag)
+	_LIT_SECURITY_POLICY_C1(KEirCommonSecurityPolicy, ECapabilityLocalServices);
+
+	if(KEirCommonSecurityPolicy.CheckPolicy(aMsg))
 		{
-		tag = static_cast<TEirTag>(aMsg.Int0());
-		switch(tag)
+		if(function == EEirManRegisterTag)
 			{
-			case EEirTagName:
-			case EEirTagTxPowerLevel:
-				/** These must have come from the stack **/
-				if(KStackSecurityPolicy.CheckPolicy(aMsg))
-					{
-					result = EPass;
-					}
-				break;
-			case EEirTagSdpUuid16:
-			case EEirTagSdpUuid32:
-			case EEirTagSdpUuid128:
-				/** These must have come from SDP server **/
-				if(KSDPSecurityPolicy.CheckPolicy(aMsg))
-					{
-					result = EPass;
-					}
-				break;
-			case EEirTagManufacturerSpecific:
-				/** To do this you must have write device data **/
-				if(KVendorSpecificDataSecurityPolicy.CheckPolicy(aMsg))
-					{
-					result = EPass;
-					}
-				break;
-			
-			case EEirTagFlags:
-				/** At present no implementation of Flags is supported. 
-				    So we are rejecting this until an implementation is provided. **/
-			default: //unknown or reserved tag, reject
-				//no need to do anything 
-				break;
+			tag = static_cast<TEirTag>(aMsg.Int0());
+			switch(tag)
+				{
+				case EEirTagName:
+				case EEirTagTxPowerLevel:
+					/** These must have come from the stack **/
+					if(KStackSecurityPolicy.CheckPolicy(aMsg))
+						{
+						result = EPass;
+						}
+					break;
+				case EEirTagSdpUuid16:
+				case EEirTagSdpUuid32:
+				case EEirTagSdpUuid128:
+					/** These must have come from SDP server **/
+					if(KSDPSecurityPolicy.CheckPolicy(aMsg))
+						{
+						result = EPass;
+						}
+					break;
+				case EEirTagManufacturerSpecific:
+					/** To do this you must have write device data **/
+					if(KVendorSpecificDataSecurityPolicy.CheckPolicy(aMsg))
+						{
+						result = EPass;
+						}
+					break;
+				case EEirTagFlags:
+					/** At present no implementation of Flags is supported. 
+					So we are rejecting this until an implementation is provided. **/
+				default: //unknown or reserved tag, reject
+					//no need to do anything 
+					break;
+				}
 			}
 		}
 	//Anything not covered by the above is invalid so do nothing and let it fail

--- a/bluetooth/btstack/eirman/eirmanserver.h	Mon May 03 13:34:38 2010 +0300
+++ b/bluetooth/btstack/eirman/eirmanserver.h	Mon Jul 12 07:03:47 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"
@@ -24,9 +24,11 @@
 #include <e32base.h>
 
 class CEirManSession;
+class CEirManInternalSession;
 class CEirManager;
 class MHCICommandQueue;
 class CLinkMgrProtocol;
+class MEirInternalSessionNotifier;
 
 enum TEirFeatureState
 	{
@@ -44,10 +46,12 @@
 	static CEirManServer* NewL(MHCICommandQueue& aCommandQueue, CLinkMgrProtocol& aLinkMgrProtocol);
 	~CEirManServer();
 	
+	CEirManInternalSession* NewInternalSessionL(MEirInternalSessionNotifier& aParent);
+	
 	inline CEirManager& EirManager() const;
 	
-	void AddSession();
-	void DropSession();
+	void AddSession(CEirManSession& aSession, TBool aInternalSession);
+	void DropSession(TBool aInternalSession);
 	void NotifyFeaturesReady();
 	TEirFeatureState EirFeatureState();
 
@@ -65,9 +69,11 @@
 	CLinkMgrProtocol& 	iLinkMgrProtocol;
 	//owned
 	CEirManager* 		iEirManager;
-	TInt				iSessionCount;
+	TInt				iInternalSessionCount;
+	TInt				iExternalSessionCount;
 	TBool				iIsFeaturesReady;
 	TBool				iIsEirSupported;
+	TDblQue<CEirManSession> iSessions;
 	};
 #include "eirmanserver.inl"
 

--- a/bluetooth/btstack/eirman/eirmanserversecuritypolicy.h	Mon May 03 13:34:38 2010 +0300
+++ b/bluetooth/btstack/eirman/eirmanserversecuritypolicy.h	Mon Jul 12 07:03:47 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"
@@ -58,7 +58,7 @@
 /** Main policy */
 const CPolicyServer::TPolicy KEirManServerPolicy = 
 	{
-	CPolicyServer::EAlwaysPass , /** Specifies all connect attempts should pass */
+	KPolicyCapabilityCheck , /** Connect attempts are only successful if the caller has ECapabilityLocalServices */
 	KEirManServerRangeCount,
 	KEirManServerRanges,
 	KEirManServerElementsIndex,

--- a/bluetooth/btstack/eirman/eirmansession.cpp	Mon May 03 13:34:38 2010 +0300
+++ b/bluetooth/btstack/eirman/eirmansession.cpp	Mon Jul 12 07:03:47 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"
@@ -32,19 +32,21 @@
 _LIT8(KLogComponent, LOG_COMPONENT_EIRMANAGER);
 #endif
 
-CEirManSession* CEirManSession::NewL(CEirManServer& aServer)
+CEirManSession* CEirManSession::NewL(CEirManServer& aServer, MEirSessionNotifier& aParent, TBool aInternalSession)
 	{
 	LOG_STATIC_FUNC
-	CEirManSession* self = new(ELeave) CEirManSession(aServer);
+	CEirManSession* self = new(ELeave) CEirManSession(aServer, aParent, aInternalSession);
 	CleanupStack::PushL(self);
 	self->ConstructL();
 	CleanupStack::Pop(self);
 	return self;
 	}
 
-CEirManSession::CEirManSession(CEirManServer& aServer)
+CEirManSession::CEirManSession(CEirManServer& aServer, MEirSessionNotifier& aParent, TBool aInternalSession)
 	: iEirManServer(aServer)
+	, iParent(aParent)
 	, iEirTag(EEirTagRESERVED)
+	, iInternalSession(aInternalSession)
 	{
 	LOG_FUNC
 	}
@@ -52,7 +54,7 @@
 void CEirManSession::ConstructL()
 	{
 	LOG_FUNC
-	iEirManServer.AddSession();
+	iEirManServer.AddSession(*this, iInternalSession);
 	}
 
 CEirManSession::~CEirManSession()
@@ -60,70 +62,24 @@
 	LOG_FUNC
 	// deregister any registered tag that may be registered
 	DeregisterTag();
-	if(!iDataAvailableListenerMessage.IsNull())
-		{
-		// complete any outstanding messages.
-		iDataAvailableListenerMessage.Complete(KErrCancel);
-		}
-	iEirManServer.DropSession();
+	iLink.Deque();
+	iEirManServer.DropSession(iInternalSession);
 	}
 
-void CEirManSession::ServiceL(const RMessage2& aMessage)
-	{
-	LOG_FUNC
-	LOG1(_L("CEirManSession::ServiceL aMessage.Function() = %d"), aMessage.Function());
-	TBool complete = ETrue;
-	TInt ret = KErrNone;
-
-	switch (aMessage.Function())
-		{
-	case EEirManRegisterTag:
-		complete = EFalse; // always async.
-		RegisterTag(aMessage);
-		break;
-
-	case EEirManSpaceAvailableNotification:
-		ret = RegisterSpaceAvailableListener(aMessage, complete);
-		break;
-
-	case EEirManCancelSpaceAvailableNotification:
-		ret = CancelSpaceAvailableListener();
-		break;
-
-	case EEirManSetData:
-		ret = SetData(aMessage);
-		break;
-		
-	case EEirManNewData:
-		ret = NewData(aMessage);
-		break;
-
-	default:
-		aMessage.Panic(KEirManCliPncCat, EEirManPanicInvalidIPC);
-		break;
-		}
-
-	if (complete)
-		{
-		aMessage.Complete(ret);
-		}
-	}
-
-void CEirManSession::RegisterTag(const RMessage2& aMessage)
+void CEirManSession::RegisterTag(TEirTag aTag)
 	{
 	LOG_FUNC
 
-	TEirTag tag = static_cast<TEirTag>(aMessage.Int0());
-	LOG1(_L("CEirManSession::RegisterTag tag = %d"), tag);
+	LOG1(_L("CEirManSession::RegisterTag tag = %d"), aTag);
 
-	if(!(tag >= EEirTagName && tag < EEirTagRESERVED))
+	if(!(aTag >= EEirTagName && aTag < EEirTagRESERVED))
 		{
-		__ASSERT_ALWAYS(EFalse, aMessage.Panic(KEirManCliPncCat, EEirManPanicInvalidTag));
+		iParent.MesnRegisterComplete(KErrArgument);
 		}
 	else if(iEirTag != EEirTagRESERVED)
 		{
 		LOG1(_L("CEirManSession::RegisterTag ERROR, Tag in use: %d"), iEirTag);
-		aMessage.Complete(KErrInUse);
+		iParent.MesnRegisterComplete(KErrInUse);
 		}
 	else
 		{
@@ -131,23 +87,23 @@
 		if(iEirManServer.EirFeatureState() == EEirFeatureReady)
 			{
 			// Eir is supported
-			TInt result = iEirManServer.EirManager().RegisterTag(tag, *this);
+			TInt result = iEirManServer.EirManager().RegisterTag(aTag, *this);
 			if(result == KErrNone)
 				{
-				iEirTag = tag;
+				iEirTag = aTag;
 				}
-			aMessage.Complete(result);
+			iParent.MesnRegisterComplete(result);
 			}
 		else if(iEirManServer.EirFeatureState() == EEirFeaturePending)
 			{
 			// We don't know if eir is supported or not at this moment
-			iPendingEirTag = tag;
-			iRegisterMessage = aMessage;
+			iRegisterPending = ETrue;
+			iPendingEirTag = aTag;
 			}
 		else
 			{
 			// Eir is not supported
-			aMessage.Complete(KErrNotSupported);
+			iParent.MesnRegisterComplete(KErrNotSupported);
 			}
 		}
 	}
@@ -169,7 +125,7 @@
 void CEirManSession::NotifyEirFeatureState(TInt aResult)
 	{
 	LOG1(_L("Eir Server has been notified feature ready, result: %d"), aResult);
-	if(aResult == KErrNone && !iRegisterMessage.IsNull())
+	if(aResult == KErrNone && iRegisterPending)
 		{
 		__ASSERT_DEBUG(iEirManServer.EirFeatureState() == EEirFeatureReady, EIR_SESSION_PANIC(EEirSessionEirFeatureNotSupported));
 		TInt result = iEirManServer.EirManager().RegisterTag(iPendingEirTag, *this);
@@ -177,80 +133,28 @@
 			{
 			iEirTag = iPendingEirTag;
 			}
-		iRegisterMessage.Complete(result);
+		iRegisterPending = EFalse;
+		iParent.MesnRegisterComplete(result);
 		}
-	else if(!iRegisterMessage.IsNull())
+	else if(iRegisterPending)
 		{
-		iRegisterMessage.Complete(aResult);
+		iRegisterPending = EFalse;
+		iParent.MesnRegisterComplete(aResult);
 		}
 	}
 
-TInt CEirManSession::RegisterSpaceAvailableListener(const RMessage2& aMessage, TBool& aComplete)
-	{
-	LOG_FUNC
 
-	if(iDataAvailableListenerMessage.Handle())
-		{
-		LOG(_L("CEirManSession:::RegisterSpaceAvailableListener ERROR IN USE"));
-		return KErrInUse;
-		}
-
-	iDataAvailableListenerMessage = aMessage;
-
-	aComplete = EFalse;
-
-	if(iLastSpaceOffered != 0)
-		{
-		LOG(_L("cached space present, completing immediately"));
-		CompleteSpaceAvailableRequest(iLastSpaceOffered);
-		iLastSpaceOffered = 0;
-		return KErrNone;
-		}
-	
-	LOG(_L("waiting for callback..."));
-	return KErrNone;
-	}
-	
-TInt CEirManSession::NewData(const RMessage2& aMessage)
+TInt CEirManSession::NewData(TInt aRequiredLength)
 	{
 	LOG_FUNC
-	__ASSERT_ALWAYS(iEirTag != EEirTagRESERVED, aMessage.Panic(KEirManCliPncCat, EEirManPanicInvalidTag));
-	TInt requiredLength = static_cast<TInt>(aMessage.Int0());
-
-	return iEirManServer.EirManager().NewData(iEirTag, requiredLength);
+	return iEirManServer.EirManager().NewData(iEirTag, aRequiredLength);
 	}
 
-TInt CEirManSession::CancelSpaceAvailableListener()
+
+TInt CEirManSession::SetData(const TDesC8& aData, TEirDataMode aMode)
 	{
 	LOG_FUNC
-
-	if(!iDataAvailableListenerMessage.Handle())
-		{
-		return KErrNotFound;
-		}
-
-	iDataAvailableListenerMessage.Complete(KErrCancel);
-
-	return KErrNone;
-	}
-
-TInt CEirManSession::SetData(const RMessage2& aMessage)
-	{
-	LOG_FUNC
-	__ASSERT_ALWAYS(iEirTag != EEirTagRESERVED, aMessage.Panic(KEirManCliPncCat, EEirManPanicInvalidTag));
-	TEirDataMode eirDataMode = static_cast<TEirDataMode>(aMessage.Int1());
-	LOG2(_L("Tag: %d EirDataMode: %d"), iEirTag, eirDataMode);
-
-	// No need to allocate memory with an expensive malloc() call (via HBuf8::NewL or whatever), 
-	// since the EIR contents fit in the stack, and the EIR Manager will cache the data anyway
-	TBuf8<KHCIExtendedInquiryResponseMaxLength> data;
-	TInt err = aMessage.Read(0, data);
-	
-	if(err == KErrNone)
-		{
-		err = iEirManServer.EirManager().SetData(iEirTag, data, eirDataMode);
-		}
-	return err;
+	return iEirManServer.EirManager().SetData(iEirTag, aData, aMode);
 	}
 
 // Callback from the EIR Manager
@@ -267,6 +171,181 @@
 		return;
 		}
 
+	iParent.MesnSpaceAvailable(aSpaceForTag);
+
+	}
+
+TEirTag CEirManSession::EirTag() const
+	{
+	return iEirTag;
+	}
+
+CEirManExternalSession* CEirManExternalSession::NewL(CEirManServer& aServer)
+	{
+	CEirManExternalSession* self = new(ELeave) CEirManExternalSession();
+	CleanupStack::PushL(self);
+	self->ConstructL(aServer);
+	CleanupStack::Pop(self);
+	return self;
+	}
+
+CEirManExternalSession::CEirManExternalSession()
+	{
+	
+	}
+
+void CEirManExternalSession::ConstructL(CEirManServer& aServer)
+	{
+	iSession = CEirManSession::NewL(aServer, *this, EFalse);
+	}
+
+CEirManExternalSession::~CEirManExternalSession()
+	{
+	if(!iDataAvailableListenerMessage.IsNull())
+		{
+		// complete any outstanding messages.
+		iDataAvailableListenerMessage.Complete(KErrCancel);
+		}
+	delete iSession;
+	}
+/*
+ * Each of the individual methods is responsible for completing the message.
+ * All 'leaves' are processed in CSession2::ServiceError() resulting in message completion
+ * with the appropriate error code.
+ * RegisterTagL() and RegisterSpaceAvailableListenerL() store aMessage parameter for the future use
+ * when the callbacks are called.
+ */
+void CEirManExternalSession::ServiceL(const RMessage2& aMessage)
+	{
+	LOG_FUNC
+	LOG1(_L("CEirManSession::ServiceL aMessage.Function() = %d"), aMessage.Function());
+
+	switch (aMessage.Function())
+		{
+	case EEirManRegisterTag:
+		RegisterTagL(aMessage);
+		break;
+
+	case EEirManSpaceAvailableNotification:
+		RegisterSpaceAvailableListenerL(aMessage);
+		break;
+
+	case EEirManCancelSpaceAvailableNotification:
+		CancelSpaceAvailableListenerL(aMessage);
+		break;
+
+	case EEirManSetData:
+		SetDataL(aMessage);
+		break;
+		
+	case EEirManNewData:
+		NewDataL(aMessage);
+		break;
+
+	default:
+		aMessage.Panic(KEirManCliPncCat, EEirManPanicInvalidIPC);
+		break;
+		}
+	}
+
+void CEirManExternalSession::RegisterTagL(const RMessage2& aMessage)
+	{
+	LOG_FUNC
+	TEirTag tag = static_cast<TEirTag>(aMessage.Int0());
+	LOG1(_L("CEirManSession::RegisterTag tag = %d"), tag);
+
+	iRegisterMessage = aMessage;
+	
+	iSession->RegisterTag(tag);
+	}
+
+void CEirManExternalSession::MesnRegisterComplete(TInt aResult)
+	{
+	if (aResult == KErrArgument)
+		{
+		iRegisterMessage.Panic(KEirManCliPncCat, EEirManPanicInvalidTag);
+		}
+	else
+		{
+		iRegisterMessage.Complete(aResult);
+		}
+	}
+
+void CEirManExternalSession::RegisterSpaceAvailableListenerL(const RMessage2& aMessage)
+	{
+	LOG_FUNC
+
+	if(iDataAvailableListenerMessage.Handle())
+		{
+		LOG(_L("CEirManSession:::RegisterSpaceAvailableListener ERROR IN USE"));
+		LEAVEL(KErrInUse);
+		}
+
+	iDataAvailableListenerMessage = aMessage;
+
+	if(iLastSpaceOffered != 0)
+		{
+		LOG(_L("cached space present, completing immediately"));
+		CompleteSpaceAvailableRequest(iLastSpaceOffered);
+		iLastSpaceOffered = 0;
+		return;
+		}
+	
+	LOG(_L("waiting for callback..."));
+	}
+	
+void CEirManExternalSession::NewDataL(const RMessage2& aMessage)
+	{
+	LOG_FUNC
+
+	if (iSession->EirTag() == EEirTagRESERVED)
+		{
+		aMessage.Panic(KEirManCliPncCat, EEirManPanicInvalidTag);
+		return;
+		}
+
+	TInt requiredLength = static_cast<TInt>(aMessage.Int0());
+
+	LEAVEIFERRORL(iSession->NewData(requiredLength));
+	aMessage.Complete(KErrNone);
+	}
+
+void CEirManExternalSession::CancelSpaceAvailableListenerL(const RMessage2& aMessage)
+	{
+	LOG_FUNC
+
+	if(!iDataAvailableListenerMessage.Handle())
+		{
+		LEAVEL(KErrNotFound);
+		}
+
+	iDataAvailableListenerMessage.Complete(KErrCancel);
+	aMessage.Complete(KErrNone);
+	}
+
+void CEirManExternalSession::SetDataL(const RMessage2& aMessage)
+	{
+	LOG_FUNC
+	if (iSession->EirTag() == EEirTagRESERVED)
+		{
+		aMessage.Panic(KEirManCliPncCat, EEirManPanicInvalidTag);
+		return;
+		}
+
+	TEirDataMode eirDataMode = static_cast<TEirDataMode>(aMessage.Int1());
+	LOG1(_L("EirDataMode: %d"),  eirDataMode);
+
+	// No need to allocate memory with an expensive malloc() call (via HBuf8::NewL or whatever), 
+	// since the EIR contents fit in the stack, and the EIR Manager will cache the data anyway
+	TBuf8<KHCIExtendedInquiryResponseMaxLength> data;
+	LEAVEIFERRORL(aMessage.Read(0, data));
+	
+	LEAVEIFERRORL(iSession->SetData(data, eirDataMode));
+	aMessage.Complete(KErrNone);
+	}
+
+void CEirManExternalSession::MesnSpaceAvailable(TUint aSpaceForTag)
+	{
 	if(iDataAvailableListenerMessage.Handle())
 		{
 		LOG(_L("Listener outstanding, completing request"));
@@ -282,14 +361,92 @@
 		}
 	}
 
-void CEirManSession::CompleteSpaceAvailableRequest(TUint aBytesAvailable)
+void CEirManExternalSession::CompleteSpaceAvailableRequest(TUint aBytesAvailable)
 	{
 	LOG_FUNC
 	LOG1(_L("CEirManSession::CompleteSpaceAvailableRequest bytes: %d"), aBytesAvailable);
 	// Offer the space to the client
-	TPckg<TUint32> pckg(aBytesAvailable);
+	TPckgC<TUint32> pckg(aBytesAvailable);
 
 	TInt err = iDataAvailableListenerMessage.Write(0, pckg);
 	iDataAvailableListenerMessage.Complete(err);
 	}
 
+CEirManInternalSession* CEirManInternalSession::NewL(CEirManServer& aServer, MEirInternalSessionNotifier& aParent)
+	{
+	LOG_STATIC_FUNC
+	CEirManInternalSession* self = new(ELeave) CEirManInternalSession(aParent);
+	CleanupStack::PushL(self);
+	self->ConstructL(aServer);
+	CleanupStack::Pop(self);
+	return self;
+	}
+
+CEirManInternalSession::CEirManInternalSession(MEirInternalSessionNotifier& aParent)
+	: iParent(aParent)
+	{
+	
+	}
+
+void CEirManInternalSession::ConstructL(CEirManServer& aServer)
+	{
+	iSession = CEirManSession::NewL(aServer, *this, ETrue);
+	iSetDataCb = new (ELeave) CAsyncCallBack(CActive::EPriorityHigh);
+	TCallBack cb(&SetDataCb, this);
+	iSetDataCb->Set(cb);
+	}
+
+CEirManInternalSession::~CEirManInternalSession()
+	{
+	delete iSetDataCb;
+	delete iSession;
+	}
+	
+void CEirManInternalSession::RegisterTag(TEirTag aTag)
+	{
+	iSession->RegisterTag(aTag);
+	}
+
+void CEirManInternalSession::SetData(const TDesC8& aData, TEirDataMode aMode)
+	{
+	delete iPendingData;
+	iPendingData = NULL;
+	iSetDataCb->Cancel();
+	iPendingData = aData.Alloc();
+	iPendingMode = aMode;
+	if (iPendingData)
+		{
+		iSetDataCb->CallBack();
+		}
+	}
+
+TInt CEirManInternalSession::SetDataCb(TAny* aThis)
+	{
+	static_cast<CEirManInternalSession*>(aThis)->DoSetData();
+	return KErrNone;
+	}
+
+void CEirManInternalSession::DoSetData()
+	{
+	TInt err = iSession->SetData(*iPendingData, iPendingMode);
+	if (err != KErrNone)
+		{
+		iParent.MeisnSetDataError(err);
+		}
+	}
+
+TInt CEirManInternalSession::NewData(TInt aRequiredLength)
+	{
+	return iSession->NewData(aRequiredLength);
+	}
+
+
+void CEirManInternalSession::MesnRegisterComplete(TInt aResult)
+	{
+	iParent.MeisnRegisterComplete(aResult);
+	}
+
+void CEirManInternalSession::MesnSpaceAvailable(TUint aSpaceForTag)
+	{
+	iParent.MeisnSpaceAvailable(aSpaceForTag - KEirLengthTagLength);
+	}

--- a/bluetooth/btstack/eirman/eirmansession.h	Mon May 03 13:34:38 2010 +0300
+++ b/bluetooth/btstack/eirman/eirmansession.h	Mon Jul 12 07:03:47 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"
@@ -27,41 +27,115 @@
 #include "eirmanager.h"
 
 class CEirManServer;
+class CEirManInternalSession;
 
-NONSHARABLE_CLASS(CEirManSession) : public CSession2, public MEirManagerNotifiee
+NONSHARABLE_CLASS(MEirSessionNotifier)
 	{
 public:
-	static CEirManSession* NewL(CEirManServer& aServer);
+	virtual void MesnRegisterComplete(TInt aResult) = 0;
+	virtual void MesnSpaceAvailable(TUint aSpaceForTag) = 0;
+	};
+
+NONSHARABLE_CLASS(MEirInternalSessionNotifier)
+	{
+public:
+	virtual void MeisnRegisterComplete(TInt aResult) = 0;
+	virtual void MeisnSpaceAvailable(TUint aSpaceForTag) = 0;
+	virtual void MeisnSetDataError(TInt aError) = 0;
+	};
+
+NONSHARABLE_CLASS(CEirManSession) : public CBase, public MEirManagerNotifiee
+	{
+public:
+	static CEirManSession* NewL(CEirManServer& aServer, MEirSessionNotifier& aParent, TBool aInternalSession);
 	~CEirManSession();
 	void NotifyEirFeatureState(TInt aResult);
+	
+	void RegisterTag(TEirTag aTag);
+	TInt SetData(const TDesC8& aData, TEirDataMode aMode);
+	TInt NewData(TInt aRequiredLength);
+	TEirTag EirTag() const;
+
 private:
-	CEirManSession(CEirManServer& aServer);
+	CEirManSession(CEirManServer& aServer, MEirSessionNotifier& aParent, TBool aInternalSession);
 	void ConstructL();
+	void DeregisterTag();
+
+private: // from MEirManagerNotifiee
+	virtual void MemnEirBlockAvailable(TEirTag aTag, TUint aSpaceForTag);
 
-	// ServiceL handlers
-	void RegisterTag(const RMessage2& aMessage);
-	TInt RegisterSpaceAvailableListener(const RMessage2& aMessage, TBool& aComplete);
-	TInt CancelSpaceAvailableListener();
-	TInt SetData(const RMessage2& aMessage);
-	TInt NewData(const RMessage2& aMessage);
+public:
+	TDblQueLink	iLink;
 	
+private:
+	CEirManServer& 		iEirManServer; // unowned
+	MEirSessionNotifier& iParent;
+	TEirTag 			iEirTag;
+	TEirTag				iPendingEirTag;
+	TBool				iRegisterPending;
+	TBool				iInternalSession;
+	};
+
+NONSHARABLE_CLASS(CEirManExternalSession): public CSession2, public MEirSessionNotifier
+	{
+public:
+	static CEirManExternalSession* NewL(CEirManServer& aServer);
+	~CEirManExternalSession();
+	
+private:
+	void ConstructL(CEirManServer& aServer);
+	CEirManExternalSession();
+	void RegisterTagL(const RMessage2& aMessage);
+	void RegisterSpaceAvailableListenerL(const RMessage2& aMessage);
+	void CancelSpaceAvailableListenerL(const RMessage2& aMessage);
+	void NewDataL(const RMessage2& aMessage);
+	void SetDataL(const RMessage2& aMessage);
+
+private:
 	void CompleteSpaceAvailableRequest(TUint aBytesAvailable);
-	void DeregisterTag();
 
 private: // CSession2 virtuals
 	virtual void ServiceL(const RMessage2& aMessage);
 
-private: // from MEirManagerNotifiee
-	virtual void MemnEirBlockAvailable(TEirTag aTag, TUint aSpaceForTag);
-
 private:
-	CEirManServer& 		iEirManServer; // unowned
-	TEirTag 			iEirTag;
-	TEirTag				iPendingEirTag;
-	TUint 				iLastSpaceOffered;
-	TBool 				iSpaceAvailableListenerOutstanding;
+	virtual void MesnRegisterComplete(TInt aResult);
+	virtual void MesnSpaceAvailable(TUint aSpaceForTag);
+	
+private:
 	RMessage2			iRegisterMessage;
 	RMessage2			iDataAvailableListenerMessage;
+	TUint 				iLastSpaceOffered;
+
+	CEirManSession* iSession;
+	};
+
+NONSHARABLE_CLASS(CEirManInternalSession) : public CBase, public MEirSessionNotifier
+	{
+public:
+	static CEirManInternalSession* NewL(CEirManServer& aServer, MEirInternalSessionNotifier& aParent);
+	~CEirManInternalSession();
+	
+	void RegisterTag(TEirTag aTag);
+	void SetData(const TDesC8& aData, TEirDataMode aMode);
+	TInt NewData(TInt aRequiredLength);
+	
+private:
+	CEirManInternalSession(MEirInternalSessionNotifier& aParent);
+	void ConstructL(CEirManServer& aServer);
+
+	static TInt SetDataCb(TAny* aThis);
+	void DoSetData();
+	
+private: // from MEirManagerNotifiee
+	virtual void MesnRegisterComplete(TInt aResult);
+	virtual void MesnSpaceAvailable(TUint aSpaceForTag);
+	
+private:
+	CEirManSession* iSession;
+	MEirInternalSessionNotifier& iParent;
+	CAsyncCallBack* iSetDataCb;
+	HBufC8* iPendingData;
+	TEirDataMode iPendingMode;
 	};
 
 #endif // _EIRMANSESSION_H

--- a/bluetooth/btstack/l2cap/l2capSAPSignalHandler.cpp	Mon May 03 13:34:38 2010 +0300
+++ b/bluetooth/btstack/l2cap/l2capSAPSignalHandler.cpp	Mon Jul 12 07:03:47 2010 +0300
@@ -631,32 +631,44 @@
  		// SAP state machine requested that we open the channel before we could do it.
  		// We can do it now.
  		iOpenChannelRequestAwaitingPeerEntityConfig = EFalse;
- 		iSigState->OpenChannelRequest(*this);
+ 		iSigState->OpenChannel(*this);
  		}
  	}
 
 TBool CL2CapSAPSignalHandler::DelayConfigRequest()
 	{
 	LOG_FUNC
-	iAwaitingConfigRequestDelayTimer = iSAPSignalHandlerTimerState==EConfigRequestDelayTimer;
+	// The whole delaying of sending of ConfigRequest is basically a workaround for
+	// certain broken carkits from a certain Swedish manufacturer at a certain stretch
+	// of time.
+	// The defect was: the carkits advertised their capability to do RTM in Extended
+	// Feature Mask, but when sent a ConfigRequest with RTM they would just panic
+	// (ie. they really only did Basic mode). 
+	// So the workaround is to delay the sending of our Config Request such that
+	// we receive the carkit's request first - we have an optimization which will
+	// downgrade our requested channel mode to Basic if the remote requests it before
+	// we've sent out our ConfigReq. This way we send Basic mode in our ConfigReq
+	// and the carkit is happy.
+	return iSAPSignalHandlerTimerState==EConfigRequestDelayTimer;
+	}
 
-	return iAwaitingConfigRequestDelayTimer; //true if we are delaying
-	}
-				
 void CL2CapSAPSignalHandler::ConfigRequestDelayTimerExpiry()	
  	{
  	LOG_FUNC
- 	if(iAwaitingConfigRequestDelayTimer)
+ 	// Now that ConfigReq delay timer have expired we can start the proper configuration timer.
+ 	StartConfigurationTimer();
+
+ 	if (!iAwaitConfigureChannelRequest)
  		{
- 		iAwaitingConfigRequestDelayTimer = EFalse;
-		ConfigureChannelRequest();
+		ConfigureChannel();
  		}
+ 	// [else]: we're in an active open scenario and SAP hasn't yet issued a ConfigureChannelRequest.
  	}
 
 void CL2CapSAPSignalHandler::CloseChannelRequest()
 	{
 	LOG_FUNC
-	iSigState->CloseChannelRequest(*this);
+	iSigState->CloseChannel(*this);
 	}
 
 void CL2CapSAPSignalHandler::OpenChannelRequest()
@@ -667,7 +679,7 @@
 
 	if (IsPeerInfoDefined())
 		{
-		iSigState->OpenChannelRequest(*this);
+		iSigState->OpenChannel(*this);
 		}
 	else
 		{
@@ -686,7 +698,12 @@
 void CL2CapSAPSignalHandler::ConfigureChannelRequest()
 	{
 	LOG_FUNC
-	iSigState->ConfigureChannelRequest(*this);
+	iAwaitConfigureChannelRequest = EFalse;
+
+	if (iSAPSignalHandlerTimerState != EConfigRequestDelayTimer)
+		{
+		ConfigureChannel();
+		}
 	}
 
 void CL2CapSAPSignalHandler::PendingCommandsDrained()
@@ -707,34 +724,31 @@
 void CL2CapSAPSignalHandler::StartConfigurationTimer()
 	{
 	LOG_FUNC
-	switch(iSAPSignalHandlerTimerState)
-		{
-		case EConfigurationTimer:
-		case EConfigRequestDelayTimer:
-			// The timer is already running. Cancel it and start it again.
-			BTSocketTimer::Remove(iSAPSignalHandlerTimerEntry);
-			iSAPSignalHandlerTimerState = ETimerIdle;
-			break;
-					
-		case ETimerIdle:
-		default:
-			// No timer running, nothing needs to be done.
-			break;
-		};
+	__ASSERT_DEBUG(iSAPSignalHandlerTimerState == ETimerIdle,
+				   Panic(EL2CapAttemptToStartConfigTimerWhenItIsRunning));
+
+	TCallBack cb(TimerExpired, this);
+	iSAPSignalHandlerTimerEntry.Set(cb);
+	BTSocketTimer::Queue(KL2ConfigWatchdogTimeout * KL2ProtocolSecondTimerMultiplier, 
+	                     iSAPSignalHandlerTimerEntry);
+	iSAPSignalHandlerTimerState = EConfigurationTimer;
+	}
 
-	if(iSAPSignalHandlerTimerState == ETimerIdle)
-		{
-		TCallBack cb(TimerExpired, this);
-		iSAPSignalHandlerTimerEntry.Set(cb);
-		BTSocketTimer::Queue(KL2ConfigRequestDelayTimout, 
-		                     iSAPSignalHandlerTimerEntry);
-		iSAPSignalHandlerTimerState = EConfigRequestDelayTimer;
-		}
+void CL2CapSAPSignalHandler::StartConfigRequestDelayTimer()
+	{
+	LOG_FUNC
+	__ASSERT_DEBUG(iSAPSignalHandlerTimerState == ETimerIdle,
+				   Panic(EL2CapAttemptToStartConfigTimerWhenItIsRunning));
+
+	TCallBack cb(TimerExpired, this);
+	iSAPSignalHandlerTimerEntry.Set(cb);
+	BTSocketTimer::Queue(KL2ConfigRequestDelayTimout, 
+						 iSAPSignalHandlerTimerEntry);
+	iSAPSignalHandlerTimerState = EConfigRequestDelayTimer;
 	}
-	
+
 void CL2CapSAPSignalHandler::CancelTimer()
 	{
-
 	LOG_FUNC
 	if(iSAPSignalHandlerTimerState != ETimerIdle)
 		{
@@ -751,18 +765,14 @@
 		case ETimerIdle:
 			Panic(EL2CAPSSHTimerExpiredWhileInIdleState);
 			break;
-			
+	
 		case EConfigRequestDelayTimer:
 			{
-			TCallBack cb(TimerExpired, this);
-			iSAPSignalHandlerTimerEntry.Set(cb);
-			BTSocketTimer::Queue(KL2ConfigWatchdogTimeout * KL2ProtocolSecondTimerMultiplier, 
-			                     iSAPSignalHandlerTimerEntry);
-			iSAPSignalHandlerTimerState = EConfigurationTimer;
+			iSAPSignalHandlerTimerState = ETimerIdle;
 			ConfigRequestDelayTimerExpiry();
 			}
 			break;
-			
+
 		case EConfigurationTimer:
 			iSAPSignalHandlerTimerState = ETimerIdle;
 			iSigState->ConfigurationTimerExpiry(*this);

--- a/bluetooth/btstack/l2cap/l2capSAPSignalHandler.h	Mon May 03 13:34:38 2010 +0300
+++ b/bluetooth/btstack/l2cap/l2capSAPSignalHandler.h	Mon Jul 12 07:03:47 2010 +0300
@@ -128,6 +128,7 @@
 	static TInt TimerExpired(TAny* aSAPSignalHandler);
 
 	void StartConfigurationTimer();
+	void StartConfigRequestDelayTimer();
 	void CancelTimer();
 
 	void DetachFromMux();
@@ -136,14 +137,16 @@
 	TInt SendEchoRequest(const TDes8* aData);
 	void EchoResponseReceived(const TDesC8* aData);
 
+	inline void ConfigureChannel();
+
 	void OverrideParkMode();
 	void UndoOverrideParkMode();
 	void OverrideLPMWithTimeout();
+
 	inline TInt SignalHandlerErrorCode() const;
 	inline MSocketNotify::TOperationBitmasks SignalHandlerErrorAction() const;
 	inline void SetSignalHandlerErrorCode(TInt aError);
 	inline void SetSignalHandlerErrorAction(MSocketNotify::TOperationBitmasks aAction);
-
 private:
 	CL2CapSAPSignalHandler(CL2CAPConnectionSAP& aSAP);
 	void ConstructL();
@@ -187,9 +190,14 @@
 	// OpenChannelRequest, so OpenChannelRequest is delayed until Information Response comes
 	// through.
 	TBool iOpenChannelRequestAwaitingPeerEntityConfig;
-	// The SAP is ready to send a config request
-	// Flag to indicate that we are delaying sending this config request
-	TBool iAwaitingConfigRequestDelayTimer;
+	// A ConfigureChannelRequest from the SAP is only expected in an active open scenario.
+	// On passive open we kick the configuration ourselves.
+	TBool iAwaitConfigureChannelRequest;
+
+	friend class TL2CAPSigStateClosed;
+	friend class TL2CAPSigStateWaitConnectRsp;
+	friend class TL2CAPSigStateWaitConnect;
+	friend class TL2CAPSigStateConfigBase;
 	};
 
 inline TUint8 CL2CapSAPSignalHandler::GetOutstandingRequestID()
@@ -230,7 +238,7 @@
 	{
 	return iRemotePort;
 	}
-	
+
 inline const TBTDevAddr& CL2CapSAPSignalHandler::RemoteBTAddress() const
 	{
 	return iSAP->RemoteDev();
@@ -280,5 +288,10 @@
 	{
 	iSignalHandlerErrorAction = aAction;
 	}
-	
+
+inline void CL2CapSAPSignalHandler::ConfigureChannel()
+	{
+	iSigState->ConfigureChannel(*this);
+	}
+
 #endif

--- a/bluetooth/btstack/l2cap/l2capSigStates.cpp	Mon May 03 13:34:38 2010 +0300
+++ b/bluetooth/btstack/l2cap/l2capSigStates.cpp	Mon Jul 12 07:03:47 2010 +0300
@@ -49,7 +49,7 @@
 	}
 
 // Events from the SAP
-void TL2CAPSigState::CloseChannelRequest(CL2CapSAPSignalHandler& aSignalHandler) const
+void TL2CAPSigState::CloseChannel(CL2CapSAPSignalHandler& aSignalHandler) const
 	{
 	LOG_FUNC
 	// This is a standard action for most states.
@@ -62,7 +62,7 @@
 	aSignalHandler.SAP()->ChannelClosed();
 	}
 
-void TL2CAPSigState::OpenChannelRequest(CL2CapSAPSignalHandler& /*aSignalHandler*/) const	
+void TL2CAPSigState::OpenChannel(CL2CapSAPSignalHandler& /*aSignalHandler*/) const	
 	{
 	LOG_FUNC
 	PanicInState(EL2CAPUnexpectedSAPEvent);
@@ -74,7 +74,7 @@
 	PanicInState(EL2CAPUnexpectedSAPEvent);
 	}
 
-void TL2CAPSigState::ConfigureChannelRequest(CL2CapSAPSignalHandler& /*aSignalHandler*/) const	
+void TL2CAPSigState::ConfigureChannel(CL2CapSAPSignalHandler& /*aSignalHandler*/) const	
 	{
 	LOG_FUNC
 	PanicInState(EL2CAPUnexpectedSAPEvent);
@@ -282,7 +282,7 @@
 	LOG_FUNC
 	}
 
-void TL2CAPSigStateClosed::OpenChannelRequest(CL2CapSAPSignalHandler& aSignalHandler) const
+void TL2CAPSigStateClosed::OpenChannel(CL2CapSAPSignalHandler& aSignalHandler) const
 	{
 	LOG_FUNC
 	// The SAP has requested a channel be opened.
@@ -353,7 +353,7 @@
 	}
 
 
-void TL2CAPSigStateClosed::CloseChannelRequest(CL2CapSAPSignalHandler& aSignalHandler) const
+void TL2CAPSigStateClosed::CloseChannel(CL2CapSAPSignalHandler& aSignalHandler) const
 	{
 	LOG_FUNC
 	// Detach from the Mux.  Inform the SAP that disconnection is complete.
@@ -382,6 +382,8 @@
 	// Cancel the configuration timer.
 	aSignalHandler.CancelTimer();
 
+	aSignalHandler.iOpenChannelRequestAwaitingPeerEntityConfig = EFalse;
+
 	// If Park mode has been overridden during either channel establishment or
 	// channel disconnect, remove the override.
 	// NB It is safe to call this method multiple times.
@@ -446,7 +448,7 @@
 	}
 
 // Events from the Mux
-void TL2CAPSigStateWaitConnectRsp::CloseChannelRequest(CL2CapSAPSignalHandler& aSignalHandler) const
+void TL2CAPSigStateWaitConnectRsp::CloseChannel(CL2CapSAPSignalHandler& aSignalHandler) const
 	{	
 	// Disconnect the channel.	
 	HandleSAPDisconnect(aSignalHandler);
@@ -457,6 +459,7 @@
 	LOG_FUNC
 	//set the remote CID to 0
 	aSignalHandler.SetRemotePort(TL2CAPPort(0));
+	aSignalHandler.iAwaitConfigureChannelRequest = ETrue;
 	}
 
 /****************************************************************************/
@@ -469,7 +472,7 @@
 	}
 	
 // Events from the SAP
-void TL2CAPSigStateWaitConnect::OpenChannelRequest(CL2CapSAPSignalHandler& aSignalHandler) const
+void TL2CAPSigStateWaitConnect::OpenChannel(CL2CapSAPSignalHandler& aSignalHandler) const
 	{
 	LOG_FUNC
 
@@ -489,7 +492,7 @@
 				// We should never get in here! The timer, which allows the delay
 				// should have been started on entry to the state "WaitConfig". 
 				{
-				aSignalHandler.ConfigureChannelRequest();
+				aSignalHandler.ConfigureChannel();
 				}
 			}
 		} // Success Response
@@ -516,7 +519,7 @@
 	}
 
 // Events from the Mux
-void TL2CAPSigStateWaitConnect::CloseChannelRequest(CL2CapSAPSignalHandler& aSignalHandler) const
+void TL2CAPSigStateWaitConnect::CloseChannel(CL2CapSAPSignalHandler& aSignalHandler) const
 	{
 	LOG_FUNC
 
@@ -567,6 +570,12 @@
 	HandleDisconnectRequest(aSignalHandler, aId);
 	}
 
+void TL2CAPSigStateWaitConnect::Enter(CL2CapSAPSignalHandler& aSignalHandler) const
+	{
+	LOG_FUNC
+	aSignalHandler.iAwaitConfigureChannelRequest = EFalse;
+	}
+
 
 /**************************************************************************/
 // Implementation of TL2CAPSigStateConfigBase
@@ -606,7 +615,7 @@
 	}      							 	
 
 // Events from the SAP
-void TL2CAPSigStateConfigBase::CloseChannelRequest(CL2CapSAPSignalHandler& aSignalHandler) const
+void TL2CAPSigStateConfigBase::CloseChannel(CL2CapSAPSignalHandler& aSignalHandler) const
 	{
 	LOG_FUNC
 	// Disconnect the channel.
@@ -624,7 +633,7 @@
 void TL2CAPSigStateConfigBase::ConfigurationTimerExpiry(CL2CapSAPSignalHandler& aSignalHandler) const
 	{
 	LOG_FUNC
-	CloseChannelRequest(aSignalHandler);
+	CloseChannel(aSignalHandler);
 	}
 	
 // Common handling of Config Request and Response commands.
@@ -669,13 +678,29 @@
 							case EConfigSuccess:
 								// Move to next state.
 								aSignalHandler.SetState(iFactory.GetState(aConfigSuccessState));
+
+								if (!configRequestSent && !aSignalHandler.iAwaitConfigureChannelRequest)
+									{
+									// The delay timer is there so that we don't send a
+									// Config Req before receiving one from the remote
+									// (as a workaround for some broken carkits, see 
+									// DelayConfigRequest()). Since we've just received a
+									// ConfigReq from the remote, we can stop the delay
+									// timer and send our request if this is passive open
+                                    // or remotely-initiated reconfiguration.
+									// If it's an active open scenario then we need to wait
+									// for security access request to get completed.
+									aSignalHandler.CancelTimer();
+									aSignalHandler.StartConfigurationTimer();
+									aSignalHandler.ConfigureChannel();
+									}
 								break;
-	
+
 							case EConfigUnacceptableParams:
 							case EConfigRejected:
 								// Stay in current state.
 								break;
-	
+
 							case EConfigUnknownOption: // impossible on this path
 							default:
 								__ASSERT_DEBUG(EFalse, PanicInState(EL2CAPInvalidConfigResponseCodeGenerated));
@@ -836,7 +861,7 @@
 	}
 
 // Events from the SAP
-void TL2CAPSigStateWaitConfig::ConfigureChannelRequest(CL2CapSAPSignalHandler& aSignalHandler) const
+void TL2CAPSigStateWaitConfig::ConfigureChannel(CL2CapSAPSignalHandler& aSignalHandler) const
 	{
 	LOG_FUNC
 	// Local config can now be initiated.  The local config requirements must
@@ -851,7 +876,7 @@
 		if(err == KErrNone)
 			{
 			aSignalHandler.SetState(iFactory.GetState(CL2CAPSignalStateFactory::EWaitConfigReqRsp));
-			}						
+			}
 		else
 			{
 			Error(aSignalHandler, KErrCouldNotConnect, MSocketNotify::EErrorAllOperations);
@@ -859,7 +884,7 @@
 		}
 	// Else wait until the delay timer expires.
 	}
-	
+
 // L2CAP commands received from the peer.
 void TL2CAPSigStateWaitConfig::ConfigRequest(CL2CapSAPSignalHandler& aSignalHandler,
 								  			 HConfigureRequest* aConfigRequest) const
@@ -868,12 +893,14 @@
 	// Call the config base class helper method to process this command.
 	TL2CAPSigStateConfigBase::ConfigRequest(aSignalHandler, aConfigRequest, CL2CAPSignalStateFactory::EWaitSendConfig);
 	}
-		
+
 // Change of state events
 void TL2CAPSigStateWaitConfig::Enter(CL2CapSAPSignalHandler& aSignalHandler) const
 	{
 	LOG_FUNC
-	aSignalHandler.StartConfigurationTimer();
+	// 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();
 	}
 
 /**************************************************************************/
@@ -890,7 +917,7 @@
 	}
 	
 // Events from the SAP
-void TL2CAPSigStateWaitSendConfig::ConfigureChannelRequest(CL2CapSAPSignalHandler& aSignalHandler) const
+void TL2CAPSigStateWaitSendConfig::ConfigureChannel(CL2CapSAPSignalHandler& aSignalHandler) const
 	{
 	LOG_FUNC
 	// Local config can now be initiated.  The local config requirements must
@@ -1005,9 +1032,6 @@
 	// should not be sent until it completes.
 	aSignalHandler.ReconfiguringChannel();
 	static_cast<void>(aSignalHandler.HandleConfigureRequest(aConfigRequest));
-
-	// Start local reconfiguration.
-	aSignalHandler.ConfigureChannelRequest();
 	}
 
 TInt TL2CAPSigStateOpen::UpdateChannelConfig(CL2CapSAPSignalHandler& aSignalHandler, const TL2CapConfig& aAPIConfig) const
@@ -1019,14 +1043,14 @@
 		{
 		aSignalHandler.ReconfiguringChannel();
 		aSignalHandler.SetState(iFactory.GetState(CL2CAPSignalStateFactory::EWaitConfig));
-		aSignalHandler.ConfigureChannelRequest();
+		aSignalHandler.ConfigureChannel();
 		rerr = KErrL2CAPConfigPending;
 		}
 	return rerr;
 	}
 
 
-void TL2CAPSigStateOpen::CloseChannelRequest(CL2CapSAPSignalHandler& aSignalHandler) const
+void TL2CAPSigStateOpen::CloseChannel(CL2CapSAPSignalHandler& aSignalHandler) const
 	{
 	LOG_FUNC
 	// Disconnect the channel.
@@ -1060,16 +1084,16 @@
 		LOG(_L("CL2CapSigStateOpen::Enter doing reconfig"));
 		// now get reconfiguring
 		aSignalHandler.SetState(iFactory.GetState(CL2CAPSignalStateFactory::EWaitConfig));
-		aSignalHandler.ConfigureChannelRequest();
+		aSignalHandler.ConfigureChannel();
 		}
 	else
 		{
 		// Remove and park override.
 		aSignalHandler.UndoOverrideParkMode();
-		
+
 		// Cancel the configuration timer.
 		aSignalHandler.CancelTimer();
-		
+
 		// Inform the SAP that the channel is now configured and ready to use.
 		aSignalHandler.SAP()->ChannelConfigured(aSignalHandler.ChannelConfig(),
 		                                        aSignalHandler.Mux(),
@@ -1153,7 +1177,7 @@
 	aSignalHandler.CancelTimer();
 	}
 
-void TL2CAPSigStateWaitDisconnect::CloseChannelRequest(CL2CapSAPSignalHandler& /*aSignalHandler*/) const
+void TL2CAPSigStateWaitDisconnect::CloseChannel(CL2CapSAPSignalHandler& /*aSignalHandler*/) const
 	{
 	LOG_FUNC
 	// Already disconnecting.
@@ -1201,7 +1225,7 @@
 	// Could well be in this state - just drop.
 	}
 
-void TL2CAPSigStateWaitDisconnect::ConfigureChannelRequest(CL2CapSAPSignalHandler& /*aSignalHandler*/) const
+void TL2CAPSigStateWaitDisconnect::ConfigureChannel(CL2CapSAPSignalHandler& /*aSignalHandler*/) const
 	{
 	LOG_FUNC
 	// This may be called if an Information Request times out

--- a/bluetooth/btstack/l2cap/l2capSigStates.h	Mon May 03 13:34:38 2010 +0300
+++ b/bluetooth/btstack/l2cap/l2capSigStates.h	Mon Jul 12 07:03:47 2010 +0300
@@ -78,10 +78,10 @@
 	TL2CAPSigState(const CL2CAPSignalStateFactory& aFactory);
 	
 	// Events from the SAP
-	virtual void CloseChannelRequest(CL2CapSAPSignalHandler& aSignalHandler) const;
-	virtual void OpenChannelRequest(CL2CapSAPSignalHandler& aSignalHandler) const;
+	virtual void CloseChannel(CL2CapSAPSignalHandler& aSignalHandler) const;
+	virtual void OpenChannel(CL2CapSAPSignalHandler& aSignalHandler) const;
 	virtual void ConnectRequestReceived(CL2CapSAPSignalHandler& aSignalHandler) const;
-	virtual void ConfigureChannelRequest(CL2CapSAPSignalHandler& aSignalHandler) const;
+	virtual void ConfigureChannel(CL2CapSAPSignalHandler& aSignalHandler) const;
 	virtual TInt UpdateChannelConfig(CL2CapSAPSignalHandler& aSignalHandler, const TL2CapConfig& aAPIConfig) const;
 
 	virtual TInt GetNegotiatedChannelMode(const CL2CapSAPSignalHandler& aSignalHandler, TL2CapChannelMode& aMode) const;
@@ -142,9 +142,9 @@
 	TL2CAPSigStateClosed(const CL2CAPSignalStateFactory& aFactory);
 
 	// Events from the SAP
-	void OpenChannelRequest(CL2CapSAPSignalHandler& aSignalHandler) const;
+	void OpenChannel(CL2CapSAPSignalHandler& aSignalHandler) const;
 	void ConnectRequestReceived(CL2CapSAPSignalHandler& aSignalHandler) const;
-	void CloseChannelRequest(CL2CapSAPSignalHandler& aSignalHandler) const;
+	void CloseChannel(CL2CapSAPSignalHandler& aSignalHandler) const;
 
 	void ConfigRequest(CL2CapSAPSignalHandler& aSignalHandler,
 					   HConfigureRequest* aConfigRequest) const;
@@ -165,7 +165,7 @@
 	TL2CAPSigStateWaitConnectRsp(const CL2CAPSignalStateFactory& aFactory);
 
 	// Events from the SAP
-	void CloseChannelRequest(CL2CapSAPSignalHandler& aSignalHandler) const;
+	void CloseChannel(CL2CapSAPSignalHandler& aSignalHandler) const;
 
 	// L2CAP commands received from the peer.
 	void ConnectResponse(CL2CapSAPSignalHandler& aSignalHandler,
@@ -183,15 +183,16 @@
 	TL2CAPSigStateWaitConnect(const CL2CAPSignalStateFactory& aFactory);	
 
 	// Events from the SAP
-	void OpenChannelRequest(CL2CapSAPSignalHandler& aSignalHandler) const;
-	void CloseChannelRequest(CL2CapSAPSignalHandler& aSignalHandler) const;
+	void OpenChannel(CL2CapSAPSignalHandler& aSignalHandler) const;
+	void CloseChannel(CL2CapSAPSignalHandler& aSignalHandler) const;
 	
 	// L2CAP commands received from the peer.
 	void DisconnectRequest(CL2CapSAPSignalHandler& aSignalHandler, TUint8 aId) const;
 
 	// Change of state state events
 	void PendingCommandsDrained(CL2CapSAPSignalHandler& aSignalHandler) const;
-	
+
+	void Enter(CL2CapSAPSignalHandler& aSignalHandler) const;
 	};
 	
 NONSHARABLE_CLASS(TL2CAPSigStateConfigBase) : public TL2CAPSigState
@@ -212,7 +213,7 @@
 	           MSocketNotify::TOperationBitmasks aErrorAction) const;
 
 	// Events from the SAP
-	void CloseChannelRequest(CL2CapSAPSignalHandler& aSignalHandler) const;
+	void CloseChannel(CL2CapSAPSignalHandler& aSignalHandler) const;
 	TInt UpdateChannelConfig(CL2CapSAPSignalHandler& aSignalHandler, const TL2CapConfig& aAPIConfig) const;
 
 	// Timer Events
@@ -238,7 +239,7 @@
 	TL2CAPSigStateWaitConfig(const CL2CAPSignalStateFactory& aFactory);	
 
 	// Events from the SAP
-	void ConfigureChannelRequest(CL2CapSAPSignalHandler& aSignalHandler) const;
+	void ConfigureChannel(CL2CapSAPSignalHandler& aSignalHandler) const;
 
 	// L2CAP commands received from the peer.
 	void ConfigRequest(CL2CapSAPSignalHandler& aSignalHandler,
@@ -259,7 +260,7 @@
 	TL2CAPSigStateWaitSendConfig(const CL2CAPSignalStateFactory& aFactory);	
 
 	// Events from the SAP
-	void ConfigureChannelRequest(CL2CapSAPSignalHandler& aSignalHandler) const;
+	void ConfigureChannel(CL2CapSAPSignalHandler& aSignalHandler) const;
 	};
 
 NONSHARABLE_CLASS(TL2CAPSigStateWaitConfigReqRsp) : public TL2CAPSigStateConfigBase
@@ -317,7 +318,7 @@
 	TL2CAPSigStateOpen(const CL2CAPSignalStateFactory& aFactory);	
 
 	// Events from the SAP
-	void CloseChannelRequest(CL2CapSAPSignalHandler& aSignalHandler) const;
+	void CloseChannel(CL2CapSAPSignalHandler& aSignalHandler) const;
 
 	// L2CAP commands received from the peer.
 	void DisconnectRequest(CL2CapSAPSignalHandler& aSignalHandler, TUint8 aId) const;
@@ -343,7 +344,7 @@
 	TL2CAPSigStateWaitDisconnect(const CL2CAPSignalStateFactory& aFactory);	
 
 	// Events from the SAP
-	void CloseChannelRequest(CL2CapSAPSignalHandler& aSignalHandler) const;
+	void CloseChannel(CL2CapSAPSignalHandler& aSignalHandler) const;
 	TInt UpdateChannelConfig(CL2CapSAPSignalHandler& aSignalHandler, const TL2CapConfig& aAPIConfig) const;
 
 	// State changes from the Mux
@@ -360,7 +361,7 @@
 
 	void ConfigResponse(CL2CapSAPSignalHandler& /*aSignalHandler*/,
  	                	HConfigureResponse* /*aConfigResponse*/) const;
-	void ConfigureChannelRequest(CL2CapSAPSignalHandler& /*aSignalHandler*/) const;
+	void ConfigureChannel(CL2CapSAPSignalHandler& /*aSignalHandler*/) const;
 	};
 
 #endif

--- a/bluetooth/btstack/l2cap/l2util.h	Mon May 03 13:34:38 2010 +0300
+++ b/bluetooth/btstack/l2cap/l2util.h	Mon Jul 12 07:03:47 2010 +0300
@@ -172,7 +172,8 @@
 	EL2CAPNullOwnerSupplied = 148,
 	EL2CAPTryingToStealOwnedPdu = 149,
 	EL2CapConstructingPositiveConfigResponseWithUnresolvedOptionStatus = 200,
-	EL2CapReferencingUnackedIFrameWhenNoRetransmissionGoing = 274, 
+	EL2CapReferencingUnackedIFrameWhenNoRetransmissionGoing = 274,
+	EL2CapAttemptToStartConfigTimerWhenItIsRunning = 275,
 	};
 
 /**

--- a/bluetooth/btstack/linkmgr/ACLSAP.cpp	Mon May 03 13:34:38 2010 +0300
+++ b/bluetooth/btstack/linkmgr/ACLSAP.cpp	Mon Jul 12 07:03:47 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2003-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2003-2010 Nokia Corporation and/or its subsidiary(-ies).
 // All rights reserved.
 // This component and the accompanying materials are made available
 // under the terms of "Eclipse Public License v1.0"
@@ -19,6 +19,7 @@
 #include <bluetooth/logger.h>
 #include <bt_sock.h>
 #include <bluetooth/hci/aclpacketconsts.h>
+#include <bluetooth/hci/hciconsts.h>
 
 #include "ACLSAP.h"
 #include "physicallinks.h"
@@ -1089,13 +1090,7 @@
 		CPhysicalLink* physicalLink = &iLinksMan.NewPhysicalLinkL(iRemoteDev);
 		// physicalLink is owned by the physical links manager.
 		User::LeaveIfError(BindLink(EACLLink, *physicalLink));
-		TInt err = iPhysicalLink->Connect();
-		if(err != KErrNone)
-			{
-			// If we failed to connect then we should roll back the attachment
-			ClearPhysicalLink();
-			User::Leave(err);
-			}
+		iPhysicalLink->Connect();
 		}
 	}
 
@@ -1333,53 +1328,34 @@
 	iState->Shutdown(*this, aOption);
 	}
 
-
 void CACLLink::NotifyDataToSocket(TUint8 aFlag, const TDesC8& aData)
 	{
 	LOG_FUNC
-	const TUint8 KFlagHeaderSize =1;
 /*
 	The design of the protocol specification for L2CAP
 	means that both we and L2CAP need to know the flag parameter
 	for now we just signal one datagram (*could* signal two - one for flag: but that's just as grubby)
 */
 
+	RMBufChain aclData;
 
-	// make a new chain consisting of Flag(1st octet) followed by Data.
-	RMBufChain aclData;
-	#ifdef HOSTCONTROLLER_TO_HOST_FLOW_CONTROL
-	THCIConnHandle connH=iHandle;
-	aclData = const_cast<CHCIFacade&>(iLinksMan.HCIFacade()).TakeInboundACLDataBufferFromPool(connH);
-	aclData.CopyIn(aData,KFlagHeaderSize);
-	aclData.TrimEnd(aData.Length()+KFlagHeaderSize); //return the reserved MBufs we didn't need
-													 //to the global pool
-	#else
-	TRAPD(err, aclData.CreateL(aData, KFlagHeaderSize));
-
+	CACLDataQController& aclQctrl = iProtocol.ACLController();
+	THCIConnHandle connH = iHandle;
+	TRAPD(err, aclData = aclQctrl.PopulateInboundBufferL(connH, aFlag, aData));
 	if (err)
 		{
-		//Since HC->H flow control is off, and we have run out of MBufs
-		//there is nothing we can do here but drop or disconnect the link
-		//due to limited resources. We drop.
+		// We have run out of MBufs, there is nothing we can do here but 
+		// 1) drop the received packet, or
+		// 2) disconnect the link
+		// We drop the packet to be multi-profile "friendly"
+		LOG1(_L8("*** ERROR: Dropping ACL Data!!! (error = %d) ***"), err);
 		return;
 		}
-	#endif
-
-	aclData.First()->Ptr()[0] = aFlag;	// aData is already in the chain
-
-
+	
 	// slap onto the RMBufPacketQ
 	iInboundBuffer.Append(aclData); // transfers
 	
-
-	#ifndef HOSTCONTROLLER_TO_HOST_FLOW_CONTROL
-	if (!err)
-		{
-	#endif
-		iSocket->NewData(1);	// datagrams: could async notify - or get l2cap to drain async
-	#ifndef HOSTCONTROLLER_TO_HOST_FLOW_CONTROL
-		}
-	#endif
+	iSocket->NewData(1);	// datagrams: could async notify - or get l2cap to drain async
 	}
 
 

--- a/bluetooth/btstack/linkmgr/AclDataQController.cpp	Mon May 03 13:34:38 2010 +0300
+++ b/bluetooth/btstack/linkmgr/AclDataQController.cpp	Mon Jul 12 07:03:47 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,10 +20,14 @@
 //
 
 #include <bluetooth/logger.h>
+#include <bluetooth/hci/hciconsts.h>
 #include "AclDataQController.h"
 #include "linkmgr.h"
 #include "AclDataQ.h"
 #include "hcifacade.h"
+#include "hostmbufpool.h"
+#include "linkflowcontrol.h"
+#include "linkconsts.h"
 
 #ifdef __FLOG_ACTIVE
 _LIT8(KLogComponent, LOG_COMPONENT_LINKMGR);
@@ -50,8 +54,6 @@
 	CleanupStack::PushL(self);
 	self->ConstructL(aProtocol, aBufSize, aFrameOverhead, aNumBufs);
 	CleanupStack::Pop(self);
-
-	LOG1(_L("CACLDataQController::NewL self = 0x%08x"), self);
 	return self;
 	}
 
@@ -67,7 +69,11 @@
 CACLDataQController::~CACLDataQController()
 	{
 	LOG_FUNC
-
+	
+#ifdef HOSTCONTROLLER_TO_HOST_FLOW_CONTROL
+	delete iMBufPool;
+#endif
+	
 	delete iDataQ;
 	iAclConns.Reset();
 	iAclConns.Close();
@@ -81,6 +87,7 @@
 	LOG_FUNC
 
 	iDataQ = CAclDataQ::NewL(aProtocol, aNumBufs, aBufSize, aFrameOverhead);
+	
 
 #ifdef PROXY_COMMUNICATES
 	LOG(_L("\tPROXY_COMMUNICATES defined- reserving slots for broadcast channel"));
@@ -88,6 +95,11 @@
 	// Reserve BC one now
 	User::LeaveIfError(ACLLogicalLinkUp(KHCIBroadcastHandle, EFalse));
 #endif
+	
+#ifdef HOSTCONTROLLER_TO_HOST_FLOW_CONTROL
+	LOG(_L8("\tHOSTCONTROLLER_TO_HOST_FLOW_CONTROL defined- creating buffer pool"));
+	iMBufPool = CHostMBufPool::NewL(aProtocol.HCIFacade().CommandQController());
+#endif
 	}
 
 void CACLDataQController::InitialDataCredits(TUint16 aCredits)
@@ -427,6 +439,15 @@
 	LOG1(_L("CACLDataQController::ACLLogicalLinkDown aConnH = %d"), 
 		aConnH);
 
+#ifdef HOSTCONTROLLER_TO_HOST_FLOW_CONTROL
+	if(iMBufPool)
+		{
+		iMBufPool->InvalidateByConnH(aConnH);
+		// the packet completions should probably move to the iAclConns model
+		// to clean up this code.
+		}
+#endif // HOSTCONTROLLER_TO_HOST_FLOW_CONTROL
+
 	TInt connection = FindConnection(aConnH);
 		
 	if ( connection == KErrNotFound )
@@ -620,5 +641,44 @@
 	return rerr;
 	}
 
+RMBufChain CACLDataQController::PopulateInboundBufferL(THCIConnHandle aConnH, TUint8 aFlag, const TDesC8& aData)
+	{
+	LOG_FUNC
+	// make a new chain consisting of Flag(1st octet) followed by Data.
+	RMBufChain aclData;
+	static const TInt KFlagHeaderOffset = 0;
+	
+#ifdef HOSTCONTROLLER_TO_HOST_FLOW_CONTROL
+	// Check what flow control mode is in operation
+	TFlowControlMode flowControl = iLinkMuxer.FlowControlMode();
+	TBool ctrlerToHost = (flowControl == ETwoWayFlowControlEnabled) || (flowControl == EFlowControlFromHostControllerOnly);
+	if(ctrlerToHost)
+		{
+		__ASSERT_DEBUG(iMBufPool, Panic(ELinkMgrFlowControlChangeOfMind));
+		aclData = iMBufPool->TakeBufferL(aConnH);
+		aclData.CopyIn(aData, KLinkMgrIncomingBufferHeaderSize);
+		// return the reserved MBufs we didn't need to the global pool
+		aclData.TrimEnd(aData.Length() + KLinkMgrIncomingBufferHeaderSize);
+		}
+	else
+#endif // HOSTCONTROLLER_TO_HOST_FLOW_CONTROL
+		{
+		aclData.CreateL(aData, KLinkMgrIncomingBufferHeaderSize);
+		}
+	
+	aclData.First()->Ptr()[KFlagHeaderOffset] = aFlag;
+	
+	return aclData;
+	}
+
+void CACLDataQController::NoExplicitInboundPoolNeeded()
+	{
+	LOG_FUNC
+#ifdef HOSTCONTROLLER_TO_HOST_FLOW_CONTROL
+	delete iMBufPool;
+	iMBufPool = NULL;
+#endif // HOSTCONTROLLER_TO_HOST_FLOW_CONTROL
+	}
+
 //
 // End of file

--- a/bluetooth/btstack/linkmgr/AclDataQController.h	Mon May 03 13:34:38 2010 +0300
+++ b/bluetooth/btstack/linkmgr/AclDataQController.h	Mon Jul 12 07:03:47 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2001-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"
@@ -18,6 +18,7 @@
 
 #include <e32base.h>
 #include <bttypes.h>
+#include <es_mbuf.h>
 
 class CAclDataQ;
 struct TDataQConnectionInfo;
@@ -25,6 +26,7 @@
 class CLinkMgrProtocol;
 class CLinkMuxer;
 class CHCIFacade;
+class CHostMBufPool;
 
 /**
 	Controller of the ACL data Q and of the pending packet list.
@@ -43,6 +45,7 @@
 	~CACLDataQController();
 
 public:
+	// Outbound aspects
 	void InitialDataCredits(TUint16 aCredits);
 	void AddItem(CACLDataItem& aACLFrame);
 	TBool IssueNextACLDataFragment();
@@ -57,6 +60,11 @@
 	void ACLLogicalLinkDown(THCIConnHandle aConnH);
 	void SetParked(THCIConnHandle aConnH, TBool aParked);
 	void CompletedPackets(THCIConnHandle aConnH, TUint16 aNo);
+	
+	// Inbound buffer related aspects
+	RMBufChain PopulateInboundBufferL(THCIConnHandle aConnH, TUint8 aFlag, const TDesC8& aData);
+	void NoExplicitInboundPoolNeeded();
+	
 
 private:
 	CACLDataQController(CHCIFacade& aHCIFacade, CLinkMuxer& aMuxer);
@@ -84,6 +92,10 @@
 	TUint iIndexOfLastSendingConn;
 
 	TUint16     iNumControllerBufs;
+	
+#ifdef HOSTCONTROLLER_TO_HOST_FLOW_CONTROL
+	CHostMBufPool* iMBufPool;
+#endif
 
 private: // unowned
 	CLinkMuxer&	iLinkMuxer;

--- a/bluetooth/btstack/linkmgr/ProxySAP.cpp	Mon May 03 13:34:38 2010 +0300
+++ b/bluetooth/btstack/linkmgr/ProxySAP.cpp	Mon Jul 12 07:03:47 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2003-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2003-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,6 +26,7 @@
 #include "linkmgr.h"
 
 #include <bluetooth/hci/aclpacketconsts.h>
+#include <bluetooth/hci/hciconsts.h>
 
 #ifdef __FLOG_ACTIVE
 _LIT8(KLogComponent, LOG_COMPONENT_LINKMGR);
@@ -552,7 +553,7 @@
 					}
 				else
 					{
-					iRequestedActiveMode = option ? ETrue : EFalse;
+					iRequestedActiveMode = option;
 					if(iRequestedActiveMode)
 						{
 						localPriority = ETrue;
@@ -766,12 +767,12 @@
 			return;
 			}										
 
-		if (aDisconnectOption == KDisconnectAllPhysicalLinks)
+		if (aDisconnectOption == KDisconnectAllPhysicalLinks || aDisconnectOption == KDisconnectAllPhysicalLinksForPowerOff)
 			{
 			// Disconnecting All BT Physical Links
 			// Only support link *termination*, this is done as normal cos esock weirdness
 			__ASSERT_ALWAYS(aCloseType == CServProviderBase::ENormal, Panic(EBTProxySAPInvalidTerminate));
-			rerr = iLinksMan.TerminateAllPhysicalLinks(this);
+			rerr = iLinksMan.TerminateAllPhysicalLinks(this, aDisconnectOption == KDisconnectAllPhysicalLinksForPowerOff ? ERemoteAboutToPowerOff : ERemoteUserEndedConnection);
 			LOG2(_L("Proxy SAP 0x%08x -- Terminating all PHY Links, error: %d"), this, rerr);
 			
 			// If there was an error terminating any of the physical links then we can 

--- a/bluetooth/btstack/linkmgr/ProxySAP.h	Mon May 03 13:34:38 2010 +0300
+++ b/bluetooth/btstack/linkmgr/ProxySAP.h	Mon Jul 12 07:03:47 2010 +0300
@@ -80,6 +80,7 @@
 public:
 	static CBTProxySAP* NewLC(CPhysicalLinksManager& aConnectionMan, CPhysicalLink*);
 	static CBTProxySAP* NewL(CPhysicalLinksManager& aConnectionMan, CPhysicalLink*);
+	~CBTProxySAP();
 
 // from SAP - the proxy will not do all of these
 	virtual void Start();
@@ -122,8 +123,7 @@
 
 	void Error(TInt aError);
 	void Disconnect();
-
-	~CBTProxySAP();
+	
 public:
 	TSglQueLink			iQueueLink;	
 	TBTDblQueLink		iPLMLink;	

--- a/bluetooth/btstack/linkmgr/Subscribers.cpp	Mon May 03 13:34:38 2010 +0300
+++ b/bluetooth/btstack/linkmgr/Subscribers.cpp	Mon Jul 12 07:03:47 2010 +0300
@@ -18,6 +18,7 @@
 #include <bt_subscribe.h>
 #include <bt_sock.h>
 #include <utf.h>
+#include <bluetooth/hci/hciconsts.h>
 #include "Subscribers.h"
 #include "linkmgr.h"
 #include "physicallinksmanager.h"

--- a/bluetooth/btstack/linkmgr/SyncSap.cpp	Mon May 03 13:34:38 2010 +0300
+++ b/bluetooth/btstack/linkmgr/SyncSap.cpp	Mon Jul 12 07:03:47 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2003-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2003-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,6 +17,7 @@
 
 #include <bluetooth/logger.h>
 #include <bt_sock.h>
+#include <bluetooth/hci/hciconsts.h>
 #include "SCOSAP.h"
 #include "physicallinksmanager.h"
 #include "physicallinks.h"

--- a/bluetooth/btstack/linkmgr/basebandsap.cpp	Mon May 03 13:34:38 2010 +0300
+++ b/bluetooth/btstack/linkmgr/basebandsap.cpp	Mon Jul 12 07:03:47 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2003-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2003-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,6 +16,7 @@
 //
 
 #include <bluetooth/logger.h>
+#include <bluetooth/hci/hciconsts.h>
 #include "basebandsap.h"
 #include "physicallinksmanager.h"
 #include "physicallinks.h"

--- a/bluetooth/btstack/linkmgr/eirpublisherlocalname.cpp	Mon May 03 13:34:38 2010 +0300
+++ b/bluetooth/btstack/linkmgr/eirpublisherlocalname.cpp	Mon Jul 12 07:03:47 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"
@@ -15,9 +15,10 @@
 
 #include "eirpublisherlocalname.h"
 #include "linkutil.h"
-#include <bluetooth/eirpublisherbase.h>
 #include <bluetooth/logger.h>
 
+#include "eirmanserver.h"
+
 #ifdef __FLOG_ACTIVE
 _LIT8(KLogComponent, LOG_COMPONENT_EIRMANAGER);
 #endif
@@ -29,18 +30,17 @@
 /**
 Provides functionality to publish Local Name to EIR.
 **/
-CEirPublisherLocalName* CEirPublisherLocalName::NewL()
+CEirPublisherLocalName* CEirPublisherLocalName::NewL(CEirManServer& aServer)
 	{
 	LOG_STATIC_FUNC
 	CEirPublisherLocalName* self = new (ELeave) CEirPublisherLocalName();
 	CleanupStack::PushL(self);
-	self->ConstructL();
+	self->ConstructL(aServer);
 	CleanupStack::Pop();
 	return self;
 	}
 
 CEirPublisherLocalName::CEirPublisherLocalName()
-:	CEirPublisherBase(EEirTagName)
 	{
 	LOG_FUNC
 	}
@@ -49,26 +49,49 @@
 	{
 	LOG_FUNC
 	delete iPublishBuf;
+	delete iSession;
 	}
 	
-void CEirPublisherLocalName::ConstructL()
+void CEirPublisherLocalName::ConstructL(CEirManServer& aServer)
 	{
 	LOG_FUNC
-	CEirPublisherBase::ConstructL();
+	iSession = aServer.NewInternalSessionL(*this);
+	iSession->RegisterTag(EEirTagName);
 	}
+
+void CEirPublisherLocalName::MeisnRegisterComplete(TInt aResult)
+	{
+	if (aResult == KErrNone)
+		{
+		iTagRegistered = ETrue;
+		if (iLocalName.Length() > 0)
+			{
+			iSession->NewData(iLocalName.Length());
+			}
+		}
+	}
+
+void CEirPublisherLocalName::MeisnSetDataError(TInt /* aError */)
+	{
 	
+	}
+
+
 void CEirPublisherLocalName::UpdateName(const TDesC8& aName)
 	{
 	LOG_FUNC
 	// Check aName isn't longer than 248 characters
 	__ASSERT_DEBUG(aName.Length() <= 248, Panic(EEIRPublisherUpdateNameTooLong));
 	iLocalName = aName;
-	iPublisher->PublishData(aName.Size());
+	if (iTagRegistered)
+		{
+		iSession->NewData(iLocalName.Size());
+		}
 	}
 	
 
 // From MEirPublisherNotifier
-void CEirPublisherLocalName::MepnSpaceAvailable(TUint aBytesAvailable)
+void CEirPublisherLocalName::MeisnSpaceAvailable(TUint aBytesAvailable)
 	{
 	LOG_FUNC
 	// Delete memory from last time this was called
@@ -84,7 +107,7 @@
 		iPublishBuf = iLocalName.Left(avail).Alloc();
 		if(iPublishBuf)
 			{
-			iPublisher->SetData(*iPublishBuf, EEirDataPartial);
+			iSession->SetData(*iPublishBuf, EEirDataPartial);
 			}
 		}
 	else
@@ -94,17 +117,14 @@
 		iPublishBuf = iLocalName.Alloc();
 		if(iPublishBuf)
 			{
-			iPublisher->SetData(*iPublishBuf, EEirDataComplete);
+			iSession->SetData(*iPublishBuf, EEirDataComplete);
 			}
 		}
 	// Final case to handle if OOM occurs.
 	if(!iPublishBuf)
 		{
-		iPublisher->SetData(KNullDesC8(), EEirDataPartial);
+		iSession->SetData(KNullDesC8(), EEirDataPartial);
 		}
 	}
-	
-void CEirPublisherLocalName::MepnSetDataError(TInt /*aResult*/)
-	{
-	LOG_FUNC
-	}
+
+