From 65b50bb906030901bf9209dbf5e6ef0d7fd561c0 Mon Sep 17 00:00:00 2001 From: Aleksander Morgado Date: Mon, 10 Apr 2023 15:12:46 +0000 Subject: Revert "uim: update UIM personalization feature enum" This reverts commit 5f366be3000e8c00f7ce73d64606095d3ba4c22e. This change introduced a TLV field type change, and we therefore need proper compat methods to avoid breaking API/ABI. --- data/qmi-service-uim.json | 2 +- .../libqmi-glib/libqmi-glib-common.sections | 5 -- src/libqmi-glib/qmi-enums-uim.h | 83 ++++------------------ 3 files changed, 14 insertions(+), 76 deletions(-) diff --git a/data/qmi-service-uim.json b/data/qmi-service-uim.json index 246ef12..6f0b94e 100644 --- a/data/qmi-service-uim.json +++ b/data/qmi-service-uim.json @@ -64,7 +64,7 @@ "public-format" : "QmiUimCardApplicationPersonalizationState" }, { "name" : "Personalization Feature", "format" : "guint8", - "public-format" : "QmiUimCardApplicationPersonalizationFeatureStatus" }, + "public-format" : "QmiUimCardApplicationPersonalizationFeature" }, { "name" : "Personalization Retries", "format" : "guint8" }, { "name" : "Personalization Unblock Retries", diff --git a/docs/reference/libqmi-glib/libqmi-glib-common.sections b/docs/reference/libqmi-glib/libqmi-glib-common.sections index 33682a1..c812dcf 100644 --- a/docs/reference/libqmi-glib/libqmi-glib-common.sections +++ b/docs/reference/libqmi-glib/libqmi-glib-common.sections @@ -1131,7 +1131,6 @@ QmiUimCardApplicationType QmiUimCardApplicationState QmiUimCardApplicationPersonalizationState QmiUimCardApplicationPersonalizationFeature -QmiUimCardApplicationPersonalizationFeatureStatus QmiUimPinId QmiUimCardProtocol QmiUimPhysicalCardState @@ -1153,7 +1152,6 @@ qmi_uim_card_application_type_get_string qmi_uim_card_application_state_get_string qmi_uim_card_application_personalization_state_get_string qmi_uim_card_application_personalization_feature_get_string -qmi_uim_card_application_personalization_feature_status_get_string qmi_uim_pin_id_get_string qmi_uim_card_protocol_get_string qmi_uim_physical_card_state_get_string @@ -1168,7 +1166,6 @@ qmi_uim_session_type_build_string_from_mask qmi_uim_file_type_build_string_from_mask qmi_uim_security_attribute_logic_build_string_from_mask qmi_uim_security_attribute_get_string -qmi_uim_card_application_personalization_feature_status_build_string_from_mask qmi_uim_card_application_personalization_feature_build_string_from_mask qmi_uim_card_application_personalization_state_build_string_from_mask qmi_uim_card_application_state_build_string_from_mask @@ -1190,7 +1187,6 @@ QMI_TYPE_UIM_SESSION_TYPE QMI_TYPE_UIM_FILE_TYPE QMI_TYPE_UIM_SECURITY_ATTRIBUTE_LOGIC QMI_TYPE_UIM_SECURITY_ATTRIBUTE -QMI_TYPE_UIM_CARD_APPLICATION_PERSONALIZATION_FEATURE_STATUS QMI_TYPE_UIM_CARD_APPLICATION_PERSONALIZATION_FEATURE QMI_TYPE_UIM_CARD_APPLICATION_PERSONALIZATION_STATE QMI_TYPE_UIM_CARD_APPLICATION_STATE @@ -1211,7 +1207,6 @@ qmi_uim_session_type_get_type qmi_uim_file_type_get_type qmi_uim_security_attribute_logic_get_type qmi_uim_security_attribute_get_type -qmi_uim_card_application_personalization_feature_status_get_type qmi_uim_card_application_personalization_feature_get_type qmi_uim_card_application_personalization_state_get_type qmi_uim_card_application_state_get_type diff --git a/src/libqmi-glib/qmi-enums-uim.h b/src/libqmi-glib/qmi-enums-uim.h index ba404e5..d5b0ad8 100644 --- a/src/libqmi-glib/qmi-enums-uim.h +++ b/src/libqmi-glib/qmi-enums-uim.h @@ -19,7 +19,6 @@ * * Copyright (C) 2012 Google Inc. * Copyright (C) 2012-2017 Aleksander Morgado - * Copyright (c) 2023 Qualcomm Innovation Center, Inc. */ #ifndef _LIBQMI_GLIB_QMI_ENUMS_UIM_H_ @@ -356,83 +355,27 @@ typedef enum { /*< since=1.10 >*/ * @QMI_UIM_CARD_APPLICATION_PERSONALIZATION_FEATURE_1X_SERVICE_PROVIDER: 1X service provider. * @QMI_UIM_CARD_APPLICATION_PERSONALIZATION_FEATURE_1X_CORPORATE: 1X corporate. * @QMI_UIM_CARD_APPLICATION_PERSONALIZATION_FEATURE_1X_RUIM: 1X R-UIM. - * @QMI_UIM_CARD_APPLICATION_PERSONALIZATION_FEATURE_GW_SPN: GW SPN. Since 1.34. - * @QMI_UIM_CARD_APPLICATION_PERSONALIZATION_FEATURE_GW_SP_EHPLMN: GW SP + EHPLMN. Since 1.34. - * @QMI_UIM_CARD_APPLICATION_PERSONALIZATION_FEATURE_GW_ICCID: GW ICCID. Since 1.34. - * @QMI_UIM_CARD_APPLICATION_PERSONALIZATION_FEATURE_GW_IMPI: GW IMPI. Since 1.34. - * @QMI_UIM_CARD_APPLICATION_PERSONALIZATION_FEATURE_GW_NETWORK_SUBSET_SERVICE_PROVIDER: GW network subset and service provider. Since 1.34. - * @QMI_UIM_CARD_APPLICATION_PERSONALIZATION_FEATURE_GW_CARRIER: GW carrier. Since 1.34. + * @QMI_UIM_CARD_APPLICATION_PERSONALIZATION_FEATURE_UNKNOWN: Unknown. * * Card application personalization feature, when a code is required. * * Since: 1.10 */ typedef enum { /*< since=1.10 >*/ - QMI_UIM_CARD_APPLICATION_PERSONALIZATION_FEATURE_GW_NETWORK = 0, - QMI_UIM_CARD_APPLICATION_PERSONALIZATION_FEATURE_GW_NETWORK_SUBSET = 1, - QMI_UIM_CARD_APPLICATION_PERSONALIZATION_FEATURE_GW_SERVICE_PROVIDER = 2, - QMI_UIM_CARD_APPLICATION_PERSONALIZATION_FEATURE_GW_CORPORATE = 3, - QMI_UIM_CARD_APPLICATION_PERSONALIZATION_FEATURE_GW_UIM = 4, - QMI_UIM_CARD_APPLICATION_PERSONALIZATION_FEATURE_1X_NETWORK_TYPE_1 = 5, - QMI_UIM_CARD_APPLICATION_PERSONALIZATION_FEATURE_1X_NETWORK_TYPE_2 = 6, - QMI_UIM_CARD_APPLICATION_PERSONALIZATION_FEATURE_1X_HRPD = 7, - QMI_UIM_CARD_APPLICATION_PERSONALIZATION_FEATURE_1X_SERVICE_PROVIDER = 8, - QMI_UIM_CARD_APPLICATION_PERSONALIZATION_FEATURE_1X_CORPORATE = 9, - QMI_UIM_CARD_APPLICATION_PERSONALIZATION_FEATURE_1X_RUIM = 10, - QMI_UIM_CARD_APPLICATION_PERSONALIZATION_FEATURE_GW_SPN = 11, - QMI_UIM_CARD_APPLICATION_PERSONALIZATION_FEATURE_GW_SP_EHPLMN = 12, - QMI_UIM_CARD_APPLICATION_PERSONALIZATION_FEATURE_GW_ICCID = 13, - QMI_UIM_CARD_APPLICATION_PERSONALIZATION_FEATURE_GW_IMPI = 14, - QMI_UIM_CARD_APPLICATION_PERSONALIZATION_FEATURE_GW_NETWORK_SUBSET_SERVICE_PROVIDER = 15, - QMI_UIM_CARD_APPLICATION_PERSONALIZATION_FEATURE_GW_CARRIER = 16 + QMI_UIM_CARD_APPLICATION_PERSONALIZATION_FEATURE_GW_NETWORK = 0, + QMI_UIM_CARD_APPLICATION_PERSONALIZATION_FEATURE_GW_NETWORK_SUBSET = 1, + QMI_UIM_CARD_APPLICATION_PERSONALIZATION_FEATURE_GW_SERVICE_PROVIDER = 2, + QMI_UIM_CARD_APPLICATION_PERSONALIZATION_FEATURE_GW_CORPORATE = 3, + QMI_UIM_CARD_APPLICATION_PERSONALIZATION_FEATURE_GW_UIM = 4, + QMI_UIM_CARD_APPLICATION_PERSONALIZATION_FEATURE_1X_NETWORK_TYPE_1 = 5, + QMI_UIM_CARD_APPLICATION_PERSONALIZATION_FEATURE_1X_NETWORK_TYPE_2 = 6, + QMI_UIM_CARD_APPLICATION_PERSONALIZATION_FEATURE_1X_HRPD = 7, + QMI_UIM_CARD_APPLICATION_PERSONALIZATION_FEATURE_1X_SERVICE_PROVIDER = 8, + QMI_UIM_CARD_APPLICATION_PERSONALIZATION_FEATURE_1X_CORPORATE = 9, + QMI_UIM_CARD_APPLICATION_PERSONALIZATION_FEATURE_1X_RUIM = 10, + QMI_UIM_CARD_APPLICATION_PERSONALIZATION_FEATURE_UNKNOWN = 11 } QmiUimCardApplicationPersonalizationFeature; -/** - * QmiUimCardApplicationPersonalizationFeatureStatus: - * @QMI_UIM_CARD_APPLICATION_PERSONALIZATION_FEATURE_STATUS_GW_NETWORK: GW network. - * @QMI_UIM_CARD_APPLICATION_PERSONALIZATION_FEATURE_STATUS_GW_NETWORK_SUBSET: GW network subset. - * @QMI_UIM_CARD_APPLICATION_PERSONALIZATION_FEATURE_STATUS_GW_SERVICE_PROVIDER: GW service provider. - * @QMI_UIM_CARD_APPLICATION_PERSONALIZATION_FEATURE_STATUS_GW_CORPORATE: GW corporate. - * @QMI_UIM_CARD_APPLICATION_PERSONALIZATION_FEATURE_STATUS_GW_UIM: UIM. - * @QMI_UIM_CARD_APPLICATION_PERSONALIZATION_FEATURE_STATUS_1X_NETWORK_TYPE_1: 1X network type 1. - * @QMI_UIM_CARD_APPLICATION_PERSONALIZATION_FEATURE_STATUS_1X_NETWORK_TYPE_2: 1X network type 2. - * @QMI_UIM_CARD_APPLICATION_PERSONALIZATION_FEATURE_STATUS_1X_HRPD: 1X HRPD. - * @QMI_UIM_CARD_APPLICATION_PERSONALIZATION_FEATURE_STATUS_1X_SERVICE_PROVIDER: 1X service provider. - * @QMI_UIM_CARD_APPLICATION_PERSONALIZATION_FEATURE_STATUS_1X_CORPORATE: 1X corporate. - * @QMI_UIM_CARD_APPLICATION_PERSONALIZATION_FEATURE_STATUS_1X_RUIM: 1X R-UIM. - * @QMI_UIM_CARD_APPLICATION_PERSONALIZATION_FEATURE_STATUS_UNKNOWN: Unknown. - * @QMI_UIM_CARD_APPLICATION_PERSONALIZATION_FEATURE_STATUS_GW_SERVICE_PROVIDER_NAME: GW service provider name. - * @QMI_UIM_CARD_APPLICATION_PERSONALIZATION_FEATURE_STATUS_GW_SP_EHPLMN: GW SP + EHPLMN. - * @QMI_UIM_CARD_APPLICATION_PERSONALIZATION_FEATURE_STATUS_GW_ICCID: GW ICCID. - * @QMI_UIM_CARD_APPLICATION_PERSONALIZATION_FEATURE_STATUS_GW_IMPI: GW IMPI. - * @QMI_UIM_CARD_APPLICATION_PERSONALIZATION_FEATURE_STATUS_GW_NETWORK_SUBSET_SERVICE_PROVIDER: GW network subset and service provider. - * @QMI_UIM_CARD_APPLICATION_PERSONALIZATION_FEATURE_STATUS_GW_CARRIER: GW carrier. - * - * Card application personalization feature status. - * - * Since: 1.34 - */ -typedef enum { /*< since=1.34 >*/ - QMI_UIM_CARD_APPLICATION_PERSONALIZATION_FEATURE_STATUS_GW_NETWORK = 0, - QMI_UIM_CARD_APPLICATION_PERSONALIZATION_FEATURE_STATUS_GW_NETWORK_SUBSET = 1, - QMI_UIM_CARD_APPLICATION_PERSONALIZATION_FEATURE_STATUS_GW_SERVICE_PROVIDER = 2, - QMI_UIM_CARD_APPLICATION_PERSONALIZATION_FEATURE_STATUS_GW_CORPORATE = 3, - QMI_UIM_CARD_APPLICATION_PERSONALIZATION_FEATURE_STATUS_GW_UIM = 4, - QMI_UIM_CARD_APPLICATION_PERSONALIZATION_FEATURE_STATUS_1X_NETWORK_TYPE_1 = 5, - QMI_UIM_CARD_APPLICATION_PERSONALIZATION_FEATURE_STATUS_1X_NETWORK_TYPE_2 = 6, - QMI_UIM_CARD_APPLICATION_PERSONALIZATION_FEATURE_STATUS_1X_HRPD = 7, - QMI_UIM_CARD_APPLICATION_PERSONALIZATION_FEATURE_STATUS_1X_SERVICE_PROVIDER = 8, - QMI_UIM_CARD_APPLICATION_PERSONALIZATION_FEATURE_STATUS_1X_CORPORATE = 9, - QMI_UIM_CARD_APPLICATION_PERSONALIZATION_FEATURE_STATUS_1X_RUIM = 10, - QMI_UIM_CARD_APPLICATION_PERSONALIZATION_FEATURE_STATUS_UNKNOWN = 11, - QMI_UIM_CARD_APPLICATION_PERSONALIZATION_FEATURE_STATUS_GW_SERVICE_PROVIDER_NAME = 12, - QMI_UIM_CARD_APPLICATION_PERSONALIZATION_FEATURE_STATUS_GW_SP_EHPLMN = 13, - QMI_UIM_CARD_APPLICATION_PERSONALIZATION_FEATURE_STATUS_GW_ICCID = 14, - QMI_UIM_CARD_APPLICATION_PERSONALIZATION_FEATURE_STATUS_GW_IMPI = 15, - QMI_UIM_CARD_APPLICATION_PERSONALIZATION_FEATURE_STATUS_GW_NETWORK_SUBSET_SERVICE_PROVIDER = 16, - QMI_UIM_CARD_APPLICATION_PERSONALIZATION_FEATURE_STATUS_GW_CARRIER = 17 -} QmiUimCardApplicationPersonalizationFeatureStatus; - /*****************************************************************************/ /* Helper enums for the 'QMI UIM Refresh' indication */ -- cgit v1.2.3