FCL/sf/os/cellularsrv: comparison telephonyserverplugins/simtsy/src/CSimPhoneSmartCardApp.cpp

equal deleted inserted replaced

-:17af172ffa5f
+:630d2f34d719
-// Copyright (c) 2002-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2002-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
 */
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "CSimPhoneSmartCardAppTraces.h"
+#endif
 #include <testconfigfileparser.h>
 #include <etelmmerr.h>
 #include "CSimPhone.h"
-#include "Simlog.h"
 //
 // CSimPhoneSmartCardApp
 //
 * Constructs all the member data and retrieves all the data from the config file specific to this class.
 *
 * @leave Leaves due to not enough memory or if any data member does not construct for any reason.
 */
 	{
-	LOGPHONE1("Starting to parse Phone Smart Card applications additional config parameters...");
+	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONESMARTCARDAPP_CONSTRUCTL_1, "Starting to parse Phone Smart Card applications additional config parameters...");
 	ParseSmartCardApplicationInfoL();
 	ParseSmartCardFileInfoL();
 	MapUSimAppsL();
-	LOGPHONE1("Finished parsing Phone Smart Card applications additional config parameters...");
+	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONESMARTCARDAPP_CONSTRUCTL_2, "Finished parsing Phone Smart Card applications additional config parameters...");
 	}
 CSimPhoneSmartCardApp::~CSimPhoneSmartCardApp()
 /**
 	case EMobilePhoneNotifyUSimApplicationsInfoChange:
 	case EMobilePhoneNotifySmartCardApplicationInfoChange:
 		numberOfSlots = KDefaultNumberOfSlots;
 		break;
 	default:
-		LOGPHONE1("CSimPhoneSmartCardApp: Number of Slots error, unknown IPC");
+		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONESMARTCARDAPP_NUMBEROFSLOTSL_1, "CSimPhoneSmartCardApp: Number of Slots error, unknown IPC");
 		User::Leave(KErrNotSupported);
 		break;
 		}
 	return numberOfSlots;
 	}
 * Returns a pointer to the config file section
 *
 * @return CTestConfigSection a pointer to the configuration file data section
 */
 	{
-	LOGPHONE1(">>CSimPhoneSmartCardApp::CfgFile");
+	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONESMARTCARDAPP_CFGFILE_1, ">>CSimPhoneSmartCardApp::CfgFile");
 	return iPhone->CfgFile();
 	}
 void CSimPhoneSmartCardApp::TimerCallBack(TInt /*aId*/)
 /**
 		}
 	//check that the client has specified a valid start offset
 	else if(aFilePathOffsets.iStartOffset < 1 || aFilePathOffsets.iStartOffset > iNumberRecords)
 		{
-		LOGPHONE1("ERROR: File start offset information invalid.");
+		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONESMARTCARDAPP_TCYCLICSMARTCARDFILE_READFILE_1, "ERROR: File start offset information invalid.");
 		return KErrMMEtelScRecordNotFound;
 		}
 	else
 		{
 		}
 	//check that the client has specified a valid start offset
 	else if(aFilePathOffsets.iStartOffset < 1 || aFilePathOffsets.iStartOffset > iNumberRecords)
 		{
-		LOGPHONE1("ERROR: File start offset information invalid.");
+		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONESMARTCARDAPP_TLINEARSMARTCARDFILE_READFILE_1, "ERROR: File start offset information invalid.");
 		return KErrMMEtelScRecordNotFound;
 		}
 	else
 		{
 		TInt filePointer = (aFilePathOffsets.iStartOffset - 1) * iRecordLength;
 		}
 	//check that the client has specified a valid start offset
 	else if(aFilePathOffsets.iStartOffset < 1 || aFilePathOffsets.iStartOffset > iNumberRecords)
 		{
-		LOGPHONE1("ERROR: File start offset information invalid.");
+		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONESMARTCARDAPP_TLINEARSMARTCARDFILE_UPDATEFILE_1, "ERROR: File start offset information invalid.");
 		return KErrMMEtelScRecordNotFound;
 		}
 	else
 		{
 		TInt filePointer = (aFilePathOffsets.iStartOffset - 1) * iRecordLength;
 		}
 	//check that the client has specified a valid start offset
 	else if(aFilePathOffsets.iStartOffset >= (TUint)iTotalLength)
 		{
-		LOGPHONE1("ERROR: File start offset information invalid.");
+		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONESMARTCARDAPP_TTRANSPARENTSMARTCARDFILE_READFILE_1, "ERROR: File start offset information invalid.");
 		return KErrMMEtelScReferencedDataNotFound;
 		}
 	//check the client is not requesting to read too many bytes, resulting in reading
 	//off the end of the file
 	else if((bytesToRead + filePointer) > iTotalLength)
 		{
-		LOGPHONE1("ERROR: Path offset information results in reading off the end of the file");
+		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONESMARTCARDAPP_TTRANSPARENTSMARTCARDFILE_READFILE_2, "ERROR: Path offset information results in reading off the end of the file");
 		return KErrMMEtelScEofReached;
 		}
 	else
 		{
 		aReadBuffer->SetLength(bytesToRead);
 		}
 	//check that the client has specified a valid start offset
 	else if(aFilePathOffsets.iStartOffset >= (TUint)iTotalLength)
 		{
-		LOGPHONE1("ERROR: File start offset information invalid.");
+		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONESMARTCARDAPP_TTRANSPARENTSMARTCARDFILE_UPDATEFILE_1, "ERROR: File start offset information invalid.");
 		return KErrMMEtelScReferencedDataNotFound;
 		}
 	//check the client is not requesting to write too many bytes, resulting in writing
 	//off the end of the file
 	else if((bytesToWrite + filePointer) > iTotalLength)
 		{
-		LOGPHONE1("ERROR: Path offset information results in reading off the end of the file");
+		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONESMARTCARDAPP_TTRANSPARENTSMARTCARDFILE_UPDATEFILE_2, "ERROR: Path offset information results in reading off the end of the file");
 		return KErrMMEtelScEofReached;
 		}
 	else
 		{
 		for(index = 0; index < bytesToWrite; index++)
 * @param aFilePathId Used to specify path of the file for which information should be retrieved
 * @param aInfo Used to return the retrieved file information
 */
 	{
-	LOGPHONE1("CSimPhoneSmartCardApp::GetScFileInfo called");
+	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONESMARTCARDAPP_GETSCFILEINFO_1, "CSimPhoneSmartCardApp::GetScFileInfo called");
 	RMobilePhone::TScFileInfoV5Pckg *scFileInfoPckg = reinterpret_cast<RMobilePhone::TScFileInfoV5Pckg*>(aInfo);
 	RMobilePhone::TScFileInfoV5 &scFileInfo = (*scFileInfoPckg)();
 	// Check that the data structure is supported by the simulated TSY version
 /**
 * Attempts to cancel a pending GetScFileInfo request (unsuccessfully)
 *
 */
 	{
-	LOGPHONE1("CSimPhoneSmartCardApp::GetScFileInfoCancel called");
+	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONESMARTCARDAPP_GETSCFILEINFOCANCEL_1, "CSimPhoneSmartCardApp::GetScFileInfoCancel called");
 	iPhone->ReqCompleted(aTsyReqHandle, KErrNone);
 	return KErrNone;
 	}
 /**
 * Attempts to cancel a pending ReadScFileInfo request (unsuccessfully)
 *
 */
 	{
-	LOGPHONE1("CSimPhoneSmartCardApp::ReadScFileInfoCancel called");
+	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONESMARTCARDAPP_READSCFILECANCEL_1, "CSimPhoneSmartCardApp::ReadScFileInfoCancel called");
 	iPhone->ReqCompleted(aTsyReqHandle, KErrNone);
 	return KErrNone;
 	}
 /**
 * Attempts to cancel a pending UpdateScFileInfo request (unsuccessfully)
 *
 */
 	{
-	LOGPHONE1("CSimPhoneSmartCardApp::UpdateScFileInfoCancel called");
+	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONESMARTCARDAPP_UPDATESCFILECANCEL_1, "CSimPhoneSmartCardApp::UpdateScFileInfoCancel called");
 	iPhone->ReqCompleted(aTsyReqHandle, KErrNone);
 	return KErrNone;
 	}
 	TSmartCardApplication appInfo;
 	TRAP_IGNORE(iTimer=CSimTimer::NewL(iPhone));
