Merge docml changeset with recent Nokia delivery.
--- a/usbclasses/usbmscpersonality/group/UsbMscPersonality.mmp Tue May 11 12:32:08 2010 +0100
+++ b/usbclasses/usbmscpersonality/group/UsbMscPersonality.mmp Tue May 18 13:19:18 2010 +0100
@@ -41,11 +41,6 @@
target usbmscpersonality.rsc
end
-start resource usbms.rss
-targetpath /private/10204bbb
-header
-end
-
LIBRARY euser.lib
LIBRARY usbpersonality.lib
LIBRARY usbman.lib
--- a/usbclasses/usbmscpersonality/src/usbms.rss Tue May 11 12:32:08 2010 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,34 +0,0 @@
-/*
-* Copyright (c) 2004 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: Resource file for the USB mass storage configuration.
-*
-*/
-
-NAME MSCF
-
-#include <badef.rh>
-#include "usbms.rh"
-
-RESOURCE BA_RSS_SIGNATURE
- {
- signature = 1;
- }
-
-RESOURCE USBMASSSTORAGE_CONFIG usbms_config
- {
- vendorId = "Nokia"; // no more than 8 characters
- productId = "S60"; // no more than 16 characters
- productRev = "1.0"; // no more than 4 characters
- }
-
Binary file usbclasses/usbphoneasmodem/classcontroller/conf/usbmanager_mscfile_2000fda8.crml has changed
Binary file usbclasses/usbphoneasmodem/classcontroller/conf/usbphoneasmodem_mscfile_classcontroller.confml has changed
--- a/usbclasses/usbphoneasmodem/classcontroller/data/usbmscfileresource.rss Tue May 11 12:32:08 2010 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,60 +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:
-//
-//
-
-// RESOURCE IDENTIFIER
-NAME UMSC
-
-#include <eikon.rh>
-#include "usbmscfileclasscontroller.rh"
-
-// CONSTANTS
-
-// MACROS
-
-// RESOURCE DEFINITIONS
-
-//-----------------------------------------------------------------------------
-//
-// -
-// Resource signature
-//
-//-----------------------------------------------------------------------------
-//
-RESOURCE RSS_SIGNATURE {}
-
-//-----------------------------------------------------------------------------
-//
-// -
-// Resource filename
-//
-//-----------------------------------------------------------------------------
-//
-RESOURCE TBUF
- {
- buf = "usbmscfileresource";
- }
-
-RESOURCE ARRAY r_usbmscfile_image_paths
- {
- items =
- {
- USBMSCFILE_FILESYSTEM_IMAGE
- {
- lun = 0;
- path = "phone_as_modem.iso";
- }
- };
- }
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/usbclasses/usbphoneasmodem/classcontroller/data/usbpammscfile.rss Tue May 18 13:19:18 2010 +0100
@@ -0,0 +1,42 @@
+/*
+* 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:
+* Resource file for the USB mass storage configuration.
+*
+*/
+
+/**
+ @file
+*/
+
+NAME MSCF
+
+#include <badef.rh>
+#include "usbpammscfile.rh"
+
+RESOURCE BA_RSS_SIGNATURE
+ {
+ signature = 1;
+ }
+
+RESOURCE USBMASSSTORAGE_CONFIG usbms_config
+ {
+ vendorId = "Nokia"; // no more than 8 characters
+ productId = "S60"; // no more than 16 characters
+ productRev = "1.0"; // no more than 4 characters
+ }
+
+
+
+
--- a/usbclasses/usbphoneasmodem/classcontroller/group/bld.inf Tue May 11 12:32:08 2010 +0100
+++ b/usbclasses/usbphoneasmodem/classcontroller/group/bld.inf Tue May 18 13:19:18 2010 +0100
@@ -27,3 +27,5 @@
PRJ_EXPORTS
../rom/usbmscfileclasscontroller.iby CORE_MW_LAYER_IBY_EXPORT_PATH(usbmscfileclasscontroller.iby)
+../conf/usbphoneasmodem_mscfile_classcontroller.confml MW_LAYER_CONFML(usbphoneasmodem_mscfile_classcontroller.confml)
+../conf/usbmanager_mscfile_2000fda8.crml MW_LAYER_CRML(usbmanager_mscfile_2000fda8.crml)
\ No newline at end of file
--- a/usbclasses/usbphoneasmodem/classcontroller/group/usbmscfileclasscontroller.mmp Tue May 11 12:32:08 2010 +0100
+++ b/usbclasses/usbphoneasmodem/classcontroller/group/usbmscfileclasscontroller.mmp Tue May 18 13:19:18 2010 +0100
@@ -42,13 +42,14 @@
TARGET usbmscfileclasscontroller.rsc
END
-START RESOURCE usbmscfileresource.rss
+start resource usbpammscfile.rss
HEADER
-TARGETPATH APP_RESOURCE_DIR
-END
+targetpath /private/101fe1db
+end
LIBRARY euser.lib
LIBRARY usbclasscontroller.lib
LIBRARY efsrv.lib
LIBRARY bafl.lib
+LIBRARY centralrepository.lib
DEBUGLIBRARY flogger.lib
--- a/usbclasses/usbphoneasmodem/classcontroller/inc/usbmscfileclasscontroller.rh Tue May 11 12:32:08 2010 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,27 +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:
-//
-//
-
-
-#include <badef.rh>
-
-STRUCT USBMSCFILE_FILESYSTEM_IMAGE
- {
- WORD protocol = 0; // protocol not used
- WORD lun; // only LUN 0 supported currently
- LTEXT path; // full path to file system image file
- }
-
-// End Of File
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/usbclasses/usbphoneasmodem/classcontroller/inc/usbmscfileclasscontroller_crkeys.h Tue May 18 13:19:18 2010 +0100
@@ -0,0 +1,42 @@
+// 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: Adheres to the UsbMan USB Class API and talks to mass storage file system
+//
+//
+#ifndef USBMSCFILECLASSCONTROLLER_CRKEYS_H
+#define USBMSCFILECLASSCONTROLLER_CRKEYS_H
+
+// CONSTANTS
+const TUid KCRUidUsbPhoneAsModemMscFileClassController = { 0x2000FDA8 };
+
+/*
+the least significant four bits is used for columns(unit file attributes: unit number, full name),
+the remains bit is used for rows(which unit file).
+
+for example, if two units is used, the following can be added for the second unit keys.
+
+const TUint32 KCRIdMscFileLogicalUnitNumber2 = 0x00000010;
+const TUint32 KCRIdMscFileImageFullName2 = 0x00000011;
+
+refer to central repository how-to document section 5, Structured Data in the Central Repository
+
+*/
+const TUint32 KCRIdMscFileLogicalUnitNumber1 = 0x00000000;
+const TUint32 KCRIdMscFileImageFullName1 = 0x00000001;
+
+const TUint32 KCRMscFileLogicalUnitNumberColumn = 0x00000000;
+const TUint32 KCRMscFileImageFullNameColumn = 0x00000001;
+
+const TUint32 KCRMscFileColumnMask = 0x0000000F;
+const TUint32 KCRMscFileRowMask = 0xFFFFFFF0;
+#endif // USBMSCFILECLASSCONTROLLER_CRKEYS_H
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/usbclasses/usbphoneasmodem/classcontroller/inc/usbpammscfile.rh Tue May 18 13:19:18 2010 +0100
@@ -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:
+* Resource header for usbman configuration.
+*
+*/
+
+/**
+ @file
+*/
+
+STRUCT USBMASSSTORAGE_CONFIG
+ {
+ LTEXT vendorId; // no more than 8 characters
+ LTEXT productId; // no more than 16 characters
+ LTEXT productRev; // no more than 4 characters
+ }
+
+
--- a/usbclasses/usbphoneasmodem/classcontroller/rom/usbmscfileclasscontroller.iby Tue May 11 12:32:08 2010 +0100
+++ b/usbclasses/usbphoneasmodem/classcontroller/rom/usbmscfileclasscontroller.iby Tue May 18 13:19:18 2010 +0100
@@ -23,7 +23,7 @@
#ifdef FF_USB_MODEM
ECOM_PLUGIN(usbmscfileclasscontroller.dll, usbmscfileclasscontroller.rsc)
-S60_APP_RESOURCE(usbmscfileresource)
+data=DATAZ_\private\101fe1db\usbpammscfile.rsc \private\101fe1db\usbpammscfile.rsc
#endif
--- a/usbclasses/usbphoneasmodem/classcontroller/src/usbmscfileclasscontroller.cpp Tue May 11 12:32:08 2010 +0100
+++ b/usbclasses/usbphoneasmodem/classcontroller/src/usbmscfileclasscontroller.cpp Tue May 18 13:19:18 2010 +0100
@@ -18,11 +18,12 @@
#include <barsread.h>
#include <usb_std.h>
#include <cusbclasscontrollerplugin.h>
-#include <usbms.rsg>
-#include <usbmscfileresource.rsg>
+#include <centralrepository.h>
+#include <usbpammscfile.rsg>
#include <data_caging_path_literals.hrh>
#include "usbmscfileclasscontroller.h"
#include "usbmscfile.h"
+#include "usbmscfileclasscontroller_crkeys.h"
#include "debug.h"
// Panic category
@@ -30,8 +31,7 @@
_LIT( KMsCcPanicCategory, "UsbMscFileCc" );
#endif
-_LIT( KResourceFileName, "usbmscfileresource.rsc" );
-_LIT( KUsbMsResource, "\\private\\101fe1db\\usbms.rsc" );
+_LIT( KUsbMsResource, "\\private\\101fe1db\\usbpammscfile.rsc" );
/**
Panic codes for the USB MSC File Class Controller.
@@ -397,38 +397,32 @@
LEAVE_IF_ERROR( mscFile.Connect() );
CleanupClosePushL( mscFile );
- LEAVE_IF_ERROR( fs.Connect() );
- CleanupClosePushL( fs );
+ CRepository* repository = CRepository::NewLC(KCRUidUsbPhoneAsModemMscFileClassController);
+
+ RArray<TUint32> lunKeys;
+ CleanupClosePushL(lunKeys);
+
+ repository->FindL(KCRMscFileLogicalUnitNumberColumn, KCRMscFileColumnMask, lunKeys);
- TFileName fileName;
- const TDriveNumber KStoreDrive = EDriveZ;
- TDriveUnit driveUnit( KStoreDrive );
- TDriveName drive = driveUnit.Name();
- fileName.Insert( 0, drive );
-
- fileName += KDC_APP_RESOURCE_DIR; // From data_caging_path_literals.hrh
- fileName += KResourceFileName;
-
- RResourceFile resourceFile;
- CleanupClosePushL( resourceFile );
- resourceFile.OpenL( fs, fileName );
- resourceFile.ConfirmSignatureL();
+
+ TInt count = lunKeys.Count();
+ for (TInt i=0; i<count; i++)
+ {
+ TUint32 lunKey = lunKeys[i];
+ TUint32 fullNameKey = ((lunKey&KCRMscFileRowMask)|KCRMscFileImageFullNameColumn);
+ TRACE_INFO( (_L( "lunKey=%d,fullNameKey=%d" ), lunKey, fullNameKey) )
- HBufC8* buf8 = resourceFile.AllocReadLC( R_USBMSCFILE_IMAGE_PATHS );
-
- TResourceReader reader;
- reader.SetBuffer( buf8 );
-
- TInt count = reader.ReadInt16();
-
- while ( count-- )
- {
- TInt protocol = reader.ReadUint16();
- TInt lun = reader.ReadUint16();
- HBufC* path = reader.ReadHBufCL();
- CleanupStack::PushL( path );
- LEAVE_IF_ERROR( mscFile.SetupLogicalUnit( *path, protocol, lun ) );
- CleanupStack::PopAndDestroy( path );
- }
- CleanupStack::PopAndDestroy( 4 ); // mscFile, fs, resourceFile, buf8
+ TInt lun = 0;
+ LEAVE_IF_ERROR(repository->Get(lunKey, lun));
+
+ TFileName fullName;
+ LEAVE_IF_ERROR(repository->Get(fullNameKey, fullName));
+
+ TRACE_INFO( (_L("lun=%d, fullName=%S"), lun, &fullName) );
+
+ TInt protocol = 0; // It is not used. Bulk Transport(0x50), SCSI transparent command Set(0x06), PDT CD/DVD device(0x05) is supported only.
+
+ LEAVE_IF_ERROR(mscFile.SetupLogicalUnit( fullName, protocol, lun ));
+ }
+ CleanupStack::PopAndDestroy( 3 ); // mscFile, repository, lunKeys
}
Binary file usbclasses/usbphoneasmodem/classimplementation/mscfileserver/rom/phone_as_modem.iso has changed
--- a/usbclasses/usbphoneasmodem/classimplementation/mscfileserver/src/mscfilesession.cpp Tue May 11 12:32:08 2010 +0100
+++ b/usbclasses/usbphoneasmodem/classimplementation/mscfileserver/src/mscfilesession.cpp Tue May 18 13:19:18 2010 +0100
@@ -118,33 +118,16 @@
TRACE_FUNC_ENTRY
TInt protocol;
TInt lun;
- RBuf buf;
+ RBuf fullImageFileName;
TInt len = aMessage.GetDesLength( 0 );
- buf.CreateL( len );
- buf.CleanupClosePushL();
- aMessage.ReadL( 0, buf );
+ fullImageFileName.CreateL( len );
+ fullImageFileName.CleanupClosePushL();
+ aMessage.ReadL( 0, fullImageFileName );
protocol = aMessage.Int1();
lun = aMessage.Int2();
-
- //get the directory and name of image file
- RFs fs;
- LEAVE_IF_ERROR(fs.Connect());
- CleanupClosePushL(fs);
- TFileName fileName;
- const TDriveNumber KResourceDrive = EDriveZ;
- TDriveUnit driveUnit( KResourceDrive );
- TDriveName drive = driveUnit.Name();
- fileName.Insert( 0, drive );
- // append private path
- TPath privatePath;
- fs.PrivatePath(privatePath);
- fileName.Append(privatePath);
- CleanupStack::PopAndDestroy(&fs);
-
- fileName.Append(buf);
- iMscFileServer.Controller().SetupLogicalUnitL( fileName, protocol, lun );
- CleanupStack::PopAndDestroy( &buf );
+ iMscFileServer.Controller().SetupLogicalUnitL( fullImageFileName, protocol, lun );
+ CleanupStack::PopAndDestroy( &fullImageFileName );
TRACE_FUNC_EXIT
}
/**
--- a/usbengines/usbwatcher/data/numberofacmfunctions.ini Tue May 11 12:32:08 2010 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,9 +0,0 @@
-[ACM_CONF]
-NumberOfAcmFunctions= 2
-
-[ACM 1]
-ProtocolNum= 1 // 0x01 - Code taken from USBCDC 1.1. Table 17- Hayes compatible modem
-
-
-[ACM 2]
-ProtocolNum= 255 //0xFF - vendor-specific
--- a/usbengines/usbwatcher/group/bld.inf Tue May 11 12:32:08 2010 +0100
+++ b/usbengines/usbwatcher/group/bld.inf Tue May 18 13:19:18 2010 +0100
@@ -32,7 +32,7 @@
backup_registration.xml /epoc32/data/z/private/101F9696/backup_registration.xml
backup_registration.xml /epoc32/release/winscw/udeb/z/private/101F9696/backup_registration.xml
backup_registration.xml /epoc32/release/winscw/urel/z/private/101F9696/backup_registration.xml
-../data/numberofacmfunctions.ini /epoc32/data/z/private/101fe1db/numberofacmfunctions.ini
+
../loc/usbman.loc MW_LAYER_LOC_EXPORT_PATH(usbman.loc)
../rom/usbwatcher.iby CORE_MW_LAYER_IBY_EXPORT_PATH(usbwatcher.iby)
// This file contains actual personality rss data
@@ -47,8 +47,5 @@
../rom/mtp_symbian_temp.iby CORE_MW_LAYER_IBY_EXPORT_PATH(mtp_symbian_temp.iby)
-// usbacmconfiguration.hby is included by usbacm.iby to define ACM configuration
-// We use this one to overwrite the os default one
-../rom/usbacmconfiguration.hby CORE_MW_LAYER_IBY_EXPORT_PATH(usbacmconfiguration.hby)
+// End of file
-// End of file
--- a/usbengines/usbwatcher/rom/usbacmconfiguration.hby Tue May 11 12:32:08 2010 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,43 +0,0 @@
-/*
-* 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:
-* Configuration for ACM functions
-*
-*/
-
-#ifndef USBACMCONFIGURATION_HBY
-#define USBACMCONFIGURATION_HBY
-
-#define USBACM_PATCHDATA_KUSBACMNUMBEROFACMFUNCTIONS 2
-
-// USBACM_PATCHDATA_KUSBACMPROTOCOLNUMACM[X] is referring to the Xth ACM *function*
-// which is accessed by the (X-1)th ACM *port*
-
-#define USBACM_PATCHDATA_KUSBACMPROTOCOLNUMACM1 1
-//0x01 - code taken from USBCDC 1.1 Table 17- Hayes compatible modem
-
-#define USBACM_PATCHDATA_KUSBACMPROTOCOLNUMACM2 255
-//0xFF - Vendor-specific
-
-//#define USBACM_PATCHDATA_KUSBACMPROTOCOLNUMACM3 1
-//#define USBACM_PATCHDATA_KUSBACMPROTOCOLNUMACM4 1
-//#define USBACM_PATCHDATA_KUSBACMPROTOCOLNUMACM5 1
-
-// To enable an ACM function, you need to change the
-// value of USBACM_PATCHDATA_KUSBACMNUMBEROFACMFUNCTIONS,
-// uncomment one define line then replace the protocol number with
-// the ACM protocol number expected.
-//
-
-#endif // USBACMCONFIGURATION_HBY
--- a/usbengines/usbwatcher/rom/usbwatcher.iby Tue May 11 12:32:08 2010 +0100
+++ b/usbengines/usbwatcher/rom/usbwatcher.iby Tue May 18 13:19:18 2010 +0100
@@ -24,7 +24,6 @@
file=ABI_DIR\BUILD_DIR\usbwatcher.dll PROGRAMS_DIR\usbwatcher.dll
file=ABI_DIR\BUILD_DIR\usbpersonality.dll PROGRAMS_DIR\usbpersonality.dll
data=DATAZ_\private\101F9696\backup_registration.xml private\101F9696\backup_registration.xml
-data=ZPRIVATE\101fe1db\numberofacmfunctions.ini private\101fe1db\numberofacmfunctions.ini
#endif
#endif
--- a/usbservices_plat/usb_secondary_display_api/group/bld.inf Tue May 11 12:32:08 2010 +0100
+++ b/usbservices_plat/usb_secondary_display_api/group/bld.inf Tue May 18 13:19:18 2010 +0100
@@ -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/inc/usbuincableconnectednotifier.h Tue May 11 12:32:08 2010 +0100
+++ b/usbuis/usbuinotif/inc/usbuincableconnectednotifier.h Tue May 18 13:19:18 2010 +0100
@@ -20,7 +20,7 @@
// INCLUDES
-#include <hbsymbiandevicedialog.h>
+#include <hbdevicedialogsymbian.h>
#include <hbsymbianvariant.h>
#include "usbnotifier.h" // Base class
@@ -145,7 +145,7 @@
*/
CUSBUICableConnectedNotifier();
- CHbDeviceDialog* iDialog;
+ CHbDeviceDialogSymbian* iDialog;
};
#endif // USBUINCABLECONNECTEDNOTIFIER_H
--- a/usbuis/usbuinotif/src/usbuincableconnectednotifier.cpp Tue May 11 12:32:08 2010 +0100
+++ b/usbuis/usbuinotif/src/usbuincableconnectednotifier.cpp Tue May 18 13:19:18 2010 +0100
@@ -211,7 +211,7 @@
delete iDialog;
iDialog = NULL;
}
- iDialog = CHbDeviceDialog::NewL();
+ iDialog = CHbDeviceDialogSymbian::NewL();
CHbSymbianVariantMap *parameters =CHbSymbianVariantMap::NewL();
CleanupStack::PushL(parameters);