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

gsm: only set auto registration if the modem isn't idle (related: bgo #591047)

Browse Source 
Some modems (Huawei E1552) appear to have problems with auto registration
in some circumstances that we don't yet fully understand, such that when
AT+COPS=0 is sent they never end up registering with the correct network.
As a minor workaround, if the modem is already registered with a provider
and the user hasn't specified manual registration, don't set auto
registration but let the modem figure it out itself.

See (bgo #591047) for more details.
This commit is contained in:
Dan Williams
2010-03-28 09:30:16 -07:00
parent fe69ab4210
commit 4d426ebbbd
1 changed files with 28 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/mm-generic-gsm.c
+28 -5
View File
@@ -82,6 +82,7 @@ typedef struct {
MMModemGsmNetworkRegStatus reg_status;
guint pending_reg_id;
MMCallbackInfo *pending_reg_info;
gboolean manual_reg;
guint signal_quality_id;
time_t signal_quality_timestamp;
@@ -1841,6 +1842,16 @@ registration_timed_out (gpointer data)
return FALSE;
}
static gboolean
reg_is_idle (MMModemGsmNetworkRegStatus status)
{
if ( status == MM_MODEM_GSM_NETWORK_REG_STATUS_HOME
|| status == MM_MODEM_GSM_NETWORK_REG_STATUS_ROAMING
|| status == MM_MODEM_GSM_NETWORK_REG_STATUS_SEARCHING)
return FALSE;
return TRUE;
}
static void
do_register (MMModemGsmNetwork *modem,
const char *network_id,
@@ -1849,7 +1860,7 @@ do_register (MMModemGsmNetwork *modem,
{
MMGenericGsmPrivate *priv = MM_GENERIC_GSM_GET_PRIVATE (modem);
MMCallbackInfo *info;
char *command;
char *command = NULL;
/* Clear any previous registration */
mm_generic_gsm_pending_registration_stop (MM_GENERIC_GSM (modem));
@@ -1859,10 +1870,18 @@ do_register (MMModemGsmNetwork *modem,
priv->pending_reg_id = g_timeout_add_seconds (60, registration_timed_out, info);
priv->pending_reg_info = info;
if (network_id)
/* If the user sent a specific network to use, lock it in. If no specific
* network was given, and the modem is not registered and not searching,
* kick it to search for a network. Also do auto registration if the modem
* had been set to manual registration last time but now is not.
*/
if (network_id) {
command = g_strdup_printf ("+COPS=1,2,\"%s\"", network_id);
else
priv->manual_reg = TRUE;
} else if (reg_is_idle (priv->reg_status) || priv->manual_reg) {
command = g_strdup ("+COPS=0,,");
priv->manual_reg = FALSE;
}
/* Ref the callback info to ensure it stays alive for register_done() even
* if the timeout triggers and ends registration (which calls the callback
@@ -1882,8 +1901,12 @@ do_register (MMModemGsmNetwork *modem,
* the +COPS response is never received.
*/
mm_callback_info_ref (info);
mm_at_serial_port_queue_command (priv->primary, command, 120, register_done, info);
g_free (command);
if (command) {
mm_at_serial_port_queue_command (priv->primary, command, 120, register_done, info);
g_free (command);
} else
register_done (priv->primary, NULL, NULL, info);
}
static void