diff -r 8b094906a049 -r 60a94a45d437 mtpfws/mtpfw/src/cmtpdataprovider.cpp --- a/mtpfws/mtpfw/src/cmtpdataprovider.cpp Mon Mar 15 12:43:12 2010 +0200 +++ b/mtpfws/mtpfw/src/cmtpdataprovider.cpp Wed Mar 31 22:58:56 2010 +0300 @@ -134,6 +134,18 @@ __FLOG_VA((_L8("ExecuteProxyRequestL - Exit, data provider %d "), iId)); } +void CMTPDataProvider::ExecutePendingRequestL() + { + __FLOG_VA((_L8("SchedulePendingRequestL - Entry"))); + + if (iCurrentRequest != NULL && !IsActive()) + { + Schedule(); + } + + __FLOG_VA((_L8("SchedulePendingRequestL - Exit"))); + } + void CMTPDataProvider::EnumerateObjectsL(TUint32 aStorageId) { __FLOG_VA((_L8("EnumerateObjectsL - Entry, data provider %d "), iId)); @@ -503,6 +515,15 @@ __FLOG(_L8("NotifyFrameworkL - Exit")); } +void CMTPDataProvider::RegisterPendingRequest(TUint aTimeOut) + { + __FLOG(_L8("RegisterPendingRequestL - Entry")); + + iSingletons.DpController().RegisterPendingRequestDP(iImplementationUid.iUid, aTimeOut); + + __FLOG(_L8("RegisterPendingRequestL - Exit")); + } + void CMTPDataProvider::DoCancel() { __FLOG_VA((_L8("DoCancel - Entry, data provider %d "), iId)); @@ -607,6 +628,7 @@ case EMTPOpCodeGetObjectPropsSupported: case EMTPOpCodeGetObjectPropDesc: case EMTPOpCodeVendorExtextensionEnd: + case EMTPOpCodeGetServicePropList: iImplementation->ProcessRequestPhaseL(iCurrentTransactionPhase, *iCurrentRequest, *iCurrentConnection); break; @@ -642,7 +664,7 @@ iImplementation->ProcessRequestPhaseL(iCurrentTransactionPhase, *iCurrentRequest, *iCurrentConnection); break; case ECompletingPhase: - TransactionCompleteL(*iCurrentRequest, *iCurrentConnection); + iImplementation->ProcessRequestPhaseL(iCurrentTransactionPhase, *iCurrentRequest, *iCurrentConnection); break; default: break; @@ -795,7 +817,9 @@ case KMTPDataTypeInvalid: code = EMTPRespCodeInvalidDataset; break; - + case KErrDiskFull: + code = EMTPRespCodeStoreFull; + break; default: code = EMTPRespCodeGeneralError; break;