diff -r 942573423a60 -r fa67e03b87df connectivitylayer/isce/isicommunicationmanager_dll/inc/isiindicationhandler.h --- a/connectivitylayer/isce/isicommunicationmanager_dll/inc/isiindicationhandler.h Fri Jan 22 10:04:04 2010 +0200 +++ b/connectivitylayer/isce/isicommunicationmanager_dll/inc/isiindicationhandler.h Wed Feb 17 13:58:55 2010 +0200 @@ -28,7 +28,7 @@ NONSHARABLE_CLASS( DISIIndicationHandler ) : public DBase { - public: + private: class TDeviceIdLink { @@ -60,7 +60,9 @@ TUint8 iObjId; SDblQueLink iSubscriberLink; }; - + + public: + /* * Constructor */ @@ -75,13 +77,15 @@ * Multicast and Subscribe must be called in same DFC thread. * If not then take a deep look at synchronization. */ - //void Multicast( TDes8& aIndication ); + void Multicast( TDes8& aIndication ); /* * Multicast and Subscribe must be called in same DFC thread. * If not then take a deep look at synchronization. */ - TInt Subscribe( TDes8& aSubscriptionReq ); + void Subscribe( TDes8& aSubscriptionReq ); + + private: @@ -91,8 +95,12 @@ void AddServer( TDeviceIdLink& aDeviceLink, const TUint32 aResourceId, const TUint8 aIndication, const TUint16 aObjId ); + void AddServer( TDeviceIdLink& aDeviceLink, const TUint32 aResourceId ); + TDeviceIdLink* GetDeviceLink( const TUint8 aDeviceId ); + TDeviceIdLink* GetExternalDeviceLink( const TUint8 aDeviceId ); + TServerIdLink* GetServerLink( TDeviceIdLink& aDeviceLink, const TUint32 aResourceId ); TIndicationLink* GetIndicationLink( TServerIdLink& aServerLink, const TUint8 aIndication ); @@ -103,12 +111,13 @@ void RemoveSubscription( const TUint16 aObjId ); - TInt SendSubscription( TDeviceIdLink& aDevice ); + void SendSubscription( TDeviceIdLink& aDevice ); private: // Owned SDblQue iDeviceQ; + SDblQue iExternalDeviceQ; // Not owned MISIObjectRouterIf* iRouter;