diff options
| author | Aleksander Morgado <aleksandermj@chromium.org> | 2024-04-04 10:19:14 +0000 |
|---|---|---|
| committer | Dan Williams <dan@bigw.org> | 2024-04-12 01:17:14 +0000 |
| commit | c344e5a286b67ba98273a4bd47d5bc48ef7643b8 (patch) | |
| tree | a4e6043fe8354a8cd9ddad6d6a043efd3b6af03b | |
| parent | 19aebae1da64ca37122d91b0899b09fa9f1013d2 (diff) | |
broadband-modem-ublox: don't assume primary port always exists
| -rw-r--r-- | src/plugins/ublox/mm-broadband-modem-ublox.c | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/src/plugins/ublox/mm-broadband-modem-ublox.c b/src/plugins/ublox/mm-broadband-modem-ublox.c index 2859e4dd..1d501558 100644 --- a/src/plugins/ublox/mm-broadband-modem-ublox.c +++ b/src/plugins/ublox/mm-broadband-modem-ublox.c @@ -1124,31 +1124,29 @@ ublox_setup_ciev_handler (MMIfaceModem *self, { g_autoptr(GRegex) pattern = NULL; g_autofree gchar *ciev_regex = NULL; - MMPortSerialAt *primary_port; - MMPortSerialAt *secondary_port; + MMPortSerialAt *ports[2]; + guint i; - primary_port = mm_base_modem_peek_port_primary (MM_BASE_MODEM (self)); mm_obj_dbg (self, "setting up simind 'CIEV: %d' events handler", simind_idx); ciev_regex = g_strdup_printf ("\\r\\n\\+CIEV: %d,([0-1]{1})\\r\\n", simind_idx); pattern = g_regex_new (ciev_regex, G_REGEX_RAW | G_REGEX_OPTIMIZE, 0, NULL); g_assert (pattern); - mm_port_serial_at_add_unsolicited_msg_handler ( - primary_port, - pattern, - (MMPortSerialAtUnsolicitedMsgFn) ublox_ciev_unsolicited_handler, - self, - NULL); - secondary_port = mm_base_modem_get_port_secondary (MM_BASE_MODEM (self)); - if (secondary_port) + 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 < G_N_ELEMENTS (ports); i++) { + if (!ports[i]) + continue; + mm_port_serial_at_add_unsolicited_msg_handler ( - secondary_port, + ports[i], pattern, (MMPortSerialAtUnsolicitedMsgFn) ublox_ciev_unsolicited_handler, self, NULL); + } } static void |