equal
deleted
inserted
replaced
2106 TInt CMmNetTsy::GetNetworkRegistrationStatusL( |
2106 TInt CMmNetTsy::GetNetworkRegistrationStatusL( |
2107 const TTsyReqHandle aTsyReqHandle, |
2107 const TTsyReqHandle aTsyReqHandle, |
2108 RMobilePhone::TMobilePhoneRegistrationStatus* aStatus ) |
2108 RMobilePhone::TMobilePhoneRegistrationStatus* aStatus ) |
2109 { |
2109 { |
2110 TFLOGSTRING2("TSY: CMmNetTsy::GetNetworkRegistrationStatusL Handle: %d", aTsyReqHandle); |
2110 TFLOGSTRING2("TSY: CMmNetTsy::GetNetworkRegistrationStatusL Handle: %d", aTsyReqHandle); |
2111 if ( RMobilePhone::ERegistrationUnknown == iNWRegistrationStatus ) |
2111 |
|
2112 // If the modem is not ready (Common TSY has not received EMmTsyBootNotifyModemStatusReadyIPC |
|
2113 // from LTSY), we don't need to ask. Update registration status and complete client immediately. |
|
2114 if (!iMmPhoneTsy->IsModemStatusReady()) |
|
2115 { |
|
2116 iNWRegistrationStatus = RMobilePhone::ERegistrationUnknown; |
|
2117 *aStatus = iNWRegistrationStatus; |
|
2118 iMmPhoneTsy->ReqCompleted( aTsyReqHandle, KErrNone ); |
|
2119 return KErrNone; |
|
2120 } |
|
2121 |
|
2122 if (RMobilePhone::ERegistrationUnknown == iNWRegistrationStatus) // modem is ready |
2112 { |
2123 { |
2113 TTsyReqHandle reqHandle = iMmPhoneTsy->iTsyReqHandleStore-> |
2124 TTsyReqHandle reqHandle = iMmPhoneTsy->iTsyReqHandleStore-> |
2114 GetTsyReqHandle( CMmPhoneTsy::EMultimodePhoneGetNetworkRegistrationStatus ); |
2125 GetTsyReqHandle( CMmPhoneTsy::EMultimodePhoneGetNetworkRegistrationStatus ); |
2115 |
2126 |
2116 if (0 < reqHandle ) |
2127 if (0 < reqHandle ) |
2122 req->iRetGetNWRegistrationStatus = aStatus; |
2133 req->iRetGetNWRegistrationStatus = aStatus; |
2123 iRegisterationStatusRequests.AppendL( req ); |
2134 iRegisterationStatusRequests.AppendL( req ); |
2124 } |
2135 } |
2125 else |
2136 else |
2126 { |
2137 { |
2127 TInt ret(KErrGeneral); |
2138 //get mode specific information |
2128 // verify that modem is ready |
2139 TInt ret ( iMmPhoneTsy->iMmPhoneExtInterface-> |
2129 if ( iMmPhoneTsy->IsModemStatusReady() ) |
2140 GetNetworkRegistrationStatusL() ); |
2130 { |
|
2131 //get mode specific information |
|
2132 TFLOGSTRING("TSY: CMmNetTsy::GetNetworkRegistrationStatusL - Sending request to LTSY" ); |
|
2133 ret = iMmPhoneTsy->iMmPhoneExtInterface-> |
|
2134 GetNetworkRegistrationStatusL(); |
|
2135 } |
|
2136 else |
|
2137 { |
|
2138 // modem is not ready. Client to be completed with error code. |
|
2139 TFLOGSTRING("TSY: CMmNetTsy::GetNetworkRegistrationStatusL - Modem not ready" ); |
|
2140 ret = KErrNotReady; |
|
2141 } |
|
2142 |
2141 |
2143 if ( KErrNone != ret ) |
2142 if ( KErrNone != ret ) |
2144 { |
2143 { |
2145 TFLOGSTRING2("TSY: CMmNetTsy::GetNetworkRegistrationStatusL - Complete with error %d", ret ); |
2144 TFLOGSTRING2("TSY: CMmNetTsy::GetNetworkRegistrationStatusL - Complete with error %d", ret ); |
2146 iMmPhoneTsy->ReqCompleted( aTsyReqHandle, ret ); |
2145 iMmPhoneTsy->ReqCompleted( aTsyReqHandle, ret ); |