FCL/sf/os/cellularsrv: comparison basebandadaptationplugins/basebandchanneladaptorforc32/c32bca2/src/C32Bca.cpp

equal deleted inserted replaced

-:17af172ffa5f
+:630d2f34d719
-// Copyright (c) 2004-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2004-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".
 /**
 @file
 @internalComponent
 */
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "C32BcaTraces.h"
+#endif
 #include "C32Bca.h"
 #include <cdbcols.h>
 #include <commsdat_partner.h>
 using namespace BasebandChannelAdaptation;
 	CActive(aAoPriority),
 	iUser(aUser),
 	iPort(aPort)
 	{
 	CActiveScheduler::Add(this);
-	__FLOG_OPEN(KC32BcaLogFolder, KC32BcaLogFile); // Connect to the BCA logger
 	}
 /**
 C++ destructor */
 CCommBase::~CCommBase()
 	{
-	__FLOG_CLOSE;
 	}
 /**
 C++ constructor
 The comm-reader has a higher priority than the comm-writer, to
 @param aMask DTE or DCE: determines when the link is considered to be down.
 */
 void CCommLinkMonitor::Setup(TUint32 aMask)
 	{
 	iNotifyChangeSignalMask = aMask;
-	__FLOG_1(_L8("CommLinkMonitor setup: Notify on signal mask [0x%X]"),iNotifyChangeSignalMask);
+	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CCOMMLINKMONITOR_SETUP1_1, "CommLinkMonitor setup: Notify on signal mask [0x%X]",iNotifyChangeSignalMask);
 	}
 /**
 Requests to be notified when the link is down.
 	// get the current state of the line so when we get notification we can tell if it really has changed
 	iSavedSignalState = iPort.Signals(iNotifyChangeSignalMask) & iNotifyChangeSignalMask;
 	iPort.NotifySignalChange(iStatus, iSignals, iNotifyChangeSignalMask);
-	__FLOG_1(_L8("CommLinkMonitor::NotifyLinkDown: initial signals: [0x%X]"), iSavedSignalState);
+	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CCOMMLINKMONITOR_NOTIFYLINKDOWN1_1, "CommLinkMonitor::NotifyLinkDown: initial signals: [0x%X]", iSavedSignalState);
 	SetActive();
 	}
 /**
 Called when EIA-232 signals change,i.e. on potential link failure
 */
 void CCommLinkMonitor::RunL()
 	{
-	__FLOG_2(_L8("CommLinkMonitor::RunL: Signals changed [0x%X]; new signals [0x%X]"), iSignals & (~0x1F), iSignals & 0x1F);
+	OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CCOMMLINKMONITOR_RUNL1_1, "CommLinkMonitor::RunL: Signals changed [0x%X]; new signals [0x%X]", iSignals & (~0x1F), iSignals & 0x1F);
 	// We report link failure if and only if a monitored line went from high to low.
 	// Method: mask the saved signals using inverted monitored bits in the signal bitmask,
 	// to filter out all transitions except for high -> low.
 	// 1 & ~0 = 1;    1 & ~1 = 0; 0 & ~1 = 0; 0 & ~0 = 0
 /**
 Cancels notification request of link failure */
 void CCommLinkMonitor::DoCancel()
 	{
-	__FLOG(_L8("CommLinkMonitor::DoCancel: Cancelling signal change notification."));
+	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CCOMMLINKMONITOR_DOCANCEL1_1, "CommLinkMonitor::DoCancel: Cancelling signal change notification.");
 	iPort.NotifySignalChangeCancel();
 	}
 /**
 * default constructor to create a C32Bca instance.
 */
 CC32Bca::CC32Bca()
 	{
-	__FLOG_OPEN(KC32BcaLogFolder,KC32BcaLogFile);
+	OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CC32BCA_CTOR1_1, "====== CC32Bca::CC32Bca: Shim BCA for C32 [Vesion: major= %d minor= %d] Constructed. ======", KC32BcaMajorVersionNumber, KC32BcaMinorVersionNumber);
-	__FLOG_2(_L8("====== CC32Bca::CC32Bca: Shim BCA for C32 [Vesion: major= %d minor= %d] Constructed. ======"), KC32BcaMajorVersionNumber, KC32BcaMinorVersionNumber);
 	}
 /**
 2nd phase of construction: allocates member objects
 * Destructor
 */
 CC32Bca::~CC32Bca()
 	{
-	__FLOG(_L8("CC32Bca::~CC32Bca: releasing resources..."));
+	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CC32BCA_DTOR1_1, "CC32Bca::~CC32Bca: releasing resources...");
 	CloseCommDbConnection();
 	CloseCommPort(); 	// Cancels reader / writer / monitor
 	// N.B.:
 	// causing C32 to panic.
 	delete iReader;
 	delete iWriter;
 	delete iLinkMonitor; // Note: may have never been created.