-	LOGPHONE1("Starting to Parse MaxActiveSmartCardApp Info");
+	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONESMARTCARDAPP_PARSESMARTCARDAPPLICATIONINFOL_1, "Starting to Parse MaxActiveSmartCardApp Info");
 	iMaxActiveSmartCardApps = CfgFile()->ItemValue(KMaxActiveSmartCardApps ,KDefaultMaxActiveSmartCardApps);
-	LOGPHONE1("Starting to Parse ActiveUSIMApp Info");
+	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONESMARTCARDAPP_PARSESMARTCARDAPPLICATIONINFOL_2, "Starting to Parse ActiveUSIMApp Info");
 	activeUSimApp.Set(CfgFile()->ItemValue(KActiveUSIMApp, KEmptyString));
 	if(activeUSimApp.Length() == 0)
 		{
-		LOGPHONE1("ERROR IN CONFIGURATION FILE PARSING: ACTIVE USIM APP NOT SPECIFIED!");
+		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONESMARTCARDAPP_PARSESMARTCARDAPPLICATIONINFOL_3, "ERROR IN CONFIGURATION FILE PARSING: ACTIVE USIM APP NOT SPECIFIED!");
 		}
 	TInt count = CfgFile()->ItemCount(KSmartCardAppInfo);
 	iSmartCardAppList=new(ELeave) CArrayFixFlat<TSmartCardApplication>(count+1);
