summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--docs/reference/libqmi-glib/libqmi-glib-common.sections2
-rw-r--r--src/libqmi-glib/qmi-compat.c12
-rw-r--r--src/libqmi-glib/qmi-compat.h29
3 files changed, 29 insertions, 14 deletions
diff --git a/docs/reference/libqmi-glib/libqmi-glib-common.sections b/docs/reference/libqmi-glib/libqmi-glib-common.sections
index 1ebce36e..be01e605 100644
--- a/docs/reference/libqmi-glib/libqmi-glib-common.sections
+++ b/docs/reference/libqmi-glib/libqmi-glib-common.sections
@@ -1826,6 +1826,8 @@ QmiDeprecatedNasSimRejectState
QmiDeprecatedWdsCdmaCauseCode
QmiDeprecatedProtocolError
QmiDeprecatedWdsVerboseCallEndReasonCm
+QmiDeprecatedDmsDellDeviceMode
+QmiDeprecatedDmsDellFirmwareVersionType
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 47ccf2f1..c6cdaf81 100644
--- a/src/libqmi-glib/qmi-compat.c
+++ b/src/libqmi-glib/qmi-compat.c
@@ -805,7 +805,7 @@ qmi_dms_dell_firmware_version_type_get_type (void)
}
const gchar *
-qmi_dms_dell_firmware_version_type_get_string (QmiDmsDellFirmwareVersionType val)
+qmi_dms_dell_firmware_version_type_get_string (QmiDeprecatedDmsDellFirmwareVersionType val)
{
return qmi_dms_foxconn_firmware_version_type_get_string ((QmiDmsFoxconnFirmwareVersionType) val);
}
@@ -844,7 +844,7 @@ qmi_message_dms_dell_get_firmware_version_input_get_type (void)
gboolean
qmi_message_dms_dell_get_firmware_version_input_get_version_type (
QmiMessageDmsDellGetFirmwareVersionInput *self,
- QmiDmsDellFirmwareVersionType *value_version_type,
+ QmiDeprecatedDmsDellFirmwareVersionType *value_version_type,
GError **error)
{
return qmi_message_dms_foxconn_get_firmware_version_input_get_version_type (self, (QmiDmsFoxconnFirmwareVersionType *)value_version_type, error);
@@ -853,7 +853,7 @@ qmi_message_dms_dell_get_firmware_version_input_get_version_type (
gboolean
qmi_message_dms_dell_get_firmware_version_input_set_version_type (
QmiMessageDmsDellGetFirmwareVersionInput *self,
- QmiDmsDellFirmwareVersionType value_version_type,
+ QmiDeprecatedDmsDellFirmwareVersionType value_version_type,
GError **error)
{
return qmi_message_dms_foxconn_get_firmware_version_input_set_version_type (self, (QmiDmsFoxconnFirmwareVersionType)value_version_type, error);
@@ -921,7 +921,7 @@ qmi_dms_dell_device_mode_get_type (void)
}
const gchar *
-qmi_dms_dell_device_mode_get_string (QmiDmsDellDeviceMode val)
+qmi_dms_dell_device_mode_get_string (QmiDeprecatedDmsDellDeviceMode val)
{
return qmi_dms_foxconn_device_mode_get_string ((QmiDmsFoxconnDeviceMode) val);
}
@@ -937,7 +937,7 @@ qmi_message_dms_dell_change_device_mode_input_get_type (void)
gboolean
qmi_message_dms_dell_change_device_mode_input_get_mode (
QmiMessageDmsDellChangeDeviceModeInput *self,
- QmiDmsDellDeviceMode *value_mode,
+ QmiDeprecatedDmsDellDeviceMode *value_mode,
GError **error)
{
return qmi_message_dms_foxconn_change_device_mode_input_get_mode (self, (QmiDmsFoxconnDeviceMode *) value_mode, error);
@@ -946,7 +946,7 @@ qmi_message_dms_dell_change_device_mode_input_get_mode (
gboolean
qmi_message_dms_dell_change_device_mode_input_set_mode (
QmiMessageDmsDellChangeDeviceModeInput *self,
- QmiDmsDellDeviceMode value_mode,
+ QmiDeprecatedDmsDellDeviceMode value_mode,
GError **error)
{
return qmi_message_dms_foxconn_change_device_mode_input_set_mode (self, (QmiDmsFoxconnDeviceMode) value_mode, error);
diff --git a/src/libqmi-glib/qmi-compat.h b/src/libqmi-glib/qmi-compat.h
index b6e369fe..076efb25 100644
--- a/src/libqmi-glib/qmi-compat.h
+++ b/src/libqmi-glib/qmi-compat.h
@@ -1121,11 +1121,17 @@ gboolean qmi_message_tlv_read_gfloat (QmiMessage *self,
* Since: 1.22.4
* Deprecated: 1.26: Use #QmiDmsFoxconnFirmwareVersionType instead.
*/
+
+/* The following type exists just so that we don't get deprecation warnings on
+ * our own methods */
typedef enum {
QMI_DMS_DELL_FIRMWARE_VERSION_TYPE_FIRMWARE_MCFG = QMI_DMS_FOXCONN_FIRMWARE_VERSION_TYPE_FIRMWARE_MCFG,
QMI_DMS_DELL_FIRMWARE_VERSION_TYPE_FIRMWARE_MCFG_APPS = QMI_DMS_FOXCONN_FIRMWARE_VERSION_TYPE_FIRMWARE_MCFG_APPS,
QMI_DMS_DELL_FIRMWARE_VERSION_TYPE_APPS = QMI_DMS_FOXCONN_FIRMWARE_VERSION_TYPE_APPS,
-} QmiDmsDellFirmwareVersionType;
+} QmiDeprecatedDmsDellFirmwareVersionType;
+
+G_DEPRECATED
+typedef QmiDeprecatedDmsDellFirmwareVersionType QmiDmsDellFirmwareVersionType;
G_DEPRECATED_FOR (qmi_dms_foxconn_firmware_version_type_get_type)
GType qmi_dms_dell_firmware_version_type_get_type (void) G_GNUC_CONST;
@@ -1142,7 +1148,8 @@ GType qmi_dms_dell_firmware_version_type_get_type (void) G_GNUC_CONST;
* Since: 1.22.4
* Deprecated: 1.26: Use qmi_dms_foxconn_firmware_version_type_get_string() instead.
*/
-const gchar *qmi_dms_dell_firmware_version_type_get_string (QmiDmsDellFirmwareVersionType val);
+G_DEPRECATED_FOR (qmi_dms_foxconn_firmware_version_type_get_string)
+const gchar *qmi_dms_dell_firmware_version_type_get_string (QmiDeprecatedDmsDellFirmwareVersionType val);
/**
* QmiDmsDellDeviceMode:
@@ -1155,11 +1162,17 @@ const gchar *qmi_dms_dell_firmware_version_type_get_string (QmiDmsDellFirmwareVe
* Since: 1.22.4
* Deprecated: 1.26: Use #QmiDmsFoxconnDeviceMode instead.
*/
+
+/* The following type exists just so that we don't get deprecation warnings on
+ * our own methods */
typedef enum {
QMI_DMS_DELL_DEVICE_MODE_UNKNOWN = QMI_DMS_FOXCONN_DEVICE_MODE_UNKNOWN,
QMI_DMS_DELL_DEVICE_MODE_FASTBOOT_ONLINE = QMI_DMS_FOXCONN_DEVICE_MODE_FASTBOOT_ONLINE,
QMI_DMS_DELL_DEVICE_MODE_FASTBOOT_OTA = QMI_DMS_FOXCONN_DEVICE_MODE_FASTBOOT_OTA,
-} QmiDmsDellDeviceMode;
+} QmiDeprecatedDmsDellDeviceMode;
+
+G_DEPRECATED
+typedef QmiDeprecatedDmsDellDeviceMode QmiDmsDellDeviceMode;
G_DEPRECATED_FOR (qmi_dms_foxconn_device_mode_get_type)
GType qmi_dms_dell_device_mode_get_type (void) G_GNUC_CONST;
@@ -1177,7 +1190,7 @@ GType qmi_dms_dell_device_mode_get_type (void) G_GNUC_CONST;
* Deprecated: 1.26: Use qmi_dms_foxconn_device_mode_get_string() instead.
*/
G_DEPRECATED_FOR (qmi_dms_foxconn_device_mode_get_string)
-const gchar *qmi_dms_dell_device_mode_get_string (QmiDmsDellDeviceMode val);
+const gchar *qmi_dms_dell_device_mode_get_string (QmiDeprecatedDmsDellDeviceMode val);
/******************************************************************************/
/* Note: these defines are on purpose out of the #ifdefs, so that gtkdoc-scan
@@ -1705,7 +1718,7 @@ GType qmi_message_dms_dell_get_firmware_version_input_get_type (void) G_GNUC_CON
G_DEPRECATED_FOR (qmi_message_dms_foxconn_get_firmware_version_input_get_version_type)
gboolean qmi_message_dms_dell_get_firmware_version_input_get_version_type (
QmiMessageDmsDellGetFirmwareVersionInput *self,
- QmiDmsDellFirmwareVersionType *value_version_type,
+ QmiDeprecatedDmsDellFirmwareVersionType *value_version_type,
GError **error);
/**
@@ -1724,7 +1737,7 @@ gboolean qmi_message_dms_dell_get_firmware_version_input_get_version_type (
G_DEPRECATED_FOR (qmi_message_dms_foxconn_get_firmware_version_input_set_version_type)
gboolean qmi_message_dms_dell_get_firmware_version_input_set_version_type (
QmiMessageDmsDellGetFirmwareVersionInput *self,
- QmiDmsDellFirmwareVersionType value_version_type,
+ QmiDeprecatedDmsDellFirmwareVersionType value_version_type,
GError **error);
/**
@@ -1902,7 +1915,7 @@ GType qmi_message_dms_dell_change_device_mode_input_get_type (void) G_GNUC_CONST
G_DEPRECATED_FOR (qmi_message_dms_foxconn_change_device_mode_input_get_mode)
gboolean qmi_message_dms_dell_change_device_mode_input_get_mode (
QmiMessageDmsDellChangeDeviceModeInput *self,
- QmiDmsDellDeviceMode *value_mode,
+ QmiDeprecatedDmsDellDeviceMode *value_mode,
GError **error);
/**
@@ -1921,7 +1934,7 @@ gboolean qmi_message_dms_dell_change_device_mode_input_get_mode (
G_DEPRECATED_FOR (qmi_message_dms_foxconn_change_device_mode_input_set_mode)
gboolean qmi_message_dms_dell_change_device_mode_input_set_mode (
QmiMessageDmsDellChangeDeviceModeInput *self,
- QmiDmsDellDeviceMode value_mode,
+ QmiDeprecatedDmsDellDeviceMode value_mode,
GError **error);
/**
View Lorry Controller Status