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

equal deleted inserted replaced

-:510c70acdbf6
+:8ccc39f9d787
 * Initial Contributors:
 * Nokia Corporation - initial contribution.
 *
 * Contributors:
 *
 * Description:
 *
 */
 #include <uiccisi.h>            // UICC server
 #include <gpdsisi.h>            // GPDS server
 #include <atk_sharedisi.h>
 #include <call_sharedisi.h>
-#include "osttracedefinitions.h"
+#include <info_sharedisi.h>
+#include "OstTraceDefinitions.h"
 #ifdef OST_TRACE_COMPILER_IN_USE
-#include "satmesshandlertraces.h"
+#include "satmesshandlerTraces.h"
 #endif
 // CONSTANTS
 iTerminalRespTraId              = KNoTransactionOngoing;
 iGetIconSimReadFieldTraId       = KNoTransactionOngoing;
 iDataDownloadSimReadFieldTraId  = KNoTransactionOngoing;
 iCardId                         = KZero;
-iSerialNumberReadReceived       = EFalse;
+iImeiAvailable                  = EFalse;
+iImeiSvAvailable                = EFalse;
 // By default, there's no need to request routing from SMS server
 iSmsCbRoutingComplete           = ETrue;
 iRefreshRequestIsOn             = EFalse;
 iTimingAdvance                  = GSS_TIMING_ADVANCE_NOT_AVAILABLE;
 iTaStatus                       = GSS_TIMING_ADVANCE_NOT_VALID;
 }
 TSatUtility::AsciiToBCD( iIMEI, bcdImei );
 // Add IMEI code to the terminal response
 tlvData.AddData( bcdImei );
