--- a/mtptransports/mtpusbtransport/usbsic_imp/src/cmtpusbconnection.cpp Fri Apr 16 15:51:48 2010 +0300
+++ b/mtptransports/mtpusbtransport/usbsic_imp/src/cmtpusbconnection.cpp Mon May 03 13:19:02 2010 +0300
@@ -298,16 +298,8 @@
*/
iUsbBulkParameterBlock.Reset();
TBool isNullParamValid = EFalse;
- TUint numberOfNullParam = 0;
- /*
- A special case: for GetNumObjects the first response parameter can be null, which means 0 objects.
- */
- if(opCode == EMTPOpCodeGetNumObjects)
- {
- isNullParamValid = ETrue;
- numberOfNullParam = 1;
- }
- iUsbBulkParameterBlock.CopyIn(aResponse, TMTPTypeResponse::EResponseParameter1, TMTPTypeResponse::EResponseParameter5, isNullParamValid, numberOfNullParam);
+ TUint numberOfNullParam = 0;
+ iUsbBulkParameterBlock.CopyIn(aResponse, TMTPTypeResponse::EResponseParameter1, TMTPTypeResponse::EResponseParameter1 + aResponse.GetNumOfValidParams(), isNullParamValid, numberOfNullParam);
// Setup the bulk container.
iUsbBulkContainer->SetPayloadL(const_cast<TMTPUsbParameterPayloadBlock*>(&iUsbBulkParameterBlock));