-	LOGPHONE1("Starting to Load and Parse Smart Card Application Info");
+	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONESMARTCARDAPP_PARSESMARTCARDAPPLICATIONINFOL_4, "Starting to Load and Parse Smart Card Application Info");
 	for(index=0;index<count;index++)
 		{
 		item=CfgFile()->Item(KSmartCardAppInfo,index);
 		if(!item)
 			{
 			}
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,0,aid);
 		if(ret!=KErrNone)
 			{
-			LOGPHONE1("ERROR IN CONFIGURATION FILE PARSING: BAD SMARTCARD APP INFO TAG");
+			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONESMARTCARDAPP_PARSESMARTCARDAPPLICATIONINFOL_5, "ERROR IN CONFIGURATION FILE PARSING: BAD SMARTCARD APP INFO TAG");
 			continue;
 			}
 		else
 			{
 			appInfo.iAID.Copy(aid);
 			}
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,1,label);
 		if(ret!=KErrNone)
 			{
-			LOGPHONE1("ERROR IN CONFIGURATION FILE PARSING: BAD SMARTCARD APP INFO TAG");
+			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONESMARTCARDAPP_PARSESMARTCARDAPPLICATIONINFOL_6, "ERROR IN CONFIGURATION FILE PARSING: BAD SMARTCARD APP INFO TAG");
 			continue;
 			}
 		else
 			{
 			appInfo.iLabel.Copy(label);
 			}
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,2,type);
 		if(ret!=KErrNone)
 			{
-			LOGPHONE1("ERROR IN CONFIGURATION FILE PARSING: BAD SMARTCARD APP INFO TAG");
+			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONESMARTCARDAPP_PARSESMARTCARDAPPLICATIONINFOL_7, "ERROR IN CONFIGURATION FILE PARSING: BAD SMARTCARD APP INFO TAG");
 			continue;
 			}
 		else
 			{
 			appInfo.iAppType = (TSmartCardAppType)type;
 			}
 		ret = CTestConfig::GetElement(item->Value(), KStdDelimiter, 3, eap);
 		if (ret != KErrNone)
 			{
-			LOGPHONE2("CONFIGURATION FILE PARSING: BAD OR NO (OPTIONAL) EAP LIST @ SMARTCARD APP INFO TAG [%d]", index);
+			OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONESMARTCARDAPP_PARSESMARTCARDAPPLICATIONINFOL_8, "CONFIGURATION FILE PARSING: BAD OR NO (OPTIONAL) EAP LIST @ SMARTCARD APP INFO TAG [%d]", index);
 			_LIT8(emptyEapList, "");
 			eap.Set(emptyEapList);
 			}
 		// Append empty string if no info is given
 		appInfo.iEapList.Copy(eap);
 		iFoundScAppTags = ETrue;
 		}//end of FOR loop
 	if(iActiveUSimApp.Length() == 0)
 		{
-		LOGPHONE1("ERROR IN CONFIGURATION FILE PARSING: AID FOR ACTIVE USIM APP NOT FOUND!");
+		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONESMARTCARDAPP_PARSESMARTCARDAPPLICATIONINFOL_9, "ERROR IN CONFIGURATION FILE PARSING: AID FOR ACTIVE USIM APP NOT FOUND!");
 		}
 	count=CfgFile()->ItemCount(KSmartCardAppEvent);
 	iSmartCardAppEventList=new(ELeave) CArrayFixFlat<TSmartCardAppEvent>(count+1);
 	TSmartCardAppEvent appEvent;
 	TInt duration, action;