-	__FLOG(_L8("CC32Bca::~CC32Bca: CC32Bca destroyed."));
+	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CC32BCA_DTOR1_2, "CC32Bca::~CC32Bca: CC32Bca destroyed.");
-	__FLOG_CLOSE;
 	}
 /** This method deletes the BCA itself.*/
 void CC32Bca::Release()
 	{
-	__FLOG(_L8("CC32Bca::Release"));
+	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CC32BCA_RELEASE1_1, "CC32Bca::Release");
 	delete this;
 	}
 /**
 * Informs that the BCA is required by the client(for instance, Raw IP NIF).Comms Server is
 	aStatus = KRequestPending;
 	// avoid compiler warning.
 	TRequestStatus* ptrStatus = &aStatus;
 	if(iCommPortOpen)
 		{
-		__FLOG(_L8("Warning: C32Bca is already Opened."));
+		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CC32BCA_OPEN1_1, "Warning: C32Bca is already Opened.");
 		User::RequestComplete(ptrStatus,KErrNone);
 		return;
 		}
 		// emty descriptor as a port name. As of December 2004, C32 does not allow that, however, this
 		// may change in the future.
 		// So, we just log a warning.
 		if(KErrNone == commPortErr && iCommPort.Size() == 0)
 			{
-			__FLOG(_L8("Warning: Null string read from CommDB. Will try to open Comm Port anyway."));
+			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CC32BCA_OPEN1_2, "Warning: Null string read from CommDB. Will try to open Comm Port anyway.");
 			}
 		if(KErrNone != commPortErr) // Fatal: we do not have a port name. Can't open RComm.
 			{
-			__FLOG(_L8("Error: Failed to get C32 PortName from CommDB "));
+			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CC32BCA_OPEN1_3, "Error: Failed to get C32 PortName from CommDB ");
 			CloseCommDbConnection();
 			User::RequestComplete(ptrStatus, commPortErr);
 			return;
 			}
 		}
 		_LIT(KDoubleColon, "::");
 		TInt len1 = aChannelId.Find(KDoubleColon);
 		if (len1 < KErrNone)
 			{
-			__FLOG(_L8("** ERROR: No :: (Double Colon) in aChannelId **"));
+			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CC32BCA_OPEN1_4, "** ERROR: No :: (Double Colon) in aChannelId **");
 			User::RequestComplete(ptrStatus, KErrBadName);
 			return;
 			}
 		else
 			{
 		TRAPD(getCsyErr, ReadCsyNameFromCommDbL(iCsyName));
 		if(KErrNone != getCsyErr) // Fatal: we do not have a CSY name. Can't load CSY module.
 			{
 			// We do not use a hardcoded value (e.g. ECUART), because the client code or the environment are
 			// confused - it is better to fail them, rather than mask their problems.
-			__FLOG(_L8("Error: Failed to get CSY name from CommDB "));
+			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CC32BCA_OPEN1_5, "Error: Failed to get CSY name from CommDB ");
 			CloseCommDbConnection();
 			User::RequestComplete(ptrStatus,getCsyErr);
 			return;
 			}
 		}
 	// Open the actual C32 session:
 	TInt ret = iCommServ.Connect();
 	if(ret)
 		{
-		__FLOG_1(_L8("Open: C32 Server connection error %d"), ret);
+		OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CC32BCA_OPEN1_6, "Open: C32 Server connection error %d", ret);
 		User::RequestComplete(ptrStatus,ret);
 		return;
 		}
 	ret = iCommServ.LoadCommModule(iCsyName);
-	__FLOG_2(_L16("Open: CSY module [%S] loaded with error %d"), &iCsyName, ret);
+	OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CC32BCA_OPEN1_7, "Open: CSY module [%S] loaded with error %d", iCsyName, ret);
 	if(ret)
 		{
 		User::RequestComplete(ptrStatus,ret);
 		return;
 	else
 		{
 		ret = iComm.Open(iCommServ, iCommPort, ECommShared, iCommRole);
 		}
-	__FLOG_2(_L16("Open: C32 port [%S] opened with error %d"), &iCommPort, ret);
+	OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CC32BCA_OPEN1_8, "Open: C32 port [%S] opened with error %d", iCommPort, ret);
 	if(ret)
 		{
 		User::RequestComplete(ptrStatus,ret);
 		return;
 	// Don't notify reader / writer / monitor. Read / Write should not be called after this anyway. Let C32 panic.
 	TRequestStatus* request = &aStatus;
 	User::RequestComplete(request, KErrNone);
-	__FLOG_1(_L8("C32Bca::Shutdown: BCA shut down with error %d"), KErrNone);
+	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CC32BCA_SHUTDOWN1_1, "C32Bca::Shutdown: BCA shut down with error %d", KErrNone);
 	}
 /**
 * Closes the BCA immediately. BCA releases its resources.
 * cancels all Writes, Reads and Controls.
 */
 void CC32Bca::Close()
 	{
 	CloseCommPort();
-	__FLOG_1(_L8("C32Bca::Close:Close: BCA closed with error %d"), KErrNone);
+	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CC32BCA_CLOSE1_1, "C32Bca::Close:Close: BCA closed with error %d", KErrNone);
 	}
 /**
 * Queues a Read on C32 serial port.
 Cancels the outstanding Read operation.(best effort operation: the read may have been completed already.)
 */
 void CC32Bca:: CancelRead()
 	{
-	__FLOG(_L8("CancelRead: Read is cancelled by client."));
+	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CC32BCA_CANCELREAD_1, "CancelRead: Read is cancelled by client.");
 	iReader->Cancel();
 	if(iReadRequest != NULL)
 		{
 		User::RequestComplete(iReadRequest, KErrCancel);
 Cancels all Write operations.(best effort attempt: the write may have been completed already.)
 */
 void CC32Bca::CancelWrite()
 {
-__FLOG(_L8("CancelWrite: Write is cancelled by client."));
+OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CC32BCA_CANCELWRITE1_1, "CancelWrite: Write is cancelled by client.");
 iWriter->Cancel();
 if(iWriteRequest != NULL)
 	{
 	}
 }
 // Debug dumps:
