loc: skip the need of the QmiIndicationLoc...GpsTime intermediate struct

4 files changed, 63 insertions, 3 deletions

diff --git a/data/qmi-service-loc.json b/data/qmi-service-loc.json
index 0e054778..0f15b13e 100644
--- a/data/qmi-service-loc.json
+++ b/data/qmi-service-loc.json
@@ -265,11 +265,11 @@
                      "type"          : "TLV",
                      "since"         : "1.22",
                      "format"        : "guint8" },
-                   { "name"          : "GPS Time",
+                   { "name"          : "GPS Date Time",
                      "id"            : "0x27",
                      "type"          : "TLV",
-                     "since"         : "1.22",
-                     "format"        : "struct",
+                     "since"         : "1.32",
+                     "format"        : "sequence",
                      "contents"      : [ { "name"   : "GPS Weeks",
                                            "format" : "guint16" },
                                          { "name"   : "GPS Time of Week Milliseconds",
diff --git a/docs/reference/libqmi-glib/libqmi-glib-common.sections b/docs/reference/libqmi-glib/libqmi-glib-common.sections
index a3dd0ce6..67dffd7d 100644
--- a/docs/reference/libqmi-glib/libqmi-glib-common.sections
+++ b/docs/reference/libqmi-glib/libqmi-glib-common.sections
@@ -1862,6 +1862,8 @@ qmi_message_dms_get_stored_image_info_input_set_image
 <SUBSECTION LocPositionReport>
 QmiIndicationLocPositionReportOutputDilutionOfPrecision
 qmi_indication_loc_position_report_output_get_dilution_of_precision
+QmiIndicationLocPositionReportOutputGpsTime
+qmi_indication_loc_position_report_output_get_gps_time
 <SUBSECTION Private>
 QmiDeprecatedNasSimRejectState
 QmiDeprecatedWdsCdmaCauseCode
@@ -1881,6 +1883,7 @@ QmiDeprecatedConfigTypeAndId
 QmiDeprecatedMessageDmsDeleteStoredImageInputImage
 QmiDeprecatedMessageDmsGetStoredImageInfoInputImage
 QmiDeprecatedIndicationLocPositionReportOutputDilutionOfPrecision
+QmiDeprecatedIndicationLocPositionReportOutputGpsTime
 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 b193008e..1be05804 100644
--- a/src/libqmi-glib/qmi-compat.c
+++ b/src/libqmi-glib/qmi-compat.c
@@ -2322,6 +2322,24 @@ qmi_indication_loc_position_report_output_get_dilution_of_precision (
     return TRUE;
 }
 
+gboolean
+qmi_indication_loc_position_report_output_get_gps_time (
+    QmiIndicationLocPositionReportOutput *self,
+    QmiDeprecatedIndicationLocPositionReportOutputGpsTime *value_gps_time,
+    GError **error)
+{
+    guint16 gps_weeks = 0;
+    guint32 gps_time_of_week_milliseconds = 0;
+
+    if (!qmi_indication_loc_position_report_output_get_gps_date_time (self, &gps_weeks, &gps_time_of_week_milliseconds, error))
+        return FALSE;
+    if (value_gps_time) {
+        value_gps_time->gps_weeks = gps_weeks;
+        value_gps_time->gps_time_of_week_milliseconds = gps_time_of_week_milliseconds;
+    }
+    return TRUE;
+}
+
 #endif /* HAVE_QMI_INDICATION_LOC_POSITION_REPORT */
 
 #endif /* QMI_DISABLE_DEPRECATED */
diff --git a/src/libqmi-glib/qmi-compat.h b/src/libqmi-glib/qmi-compat.h
index 15a654a1..df8245b8 100644
--- a/src/libqmi-glib/qmi-compat.h
+++ b/src/libqmi-glib/qmi-compat.h
@@ -3758,6 +3758,45 @@ gboolean qmi_indication_loc_position_report_output_get_dilution_of_precision (
     QmiDeprecatedIndicationLocPositionReportOutputDilutionOfPrecision *value_dilution_of_precision,
     GError **error);
 
+/**
+ * QmiIndicationLocPositionReportOutputGpsTime:
+ * @gps_weeks: a #guint16.
+ * @gps_time_of_week_milliseconds: a #guint32.
+ *
+ * A QmiIndicationLocPositionReportOutputGpsTime struct.
+ *
+ * This type is deprecated and there is no replacement as the
+ * new methods don't require any intermediate type any more.
+ *
+ * Since: 1.22
+ * Deprecated: 1.32
+ */
+typedef struct _QmiDeprecatedIndicationLocPositionReportOutputGpsTime {
+    guint16 gps_weeks;
+    guint32 gps_time_of_week_milliseconds;
+} QmiDeprecatedIndicationLocPositionReportOutputGpsTime;
+G_DEPRECATED
+typedef QmiDeprecatedIndicationLocPositionReportOutputGpsTime QmiIndicationLocPositionReportOutputGpsTime;
+
+/**
+ * qmi_indication_loc_position_report_output_get_gps_time:
+ * @self: a #QmiIndicationLocPositionReportOutput.
+ * @value_gps_time: (out)(optional)(transfer none): a placeholder for the output constant #QmiIndicationLocPositionReportOutputGpsTime, or %NULL if not required.
+ * @error: Return location for error or %NULL.
+ *
+ * Get the 'GPS Time' field from @self.
+ *
+ * Returns: (skip): %TRUE if the field is found, %FALSE otherwise.
+ *
+ * Since: 1.22
+ * Deprecated: 1.32: Use qmi_indication_loc_position_report_output_get_gps_date_time() instead.
+ */
+G_DEPRECATED_FOR (qmi_indication_loc_position_report_output_get_gps_date_time)
+gboolean qmi_indication_loc_position_report_output_get_gps_time (
+    QmiIndicationLocPositionReportOutput *self,
+    QmiDeprecatedIndicationLocPositionReportOutputGpsTime *value_gps_time,
+    GError **error);
+
 #endif /* HAVE_QMI_INDICATION_LOC_POSITION_REPORT */
 
 #endif /* QMI_DISABLE_DEPRECATED */