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

huawei: ignore ^RFSWITCH unsolicited messages

Browse Source 
This patch ignores the ^RFSWITCH unsolicited messages in order to avoid
them being mixed with other unsolicited messages. The modem power state
is explicitly determined by the ^RFSWITCH? command, if supported, so we
don't need to depend on the ^RFSWITCH unsolicited messages.
This commit is contained in:
Ben Chan
2013-08-21 17:32:59 -07:00
committed by Aleksander Morgado
parent 0f2a0aa0bc
commit 82eb2158db
1 changed files with 38 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
plugins/huawei/mm-broadband-modem-huawei.c
View File

@@ -97,6 +97,7 @@ struct _MMBroadbandModemHuaweiPrivate {
GRegex *ndisstat_regex; GRegex *ndisstat_regex;
GRegex *pdpdeact_regex; GRegex *pdpdeact_regex;
GRegex *ndisend_regex; GRegex *ndisend_regex;
GRegex *rfswitch_regex;
NdisdupSupport ndisdup_support; NdisdupSupport ndisdup_support;
RfswitchSupport rfswitch_support; RfswitchSupport rfswitch_support;
@@ -2625,6 +2626,27 @@ modem_time_load_network_time (MMIfaceModemTime *self,
/*****************************************************************************/ /*****************************************************************************/
/* Power state loading (Modem interface) */ /* Power state loading (Modem interface) */
static void
enable_disable_unsolicited_rfswitch_event_handler (MMBroadbandModemHuawei *self,
gboolean enable)
{
MMAtSerialPort *ports[2];
guint i;
mm_dbg ("%s ^RFSWITCH unsolicited event handler",
enable ? "Enable" : "Disable");
ports[0] = mm_base_modem_peek_port_primary (MM_BASE_MODEM (self));
ports[1] = mm_base_modem_peek_port_secondary (MM_BASE_MODEM (self));
for (i = 0; i < 2; i++)
if (ports[i])
mm_at_serial_port_enable_disable_unsolicited_msg_handler (
ports[i],
self->priv->rfswitch_regex,
enable);
}
static void static void
parent_load_power_state_ready (MMIfaceModem *self, parent_load_power_state_ready (MMIfaceModem *self,
GAsyncResult *res, GAsyncResult *res,
@@ -2653,6 +2675,9 @@ huawei_rfswitch_check_ready (MMBaseModem *_self,
const gchar *response; const gchar *response;
gint sw_state; gint sw_state;
enable_disable_unsolicited_rfswitch_event_handler (MM_BROADBAND_MODEM_HUAWEI (self),
TRUE /* enable */);
response = mm_base_modem_at_command_finish (_self, res, &error); response = mm_base_modem_at_command_finish (_self, res, &error);
if (response) { if (response) {
response = mm_strip_tag (response, "^RFSWITCH:"); response = mm_strip_tag (response, "^RFSWITCH:");
@@ -2728,6 +2753,12 @@ load_power_state (MMIfaceModem *self,
switch (MM_BROADBAND_MODEM_HUAWEI (self)->priv->rfswitch_support) { switch (MM_BROADBAND_MODEM_HUAWEI (self)->priv->rfswitch_support) {
case RFSWITCH_SUPPORT_UNKNOWN: case RFSWITCH_SUPPORT_UNKNOWN:
case RFSWITCH_SUPPORTED: { case RFSWITCH_SUPPORTED: {
/* Temporarily disable the unsolicited ^RFSWITCH event handler in order to
* prevent it from discarding the response to the ^RFSWITCH? command.
* It will be re-enabled in huawei_rfswitch_check_ready.
*/
enable_disable_unsolicited_rfswitch_event_handler (MM_BROADBAND_MODEM_HUAWEI (self),
FALSE /* enable */);
mm_base_modem_at_command (MM_BASE_MODEM (self), mm_base_modem_at_command (MM_BASE_MODEM (self),
"^RFSWITCH?", "^RFSWITCH?",
3, 3,
@@ -2934,6 +2965,10 @@ set_ignored_unsolicited_events_handlers (MMBroadbandModemHuawei *self)
ports[i], ports[i],
self->priv->ndisend_regex, self->priv->ndisend_regex,
NULL, NULL, NULL); NULL, NULL, NULL);
mm_at_serial_port_add_unsolicited_msg_handler (
ports[i],
self->priv->rfswitch_regex,
NULL, NULL, NULL);
} }
} }
@@ -3013,6 +3048,8 @@ mm_broadband_modem_huawei_init (MMBroadbandModemHuawei *self)
G_REGEX_RAW | G_REGEX_OPTIMIZE, 0, NULL); G_REGEX_RAW | G_REGEX_OPTIMIZE, 0, NULL);
self->priv->ndisend_regex = g_regex_new ("\\r\\n\\^NDISEND:.+\\r+\\n", self->priv->ndisend_regex = g_regex_new ("\\r\\n\\^NDISEND:.+\\r+\\n",
G_REGEX_RAW | G_REGEX_OPTIMIZE, 0, NULL); G_REGEX_RAW | G_REGEX_OPTIMIZE, 0, NULL);
self->priv->rfswitch_regex = g_regex_new ("\\r\\n\\^RFSWITCH:.+\\r\\n",
G_REGEX_RAW | G_REGEX_OPTIMIZE, 0, NULL);
self->priv->ndisdup_support = NDISDUP_SUPPORT_UNKNOWN; self->priv->ndisdup_support = NDISDUP_SUPPORT_UNKNOWN;
self->priv->rfswitch_support = RFSWITCH_SUPPORT_UNKNOWN; self->priv->rfswitch_support = RFSWITCH_SUPPORT_UNKNOWN;
@@ -3042,6 +3079,7 @@ finalize (GObject *object)
g_regex_unref (self->priv->ndisstat_regex); g_regex_unref (self->priv->ndisstat_regex);
g_regex_unref (self->priv->pdpdeact_regex); g_regex_unref (self->priv->pdpdeact_regex);
g_regex_unref (self->priv->ndisend_regex); g_regex_unref (self->priv->ndisend_regex);
g_regex_unref (self->priv->rfswitch_regex);
G_OBJECT_CLASS (mm_broadband_modem_huawei_parent_class)->finalize (object); G_OBJECT_CLASS (mm_broadband_modem_huawei_parent_class)->finalize (object);
} }