-#ifdef __FLOG_ACTIVE
+#ifdef OST_TRACE_COMPILER_IN_USE
 _LIT8(KLitOptLevelGeneric,    "KBcaOptLevelGeneric");
 _LIT8(KLitOptLevelExtSerial,   "KBcaOptLevelExtSerial");
 _LIT8(KLitOptLevelUnsupported, "**Unsupported**");
 			return KLitSerialSetControlLines;
 		default:
 			return KLitOptNameUnsupported;
 		}
 	}
-#endif // __FLOG_ACTIVE
+#endif // OST_TRACE_CATEGORY & OST_TRACE_CATEGORY_DEBUG
-#ifdef __FLOG_ACTIVE
-/**
-Print debug output of the TCommComfig parameters.
-@param The configuration whose parameters should be logged.
-*/
-void CC32Bca::LogCommConfig(TCommConfig& c)
-	{
-	__FLOG_5(_L8("Rate[%d] DataBits[%d] StopBits[%d] Parity[%d] Handshake[0x%x]"), c().iRate, c().iDataBits, c().iStopBits, c().iParity, c().iHandshake);
-	__FLOG_4(_L8("ParityError[%d] Fifo[%d] SpecialRate[%d] terminatorCount[%d]"), c().iParityError, c().iFifo, c().iSpecialRate, c().iTerminatorCount);
-	__FLOG_1(_L8("Terminator[0x%x]"), c().iTerminator);
-	}
-#endif // __FLOG_ACTIVE
 /**
 * Ioctl: asynchronously controls the C32Bca.
 * @param aOpt an optional parameter,holds the option value on return or the option value to be set.
 */
 void CC32Bca::Ioctl(TRequestStatus& aStatus, TUint aOptLevel, TUint aOptName, TDes8& aOpt)
 	{
-	__FLOG_4(_L8("Ioctl: Level[%S](0x%X) Name[%S](0x%X)."), &IoctlOptLevelStr(aOptLevel), aOptLevel, &IoctlOptNameStr(aOptName), aOptName);
+	OstTraceDefExt4(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CC32BCA_IOCTL1_1, "Ioctl: Level[%s](0x%X) Name[%s](0x%X).", IoctlOptLevelStr(aOptLevel), aOptLevel, IoctlOptNameStr(aOptName), aOptName);
 	aStatus = KRequestPending;
 	TInt ret(KErrNone); // If operation fails, this will be set to the failure code explicitly.
 			case KBCASetIapId:
 				{
 				TUint32 tempIapId = *(reinterpret_cast<const TUint32*>(aOpt.Ptr()));
-				__FLOG_1(_L8("Ioctl: IAP ID [%d] specified."),tempIapId);
+				OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CC32BCA_IOCTL1_2, "Ioctl: IAP ID [%d] specified.",tempIapId);
 				if(tempIapId < 1 )
 					{
 					ret = KErrArgument;
 					}
 			break;
 			}
 		case KSerialConfig:
 			{
-			__FLOG(_L8("Ioctl: KSerialConfig"));
+			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CC32BCA_IOCTL1_3, "Ioctl: KSerialConfig");
 			TCommConfig cfg;
 			iComm.Config(cfg);
