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

broadband-modem-mbim: use ms extensions, if available, for capabilities

Browse Source
This commit is contained in:
Daniele Palmas
2022-09-13 13:50:46 +02:00
committed by Aleksander Morgado
parent ea275d05e6
commit e0fb1cb643
1 changed files with 82 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

70
src/mm-broadband-modem-mbim.c
View File

@@ -487,9 +487,69 @@ device_caps_query_ready (MbimDevice *device,
ctx = g_task_get_task_data (task); ctx = g_task_get_task_data (task);
response = mbim_device_command_finish (device, res, &error); response = mbim_device_command_finish (device, res, &error);
if (!response || if (!response || !mbim_message_response_get_result (response, MBIM_MESSAGE_TYPE_COMMAND_DONE, &error)) {
!mbim_message_response_get_result (response, MBIM_MESSAGE_TYPE_COMMAND_DONE, &error) || g_task_return_error (task, error);
!mbim_message_device_caps_response_parse ( g_object_unref (task);
goto out;
}
if (mbim_device_check_ms_mbimex_version (device, 3, 0)) {
MbimDataClassV3 data_class_v3;
MbimDataSubclass data_subclass;
if (!mbim_message_ms_basic_connect_extensions_v3_device_caps_response_parse (
response,
NULL, /* device_type */
&self->priv->caps_cellular_class,
NULL, /* voice_class */
NULL, /* sim_class */
&data_class_v3,
&self->priv->caps_sms,
NULL, /* ctrl_caps */
&data_subclass,
&self->priv->caps_max_sessions,
NULL, /* executor_index */
NULL, /* wcdma_band_class */
NULL, /* lte_band_class_array_size */
NULL, /* lte_band_class_array */
NULL, /* nr_band_class_array_size */
NULL, /* nr_band_class_array */
&self->priv->caps_custom_data_class,
&self->priv->caps_device_id,
&self->priv->caps_firmware_info,
&self->priv->caps_hardware_info,
&error)) {
g_task_return_error (task, error);
g_object_unref (task);
goto out;
}
/* Translate data class v3 to standard data class to simplify further usage of the field */
self->priv->caps_data_class = mm_mbim_data_class_from_mbim_data_class_v3_and_subclass (
data_class_v3,
data_subclass);
} else if (mbim_device_check_ms_mbimex_version (device, 2, 0)) {
if (!mbim_message_ms_basic_connect_extensions_device_caps_response_parse (
response,
NULL, /* device_type */
&self->priv->caps_cellular_class,
NULL, /* voice_class */
NULL, /* sim_class */
&self->priv->caps_data_class,
&self->priv->caps_sms,
NULL, /* ctrl_caps */
&self->priv->caps_max_sessions,
&self->priv->caps_custom_data_class,
&self->priv->caps_device_id,
&self->priv->caps_firmware_info,
&self->priv->caps_hardware_info,
NULL, /* executor_index */
&error)) {
g_task_return_error (task, error);
g_object_unref (task);
goto out;
}
} else {
if (!mbim_message_device_caps_response_parse (
response, response,
NULL, /* device_type */ NULL, /* device_type */
&self->priv->caps_cellular_class, &self->priv->caps_cellular_class,
@@ -508,6 +568,7 @@ device_caps_query_ready (MbimDevice *device,
g_object_unref (task); g_object_unref (task);
goto out; goto out;
} }
}
ctx->current_mbim = mm_modem_capability_from_mbim_device_caps (self->priv->caps_cellular_class, ctx->current_mbim = mm_modem_capability_from_mbim_device_caps (self->priv->caps_cellular_class,
self->priv->caps_data_class, self->priv->caps_data_class,
@@ -530,6 +591,9 @@ load_current_capabilities_mbim (GTask *task)
ctx = g_task_get_task_data (task); ctx = g_task_get_task_data (task);
mm_obj_dbg (self, "loading current capabilities..."); mm_obj_dbg (self, "loading current capabilities...");
if (mbim_device_check_ms_mbimex_version (ctx->device, 2, 0))
message = mbim_message_ms_basic_connect_extensions_device_caps_query_new (NULL);
else
message = mbim_message_device_caps_query_new (NULL); message = mbim_message_device_caps_query_new (NULL);
mbim_device_command (ctx->device, mbim_device_command (ctx->device,
message, message,