--- a/usbclasses/usbphoneasmodem/classimplementation/mscfileserver/inc/mscfileserversecuritypolicy.h Wed Sep 01 12:20:49 2010 +0100
+++ b/usbclasses/usbphoneasmodem/classimplementation/mscfileserver/inc/mscfileserversecuritypolicy.h Tue Sep 14 23:15:19 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2009-2010 Nokia Corporation and/or its subsidiary(-ies).
// All rights reserved.
// This component and the accompanying materials are made available
// under the terms of "Eclipse Public License v1.0"
@@ -21,24 +21,21 @@
// USB masss storage Server Security Policy Definition
-const TUint KUsbMsServerRangeCount = 3;
+const TUint KUsbMsServerRangeCount = 2;
const TInt KUsbMsServerRanges[KUsbMsServerRangeCount] =
{
- EMscFileStart, // NetworkControl [StartL/Stop]
- EMscFileShutdown, // DiskAdmin [Shutdown]
+ EMscFileSetupLu, // NetworkControl [SetupLogicalUnitL/StartL/Stop/Shutdown]
EMscFileShutdown + 1, // fail (to KMaxInt)
};
// Index numbers into KUsbMsServerElements[]
const TInt KPolicyNetworkControl = 0;
-const TInt KPolicyDiskAdmin = 1;
// Mapping IPCs to poicy element
const TUint8 KUsbMsServerElementsIndex[KUsbMsServerRangeCount] =
{
- KPolicyNetworkControl, // EMscFileStart & EMscFileStop
- KPolicyDiskAdmin, // EMscFileShutdown
+ KPolicyNetworkControl, // EMscFileSetupLu, EMscFileStart, EMscFileStop, EMscFileShutdown
CPolicyServer::ENotSupported, // EMscFileShutdown + 1 to KMaxTInt
};
@@ -46,7 +43,6 @@
const CPolicyServer::TPolicyElement KUsbMsServerElements[] =
{
{ _INIT_SECURITY_POLICY_C1(ECapabilityNetworkControl), CPolicyServer::EFailClient },
- { _INIT_SECURITY_POLICY_C1(ECapabilityDiskAdmin), CPolicyServer::EFailClient},
// the EFailClient means that if the check fails
// the CheckFailed method with return KErrPermissionDenied
};
--- a/usbengines/usbotgwatcher/src/cusbotgwatcher.cpp Wed Sep 01 12:20:49 2010 +0100
+++ b/usbengines/usbotgwatcher/src/cusbotgwatcher.cpp Tue Sep 14 23:15:19 2010 +0300
@@ -37,8 +37,10 @@
#include "errors.h"
#include "debug.h"
#include "panic.h"
+#ifndef STIF
_LIT_SECURITY_POLICY_PASS( KAlwaysPassPolicy );
_LIT_SECURITY_POLICY_C1( KLocalServicesPolicy, ECapabilityLocalServices );
+#endif
// ---------------------------------------------------------------------------
//
--- a/usbservices_plat/usb_secondary_display_api/group/bld.inf Wed Sep 01 12:20:49 2010 +0100
+++ b/usbservices_plat/usb_secondary_display_api/group/bld.inf Tue Sep 14 23:15:19 2010 +0300
@@ -24,4 +24,4 @@
PRJ_EXPORTS
-../inc/usbuinotifsecondarydisplay.h MW_LAYER_PLATFORM_EXPORT_PATH(SecondaryDisplay/usbuinotifsecondarydisplay.h)
+../inc/usbuinotifsecondarydisplay.h MW_LAYER_PLATFORM_EXPORT_PATH(secondarydisplay/usbuinotifsecondarydisplay.h)
--- a/usbuis/usbuinotif/tsrc/usbuinotifapitest/init/usbuinotifapitest.ini Wed Sep 01 12:20:49 2010 +0100
+++ b/usbuis/usbuinotif/tsrc/usbuinotifapitest/init/usbuinotifapitest.ini Tue Sep 14 23:15:19 2010 +0300
@@ -110,7 +110,7 @@
[New_Module]
ModuleName= testscripter
-TestCaseFile= e:\testing\conf\ui_usbuinotifapitest.cfg
+TestCaseFile= e:\testing\conf\ui_USBUiNotifApiTest.cfg
[End_Module]
--- a/usbuis/usbuinotif/tsrc/usbuinotifapitest/init/usbuinotifapitest_phone.ini Wed Sep 01 12:20:49 2010 +0100
+++ b/usbuis/usbuinotif/tsrc/usbuinotifapitest/init/usbuinotifapitest_phone.ini Tue Sep 14 23:15:19 2010 +0300
@@ -65,7 +65,7 @@
CreateTestReport= YES # Possible values: YES or NO
-TestReportFilePath= c:\logs\testframework\usbuinotifapitest\
+TestReportFilePath= c:\logs\testframework\UsbUiNotifApiTest\
TestReportFileName= testreport
TestReportFormat= TXT # Possible values: TXT, HTML or XML
@@ -110,7 +110,7 @@
[New_Module]
ModuleName= testscripter
-TestCaseFile= c:\testframework\ui_usbuinotifapitest.cfg
+TestCaseFile= c:\testframework\ui_UsbUiNotifApiTest.cfg
[End_Module]