-#ifdef __FLOG_ACTIVE
+		    OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CC32BCA_IOCTL1_4, "Rate[%d] DataBits[%d] StopBits[%d]", cfg().iRate, cfg().iDataBits, cfg().iStopBits);
-			LogCommConfig(cfg);
+		    OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CC32BCA_IOCTL1_5, "Parity[%d] Handshake[0x%x]", cfg().iParity, cfg().iHandshake);
-#endif // __FLOG_ACTIVE
+		    OstTraceDefExt4(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CC32BCA_IOCTL1_6, "ParityError[%d] Fifo[%d] SpecialRate[%d] terminatorCount[%d]", cfg().iParityError, cfg().iFifo, cfg().iSpecialRate, cfg().iTerminatorCount);
+		    OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CC32BCA_IOCTL1_7, "Terminator[0x%x]", cfg().iTerminator);
 			TPckgBuf<TCommConfig> cfgBuf(cfg);
 			aOpt.Copy(cfgBuf);
 			break;
 			}
 		case KSerialSetConfig:
 			{
-			__FLOG(_L8("Ioctl: KSerialSetConfig"));
+			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CC32BCA_IOCTL1_8, "Ioctl: KSerialSetConfig");
 			TCommConfig cfg(*(reinterpret_cast<const TCommConfig*>(aOpt.Ptr())));
