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

base-modem: sort port info array by port name

Browse Source 
So that the list of ports shown in the Ports DBus property is also
alphabetically sorted by port name, instead of having a mess like
this:

  -----------------------------
  System   |            device: qcom-soc
           |           drivers: bam-dmux
           |            plugin: qcom-soc
           |      primary port: rpmsg0
           |             ports: rmnet5 (net), rmnet_usb0 (unknown), rmnet4 (net),
           |                    rpmsg1 (at), rmnet3 (net), rpmsg0 (qmi), rmnet2 (net), rmnet1 (net),
           |                    rmnet7 (net), rmnet0 (net), rmnet6 (net)
This commit is contained in:
Aleksander Morgado
2020-10-25 22:10:28 +01:00
parent a174edb74d
commit c385031941
1 changed files with 28 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
src/mm-base-modem.c
View File

@@ -928,56 +928,66 @@ mm_base_modem_has_at_port (MMBaseModem *self)
return FALSE; return FALSE;
} }
static gint
port_info_cmp (const MMModemPortInfo *a,
const MMModemPortInfo *b)
{
/* default to alphabetical sorting on the port name */
return g_strcmp0 (a->name, b->name);
}
MMModemPortInfo * MMModemPortInfo *
mm_base_modem_get_port_infos (MMBaseModem *self, mm_base_modem_get_port_infos (MMBaseModem *self,
guint *n_port_infos) guint *n_port_infos)
{ {
GHashTableIter iter; GHashTableIter iter;
MMModemPortInfo *port_infos; GArray *port_infos;
MMPort *port; MMPort *port;
guint i;
*n_port_infos = g_hash_table_size (self->priv->ports); *n_port_infos = g_hash_table_size (self->priv->ports);
port_infos = g_new (MMModemPortInfo, *n_port_infos); port_infos = g_array_sized_new (FALSE, FALSE, sizeof (MMModemPortInfo), *n_port_infos);
g_hash_table_iter_init (&iter, self->priv->ports); g_hash_table_iter_init (&iter, self->priv->ports);
i = 0;
while (g_hash_table_iter_next (&iter, NULL, (gpointer)&port)) { while (g_hash_table_iter_next (&iter, NULL, (gpointer)&port)) {
port_infos[i].name = g_strdup (mm_port_get_device (port)); MMModemPortInfo port_info;
port_info.name = g_strdup (mm_port_get_device (port));
switch (mm_port_get_port_type (port)) { switch (mm_port_get_port_type (port)) {
case MM_PORT_TYPE_NET: case MM_PORT_TYPE_NET:
port_infos[i].type = MM_MODEM_PORT_TYPE_NET; port_info.type = MM_MODEM_PORT_TYPE_NET;
break; break;
case MM_PORT_TYPE_AT: case MM_PORT_TYPE_AT:
port_infos[i].type = MM_MODEM_PORT_TYPE_AT; port_info.type = MM_MODEM_PORT_TYPE_AT;
break; break;
case MM_PORT_TYPE_QCDM: case MM_PORT_TYPE_QCDM:
port_infos[i].type = MM_MODEM_PORT_TYPE_QCDM; port_info.type = MM_MODEM_PORT_TYPE_QCDM;
break; break;
case MM_PORT_TYPE_GPS: case MM_PORT_TYPE_GPS:
port_infos[i].type = MM_MODEM_PORT_TYPE_GPS; port_info.type = MM_MODEM_PORT_TYPE_GPS;
break; break;
case MM_PORT_TYPE_AUDIO: case MM_PORT_TYPE_AUDIO:
port_infos[i].type = MM_MODEM_PORT_TYPE_AUDIO; port_info.type = MM_MODEM_PORT_TYPE_AUDIO;
break; break;
case MM_PORT_TYPE_QMI: case MM_PORT_TYPE_QMI:
port_infos[i].type = MM_MODEM_PORT_TYPE_QMI; port_info.type = MM_MODEM_PORT_TYPE_QMI;
break; break;
case MM_PORT_TYPE_MBIM: case MM_PORT_TYPE_MBIM:
port_infos[i].type = MM_MODEM_PORT_TYPE_MBIM; port_info.type = MM_MODEM_PORT_TYPE_MBIM;
break; break;
case MM_PORT_TYPE_IGNORED: case MM_PORT_TYPE_IGNORED:
port_info.type = MM_MODEM_PORT_TYPE_IGNORED; port_info.type = MM_MODEM_PORT_TYPE_IGNORED;
break; break;
case MM_PORT_TYPE_UNKNOWN: case MM_PORT_TYPE_UNKNOWN:
default: default:
port_infos[i].type = MM_MODEM_PORT_TYPE_UNKNOWN; port_info.type = MM_MODEM_PORT_TYPE_UNKNOWN;
break; break;
} }
i++; g_array_append_val (port_infos, port_info);
} }
return port_infos; g_assert (*n_port_infos == port_infos->len);
g_array_sort (port_infos, (GCompareFunc) port_info_cmp);
return (MMModemPortInfo *) g_array_free (port_infos, FALSE);
} }
GList * GList *