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

equal deleted inserted replaced

-:2c19c7cf5550
+:c20dd21d1eb4
 #include "cmtpdevicedatastore.h"
 #include "cmtpgetdevicepropdesc.h"
 #include "mtpdevicedpconst.h"
 #include "mtpdevdppanic.h"
 #include "cmtpdevicedpconfigmgr.h"
+#include "mtpdebug.h"
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "cmtpgetdevicepropdescTraces.h"
+#endif
 // Class constants.
-__FLOG_STMT(_LIT8(KComponent,"GetDevicePropDesc");)
 _LIT(KSpace, " ");
 /**
 Two-phase constructor.
 /**
 Destructor.
 */
 CMTPGetDevicePropDesc::~CMTPGetDevicePropDesc()
 {
-__FLOG(_L8("~CMTPGetDevicePropDesc - Entry"));
+OstTraceFunctionEntry0( CMTPGETDEVICEPROPDESC_CMTPGETDEVICEPROPDESC_DES_ENTRY );
 delete iData;
 delete iPropDesc;
 delete iRepository;
 iDpSingletons.Close();
-__FLOG(_L8("~CMTPGetDevicePropDesc - Exit"));
+OstTraceFunctionExit0( CMTPGETDEVICEPROPDESC_CMTPGETDEVICEPROPDESC_DES_EXIT );
-__FLOG_CLOSE;
 }
 /**
 Constructor.
 */
 GetDevicePropDesc request validator.
 @return EMTPRespCodeOK if request is verified, otherwise one of the error response codes
 */
 TMTPResponseCode CMTPGetDevicePropDesc::CheckRequestL()
 {
-__FLOG(_L8("CheckRequestL - Entry"));
+OstTraceFunctionEntry0( CMTPGETDEVICEPROPDESC_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((respCode != EMTPRespCodeOK) && iDpSingletons.DeviceDataStore().ExtnDevicePropDp())//2113
 {
 respCode = EMTPRespCodeOK;
 }
-__FLOG(_L8("CheckRequestL - Exit"));
+OstTraceFunctionExit0( CMTPGETDEVICEPROPDESC_CHECKREQUESTL_EXIT );
 return respCode;
 }
 /**
 GetDevicePropDesc request handler.
 */
 void CMTPGetDevicePropDesc::ServiceL()
 {
-__FLOG(_L8("ServiceL - Entry"));
+OstTraceFunctionEntry0( CMTPGETDEVICEPROPDESC_SERVICEL_ENTRY );
 iPropCode = Request().Uint32(TMTPTypeRequest::ERequestParameter1);
 //before performing any operation will check the properties are supported or
 //not if not then return EMTPRespCodeDevicePropNotSupported
 const CMTPTypeArray *mtpArray = &(iDpSingletons.DeviceDataStore().GetSupportedDeviceProperties());
 RArray <TUint> supportedArray;
 mtpArray->Array(supportedArray);
-__FLOG_VA((_L8("No of elements in supported property array = %d "), supportedArray.Count()));
+OstTrace1(TRACE_NORMAL, CMTPGETDEVICEPROPDESC_SERVICEL,
+"No of elements in supported property array = %d ", supportedArray.Count());
 if(KErrNotFound == supportedArray.Find(iPropCode))
 {
 SendResponseL(EMTPRespCodeDevicePropNotSupported);
-__FLOG(_L8("CMTPGetDevicePropDesc::EMTPRespCodeDevicePropNotSupported "));
+OstTrace0(TRACE_NORMAL, DUP1_CMTPGETDEVICEPROPDESC_SERVICEL, "CMTPGetDevicePropDesc::EMTPRespCodeDevicePropNotSupported ");
 }
 else
 {
 switch (iPropCode)
 {
 SendResponseL(EMTPRespCodeDevicePropNotSupported);
 break;
 }
 }
 supportedArray.Close();
-__FLOG(_L8("ServiceL - Exit"));
+OstTraceFunctionExit0( CMTPGETDEVICEPROPDESC_SERVICEL_EXIT );
 }
 void  CMTPGetDevicePropDesc::HandleExtnServiceL(TInt aPropCode, MExtnDevicePropDp* aExtnDevplugin )
 	{
+	OstTraceFunctionEntry0( CMTPGETDEVICEPROPDESC_HANDLEEXTNSERVICEL_ENTRY );
 	//call	 plugin ->desc
 	MMTPType* mtptype;
 	if(KErrNone == aExtnDevplugin->GetDevPropertyDescL((TMTPDevicePropertyCode)aPropCode, &mtptype))
 	{
 	SendDataL(*mtptype);
 	{
 	SendResponseL(EMTPRespCodeDevicePropNotSupported);
 	}
+	OstTraceFunctionExit0( CMTPGETDEVICEPROPDESC_HANDLEEXTNSERVICEL_EXIT );
 	}
 void CMTPGetDevicePropDesc::DoCancel()
 {
-__FLOG(_L8("DoCancel - Entry"));
+OstTraceFunctionEntry0( CMTPGETDEVICEPROPDESC_DOCANCEL_ENTRY );
 if (iPropCode == EMTPDevicePropCodeBatteryLevel)
 {
 iDpSingletons.DeviceDataStore().Cancel();
 }
-__FLOG(_L8("DoCancel - Exit"));
+OstTraceFunctionExit0( CMTPGETDEVICEPROPDESC_DOCANCEL_EXIT );
 }
 void CMTPGetDevicePropDesc::RunL()
 {
-__FLOG(_L8("RunL - Entry"));
+OstTraceFunctionEntry0( CMTPGETDEVICEPROPDESC_RUNL_ENTRY );
 if (iPropCode == EMTPDevicePropCodeBatteryLevel)
 {
 ServiceBatteryLevelL();
 }
 else
 {
 __DEBUG_ONLY(Panic(EMTPDevDpUnknownDeviceProperty));
 }
-__FLOG(_L8("RunL - Exit"));
+OstTraceFunctionExit0( CMTPGETDEVICEPROPDESC_RUNL_EXIT );
 }
 /**
 Second-phase constructor.
 */
 void CMTPGetDevicePropDesc::ConstructL()
 {
-__FLOG_OPEN(KMTPSubsystem, KComponent);
+OstTraceFunctionEntry0( CMTPGETDEVICEPROPDESC_CONSTRUCTL_ENTRY );
-__FLOG(_L8("CMTPGetDevicePropDesc: ConstructL - Entry"));
 iDpSingletons.OpenL(iFramework);
 	const TUint32 KUidMTPRepositoryValue(0x10282FCC);
 const TUid KUidMTPRepository = {KUidMTPRepositoryValue};
 iRepository = CRepository::NewL(KUidMTPRepository);
-__FLOG(_L8("CMTPGetDevicePropDesc: ConstructL - Exit"));
+OstTraceFunctionExit0( CMTPGETDEVICEPROPDESC_CONSTRUCTL_EXIT );
 }
 /**
 Services the battery level property.
 */
 void CMTPGetDevicePropDesc::ServiceBatteryLevelL()
 {
-__FLOG(_L8("ServiceBatteryLevelL - Entry"));
+OstTraceFunctionEntry0( CMTPGETDEVICEPROPDESC_SERVICEBATTERYLEVELL_ENTRY );
 CMTPTypeDevicePropDescRangeForm* form = CMTPTypeDevicePropDescRangeForm::NewLC(EMTPTypeUINT8);
 form->SetUint8L(CMTPTypeDevicePropDescRangeForm::EMinimumValue, 0);
 form->SetUint8L(CMTPTypeDevicePropDescRangeForm::EMaximumValue, 100);
 form->SetUint8L(CMTPTypeDevicePropDescRangeForm::EStepSize, 10);
 iPropDesc->SetUint8L(CMTPTypeDevicePropDesc::EFactoryDefaultValue, 0);
 iPropDesc->SetUint8L(CMTPTypeDevicePropDesc::ECurrentValue, iBatteryLevelValue);
 CleanupStack::PopAndDestroy(form);
 SendDataL(*iPropDesc);
-__FLOG(_L8("ServiceBatteryLevelL - Exit"));
+OstTraceFunctionExit0( CMTPGETDEVICEPROPDESC_SERVICEBATTERYLEVELL_EXIT );
 }
 /**
 Services the device friendly name property.
 */
 void CMTPGetDevicePropDesc::ServiceDeviceFriendlyNameL()
 {
-__FLOG(_L8("ServiceDeviceFriendlyNameL - Entry"));
+OstTraceFunctionEntry0( CMTPGETDEVICEPROPDESC_SERVICEDEVICEFRIENDLYNAMEL_ENTRY );
 delete iPropDesc;
 iPropDesc = NULL;
 iPropDesc = CMTPTypeDevicePropDesc::NewL(EMTPDevicePropCodeDeviceFriendlyName);
 CMTPDeviceDataStore& device(iDpSingletons.DeviceDataStore());
 {
 iPropDesc->SetStringL(CMTPTypeDevicePropDesc::ECurrentValue, device.DeviceFriendlyName());
 }
 SendDataL(*iPropDesc);
-__FLOG(_L8("ServiceDeviceFriendlyNameL - Exit"));
+OstTraceFunctionExit0( CMTPGETDEVICEPROPDESC_SERVICEDEVICEFRIENDLYNAMEL_EXIT );
 }
 /**
 Services the synchronisation partner property.
 */
 void CMTPGetDevicePropDesc::ServiceSynchronisationPartnerL()
 {
-__FLOG(_L8("ServiceSynchronisationPartnerL - Entry"));
+OstTraceFunctionEntry0( CMTPGETDEVICEPROPDESC_SERVICESYNCHRONISATIONPARTNERL_ENTRY );
 delete iPropDesc;
 iPropDesc = NULL;
 iPropDesc = CMTPTypeDevicePropDesc::NewL(EMTPDevicePropCodeSynchronizationPartner);
 CMTPDeviceDataStore& device(iDpSingletons.DeviceDataStore());
 iPropDesc->SetStringL(CMTPTypeDevicePropDesc::EFactoryDefaultValue, device.SynchronisationPartnerDefault());
 iPropDesc->SetStringL(CMTPTypeDevicePropDesc::ECurrentValue, device.SynchronisationPartner());
 SendDataL(*iPropDesc);
-__FLOG(_L8("ServiceSynchronisationPartnerL - Exit"));
+OstTraceFunctionExit0( CMTPGETDEVICEPROPDESC_SERVICESYNCHRONISATIONPARTNERL_EXIT );
 }
 /**
 *Services the synchronisation partner property.
 */
 void CMTPGetDevicePropDesc::ServiceSessionInitiatorVersionInfoL()
 {
-__FLOG(_L8("ServiceSessionInitiatorVersionInfoL - Entry"));
+OstTraceFunctionEntry0( CMTPGETDEVICEPROPDESC_SERVICESESSIONINITIATORVERSIONINFOL_ENTRY );
 delete iPropDesc;
 iPropDesc = NULL;
 // this property is of type set or get
 iPropDesc = CMTPTypeDevicePropDesc::NewL(EMTPDevicePropCodeSessionInitiatorVersionInfo, 0x01/*set/get*/, 0x00, NULL);
 CMTPDeviceDataStore& device(iDpSingletons.DeviceDataStore());
 iPropDesc->SetStringL(CMTPTypeDevicePropDesc::EFactoryDefaultValue, device.SessionInitiatorVersionInfoDefault());
 iPropDesc->SetStringL(CMTPTypeDevicePropDesc::ECurrentValue, device.SessionInitiatorVersionInfo());
 SendDataL(*iPropDesc);
-__FLOG(_L8("ServiceSessionInitiatorVersionInfoL - Exit"));
+OstTraceFunctionExit0( CMTPGETDEVICEPROPDESC_SERVICESESSIONINITIATORVERSIONINFOL_EXIT );
 }
 /**
 *Services the Service Perceived Device Type.
 */
 void CMTPGetDevicePropDesc::ServicePerceivedDeviceTypeL()
 {
-__FLOG(_L8("ServicePerceivedDeviceType - Entry"));
+OstTraceFunctionEntry0( CMTPGETDEVICEPROPDESC_SERVICEPERCEIVEDDEVICETYPEL_ENTRY );
 delete iPropDesc;
 iPropDesc = NULL;
 iPropDesc = CMTPTypeDevicePropDesc::NewL(EMTPDevicePropCodePerceivedDeviceType, 0x00/*get only*/, 0x00, NULL);
 CMTPDeviceDataStore& device(iDpSingletons.DeviceDataStore());
 iPropDesc->SetUint32L(CMTPTypeDevicePropDesc::EFactoryDefaultValue, device.PerceivedDeviceTypeDefault());
 iPropDesc->SetUint32L(CMTPTypeDevicePropDesc::ECurrentValue, device.PerceivedDeviceType());
 SendDataL(*iPropDesc);
-__FLOG(_L8("ServicePerceivedDeviceType - Exit"));
+OstTraceFunctionExit0( CMTPGETDEVICEPROPDESC_SERVICEPERCEIVEDDEVICETYPEL_EXIT );
 }
 /**
 Services the Date Time property.
 */
 void CMTPGetDevicePropDesc::ServiceDateTimeL()
 {
-__FLOG(_L8("ServicePerceivedDeviceType - Entry"));
+OstTraceFunctionEntry0( CMTPGETDEVICEPROPDESC_SERVICEDATETIMEL_ENTRY );
 delete iPropDesc;
 iPropDesc = NULL;
 iPropDesc = CMTPTypeDevicePropDesc::NewL(EMTPDevicePropCodeDateTime, 0x01/*get/set*/, 0x00, NULL);
 CMTPDeviceDataStore& device(iDpSingletons.DeviceDataStore());
 iPropDesc->SetStringL(CMTPTypeDevicePropDesc::EFactoryDefaultValue, device.DateTimeL());
 iPropDesc->SetStringL(CMTPTypeDevicePropDesc::ECurrentValue, device.DateTimeL());
 SendDataL(*iPropDesc);
-__FLOG(_L8("ServicePerceivedDeviceType - Exit"));
+OstTraceFunctionExit0( CMTPGETDEVICEPROPDESC_SERVICEDATETIMEL_EXIT );
 }
 /**
 Services the Date Time property.
 */
 void CMTPGetDevicePropDesc::ServiceDeviceIconL()
 {
-__FLOG(_L8("ServiceDeviceIcon - Entry"));
+OstTraceFunctionEntry0( CMTPGETDEVICEPROPDESC_SERVICEDEVICEICONL_ENTRY );
 delete iPropDesc;
 iPropDesc = NULL;
 iPropDesc = CMTPTypeDevicePropDesc::NewL(EMTPDevicePropCodeDeviceIcon, 0x00, 0x00, NULL);
 CMTPDeviceDataStore& device(iDpSingletons.DeviceDataStore());
 //need to think of which one to be used for default.
 iPropDesc->SetL(CMTPTypeDevicePropDesc::EFactoryDefaultValue, device.DeviceIcon());
 iPropDesc->SetL(CMTPTypeDevicePropDesc::ECurrentValue, device.DeviceIcon());
 SendDataL(*iPropDesc);
-__FLOG(_L8("ServiceDeviceIcon- Exit"));
+OstTraceFunctionExit0( CMTPGETDEVICEPROPDESC_SERVICEDEVICEICONL_EXIT );
 }
 /*
 *Service Supported format ordered.
 */
 void CMTPGetDevicePropDesc::ServiceSupportedFormatsOrderedL()
 {
-__FLOG(_L8("ServiceSupportedFormatsOrdered - Entry"));
+OstTraceFunctionEntry0( CMTPGETDEVICEPROPDESC_SERVICESUPPORTEDFORMATSORDEREDL_ENTRY );
 delete iPropDesc;
 iPropDesc = NULL;
 iPropDesc = CMTPTypeDevicePropDesc::NewL(EMTPDevicePropCodeSupportedFormatsOrdered, 0x00, 0x00, NULL);
 iPropDesc->SetUint8L(CMTPTypeDevicePropDesc::EFactoryDefaultValue, (TUint8)FORMAT_UNORDERED);
 iPropDesc->SetUint8L(CMTPTypeDevicePropDesc::ECurrentValue, GetFormatOrdered());
 SendDataL(*iPropDesc);
-__FLOG(_L8("ServiceSupportedFormatsOrdered - Exit"));
+OstTraceFunctionExit0( CMTPGETDEVICEPROPDESC_SERVICESUPPORTEDFORMATSORDEREDL_EXIT );
 }
 /*
 *Service Supported FuntionalID.
 */
 void CMTPGetDevicePropDesc::ServiceFunctionalIDL()
 {
-__FLOG(_L8("ServiceFuntionalIDL - Entry"));
+OstTraceFunctionEntry0( CMTPGETDEVICEPROPDESC_SERVICEFUNCTIONALIDL_ENTRY );
 delete iPropDesc;
 iPropDesc = NULL;
 iPropDesc = CMTPTypeDevicePropDesc::NewL(EMTPDevicePropCodeFunctionalID, 1, 0, NULL);
 delete iData;
 	delete iData;
 	iData = GetGUIDL(MMTPFrameworkConfig::EDeviceCurrentFuncationalID);
 	iPropDesc->SetL(CMTPTypeDevicePropDesc::ECurrentValue, *iData);
 SendDataL(*iPropDesc);
-__FLOG(_L8("ServiceFuntionalIDL - Exit"));
+OstTraceFunctionExit0( CMTPGETDEVICEPROPDESC_SERVICEFUNCTIONALIDL_EXIT );
 }
 /*
 *Service Supported ModelID.
 */
 void CMTPGetDevicePropDesc::ServiceModelIDL()
 {
-__FLOG(_L8("ServiceModelIDL - Entry"));
+OstTraceFunctionEntry0( CMTPGETDEVICEPROPDESC_SERVICEMODELIDL_ENTRY );
 delete iPropDesc;
 iPropDesc = NULL;
 iPropDesc = CMTPTypeDevicePropDesc::NewL(EMTPDevicePropCodeModelID, 0, 0, NULL);
 delete iData;
 delete iData;
 iData = GetGUIDL(MMTPFrameworkConfig::EDeviceCurrentModelID);
 	iPropDesc->SetL(CMTPTypeDevicePropDesc::ECurrentValue, *iData);
 SendDataL(*iPropDesc);
-__FLOG(_L8("ServiceModelIDL - Exit"));
+OstTraceFunctionExit0( CMTPGETDEVICEPROPDESC_SERVICEMODELIDL_EXIT );
 }
 /*
 *Service Supported UseDeviceStage.
 */
 void CMTPGetDevicePropDesc::ServiceUseDeviceStageL()
 {
-__FLOG(_L8("ServiceUseDeviceStageL - Entry"));
+OstTraceFunctionEntry0( CMTPGETDEVICEPROPDESC_SERVICEUSEDEVICESTAGEL_ENTRY );
 delete iPropDesc;
 iPropDesc = NULL;
 iPropDesc = CMTPTypeDevicePropDesc::NewL(EMTPDevicePropCodeUseDeviceStage, 0, 0, NULL);
 TMTPTypeUint8 *data = new (ELeave)TMTPTypeUint8(1);
 iPropDesc->SetL(CMTPTypeDevicePropDesc::ECurrentValue, *data);
 delete data;
 SendDataL(*iPropDesc);
-__FLOG(_L8("ServiceUseDeviceStageL - Exit"));
+OstTraceFunctionExit0( CMTPGETDEVICEPROPDESC_SERVICEUSEDEVICESTAGEL_EXIT );
 }
 /*
 *This method to set the supported format order.
 *this value will be set by getdevice info based on the formats present in the
 RArray<TUint> orderedFormats(8);
 CleanupClosePushL(orderedFormats);
 TRAPD(error,iDpSingletons.ConfigMgr().GetRssConfigInfoArrayL(orderedFormats, EDevDpFormats));
 	if(error!=KErrNone)
 		{
-		__FLOG_VA((_L8("GetRssConfigArray returned with %d"), error));
+		OstTrace1(TRACE_WARNING, CMTPGETDEVICEPROPDESC_GETFORMATORDERED,
+		        "GetRssConfigArray returned with %d", error);
 		}
 if(orderedFormats.Count() > 0)
 {
 formatOrdered = (TUint8)FORMAT_ORDERED;
 }
 TMTPTypeGuid* CMTPGetDevicePropDesc::GetGUIDL(const TUint aKey)
 {
 TBuf<KGUIDFormatStringLength> buf;
-User::LeaveIfError(iRepository->Get(aKey,buf));
+LEAVEIFERROR(iRepository->Get(aKey,buf),
+OstTrace1( TRACE_ERROR, CMTPGETDEVICEPROPDESC_GETGUIDL, "can't get from iRepository. the parameter is %d", aKey));
 TMTPTypeGuid* ret = new (ELeave) TMTPTypeGuid( buf );
 return ret;
 }

changeset 49	c20dd21d1eb4
parent 29	3ae5cb0b4c02
child 52	866b4af7ffbe