--- a/connectivitylayer/isce/isaaccessextension_dll/inc/router.h	Mon Nov 09 10:36:19 2009 +0000
+++ b/connectivitylayer/isce/isaaccessextension_dll/inc/router.h	Thu Jan 14 10:44:58 2010 +0200
@@ -29,7 +29,7 @@
 //ISCE
 #include "isirouterlinkifs.h"       // For MLinkRouterIf
 //ISCE
-#ifndef NCP_COMMON_BRIDGE_FAMILY
+#ifdef NCP_COMMON_BRIDGE_FAMILY_PIPE_SUPPORT 
 class DPipeHandler;
 #endif
 //ISCE class MIAD2ISTApi;
@@ -137,18 +137,15 @@
             EPipeMsg,
             EMediaMsg,
             EIndicationMsg,
-            EControlMsg,
-            EPnNameAddRespMsg,
             ENotKnownMsg,
+            EUsbPhonetMsg
             };
 
         enum TWaitingType
             {
             ENormalOpen = 1,
-            EDrmOpen,
-            ENameAddOpen
 #if (NCP_COMMON_SOS_VERSION_SUPPORT >= SOS_VERSION_95)
-            ,ELoan
+            ELoan
 #endif
             };
 
@@ -158,9 +155,6 @@
 
         void HandleMediaMessage( TDes8& aMsg );
 
-        void HandleControlMessage( TDes8& aMsg );
-
-        void HandlePnsNameAddResp( TDes8& aMsg );
 
         void SendCommIsaEntityNotReachableResp( const TDesC8& aMsg );
 
@@ -171,18 +165,16 @@
     public:
         static void CheckRouting( DRouter& aTmp, TDes8& aMsg );
 
+        static DRouter* iThisPtr;
+        MISIRouterObjectIf* iNameService;
+        MISIRouterObjectIf* iCommunicationManager;
+
     private:
         static void CommonRxDfc( TAny* aPtr );
 
         static void InitCmtDfc( TAny* aPtr );
-#ifdef NCP_COMMON_BRIDGE_FAMILY
+
         void InitConnectionOk();
-#endif
-        void InitCmtConnection();
-
-        void SendDrmReq( const TUint16 aChannelId );
-
-        void SendPnsNameAddReq( const TUint16 aChannel, const TDesC8& aOpenInfo );
 
         static void NotifyObjLayerConnStatDfc( TAny* aPtr );
 
@@ -190,6 +182,9 @@
 
         void SetSenderInfo( TDes8& aMessage, const TUint16 aCh );
 
+        //From objectapi
+        TInt Send( TDes8& aMessage, const TUint8 aObjId );
+
       // Member data
     private:
         
@@ -214,11 +209,7 @@
 
         enum TISIMedias
             {
-#ifndef NCP_COMMON_BRIDGE_FAMILY
-            EISIMediaSOS            = 0x00,
-#else
             EISIMediaHostSSI        = 0x00,
-#endif
             EISIAmountOfMedias
             };
 // ISCE
@@ -226,7 +217,7 @@
         // owned
         // APE <-> CMT connection status ok/nok.
         TIADConnectionStatus                            iConnectionStatus;
-#ifndef NCP_COMMON_BRIDGE_FAMILY
+#ifdef NCP_COMMON_BRIDGE_FAMILY_PIPE_SUPPORT
         DPipeHandler*                                   iPipeHandler;
 #endif
         DIndicationHandler*                             iIndicationHandler;