diff -r 6295dc2169f3 -r 8486d82aef45 adaptationlayer/bcaiscadapter/bcatoisc_dll/inc/bcatoisc.h
--- a/adaptationlayer/bcaiscadapter/bcatoisc_dll/inc/bcatoisc.h	Wed Apr 21 14:29:55 2010 +0300
+++ b/adaptationlayer/bcaiscadapter/bcatoisc_dll/inc/bcatoisc.h	Tue Oct 19 13:16:20 2010 +0300
@@ -1,5 +1,5 @@
 /*
-* 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 the License "Eclipse Public License v1.0"
@@ -19,15 +19,16 @@
 
 #ifndef BCATOISC_H
 #define BCATOISC_H
+
 #include <networking/bca.h>
 #include <iscapi.h>
 #include <e32std.h>
 #include <e32base.h>
 #include <e32def.h>
 
-
-        
-
+#include <tisi.h>
+const TUint8 KMaxChannelNbr = 11;
+const TUint8 KNameLen = 4;
 
 /**
 * BCATOISC Panic code.
@@ -61,6 +62,7 @@
         CNotifyFlowControlMonitor(RIscApi& aIscApi);
         void NotifyFlowControlStatus();
         void RequestFlowcontrolChange( TRequestStatus& aClientStatus );
+        void CompleteFlowcontrolChangeWithCancel();
         void RunL();
         void DoCancel();
         TInt GetFlowControlState();
@@ -82,7 +84,7 @@
         
         CNotifyWriteStatusMonitor(CBcaToIsc& aUser, RIscApi& aIscApi);
         void Write( TRequestStatus& aStatus, const TDesC8& aBuf );
-        void SendAndComplete();
+        void SendAndComplete(TInt error);
         void RunL();
         void DoCancel();
         ~CNotifyWriteStatusMonitor();
@@ -100,10 +102,11 @@
     /**
     * The interface between NIF and Isc Bearer Transport.     
     */
-    NONSHARABLE_CLASS(CBcaToIsc): public CBase, 
-                                  public MBca  // BCA is accessed via this interface by clients.
+    NONSHARABLE_CLASS(CBcaToIsc): 
+                                  public CActive,
+                                  public MBca // BCA is accessed via this interface by clients.
         {
-        
+
         public:
             
         CBcaToIsc(); 
@@ -125,21 +128,46 @@
         
         virtual void Ioctl(TRequestStatus& aStatus, TUint aOptLevel, TUint aOptName, TDes8& aOpt);
         virtual void CancelIoctl();
-          
+
+        TInt SendNameAddReq( TUint16& aObjId, TUint16& aClientObjId );
+        TInt SendNameRemoveReq();
+        TInt SendPepCtrlResp(
+            TUint8 aTrId,
+            TUint8 aReceiverDev,
+            TUint8 aReceiverObj,
+            TUint8 aPipeHandle,
+            TUint8 aPepCtrlId,
+            TUint8 aPepType,
+            TUint8 aResult );
+        void HandleReceivedMsg( const TIsiReceiveC& aIsiMsg );
+        void HandleNameServiceMsg( const TIsiReceiveC& aIsiMsg );
+        void HandlePipeMsg( const TIsiReceiveC& aIsiMsg );
+        void HandlePepCtrlReq( const TIsiReceiveC& aIsiMsg );
 
         // Ownership
         CNotifyWriteStatusMonitor* iWriteStatusMonitor;
         CNotifyFlowControlMonitor* iFlowControlMonitor;
-   
+
+        protected:
+        
+        // from CActive
+        void RunL();
+        void DoCancel();
 
         private:
 
         RIscApi iIscApi;
         // no ownership
         TRequestStatus* iClientShutdownStatus;
+        TRequestStatus* iClientOpenStatus;
+        
+        HBufC8* iReceivedMessageBuffer;
+        TPtr8 iMessageBufferPtr;
+        TBuf8<KNameLen> iName;
+        TBuf16<KMaxChannelNbr> iChannelList;
+        
         TUint16 iReadLength;
         TUint16 iChannelNumber;
-
         };
 
 } // namespace BasebandChannelAdaptation