--- a/usbmgmt/usbmgr/group/Usbmanbin.iby Mon May 03 14:13:42 2010 +0300
+++ b/usbmgmt/usbmgr/group/Usbmanbin.iby Fri May 14 17:40:49 2010 +0300
@@ -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 May 14 17:40:49 2010 +0300
@@ -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__
--- a/usbmgmt/usbmgr/group/usb.iby Mon May 03 14:13:42 2010 +0300
+++ b/usbmgmt/usbmgr/group/usb.iby Fri May 14 17:40:49 2010 +0300
@@ -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 May 14 17:40:49 2010 +0300
@@ -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/client/group/bld.inf Mon May 03 14:13:42 2010 +0300
+++ b/usbmgmt/usbmgr/host/fdf/production/client/group/bld.inf Fri May 14 17:40:49 2010 +0300
@@ -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/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 May 14 17:40:49 2010 +0300
@@ -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 May 14 17:40:49 2010 +0300
@@ -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 May 14 17:40:49 2010 +0300
@@ -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 May 14 17:40:49 2010 +0300
@@ -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 May 14 17:40:49 2010 +0300
@@ -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 May 14 17:40:49 2010 +0300
@@ -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/repositorynotifier.cpp Mon May 03 14:13:42 2010 +0300
+++ b/usbmgmt/usbmgr/usbman/chargingplugin/src/repositorynotifier.cpp Fri May 14 17:40:49 2010 +0300
@@ -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/usbmgrtest/usbtestconsole/usbtestconsole.cpp Mon May 03 14:13:42 2010 +0300
+++ b/usbmgmt/usbmgrtest/usbtestconsole/usbtestconsole.cpp Fri May 14 17:40:49 2010 +0300
@@ -969,7 +969,7 @@
CUsbTestConsoleTextEntryBase::CUsbTestConsoleTextEntryBase()
- : CActive(EPriorityNormal)
+ : CActive(CActive::EPriorityStandard)
{
CActiveScheduler::Add(this);
}