+break;
+}
+case RSat::KProvideLocalInfoIMEISV:
+{
+tlvData.AddTag( KTlvImeisvTag );
+tlvData.AddData( iIMEIsv );
 break;
 }
 case RSat::KProvideLocalInformationNmr:
 {
 // Check if NMR's were for UTRAN
 OstTrace0( TRACE_NORMAL, CSATMESSHANDLER_INFOSERIALNUMBERREADRESP, "CSatMessHandler::InfoSerialNumberReadResp" );
 TFLOGSTRING("TSY:CSatMessHandler::InfoSerialNumberReadResp");
 TUint sbStartOffset( 0 );
-TInt retValue( aIsiMessage.FindSubBlockOffsetById(
-ISI_HEADER_SIZE + SIZE_INFO_SERIAL_NUMBER_READ_RESP,
-INFO_SB_SN_IMEI_PLAIN, EIsiSubBlockTypeId8Len8,
-sbStartOffset ) );
 //check if INFO_SB_SN_IMEI_PLAIN sub block is present
-if ( KErrNone == retValue )
+if ( KErrNone == aIsiMessage.FindSubBlockOffsetById(
+ISI_HEADER_SIZE + SIZE_INFO_SERIAL_NUMBER_READ_RESP,
+INFO_SB_SN_IMEI_PLAIN, EIsiSubBlockTypeId8Len8,
+sbStartOffset ) )
 {
 //store imei code
 iIMEI.Copy( aIsiMessage.GetData(
 sbStartOffset + INFO_SB_SN_IMEI_PLAIN_OFFSET_IMEIPLAINU8,
 aIsiMessage.Get8bit( sbStartOffset +
 INFO_SB_SN_IMEI_PLAIN_OFFSET_STRLEN ) - 1 ) );
 //Set the flag to inform that needed data has been received
-iSerialNumberReadReceived = ETrue;
+iImeiAvailable = ETrue;
 TFLOGSTRING("TSY: SAT, Imei received.");
 OstTrace0( TRACE_NORMAL, DUP1_CSATMESSHANDLER_INFOSERIALNUMBERREADRESP, "SAT, Imei received." );
+}
+//check if INFO_SB_SN_IMEI_SV_TO_NET sub block is present
+else if ( KErrNone == aIsiMessage.FindSubBlockOffsetById(
+ISI_HEADER_SIZE + SIZE_INFO_SERIAL_NUMBER_READ_RESP,
+INFO_SB_SN_IMEI_SV_TO_NET, EIsiSubBlockTypeId8Len8,
+sbStartOffset ) )
+{
+// store imeisv code
+iIMEIsv.Copy( aIsiMessage.GetData(
+sbStartOffset + INFO_SB_SN_IMEI_SV_TO_NET_OFFSET_IMEISVU8,
+aIsiMessage.Get8bit( sbStartOffset +
+INFO_SB_SN_IMEI_SV_TO_NET_OFFSET_STRLEN ) ) );
+iImeiSvAvailable = ETrue;
+TFLOGSTRING("TSY: CSatMessHandler::InfoSerialNumberReadResp IMEISV received");
+OstTrace0( TRACE_NORMAL, DUP2_CSATMESSHANDLER_INFOSERIALNUMBERREADRESP, "CSatMessHandler::InfoSerialNumberReadResp IMEISV received" );
 }
 }
 // -----------------------------------------------------------------------------
 // CSatMessHandler::NetNeighbourCellsReq
 PN_MODEM_NETWORK,
 aTransId,
 NET_NEIGHBOUR_CELLS_REQ,
 data );
 }
 // -----------------------------------------------------------------------------
 // CSatMessHandler::NetNeighbourCellResp
 // Parse NET_NEIGHBOUR_CELLS_RESP message and read from it BCCH
 // channel list and Network measurement results.
 // -----------------------------------------------------------------------------
 // CSatMessHandler::CallModemResourceReq
 // Sends a CALL_MODEM_RESOURCE_REQ ISI message.
 // -----------------------------------------------------------------------------
 //
 TInt CSatMessHandler::CallModemResourceReq(
 TUint8 aTransId,
 const TDesC8& aMsg
 )
 {
 TFLOGSTRING("TSY:CSatMessHandler::CallModemResourceReq");
 OstTrace0( TRACE_NORMAL, CSATMESSHANDLER_CALLMODEMRESOURCEREQ, "TSY:CSatMessHandler::CallModemResourceReq" );
 TUint16 aResourceIdMask )
 {
 TFLOGSTRING("TSY:CSatMessHandler::CallModemResourceConfReq");
 OstTrace0( TRACE_NORMAL, CSATMESSHANDLER_CALLMODEMRESOURCECONFREQ, "TSY:CSatMessHandler::CallModemResourceConfReq" );
 TBuf8< SIZE_CALL_MODEM_RESOURCE_CONF_REQ +
 SIZE_CALL_MODEM_SB_RESOURCE_CONF> msg;
 // CALL_MODEM_RES_CONF_OPERATION
 msg.Append( CALL_MODEM_RES_CONF_SET );
 // Nbr of sb's
 msg.Append( 1 );
 TIsiSubBlock sbResourceConf(
 msg,
 CALL_MODEM_SB_RESOURCE_CONF,
 EIsiSubBlockTypeId8Len8 );
 TSatUtility::AppendWord( aResourceId, msg );
 TSatUtility::AppendWord( aResourceIdMask, msg);
 sbResourceConf.CompleteSubBlock();
 return iPnSend->Send(
 PN_MODEM_CALL,
 iTsySatMessaging->GetTransactionId(),
 CALL_MODEM_RESOURCE_CONF_REQ,
 msg );
 }
 //
 TInt CSatMessHandler::SsResourceConfReq()
 {
 TFLOGSTRING("TSY:CSatMessHandler::SsResourceConfReq");
 OstTrace0( TRACE_NORMAL, CSATMESSHANDLER_SSRESOURCECONFREQ, "TSY:CSatMessHandler::SsResourceConfReq" );
 TBuf8< SIZE_SS_RESOURCE_CONF_REQ  +
 SIZE_SS_SB_RESOURCE_CONF > msg;
 // SS_RESOURCE_CONF_OPERATION
 msg.Append( SS_RESOURCE_CONF_SET );
 // Nbr of sb's
 msg.Append( 1 );
 TIsiSubBlock sbResourceConf(
 msg,
 SS_SB_RESOURCE_CONF,
 EIsiSubBlockTypeId8Len8 );
 TSatUtility::AppendWord( SS_RES_ID_MO_SS_OPERATION, msg );
 TSatUtility::AppendWord( SS_RES_ID_MO_SS_OPERATION_MASK, msg);
 sbResourceConf.CompleteSubBlock();
 return iPnSend->Send(
 PN_SS,
 iTsySatMessaging->GetTransactionId(),
 SS_RESOURCE_CONF_REQ,
 msg );
 }
 // -----------------------------------------------------------------------------
 // CSatMessHandler::SsResourceControlReq
 // Sends a SS_RESOURCE_CONNTROL_REQ ISI message.
 // -----------------------------------------------------------------------------
 //
 TInt CSatMessHandler::SsResourceControlReq(
 TUint8 aTransId,
 const TDesC8& aMsg
 )
 {
 TFLOGSTRING("TSY:CSatMessHandler::SsResourceControlReq");
 OstTrace0( TRACE_NORMAL, CSATMESSHANDLER_SSRESOURCECONTROLREQ, "TSY:CSatMessHandler::SsResourceControlReq" );
 //
 TInt CSatMessHandler::GpdsResourceConfReq()
 {
 TFLOGSTRING("TSY:CSatMessHandler::GpdsResourceConfReq");
 OstTrace0( TRACE_NORMAL, CSATMESSHANDLER_GPDSRESOURCECONFREQ, "TSY:CSatMessHandler::GpdsResourceConfReq" );
 TBuf8< SIZE_GPDS_RESOURCE_CONF_REQ  +
 SIZE_GPDS_RESOURCE_CONF > msg;
 // SS_RESOURCE_CONF_OPERATION
 msg.Append( GPDS_RESOURCE_CONF_SET );
 // Nbr of sb's
 msg.Append( 1 );
 TIsiSubBlock sbResourceConf(
 TSatUtility::AppendWord( GPDS_RES_ID_CC_FOR_GPRS, msg );
 TSatUtility::AppendWord( GPDS_RES_ID_MASK_CC_FOR_GPRS, msg);
 sbResourceConf.CompleteSubBlock();
 return iPnSend->Send(
 PN_GPDS,
 iTsySatMessaging->GetTransactionId(),
 GPDS_RESOURCE_CONF_REQ,
 msg );
 }
 // -----------------------------------------------------------------------------
 // CSatMessHandler::GpdsResourceControlReq
 // Sends a GPDS_RESOURCE_CONNTROL_REQ ISI message.
 // -----------------------------------------------------------------------------
 //
 TInt CSatMessHandler::GpdsResourceControlReq(
 TUint8 aTransId,
 const TDesC8& aMsg
 )
 {
 TFLOGSTRING("TSY:CSatMessHandler::GpdsResourceControlReq");
 OstTrace0( TRACE_NORMAL, CSATMESSHANDLER_GPDSRESOURCECONTROLREQ, "CSatMessHandler::GpdsResourceControlReq" );
 }
 if ( KErrCorrupt == ret )
 {
 if ( !berTlv.TlvByTagValue( &commandDetails,
 KTlvCommandDetailsTag ) &&
 5 == commandDetails.GetSize()  )
 {
 commandDetailsTlv.Copy( commandDetails.Data() );
 }
 else
 iSmsCbRoutingComplete = EFalse;
 // TBuf8<SIZE_SMS_CB_ROUTING_REQ> because we are sending [U]SIM EF CBMID Message
 // Subscription;
 TBuf8<SIZE_SMS_CB_ROUTING_REQ> data;
 // Append Routing command
 data.Append( aRoutingCommand );
 // Append Subscription number
 data.Append( SMS_NEW_SUBSCRIPTION );
 // append Subscription type
 // Append Filler bytes
 data.AppendFill( KPadding, 2 );
 // Append no of Subblocks
 data.Append( 0 );
 // Send Subscription request
 ret = iPnSend->Send( PN_SMS, aTransId, SMS_CB_ROUTING_REQ,
 data );
 return ret;
 }
 }
 // -----------------------------------------------------------------------------
 // CSatMessHandler::SmsResourceConfInd
 // Handles Indication from SMS Server for resource configuration Startup
 // and reconfigure condition .
 // -----------------------------------------------------------------------------
 //
 void CSatMessHandler::SmsResourceConfInd
 // To check The receive indication is for startup or reconfiguration
 if ( SMS_RES_CONF_STARTUP == aIsiMessage.Get8bit( ISI_HEADER_SIZE
 + SMS_RESOURCE_CONF_IND_OFFSET_CONFSTATUS ) )
 {
 TUint sbStartOffset( 0 );
-TInt retValue( KErrNotFound );
 // Check if resource control is requested for MO SM.
 if ( KErrNone == aIsiMessage.FindSubBlockOffsetById(
 ISI_HEADER_SIZE + SIZE_SMS_RESOURCE_CONF_IND,
 SMS_SB_RESOURCE_CONF_REQUIRED,
 EIsiSubBlockTypeId16Len16,

changeset 5	8ccc39f9d787
parent 0	63b37f68c1ce
child 8	6295dc2169f3