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

api,modem: new 'SimSlots' and 'PrimarySimSlot' properties

Browse Source 
The 'SimSlots' property exposes an array of SIM object paths, with one
array item for each available SIM slot in the system. If a valid SIM
card is found in a given slot, the path of the SIM object will be
exposed in the array item; if no valid SIM card is found, the empty
object path ("/") will be exposed instead.

The 'PrimarySimSlot' property exposes which of the SIM slots available
in the system is the one configured as being primary. In a Multi-SIM
Single-Standby setup, the primary slot will be the one corresponding
to the single active SIM in the system. In a Multi-SIM Multi-Standby
setup, the primary slot will be the one configured to act as primary
(e.g. the one that will be used for the data connection) among all the
active SIM cards found.
This commit is contained in:
Aleksander Morgado
2020-08-01 09:59:27 +02:00
parent b2979c63eb
commit e7409b6898
12 changed files with 587 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
cli/mmcli-output.c
View File

@@ -147,7 +147,9 @@ static FieldInfo field_infos[] = {
[MMC_F_CDMA_REGISTRATION_CDMA1X] = { "modem.cdma.cdma1x-registration-state", "registration cdma1x", MMC_S_MODEM_CDMA, },
[MMC_F_CDMA_REGISTRATION_EVDO] = { "modem.cdma.evdo-registration-state", "registration evdo", MMC_S_MODEM_CDMA, },
[MMC_F_CDMA_ACTIVATION] = { "modem.cdma.activation-state", "activation", MMC_S_MODEM_CDMA, },
[MMC_F_SIM_PATH] = { "modem.generic.sim", "path", MMC_S_MODEM_SIM, },
[MMC_F_SIM_PATH] = { "modem.generic.sim", "primary sim path", MMC_S_MODEM_SIM, },
[MMC_F_SIM_PRIMARY_SLOT] = { "modem.generic.primary-sim-slot", NULL, MMC_S_MODEM_SIM, },
[MMC_F_SIM_SLOT_PATHS] = { "modem.generic.sim-slots", "sim slot paths", MMC_S_MODEM_SIM, },
[MMC_F_BEARER_PATHS] = { "modem.generic.bearers", "paths", MMC_S_MODEM_BEARER, },
[MMC_F_TIME_CURRENT] = { "modem.time.current", "current", MMC_S_MODEM_TIME, },
[MMC_F_TIMEZONE_CURRENT] = { "modem.timezone.current", "current", MMC_S_MODEM_TIMEZONE, },
@@ -569,6 +571,37 @@ mmcli_output_state (MMModemState state,
NULL);
}
/******************************************************************************/
/* (Custom) SIM slots output */
void
mmcli_output_sim_slots (gchar **sim_slot_paths,
guint primary_sim_slot)
{
guint i;
if (selected_type != MMC_OUTPUT_TYPE_HUMAN || !sim_slot_paths) {
mmcli_output_string_take (MMC_F_SIM_PRIMARY_SLOT, primary_sim_slot ? g_strdup_printf ("%u", primary_sim_slot) : NULL);
mmcli_output_string_array_take (MMC_F_SIM_SLOT_PATHS, sim_slot_paths ? sim_slot_paths : NULL, TRUE);
return;
}
/* Include SIM slot number in each item */
for (i = 0; sim_slot_paths[i]; i++) {
gchar *aux;
guint slot_number = i + 1;
aux = g_strdup_printf ("slot %u: %s%s",
slot_number,
g_str_equal (sim_slot_paths[i], "/") ? "none" : sim_slot_paths[i],
(primary_sim_slot == slot_number) ? " (active)" : "");
g_free (sim_slot_paths[i]);
sim_slot_paths[i] = aux;
}
mmcli_output_string_array_take (MMC_F_SIM_SLOT_PATHS, sim_slot_paths, TRUE);
}
/******************************************************************************/
/* (Custom) Network scan output */