-	LOGPHONE1("Starting to Load and Parse Smart Card Application Event Info");
+	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONESMARTCARDAPP_PARSESMARTCARDAPPLICATIONINFOL_10, "Starting to Load and Parse Smart Card Application Event Info");
 	for(index=0;index<count;index++)
 		{
 		item=CfgFile()->Item(KSmartCardAppEvent,index);
 		if(!item)
 			}
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,0, duration);
 		if(ret!=KErrNone)
 			{
-			LOGPHONE1("ERROR IN CONFIGURATION FILE PARSING: BAD SMART CARD APP EVENT TAG");
+			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONESMARTCARDAPP_PARSESMARTCARDAPPLICATIONINFOL_11, "ERROR IN CONFIGURATION FILE PARSING: BAD SMART CARD APP EVENT TAG");
 			continue;
 			}
 		else
 			{
 			appEvent.iDuration=duration;
 			}
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,1, aid);
 		if(ret!=KErrNone)
 			{
-			LOGPHONE1("ERROR IN CONFIGURATION FILE PARSING; BAD SMART CARD APP EVENT TAG");
+			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONESMARTCARDAPP_PARSESMARTCARDAPPLICATIONINFOL_12, "ERROR IN CONFIGURATION FILE PARSING; BAD SMART CARD APP EVENT TAG");
 			continue;
 			}
 		else
 			{
 			appEvent.iAID.Copy(aid);
 			}
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,2, action);
 		if(ret!=KErrNone)
 			{
-			LOGPHONE1("ERROR IN CONFIGURATION FILE PARSING; BAD SMART CARD APP EVENT TAG");
+			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONESMARTCARDAPP_PARSESMARTCARDAPPLICATIONINFOL_13, "ERROR IN CONFIGURATION FILE PARSING; BAD SMART CARD APP EVENT TAG");
 			continue;
 			}
 		else
 			{
 			appEvent.iAction = (RMobilePhone::TSmartCardApplicationAction)action;
 	TInt ret=KErrNone;
 	TPtrC8 fileId, filePath, fileData;
 	TInt aidIndex, fileType, fileLength, recordLength, numRecords, index;
 	TSmartCardFile* file = NULL;
-	LOGPHONE1("Starting to Parse Smart Card File Info");
+	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONESMARTCARDAPP_PARSESMARTCARDFILEINFOL_1, "Starting to Parse Smart Card File Info");
 	TInt count = CfgFile()->ItemCount(KSmartCardFile);
 	iSmartCardFileList = new(ELeave) CArrayPtrFlat<TSmartCardFile>(count+1);
 	for(index=0;index<count;index++)
 		{
 		//Get the file's type information
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,0,fileType);
 		if(ret!=KErrNone)
 			{
-			LOGPHONE1("ERROR IN CONFIGURATION FILE PARSING: BAD SMARTCARD FILE TAG");
+			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONESMARTCARDAPP_PARSESMARTCARDFILEINFOL_2, "ERROR IN CONFIGURATION FILE PARSING: BAD SMARTCARD FILE TAG");
 			continue;
 			}
 		else
 			{
 			switch ((RMobilePhone::TScFileType)fileType)
 				break;
 			case RMobilePhone::ETransparent:
 				file = new(ELeave) TTransparentSmartCardFile;
 				break;
 			default:
-				LOGPHONE1("ERROR IN CONFIGURATION FILE PARSING:");
+				OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONESMARTCARDAPP_PARSESMARTCARDFILEINFOL_3, "ERROR IN CONFIGURATION FILE PARSING:");
-				LOGPHONE1("ENCOUNTERED UNKNOWN SMART CARD FILE TYPE.");
+				OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONESMARTCARDAPP_PARSESMARTCARDFILEINFOL_4, "ENCOUNTERED UNKNOWN SMART CARD FILE TYPE.");
 				continue;
 				}
 			file->iType = (RMobilePhone::TScFileType)fileType;
 			}
 		//Get the FID of the file
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,1,fileId);
 		if(ret!=KErrNone)
 			{
-			LOGPHONE1("ERROR IN CONFIGURATION FILE PARSING: BAD SMARTCARD FILE TAG");
+			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONESMARTCARDAPP_PARSESMARTCARDFILEINFOL_5, "ERROR IN CONFIGURATION FILE PARSING: BAD SMARTCARD FILE TAG");
 			delete file;
 			continue;
 			}
 		//check that the FID is precisely 4 bytes long
 		else if(fileId.Length() != KMaxHexFIDLen)
 			{
-			LOGPHONE1("ERROR IN CONFIGURATION FILE PARSING: BAD SMARTCARD FILE FID");
+			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONESMARTCARDAPP_PARSESMARTCARDFILEINFOL_6, "ERROR IN CONFIGURATION FILE PARSING: BAD SMARTCARD FILE FID");
 			delete file;
 			continue;
 			}
 		else
 			{
 		//Get the Index of the AID of the application the file belongs to
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,2,aidIndex);
 		if(ret!=KErrNone)
 			{
-			LOGPHONE1("ERROR IN CONFIGURATION FILE PARSING: BAD SMARTCARD FILE TAG");
+			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONESMARTCARDAPP_PARSESMARTCARDFILEINFOL_7, "ERROR IN CONFIGURATION FILE PARSING: BAD SMARTCARD FILE TAG");
 			delete file;
 			continue;
 			}
 		else
 			{
 		//Get the file's path information
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,3,filePath);
 		if(ret!=KErrNone)
 			{
-			LOGPHONE1("ERROR IN CONFIGURATION FILE PARSING: BAD SMARTCARD FILE TAG");
+			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONESMARTCARDAPP_PARSESMARTCARDFILEINFOL_8, "ERROR IN CONFIGURATION FILE PARSING: BAD SMARTCARD FILE TAG");
 			delete file;
 			continue;
 			}
 		else
 			{
 		//Get the information about the total length of the file
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,4,fileLength);
 		if(ret!=KErrNone)
 			{
-			LOGPHONE1("ERROR IN CONFIGURATION FILE PARSING: BAD SMARTCARD FILE TAG");
+			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONESMARTCARDAPP_PARSESMARTCARDFILEINFOL_9, "ERROR IN CONFIGURATION FILE PARSING: BAD SMARTCARD FILE TAG");
 			delete file;
 			continue;
 			}
 		else
 			{
 		//Get information about the length of each record in the file
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,5,recordLength);
 		if(ret!=KErrNone)
 			{
-			LOGPHONE1("ERROR IN CONFIGURATION FILE PARSING: BAD SMARTCARD FILE TAG");
+			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONESMARTCARDAPP_PARSESMARTCARDFILEINFOL_10, "ERROR IN CONFIGURATION FILE PARSING: BAD SMARTCARD FILE TAG");
 			delete file;
 			continue;
 			}
 		else
 			{
 		//Get information about the number of records in the file
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,6,numRecords);
 		if(ret!=KErrNone)
 			{
-			LOGPHONE1("ERROR IN CONFIGURATION FILE PARSING: BAD SMARTCARD FILE TAG");
+			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONESMARTCARDAPP_PARSESMARTCARDFILEINFOL_11, "ERROR IN CONFIGURATION FILE PARSING: BAD SMARTCARD FILE TAG");
 			delete file;
 			continue;
 			}
 		else
 			{
 		//If the file is Cyclic or Linear record based file...
 		//Check that record Length * number of records = Total length of file
 		if((fileType != RMobilePhone::ETransparent) && ((recordLength*numRecords) != fileLength))
 			{
-			LOGPHONE1("ERROR IN CONFIGURATION FILE PARSING:...");
+			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONESMARTCARDAPP_PARSESMARTCARDFILEINFOL_12, "ERROR IN CONFIGURATION FILE PARSING:...");
-			LOGPHONE1("...Record Length * Number of Records != File Length");
+			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONESMARTCARDAPP_PARSESMARTCARDFILEINFOL_13, "...Record Length * Number of Records != File Length");
 			delete file;
 			continue;
 			}
 		//Get file data
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,7,fileData);
 		if(ret!=KErrNone)
 			{
-			LOGPHONE1("ERROR IN CONFIGURATION FILE PARSING: BAD SMARTCARD FILE TAG");
+			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONESMARTCARDAPP_PARSESMARTCARDFILEINFOL_14, "ERROR IN CONFIGURATION FILE PARSING: BAD SMARTCARD FILE TAG");
 			delete file;
 			continue;
 			}
 		else if((fileData.Length() % 2 ) != 0)
 			{
-			LOGPHONE1("ERROR IN CONFIGURATION FILE PARSING: BAD SMARTCARD FILE DATA");
+			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONESMARTCARDAPP_PARSESMARTCARDFILEINFOL_15, "ERROR IN CONFIGURATION FILE PARSING: BAD SMARTCARD FILE DATA");
 			continue;
 			}
 		else
 			{
 			TBuf8<KMaxFileSize> fileDataBuffer;
 			TextToBin(fileData, fileDataBuffer);
 			if(fileDataBuffer.Length() != fileLength)
 				{
-				LOGPHONE1("ERROR IN CONFIGURATION FILE PARSING:INCONSISTANT DATA FILE LENGTH");
+				OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONESMARTCARDAPP_PARSESMARTCARDFILEINFOL_16, "ERROR IN CONFIGURATION FILE PARSING:INCONSISTANT DATA FILE LENGTH");
 				delete file;
 				continue;
 				}
 			file->iFileData = fileDataBuffer;
 			}
 			else
 				{
 				if(smartCardApp->iAppStatus == CSimPhoneSmartCardApp::EActive)
 					{
-					LOGPHONE1("REACTIVATING AN ALREADY ACTIVE APPLICATION");
+					OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONESMARTCARDAPP_ACTIVATESMARTCARDAPP_1, "REACTIVATING AN ALREADY ACTIVE APPLICATION");
 					return KErrNone;
 					}
 				else
 					{
 					//iMaxActiveSmartCardApps will be exceeded
-					LOGPHONE1("WARNING: CANNOT PROCESS ACTIVATING APPLICATION");
+					OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONESMARTCARDAPP_ACTIVATESMARTCARDAPP_2, "WARNING: CANNOT PROCESS ACTIVATING APPLICATION");
 					return KErrMMEtelScMaxApplicationsActive;
 					}
 				}
 			}
 		}//end for loop
