# HG changeset patch
# User hgs
# Date 1287547493 -28800
# Node ID bbdce6bffaadbad5f06aa9fc550a3023c5a9047b
# Parent  84c26be382f0695a1d3c8b7e22628ab6739167b8
201041_02

diff -r 84c26be382f0 -r bbdce6bffaad group/bld.inf
--- a/group/bld.inf	Tue Oct 19 14:23:03 2010 +0800
+++ b/group/bld.inf	Wed Oct 20 12:04:53 2010 +0800
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 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"
diff -r 84c26be382f0 -r bbdce6bffaad layers.sysdef.xml
--- a/layers.sysdef.xml	Tue Oct 19 14:23:03 2010 +0800
+++ b/layers.sysdef.xml	Wed Oct 20 12:04:53 2010 +0800
@@ -8,14 +8,8 @@
     <layer name="os_layer">
       <module name="usb">
         <unit unitID="usbdo.usb" mrp="" bldFile="&layer_real_source_path;/group" name="usb" />
-      </module>
-      <module name="">
-        <unit unitID="usbdo.usb.usbextension" mrp="" bldFile="&layer_real_source_path;/usbextension/group" filter="!sf_build" name="usb_usbextension" />
-        <unit unitID="usbdo.usb.usb_plat.usb_audio_types_api" mrp="" bldFile="&layer_real_source_path;/usb_plat/usb_audio_types_api/group" filter="!sf_build" name="usb_usb_plat_usb_audio_types_api" />
-        <unit unitID="usbdo.usb.usb_plat.usb_audio_stream_plugin_api" mrp="" bldFile="&layer_real_source_path;/usb_plat/usb_audio_stream_plugin_api/group" filter="!sf_build" name="usb_usb_plat_usb_audio_stream_plugin_api" />
-        <unit unitID="usbdo.usb.usb_plat.usb_audio_capability_plugin_api" mrp="" bldFile="&layer_real_source_path;/usb_plat/usb_audio_capability_plugin_api/group" filter="!sf_build" name="usb_usb_plat_usb_audio_capability_plugin_api" />
-        <unit unitID="usbdo.usb.usb_plat.usb_audio_class_api" mrp="" bldFile="&layer_real_source_path;/usb_plat/usb_audio_class_api/group" filter="!sf_build" name="usb_usb_plat_usb_audio_class_api" />
-      </module>    
+      </module> 
     </layer>
   </systemModel>
 </SystemDefinition>
+
diff -r 84c26be382f0 -r bbdce6bffaad package_definition.xml
--- a/package_definition.xml	Tue Oct 19 14:23:03 2010 +0800
+++ b/package_definition.xml	Wed Oct 20 12:04:53 2010 +0800
@@ -2,10 +2,12 @@
 <SystemDefinition schema="3.0.0">
  <package id="usb" name="USB" levels="adaptation hw-if plugin framework server app-if">
   <collection id="usb_plat" name="USB Platform Interfaces" level="app-if">
-	<!-- placeholder for platform APIs -->
+      <component id="usb_shai_api" name="USB SHAI API" class="api" introduced="^4">
+       <unit bldFile="usb_plat/usb_shai_api/group"/>
+      </component>
   </collection>
   <collection id="usbdrv" name="USB Device Drivers" level="hw-if">
-	 	<component id="peripheraldrv" name="Usb peripheral driver" purpose="optional">
+	 	<component id="peripheraldrv" name="USB Peripheral Driver" purpose="optional">
   		<unit version="1" bldFile="usbdrv/peripheral/group" mrp="usbdrv/peripheral/group/peripheral.mrp" /> 
   	</component>
   </collection>
@@ -16,14 +18,6 @@
    <component id="usbmgrtest" name="USB Manager Tests" introduced="7.0" purpose="development" filter="test">
     <unit version="2" mrp="usbmgmt/usbmgrtest/group/usb_test.mrp" bldFile="usbmgmt/usbmgrtest/group"/>
    </component>
-   <component id="usbclassandmgrdocs" name="USB Class and Manager Documentation" purpose="development" class="doc">
-    <unit mrp="usbmgmt/usbclassandmgrdocs/usb_documentation.mrp"/>
-   </component>
-  </collection>
-  <collection id="usb_info" name="USB Info" level="app-if">
-   <component id="usb_metadata" name="USB Metadata" class="config" introduced="^3" purpose="development" target="desktop">
-    <unit mrp="usb_info/usb_metadata/usb_metadata.mrp"/>
-   </component>
   </collection>
  </package>
 </SystemDefinition>
diff -r 84c26be382f0 -r bbdce6bffaad usb_info/usb_metadata/usb_metadata.mrp
--- a/usb_info/usb_metadata/usb_metadata.mrp	Tue Oct 19 14:23:03 2010 +0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,6 +0,0 @@
-component           usb_metadata
-source   \sf\os\usb\usb_info\usb_metadata 
-source   \sf\os\usb\package_definition.xml
-source   \sf\os\usb\distribution.policy.s60
-notes_source      \component_defs\release.src
-ipr T 
diff -r 84c26be382f0 -r bbdce6bffaad usb_plat/group/usb_plat.mrp
--- a/usb_plat/group/usb_plat.mrp	Tue Oct 19 14:23:03 2010 +0800
+++ b/usb_plat/group/usb_plat.mrp	Wed Oct 20 12:04:53 2010 +0800
@@ -15,12 +15,12 @@
 #
 component	usb_plat
 
-source	\sf\os\usb\usb_plat\group
+source	/sf/os/usb/usb_plat/group
 
-binary	\sf\os\usb\usb_plat\group	all
+binary	/sf/os/usb/usb_plat/group	all
 
-exports	\sf\os\usb\usb_plat\group
+exports	/sf/os/usb/usb_plat/group
 
-notes_source	\component_defs\release.src
+notes_source	/component_defs/release.src
 
 ipr E
diff -r 84c26be382f0 -r bbdce6bffaad usb_plat/usb_shai_api/group/bld.inf
--- a/usb_plat/usb_shai_api/group/bld.inf	Tue Oct 19 14:23:03 2010 +0800
+++ b/usb_plat/usb_shai_api/group/bld.inf	Wed Oct 20 12:04:53 2010 +0800
@@ -23,7 +23,6 @@
 
 PRJ_EXPORTS
 
-
 ../inc/usb_common_shai.h               SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(usb/)
 ../inc/usb_host_shai.h                 SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(usb/)
 ../inc/usb_otg_shai.h                  SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(usb/)
diff -r 84c26be382f0 -r bbdce6bffaad usb_plat/usb_shai_api/inc/usb_charger_detection_shai.h
--- a/usb_plat/usb_shai_api/inc/usb_charger_detection_shai.h	Tue Oct 19 14:23:03 2010 +0800
+++ b/usb_plat/usb_shai_api/inc/usb_charger_detection_shai.h	Wed Oct 20 12:04:53 2010 +0800
@@ -24,7 +24,6 @@
     @publishedDeviceAbstraction
 */
 
-
 #ifndef USB_CHARGER_DETECTION_SHAI_H
 #define USB_CHARGER_DETECTION_SHAI_H
 
diff -r 84c26be382f0 -r bbdce6bffaad usb_plat/usb_shai_api/inc/usb_host_shai.h
--- a/usb_plat/usb_shai_api/inc/usb_host_shai.h	Tue Oct 19 14:23:03 2010 +0800
+++ b/usb_plat/usb_shai_api/inc/usb_host_shai.h	Wed Oct 20 12:04:53 2010 +0800
@@ -24,7 +24,6 @@
     @publishedDeviceAbstraction
 */
 
-
 #ifndef USB_HOST_SHAI_H
 #define USB_HOST_SHAI_H
 
diff -r 84c26be382f0 -r bbdce6bffaad usb_plat/usb_shai_api/inc/usb_otg_shai.h
--- a/usb_plat/usb_shai_api/inc/usb_otg_shai.h	Tue Oct 19 14:23:03 2010 +0800
+++ b/usb_plat/usb_shai_api/inc/usb_otg_shai.h	Wed Oct 20 12:04:53 2010 +0800
@@ -24,7 +24,6 @@
     @publishedDeviceAbstraction
 */
 
-
 #ifndef USB_OTG_SHAI_H
 #define USB_OTG_SHAI_H
 
diff -r 84c26be382f0 -r bbdce6bffaad usb_plat/usb_shai_api/inc/usb_peripheral_shai.h
--- a/usb_plat/usb_shai_api/inc/usb_peripheral_shai.h	Tue Oct 19 14:23:03 2010 +0800
+++ b/usb_plat/usb_shai_api/inc/usb_peripheral_shai.h	Wed Oct 20 12:04:53 2010 +0800
@@ -14,7 +14,6 @@
 * Description: 
 *
 */
-
 /** @file
     
     @brief USB Peripheral SHAI header
diff -r 84c26be382f0 -r bbdce6bffaad usb_plat/usb_shai_api/inc/usb_peripheral_shai_shared.h
--- a/usb_plat/usb_shai_api/inc/usb_peripheral_shai_shared.h	Tue Oct 19 14:23:03 2010 +0800
+++ b/usb_plat/usb_shai_api/inc/usb_peripheral_shai_shared.h	Wed Oct 20 12:04:53 2010 +0800
@@ -14,7 +14,6 @@
 * Description: 
 *
 */
-
 /** @file
 
     @brief USB Peripheral SHAI header shared part.
diff -r 84c26be382f0 -r bbdce6bffaad usbdrv/peripheral/group/bld.inf
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usbdrv/peripheral/group/bld.inf	Wed Oct 20 12:04:53 2010 +0800
@@ -0,0 +1,62 @@
+/*
+* Copyright (c) 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"
+* 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:
+*
+*/
+
+#if !defined(WINS) && !defined(X86GCC) && !defined(WINSCW)
+
+#include <platform_paths.hrh>
+
+PRJ_PLATFORMS
+ARMV5
+ARMV5SMP
+
+PRJ_EXPORTS
+../public/usbc.h                 SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(usb/)
+../public/usbc.inl               SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(usb/)
+../public/d32usbc.h              SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(usb/)
+../public/d32usbc.inl            SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(usb/)
+../public/d32usbcshared.h        SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(usb/)
+../public/d32usbcshared.inl      SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(usb/)
+../public/d32usbtransfers.h      SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(usb/)
+../public/d32usbdescriptors.h    SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(usb/)
+
+../public/usbcshared.h                       SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(usb/)
+../public/usbcshared.inl                     SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(usb/)
+../public/usbotgperipheralcontrolif.h        SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(usb/)
+../public/usbcdesc.h                         SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(usb/)
+../public/usbcque.h                          SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(usb/)
+../public/usb.h                              SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(usb/)
+../public/usbcontrolxferif.h                 SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(usb/)
+../public/usbcsc.h          SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(usb/)
+../public/usbcsc.inl        SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(usb/)
+../public/d32usbcsc.h       SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(usb/)
+../public/d32usbcsc.inl     SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(usb/)
+
+../../../usb_plat/usb_shai_api/inc/usb_common_shai.h               SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(usb/)
+../../../usb_plat/usb_shai_api/inc/usb_peripheral_shai.h              SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(usb/)
+../../../usb_plat/usb_shai_api/inc/usb_peripheral_shai.inl            SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(usb/)
+../../../usb_plat/usb_shai_api/inc/usb_peripheral_shai_shared.h    SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(usb/)
+../../../usb_plat/usb_shai_api/inc/usb_charger_detection_shai.h   SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(usb/)
+../../../usb_plat/usb_shai_api/inc/usb_charger_detection_shai_shared.h     SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(usb/)
+
+usbperipheral_shai.iby        /epoc32/rom/include/usbperipheral_shai.iby
+
+#include "../pdd/pil/group/bld.inf"
+#include "../ldd/perildd/group/bld.inf"
+#include "../ldd/perilddsc/group/bld.inf"
+#include "../ldd/perilddsc/appifwrapper/group/bld.inf"
+
+#endif
diff -r 84c26be382f0 -r bbdce6bffaad usbdrv/peripheral/group/peripheral.mrp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usbdrv/peripheral/group/peripheral.mrp	Wed Oct 20 12:04:53 2010 +0800
@@ -0,0 +1,48 @@
+# 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	peripheraldrv
+
+source /sf/os/usb/usbdrv/peripheral/group
+source /sf/os/usb/usbdrv/peripheral/ldd/perilddnsc/group
+source /sf/os/usb/usbdrv/peripheral/ldd/perilddnsc/src
+source /sf/os/usb/usbdrv/peripheral/ldd/perilddsc/group
+source /sf/os/usb/usbdrv/peripheral/ldd/perilddsc/src
+source /sf/os/usb/usbdrv/peripheral/ldd/perilddsc/appifwrapper/group
+source /sf/os/usb/usbdrv/peripheral/ldd/perilddsc/appifwrapper/src
+source /sf/os/usb/usbdrv/peripheral/pdd/pil/group
+source /sf/os/usb/usbdrv/peripheral/pdd/pil/inc
+source /sf/os/usb/usbdrv/peripheral/pdd/pil/src
+source /sf/os/usb/usbdrv/peripheral/public
+
+binary	/sf/os/usb/usbdrv/peripheral/group	all
+
+exports	/sf/os/usb/usbdrv/peripheral/group
+
+ipr E
+ipr T  /sf/os/usb/usbdrv/peripheral/group
+ipr T  /sf/os/usb/usbdrv/peripheral/ldd/perilddnsc/group
+ipr T  /sf/os/usb/usbdrv/peripheral/ldd/perilddnsc/src
+ipr T  /sf/os/usb/usbdrv/peripheral/ldd/perilddsc/group
+ipr T  /sf/os/usb/usbdrv/peripheral/ldd/perilddsc/src
+ipr T  /sf/os/usb/usbdrv/peripheral/ldd/perilddsc/appifwrapper/group
+ipr T  /sf/os/usb/usbdrv/peripheral/ldd/perilddsc/appifwrapper/src
+ipr T  /sf/os/usb/usbdrv/peripheral/pdd/pil/group
+ipr T  /sf/os/usb/usbdrv/peripheral/pdd/pil/inc
+ipr T  /sf/os/usb/usbdrv/peripheral/pdd/pil/src
+ipr T  /sf/os/usb/usbdrv/peripheral/public
+
diff -r 84c26be382f0 -r bbdce6bffaad usbdrv/peripheral/group/usbperipheral_shai.iby
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usbdrv/peripheral/group/usbperipheral_shai.iby	Wed Oct 20 12:04:53 2010 +0800
@@ -0,0 +1,27 @@
+/*
+* Copyright (c) 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"
+* 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:
+*
+*/
+
+#ifndef USBPERIPHERAL_SHAI_IBY
+#define USBPERIPHERAL_SHAI_IBY
+
+#ifdef BSW_USB_DEVICE
+extension[VARID]=KERNEL_DIR\BUILD_DIR\usbperipheralpil.dll  \Sys\Bin\usbperipheralpil.dll
+device[VARID]=KERNEL_DIR\BUILD_DIR\usbcshai.ldd  \sys\bin\eusbc.ldd
+device[VARID]=KERNEL_DIR\BUILD_DIR\usbcscshai.ldd  \sys\bin\eusbcsc.ldd
+#endif // BSW_USB_DEVICE
+
+#endif // USBPERIPHERAL_SHAI_IBY
diff -r 84c26be382f0 -r bbdce6bffaad usbdrv/peripheral/ldd/perildd/group/base_e32_drivers_usbcli.mrp
--- a/usbdrv/peripheral/ldd/perildd/group/base_e32_drivers_usbcli.mrp	Tue Oct 19 14:23:03 2010 +0800
+++ b/usbdrv/peripheral/ldd/perildd/group/base_e32_drivers_usbcli.mrp	Wed Oct 20 12:04:53 2010 +0800
@@ -1,16 +1,30 @@
-# component name "USB Client Driver"
-
+/*
+* Copyright (c) 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"
+* 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	base_e32_drivers_usbcli
 
 
-source	\sf\os\kernelhwsrv\kernel\eka\drivers\usbc
-source	\sf\os\kernelhwsrv\kernel\eka\drivers\usbcc
-source	\sf\os\kernelhwsrv\kernel\eka\drivers\usbcsc
+source	/sf/os/kernelhwsrv/kernel/eka/drivers/usbc
+source	/sf/os/kernelhwsrv/kernel/eka/drivers/usbcc
+source	/sf/os/kernelhwsrv/kernel/eka/drivers/usbcsc
 
-binary	\sf\os\kernelhwsrv\kernel\eka\drivers\usbc all
-exports	\sf\os\kernelhwsrv\kernel\eka\drivers\usbc
+binary	/sf/os/kernelhwsrv/kernel/eka/drivers/usbc all
+exports	/sf/os/kernelhwsrv/kernel/eka/drivers/usbc
 
-notes_source	\component_defs\release.src
+notes_source	/component_defs/release.src
 
 
 ipr E
diff -r 84c26be382f0 -r bbdce6bffaad usbdrv/peripheral/ldd/perildd/group/bld.inf
--- a/usbdrv/peripheral/ldd/perildd/group/bld.inf	Tue Oct 19 14:23:03 2010 +0800
+++ b/usbdrv/peripheral/ldd/perildd/group/bld.inf	Wed Oct 20 12:04:53 2010 +0800
@@ -1,20 +1,19 @@
-// Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of the License "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:
-// bld.inf
-// USB Client Driver
-// 
-//
+/*
+* Copyright (c) 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"
+* 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:
+*
+*/
 
 /**
  @file
diff -r 84c26be382f0 -r bbdce6bffaad usbdrv/peripheral/ldd/perildd/group/usbc.mmp
--- a/usbdrv/peripheral/ldd/perildd/group/usbc.mmp	Tue Oct 19 14:23:03 2010 +0800
+++ b/usbdrv/peripheral/ldd/perildd/group/usbc.mmp	Wed Oct 20 12:04:53 2010 +0800
@@ -1,19 +1,19 @@
-// Copyright (c) 1998-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of the License "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:
-// e32/drivers/usbc/usbc.mmp
-// 
-//
+/*
+* Copyright (c) 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"
+* 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 <kernel/kern_ext.mmh>
@@ -33,3 +33,4 @@
 uid             0 0x101F8928
 VENDORID        0x70000001
 capability        all
+SMPSAFE
\ No newline at end of file
diff -r 84c26be382f0 -r bbdce6bffaad usbdrv/peripheral/ldd/perildd/src/d_usbc.cpp
--- a/usbdrv/peripheral/ldd/perildd/src/d_usbc.cpp	Tue Oct 19 14:23:03 2010 +0800
+++ b/usbdrv/peripheral/ldd/perildd/src/d_usbc.cpp	Wed Oct 20 12:04:53 2010 +0800
@@ -1,21 +1,22 @@
-// Copyright (c) 2000-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of the License "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:
-// e32/drivers/usbc/d_usbc.cpp
-// LDD for USB Device driver stack:
-// The channel object.
-// 
-//
+/*
+* Copyright (c) 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"
+* 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:
+* e32/drivers/usbc/d_usbc.cpp
+* LDD for USB Device driver stack:
+* The channel object.
+*
+*/
 
 /**
  @file d_usbc.cpp
diff -r 84c26be382f0 -r bbdce6bffaad usbdrv/peripheral/ldd/perildd/src/usbdma.cpp
--- a/usbdrv/peripheral/ldd/perildd/src/usbdma.cpp	Tue Oct 19 14:23:03 2010 +0800
+++ b/usbdrv/peripheral/ldd/perildd/src/usbdma.cpp	Wed Oct 20 12:04:53 2010 +0800
@@ -1,21 +1,23 @@
-// Copyright (c) 2000-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of the License "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:
-// e32\drivers\usbc\usbdma.cpp
-// LDD for USB Device driver stack:
-// Management of DMA-capable data buffers.
-// 
-//
+/*
+* Copyright (c) 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"
+* 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:
+* e32\drivers\usbc\usbdma.cpp
+* LDD for USB Device driver stack:
+* Management of DMA-capable data buffers.
+*
+*/
+
 
 /**
  @file usbdma.cpp
diff -r 84c26be382f0 -r bbdce6bffaad usbdrv/peripheral/ldd/perilddsc/appifwrapper/group/bld.inf
--- a/usbdrv/peripheral/ldd/perilddsc/appifwrapper/group/bld.inf	Tue Oct 19 14:23:03 2010 +0800
+++ b/usbdrv/peripheral/ldd/perilddsc/appifwrapper/group/bld.inf	Wed Oct 20 12:04:53 2010 +0800
@@ -1,20 +1,19 @@
-// Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of the License "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:
-// bld.inf
-// USB Client Driver
-// 
-//
+/*
+* Copyright (c) 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"
+* 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:
+*
+*/
 
 /**
  @file
diff -r 84c26be382f0 -r bbdce6bffaad usbdrv/peripheral/ldd/perilddsc/appifwrapper/group/usbcsc_bil.mmp
--- a/usbdrv/peripheral/ldd/perilddsc/appifwrapper/group/usbcsc_bil.mmp	Tue Oct 19 14:23:03 2010 +0800
+++ b/usbdrv/peripheral/ldd/perilddsc/appifwrapper/group/usbcsc_bil.mmp	Wed Oct 20 12:04:53 2010 +0800
@@ -1,19 +1,19 @@
-// Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of the License "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:
-// e32/drivers/usbcsc/usbcsc_bil.mmp
-// 
-//
+/*
+* Copyright (c) 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"
+* 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:
+*
+*/
 USERINCLUDE    ../../include
 
 OS_LAYER_SYSTEMINCLUDE
@@ -29,3 +29,4 @@
 
 VENDORID        0x70000001
 capability        all
+SMPSAFE
\ No newline at end of file
diff -r 84c26be382f0 -r bbdce6bffaad usbdrv/peripheral/ldd/perilddsc/appifwrapper/src/usbcsc_bil.cpp
--- a/usbdrv/peripheral/ldd/perilddsc/appifwrapper/src/usbcsc_bil.cpp	Tue Oct 19 14:23:03 2010 +0800
+++ b/usbdrv/peripheral/ldd/perilddsc/appifwrapper/src/usbcsc_bil.cpp	Wed Oct 20 12:04:53 2010 +0800
@@ -1,19 +1,20 @@
-// Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of the License "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:
-// e32\drivers\usbcsc\usbcsc_bil.cpp
-// 
-//
+/*
+* Copyright (c) 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"
+* 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:
+* e32\drivers\usbcsc\usbcsc_bil.cpp
+*
+*/
 
 #include <e32std.h>
 #include <e32std_private.h>
