224 |
224 |
225 cmdParams.filePath.Append( static_cast<TUint8>( MF_FILE >> 8 )); |
225 cmdParams.filePath.Append( static_cast<TUint8>( MF_FILE >> 8 )); |
226 cmdParams.filePath.Append( static_cast<TUint8>( MF_FILE )); |
226 cmdParams.filePath.Append( static_cast<TUint8>( MF_FILE )); |
227 cmdParams.filePath.Append( APPL_FILE_ID>>8); |
227 cmdParams.filePath.Append( APPL_FILE_ID>>8); |
228 cmdParams.filePath.Append( APPL_FILE_ID); |
228 cmdParams.filePath.Append( APPL_FILE_ID); |
229 cmdParams.filePath.Append( static_cast<TUint8>( DF_PHONEBOOK >> 8 )); |
229 |
230 cmdParams.filePath.Append( static_cast<TUint8>( DF_PHONEBOOK )); |
230 if( UICC_CARD_TYPE_UICC == iMmUiccMessHandler->GetCardType() ) |
|
231 { |
|
232 cmdParams.filePath.Append( static_cast<TUint8>( DF_PHONEBOOK >> 8 )); |
|
233 cmdParams.filePath.Append( static_cast<TUint8>( DF_PHONEBOOK )); |
|
234 } |
|
235 |
231 cmdParams.serviceType = UICC_APPL_READ_LINEAR_FIXED; |
236 cmdParams.serviceType = UICC_APPL_READ_LINEAR_FIXED; |
232 cmdParams.record = aRecordNo; |
237 cmdParams.record = aRecordNo; |
233 cmdParams.trId = static_cast<TUiccTrId>( aTransId ); |
238 cmdParams.trId = static_cast<TUiccTrId>( aTransId ); |
234 // Convert Phone Book name to file id |
239 // Convert Phone Book name to file id |
235 TUint16 fileIdExt ( 0x0000 ); |
240 TUint16 fileIdExt ( 0x0000 ); |
236 TUint16 pbFileId = ConvertToPBfileId( iPhoneBookTypeName, fileIdExt ); |
241 TUint16 pbFileId = ConvertToPBfileId( iPhoneBookTypeName, fileIdExt, iMmUiccMessHandler->GetCardType() ); |
237 TUint8 arrayIndex = ConvertToConfArrayIndex( pbFileId ); |
242 TUint8 arrayIndex = ConvertToConfArrayIndex( pbFileId ); |
238 |
243 |
239 // get the corect Location to be read from phone book |
244 // get the corect Location to be read from phone book |
240 if( PB_MBDN_FID == pbFileId) |
245 if( PB_MBDN_FID == pbFileId) |
241 { |
246 { |
403 ret = CMmStaticUtility::UICCCSCauseToEpocError(aStatus ); |
408 ret = CMmStaticUtility::UICCCSCauseToEpocError(aStatus ); |
404 } |
409 } |
405 |
410 |
406 // Convert Phone Book name to file id |
411 // Convert Phone Book name to file id |
407 TUint16 fileIdExt( 0x0000 ); |
412 TUint16 fileIdExt( 0x0000 ); |
408 TUint16 pbFileId = ConvertToPBfileId( iPhoneBookTypeName, fileIdExt ); |
413 TUint16 pbFileId = ConvertToPBfileId( iPhoneBookTypeName, fileIdExt, iMmUiccMessHandler->GetCardType() ); |
409 TUint8 arrayIndex = ConvertToConfArrayIndex( pbFileId ); |
414 TUint8 arrayIndex = ConvertToConfArrayIndex( pbFileId ); |
410 |
415 |
411 if ( UICC_STATUS_OK == aStatus ) |
416 if ( UICC_STATUS_OK == aStatus ) |
412 { |
417 { |
413 if ( EBasicEfRead == iTypeOfReading ) |
418 if ( EBasicEfRead == iTypeOfReading ) |