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

huawei: only tag GETPORTMODE supported if it was really used

Browse Source 
E.g. do nothing if the response is empty:

 <debug> (ttyUSB1): -->'AT^GETPORTMODE<CR>'
 <debug> (ttyUSB1): <--'<CR><LF>^GETPORTMODE: TYPE: WCDMA: Huawei Technologies Co.,Ltd.,<CR><LF><CR><LF>OK<CR><LF>'
This commit is contained in:
Aleksander Morgado
2020-01-21 12:21:28 +01:00
parent 353e27065d
commit 6eabfd27bf
1 changed files with 15 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
plugins/huawei/mm-plugin-huawei.c
View File

@@ -99,7 +99,7 @@ huawei_custom_init_finish (MMPortProbe *probe,
static void huawei_custom_init_step (GTask *task); static void huawei_custom_init_step (GTask *task);
static void static gboolean
cache_port_mode (MMDevice *device, cache_port_mode (MMDevice *device,
const gchar *reply, const gchar *reply,
const gchar *type, const gchar *type,
@@ -114,9 +114,12 @@ cache_port_mode (MMDevice *device,
errno = 0; errno = 0;
/* shift by 1 so NULL return from g_object_get_data() means no tag */ /* shift by 1 so NULL return from g_object_get_data() means no tag */
i = 1 + strtol (p + strlen (type), NULL, 10); i = 1 + strtol (p + strlen (type), NULL, 10);
if (i > 0 && i < 256 && errno == 0) if (i > 0 && i < 256 && errno == 0) {
g_object_set_data (G_OBJECT (device), tag, GUINT_TO_POINTER ((guint) i)); g_object_set_data (G_OBJECT (device), tag, GINT_TO_POINTER ((gint) i));
return TRUE;
} }
}
return FALSE;
} }
static void static void
@@ -146,19 +149,21 @@ getportmode_ready (MMPortSerialAt *port,
/* Port mode not supported */ /* Port mode not supported */
} else { } else {
MMDevice *device; MMDevice *device;
guint n_cached_port_modes = 0;
mm_dbg ("(Huawei) port mode layout retrieved"); mm_dbg ("(Huawei) port mode layout retrieved");
/* Results are cached in the parent device object */ /* Results are cached in the parent device object */
device = mm_port_probe_peek_device (ctx->probe); device = mm_port_probe_peek_device (ctx->probe);
cache_port_mode (device, response, "PCUI:", TAG_HUAWEI_PCUI_PORT); n_cached_port_modes += cache_port_mode (device, response, "PCUI:", TAG_HUAWEI_PCUI_PORT);
cache_port_mode (device, response, "MDM:", TAG_HUAWEI_MODEM_PORT); n_cached_port_modes += cache_port_mode (device, response, "MDM:", TAG_HUAWEI_MODEM_PORT);
cache_port_mode (device, response, "NDIS:", TAG_HUAWEI_NDIS_PORT); n_cached_port_modes += cache_port_mode (device, response, "NDIS:", TAG_HUAWEI_NDIS_PORT);
cache_port_mode (device, response, "DIAG:", TAG_HUAWEI_DIAG_PORT); n_cached_port_modes += cache_port_mode (device, response, "DIAG:", TAG_HUAWEI_DIAG_PORT);
/* GETPORTMODE response format in newer devices... (e.g. E3372) */ /* GETPORTMODE response format in newer devices... (e.g. E3372) */
cache_port_mode (device, response, "pcui:", TAG_HUAWEI_PCUI_PORT); n_cached_port_modes += cache_port_mode (device, response, "pcui:", TAG_HUAWEI_PCUI_PORT);
cache_port_mode (device, response, "modem:", TAG_HUAWEI_MODEM_PORT); n_cached_port_modes += cache_port_mode (device, response, "modem:", TAG_HUAWEI_MODEM_PORT);
if (n_cached_port_modes > 0)
g_object_set_data (G_OBJECT (device), TAG_GETPORTMODE_SUPPORTED, GUINT_TO_POINTER (TRUE)); g_object_set_data (G_OBJECT (device), TAG_GETPORTMODE_SUPPORTED, GUINT_TO_POINTER (TRUE));
/* Mark port as being AT already */ /* Mark port as being AT already */