colin/ModemManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

broadband-modem-qmi: LAC/CID not given in all serving system indications

Browse Source 
LAC/CID may only be given in the serving system indications when the values
change, and therefore we shouldn't reset the values to 0 whenever they're not
reported.

This seems to happen in newer devices; older devices like the MC7710 did always
report the values in the indications.
This commit is contained in:
Aleksander Morgado
2015-10-13 10:41:10 +02:00
parent 2c0da94319
commit 1cb68c810e
1 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/mm-broadband-modem-qmi.c
View File

@@ -4196,21 +4196,22 @@ common_process_serving_system_3gpp (MMBroadbandModemQmi *self,
mnc); mnc);
} }
/* Get 3GPP location LAC and CI */
lac = 0;
cid = 0;
if (response_output) {
qmi_message_nas_get_serving_system_output_get_lac_3gpp (response_output, &lac, NULL);
qmi_message_nas_get_serving_system_output_get_cid_3gpp (response_output, &cid, NULL);
} else {
qmi_indication_nas_serving_system_output_get_lac_3gpp (indication_output, &lac, NULL);
qmi_indication_nas_serving_system_output_get_cid_3gpp (indication_output, &cid, NULL);
}
/* Report new registration states */ /* Report new registration states */
mm_iface_modem_3gpp_update_cs_registration_state (MM_IFACE_MODEM_3GPP (self), mm_cs_registration_state); mm_iface_modem_3gpp_update_cs_registration_state (MM_IFACE_MODEM_3GPP (self), mm_cs_registration_state);
mm_iface_modem_3gpp_update_ps_registration_state (MM_IFACE_MODEM_3GPP (self), mm_ps_registration_state); mm_iface_modem_3gpp_update_ps_registration_state (MM_IFACE_MODEM_3GPP (self), mm_ps_registration_state);
mm_iface_modem_3gpp_update_location (MM_IFACE_MODEM_3GPP (self), lac, cid);
/* Get 3GPP location LAC and CI */
lac = 0;
cid = 0;
if ((response_output &&
qmi_message_nas_get_serving_system_output_get_lac_3gpp (response_output, &lac, NULL) &&
qmi_message_nas_get_serving_system_output_get_cid_3gpp (response_output, &cid, NULL)) ||
(indication_output &&
qmi_indication_nas_serving_system_output_get_lac_3gpp (indication_output, &lac, NULL) &&
qmi_indication_nas_serving_system_output_get_cid_3gpp (indication_output, &cid, NULL))) {
/* Only update info in the interface if we get something */
mm_iface_modem_3gpp_update_location (MM_IFACE_MODEM_3GPP (self), lac, cid);
}
/* Note: don't update access technologies with the ones retrieved here; they /* Note: don't update access technologies with the ones retrieved here; they
* are not really the 'current' access technologies */ * are not really the 'current' access technologies */