-#ifdef __FLOG_ACTIVE
+OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CC32BCA_IOCTL1_9, "Rate[%d] DataBits[%d] StopBits[%d]", cfg().iRate, cfg().iDataBits, cfg().iStopBits);
-			LogCommConfig(cfg);
+OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CC32BCA_IOCTL1_10, "Parity[%d] Handshake[0x%x]", cfg().iParity, cfg().iHandshake);
-#endif // __FLOG_ACTIVE
+OstTraceDefExt4(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CC32BCA_IOCTL1_11, "ParityError[%d] Fifo[%d] SpecialRate[%d] terminatorCount[%d]", cfg().iParityError, cfg().iFifo, cfg().iSpecialRate, cfg().iTerminatorCount);
+	        OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CC32BCA_IOCTL1_12, "Terminator[0x%x]", cfg().iTerminator);
 			ret = iComm.SetConfig(cfg);
 			break;
 			}
 				{
 				iCsyName.Copy(*(
 			   				reinterpret_cast<const TName*>(aOpt.Ptr())
 			   				));
 				iCsyNameOverride = ETrue;
-				__FLOG_1(_L8("Ioctl: CSY Name set to [%S]"), &iCsyName);
+				OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CC32BCA_IOCTL1_13, "Ioctl: CSY Name set to [%S]", iCsyName);
 				}
 			else
 				{
-				__FLOG(_L8("Ioctl: Warning: Cannot set the CSY name because the Comm Port is already open."));
+				OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CC32BCA_IOCTL1_14, "Ioctl: Warning: Cannot set the CSY name because the Comm Port is already open.");
 				ret = KErrAlreadyExists;
 				}
 			break;
 			}
 			{
 			if(!iCommPortOpen)
 				{
 				iCommRole = *(reinterpret_cast<const TCommRole*>(aOpt.Ptr()));
 				iCommRoleOverride = ETrue;
-				__FLOG_1(_L8("Ioctl: Comm Role set to [%d]"), iCommRole);
+				OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CC32BCA_IOCTL1_15, "Ioctl: Comm Role set to [%d]", iCommRole);
 				}
 			else
 				{
-				__FLOG(_L8("Ioctl: Warning: Cannot set Comm Role because the Comm Port is already open."));
+				OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CC32BCA_IOCTL1_16, "Ioctl: Warning: Cannot set Comm Role because the Comm Port is already open.");
 				ret = KErrAlreadyExists;
 				}
 			break;
 			}
 		case KSerialSetTxRxBufferSize:
 			{
 			TInt bufSize = *(reinterpret_cast<const TInt*>(aOpt.Ptr()));
-			__FLOG_1(_L8("Ioctl: Setting Rx Tx buffer size to [%d]"), bufSize);
+			OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CC32BCA_IOCTL1_17, "Ioctl: Setting Rx Tx buffer size to [%d]", bufSize);
 			iComm.SetReceiveBufferLength(bufSize);
 			break;
 			}
 				ret = KErrArgument;
 				}
 			else
 				{
 				const TSerialSetControlLines& lines = *(reinterpret_cast<const TSerialSetControlLines*>(aOpt.Ptr()));
-				__FLOG_2(_L8("Ioctl: Setting/clearing control lines %x/%x"), lines.iSetMask, lines.iClearMask);
+				OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CC32BCA_IOCTL1_18, "Ioctl: Setting/clearing control lines %x/%x", lines.iSetMask, lines.iClearMask);
 				iComm.SetSignals(lines.iSetMask, lines.iClearMask);
 				ret = KErrNone;
 				}
 			break;
 			}
 		{
 		ret = KErrNotSupported;
 		}
-	__FLOG_1(_L8("Ioctl completed with error %d"), ret);
+	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CC32BCA_IOCTL1_19, "Ioctl completed with error %d", ret);
 	TRequestStatus* ptrStatus = &aStatus;
 	User::RequestComplete(ptrStatus, ret);
 	}
 @leave if the monitoring object cannot be constructed, typically due to OOM.
 */
 void CC32Bca::MonitorControlLinesL(TUint32 aArgMask)
 	{
-	__FLOG_1(_L8("Ioctl: argument bitmask = [0x%X] "), aArgMask);
+	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CC32BCA_MONITORCONTROLLINESL1_1, "Ioctl: argument bitmask = [0x%X] ", aArgMask);
 	if(iLinkMonitor) // We may have never started...
 			{
 			// We are called to either stop or change the monitoring options.
 			iLinkMonitor->Cancel(); // If we are not monitoring, this has no effect.
 			}
 	if(KMonitorOff == aArgMask) // Stop monitoring:
 		{
-		__FLOG(_L8("MonitorControlLinesL: Stopping Control Lines monitoring."));
+		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CC32BCA_MONITORCONTROLLINESL1_2, "MonitorControlLinesL: Stopping Control Lines monitoring.");
 		// We either never started, or we just cancelled above.
 		}
 	else // Start Monitoring, or change the monitored lines.
 		{
-		__FLOG(_L8("MonitorControlLinesL: Starting to monitor Control Lines."));
+		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CC32BCA_MONITORCONTROLLINESL1_3, "MonitorControlLinesL: Starting to monitor Control Lines.");
 		if(!iLinkMonitor) // We are starting to monitor for the first time
 			{
 			iLinkMonitor = new (ELeave)CCommLinkMonitor(*this, iComm);
 			}
 			}
 		iLinkMonitor->Setup(lineMask);
 		iLinkMonitor->NotifyLinkDown();
