FCL/sf/incubator/modemadaptation: comparison adaptationlayer/tsy/nokiatsy_dll/src/cmmphonebookoperationinit3g

equal deleted inserted replaced

-:510c70acdbf6
+:8ccc39f9d787
 #include <tisi.h>
 #include <pn_const.h>
 #include <ctsy/serviceapi/mmtsy_ipcdefs.h>
 #include "cmmmessagerouter.h"
 #include "cmmphonebookoperationinit3G_adn.h"
-#include "osttracedefinitions.h"
+#include "OstTraceDefinitions.h"
 #ifdef OST_TRACE_COMPILER_IN_USE
-#include "cmmphonebookoperationinittraces.h"
+#include "cmmphonebookoperationinitTraces.h"
 #include "OstTraceDefinitions.h"
 #ifdef OST_TRACE_COMPILER_IN_USE
 #include "cmmphonebookoperationinit3g_adnTraces.h"
 #endif
 const CPhoneBookDataPackage* phoneBookData =
 static_cast<const CPhoneBookDataPackage*>( aDataPackage );
 phoneBookData->GetPhoneBookName( phonebookTypeName );
 // Store phonebook name
-mmPhoneBookOperationInit3G_adn->iPhonebookType = phonebookTypeName;
+mmPhoneBookOperationInit3G_adn->iPhoneBookTypeName = phonebookTypeName;
 if( 0 == phonebookTypeName.CompareF( KInternalPhoneBookType ) )
 {
 mmPhoneBookOperationInit3G_adn->iIniPhase = EPBIniPhase_Internal;
 }
 else // Full construction is not needed in case of internal initilization
 {
-mmPhoneBookOperationInit3G_adn->iTransactionId = ETrIdPbInit;
 mmPhoneBookOperationInit3G_adn->ConstructL();
 }
 mmPhoneBookOperationInit3G_adn->iMmPhoneBookStoreMessHandler =
 aMmPhoneBookStoreMessHandler;
 // -----------------------------------------------------------------------------
 //
 TInt CMmPhoneBookOperationInit3G_adn::UICCCreateReq
 (
 TInt aIpc,
-const CMmDataPackage* /*aDataPackage*/
+const CMmDataPackage* /*aDataPackage*/,
+TUint8 aTransId
 )
 {
 TFLOGSTRING( "TSY: CMmPhoneBookOperationInit3G_adn::UICCCreateReq" );
 OstTrace0( TRACE_NORMAL, CMMPHONEBOOKOPERATIONINIT3G_ADN_UICCCREATEREQ, "CMmPhoneBookOperationInit3G_adn::UICCCreateReq" );
 iInternalInit = ETrue;
 }
 iServiceType = UICC_APPL_FILE_INFO;
-iExtensionPresent = EFalse; // Default Extension is not present
 // Start Initialization for ADN phonebook 3G
 iIniPhase = EPBInitPhase_3GADN_PBR;
