api,firmware: expose device ids

This commit is contained in:
Aleksander Morgado
2019-01-03 18:53:52 +00:00
committed by Dan Williams
parent bc39201f76
commit 67b3b830c8
8 changed files with 139 additions and 26 deletions
+10 -6
View File
@@ -142,17 +142,20 @@ mmcli_modem_firmware_shutdown (void)
static void
print_firmware_status (void)
{
MMFirmwareUpdateSettings *update_settings;
const gchar *method = NULL;
const gchar *fastboot_at = NULL;
MMFirmwareUpdateSettings *update_settings;
const gchar *method = NULL;
const gchar **device_ids = NULL;
const gchar *fastboot_at = NULL;
update_settings = mm_modem_firmware_peek_update_settings (ctx->modem_firmware);
if (update_settings) {
MMModemFirmwareUpdateMethod m;
m = mm_firmware_update_settings_get_method (update_settings);
if (m != MM_MODEM_FIRMWARE_UPDATE_METHOD_UNKNOWN)
if (m != MM_MODEM_FIRMWARE_UPDATE_METHOD_UNKNOWN) {
method = mm_modem_firmware_update_method_get_string (m);
device_ids = mm_firmware_update_settings_get_device_ids (update_settings);
}
switch (m) {
case MM_MODEM_FIRMWARE_UPDATE_METHOD_FASTBOOT:
@@ -175,8 +178,9 @@ print_firmware_status (void)
exit (EXIT_FAILURE);
}
mmcli_output_string (MMC_F_FIRMWARE_METHOD, method);
mmcli_output_string (MMC_F_FIRMWARE_FASTBOOT_AT, fastboot_at);
mmcli_output_string (MMC_F_FIRMWARE_METHOD, method);
mmcli_output_string_array (MMC_F_FIRMWARE_DEVICE_IDS, device_ids, FALSE);
mmcli_output_string (MMC_F_FIRMWARE_FASTBOOT_AT, fastboot_at);
mmcli_output_dump ();
}
+1
View File
@@ -191,6 +191,7 @@ static FieldInfo field_infos[] = {
[MMC_F_LOCATION_CDMABS_LAT] = { "modem.location.cdma-bs.latitude", "latitude", MMC_S_MODEM_LOCATION_CDMABS, },
[MMC_F_FIRMWARE_LIST] = { "modem.firmware.list", "list", MMC_S_MODEM_FIRMWARE, },
[MMC_F_FIRMWARE_METHOD] = { "modem.firmware.method", "method", MMC_S_MODEM_FIRMWARE, },
[MMC_F_FIRMWARE_DEVICE_IDS] = { "modem.firmware.device-ids", "device ids", MMC_S_MODEM_FIRMWARE, },
[MMC_F_FIRMWARE_FASTBOOT_AT] = { "modem.firmware.fastboot.at", "at command", MMC_S_MODEM_FIRMWARE_FASTBOOT, },
[MMC_F_BEARER_GENERAL_DBUS_PATH] = { "bearer.dbus-path", "dbus path", MMC_S_BEARER_GENERAL, },
[MMC_F_BEARER_GENERAL_TYPE] = { "bearer.type", "type", MMC_S_BEARER_GENERAL, },
+1
View File
@@ -204,6 +204,7 @@ typedef enum {
/* Firmware status section */
MMC_F_FIRMWARE_LIST,
MMC_F_FIRMWARE_METHOD,
MMC_F_FIRMWARE_DEVICE_IDS,
MMC_F_FIRMWARE_FASTBOOT_AT,
/* Bearer general section */
MMC_F_BEARER_GENERAL_DBUS_PATH,