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

huawei: update to correct secondary port request and regex masking for ^POSITION

Browse Source
This commit is contained in:
Marc Murphy
2015-06-18 08:28:28 +01:00
committed by Aleksander Morgado
parent 0ac7feb797
commit 1f270c09d0
1 changed files with 17 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -101,6 +101,8 @@ struct _MMBroadbandModemHuaweiPrivate {
GRegex *pdpdeact_regex; GRegex *pdpdeact_regex;
GRegex *ndisend_regex; GRegex *ndisend_regex;
GRegex *rfswitch_regex; GRegex *rfswitch_regex;
GRegex *position_regex;
GRegex *posend_regex;
FeatureSupport ndisdup_support; FeatureSupport ndisdup_support;
FeatureSupport rfswitch_support; FeatureSupport rfswitch_support;
@@ -133,7 +135,7 @@ get_at_port_list (MMBroadbandModemHuawei *self)
out = g_list_append (out, port); out = g_list_append (out, port);
/* Secondary */ /* Secondary */
port = mm_base_modem_get_port_primary (MM_BASE_MODEM (self)); port = mm_base_modem_get_port_secondary (MM_BASE_MODEM (self));
if (port) if (port)
out = g_list_append (out, port); out = g_list_append (out, port);
@@ -3634,6 +3636,14 @@ set_ignored_unsolicited_events_handlers (MMBroadbandModemHuawei *self)
port, port,
self->priv->rfswitch_regex, self->priv->rfswitch_regex,
NULL, NULL, NULL); NULL, NULL, NULL);
mm_port_serial_at_add_unsolicited_msg_handler (
port,
self->priv->position_regex,
NULL, NULL, NULL);
mm_port_serial_at_add_unsolicited_msg_handler (
port,
self->priv->posend_regex,
NULL, NULL, NULL);
} }
g_list_free_full (ports, (GDestroyNotify)g_object_unref); g_list_free_full (ports, (GDestroyNotify)g_object_unref);
@@ -3745,6 +3755,10 @@ 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->rfswitch_regex = g_regex_new ("\\r\\n\\^RFSWITCH:.+\\r\\n", self->priv->rfswitch_regex = g_regex_new ("\\r\\n\\^RFSWITCH:.+\\r\\n",
G_REGEX_RAW | G_REGEX_OPTIMIZE, 0, NULL); G_REGEX_RAW | G_REGEX_OPTIMIZE, 0, NULL);
self->priv->position_regex = g_regex_new ("\\r\\n\\^POSITION:.+\\r\\n",
G_REGEX_RAW | G_REGEX_OPTIMIZE, 0, NULL);
self->priv->posend_regex = g_regex_new ("\\r\\n\\^POSEND:.+\\r\\n",
G_REGEX_RAW | G_REGEX_OPTIMIZE, 0, NULL);
self->priv->ndisdup_support = FEATURE_SUPPORT_UNKNOWN; self->priv->ndisdup_support = FEATURE_SUPPORT_UNKNOWN;
self->priv->rfswitch_support = FEATURE_SUPPORT_UNKNOWN; self->priv->rfswitch_support = FEATURE_SUPPORT_UNKNOWN;
@@ -3780,6 +3794,8 @@ finalize (GObject *object)
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_regex_unref (self->priv->rfswitch_regex);
g_regex_unref (self->priv->position_regex);
g_regex_unref (self->priv->posend_regex);
if (self->priv->syscfg_supported_modes) if (self->priv->syscfg_supported_modes)
g_array_unref (self->priv->syscfg_supported_modes); g_array_unref (self->priv->syscfg_supported_modes);