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

broadband-modem: generic Firehose and Sahara support

Browse Source 
Allows setting the renamed `ID_MM_QUALCOMM_FIREHOSE` and
`ID_MM_QUALCOMM_SAHARA` environment variables for all devices.

Signed-off-by: Lukas Voegl <lvoegl@tdt.de>
This commit is contained in:
Lukas Voegl
2025-02-21 14:08:50 +00:00
committed by Dan Williams
parent 6e981b61b3
commit 155893ea38
21 changed files with 557 additions and 169 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/plugins/fibocom/mm-broadband-modem-fibocom.c
+11
View File
@@ -27,6 +27,8 @@ static void iface_modem_init (MMIfaceModemInterface *iface);
static void iface_modem_firmware_init (MMIfaceModemFirmwareInterface *iface);
static void shared_fibocom_init (MMSharedFibocomInterface *iface);
static MMIfaceModemFirmwareInterface *iface_modem_firmware_parent;
G_DEFINE_TYPE_EXTENDED (MMBroadbandModemFibocom, mm_broadband_modem_fibocom, MM_TYPE_BROADBAND_MODEM, 0,
G_IMPLEMENT_INTERFACE (MM_TYPE_IFACE_MODEM, iface_modem_init)
G_IMPLEMENT_INTERFACE (MM_TYPE_SHARED_FIBOCOM, shared_fibocom_init)
@@ -265,10 +267,18 @@ iface_modem_init (MMIfaceModemInterface *iface)
static void
iface_modem_firmware_init (MMIfaceModemFirmwareInterface *iface)
{
iface_modem_firmware_parent = g_type_interface_peek_parent (iface);
iface->load_update_settings = mm_shared_fibocom_firmware_load_update_settings;
iface->load_update_settings_finish = mm_shared_fibocom_firmware_load_update_settings_finish;
}
static MMIfaceModemFirmwareInterface *
peek_parent_firmware_interface (MMSharedFibocom *self)
{
return iface_modem_firmware_parent;
}
static MMBaseModemClass *
peek_parent_class (MMSharedFibocom *self)
{
@@ -279,6 +289,7 @@ static void
shared_fibocom_init (MMSharedFibocomInterface *iface)
{
iface->peek_parent_class = peek_parent_class;
iface->peek_parent_firmware_interface = peek_parent_firmware_interface;
}
static void
src/plugins/fibocom/mm-broadband-modem-mbim-fibocom.c
+11
View File
@@ -30,6 +30,8 @@
static void shared_fibocom_init (MMSharedFibocomInterface *iface);
static void iface_modem_firmware_init (MMIfaceModemFirmwareInterface *iface);
static MMIfaceModemFirmwareInterface *iface_modem_firmware_parent;
G_DEFINE_TYPE_EXTENDED (MMBroadbandModemMbimFibocom, mm_broadband_modem_mbim_fibocom, MM_TYPE_BROADBAND_MODEM_MBIM, 0,
G_IMPLEMENT_INTERFACE (MM_TYPE_SHARED_FIBOCOM, shared_fibocom_init)
G_IMPLEMENT_INTERFACE (MM_TYPE_IFACE_MODEM_FIRMWARE, iface_modem_firmware_init))
@@ -67,10 +69,18 @@ mm_broadband_modem_mbim_fibocom_init (MMBroadbandModemMbimFibocom *self)
static void
iface_modem_firmware_init (MMIfaceModemFirmwareInterface *iface)
{
iface_modem_firmware_parent = g_type_interface_peek_parent (iface);
iface->load_update_settings = mm_shared_fibocom_firmware_load_update_settings;
iface->load_update_settings_finish = mm_shared_fibocom_firmware_load_update_settings_finish;
}
static MMIfaceModemFirmwareInterface *
peek_parent_firmware_interface (MMSharedFibocom *self)
{
return iface_modem_firmware_parent;
}
static MMBaseModemClass *
peek_parent_class (MMSharedFibocom *self)
{
@@ -81,6 +91,7 @@ static void
shared_fibocom_init (MMSharedFibocomInterface *iface)
{
iface->peek_parent_class = peek_parent_class;
iface->peek_parent_firmware_interface = peek_parent_firmware_interface;
}
static void
src/plugins/fibocom/mm-broadband-modem-mbim-xmm-fibocom.c
+10
View File
@@ -32,6 +32,7 @@ static void iface_modem_firmware_init (MMIfaceModemFirmwareInterface *iface);
static void shared_fibocom_init (MMSharedFibocomInterface *iface);
static MMIfaceModemInterface *iface_modem_parent;
static MMIfaceModemFirmwareInterface *iface_modem_firmware_parent;
G_DEFINE_TYPE_EXTENDED (MMBroadbandModemMbimXmmFibocom, mm_broadband_modem_mbim_xmm_fibocom, MM_TYPE_BROADBAND_MODEM_MBIM_XMM, 0,
G_IMPLEMENT_INTERFACE (MM_TYPE_IFACE_MODEM, iface_modem_init)
@@ -218,10 +219,18 @@ iface_modem_init (MMIfaceModemInterface *iface)
static void
iface_modem_firmware_init (MMIfaceModemFirmwareInterface *iface)
{
iface_modem_firmware_parent = g_type_interface_peek_parent (iface);
iface->load_update_settings = mm_shared_fibocom_firmware_load_update_settings;
iface->load_update_settings_finish = mm_shared_fibocom_firmware_load_update_settings_finish;
}
static MMIfaceModemFirmwareInterface *
peek_parent_firmware_interface (MMSharedFibocom *self)
{
return iface_modem_firmware_parent;
}
static MMBaseModemClass *
peek_parent_class (MMSharedFibocom *self)
{
@@ -232,6 +241,7 @@ static void
shared_fibocom_init (MMSharedFibocomInterface *iface)
{
iface->peek_parent_class = peek_parent_class;
iface->peek_parent_firmware_interface = peek_parent_firmware_interface;
}
static void
src/plugins/fibocom/mm-shared-fibocom.c
+53 -16
View File
@@ -42,6 +42,8 @@ static GQuark private_quark;
typedef struct {
/* Parent class */
MMBaseModemClass *class_parent;
/* Firmware interface of parent class */
MMIfaceModemFirmwareInterface *iface_modem_firmware_parent;
/* URCs to ignore */
GRegex *sim_ready_regex;
} Private;
@@ -72,6 +74,10 @@ get_private (MMSharedFibocom *self)
g_assert (MM_SHARED_FIBOCOM_GET_IFACE (self)->peek_parent_class);
priv->class_parent = MM_SHARED_FIBOCOM_GET_IFACE (self)->peek_parent_class (self);
/* Setup firmware interface of parent class */
g_assert (MM_SHARED_FIBOCOM_GET_IFACE (self)->peek_parent_firmware_interface);
priv->iface_modem_firmware_parent = MM_SHARED_FIBOCOM_GET_IFACE (self)->peek_parent_firmware_interface (self);
g_object_set_qdata_full (G_OBJECT (self), private_quark, priv, (GDestroyNotify)private_free);
}
@@ -227,24 +233,37 @@ fibocom_at_port_get_firmware_version_ready (MMBaseModem *self,
g_object_unref (task);
}
void
mm_shared_fibocom_firmware_load_update_settings (MMIfaceModemFirmware *self,
GAsyncReadyCallback callback,
gpointer user_data)
static void
parent_load_update_settings_ready (MMIfaceModemFirmware *self,
GAsyncResult *res,
GTask *task)
{
GTask *task;
MMPortSerialAt *at_port;
MMModemFirmwareUpdateMethod update_methods;
MMFirmwareUpdateSettings *update_settings;
Private *priv;
MMPortSerialAt *at_port;
MMModemFirmwareUpdateMethod update_methods;
g_autoptr(GError) error = NULL;
g_autoptr(MMFirmwareUpdateSettings) update_settings;
task = g_task_new (self, NULL, callback, user_data);
priv = get_private (MM_SHARED_FIBOCOM (self));
update_settings = priv->iface_modem_firmware_parent->load_update_settings_finish (self, res, &error);
if (error) {
g_task_return_error (task, error);
g_object_unref (task);
return;
}
g_task_set_task_data (task, g_object_ref (update_settings), g_object_unref);
/* We always report the primary port as the one to be used for FW upgrade */
at_port = mm_base_modem_peek_port_primary (MM_BASE_MODEM (self));
if (at_port) {
update_methods = fibocom_get_firmware_update_methods (MM_BASE_MODEM (self), MM_PORT (at_port));
update_settings = mm_firmware_update_settings_new (update_methods);
g_task_set_task_data (task, update_settings, g_object_unref);
update_methods = mm_firmware_update_settings_get_method (update_settings);
/* Prefer any parent's update method */
if (update_methods == MM_MODEM_FIRMWARE_UPDATE_METHOD_NONE) {
update_methods = fibocom_get_firmware_update_methods (MM_BASE_MODEM (self), MM_PORT (at_port));
mm_firmware_update_settings_set_method (update_settings, update_methods);
}
/* Get modem version by AT */
mm_base_modem_at_command (MM_BASE_MODEM (self),
@@ -257,13 +276,31 @@ mm_shared_fibocom_firmware_load_update_settings (MMIfaceModemFirmware *self,
return;
}
g_task_return_new_error (task,
MM_CORE_ERROR,
MM_CORE_ERROR_FAILED,
"Couldn't find a port to fetch firmware info");
g_task_return_pointer (task, g_object_ref (update_settings), g_object_unref);
g_object_unref (task);
}
void
mm_shared_fibocom_firmware_load_update_settings (MMIfaceModemFirmware *self,
GAsyncReadyCallback callback,
gpointer user_data)
{
GTask *task;
Private *priv;
priv = get_private (MM_SHARED_FIBOCOM (self));
g_assert (priv->iface_modem_firmware_parent);
g_assert (priv->iface_modem_firmware_parent->load_update_settings);
g_assert (priv->iface_modem_firmware_parent->load_update_settings_finish);
task = g_task_new (self, NULL, callback, user_data);
priv->iface_modem_firmware_parent->load_update_settings (
self,
(GAsyncReadyCallback)parent_load_update_settings_ready,
task);
}
/*****************************************************************************/
static void
src/plugins/fibocom/mm-shared-fibocom.h
+3
View File
@@ -36,6 +36,9 @@ struct _MMSharedFibocomInterface {
/* Peek parent class of the object */
MMBaseModemClass * (* peek_parent_class) (MMSharedFibocom *self);
/* Peek firmware interface of the parent class of the object */
MMIfaceModemFirmwareInterface * (* peek_parent_firmware_interface) (MMSharedFibocom *self);
};
void mm_shared_fibocom_setup_ports (MMBroadbandModem *self);