diff -r 84c26be382f0 -r bbdce6bffaad usbdrv/peripheral/ldd/perilddsc/group/bld.inf
--- a/usbdrv/peripheral/ldd/perilddsc/group/bld.inf	Tue Oct 19 14:23:03 2010 +0800
+++ b/usbdrv/peripheral/ldd/perilddsc/group/bld.inf	Wed Oct 20 12:04:53 2010 +0800
@@ -1,20 +1,19 @@
-// Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of the License "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:
-// bld.inf
-// USB Client Driver
-// 
-//
+/*
+* Copyright (c) 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"
+* 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:
+*
+*/
 
 /**
  @file
diff -r 84c26be382f0 -r bbdce6bffaad usbdrv/peripheral/ldd/perilddsc/group/usbcsc.mmp
--- a/usbdrv/peripheral/ldd/perilddsc/group/usbcsc.mmp	Tue Oct 19 14:23:03 2010 +0800
+++ b/usbdrv/peripheral/ldd/perilddsc/group/usbcsc.mmp	Wed Oct 20 12:04:53 2010 +0800
@@ -1,19 +1,19 @@
-// Copyright (c) 1998-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of the License "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:
-// e32/drivers/usbcsc/usbcsc.mmp
-// 
-//
+/*
+* Copyright (c) 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"
+* 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 <kernel/kern_ext.mmh>
 
 
@@ -30,3 +30,4 @@
 uid             0 0x101F8928
 VENDORID        0x70000001
 capability        all
+SMPSAFE
\ No newline at end of file
diff -r 84c26be382f0 -r bbdce6bffaad usbdrv/peripheral/ldd/perilddsc/src/d_usbcsc.cpp
--- a/usbdrv/peripheral/ldd/perilddsc/src/d_usbcsc.cpp	Tue Oct 19 14:23:03 2010 +0800
+++ b/usbdrv/peripheral/ldd/perilddsc/src/d_usbcsc.cpp	Wed Oct 20 12:04:53 2010 +0800
@@ -1,21 +1,22 @@
-// Copyright (c) 2000-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of the License "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:
-// e32\drivers\usbcsc\d_usbcsc.cpp
-// LDD for USB Device driver stack, using shared chunks:
-// The channel object.
-// 
-//
+/*
+* Copyright (c) 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"
+* 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:
+* e32\drivers\usbcsc\d_usbcsc.cpp
+* LDD for USB Device driver stack, using shared chunks:
+* The channel object.
+*
+*/
 
 /**
  @file d_usbcsc.cpp
diff -r 84c26be382f0 -r bbdce6bffaad usbdrv/peripheral/pdd/pil/group/bld.inf
--- a/usbdrv/peripheral/pdd/pil/group/bld.inf	Tue Oct 19 14:23:03 2010 +0800
+++ b/usbdrv/peripheral/pdd/pil/group/bld.inf	Wed Oct 20 12:04:53 2010 +0800
@@ -1,16 +1,18 @@
 /*
-  Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies). 
-  All rights reserved.
-
-  This program and the accompanying materials are made available 
-  under the terms of the Eclipse Public License v1.0 which accompanies 
-  this distribution, and is available at 
-  http://www.eclipse.org/legal/epl-v10.html
-
-  Initial Contributors:
-  Nokia Corporation - initial contribution.
-
-  Contributors:
+* Copyright (c) 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"
+* 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 <platform_paths.hrh>
 
diff -r 84c26be382f0 -r bbdce6bffaad usbdrv/peripheral/pdd/pil/group/usbperipheralpil.mmp
--- a/usbdrv/peripheral/pdd/pil/group/usbperipheralpil.mmp	Tue Oct 19 14:23:03 2010 +0800
+++ b/usbdrv/peripheral/pdd/pil/group/usbperipheralpil.mmp	Wed Oct 20 12:04:53 2010 +0800
@@ -1,16 +1,18 @@
 /*
-  Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies). 
-  All rights reserved.
-
-  This program and the accompanying materials are made available 
-  under the terms of the Eclipse Public License v1.0 which accompanies 
-  this distribution, and is available at 
-  http://www.eclipse.org/legal/epl-v10.html
-
-  Initial Contributors:
-  Nokia Corporation - initial contribution.
-
-  Contributors:
+* Copyright (c) 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"
+* 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 <platform_paths.hrh>
@@ -43,3 +45,4 @@
 source       ps_usbc.cpp
 source       queue.cpp
 source       controltransfersm.cpp
+SMPSAFE
\ No newline at end of file
diff -r 84c26be382f0 -r bbdce6bffaad usbdrv/peripheral/pdd/pil/inc/controltransfersm.h
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usbdrv/peripheral/pdd/pil/inc/controltransfersm.h	Wed Oct 20 12:04:53 2010 +0800
@@ -0,0 +1,292 @@
+/*
+* Copyright (c) 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"
+* 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:
+*
+*/
+
+// Control transfer state machine.
+// Generally used for Endpoint zero.
+
+#ifndef CONTROLTRANSFER_SM_H
+#define CONTROLTRANSFER_SM_H
+
+#include <e32def.h>                     // General types definition
+#include <usb/usb_peripheral_shai.h>    // Peripheral SHAI Header
+#include <usb/usb.h>                    // Usb const
+
+#include <usb/usbcontrolxferif.h>
+
+// Forward class declaration
+class TControlStageSm;
+
+// Refer usb setup packet definition
+const TUint8 KUSB_SETUPKT_DATA_DIR_MASK = 0x80;
+const TUint8 KUSB_SETUPKT_REQ_TYPE_VENDOR_MASK = 0x40;
+const TUint8 KUSB_SETUPKT_REQ_TYPE_CLASS_MASK = 0x20;
+const TUint8 KUSB_SETUPKT_REQ_TYPE_STANDARD_MASK = 0x60;
+
+/** 
+ * TUsbPeripheralSetup
+ * @brief  A USB Setup packet's structure.
+ * @see ProcessSetConfiguration(const TUsbPeripheralSetup&)
+ *
+ */
+struct TUsbcSetup
+    {
+    /** bmRequestType */
+    TUint8 iRequestType;
+    
+    /** bRequest */
+    TUint8 iRequest;
+    
+    /** wValue */
+    TUint16 iValue;
+    
+    /** wIndex */
+    TUint16 iIndex;
+    
+    /** wLength */
+    TUint16 iLength;
+    };
+
+/** Valid request catogary that a client(PIL or App) can request
+ *  via this state machine
+ */
+enum TControlTransferRequest
+    {
+    // Write . Data IN . From Device to Host
+    TControlTransferRequestWrite,
+
+    // Read . Data OUT . From Host to Device
+    TControlTransferRequestRead,
+
+    // Zero bytes status, Write . Status IN
+    // Status from Device to Host
+    TControlTransferRequestSendStatus
+    
+    // Status from Host to device will be ignored
+    };
+
+// Data dir as spec defined
+enum TUsbDataDir
+    {        
+    EUsbDataDir_ToDevice,
+    EUsbDataDir_ToHost
+    };
+
+// Request catogary from Host to device as spec defined
+enum TUsbRequestType
+    {
+    EUsbStandardRequest,
+    EUsbClassRequest,
+    EUsbVendorRequest
+    };
+
+// Target of the request(from host to device)
+enum TUsbRequestTarget
+    {
+    EUsbRequestTargetToDevice,
+    EUsbRequestTargetToInterface,
+    EUsbRequestTargetToEndpoint,
+    EUsbRequestTargetToElement
+    };
+
+typedef TUint8  TUsbRequest;
+
+/** Helper function which can parse a setup packet 
+ *  and explain it as what's spec required
+ */
+NONSHARABLE_CLASS(TSetupPkgParser)
+    {
+    public:
+        TSetupPkgParser();
+        // Set the setup buffer
+        // this class does't hold this buffer, it do a bitwise copy
+        // assumed length is 8 bytes
+        static void Set(const TUint8* aSetupBuf);
+        
+        // Get what the next stage following the received setup
+        // packet
+        static UsbShai::TControlStage NextStage();
+                
+        static TUsbDataDir DataDirection();
+
+        static TBool IsVendorRequest();
+        static TBool IsClassRequest(); 
+        static TBool IsStandardRequest();
+         
+        static TUsbRequest Request();        
+        static TUint16 Value();
+        static TUint16 Index();
+        
+        // data length if there is a data packet(in/out) follows
+        // data length will be modified during a transfer
+        static TUint16 DataLength();
+        
+        static TUsbcSetup& SetupPacket();
+        
+    private:
+        static TUsbcSetup iSetupPkt;
+    };
+
+
+// State machine manager
+// 
+NONSHARABLE_CLASS(DControlTransferManager)
+    {
+    friend class TControlStageSm;
+    
+    public:
+        DControlTransferManager(MControlTransferIf& aPktProcessor);
+        
+        // PSL will complete to PIL directly, in our cases, PIL will delegate to us via this interface
+        void Ep0RequestComplete(TUint8* aBuf, TInt aSize, TInt aError, UsbShai::TControlPacketType aPktType);
+        
+        // Add a new state processor
+        void AddState(UsbShai::TControlStage aStage, TControlStageSm& aStageSm);
+        
+    public:
+        // Helper inline function
+        MControlTransferIf& CtrTransferIf();
+        TSetupPkgParser& PktParser();
+        
+    public:
+        // EP0 Access interface
+        // They are the same as it shows in SHAI header
+        // so, PIL code can delegate those task to us, we will perform a series of checking
+        // depending on which state we are in, if each condition meet, we will callback via
+        // interface MControlTransferIf to perform the real work.
+        TInt SetupEndpointZeroRead();
+        TInt SetupEndpointZeroWrite(const TUint8* aBuffer, TInt aLength, TBool aZlpReqd=EFalse);
+        TInt SendEp0ZeroByteStatusPacket();
+        TInt StallEndpoint(TInt aRealEndpoint);
+        void Ep0SetupPacketProceed();
+        void Ep0DataPacketProceed();
+    
+        // Reset state machine.
+        void Reset();      
+        
+        // Data received for data out stage
+        void DataReceived(TUint16 aCount);
+        TBool IsMoreBytesNeeded();
+        
+    private:
+        // State machines for each stage
+        TControlStageSm* iState[UsbShai::EControlTransferStageMax];
+        // Current stage 
+        UsbShai::TControlStage iCurrentStage;        
+        TSetupPkgParser iPacketParser;
+        
+        MControlTransferIf& iCtrTransferIf;
+        
+        TBool iReadPending; 
+        
+        TUint16 iDataTransfered;        
+    };
+
+// Base class of state machine
+NONSHARABLE_CLASS(TControlStageSm)
+    {
+    public:
+
+        /** PSL --Ep0RequestComplete()--> PIL --Ep0RequestComplete()---------> 
+         *                                                                    |
+         *  (ProcessXXX)PIL <-- RequestComplete()<--DControlTransferManager <-
+         *                                                                     
+         *  @param  aPktSize the size of the packet recieved
+         *          aError error code if something wrong
+         *          aPktType one of the packet type specified in UsbShai::TControlPacketType
+         *  
+         *  @return ETrue if the packet need to be further processed
+         *          EFalse if the packet was consumed
+         */
+        virtual TBool RequestComplete(TInt aPktSize, TInt aError, UsbShai::TControlPacketType aPktType) = 0;
+        
+        /** Query whether a kind of operation is allowed in specified state
+         *   
+         *  @param  aRequest the request to be queried
+         *  
+         *  @return ETrue is the operation is allowed
+         *          EFalse if not
+         */
+        virtual TBool IsRequstAllowed(TControlTransferRequest aRequest) = 0;
+        
+        TControlStageSm(DControlTransferManager& aTransferMgr);           
+        
+    protected:
+        // change state of SM in iTransferMgr
+        void ChangeToStage(UsbShai::TControlStage aToStage);
+        
+        // Clear ReadPending in ControlTransferMgr so that it won't
+        // block any further read operation
+        void ClearPendingRead();
+        
+    protected:        
+        DControlTransferManager& iTransferMgr;
+    };
+
+// Concreate state class
+// State of "Setup", used to wait for a setup packet
+// it will ignore all non-setup-packet
+NONSHARABLE_CLASS(DSetupStageSm) : public TControlStageSm
+    {
+    public:
+        DSetupStageSm(DControlTransferManager& aTransferMgr);
+        
+        TBool RequestComplete(TInt aPktSize, TInt aError, UsbShai::TControlPacketType aPktType);
+        TBool IsRequstAllowed(TControlTransferRequest aRequest);
+    };
+
+// State used to wait for user to write something to host
+// The write is supposed to be done in one shot
+NONSHARABLE_CLASS(DDataInStageSm) : public TControlStageSm
+    {
+    public:
+        DDataInStageSm(DControlTransferManager& aTransferMgr);
+        
+        TBool RequestComplete(TInt aPktSize, TInt aError, UsbShai::TControlPacketType aPktType);
+        TBool IsRequstAllowed(TControlTransferRequest aRequest);
+    };
+
+// State used to wait some data from Host
+NONSHARABLE_CLASS(DDataOutStageSm) : public TControlStageSm
+    {
+    public:
+        DDataOutStageSm(DControlTransferManager& aTransferMgr);
+        
+        TBool RequestComplete(TInt aPktSize, TInt aError, UsbShai::TControlPacketType aPktType);
+        TBool IsRequstAllowed(TControlTransferRequest aRequest);
+    };
+
+NONSHARABLE_CLASS(DStatusInStageSm) : public TControlStageSm
+    {
+    public:
+        DStatusInStageSm(DControlTransferManager& aTransferMgr);
+        
+        TBool RequestComplete(TInt aPktSize, TInt aError, UsbShai::TControlPacketType aPktType);
+        TBool IsRequstAllowed(TControlTransferRequest aRequest);
+    };
+
+NONSHARABLE_CLASS(DStatusOutStageSm) : public TControlStageSm
+    {
+    public:
+        DStatusOutStageSm(DControlTransferManager& aTransferMgr);
+        
+        TBool RequestComplete(TInt aPktSize, TInt aError, UsbShai::TControlPacketType aPktType);
+        TBool IsRequstAllowed(TControlTransferRequest aRequest);
+    };
+
+#include "controltransfersm.inl"
+
+#endif //CONTROLTRANSFER_SM_H
diff -r 84c26be382f0 -r bbdce6bffaad usbdrv/peripheral/pdd/pil/inc/controltransfersm.inl
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usbdrv/peripheral/pdd/pil/inc/controltransfersm.inl	Wed Oct 20 12:04:53 2010 +0800
@@ -0,0 +1,90 @@
+/*
+* Copyright (c) 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"
+* 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:
+*
+*/
+
+#ifndef CONTROLTRANSFERSM_INL
+#define CONTROLTRANSFERSM_INL
+
+inline MControlTransferIf& DControlTransferManager::CtrTransferIf() 
+    { 
+    return iCtrTransferIf; 
+    }
+    
+inline TSetupPkgParser& DControlTransferManager::PktParser() 
+    { 
+    return iPacketParser; 
+    }
+
+inline void DControlTransferManager::DataReceived(TUint16 aCount)
+    {
+    iDataTransfered += aCount;
+    }
+    
+inline TBool DControlTransferManager::IsMoreBytesNeeded()
+    {
+    return (iDataTransfered >= iPacketParser.DataLength())?EFalse:ETrue;
+    }
+    
+inline TUsbDataDir TSetupPkgParser::DataDirection()
+    {
+    return (iSetupPkt.iRequestType & KUSB_SETUPKT_DATA_DIR_MASK) ? 
+                                    EUsbDataDir_ToHost : EUsbDataDir_ToDevice;
+    }
+    
+inline TBool TSetupPkgParser::IsVendorRequest()
+    {
+    return (iSetupPkt.iRequestType & KUSB_SETUPKT_REQ_TYPE_VENDOR_MASK) ? ETrue : EFalse;
+    }
+   
+inline TBool TSetupPkgParser::IsClassRequest()
+    {
+    return (iSetupPkt.iRequestType & KUSB_SETUPKT_REQ_TYPE_CLASS_MASK) ? ETrue : EFalse;
+    }
+    
+inline TBool TSetupPkgParser::IsStandardRequest()
+    {
+    return (iSetupPkt.iRequestType & KUSB_SETUPKT_REQ_TYPE_STANDARD_MASK == 0)? ETrue : EFalse;
+    }
+    
+inline TUsbRequest TSetupPkgParser::Request()
+    {
+    return iSetupPkt.iRequestType;
+    }
+    
+inline TUint16 TSetupPkgParser::Value()
+    {
+    return iSetupPkt.iValue;
+    }
+    
+inline TUint16 TSetupPkgParser::Index()
+    {
+    return iSetupPkt.iIndex;
+    }
+    
+inline TUint16 TSetupPkgParser::DataLength()
+    {     
+    return iSetupPkt.iLength;
+    }
+    
+inline TUsbcSetup& TSetupPkgParser::SetupPacket()
+    {
+    return iSetupPkt;
+    } 
+    
+#endif //CONTROLTRANSFERSM_INL
+
+// End of file
+
diff -r 84c26be382f0 -r bbdce6bffaad usbdrv/peripheral/pdd/pil/src/chapter9.cpp
--- a/usbdrv/peripheral/pdd/pil/src/chapter9.cpp	Tue Oct 19 14:23:03 2010 +0800
+++ b/usbdrv/peripheral/pdd/pil/src/chapter9.cpp	Wed Oct 20 12:04:53 2010 +0800
@@ -1,21 +1,22 @@
-// Copyright (c) 2000-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of the License "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:
-// e32/drivers/usbcc/chapter9.cpp
-// Platform independent layer (PIL) of the USB Device controller driver:
-// Processing of USB spec chapter 9 standard requests.
-// 
-//
+/*
+* Copyright (c) 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"
+* 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:
+* e32/drivers/usbcc/chapter9.cpp
+* Platform independent layer (PIL) of the USB Device controller driver:
+* Processing of USB spec chapter 9 standard requests.
+*
+*/
 
 /**
  @file chapter9.cpp
diff -r 84c26be382f0 -r bbdce6bffaad usbdrv/peripheral/pdd/pil/src/controltransfersm.cpp
--- a/usbdrv/peripheral/pdd/pil/src/controltransfersm.cpp	Tue Oct 19 14:23:03 2010 +0800
+++ b/usbdrv/peripheral/pdd/pil/src/controltransfersm.cpp	Wed Oct 20 12:04:53 2010 +0800
@@ -1,16 +1,18 @@
 /*
-  Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies). 
-  All rights reserved.
-
-  This program and the accompanying materials are made available 
-  under the terms of the Eclipse Public License v1.0 which accompanies 
-  this distribution, and is available at 
-  http://www.eclipse.org/legal/epl-v10.html
-
-  Initial Contributors:
-  Nokia Corporation - initial contribution.
-
-  Contributors:
+* Copyright (c) 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"
+* 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 "controltransfersm.h"
diff -r 84c26be382f0 -r bbdce6bffaad usbdrv/peripheral/pdd/pil/src/descriptors.cpp
--- a/usbdrv/peripheral/pdd/pil/src/descriptors.cpp	Tue Oct 19 14:23:03 2010 +0800
+++ b/usbdrv/peripheral/pdd/pil/src/descriptors.cpp	Wed Oct 20 12:04:53 2010 +0800
@@ -1,21 +1,22 @@
-// Copyright (c) 2000-2010 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of the License "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:
-// e32/drivers/usbcc/descriptors.cpp
-// Platform independent layer (PIL) of the USB Device controller driver:
-// USB descriptor handling and management.
-// 
-//
+/*
+* Copyright (c) 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"
+* 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:
+* e32/drivers/usbcc/descriptors.cpp
+* Platform independent layer (PIL) of the USB Device controller driver:
+* USB descriptor handling and management.
+*
+*/
 
 /**
  @file descriptors.cpp
diff -r 84c26be382f0 -r bbdce6bffaad usbdrv/peripheral/pdd/pil/src/misc.cpp
--- a/usbdrv/peripheral/pdd/pil/src/misc.cpp	Tue Oct 19 14:23:03 2010 +0800
+++ b/usbdrv/peripheral/pdd/pil/src/misc.cpp	Wed Oct 20 12:04:53 2010 +0800
@@ -1,21 +1,22 @@
-// Copyright (c) 2000-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of the License "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:
-// e32/drivers/usbcc/misc.cpp
-// Platform independent layer (PIL) of the USB Device controller driver:
-// Implementations of misc. classes defined in usbc.h.
-// 
-//
+/*
+* Copyright (c) 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"
+* 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:
+* e32/drivers/usbcc/misc.cpp
+* Platform independent layer (PIL) of the USB Device controller driver:
+* Implementations of misc. classes defined in usbc.h.
+*
+*/
 
 /**
  @file misc.cpp
diff -r 84c26be382f0 -r bbdce6bffaad usbdrv/peripheral/pdd/pil/src/ps_usbc.cpp
--- a/usbdrv/peripheral/pdd/pil/src/ps_usbc.cpp	Tue Oct 19 14:23:03 2010 +0800
+++ b/usbdrv/peripheral/pdd/pil/src/ps_usbc.cpp	Wed Oct 20 12:04:53 2010 +0800
@@ -1,21 +1,22 @@
-// Copyright (c) 2000-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of the License "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:
-// e32/drivers/usbcc/ps_usbc.cpp
-// Platform independent layer (PIL) of the USB Device controller driver (PDD).
-// Interface to the USB LDD.
-// 
-//
+/*
+* Copyright (c) 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"
+* 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:
+* e32/drivers/usbcc/ps_usbc.cpp
+* Platform independent layer (PIL) of the USB Device controller driver (PDD).
+* Interface to the USB LDD.
+*
+*/
 
 /**
  @file ps_usbc.cpp
diff -r 84c26be382f0 -r bbdce6bffaad usbdrv/peripheral/pdd/pil/src/queue.cpp
--- a/usbdrv/peripheral/pdd/pil/src/queue.cpp	Tue Oct 19 14:23:03 2010 +0800
+++ b/usbdrv/peripheral/pdd/pil/src/queue.cpp	Wed Oct 20 12:04:53 2010 +0800
@@ -1,21 +1,22 @@
-// Copyright (c) 2002-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of the License "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:
-// e32\drivers\usbcc\queue.cpp
-// Platform independent layer (PIL) of the USB Device controller driver:
-// Simple singly linked list + its iterator.
-// 
-//
+/*
+* Copyright (c) 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"
+* 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:
+* e32\drivers\usbcc\queue.cpp
+* Platform independent layer (PIL) of the USB Device controller driver:
+* Simple singly linked list + its iterator.
+*
+*/
 
 /**
  @file queue.cpp
diff -r 84c26be382f0 -r bbdce6bffaad usbdrv/peripheral/public/d32usbc.h
--- a/usbdrv/peripheral/public/d32usbc.h	Tue Oct 19 14:23:03 2010 +0800
+++ b/usbdrv/peripheral/public/d32usbc.h	Wed Oct 20 12:04:53 2010 +0800
@@ -1,20 +1,21 @@
-// Copyright (c) 1995-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of the License "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:
-// e32/include/d32usbc.h
-// User side class definitions for USB Device support.
-// 
-//
+/*
+* Copyright (c) 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"
+* 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:
+* e32/include/d32usbc.h
+* User side class definitions for USB Device support.
+*
+*/
 
 /**
  @file d32usbc.h
diff -r 84c26be382f0 -r bbdce6bffaad usbdrv/peripheral/public/d32usbc.inl
--- a/usbdrv/peripheral/public/d32usbc.inl	Tue Oct 19 14:23:03 2010 +0800
+++ b/usbdrv/peripheral/public/d32usbc.inl	Wed Oct 20 12:04:53 2010 +0800
@@ -1,20 +1,21 @@
-// Copyright (c) 1995-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of the License "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:
-// e32/include/d32usbc.inl
-// User side class definitions for USB Device support (inline header).
-// 
-//
+/*
+* Copyright (c) 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"
+* 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:
+* e32/include/d32usbc.inl
+* User side class definitions for USB Device support (inline header).
+*
+*/
 
 /**
  @file d32usbc.inl
diff -r 84c26be382f0 -r bbdce6bffaad usbdrv/peripheral/public/d32usbcsc.h
--- a/usbdrv/peripheral/public/d32usbcsc.h	Tue Oct 19 14:23:03 2010 +0800
+++ b/usbdrv/peripheral/public/d32usbcsc.h	Wed Oct 20 12:04:53 2010 +0800
@@ -1,20 +1,21 @@
-// Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of the License "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:
-// e32\include\d32usbcsc.h
-// User side class definitions for USB Device support.
-// 
-//
+/*
+* Copyright (c) 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"
+* 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:
+* e32\include\d32usbcsc.h
+* User side class definitions for USB Device support.
+*
+*/
 
 /**
  @file d32usbcsc.h
diff -r 84c26be382f0 -r bbdce6bffaad usbdrv/peripheral/public/d32usbcsc.inl
--- a/usbdrv/peripheral/public/d32usbcsc.inl	Tue Oct 19 14:23:03 2010 +0800
+++ b/usbdrv/peripheral/public/d32usbcsc.inl	Wed Oct 20 12:04:53 2010 +0800
@@ -1,20 +1,21 @@
-// Copyright (c) 1995-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of the License "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:
-// e32\include\d32usbcsc.inl
-// User side class definitions for USB Device support (inline header).
-// 
-//
+/*
+* Copyright (c) 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"
+* 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:
+* e32\include\d32usbcsc.inl
+* User side class definitions for USB Device support (inline header).
+*
+*/
 
 /** @file d32usbcsc.inl
 	@publishedPartner
diff -r 84c26be382f0 -r bbdce6bffaad usbdrv/peripheral/public/d32usbcshared.h
--- a/usbdrv/peripheral/public/d32usbcshared.h	Tue Oct 19 14:23:03 2010 +0800
+++ b/usbdrv/peripheral/public/d32usbcshared.h	Wed Oct 20 12:04:53 2010 +0800
@@ -1,20 +1,21 @@
-// Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of the License "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:
-// e32/include/d32usbcshared.h
-// User side class definitions for USB Device support.
-// 
-//
+/*
+* Copyright (c) 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"
+* 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:
+* e32/include/d32usbcshared.h
+* User side class definitions for USB Device support.
+*
+*/
 
 /**
  @file d32usbcshared.h
diff -r 84c26be382f0 -r bbdce6bffaad usbdrv/peripheral/public/d32usbcshared.inl
--- a/usbdrv/peripheral/public/d32usbcshared.inl	Tue Oct 19 14:23:03 2010 +0800
+++ b/usbdrv/peripheral/public/d32usbcshared.inl	Wed Oct 20 12:04:53 2010 +0800
@@ -1,20 +1,21 @@
-// Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of the License "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:
-// e32/include/d32usbcshared.inl
-// User side class definitions for USB Device support.
-// 
-//
+/*
+* Copyright (c) 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"
+* 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:
+* e32/include/d32usbcshared.inl
+* User side class definitions for USB Device support.
+*
+*/
 
 /**
  @file d32usbcshared.inl
diff -r 84c26be382f0 -r bbdce6bffaad usbdrv/peripheral/public/d32usbdescriptors.h
--- a/usbdrv/peripheral/public/d32usbdescriptors.h	Tue Oct 19 14:23:03 2010 +0800
+++ b/usbdrv/peripheral/public/d32usbdescriptors.h	Wed Oct 20 12:04:53 2010 +0800
@@ -1,17 +1,19 @@
-// 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 the License "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:
-//
+/*
+* Copyright (c) 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"
+* 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:
+*
+*/
 
 #ifndef D32USBDESCRIPTORS_H
 #define D32USBDESCRIPTORS_H
