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

api,firmware: MMModemFirmwareUpdateMethod as flags, not enum

Browse Source 
Devices may require/support more than one update method, so instead of
reporting the method as a single enum value, use a set of flags
instead.
This commit is contained in:
Aleksander Morgado
2019-01-03 18:53:52 +00:00
committed by Dan Williams
parent f35d64a899
commit 87712c27f5
6 changed files with 41 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cli/mmcli-modem-firmware.c
+4 -4
View File
@@ -143,7 +143,7 @@ static void
print_firmware_status (void)
{
MMFirmwareUpdateSettings *update_settings;
const gchar *method = NULL;
gchar *method = NULL;
const gchar **device_ids = NULL;
const gchar *version = NULL;
const gchar *fastboot_at = NULL;
@@ -153,8 +153,8 @@ print_firmware_status (void)
MMModemFirmwareUpdateMethod m;
m = mm_firmware_update_settings_get_method (update_settings);
if (m != MM_MODEM_FIRMWARE_UPDATE_METHOD_UNKNOWN) {
method = mm_modem_firmware_update_method_get_string (m);
if (m != MM_MODEM_FIRMWARE_UPDATE_METHOD_NONE) {
method = mm_modem_firmware_update_method_build_string_from_mask (m);
device_ids = mm_firmware_update_settings_get_device_ids (update_settings);
version = mm_firmware_update_settings_get_version (update_settings);
}
@@ -180,7 +180,7 @@ print_firmware_status (void)
exit (EXIT_FAILURE);
}
mmcli_output_string (MMC_F_FIRMWARE_METHOD, method);
mmcli_output_string_take (MMC_F_FIRMWARE_METHOD, method);
mmcli_output_string_array (MMC_F_FIRMWARE_DEVICE_IDS, device_ids, TRUE);
mmcli_output_string (MMC_F_FIRMWARE_VERSION, version);
mmcli_output_string (MMC_F_FIRMWARE_FASTBOOT_AT, fastboot_at);