--- a/localconnectivityservice/dun/atext/group/dunatext.mmp Fri Jul 09 17:58:21 2010 +0800
+++ b/localconnectivityservice/dun/atext/group/dunatext.mmp Fri Jul 23 18:35:35 2010 +0800
@@ -36,16 +36,10 @@
SOURCE DunAtNvramListen.cpp
SOURCE DunAtSpecialCmdHandler.cpp
-USERINCLUDE ../inc ../../utils/inc
-
MW_LAYER_SYSTEMINCLUDE
-// Note:
-// The only other SYSTEMINCLUDE should you shall add are Symbian specific ones.
-// If there is a S60 header in the subdirectory then that should be
-// added into the include statements (like #include <phonebook/header.h>)
-//SYSTEMINCLUDE /epoc32/include/ecom
-SYSTEMINCLUDE ../../../inc
+USERINCLUDE ../inc ../../utils/inc
+USERINCLUDE ../../../inc
LIBRARY atextclient.lib
LIBRARY atextcommon.lib
--- a/localconnectivityservice/dun/client/group/dunclient.mmp Fri Jul 09 17:58:21 2010 +0800
+++ b/localconnectivityservice/dun/client/group/dunclient.mmp Fri Jul 23 18:35:35 2010 +0800
@@ -36,16 +36,10 @@
TARGET dunclient.rsc
END // RESOURCE
-USERINCLUDE ../inc ../../utils/inc
-
MW_LAYER_SYSTEMINCLUDE
-// Note:
-// The only other SYSTEMINCLUDE should you shall add are Symbian specific ones.
-// If there is a S60 header in the subdirectory then that should be
-// added into the include statements (like #include <phonebook/header.h>)
-//SYSTEMINCLUDE /epoc32/include/ecom
-SYSTEMINCLUDE ../../../inc ../../../../inc /epoc32/include/ecom
+USERINCLUDE ../inc ../../utils/inc
+USERINCLUDE ../../../inc ../../../../inc
LIBRARY euser.lib
LIBRARY ecom.lib
--- a/localconnectivityservice/dun/client/src/0x20002775.rss Fri Jul 09 17:58:21 2010 +0800
+++ b/localconnectivityservice/dun/client/src/0x20002775.rss Fri Jul 23 18:35:35 2010 +0800
@@ -16,8 +16,8 @@
*/
-#include "registryinfov2.rh"
-#include "locodplugin.hrh"
+#include <ecom/registryinfov2.rh>
+#include <locodplugin.hrh>
RESOURCE REGISTRY_INFO theInfo
{
--- a/localconnectivityservice/dun/client/src/proxy.cpp Fri Jul 09 17:58:21 2010 +0800
+++ b/localconnectivityservice/dun/client/src/proxy.cpp Fri Jul 23 18:35:35 2010 +0800
@@ -16,7 +16,7 @@
*/
-#include <implementationproxy.h> //ECom header file
+#include <ecom/implementationproxy.h> //ECom header file
#include "dunplugin.h"
// ---------------------------------------------------------------------------
--- a/localconnectivityservice/dun/plugins/group/dunbt.mmp Fri Jul 09 17:58:21 2010 +0800
+++ b/localconnectivityservice/dun/plugins/group/dunbt.mmp Fri Jul 23 18:35:35 2010 +0800
@@ -29,16 +29,10 @@
SOURCE DunBtPlugin.cpp
SOURCE DunBtListen.cpp
-USERINCLUDE ../inc/bt ../../utils/inc
-
MW_LAYER_SYSTEMINCLUDE
-// Note:
-// The only other SYSTEMINCLUDE should you shall add are Symbian specific ones.
-// If there is a S60 header in the subdirectory then that should be
-// added into the include statements (like #include <phonebook/header.h>)
-//SYSTEMINCLUDE /epoc32/include/ecom
-SYSTEMINCLUDE ../../../inc
+USERINCLUDE ../inc/bt ../../utils/inc
+USERINCLUDE ../../../inc
LIBRARY euser.lib
LIBRARY esock.lib
--- a/localconnectivityservice/dun/plugins/group/dunir.mmp Fri Jul 09 17:58:21 2010 +0800
+++ b/localconnectivityservice/dun/plugins/group/dunir.mmp Fri Jul 23 18:35:35 2010 +0800
@@ -28,16 +28,10 @@
SOURCEPATH ../src/ir
SOURCE DunIrPlugin.cpp
-USERINCLUDE ../inc/ir ../../utils/inc
-
MW_LAYER_SYSTEMINCLUDE
-// Note:
-// The only other SYSTEMINCLUDE should you shall add are Symbian specific ones.
-// If there is a S60 header in the subdirectory then that should be
-// added into the include statements (like #include <phonebook/header.h>)
-//SYSTEMINCLUDE /epoc32/include/ecom
-SYSTEMINCLUDE ../../../inc
+USERINCLUDE ../inc/ir ../../utils/inc
+USERINCLUDE ../../../inc
LIBRARY euser.lib
LIBRARY c32.lib
--- a/localconnectivityservice/dun/plugins/group/dunusb.mmp Fri Jul 09 17:58:21 2010 +0800
+++ b/localconnectivityservice/dun/plugins/group/dunusb.mmp Fri Jul 23 18:35:35 2010 +0800
@@ -30,16 +30,10 @@
SOURCE DunUsbListen.cpp
SOURCE DunUsbConfig.cpp
-USERINCLUDE ../inc/usb ../../utils/inc
-
MW_LAYER_SYSTEMINCLUDE
-// Note:
-// The only other SYSTEMINCLUDE should you shall add are Symbian specific ones.
-// If there is a S60 header in the subdirectory then that should be
-// added into the include statements (like #include <phonebook/header.h>)
-//SYSTEMINCLUDE /epoc32/include/ecom
-SYSTEMINCLUDE ../../../inc
+USERINCLUDE ../inc/usb ../../utils/inc
+USERINCLUDE ../../../inc
LIBRARY euser.lib
LIBRARY c32.lib
--- a/localconnectivityservice/dun/server/group/dunserver.mmp Fri Jul 09 17:58:21 2010 +0800
+++ b/localconnectivityservice/dun/server/group/dunserver.mmp Fri Jul 23 18:35:35 2010 +0800
@@ -31,16 +31,10 @@
SOURCE DunServerUtils.cpp
SOURCE DunCloseWait.cpp
-USERINCLUDE ../inc ../../utils/inc
-
MW_LAYER_SYSTEMINCLUDE
-// Note:
-// The only other SYSTEMINCLUDE should you shall add are Symbian specific ones.
-// If there is a S60 header in the subdirectory then that should be
-// added into the include statements (like #include <phonebook/header.h>)
-//SYSTEMINCLUDE /epoc32/include/ecom
-SYSTEMINCLUDE ../../../inc ../../../../inc
+USERINCLUDE ../inc ../../utils/inc
+USERINCLUDE ../../../inc ../../../../inc
LIBRARY euser.lib
LIBRARY dunutils.lib
--- a/localconnectivityservice/dun/tsrc/group/dunutilstest.mmp Fri Jul 09 17:58:21 2010 +0800
+++ b/localconnectivityservice/dun/tsrc/group/dunutilstest.mmp Fri Jul 23 18:35:35 2010 +0800
@@ -21,20 +21,11 @@
CAPABILITY ALL -TCB
-//TARGETPATH ?target_path
DEFFILE dunutilstest.def
USERINCLUDE ../inc ../../utils/inc
-SYSTEMINCLUDE /epoc32/include/mw/hb/hbwidgets
-
-#if defined(__S60_)
- // OSEXT_LAYER_SYSTEMINCLUDE
- MW_LAYER_SYSTEMINCLUDE
-#else
- //SYSTEMINCLUDE /epoc32/include
- //SYSTEMINCLUDE /epoc32/include/internal
-#endif
+MW_LAYER_SYSTEMINCLUDE
SOURCEPATH ../src
--- a/localconnectivityservice/dun/utils/group/dunutils.mmp Fri Jul 09 17:58:21 2010 +0800
+++ b/localconnectivityservice/dun/utils/group/dunutils.mmp Fri Jul 23 18:35:35 2010 +0800
@@ -54,17 +54,10 @@
SOURCE DunNoteHandler.cpp
SOURCE DunUtils.cpp
-USERINCLUDE ../inc ../../atext/inc
-
MW_LAYER_SYSTEMINCLUDE
-// Note:
-// The only other SYSTEMINCLUDE should you shall add are Symbian specific ones.
-// If there is a S60 header in the subdirectory then that should be
-// added into the include statements (like #include <phonebook/header.h>)
-//SYSTEMINCLUDE /epoc32/include/ecom
-SYSTEMINCLUDE ../../../inc
-SYSTEMINCLUDE /epoc32/include/mw/hb/hbwidgets
+USERINCLUDE ../inc ../../atext/inc
+USERINCLUDE ../../../inc
LIBRARY bafl.lib
#ifdef PRJ_USE_NETWORK_STUBS
--- a/localconnectivityservice/dun/utils/inc/DunNoteHandler.h Fri Jul 09 17:58:21 2010 +0800
+++ b/localconnectivityservice/dun/utils/inc/DunNoteHandler.h Fri Jul 23 18:35:35 2010 +0800
@@ -20,7 +20,7 @@
#define C_CDUNNOTEHANDLER_H
#include <e32base.h>
-#include <hbdevicemessageboxsymbian.h>
+#include <hb/hbwidgets/hbdevicemessageboxsymbian.h>
#include "DunTransporter.h"
/**
--- a/localconnectivityservice/generichid/group/generichid.mmp Fri Jul 09 17:58:21 2010 +0800
+++ b/localconnectivityservice/generichid/group/generichid.mmp Fri Jul 23 18:35:35 2010 +0800
@@ -41,11 +41,10 @@
SOURCE hidinterfaces.cpp
SOURCE hidconnectioninfo.cpp
-USERINCLUDE ../inc
+MW_LAYER_SYSTEMINCLUDE
-MW_LAYER_SYSTEMINCLUDE
-SYSTEMINCLUDE ../../../inc
-SYSTEMINCLUDE /epoc32/include/ecom
+USERINCLUDE ../inc
+USERINCLUDE ../../../inc
LIBRARY euser.lib
LIBRARY ecom.lib
--- a/localconnectivityservice/generichid/tsrc/GenericHidTest/group/CHidDriverPlugin.mmp Fri Jul 09 17:58:21 2010 +0800
+++ b/localconnectivityservice/generichid/tsrc/GenericHidTest/group/CHidDriverPlugin.mmp Fri Jul 23 18:35:35 2010 +0800
@@ -33,7 +33,6 @@
USERINCLUDE ../inc
USERINCLUDE ../../../inc
-SYSTEMINCLUDE /epoc32/include/ecom
MW_LAYER_SYSTEMINCLUDE
--- a/localconnectivityservice/generichid/tsrc/GenericHidTest/group/GenericHidTest.mmp Fri Jul 09 17:58:21 2010 +0800
+++ b/localconnectivityservice/generichid/tsrc/GenericHidTest/group/GenericHidTest.mmp Fri Jul 23 18:35:35 2010 +0800
@@ -36,8 +36,6 @@
USERINCLUDE ../inc
USERINCLUDE ../../../inc
-SYSTEMINCLUDE /epoc32/include/internal
-
SOURCEPATH ../src
SOURCE GenericHidTest.cpp
SOURCE GenericHidTestBlocks.cpp
--- a/localconnectivityservice/headset/group/hidheadset.mmp Fri Jul 09 17:58:21 2010 +0800
+++ b/localconnectivityservice/headset/group/hidheadset.mmp Fri Jul 23 18:35:35 2010 +0800
@@ -36,14 +36,14 @@
TARGET hidheadset.rsc
END // ECOM resource definition
-USERINCLUDE ../inc ../hidremconbearer/inc
-
#ifdef NO101APPDEPFIXES
APP_LAYER_SYSTEMINCLUDE
#else //NO101APPDEPFIXES
MW_LAYER_SYSTEMINCLUDE
#endif //NO101APPDEPFIXES
-SYSTEMINCLUDE ../../../inc
+
+USERINCLUDE ../inc ../hidremconbearer/inc
+USERINCLUDE ../../../inc
LIBRARY euser.lib
LIBRARY ecom.lib
--- a/localconnectivityservice/locod/commoninc/locodbearerplugin.inl Fri Jul 09 17:58:21 2010 +0800
+++ b/localconnectivityservice/locod/commoninc/locodbearerplugin.inl Fri Jul 23 18:35:35 2010 +0800
@@ -17,7 +17,7 @@
*/
-#include <ecom.h>
+#include <ecom/ecom.h>
// -----------------------------------------------------------------------------
// Creates the bearer plug ins and return it to caller
--- a/localconnectivityservice/locod/commoninc/locodserviceplugin.inl Fri Jul 09 17:58:21 2010 +0800
+++ b/localconnectivityservice/locod/commoninc/locodserviceplugin.inl Fri Jul 23 18:35:35 2010 +0800
@@ -17,7 +17,7 @@
*/
-#include <ecom.h>
+#include <ecom/ecom.h>
// -----------------------------------------------------------------------------
// Constructor method, just saves the arguments into member variables
--- a/localconnectivityservice/locod/group/locod.mmp Fri Jul 09 17:58:21 2010 +0800
+++ b/localconnectivityservice/locod/group/locod.mmp Fri Jul 23 18:35:35 2010 +0800
@@ -33,9 +33,9 @@
SOURCE locodserviceman.cpp
SOURCE locodservice.cpp
-USERINCLUDE ../inc
-SYSTEMINCLUDE ../../inc ../../../inc
-SYSTEMINCLUDE /epoc32/include/ecom
+USERINCLUDE ../inc
+USERINCLUDE ../../inc ../../../inc
+
MW_LAYER_SYSTEMINCLUDE
LIBRARY euser.lib
--- a/mtpdataproviders/mtppictbridgedp/src/cmtppictbridgedpsendobjectinfo.cpp Fri Jul 09 17:58:21 2010 +0800
+++ b/mtpdataproviders/mtppictbridgedp/src/cmtppictbridgedpsendobjectinfo.cpp Fri Jul 23 18:35:35 2010 +0800
@@ -659,7 +659,16 @@
//with folder creation.
- iFramework.ObjectMgr().CommitReservedObjectHandleL(*iReceivedObjectP);
+ TRAPD(err, iFramework.ObjectMgr().CommitReservedObjectHandleL(*iReceivedObjectP));
+ __FLOG_VA((_L8(" Entry error %d"),err));
+ if( KErrAlreadyExists == err )
+ {
+ iReceivedObjectP->SetUint(CMTPObjectMetaData::EHandle, iFramework.ObjectMgr().HandleL(iFullPath));
+ }
+ else
+ {
+ User::LeaveIfError(err);
+ }
SendResponseL(EMTPRespCodeOK);
}
__FLOG(_L8("<< CMTPPictGetObjectPropDesc::DoHandleSendObjectCompleteL"));
--- a/mtpdataproviders/mtppictbridgedp/src/cmtppictbridgeusbconnection.cpp Fri Jul 09 17:58:21 2010 +0800
+++ b/mtpdataproviders/mtppictbridgedp/src/cmtppictbridgeusbconnection.cpp Fri Jul 23 18:35:35 2010 +0800
@@ -78,13 +78,19 @@
//
void CMTPPictBridgeUsbConnection::Listen()
{
- iProperty.Subscribe(iStatus);
- SetActive();
- if(ConnectionClosed()) // we listen to the disconnection only if connected to the printer
+ __FLOG(_L8(">> CMTPPictBridgeUsbConnection::Listen"));
+ if(!IsActive())
{
- iPrinter.ConnectionClosed();
- Cancel();
+ __FLOG(_L8(" CMTPPictBridgeUsbConnection AO is NOT active and run AO"));
+ iProperty.Subscribe(iStatus);
+ SetActive();
+ if(ConnectionClosed()) // we listen to the disconnection only if connected to the printer
+ {
+ iPrinter.ConnectionClosed();
+ Cancel();
+ }
}
+ __FLOG(_L8("<< CMTPPictBridgeUsbConnection::Listen"));
}
// --------------------------------------------------------------------------
@@ -97,12 +103,14 @@
TInt ret = RProperty::Get(KPSUidUsbWatcher, KUsbWatcherSelectedPersonality, personality);
__FLOG_VA((_L8("CMTPPictBridgeUsbConnection::ConnectionClosed() current personality = %d, previous personality = %d"), personality, iPreviousPersonality));
- if ((ret == KErrNone &&
- (personality == KUsbPersonalityIdMS || personality == KUsbPersonalityIdPTP))
+ if ((ret == KErrNone && personality == KUsbPersonalityIdMS)
|| (iPreviousPersonality != KNotAssigned && personality != iPreviousPersonality))
- {
- __FLOG_VA((_L8("****WARNING!!! PTP server detects the USB connection closed!")));
- return ETrue;
+ {
+ if((personality != KUsbPersonalityIdPCSuiteMTP)&&(personality != KUsbPersonalityIdMTP))
+ {
+ __FLOG_VA((_L8("****WARNING!!! PTP server detects the USB connection closed!")));
+ return ETrue;
+ }
}
iPreviousPersonality = personality;
--- a/mtpfws/mtpfw/src/cmtpconnectionmgr.cpp Fri Jul 09 17:58:21 2010 +0800
+++ b/mtpfws/mtpfw/src/cmtpconnectionmgr.cpp Fri Jul 23 18:35:35 2010 +0800
@@ -13,8 +13,6 @@
// Description:
//
-#include <usbman.h>
-#include <usbstates.h>
#include "cmtpconnectionmgr.h"
#include "cmtpconnection.h"
@@ -115,33 +113,6 @@
EXPORT_C void CMTPConnectionMgr::StartTransportL(TUid aTransport)
{
__FLOG(_L8("StartTransportL - Entry"));
-
- RUsb usb;
- User::LeaveIfError(usb.Connect());
- __FLOG(_L8("after connect, and before call get currentpersonalityid"));
- TInt usbMode;
- TUsbServiceState usbStat;
- TInt err = usb.GetCurrentPersonalityId(usbMode);
- __FLOG_1(_L8("The return value of GetCurrentPersonalityId is %d"), err);
-
- err = usb.GetServiceState(usbStat);
- __FLOG_1(_L8("The return value of GetServiceState is %d"), err);
-
- usb.Close();
-
- __FLOG_1(_L8("The current usb mode is %d"), usbMode);
- __FLOG_1(_L8("The current usb service state is %d"), usbStat);
-
- TInt massStorageMode = 0x02;
-
- if(usbMode == massStorageMode && usbStat != EUsbServiceIdle)
- {
- __FLOG(_L8("StartTransportL without parameter!"));
- StartTransportL( aTransport, NULL );
- return;
- }
-
-
//When USB plug out, BT will start Master mode to reconnect remote device. Else BT will start slave mode to listen connection.
if(aTransport.iUid == KMTPBTTransportUid && iRemoteDevice.iDeviceAddr != 0 && aTransport != iTransportUid)
--- a/mtptransports/mtpcontroller/src/cmtpcontrollertimer.cpp Fri Jul 09 17:58:21 2010 +0800
+++ b/mtptransports/mtpcontroller/src/cmtpcontrollertimer.cpp Fri Jul 23 18:35:35 2010 +0800
@@ -89,7 +89,7 @@
{
__FLOG( _L8("Start transport to launch mtp server") );
- iMTPClient.Connect();
+ User::LeaveIfError(iMTPClient.Connect());
iMTPClient.StartTransport(KMTPBtTransportUid);
iStopTransport = EFalse;
iMTPOperator->SubscribeConnState();
--- a/mtptransports/mtpusbtransport/usbsic_imp/src/cmtpusbconnection.cpp Fri Jul 09 17:58:21 2010 +0800
+++ b/mtptransports/mtpusbtransport/usbsic_imp/src/cmtpusbconnection.cpp Fri Jul 23 18:35:35 2010 +0800
@@ -1684,6 +1684,7 @@
SetBulkTransactionState(EUndefined);
SetConnectionState(EIdle);
SetSuspendState(ENotSuspended);
+ iMTPSessionId = KMTPSessionNone;
}
__FLOG(_L8("StopConnection - Exit"));