FCL/sf/incubator/modemadaptation: comparison adaptationlayer/tsy/nokiatsy

equal deleted inserted replaced

-:6295dc2169f3
+:8486d82aef45
 * Initial Contributors:
 * Nokia Corporation - initial contribution.
 *
 * Contributors:
 *
 * Description:
 *
 */
 #include <ctsy/serviceapi/mmtsy_defaults.h>
 #include "nokiatsy_internal_variation.h"
 // CONSTANTS
 const TUint8 KFirstPepType = PN_PEP_TYPE_COMMON; // First PEP type
-const TUint8 KSecondPepType = PN_PEP_TYPE_GPRS; // Second PEP type
+const TUint8 KSecondPepType = PN_PEP_TYPE_COMMON; // Second PEP type
-const TUint8 KSecondPepDevice = 0x00; // Device Id of second PEP
+const TUint8 KFirstPepDevice = PN_DEV_OWN;      // Device Id of first PEP
-const TUint8 KSecondPepObject = 0x33; // Object Id of second PEP
+const TUint8 KSecondPepDevice = PN_DEV_MODEM;    // Device Id of second PEP
+const TUint8 KSecondPepObject = PN_OBJ_PEP_GPDS; // Object Id of second PEP
 const TUint8 KUnknownTransID  = 0x00;
 const TUint8 KInvalidPipeHandle = 0xFF;
 // Maximum number of simultaneous PipeHandle supported by this phone.
 const TInt KMmMaxNumberOfPipeHandles  = KMmMaxNumberOfContexts;
