# HG changeset patch # User William Roberts # Date 1272014153 -3600 # Node ID 573550b5054349718ab55beb1e4f7865aefc7182 # Parent 863facfed77d9a25936799f7a80d60bae8b779c0# Parent f21b00489775649dc7fb1bd6401e814257e8e8b5 Remerge fix for Bug 2485 diff -r f21b00489775 -r 573550b50543 usbmgmt/usbclassandmgrdocs/USBDI-Unit Test Design.EAP Binary file usbmgmt/usbclassandmgrdocs/USBDI-Unit Test Design.EAP has changed diff -r f21b00489775 -r 573550b50543 usbmgmt/usbclassandmgrdocs/USB_Control_App_UML_Diagrams.eap Binary file usbmgmt/usbclassandmgrdocs/USB_Control_App_UML_Diagrams.eap has changed diff -r f21b00489775 -r 573550b50543 usbmgmt/usbclassandmgrdocs/USB_FDF_Model.EAP Binary file usbmgmt/usbclassandmgrdocs/USB_FDF_Model.EAP has changed diff -r f21b00489775 -r 573550b50543 usbmgmt/usbclassandmgrdocs/USB_Host_and_OTG_Test_Harness_Design.eap Binary file usbmgmt/usbclassandmgrdocs/USB_Host_and_OTG_Test_Harness_Design.eap has changed diff -r f21b00489775 -r 573550b50543 usbmgmt/usbclassandmgrdocs/USB_MSMM_Design.eap Binary file usbmgmt/usbclassandmgrdocs/USB_MSMM_Design.eap has changed diff -r f21b00489775 -r 573550b50543 usbmgmt/usbclassandmgrdocs/usb_documentation.history.xml --- a/usbmgmt/usbclassandmgrdocs/usb_documentation.history.xml Mon Apr 12 12:12:03 2010 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,13 +0,0 @@ - - - - Documentation for USB. - - - - Project mgt documents removed - - - - - diff -r f21b00489775 -r 573550b50543 usbmgmt/usbclassandmgrdocs/usb_documentation.mrp --- a/usbmgmt/usbclassandmgrdocs/usb_documentation.mrp Mon Apr 12 12:12:03 2010 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,27 +0,0 @@ -# Copyright (c) 2003-2009 Nokia Corporation and/or its subsidiary(-ies). -# All rights reserved. -# This component and the accompanying materials are made available -# under the terms of "Eclipse Public License v1.0" -# which accompanies this distribution, and is available -# at the URL "http://www.eclipse.org/legal/epl-v10.html". -# -# Initial Contributors: -# Nokia Corporation - initial contribution. -# -# Contributors: -# -# Description: -# -# -# - - -component usb_documentation - -source \sf\os\usb\usbmgmt\usbclassandmgrdocs\ - -notes_source \component_defs\release.src - - -ipr D - diff -r f21b00489775 -r 573550b50543 usbmgmt/usbmgr/host/fdf/production/server/src/fdf.cpp --- a/usbmgmt/usbmgr/host/fdf/production/server/src/fdf.cpp Mon Apr 12 12:12:03 2010 +0100 +++ b/usbmgmt/usbmgr/host/fdf/production/server/src/fdf.cpp Fri Apr 23 10:15:53 2010 +0100 @@ -777,6 +777,8 @@ (aKey == EInterfaceclassInterfacesubclassInterfaceprotocol && ifInfo->iClass == KVendorSpecificInterfaceClassValue) || (aKey == EInterfaceclassInterfacesubclass && ifInfo->iClass == KVendorSpecificInterfaceClassValue)) { + // Putting ii+1 as the starting offset is to remove the interface on which the searching have been done. + RebuildUnClaimedInterfacesArrayL(aDevice, aInterfacesNumberArray, ii+1); continue; } diff -r f21b00489775 -r 573550b50543 usbmgmt/usbmgr/usbman/client/EABI/usbman_over_dummyusbdiu.def --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/usbmgmt/usbmgr/usbman/client/EABI/usbman_over_dummyusbdiu.def Fri Apr 23 10:15:53 2010 +0100 @@ -0,0 +1,54 @@ +EXPORTS + _Z5panicv @ 1 NONAME + _ZN4RUsb10BusRequestEv @ 2 NONAME + _ZN4RUsb10StopCancelEv @ 3 NONAME + _ZN4RUsb10__DbgAllocEv @ 4 NONAME + _ZN4RUsb11StartCancelEv @ 5 NONAME + _ZN4RUsb12__DbgMarkEndEi @ 6 NONAME + _ZN4RUsb13BusClearErrorEv @ 7 NONAME + _ZN4RUsb13BusRespondSrpEv @ 8 NONAME + _ZN4RUsb13__DbgFailNextEi @ 9 NONAME + _ZN4RUsb13__DbgMarkHeapEv @ 10 NONAME + _ZN4RUsb14CancelInterestENS_11TUsbReqTypeE @ 11 NONAME + _ZN4RUsb14ClassSupportedEi4TUidRi @ 12 NONAME + _ZN4RUsb14GetDescriptionEiRP7HBufC16 @ 13 NONAME + _ZN4RUsb14GetDeviceStateER15TUsbDeviceState @ 14 NONAME + _ZN4RUsb14RequestSessionEv @ 15 NONAME + _ZN4RUsb14__DbgCheckHeapEi @ 16 NONAME + _ZN4RUsb15GetCurrentStateER16TUsbServiceState @ 17 NONAME + _ZN4RUsb15GetServiceStateER16TUsbServiceState @ 18 NONAME + _ZN4RUsb16GetOtgDescriptorEjR14TOtgDescriptor @ 19 NONAME + _ZN4RUsb17GetPersonalityIdsER6RArrayIiE @ 20 NONAME + _ZN4RUsb17SetCtlSessionModeEi @ 21 NONAME + _ZN4RUsb17StateNotificationEjR15TUsbDeviceStateR14TRequestStatus @ 22 NONAME + _ZN4RUsb19GetSupportedClassesEiR6RArrayI4TUidE @ 23 NONAME + _ZN4RUsb19MessageNotificationER14TRequestStatusRi @ 24 NONAME + _ZN4RUsb21GetSupportedLanguagesEjR6RArrayIjE @ 25 NONAME + _ZN4RUsb21HostEventNotificationER14TRequestStatusR23TDeviceEventInformation @ 26 NONAME + _ZN4RUsb22GetDetailedDescriptionEiRP7HBufC16 @ 27 NONAME + _ZN4RUsb22GetPersonalityPropertyEiRm @ 28 NONAME + _ZN4RUsb23DeviceStateNotificationEjR15TUsbDeviceStateR14TRequestStatus @ 29 NONAME + _ZN4RUsb23GetCurrentPersonalityIdERi @ 30 NONAME + _ZN4RUsb23StateNotificationCancelEv @ 31 NONAME + _ZN4RUsb24ServiceStateNotificationER16TUsbServiceStateR14TRequestStatus @ 32 NONAME + _ZN4RUsb25MessageNotificationCancelEv @ 33 NONAME + _ZN4RUsb26GetProductStringDescriptorEjjR4TBufILi128EE @ 34 NONAME + _ZN4RUsb27EnableFunctionDriverLoadingEv @ 35 NONAME + _ZN4RUsb27HostEventNotificationCancelEv @ 36 NONAME + _ZN4RUsb28DisableFunctionDriverLoadingEv @ 37 NONAME + _ZN4RUsb29DeviceStateNotificationCancelEv @ 38 NONAME + _ZN4RUsb30ServiceStateNotificationCancelEv @ 39 NONAME + _ZN4RUsb31GetManufacturerStringDescriptorEjjR4TBufILi128EE @ 40 NONAME + _ZN4RUsb4StopER14TRequestStatus @ 41 NONAME + _ZN4RUsb4StopEv @ 42 NONAME + _ZN4RUsb5StartER14TRequestStatus @ 43 NONAME + _ZN4RUsb7BusDropEv @ 44 NONAME + _ZN4RUsb7ConnectEv @ 45 NONAME + _ZN4RUsb7TryStopER14TRequestStatus @ 46 NONAME + _ZN4RUsb8TryStartEiR14TRequestStatus @ 47 NONAME + _ZN4RUsbC1Ev @ 48 NONAME + _ZN4RUsbC2Ev @ 49 NONAME + _ZN4RUsbD1Ev @ 50 NONAME + _ZN4RUsbD2Ev @ 51 NONAME + _ZNK4RUsb7VersionEv @ 52 NONAME + diff -r f21b00489775 -r 573550b50543 usbmgmt/usbmgr/usbman/client/group/BLD.INF --- a/usbmgmt/usbmgr/usbman/client/group/BLD.INF Mon Apr 12 12:12:03 2010 +0100 +++ b/usbmgmt/usbmgr/usbman/client/group/BLD.INF Fri Apr 23 10:15:53 2010 +0100 @@ -22,7 +22,11 @@ PRJ_MMPFILES Usbman.mmp -#if defined(WINS) +/* +* Previously, it only supports WINSCW. +* But the NSE(None Silent Error) unit test depends on this library and the NSE test +* will be run on the hardware. So we need it to support armv5. +*/ PRJ_TESTMMPFILES Usbman_over_dummyusbdi.mmp -#endif + diff -r f21b00489775 -r 573550b50543 usbmgmt/usbmgrtest/ObexClassController/bld.inf --- a/usbmgmt/usbmgrtest/ObexClassController/bld.inf Mon Apr 12 12:12:03 2010 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,20 +0,0 @@ -/* -* Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of "Eclipse Public License v1.0" -* which accompanies this distribution, and is available -* at the URL "http://www.eclipse.org/legal/epl-v10.html". -* -* Initial Contributors: -* Nokia Corporation - initial contribution. -* -* Contributors: -* -* Description: -* -*/ - - -#include "ObexUsbClassController/bld.inf" -#include "test/group/bld.inf" \ No newline at end of file