FCL/sf/os/usb: comparison usbmgmt/usbmgr/host/functiondrivers/ms/msmm/server/src/subcommands.cpp

equal deleted inserted replaced

-:f92a4f87e424
+:012cc2ee6408
 /*
-* Copyright (c) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
+* 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".
 #include "msmm_internal_def.h"
 #include <usb/hostms/msmmpolicypluginbase.h>
 #include <usb/hostms/srverr.h>
 #include <usb/usblogger.h>
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
+#ifdef __FLOG_ACTIVE
-#include "subcommandsTraces.h"
+_LIT8(KLogComponent, "UsbHostMsmmServer");
 #endif
 /**
 *  TRegisterInterface member functions
 */
 TRegisterInterface::TRegisterInterface(THostMsSubCommandParam aParam):
 TSubCommandBase(aParam),
 iDeviceNode(NULL),
 iInterfaceNode(NULL)
 {
-OstTraceFunctionEntry0( TREGISTERINTERFACE_TREGISTERINTERFACE_CONS_ENTRY );
+LOG_FUNC
 }
 void TRegisterInterface::DoExecuteL()
 {
-OstTraceFunctionEntry0( TREGISTERINTERFACE_DOEXECUTEL_ENTRY );
+LOG_FUNC
 // Add new interface node into data engine
 iInterfaceNode = iServer.Engine().AddUsbMsInterfaceL(iEvent.iDeviceId,
 iEvent.iInterfaceNumber, iEvent.iInterfaceToken);
 iMsConfig.iProtocolId = device.iProtocolId;
 iMsConfig.iTransportId = device.iTransportId;
 iMsConfig.iRemoteWakeup = device.iRemoteWakeup;
 iMsConfig.iIsOtgClient = device.iIsOtgClient;
-OstTrace1( TRACE_NORMAL, TREGISTERINTERFACE_DOEXECUTEL,
+LOGTEXT2(_L8("\t iMsConfig.iProtocolId %d"), iMsConfig.iProtocolId);
-"iMsConfig.iProtocolId %d", iMsConfig.iProtocolId );
+LOGTEXT2(_L8("\t iMsConfig.iTransportId %d"), iMsConfig.iTransportId);
-OstTrace1( TRACE_NORMAL, TREGISTERINTERFACE_DOEXECUTEL_DUP1,
+LOGTEXT2(_L8("\t iMsConfig.iRemoteWakeup %d"), iMsConfig.iRemoteWakeup);
-"iMsConfig.iTransportId %d", iMsConfig.iTransportId );
+LOGTEXT2(_L8("\t iMsConfig.iIsOtgClient %d"), iMsConfig.iIsOtgClient);
-OstTrace1( TRACE_NORMAL, TREGISTERINTERFACE_DOEXECUTEL_DUP2,
-"iMsConfig.iRemoteWakeup %d", iMsConfig.iRemoteWakeup );
-OstTrace1( TRACE_NORMAL, TREGISTERINTERFACE_DOEXECUTEL_DUP3,
-"iMsConfig.iIsOtgClient %d", iMsConfig.iIsOtgClient );
 TSuspensionPolicy suspensionPolicy;
 iServer.PolicyPlugin()->GetSuspensionPolicy(suspensionPolicy);
 iMsConfig.iOtgSuspendTime = suspensionPolicy.iOtgSuspendTime;
 iMsConfig.iStatusPollingInterval = suspensionPolicy.iStatusPollingInterval;
-OstTrace1( TRACE_NORMAL, TREGISTERINTERFACE_DOEXECUTEL_DUP4,
-"iMsConfig.iStatusPollingInterval %d", iMsConfig.iStatusPollingInterval );
+LOGTEXT2(_L8("\t iMsConfig.iStatusPollingInterval %d"), iMsConfig.iStatusPollingInterval);
-OstTrace1( TRACE_NORMAL, TREGISTERINTERFACE_DOEXECUTEL_DUP5,
+LOGTEXT2(_L8("\t iMsConfig.iOtgSuspendTime %d"), iMsConfig.iOtgSuspendTime);
-"iMsConfig.iOtgSuspendTime %d", iMsConfig.iOtgSuspendTime );
 iHandler.Start();
 iInterfaceNode->iUsbMsDevice.Add(iMsConfig, iHandler.Status());
-OstTraceFunctionExit0( TREGISTERINTERFACE_DOEXECUTEL_EXIT );
 }
 void TRegisterInterface::HandleError(THostMsErrData& aData, TInt aError)
 {
-OstTraceFunctionEntry0( TREGISTERINTERFACE_HANDLEERROR_ENTRY );
+LOG_FUNC
 switch (aError)
 {
 case KErrNoMemory:
 aData.iError = EHostMsErrOutOfMemory;
 if (iInterfaceNode)
 {
 iServer.Engine().RemoveUsbMsNode(iInterfaceNode);
 iInterfaceNode = NULL;
 }
-OstTraceFunctionExit0( TREGISTERINTERFACE_HANDLEERROR_EXIT );
 }
 void TRegisterInterface::DoAsyncCmdCompleteL()
 {
-OstTraceFunctionEntry0( TREGISTERINTERFACE_DOASYNCCMDCOMPLETEL_ENTRY );
+LOG_FUNC
 User::LeaveIfError(iHandler.Status().Int());
 if(iInterfaceNode)
 {
 User::LeaveIfError(
 iInterfaceNode->iUsbMsDevice.GetNumLun(iMaxLogicalUnit));
 }
-OstTrace1( TRACE_NORMAL, TREGISTERINTERFACE_DOASYNCCMDCOMPLETEL,
+LOGTEXT2(_L8("\tGetNumLun %d"), iMaxLogicalUnit);
-"GetNumLun %d", iMaxLogicalUnit );
 iCreator.CreateSubCmdForRetrieveDriveLetterL(iMaxLogicalUnit);
-OstTraceFunctionExit0( TREGISTERINTERFACE_DOASYNCCMDCOMPLETEL_EXIT );
 }
 void TRegisterInterface::DoCancelAsyncCmd()
 {
-OstTraceFunctionEntry0( TREGISTERINTERFACE_DOCANCELASYNCCMD_ENTRY );
+LOG_FUNC
 if(iInterfaceNode)
 {
 iInterfaceNode->iUsbMsDevice.Remove();
 iServer.Engine().RemoveUsbMsNode(iInterfaceNode);
 iInterfaceNode = NULL;
 }
-OstTraceFunctionExit0( TREGISTERINTERFACE_DOCANCELASYNCCMD_EXIT );
 }
 /**
 *  TRetrieveDriveLetter member functions
 */
 THostMsSubCommandParam& aParameter, TInt aLuNumber):
 TSubCommandBase(aParameter),
 iLuNumber(aLuNumber),
 iDrive(0)
 {
-OstTraceFunctionEntry0( TRETRIEVEDRIVELETTER_TRETRIEVEDRIVELETTER_CONS_ENTRY );
+LOG_FUNC
 }
 void TRetrieveDriveLetter::DoExecuteL()
 {
-OstTraceFunctionEntry0( TRETRIEVEDRIVELETTER_DOEXECUTEL_ENTRY );
+LOG_FUNC
 TUsbMsDevice* deviceEntry(NULL);
 deviceEntry = iServer.Engine().SearchDevice(iEvent.iDeviceId);
 if (!deviceEntry)
 {
 iHandler.Start();
 TRequestStatus& status = iHandler.Status();
 iServer.PolicyPlugin()->RetrieveDriveLetterL(
 iDrive, iRequestData, status);
 }
-OstTraceFunctionExit0( TRETRIEVEDRIVELETTER_DOEXECUTEL_EXIT );
 }
 void TRetrieveDriveLetter::HandleError(THostMsErrData& aData, TInt aError)
 {
-OstTraceFunctionEntry0( TRETRIEVEDRIVELETTER_HANDLEERROR_ENTRY );
+LOG_FUNC
 switch (aError)
 {
 case KErrArgument:
 aData.iError = EHostMsErrInvalidParameter;
 }
 aData.iE32Error = aError;
 aData.iManufacturerString = iRequestData.iManufacturerString;
 aData.iProductString = iRequestData.iProductString;
 aData.iDriveName = iDrive;
-OstTraceFunctionExit0( TRETRIEVEDRIVELETTER_HANDLEERROR_EXIT );
 }
 void TRetrieveDriveLetter::DoAsyncCmdCompleteL()
 {
-OstTraceFunctionEntry0( TRETRIEVEDRIVELETTER_DOASYNCCMDCOMPLETEL_ENTRY );
+LOG_FUNC
 User::LeaveIfError(iHandler.Status().Int());
 iCreator.CreateSubCmdForMountingLogicalUnitL(iDrive, iLuNumber);
-OstTraceFunctionExit0( TRETRIEVEDRIVELETTER_DOASYNCCMDCOMPLETEL_EXIT );
 }
 void TRetrieveDriveLetter::DoCancelAsyncCmd()
 {
-OstTraceFunctionEntry0( TRETRIEVEDRIVELETTER_DOCANCELASYNCCMD_ENTRY );
+LOG_FUNC
 iServer.PolicyPlugin()->CancelRetrieveDriveLetter();
-OstTraceFunctionExit0( TRETRIEVEDRIVELETTER_DOCANCELASYNCCMD_EXIT );
 }
 /**
 *  TMountLogicalUnit member functions
 */
 TText aDrive, TInt aLuNumber):
 TSubCommandBase(aParameter),
 iDrive(aDrive),
 iLuNumber(aLuNumber)
 {
-OstTraceFunctionEntry0( TMOUNTLOGICALUNIT_TMOUNTLOGICALUNIT_CONS_ENTRY );
+LOG_FUNC
 iIsKeyCommand = EFalse;
-OstTraceFunctionExit0( TMOUNTLOGICALUNIT_TMOUNTLOGICALUNIT_CONS_EXIT );
 }
 void TMountLogicalUnit::DoExecuteL()
 {
-OstTraceFunctionEntry0( TMOUNTLOGICALUNIT_DOEXECUTEL_ENTRY );
+LOG_FUNC
 TInt ret(KErrNone);
 RFs& fs = iServer.FileServerSession();
 TInt driveNum;
 User::LeaveIfError(fs.CharToDrive(iDrive, driveNum));
 ret = interface->iUsbMsDevice.MountLun(iLuNumber, driveNum);
 if ((KErrNone != ret) && (KErrAlreadyExists != ret)
 && (KErrNotReady != ret))
 {
-if (KErrAbort != ret)
+User::Leave (ret);
-User::Leave (ret);
 }
 iHandler.Start();
 iHandler.Complete();
-OstTraceFunctionExit0( TMOUNTLOGICALUNIT_DOEXECUTEL_EXIT );
 }
 void TMountLogicalUnit::HandleError(THostMsErrData& aData, TInt aError)
 {
-OstTraceFunctionEntry0( TMOUNTLOGICALUNIT_HANDLEERROR_ENTRY );
+LOG_FUNC
 switch (aError)
 {
 case KErrNoMemory:
 aData.iError = EHostMsErrOutOfMemory;
 {
 aData.iManufacturerString.Copy(deviceNode->iDevice.iManufacturerString);
 aData.iProductString.Copy(deviceNode->iDevice.iProductString);
 }
 aData.iDriveName = iDrive;
-OstTraceFunctionExit0( TMOUNTLOGICALUNIT_HANDLEERROR_EXIT );
 }
 void TMountLogicalUnit::DoAsyncCmdCompleteL()
 {
-OstTraceFunctionEntry0( TMOUNTLOGICALUNIT_DOASYNCCMDCOMPLETEL_ENTRY );
+LOG_FUNC
 iServer.Engine().AddUsbMsLogicalUnitL(
 iEvent.iDeviceId, iEvent.iInterfaceNumber,
 iLuNumber, iDrive);
 iCreator.CreateSubCmdForSaveLatestMountInfoL(iDrive, iLuNumber);
-OstTraceFunctionExit0( TMOUNTLOGICALUNIT_DOASYNCCMDCOMPLETEL_EXIT );
 }
 /**
 *  TSaveLatestMountInfo member functions
 */
 TText aDrive, TInt aLuNumber):
 TSubCommandBase(aParameter),
 iDrive(aDrive),
 iLuNumber(aLuNumber)
 {
-OstTraceFunctionEntry0( TSAVELATESTMOUNTINFO_TSAVELATESTMOUNTINFO_CONS_ENTRY );
+LOG_FUNC
 iIsKeyCommand = EFalse;
-OstTraceFunctionExit0( TSAVELATESTMOUNTINFO_TSAVELATESTMOUNTINFO_CONS_EXIT );
 }
 void TSaveLatestMountInfo::DoExecuteL()
 {
-OstTraceFunctionEntry0( TSAVELATESTMOUNTINFO_DOEXECUTEL_ENTRY );
+LOG_FUNC
 TUsbMsDevice* deviceEntry(NULL);
 deviceEntry = iServer.Engine().SearchDevice(iEvent.iDeviceId);
 if (!deviceEntry)
 {
 User::Leave(KErrArgument);
 iHandler.Start();
 TRequestStatus& status = iHandler.Status();
 iServer.PolicyPlugin()->SaveLatestMountInfoL(iRecord, status);
 }
-OstTraceFunctionExit0( TSAVELATESTMOUNTINFO_DOEXECUTEL_EXIT );
 }
 void TSaveLatestMountInfo::DoAsyncCmdCompleteL()
 {
-OstTraceFunctionEntry0( TSAVELATESTMOUNTINFO_DOASYNCCMDCOMPLETEL_ENTRY );
+LOG_FUNC
+User::LeaveIfError(iHandler.Status().Int());
+}
+void TSaveLatestMountInfo::HandleError(THostMsErrData& aData, TInt aError)
+{
+LOG_FUNC
-User::LeaveIfError(iHandler.Status().Int());
-OstTraceFunctionExit0( TSAVELATESTMOUNTINFO_DOASYNCCMDCOMPLETEL_EXIT );
-}
-void TSaveLatestMountInfo::HandleError(THostMsErrData& aData, TInt aError)
-{
-OstTraceFunctionEntry0( TSAVELATESTMOUNTINFO_HANDLEERROR_ENTRY );
 switch (aError)
 {
 case KErrNoMemory:
 aData.iError = EHostMsErrOutOfMemory;
 break;
 }
 aData.iE32Error = aError;
 aData.iManufacturerString = iRecord.iLogicUnit.iManufacturerString;
 aData.iProductString = iRecord.iLogicUnit.iProductString;
 aData.iDriveName = iDrive;
-OstTraceFunctionExit0( TSAVELATESTMOUNTINFO_HANDLEERROR_EXIT );
 }
 void TSaveLatestMountInfo::DoCancelAsyncCmd()
 {
-OstTraceFunctionEntry0( TSAVELATESTMOUNTINFO_DOCANCELASYNCCMD_ENTRY );
+LOG_FUNC
 iServer.PolicyPlugin()->CancelSaveLatestMountInfo();
-OstTraceFunctionExit0( TSAVELATESTMOUNTINFO_DOCANCELASYNCCMD_EXIT );
 }
 /**
 *  TDeregisterInterface member functions
 iInterfaceNumber(aInterfaceNumber),
 iInterfaceToken(aInterfaceToken),
 iDeviceNode(NULL),
 iInterfaceNode(NULL)
 {
-OstTraceFunctionEntry0( TDEREGISTERINTERFACE_TDEREGISTERINTERFACE_CONS_ENTRY );
+LOG_FUNC
 }
 void TDeregisterInterface::DoExecuteL()
 {
-OstTraceFunctionEntry0( TDEREGISTERINTERFACE_DOEXECUTEL_ENTRY );
+LOG_FUNC
 iDeviceNode = iServer.Engine().SearchDevice(iEvent.iDeviceId);
 if (!iDeviceNode)
 {
 User::Leave(KErrArgument);
 }
 // Activate the handler.
 iHandler.Start();
 // Simulate a async request be completed.
 iHandler.Complete();
-OstTraceFunctionExit0( TDEREGISTERINTERFACE_DOEXECUTEL_EXIT );
 }
 void TDeregisterInterface::HandleError(THostMsErrData& aData, TInt aError)
 {
-OstTraceFunctionEntry0( TDEREGISTERINTERFACE_HANDLEERROR_ENTRY );
+LOG_FUNC
 switch (aError)
 {
 case KErrNoMemory:
 aData.iError = EHostMsErrOutOfMemory;
 break;
 {
 aData.iManufacturerString.Copy(iDeviceNode->iDevice.iManufacturerString);
 aData.iProductString.Copy(iDeviceNode->iDevice.iProductString);
 }
 aData.iDriveName = 0;
-OstTraceFunctionExit0( TDEREGISTERINTERFACE_HANDLEERROR_EXIT );
 }
 /**
 *  TDismountLogicalUnit member functions
 */
 THostMsSubCommandParam& aParameter,
 const TUsbMsLogicalUnit& aLogicalUnit):
 TSubCommandBase(aParameter),
 iLogicalUnit(aLogicalUnit)
 {
-OstTraceFunctionEntry0( TDISMOUNTLOGICALUNIT_TDISMOUNTLOGICALUNIT_CONS_ENTRY );
+LOG_FUNC
 }
 void TDismountLogicalUnit::DoExecuteL()
 {
-OstTraceFunctionEntry0( TDISMOUNTLOGICALUNIT_DOEXECUTEL_ENTRY );
+LOG_FUNC
 RFs& fs = iServer.FileServerSession();
 TInt driveNum;
 fs.CharToDrive(iLogicalUnit.iDrive, driveNum);
 TUsbMsInterface* interface(NULL);
 // Activate the handler.
 iHandler.Start();
 // Simulate a async request be completed.
 iHandler.Complete();
-OstTraceFunctionExit0( TDISMOUNTLOGICALUNIT_DOEXECUTEL_EXIT );
 }
 void TDismountLogicalUnit::HandleError(THostMsErrData& aData, TInt aError)
 {
-OstTraceFunctionEntry0( TDISMOUNTLOGICALUNIT_HANDLEERROR_ENTRY );
+LOG_FUNC
 switch (aError)
 {
 case KErrNoMemory:
 aData.iError = EHostMsErrOutOfMemory;
 {
 aData.iManufacturerString.Copy(deviceNode->iDevice.iManufacturerString);
 aData.iProductString.Copy(deviceNode->iDevice.iProductString);
 }
 aData.iDriveName = iLogicalUnit.iDrive;
-OstTraceFunctionExit0( TDISMOUNTLOGICALUNIT_HANDLEERROR_EXIT );
 }
 /**
 *  TRemoveUsbMsDeviceNode member functions
 */
 THostMsSubCommandParam& aParameter,
 TMsmmNodeBase* aNodeToBeRemoved):
 TSubCommandBase(aParameter),
 iNodeToBeRemoved(aNodeToBeRemoved)
 {
-OstTraceFunctionEntry0( TREMOVEUSBMSDEVICENODE_TREMOVEUSBMSDEVICENODE_CONS_ENTRY );
+LOG_FUNC
 }
 void TRemoveUsbMsDeviceNode::DoExecuteL()
 {
-OstTraceFunctionEntry0( TREMOVEUSBMSDEVICENODE_DOEXECUTEL_ENTRY );
+LOG_FUNC
 if(iNodeToBeRemoved)
 {
 iServer.Engine().RemoveUsbMsNode(iNodeToBeRemoved);
 iNodeToBeRemoved = NULL;
 }
 // Activate the handler.
 iHandler.Start();
 // Simulate a async request be completed.
 iHandler.Complete();
-OstTraceFunctionExit0( TREMOVEUSBMSDEVICENODE_DOEXECUTEL_EXIT );
 }
 void TRemoveUsbMsDeviceNode::HandleError(THostMsErrData& aData, TInt aError)
 {
-OstTraceFunctionEntry0( TREMOVEUSBMSDEVICENODE_HANDLEERROR_ENTRY );
+LOG_FUNC
 switch (aError)
 {
 case KErrArgument:
 aData.iError = EHostMsErrInvalidParameter;
 break;
 {
 aData.iManufacturerString.Copy(deviceNode->iDevice.iManufacturerString);
 aData.iProductString.Copy(deviceNode->iDevice.iProductString);
 }
 aData.iDriveName = 0;
-OstTraceFunctionExit0( TREMOVEUSBMSDEVICENODE_HANDLEERROR_EXIT );
 }
 // End of file

branch	RCL_3
changeset 43	012cc2ee6408
parent 42	f92a4f87e424
child 52	3d9964be03bc