-const TUint8 KFirstPepDevice = PN_DEV_HOST; // Device Id of first PEP
 #ifdef DUMMY_NIF_PEP_FOR_PACKET_DATA_TESTING_DOS
 // Channel ID's
 // Proxy Id's are taken from IscNokiaDefinitions.h file
 // CLASS DECLARATION
 // CMmPipeControl is used to create and send GSM-specific pipe control
 // ISI messages to PhoNet via PhoNetSender. It also receives
 // GSM-specific pipe control ISI messages from Phonet via PhoNetReceiver.
 class CMmPipeControl : public CBase,
 public MMmMessageReceiver
 {
 public: // Constructors and destructor.
 /**
 * NewL method is used to create a new instance of class.
 * @param CMmPhoNetSender*: pointer to phonet sender
 * @param CMmPhoNetReceiver*: pointer to phonet receiver
 * @param CMmPacketContextMessHandler*: pointer to context message handler
 * Destructor.
 */
 ~CMmPipeControl();
 public: // New classes
 // TPipeOperationInfo
 class TPipeOperationInfo
 {
 public:
 TUint8 iPipeHandle;
 TUint8 iTransId;
 };
 public: // Functions from base classes
 /**
 * Isimsg received by PhonetReceiver.
 * @param TIsiReceiveC, reference to the received message.
 */
-		void ReceiveMessageL( const TIsiReceiveC& aIsiMessage );
+void ReceiveMessageL( const TIsiReceiveC& aIsiMessage );
 public: // New functions
 /**
 * Creates PnsPipeCreateReq ISI message and sends it to Phonet.
 * @param aTransId: transaction Id
 * @param aPipeState: pipe state
 * @param aFirstPepObject: First PEP object Id
-		* @return error value: Symbian error code
+* @return error value: Symbian error code
 */
 TInt PnsPipeCreateReq(
 const TUint8 aTransId,
 const TUint8 aPipeState,
 const TUint8 aFirstPepObject ) const;
 /**
 * Creates PnsPipeEnableReq ISI message and sends it to Phonet.
-* @param aPackage: data package
+* @param aPipeHandle: pipe to be enabled
-		* @return error value: Symbian error code
+* @param aTransId: transaction Id
-*/
+* @return error value: Symbian error code
-TInt PnsPipeEnableReq( const CMmDataPackage& aPackage ) const;
+*/
+TInt PnsPipeEnableReq(
+TUint8 aPipeHandle,
+TUint8 aTransId ) const;
 /**
 * Creates PnsPipeResetReq ISI message and sends it to Phonet.
 * @param aTransId: transaction Id
 * @param aPipeHandle: pipe handle
 * @param aStateAfterReset: pipe state after reset
-		* @return error value: Symbian error code
+* @return error value: Symbian error code
 */
 TInt PnsPipeResetReq(
 const TUint8 aTransId,
 const TUint8 aPipeHandle,
 const TUint8 aStateAfterReset );
 /**
 * Creates PnsPipeRemoveReq ISI message and sends it to Phonet.
 * @param aTransId: transaction Id
 * @param aPipeHandle: pipe handle
-		* @return error value: Symbian error code
+* @return error value: Symbian error code
 */
 TInt PnsPipeRemoveReq(
 const TUint8 aTransId,
 const TUint8 aPipeHandle );
+/**
+* Creates PnsPipeRedirectReq ISI message and sends it to Phonet.
+* @param aTransId: transaction Id
+* @param aPipeHandle: pipe handle
+* @param aOldPepDevId: Device ID to remove from
+* @param aOldPepObjId: Object ID to remove from
+* @param aReplacementPepDevId: Device ID to redirect to
+* @param aReplacementPepObjId: Object ID to redirect to
+* @return error value: Symbian error code
+*/
+TInt PnsPipeRedirectReq(
+TUint8 aTransId,
+TUint8 aPipeHandle,
+TUint8 aOldPepDevId,
+TUint8 aOldPepObjId,
+TUint8 aReplacementPepDevId,
+TUint8 aReplacementPepObjId);
+/**
+* Creates PnsPepCtrlReq ISI message and sends it to Phonet.
+* @param aDevId: device Id
+* @param aObjId: object Id
+* @param aTransId: transaction Id
+* @param aPipeHandle: pipe handle
+* @param aControlId: control id
+* @param aStatus: status code
+* @return error value: Symbian error code
+*/
+TInt PnsPepCtrlReq(
+TUint8 aDevId,
+TUint8 aObjId,
+TUint8 aTransId,
+TUint8 aPipeHandle,
+TUint8 aControlId,
+TUint8 aStatus,
+TUint8 aChannelId );
 public: // Functions from base classes
 // None
 protected: // New functions
 // None
 protected: // Functions from base classes
 // None
 /**
 * By default EPOC constructor is private.
 */
 void ConstructL();
-#ifdef INTERNAL_TESTING_OLD_IMPLEMENTATION_FOR_UICC_TESTING
+/**
-/**
+* PnsPipeCreate response.
-* Creates PnsNameQueryReq ISI message and sends it to Phonet.
-		* @return error value: Symbian error code
-*/
-TInt PnsNameQueryReq() const;
-#endif /* INTERNAL_TESTING_OLD_IMPLEMENTATION_FOR_UICC_TESTING */
-/**
-* PnsPipeCreate response.
 * @param aIsiMessage, reference to the received message.
 */
 void PnsPipeCreateResp( const TIsiReceiveC &aIsiMessage );
 /**
 * @param aIsiMessage, reference to the received message.
 */
 void PnsPipeEnableResp( const TIsiReceiveC& aIsiMessage );
 /**
 * PnsPipeReset response.
 * @param aIsiMessage, reference to the received message.
 */
 void PnsPipeResetResp( const TIsiReceiveC& aIsiMessage );
 /**
 * PnsPipeRemove response.
 * @param aIsiMessage, reference to the received message.
 */
 void PnsPipeRemoveResp( const TIsiReceiveC& aIsiMessage );
-#ifdef INTERNAL_TESTING_OLD_IMPLEMENTATION_FOR_UICC_TESTING
+/**
-/**
+* PnsPipeRedirect response.
-* PnsNameQuery response.
+* @param aIsiMessage, reference to the received message.
-* @param aIsiMessage, reference to the received message.
+*/
-*/
+void PnsPipeRedirectResp( const TIsiReceiveC& aIsiMessage );
-void PnsNameQueryResp( const TIsiReceiveC& aIsiMessage );
-#endif /* INTERNAL_TESTING_OLD_IMPLEMENTATION_FOR_UICC_TESTING */
+/**
+* PnsPepCtrl response.
-/**
+* @param aIsiMessage, reference to the received message.
-* Initialize lists.
+*/
+void PnsPepCtrlResp( const TIsiReceiveC& aIsiMessage );
+/**
+* Initialize lists.
 */
 void InitLists();
 /**
 * Set Pipe Handle.
 * @param aPipeHandle: pipe handle
 */
 void SetPipeHandle( const TUint8 aPipeHandle );
 /**
 * Set Transaction Id.
 * @param aPipeHandle: pipe handle
 * @param aTransId: transaction Id
 */
 void SetTransactionId(
 const TUint8 aPipeHandle,
 const TUint8 aTransId );
 /**
 * Return Transaction Id.
 * @param aPipeHandle: pipe handle
-		* @return TUint8, Transaction Id
+* @return TUint8, Transaction Id
 */
 TUint8 TransactionId( const TUint8 aPipeHandle ) const;
 /**
 * Reset Pipe Handle.
 * @param aPipeHandle: pipe handle
 */
 void ResetPipeHandle( const TUint8 aPipeHandle );
 /**
 * If PipeHandle found returns True otherwise returns False.
 * @param aPipeHandle: pipe handle
 */
 TBool IsOperationCalled( const TUint8 aPipeHandle ) const;
 #ifdef DUMMY_NIF_PEP_FOR_PACKET_DATA_TESTING_DOS
 /**
 * PnsPepConnect request.
 * @param aIsiMessage, reference to the received message.
 */
 void PnsPepConnectReq( const TIsiReceiveC& aIsiMessage );
 * @param aIsiMessage, reference to the received message.
 */
 void PnsPepDisconnectReq( const TIsiReceiveC& aIsiMessage );
 /**
 * PnsPepReset request.
 * @param aIsiMessage, reference to the received message.
 */
 void PnsPepResetReq( const TIsiReceiveC& aIsiMessage );
 /**
 * PnsPepEnable request.
 * @param aIsiMessage, reference to the received message.
 */
 void PnsPepEnableReq( const TIsiReceiveC& aIsiMessage );
 /**
 * PnsPepConnect response.
 * @param aTransId: transaction Id
 * @param aPipeHandle: pipe handle
 */
 void PnsPepConnectResp(
 const TUint8 aTransId,
 const TUint8 aPipeHandle );
 /**
 * PnsPepDisconnect response.
 * @param aTransId: transaction Id
 * @param aPipeHandle: pipe handle
 */
 void PnsPepDisconnectResp(
 const TUint8 aTransId,
 void PnsPepResetResp(
 const TUint8 aTransId,
 const TUint8 aPipeHandle );
 /**
 * PnsPepEnable response.
 * @param aTransId: transaction Id
 * @param aPipeHandle: pipe handle
 */
 void PnsPepEnableResp(
 const TUint8 aTransId,
 private: // Data
 // A pointer to the context messhandler.
 CMmPacketContextMessHandler* iContextMessHandler;
 // Pointer to contextlist
 CMmPacketContextMesshandlerList* iContextList;
 // A pointer to the PhonetSender.
 CMmPhoNetSender* iPhoNetSender;
 // Pipe Operation Array contains TPipeOperation elements.
 TPipeOperationInfo iPipeOperationArray[KMmMaxNumberOfPipeHandles];
 // Device Id of second PEP.
 TUint8 iSecondPepDeviceId;
 // None
 };
 #endif // CMMPIPECONTROL_H
 // End of File

changeset 9	8486d82aef45
parent 0	63b37f68c1ce