fibocom: detect ID_MM_FIBOCOM_INITIAL_EPS_OFF_ON on runtime
We won't create a full new different modem object based on whether the ID_MM_FIBOCOM_INITIAL_EPS_OFF_ON tag is found or not. Instead, we always will create the same object type, and detect whether the OFF/ON cycle is required during runtime.
This commit is contained in:
Aleksander Morgado
@@ -36,6 +36,18 @@ G_DEFINE_TYPE_EXTENDED (MMBroadbandModemMbimXmmFibocom, mm_broadband_modem_mbim_
|
||||
|
||||
/*****************************************************************************/
|
||||
|
||||
typedef struct {
|
||||
MMBearerProperties *config;
|
||||
gboolean initial_eps_off_on;
|
||||
} SetInitialEpsBearerSettingsContext;
|
||||
|
||||
static void
|
||||
set_initial_eps_bearer_settings_context_free (SetInitialEpsBearerSettingsContext *ctx)
|
||||
{
|
||||
g_clear_object (&ctx->config);
|
||||
g_slice_free (SetInitialEpsBearerSettingsContext, ctx);
|
||||
}
|
||||
|
||||
static gboolean
|
||||
modem_3gpp_set_initial_eps_bearer_settings_finish (MMIfaceModem3gpp *self,
|
||||
GAsyncResult *res,
|
||||
@@ -68,20 +80,46 @@ parent_set_initial_eps_bearer_settings_ready (MMIfaceModem3gpp *self,
|
||||
GAsyncResult *res,
|
||||
GTask *task)
|
||||
{
|
||||
GError *error = NULL;
|
||||
SetInitialEpsBearerSettingsContext *ctx;
|
||||
GError *error = NULL;
|
||||
|
||||
iface_modem_3gpp_parent->set_initial_eps_bearer_settings_finish (self, res, &error);
|
||||
if (error) {
|
||||
ctx = g_task_get_task_data (task);
|
||||
|
||||
if (!iface_modem_3gpp_parent->set_initial_eps_bearer_settings_finish (self, res, &error)) {
|
||||
g_task_return_error (task, error);
|
||||
g_object_unref (task);
|
||||
return;
|
||||
}
|
||||
|
||||
mm_obj_dbg (self, "toggle modem power up after attach APN");
|
||||
mm_iface_modem_set_power_state (MM_IFACE_MODEM (self),
|
||||
MM_MODEM_POWER_STATE_ON,
|
||||
(GAsyncReadyCallback) after_attach_apn_modem_power_up_ready,
|
||||
task);
|
||||
if (ctx->initial_eps_off_on) {
|
||||
mm_obj_dbg (self, "toggle modem power up after attach APN");
|
||||
mm_iface_modem_set_power_state (MM_IFACE_MODEM (self),
|
||||
MM_MODEM_POWER_STATE_ON,
|
||||
(GAsyncReadyCallback) after_attach_apn_modem_power_up_ready,
|
||||
task);
|
||||
return;
|
||||
}
|
||||
|
||||
g_task_return_boolean (task, TRUE);
|
||||
g_object_unref (task);
|
||||
}
|
||||
|
||||
static void
|
||||
parent_set_initial_eps_bearer_settings (GTask *task)
|
||||
{
|
||||
MMBroadbandModemMbimXmmFibocom *self;
|
||||
SetInitialEpsBearerSettingsContext *ctx;
|
||||
|
||||
self = g_task_get_source_object (task);
|
||||
ctx = g_task_get_task_data (task);
|
||||
|
||||
g_assert (iface_modem_3gpp_parent->set_initial_eps_bearer_settings);
|
||||
g_assert (iface_modem_3gpp_parent->set_initial_eps_bearer_settings_finish);
|
||||
|
||||
iface_modem_3gpp_parent->set_initial_eps_bearer_settings (MM_IFACE_MODEM_3GPP (self),
|
||||
ctx->config,
|
||||
(GAsyncReadyCallback)parent_set_initial_eps_bearer_settings_ready,
|
||||
task);
|
||||
}
|
||||
|
||||
static void
|
||||
@@ -89,10 +127,7 @@ before_attach_apn_modem_power_down_ready (MMIfaceModem *self,
|
||||
GAsyncResult *res,
|
||||
GTask *task)
|
||||
{
|
||||
GError *error = NULL;
|
||||
MMBearerProperties *config;
|
||||
|
||||
config = g_task_get_task_data (task);
|
||||
GError *error = NULL;
|
||||
|
||||
if (!mm_iface_modem_set_power_state_finish (self, res, &error)) {
|
||||
mm_obj_warn (self, "failed to power down modem before attach APN settings update: %s", error->message);
|
||||
@@ -100,16 +135,9 @@ before_attach_apn_modem_power_down_ready (MMIfaceModem *self,
|
||||
g_object_unref (task);
|
||||
return;
|
||||
}
|
||||
|
||||
mm_obj_dbg (self, "success toggling modem power down before attach APN");
|
||||
|
||||
g_assert (iface_modem_3gpp_parent->set_initial_eps_bearer_settings);
|
||||
g_assert (iface_modem_3gpp_parent->set_initial_eps_bearer_settings_finish);
|
||||
|
||||
iface_modem_3gpp_parent->set_initial_eps_bearer_settings (MM_IFACE_MODEM_3GPP (self),
|
||||
config,
|
||||
(GAsyncReadyCallback)parent_set_initial_eps_bearer_settings_ready,
|
||||
task);
|
||||
parent_set_initial_eps_bearer_settings (task);
|
||||
}
|
||||
|
||||
static void
|
||||
@@ -118,16 +146,36 @@ modem_3gpp_set_initial_eps_bearer_settings (MMIfaceModem3gpp *self,
|
||||
GAsyncReadyCallback callback,
|
||||
gpointer user_data)
|
||||
{
|
||||
GTask *task;
|
||||
SetInitialEpsBearerSettingsContext *ctx;
|
||||
GTask *task;
|
||||
MMPortMbim *port;
|
||||
|
||||
task = g_task_new (self, NULL, callback, user_data);
|
||||
g_task_set_task_data (task, g_object_ref (config), g_object_unref);
|
||||
|
||||
mm_obj_dbg (self, "toggle modem power down before attach APN");
|
||||
mm_iface_modem_set_power_state (MM_IFACE_MODEM (self),
|
||||
MM_MODEM_POWER_STATE_LOW,
|
||||
(GAsyncReadyCallback) before_attach_apn_modem_power_down_ready,
|
||||
task);
|
||||
port = mm_broadband_modem_mbim_peek_port_mbim (MM_BROADBAND_MODEM_MBIM (self));
|
||||
if (!port) {
|
||||
g_task_return_new_error (task, MM_CORE_ERROR, MM_CORE_ERROR_FAILED,
|
||||
"No valid MBIM port found");
|
||||
g_object_unref (task);
|
||||
return;
|
||||
}
|
||||
|
||||
ctx = g_slice_new0 (SetInitialEpsBearerSettingsContext);
|
||||
ctx->config = g_object_ref (config);
|
||||
ctx->initial_eps_off_on = mm_kernel_device_get_property_as_boolean (mm_port_peek_kernel_device (MM_PORT (port)), "ID_MM_FIBOCOM_INITIAL_EPS_OFF_ON");
|
||||
g_task_set_task_data (task, ctx, (GDestroyNotify)set_initial_eps_bearer_settings_context_free);
|
||||
|
||||
|
||||
if (ctx->initial_eps_off_on) {
|
||||
mm_obj_dbg (self, "toggle modem power down before attach APN");
|
||||
mm_iface_modem_set_power_state (MM_IFACE_MODEM (self),
|
||||
MM_MODEM_POWER_STATE_LOW,
|
||||
(GAsyncReadyCallback) before_attach_apn_modem_power_down_ready,
|
||||
task);
|
||||
return;
|
||||
}
|
||||
|
||||
parent_set_initial_eps_bearer_settings (task);
|
||||
}
|
||||
|
||||
/******************************************************************************/
|
||||
|
||||
@@ -42,22 +42,6 @@ MM_PLUGIN_DEFINE_MINOR_VERSION
|
||||
|
||||
/*****************************************************************************/
|
||||
|
||||
#if defined WITH_MBIM
|
||||
static gboolean
|
||||
mm_port_probe_list_has_initial_eps_off_on_tag (GList *probes)
|
||||
{
|
||||
GList *l;
|
||||
|
||||
for (l = probes; l; l = g_list_next (l)) {
|
||||
if (mm_kernel_device_get_global_property_as_boolean (mm_port_probe_peek_port (MM_PORT_PROBE (l->data)),
|
||||
"ID_MM_FIBOCOM_INITIAL_EPS_OFF_ON"))
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
return FALSE;
|
||||
}
|
||||
#endif
|
||||
|
||||
static MMBaseModem *
|
||||
create_modem (MMPlugin *self,
|
||||
const gchar *uid,
|
||||
@@ -71,20 +55,11 @@ create_modem (MMPlugin *self,
|
||||
if (mm_port_probe_list_has_mbim_port (probes)) {
|
||||
if (mm_port_probe_list_is_xmm (probes)) {
|
||||
mm_obj_dbg (self, "MBIM-powered XMM-based Fibocom modem found...");
|
||||
if (mm_port_probe_list_has_initial_eps_off_on_tag (probes)) {
|
||||
mm_obj_dbg (self, "initial eps need to toggle modem power");
|
||||
return MM_BASE_MODEM (mm_broadband_modem_mbim_xmm_fibocom_new (uid,
|
||||
drivers,
|
||||
mm_plugin_get_name (self),
|
||||
vendor,
|
||||
product));
|
||||
}
|
||||
|
||||
return MM_BASE_MODEM (mm_broadband_modem_mbim_xmm_new (uid,
|
||||
drivers,
|
||||
mm_plugin_get_name (self),
|
||||
vendor,
|
||||
product));
|
||||
return MM_BASE_MODEM (mm_broadband_modem_mbim_xmm_fibocom_new (uid,
|
||||
drivers,
|
||||
mm_plugin_get_name (self),
|
||||
vendor,
|
||||
product));
|
||||
}
|
||||
mm_obj_dbg (self, "MBIM-powered Fibocom modem found...");
|
||||
return MM_BASE_MODEM (mm_broadband_modem_mbim_new (uid,
|
||||
|
||||
Reference in New Issue
Block a user