-ret = UICCInitializeReq3GADN();
+ret = UICCInitializeReq3GADN( aTransId );
 }
 else  // else for if internalInit goign on
 {
 // Simultaneous initializations are not allowed.
 ret = KErrInUse;
 // -----------------------------------------------------------------------------
 // CMmPhoneBookOperationInit3G_adn::UICCCreateReq
 // For USIM Separate different request to correct function
 // -----------------------------------------------------------------------------
 //
-TInt CMmPhoneBookOperationInit3G_adn::UICCInitializeReq3GADN()
+TInt CMmPhoneBookOperationInit3G_adn::UICCInitializeReq3GADN( TUint8 aTransId)
 {
 TInt ret(KErrNone);
 TFLOGSTRING( "TSY: CMmPhoneBookOperationInit3G_adn::UICCInitializeReq3GADN" );
 OstTrace0( TRACE_NORMAL, CMMPHONEBOOKOPERATIONINIT3G_ADN_UICCINITIALIZEREQ3GADN, "CMmPhoneBookOperationInit3G_adn::UICCInitializeReq3GADN" );
 TInt appFileID( APPL_FILE_ID );
 TUiccReadLinearFixed cmdParams;
 cmdParams.messHandlerPtr =
 static_cast<MUiccOperationBase*>( iMmPhoneBookStoreMessHandler );
-cmdParams.trId = ETrIdPbInit;
+cmdParams.trId = static_cast<TUiccTrId>( aTransId );
 cmdParams.filePath.Append( static_cast<TUint8>( MF_FILE >> 8 ));
 cmdParams.filePath.Append( static_cast<TUint8>( MF_FILE ));
 cmdParams.filePath.Append( appFileID>>8 );
 cmdParams.filePath.Append( appFileID );
 // CmmPhonebookOperationInit::HandleUICCPbRespL
 // HAndle response for all phase init response in USIM
 // -----------------------------------------------------------------------------
 //
-TInt CMmPhoneBookOperationInit3G_adn::HandleUICCPbRespL
+TBool CMmPhoneBookOperationInit3G_adn::HandleUICCPbRespL
 (
-TBool &aComplete,
 TInt aStatus,
+TUint8 /*aDetails*/,
 const TDesC8 &aFileData,
-TInt /*aTransId*/
+TInt aTransId
 )
 {
 TInt ret( KErrNone );
+TBool complete( EFalse );
 // break immediatelly in case of internal init
 if ( iInternalInit )
 {
 TFLOGSTRING("TSY: CMmPhoneBookOperationInit3G_adn::HandleUICCPbRespL. Internal Init->Break");
 iIniPhase = EPBIniPhase_Unknown;
 iInternalInit = EFalse;
-aComplete = ETrue;
+complete = ETrue;
 return KErrNone;
 }
 switch(iIniPhase)
 {
 case EPBInitPhase_3GADN_Type3:
 {
 TFLOGSTRING( "TSY: CMmPhoneBookOperationInit3G_adn::HandleUICCPbRespL. USIM ADN PhoneBook Init" );
 OstTrace0( TRACE_NORMAL, CMMPHONEBOOKOPERATIONINIT3G_ADN_HANDLEUICCPBRESPL, "CMmPhoneBookOperationInit3G_adn::HandleUICCPbRespL. USIM ADN Phonebook init" );
-ret = HandleUICCPbResp3GADN( aFileData, aStatus );
+ret = HandleUICCPbResp3GADN( aFileData, aStatus, aTransId );
 }
 break;
 case EPBInitPhaseFDN:
 case EPBInitPhaseSDN:
 case EPBInitPhaseMBDN:
 {
 TFLOGSTRING( "TSY: CMmPhoneBookOperationInit::HandleUICCPbRespL. Other PhoneBook Init" );
 OstTrace0( TRACE_NORMAL, DUP2_CMMPHONEBOOKOPERATIONINIT3G_ADN_HANDLEUICCPBRESPL, "CMmPhoneBookOperationInit3G_adn::HandleUICCPbRespL. Other Phonebook Init" );
 // For all other phoenbook handling is same as 2g Phonebook
-ret = HandlePBRespL( aFileData, aStatus );
+ret = HandlePBRespL( aFileData, aStatus, aTransId );
 }
 break;
 default:
 // Not to handle anything if card type is not available
 break;
 // Complete, if phonebook initalization is complete or there is some error in UICC server
 if ( KErrNone != ret || EPBIniPhase_PBInitialized == iIniPhase )
 {
 CPhoneBookDataPackage phoneBookData;
-phoneBookData.SetPhoneBookName( iPhonebookType );
+phoneBookData.SetPhoneBookName( iPhoneBookTypeName );
 phoneBookData.PackData( iPBStoreInfoData );
 if ( UICC_STATUS_OK != aStatus )
 {
 ret = CMmStaticUtility::UICCCSCauseToEpocError( aStatus );
 iMmPhoneBookStoreMessHandler->MessageRouter()->Complete(
 EMmTsyPhoneBookStoreInitIPC,
 &phoneBookData,
 ret );
-aComplete = ETrue;
+complete = ETrue;
 }
-return ret;
+return complete;
 }
 // -----------------------------------------------------------------------------
 // CmmPhonebookOperationInit::HandleUICCPbResp3GADN
 // Handle response for ADN phone book init in USIM
 // -----------------------------------------------------------------------------
 //
 TInt CMmPhoneBookOperationInit3G_adn::HandleUICCPbResp3GADN
 (
 const TDesC8& aFileData,
-TInt aStatus)
+TInt aStatus,
+TUint8 aTransId )
 {
 TFLOGSTRING("TSY: CMmPhoneBookOperationInit3G_adn::HandleUICCPbResp3GADN");
 OstTrace0( TRACE_NORMAL, CMMPHONEBOOKOPERATIONINIT3G_ADN_HANDLEUICCPBRESP3GADN, "CMmPhoneBookOperationInit3G_adn::HandleUICCPbResp3GADN" );
 TInt ret( KErrNone );
 {
 TInt offSet( 0 );
 // For File Info , get the no of records in PBR file to get the total no of entries in 3G ADN phonebook
 if( UICC_APPL_FILE_INFO == iServiceType )
 {
-// Extract Number of records in PBR EF
+TFci fci( aFileData );
-offSet = aFileData.Find( &KTagFCIFileDescriptor,1 );
+iNumOfPBRRecords = fci.GetNumberOfRecords();
-if( offSet != KErrNotFound )
-{
+ret = KErrNone;
-// Number of entries is 1 byte long
-//iNumOfPBRRecords = aFileData[offSet + UICC_FCI_EF_FDESC_OFFSET_NUM_ENTR];
-// get the no of records in PBR file
-HandleFcpData(aFileData, iNumOfPBRRecords, KNoOfRecords);
-ret = KErrNone;
-}
 iServiceType = UICC_APPL_READ_LINEAR_FIXED;
 }
 else if( UICC_APPL_READ_LINEAR_FIXED == iServiceType )
 {
 // Get the offset for  Type 1 file tag "KTagConstructedTagA8"
 {
 // get the next Phone book available in UST OR SST Table (for 2G)table
 iIniPhase = GetNextAvailablePbUicc( UICC_FDN_SERVICE_NUM );
 }
 iServiceType = UICC_APPL_FILE_INFO;
-ret = UICCInitializeReq();
+ret = UICCInitializeReq( aTransId );
 }
 else
 {
 // Call Create request for next phase
-ret = UICCInitializeReq3GADN();
+ret = UICCInitializeReq3GADN( aTransId );
 }
 }
 return ret;
 }
 {
 // Get the Tag name
 primTag.tagValue = aFileData[offset + i];
 // get the File ID which is 2byte long
-Get16bit(primTag.tagFID, aFileData, ( offset+i+2 ));
+primTag.tagFID = CMmStaticUtility::Get16Bit( aFileData, ( offset+i+2 ));
 // if file Tag length is 3 the SFI is available and if file tag length is 2 the only File ID is present
 if(KLengthWithSFI == aFileData[offset + i+1])
 {
 primTag.tagSFI = aFileData[offset+i+4];
 for( TInt i = 0; i < aTagLength; )
 {
 // Get the Tag name
 primTag.tagValue = aFileData[offset+i];
 // get the File ID which is 2byte long
-Get16bit(primTag.tagFID, aFileData, ( offset+i+2 ));
+primTag.tagFID = CMmStaticUtility::Get16Bit( aFileData, ( offset+i+2 ));
 // if file Tag length is 3 the SFI is available and if file tag length is 2 the only File ID is present
 if(KLengthWithSFI == aFileData[offset+i+1])
 {
 primTag.tagSFI = aFileData[offset+i+4];
 {
 // Get the Tag name
 primTag.tagValue = aFileData[offset+i];
 // get the File ID which is 2byte long
-Get16bit( primTag.tagFID, aFileData, ( offset+i+2 ));
+primTag.tagFID = CMmStaticUtility::Get16Bit( aFileData,
+	                                          ( offset + i + 2 ));
 // if file Tag length is 3 the SFI is available and if file tag length is 2 the only File ID is present
 if(KLengthWithSFI == aFileData[offset+i+1])
 {
 primTag.tagSFI = aFileData[offset+i+4];
 TUint8 tagValue = iType1FileArray[iCurrentArrayCounter].tagValue;
 if( UICC_STATUS_OK  == aStatus )
 {
 // Get the Record length for all linear fixed and circular EF's
-HandleFcpData(aFileData, recordLength, KRecordLength);
+TFci fci( aFileData );
+recordLength = fci.GetRecordLength();
-// Get the no of records
+noOfRecords = fci.GetNumberOfRecords();
-HandleFcpData(aFileData, noOfRecords, KNoOfRecords);
 // Check for No of records in Type 1 file
 if( UICC_EF_ADN_TAG != tagValue )
 {
 ret = CheckForNoOfRecords( noOfRecords );
 }
 TInt noOfRecords(0);
 if( UICC_STATUS_OK  == aStatus )
 {
 // Get the Record length for all linear fixed and circular EF's
-HandleFcpData(aFileData, recordLength, KRecordLength);
+TFci fci( aFileData );
+recordLength = fci.GetRecordLength();
-// get no of records
+noOfRecords = fci.GetNumberOfRecords();
-HandleFcpData(aFileData, noOfRecords, KNoOfRecords);
+}
-}
 // Get the tag value for current File
 TUint tagValue = iType2FileArray[iCurrentArrayCounter].tagValue;
 if( iCurrentArrayCounter < iType2FileArray.Count() )
 {
 TInt noOfRecords(0);
 if( UICC_STATUS_OK  == aStatus )
 {
-// Get the Record length for all linear fixed and circular EF's
+TFci fci( aFileData );
-HandleFcpData(aFileData, recordLength, KRecordLength);
+recordLength = fci.GetRecordLength();
+noOfRecords = fci.GetNumberOfRecords();
-HandleFcpData(aFileData, noOfRecords, KNoOfRecords);
 }
 // Get the tag value for current File
 TUint tagValue ( iType3FileArray[iCurrentArrayCounter].tagValue );

changeset 5	8ccc39f9d787
parent 0	63b37f68c1ce
child 7	fa67e03b87df