diff -r 84c26be382f0 -r bbdce6bffaad usbdrv/peripheral/public/d32usbtransfers.h
--- a/usbdrv/peripheral/public/d32usbtransfers.h	Tue Oct 19 14:23:03 2010 +0800
+++ b/usbdrv/peripheral/public/d32usbtransfers.h	Wed Oct 20 12:04:53 2010 +0800
@@ -1,17 +1,19 @@
-// Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of the License "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:
-//
+/*
+* Copyright (c) 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"
+* 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:
+*
+*/
 
 #ifndef __D32USBTRANSFERS_H
 #define __D32USBTRANSFERS_H
diff -r 84c26be382f0 -r bbdce6bffaad usbdrv/peripheral/public/usb.h
--- a/usbdrv/peripheral/public/usb.h	Tue Oct 19 14:23:03 2010 +0800
+++ b/usbdrv/peripheral/public/usb.h	Wed Oct 20 12:04:53 2010 +0800
@@ -1,20 +1,21 @@
-// Copyright (c) 2002-2010 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of the License "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:
-// e32\include\usb.h
-// Definitions of USB-specific constants and macros.
-// 
-//
+/*
+* Copyright (c) 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"
+* 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:
+* e32\include\usb.h
+* Definitions of USB-specific constants and macros.
+*
+*/
 
 /**
  @file usb.h
diff -r 84c26be382f0 -r bbdce6bffaad usbdrv/peripheral/public/usbc.h
--- a/usbdrv/peripheral/public/usbc.h	Tue Oct 19 14:23:03 2010 +0800
+++ b/usbdrv/peripheral/public/usbc.h	Wed Oct 20 12:04:53 2010 +0800
@@ -1,20 +1,21 @@
-// Copyright (c) 2000-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of the License "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:
-// e32/include/drivers/usbc.h
-// Kernel side definitions for the USB Device driver stack (PIL + LDD).
-// 
-//
+/*
+* Copyright (c) 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"
+* 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:
+* e32/include/drivers/usbc.h
+* Kernel side definitions for the USB Device driver stack (PIL + LDD).
+*
+*/
 
 /**
  @file usbc.h
diff -r 84c26be382f0 -r bbdce6bffaad usbdrv/peripheral/public/usbc.inl
--- a/usbdrv/peripheral/public/usbc.inl	Tue Oct 19 14:23:03 2010 +0800
+++ b/usbdrv/peripheral/public/usbc.inl	Wed Oct 20 12:04:53 2010 +0800
@@ -1,20 +1,21 @@
-// Copyright (c) 1996-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of the License "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:
-// e32\include\drivers\usbc.inl
-// Kernel side inline header file for USB device driver.
-// 
-//
+/*
+* Copyright (c) 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"
+* 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:
+* e32\include\drivers\usbc.inl
+* Kernel side inline header file for USB device driver.
+*
+*/
 
 /**
  @file usbc.inl
diff -r 84c26be382f0 -r bbdce6bffaad usbdrv/peripheral/public/usbcdesc.h
--- a/usbdrv/peripheral/public/usbcdesc.h	Tue Oct 19 14:23:03 2010 +0800
+++ b/usbdrv/peripheral/public/usbcdesc.h	Wed Oct 20 12:04:53 2010 +0800
@@ -1,20 +1,21 @@
-// Copyright (c) 2002-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of the License "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:
-// e32/include/drivers/usbcdesc.h
-// USB descriptors and their management.
-// 
-//
+/*
+* Copyright (c) 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"
+* 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:
+* e32/include/drivers/usbcdesc.h
+* USB descriptors and their management.
+*
+*/
 
 /**
  @file usbcdesc.h
diff -r 84c26be382f0 -r bbdce6bffaad usbdrv/peripheral/public/usbcontrolxferif.h
--- a/usbdrv/peripheral/public/usbcontrolxferif.h	Tue Oct 19 14:23:03 2010 +0800
+++ b/usbdrv/peripheral/public/usbcontrolxferif.h	Wed Oct 20 12:04:53 2010 +0800
@@ -1,16 +1,18 @@
 /*
-  Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies). 
-  All rights reserved.
-
-  This program and the accompanying materials are made available 
-  under the terms of the Eclipse Public License v1.0 which accompanies 
-  this distribution, and is available at 
-  http://www.eclipse.org/legal/epl-v10.html
-
-  Initial Contributors:
-  Nokia Corporation - initial contribution.
-
-  Contributors:
+* Copyright (c) 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"
+* 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:
+*
 */
 
 #ifndef USBCONTROLXFERIF_H
diff -r 84c26be382f0 -r bbdce6bffaad usbdrv/peripheral/public/usbcque.h
--- a/usbdrv/peripheral/public/usbcque.h	Tue Oct 19 14:23:03 2010 +0800
+++ b/usbdrv/peripheral/public/usbcque.h	Wed Oct 20 12:04:53 2010 +0800
@@ -1,21 +1,21 @@
-// Copyright (c) 2002-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of the License "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:
-// e32\include\drivers\usbcque.h
-// Simple singly linked list + its iterator for the USB Device driver.
-// 
-//
-
+/*
+* Copyright (c) 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"
+* 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:
+* e32\include\drivers\usbcque.h
+* Simple singly linked list + its iterator for the USB Device driver.
+*
+*/
 /**
  @file usbcque.h
  @internalTechnology
diff -r 84c26be382f0 -r bbdce6bffaad usbdrv/peripheral/public/usbcsc.h
--- a/usbdrv/peripheral/public/usbcsc.h	Tue Oct 19 14:23:03 2010 +0800
+++ b/usbdrv/peripheral/public/usbcsc.h	Wed Oct 20 12:04:53 2010 +0800
@@ -1,20 +1,21 @@
-// Copyright (c) 2000-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of the License "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:
-// e32\include\drivers\usbcsc.h
-// Kernel side definitions for the USB Device driver stack (PIL + LDD).
-// 
-//
+/*
+* Copyright (c) 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"
+* 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:
+* e32\include\drivers\usbcsc.h
+* Kernel side definitions for the USB Device driver stack (PIL + LDD).
+*
+*/
 
 /**
  @file usbcsc.h
diff -r 84c26be382f0 -r bbdce6bffaad usbdrv/peripheral/public/usbcsc.inl
--- a/usbdrv/peripheral/public/usbcsc.inl	Tue Oct 19 14:23:03 2010 +0800
+++ b/usbdrv/peripheral/public/usbcsc.inl	Wed Oct 20 12:04:53 2010 +0800
@@ -1,20 +1,21 @@
-// Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of the License "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:
-// e32\include\drivers\usbcsc.inl
-// Kernel side inline header file for USB device driver.
-// 
-//
+/*
+* Copyright (c) 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"
+* 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:
+* e32\include\drivers\usbcsc.inl
+* Kernel side inline header file for USB device driver.
+*
+*/
 
 /**
  @file usbcsc.inl
diff -r 84c26be382f0 -r bbdce6bffaad usbdrv/peripheral/public/usbcshared.h
--- a/usbdrv/peripheral/public/usbcshared.h	Tue Oct 19 14:23:03 2010 +0800
+++ b/usbdrv/peripheral/public/usbcshared.h	Wed Oct 20 12:04:53 2010 +0800
@@ -1,20 +1,21 @@
-// Copyright (c) 2000-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of the License "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:
-// e32\include\drivers\usbcshared.h
-// Kernel side definitions for the USB Device driver stack (PIL + LDD).
-// 
-//
+/*
+* Copyright (c) 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"
+* 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:
+* e32\include\drivers\usbcshared.h
+* Kernel side definitions for the USB Device driver stack (PIL + LDD).
+*
+*/
 
 /**
  @file usbcshared.h
diff -r 84c26be382f0 -r bbdce6bffaad usbdrv/peripheral/public/usbcshared.inl
--- a/usbdrv/peripheral/public/usbcshared.inl	Tue Oct 19 14:23:03 2010 +0800
+++ b/usbdrv/peripheral/public/usbcshared.inl	Wed Oct 20 12:04:53 2010 +0800
@@ -1,20 +1,21 @@
-// Copyright (c) 2000-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of the License "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:
-// e32\include\drivers\usbcshared.inl
-// Kernel side definitions for the USB Device driver stack (PIL + LDD).
-// 
-//
+/*
+* Copyright (c) 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"
+* 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:
+* e32\include\drivers\usbcshared.inl
+* Kernel side definitions for the USB Device driver stack (PIL + LDD).
+*
+*/
 
 /**
  @file usbcshared.inl
diff -r 84c26be382f0 -r bbdce6bffaad usbdrv/peripheral/public/usbotgperipheralcontrolif.h
--- a/usbdrv/peripheral/public/usbotgperipheralcontrolif.h	Tue Oct 19 14:23:03 2010 +0800
+++ b/usbdrv/peripheral/public/usbotgperipheralcontrolif.h	Wed Oct 20 12:04:53 2010 +0800
@@ -1,20 +1,21 @@
-// Copyright (c) 2000-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of the License "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:
-// e32\include\drivers\usbcshared.h
-// Kernel side definitions for the USB Device driver stack (PIL + LDD).
-// 
-//
+/*
+* Copyright (c) 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"
+* 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:
+* e32\include\drivers\usbcshared.h
+* Kernel side definitions for the USB Device driver stack (PIL + LDD).
+*
+*/
 
 /**
  @file usbotgperipheralcontrolif.h
diff -r 84c26be382f0 -r bbdce6bffaad usbmgmt/usbmgr/conf/usbmanager.confml
Binary file usbmgmt/usbmgr/conf/usbmanager.confml has changed
diff -r 84c26be382f0 -r bbdce6bffaad usbmgmt/usbmgr/device/classcontroller/group/UsbClassController.mmp
--- a/usbmgmt/usbmgr/device/classcontroller/group/UsbClassController.mmp	Tue Oct 19 14:23:03 2010 +0800
+++ b/usbmgmt/usbmgr/device/classcontroller/group/UsbClassController.mmp	Wed Oct 20 12:04:53 2010 +0800
@@ -39,3 +39,5 @@
 library			ecom.lib
 
 USERINCLUDE		../traces
+
+SMPSAFE
\ No newline at end of file
diff -r 84c26be382f0 -r bbdce6bffaad usbmgmt/usbmgr/device/classdrivers/acm/classcontroller/group/AcmClassController.mmp
--- a/usbmgmt/usbmgr/device/classdrivers/acm/classcontroller/group/AcmClassController.mmp	Tue Oct 19 14:23:03 2010 +0800
+++ b/usbmgmt/usbmgr/device/classdrivers/acm/classcontroller/group/AcmClassController.mmp	Wed Oct 20 12:04:53 2010 +0800
@@ -29,4 +29,5 @@
 
 LIBRARY acmserver.lib
 
+SMPSAFE
 #include "AcmClassControllerBase.mmp"
\ No newline at end of file
diff -r 84c26be382f0 -r bbdce6bffaad usbmgmt/usbmgr/device/classdrivers/acm/classcontroller/group/AcmClassControllerBase.mmp
--- a/usbmgmt/usbmgr/device/classdrivers/acm/classcontroller/group/AcmClassControllerBase.mmp	Tue Oct 19 14:23:03 2010 +0800
+++ b/usbmgmt/usbmgr/device/classdrivers/acm/classcontroller/group/AcmClassControllerBase.mmp	Wed Oct 20 12:04:53 2010 +0800
@@ -38,3 +38,4 @@
 LIBRARY			euser.lib 
 LIBRARY			usbclasscontroller.lib
 LIBRARY			efsrv.lib
+
diff -r 84c26be382f0 -r bbdce6bffaad usbmgmt/usbmgr/device/classdrivers/acm/classcontroller/group/t_regport_AcmClassController.mmp
--- a/usbmgmt/usbmgr/device/classdrivers/acm/classcontroller/group/t_regport_AcmClassController.mmp	Tue Oct 19 14:23:03 2010 +0800
+++ b/usbmgmt/usbmgr/device/classdrivers/acm/classcontroller/group/t_regport_AcmClassController.mmp	Wed Oct 20 12:04:53 2010 +0800
@@ -33,4 +33,6 @@
 
 LIBRARY c32.lib
 
+SMPSAFE
+
 #include "AcmClassControllerBase.mmp"
\ No newline at end of file
diff -r 84c26be382f0 -r bbdce6bffaad usbmgmt/usbmgr/device/classdrivers/acm/classimplementation/acmserver/group/acmserver.mmp
--- a/usbmgmt/usbmgr/device/classdrivers/acm/classimplementation/acmserver/group/acmserver.mmp	Tue Oct 19 14:23:03 2010 +0800
+++ b/usbmgmt/usbmgr/device/classdrivers/acm/classimplementation/acmserver/group/acmserver.mmp	Wed Oct 20 12:04:53 2010 +0800
@@ -44,4 +44,6 @@
 LIBRARY			euser.lib 
 LIBRARY			c32.lib
 
+SMPSAFE
+
 UNPAGED
diff -r 84c26be382f0 -r bbdce6bffaad usbmgmt/usbmgr/device/classdrivers/acm/classimplementation/ecacm/group/ECACM.MMP
--- a/usbmgmt/usbmgr/device/classdrivers/acm/classimplementation/ecacm/group/ECACM.MMP	Tue Oct 19 14:23:03 2010 +0800
+++ b/usbmgmt/usbmgr/device/classdrivers/acm/classimplementation/ecacm/group/ECACM.MMP	Wed Oct 20 12:04:53 2010 +0800
@@ -69,6 +69,6 @@
 LIBRARY			efsrv.lib
 
 VENDORID 0x70000001
-
+SMPSAFE
 UNPAGED
 
diff -r 84c26be382f0 -r bbdce6bffaad usbmgmt/usbmgr/device/classdrivers/acm/classimplementation/ecacm/group/bld.inf
--- a/usbmgmt/usbmgr/device/classdrivers/acm/classimplementation/ecacm/group/bld.inf	Tue Oct 19 14:23:03 2010 +0800
+++ b/usbmgmt/usbmgr/device/classdrivers/acm/classimplementation/ecacm/group/bld.inf	Wed Oct 20 12:04:53 2010 +0800
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 1999-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 1999-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"
diff -r 84c26be382f0 -r bbdce6bffaad usbmgmt/usbmgr/device/classdrivers/acm/classimplementation/ecacm/group/ecacm_overdummyusbldd.mmp
--- a/usbmgmt/usbmgr/device/classdrivers/acm/classimplementation/ecacm/group/ecacm_overdummyusbldd.mmp	Tue Oct 19 14:23:03 2010 +0800
+++ b/usbmgmt/usbmgr/device/classdrivers/acm/classimplementation/ecacm/group/ecacm_overdummyusbldd.mmp	Wed Oct 20 12:04:53 2010 +0800
@@ -72,6 +72,6 @@
 LIBRARY                 dummyusblddapi.lib
 
 VENDORID 0x70000001
-
+SMPSAFE
 UNPAGED
 
diff -r 84c26be382f0 -r bbdce6bffaad usbmgmt/usbmgr/device/classdrivers/acm/classimplementation/ecacm/inc/ActiveDataAvailableNotifier.h
--- a/usbmgmt/usbmgr/device/classdrivers/acm/classimplementation/ecacm/inc/ActiveDataAvailableNotifier.h	Tue Oct 19 14:23:03 2010 +0800
+++ b/usbmgmt/usbmgr/device/classdrivers/acm/classimplementation/ecacm/inc/ActiveDataAvailableNotifier.h	Wed Oct 20 12:04:53 2010 +0800
@@ -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"
diff -r 84c26be382f0 -r bbdce6bffaad usbmgmt/usbmgr/device/classdrivers/acm/classimplementation/ecacm/inc/ActiveReadOneOrMoreReader.h
--- a/usbmgmt/usbmgr/device/classdrivers/acm/classimplementation/ecacm/inc/ActiveReadOneOrMoreReader.h	Tue Oct 19 14:23:03 2010 +0800
+++ b/usbmgmt/usbmgr/device/classdrivers/acm/classimplementation/ecacm/inc/ActiveReadOneOrMoreReader.h	Wed Oct 20 12:04:53 2010 +0800
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 1997-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 1997-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"
diff -r 84c26be382f0 -r bbdce6bffaad usbmgmt/usbmgr/device/classdrivers/acm/classimplementation/ecacm/inc/ActiveReader.h
--- a/usbmgmt/usbmgr/device/classdrivers/acm/classimplementation/ecacm/inc/ActiveReader.h	Tue Oct 19 14:23:03 2010 +0800
+++ b/usbmgmt/usbmgr/device/classdrivers/acm/classimplementation/ecacm/inc/ActiveReader.h	Wed Oct 20 12:04:53 2010 +0800
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 1997-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 1997-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"
diff -r 84c26be382f0 -r bbdce6bffaad usbmgmt/usbmgr/device/classdrivers/acm/classimplementation/ecacm/inc/ActiveWriter.h
--- a/usbmgmt/usbmgr/device/classdrivers/acm/classimplementation/ecacm/inc/ActiveWriter.h	Tue Oct 19 14:23:03 2010 +0800
+++ b/usbmgmt/usbmgr/device/classdrivers/acm/classimplementation/ecacm/inc/ActiveWriter.h	Wed Oct 20 12:04:53 2010 +0800
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 1997-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 1997-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"
diff -r 84c26be382f0 -r bbdce6bffaad usbmgmt/usbmgr/device/classdrivers/acm/classimplementation/ecacm/inc/CdcInterfaceBase.h
--- a/usbmgmt/usbmgr/device/classdrivers/acm/classimplementation/ecacm/inc/CdcInterfaceBase.h	Tue Oct 19 14:23:03 2010 +0800
+++ b/usbmgmt/usbmgr/device/classdrivers/acm/classimplementation/ecacm/inc/CdcInterfaceBase.h	Wed Oct 20 12:04:53 2010 +0800
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 1997-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 1997-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"
diff -r 84c26be382f0 -r bbdce6bffaad usbmgmt/usbmgr/device/classdrivers/acm/classimplementation/ecacm/src/AcmReader.cpp
--- a/usbmgmt/usbmgr/device/classdrivers/acm/classimplementation/ecacm/src/AcmReader.cpp	Tue Oct 19 14:23:03 2010 +0800
+++ b/usbmgmt/usbmgr/device/classdrivers/acm/classimplementation/ecacm/src/AcmReader.cpp	Wed Oct 20 12:04:53 2010 +0800
@@ -960,7 +960,8 @@
 	{
 	OstTraceFunctionEntry0( CACMREADER_PARTIALFINDTERMINATOR_ENTRY );
 	
-	aPos = 1;
+	//change aPos from 1 to 0 since RComm::read will return part of the terminator string if aPos = 1
+	aPos = 0;
 	OstTraceExt2( TRACE_NORMAL, CACMREADER_PARTIALFINDTERMINATOR, 
 			"CAcmReader::PartialFindTerminator;\taFrom=%d, aTo=%d", (TInt)(aFrom-iBufStart), (TInt)(aTo-iBufStart) );
 	
diff -r 84c26be382f0 -r bbdce6bffaad usbmgmt/usbmgr/device/classdrivers/ms/classcontroller/group/bld.inf
--- a/usbmgmt/usbmgr/device/classdrivers/ms/classcontroller/group/bld.inf	Tue Oct 19 14:23:03 2010 +0800
+++ b/usbmgmt/usbmgr/device/classdrivers/ms/classcontroller/group/bld.inf	Wed Oct 20 12:04:53 2010 +0800
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2004-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2004-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"
@@ -23,4 +23,4 @@
 
 
 PRJ_TESTMMPFILES
-t_msclasscontroller.mmp	// Mass Storage Class Controller plugin
\ No newline at end of file
+t_msclasscontroller.mmp	// Mass Storage Class Controller plugin
diff -r 84c26be382f0 -r bbdce6bffaad usbmgmt/usbmgr/device/classdrivers/ms/classcontroller/group/msclasscontroller.mmp
--- a/usbmgmt/usbmgr/device/classdrivers/ms/classcontroller/group/msclasscontroller.mmp	Tue Oct 19 14:23:03 2010 +0800
+++ b/usbmgmt/usbmgr/device/classdrivers/ms/classcontroller/group/msclasscontroller.mmp	Wed Oct 20 12:04:53 2010 +0800
@@ -52,4 +52,6 @@
 LIBRARY			efsrv.lib
 LIBRARY			bafl.lib
 
+SMPSAFE
+
 VENDORID 0x70000001
diff -r 84c26be382f0 -r bbdce6bffaad usbmgmt/usbmgr/device/classdrivers/ms/classcontroller/group/t_msclasscontroller.mmp
--- a/usbmgmt/usbmgr/device/classdrivers/ms/classcontroller/group/t_msclasscontroller.mmp	Tue Oct 19 14:23:03 2010 +0800
+++ b/usbmgmt/usbmgr/device/classdrivers/ms/classcontroller/group/t_msclasscontroller.mmp	Wed Oct 20 12:04:53 2010 +0800
@@ -52,5 +52,5 @@
 LIBRARY			usbclasscontroller.lib
 LIBRARY			efsrv.lib
 LIBRARY			bafl.lib
-
+SMPSAFE
 VENDORID 0x70000001
diff -r 84c26be382f0 -r bbdce6bffaad usbmgmt/usbmgr/device/classdrivers/ncm/classcontroller/test/bld.inf
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usbmgmt/usbmgr/device/classdrivers/ncm/classcontroller/test/bld.inf	Wed Oct 20 12:04:53 2010 +0800
@@ -0,0 +1,26 @@
+/*
+* Copyright (c) 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"
+* 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: 
+*
+*/
+
+PRJ_PLATFORMS
+armv5 winscw
+
+PRJ_MMPFILES
+
+PRJ_EXPORTS
+
+PRJ_TESTMMPFILES
+../group/ncmcc_over_dummy_stubs.mmp
diff -r 84c26be382f0 -r bbdce6bffaad usbmgmt/usbmgr/device/classdrivers/ncm/classimplementation/ncmpktdrv/client/src/ncminternalsrv.cpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usbmgmt/usbmgr/device/classdrivers/ncm/classimplementation/ncmpktdrv/client/src/ncminternalsrv.cpp	Wed Oct 20 12:04:53 2010 +0800
@@ -0,0 +1,80 @@
+/*
+* Copyright (c) 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"
+* 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:
+*
+*/
+
+/**
+@file
+@internalTechnology
+*/
+
+#include <e32base.h>
+#include "ncminternalsrv.h"
+#include "ncmserverconsts.h"
+
+
+/** Constructor */
+EXPORT_C RNcmInternalSrv::RNcmInternalSrv()
+    {
+    }
+
+/** Destructor */
+EXPORT_C RNcmInternalSrv::~RNcmInternalSrv()
+    {
+    }
+
+EXPORT_C TVersion RNcmInternalSrv::Version() const
+    {
+    return TVersion(    KNcmSrvMajorVersionNumber,
+                        KNcmSrvMinorVersionNumber,
+                        KNcmSrvBuildNumber
+                    );
+    }
+
+EXPORT_C TInt RNcmInternalSrv::Connect()
+    {
+    return CreateSession(KNcmServerName, Version(), 1);
+    }
+
+EXPORT_C TInt RNcmInternalSrv::TransferHandle(RHandleBase& aCommHandle, RHandleBase& aCommChunk, RHandleBase& aDataHandle, RHandleBase& aDataChunk)
+    {
+    return SendReceive(ENcmTransferHandle, TIpcArgs(aCommHandle, aCommChunk, aDataHandle, aDataChunk));
+    }
+
+EXPORT_C TInt RNcmInternalSrv::SetIapId(TUint aIapId)
+    {
+    return SendReceive(ENcmSetIapId, TIpcArgs(aIapId));
+    }
+
+EXPORT_C TInt RNcmInternalSrv::SetDhcpResult(TInt aResult)
+    {
+    return SendReceive(ENcmSetDhcpResult, TIpcArgs(aResult));
+    }
+
+EXPORT_C void RNcmInternalSrv::DhcpProvisionNotify(TRequestStatus& aStatus)
+    {
+    SendReceive(ENcmDhcpProvisionNotify, aStatus);
+    }
+
+EXPORT_C void RNcmInternalSrv::DhcpProvisionNotifyCancel()
+    {
+    SendReceive(ENcmDhcpProvisionNotifyCancel);
+    }
+
+EXPORT_C TInt RNcmInternalSrv::TransferBufferSize(TUint aSize)
+    {
+    return SendReceive(ENcmTransferBufferSize, TIpcArgs(aSize));
+    }
+
diff -r 84c26be382f0 -r bbdce6bffaad usbmgmt/usbmgr/device/classdrivers/ncm/classimplementation/ncmpktdrv/pktdrv/src/ncmntb16builder.cpp
--- a/usbmgmt/usbmgr/device/classdrivers/ncm/classimplementation/ncmpktdrv/pktdrv/src/ncmntb16builder.cpp	Tue Oct 19 14:23:03 2010 +0800
+++ b/usbmgmt/usbmgr/device/classdrivers/ncm/classimplementation/ncmpktdrv/pktdrv/src/ncmntb16builder.cpp	Wed Oct 20 12:04:53 2010 +0800
@@ -62,7 +62,11 @@
     {
     OstTraceFunctionEntry1( CNCMNTB16BUILDER_NEWL_ENTRY, ( TUint )&( aObserver ) );
     CNcmNtb16Builder *self=new (ELeave) CNcmNtb16Builder(aObserver);
+
+	CleanupStack::PushL(self);	
     self->ConstructL();
+	CleanupStack::Pop(self);
+
     OstTraceFunctionExit0( CNCMNTB16BUILDER_NEWL_EXIT );
     return self;    
     }
