equal
deleted
inserted
replaced
121 } |
121 } |
122 else |
122 else |
123 { |
123 { |
124 geoCell = CLbtGeoWcdmaCell::NewL(); |
124 geoCell = CLbtGeoWcdmaCell::NewL(); |
125 } |
125 } |
|
126 CleanupStack::PushL( geoCell ); |
126 geoCell->SetNetworkType( iNetworkMode ); |
127 geoCell->SetNetworkType( iNetworkMode ); |
127 geoCell->SetNetworkCountryCode( iNwInfo.iCountryCode ); |
128 geoCell->SetNetworkCountryCode( iNwInfo.iCountryCode ); |
128 geoCell->SetNetworkIdentityCode( iNwInfo.iNetworkId ); |
129 geoCell->SetNetworkIdentityCode( iNwInfo.iNetworkId ); |
129 geoCell->SetLocationAreaCode( iLocArea.iLocationAreaCode ); |
130 geoCell->SetLocationAreaCode( iLocArea.iLocationAreaCode ); |
130 geoCell->SetCellId( iLocArea.iCellId ); |
131 geoCell->SetCellId( iLocArea.iCellId ); |
135 RArray<TInt> bsicArray; |
136 RArray<TInt> bsicArray; |
136 for( TInt i=0;i<15;i++ ) // 15 is max available Nmr value |
137 for( TInt i=0;i<15;i++ ) // 15 is max available Nmr value |
137 { |
138 { |
138 if( iCellInfo.iGsmCellInfo.iNmr[i].iBSIC != -1 ) |
139 if( iCellInfo.iGsmCellInfo.iNmr[i].iBSIC != -1 ) |
139 { |
140 { |
140 bsicArray.Append( iCellInfo.iGsmCellInfo.iNmr[i].iBSIC ); |
141 bsicArray.AppendL( iCellInfo.iGsmCellInfo.iNmr[i].iBSIC ); |
141 } |
142 } |
142 } |
143 } |
143 gsmCell->SetBsic( bsicArray ); |
144 gsmCell->SetBsic( bsicArray ); |
144 geoCell = gsmCell; |
145 geoCell = gsmCell; |
145 } |
146 } |
167 if( (rscp != -1) && (ecNo != -1) ) |
168 if( (rscp != -1) && (ecNo != -1) ) |
168 { |
169 { |
169 TLbtWcdmaCellInfo::TLbtCellMeasuredResult cellMsr; |
170 TLbtWcdmaCellInfo::TLbtCellMeasuredResult cellMsr; |
170 cellMsr.iEcNo = ecNo; |
171 cellMsr.iEcNo = ecNo; |
171 cellMsr.iRscp = rscp; |
172 cellMsr.iRscp = rscp; |
172 wcdmaCellInfo.iMeasurementResult.Append(cellMsr); |
173 wcdmaCellInfo.iMeasurementResult.AppendL(cellMsr); |
173 } |
174 } |
174 } |
175 } |
175 } |
176 } |
176 wcdmaCell->SetWcdmaCellInfo(wcdmaCellInfo); |
177 wcdmaCell->SetWcdmaCellInfo(wcdmaCellInfo); |
177 geoCell = wcdmaCell; |
178 geoCell = wcdmaCell; |
178 } |
179 } |
|
180 CleanupStack::Pop( geoCell ); |
179 *(iArea) = geoCell; |
181 *(iArea) = geoCell; |
180 TRequestStatus* status = &iClientStatus; |
182 TRequestStatus* status = &iClientStatus; |
181 User::RequestComplete( status, iStatus.Int() ); |
183 User::RequestComplete( status, iStatus.Int() ); |
182 } |
184 } |
183 } |
185 } |