Revision: 201007 RCL_3
authorDremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
Wed, 14 Apr 2010 17:50:51 +0300
branchRCL_3
changeset 11 863facfed77d
parent 9 fcd52893bbd3
child 13 573550b50543
child 17 6ba7b7d87ab3
Revision: 201007 Kit: 201015
usbmgmt/usbclassandmgrdocs/USBDI-Unit Test Design.EAP
usbmgmt/usbclassandmgrdocs/USB_Control_App_UML_Diagrams.eap
usbmgmt/usbclassandmgrdocs/USB_FDF_Model.EAP
usbmgmt/usbclassandmgrdocs/USB_Host_and_OTG_Test_Harness_Design.eap
usbmgmt/usbclassandmgrdocs/USB_MSMM_Design.eap
usbmgmt/usbclassandmgrdocs/usb_documentation.history.xml
usbmgmt/usbclassandmgrdocs/usb_documentation.mrp
usbmgmt/usbmgr/host/fdf/production/server/src/fdf.cpp
usbmgmt/usbmgr/usbman/client/EABI/usbman_over_dummyusbdiu.def
usbmgmt/usbmgr/usbman/client/group/BLD.INF
usbmgmt/usbmgrtest/ObexClassController/bld.inf
Binary file usbmgmt/usbclassandmgrdocs/USBDI-Unit Test Design.EAP has changed
Binary file usbmgmt/usbclassandmgrdocs/USB_Control_App_UML_Diagrams.eap has changed
Binary file usbmgmt/usbclassandmgrdocs/USB_FDF_Model.EAP has changed
Binary file usbmgmt/usbclassandmgrdocs/USB_Host_and_OTG_Test_Harness_Design.eap has changed
Binary file usbmgmt/usbclassandmgrdocs/USB_MSMM_Design.eap has changed
--- a/usbmgmt/usbclassandmgrdocs/usb_documentation.history.xml	Thu Apr 01 00:28:40 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<relnotes name="DEVELOPERLIBRARY">
-  <purpose>
-    Documentation for USB.
-  </purpose>
-
-  <defect number="DEF125990" title="USB Documentation directory includes project review documents" revision="003">
-    Project mgt documents removed
-  </defect>
-
-  <preq number="1782" title="USB Host and on-the-go for pre-installed drivers" revision="002"/>
-  <preq number="1576" title="State change plug-in interface to USB Manager (for charging)" revision="001"/>
-</relnotes>
--- a/usbmgmt/usbclassandmgrdocs/usb_documentation.mrp	Thu Apr 01 00:28:40 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 
-
--- a/usbmgmt/usbmgr/host/fdf/production/server/src/fdf.cpp	Thu Apr 01 00:28:40 2010 +0300
+++ b/usbmgmt/usbmgr/host/fdf/production/server/src/fdf.cpp	Wed Apr 14 17:50:51 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;
 			}
 		
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usbmgmt/usbmgr/usbman/client/EABI/usbman_over_dummyusbdiu.def	Wed Apr 14 17:50:51 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
+
--- a/usbmgmt/usbmgr/usbman/client/group/BLD.INF	Thu Apr 01 00:28:40 2010 +0300
+++ b/usbmgmt/usbmgr/usbman/client/group/BLD.INF	Wed Apr 14 17:50:51 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
+
--- a/usbmgmt/usbmgrtest/ObexClassController/bld.inf	Thu Apr 01 00:28:40 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