# HG changeset patch # User Dremov Kirill (Nokia-D-MSW/Tampere) # Date 1272885222 -10800 # Node ID 4285b54b0d2cf906d92879e42435eb9fb5554db1 # Parent e9d124871462c6ddc0bef5d32adb93ef4a6f3468 Revision: 201018 Kit: 201018 diff -r e9d124871462 -r 4285b54b0d2c usbmgmt/usbclassandmgrdocs/USB_Control_App_UML_Diagrams.eap Binary file usbmgmt/usbclassandmgrdocs/USB_Control_App_UML_Diagrams.eap has changed diff -r e9d124871462 -r 4285b54b0d2c usbmgmt/usbclassandmgrdocs/USB_FDF_Model.EAP Binary file usbmgmt/usbclassandmgrdocs/USB_FDF_Model.EAP has changed diff -r e9d124871462 -r 4285b54b0d2c 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 e9d124871462 -r 4285b54b0d2c usbmgmt/usbclassandmgrdocs/USB_MSMM_Design.eap Binary file usbmgmt/usbclassandmgrdocs/USB_MSMM_Design.eap has changed diff -r e9d124871462 -r 4285b54b0d2c usbmgmt/usbclassandmgrdocs/usb_documentation.history.xml --- a/usbmgmt/usbclassandmgrdocs/usb_documentation.history.xml Fri Apr 16 16:55:35 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,13 +0,0 @@ - - - - Documentation for USB. - - - - Project mgt documents removed - - - - - diff -r e9d124871462 -r 4285b54b0d2c usbmgmt/usbclassandmgrdocs/usb_documentation.mrp --- a/usbmgmt/usbclassandmgrdocs/usb_documentation.mrp Fri Apr 16 16:55:35 2010 +0300 +++ /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 e9d124871462 -r 4285b54b0d2c usbmgmt/usbmgr/device/classdrivers/acm/classcontroller/group/usbacmconfiguration.hby --- a/usbmgmt/usbmgr/device/classdrivers/acm/classcontroller/group/usbacmconfiguration.hby Fri Apr 16 16:55:35 2010 +0300 +++ b/usbmgmt/usbmgr/device/classdrivers/acm/classcontroller/group/usbacmconfiguration.hby Mon May 03 14:13:42 2010 +0300 @@ -19,9 +19,7 @@ #ifndef USBACMCONFIGURATION_HBY #define USBACMCONFIGURATION_HBY - -#define USBACM_PATCHDATA_KUSBACMNUMBEROFACMFUNCTIONS 1 - +#define USBACM_PATCHDATA_KUSBACMNUMBEROFACMFUNCTIONS 2 // USBACM_PATCHDATA_KUSBACMPROTOCOLNUMACM[X] is referring to the Xth ACM *function* // which is accessed by the (X-1)th ACM *port* @@ -29,7 +27,7 @@ #define USBACM_PATCHDATA_KUSBACMPROTOCOLNUMACM1 1 //0x01 - code taken from USBCDC 1.1 Table 17- Hayes compatible modem -//#define USBACM_PATCHDATA_KUSBACMPROTOCOLNUMACM2 255 +#define USBACM_PATCHDATA_KUSBACMPROTOCOLNUMACM2 255 //0xFF - Vendor-specific //#define USBACM_PATCHDATA_KUSBACMPROTOCOLNUMACM3 1 diff -r e9d124871462 -r 4285b54b0d2c usbmgmt/usbmgr/device/classdrivers/ms/classcontroller/src/usbms.rss --- a/usbmgmt/usbmgr/device/classdrivers/ms/classcontroller/src/usbms.rss Fri Apr 16 16:55:35 2010 +0300 +++ b/usbmgmt/usbmgr/device/classdrivers/ms/classcontroller/src/usbms.rss Mon May 03 14:13:42 2010 +0300 @@ -32,8 +32,9 @@ RESOURCE USBMASSSTORAGE_CONFIG usbms_config { - vendorId = "vendorId"; // no more than 8 characters - productId = "productId"; // no more than 16 characters - productRev = "rev"; // no more than 4 characters + vendorId = "Nokia"; // no more than 8 characters + productId = "S60"; // no more than 16 characters + productRev = "1.0"; // no more than 4 characters } + diff -r e9d124871462 -r 4285b54b0d2c usbmgmt/usbmgr/host/fdf/production/server/inc/eventqueue.h --- a/usbmgmt/usbmgr/host/fdf/production/server/inc/eventqueue.h Fri Apr 16 16:55:35 2010 +0300 +++ b/usbmgmt/usbmgr/host/fdf/production/server/inc/eventqueue.h Mon May 03 14:13:42 2010 +0300 @@ -1,5 +1,5 @@ /* -* Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies). +* Copyright (c) 2007-2010 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" @@ -104,9 +104,7 @@ KUsbBadHubPosition = 3, KUsbBadHub = 4, KUsbEventOverflow = 5, - KUsbBadDeviceAttached = 6, - KUsbBadDeviceDetached = 7, - KNumberOfDevmonEventTypes = 8, + KNumberOfDevmonEventTypes = 6 }; TFixedArray iDevmonEventCount; }; diff -r e9d124871462 -r 4285b54b0d2c usbmgmt/usbmgr/host/fdf/production/server/src/eventqueue.cpp --- a/usbmgmt/usbmgr/host/fdf/production/server/src/eventqueue.cpp Fri Apr 16 16:55:35 2010 +0300 +++ b/usbmgmt/usbmgr/host/fdf/production/server/src/eventqueue.cpp Mon May 03 14:13:42 2010 +0300 @@ -1,5 +1,5 @@ /* -* Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies). +* Copyright (c) 2007-2010 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" @@ -291,12 +291,7 @@ case KUsbEventOverflow: aEvent = KErrUsbEventOverflow; break; - case KUsbBadDeviceAttached: - aEvent = KErrUsbBadDeviceAttached; - break; - case KUsbBadDeviceDetached: - aEvent = KEventUsbBadDeviceDetached; - break; + case KNumberOfDevmonEventTypes: default: LOGTEXT2(_L8("\tUnexpected devmon error, not handled properly %d"), ii); @@ -343,13 +338,7 @@ break; case KErrUsbEventOverflow: index = KUsbEventOverflow; - break; - case KErrUsbBadDeviceAttached: - index = KUsbBadDeviceAttached; - break; - case KEventUsbBadDeviceDetached: - index = KUsbBadDeviceDetached; - break; + break; default: LOGTEXT2(_L8("\tUnexpected devmon error, not handled properly %d"), aEvent); diff -r e9d124871462 -r 4285b54b0d2c usbmgmt/usbmgr/host/fdf/production/server/src/fdf.cpp --- a/usbmgmt/usbmgr/host/fdf/production/server/src/fdf.cpp Fri Apr 16 16:55:35 2010 +0300 +++ b/usbmgmt/usbmgr/host/fdf/production/server/src/fdf.cpp Mon May 03 14:13:42 2010 +0300 @@ -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 e9d124871462 -r 4285b54b0d2c 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 Mon May 03 14:13:42 2010 +0300 @@ -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 e9d124871462 -r 4285b54b0d2c usbmgmt/usbmgr/usbman/client/group/BLD.INF --- a/usbmgmt/usbmgr/usbman/client/group/BLD.INF Fri Apr 16 16:55:35 2010 +0300 +++ b/usbmgmt/usbmgr/usbman/client/group/BLD.INF Mon May 03 14:13:42 2010 +0300 @@ -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 e9d124871462 -r 4285b54b0d2c usbmgmt/usbmgrtest/ObexClassController/bld.inf --- a/usbmgmt/usbmgrtest/ObexClassController/bld.inf Fri Apr 16 16:55:35 2010 +0300 +++ /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