FCL/sf/mw/remoteconn: comparison mtpfws/mtpfw/dataproviders/devdp/src/cmtpresetdevicepropvalue.cpp

equal deleted inserted replaced

-:2c19c7cf5550
+:c20dd21d1eb4
 #include "cmtpdevicedatastore.h"
 #include "cmtpresetdevicepropvalue.h"
 #include "mtpdevicedpconst.h"
 #include "mtpdevdppanic.h"
+#include "mtpdebug.h"
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "cmtpresetdevicepropvalueTraces.h"
+#endif
 // Class constants.
-__FLOG_STMT(_LIT8(KComponent,"ResetDevicePropValue");)
 /**
 Two-phase constructor.
 @param aPlugin  The data provider plugin
 @param aFramework The data provider framework
 /**
 Destructor
 */
 CMTPResetDevicePropValue::~CMTPResetDevicePropValue()
 {
-__FLOG(_L8("~CMTPResetDevicePropValue - Entry"));
+OstTraceFunctionEntry0( CMTPRESETDEVICEPROPVALUE_CMTPRESETDEVICEPROPVALUE_DES_ENTRY );
 iDpSingletons.Close();
 delete iData;
 delete iRepository;
-__FLOG(_L8("~CMTPResetDevicePropValue - Exit"));
+OstTraceFunctionExit0( CMTPRESETDEVICEPROPVALUE_CMTPRESETDEVICEPROPVALUE_DES_EXIT );
-__FLOG_CLOSE;
 }
 /**
 Standard c++ constructor
 */
 CMTPResetDevicePropValue::CMTPResetDevicePropValue(MMTPDataProviderFramework& aFramework, MMTPConnection& aConnection) :
 CMTPRequestProcessor(aFramework, aConnection, 0, NULL)
 {
 }
 /**
 Second-phase construction
 */
 void CMTPResetDevicePropValue::ConstructL()
 {
-__FLOG_OPEN(KMTPSubsystem, KComponent);
+OstTraceFunctionEntry0( CMTPRESETDEVICEPROPVALUE_CONSTRUCTL_ENTRY );
-__FLOG(_L8("ConstructL - Entry"));
 iDpSingletons.OpenL(iFramework);
 	const TUint32 KUidMTPRepositoryValue(0x10282FCC);
 const TUid KUidMTPRepository = {KUidMTPRepositoryValue};
 iRepository = CRepository::NewL(KUidMTPRepository);
-__FLOG(_L8("ConstructL - Exit"));
+OstTraceFunctionExit0( CMTPRESETDEVICEPROPVALUE_CONSTRUCTL_EXIT );
 }
 /**
 SetDevicePropValue request validator.
 @return EMTPRespCodeOK if request is verified, otherwise one of the error response codes
 */
 TMTPResponseCode CMTPResetDevicePropValue::CheckRequestL()
 {
-__FLOG(_L8("CheckRequestL - Entry"));
+OstTraceFunctionEntry0( CMTPRESETDEVICEPROPVALUE_CHECKREQUESTL_ENTRY );
 TMTPResponseCode respCode(EMTPRespCodeDevicePropNotSupported);
 iPropCode = Request().Uint32(TMTPTypeRequest::ERequestParameter1);
 const TInt count = sizeof(KMTPDeviceDpSupportedProperties) / sizeof(KMTPDeviceDpSupportedProperties[0]);
 for (TUint i(0); ((respCode != EMTPRespCodeOK) && (i < count)); i++)
 {
 if(iDpSingletons.DeviceDataStore().ExtnDevicePropDp())
 {
 respCode = EMTPRespCodeOK;
 }
-__FLOG(_L8("CheckRequestL - Exit"));
+OstTraceFunctionExit0( CMTPRESETDEVICEPROPVALUE_CHECKREQUESTL_EXIT );
 return respCode;
 }
 /**
 ResetDevicePropValue request handler.
 */
 void CMTPResetDevicePropValue::ServiceL()
 {
-__FLOG(_L8("ServiceL - Entry"));
+OstTraceFunctionEntry0( CMTPRESETDEVICEPROPVALUE_SERVICEL_ENTRY );
 iPropCode = Request().Uint32(TMTPTypeRequest::ERequestParameter1);
 MExtnDevicePropDp* extnDevplugin = iDpSingletons.DeviceDataStore().ExtnDevicePropDp();
 switch (iPropCode)
 {
 //Added all new prpoerties here we have to add other properties that not present here*/
 {
 SendResponseL(EMTPRespCodeDevicePropNotSupported);
 }
 break;
 }
+OstTraceFunctionExit0( CMTPRESETDEVICEPROPVALUE_SERVICEL_EXIT );
 }
 void CMTPResetDevicePropValue::HandleExtnServiceL(TInt aPropCode, MExtnDevicePropDp* aExtnDevplugin)
 {
 	  if(aExtnDevplugin->ResetDevPropertyL((TMTPDevicePropertyCode)aPropCode) == KErrNone)
 	  }
 	  else
 	  {
 	  SendResponseL(EMTPRespCodeDevicePropNotSupported);
 	  }
 }
 /**
 Service session initiator property.
 */
 void CMTPResetDevicePropValue::ServiceSessionInitiatorVersionInfoL()
 {
-__FLOG(_L8("SetSessionInitiatorVersionInfo - Entry"));
+OstTraceFunctionEntry0( CMTPRESETDEVICEPROPVALUE_SERVICESESSIONINITIATORVERSIONINFOL_ENTRY );
 iDpSingletons.DeviceDataStore().SetSessionInitiatorVersionInfoL( iDpSingletons.DeviceDataStore().SessionInitiatorVersionInfoDefault());
 SendResponseL(EMTPRespCodeOK);
-__FLOG(_L8("SetSessionInitiatorVersionInfo - Exit"));
+OstTraceFunctionExit0( CMTPRESETDEVICEPROPVALUE_SERVICESESSIONINITIATORVERSIONINFOL_EXIT );
 }
 /**
 *Service the PerceivedDeviceType property.
 *it is not set type it should be removed
 **/
 void CMTPResetDevicePropValue::ServicePerceivedDeviceTypeL()
 {
-__FLOG(_L8("ServicePerceivedDeviceType - Entry"));
+OstTraceFunctionEntry0( CMTPRESETDEVICEPROPVALUE_SERVICEPERCEIVEDDEVICETYPEL_ENTRY );
 //PerceivedDeviceType is of type get only .
 SendResponseL(EMTPRespCodeAccessDenied);
-__FLOG(_L8("ServicePerceivedDeviceType - Exit"));
+OstTraceFunctionExit0( CMTPRESETDEVICEPROPVALUE_SERVICEPERCEIVEDDEVICETYPEL_EXIT );
 }
 /**
 Service the Date Time property.
 */
 void CMTPResetDevicePropValue::ServiceDateTimeL()
 {
-__FLOG(_L8("ServiceDateTime - Entry"));
+OstTraceFunctionEntry0( CMTPRESETDEVICEPROPVALUE_SERVICEDATETIMEL_ENTRY );
 SendResponseL(EMTPRespCodeOperationNotSupported);
-__FLOG(_L8("ServiceDateTime - Exit"));
+OstTraceFunctionExit0( CMTPRESETDEVICEPROPVALUE_SERVICEDATETIMEL_EXIT );
 }
 /*
 *Service the Device Icon property and CompleteDeviceIcon.
 As of now implemented as device property of type get.
 */
 void CMTPResetDevicePropValue::ServiceDeviceIconL()
 {
-__FLOG(_L8("ServiceDeviceIcon - Entry"));
+OstTraceFunctionEntry0( CMTPRESETDEVICEPROPVALUE_SERVICEDEVICEICONL_ENTRY );
 //DeviceIcon property is implemented as get only .
 SendResponseL(EMTPRespCodeAccessDenied);
-__FLOG(_L8("ServiceDeviceIcon - Exit"));
+OstTraceFunctionExit0( CMTPRESETDEVICEPROPVALUE_SERVICEDEVICEICONL_EXIT );
 }
 /*
 *ServiceSupportedFormatsOrdered property. it is get only type.
 */
 void CMTPResetDevicePropValue::ServiceSupportedFormatsOrderedL()
 {
-__FLOG(_L8("ServiceSupportedFormatsOrdered - Entry"));
+OstTraceFunctionEntry0( CMTPRESETDEVICEPROPVALUE_SERVICESUPPORTEDFORMATSORDEREDL_ENTRY );
 //no need to recive this data beacuse it is Get property
 //iDpSingletons.DeviceDataStore().SetFormatOrdered( iDpSingletons.DeviceDataStore().FormatOrderedDefault());
 SendResponseL(EMTPRespCodeAccessDenied);
-__FLOG(_L8("ServicePerceivedDeviceType - Exit"));
+OstTraceFunctionExit0( CMTPRESETDEVICEPROPVALUE_SERVICESUPPORTEDFORMATSORDEREDL_EXIT );
 }
 /*
 *FunctionalID property.
 */
 void CMTPResetDevicePropValue::ServiceFunctionalIDL()
 {
-__FLOG(_L8("ServiceFunctionalIDL - Entry"));
+OstTraceFunctionEntry0( CMTPRESETDEVICEPROPVALUE_SERVICEFUNCTIONALIDL_ENTRY );
 delete iData;
 iData = GetGUIDL( MMTPFrameworkConfig::EDeviceDefaultFuncationalID );
 SaveGUID(MMTPFrameworkConfig::EDeviceCurrentFuncationalID, *iData);
 SendResponseL(EMTPRespCodeOK);
-__FLOG(_L8("ServiceFunctionalIDL - Exit"));
+OstTraceFunctionExit0( CMTPRESETDEVICEPROPVALUE_SERVICEFUNCTIONALIDL_EXIT );
 }
 /*
 *ModelID property. it is get only type.
 */
 void CMTPResetDevicePropValue::ServiceModelIDL()
 {
-__FLOG(_L8("ServiceModelIDL - Entry"));
+OstTraceFunctionEntry0( CMTPRESETDEVICEPROPVALUE_SERVICEMODELIDL_ENTRY );
 SendResponseL(EMTPRespCodeAccessDenied);
-__FLOG(_L8("ServiceModelIDL - Exit"));
+OstTraceFunctionExit0( CMTPRESETDEVICEPROPVALUE_SERVICEMODELIDL_EXIT );
 }
 /*
 *UseDeviceStage property. it is get only type.
 */
 void CMTPResetDevicePropValue::ServiceUseDeviceStageL()
 {
-__FLOG(_L8("ServiceUseDeviceStageL - Entry"));
+OstTraceFunctionEntry0( CMTPRESETDEVICEPROPVALUE_SERVICEUSEDEVICESTAGEL_ENTRY );
 SendResponseL(EMTPRespCodeAccessDenied);
-__FLOG(_L8("ServiceUseDeviceStageL - Exit"));
+OstTraceFunctionExit0( CMTPRESETDEVICEPROPVALUE_SERVICEUSEDEVICESTAGEL_EXIT );
 }
 TMTPTypeGuid* CMTPResetDevicePropValue::GetGUIDL(const TUint aKey)
 {
 TBuf<KGUIDFormatStringLength> buf;
-User::LeaveIfError(iRepository->Get(aKey,buf));
+LEAVEIFERROR(iRepository->Get(aKey,buf),
+OstTrace1( TRACE_ERROR, CMTPRESETDEVICEPROPVALUE_GETGUIDL, "get from iRepository with key %d", aKey ));
 TMTPTypeGuid* ret = new (ELeave) TMTPTypeGuid( buf );
 return ret;
 }

changeset 49	c20dd21d1eb4
parent 20	6e82ae192c3a
child 52	866b4af7ffbe