FCL/sf/incubator/modemadaptation: comparison adaptationlayer/tsy/nokiatsy

equal deleted inserted replaced

-:942573423a60
+:fa67e03b87df
 // -----------------------------------------------------------------------------
 //
 CMmPhoneBookOperationCache* CMmPhoneBookOperationCache::NewL
 (
 CMmPhoneBookStoreMessHandler* aMmPhoneBookStoreMessHandler,
-CMmUiccMessHandler* /*aUiccMessHandler*/,
+CMmUiccMessHandler* aUiccMessHandler,
 TInt /*aIpc*/,
 const CMmDataPackage* aDataPackage // Data
 )
 {
 TFLOGSTRING("TSY: CMmPhoneBookOperationCache::NewL");
 mmPhoneBookOperationCache->iPhoneBookTypeName = phonebookTypeName;
 mmPhoneBookOperationCache->iMmPhoneBookStoreMessHandler =
 aMmPhoneBookStoreMessHandler;
+mmPhoneBookOperationCache->iMmUiccMessHandler = aUiccMessHandler;
 return mmPhoneBookOperationCache;
 }
 // -----------------------------------------------------------------------------
 // CMmPhoneBookOperationCache::UiccCreateReq
 if( !iCancelOperation )
 {
 // Convert Phone Book name to file id
 TUint16 fileIdExt ( UICC_ILLEGAL_FILE_ID );
-TUint16 pbFileId = ConvertToPBfileId( iPhoneBookTypeName, fileIdExt );
+TUint16 pbFileId = ConvertToPBfileId( iPhoneBookTypeName, fileIdExt,  iMmUiccMessHandler->GetCardType());
 TUint8 pbArrayIndex = ConvertToConfArrayIndex( pbFileId );
 switch(pbFileId)
 {
 case PB_ADN_FID:
 // Update Entry Status
 iStoreEntry->iEntryPresent = ETrue;
 // Seperate Entry data form UICC Server response message
 // Case: <Data available to be filled into array>
 iMmPhoneBookStoreMessHandler->
-iPBStoreConf[EPhonebookTypeAdn].
+iPBStoreConf[pbArrayIndex].
 GetPBEntryFromUICCData(
 aFileData,
 iNumberBuf,
 iNameBuf);
 // And the Extension data record number is valid
 // Index to read Extension file Data is Alpha string
 // Length + 14 , minus 1 is for Array index Calculation
 //(it starts from 0)
 if ( 0xFF == aFileData[iMmPhoneBookStoreMessHandler->
-iPBStoreConf[EPhonebookTypeAdn].
+iPBStoreConf[pbArrayIndex].
 iAlphaStringlength + 13]  )
 {
 // Append Entry to list
 iMmPhoneBookStoreMessHandler->StoreEntryToPhoneBookList(
 iStoreEntry,
 else
 {
 iExtensionToRead = ETrue;
 // Record no to be read from EXT File
 TInt recordNo = aFileData[iMmPhoneBookStoreMessHandler->
-iPBStoreConf[EPhonebookTypeAdn].
+iPBStoreConf[pbArrayIndex].
 iAlphaStringlength + 13];
 // Append EXT record no.
 iStoreEntry->PBEntryExtRecord.Append( recordNo );
 OstTrace0( TRACE_NORMAL, CMMPHONEBOOKOPERATIONCACHE_USIMPBREQREAD, "CMmPhoneBookOperationCache::USimPbReqRead" );
 TInt ret( KErrNone );
 TInt appFileID ( APPL_FILE_ID );   // Application File id for DFphonebook
-// get the index to be read from phonebook
-TInt index( iIndexToRead );
 TUiccReadLinearFixed cmdParams;
 cmdParams.messHandlerPtr  = static_cast<MUiccOperationBase*>
 ( iMmPhoneBookStoreMessHandler );
 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);
-cmdParams.filePath.Append( static_cast<TUint8>( DF_PHONEBOOK >> 8 ));
-cmdParams.filePath.Append( static_cast<TUint8>( DF_PHONEBOOK ));
+if( UICC_CARD_TYPE_UICC == iMmUiccMessHandler->GetCardType())
+{
+cmdParams.filePath.Append( static_cast<TUint8>( DF_PHONEBOOK >> 8 ));
+cmdParams.filePath.Append( static_cast<TUint8>( DF_PHONEBOOK ));
+}
 // Convert Phone Book name to file id
 TUint16 fileIdExt ( 0x0000 );
-TUint16 pbFileId = ConvertToPBfileId( iPhoneBookTypeName, fileIdExt );
+TUint16 pbFileId = ConvertToPBfileId( iPhoneBookTypeName, fileIdExt, iMmUiccMessHandler->GetCardType() );
+TUint8 pbArrayIndex = ConvertToConfArrayIndex( pbFileId );
-// get the corect Location to be read from phone book
-if( PB_MBDN_FID == pbFileId)
+switch( pbFileId )
 {
-// Index to be read contains two types of information.
+case PB_ADN_FID:
-// The least significant byte contains the profile number
+case PB_FDN_FID:
-// and the most significant byte contains the type.
+case PB_SDN_FID:
-index = index || 0x0100; // Only subscriber profile number 1 is supported
+{
-}
+// For 2G ADN Phonebook EXT1 will be the extension number store
+cmdParams.trId = static_cast<TUiccTrId> ( aTransId );
-switch( pbFileId )
+cmdParams.serviceType = UICC_APPL_READ_LINEAR_FIXED;
-{
+cmdParams.record = aRecordNo;
-case PB_ADN_FID:
-{
-// For 2G ADN Phonebook EXT1 will be the extension number store
-cmdParams.trId = static_cast<TUiccTrId> ( aTransId );
-cmdParams.serviceType = UICC_APPL_READ_LINEAR_FIXED;
-cmdParams.record = aRecordNo;
 // Check for Extension Data is Present or not
 if(!iExtensionToRead)
+{
+// Check for the record Number to be
+//read is valid record number
+if( iIndexToRead <= iMmPhoneBookStoreMessHandler->
+iPBStoreConf[pbArrayIndex].iNoOfRecords)
 {
-// Check for the record Number to be
+// Start from first location and Search for First Valid
-//read is valid record number
+//Entry in the Stored List And if some Entry is invalid
-if( iIndexToRead <= iMmPhoneBookStoreMessHandler->
+// then Read From Sim and Check the Staus its Free
-iPBStoreConf[EPhonebookTypeAdn].iNoOfRecords)
+// or not till end of the records
+cmdParams.fileId = pbFileId;
+cmdParams.serviceType = UICC_APPL_READ_LINEAR_FIXED;
+cmdParams.record = aRecordNo;
+// till End of Record
+cmdParams.dataAmount = 0;
+// Start from begining of record
+cmdParams.dataOffset = 0;
+}
+else
+{
+ret = KErrNotFound;
+}
+} // end of if case for checking extension data
+else
+{
+// Send Request to Read Extension Data
+// Check for UST Table supports for EXT File
+if( iMmPhoneBookStoreMessHandler->
+iPBStoreConf[pbArrayIndex].iExtension )
+{
+// Check for Extension data record in valid
+if(iMmPhoneBookStoreMessHandler->
+iPBStoreConf[pbArrayIndex].iExtNoOfRec >= aRecordNo)
 {
-// Start from first location and Search for First Valid
+// Read Request to read that index
-//Entry in the Stored List And if some Entry is invalid
+cmdParams.fileId = fileIdExt;
-// then Read From Sim and Check the Staus its Free
-// or not till end of the records
-cmdParams.fileId = PB_ADN_FID;
 cmdParams.serviceType = UICC_APPL_READ_LINEAR_FIXED;
 cmdParams.record = aRecordNo;
 // till End of Record
 cmdParams.dataAmount = 0;
 // Start from begining of record
 cmdParams.dataOffset = 0;
 }
 else
 {
-ret = KErrNotFound;
-}
-} // end of if case for checking extension data
-else
-{
-// Send Request to Read Extension Data
-// Check for UST Table supports for EXT File
-if( iMmPhoneBookStoreMessHandler->
-iPBStoreConf[EPhonebookTypeAdn].iExtension )
-{
-// Check for Extension data record in valid
-if(iMmPhoneBookStoreMessHandler->
-iPBStoreConf[EPhonebookTypeAdn].iExtNoOfRec > aRecordNo)
-{
-// Read Request to read that index
-cmdParams.fileId = PB_EXT1_FID;
-cmdParams.serviceType = UICC_APPL_READ_LINEAR_FIXED;
-cmdParams.record = aRecordNo;
-// till End of Record
-cmdParams.dataAmount = 0;
-// Start from begining of record
-cmdParams.dataOffset = 0;
-}
-else
-{
-ret = KErrGeneral;
-}
-}
-else
-{
 ret = KErrGeneral;
 }
 }
+else
+{
+ret = KErrGeneral;
+}
+}
 break;
 }
-case PB_FDN_FID:
+default:
 {
-// For FDN Phonebook EXT2 will be the extension number store
-cmdParams.trId = ETrIdPbReadFdn;
-cmdParams.fileId = PB_EXT2_FID;
-cmdParams.serviceType = UICC_APPL_READ_LINEAR_FIXED;
-cmdParams.record = aRecordNo;
-break;
-}
-default:
-{
 TFLOGSTRING("TSY: CMmPhoneBookOperationRead::USimPbReqRead - PhoenBook Not supported");
 OstTrace0( TRACE_NORMAL, DUP1_CMMPHONEBOOKOPERATIONCACHE_USIMPBREQREAD, "CMmPhoneBookOperationCache::USimPbReqRead - PhoneBook not supported" );
 break;
 }
 }
 if( KErrNone == ret )
 {
 ret = iMmPhoneBookStoreMessHandler->UiccMessHandler()->
 CreateUiccApplCmdReq( cmdParams );
 TFLOGSTRING2("TSY: CreateUiccApplCmdReq returns %d", ret);
 OstTraceExt1( TRACE_NORMAL, DUP2_CMMPHONEBOOKOPERATIONCACHE_USIMPBREQREAD, "CMmPhoneBookOperationCache::USimPbReqRead;ret=%hd", ret );
 }
 return ret;
 }

changeset 7	fa67e03b87df
parent 5	8ccc39f9d787
child 8	6295dc2169f3