-		LOGPHONE1("WARNING: AID NOT FOUND. CANNOT PROCESS EVENT");
+		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONESMARTCARDAPP_ACTIVATESMARTCARDAPP_3, "WARNING: AID NOT FOUND. CANNOT PROCESS EVENT");
 		return KErrNotFound;
 	}
 TInt CSimPhoneSmartCardApp::TerminateSmartCardApp(const RMobilePhone::TAID aAID, TBool& aTerminatedUSimApp)
 				return KErrNone;
 				}
 			else
 				{
-				LOGPHONE1("ATTEMPTED TO TERMINATE NON-ACTIVE APPLICATION");
+				OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONESMARTCARDAPP_TERMINATESMARTCARDAPP_1, "ATTEMPTED TO TERMINATE NON-ACTIVE APPLICATION");
 				return KErrMMEtelScApplicationNotActive;
 				}
 			}
 		}//end for loop
-	LOGPHONE1("WARNING: AID NOT FOUND. CANNOT PROCESS EVENT");
+	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONESMARTCARDAPP_TERMINATESMARTCARDAPP_2, "WARNING: AID NOT FOUND. CANNOT PROCESS EVENT");
 	return KErrNotFound;
 	}
 void CSimPhoneSmartCardApp::TextToBin(const TDesC8& aSrc, TDes8& aDst)

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