dms: skip the need of the QmiMessageDmsDeleteStoredImageInputImage intermediate struct

4 files changed, 106 insertions, 3 deletions

diff --git a/data/qmi-service-dms.json b/data/qmi-service-dms.json
index 41ececbb..53146955 100644
--- a/data/qmi-service-dms.json
+++ b/data/qmi-service-dms.json
@@ -1057,11 +1057,11 @@
      "service" : "DMS",
      "id"      : "0x004A",
      "since"   : "1.0",
-     "input"   : [ { "name"      : "Image",
+     "input"   : [ { "name"      : "Image Details",
                      "id"        : "0x01",
                      "type"      : "TLV",
-                     "since"     : "1.0",
-                     "format"    : "struct",
+                     "since"     : "1.32",
+                     "format"    : "sequence",
                      "contents"  : [ { "name"          : "Type",
                                        "format"        : "guint8",
                                        "public-format" : "QmiDmsFirmwareImageType" },
diff --git a/docs/reference/libqmi-glib/libqmi-glib-common.sections b/docs/reference/libqmi-glib/libqmi-glib-common.sections
index 936243b8..c3ceb082 100644
--- a/docs/reference/libqmi-glib/libqmi-glib-common.sections
+++ b/docs/reference/libqmi-glib/libqmi-glib-common.sections
@@ -1851,6 +1851,10 @@ qmi_message_pdc_set_selected_config_input_get_type_with_id
 qmi_message_pdc_set_selected_config_input_set_type_with_id
 qmi_message_pdc_get_config_info_input_get_type_with_id
 qmi_message_pdc_get_config_info_input_set_type_with_id
+<SUBSECTION DmsDeleteStoredImage>
+QmiMessageDmsDeleteStoredImageInputImage
+qmi_message_dms_delete_stored_image_input_get_image
+qmi_message_dms_delete_stored_image_input_set_image
 <SUBSECTION Private>
 QmiDeprecatedNasSimRejectState
 QmiDeprecatedWdsCdmaCauseCode
@@ -1867,6 +1871,7 @@ QmiDeprecatedMessageWdsGetDefaultProfileNumOutput
 QmiDeprecatedMessageWdsSetDefaultProfileNumInput
 QmiDeprecatedMessageWdsSetDefaultProfileNumOutput
 QmiDeprecatedConfigTypeAndId
+QmiDeprecatedMessageDmsDeleteStoredImageInputImage
 QMI_TYPE_DMS_DELL_FIRMWARE_VERSION_TYPE
 QMI_TYPE_MESSAGE_DMS_DELL_GET_FIRMWARE_VERSION_INPUT
 QMI_TYPE_MESSAGE_DMS_DELL_GET_FIRMWARE_VERSION_OUTPUT
diff --git a/src/libqmi-glib/qmi-compat.c b/src/libqmi-glib/qmi-compat.c
index 8854033c..7e052253 100644
--- a/src/libqmi-glib/qmi-compat.c
+++ b/src/libqmi-glib/qmi-compat.c
@@ -2234,4 +2234,37 @@ qmi_message_pdc_get_config_info_input_set_type_with_id (
 
 #endif /* HAVE_QMI_MESSAGE_PDC_GET_CONFIG_INFO */
 
+#if defined HAVE_QMI_MESSAGE_DMS_DELETE_STORED_IMAGE
+
+gboolean
+qmi_message_dms_delete_stored_image_input_get_image (
+    QmiMessageDmsDeleteStoredImageInput *self,
+    QmiDeprecatedMessageDmsDeleteStoredImageInputImage *value_image,
+    GError **error)
+{
+    QmiDmsFirmwareImageType  type = QMI_DMS_FIRMWARE_IMAGE_TYPE_MODEM;
+    GArray                  *unique_id = NULL;
+    const gchar             *build_id = NULL;
+
+    if (!qmi_message_dms_delete_stored_image_input_get_image_details (self, &type, &unique_id, &build_id, error))
+        return FALSE;
+    if (value_image) {
+        value_image->type = type;
+        value_image->unique_id = unique_id;
+        value_image->build_id = (gchar *) build_id;
+    }
+    return TRUE;
+}
+
+gboolean
+qmi_message_dms_delete_stored_image_input_set_image (
+    QmiMessageDmsDeleteStoredImageInput *self,
+    const QmiDeprecatedMessageDmsDeleteStoredImageInputImage *value_image,
+    GError **error)
+{
+    return qmi_message_dms_delete_stored_image_input_set_image_details (self, value_image->type, value_image->unique_id, value_image->build_id, error);
+}
+
+#endif /* HAVE_QMI_MESSAGE_DMS_DELETE_STORED_IMAGE */
+
 #endif /* QMI_DISABLE_DEPRECATED */
diff --git a/src/libqmi-glib/qmi-compat.h b/src/libqmi-glib/qmi-compat.h
index 7b6933e7..85717399 100644
--- a/src/libqmi-glib/qmi-compat.h
+++ b/src/libqmi-glib/qmi-compat.h
@@ -3585,6 +3585,71 @@ gboolean qmi_message_pdc_get_config_info_input_set_type_with_id (
 
 #endif /* HAVE_QMI_MESSAGE_PDC_GET_CONFIG_INFO */
 
+#if defined HAVE_QMI_MESSAGE_DMS_DELETE_STORED_IMAGE
+
+/**
+ * QmiMessageDmsDeleteStoredImageInputImage:
+ * @type: a #QmiDmsFirmwareImageType.
+ * @unique_id: a #GArray of #guint8 elements.
+ * @build_id: a string.
+ *
+ * A QmiMessageDmsDeleteStoredImageInputImage struct.
+ *
+ * This type is deprecated and there is no replacement as the
+ * new methods don't require any intermediate type any more.
+ *
+ * Since: 1.0
+ * Deprecated: 1.32
+ */
+typedef struct _QmiDeprecatedMessageDmsDeleteStoredImageInputImage {
+    QmiDmsFirmwareImageType type;
+    GArray *unique_id;
+    gchar *build_id;
+} QmiDeprecatedMessageDmsDeleteStoredImageInputImage;
+G_DEPRECATED
+typedef QmiDeprecatedMessageDmsDeleteStoredImageInputImage QmiMessageDmsDeleteStoredImageInputImage;
+
+/**
+ * qmi_message_dms_delete_stored_image_input_get_image:
+ * @self: a #QmiMessageDmsDeleteStoredImageInput.
+ * @value_image: (out)(optional)(transfer none): a placeholder for the output constant #QmiMessageDmsDeleteStoredImageInputImage, or %NULL if not required.
+ * @error: Return location for error or %NULL.
+ *
+ * Get the 'Image' field from @self.
+ *
+ * Returns: (skip): %TRUE if the field is found, %FALSE otherwise.
+ *
+ * Since: 1.0
+ * Deprecated: 1.32: Use qmi_message_dms_delete_stored_image_input_set_image_details() instead.
+ */
+G_DEPRECATED_FOR (qmi_message_dms_delete_stored_image_input_get_image_details)
+gboolean qmi_message_dms_delete_stored_image_input_get_image (
+    QmiMessageDmsDeleteStoredImageInput *self,
+    QmiDeprecatedMessageDmsDeleteStoredImageInputImage *value_image,
+    GError **error);
+
+
+/**
+ * qmi_message_dms_delete_stored_image_input_set_image:
+ * @self: a #QmiMessageDmsDeleteStoredImageInput.
+ * @value_image: the address of the #QmiMessageDmsDeleteStoredImageInputImage to set.
+ * @error: Return location for error or %NULL.
+ *
+ * Set the 'Image' field in the message.
+ *
+ * Returns: (skip): %TRUE if @value was successfully set, %FALSE otherwise.
+ *
+ * Since: 1.0
+ * Deprecated: 1.32: Use qmi_message_dms_delete_stored_image_input_set_image_details() instead.
+ */
+G_DEPRECATED_FOR (qmi_message_dms_delete_stored_image_input_set_image_details)
+gboolean qmi_message_dms_delete_stored_image_input_set_image (
+    QmiMessageDmsDeleteStoredImageInput *self,
+    const QmiDeprecatedMessageDmsDeleteStoredImageInputImage *value_image,
+    GError **error);
+
+#endif /* HAVE_QMI_MESSAGE_DMS_DELETE_STORED_IMAGE */
+
 #endif /* QMI_DISABLE_DEPRECATED */
 
 #endif /* _LIBQMI_GLIB_QMI_COMPAT_H_ */