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

gsm: clean up periodic poll start/stop and poll signal strength

Browse Source
This commit is contained in:
Dan Williams
2010-04-05 10:47:14 -07:00
parent 7da2b5cb6a
commit a55265f03a
1 changed files with 37 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
src/mm-generic-gsm.c
View File

@@ -524,6 +524,15 @@ reg_poll_response (MMAtSerialPort *port,
handle_reg_status_response (self, response, NULL); handle_reg_status_response (self, response, NULL);
} }
static void
periodic_signal_quality_cb (MMModem *modem,
guint32 result,
GError *error,
gpointer user_data)
{
/* Cached signal quality already updated */
}
static gboolean static gboolean
periodic_poll_cb (gpointer user_data) periodic_poll_cb (gpointer user_data)
{ {
@@ -540,6 +549,10 @@ periodic_poll_cb (gpointer user_data)
if (priv->cgreg_poll) if (priv->cgreg_poll)
mm_at_serial_port_queue_command (port, "+CGREG?", 10, reg_poll_response, self); mm_at_serial_port_queue_command (port, "+CGREG?", 10, reg_poll_response, self);
mm_modem_gsm_network_get_signal_quality (MM_MODEM_GSM_NETWORK (self),
periodic_signal_quality_cb,
NULL);
return TRUE; /* continue running */ return TRUE; /* continue running */
} }
@@ -560,8 +573,6 @@ cgreg1_done (MMAtSerialPort *port,
/* The modem doesn't like unsolicited CGREG, so we'll need to poll */ /* The modem doesn't like unsolicited CGREG, so we'll need to poll */
priv->cgreg_poll = TRUE; priv->cgreg_poll = TRUE;
if (!priv->poll_id)
priv->poll_id = g_timeout_add_seconds (10, periodic_poll_cb, info->modem);
} }
/* Success; get initial state */ /* Success; get initial state */
mm_at_serial_port_queue_command (port, "+CGREG?", 10, reg_poll_response, info->modem); mm_at_serial_port_queue_command (port, "+CGREG?", 10, reg_poll_response, info->modem);
@@ -614,8 +625,6 @@ creg1_done (MMAtSerialPort *port,
/* The modem doesn't like unsolicited CREG, so we'll need to poll */ /* The modem doesn't like unsolicited CREG, so we'll need to poll */
priv->creg_poll = TRUE; priv->creg_poll = TRUE;
if (!priv->poll_id)
priv->poll_id = g_timeout_add_seconds (10, periodic_poll_cb, info->modem);
} }
/* Success; get initial state */ /* Success; get initial state */
mm_at_serial_port_queue_command (port, "+CREG?", 10, reg_poll_response, info->modem); mm_at_serial_port_queue_command (port, "+CREG?", 10, reg_poll_response, info->modem);
@@ -3345,6 +3354,27 @@ simple_get_status (MMModemSimple *simple,
/*****************************************************************************/ /*****************************************************************************/
static void
modem_state_changed (MMGenericGsm *self, GParamSpec *pspec, gpointer user_data)
{
MMGenericGsmPrivate *priv = MM_GENERIC_GSM_GET_PRIVATE (self);
MMModemState state;
/* Start polling registration status and signal quality when enabled */
state = mm_modem_get_state (MM_MODEM (self));
if (state >= MM_MODEM_STATE_ENABLED) {
if (!priv->poll_id)
priv->poll_id = g_timeout_add_seconds (30, periodic_poll_cb, self);
} else {
if (priv->poll_id)
g_source_remove (priv->poll_id);
priv->poll_id = 0;
}
}
/*****************************************************************************/
static void static void
modem_init (MMModem *modem_class) modem_init (MMModem *modem_class)
{ {
@@ -3411,6 +3441,9 @@ mm_generic_gsm_init (MMGenericGsm *self)
mm_properties_changed_signal_register_property (G_OBJECT (self), mm_properties_changed_signal_register_property (G_OBJECT (self),
MM_MODEM_GSM_NETWORK_ACCESS_TECHNOLOGY, MM_MODEM_GSM_NETWORK_ACCESS_TECHNOLOGY,
MM_MODEM_GSM_NETWORK_DBUS_INTERFACE); MM_MODEM_GSM_NETWORK_DBUS_INTERFACE);
g_signal_connect (self, "notify::" MM_MODEM_STATE,
G_CALLBACK (modem_state_changed), NULL);
} }
static void static void