-		__FLOG(_L8("MonitorControlLinesL: Control Lines monitoring started."));
+		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CC32BCA_MONITORCONTROLLINESL1_4, "MonitorControlLinesL: Control Lines monitoring started.");
 		}
 	}
 /**
 Closes the connection to CommDB, if it is open */
 Read Comm Port from CommDB bearer record
 @param aPortName
 @leave if the value could not be read */
 void CC32Bca::ReadCommPortFromCommDbL(TDes& aPortName)
 	{
-	__FLOG(_L8("CC32Bca::ReadCommPortFromCommDbL()"));
+	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CC32BCA_READCOMMPORTFROMCOMMDBL1_1, "CC32Bca::ReadCommPortFromCommDbL()");
 	ConnectToCommDbBearerRecordL();
 	TInt ret(0);
 	CMDBField<TDesC>* portField = new(ELeave) CMDBField<TDesC>(KCDTIdPortName);
 	CleanupStack::PushL(portField);
 	portField->SetMaxLengthL(KMaxTextLength);
 	TRAP(ret,portField->LoadL(*iCommsDat));
 	if(ret!=KErrNone)
 		{
-		__FLOG_1(_L8("portField->LoadL(*iCommsDat) left with[%d] "), ret);
+		OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CC32BCA_READCOMMPORTFROMCOMMDBL1_2, "portField->LoadL(*iCommsDat) left with[%d] ", ret);
 		User::Leave(ret);
 		}
 	aPortName = *portField;
 	CleanupStack::PopAndDestroy(portField);
 Read the CSY name from CommDB bearer record.
 @param aCsyName the CSY name
 @leave if the value could not be read */
 void CC32Bca::ReadCsyNameFromCommDbL(TDes& aCsyName)
 	{
-	__FLOG(_L8("CC32Bca::ReadCsyNameFromCommDbL()"));
+	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CC32BCA_READCSYNAMEFROMCOMMDBL1_1, "CC32Bca::ReadCsyNameFromCommDbL()");
 	ConnectToCommDbBearerRecordL();
 	TInt ret(0);
 	CMDBField<TDesC>* csyField = new(ELeave) CMDBField<TDesC>(KCDTIdCsyName);
 	CleanupStack::PushL(csyField);
 	csyField->SetMaxLengthL(KMaxTextLength);
 	TRAP(ret,csyField->LoadL(*iCommsDat));
 	if(ret!=KErrNone)
 		{
-		__FLOG_1(_L8("csyField->LoadL(*iCommsDat) left with[%d] "), ret);
+		OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CC32BCA_READCSYNAMEFROMCOMMDBL1_2, "csyField->LoadL(*iCommsDat) left with[%d] ", ret);
 		User::Leave(ret);
 		}
 	aCsyName = *csyField;
 	CleanupStack::PopAndDestroy(csyField);
 @param aCommRole the specified role.
 @leave if the value could not be read */
 void CC32Bca::ReadCommRoleFromCommDbL(TCommRole& aCommRole)
 	{
-	__FLOG(_L8("CC32Bca::ReadCommRoleFromCommDbL()"));
+	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CC32BCA_READCOMMROLEFROMCOMMDBL1_1, "CC32Bca::ReadCommRoleFromCommDbL()");
 	ConnectToCommDbBearerRecordL();
 	TUint32 role(0);
 	TInt ret(0);
 	CMDBField<TUint32>* roleField = new(ELeave) CMDBField<TUint32>(KCDTIdCommRole);
 	roleField->SetRecordId(iModemId);
 	TRAP(ret,roleField->LoadL(*iCommsDat));
 	if(ret!=KErrNone)
 		{
-		__FLOG_1(_L8("roleField->LoadL(*iCommsDat) left with[%d] "), ret);
+		OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CC32BCA_READCOMMROLEFROMCOMMDBL1_2, "roleField->LoadL(*iCommsDat) left with[%d] ", ret);
 		User::Leave(ret);
 		}
 	role = *roleField;
 	CleanupStack::PopAndDestroy(roleField);
 @leave KErrNotReady, if the provisioned IAP id is invalid. System-wide error code
 if the connection cannot be opened for some other reason.
 */
 void CC32Bca::ConnectToCommDbBearerRecordL()
 	{
-	__FLOG(_L8("CC32Bca::ConnectToCommDbBearerRecordL()"));
+	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CC32BCA_CONNECTTOCOMMDBBEARERRECORDL1_1, "CC32Bca::ConnectToCommDbBearerRecordL()");
 	if(iCommsDat != NULL) // CommDB is already open, we don't need to do anything
 		{
 		return;
 		}
 	if(iIapId < 1) // Can't access CommDB if IAP ID is unknown
 		{
-		__FLOG_1(_L8("iIapId[%d] is unknown"), iIapId);
+		OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CC32BCA_CONNECTTOCOMMDBBEARERRECORDL1_2, "iIapId[%d] is unknown", iIapId);
 		User::Leave(KErrNotReady);
 		}
 	//
 	// Open connecton to CommDB Bearer record specified by the IAP.
 		}
 	TRAPD(ret,iapRecord->LoadL(*iCommsDat));
 	if (ret != KErrNone)
 		{
-		__FLOG_1(_L8("iapRecord->LoadL(*iCommsDat) left with[%d] "), ret);
+		OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CC32BCA_CONNECTTOCOMMDBBEARERRECORDL1_3, "iapRecord->LoadL(*iCommsDat) left with[%d] ", ret);
 		User::Leave(ret);
 		}
 // If we enabled viewing hidden records now disable viewing them.
 if(!hiddenAttributeMaskValue)
 	iModemId = iapRecord->iBearer;
 	CleanupStack::PopAndDestroy(iapRecord);
 	if(iModemId == 0) // ID not found.
 		{
-		__FLOG_1(_L8("iModemId[%d] is not found"), iModemId);
+		OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CC32BCA_CONNECTTOCOMMDBBEARERRECORDL1_4, "iModemId[%d] is not found", iModemId);
 		User::Leave(KErrNotFound);
 		}
 	}
 /** Cancels an outstanding Ioctl, if any. */
 void CC32Bca::CancelIoctl()
 	{
-	__FLOG(_L8("CancelIoctl(): Ioctl cancel request. No Ioctl to cancel."));
+	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CC32BCA_CANCELIOCTL1_1, "CancelIoctl(): Ioctl cancel request. No Ioctl to cancel.");
 	}
 /** Closes the Comm port and Comm Server.*/
 void CC32Bca::CloseCommPort()
 		{
 		iComm.Close();
 		iCommServ.Close();
 		iCommPortOpen = EFalse;
 		}
