--- a/layers.sysdef.xml Mon May 03 14:13:42 2010 +0300
+++ b/layers.sysdef.xml Fri Jun 25 13:07:44 2010 +0800
@@ -7,11 +7,11 @@
<systemModel>
<layer name="os_layer">
<module name="usb">
- <unit unitID="lcdo.usb" mrp="" bldFile="&layer_real_source_path;/group" name="usb" />
+ <unit unitID="usbdo.usb" mrp="" bldFile="&layer_real_source_path;/group" name="usb" />
</module>
<module name="">
- <unit unitID="lcdo.usb.usbextension" mrp="" bldFile="&layer_real_source_path;/usbextension/group" filter="!sf_build" name="usb_usbextension" />
- <unit unitID="lcdo.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.usbextension" mrp="" bldFile="&layer_real_source_path;/usbextension/group" filter="!sf_build" name="usb_usbextension" />
+ <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" />
</module>
</layer>
</systemModel>
--- a/package_definition.xml Mon May 03 14:13:42 2010 +0300
+++ b/package_definition.xml Fri Jun 25 13:07:44 2010 +0800
@@ -20,7 +20,7 @@
<unit mrp="usb_info/usb_metadata/usb_metadata.mrp"/>
</component>
<component id="usb_plat" name="USB Platform Interfaces" class="api" filter="s60">
- <!--unit bldFile="usb_plat/group"/-->
+ <unit bldFile="usb_plat/group" mrp="usb_plat/group/usb_plat.mrp" />
</component>
</collection>
</package>
--- a/usb_info/usb_metadata/usb_metadata.mrp Mon May 03 14:13:42 2010 +0300
+++ b/usb_info/usb_metadata/usb_metadata.mrp Fri Jun 25 13:07:44 2010 +0800
@@ -1,19 +1,3 @@
-#
-# Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-# All rights reserved.
-# This component and the accompanying materials are made available
-# under the terms of "Eclipse Public License v1.0"
-# which accompanies this distribution, and is available
-# at the URL "http://www.eclipse.org/legal/epl-v10.html".
-#
-# Initial Contributors:
-# Nokia Corporation - initial contribution.
-#
-# Contributors:
-#
-# Description:
-#
-
component usb_metadata
source \sf\os\usb\usb_info\usb_metadata
source \sf\os\usb\package_definition.xml
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/usb_plat/group/usb_plat.mrp Fri Jun 25 13:07:44 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:
+#
+#
+component usb_plat
+
+source \sf\os\usb\usb_plat\group
+
+binary \sf\os\usb\usb_plat\group all
+
+exports \sf\os\usb\usb_plat\group
+
+notes_source \component_defs\release.src
+
+ipr E
--- a/usbmgmt/usbmgr/device/classdrivers/acm/classimplementation/ecacm/group/BLD.INF Mon May 03 14:13:42 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,34 +0,0 @@
-/*
-* Copyright (c) 1999-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:
-* Build information for USB class support
-*
-*/
-
-/**
- @file
-*/
-
-
-PRJ_EXPORTS
-../public/AcmInterface.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(acminterface.h)
-../public/AcmConfig.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(usb/acmconfig.h)
-
-usbecacmconfiguration.hby /epoc32/rom/include/usbecacmconfiguration.hby
-t_usbecacmconfiguration.hby /epoc32/rom/include/t_usbecacmconfiguration.hby
-PRJ_MMPFILES
-ECACM.MMP
-
-PRJ_TESTEXPORTS
-../public/acmserverconsts.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(usb/acmserverconsts.h)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/usbmgmt/usbmgr/device/classdrivers/acm/classimplementation/ecacm/group/bld.inf Fri Jun 25 13:07:44 2010 +0800
@@ -0,0 +1,34 @@
+/*
+* Copyright (c) 1999-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:
+* Build information for USB class support
+*
+*/
+
+/**
+ @file
+*/
+
+
+PRJ_EXPORTS
+../public/AcmInterface.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(acminterface.h)
+../public/AcmConfig.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(usb/acmconfig.h)
+
+usbecacmconfiguration.hby /epoc32/rom/include/usbecacmconfiguration.hby
+t_usbecacmconfiguration.hby /epoc32/rom/include/t_usbecacmconfiguration.hby
+PRJ_MMPFILES
+ECACM.MMP
+
+PRJ_TESTEXPORTS
+../public/acmserverconsts.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(usb/acmserverconsts.h)
--- a/usbmgmt/usbmgr/device/classdrivers/ms/classcontroller/group/BLD.INF Mon May 03 14:13:42 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,22 +0,0 @@
-/*
-* Copyright (c) 2004-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:
-*
-*/
-
-PRJ_MMPFILES
-
-#if !(defined(WINS) || defined(WINSCW))
-msclasscontroller.mmp // Mass Storage Class Controller plugin
-#endif
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/usbmgmt/usbmgr/device/classdrivers/ms/classcontroller/group/bld.inf Fri Jun 25 13:07:44 2010 +0800
@@ -0,0 +1,22 @@
+/*
+* Copyright (c) 2004-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:
+*
+*/
+
+PRJ_MMPFILES
+
+#if !(defined(WINS) || defined(WINSCW))
+msclasscontroller.mmp // Mass Storage Class Controller plugin
+#endif
--- a/usbmgmt/usbmgr/device/classdrivers/obex/classcontroller/group/BLD.INF Mon May 03 14:13:42 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,19 +0,0 @@
-/*
-* Copyright (c) 2004-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:
-*
-*/
-
-PRJ_TESTMMPFILES
-ObexClassController.mmp
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/usbmgmt/usbmgr/device/classdrivers/obex/classcontroller/group/bld.inf Fri Jun 25 13:07:44 2010 +0800
@@ -0,0 +1,19 @@
+/*
+* Copyright (c) 2004-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:
+*
+*/
+
+PRJ_TESTMMPFILES
+ObexClassController.mmp
--- a/usbmgmt/usbmgr/group/BLD.INF Mon May 03 14:13:42 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,41 +0,0 @@
-/*
-* Copyright (c) 1999-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:
-* Build information for USB class support
-* USB Comms support
-*
-*/
-
-/**
- @file
-*/
-
-#include "../logger/group/bld.inf"
-
-#if defined SYMBIAN_ENABLE_USB_OTG_HOST && !defined X86GCC
-#include "../host/bld.inf"
-#endif
-
-#include "../usbman/bld.inf"
-#include "../device/bld.inf"
-
-PRJ_EXPORTS
-usb.iby /epoc32/rom/include/usb.iby
-Usbman.iby /epoc32/rom/include/usbman.iby
-Usbmanbin.iby /epoc32/rom/include/usbmanbin.iby
-Usbmanrsc.iby /epoc32/rom/include/usbmanrsc.iby
-
-// ConfML Files
-../conf/usbmanager.confml OS_LAYER_EXPORTS_CONFML(usbmanager.confml)
-
--- a/usbmgmt/usbmgr/group/Usbmanbin.iby Mon May 03 14:13:42 2010 +0300
+++ b/usbmgmt/usbmgr/group/Usbmanbin.iby Fri Jun 25 13:07:44 2010 +0800
@@ -55,9 +55,9 @@
// *** Now for things which should only be included if the device supports
// *** USB, to save ROM space...
-#if defined(SYMBIAN_EXCLUDE_USB) || !defined(EUSBC)
+#if !defined(__USB) || !defined(EUSBC)
REM Feature USB is not included in this ROM (usbman.iby)
-#else
+#else //defined(__USB) && defined(EUSBC)
#include <usbacm.iby>
@@ -153,6 +153,6 @@
file=ABI_DIR\USB_DIR\rndisagt.agt System\Libs\rndisagt.agt
#endif // SYMBIAN_INCLUDE_USB_RNDIS
-#endif // SYMBIAN_EXCLUDE_USB
+#endif // !defined(__USB) || !defined(EUSBC)
#endif // __USBMANBIN_IBY__
--- a/usbmgmt/usbmgr/group/Usbmanrsc.iby Mon May 03 14:13:42 2010 +0300
+++ b/usbmgmt/usbmgr/group/Usbmanrsc.iby Fri Jun 25 13:07:44 2010 +0800
@@ -22,9 +22,9 @@
// *** Only include resource files if device supports USB
-#if defined(SYMBIAN_EXCLUDE_USB) || !defined(EUSBC)
+#if !defined(__USB) || !defined(EUSBC)
REM Feature USB is not included in this ROM (usbman.iby)
-#else
+#else // defined(__USB) && defined(EUSBC)
DEFINE __USBMAN_RSC_ZPATH__ ZPRIVATE\101fe1db
DEFINE __USBMAN_RSC_PATH__ PRIVATE\101fe1db
@@ -42,7 +42,7 @@
#else //__EXAMPLE_OBEX_CC__
// *** This is the normal resource file..
#ifndef USB_EXCLUDE_DEFAULT_PERSONALITIES
- #ifdef SYMBIAN_EXCLUDE_MTP
+ #ifndef __MTP_PROTOCOL_SUPPORT
#ifdef SYMBIAN_INCLUDE_USB_RNDIS
// *** Normal resource file including RNDIS support but excluding MTP
data=__USBMAN_RSC_ZPATH__\usbmanrndis.rsc __USBMAN_RSC_PATH__\usbman.rsc
@@ -50,7 +50,7 @@
// *** Normal resource file excluding MTP and RNDIS support
data=__USBMAN_RSC_ZPATH__\usbman.rsc __USBMAN_RSC_PATH__\usbman.rsc
#endif // SYMBIAN_INCLUDE_USB_RNDIS
- #else // SYMBIAN_EXCLUDE_MTP
+ #else // defined(__MTP_PROTOCOL_SUPPORT)
#ifdef SYMBIAN_INCLUDE_USB_RNDIS
// *** Normal resource file including RNDIS and MTP support
data=__USBMAN_RSC_ZPATH__\usbmanmtprndis.rsc __USBMAN_RSC_PATH__\usbman.rsc
@@ -58,11 +58,11 @@
// *** Normal resource file including MTP support but excluding RNDIS
data=__USBMAN_RSC_ZPATH__\usbmanmtp.rsc __USBMAN_RSC_PATH__\usbman.rsc
#endif // SYMBIAN_INCLUDE_USB_RNDIS
- #endif // SYMBIAN_EXCLUDE_MTP
+ #endif // __MTP_PROTOCOL_SUPPORT
#endif // USB_EXCLUDE_DEFAULT_PERSONALITIES
#endif //__EXAMPLE_OBEX_CC__
#endif //__TEST_USB_ZLP__
-#endif // SYMBIAN_EXCLUDE_USB
+#endif // !defined(__USB) || !defined(EUSBC)
#endif // __USBMANRSC_IBY__
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/usbmgmt/usbmgr/group/bld.inf Fri Jun 25 13:07:44 2010 +0800
@@ -0,0 +1,41 @@
+/*
+* Copyright (c) 1999-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:
+* Build information for USB class support
+* USB Comms support
+*
+*/
+
+/**
+ @file
+*/
+
+#include "../logger/group/bld.inf"
+
+#if defined SYMBIAN_ENABLE_USB_OTG_HOST && !defined X86GCC
+#include "../host/bld.inf"
+#endif
+
+#include "../usbman/bld.inf"
+#include "../device/bld.inf"
+
+PRJ_EXPORTS
+usb.iby /epoc32/rom/include/usb.iby
+Usbman.iby /epoc32/rom/include/usbman.iby
+Usbmanbin.iby /epoc32/rom/include/usbmanbin.iby
+Usbmanrsc.iby /epoc32/rom/include/usbmanrsc.iby
+
+// ConfML Files
+../conf/usbmanager.confml OS_LAYER_EXPORTS_CONFML(usbmanager.confml)
+
--- a/usbmgmt/usbmgr/group/usb.iby Mon May 03 14:13:42 2010 +0300
+++ b/usbmgmt/usbmgr/group/usb.iby Fri Jun 25 13:07:44 2010 +0800
@@ -28,10 +28,10 @@
REM *** Now for things which should only be included if the device
REM *** supports USB, to save ROM space...
-#if defined(SYMBIAN_EXCLUDE_USB) || !defined(EUSBC)
+#if !defined(__USB) || !defined(EUSBC)
REM Feature USB is not included in this ROM (usb.iby)
-#else
+#else // defined(__USB) && defined(EUSBC)
REM USB component can be added here.
-#endif // SYMBIAN_EXCLUDE_USB
+#endif // !defined(__USB) || !defined(EUSBC)
#endif
--- a/usbmgmt/usbmgr/group/usb_manager.history.xml Mon May 03 14:13:42 2010 +0300
+++ b/usbmgmt/usbmgr/group/usb_manager.history.xml Fri Jun 25 13:07:44 2010 +0800
@@ -220,7 +220,7 @@
- Added new .rss file (usbmanmtp.rss) which contains additional personality definition for the MTP personality
- Extended usbsvrbase.mmp to build the new .rss file as usbmanmtp.rsc
- Added more definitions to the usbman*.rls localisation files to cover the new MTP personality
- - Amended usbman.iby to choose the usbman.rsc file in the final ROM depending on the presence or absence of the SYMBIAN_EXCLUDE_MTP macro at ROM build time.
+ - Amended usbman.iby to choose the usbman.rsc file in the final ROM depending on the presence or absence of the __MTP_PROTOCOL_SUPPORT macro at ROM build time.
</defect>
<defect number="PDEF101314" title="NotifyDataAvailable() is not supported by CAcmPort" revision="005">
--- a/usbmgmt/usbmgr/host/fdf/production/BLD.INF Mon May 03 14:13:42 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,23 +0,0 @@
-/*
-* 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 "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 "fdcbase/group/bld.inf"
-#include "server/group/bld.inf"
-#include "client/group/bld.inf"
-
-PRJ_EXPORTS
-fdf.iby /epoc32/rom/include/fdf.iby
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/usbmgmt/usbmgr/host/fdf/production/bld.inf Fri Jun 25 13:07:44 2010 +0800
@@ -0,0 +1,23 @@
+/*
+* 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 "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 "fdcbase/group/bld.inf"
+#include "server/group/bld.inf"
+#include "client/group/bld.inf"
+
+PRJ_EXPORTS
+fdf.iby /epoc32/rom/include/fdf.iby
--- a/usbmgmt/usbmgr/host/fdf/production/client/group/bld.inf Mon May 03 14:13:42 2010 +0300
+++ b/usbmgmt/usbmgr/host/fdf/production/client/group/bld.inf Fri Jun 25 13:07:44 2010 +0800
@@ -20,7 +20,7 @@
@internalComponent
*/
-#if !defined(WINS)
+
PRJ_PLATFORMS
ARMV5
@@ -34,4 +34,4 @@
PRJ_TESTEXPORTS
../public/usbhoststack.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(usbhost/internal/usbhoststack.h)
-#endif
+
--- a/usbmgmt/usbmgr/host/fdf/production/server/public/fdfapi.h Mon May 03 14:13:42 2010 +0300
+++ b/usbmgmt/usbmgr/host/fdf/production/server/public/fdfapi.h Fri Jun 25 13:07:44 2010 +0800
@@ -28,15 +28,15 @@
#ifdef __OVER_DUMMYUSBDI__
const TUint32 KUsbFdfTUint = 0x10282B50;
_LIT(KUsbFdfImg, "fdf_over_dummyusbdi.exe");
+_LIT(KUsbFdfServerName, "!FdfSrv_over_dummyusbdi");
#else
const TUint32 KUsbFdfTUint = 0x10282B48;
_LIT(KUsbFdfImg, "fdf.exe");
+_LIT(KUsbFdfServerName, "!FdfSrv");
#endif
const TUid KUsbFdfUid = {KUsbFdfTUint};
-_LIT(KUsbFdfServerName, "!FdfSrv");
-
/** Version numbers. */
const TInt8 KUsbFdfSrvMajorVersionNumber = 1;
const TInt8 KUsbFdfSrvMinorVersionNumber = 1;
--- a/usbmgmt/usbmgr/host/fdf/test/t_fdf/BLD.INF Mon May 03 14:13:42 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,28 +0,0 @@
-/*
-* 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 "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:
-* NB To run t_fdf successfully, the secure ID check in CFdfServer must be
-* disabled.
-*
-*/
-
-
-PRJ_PLATFORMS
-ARMV5
-
-PRJ_TESTMMPFILES
-t_fdf.mmp
-
-PRJ_TESTEXPORTS
-t_fdf.iby /epoc32/rom/include/t_fdf.iby
\ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/usbmgmt/usbmgr/host/fdf/test/t_fdf/bld.inf Fri Jun 25 13:07:44 2010 +0800
@@ -0,0 +1,28 @@
+/*
+* 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 "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:
+* NB To run t_fdf successfully, the secure ID check in CFdfServer must be
+* disabled.
+*
+*/
+
+
+PRJ_PLATFORMS
+ARMV5
+
+PRJ_TESTMMPFILES
+t_fdf.mmp
+
+PRJ_TESTEXPORTS
+t_fdf.iby /epoc32/rom/include/t_fdf.iby
\ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/usbmgmt/usbmgr/host/functiondrivers/ms/msmm/client/bwins/msmmicsession_over_dummycomponentu.def Fri Jun 25 13:07:44 2010 +0800
@@ -0,0 +1,6 @@
+EXPORTS
+ ?EjectUsbDrives@RHostMassStorage@@QAEHXZ @ 1 NONAME ; int RHostMassStorage::EjectUsbDrives(void)
+ ?Disconnect@RHostMassStorage@@QAEHXZ @ 2 NONAME ; int RHostMassStorage::Disconnect(void)
+ ?Connect@RHostMassStorage@@QAEHXZ @ 3 NONAME ; int RHostMassStorage::Connect(void)
+ ?Version@RHostMassStorage@@QBE?AVTVersion@@XZ @ 4 NONAME ; class TVersion RHostMassStorage::Version(void) const
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/usbmgmt/usbmgr/host/functiondrivers/ms/msmm/client/eabi/msmmicsession_over_dummycomponentu.def Fri Jun 25 13:07:44 2010 +0800
@@ -0,0 +1,6 @@
+EXPORTS
+ _ZN16RHostMassStorage10DisconnectEv @ 1 NONAME
+ _ZN16RHostMassStorage14EjectUsbDrivesEv @ 2 NONAME
+ _ZN16RHostMassStorage7ConnectEv @ 3 NONAME
+ _ZNK16RHostMassStorage7VersionEv @ 4 NONAME
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/usbmgmt/usbmgr/host/functiondrivers/ms/msmm/client/eabi/msmmindicatorsessionu.def Fri Jun 25 13:07:44 2010 +0800
@@ -0,0 +1,6 @@
+EXPORTS
+ _ZN16RHostMassStorage10DisconnectEv @ 1 NONAME
+ _ZN16RHostMassStorage14EjectUsbDrivesEv @ 2 NONAME
+ _ZN16RHostMassStorage7ConnectEv @ 3 NONAME
+ _ZNK16RHostMassStorage7VersionEv @ 4 NONAME
+
--- a/usbmgmt/usbmgr/host/functiondrivers/ms/msmm/client/group/bld.inf Mon May 03 14:13:42 2010 +0300
+++ b/usbmgmt/usbmgr/host/functiondrivers/ms/msmm/client/group/bld.inf Fri Jun 25 13:07:44 2010 +0800
@@ -27,9 +27,11 @@
#if defined(SYMBIAN_ENABLE_USB_OTG_HOST) && !defined(WINS) && !defined(X86GCC)
msmmclient.mmp
+msmmindicatorclient.mmp
#endif
-
PRJ_TESTEXPORTS
../public/msmmclient.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(usb/hostms/msmmclient.h)
+PRJ_EXPORTS
+../public/msmmindicatorclient.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(usb/hostms/msmmindicatorclient.h)
--- a/usbmgmt/usbmgr/host/functiondrivers/ms/msmm/client/group/msmmclient_over_dummycomponent.mmp Mon May 03 14:13:42 2010 +0300
+++ b/usbmgmt/usbmgr/host/functiondrivers/ms/msmm/client/group/msmmclient_over_dummycomponent.mmp Fri Jun 25 13:07:44 2010 +0800
@@ -28,6 +28,6 @@
#include "msmmclient_base.mmp"
-CAPABILITY ProtServ WriteDeviceData CommDD DiskAdmin NetworkControl
+CAPABILITY ProtServ WriteDeviceData CommDD DiskAdmin NetworkControl TrustedUI
MACRO __OVER_DUMMYCOMPONENT__
\ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/usbmgmt/usbmgr/host/functiondrivers/ms/msmm/client/group/msmmindicatorclient.mmp Fri Jun 25 13:07:44 2010 +0800
@@ -0,0 +1,30 @@
+/*
+* 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 "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
+ @internalComponent
+*/
+
+
+TARGET msmmindicatorsession.dll
+TARGETTYPE dll
+UID 0x1000008d 0x20031571
+
+CAPABILITY All -TCB
+
+#include "msmmindicatorclient_base.mmp"
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/usbmgmt/usbmgr/host/functiondrivers/ms/msmm/client/group/msmmindicatorclient_base.mmp Fri Jun 25 13:07:44 2010 +0800
@@ -0,0 +1,37 @@
+/*
+* 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 "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
+ @internalComponent
+*/
+
+#include <usb/usblogger.mmh>
+
+OS_LAYER_SYSTEMINCLUDE_SYMBIAN
+
+LIBRARY euser.lib
+
+SOURCEPATH ../src
+
+SOURCE msmmindicatorclient.cpp
+
+USERINCLUDE ../../inc
+USERINCLUDE ../public
+USERINCLUDE ../../server/public
+
+VENDORID 0x70000001
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/usbmgmt/usbmgr/host/functiondrivers/ms/msmm/client/group/msmmindicatorclient_over_dummycomponent.mmp Fri Jun 25 13:07:44 2010 +0800
@@ -0,0 +1,33 @@
+/*
+* 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 "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
+ @internalComponent
+ @test
+*/
+
+
+TARGET msmmicsession_over_dummycomponent.dll
+TARGETTYPE dll
+UID 0x1000008d 0x0F15655A
+
+#include "msmmindicatorclient_base.mmp"
+
+CAPABILITY ProtServ WriteDeviceData CommDD DiskAdmin NetworkControl TrustedUI
+
+MACRO __OVER_DUMMYCOMPONENT__
\ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/usbmgmt/usbmgr/host/functiondrivers/ms/msmm/client/public/msmmindicatorclient.h Fri Jun 25 13:07:44 2010 +0800
@@ -0,0 +1,49 @@
+/*
+* 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 "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
+ @internalComponent
+*/
+
+#ifndef MSMMINDICATORCLIENT_H
+#define MSMMINDICATORCLIENT_H
+
+#include <e32std.h>
+
+/**
+RHostMassStorage is the interface for Mass Storage Indicator UI to use the MSMM.
+*/
+NONSHARABLE_CLASS(RHostMassStorage) : public RSessionBase
+{
+public:
+ // RHostMassStorage Implementation API to add a session to the running MSMM server
+ IMPORT_C TInt Connect();
+ IMPORT_C TInt Disconnect();
+ IMPORT_C TVersion Version() const;
+
+ /** Dismount USB drives from File System asynchronously. The function will return immediately to the UI with complete status
+ The result of dismounting USB drives will be notified to the MSMM Plugin via CMsmmPolicyPluginBase
+ @return Error code of IPC.
+ */
+ IMPORT_C TInt EjectUsbDrives();
+
+};
+
+#endif // MSMMINDICATORCLIENT_H
+
+// End of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/usbmgmt/usbmgr/host/functiondrivers/ms/msmm/client/src/msmmindicatorclient.cpp Fri Jun 25 13:07:44 2010 +0800
@@ -0,0 +1,110 @@
+/*
+* 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 "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
+ @internalComponent
+*/
+
+#include <usb/usblogger.h>
+#include <e32cmn.h>
+
+#include "srvdef.h"
+#include "msmmindicatorclient.h"
+
+#ifdef __FLOG_ACTIVE
+_LIT8(KLogComponent, "UsbHostMsmmIndicatorClient");
+#endif
+
+// Costants
+const TInt KConnectRetry = 0x2;
+
+
+//---------------------------------------------------------------------------
+// RHostMassStorage
+//
+// Public member functions
+
+EXPORT_C TInt RHostMassStorage::Connect()
+ {
+ LOG_FUNC
+
+ TInt retry = KConnectRetry; // Attempt to add a session to MSMM Server twice
+ TInt ret(KErrNone);
+ FOREVER
+ {
+ ret = CreateSession(KMsmmServerName, Version(), KDefaultMessageSlots);
+ // We are not allowed to start the server
+ if ((KErrNotFound == ret) || (KErrServerTerminated == ret))
+ {
+ LOGTEXT2(_L("Underlying error value = %d"), ret)
+ return KErrNotReady;
+ }
+ if ( KErrNone == ret )
+ {
+ break;
+ }
+ if ((--retry) == 0)
+ {
+ break;
+ }
+ }
+ return ret;
+ }
+
+EXPORT_C TInt RHostMassStorage::Disconnect()
+ {
+ LOG_FUNC
+
+ Close();
+ return KErrNone;
+ }
+
+/**
+ * Called to validate the version of the server we require for this API
+ * @return TVersion The version of MSMM Server that supports this API
+ */
+EXPORT_C TVersion RHostMassStorage::Version() const
+ {
+ LOG_FUNC
+
+ return TVersion(KMsmmServMajorVersionNumber,
+ KMsmmServMinorVersionNumber,
+ KMsmmServBuildVersionNumber);
+ }
+
+/**
+ * Dismount USB drives from File System asynchronously. The function will return immediately to the UI with complete status
+ * The result of dismounting USB drives will be notified to the MSMM Plugin via CMsmmPolicyPluginBase
+ * @return Error code of IPC.
+*/
+
+EXPORT_C TInt RHostMassStorage::EjectUsbDrives()
+ {
+ LOG_FUNC
+
+ TInt ret(KErrNone);
+
+ TIpcArgs usbmsIpcArgs;
+
+ ret = Send(EHostMsmmServerEjectUsbDrives, usbmsIpcArgs);
+
+ return ret;
+ }
+
+
+// End of file
--- a/usbmgmt/usbmgr/host/functiondrivers/ms/msmm/group/bld.inf Mon May 03 14:13:42 2010 +0300
+++ b/usbmgmt/usbmgr/host/functiondrivers/ms/msmm/group/bld.inf Fri Jun 25 13:07:44 2010 +0800
@@ -23,10 +23,11 @@
PRJ_PLATFORMS
ARMV5 GCCXML
+#include "../client/group/bld.inf"
#include "../server/group/bld.inf"
-#include "../client/group/bld.inf"
#include "../referencepolicyplugin/group/bld.inf"
#include "../refppnotifier/group/bld.inf"
PRJ_EXPORTS
usbhostmsmm.iby /epoc32/rom/include/usbhostmsmm.iby
+
--- a/usbmgmt/usbmgr/host/functiondrivers/ms/msmm/group/msmm_over_dummycomponent_bld.inf Mon May 03 14:13:42 2010 +0300
+++ b/usbmgmt/usbmgr/host/functiondrivers/ms/msmm/group/msmm_over_dummycomponent_bld.inf Fri Jun 25 13:07:44 2010 +0800
@@ -28,4 +28,5 @@
PRJ_TESTMMPFILES
../server/group/msmmserver_over_dummycomponent.mmp
../client/group/msmmclient_over_dummycomponent.mmp
+../client/group/msmmindicatorclient_over_dummycomponent.mmp
../referencepolicyplugin/group/refpp_over_dummycomponent.mmp
--- a/usbmgmt/usbmgr/host/functiondrivers/ms/msmm/group/usbhostmsmm.iby Mon May 03 14:13:42 2010 +0300
+++ b/usbmgmt/usbmgr/host/functiondrivers/ms/msmm/group/usbhostmsmm.iby Fri Jun 25 13:07:44 2010 +0800
@@ -30,6 +30,7 @@
file=ABI_DIR\USB_DIR\msmmsession.dll Sys\bin\msmmsession.dll
file=ABI_DIR\USB_DIR\msmmserver.exe Sys\bin\msmmserver.exe
+file=ABI_DIR\USB_DIR\msmmindicatorsession.dll Sys\bin\msmmindicatorsession.dll
#endif
--- a/usbmgmt/usbmgr/host/functiondrivers/ms/msmm/inc/srvdef.h Mon May 03 14:13:42 2010 +0300
+++ b/usbmgmt/usbmgr/host/functiondrivers/ms/msmm/inc/srvdef.h Fri Jun 25 13:07:44 2010 +0800
@@ -48,6 +48,12 @@
const TUint32 KFDFWSecureId = 0x10282B48;
#endif
+#ifdef __OVER_DUMMYCOMPONENT__
+const TUint32 KSidHbDeviceDialogAppServer = 0x20022FC4; // SID for unit test project
+#else
+const TUint32 KSidHbDeviceDialogAppServer = 0x20022FC5; //SID for indicator UI that will call eject usb drives
+#endif
+
/** The Msmm Version numbers */
const TUint KMsmmServMajorVersionNumber = 1;
const TUint KMsmmServMinorVersionNumber = 0;
@@ -60,6 +66,7 @@
EHostMsmmServerRemoveDevice = 2, // Remove device request
EHostMsmmServerDbgFailNext = 3,
EHostMsmmServerDbgAlloc = 4,
+ EHostMsmmServerEjectUsbDrives = 5, // Dismount USB drives request
EHostMsmmServerEndMarker // Request end mark
};
@@ -67,6 +74,6 @@
const TUint KDefaultMessageSlots = 1;
// Max connection number
-const TInt KMaxClientCount = 1;
+const TInt KMaxClientCount = 2;
#endif // #ifndef SRVDEF_H
--- a/usbmgmt/usbmgr/host/functiondrivers/ms/msmm/refppnotifier/inc/refppdialog.h Mon May 03 14:13:42 2010 +0300
+++ b/usbmgmt/usbmgr/host/functiondrivers/ms/msmm/refppnotifier/inc/refppdialog.h Fri Jun 25 13:07:44 2010 +0800
@@ -24,7 +24,7 @@
#define CREFPPDIALOG_H
// INCLUDES
-#include <techview/eikdialg.h>
+#include <eikdialg.h>
// CLASS DECLARATION
/**
--- a/usbmgmt/usbmgr/host/functiondrivers/ms/msmm/refppnotifier/inc/refppnotifier.h Mon May 03 14:13:42 2010 +0300
+++ b/usbmgmt/usbmgr/host/functiondrivers/ms/msmm/refppnotifier/inc/refppnotifier.h Fri Jun 25 13:07:44 2010 +0800
@@ -23,7 +23,7 @@
#ifndef REFPPNOTIFIER_H
#define REFPPNOTIFIER_H
-#include <techview/eikdialg.h>
+#include <eikdialg.h>
#include <eiknotapi.h>
#include "refppdialog.h"
--- a/usbmgmt/usbmgr/host/functiondrivers/ms/msmm/refppnotifier/src/dialog.rss Mon May 03 14:13:42 2010 +0300
+++ b/usbmgmt/usbmgr/host/functiondrivers/ms/msmm/refppnotifier/src/dialog.rss Fri Jun 25 13:07:44 2010 +0800
@@ -21,9 +21,8 @@
@internalComponent
*/
-#include <techview/eikon.rh>
-#include <techview/eikon.rsg>
-#include <techview/techviewctl.rh>
+#include <eikon.rh>
+#include <eikon.rsg>
#include <eikcoctl.rsg>
#include "refppnotifier.hrh"
NAME REFN
--- a/usbmgmt/usbmgr/host/functiondrivers/ms/msmm/refppnotifier/src/refppnotifier.cpp Mon May 03 14:13:42 2010 +0300
+++ b/usbmgmt/usbmgr/host/functiondrivers/ms/msmm/refppnotifier/src/refppnotifier.cpp Fri Jun 25 13:07:44 2010 +0800
@@ -23,9 +23,9 @@
#include "refppnotifier.h"
#include <ecom/implementationproxy.h>
#include "refppnotifier.hrh"
-#include <techview/eikinfo.h>
+#include <eikinfo.h>
#include <dialog.rsg>
-#include <techview/eiklabel.h>
+#include <eiklabel.h>
#include <usb/hostms/srverr.h>
#include <usb/hostms/policypluginnotifier.hrh>
const TUid KMsmmRefNotifierChannel = {0x10009D48}; //0x10208C14
--- a/usbmgmt/usbmgr/host/functiondrivers/ms/msmm/server/group/msmmserver_base.mmp Mon May 03 14:13:42 2010 +0300
+++ b/usbmgmt/usbmgr/host/functiondrivers/ms/msmm/server/group/msmmserver_base.mmp Fri Jun 25 13:07:44 2010 +0800
@@ -33,6 +33,7 @@
SOURCE main.cpp
SOURCE msmmserver.cpp
SOURCE msmmsession.cpp
+SOURCE msmmdismountusbdrives.cpp
SOURCE eventqueue.cpp
SOURCE eventhandler.cpp
SOURCE msmmterminator.cpp
--- a/usbmgmt/usbmgr/host/functiondrivers/ms/msmm/server/group/msmmserver_over_dummycomponent.mmp Mon May 03 14:13:42 2010 +0300
+++ b/usbmgmt/usbmgr/host/functiondrivers/ms/msmm/server/group/msmmserver_over_dummycomponent.mmp Fri Jun 25 13:07:44 2010 +0800
@@ -27,6 +27,7 @@
UID 0 0x1028653F
LIBRARY dummymsc.lib
+LIBRARY dummyfilesysclient.lib
#include "msmmserver_base.mmp"
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/usbmgmt/usbmgr/host/functiondrivers/ms/msmm/server/inc/msmmdismountusbdrives.h Fri Jun 25 13:07:44 2010 +0800
@@ -0,0 +1,169 @@
+/*
+* Copyright (c) 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: Header file for Stylus Tap indicator eject usb drives
+*
+*/
+
+
+#ifndef MSMMDISMOUNTUSBDRIVES_H
+#define MSMMDISMOUNTUSBDRIVES_H
+
+#include <e32base.h>
+#ifdef __OVER_DUMMYCOMPONENT__
+#include "usb/hostms/dummycomponent/dummyfsclient.h"
+#else
+#include <f32file.h>
+#endif
+
+#include "msmm_pub_def.h"
+
+class CDismountTimer;
+class CMsmmPolicyPluginBase;
+
+/**
+ * Timer callback interface to indicate USB drive in use
+ *
+ * This class specifies the function to be called when a timeout occurs.
+ * Used in conjunction with CDismountTimer class
+ *
+ */
+class MTimerNotifier
+ {
+public:
+ /**
+ * The function to be called when a timeout occurs.
+ *
+ */
+ virtual void TimerExpired() = 0;
+ };
+
+/**
+ * An Active Object class to request dismount of usb specific drives and notify the result to MSMM plugin
+ *
+ */
+NONSHARABLE_CLASS( CMsmmDismountUsbDrives ) : public CActive,
+ public MTimerNotifier
+ {
+public:
+ virtual ~CMsmmDismountUsbDrives();
+ static CMsmmDismountUsbDrives* NewL();
+ static CMsmmDismountUsbDrives* NewLC();
+
+public:
+ /**
+ * Send dismount notifications for all usb drives.
+ */
+ void DismountUsbDrives(CMsmmPolicyPluginBase& aPlugin, TUSBMSDeviceDescription& aDevice);
+
+protected:
+ CMsmmDismountUsbDrives();
+ void ConstructL();
+
+private:
+ /**
+ * Send dismount notification via RFs
+ */
+ void DoDismount();
+
+ /**
+ * Callback to CMsmmPolicyPluginBase
+ */
+ void CompleteDismountRequest(const TInt aResult);
+
+private: //from CActive
+ void RunL();
+ void DoCancel();
+
+private: // from MTimerNotifier
+
+ /**
+ * Dismount timer callback
+ */
+ void TimerExpired();
+
+private:
+ /**
+ * Drive index
+ */
+ TInt iDriveIndex;
+ /**
+ * RFs session
+ */
+#ifdef __OVER_DUMMYCOMPONENT__
+ RDummyFs iRFs;
+#else
+ RFs iRFs;
+#endif
+ /**
+ * List of drives
+ */
+ TDriveList iDriveList;
+
+ /**
+ * Dismount timer
+ * Own
+ */
+ CDismountTimer* iDismountTimer;
+
+ /**
+ * Callback API for dismount result
+ * Do not own
+ */
+ CMsmmPolicyPluginBase* iPlugin;
+
+ /**
+ * Device specific details, manufacturer and productid
+ */
+ TPckgBuf<TUSBMSDeviceDescription> iDevicePkgInfo;
+ };
+
+
+/**
+ * Timer interface for dismount request
+ *
+ * This class will notify an object after a specified timeout.
+ *
+ */
+class CDismountTimer : public CTimer
+ {
+public:
+ static CDismountTimer* NewL( MTimerNotifier* aTimeOutNotify );
+ static CDismountTimer* NewLC( MTimerNotifier* aTimeOutNotify);
+ virtual ~CDismountTimer();
+ void CancelTimer();
+ void StartTimer();
+
+protected:
+ /**
+ * From CTimer
+ * Invoked when a timeout occurs
+ *
+ */
+ virtual void RunL();
+
+private:
+ CDismountTimer( MTimerNotifier* aTimeOutNotify );
+ void ConstructL();
+
+private: // Member variables
+
+ /**
+ * The observer for this objects events
+ * Not own.
+ */
+ MTimerNotifier* iNotify;
+ };
+
+
+#endif // MSMMDISMOUNTUSBDRIVES_H
--- a/usbmgmt/usbmgr/host/functiondrivers/ms/msmm/server/inc/msmmserver.h Mon May 03 14:13:42 2010 +0300
+++ b/usbmgmt/usbmgr/host/functiondrivers/ms/msmm/server/inc/msmmserver.h Fri Jun 25 13:07:44 2010 +0800
@@ -37,6 +37,9 @@
class CMsmmTerminator;
class CDeviceEventQueue;
class CMsmmPolicyPluginBase;
+class THostMsErrData;
+class CMsmmDismountUsbDrives;
+class TUSBMSDeviceDescription;
// Server side resource container class
// Intends to be used by any internal objects (such as sub-command objects)
@@ -66,11 +69,16 @@
// CMsmmServer API
virtual CSession2* NewSessionL(const TVersion& aVersion,
const RMessage2& aMessage) const;
-
+ CPolicyServer::TCustomResult CustomSecurityCheckL(const RMessage2& aMsg,
+ TInt& aAction,
+ TSecurityInfo& aMissing);
+
TInt SessionNumber() const;
void AddSession();
void RemoveSession();
+ void DismountUsbDrivesL(TUSBMSDeviceDescription& aDevice);
+
// From MMsmmSrvProxy
inline CMsmmEngine& Engine() const;
inline RFs& FileServerSession() const;
@@ -87,6 +95,8 @@
RFs iFs;
CMsmmPolicyPluginBase* iPolicyPlugin; // Owned
CDeviceEventQueue* iEventQueue; // Owned
+ CMsmmDismountUsbDrives* iDismountManager; //Singleton to request dismounting usb drives via RFs
+ THostMsErrData* iDismountErrData; // The data nodes try, Owned
};
#include "msmmserver.inl"
#endif // MSMMSERVER_H
--- a/usbmgmt/usbmgr/host/functiondrivers/ms/msmm/server/inc/srvsec.h Mon May 03 14:13:42 2010 +0300
+++ b/usbmgmt/usbmgr/host/functiondrivers/ms/msmm/server/inc/srvsec.h Fri Jun 25 13:07:44 2010 +0800
@@ -26,6 +26,7 @@
const TInt KMsmmServerRanges[] =
{
EHostMsmmServerAddFunction,
+ EHostMsmmServerEjectUsbDrives, //separate policy check for Eject usb drives client
EHostMsmmServerEndMarker
};
const TUint KMsmmServerRangeCount =
@@ -34,18 +35,21 @@
const TUint8 KMsmmServerElementsIndex[KMsmmServerRangeCount] =
{
0,
+ 1,
CPolicyServer::ENotSupported
};
const CPolicyServer::TPolicyElement KMsmmServerElements[] =
{
{_INIT_SECURITY_POLICY_S1( KFDFWSecureId, ECapabilityCommDD ),
+ CPolicyServer::EFailClient},
+ {_INIT_SECURITY_POLICY_S1( KSidHbDeviceDialogAppServer, ECapabilityTrustedUI ),
CPolicyServer::EFailClient}
};
const CPolicyServer::TPolicy KMsmmServerSecurityPolicy =
{
- 0,
+ CPolicyServer::ECustomCheck,
KMsmmServerRangeCount,
KMsmmServerRanges,
KMsmmServerElementsIndex,
--- a/usbmgmt/usbmgr/host/functiondrivers/ms/msmm/server/public/srverr.h Mon May 03 14:13:42 2010 +0300
+++ b/usbmgmt/usbmgr/host/functiondrivers/ms/msmm/server/public/srverr.h Fri Jun 25 13:07:44 2010 +0800
@@ -31,6 +31,9 @@
// adding device
EHostMsErrInvalidParameter = 0x4, // Invalid request parameter
EHostMsErrOutOfMemory = 0x5, // Out of memory
+ EHostMsEjectInProgress = 0x6, // eject request commenced
+ EHostMsErrNone = 0x7, // no error == success condition
+ EHostMsErrInUse = 0x8, // Drives in use
EHostMsErrorEndMarker
};
--- a/usbmgmt/usbmgr/host/functiondrivers/ms/msmm/server/src/eventhandler.cpp Mon May 03 14:13:42 2010 +0300
+++ b/usbmgmt/usbmgr/host/functiondrivers/ms/msmm/server/src/eventhandler.cpp Fri Jun 25 13:07:44 2010 +0800
@@ -212,9 +212,12 @@
LOG_FUNC
// Complete client with KErrCancel
CompleteClient(KErrCancel);
-
+
// Cancel current pending command
- iSubCommandQueue.Head().CancelAsyncCmd();
+ if (iSubCommandQueue.Count())
+ {
+ iSubCommandQueue.Head().CancelAsyncCmd();
+ }
}
void CDeviceEventHandler::RunL( )
@@ -251,30 +254,33 @@
TInt CDeviceEventHandler::RunError(TInt aError)
{
LOG_FUNC
- // Retrieve sub-command related error notification data
- iSubCommandQueue.Head().HandleError(*iErrNotiData, aError);
-
- // If current sub-command isn't a key one, the handler will continue to
- // execute rest sub-command in the queue. But, if current sub-command
- // is the last one in the queue, handler shall complete the client also.
- if (iSubCommandQueue.Head().IsKeyCommand() ||
- (iSubCommandQueue.Count() == 1))
+
+ if (iSubCommandQueue.Count())
{
- CompleteClient(aError);
+ // Retrieve sub-command related error notification data
+ iSubCommandQueue.Head().HandleError(*iErrNotiData, aError);
+
+ // If current sub-command isn't a key one, the handler will continue to
+ // execute rest sub-command in the queue. But, if current sub-command
+ // is the last one in the queue, handler shall complete the client also.
+ if (iSubCommandQueue.Head().IsKeyCommand() ||
+ (iSubCommandQueue.Count() == 1))
+ {
+ CompleteClient(aError);
+ }
+ iSubCommandQueue.Pop();
}
- //Restart the handler after error handling;
- if (!IsActive())
+ if( IsActive() )
+ {
+ Complete(aError);
+ }
+ else if (iSubCommandQueue.Count())
{
Start();
+ Complete();
}
- Complete(aError);
-
- if (iSubCommandQueue.Count())
- {
- iSubCommandQueue.Pop();
- }
-
+
return KErrNone;
}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/usbmgmt/usbmgr/host/functiondrivers/ms/msmm/server/src/msmmdismountusbdrives.cpp Fri Jun 25 13:07:44 2010 +0800
@@ -0,0 +1,248 @@
+/*
+* Copyright (c) 2007-2008 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: Active Object to dismount usb drives
+*
+*/
+
+
+#include <usb/usblogger.h>
+#include <usb/hostms/srverr.h>
+#include <usb/hostms/msmmpolicypluginbase.h>
+
+#include "msmmdismountusbdrives.h"
+
+const TInt KDismountTimeOut = 6000000; // 6 seconds
+
+
+#ifdef __FLOG_ACTIVE
+_LIT8(KLogComponent, "UsbHostMsmmServer");
+#endif
+
+CMsmmDismountUsbDrives::~CMsmmDismountUsbDrives()
+ {
+ LOG_FUNC
+ Cancel();
+ delete iDismountTimer;
+ iRFs.Close();
+ }
+
+/**
+ * Symbian two phase constructor
+ */
+CMsmmDismountUsbDrives* CMsmmDismountUsbDrives::NewL()
+ {
+ LOG_STATIC_FUNC_ENTRY
+ CMsmmDismountUsbDrives* self = CMsmmDismountUsbDrives::NewLC();
+ CleanupStack::Pop(self);
+ return self;
+ }
+
+/**
+ * Symbian two phase constructor. Object pushed to cleanup stack
+ */
+CMsmmDismountUsbDrives* CMsmmDismountUsbDrives::NewLC()
+ {
+ LOG_STATIC_FUNC_ENTRY
+ CMsmmDismountUsbDrives* self = new (ELeave) CMsmmDismountUsbDrives();
+ CleanupStack::PushL(self);
+ self->ConstructL();
+ return self;
+ }
+
+/**
+ * Check the status of current dismount request and continue issuing next if no error
+ */
+void CMsmmDismountUsbDrives::RunL()
+ {
+ LOG_FUNC
+
+ iDismountTimer->CancelTimer();
+
+ // Indicates there has been an error dismounting a usb drive, report immediately to MSMM plugin and
+ // abort the process
+ if ( iStatus != KErrNone )
+ {
+ CompleteDismountRequest( iStatus.Int() );
+ }
+ // Indicates we have reached the end of all usb drives dismounting, in other words a success condition
+ else if ( iDriveIndex == KMaxDrives )
+ {
+ CompleteDismountRequest( KErrNone );
+ }
+ // We still have more drives to traverse
+ else if ( iDriveIndex < KMaxDrives )
+ {
+ DoDismount();
+ }
+ }
+
+/**
+ * Cancel pending notifier and those in queue
+ */
+void CMsmmDismountUsbDrives::DoCancel()
+ {
+ LOG_FUNC
+ iRFs.NotifyDismountCancel(iStatus);
+ }
+
+CMsmmDismountUsbDrives::CMsmmDismountUsbDrives()
+ : CActive(EPriorityStandard)
+ {
+ LOG_FUNC
+ CActiveScheduler::Add(this);
+ }
+
+void CMsmmDismountUsbDrives::ConstructL()
+ {
+ LOG_FUNC
+ User::LeaveIfError( iRFs.Connect());
+ iDismountTimer = CDismountTimer::NewL(this);
+ }
+
+/**
+ * Dismount usb drives
+ */
+void CMsmmDismountUsbDrives::DismountUsbDrives(CMsmmPolicyPluginBase& aPlugin, TUSBMSDeviceDescription& aDevice)
+ {
+ LOG_FUNC
+ Cancel();
+ iPlugin = &aPlugin;
+ TUSBMSDeviceDescription& device = iDevicePkgInfo();
+ device = aDevice;
+ iDriveIndex = 0;
+ iRFs.DriveList( iDriveList );
+ DoDismount();
+ }
+
+/**
+ * Callback to CMsmmPolicyPluginBase with either success or failure message
+ */
+void CMsmmDismountUsbDrives::CompleteDismountRequest(const TInt aResult)
+ {
+ THostMsErrData data;
+ if( aResult == KErrNone )
+ data.iError = EHostMsErrNone;
+ else
+ data.iError = EHostMsErrInUse;
+ data.iE32Error = aResult;
+ data.iManufacturerString = iDevicePkgInfo().iManufacturerString;
+ data.iProductString = iDevicePkgInfo().iProductString;
+ data.iDriveName = 0x0;
+
+ TRAP_IGNORE(iPlugin->SendErrorNotificationL(data));
+ }
+
+/**
+ * Dismount next usb drive
+ */
+void CMsmmDismountUsbDrives::DoDismount()
+ {
+ LOG_FUNC
+ TDriveInfo info;
+ TInt err = KErrNone;
+ for ( ; iDriveIndex < KMaxDrives; iDriveIndex++ )
+ {
+ if ( iDriveList[iDriveIndex] )
+ {
+ err = iRFs.Drive( info , iDriveIndex );
+ if ( info.iConnectionBusType == EConnectionBusUsb &&
+ info.iDriveAtt & KDriveAttExternal &&
+ err == KErrNone )
+ {
+ LOGTEXT(_L("CMsmmDismountUsbDrives::DoDismount Dismount notify request "));
+ iRFs.NotifyDismount( iDriveIndex, iStatus, EFsDismountNotifyClients );
+ iDismountTimer->StartTimer();
+ SetActive();
+ return;
+ }
+ }
+ }
+ // Indicates we have gone through all the drives and no more usb drives left to request dismount
+ CompleteDismountRequest( KErrNone );
+ }
+
+
+/**
+ * Callback function from CDismountTimer after 6 seconds indicating a usb drive is not released by another process, report it as an error
+ */
+void CMsmmDismountUsbDrives::TimerExpired()
+ {
+ LOG_FUNC
+
+ Cancel();
+ iDismountTimer->CancelTimer();
+ CompleteDismountRequest( KErrInUse );
+ }
+
+//CDismountTimer
+
+CDismountTimer* CDismountTimer::NewL( MTimerNotifier* aTimeOutNotify)
+ {
+ LOG_STATIC_FUNC_ENTRY
+ CDismountTimer* self = CDismountTimer::NewLC( aTimeOutNotify );
+ CleanupStack::Pop(self);
+ return self;
+ }
+
+CDismountTimer* CDismountTimer::NewLC( MTimerNotifier* aTimeOutNotify )
+ {
+ LOG_STATIC_FUNC_ENTRY
+ CDismountTimer* self = new (ELeave) CDismountTimer( aTimeOutNotify );
+ CleanupStack::PushL(self);
+ self->ConstructL();
+ return self;
+ }
+
+CDismountTimer::CDismountTimer( MTimerNotifier* aTimeOutNotify):
+ CTimer(EPriorityStandard),
+ iNotify(aTimeOutNotify)
+ {
+ LOG_FUNC
+ }
+
+CDismountTimer::~CDismountTimer()
+ {
+ LOG_FUNC
+ Cancel();
+ }
+
+void CDismountTimer::ConstructL()
+ {
+ LOG_FUNC
+ if ( !iNotify )
+ {
+ User::Leave(KErrArgument);
+ }
+ CTimer::ConstructL();
+ CActiveScheduler::Add(this);
+ }
+
+void CDismountTimer::RunL()
+ {
+ LOG_FUNC
+ // Timer request has completed, so notify the timer's owner
+ iNotify->TimerExpired();
+ }
+void CDismountTimer::CancelTimer()
+ {
+ LOG_FUNC
+ Cancel();
+ }
+
+void CDismountTimer::StartTimer()
+ {
+ LOG_FUNC
+ After( KDismountTimeOut );
+ }
+// End of File
--- a/usbmgmt/usbmgr/host/functiondrivers/ms/msmm/server/src/msmmserver.cpp Mon May 03 14:13:42 2010 +0300
+++ b/usbmgmt/usbmgr/host/functiondrivers/ms/msmm/server/src/msmmserver.cpp Fri Jun 25 13:07:44 2010 +0800
@@ -21,13 +21,14 @@
*/
#include "msmmserver.h"
-#include <usb/hostms/msmmpolicypluginbase.h>
#include "msmm_internal_def.h"
#include "msmmsession.h"
#include "msmmengine.h"
#include "eventqueue.h"
#include "msmmterminator.h"
+#include "msmmdismountusbdrives.h"
+#include <usb/hostms/msmmpolicypluginbase.h>
#include <usb/usblogger.h>
#ifdef __FLOG_ACTIVE
@@ -97,6 +98,26 @@
CleanupStack::PopAndDestroy(2, scheduler);
}
+CPolicyServer::TCustomResult CMsmmServer::CustomSecurityCheckL(
+ const RMessage2& aMsg,
+ TInt& /*aAction*/,
+ TSecurityInfo& /*aMissing*/)
+ {
+ CPolicyServer::TCustomResult returnValue = CPolicyServer::EFail;
+
+ TSecureId ClientSID = aMsg.SecureId();
+
+ if (KFDFWSecureId == ClientSID)
+ {
+ returnValue = CPolicyServer::EPass;
+ }
+ else if ((KSidHbDeviceDialogAppServer == ClientSID) && SessionNumber() > 0)
+ {
+ returnValue = CPolicyServer::EPass;
+ }
+ return returnValue;
+ }
+
// Public functions
// Construction and destruction
CMsmmServer* CMsmmServer::NewLC()
@@ -119,6 +140,8 @@
delete iEventQueue;
delete iEngine;
delete iTerminator;
+ delete iDismountErrData;
+ delete iDismountManager;
REComSession::FinalClose();
#ifndef __OVER_DUMMYCOMPONENT__
@@ -136,7 +159,7 @@
if (KMaxClientCount <= SessionNumber())
{
// There is a connection to MSMM server already.
- // Currently design of MSMM allows only one activated client
+ // Currently design of MSMM can have two clients, one FDF and the other Indicator UI
// at any time.
User::Leave(KErrInUse);
}
@@ -188,6 +211,26 @@
}
}
+void CMsmmServer::DismountUsbDrivesL(TUSBMSDeviceDescription& aDevice)
+ {
+ LOG_FUNC
+ delete iDismountManager;
+ iDismountManager = NULL;
+ iDismountManager= CMsmmDismountUsbDrives::NewL();
+
+ //Also notify the MSMM plugin of beginning of dismounting
+ iDismountErrData->iError = EHostMsEjectInProgress;
+ iDismountErrData->iE32Error = KErrNone;
+ iDismountErrData->iManufacturerString = aDevice.iManufacturerString;
+ iDismountErrData->iProductString = aDevice.iProductString;
+ iDismountErrData->iDriveName = 0x0;
+
+ TRAP_IGNORE(iPolicyPlugin->SendErrorNotificationL(*iDismountErrData));
+
+ // Start dismounting
+ iDismountManager->DismountUsbDrives(*iPolicyPlugin, aDevice);
+ }
+
// Private functions
// CMsmmServer Construction
CMsmmServer::CMsmmServer(TInt aPriority)
@@ -205,6 +248,7 @@
iEventQueue = CDeviceEventQueue::NewL(*this);
iTerminator = CMsmmTerminator::NewL(*iEventQueue);
iPolicyPlugin = CMsmmPolicyPluginBase::NewL();
+ iDismountErrData = new (ELeave) THostMsErrData;
if (!iPolicyPlugin)
{
// Not any policy plugin implementation available
--- a/usbmgmt/usbmgr/host/functiondrivers/ms/msmm/server/src/msmmsession.cpp Mon May 03 14:13:42 2010 +0300
+++ b/usbmgmt/usbmgr/host/functiondrivers/ms/msmm/server/src/msmmsession.cpp Fri Jun 25 13:07:44 2010 +0800
@@ -24,9 +24,9 @@
#include "msmmserver.h"
#include "msmmengine.h"
#include "eventqueue.h"
+#include "msmmnodebase.h"
#include <usb/hostms/srverr.h>
#include <usb/hostms/msmmpolicypluginbase.h>
-#include "msmmnodebase.h"
#include <usb/usblogger.h>
#ifdef __FLOG_ACTIVE
@@ -92,7 +92,10 @@
delete heapObj;
#endif // _DEBUG
break;
-
+
+ case EHostMsmmServerEjectUsbDrives:
+ iServer.DismountUsbDrivesL(iDevicePkg());
+ break;
default:
// Unsupported function number - panic the client
PanicClient(aMessage, EBadRequest);
--- a/usbmgmt/usbmgr/logger/group/BLD.INF Mon May 03 14:13:42 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,27 +0,0 @@
-/*
-* Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
-
-/**
- @file
-*/
-
-PRJ_EXPORTS
-../public/usblogger.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(usb/usblogger.h)
-usblogger.mmh /epoc32/include/usb/usblogger.mmh
-
-PRJ_MMPFILES
-usblogger.MMP
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/usbmgmt/usbmgr/logger/group/bld.inf Fri Jun 25 13:07:44 2010 +0800
@@ -0,0 +1,27 @@
+/*
+* 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:
+*
+*/
+
+/**
+ @file
+*/
+
+PRJ_EXPORTS
+../public/usblogger.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(usb/usblogger.h)
+usblogger.mmh /epoc32/include/usb/usblogger.mmh
+
+PRJ_MMPFILES
+usblogger.MMP
--- a/usbmgmt/usbmgr/test/cit/ROMConfig/scripts/USB_CIT_P581_UsbExcluded.script Mon May 03 14:13:42 2010 +0300
+++ b/usbmgmt/usbmgr/test/cit/ROMConfig/scripts/USB_CIT_P581_UsbExcluded.script Fri Jun 25 13:07:44 2010 +0800
@@ -16,7 +16,7 @@
*/
// Run all the USB_ROMCONFIG_* tests
-// Expects a ROM to be built without USB i.e. SYMBIAN_EXCLUDE_USB has been specified
+// Expects a ROM to be built without USB i.e. __USB has NOT been specified
RUN_SCRIPT c:\scripts\usbromconfig\USB_ROMCONFIG_001.script
--- a/usbmgmt/usbmgr/test/cit/ROMConfig/scripts/USB_CIT_P581_UsbIncluded.script Mon May 03 14:13:42 2010 +0300
+++ b/usbmgmt/usbmgr/test/cit/ROMConfig/scripts/USB_CIT_P581_UsbIncluded.script Fri Jun 25 13:07:44 2010 +0800
@@ -16,7 +16,7 @@
*/
// Run all the USB_INC_ROMCONFIG_* tests
-// Expects a standard ROM to be built i.e. SYMBIAN_EXCLUDE_USB has NOT been specified
+// Expects a standard ROM to be built i.e. __USB has been specified
RUN_SCRIPT c:\scripts\usbromconfig\USB_INC_ROMCONFIG_001.script
--- a/usbmgmt/usbmgr/test/cit/ROMConfig/scripts/USB_ROMCONFIG_001.script Mon May 03 14:13:42 2010 +0300
+++ b/usbmgmt/usbmgr/test/cit/ROMConfig/scripts/USB_ROMCONFIG_001.script Fri Jun 25 13:07:44 2010 +0800
@@ -19,7 +19,7 @@
START_TESTCASE USB-ROMCONFIG-001
//! @SYMTestCaseID USB-ROMCONFIG-001
-//! @SYMTestCaseDesc RUsb::Connect should fail on a SYMBIAN_EXCLUDE_USB ROM
+//! @SYMTestCaseDesc RUsb::Connect should fail on a ROM built without __USB specified
//! @SYMREQ 5414
//! @SYMTestType CIT
//! @SYMTestPriority 1
--- a/usbmgmt/usbmgr/test/cit/ROMConfig/scripts/USB_ROMCONFIG_002.script Mon May 03 14:13:42 2010 +0300
+++ b/usbmgmt/usbmgr/test/cit/ROMConfig/scripts/USB_ROMCONFIG_002.script Fri Jun 25 13:07:44 2010 +0800
@@ -19,7 +19,7 @@
START_TESTCASE USB-ROMCONFIG-002
//! @SYMTestCaseID USB-ROMCONFIG-002
-//! @SYMTestCaseDesc User::LoadLogicalDevice("EUSBC") should fail on a SYMBIAN_EXCLUDE_USB ROM
+//! @SYMTestCaseDesc User::LoadLogicalDevice("EUSBC") should fail on a a ROM built without __USB specified
//! @SYMREQ 5414
//! @SYMTestType CIT
//! @SYMTestPriority 1
--- a/usbmgmt/usbmgr/test/cit/ROMConfig/scripts/USB_ROMCONFIG_003.script Mon May 03 14:13:42 2010 +0300
+++ b/usbmgmt/usbmgr/test/cit/ROMConfig/scripts/USB_ROMCONFIG_003.script Fri Jun 25 13:07:44 2010 +0800
@@ -19,7 +19,7 @@
START_TESTCASE USB-ROMCONFIG-003
//! @SYMTestCaseID USB-ROMCONFIG-003
-//! @SYMTestCaseDesc RCommServ::LoadCommModule should fail for ACM csy on a SYMBIAN_EXCLUDE_USB ROM
+//! @SYMTestCaseDesc RCommServ::LoadCommModule should fail for ACM csy on a ROM built without __USB specified
//! @SYMREQ 5414
//! @SYMTestType CIT
//! @SYMTestPriority 1
--- a/usbmgmt/usbmgr/test/cit/ROMConfig/scripts/USB_ROMCONFIG_004.script Mon May 03 14:13:42 2010 +0300
+++ b/usbmgmt/usbmgr/test/cit/ROMConfig/scripts/USB_ROMCONFIG_004.script Fri Jun 25 13:07:44 2010 +0800
@@ -19,7 +19,7 @@
START_TESTCASE USB-ROMCONFIG-004
//! @SYMTestCaseID USB-ROMCONFIG-004
-//! @SYMTestCaseDesc RDevUsbcClient::Open should fail on a SYMBIAN_EXCLUDE_USB ROM
+//! @SYMTestCaseDesc RDevUsbcClient::Open should fail on a a ROM built without __USB specified
//! @SYMREQ 5414
//! @SYMTestType CIT
//! @SYMTestPriority 1
--- a/usbmgmt/usbmgr/usbman/chargingplugin/src/idpinwatcher.cpp Mon May 03 14:13:42 2010 +0300
+++ b/usbmgmt/usbmgr/usbman/chargingplugin/src/idpinwatcher.cpp Fri Jun 25 13:07:44 2010 +0800
@@ -48,7 +48,13 @@
void CIdPinWatcher::ConstructL()
{
- User::LeaveIfError(iIdPinProp.Attach(KUidUsbManCategory, KUsbOtgIdPinPresentProperty));
+#ifdef __CHARGING_PLUGIN_TEST_CODE__
+ const TInt8 KPropertyOffsetForChargingTest = 100;
+ User::LeaveIfError(iIdPinProp.Attach(KUidUsbManCategory, KUsbOtgIdPinPresentProperty + KPropertyOffsetForChargingTest));
+#else
+ User::LeaveIfError(iIdPinProp.Attach(KUidUsbManCategory, KUsbOtgIdPinPresentProperty));
+#endif
+
iIdPinProp.Subscribe(iStatus);
SetActive();
--- a/usbmgmt/usbmgr/usbman/chargingplugin/src/otgstatewatcher.cpp Mon May 03 14:13:42 2010 +0300
+++ b/usbmgmt/usbmgr/usbman/chargingplugin/src/otgstatewatcher.cpp Fri Jun 25 13:07:44 2010 +0800
@@ -48,7 +48,13 @@
void COtgStateWatcher::ConstructL()
{
- User::LeaveIfError(iOtgStateProp.Attach(KUidUsbManCategory, KUsbOtgStateProperty));
+#ifdef __CHARGING_PLUGIN_TEST_CODE__
+ const TInt8 KPropertyOffsetForChargingTest = 100;
+ User::LeaveIfError(iOtgStateProp.Attach(KUidUsbManCategory, KUsbOtgStateProperty + KPropertyOffsetForChargingTest));
+#else
+ User::LeaveIfError(iOtgStateProp.Attach(KUidUsbManCategory, KUsbOtgStateProperty));
+#endif
+
iOtgStateProp.Subscribe(iStatus);
SetActive();
--- a/usbmgmt/usbmgr/usbman/chargingplugin/src/repositorynotifier.cpp Mon May 03 14:13:42 2010 +0300
+++ b/usbmgmt/usbmgr/usbman/chargingplugin/src/repositorynotifier.cpp Fri Jun 25 13:07:44 2010 +0800
@@ -24,7 +24,7 @@
#include <centralrepository.h>
CUsbChargingRepositoryNotifier::CUsbChargingRepositoryNotifier(MUsbChargingRepositoryObserver& aObserver,const TUid& aRepository, TUint aId)
-: CActive(EPriorityNormal), iObserver(aObserver), iRepositoryUid(aRepository), iId(aId)
+: CActive(CActive::EPriorityStandard), iObserver(aObserver), iRepositoryUid(aRepository), iId(aId)
{
CActiveScheduler::Add(this);
}
--- a/usbmgmt/usbmgr/usbman/chargingplugin/src/vbuswatcher.cpp Mon May 03 14:13:42 2010 +0300
+++ b/usbmgmt/usbmgr/usbman/chargingplugin/src/vbuswatcher.cpp Fri Jun 25 13:07:44 2010 +0800
@@ -48,7 +48,13 @@
void CVBusWatcher::ConstructL()
{
- User::LeaveIfError(iVBusProp.Attach(KUidUsbManCategory, KUsbOtgVBusPoweredProperty));
+#ifdef __CHARGING_PLUGIN_TEST_CODE__
+ const TInt8 KPropertyOffsetForChargingTest = 100;
+ User::LeaveIfError(iVBusProp.Attach(KUidUsbManCategory, KUsbOtgVBusPoweredProperty + KPropertyOffsetForChargingTest));
+#else
+ User::LeaveIfError(iVBusProp.Attach(KUidUsbManCategory, KUsbOtgVBusPoweredProperty));
+#endif
+
iVBusProp.Subscribe(iStatus);
SetActive();
--- a/usbmgmt/usbmgr/usbman/client/group/BLD.INF Mon May 03 14:13:42 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,32 +0,0 @@
-/*
-* Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
-
-PRJ_EXPORTS
-../public/usbman.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(usbman.h)
-../public/usbstates.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(usbstates.h)
-
-PRJ_MMPFILES
-Usbman.mmp
-
-/*
-* Previously, it only supports WINSCW.
-* But the NSE(None Silent Error) unit test depends on this library and the NSE test
-* will be run on the hardware. So we need it to support armv5.
-*/
-PRJ_TESTMMPFILES
-Usbman_over_dummyusbdi.mmp
-
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/usbmgmt/usbmgr/usbman/client/group/bld.inf Fri Jun 25 13:07:44 2010 +0800
@@ -0,0 +1,32 @@
+/*
+* 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:
+*
+*/
+
+PRJ_EXPORTS
+../public/usbman.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(usbman.h)
+../public/usbstates.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(usbstates.h)
+
+PRJ_MMPFILES
+Usbman.mmp
+
+/*
+* Previously, it only supports WINSCW.
+* But the NSE(None Silent Error) unit test depends on this library and the NSE test
+* will be run on the hardware. So we need it to support armv5.
+*/
+PRJ_TESTMMPFILES
+Usbman_over_dummyusbdi.mmp
+
--- a/usbmgmt/usbmgr/usbman/server/SRC/CUsbDevice.cpp Mon May 03 14:13:42 2010 +0300
+++ b/usbmgmt/usbmgr/usbman/server/SRC/CUsbDevice.cpp Fri Jun 25 13:07:44 2010 +0800
@@ -118,6 +118,7 @@
// the observers themselves.
iObservers.Reset();
+#ifndef __OVER_DUMMYUSBDI__
#ifndef __WINS__
LOGTEXT2(_L8("about to delete device state watcher @ %08x"), (TUint32) iDeviceStateWatcher);
delete iDeviceStateWatcher;
@@ -133,6 +134,7 @@
{
LOGTEXT2(_L8(" User::FreeLogicalDevice returned %d"),err);
}
+#endif
#endif
delete iDefaultSerialNumber;
@@ -164,6 +166,7 @@
iUsbClassControllerIterator = new(ELeave) CUsbClassControllerIterator(iSupportedClasses);
+#ifndef __OVER_DUMMYUSBDI__
#ifndef __WINS__
LOGTEXT(_L8("About to load LDD"));
TInt err = User::LoadLogicalDevice(KUsbLDDName);
@@ -229,6 +232,7 @@
LOGTEXT(_L8("UsbDevice::ConstructL() finished"));
#endif
+#endif
#ifndef __OVER_DUMMYUSBDI__
InstantiateExtensionPluginsL();
@@ -491,6 +495,7 @@
if (iDeviceState != state)
{
+#ifndef __OVER_DUMMYUSBDI__
#ifndef __WINS__
if (iDeviceState == EUsbDeviceStateUndefined &&
iUdcSupportsCableDetectWhenUnpowered &&
@@ -502,7 +507,8 @@
// it up (so long as usbman is fully started).
(void)PowerUpAndConnect(); // We don't care about any errors here.
}
-#endif // __WINS__
+#endif
+#endif // __OVER_DUMMYUSBDI__
// Change state straight away in case any of the clients check it
TUsbDeviceState oldState = iDeviceState;
iDeviceState = state;
@@ -610,6 +616,7 @@
case EUsbServiceStarting:
if (iUsbClassControllerIterator->Next() == KErrNotFound)
{
+#ifndef __OVER_DUMMYUSBDI__
#ifndef __WINS__
if (!iUdcSupportsCableDetectWhenUnpowered || iDeviceState != EUsbDeviceStateUndefined)
{
@@ -623,6 +630,7 @@
(void)PowerUpAndConnect();
}
#endif
+#endif
// If we're not running on target, we can just go to "started".
SetServiceState(EUsbServiceStarted);
}
@@ -636,6 +644,7 @@
if (iUsbClassControllerIterator->Previous() == KErrNotFound)
{
// if stopping classes, hide the USB interface from the host
+#ifndef __OVER_DUMMYUSBDI__
#ifndef __WINS__
iLdd.DeviceDisconnectFromHost();
@@ -650,7 +659,8 @@
TInt res = iLdd.RemoveSerialNumberStringDescriptor();
LOGTEXT2(_L8("Remove serial number res = %d"), res);
}
-
+
+#endif
#endif
SetServiceState(EUsbServiceIdle);
}
@@ -793,7 +803,7 @@
{
LOG_FUNC
-#ifndef __WINS__
+#if !defined(__OVER_DUMMYUSBDI__) && !defined(__WINS__)
TInt desSize = 0;
iLdd.GetDeviceDescriptorSize(desSize);
@@ -821,7 +831,7 @@
TUsbDeviceDescriptor descriptor;
TUsbDeviceDescriptor* deviceDescriptor = &descriptor;
-#endif // __WINS__
+#endif // __OVER_DUMMYUSBDI__ && _WINS_
if (iPersonalityCfged)
{
@@ -832,6 +842,7 @@
SetUsbDeviceSettingsL(*deviceDescriptor);
}
+#ifndef __OVER_DUMMYUSBDI__
#ifndef __WINS__
ret = iLdd.SetDeviceDescriptor(devicePtr);
@@ -843,7 +854,8 @@
CleanupStack::PopAndDestroy(deviceBuf);
-#endif // __WINS__
+#endif
+#endif // __OVER_DUMMYUSBDI__
}
void CUsbDevice::SetUsbDeviceSettingsDefaultsL(CUsbDevice::TUsbDeviceDescriptor& aDeviceDescriptor)
@@ -932,6 +944,7 @@
// If we succesfully read the manufacturer or device name from SysUtil API
// then set these results, otherwise use the values defined in resource file
+#ifndef __OVER_DUMMYUSBDI__
#ifndef __WINS__
if (gotSysUtilManuName == KErrNone)
{
@@ -950,7 +963,9 @@
{
LEAVEIFERRORL(iLdd.SetProductStringDescriptor(productString));
}
-#endif // __WINS__
+
+#endif
+#endif // __OVER_DUMMYUSBDI__
#ifdef __FLOG_ACTIVE
PrintDescriptor(aDeviceDescriptor);
@@ -961,6 +976,7 @@
LOGTEXT2(_L8("Product is: '%S'"), &narrowString);
#endif // __FLOG_ACTIVE
+#ifndef __OVER_DUMMYUSBDI__
#ifndef __WINS__
//Read the published serial number. The key is the UID KUidUsbmanServer = 0x101FE1DB
TBuf16<KUsbStringDescStringMaxSize> serNum;
@@ -982,7 +998,9 @@
LOGTEXT(_L8("SerialNumber has not been published"));
}
#endif // __FLOG_ACTIVE
-#endif // __WINS__
+
+#endif
+#endif // __OVER_DUMMYUSBDI__
CleanupStack::PopAndDestroy(4, &fs); // deviceInfo, id, resource, fs
@@ -1012,6 +1030,7 @@
aDeviceDescriptor.iSerialNumber = deviceDes.iSerialNumber;
aDeviceDescriptor.iNumConfigurations = deviceDes.iNumConfigurations;
+#ifndef __OVER_DUMMYUSBDI__
#ifndef __WINS__
LEAVEIFERRORL(iLdd.SetManufacturerStringDescriptor(*(iCurrentPersonality->Manufacturer())));
LEAVEIFERRORL(iLdd.SetProductStringDescriptor(*(iCurrentPersonality->Product())));
@@ -1036,12 +1055,15 @@
LOGTEXT(_L8("SerialNumber has not been published"));
}
#endif // __FLOG_ACTIVE
-#endif // __WINS__
+
+#endif
+#endif // __OVER_DUMMYUSBDI__
#ifdef __FLOG_ACTIVE
PrintDescriptor(aDeviceDescriptor);
+#ifndef __OVER_DUMMYUSBDI__
#ifndef __WINS__
TBuf16<KUsbStringDescStringMaxSize> wideString;
TBuf8<KUsbStringDescStringMaxSize> narrowString;
@@ -1049,7 +1071,8 @@
LEAVEIFERRORL(iLdd.GetConfigurationStringDescriptor(wideString));
narrowString.Copy(wideString);
LOGTEXT2(_L8("Configuration is: '%S'"), &narrowString);
-#endif // __WINS__
+#endif
+#endif // __OVER_DUMMYUSBDI__
#endif // __FLOG_ACTIVE
}
--- a/usbmgmt/usbmgr/usbman/server/group/BLD.INF Mon May 03 14:13:42 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,74 +0,0 @@
-/*
-* Copyright (c) 2003-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
-
-PRJ_PLATFORMS
-DEFAULT
-
-PRJ_EXPORTS
-../public/Usb_std.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(usb_std.h)
-../public/MUsbDeviceNotify.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(musbdevicenotify.h)
-../public/usbman.rh /epoc32/include/usbman.rh
-../public/usberrors.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(usberrors.h)
-../public/UsbClassUids.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(usbclassuids.h)
-../public/usbshared.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(usb/usbshared.h)
-../public/usbotgdefs.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(usbotgdefs.h)
-../public/usbhostdefs.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(usbhostdefs.h)
-./backup_registration.xml /epoc32/data/z/private/101fe1db/backup_registration.xml
-
-PRJ_TESTEXPORTS
-
-// IBY and INI files for Dummy Class Controller Tests (t_usbman_dummycc)
-dummyCCinifiles.iby /epoc32/rom/include/dummyccinifiles.iby
-../data/BadStart0CI.ini /epoc32/data/z/private/101fe1db/data/badstart0ci.ini
-../data/BadStart1CI.ini /epoc32/data/z/private/101fe1db/data/badstart1ci.ini
-../data/BadStart2CI.ini /epoc32/data/z/private/101fe1db/data/badstart2ci.ini
-../data/BadStop0CI.ini /epoc32/data/z/private/101fe1db/data/badstop0ci.ini
-../data/BadStop1CI.ini /epoc32/data/z/private/101fe1db/data/badstop1ci.ini
-../data/BadStop2CI.ini /epoc32/data/z/private/101fe1db/data/badstop2ci.ini
-../data/nice.ini /epoc32/data/z/private/101fe1db/data/nice.ini
-../data/test.ini /epoc32/data/z/private/101fe1db/data/test.ini
-../data/SyncStart.ini /epoc32/data/z/private/101fe1db/data/syncstart.ini
-../data/SyncStop.ini /epoc32/data/z/private/101fe1db/data/syncstop.ini
-../data/AsyncStart.ini /epoc32/data/z/private/101fe1db/data/asyncstart.ini
-../data/AsyncStop.ini /epoc32/data/z/private/101fe1db/data/asyncstop.ini
-
-../public/rusb.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(usb/rusb.h)
-../public/UsbmanInternalConstants.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(usb/usbmaninternalconstants.h)
-
-PRJ_MMPFILES
-
-Usbsvr.mmp
-
-#if defined(SYMBIAN_ENABLE_USB_OTG_HOST) && !defined(WINS) && !defined(X86GCC)
-usbsvrotg.mmp
-#endif
-
-PRJ_TESTMMPFILES
-
-// Special USBSVR with no class controllers except 3 instances of the dummy
-// class controller, for GT171 tests.
-t_Usbman_dummyCC.mmp
-
-#if defined(SYMBIAN_ENABLE_USB_OTG_HOST)
-
-// exe built from usbsvrotg_dummyusbdi.mmp (below) has dependency on usbhoststack_over_dummyusbdi.lib
-#include "../../../host/fdf/production/client/group/usbhoststack_over_dummyusbdi_bld.inf"
-
-// Special USBSVR with no OTGDI part and over DUMMY USBDI
-usbsvrotg_dummyusbdi.mmp
-
-#endif // SYMBIAN_ENABLE_USB_OTG_HOST
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/usbmgmt/usbmgr/usbman/server/group/bld.inf Fri Jun 25 13:07:44 2010 +0800
@@ -0,0 +1,74 @@
+/*
+* 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:
+*
+*/
+
+PRJ_PLATFORMS
+DEFAULT
+
+PRJ_EXPORTS
+../public/Usb_std.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(usb_std.h)
+../public/MUsbDeviceNotify.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(musbdevicenotify.h)
+../public/usbman.rh /epoc32/include/usbman.rh
+../public/usberrors.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(usberrors.h)
+../public/UsbClassUids.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(usbclassuids.h)
+../public/usbshared.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(usb/usbshared.h)
+../public/usbotgdefs.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(usbotgdefs.h)
+../public/usbhostdefs.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(usbhostdefs.h)
+./backup_registration.xml /epoc32/data/z/private/101fe1db/backup_registration.xml
+
+PRJ_TESTEXPORTS
+
+// IBY and INI files for Dummy Class Controller Tests (t_usbman_dummycc)
+dummyCCinifiles.iby /epoc32/rom/include/dummyccinifiles.iby
+../data/BadStart0CI.ini /epoc32/data/z/private/101fe1db/data/badstart0ci.ini
+../data/BadStart1CI.ini /epoc32/data/z/private/101fe1db/data/badstart1ci.ini
+../data/BadStart2CI.ini /epoc32/data/z/private/101fe1db/data/badstart2ci.ini
+../data/BadStop0CI.ini /epoc32/data/z/private/101fe1db/data/badstop0ci.ini
+../data/BadStop1CI.ini /epoc32/data/z/private/101fe1db/data/badstop1ci.ini
+../data/BadStop2CI.ini /epoc32/data/z/private/101fe1db/data/badstop2ci.ini
+../data/nice.ini /epoc32/data/z/private/101fe1db/data/nice.ini
+../data/test.ini /epoc32/data/z/private/101fe1db/data/test.ini
+../data/SyncStart.ini /epoc32/data/z/private/101fe1db/data/syncstart.ini
+../data/SyncStop.ini /epoc32/data/z/private/101fe1db/data/syncstop.ini
+../data/AsyncStart.ini /epoc32/data/z/private/101fe1db/data/asyncstart.ini
+../data/AsyncStop.ini /epoc32/data/z/private/101fe1db/data/asyncstop.ini
+
+../public/rusb.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(usb/rusb.h)
+../public/UsbmanInternalConstants.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(usb/usbmaninternalconstants.h)
+
+PRJ_MMPFILES
+
+Usbsvr.mmp
+
+#if defined(SYMBIAN_ENABLE_USB_OTG_HOST) && !defined(WINS) && !defined(X86GCC)
+usbsvrotg.mmp
+#endif
+
+PRJ_TESTMMPFILES
+
+// Special USBSVR with no class controllers except 3 instances of the dummy
+// class controller, for GT171 tests.
+t_Usbman_dummyCC.mmp
+
+#if defined(SYMBIAN_ENABLE_USB_OTG_HOST)
+
+// exe built from usbsvrotg_dummyusbdi.mmp (below) has dependency on usbhoststack_over_dummyusbdi.lib
+#include "../../../host/fdf/production/client/group/usbhoststack_over_dummyusbdi_bld.inf"
+
+// Special USBSVR with no OTGDI part and over DUMMY USBDI
+usbsvrotg_dummyusbdi.mmp
+
+#endif // SYMBIAN_ENABLE_USB_OTG_HOST
--- a/usbmgmt/usbmgr/usbman/server/public/rusb.h Mon May 03 14:13:42 2010 +0300
+++ b/usbmgmt/usbmgr/usbman/server/public/rusb.h Fri Jun 25 13:07:44 2010 +0800
@@ -35,7 +35,11 @@
const TInt KUsbMaxSupportedPersonalities = 64; // Max number of supported personalities
+#ifndef __OVER_DUMMYUSBDI__
_LIT(KUsbServerName, "!usbman");
+#else
+_LIT(KUsbServerName, "!usbman_over_dummyusbdi");
+#endif
enum TUsbMessages
{
--- a/usbmgmt/usbmgrtest/ObexClassController/ObexUsbClassController/ClassControllerServerSession/group/Bld.inf Mon May 03 14:13:42 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,21 +0,0 @@
-/*
-* Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
-
-
-PRJ_TESTMMPFILES
-classControllerServerSession.mmp
-
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/usbmgmt/usbmgrtest/ObexClassController/ObexUsbClassController/ClassControllerServerSession/group/bld.inf Fri Jun 25 13:07:44 2010 +0800
@@ -0,0 +1,21 @@
+/*
+* 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:
+*
+*/
+
+
+PRJ_TESTMMPFILES
+classControllerServerSession.mmp
+
--- a/usbmgmt/usbmgrtest/ObexClassController/test/group/Bld.inf Mon May 03 14:13:42 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,26 +0,0 @@
-/*
-* Copyright (c) 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:
-*
-*/
-// BLD.INF
-//
-PRJ_TESTMMPFILES
-
-simpleObexApp.mmp
-
-
-PRJ_TESTEXPORTS
-
-simpleObexApp.IBY /epoc32/rom/include/simpleobexapp.iby
\ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/usbmgmt/usbmgrtest/ObexClassController/test/group/bld.inf Fri Jun 25 13:07:44 2010 +0800
@@ -0,0 +1,26 @@
+/*
+* Copyright (c) 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:
+*
+*/
+// BLD.INF
+//
+PRJ_TESTMMPFILES
+
+simpleObexApp.mmp
+
+
+PRJ_TESTEXPORTS
+
+simpleObexApp.IBY /epoc32/rom/include/simpleobexapp.iby
\ No newline at end of file
--- a/usbmgmt/usbmgrtest/ObexClassController/test/src/simpleObexApp.cpp Mon May 03 14:13:42 2010 +0300
+++ b/usbmgmt/usbmgrtest/ObexClassController/test/src/simpleObexApp.cpp Fri Jun 25 13:07:44 2010 +0800
@@ -455,33 +455,33 @@
CleanupStack::PushL(myScheduler);
CActiveScheduler::Install(myScheduler);
- CConsoleBase* aConsole =
+ CConsoleBase* console =
Console::NewL(_L("Obex Program"),TSize(KConsFullScreen, KConsFullScreen));
// Load Device drivers
TInt err;
// Start C32 now
- aConsole->Printf(_L("Loading C32...\n"));
+ console->Printf(_L("Loading C32...\n"));
err=StartC32();
if (err!=KErrNone && err!=KErrAlreadyExists)
- aConsole->Printf(_L(" Failed %d\n"), err);
+ console->Printf(_L(" Failed %d\n"), err);
else
- aConsole->Printf(_L(" Sucess\n"));
+ console->Printf(_L(" Sucess\n"));
// If running on PC emulator
// Load drivers for using Serial communication
#ifdef __WINS__
TInt load = User::LoadLogicalDevice(KWinsLddName);
- aConsole->Printf(_L("Load LDD : %d\n"), load);
+ console->Printf(_L("Load LDD : %d\n"), load);
load = User::LoadPhysicalDevice(KWinsPddName);
- aConsole->Printf(_L("Load PDD : %d\n"), load);
+ console->Printf(_L("Load PDD : %d\n"), load);
#endif //__WINS__
- CleanupStack::PushL(aConsole);
- CActiveConsole* my_console = CActiveConsole::NewLC(aConsole);// New active console
+ CleanupStack::PushL(console);
+ CActiveConsole* my_console = CActiveConsole::NewLC(console);// New active console
my_console->RequestCharacter();
CActiveScheduler::Start();
CleanupStack::PopAndDestroy(3);
--- a/usbmgmt/usbmgrtest/ObexClassController/test/src/simpleObexClient.cpp Mon May 03 14:13:42 2010 +0300
+++ b/usbmgmt/usbmgrtest/ObexClassController/test/src/simpleObexClient.cpp Fri Jun 25 13:07:44 2010 +0800
@@ -119,16 +119,16 @@
// Create file session and create a new private path on drive C
RFs fileSession;
- fileSession.Connect();
+ User::LeaveIfError(fileSession.Connect());
- fileSession.CreatePrivatePath(EDriveC);
- fileSession.SetSessionToPrivate(EDriveC);
- fileSession.SessionPath(iSessionPath);
+ User::LeaveIfError(fileSession.CreatePrivatePath(EDriveC));
+ User::LeaveIfError(fileSession.SetSessionToPrivate(EDriveC));
+ User::LeaveIfError(fileSession.SessionPath(iSessionPath));
// Copy the files from oby file ro the newly created path
- BaflUtils::CopyFile(fileSession, KFilePath1, KFilename1,0);
- BaflUtils::CopyFile(fileSession, KFilePath2, KFilename2,0);
- BaflUtils::CopyFile(fileSession, KFilePath3, KFilename3,0);
+ User::LeaveIfError(BaflUtils::CopyFile(fileSession, KFilePath1, KFilename1,0));
+ User::LeaveIfError(BaflUtils::CopyFile(fileSession, KFilePath2, KFilename2,0));
+ User::LeaveIfError(BaflUtils::CopyFile(fileSession, KFilePath3, KFilename3,0));
fileSession.Close();
--- a/usbmgmt/usbmgrtest/ObexClassController/test/src/simpleObexServer.cpp Mon May 03 14:13:42 2010 +0300
+++ b/usbmgmt/usbmgrtest/ObexClassController/test/src/simpleObexServer.cpp Fri Jun 25 13:07:44 2010 +0800
@@ -63,7 +63,7 @@
{
// Start bluetooth socket and set security
RSocketServ socketServ;
- socketServ.Connect();
+ User::LeaveIfError(socketServ.Connect());
RSocket listen;
TInt test = listen.Open(socketServ, KRFCOMMDesC);
@@ -129,6 +129,7 @@
// Update attribute
iSdpdb.UpdateAttributeL(ftphandle, KProtocolDescriptorListUUID, *iProtDescList); // put into both records
delete iProtDescList;
+ iProtDescList = NULL;
User::LeaveIfError(listen.Bind(addr));
--- a/usbmgmt/usbmgrtest/csy/t_ecacm/src/t_csyaccess.cpp Mon May 03 14:13:42 2010 +0300
+++ b/usbmgmt/usbmgrtest/csy/t_ecacm/src/t_csyaccess.cpp Fri Jun 25 13:07:44 2010 +0800
@@ -24,12 +24,10 @@
#ifndef __WINS__
_LIT(KCommDriverName, "EUSBC");
-//_LIT(KCommDeviceName, "USBC");
#else
_LIT(KCommPhysDriverName, "ECDRV");
_LIT(KCommPhysDeviceName, "Comm.Wins");
_LIT(KCommDriverName, "ECOMM");
-//_LIT(KCommDeviceName, "Comm");
#endif
LOCAL_D RTest gTest(_L("T_CSYACCESS"));
@@ -467,21 +465,6 @@
if ( !err )
{
gTest.Printf(_L("\tsuccessful result from RComm::Open\n"));
-
- /* TCommServerConfigV01 serverConfig;
- TCommServerConfig serverConfigBuf(serverConfig);
- comm.Mode(serverConfigBuf);
-
- const TUint KBufSize = 0x1000;
- serverConfig.iBufSize = KBufSize;
-
- err = comm.SetMode(serverConfig);
- if ( !err )
- {
- gTest.Printf(_L("\tsuccessful result from RComm::SetMode\n"));
- // End of use case.
- }
- */
comm.Close();
}
}
@@ -751,7 +734,10 @@
TInt error = KErrNone;
RCommServ sess;
- sess.Connect();
+ gTest.Next(_L("Connecting to Comm Server"));
+ r = sess.Connect();
+ gTest(r == KErrNone);
+
sess.__DbgMarkHeap();
switch (key )
@@ -830,7 +816,9 @@
void RunAll()
{
RCommServ sess;
- sess.Connect();
+ gTest.Next(_L("Connecting to Comm Server"));
+ TInt r = sess.Connect();
+ gTest(r == KErrNone);
for ( TInt ii = 0 ; ii < 9 ; ii++ ) // TODO: keep 9 up-to-date with number of tests.
{
--- a/usbmgmt/usbmgrtest/t_acm/src/t_acm.cpp Mon May 03 14:13:42 2010 +0300
+++ b/usbmgmt/usbmgrtest/t_acm/src/t_acm.cpp Fri Jun 25 13:07:44 2010 +0800
@@ -34,7 +34,6 @@
const TInt KReceiveBufferLength = 4096;
const TInt KMaxAcmPortNameLength = 8;
-//_LIT(KUsbCsyName, "ECACM");
_LIT(KUsbPortName, "ACM::0");
_LIT(KUsbPortNameAcm1, "ACM::1");
@@ -943,8 +942,6 @@
_printf(_L("Writing data\n"));
for (timeout = 10; timeout<100; timeout++)
{
-// FillBuffer(readBuf);
-
port.Write(status, readBuf);
// Wait before cancelling
@@ -1774,19 +1771,7 @@
_printf(_L("a. Event notification, flow control (test 2.8.2)\n"));
_printf(_L("b. Event notification, config change (test 2.8.3)\n"));
_printf(_L("c. Second client (test 2.9)\n"));
-/* _printf(_L("d. ACM request, encapsulated command (test 2.10.1)\n"));
- _printf(_L("e. ACM request, break (test 2.10.2)\n"));
- _printf(_L("f. ACM request, setting feature (test 2.10.3)\n"));
- _printf(_L("g. ACM request, clearing feature (test 2.10.4)\n"));
- _printf(_L("h. ACM request, setting line coding (test 2.10.5)\n"));
- _printf(_L("i. ACM request, control line state (test 2.10.6)\n"));
- _printf(_L("j. ACM request, encapsualted response (test 2.10.7)\n"));
- _printf(_L("k. ACM request, comms feature (test 2.10.8)\n"));
- _printf(_L("l. ACM request, getting line coding (test 2.10.9)\n"));
- _printf(_L("m. ACM Notifications, send serial state (test 2.11.1)\n"));
- _printf(_L("n. ACM Notifications, network status (test 2.11.2)\n"));
- _printf(_L("o. ACM Notifications, response available (test 2.11.3)\n"));
-*/ _printf(_L("p. Loopback test (test 2.12)\n"));
+ _printf(_L("p. Loopback test (test 2.12)\n"));
_printf(_L("q. Main menu\n"));
ch = (char) _getch();
--- a/usbmgmt/usbmgrtest/t_acm_cc/src/t_acm_cc.cpp Mon May 03 14:13:42 2010 +0300
+++ b/usbmgmt/usbmgrtest/t_acm_cc/src/t_acm_cc.cpp Fri Jun 25 13:07:44 2010 +0800
@@ -119,17 +119,6 @@
current_test_state = EUSBManConnected;
break;
case EUSBManConnected:
- // Register as primary client.
- // *** Obsolete ***
- /*
- r = usbman->RegisterAsPrimarySession();
- if (r != KErrNone)
- {
- test.Printf(_L(" Failed to register as primary client. Error = %d\n"), r);
- return r;
- }
- test.Printf(_L(" Registered as primary client.\n"));
- */
current_test_state = EPrimaryRegistered;
break;
default:
@@ -162,8 +151,6 @@
current_test_state = EPrimaryRegistered;
break;
case EPrimaryRegistered:
- // *** Obsolete ***
- // usbman->DeregisterAsPrimarySession();
current_test_state = EUSBManConnected;
break;
case EUSBManConnected:
@@ -240,44 +227,6 @@
}
/**
- * Executes test B2 (as detailed in the USB Manager Test Specification).
- * No longer a relevant test.
- */
-/*static TInt RunTest_B2()
- {
- TInt r;
-
- test.Next(_L("Test B2.\n"));
-
- // Perform common startup
- current_test_state = EStart;
- r = CommonStart();
- if (r != KErrNone)
- return r;
-
- // Start the USB Manager
- TRequestStatus status;
- test.Printf(_L("Starting.\n"));
- usbman->Start(status);
-
- // Wait for specific time (has to be less than the time to process a start request)
- timer.After(status, CANCEL_START_REQ_DELAY);
- User::WaitForRequest(status);
-
- // Cancel the start request
- test.Printf(_L("Cancelling.\n"));
- usbman->StartCancel();
-
- // Check service status
- test.Printf(_L("Checking service status.\n"));
- r = CheckServiceState(EUsbServiceIdle);
- if ( r != KErrNone)
- return r;
-
- return KErrNone;
- }
-*/
-/**
* Executes test B3 (as detailed in the USB Manager Test Specification).
*/
static TInt RunTest_B3()
@@ -314,47 +263,6 @@
}
/**
- * Executes test B4 (as detailed in the USB Manager Test Specification).
- * No longer a relevant test.
- */
-/*static TInt RunTest_B4()
- {
- TInt r;
-
- test.Next(_L("Test B4.\n"));
-
- // Perform common startup
- current_test_state = EStart;
- r = CommonStart();
- if (r != KErrNone)
- return r;
-
- // Start the USB Manager
- TRequestStatus status, timerStatus;
- usbman->Start(status);
- User::WaitForRequest(status);
- test.Printf(_L("Start completed with status %d\n"), status.Int());
- current_test_state = EUSBManStarted;
-
- // Stop the USB Manager
- usbman->Stop(status);
-
- // Wait for specific time (has to be less than the time to process a start request)
- timer.After(timerStatus, CANCEL_STOP_REQ_DELAY);
- User::WaitForRequest(status, timerStatus);
-
- // Cancel the stop request
- usbman->StopCancel();
-
- // Check service status
- r = CheckServiceState(EUsbServiceStarted);
- if ( r != KErrNone)
- return r;
-
- return KErrNone;
- }
-*/
-/**
* Executes test B5 (as detailed in the USB Manager Test Specification).
*/
static TInt RunTest_B5()
@@ -507,16 +415,6 @@
test.Printf(_L("Test B1 passed.\n\n"));
CommonCleanup();
-/* Depreciated test.
- err=RunTest_B2();
- if (err != KErrNone)
- {
- test.Printf(_L("Test B2 failed, code: %d\n\n"), err);
- }
- else
- test.Printf(_L("Test B2 passed.\n\n"));
- CommonCleanup();
-*/
err=RunTest_B3();
if (err != KErrNone)
{
@@ -526,16 +424,6 @@
test.Printf(_L("Test B3 passed.\n\n"));
CommonCleanup();
-/* Depreciated test.
- err=RunTest_B4();
- if (err != KErrNone)
- {
- test.Printf(_L("Test B4 failed, code: %d\n\n"), err);
- }
- else
- test.Printf(_L("Test B4 passed.\n\n"));
- CommonCleanup();
-*/
err=RunTest_B5();
if (err != KErrNone)
{
--- a/usbmgmt/usbmgrtest/t_acm_pub_sub/group/Bld.inf Mon May 03 14:13:42 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,26 +0,0 @@
-/*
-* 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 "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_TESTEXPORTS
-t_acm_pub_sub.iby /epoc32/rom/include/t_acm_pub_sub.iby
-
-usbacmconfiguration.hby /epoc32/rom/include/usbacmconfiguration.hby
-
-
-PRJ_TESTMMPFILES
-
-t_acm_pub_sub.mmp
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/usbmgmt/usbmgrtest/t_acm_pub_sub/group/bld.inf Fri Jun 25 13:07:44 2010 +0800
@@ -0,0 +1,26 @@
+/*
+* 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 "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_TESTEXPORTS
+t_acm_pub_sub.iby /epoc32/rom/include/t_acm_pub_sub.iby
+
+usbacmconfiguration.hby /epoc32/rom/include/usbacmconfiguration.hby
+
+
+PRJ_TESTMMPFILES
+
+t_acm_pub_sub.mmp
--- a/usbmgmt/usbmgrtest/t_acm_pub_sub/src/t_acm_pub_sub.cpp Mon May 03 14:13:42 2010 +0300
+++ b/usbmgmt/usbmgrtest/t_acm_pub_sub/src/t_acm_pub_sub.cpp Fri Jun 25 13:07:44 2010 +0800
@@ -344,7 +344,7 @@
}
//Connect to the file server
- gFs.Connect();
+ User::LeaveIfError(gFs.Connect());
TInt result = KErrNone;
TRAPD(error, result = TestCase1L());
if(error)
--- a/usbmgmt/usbmgrtest/t_acm_spec/src/t_acm_spec.cpp Mon May 03 14:13:42 2010 +0300
+++ b/usbmgmt/usbmgrtest/t_acm_spec/src/t_acm_spec.cpp Fri Jun 25 13:07:44 2010 +0800
@@ -35,7 +35,6 @@
const TInt KReceiveBufferLength = 8192;
-//_LIT(KUsbCsyName, "ECACM");
_LIT(KUsbPortName, "ACM::0");
_LIT(KUsbLddName, "EUSBC");
@@ -421,8 +420,6 @@
_printf(_L("Writing data\n"));
for (timeout = 10; timeout<100; timeout++)
{
-// FillBuffer(readBuf);
-
port.Write(status, readBuf);
// Wait before cancelling
@@ -527,7 +524,6 @@
if (status != KErrNone) // Error code ? TODO
{
- //LEAVE(status.Int());
_printf(_L("Read failed\n"));
}
@@ -985,7 +981,6 @@
break;
}
-// _printf(_L("Read %d bytes\n"), readBuf.Length());
port.Write(status, readBuf);
User::WaitForRequest(status, consoleStatus);
@@ -1135,14 +1130,6 @@
port.SetConfig(TheConfigBuf);
-// _printf(_L("----------------------------------------\n"));
-// _printf(_L("Initial port config:\n"));
-// _printf(_L(" Rate: %d bps\n"), TheConfig.iRate);
-// _printf(_L(" Data bits: %d. Parity type: %d. Stop bits: %d\n"),
-// TheConfig.iStopBits, TheConfig.iParity, TheConfig.iStopBits);
-// _printf(_L(" Handshaking options: 0x%X\n"), TheConfig.iHandshake);
-// _printf(_L("----------------------------------------\n\n"));
-
CleanupStack::PopAndDestroy(); // port
TBool noExit = ETrue;
@@ -1185,19 +1172,7 @@
_printf(_L("a. Event notification, flow control (test 2.8.2)\n"));
_printf(_L("b. Event notification, config change (test 2.8.3)\n"));
_printf(_L("c. Second client (test 2.9)\n"));
-/* _printf(_L("d. ACM request, encapsulated command (test 2.10.1)\n"));
- _printf(_L("e. ACM request, break (test 2.10.2)\n"));
- _printf(_L("f. ACM request, setting feature (test 2.10.3)\n"));
- _printf(_L("g. ACM request, clearing feature (test 2.10.4)\n"));
- _printf(_L("h. ACM request, setting line coding (test 2.10.5)\n"));
- _printf(_L("i. ACM request, control line state (test 2.10.6)\n"));
- _printf(_L("j. ACM request, encapsualted response (test 2.10.7)\n"));
- _printf(_L("k. ACM request, comms feature (test 2.10.8)\n"));
- _printf(_L("l. ACM request, getting line coding (test 2.10.9)\n"));
- _printf(_L("m. ACM Notifications, send serial state (test 2.11.1)\n"));
- _printf(_L("n. ACM Notifications, network status (test 2.11.2)\n"));
- _printf(_L("o. ACM Notifications, response available (test 2.11.3)\n"));
-*/ _printf(_L("p. Loopback test (test 2.12)\n"));
+ _printf(_L("p. Loopback test (test 2.12)\n"));
_printf(_L("q. Main menu\n"));
ch = (char) _getch();
--- a/usbmgmt/usbmgrtest/t_acm_wins/src/t_acm_wins.cpp Mon May 03 14:13:42 2010 +0300
+++ b/usbmgmt/usbmgrtest/t_acm_wins/src/t_acm_wins.cpp Fri Jun 25 13:07:44 2010 +0800
@@ -758,7 +758,6 @@
memset(writeBufbig, i, MAX_BUFFER_SIZE); // fill the write buffer with known data
_printf(_L("%d: "), (TInt)i);
WriteData(writeBufbig, 64);
- //FlushFileBuffers(hSerial);
ReadData(readBufbig, 64);
for (int j=0; j<64; j++)
{
@@ -806,19 +805,7 @@
_printf(_L("a. Event notification, flow control (test 2.8.2)\n"));
_printf(_L("b. Event notification, config change (test 2.8.3)\n"));
_printf(_L("c. Second client (test 2.9)\n"));
-/* _printf(_L("d. ACM request, encapsulated command (test 2.10.1)\n"));
- _printf(_L("e. ACM request, break (test 2.10.2)\n"));
- _printf(_L("f. ACM request, setting feature (test 2.10.3)\n"));
- _printf(_L("g. ACM request, clearing feature (test 2.10.4)\n"));
- _printf(_L("h. ACM request, setting line coding (test 2.10.5)\n"));
- _printf(_L("i. ACM request, control line state (test 2.10.6)\n"));
- _printf(_L("j. ACM request, encapsualted response (test 2.10.7)\n"));
- _printf(_L("k. ACM request, comms feature (test 2.10.8)\n"));
- _printf(_L("l. ACM request, getting line coding (test 2.10.9)\n"));
- _printf(_L("m. ACM Notifications, send serial state (test 2.11.1)\n"));
- _printf(_L("n. ACM Notifications, network status (test 2.11.2)\n"));
- _printf(_L("o. ACM Notifications, response available (test 2.11.3)\n"));
-*/ _printf(_L("p. Loopback test (test 2.12)\n"));
+ _printf(_L("p. Loopback test (test 2.12)\n"));
_printf(_L("\n"));
_printf(_L("\nSelection (x to exit): "));
--- a/usbmgmt/usbmgrtest/t_catc/src/t_catc.cpp Mon May 03 14:13:42 2010 +0300
+++ b/usbmgmt/usbmgrtest/t_catc/src/t_catc.cpp Fri Jun 25 13:07:44 2010 +0800
@@ -37,12 +37,10 @@
TCommConfigV01& TheConfig = TheConfigBuf();
const TInt KReceiveBufferLength = 65536/*16384*/; // TODO: speed enhancement!
-//const TInt KMaxBufferSize = 8192; // TODO: speed enhancement!
const TUint KChunkSize = 65536;
////////////////////////////////////////////////////////////////////////////////
-//_LIT(KUsbCsyName, "ECACM");
_LIT(KUsbPortName, "ACM::0");
_LIT(KUsbLddName, "EUSBC");
@@ -137,7 +135,6 @@
TRequestStatus status;
RComm port;
-// static TBuf8<1024> OUT_Buf; // TODO: speed enhancement!
static TBuf8<KChunkSize> OUT_Buf;
_printf(_L("\n"));
@@ -162,7 +159,6 @@
console->Read(consoleStatus);
TInt uReadCount = 0 ;
- //TInt uThermoBar = 0 ; // TODO: speed enhancement! (remove ThermoBar fnality)
_printf(_L("\tWatch : "));
@@ -216,25 +212,6 @@
}
uReadCount += OUT_Buf.Length() ;
-
-/* if( uReadCount >= 1024 )
- {
- // uThermoBar runs from 0..63
-
- uThermoBar = ( uThermoBar + 1 ) & 0x3F ;
-
- if( uThermoBar < 32 )
- {
- _printf(_L("*"));
- }
- else
- {
- _printf(_L("\b \b"));
- }
-
- uReadCount -= 1024 ;
- }
- */
}
else
{
@@ -270,7 +247,6 @@
TRequestStatus status;
RComm port;
-//#define uInBufSize 4096 // TODO: speed enhancement! reduce number of IPC calls
#define uInBufSize 65536
static TBuf8<uInBufSize> IN_Buf;
@@ -337,7 +313,6 @@
TInt bNeedZLP = bUseZLP && ((IN_Buf.Length()%64)==0);
TInt uWriteCount = 0 ;
-// TInt uThermoBar = 0 ; // TODO: speed enhancement!
_printf(_L("\tWatch : "));
@@ -378,24 +353,6 @@
// reassure watcher that there is something happening...
-/* while( uWriteCount >= 1024 )
- {
- // uThermoBar runs from 0..63
-
- uThermoBar = ( uThermoBar + 1 ) & 0x3F ;
-
- if( uThermoBar < 32 )
- {
- _printf(_L("*"));
- }
- else
- {
- _printf(_L("\b \b"));
- }
-
- uWriteCount -= 1024 ;
- }
- */
}
else
{
@@ -498,49 +455,7 @@
_printf(_L("Restarted USB.\n"));
}
-////////////////////////////////////////////////////////////////////////////////
-/*void ThermoBar()
- {
- TUint uCol = 0 ;
-
- TTime now;
-
- TDateTime WasDT;
- TDateTime NowDT;
-
- now.HomeTime();
- WasDT = now.DateTime();
-
- for( TUint line = 0 ; line < 30 ; )
- {
- for( TUint dotO = 0 ; dotO < 1000 ; dotO++ )
- {
- for( TUint dotI = 0 ; dotI < 1000 ; dotI++ )
- {
- ;
- }
- }
-
- _printf(_L("*"));
-
- now.HomeTime();
- NowDT = now.DateTime();
-
- if( ( ++uCol >= 79 ) || ( WasDT.Second() != NowDT.Second() ) )
- {
- _printf(_L("\n"));
-
- uCol = 0 ;
-
- line++ ;
-
- WasDT = now.DateTime() ;
- }
- }
- }
-*/
-////////////////////////////////////////////////////////////////////////////////
void ToggleTermL()
{
@@ -659,7 +574,6 @@
_printf(_L("2. Bulk IN test \n"));
_printf(_L("3. Set handshaking \n"));
_printf(_L("4. Restart USB \n"));
-// _printf(_L("5. Run ThermoBar \n"));
_printf(_L("6. Swap Read Method \n"));
_printf(_L("7. Swap ZLP Method \n"));
_printf(_L("8. Swap Term Method \n"));
@@ -675,7 +589,6 @@
case '2': Bulk_IN_TestL(); break;
case '3': SetHandshakingL(); break;
case '4': RestartUsbL(); break;
-// case '5': ThermoBar(); break;
case '6': bReadCall = ( bReadCall == EFalse ) ; break;
case '7': bUseZLP = ( bUseZLP == EFalse ) ; break;
case '8': ToggleTermL() ; break;
--- a/usbmgmt/usbmgrtest/t_charging_emu/group/BLD.INF Mon May 03 14:13:42 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,35 +0,0 @@
-/*
-* Copyright (c) 1999-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:
-*
-*/
-
-PRJ_PLATFORMS
-DEFAULT
-
-PRJ_TESTEXPORTS
-../inc/dummyldd.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(dummyldd.h)
-../inc/CUsbBatteryChargingTestPlugin.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(usb/chargingtest/CUsbBatteryChargingTestPlugin.h)
-../src/t_charging.txt /epoc32/winscw/c/system/data/t_charging.txt
-../src/t_charging.txt /epoc32/data/z/system/data/t_charging.txt
-
-
-t_usbcharging.iby /epoc32/rom/include/t_usbcharging.iby
-
-PRJ_TESTMMPFILES
-
- tbatterycharging.mmp
- tbatterychargingrepositorywriter.mmp
- TestPlugin.mmp
- TestPluginotg.mmp
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/usbmgmt/usbmgrtest/t_charging_emu/group/bld.inf Fri Jun 25 13:07:44 2010 +0800
@@ -0,0 +1,35 @@
+/*
+* Copyright (c) 1999-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:
+*
+*/
+
+PRJ_PLATFORMS
+DEFAULT
+
+PRJ_TESTEXPORTS
+../inc/dummyldd.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(dummyldd.h)
+../inc/CUsbBatteryChargingTestPlugin.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(usb/chargingtest/CUsbBatteryChargingTestPlugin.h)
+../src/t_charging.txt /epoc32/winscw/c/system/data/t_charging.txt
+../src/t_charging.txt /epoc32/data/z/system/data/t_charging.txt
+
+
+t_usbcharging.iby /epoc32/rom/include/t_usbcharging.iby
+
+PRJ_TESTMMPFILES
+
+ tbatterycharging.mmp
+ tbatterychargingrepositorywriter.mmp
+ TestPlugin.mmp
+ TestPluginotg.mmp
--- a/usbmgmt/usbmgrtest/t_charging_emu/inc/dummyldd.h Mon May 03 14:13:42 2010 +0300
+++ b/usbmgmt/usbmgrtest/t_charging_emu/inc/dummyldd.h Fri Jun 25 13:07:44 2010 +0800
@@ -42,7 +42,7 @@
inline TInt RDevUsbcClient::GetConfigurationDescriptor(TDes8& aConfigurationDescriptor)
{
// 8th byte is bMaxPower
- aConfigurationDescriptor.Copy(iConfigDesc);//[8] = iConfigDesc[8];
+ aConfigurationDescriptor.Copy(iConfigDesc);
return KErrNone;
}
--- a/usbmgmt/usbmgrtest/t_charging_emu/inc/tbatterycharging.h Mon May 03 14:13:42 2010 +0300
+++ b/usbmgmt/usbmgrtest/t_charging_emu/inc/tbatterycharging.h Fri Jun 25 13:07:44 2010 +0800
@@ -120,7 +120,6 @@
RTest iTest;
RTimer iTimer;
- //CRepository* iRepository;
TPtr8 iPtr; // data file
TPtr8 iLine; // current line
--- a/usbmgmt/usbmgrtest/t_charging_emu/inc/tpropertybatterycharging.h Mon May 03 14:13:42 2010 +0300
+++ b/usbmgmt/usbmgrtest/t_charging_emu/inc/tpropertybatterycharging.h Fri Jun 25 13:07:44 2010 +0800
@@ -56,9 +56,7 @@
CActivePropertyReadChargingCurrent* iActiveReadChargingCurrent;
CRepository* iRepository;
- //RProperty iPropertyWrittenToRepositoryAck;
- //RProperty iPropertyReadChargingCurrentAck;
RProperty iProperty; // only one protected needed ?
- };
\ No newline at end of file
+ };
--- a/usbmgmt/usbmgrtest/t_charging_emu/src/1020DEA7.rss Mon May 03 14:13:42 2010 +0300
+++ b/usbmgmt/usbmgrtest/t_charging_emu/src/1020DEA7.rss Fri Jun 25 13:07:44 2010 +0800
@@ -29,7 +29,7 @@
{
INTERFACE_INFO
{
- interface_uid = 0x10208DD6;
+ interface_uid = 0xE0208DD6;
implementations =
{
IMPLEMENTATION_INFO
--- a/usbmgmt/usbmgrtest/t_charging_emu/src/tbatterycharging.cpp Mon May 03 14:13:42 2010 +0300
+++ b/usbmgmt/usbmgrtest/t_charging_emu/src/tbatterycharging.cpp Fri Jun 25 13:07:44 2010 +0800
@@ -129,7 +129,6 @@
iPlugin = iExtensionPlugins[0];
iDummyLdd.Initialise();
- //iRepository = CRepository::NewL(KUsbBatteryChargingCentralRepositoryUid);
User::LeaveIfError(iTimer.CreateLocal());
DefinePropertyL(KBattChargWriteRepositoryUid, KBattChargWriteRepositoryKey,RProperty::EInt);
@@ -346,7 +345,7 @@
TInt CDummyUsbDevice::GetNextLine()
{
- TInt newLineOffset = (iPtr.Mid(iFileOffset)).Locate(13);//Find(_L("\r\n"));
+ TInt newLineOffset = (iPtr.Mid(iFileOffset)).Locate(13);
if (newLineOffset < 0)
{
return newLineOffset;
@@ -427,7 +426,6 @@
{
TInt err = WriteToRepositoryProperty(iCommandValue);
- //TInt err = iRepository->Set(KUsbBatteryChargingKeyEnabledUserSetting, iCommandValue);
iTest(err == KErrNone);
}
break;
@@ -483,8 +481,6 @@
TInt current;
TInt err = GetChargingCurrentFromProperty(current);
- //TInt err = RProperty::Get(KPropertyUidUsbBatteryChargingCategory,
- // KPropertyUidUsbBatteryChargingChargingCurrent, current);
iTest(err == KErrNone);
iTest(current == iCheckValue);
}
--- a/usbmgmt/usbmgrtest/t_multi_acm/src/t_multiple_acm.cpp Mon May 03 14:13:42 2010 +0300
+++ b/usbmgmt/usbmgrtest/t_multi_acm/src/t_multiple_acm.cpp Fri Jun 25 13:07:44 2010 +0800
@@ -33,7 +33,6 @@
const TInt KReceiveBufferLength = 4096;
const TInt KMaxAcmPortNameLength = 8;
-//_LIT(KUsbCsyName, "ECACM");
_LIT(KUsbPortName, "ACM::0");
_LIT(KUsbPortNameAcm1, "ACM::1");
--- a/usbmgmt/usbmgrtest/t_termusb/src/t_termusb.cpp Mon May 03 14:13:42 2010 +0300
+++ b/usbmgmt/usbmgrtest/t_termusb/src/t_termusb.cpp Fri Jun 25 13:07:44 2010 +0800
@@ -205,11 +205,6 @@
aBuf.Append(_L("DSR/DTR "));
if (aConfig.iHandshake&KConfigWriteBufferedComplete)
aBuf.Append(_L("Early "));
- //|KConfigObeyDCD|KConfigFailDCD|))
-
-
-// if (aConfig.iBreak==TEiger::EBreakOn)
-// aBuf.Append(_L("Brk "));
if (aConfig.iFifo==EFifoEnable)
aBuf.Append(_L("Fifo "));
@@ -223,10 +218,6 @@
aBuf.Append(_L("LpBk"));
else if ((aSettings.iRxMode&~ECapture)==ECountChars)
aBuf.Append(_L("CtCh"));
- //else if (aSettings.iRxMode==ERxOff)
- //{
- //aBuf.Append(_L("NoRx"));
- //}
aBuf.Append(_L(" "));
aBuf.AppendNum((TInt)(RThread().Priority()));
if (aSettings.iInfraRed==1)
@@ -357,23 +348,6 @@
aWait=ETrue;
}
-/*LOCAL_C void GetBreak(const TDesC &aDes)
- {
-
- if (aDes==_L(""))
- {
- if (data.iBreak==TEiger::EBreakOn)
- data.iBreak=TEiger::EBreakOff;
- else
- data.iBreak=TEiger::EBreakOn;
- }
- if (aDes.FindF(_L("N"))>=0)
- data.iBreak=TEiger::EBreakOn;
- if (aDes.FindF(_L("F"))>=0)
- data.iBreak=TEiger::EBreakOff;
- SetConfig();
- }
-*/
LOCAL_C void GetFifo(TUint& aFifo, const TDesC &aDes)
{
@@ -468,8 +442,6 @@
TPtrC s(&a,1);
dialog.Write(s);
aSettings.iDumpData.Append(k.Code());
- //if (a=='\r')
- // dialog.Write(_L("\n"));
} while (aSettings.iDumpData.Length()<KMaxDumpLength);
dialog.Destroy();
@@ -528,8 +500,6 @@
GetStopBit(aConfig.iStopBits, right);
if (des[0]=='L')
GetLength(aConfig.iDataBits, right);
-// if (des[0]=='K')
-// GetBreak(aSettings.iBreak, right);
if (des[0]=='F')
GetFifo(aConfig.iFifo, right);
if (des[0]=='I')
@@ -747,7 +717,7 @@
TheWindow.Write(_L("Opened USB Comm Port\r\n"));
TheCommPort.Config(TheConfigBuf); // get config
- TheConfig.iHandshake=0; //KConfigObeyXoff|KConfigSendXoff;
+ TheConfig.iHandshake=0;
TheCommPort.SetConfig(TheConfigBuf);
TheCommPort.SetReceiveBufferLength(8192);
--- a/usbmgmt/usbmgrtest/t_termusb2/src/t_termusb2.cpp Mon May 03 14:13:42 2010 +0300
+++ b/usbmgmt/usbmgrtest/t_termusb2/src/t_termusb2.cpp Fri Jun 25 13:07:44 2010 +0800
@@ -203,11 +203,6 @@
aBuf.Append(_L("DSR/DTR "));
if (aConfig.iHandshake&KConfigWriteBufferedComplete)
aBuf.Append(_L("Early "));
- //|KConfigObeyDCD|KConfigFailDCD|))
-
-
-// if (aConfig.iBreak==TEiger::EBreakOn)
-// aBuf.Append(_L("Brk "));
if (aConfig.iFifo==EFifoEnable)
aBuf.Append(_L("Fifo "));
@@ -221,10 +216,6 @@
aBuf.Append(_L("LpBk"));
else if ((aSettings.iRxMode&~ECapture)==ECountChars)
aBuf.Append(_L("CtCh"));
- //else if (aSettings.iRxMode==ERxOff)
- //{
- //aBuf.Append(_L("NoRx"));
- //}
aBuf.Append(_L(" "));
aBuf.AppendNum((TInt)(RThread().Priority()));
if (aSettings.iInfraRed==1)
@@ -355,23 +346,6 @@
aWait=ETrue;
}
-/*LOCAL_C void GetBreak(const TDesC &aDes)
- {
-
- if (aDes==_L(""))
- {
- if (data.iBreak==TEiger::EBreakOn)
- data.iBreak=TEiger::EBreakOff;
- else
- data.iBreak=TEiger::EBreakOn;
- }
- if (aDes.FindF(_L("N"))>=0)
- data.iBreak=TEiger::EBreakOn;
- if (aDes.FindF(_L("F"))>=0)
- data.iBreak=TEiger::EBreakOff;
- SetConfig();
- }
-*/
LOCAL_C void GetFifo(TUint& aFifo, const TDesC &aDes)
{
@@ -466,8 +440,6 @@
TPtrC s(&a,1);
dialog.Write(s);
aSettings.iDumpData.Append(k.Code());
- //if (a=='\r')
- // dialog.Write(_L("\n"));
} while (aSettings.iDumpData.Length()<KMaxDumpLength);
dialog.Destroy();
@@ -526,8 +498,6 @@
GetStopBit(aConfig.iStopBits, right);
if (des[0]=='L')
GetLength(aConfig.iDataBits, right);
-// if (des[0]=='K')
-// GetBreak(aSettings.iBreak, right);
if (des[0]=='F')
GetFifo(aConfig.iFifo, right);
if (des[0]=='I')
@@ -652,17 +622,6 @@
// Initialisation
-/*
- // I don't belive this section of code is being used anymore and
- // has been replaced with PORT_NAME.
- // I'm not sure so I've left it here ...
-
- TBuf <0x100> cmd;
- User::CommandLine(cmd);
- TInt port=0;
- if ((cmd.Length()>0) && (cmd[0]>='1' && cmd[0]<='4'))
- port=(TInt)(cmd[0]-'0');
-*/
// Load Device Drivers
TInt r;
@@ -761,7 +720,7 @@
RDebug::Print(_L("E32Main: Open USB Comm Port"));
TheCommPort.Config(TheConfigBuf); // get config
- TheConfig.iHandshake=0; //KConfigObeyXoff|KConfigSendXoff;
+ TheConfig.iHandshake=0;
TheConfig.iTerminator[0] = 'Z';
TheConfig.iTerminatorCount = 1;
TheCommPort.SetConfig(TheConfigBuf);
--- a/usbmgmt/usbmgrtest/t_usb_cable_detect/src/t_usb_cable_detect.cpp Mon May 03 14:13:42 2010 +0300
+++ b/usbmgmt/usbmgrtest/t_usb_cable_detect/src/t_usb_cable_detect.cpp Fri Jun 25 13:07:44 2010 +0800
@@ -136,7 +136,7 @@
TUsbServiceState serviceState;
User::LeaveIfError(iUsbMan.GetServiceState(serviceState));
-// RDebug::Print(_L("Service state: %d. Device state: %d"), serviceState, iDeviceState);
+
if ((serviceState != EUsbServiceIdle) &&
(iDeviceState == EUsbDeviceStateUndefined))
--- a/usbmgmt/usbmgrtest/t_usbman/src/t_usbman.cpp Mon May 03 14:13:42 2010 +0300
+++ b/usbmgmt/usbmgrtest/t_usbman/src/t_usbman.cpp Fri Jun 25 13:07:44 2010 +0800
@@ -41,8 +41,6 @@
RUsb TheSecondUsbSession;
TBool ThePrimaryClient;
-//_LIT(KUsbCsyName, "ECACM");
-//_LIT(KUsbPortName, "ACM::0");
_LIT(KUsbLddName, "EUSBC");
// These are used in the startup stress test.
@@ -656,19 +654,7 @@
TheSecondUsbSession.Close();
}
-/*
-void RegisterAsPrimaryClientL()
- {
- LEAVEIFERROR(TheUsb.RegisterAsPrimarySession());
- ThePrimaryClient = ETrue;
- }
-void DeregisterAsPrimaryClientL()
- {
- LEAVEIFERROR(TheUsb.DeregisterAsPrimarySession());
- ThePrimaryClient = EFalse;
- }
-*/
void DbgCheckHeapL()
{
_printf(_L("Expected number of allocated heap cells: "));
@@ -1050,9 +1036,7 @@
case '5': SetUsbSerialNumberL(); break;
case 's': case 'S': SanityTestL(); break;
#ifndef HURRICANE
-/* case 'r': RegisterAsPrimaryClientL(); break;
- case 'd': DeregisterAsPrimaryClientL(); break;
-*/ case 'm': MemoryTestsL(); break;
+ case 'm': MemoryTestsL(); break;
#endif // HURRICANE
case 'c': case 'C': CloseUsbL(); break;
case 'o': case 'O': OpenUsbL(); break;
@@ -1105,9 +1089,7 @@
_printf(_L("5. Publish Serial Number\n"));
_printf(_L("S. Sanity test- quickly calls all APIs to make sure they don't panic\n"));
#ifndef HURRICANE
-/* _printf(_L("R. Register as primary client\n"));
- _printf(_L("D. Deregister as primary client\n"));
-*/ _printf(_L("M. Memory tests\n"));
+ _printf(_L("M. Memory tests\n"));
#endif // HURRICANE
_printf(_L("C. Close connection to USB Manager\n"));
_printf(_L("O. Connect to USB Manager\n"));
--- a/usbmgmt/usbmgrtest/t_usbmanager_suite/Stub1CC/group/BLD.INF Mon May 03 14:13:42 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,32 +0,0 @@
-/*
-* Copyright (c) 2004-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:
-*
-*/
-
-PRJ_PLATFORMS
-DEFAULT
-
-PRJ_TESTEXPORTS
-#ifndef WINS
-Stub1CC.iby /epoc32/rom/include/stub1cc.iby
-stub1cc.ini z:/testdata/config/stub1cc.ini
-#endif
-
-PRJ_TESTMMPFILES
-#ifndef WINS
-Stub1CC.mmp
-#endif
-
-
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/usbmgmt/usbmgrtest/t_usbmanager_suite/Stub1CC/group/bld.inf Fri Jun 25 13:07:44 2010 +0800
@@ -0,0 +1,32 @@
+/*
+* Copyright (c) 2004-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:
+*
+*/
+
+PRJ_PLATFORMS
+DEFAULT
+
+PRJ_TESTEXPORTS
+#ifndef WINS
+Stub1CC.iby /epoc32/rom/include/stub1cc.iby
+stub1cc.ini z:/testdata/config/stub1cc.ini
+#endif
+
+PRJ_TESTMMPFILES
+#ifndef WINS
+Stub1CC.mmp
+#endif
+
+
--- a/usbmgmt/usbmgrtest/t_usbmanager_suite/Stub1CC/inc/Stub1CC.h Mon May 03 14:13:42 2010 +0300
+++ b/usbmgmt/usbmgrtest/t_usbmanager_suite/Stub1CC/inc/Stub1CC.h Fri Jun 25 13:07:44 2010 +0800
@@ -40,12 +40,7 @@
const TInt Kstub1NumberOfInterfacesPerstub1Function = 2; // data and control interfaces
-// The name of the ini file specifying the number of functions required different from default
-/*
-_LIT(Kstub1FunctionsIniFileName, "NumberOfstub1Functions.ini");
-_LIT(Kstub1ConfigSection,"stub1_CONF");
-_LIT(KNumberOfstub1FunctionsKeyWord,"NumberOfstub1Functions");
-*/
+
// Lengths of the various bits of the descriptor. Taken from the USB
// WMCDC specification, v1.0.
const TInt Kstub1InterfaceDescriptorLength = 3;
--- a/usbmgmt/usbmgrtest/t_usbmanager_suite/Stub2CC/group/BLD.INF Mon May 03 14:13:42 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,32 +0,0 @@
-/*
-* Copyright (c) 2004-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:
-*
-*/
-
-PRJ_PLATFORMS
-DEFAULT
-
-PRJ_TESTEXPORTS
-#ifndef WINS
-Stub2CC.iby /epoc32/rom/include/stub2cc.iby
-stub2cc.ini z:/testdata/config/stub2cc.ini
-#endif
-
-PRJ_TESTMMPFILES
-#ifndef WINS
-Stub2CC.mmp
-#endif
-
-
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/usbmgmt/usbmgrtest/t_usbmanager_suite/Stub2CC/group/bld.inf Fri Jun 25 13:07:44 2010 +0800
@@ -0,0 +1,32 @@
+/*
+* Copyright (c) 2004-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:
+*
+*/
+
+PRJ_PLATFORMS
+DEFAULT
+
+PRJ_TESTEXPORTS
+#ifndef WINS
+Stub2CC.iby /epoc32/rom/include/stub2cc.iby
+stub2cc.ini z:/testdata/config/stub2cc.ini
+#endif
+
+PRJ_TESTMMPFILES
+#ifndef WINS
+Stub2CC.mmp
+#endif
+
+
--- a/usbmgmt/usbmgrtest/t_usbmanager_suite/Stub2CC/inc/Stub2CC.h Mon May 03 14:13:42 2010 +0300
+++ b/usbmgmt/usbmgrtest/t_usbmanager_suite/Stub2CC/inc/Stub2CC.h Fri Jun 25 13:07:44 2010 +0800
@@ -40,12 +40,7 @@
const TInt Kstub2NumberOfInterfacesPerstub2Function = 2; // data and control interfaces
-// The name of the ini file specifying the number of functions required different from default
-/*
-_LIT(Kstub2FunctionsIniFileName, "NumberOfstub2Functions.ini");
-_LIT(Kstub2ConfigSection,"stub2_CONF");
-_LIT(KNumberOfstub2FunctionsKeyWord,"NumberOfstub2Functions");
-*/
+
// Lengths of the various bits of the descriptor. Taken from the USB
// WMCDC specification, v1.0.
const TInt Kstub2InterfaceDescriptorLength = 3;
--- a/usbmgmt/usbmgrtest/t_usbmanager_suite/Stub3CC/group/BLD.INF Mon May 03 14:13:42 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,32 +0,0 @@
-/*
-* Copyright (c) 2004-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:
-*
-*/
-
-PRJ_PLATFORMS
-DEFAULT
-
-PRJ_TESTEXPORTS
-#ifndef WINS
-Stub3CC.iby /epoc32/rom/include/stub3cc.iby
-stub3cc.ini z:/testdata/config/stub3cc.ini
-#endif
-
-PRJ_TESTMMPFILES
-#ifndef WINS
-Stub3CC.mmp
-#endif
-
-
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/usbmgmt/usbmgrtest/t_usbmanager_suite/Stub3CC/group/bld.inf Fri Jun 25 13:07:44 2010 +0800
@@ -0,0 +1,32 @@
+/*
+* Copyright (c) 2004-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:
+*
+*/
+
+PRJ_PLATFORMS
+DEFAULT
+
+PRJ_TESTEXPORTS
+#ifndef WINS
+Stub3CC.iby /epoc32/rom/include/stub3cc.iby
+stub3cc.ini z:/testdata/config/stub3cc.ini
+#endif
+
+PRJ_TESTMMPFILES
+#ifndef WINS
+Stub3CC.mmp
+#endif
+
+
--- a/usbmgmt/usbmgrtest/t_usbmanager_suite/Stub3CC/inc/Stub3CC.h Mon May 03 14:13:42 2010 +0300
+++ b/usbmgmt/usbmgrtest/t_usbmanager_suite/Stub3CC/inc/Stub3CC.h Fri Jun 25 13:07:44 2010 +0800
@@ -40,12 +40,7 @@
const TInt Kstub3NumberOfInterfacesPerstub3Function = 2; // data and control interfaces
-// The name of the ini file specifying the number of functions required different from default
-/*
-_LIT(Kstub3FunctionsIniFileName, "NumberOfstub3Functions.ini");
-_LIT(Kstub3ConfigSection,"stub3_CONF");
-_LIT(KNumberOfstub3FunctionsKeyWord,"NumberOfstub3Functions");
-*/
+
// Lengths of the various bits of the descriptor. Taken from the USB
// WMCDC specification, v1.0.
const TInt Kstub3InterfaceDescriptorLength = 3;
--- a/usbmgmt/usbmgrtest/t_usbmanager_suite/T_UsbManager/group/BLD.INF Mon May 03 14:13:42 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,47 +0,0 @@
-/*
-* Copyright (c) 1999-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:
-*
-*/
-
-PRJ_PLATFORMS
-DEFAULT
-
-PRJ_TESTEXPORTS
-
-t_UsbManager.oby /epoc32/rom/include/t_usbmanager.oby
-t_UsbManagerComponent_4.oby /epoc32/rom/include/t_usbmanagercomponent_4.oby
-t_UsbManagerComponent_5.oby /epoc32/rom/include/t_usbmanagercomponent_5.oby
-
-../scripts/t_usbmancomponent_1.script z:/testdata/scripts/t_usbmancomponent_1.script
-../scripts/t_usbmancomponent_4.script z:/testdata/scripts/t_usbmancomponent_4.script
-../scripts/t_usbmancomponent_5.script z:/testdata/scripts/t_usbmancomponent_5.script
-../scripts/t_usbmscccomponent.script z:/testdata/scripts/t_usbmscccomponent.script
-
-
-../scripts/t_usbmanintegration.script z:/testdata/scripts/t_usbmanintegration.script
-../scripts/t_usbmanconnected_1.script z:/testdata/scripts/t_usbmanconnected_1.script
-../scripts/t_usbmanconnected_2.script z:/testdata/scripts/t_usbmanconnected_2.script
-../scripts/t_usbmanconnected_3.script z:/testdata/scripts/t_usbmanconnected_3.script
-../scripts/t_usbmanconnected_4.script z:/testdata/scripts/t_usbmanconnected_4.script
-../scripts/t_usbmanconnected_5.script z:/testdata/scripts/t_usbmanconnected_5.script
-../scripts/t_usbmanconnected_6.script z:/testdata/scripts/t_usbmanconnected_6.script
-../testdata/t_usbmanintegration.ini z:/testdata/config/t_usbmanintegration.ini
-../testdata/t_usbmancomponent.ini z:/testdata/config/t_usbmancomponent.ini
-../testdata/stub1cctest.ini z:/testdata/config/stub1cctest.ini
-
-
-PRJ_TESTMMPFILES
-T_UsbManager.mmp
-t_usbms_cable_detect.mmp
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/usbmgmt/usbmgrtest/t_usbmanager_suite/T_UsbManager/group/bld.inf Fri Jun 25 13:07:44 2010 +0800
@@ -0,0 +1,47 @@
+/*
+* Copyright (c) 1999-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:
+*
+*/
+
+PRJ_PLATFORMS
+DEFAULT
+
+PRJ_TESTEXPORTS
+
+t_UsbManager.oby /epoc32/rom/include/t_usbmanager.oby
+t_UsbManagerComponent_4.oby /epoc32/rom/include/t_usbmanagercomponent_4.oby
+t_UsbManagerComponent_5.oby /epoc32/rom/include/t_usbmanagercomponent_5.oby
+
+../scripts/t_usbmancomponent_1.script z:/testdata/scripts/t_usbmancomponent_1.script
+../scripts/t_usbmancomponent_4.script z:/testdata/scripts/t_usbmancomponent_4.script
+../scripts/t_usbmancomponent_5.script z:/testdata/scripts/t_usbmancomponent_5.script
+../scripts/t_usbmscccomponent.script z:/testdata/scripts/t_usbmscccomponent.script
+
+
+../scripts/t_usbmanintegration.script z:/testdata/scripts/t_usbmanintegration.script
+../scripts/t_usbmanconnected_1.script z:/testdata/scripts/t_usbmanconnected_1.script
+../scripts/t_usbmanconnected_2.script z:/testdata/scripts/t_usbmanconnected_2.script
+../scripts/t_usbmanconnected_3.script z:/testdata/scripts/t_usbmanconnected_3.script
+../scripts/t_usbmanconnected_4.script z:/testdata/scripts/t_usbmanconnected_4.script
+../scripts/t_usbmanconnected_5.script z:/testdata/scripts/t_usbmanconnected_5.script
+../scripts/t_usbmanconnected_6.script z:/testdata/scripts/t_usbmanconnected_6.script
+../testdata/t_usbmanintegration.ini z:/testdata/config/t_usbmanintegration.ini
+../testdata/t_usbmancomponent.ini z:/testdata/config/t_usbmancomponent.ini
+../testdata/stub1cctest.ini z:/testdata/config/stub1cctest.ini
+
+
+PRJ_TESTMMPFILES
+T_UsbManager.mmp
+t_usbms_cable_detect.mmp
--- a/usbmgmt/usbmgrtest/t_usbmanager_suite/T_UsbManager/src/CUsbComponentTest.cpp Mon May 03 14:13:42 2010 +0300
+++ b/usbmgmt/usbmgrtest/t_usbmanager_suite/T_UsbManager/src/CUsbComponentTest.cpp Fri Jun 25 13:07:44 2010 +0800
@@ -403,7 +403,6 @@
INFO_PRINTF1(_L("Can't get class id from config file"));
SetTestStepResult(EFail);
}
-// TUid temp = uidArray[k];
TEST(uidArray[k] ==TUid::Uid(classID));
}
--- a/usbmgmt/usbmgrtest/t_usbmanager_suite/T_UsbManager/src/T_UsbManagerServer.cpp Mon May 03 14:13:42 2010 +0300
+++ b/usbmgmt/usbmgrtest/t_usbmanager_suite/T_UsbManager/src/T_UsbManagerServer.cpp Fri Jun 25 13:07:44 2010 +0800
@@ -53,7 +53,6 @@
// Server Logging.
server->StartL(KServerName);
- //server-> ConstructL(KServerName);
CleanupStack::Pop(server);
return server;
}
--- a/usbmgmt/usbmgrtest/t_usbmanager_suite/mscc/group/BLD.INF Mon May 03 14:13:42 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,33 +0,0 @@
-/*
-* Copyright (c) 2004-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:
-*
-*/
-
-PRJ_PLATFORMS
-DEFAULT
-
-
-PRJ_TESTEXPORTS
-../scripts/te_msclasscontroller.script z:/testdata/scripts/te_msclasscontroller.script
-../scripts/te_msclasscontroller.ini z:/testdata/scripts/te_msclasscontroller.ini
-te_msclasscontroller.iby /epoc32/rom/include/te_msclasscontroller.iby
-
-PRJ_TESTMMPFILES
-te_msclasscontroller.mmp
-
-
-
-
-
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/usbmgmt/usbmgrtest/t_usbmanager_suite/mscc/group/bld.inf Fri Jun 25 13:07:44 2010 +0800
@@ -0,0 +1,33 @@
+/*
+* Copyright (c) 2004-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:
+*
+*/
+
+PRJ_PLATFORMS
+DEFAULT
+
+
+PRJ_TESTEXPORTS
+../scripts/te_msclasscontroller.script z:/testdata/scripts/te_msclasscontroller.script
+../scripts/te_msclasscontroller.ini z:/testdata/scripts/te_msclasscontroller.ini
+te_msclasscontroller.iby /epoc32/rom/include/te_msclasscontroller.iby
+
+PRJ_TESTMMPFILES
+te_msclasscontroller.mmp
+
+
+
+
+
--- a/usbmgmt/usbmgrtest/t_usbmodem/inc/t_usbmodem.h Mon May 03 14:13:42 2010 +0300
+++ b/usbmgmt/usbmgrtest/t_usbmodem/inc/t_usbmodem.h Fri Jun 25 13:07:44 2010 +0800
@@ -146,7 +146,7 @@
RComm* iCommPort;
};
-class CDuplex : public MTransferNotifier, CBase
+class CDuplex : public CBase, MTransferNotifier
{
public:
// Construction
--- a/usbmgmt/usbmgrtest/t_usbmodem/src/t_usbmodem.cpp Mon May 03 14:13:42 2010 +0300
+++ b/usbmgmt/usbmgrtest/t_usbmodem/src/t_usbmodem.cpp Fri Jun 25 13:07:44 2010 +0800
@@ -46,7 +46,6 @@
RDebug::Print(_L(": CSimplexRead::StartL Warning - Already active\n"));
return;
}
- //iBuffer.SetMax();
iCommPort->ReadOneOrMore(iStatus, iBuffer);
SetActive();
}
@@ -56,8 +55,6 @@
#ifdef _DEBUG
RDebug::Print(_L(": CSimplexRead::RunL - iStatus:%d iBuffer.Length:%d TotalAmount Left:%d\n"),iStatus.Int(),iBuffer.Length(),iTotalAmount);
#endif
- //RDebug::Print(_L(">%S<\n"),&iBuffer);
- //Notify Duplex object
iDuplex.NotifyRead(iStatus.Int(),iBuffer.Length(), iBuffer);
}
@@ -342,7 +339,6 @@
RDebug::Print(_L(": Serial RTS on"));
#endif
TheSerialPort.SetSignals( KSignalRTS, 0 );
- //TheUsbPort.SetSignals( KSignalCTS, 0 );
}
else
{
@@ -350,7 +346,6 @@
RDebug::Print(_L(": Serial RTS off"));
#endif
TheSerialPort.SetSignals( 0, KSignalRTS );
- //TheUsbPort.SetSignals( 0, KSignalCTS );
}
}
@@ -362,7 +357,6 @@
RDebug::Print(_L(": Serial DTR on"));
#endif
TheSerialPort.SetSignals( KSignalDTR, 0 );
- //TheUsbPort.SetSignals( KSignalDSR, 0 );
}
else
{
@@ -370,7 +364,6 @@
RDebug::Print(_L(": Serial DTR off"));
#endif
TheSerialPort.SetSignals( 0, KSignalDTR );
- //TheUsbPort.SetSignals( 0, KSignalDSR );
}
}
@@ -534,7 +527,6 @@
iUsbConfigChangeNotifier->Cancel();
iSerialSignalChangeNotifier->Cancel();
iUsbSignalChangeNotifier->Cancel();
- //iUsbFControlNotifier->Cancel();
iUsbToSerial->Cancel();
iSerialToUsb->Cancel();
@@ -571,7 +563,6 @@
iSerialSignalChangeNotifier = CSignalChangeNotifier::NewL(EFalse);
iUsbSignalChangeNotifier = CSignalChangeNotifier::NewL(ETrue);
-// iUsbFControlNotifier = CFControlChangeNotifier::NewL();
iUsbConfigChangeNotifier = CConfigChangeNotifier::NewL();
}
@@ -590,7 +581,6 @@
TRAP(ignoreErr, iUsbConfigChangeNotifier->StartL());
TRAP(ignoreErr, iSerialSignalChangeNotifier->StartL());
TRAP(ignoreErr, iUsbSignalChangeNotifier->StartL());
-// iUsbFControlNotifier->StartL();
TRAP(ignoreErr, iUsbToSerial->StartL());
TRAP(ignoreErr, iSerialToUsb->StartL());
@@ -701,107 +691,6 @@
}
}
-/*
-LOCAL_C TInt RateToInt(TBps aRate)
- {
- switch (aRate)
- {
- case EBps115200: return 115200;
- case EBps57600: return 57600;
- case EBps38400: return 38400;
- case EBps19200: return 19200;
- case EBps9600: return 9600;
- case EBps7200: return 7200;
- case EBps4800: return 4800;
- case EBps3600: return 3600;
- case EBps2400: return 2400;
- case EBps2000: return 2000;
- case EBps1800: return 1800;
- case EBps1200: return 1200;
- case EBps600: return 600;
- case EBps300: return 300;
- case EBps150: return 150;
- case EBps134: return 134;
- case EBps110: return 110;
- case EBps75: return 75;
- case EBps50: return 50;
- default: return -1;
- }
- }
-
-LOCAL_C void ConfigString(TDes &aBuf, const TCommNotificationV01 &aConfig)
- {
- // Config
- aBuf.Format(_L(" %d "), RateToInt(aConfig.iRate));
- switch (aConfig.iParity)
- {
- case EParityEven: aBuf.Append(_L("E")); break;
- case EParityOdd: aBuf.Append(_L("O")); break;
- case EParityNone: aBuf.Append(_L("N")); break;
- default: break;
- }
- switch (aConfig.iDataBits)
- {
- case EData5: aBuf.Append(_L("5")); break;
- case EData6: aBuf.Append(_L("6")); break;
- case EData7: aBuf.Append(_L("7")); break;
- case EData8: aBuf.Append(_L("8")); break;
- default: break;
- }
- if (aConfig.iStopBits==EStop1)
- aBuf.Append(_L("1 "));
- else
- aBuf.Append(_L("2 "));
-
- aBuf.Append(_L("Use:"));
- if (aConfig.iHandshake==0)
- aBuf.Append(_L("NoControl "));
- if (aConfig.iHandshake&(KConfigObeyXoff|KConfigSendXoff))
- aBuf.Append(_L("XonXoff "));
- if (aConfig.iHandshake&KConfigObeyCTS)
- aBuf.Append(_L("CTS/RTS "));
- if (aConfig.iHandshake&KConfigObeyDSR)
- aBuf.Append(_L("DSR/DTR "));
- if (aConfig.iHandshake&KConfigWriteBufferedComplete)
- aBuf.Append(_L("Early "));
- //|KConfigObeyDCD|KConfigFailDCD|))
-
-// if (aConfig.iBreak==TEiger::EBreakOn)
-// aBuf.Append(_L("Brk "));
-// if (aConfig.iFifo==EFifoEnable)
-// aBuf.Append(_L("Fifo "));
- }
-
-LOCAL_C void PrintCaps()
- {
- TCommCaps2 caps;
- TheUsbPort.Caps(caps);
- TUint notifycaps = caps().iNotificationCaps;
- RDebug::Print(_L("Capabilities:\n"));
- if (notifycaps&KNotifySignalsChangeSupported)
- RDebug::Print(_L("Notify Signals Change supported\n"));
- if (notifycaps&KNotifyRateChangeSupported)
- RDebug::Print(_L("Notify Rate Change supported\n"));
- if (notifycaps&KNotifyDataFormatChangeSupported)
- RDebug::Print(_L("Notify Data Format Change supported\n"));
- if (notifycaps&KNotifyHandshakeChangeSupported)
- RDebug::Print(_L("Notify Handshake Change supported\n"));
- if (notifycaps&KNotifyBreakSupported)
- RDebug::Print(_L("Notify Break supported\n"));
- if (notifycaps&KNotifyFlowControlChangeSupported)
- RDebug::Print(_L("Notify Flow Control Change supported\n"));
- if (notifycaps&KNotifyDataAvailableSupported)
- RDebug::Print(_L("Notify Data Available supported\n"));
- if (notifycaps&KNotifyOutputEmptySupported)
- RDebug::Print(_L("Notify Output Empty supported\n"));
- RDebug::Print(_L("\n"));
- if ((caps().iRoleCaps)&KCapsRoleSwitchSupported)
- RDebug::Print(_L("Role switching is supported\n"));
- RDebug::Print(_L("\n"));
- if ((caps().iFlowControlCaps)&KCapsFlowControlStatusSupported)
- RDebug::Print(_L("Retrieve flow control status is supported\n"));
- }
-*/
LOCAL_C void DoInitL()
{
// Do the necessary initialisation of the C32, 2 comm ports, USB stuff.
@@ -901,8 +790,6 @@
}
RDebug::Print(_L("E32Main: Opened Serial Comm Port"));
- // Print the caps
- //PrintCaps();
RDebug::Print(_L("E32Main: Reading Serial Comm Port config"));
TheSerialPort.Config(TheSerialConfigBuf); // get config
@@ -911,12 +798,10 @@
TBuf<80> buf;
buf.FillZ();
- //ConfigString(buf, TheUsbConfig);
RDebug::Print(_L("E32Main: Old USB Port Settings"));
RDebug::Print(buf);
RDebug::Print(_L(""));
buf.FillZ();
- //ConfigString(buf, TheSerialConfig);
RDebug::Print(_L("E32Main: Old Serial Port Settings"));
RDebug::Print(buf);
RDebug::Print(_L(""));
--- a/usbmgmt/usbmgrtest/t_whcm_cc/src/t_whcm_cc.cpp Mon May 03 14:13:42 2010 +0300
+++ b/usbmgmt/usbmgrtest/t_whcm_cc/src/t_whcm_cc.cpp Fri Jun 25 13:07:44 2010 +0800
@@ -117,17 +117,6 @@
current_test_state = EUSBManConnected;
break;
case EUSBManConnected:
- // Register as primary client.
- // *** Obsolete ***
- /*
- r = usbman->RegisterAsPrimarySession();
- if (r != KErrNone)
- {
- test.Printf(_L(" Failed to register as primary client. Error = %d\n"), r);
- return r;
- }
- test.Printf(_L(" Registered as primary client.\n"));
- */
current_test_state = EPrimaryRegistered;
break;
default:
@@ -160,8 +149,6 @@
current_test_state = EPrimaryRegistered;
break;
case EPrimaryRegistered:
- // *** Obsolete ***
- // usbman->DeregisterAsPrimarySession();
current_test_state = EUSBManConnected;
break;
case EUSBManConnected:
@@ -237,45 +224,6 @@
return KErrNone;
}
-
-/**
- * Executes test A2 (as detailed in the USB Manager Test Specification).
- * No longer a relevant test.
- */
-/*static TInt RunTest_A2()
- {
- TInt r;
-
- test.Next(_L("Test A2.\n"));
-
- // Perform common startup
- current_test_state = EStart;
- r = CommonStart();
- if (r != KErrNone)
- return r;
-
- // Start the USB Manager
- TRequestStatus status;
- test.Printf(_L("Starting.\n"));
- usbman->Start(status);
-
- // Wait for specific time (has to be less than the time to process a start request)
- timer.After(status, CANCEL_START_REQ_DELAY);
- User::WaitForRequest(status);
-
- // Cancel the start request
- test.Printf(_L("Cancelling.\n"));
- usbman->StartCancel();
-
- // Check service status
- test.Printf(_L("Checking service status.\n"));
- r = CheckServiceState(EUsbServiceIdle);
- if ( r != KErrNone)
- return r;
-
- return KErrNone;
- }
-*/
/**
* Executes test A3 (as detailed in the USB Manager Test Specification).
*/
@@ -313,47 +261,6 @@
}
/**
- * Executes test A4 (as detailed in the USB Manager Test Specification).
- * No longer a relevant test.
- */
-/*static TInt RunTest_A4()
- {
- TInt r;
-
- test.Next(_L("Test A4.\n"));
-
- // Perform common startup
- current_test_state = EStart;
- r = CommonStart();
- if (r != KErrNone)
- return r;
-
- // Start the USB Manager
- TRequestStatus status, timerStatus;
- usbman->Start(status);
- User::WaitForRequest(status);
- test.Printf(_L("Start completed with status %d\n"), status.Int());
- current_test_state = EUSBManStarted;
-
- // Stop the USB Manager
- usbman->Stop(status);
-
- // Wait for specific time (has to be less than the time to process a start request)
- timer.After(timerStatus, CANCEL_STOP_REQ_DELAY);
- User::WaitForRequest(status, timerStatus);
-
- // Cancel the stop request
- usbman->StopCancel();
-
- // Check service status
- r = CheckServiceState(EUsbServiceStarted);
- if ( r != KErrNone)
- return r;
-
- return KErrNone;
- }
-*/
-/**
* Main function.
*
* Runs all the tests in order.
@@ -373,16 +280,6 @@
test.Printf(_L("Test A1 passed.\n\n"));
CommonCleanup();
-/* Depreciated test.
- err=RunTest_A2();
- if (err != KErrNone)
- {
- test.Printf(_L("Test A2 failed, code: %d\n\n"), err);
- }
- else
- test.Printf(_L("Test A2 passed.\n\n"));
- CommonCleanup();
-*/
err=RunTest_A3();
if (err != KErrNone)
{
@@ -392,16 +289,7 @@
test.Printf(_L("Test A3 passed.\n\n"));
CommonCleanup();
-/* Depreciated test.
- err=RunTest_A4();
- if (err != KErrNone)
- {
- test.Printf(_L("Test A4 failed, code: %d\n\n"), err);
- }
- else
- test.Printf(_L("Test A4 passed.\n\n"));
- CommonCleanup();
-*/
+
// Tests finished
}
--- a/usbmgmt/usbmgrtest/usbmsapp/BLD.INF Mon May 03 14:13:42 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,37 +0,0 @@
-/*
-* Copyright (c) 1999-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:
-* Build information for USB Mass Storage sample application
-*
-*/
-
-/**
- @file
-*/
-
-
-#include "usbms_stub/group/bld.inf"
-
-PRJ_EXPORTS
-
-PRJ_TESTEXPORTS
-
-./usbms.iby /epoc32/rom/include/usbms.iby
-./usbms.oby /epoc32/rom/include/usbms.oby
-
-PRJ_MMPFILES
-
-PRJ_TESTMMPFILES
-
-usbmsapp.mmp
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/usbmgmt/usbmgrtest/usbmsapp/bld.inf Fri Jun 25 13:07:44 2010 +0800
@@ -0,0 +1,37 @@
+/*
+* Copyright (c) 1999-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:
+* Build information for USB Mass Storage sample application
+*
+*/
+
+/**
+ @file
+*/
+
+
+#include "usbms_stub/group/bld.inf"
+
+PRJ_EXPORTS
+
+PRJ_TESTEXPORTS
+
+./usbms.iby /epoc32/rom/include/usbms.iby
+./usbms.oby /epoc32/rom/include/usbms.oby
+
+PRJ_MMPFILES
+
+PRJ_TESTMMPFILES
+
+usbmsapp.mmp
--- a/usbmgmt/usbmgrtest/usbmsapp/usbms_stub/group/BLD.INF Mon May 03 14:13:42 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,30 +0,0 @@
-/*
-* Copyright (c) 2004-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:
-*
-*/
-
-PRJ_PLATFORMS
-DEFAULT
-
-PRJ_TESTEXPORTS
-
-PRJ_TESTMMPFILES
-#ifdef WINS
-usbms_stub1cc.mmp
-usbms_stub2cc.mmp
-usbms_stub3cc.mmp
-#endif
-
-
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/usbmgmt/usbmgrtest/usbmsapp/usbms_stub/group/bld.inf Fri Jun 25 13:07:44 2010 +0800
@@ -0,0 +1,30 @@
+/*
+* Copyright (c) 2004-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:
+*
+*/
+
+PRJ_PLATFORMS
+DEFAULT
+
+PRJ_TESTEXPORTS
+
+PRJ_TESTMMPFILES
+#ifdef WINS
+usbms_stub1cc.mmp
+usbms_stub2cc.mmp
+usbms_stub3cc.mmp
+#endif
+
+
--- a/usbmgmt/usbmgrtest/usbmsapp/usbms_stub/inc/usbms_stub.h Mon May 03 14:13:42 2010 +0300
+++ b/usbmgmt/usbmgrtest/usbmsapp/usbms_stub/inc/usbms_stub.h Fri Jun 25 13:07:44 2010 +0800
@@ -40,12 +40,7 @@
const TInt Kstub3NumberOfInterfacesPerstub3Function = 2; // data and control interfaces
-// The name of the ini file specifying the number of functions required different from default
-/*
-_LIT(Kstub3FunctionsIniFileName, "NumberOfstub3Functions.ini");
-_LIT(Kstub3ConfigSection,"stub3_CONF");
-_LIT(KNumberOfstub3FunctionsKeyWord,"NumberOfstub3Functions");
-*/
+
// Lengths of the various bits of the descriptor. Taken from the USB
// WMCDC specification, v1.0.
const TInt Kstub3InterfaceDescriptorLength = 3;
--- a/usbmgmt/usbmgrtest/usbmsapp/usbms_stub/src/usbms_stub.cpp Mon May 03 14:13:42 2010 +0300
+++ b/usbmgmt/usbmgrtest/usbmsapp/usbms_stub/src/usbms_stub.cpp Fri Jun 25 13:07:44 2010 +0800
@@ -80,11 +80,6 @@
Cancel();
iTimer.Close();
-
-#ifndef __WINS__
-// iLdd.Close();
-#endif
-
}
@@ -255,7 +250,7 @@
* endpoint and, if found, configuring the interface.
*/
{
-return 0;
+ return 0;
}
--- a/usbmgmt/usbmgrtest/usbtestconsole/usbtestconsole.cpp Mon May 03 14:13:42 2010 +0300
+++ b/usbmgmt/usbmgrtest/usbtestconsole/usbtestconsole.cpp Fri Jun 25 13:07:44 2010 +0800
@@ -969,7 +969,7 @@
CUsbTestConsoleTextEntryBase::CUsbTestConsoleTextEntryBase()
- : CActive(EPriorityNormal)
+ : CActive(CActive::EPriorityStandard)
{
CActiveScheduler::Add(this);
}