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

iface-modem-firmware: expose device id builder

Browse Source 
Expose the generic device id method as a public API for plugins.
Plugins can call this method first and then add their own device ids on
top in case the generic ones aren't specific enough like in the case of
Quectel modems.
This commit is contained in:
Dylan Van Assche
2022-02-06 18:47:24 +01:00
parent bdf4d898f6
commit 90397fa1bb
2 changed files with 25 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
src/mm-iface-modem-firmware.c
View File

@@ -325,10 +325,9 @@ add_generic_version (MMBaseModem *self,
return TRUE; return TRUE;
} }
static gboolean GPtrArray *
add_generic_device_ids (MMBaseModem *self, mm_iface_firmware_build_generic_device_ids (MMIfaceModemFirmware *self,
MMFirmwareUpdateSettings *update_settings, GError **error)
GError **error)
{ {
static const gchar *supported_subsystems[] = { "USB", "PCI" }; static const gchar *supported_subsystems[] = { "USB", "PCI" };
guint16 vid; guint16 vid;
@@ -341,8 +340,8 @@ add_generic_device_ids (MMBaseModem *self,
guint i; guint i;
gboolean ignore_carrier = FALSE; gboolean ignore_carrier = FALSE;
vid = mm_base_modem_get_vendor_id (self); vid = mm_base_modem_get_vendor_id (MM_BASE_MODEM (self));
pid = mm_base_modem_get_product_id (self); pid = mm_base_modem_get_product_id (MM_BASE_MODEM (self));
#if defined WITH_QMI #if defined WITH_QMI
if (MM_IS_BROADBAND_MODEM_QMI (self)) if (MM_IS_BROADBAND_MODEM_QMI (self))
@@ -353,16 +352,15 @@ add_generic_device_ids (MMBaseModem *self,
primary = MM_PORT (mm_broadband_modem_mbim_peek_port_mbim (MM_BROADBAND_MODEM_MBIM (self))); primary = MM_PORT (mm_broadband_modem_mbim_peek_port_mbim (MM_BROADBAND_MODEM_MBIM (self)));
#endif #endif
if (!primary) if (!primary)
primary = MM_PORT (mm_base_modem_peek_port_primary (self)); primary = MM_PORT (mm_base_modem_peek_port_primary (MM_BASE_MODEM (self)));
g_assert (primary != NULL); g_assert (primary != NULL);
rid = mm_kernel_device_get_physdev_revision (mm_port_peek_kernel_device (primary)); rid = mm_kernel_device_get_physdev_revision (mm_port_peek_kernel_device (primary));
subsystem = mm_kernel_device_get_physdev_subsystem (mm_port_peek_kernel_device (primary)); subsystem = mm_kernel_device_get_physdev_subsystem (mm_port_peek_kernel_device (primary));
if (!subsystem) { if (!subsystem) {
g_set_error (error, MM_CORE_ERROR, MM_CORE_ERROR_FAILED, g_set_error (error, MM_CORE_ERROR, MM_CORE_ERROR_FAILED,
"Unknown device subsystem"); "Unknown device subsystem");
return FALSE; return NULL;
} }
for (i = 0; i < G_N_ELEMENTS (supported_subsystems); i++) { for (i = 0; i < G_N_ELEMENTS (supported_subsystems); i++) {
@@ -372,7 +370,7 @@ add_generic_device_ids (MMBaseModem *self,
if (i == G_N_ELEMENTS (supported_subsystems)) { if (i == G_N_ELEMENTS (supported_subsystems)) {
g_set_error (error, MM_CORE_ERROR, MM_CORE_ERROR_FAILED, g_set_error (error, MM_CORE_ERROR, MM_CORE_ERROR_FAILED,
"Unsupported subsystem: %s", subsystem); "Unsupported subsystem: %s", subsystem);
return FALSE; return NULL;
} }
g_object_get (self, g_object_get (self,
@@ -398,8 +396,7 @@ add_generic_device_ids (MMBaseModem *self,
supported_subsystems[i], vid)); supported_subsystems[i], vid));
g_ptr_array_add (ids, NULL); g_ptr_array_add (ids, NULL);
mm_firmware_update_settings_set_device_ids (update_settings, (const gchar **)ids->pdata); return g_steal_pointer (&ids);
return TRUE;
} }
static void static void
@@ -411,6 +408,7 @@ load_update_settings_ready (MMIfaceModemFirmware *self,
MMFirmwareUpdateSettings *update_settings; MMFirmwareUpdateSettings *update_settings;
GError *error = NULL; GError *error = NULL;
GVariant *variant = NULL; GVariant *variant = NULL;
g_autoptr(GPtrArray) ids = NULL;
ctx = g_task_get_task_data (task); ctx = g_task_get_task_data (task);
@@ -422,12 +420,17 @@ load_update_settings_ready (MMIfaceModemFirmware *self,
} }
/* If the plugin didn't specify custom device ids, add the default ones ourselves */ /* If the plugin didn't specify custom device ids, add the default ones ourselves */
if (!mm_firmware_update_settings_get_device_ids (update_settings) && if (!mm_firmware_update_settings_get_device_ids (update_settings)) {
!add_generic_device_ids (MM_BASE_MODEM (self), update_settings, &error)) { mm_obj_dbg (self, "No device ids set by plugin, adding generic ids");
mm_obj_warn (self, "couldn't build device ids: %s", error->message); ids = mm_iface_firmware_build_generic_device_ids (self, &error);
g_error_free (error); if (error) {
g_clear_object (&update_settings); mm_obj_warn (self, "couldn't build device ids: %s", error->message);
goto out; g_error_free (error);
g_clear_object (&update_settings);
goto out;
}
mm_firmware_update_settings_set_device_ids (update_settings, (const gchar **)ids->pdata);
} }
/* If the plugin didn't specify custom version, add the default one ourselves */ /* If the plugin didn't specify custom version, add the default one ourselves */

4
src/mm-iface-modem-firmware.h
View File

@@ -72,6 +72,10 @@ struct _MMIfaceModemFirmware {
GType mm_iface_modem_firmware_get_type (void); GType mm_iface_modem_firmware_get_type (void);
G_DEFINE_AUTOPTR_CLEANUP_FUNC (MMIfaceModemFirmware, g_object_unref) G_DEFINE_AUTOPTR_CLEANUP_FUNC (MMIfaceModemFirmware, g_object_unref)
/* Get generic device ids */
GPtrArray *mm_iface_firmware_build_generic_device_ids (MMIfaceModemFirmware *self,
GError **error);
/* Initialize Firmware interface (async) */ /* Initialize Firmware interface (async) */
void mm_iface_modem_firmware_initialize (MMIfaceModemFirmware *self, void mm_iface_modem_firmware_initialize (MMIfaceModemFirmware *self,
GCancellable *cancellable, GCancellable *cancellable,