-	__FLOG(_L8("CloseCommPort(): Session with C32 & RComm closed."));
+	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CC32BCA_CLOSECOMMPORT1_1, "CloseCommPort(): Session with C32 & RComm closed.");
 	}
 /**
 C32Bca Panic function
 @internalComponent
 */
 void C32Bca::Panic(TC32BcaPanic aPanic)
 	{
-	__FLOG_STATIC2(KC32BcaLogFolder,KC32BcaLogFile,_L8("%S Panic %d"), &KC32BcaPanic(), aPanic);
+OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CC32BCA_PANIC1_1, "%S Panic %d", KC32BcaPanic(), aPanic);
 	User::Panic(KC32BcaPanic, aPanic);
 	}
 // MC32User implementation:
 	}
 // Upcall from the link monitor: Link has gone down.
 void CC32Bca::CommLinkDown(TInt aErr)
 	{
-	__FLOG_1(_L8("CommLinkDown: Warning: serial link has gone down with error[%d]. Erroring the outstanding Read & Write."), aErr);
+	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CC32BCA_COMMLINKDOWN1_1, "CommLinkDown: Warning: serial link has gone down with error[%d]. Erroring the outstanding Read & Write.", aErr);
 	__ASSERT_DEBUG(KErrNone != aErr, Panic(EGeneralLogicError)); // If KErrNone, use has no way to know that the read has failed.
 	if(iReader->IsActive())
 		{
 		CommReadComplete(aErr);

branch	RCL_3
changeset 65	630d2f34d719
parent 0	3553901f7fa8
child 66	07a122eea281