@@ -74,7 +78,7 @@
 
 void CNcmNtb16Builder::ConstructL()
     {
-    iNtbInMaxSize = KNtb16InMaxSize;
+	iNtbInMaxSize = KNtb16InMaxSize;
     iNdpInDivisor = KNdp16InDivisor;
     iNdpInPayloadRemainder = KNdp16InRemainder;
     iNdpInAlignment = KNdp16InAlignment;  
diff -r 84c26be382f0 -r bbdce6bffaad usbmgmt/usbmgr/device/classdrivers/ncm/classimplementation/ncmpktdrv/pktdrv/test/bld.inf
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usbmgmt/usbmgr/device/classdrivers/ncm/classimplementation/ncmpktdrv/pktdrv/test/bld.inf	Wed Oct 20 12:04:53 2010 +0800
@@ -0,0 +1,34 @@
+/*
+* Copyright (c) 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"
+* 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:
+*
+*/
+
+PRJ_PLATFORMS
+default
+
+PRJ_EXPORTS
+
+PRJ_MMPFILES
+
+
+PRJ_TESTMMPFILES
+../../client/group/ncminternalsrv.mmp
+../group/pktdrv_overdummyusbldd.mmp
+
+PRJ_TESTEXPORTS
+../../../../inc/ncmcommon.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(usb/testncm/ncmcommon.h)
+../../../../inc/ncminternalsrv.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(usb/testncm/ncminternalsrv.h)
+
+
diff -r 84c26be382f0 -r bbdce6bffaad usbmgmt/usbmgr/device/classdrivers/whcm/classcontroller/INC/CUsbWHCMClassController.h
--- a/usbmgmt/usbmgr/device/classdrivers/whcm/classcontroller/INC/CUsbWHCMClassController.h	Tue Oct 19 14:23:03 2010 +0800
+++ b/usbmgmt/usbmgr/device/classdrivers/whcm/classcontroller/INC/CUsbWHCMClassController.h	Wed Oct 20 12:04:53 2010 +0800
@@ -1,5 +1,5 @@
 /**
-* Copyright (c) 1997-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 1997-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"
diff -r 84c26be382f0 -r bbdce6bffaad usbmgmt/usbmgr/device/classdrivers/whcm/classcontroller/group/WHCMClassController.mmp
--- a/usbmgmt/usbmgr/device/classdrivers/whcm/classcontroller/group/WHCMClassController.mmp	Tue Oct 19 14:23:03 2010 +0800
+++ b/usbmgmt/usbmgr/device/classdrivers/whcm/classcontroller/group/WHCMClassController.mmp	Wed Oct 20 12:04:53 2010 +0800
@@ -45,3 +45,4 @@
 
 LIBRARY			euser.lib 
 LIBRARY			usbclasscontroller.lib
+SMPSAFE
\ No newline at end of file
diff -r 84c26be382f0 -r bbdce6bffaad usbmgmt/usbmgr/device/classdrivers/whcm/classcontroller/group/bld.inf
--- a/usbmgmt/usbmgr/device/classdrivers/whcm/classcontroller/group/bld.inf	Tue Oct 19 14:23:03 2010 +0800
+++ b/usbmgmt/usbmgr/device/classdrivers/whcm/classcontroller/group/bld.inf	Wed Oct 20 12:04:53 2010 +0800
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2005-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"
@@ -27,4 +27,4 @@
 #endif
 
 PRJ_TESTMMPFILES
-t_WHCMClassController.mmp	// Mass Storage Class Controller plugin
\ No newline at end of file
+t_WHCMClassController.mmp	// Mass Storage Class Controller plugin
diff -r 84c26be382f0 -r bbdce6bffaad usbmgmt/usbmgr/device/classdrivers/whcm/classcontroller/group/t_WHCMClassController.mmp
--- a/usbmgmt/usbmgr/device/classdrivers/whcm/classcontroller/group/t_WHCMClassController.mmp	Tue Oct 19 14:23:03 2010 +0800
+++ b/usbmgmt/usbmgr/device/classdrivers/whcm/classcontroller/group/t_WHCMClassController.mmp	Wed Oct 20 12:04:53 2010 +0800
@@ -48,3 +48,4 @@
 LIBRARY			euser.lib 
 LIBRARY			usbclasscontroller.lib
 LIBRARY	   dummyusblddapi.lib
+SMPSAFE
\ No newline at end of file
diff -r 84c26be382f0 -r bbdce6bffaad usbmgmt/usbmgr/group/usb_manager.mrp
--- a/usbmgmt/usbmgr/group/usb_manager.mrp	Tue Oct 19 14:23:03 2010 +0800
+++ b/usbmgmt/usbmgr/group/usb_manager.mrp	Wed Oct 20 12:04:53 2010 +0800
@@ -17,30 +17,30 @@
 
 component	usb_manager
 
-source	\sf\os\usb\usbmgmt\usbmgr\device
-source	\sf\os\usb\usbmgmt\usbmgr\group
-source	\sf\os\usb\usbmgmt\usbmgr\logger
-source	\sf\os\usb\usbmgmt\usbmgr\test
-source	\sf\os\usb\usbmgmt\usbmgr\inifile
-source	\sf\os\usb\usbmgmt\usbmgr\host
-source	\sf\os\usb\usbmgmt\usbmgr\usbman
-source	\sf\os\usb\usbmgmt\usbmgr\conf
+source	/sf/os/usb/usbmgmt/usbmgr/device
+source	/sf/os/usb/usbmgmt/usbmgr/group
+source	/sf/os/usb/usbmgmt/usbmgr/logger
+source	/sf/os/usb/usbmgmt/usbmgr/test
+source	/sf/os/usb/usbmgmt/usbmgr/inifile
+source	/sf/os/usb/usbmgmt/usbmgr/host
+source	/sf/os/usb/usbmgmt/usbmgr/usbman
+source	/sf/os/usb/usbmgmt/usbmgr/conf
 
-binary	\sf\os\usb\usbmgmt\usbmgr\group	all
+binary	/sf/os/usb/usbmgmt/usbmgr/group	all
 
-exports	\sf\os\usb\usbmgmt\usbmgr\group
+exports	/sf/os/usb/usbmgmt/usbmgr/group
 
-notes_source	\component_defs\release.src
+notes_source	/component_defs/release.src
 
 
 
 ipr E 
-ipr T \sf\os\usb\usbmgmt\usbmgr\test
-ipr T \sf\os\usb\usbmgmt\usbmgr\usbman\chargingplugin
-ipr T \sf\os\usb\usbmgmt\usbmgr\device\classdrivers\obex
-ipr T \sf\os\usb\usbmgmt\usbmgr\host\fdf\test
-ipr T \sf\os\usb\usbmgmt\usbmgr\host\fdf\reference
-ipr T \sf\os\usb\usbmgmt\usbmgr\host\functiondrivers\ms\msmm\referencepolicyplugin
-ipr T \sf\os\usb\usbmgmt\usbmgr\host\functiondrivers\ms\msmm\refppnotifier
-ipr T \sf\os\usb\usbmgmt\usbmgr\host\functiondrivers\ms\msmm\test
+ipr T /sf/os/usb/usbmgmt/usbmgr/test
+ipr T /sf/os/usb/usbmgmt/usbmgr/usbman/chargingplugin
+ipr T /sf/os/usb/usbmgmt/usbmgr/device/classdrivers/obex
+ipr T /sf/os/usb/usbmgmt/usbmgr/host/fdf/test
+ipr T /sf/os/usb/usbmgmt/usbmgr/host/fdf/reference
+ipr T /sf/os/usb/usbmgmt/usbmgr/host/functiondrivers/ms/msmm/referencepolicyplugin
+ipr T /sf/os/usb/usbmgmt/usbmgr/host/functiondrivers/ms/msmm/refppnotifier
+ipr T /sf/os/usb/usbmgmt/usbmgr/host/functiondrivers/ms/msmm/test
 
diff -r 84c26be382f0 -r bbdce6bffaad usbmgmt/usbmgr/host/fdf/production/client/BWINS/usbhoststacku.def
--- a/usbmgmt/usbmgr/host/fdf/production/client/BWINS/usbhoststacku.def	Tue Oct 19 14:23:03 2010 +0800
+++ b/usbmgmt/usbmgr/host/fdf/production/client/BWINS/usbhoststacku.def	Wed Oct 20 12:04:53 2010 +0800
@@ -1,17 +1,18 @@
 EXPORTS
-	??0RUsbHostStack@@QAE@XZ @ 1 NONAME ; RUsbHostStack::RUsbHostStack(void)
-	?Connect@RUsbHostStack@@QAEHXZ @ 2 NONAME ; int RUsbHostStack::Connect(void)
-	?DisableDriverLoading@RUsbHostStack@@QAEXXZ @ 3 NONAME ; void RUsbHostStack::DisableDriverLoading(void)
-	?EnableDriverLoading@RUsbHostStack@@QAEHXZ @ 4 NONAME ; int RUsbHostStack::EnableDriverLoading(void)
-	?GetManufacturerStringDescriptor@RUsbHostStack@@QAEHIIAAV?$TBuf@$0IA@@@@Z @ 5 NONAME ; int RUsbHostStack::GetManufacturerStringDescriptor(unsigned int, unsigned int, class TBuf<128> &)
-	?GetProductStringDescriptor@RUsbHostStack@@QAEHIIAAV?$TBuf@$0IA@@@@Z @ 6 NONAME ; int RUsbHostStack::GetProductStringDescriptor(unsigned int, unsigned int, class TBuf<128> &)
-	?GetSupportedLanguages@RUsbHostStack@@QAEHIAAV?$RArray@I@@@Z @ 7 NONAME ; int RUsbHostStack::GetSupportedLanguages(unsigned int, class RArray<unsigned int> &)
-	?NotifyDeviceEvent@RUsbHostStack@@QAEXAAVTRequestStatus@@AAVTDeviceEventInformation@@@Z @ 8 NONAME ; void RUsbHostStack::NotifyDeviceEvent(class TRequestStatus &, class TDeviceEventInformation &)
-	?NotifyDeviceEventCancel@RUsbHostStack@@QAEXXZ @ 9 NONAME ; void RUsbHostStack::NotifyDeviceEventCancel(void)
-	?NotifyDevmonEvent@RUsbHostStack@@QAEXAAVTRequestStatus@@AAH@Z @ 10 NONAME ; void RUsbHostStack::NotifyDevmonEvent(class TRequestStatus &, int &)
-	?NotifyDevmonEventCancel@RUsbHostStack@@QAEXXZ @ 11 NONAME ; void RUsbHostStack::NotifyDevmonEventCancel(void)
-	?Version@RUsbHostStack@@QBE?AVTVersion@@XZ @ 12 NONAME ; class TVersion RUsbHostStack::Version(void) const
-	?__DbgAlloc@RUsbHostStack@@QAEHXZ @ 13 NONAME ; int RUsbHostStack::__DbgAlloc(void)
-	?__DbgFailNext@RUsbHostStack@@QAEHH@Z @ 14 NONAME ; int RUsbHostStack::__DbgFailNext(int)
-	?GetOtgDescriptor@RUsbHostStack@@QAEHIAAVTOtgDescriptor@@@Z @ 15 NONAME ; int RUsbHostStack::GetOtgDescriptor(unsigned int, class TOtgDescriptor &)
+	?NotifyDevmonEvent@RUsbHostStack@@QAEXAAVTRequestStatus@@AAH@Z @ 1 NONAME ; void RUsbHostStack::NotifyDevmonEvent(class TRequestStatus &, int &)
+	?EnableDriverLoading@RUsbHostStack@@QAEHXZ @ 2 NONAME ; int RUsbHostStack::EnableDriverLoading(void)
+	?Version@RUsbHostStack@@QBE?AVTVersion@@XZ @ 3 NONAME ; class TVersion RUsbHostStack::Version(void) const
+	?NotifyDeviceEvent@RUsbHostStack@@QAEXAAVTRequestStatus@@AAVTDeviceEventInformation@@@Z @ 4 NONAME ; void RUsbHostStack::NotifyDeviceEvent(class TRequestStatus &, class TDeviceEventInformation &)
+	??0RUsbHostStack@@QAE@XZ @ 5 NONAME ; RUsbHostStack::RUsbHostStack(void)
+	?DisableDriverLoading@RUsbHostStack@@QAEXXZ @ 6 NONAME ; void RUsbHostStack::DisableDriverLoading(void)
+	?__DbgFailNext@RUsbHostStack@@QAEHH@Z @ 7 NONAME ; int RUsbHostStack::__DbgFailNext(int)
+	?__DbgAlloc@RUsbHostStack@@QAEHXZ @ 8 NONAME ; int RUsbHostStack::__DbgAlloc(void)
+	?GetProductStringDescriptor@RUsbHostStack@@QAEHIIAAV?$TBuf@$0IA@@@@Z @ 9 NONAME ; int RUsbHostStack::GetProductStringDescriptor(unsigned int, unsigned int, class TBuf<128> &)
+	?NotifyDeviceEventCancel@RUsbHostStack@@QAEXXZ @ 10 NONAME ; void RUsbHostStack::NotifyDeviceEventCancel(void)
+	?GetOtgDescriptor@RUsbHostStack@@QAEHIAAVTOtgDescriptor@@@Z @ 11 NONAME ; int RUsbHostStack::GetOtgDescriptor(unsigned int, class TOtgDescriptor &)
+	?NotifyDevmonEventCancel@RUsbHostStack@@QAEXXZ @ 12 NONAME ; void RUsbHostStack::NotifyDevmonEventCancel(void)
+	?Connect@RUsbHostStack@@QAEHXZ @ 13 NONAME ; int RUsbHostStack::Connect(void)
+	?GetManufacturerStringDescriptor@RUsbHostStack@@QAEHIIAAV?$TBuf@$0IA@@@@Z @ 14 NONAME ; int RUsbHostStack::GetManufacturerStringDescriptor(unsigned int, unsigned int, class TBuf<128> &)
+	?GetConfigurationDescriptor@RUsbHostStack@@QAEHIAAVTConfigurationDescriptor@@@Z @ 15 NONAME ; int RUsbHostStack::GetConfigurationDescriptor(unsigned int, class TConfigurationDescriptor &)
+	?GetSupportedLanguages@RUsbHostStack@@QAEHIAAV?$RArray@I@@@Z @ 16 NONAME ; int RUsbHostStack::GetSupportedLanguages(unsigned int, class RArray<unsigned int> &)
 
diff -r 84c26be382f0 -r bbdce6bffaad usbmgmt/usbmgr/host/fdf/production/client/group/usbhoststack.mmp
--- a/usbmgmt/usbmgr/host/fdf/production/client/group/usbhoststack.mmp	Tue Oct 19 14:23:03 2010 +0800
+++ b/usbmgmt/usbmgr/host/fdf/production/client/group/usbhoststack.mmp	Wed Oct 20 12:04:53 2010 +0800
@@ -32,3 +32,4 @@
 // UID2 = 0x1000008d for static interface DLLs.
 // UID3 = unique for FDF system
 UID 			0x1000008d 0x10282B48
+SMPSAFE
\ No newline at end of file
diff -r 84c26be382f0 -r bbdce6bffaad usbmgmt/usbmgr/host/fdf/production/client/group/usbhoststack_base.mmp
--- a/usbmgmt/usbmgr/host/fdf/production/client/group/usbhoststack_base.mmp	Tue Oct 19 14:23:03 2010 +0800
+++ b/usbmgmt/usbmgr/host/fdf/production/client/group/usbhoststack_base.mmp	Wed Oct 20 12:04:53 2010 +0800
@@ -35,4 +35,4 @@
 
 DEFFILE			usbhoststack.def
 
-LIBRARY 		euser.lib
+LIBRARY 		euser.lib
\ No newline at end of file
diff -r 84c26be382f0 -r bbdce6bffaad usbmgmt/usbmgr/host/fdf/production/client/group/usbhoststack_over_dummyusbdi.mmp
--- a/usbmgmt/usbmgr/host/fdf/production/client/group/usbhoststack_over_dummyusbdi.mmp	Tue Oct 19 14:23:03 2010 +0800
+++ b/usbmgmt/usbmgr/host/fdf/production/client/group/usbhoststack_over_dummyusbdi.mmp	Wed Oct 20 12:04:53 2010 +0800
@@ -33,3 +33,4 @@
 UID 			0x1000008d 0x10282B50
 
 MACRO	__OVER_DUMMYUSBDI__
+SMPSAFE
\ No newline at end of file
diff -r 84c26be382f0 -r bbdce6bffaad usbmgmt/usbmgr/host/fdf/production/fdcbase/group/fdcbase.mmp
--- a/usbmgmt/usbmgr/host/fdf/production/fdcbase/group/fdcbase.mmp	Tue Oct 19 14:23:03 2010 +0800
+++ b/usbmgmt/usbmgr/host/fdf/production/fdcbase/group/fdcbase.mmp	Wed Oct 20 12:04:53 2010 +0800
@@ -38,5 +38,5 @@
 LIBRARY 		ecom.lib
 
 USERINCLUDE   ../traces
-
+SMPSAFE
 #include <usbhost/internal/fdfcaps.mmh>
diff -r 84c26be382f0 -r bbdce6bffaad usbmgmt/usbmgr/host/fdf/production/server/group/fdf.mmp
--- a/usbmgmt/usbmgr/host/fdf/production/server/group/fdf.mmp	Tue Oct 19 14:23:03 2010 +0800
+++ b/usbmgmt/usbmgr/host/fdf/production/server/group/fdf.mmp	Wed Oct 20 12:04:53 2010 +0800
@@ -28,3 +28,4 @@
 // UID3 = unique for FDF system
 UID 			0x1000008c 0x10282B48
 
+SMPSAFE
\ No newline at end of file
diff -r 84c26be382f0 -r bbdce6bffaad usbmgmt/usbmgr/host/fdf/production/server/group/fdf_over_dummyusbdi.mmp
--- a/usbmgmt/usbmgr/host/fdf/production/server/group/fdf_over_dummyusbdi.mmp	Tue Oct 19 14:23:03 2010 +0800
+++ b/usbmgmt/usbmgr/host/fdf/production/server/group/fdf_over_dummyusbdi.mmp	Wed Oct 20 12:04:53 2010 +0800
@@ -33,3 +33,4 @@
 LIBRARY			tfdf_usbdescriptors.lib
 
 MACRO	__OVER_DUMMYUSBDI__
+SMPSAFE
\ No newline at end of file
diff -r 84c26be382f0 -r bbdce6bffaad usbmgmt/usbmgr/host/fdf/reference/reffdc/group/reffdc.mmp
--- a/usbmgmt/usbmgr/host/fdf/reference/reffdc/group/reffdc.mmp	Tue Oct 19 14:23:03 2010 +0800
+++ b/usbmgmt/usbmgr/host/fdf/reference/reffdc/group/reffdc.mmp	Wed Oct 20 12:04:53 2010 +0800
@@ -29,7 +29,7 @@
 UID 			0x10009d8d 0x10282B51
 VENDORID		0x70000001
 
-SOURCEPATH		..\src
+SOURCEPATH		../src
 SOURCE			reffdc.cpp
 SOURCE			reffdcmain.cpp
 
@@ -37,13 +37,13 @@
 
 OS_LAYER_SYSTEMINCLUDE_SYMBIAN
 
-USERINCLUDE		..\inc
-USERINCLUDE		..\traces
+USERINCLUDE		../inc
+USERINCLUDE		../traces
 
 LIBRARY 		euser.lib
 LIBRARY			fdcbase.lib
 
 NOEXPORTLIBRARY
-
+SMPSAFE
 #include <usbhost/internal/fdfcaps.mmh>
 
diff -r 84c26be382f0 -r bbdce6bffaad usbmgmt/usbmgr/host/fdf/test/t_fdf/t_fdf.mmp
--- a/usbmgmt/usbmgr/host/fdf/test/t_fdf/t_fdf.mmp	Tue Oct 19 14:23:03 2010 +0800
+++ b/usbmgmt/usbmgr/host/fdf/test/t_fdf/t_fdf.mmp	Wed Oct 20 12:04:53 2010 +0800
@@ -31,9 +31,9 @@
 SOURCE			testbase.cpp
 SOURCE			FdfTest.cpp
 
-SYSTEMINCLUDE	\epoc32\include
+OS_LAYER_SYSTEMINCLUDE_SYMBIAN 
 
-LIBRARY			EUSER.LIB
+LIBRARY			euser.lib
 LIBRARY			usbhoststack.lib
 
 //MACRO	__TEST_FDF__
diff -r 84c26be382f0 -r bbdce6bffaad usbmgmt/usbmgr/host/functiondrivers/ms/msfdc/group/bld.inf
--- a/usbmgmt/usbmgr/host/functiondrivers/ms/msfdc/group/bld.inf	Tue Oct 19 14:23:03 2010 +0800
+++ b/usbmgmt/usbmgr/host/functiondrivers/ms/msfdc/group/bld.inf	Wed Oct 20 12:04:53 2010 +0800
@@ -32,4 +32,4 @@
 msfdc.iby				/epoc32/rom/include/msfdc.iby
 
 PRJ_TESTMMPFILES
-msfdc_overdummy.mmp
\ No newline at end of file
+msfdc_overdummy.mmp
diff -r 84c26be382f0 -r bbdce6bffaad usbmgmt/usbmgr/host/functiondrivers/ms/msfdc/group/msfdc.mmp
--- a/usbmgmt/usbmgr/host/functiondrivers/ms/msfdc/group/msfdc.mmp	Tue Oct 19 14:23:03 2010 +0800
+++ b/usbmgmt/usbmgr/host/functiondrivers/ms/msfdc/group/msfdc.mmp	Wed Oct 20 12:04:53 2010 +0800
@@ -47,5 +47,5 @@
 LIBRARY			fdcbase.lib msmmsession.lib usbdescriptors.lib usbdi_utils.lib
 
 NOEXPORTLIBRARY
-
+SMPSAFE
 #include <usbhost/internal/fdfcaps.mmh>
diff -r 84c26be382f0 -r bbdce6bffaad usbmgmt/usbmgr/host/functiondrivers/ms/msfdc/group/msfdc_overdummy.mmp
--- a/usbmgmt/usbmgr/host/functiondrivers/ms/msfdc/group/msfdc_overdummy.mmp	Tue Oct 19 14:23:03 2010 +0800
+++ b/usbmgmt/usbmgr/host/functiondrivers/ms/msfdc/group/msfdc_overdummy.mmp	Wed Oct 20 12:04:53 2010 +0800
@@ -49,5 +49,5 @@
 LIBRARY			usbdescriptors.lib 
 LIBRARY			usbdi_utils_dummy.lib
 NOEXPORTLIBRARY
-
+SMPSAFE
 #include <usbhost/internal/fdfcaps.mmh>
diff -r 84c26be382f0 -r bbdce6bffaad usbmgmt/usbmgr/host/functiondrivers/ms/msmm/client/group/msmmclient.mmp
--- a/usbmgmt/usbmgr/host/functiondrivers/ms/msmm/client/group/msmmclient.mmp	Tue Oct 19 14:23:03 2010 +0800
+++ b/usbmgmt/usbmgr/host/functiondrivers/ms/msmm/client/group/msmmclient.mmp	Wed Oct 20 12:04:53 2010 +0800
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2008-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"
@@ -23,6 +23,6 @@
 TARGET	msmmsession.dll
 TARGETTYPE	dll
 UID 0x1000008d 0x09A85D84
-
+SMPSAFE
 #include "msmmclient_base.mmp"
 #include <usbhost/internal/fdfcaps.mmh>
diff -r 84c26be382f0 -r bbdce6bffaad usbmgmt/usbmgr/host/functiondrivers/ms/msmm/client/group/msmmclient_over_dummycomponent.mmp
--- a/usbmgmt/usbmgr/host/functiondrivers/ms/msmm/client/group/msmmclient_over_dummycomponent.mmp	Tue Oct 19 14:23:03 2010 +0800
+++ b/usbmgmt/usbmgr/host/functiondrivers/ms/msmm/client/group/msmmclient_over_dummycomponent.mmp	Wed Oct 20 12:04:53 2010 +0800
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2008-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"
@@ -29,5 +29,5 @@
 #include "msmmclient_base.mmp"
 
 CAPABILITY ProtServ WriteDeviceData CommDD DiskAdmin NetworkControl TrustedUI
-
+SMPSAFE
 MACRO	__OVER_DUMMYCOMPONENT__
\ No newline at end of file
diff -r 84c26be382f0 -r bbdce6bffaad usbmgmt/usbmgr/host/functiondrivers/ms/msmm/client/group/msmmindicatorclient.mmp
--- a/usbmgmt/usbmgr/host/functiondrivers/ms/msmm/client/group/msmmindicatorclient.mmp	Tue Oct 19 14:23:03 2010 +0800
+++ b/usbmgmt/usbmgr/host/functiondrivers/ms/msmm/client/group/msmmindicatorclient.mmp	Wed Oct 20 12:04:53 2010 +0800
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2008-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"
@@ -26,5 +26,5 @@
 UID 0x1000008d 0x20031571
 
 CAPABILITY All -TCB
-
+SMPSAFE
 #include "msmmindicatorclient_base.mmp" 
diff -r 84c26be382f0 -r bbdce6bffaad usbmgmt/usbmgr/host/functiondrivers/ms/msmm/client/group/msmmindicatorclient_over_dummycomponent.mmp
--- a/usbmgmt/usbmgr/host/functiondrivers/ms/msmm/client/group/msmmindicatorclient_over_dummycomponent.mmp	Tue Oct 19 14:23:03 2010 +0800
+++ b/usbmgmt/usbmgr/host/functiondrivers/ms/msmm/client/group/msmmindicatorclient_over_dummycomponent.mmp	Wed Oct 20 12:04:53 2010 +0800
@@ -29,5 +29,5 @@
 #include "msmmindicatorclient_base.mmp"
 
 CAPABILITY ProtServ WriteDeviceData CommDD DiskAdmin NetworkControl TrustedUI
-
+SMPSAFE
 MACRO	__OVER_DUMMYCOMPONENT__
\ No newline at end of file
diff -r 84c26be382f0 -r bbdce6bffaad usbmgmt/usbmgr/host/functiondrivers/ms/msmm/referencepolicyplugin/group/referencepolicyplugin.mmh
--- a/usbmgmt/usbmgr/host/functiondrivers/ms/msmm/referencepolicyplugin/group/referencepolicyplugin.mmh	Tue Oct 19 14:23:03 2010 +0800
+++ b/usbmgmt/usbmgr/host/functiondrivers/ms/msmm/referencepolicyplugin/group/referencepolicyplugin.mmh	Wed Oct 20 12:04:53 2010 +0800
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2008-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"
diff -r 84c26be382f0 -r bbdce6bffaad usbmgmt/usbmgr/host/functiondrivers/ms/msmm/referencepolicyplugin/group/referencepolicyplugin.mmp
--- a/usbmgmt/usbmgr/host/functiondrivers/ms/msmm/referencepolicyplugin/group/referencepolicyplugin.mmp	Tue Oct 19 14:23:03 2010 +0800
+++ b/usbmgmt/usbmgr/host/functiondrivers/ms/msmm/referencepolicyplugin/group/referencepolicyplugin.mmp	Wed Oct 20 12:04:53 2010 +0800
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2008-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"
diff -r 84c26be382f0 -r bbdce6bffaad usbmgmt/usbmgr/host/functiondrivers/ms/msmm/referencepolicyplugin/group/refpp_over_dummycomponent.mmp
--- a/usbmgmt/usbmgr/host/functiondrivers/ms/msmm/referencepolicyplugin/group/refpp_over_dummycomponent.mmp	Tue Oct 19 14:23:03 2010 +0800
+++ b/usbmgmt/usbmgr/host/functiondrivers/ms/msmm/referencepolicyplugin/group/refpp_over_dummycomponent.mmp	Wed Oct 20 12:04:53 2010 +0800
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2008-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"
diff -r 84c26be382f0 -r bbdce6bffaad usbmgmt/usbmgr/host/functiondrivers/ms/msmm/server/group/msmmserver.mmp
--- a/usbmgmt/usbmgr/host/functiondrivers/ms/msmm/server/group/msmmserver.mmp	Tue Oct 19 14:23:03 2010 +0800
+++ b/usbmgmt/usbmgr/host/functiondrivers/ms/msmm/server/group/msmmserver.mmp	Wed Oct 20 12:04:53 2010 +0800
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2008-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"
@@ -24,5 +24,6 @@
 TARGETTYPE	  exe
 UID    0 0x10285c44
 
+SMPSAFE
 #include "msmmserver_base.mmp"
 LIBRARY usbhostmsclient.lib
diff -r 84c26be382f0 -r bbdce6bffaad usbmgmt/usbmgr/host/functiondrivers/ms/msmm/server/group/msmmserver_over_dummycomponent.mmp
--- a/usbmgmt/usbmgr/host/functiondrivers/ms/msmm/server/group/msmmserver_over_dummycomponent.mmp	Tue Oct 19 14:23:03 2010 +0800
+++ b/usbmgmt/usbmgr/host/functiondrivers/ms/msmm/server/group/msmmserver_over_dummycomponent.mmp	Wed Oct 20 12:04:53 2010 +0800
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2008-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"
@@ -30,5 +30,5 @@
 LIBRARY		 dummyfilesysclient.lib
 #include "msmmserver_base.mmp"
 
-
+SMPSAFE
 MACRO	__OVER_DUMMYCOMPONENT__
\ No newline at end of file
diff -r 84c26be382f0 -r bbdce6bffaad usbmgmt/usbmgr/host/functiondrivers/ms/msmm/server/public/hostmscaps.mmh
--- a/usbmgmt/usbmgr/host/functiondrivers/ms/msmm/server/public/hostmscaps.mmh	Tue Oct 19 14:23:03 2010 +0800
+++ b/usbmgmt/usbmgr/host/functiondrivers/ms/msmm/server/public/hostmscaps.mmh	Wed Oct 20 12:04:53 2010 +0800
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2008-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"
diff -r 84c26be382f0 -r bbdce6bffaad usbmgmt/usbmgr/host/functiondrivers/ms/msmm/server/src/eventhandler.cpp
--- a/usbmgmt/usbmgr/host/functiondrivers/ms/msmm/server/src/eventhandler.cpp	Tue Oct 19 14:23:03 2010 +0800
+++ b/usbmgmt/usbmgr/host/functiondrivers/ms/msmm/server/src/eventhandler.cpp	Wed Oct 20 12:04:53 2010 +0800
@@ -148,7 +148,11 @@
     for (TInt index = 0; index < aLogicalUnitCount; index++)
         {
         command = new (ELeave) TRetrieveDriveLetter(parameter, index);
-        iSubCommandQueue.PushL(command);
+
+		CleanupStack::PushL(command);        
+		iSubCommandQueue.PushL(command);
+		CleanupStack::Pop(command);
+
         }
     OstTraceFunctionExit0( CDEVICEEVENTHANDLER_CREATESUBCMDFORRETRIEVEDRIVELETTERL_EXIT );
     }
@@ -161,7 +165,11 @@
     THostMsSubCommandParam parameter(iServer, *this, *this, iIncomingEvent);
     TMountLogicalUnit* command = new (ELeave) TMountLogicalUnit(
             parameter, aDrive, aLuNumber);
+	
+	CleanupStack::PushL(command);
     iSubCommandQueue.InsertAfterHeadL(command);
+	CleanupStack::Pop(command);
+
     OstTraceFunctionExit0( CDEVICEEVENTHANDLER_CREATESUBCMDFORMOUNTINGLOGICALUNITL_EXIT );
     }
 
@@ -173,7 +181,11 @@
     THostMsSubCommandParam parameter(iServer, *this, *this, iIncomingEvent);
     TSaveLatestMountInfo* command = 
         new (ELeave) TSaveLatestMountInfo(parameter, aDrive, aLuNumber);
+	
+	CleanupStack::PushL(command);
     iSubCommandQueue.InsertAfterHeadL(command);
+	CleanupStack::Pop(command);
+
     OstTraceFunctionExit0( CDEVICEEVENTHANDLER_CREATESUBCMDFORSAVELATESTMOUNTINFOL_EXIT );
     }
 
@@ -362,7 +374,11 @@
     
     THostMsSubCommandParam parameter(iServer, *this, *this, iIncomingEvent);
     TRegisterInterface* command = new (ELeave) TRegisterInterface(parameter);
+
+	CleanupStack::PushL(command);
     iSubCommandQueue.PushL(command);
+	CleanupStack::Pop(command);
+
     OstTraceFunctionExit0( CDEVICEEVENTHANDLER_CREATESUBCMDFORADDINGUSBMSFUNCTIONL_EXIT );
     }
 
@@ -380,7 +396,10 @@
     THostMsSubCommandParam parameter(iServer, *this, *this, iIncomingEvent);
     TRemoveUsbMsDevice* removeMsDevice = new (ELeave) TRemoveUsbMsDevice(
             parameter);
+	
+	CleanupStack::PushL(removeMsDevice);
     iSubCommandQueue.PushL(removeMsDevice);
+	CleanupStack::Pop(removeMsDevice);
     
     OstTraceFunctionExit0( CDEVICEEVENTHANDLER_CREATESUBCMDFORREMOVINGUSBMSDEVICEL_EXIT );
     }
diff -r 84c26be382f0 -r bbdce6bffaad usbmgmt/usbmgr/usbman/chargingplugin/conf/usbmanager_10208dd7.crml
Binary file usbmgmt/usbmgr/usbman/chargingplugin/conf/usbmanager_10208dd7.crml has changed
diff -r 84c26be382f0 -r bbdce6bffaad usbmgmt/usbmgr/usbman/chargingplugin/group/UsbBatteryChargingPlugin.mmp
--- a/usbmgmt/usbmgr/usbman/chargingplugin/group/UsbBatteryChargingPlugin.mmp	Tue Oct 19 14:23:03 2010 +0800
+++ b/usbmgmt/usbmgr/usbman/chargingplugin/group/UsbBatteryChargingPlugin.mmp	Wed Oct 20 12:04:53 2010 +0800
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2005-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"
@@ -36,5 +36,5 @@
 //macro __USB_LOG_TO_RDEBUG__
 
 //macro __USB_LOGGING__
-
+SMPSAFE
 //macro __CHARGING_PLUGIN_TEST_CODE__
diff -r 84c26be382f0 -r bbdce6bffaad usbmgmt/usbmgr/usbman/chargingplugin/group/UsbBatteryChargingPluginBase.mmp
--- a/usbmgmt/usbmgr/usbman/chargingplugin/group/UsbBatteryChargingPluginBase.mmp	Tue Oct 19 14:23:03 2010 +0800
+++ b/usbmgmt/usbmgr/usbman/chargingplugin/group/UsbBatteryChargingPluginBase.mmp	Wed Oct 20 12:04:53 2010 +0800
@@ -47,5 +47,4 @@
 LIBRARY 		usbmanextensionplugin.lib 
 LIBRARY			centralrepository.lib
 
-
 NOEXPORTLIBRARY
diff -r 84c26be382f0 -r bbdce6bffaad usbmgmt/usbmgr/usbman/chargingplugin/group/UsbBatteryChargingPluginotg.mmp
--- a/usbmgmt/usbmgr/usbman/chargingplugin/group/UsbBatteryChargingPluginotg.mmp	Tue Oct 19 14:23:03 2010 +0800
+++ b/usbmgmt/usbmgr/usbman/chargingplugin/group/UsbBatteryChargingPluginotg.mmp	Wed Oct 20 12:04:53 2010 +0800
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2005-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"
@@ -34,5 +34,5 @@
 START RESOURCE 10208DD7.rss
 target usbbatterychargingpluginotg.rsc
 END
-
+SMPSAFE
 MACRO            SYMBIAN_ENABLE_USB_OTG_HOST_PRIV
diff -r 84c26be382f0 -r bbdce6bffaad usbmgmt/usbmgr/usbman/client/group/Usbman.mmp
--- a/usbmgmt/usbmgr/usbman/client/group/Usbman.mmp	Tue Oct 19 14:23:03 2010 +0800
+++ b/usbmgmt/usbmgr/usbman/client/group/Usbman.mmp	Wed Oct 20 12:04:53 2010 +0800
@@ -43,5 +43,5 @@
 library			euser.lib
 
 VENDORID 0x70000001
-
+SMPSAFE
 UNPAGED
diff -r 84c26be382f0 -r bbdce6bffaad usbmgmt/usbmgr/usbman/client/group/Usbman_over_dummyldd.mmp
--- a/usbmgmt/usbmgr/usbman/client/group/Usbman_over_dummyldd.mmp	Tue Oct 19 14:23:03 2010 +0800
+++ b/usbmgmt/usbmgr/usbman/client/group/Usbman_over_dummyldd.mmp	Wed Oct 20 12:04:53 2010 +0800
@@ -39,5 +39,5 @@
 library			euser.lib
 
 VENDORID 0x70000001
-
+SMPSAFE
 UNPAGED
diff -r 84c26be382f0 -r bbdce6bffaad usbmgmt/usbmgr/usbman/client/group/Usbman_over_dummyusbdi.mmp
--- a/usbmgmt/usbmgr/usbman/client/group/Usbman_over_dummyusbdi.mmp	Tue Oct 19 14:23:03 2010 +0800
+++ b/usbmgmt/usbmgr/usbman/client/group/Usbman_over_dummyusbdi.mmp	Wed Oct 20 12:04:53 2010 +0800
@@ -44,5 +44,5 @@
 library			euser.lib
 
 VENDORID 0x70000001
-
+SMPSAFE
 UNPAGED
diff -r 84c26be382f0 -r bbdce6bffaad usbmgmt/usbmgr/usbman/client/group/bld.inf
--- a/usbmgmt/usbmgr/usbman/client/group/bld.inf	Tue Oct 19 14:23:03 2010 +0800
+++ b/usbmgmt/usbmgr/usbman/client/group/bld.inf	Wed Oct 20 12:04:53 2010 +0800
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2005-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"
diff -r 84c26be382f0 -r bbdce6bffaad usbmgmt/usbmgr/usbman/extensionplugin/group/UsbManExtensionPlugin.mmp
--- a/usbmgmt/usbmgr/usbman/extensionplugin/group/UsbManExtensionPlugin.mmp	Tue Oct 19 14:23:03 2010 +0800
+++ b/usbmgmt/usbmgr/usbman/extensionplugin/group/UsbManExtensionPlugin.mmp	Wed Oct 20 12:04:53 2010 +0800
@@ -45,5 +45,5 @@
 LIBRARY 		euser.lib
 LIBRARY 		ecom.lib
 
-
+SMPSAFE
 //macro __USB_LOG_TO_RDEBUG__
diff -r 84c26be382f0 -r bbdce6bffaad usbmgmt/usbmgr/usbman/extensionplugin/group/UsbManExtensionPluginDummy.mmp
--- a/usbmgmt/usbmgr/usbman/extensionplugin/group/UsbManExtensionPluginDummy.mmp	Tue Oct 19 14:23:03 2010 +0800
+++ b/usbmgmt/usbmgr/usbman/extensionplugin/group/UsbManExtensionPluginDummy.mmp	Wed Oct 20 12:04:53 2010 +0800
@@ -39,5 +39,5 @@
 LIBRARY 		euser.lib
 LIBRARY 		ecom.lib
 MACRO 			__DUMMY_LDD__
-
+SMPSAFE
 //macro __USB_LOG_TO_RDEBUG__
diff -r 84c26be382f0 -r bbdce6bffaad usbmgmt/usbmgr/usbman/extensionplugin/group/bld.inf
--- a/usbmgmt/usbmgr/usbman/extensionplugin/group/bld.inf	Tue Oct 19 14:23:03 2010 +0800
+++ b/usbmgmt/usbmgr/usbman/extensionplugin/group/bld.inf	Wed Oct 20 12:04:53 2010 +0800
@@ -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"
@@ -26,4 +26,4 @@
 PRJ_MMPFILES
 UsbManExtensionPlugin.mmp
 PRJ_TESTMMPFILES
-UsbManExtensionPluginDummy.mmp
\ No newline at end of file
+UsbManExtensionPluginDummy.mmp
diff -r 84c26be382f0 -r bbdce6bffaad usbmgmt/usbmgr/usbman/extensionplugin/src/CUsbManExtensionPlugin.cpp
--- a/usbmgmt/usbmgr/usbman/extensionplugin/src/CUsbManExtensionPlugin.cpp	Tue Oct 19 14:23:03 2010 +0800
+++ b/usbmgmt/usbmgr/usbman/extensionplugin/src/CUsbManExtensionPlugin.cpp	Wed Oct 20 12:04:53 2010 +0800
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2005-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"
diff -r 84c26be382f0 -r bbdce6bffaad usbmgmt/usbmgr/usbman/extensionplugin/src/MUsbManExtensionPluginObserver.cpp
--- a/usbmgmt/usbmgr/usbman/extensionplugin/src/MUsbManExtensionPluginObserver.cpp	Tue Oct 19 14:23:03 2010 +0800
+++ b/usbmgmt/usbmgr/usbman/extensionplugin/src/MUsbManExtensionPluginObserver.cpp	Wed Oct 20 12:04:53 2010 +0800
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2005-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"
diff -r 84c26be382f0 -r bbdce6bffaad usbmgmt/usbmgr/usbman/server/INC/CUsbOtg.h
--- a/usbmgmt/usbmgr/usbman/server/INC/CUsbOtg.h	Tue Oct 19 14:23:03 2010 +0800
+++ b/usbmgmt/usbmgr/usbman/server/INC/CUsbOtg.h	Wed Oct 20 12:04:53 2010 +0800
@@ -1,5 +1,5 @@
 /**
-* Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2008-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"
diff -r 84c26be382f0 -r bbdce6bffaad usbmgmt/usbmgr/usbman/server/INC/cusbotgwatcher.h
--- a/usbmgmt/usbmgr/usbman/server/INC/cusbotgwatcher.h	Tue Oct 19 14:23:03 2010 +0800
+++ b/usbmgmt/usbmgr/usbman/server/INC/cusbotgwatcher.h	Wed Oct 20 12:04:53 2010 +0800
@@ -1,5 +1,5 @@
 /**
-* Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2008-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"
diff -r 84c26be382f0 -r bbdce6bffaad usbmgmt/usbmgr/usbman/server/group/UsbDummyClassControllerLdd.mmp
--- a/usbmgmt/usbmgr/usbman/server/group/UsbDummyClassControllerLdd.mmp	Tue Oct 19 14:23:03 2010 +0800
+++ b/usbmgmt/usbmgr/usbman/server/group/UsbDummyClassControllerLdd.mmp	Wed Oct 20 12:04:53 2010 +0800
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 1997-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 1997-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"
@@ -49,5 +49,5 @@
 LIBRARY			efsrv.lib
 LIBRARY			bafl.lib
 
-
+SMPSAFE
 VENDORID 0x70000001
diff -r 84c26be382f0 -r bbdce6bffaad usbmgmt/usbmgr/usbman/server/group/Usbsvr.mmp
--- a/usbmgmt/usbmgr/usbman/server/group/Usbsvr.mmp	Tue Oct 19 14:23:03 2010 +0800
+++ b/usbmgmt/usbmgr/usbman/server/group/Usbsvr.mmp	Wed Oct 20 12:04:53 2010 +0800
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2003-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2003-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"
@@ -25,5 +25,5 @@
 #include "usbsvrbase.mmp"
 //
 // End of file
-
+SMPSAFE
 UNPAGED
diff -r 84c26be382f0 -r bbdce6bffaad usbmgmt/usbmgr/usbman/server/group/t_Usbman_dummyCC.mmp
--- a/usbmgmt/usbmgr/usbman/server/group/t_Usbman_dummyCC.mmp	Tue Oct 19 14:23:03 2010 +0800
+++ b/usbmgmt/usbmgr/usbman/server/group/t_Usbman_dummyCC.mmp	Wed Oct 20 12:04:53 2010 +0800
@@ -65,6 +65,6 @@
 
 // This is the crucial difference between this and usbsvr.mmp.
 MACRO USE_DUMMY_CLASS_CONTROLLER
-
+SMPSAFE
 //
 // End of file
diff -r 84c26be382f0 -r bbdce6bffaad usbmgmt/usbmgr/usbman/server/group/usbsvr_dummyldd.mmp
--- a/usbmgmt/usbmgr/usbman/server/group/usbsvr_dummyldd.mmp	Tue Oct 19 14:23:03 2010 +0800
+++ b/usbmgmt/usbmgr/usbman/server/group/usbsvr_dummyldd.mmp	Wed Oct 20 12:04:53 2010 +0800
@@ -65,5 +65,5 @@
 #endif
 library 		dummyusblddapi.lib
 library			usbman_over_dummyldd.lib
-
+SMPSAFE
 UNPAGED
diff -r 84c26be382f0 -r bbdce6bffaad usbmgmt/usbmgr/usbman/server/group/usbsvrotg.mmp
--- a/usbmgmt/usbmgr/usbman/server/group/usbsvrotg.mmp	Tue Oct 19 14:23:03 2010 +0800
+++ b/usbmgmt/usbmgr/usbman/server/group/usbsvrotg.mmp	Wed Oct 20 12:04:53 2010 +0800
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2008-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"
@@ -33,5 +33,5 @@
 source			cusbhostwatcher.cpp
 
 library			usbhoststack.lib
-
+SMPSAFE
 UNPAGED
diff -r 84c26be382f0 -r bbdce6bffaad usbmgmt/usbmgr/usbman/server/group/usbsvrotg_dummyusbdi.mmp
--- a/usbmgmt/usbmgr/usbman/server/group/usbsvrotg_dummyusbdi.mmp	Tue Oct 19 14:23:03 2010 +0800
+++ b/usbmgmt/usbmgr/usbman/server/group/usbsvrotg_dummyusbdi.mmp	Wed Oct 20 12:04:53 2010 +0800
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2008-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"
@@ -40,5 +40,5 @@
 
 library			dummyotgdi.lib
 library			usbhoststack_over_dummyusbdi.lib
-
+SMPSAFE
 UNPAGED
diff -r 84c26be382f0 -r bbdce6bffaad usbmgmt/usbmgr/usbman/server/public/UsbClassUids.h
--- a/usbmgmt/usbmgr/usbman/server/public/UsbClassUids.h	Tue Oct 19 14:23:03 2010 +0800
+++ b/usbmgmt/usbmgr/usbman/server/public/UsbClassUids.h	Wed Oct 20 12:04:53 2010 +0800
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2005-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"
@@ -41,5 +41,5 @@
 const TUid KUSBMSUid={0x10204bbc};
 
 
-const TUid KUSBDUMMYid={0x20031D70}
+const TUid KUSBDUMMYid={0x20031D70};
 #endif // USBCLASSUIDS_H
diff -r 84c26be382f0 -r bbdce6bffaad usbmgmt/usbmgrautotest/TestExecute/USB/ncm_unit_test/ncmcctest/dummy_ncminternalsrv/group/bld.inf
--- a/usbmgmt/usbmgrautotest/TestExecute/USB/ncm_unit_test/ncmcctest/dummy_ncminternalsrv/group/bld.inf	Tue Oct 19 14:23:03 2010 +0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,29 +0,0 @@
-/*
- * Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
- * All rights reserved.
- * This material, including documentation and any related 
- * computer programs, is protected by copyright controlled by 
- * Nokia. All rights are reserved. Copying, including 
- * reproducing, storing, adapting or translating, any 
- * or all of this material requires the prior written consent of 
- * Nokia. This material also contains confidential 
- * information which may not be disclosed to others without the 
- * prior written consent of Nokia.
- *
- * Initial Contributors:
- * Nokia Corporation - initial contribution.
- *
- * Contributors:
- *
- * Description:  
- *  
- */
-
-PRJ_PLATFORMS
-ARMV5  winscw
-
-PRJ_TESTEXPORTS
-../inc/dummy_ncminternalsrv.h  SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(usb/testncmcc/dummy_ncminternalsrv.h)
-
-PRJ_TESTMMPFILES
-dummy_ncminternalsrv.mmp
diff -r 84c26be382f0 -r bbdce6bffaad usbmgmt/usbmgrautotest/TestExecute/USB/ncm_unit_test/ncmcctest/dummy_ncminternalsrv/group/dummy_ncminternalsrv.mmp
--- a/usbmgmt/usbmgrautotest/TestExecute/USB/ncm_unit_test/ncmcctest/dummy_ncminternalsrv/group/dummy_ncminternalsrv.mmp	Tue Oct 19 14:23:03 2010 +0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,39 +0,0 @@
-/*
- * Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
- * All rights reserved.
- * This material, including documentation and any related 
- * computer programs, is protected by copyright controlled by 
- * Nokia. All rights are reserved. Copying, including 
- * reproducing, storing, adapting or translating, any 
- * or all of this material requires the prior written consent of 
- * Nokia. This material also contains confidential 
- * information which may not be disclosed to others without the 
- * prior written consent of Nokia.
- *
- * Initial Contributors:
- * Nokia Corporation - initial contribution.
- *
- * Contributors:
- *
- * Description:  
- *
- */
-
-TARGET dummy_ncminternalsrv.dll
-TARGETTYPE DLL
-
-UID 0x1000008d 0x2002EA86
-VENDORID 0x70000001
-
-// Being run in usbsvr.exe(usbman)
-CAPABILITY CommDD PowerMgmt TrustedUI ProtServ NetworkControl NetworkServices LocalServices ReadUserData WriteUserData ReadDeviceData WriteDeviceData 
-
-OS_LAYER_SYSTEMINCLUDE_SYMBIAN
-
-SOURCEPATH    ../src
-
-LIBRARY       euser.lib
-
-SOURCE dummy_ncminternalsrv.cpp
-
-USERINCLUDE ../inc ../../inc
diff -r 84c26be382f0 -r bbdce6bffaad usbmgmt/usbmgrtest/ObexClassController/ObexUsbClassController/ClassControllerClientSession/group/ClassControllerClientSession.mmp
--- a/usbmgmt/usbmgrtest/ObexClassController/ObexUsbClassController/ClassControllerClientSession/group/ClassControllerClientSession.mmp	Tue Oct 19 14:23:03 2010 +0800
+++ b/usbmgmt/usbmgrtest/ObexClassController/ObexUsbClassController/ClassControllerClientSession/group/ClassControllerClientSession.mmp	Wed Oct 20 12:04:53 2010 +0800
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2005-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"
@@ -41,4 +41,3 @@
 LIBRARY			euser.lib 
 
 
-
diff -r 84c26be382f0 -r bbdce6bffaad usbmgmt/usbmgrtest/ObexClassController/ObexUsbClassController/ClassControllerServerSession/group/classControllerServerSession.mmp
--- a/usbmgmt/usbmgrtest/ObexClassController/ObexUsbClassController/ClassControllerServerSession/group/classControllerServerSession.mmp	Tue Oct 19 14:23:03 2010 +0800
+++ b/usbmgmt/usbmgrtest/ObexClassController/ObexUsbClassController/ClassControllerServerSession/group/classControllerServerSession.mmp	Wed Oct 20 12:04:53 2010 +0800
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2005-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"
@@ -39,5 +39,3 @@
 LIBRARY		obex.lib
 LIBRARY		c32.lib
 
-
-
diff -r 84c26be382f0 -r bbdce6bffaad usbmgmt/usbmgrtest/ObexClassController/ObexUsbClassController/ObexClassController/conf/obexusbman_101fe1db.txt
Binary file usbmgmt/usbmgrtest/ObexClassController/ObexUsbClassController/ObexClassController/conf/obexusbman_101fe1db.txt has changed
diff -r 84c26be382f0 -r bbdce6bffaad usbmgmt/usbmgrtest/ObexClassController/ObexUsbClassController/ObexClassController/group/CUsbObexClassController.mmp
--- a/usbmgmt/usbmgrtest/ObexClassController/ObexUsbClassController/ObexClassController/group/CUsbObexClassController.mmp	Tue Oct 19 14:23:03 2010 +0800
+++ b/usbmgmt/usbmgrtest/ObexClassController/ObexUsbClassController/ObexClassController/group/CUsbObexClassController.mmp	Wed Oct 20 12:04:53 2010 +0800
@@ -48,5 +48,3 @@
 LIBRARY			efsrv.lib
 
 
-
-
diff -r 84c26be382f0 -r bbdce6bffaad usbmgmt/usbmgrtest/ObexClassController/bld.inf
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usbmgmt/usbmgrtest/ObexClassController/bld.inf	Wed Oct 20 12:04:53 2010 +0800
@@ -0,0 +1,20 @@
+/*
+* 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
diff -r 84c26be382f0 -r bbdce6bffaad usbmgmt/usbmgrtest/ObexClassController/test/group/simpleObexApp.mmp
--- a/usbmgmt/usbmgrtest/ObexClassController/test/group/simpleObexApp.mmp	Tue Oct 19 14:23:03 2010 +0800
+++ b/usbmgmt/usbmgrtest/ObexClassController/test/group/simpleObexApp.mmp	Wed Oct 20 12:04:53 2010 +0800
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2005-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"
@@ -52,5 +52,3 @@
 MACRO TRANSPORT_IRDA // Comment this out if OBEX is not to be used over IrDA
 
 CAPABILITY All -Tcb 
-
-
diff -r 84c26be382f0 -r bbdce6bffaad usbmgmt/usbmgrtest/T_usb/group/T_usb.mmp
--- a/usbmgmt/usbmgrtest/T_usb/group/T_usb.mmp	Tue Oct 19 14:23:03 2010 +0800
+++ b/usbmgmt/usbmgrtest/T_usb/group/T_usb.mmp	Wed Oct 20 12:04:53 2010 +0800
@@ -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"
@@ -36,4 +36,3 @@
 
 LIBRARY       euser.lib usbman.lib c32.lib 		// EPOC stuff
 LIBRARY	      integrationtestutils.lib 			// Test utils stuff
-
diff -r 84c26be382f0 -r bbdce6bffaad usbmgmt/usbmgrtest/csy/t_ecacm/group/T_csyaccess.mmp
--- a/usbmgmt/usbmgrtest/csy/t_ecacm/group/T_csyaccess.mmp	Tue Oct 19 14:23:03 2010 +0800
+++ b/usbmgmt/usbmgrtest/csy/t_ecacm/group/T_csyaccess.mmp	Wed Oct 20 12:04:53 2010 +0800
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2001-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"
diff -r 84c26be382f0 -r bbdce6bffaad usbmgmt/usbmgrtest/group/usb_test.mrp
--- a/usbmgmt/usbmgrtest/group/usb_test.mrp	Tue Oct 19 14:23:03 2010 +0800
+++ b/usbmgmt/usbmgrtest/group/usb_test.mrp	Wed Oct 20 12:04:53 2010 +0800
@@ -17,9 +17,9 @@
 
 component	usb_test
 
-source	\sf\os\usb\usbmgmt\usbmgrtest
+source	/sf/os/usb/usbmgmt/usbmgrtest
 
-notes_source	\component_defs\release.src
+notes_source	/component_defs/release.src
 
 
 
diff -r 84c26be382f0 -r bbdce6bffaad usbmgmt/usbmgrtest/showcaps/group/showcaps.mmp
--- a/usbmgmt/usbmgrtest/showcaps/group/showcaps.mmp	Tue Oct 19 14:23:03 2010 +0800
+++ b/usbmgmt/usbmgrtest/showcaps/group/showcaps.mmp	Wed Oct 20 12:04:53 2010 +0800
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 1997-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 1997-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"
@@ -23,5 +23,4 @@
 LIBRARY        euser.lib c32.lib
 OS_LAYER_SYSTEMINCLUDE_SYMBIAN
 
-
 VENDORID 0x70000001
diff -r 84c26be382f0 -r bbdce6bffaad usbmgmt/usbmgrtest/startusb/group/startusb.mmp
--- a/usbmgmt/usbmgrtest/startusb/group/startusb.mmp	Tue Oct 19 14:23:03 2010 +0800
+++ b/usbmgmt/usbmgrtest/startusb/group/startusb.mmp	Wed Oct 20 12:04:53 2010 +0800
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 1997-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 1997-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"
diff -r 84c26be382f0 -r bbdce6bffaad usbmgmt/usbmgrtest/startusb2/group/startusb2.mmp
--- a/usbmgmt/usbmgrtest/startusb2/group/startusb2.mmp	Tue Oct 19 14:23:03 2010 +0800
+++ b/usbmgmt/usbmgrtest/startusb2/group/startusb2.mmp	Wed Oct 20 12:04:53 2010 +0800
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 1997-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 1997-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"
diff -r 84c26be382f0 -r bbdce6bffaad usbmgmt/usbmgrtest/stopusb/group/stopusb.mmp
--- a/usbmgmt/usbmgrtest/stopusb/group/stopusb.mmp	Tue Oct 19 14:23:03 2010 +0800
+++ b/usbmgmt/usbmgrtest/stopusb/group/stopusb.mmp	Wed Oct 20 12:04:53 2010 +0800
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 1997-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 1997-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"
diff -r 84c26be382f0 -r bbdce6bffaad usbmgmt/usbmgrtest/t_acm/group/t_acm.mmp
--- a/usbmgmt/usbmgrtest/t_acm/group/t_acm.mmp	Tue Oct 19 14:23:03 2010 +0800
+++ b/usbmgmt/usbmgrtest/t_acm/group/t_acm.mmp	Wed Oct 20 12:04:53 2010 +0800
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 1997-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 1997-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"
@@ -24,4 +24,3 @@
 SOURCE		t_acm.cpp
 LIBRARY		euser.lib c32.lib usbman.lib
 OS_LAYER_SYSTEMINCLUDE_SYMBIAN
-
diff -r 84c26be382f0 -r bbdce6bffaad usbmgmt/usbmgrtest/t_acm_cc/group/t_acm_cc.mmp
--- a/usbmgmt/usbmgrtest/t_acm_cc/group/t_acm_cc.mmp	Tue Oct 19 14:23:03 2010 +0800
+++ b/usbmgmt/usbmgrtest/t_acm_cc/group/t_acm_cc.mmp	Wed Oct 20 12:04:53 2010 +0800
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 1997-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 1997-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"
@@ -22,5 +22,4 @@
 LIBRARY        euser.lib efsrv.lib c32.lib usbman.lib
 OS_LAYER_SYSTEMINCLUDE_SYMBIAN
 
-
 VENDORID 0x70000001
diff -r 84c26be382f0 -r bbdce6bffaad usbmgmt/usbmgrtest/t_acm_pub_sub/group/t_acm_pub_sub.iby
--- a/usbmgmt/usbmgrtest/t_acm_pub_sub/group/t_acm_pub_sub.iby	Tue Oct 19 14:23:03 2010 +0800
+++ b/usbmgmt/usbmgrtest/t_acm_pub_sub/group/t_acm_pub_sub.iby	Wed Oct 20 12:04:53 2010 +0800
@@ -19,8 +19,8 @@
 #ifndef __ACM_PUB_SUB_IBY__
 #define __ACM_PUB_SUB_IBY__
 
-file=ABI_DIR\BUILD_DIR\t_acm_pub_sub.exe	                     		Sys\Bin\t_acm_pub_sub.exe
+file=ABI_DIR/BUILD_DIR/t_acm_pub_sub.exe	                     		sys/bin/t_acm_pub_sub.exe
 
-data=EPOCROOT##epoc32\data\z\private\101fe1db\NumberOfAcmFunctions.ini		private\101fe1db\NumberOfAcmFunctions.ini
+data=EPOCROOT##epoc32/data/z/private/101fe1db/NumberOfAcmFunctions.ini		private/101fe1db/NumberOfAcmFunctions.ini
 
 #endif
\ No newline at end of file
diff -r 84c26be382f0 -r bbdce6bffaad usbmgmt/usbmgrtest/t_acm_pub_sub/group/t_acm_pub_sub.mmp
--- a/usbmgmt/usbmgrtest/t_acm_pub_sub/group/t_acm_pub_sub.mmp	Tue Oct 19 14:23:03 2010 +0800
+++ b/usbmgmt/usbmgrtest/t_acm_pub_sub/group/t_acm_pub_sub.mmp	Wed Oct 20 12:04:53 2010 +0800
@@ -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"
@@ -21,14 +21,14 @@
 TARGETTYPE    exe
 UID           0
 
-SOURCEPATH    ..\src
+SOURCEPATH    ../src
 SOURCE        t_acm_pub_sub.cpp
 
-USERINCLUDE   ..\inc
-SYSTEMINCLUDE \Epoc32\include
-SYSTEMINCLUDE \Epoc32\include\usb
-SYSTEMINCLUDE \Epoc32\include\test
+USERINCLUDE   ../inc
+OS_LAYER_SYSTEMINCLUDE_SYMBIAN 
+SYSTEMINCLUDE /epoc32/include/usb
+SYSTEMINCLUDE /epoc32/include/test
 
-LIBRARY       EUSER.LIB EFSRV.LIB c32.lib usbman.lib acmserver.lib
+LIBRARY       euser.lib efsrv.lib c32.lib usbman.lib acmserver.lib
 
 
diff -r 84c26be382f0 -r bbdce6bffaad usbmgmt/usbmgrtest/t_acm_spec/group/t_acm_spec.mmp
--- a/usbmgmt/usbmgrtest/t_acm_spec/group/t_acm_spec.mmp	Tue Oct 19 14:23:03 2010 +0800
+++ b/usbmgmt/usbmgrtest/t_acm_spec/group/t_acm_spec.mmp	Wed Oct 20 12:04:53 2010 +0800
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 1997-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 1997-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"
@@ -23,4 +23,3 @@
 SOURCE		t_acm_spec.cpp
 LIBRARY		euser.lib c32.lib usbman.lib
 OS_LAYER_SYSTEMINCLUDE_SYMBIAN
-
diff -r 84c26be382f0 -r bbdce6bffaad usbmgmt/usbmgrtest/t_acm_wins/group/t_acm_wins.mmp
--- a/usbmgmt/usbmgrtest/t_acm_wins/group/t_acm_wins.mmp	Tue Oct 19 14:23:03 2010 +0800
+++ b/usbmgmt/usbmgrtest/t_acm_wins/group/t_acm_wins.mmp	Wed Oct 20 12:04:53 2010 +0800
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 1997-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 1997-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"
diff -r 84c26be382f0 -r bbdce6bffaad usbmgmt/usbmgrtest/t_catc/group/t_catc.mmp
--- a/usbmgmt/usbmgrtest/t_catc/group/t_catc.mmp	Tue Oct 19 14:23:03 2010 +0800
+++ b/usbmgmt/usbmgrtest/t_catc/group/t_catc.mmp	Wed Oct 20 12:04:53 2010 +0800
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 1997-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 1997-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"
@@ -24,4 +24,3 @@
 SOURCE		t_catc.cpp
 LIBRARY		euser.lib c32.lib usbman.lib
 OS_LAYER_SYSTEMINCLUDE_SYMBIAN
-
diff -r 84c26be382f0 -r bbdce6bffaad usbmgmt/usbmgrtest/t_charging_arm/group/t_usbchargingarm.mmp
--- a/usbmgmt/usbmgrtest/t_charging_arm/group/t_usbchargingarm.mmp	Tue Oct 19 14:23:03 2010 +0800
+++ b/usbmgmt/usbmgrtest/t_charging_arm/group/t_usbchargingarm.mmp	Wed Oct 20 12:04:53 2010 +0800
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2006-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"
@@ -25,9 +25,9 @@
 CAPABILITY		ALL -Tcb
 
 SOURCEPATH              ../src
-SOURCE			activetest.CPP
-SOURCE			activeconsole.CPP
-SOURCE			testbase.CPP
+SOURCE			activetest.cpp
+SOURCE			activeconsole.cpp
+SOURCE			testbase.cpp
 
 // -- Add specific test files here.
 SOURCE			usbchargingarmtest.cpp
diff -r 84c26be382f0 -r bbdce6bffaad usbmgmt/usbmgrtest/t_charging_emu/group/tbatterycharging.mmp
--- a/usbmgmt/usbmgrtest/t_charging_emu/group/tbatterycharging.mmp	Tue Oct 19 14:23:03 2010 +0800
+++ b/usbmgmt/usbmgrtest/t_charging_emu/group/tbatterycharging.mmp	Wed Oct 20 12:04:53 2010 +0800
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2005-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"
diff -r 84c26be382f0 -r bbdce6bffaad usbmgmt/usbmgrtest/t_charging_emu/group/tbatterychargingrepositorywriter.mmp
--- a/usbmgmt/usbmgrtest/t_charging_emu/group/tbatterychargingrepositorywriter.mmp	Tue Oct 19 14:23:03 2010 +0800
+++ b/usbmgmt/usbmgrtest/t_charging_emu/group/tbatterychargingrepositorywriter.mmp	Wed Oct 20 12:04:53 2010 +0800
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2008-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"
diff -r 84c26be382f0 -r bbdce6bffaad usbmgmt/usbmgrtest/t_headlessecacm/group/t_headlessecacm.mmp
--- a/usbmgmt/usbmgrtest/t_headlessecacm/group/t_headlessecacm.mmp	Tue Oct 19 14:23:03 2010 +0800
+++ b/usbmgmt/usbmgrtest/t_headlessecacm/group/t_headlessecacm.mmp	Wed Oct 20 12:04:53 2010 +0800
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 1997-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 1997-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"
@@ -70,13 +70,12 @@
 LIBRARY			efsrv.lib
 
 #ifdef WINS
-DEFFILE			..\..\..\usbmgr\usb\csy\bmarm\ecacm.def
+DEFFILE			../../../usbmgr/usb/csy/bmarm/ecacm.def
 #else
-DEFFILE			..\..\..\usbmgr\usb\csy\bwins\ecacm.def
+DEFFILE			../../../usbmgr/usb/csy/bwins/ecacm.def
 #endif
 
 // Define this macro to build a 'headless' ACM, which, when you do a Read or 
 // ReadOneOrMore, Writes the data back to the LDD. This is used for 
 // performance testing at the level of RDevUsbcClient.
 MACRO __HEADLESS_ACM_TEST_CODE__
-
diff -r 84c26be382f0 -r bbdce6bffaad usbmgmt/usbmgrtest/t_multi_acm/group/t_multi_acm.mmp
--- a/usbmgmt/usbmgrtest/t_multi_acm/group/t_multi_acm.mmp	Tue Oct 19 14:23:03 2010 +0800
+++ b/usbmgmt/usbmgrtest/t_multi_acm/group/t_multi_acm.mmp	Wed Oct 20 12:04:53 2010 +0800
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 1997-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 1997-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"
@@ -22,4 +22,3 @@
 SOURCE          t_multiple_acm.cpp
 LIBRARY		euser.lib c32.lib usbman.lib
 OS_LAYER_SYSTEMINCLUDE_SYMBIAN
-
diff -r 84c26be382f0 -r bbdce6bffaad usbmgmt/usbmgrtest/t_ncm/netutil/client.pl
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usbmgmt/usbmgrtest/t_ncm/netutil/client.pl	Wed Oct 20 12:04:53 2010 +0800
@@ -0,0 +1,56 @@
+#!/usr/bin/perl -w
+# Copyright (c) 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"
+# 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:
+#
+
+use strict;
+use IO::Socket qw(:DEFAULT :crlf);
+
+use constant DEFAULT_ADDR	=> '192.168.3.100';
+use constant MY_ECHO_PORT	=> 5000;
+my ($byte_out, $byte_in) = (0,0);
+$/ = "\n";
+$| = 1;
+
+print "\nUsage: client.pl tcp|udp [ip] [port]\n\n";
+
+my $quit = 0;
+$SIG{INT}  = sub { $quit++ };
+
+my $tcp = shift;
+my $address = shift || DEFAULT_ADDR;
+my $port = shift || MY_ECHO_PORT;
+
+print "\nTry to connect to a $tcp server of $address:$port...\n";
+
+my $sock = IO::Socket::INET->new(PeerAddr => $address,
+                                 PeerPort => $port,
+                                 Proto  => $tcp)
+            or die "Can't connect: $!\n";
+
+while (my $msg_out = <>)
+{
+    last if $msg_out =~ /^\.$/;
+    print "out: $msg_out\n";
+    $sock->send($msg_out);
+
+    my $msg_in;
+    $sock->recv($msg_in, 10000);
+    print "in: $msg_in\n";
+}
+
+close $sock;
+
+
+
diff -r 84c26be382f0 -r bbdce6bffaad usbmgmt/usbmgrtest/t_ncm/netutil/server.pl
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usbmgmt/usbmgrtest/t_ncm/netutil/server.pl	Wed Oct 20 12:04:53 2010 +0800
@@ -0,0 +1,87 @@
+#!/usr/bin/perl -w
+# Copyright (c) 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"
+# 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:
+#
+use strict;
+use IO::Socket qw(:DEFAULT :crlf);
+
+use constant MY_ECHO_PORT	=> 5000;
+$/ = "\n";
+$| = 1;
+my $tcp = 0;
+print "\nUsage: server.pl tcp|udp [port]\n\n";
+
+my ($byte_out, $byte_in) = (0,0);
+
+my $quit = 0;
+$SIG{INT}  = sub { $quit++ };
+
+my $tcp = shift eq 'tcp';
+my $port = shift || MY_ECHO_PORT;
+my $sock;
+
+if ($tcp)
+{
+    my $sock = IO::Socket::INET->new (
+	Listen	=> 20,
+	LocalPort => $port,
+	Timeout	=> 60*60,
+	Reuse	=> 1 )
+	or die "Can not create listening socket: $!\n";
+    warn "waiting for the incoming connections on port $port...\n";
+
+    while ($tcp and !$quit) {
+	next unless my $session = $sock->accept;
+	my $peer = gethostbyaddr($session->peeraddr, AF_INET) || $session->peerhost;
+	warn "Connection from [$peer, $port]\n";
+
+	while(<$session>) {
+	    $byte_in += length($_);
+	    chomp;
+	    print "in: $_\n";
+	    my $msg_out = (scalar reverse $_) . CRLF;
+	    print "send back: $msg_out";
+	    print $session $msg_out;
+	    $byte_out += length($msg_out);
+	}
+	warn "Connection from [$peer, $port] finished\n";
+	close $session;
+    }
+}
+
+if (not $tcp)
+{
+    my $sock = IO::Socket::INET->new(
+	LocalPort  => $port,
+	Type   => SOCK_DGRAM,
+	Proto  => 'udp') or die "Can't connect: $!\n";
+
+    warn "waiting for the incoming udp data on port $port...\n";
+
+    while (!$quit) {
+	my $msg_in;
+	$sock->recv($msg_in, 10000);
+	$byte_in += length($msg_in);
+	chomp($msg_in);
+	print "in: $msg_in\n";
+	my $msg_out = (scalar reverse $msg_in) . CRLF;
+	print "send back: $msg_out";
+	$sock->send($msg_out);
+	$byte_out += length($msg_out);
+    }
+}
+
+print STDERR "out = $byte_out, in = $byte_in\n";
+close $sock;
+
diff -r 84c26be382f0 -r bbdce6bffaad usbmgmt/usbmgrtest/t_termusb/group/t_termusb.mmp
--- a/usbmgmt/usbmgrtest/t_termusb/group/t_termusb.mmp	Tue Oct 19 14:23:03 2010 +0800
+++ b/usbmgmt/usbmgrtest/t_termusb/group/t_termusb.mmp	Wed Oct 20 12:04:53 2010 +0800
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 1997-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 1997-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"
diff -r 84c26be382f0 -r bbdce6bffaad usbmgmt/usbmgrtest/t_termusb2/group/t_termusb2.mmp
--- a/usbmgmt/usbmgrtest/t_termusb2/group/t_termusb2.mmp	Tue Oct 19 14:23:03 2010 +0800
+++ b/usbmgmt/usbmgrtest/t_termusb2/group/t_termusb2.mmp	Wed Oct 20 12:04:53 2010 +0800
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 1997-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 1997-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"
@@ -27,5 +27,4 @@
 
 OS_LAYER_SYSTEMINCLUDE_SYMBIAN
 
-
 VENDORID 0x70000001
diff -r 84c26be382f0 -r bbdce6bffaad usbmgmt/usbmgrtest/t_usb_cable_detect/group/t_usb_cable_detect.mmp
--- a/usbmgmt/usbmgrtest/t_usb_cable_detect/group/t_usb_cable_detect.mmp	Tue Oct 19 14:23:03 2010 +0800
+++ b/usbmgmt/usbmgrtest/t_usb_cable_detect/group/t_usb_cable_detect.mmp	Wed Oct 20 12:04:53 2010 +0800
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2003-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2003-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"
diff -r 84c26be382f0 -r bbdce6bffaad usbmgmt/usbmgrtest/t_usb_charging/group/t_usbcharging.mmp
--- a/usbmgmt/usbmgrtest/t_usb_charging/group/t_usbcharging.mmp	Tue Oct 19 14:23:03 2010 +0800
+++ b/usbmgmt/usbmgrtest/t_usb_charging/group/t_usbcharging.mmp	Wed Oct 20 12:04:53 2010 +0800
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2006-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"
diff -r 84c26be382f0 -r bbdce6bffaad usbmgmt/usbmgrtest/t_usb_charging/group/t_usbcharging_cmdparam.mmp
--- a/usbmgmt/usbmgrtest/t_usb_charging/group/t_usbcharging_cmdparam.mmp	Tue Oct 19 14:23:03 2010 +0800
+++ b/usbmgmt/usbmgrtest/t_usb_charging/group/t_usbcharging_cmdparam.mmp	Wed Oct 20 12:04:53 2010 +0800
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2006-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"
@@ -39,4 +39,3 @@
 LIBRARY			usbman.lib
 LIBRARY			esock.lib
 LIBRARY			efsrv.lib
-
diff -r 84c26be382f0 -r bbdce6bffaad usbmgmt/usbmgrtest/t_usb_charging/inc/usbchargingcurrentwatcher.h
--- a/usbmgmt/usbmgrtest/t_usb_charging/inc/usbchargingcurrentwatcher.h	Tue Oct 19 14:23:03 2010 +0800
+++ b/usbmgmt/usbmgrtest/t_usb_charging/inc/usbchargingcurrentwatcher.h	Wed Oct 20 12:04:53 2010 +0800
@@ -1,17 +1,19 @@
-// Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of the License "Symbian Foundation License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.symbianfoundation.org/legal/sfl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-//
+/*
+* Copyright (c) 2006-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"
+* 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:
+*
+*/
 
 #ifndef __USBCHARGINGCURRENTWATCHER_H__
 #define __USBCHARGINGCURRENTWATCHER_H__
diff -r 84c26be382f0 -r bbdce6bffaad usbmgmt/usbmgrtest/t_usb_charging/inc/usbstatewatcher.h
--- a/usbmgmt/usbmgrtest/t_usb_charging/inc/usbstatewatcher.h	Tue Oct 19 14:23:03 2010 +0800
+++ b/usbmgmt/usbmgrtest/t_usb_charging/inc/usbstatewatcher.h	Wed Oct 20 12:04:53 2010 +0800
@@ -1,17 +1,19 @@
-// Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of the License "Symbian Foundation License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.symbianfoundation.org/legal/sfl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-//
+/*
+* Copyright (c) 2006-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"
+* 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:
+*
+*/
 
 #ifndef __USBSTATEWATCHER_H__
 #define __USBSTATEWATCHER_H__
diff -r 84c26be382f0 -r bbdce6bffaad usbmgmt/usbmgrtest/t_usb_charging/src/usbchargingcurrentwatcher.cpp
--- a/usbmgmt/usbmgrtest/t_usb_charging/src/usbchargingcurrentwatcher.cpp	Tue Oct 19 14:23:03 2010 +0800
+++ b/usbmgmt/usbmgrtest/t_usb_charging/src/usbchargingcurrentwatcher.cpp	Wed Oct 20 12:04:53 2010 +0800
@@ -1,17 +1,20 @@
-// Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of the License "Symbian Foundation License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.symbianfoundation.org/legal/sfl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-//
+/*
+* Copyright (c) 2006-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"
+* 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 <e32cmn.h>
 #include <e32debug.h>
diff -r 84c26be382f0 -r bbdce6bffaad usbmgmt/usbmgrtest/t_usb_charging/src/usbstatewatcher.cpp
--- a/usbmgmt/usbmgrtest/t_usb_charging/src/usbstatewatcher.cpp	Tue Oct 19 14:23:03 2010 +0800
+++ b/usbmgmt/usbmgrtest/t_usb_charging/src/usbstatewatcher.cpp	Wed Oct 20 12:04:53 2010 +0800
@@ -1,17 +1,19 @@
-// Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of the License "Symbian Foundation License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.symbianfoundation.org/legal/sfl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-//
+/*
+* Copyright (c) 2006-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"
+* 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 "usbstatewatcher.h"
 #include <e32cmn.h>
diff -r 84c26be382f0 -r bbdce6bffaad usbmgmt/usbmgrtest/t_usb_charging/traces/OstTraceDefinitions.h
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usbmgmt/usbmgrtest/t_usb_charging/traces/OstTraceDefinitions.h	Wed Oct 20 12:04:53 2010 +0800
@@ -0,0 +1,7 @@
+#ifndef __OSTTRACEDEFINITIONS_H__
+#define __OSTTRACEDEFINITIONS_H__
+// OST_TRACE_COMPILER_IN_USE flag has been added by Trace Compiler
+// REMOVE BEFORE CHECK-IN TO VERSION CONTROL
+//#define OST_TRACE_COMPILER_IN_USE
+#include <opensystemtrace.h>
+#endif
diff -r 84c26be382f0 -r bbdce6bffaad usbmgmt/usbmgrtest/t_usb_charging/traces/fixed_id.definitions
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usbmgmt/usbmgrtest/t_usb_charging/traces/fixed_id.definitions	Wed Oct 20 12:04:53 2010 +0800
@@ -0,0 +1,116 @@
+#Fixed group and trace id definitions. If this file is removed, the identifiers are rebuilt.
+[GROUP]TRACE_ERROR=0x82
+[GROUP]TRACE_FLOW=0x8a
+[GROUP]TRACE_NORMAL=0x86
+[TRACE]TRACE_ERROR[0x82]_DUP1_CUSBCHARGINGARMTEST_STARTMASSSTORAGE=0x1
+[TRACE]TRACE_ERROR[0x82]_DUP2_CUSBCHARGINGARMTEST_STARTMASSSTORAGE=0x2
+[TRACE]TRACE_FLOW[0x8A]_CACTIVECONSOLE_CACTIVECONSOLE_ENTRY=0x1
+[TRACE]TRACE_FLOW[0x8A]_CACTIVECONSOLE_CACTIVECONSOLE_EXIT=0x2
+[TRACE]TRACE_FLOW[0x8A]_CACTIVECONSOLE_CONSTRUCTL_ENTRY=0x5
+[TRACE]TRACE_FLOW[0x8A]_CACTIVECONSOLE_CONSTRUCTL_EXIT=0x6
+[TRACE]TRACE_FLOW[0x8A]_CACTIVECONSOLE_DISPLAYMAINMENU_ENTRY=0x14
+[TRACE]TRACE_FLOW[0x8A]_CACTIVECONSOLE_DISPLAYMAINMENU_EXIT=0x15
+[TRACE]TRACE_FLOW[0x8A]_CACTIVECONSOLE_DOACTIONKEYL_ENTRY=0xf
+[TRACE]TRACE_FLOW[0x8A]_CACTIVECONSOLE_DOACTIONKEYL_EXIT=0x10
+[TRACE]TRACE_FLOW[0x8A]_CACTIVECONSOLE_DOCANCEL_ENTRY=0x9
+[TRACE]TRACE_FLOW[0x8A]_CACTIVECONSOLE_DOCANCEL_EXIT=0xa
+[TRACE]TRACE_FLOW[0x8A]_CACTIVECONSOLE_GETCH_ENTRY=0x1a
+[TRACE]TRACE_FLOW[0x8A]_CACTIVECONSOLE_GETNUMBERL_ENTRY=0x21
+[TRACE]TRACE_FLOW[0x8A]_CACTIVECONSOLE_GETNUMBERL_EXIT=0x22
+[TRACE]TRACE_FLOW[0x8A]_CACTIVECONSOLE_NEWLC_ENTRY=0x3
+[TRACE]TRACE_FLOW[0x8A]_CACTIVECONSOLE_NEWLC_EXIT=0x4
+[TRACE]TRACE_FLOW[0x8A]_CACTIVECONSOLE_REQUESTCHARACTER_ENTRY=0x12
+[TRACE]TRACE_FLOW[0x8A]_CACTIVECONSOLE_REQUESTCHARACTER_EXIT=0x13
+[TRACE]TRACE_FLOW[0x8A]_CACTIVECONSOLE_RUNERROR_ENTRY=0x1f
+[TRACE]TRACE_FLOW[0x8A]_CACTIVECONSOLE_RUNERROR_EXIT=0x20
+[TRACE]TRACE_FLOW[0x8A]_CACTIVECONSOLE_RUNL_ENTRY=0xd
+[TRACE]TRACE_FLOW[0x8A]_CACTIVECONSOLE_RUNL_EXIT=0xe
+[TRACE]TRACE_FLOW[0x8A]_CACTIVECONSOLE_SELECTTESTL_ENTRY=0x1b
+[TRACE]TRACE_FLOW[0x8A]_CACTIVECONSOLE_SELECTTESTL_EXIT=0x1c
+[TRACE]TRACE_FLOW[0x8A]_CACTIVECONSOLE_STOPCURRENTTEST_ENTRY=0xb
+[TRACE]TRACE_FLOW[0x8A]_CACTIVECONSOLE_STOPCURRENTTEST_EXIT=0xc
+[TRACE]TRACE_FLOW[0x8A]_CACTIVECONSOLE_TESTFINISHED_ENTRY=0x1d
+[TRACE]TRACE_FLOW[0x8A]_CACTIVECONSOLE_TESTFINISHED_EXIT=0x1e
+[TRACE]TRACE_FLOW[0x8A]_CACTIVECONSOLE_WRITENORETURN_ENTRY=0x18
+[TRACE]TRACE_FLOW[0x8A]_CACTIVECONSOLE_WRITENORETURN_EXIT=0x19
+[TRACE]TRACE_FLOW[0x8A]_CACTIVECONSOLE_WRITE_ENTRY=0x16
+[TRACE]TRACE_FLOW[0x8A]_CACTIVECONSOLE_WRITE_EXIT=0x17
+[TRACE]TRACE_FLOW[0x8A]_CTESTBASE_CTESTBASE_ENTRY=0x27
+[TRACE]TRACE_FLOW[0x8A]_CTESTBASE_CTESTBASE_EXIT=0x28
+[TRACE]TRACE_FLOW[0x8A]_CTESTBASE_PROCESSKEYL_ENTRY=0x2b
+[TRACE]TRACE_FLOW[0x8A]_CTESTBASE_PROCESSKEYL_EXIT=0x2c
+[TRACE]TRACE_FLOW[0x8A]_CUSBCHARGINGARMTEST_CONSTRUCTL_ENTRY=0x39
+[TRACE]TRACE_FLOW[0x8A]_CUSBCHARGINGARMTEST_CONSTRUCTL_EXIT=0x3a
+[TRACE]TRACE_FLOW[0x8A]_CUSBCHARGINGARMTEST_CUSBCHARGINGARMTEST_ENTRY=0x30
+[TRACE]TRACE_FLOW[0x8A]_CUSBCHARGINGARMTEST_CUSBCHARGINGARMTEST_EXIT=0x31
+[TRACE]TRACE_FLOW[0x8A]_CUSBCHARGINGARMTEST_DISPLAYTESTSPECIFICMENU_ENTRY=0x3f
+[TRACE]TRACE_FLOW[0x8A]_CUSBCHARGINGARMTEST_DISPLAYTESTSPECIFICMENU_EXIT=0x40
+[TRACE]TRACE_FLOW[0x8A]_CUSBCHARGINGARMTEST_NEWL_ENTRY=0x33
+[TRACE]TRACE_FLOW[0x8A]_CUSBCHARGINGARMTEST_NEWL_EXIT=0x34
+[TRACE]TRACE_FLOW[0x8A]_CUSBCHARGINGARMTEST_PROCESSKEYL_ENTRY=0x3d
+[TRACE]TRACE_FLOW[0x8A]_CUSBCHARGINGARMTEST_PROCESSKEYL_EXIT=0x3e
+[TRACE]TRACE_FLOW[0x8A]_CUSBCHARGINGARMTEST_SHOWCHARGINGTYPE_ENTRY=0x45
+[TRACE]TRACE_FLOW[0x8A]_CUSBCHARGINGARMTEST_SHOWCHARGINGTYPE_EXIT=0x46
+[TRACE]TRACE_FLOW[0x8A]_CUSBCHARGINGARMTEST_SHOWCONNSTATUS_ENTRY=0x47
+[TRACE]TRACE_FLOW[0x8A]_CUSBCHARGINGARMTEST_SHOWCONNSTATUS_EXIT=0x48
+[TRACE]TRACE_FLOW[0x8A]_CUSBCHARGINGARMTEST_SHOWUSBCHARGINGVALUE_ENTRY=0x41
+[TRACE]TRACE_FLOW[0x8A]_CUSBCHARGINGARMTEST_SHOWUSBCHARGINGVALUE_EXIT=0x42
+[TRACE]TRACE_FLOW[0x8A]_CUSBCHARGINGARMTEST_SHOWUSBDEVICESTATE_ENTRY=0x43
+[TRACE]TRACE_FLOW[0x8A]_CUSBCHARGINGARMTEST_SHOWUSBDEVICESTATE_EXIT=0x44
+[TRACE]TRACE_FLOW[0x8A]_CUSBCHARGINGARMTEST_STARTMASSSTORAGE_ENTRY=0x35
+[TRACE]TRACE_FLOW[0x8A]_CUSBCHARGINGARMTEST_STARTMASSSTORAGE_EXIT=0x36
+[TRACE]TRACE_FLOW[0x8A]_CUSBCHARGINGCURRENTWATCHER_CONSTRUCTL_ENTRY=0x4f
+[TRACE]TRACE_FLOW[0x8A]_CUSBCHARGINGCURRENTWATCHER_CONSTRUCTL_EXIT=0x50
+[TRACE]TRACE_FLOW[0x8A]_CUSBCHARGINGCURRENTWATCHER_CUSBCHARGINGCURRENTWATCHER_ENTRY=0x4b
+[TRACE]TRACE_FLOW[0x8A]_CUSBCHARGINGCURRENTWATCHER_CUSBCHARGINGCURRENTWATCHER_EXIT=0x4c
+[TRACE]TRACE_FLOW[0x8A]_CUSBCHARGINGCURRENTWATCHER_DOCANCEL_ENTRY=0x51
+[TRACE]TRACE_FLOW[0x8A]_CUSBCHARGINGCURRENTWATCHER_DOCANCEL_EXIT=0x52
+[TRACE]TRACE_FLOW[0x8A]_CUSBCHARGINGCURRENTWATCHER_NEWL_ENTRY=0x49
+[TRACE]TRACE_FLOW[0x8A]_CUSBCHARGINGCURRENTWATCHER_NEWL_EXIT=0x4a
+[TRACE]TRACE_FLOW[0x8A]_CUSBCHARGINGCURRENTWATCHER_POSTANDNOTIFYCURRENTL_ENTRY=0x55
+[TRACE]TRACE_FLOW[0x8A]_CUSBCHARGINGCURRENTWATCHER_POSTANDNOTIFYCURRENTL_EXIT=0x56
+[TRACE]TRACE_FLOW[0x8A]_CUSBCHARGINGCURRENTWATCHER_RUNL_ENTRY=0x53
+[TRACE]TRACE_FLOW[0x8A]_CUSBCHARGINGCURRENTWATCHER_RUNL_EXIT=0x54
+[TRACE]TRACE_FLOW[0x8A]_CUSBSTATEWATCHER_CONSTRUCTL_ENTRY=0x5d
+[TRACE]TRACE_FLOW[0x8A]_CUSBSTATEWATCHER_CONSTRUCTL_EXIT=0x5e
+[TRACE]TRACE_FLOW[0x8A]_CUSBSTATEWATCHER_CUSBSTATEWATCHER_ENTRY=0x59
+[TRACE]TRACE_FLOW[0x8A]_CUSBSTATEWATCHER_CUSBSTATEWATCHER_EXIT=0x5a
+[TRACE]TRACE_FLOW[0x8A]_CUSBSTATEWATCHER_DOCANCEL_ENTRY=0x5f
+[TRACE]TRACE_FLOW[0x8A]_CUSBSTATEWATCHER_DOCANCEL_EXIT=0x60
+[TRACE]TRACE_FLOW[0x8A]_CUSBSTATEWATCHER_GETANDSHOWDEVICESTATEL_ENTRY=0x63
+[TRACE]TRACE_FLOW[0x8A]_CUSBSTATEWATCHER_GETANDSHOWDEVICESTATEL_EXIT=0x64
+[TRACE]TRACE_FLOW[0x8A]_CUSBSTATEWATCHER_NEWL_ENTRY=0x57
+[TRACE]TRACE_FLOW[0x8A]_CUSBSTATEWATCHER_NEWL_EXIT=0x58
+[TRACE]TRACE_FLOW[0x8A]_CUSBSTATEWATCHER_RUNL_ENTRY=0x61
+[TRACE]TRACE_FLOW[0x8A]_CUSBSTATEWATCHER_RUNL_EXIT=0x62
+[TRACE]TRACE_FLOW[0x8A]_DUP1_CACTIVECONSOLE_CACTIVECONSOLE_ENTRY=0x7
+[TRACE]TRACE_FLOW[0x8A]_DUP1_CACTIVECONSOLE_CACTIVECONSOLE_EXIT=0x8
+[TRACE]TRACE_FLOW[0x8A]_DUP1_CACTIVECONSOLE_DOACTIONKEYL_EXIT=0x11
+[TRACE]TRACE_FLOW[0x8A]_DUP1_CTESTBASE_CTESTBASE_ENTRY=0x29
+[TRACE]TRACE_FLOW[0x8A]_DUP1_CTESTBASE_CTESTBASE_EXIT=0x2a
+[TRACE]TRACE_FLOW[0x8A]_DUP1_CTESTBASE_PROCESSKEYL_ENTRY=0x2d
+[TRACE]TRACE_FLOW[0x8A]_DUP1_CTESTBASE_PROCESSKEYL_EXIT=0x2e
+[TRACE]TRACE_FLOW[0x8A]_DUP1_CUSBCHARGINGARMTEST_CUSBCHARGINGARMTEST_ENTRY=0x2f
+[TRACE]TRACE_FLOW[0x8A]_DUP1_CUSBCHARGINGARMTEST_CUSBCHARGINGARMTEST_EXIT=0x32
+[TRACE]TRACE_FLOW[0x8A]_DUP1_CUSBCHARGINGARMTEST_STARTMASSSTORAGE_EXIT=0x37
+[TRACE]TRACE_FLOW[0x8A]_DUP1_CUSBCHARGINGCURRENTWATCHER_CUSBCHARGINGCURRENTWATCHER_ENTRY=0x4d
+[TRACE]TRACE_FLOW[0x8A]_DUP1_CUSBCHARGINGCURRENTWATCHER_CUSBCHARGINGCURRENTWATCHER_EXIT=0x4e
+[TRACE]TRACE_FLOW[0x8A]_DUP1_CUSBSTATEWATCHER_CUSBSTATEWATCHER_ENTRY=0x5b
+[TRACE]TRACE_FLOW[0x8A]_DUP1_CUSBSTATEWATCHER_CUSBSTATEWATCHER_EXIT=0x5c
+[TRACE]TRACE_FLOW[0x8A]_DUP2_CUSBCHARGINGARMTEST_CUSBCHARGINGARMTEST_ENTRY=0x3b
+[TRACE]TRACE_FLOW[0x8A]_DUP2_CUSBCHARGINGARMTEST_CUSBCHARGINGARMTEST_EXIT=0x3c
+[TRACE]TRACE_FLOW[0x8A]_DUP3_CUSBCHARGINGARMTEST_STARTMASSSTORAGE_EXIT=0x38
+[TRACE]TRACE_FLOW[0x8A]__ACTIVETESTL_ENTRY=0x23
+[TRACE]TRACE_FLOW[0x8A]__ACTIVETESTL_EXIT=0x24
+[TRACE]TRACE_FLOW[0x8A]__E32MAIN_ENTRY=0x25
+[TRACE]TRACE_FLOW[0x8A]__E32MAIN_EXIT=0x26
+[TRACE]TRACE_NORMAL[0x86]_CUSBCHARGINGARMTEST_SHOWUSBCHARGINGVALUE_DUP1=0x3
+[TRACE]TRACE_NORMAL[0x86]_CUSBCHARGINGARMTEST_SHOWUSBCHARGINGVALUE_DUP2=0x4
+[TRACE]TRACE_NORMAL[0x86]_CUSBCHARGINGARMTEST_SHOWUSBCHARGINGVALUE_DUP3=0x5
+[TRACE]TRACE_NORMAL[0x86]_CUSBCHARGINGARMTEST_SHOWUSBCHARGINGVALUE_DUP4=0x8
+[TRACE]TRACE_NORMAL[0x86]_CUSBCHARGINGARMTEST_SHOWUSBCHARGINGVALUE_DUP5=0x9
+[TRACE]TRACE_NORMAL[0x86]_CUSBCHARGINGARMTEST_SHOWUSBCHARGINGVALUE_DUP6=0xa
+[TRACE]TRACE_NORMAL[0x86]_CUSBCHARGINGARMTEST_SHOWUSBCHARGINGVALUE_DUP7=0x6
+[TRACE]TRACE_NORMAL[0x86]_CUSBCHARGINGARMTEST_STARTMASSSTORAGE=0x1
+[TRACE]TRACE_NORMAL[0x86]_CUSBCHARGINGCURRENTWATCHER_POSTANDNOTIFYCURRENTL=0x7
+[TRACE]TRACE_NORMAL[0x86]_DUP3_CUSBCHARGINGARMTEST_STARTMASSSTORAGE=0x2
diff -r 84c26be382f0 -r bbdce6bffaad usbmgmt/usbmgrtest/t_usbman/group/t_usbman.mmp
--- a/usbmgmt/usbmgrtest/t_usbman/group/t_usbman.mmp	Tue Oct 19 14:23:03 2010 +0800
+++ b/usbmgmt/usbmgrtest/t_usbman/group/t_usbman.mmp	Wed Oct 20 12:04:53 2010 +0800
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 1997-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 1997-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"
diff -r 84c26be382f0 -r bbdce6bffaad usbmgmt/usbmgrtest/t_usbmanager_suite/Stub1CC/group/Stub1CC.mmp
--- a/usbmgmt/usbmgrtest/t_usbmanager_suite/Stub1CC/group/Stub1CC.mmp	Tue Oct 19 14:23:03 2010 +0800
+++ b/usbmgmt/usbmgrtest/t_usbmanager_suite/Stub1CC/group/Stub1CC.mmp	Wed Oct 20 12:04:53 2010 +0800
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 1997-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 1997-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"
@@ -47,4 +47,3 @@
 LIBRARY			euser.lib 
 LIBRARY			usbclasscontroller.lib
 LIBRARY 		esock.lib
-
diff -r 84c26be382f0 -r bbdce6bffaad usbmgmt/usbmgrtest/t_usbmanager_suite/Stub2CC/group/Stub2CC.mmp
--- a/usbmgmt/usbmgrtest/t_usbmanager_suite/Stub2CC/group/Stub2CC.mmp	Tue Oct 19 14:23:03 2010 +0800
+++ b/usbmgmt/usbmgrtest/t_usbmanager_suite/Stub2CC/group/Stub2CC.mmp	Wed Oct 20 12:04:53 2010 +0800
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 1997-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 1997-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"
@@ -47,4 +47,3 @@
 LIBRARY			euser.lib
 LIBRARY			usbclasscontroller.lib
 LIBRARY 		esock.lib
-
diff -r 84c26be382f0 -r bbdce6bffaad usbmgmt/usbmgrtest/t_usbmanager_suite/Stub3CC/group/Stub3CC.mmp
--- a/usbmgmt/usbmgrtest/t_usbmanager_suite/Stub3CC/group/Stub3CC.mmp	Tue Oct 19 14:23:03 2010 +0800
+++ b/usbmgmt/usbmgrtest/t_usbmanager_suite/Stub3CC/group/Stub3CC.mmp	Wed Oct 20 12:04:53 2010 +0800
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 1997-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 1997-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"
@@ -48,4 +48,3 @@
 LIBRARY			euser.lib 
 LIBRARY			usbclasscontroller.lib
 LIBRARY 		esock.lib
-
diff -r 84c26be382f0 -r bbdce6bffaad usbmgmt/usbmgrtest/t_usbmanager_suite/T_UsbManager/group/T_UsbManager.mmp
--- a/usbmgmt/usbmgrtest/t_usbmanager_suite/T_UsbManager/group/T_UsbManager.mmp	Tue Oct 19 14:23:03 2010 +0800
+++ b/usbmgmt/usbmgrtest/t_usbmanager_suite/T_UsbManager/group/T_UsbManager.mmp	Wed Oct 20 12:04:53 2010 +0800
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2002-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2002-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"
@@ -41,4 +41,4 @@
 LIBRARY    	euser.lib efsrv.lib
 LIBRARY		testexecuteutils.lib
 LIBRARY		testexecutelogclient.lib
-LIBRARY		usbman.lib
+LIBRARY		usbman.lib
\ No newline at end of file
diff -r 84c26be382f0 -r bbdce6bffaad usbmgmt/usbmgrtest/t_usbmanager_suite/T_UsbManager/group/t_usbms_cable_detect.mmp
--- a/usbmgmt/usbmgrtest/t_usbmanager_suite/T_UsbManager/group/t_usbms_cable_detect.mmp	Tue Oct 19 14:23:03 2010 +0800
+++ b/usbmgmt/usbmgrtest/t_usbmanager_suite/T_UsbManager/group/t_usbms_cable_detect.mmp	Wed Oct 20 12:04:53 2010 +0800
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2003-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2003-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"
diff -r 84c26be382f0 -r bbdce6bffaad usbmgmt/usbmgrtest/t_usbmanager_suite/mscc/group/te_msclasscontroller.mmp
--- a/usbmgmt/usbmgrtest/t_usbmanager_suite/mscc/group/te_msclasscontroller.mmp	Tue Oct 19 14:23:03 2010 +0800
+++ b/usbmgmt/usbmgrtest/t_usbmanager_suite/mscc/group/te_msclasscontroller.mmp	Wed Oct 20 12:04:53 2010 +0800
@@ -51,4 +51,3 @@
 LIBRARY		testexecutelogclient.lib
 LIBRARY		bafl.lib 
 LIBRARY		usbclasscontroller.lib
-
diff -r 84c26be382f0 -r bbdce6bffaad usbmgmt/usbmgrtest/t_usbmodem/group/t_usbmodem.mmp
--- a/usbmgmt/usbmgrtest/t_usbmodem/group/t_usbmodem.mmp	Tue Oct 19 14:23:03 2010 +0800
+++ b/usbmgmt/usbmgrtest/t_usbmodem/group/t_usbmodem.mmp	Wed Oct 20 12:04:53 2010 +0800
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 1997-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 1997-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"
diff -r 84c26be382f0 -r bbdce6bffaad usbmgmt/usbmgrtest/t_whcm_cc/group/t_whcm_cc.mmp
--- a/usbmgmt/usbmgrtest/t_whcm_cc/group/t_whcm_cc.mmp	Tue Oct 19 14:23:03 2010 +0800
+++ b/usbmgmt/usbmgrtest/t_whcm_cc/group/t_whcm_cc.mmp	Wed Oct 20 12:04:53 2010 +0800
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 1997-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 1997-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"
diff -r 84c26be382f0 -r bbdce6bffaad usbmgmt/usbmgrtest/usbcontrolapp/controlappbinder/controlappbinder.mmp
--- a/usbmgmt/usbmgrtest/usbcontrolapp/controlappbinder/controlappbinder.mmp	Tue Oct 19 14:23:03 2010 +0800
+++ b/usbmgmt/usbmgrtest/usbcontrolapp/controlappbinder/controlappbinder.mmp	Wed Oct 20 12:04:53 2010 +0800
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2008-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"
@@ -30,4 +30,3 @@
 source		controlappbinder.cpp
 
 library		euser.lib
-
diff -r 84c26be382f0 -r bbdce6bffaad usbmgmt/usbmgrtest/usbcontrolapp/exampleusbcontrolapp/exampleusbcontrolapp.mmp
--- a/usbmgmt/usbmgrtest/usbcontrolapp/exampleusbcontrolapp/exampleusbcontrolapp.mmp	Tue Oct 19 14:23:03 2010 +0800
+++ b/usbmgmt/usbmgrtest/usbcontrolapp/exampleusbcontrolapp/exampleusbcontrolapp.mmp	Wed Oct 20 12:04:53 2010 +0800
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2008-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"
@@ -31,4 +31,3 @@
 
 library		euser.lib
 library		usbman.lib
-
diff -r 84c26be382f0 -r bbdce6bffaad usbmgmt/usbmgrtest/usbcontrolapp/testusbawareapp/testusbawareapp.mmp
--- a/usbmgmt/usbmgrtest/usbcontrolapp/testusbawareapp/testusbawareapp.mmp	Tue Oct 19 14:23:03 2010 +0800
+++ b/usbmgmt/usbmgrtest/usbcontrolapp/testusbawareapp/testusbawareapp.mmp	Wed Oct 20 12:04:53 2010 +0800
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2008-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"
@@ -31,4 +31,3 @@
 
 library		euser.lib
 library		usbman.lib
-
diff -r 84c26be382f0 -r bbdce6bffaad usbmgmt/usbmgrtest/usbcontrolapp/usbviewer/usbviewer.mmp
--- a/usbmgmt/usbmgrtest/usbcontrolapp/usbviewer/usbviewer.mmp	Tue Oct 19 14:23:03 2010 +0800
+++ b/usbmgmt/usbmgrtest/usbcontrolapp/usbviewer/usbviewer.mmp	Wed Oct 20 12:04:53 2010 +0800
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2008-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"
@@ -31,4 +31,3 @@
 
 library		euser.lib
 library		usbman.lib
-
diff -r 84c26be382f0 -r bbdce6bffaad usbmgmt/usbmgrtest/usbmsapp/usbms_stub/group/usbms_stub1cc.mmp
--- a/usbmgmt/usbmgrtest/usbmsapp/usbms_stub/group/usbms_stub1cc.mmp	Tue Oct 19 14:23:03 2010 +0800
+++ b/usbmgmt/usbmgrtest/usbmsapp/usbms_stub/group/usbms_stub1cc.mmp	Wed Oct 20 12:04:53 2010 +0800
@@ -57,4 +57,3 @@
 LIBRARY			euser.lib 
 LIBRARY			usbclasscontroller.lib
 
-
diff -r 84c26be382f0 -r bbdce6bffaad usbmgmt/usbmgrtest/usbmsapp/usbms_stub/group/usbms_stub3cc.mmp
--- a/usbmgmt/usbmgrtest/usbmsapp/usbms_stub/group/usbms_stub3cc.mmp	Tue Oct 19 14:23:03 2010 +0800
+++ b/usbmgmt/usbmgrtest/usbmsapp/usbms_stub/group/usbms_stub3cc.mmp	Wed Oct 20 12:04:53 2010 +0800
@@ -57,4 +57,3 @@
 LIBRARY			euser.lib 
 LIBRARY			usbclasscontroller.lib
 
-
diff -r 84c26be382f0 -r bbdce6bffaad usbmgmt/usbmgrtest/usbmsapp/usbmsapp.mmp
--- a/usbmgmt/usbmgrtest/usbmsapp/usbmsapp.mmp	Tue Oct 19 14:23:03 2010 +0800
+++ b/usbmgmt/usbmgrtest/usbmsapp/usbmsapp.mmp	Wed Oct 20 12:04:53 2010 +0800
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2004-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2004-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"
diff -r 84c26be382f0 -r bbdce6bffaad usbmgmt/usbmgrtest/usbtestconsole/usbtestconsole.mmp
--- a/usbmgmt/usbmgrtest/usbtestconsole/usbtestconsole.mmp	Tue Oct 19 14:23:03 2010 +0800
+++ b/usbmgmt/usbmgrtest/usbtestconsole/usbtestconsole.mmp	Wed Oct 20 12:04:53 2010 +0800
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2008-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"
@@ -28,4 +28,3 @@
 
 library euser.lib
 library usbman.lib
-