libmbim-glib,enums: rename 'MbimDataClassV2' to 'MbimDataClassV3'

The type is introduced in MBIMEx v3.0, so just name it with the v3
suffix, not to confuse with the updated introduced in MBIMEx v2.0,
which is compatible with the original type in MBIM v1.0.

6 files changed, 52 insertions, 50 deletions

diff --git a/data/mbim-service-ms-basic-connect-extensions-v3.json b/data/mbim-service-ms-basic-connect-extensions-v3.json
index 0f7ca61..7014293 100644
--- a/data/mbim-service-ms-basic-connect-extensions-v3.json
+++ b/data/mbim-service-ms-basic-connect-extensions-v3.json
@@ -155,7 +155,7 @@
                        "format"        : "guint32" } ],
     "response"   : [ { "name"          : "SystemType",
                        "format"        : "guint32",
-                       "public-format" : "MbimDataClassV2" },
+                       "public-format" : "MbimDataClassV3" },
                      { "name"          : "SystemSubType",
                        "format"        : "guint32",
                        "public-format" : "MbimDataSubclass" },
diff --git a/data/mbim-service-ms-basic-connect-v3.json b/data/mbim-service-ms-basic-connect-v3.json
index a8b5e67..0d30e30 100644
--- a/data/mbim-service-ms-basic-connect-v3.json
+++ b/data/mbim-service-ms-basic-connect-v3.json
@@ -71,7 +71,7 @@
                          "public-format" : "MbimPacketServiceState" },
                        { "name"          : "HighestAvailableDataClass",
                          "format"        : "guint32",
-                         "public-format" : "MbimDataClassV2" },
+                         "public-format" : "MbimDataClassV3" },
                        { "name"   : "UplinkSpeed",
                          "format" : "guint64" },
                        { "name"   : "DownlinkSpeed",
@@ -92,7 +92,7 @@
                          "public-format" : "MbimPacketServiceState" },
                        { "name"          : "HighestAvailableDataClass",
                          "format"        : "guint32",
-                         "public-format" : "MbimDataClassV2" },
+                         "public-format" : "MbimDataClassV3" },
                        { "name"   : "UplinkSpeed",
                          "format" : "guint64" },
                        { "name"   : "DownlinkSpeed",
diff --git a/docs/reference/libmbim-glib/libmbim-glib-common.sections b/docs/reference/libmbim-glib/libmbim-glib-common.sections
index 4507d0f..0531a25 100755
--- a/docs/reference/libmbim-glib/libmbim-glib-common.sections
+++ b/docs/reference/libmbim-glib/libmbim-glib-common.sections
@@ -378,7 +378,7 @@ MbimDefaultPduActivationHint
 MbimLadnInfo
 MbimDrxCycle
 MbimSubscriberReadyStatusFlag
-MbimDataClassV2
+MbimDataClassV3
 MbimDataSublass
 <SUBSECTION Methods>
 mbim_device_type_get_string
@@ -461,7 +461,7 @@ mbim_default_pdu_activation_hint_get_string
 mbim_ladn_info_get_string
 mbim_drx_cycle_get_string
 mbim_subscriber_ready_status_flag_build_string_from_mask
-mbim_data_class_v2_build_string_from_mask
+mbim_data_class_v3_build_string_from_mask
 mbim_data_subclass_build_string_from_mask
 <SUBSECTION Private>
 mbim_device_type_build_string_from_mask
@@ -546,7 +546,7 @@ mbim_default_pdu_activation_hint_build_string_from_mask
 mbim_ladn_info_build_string_from_mask
 mbim_drx_cycle_build_string_from_mask
 mbim_subscriber_ready_status_flag_get_string
-mbim_data_class_v2_get_string
+mbim_data_class_v3_get_string
 mbim_data_subclass_get_string
 <SUBSECTION Standard>
 MBIM_TYPE_ACTIVATION_COMMAND
@@ -634,7 +634,7 @@ MBIM_TYPE_DEFAULT_PDU_ACTIVATION_HINT
 MBIM_TYPE_LADN_INFO
 MBIM_TYPE_DRX_CYCLE
 MBIM_TYPE_SUBSCRIBER_READY_STATUS_FLAG
-MBIM_TYPE_DATA_CLASS_V2
+MBIM_TYPE_DATA_CLASS_V3
 MBIM_TYPE_DATA_SUBCLASS
 mbim_activation_command_get_type
 mbim_activation_state_get_type
@@ -721,7 +721,7 @@ mbim_default_pdu_activation_hint_get_type
 mbim_ladn_info_get_type
 mbim_drx_cycle_get_type
 mbim_subscriber_ready_status_flag_get_type
-mbim_data_class_v2_get_type
+mbim_data_class_v3_get_type
 mbim_data_subclass_get_type
 </SECTION>
 
diff --git a/src/libmbim-glib/mbim-enums.h b/src/libmbim-glib/mbim-enums.h
index 52b9d04..600256b 100644
--- a/src/libmbim-glib/mbim-enums.h
+++ b/src/libmbim-glib/mbim-enums.h
@@ -116,7 +116,7 @@ typedef enum { /*< since=1.0 >*/
  * report them without having enabled MBIM Extension v2.0 support.
  *
  * This type is updated in MBIM Extension v3.0 in a non-backwards compatible
- * way, see #MbimDataClassV2.
+ * way, see #MbimDataClassV3.
  *
  * Since: 1.0
  */
@@ -1670,52 +1670,54 @@ typedef enum { /*< since=1.28 >*/
 } MbimSubscriberReadyStatusFlag;
 
 /*****************************************************************************/
-/* 'Base Stations Info v3' enums */
-
-/**
- * MbimDataClassV2:
- * @MBIM_DATA_CLASS_V2_GPRS: GPRS.
- * @MBIM_DATA_CLASS_V2_EDGE: EDGE.
- * @MBIM_DATA_CLASS_V2_UMTS: UMTS.
- * @MBIM_DATA_CLASS_V2_HSDPA: HSDPA.
- * @MBIM_DATA_CLASS_V2_HSUPA: HSUPA.
- * @MBIM_DATA_CLASS_V2_LTE: LTE.
- * @MBIM_DATA_CLASS_V2_5G: 5G.
- * @MBIM_DATA_CLASS_V2_1XRTT: 1xRTT.
- * @MBIM_DATA_CLASS_V2_1XEVDO: 1xEV-DO.
- * @MBIM_DATA_CLASS_V2_1XEVDO_REVA: 1xEV-DO RevA
- * @MBIM_DATA_CLASS_V2_1XEVDV: 1xEV-DV.
- * @MBIM_DATA_CLASS_V2_3XRTT: 3xRTT.
- * @MBIM_DATA_CLASS_V2_1XEVDO_REVB: 1xEV-DO RevB.
- * @MBIM_DATA_CLASS_V2_UMB: UMB.
- * @MBIM_DATA_CLASS_V2_CUSTOM: Custom.
+/* 'Device Caps v3' and 'Base Stations Info v3' enums */
+
+/**
+ * MbimDataClassV3:
+ * @MBIM_DATA_CLASS_V3_GPRS: GPRS.
+ * @MBIM_DATA_CLASS_V3_EDGE: EDGE.
+ * @MBIM_DATA_CLASS_V3_UMTS: UMTS.
+ * @MBIM_DATA_CLASS_V3_HSDPA: HSDPA.
+ * @MBIM_DATA_CLASS_V3_HSUPA: HSUPA.
+ * @MBIM_DATA_CLASS_V3_LTE: LTE.
+ * @MBIM_DATA_CLASS_V3_5G: 5G.
+ * @MBIM_DATA_CLASS_V3_1XRTT: 1xRTT.
+ * @MBIM_DATA_CLASS_V3_1XEVDO: 1xEV-DO.
+ * @MBIM_DATA_CLASS_V3_1XEVDO_REVA: 1xEV-DO RevA
+ * @MBIM_DATA_CLASS_V3_1XEVDV: 1xEV-DV.
+ * @MBIM_DATA_CLASS_V3_3XRTT: 3xRTT.
+ * @MBIM_DATA_CLASS_V3_1XEVDO_REVB: 1xEV-DO RevB.
+ * @MBIM_DATA_CLASS_V3_UMB: UMB.
+ * @MBIM_DATA_CLASS_V3_CUSTOM: Custom.
  *
  * Data class update in MBIMEx v3.0.
  *
  * There is now a single flag for 5G, and the new #MbimDataSubclass helps to
  * identify the specific 5G setup.
  *
+ * This type should be considered incompatible with #MbimDataClass.
+ *
  * Since: 1.28
  */
 typedef enum { /*< since=1.28 >*/
-    MBIM_DATA_CLASS_V2_GPRS        = 1 << 0,
-    MBIM_DATA_CLASS_V2_EDGE        = 1 << 1,
-    MBIM_DATA_CLASS_V2_UMTS        = 1 << 2,
-    MBIM_DATA_CLASS_V2_HSDPA       = 1 << 3,
-    MBIM_DATA_CLASS_V2_HSUPA       = 1 << 4,
-    MBIM_DATA_CLASS_V2_LTE         = 1 << 5,
-    MBIM_DATA_CLASS_V2_5G          = 1 << 6,
+    MBIM_DATA_CLASS_V3_GPRS        = 1 << 0,
+    MBIM_DATA_CLASS_V3_EDGE        = 1 << 1,
+    MBIM_DATA_CLASS_V3_UMTS        = 1 << 2,
+    MBIM_DATA_CLASS_V3_HSDPA       = 1 << 3,
+    MBIM_DATA_CLASS_V3_HSUPA       = 1 << 4,
+    MBIM_DATA_CLASS_V3_LTE         = 1 << 5,
+    MBIM_DATA_CLASS_V3_5G          = 1 << 6,
     /* Bit 7 unused, bits 8 to 15 reserved for future 3GPP classes */
-    MBIM_DATA_CLASS_V2_1XRTT       = 1 << 16,
-    MBIM_DATA_CLASS_V2_1XEVDO      = 1 << 17,
-    MBIM_DATA_CLASS_V2_1XEVDO_REVA = 1 << 18,
-    MBIM_DATA_CLASS_V2_1XEVDV      = 1 << 19,
-    MBIM_DATA_CLASS_V2_3XRTT       = 1 << 20,
-    MBIM_DATA_CLASS_V2_1XEVDO_REVB = 1 << 21,
-    MBIM_DATA_CLASS_V2_UMB         = 1 << 22,
+    MBIM_DATA_CLASS_V3_1XRTT       = 1 << 16,
+    MBIM_DATA_CLASS_V3_1XEVDO      = 1 << 17,
+    MBIM_DATA_CLASS_V3_1XEVDO_REVA = 1 << 18,
+    MBIM_DATA_CLASS_V3_1XEVDV      = 1 << 19,
+    MBIM_DATA_CLASS_V3_3XRTT       = 1 << 20,
+    MBIM_DATA_CLASS_V3_1XEVDO_REVB = 1 << 21,
+    MBIM_DATA_CLASS_V3_UMB         = 1 << 22,
     /* Bits 23 to 30 reserved for future 3GPP2 classes */
-    MBIM_DATA_CLASS_V2_CUSTOM      = 1 << 31
-} MbimDataClassV2;
+    MBIM_DATA_CLASS_V3_CUSTOM      = 1 << 31
+} MbimDataClassV3;
 
 /**
  * MbimDataSubclass:
diff --git a/src/mbimcli/mbimcli-basic-connect.c b/src/mbimcli/mbimcli-basic-connect.c
index b646496..372516b 100644
--- a/src/mbimcli/mbimcli-basic-connect.c
+++ b/src/mbimcli/mbimcli-basic-connect.c
@@ -1611,7 +1611,7 @@ packet_service_ready (MbimDevice   *device,
     guint32                 nw_error;
     MbimPacketServiceState  packet_service_state;
     MbimDataClass           highest_available_data_class;
-    MbimDataClassV2         highest_available_data_class_v2;
+    MbimDataClassV3         highest_available_data_class_v3;
     g_autofree gchar       *highest_available_data_class_str = NULL;
     guint64                 uplink_speed;
     guint64                 downlink_speed;
@@ -1631,7 +1631,7 @@ packet_service_ready (MbimDevice   *device,
         if (!mbim_message_ms_basic_connect_v3_packet_service_response_parse (response,
                                                                              &nw_error,
                                                                              &packet_service_state,
-                                                                             &highest_available_data_class_v2,
+                                                                             &highest_available_data_class_v3,
                                                                              &uplink_speed,
                                                                              &downlink_speed,
                                                                              &frequency_range,
@@ -1690,7 +1690,7 @@ packet_service_ready (MbimDevice   *device,
     }
 
     if (mbim_device_check_ms_mbimex_version (device, 3, 0))
-        highest_available_data_class_str = mbim_data_class_v2_build_string_from_mask (highest_available_data_class_v2);
+        highest_available_data_class_str = mbim_data_class_v3_build_string_from_mask (highest_available_data_class_v3);
     else
         highest_available_data_class_str = mbim_data_class_build_string_from_mask (highest_available_data_class);
 
diff --git a/src/mbimcli/mbimcli-ms-basic-connect-extensions.c b/src/mbimcli/mbimcli-ms-basic-connect-extensions.c
index 8ce0183..e945e5d 100644
--- a/src/mbimcli/mbimcli-ms-basic-connect-extensions.c
+++ b/src/mbimcli/mbimcli-ms-basic-connect-extensions.c
@@ -933,7 +933,7 @@ query_base_stations_ready (MbimDevice   *device,
     g_autoptr(MbimMessage)                         response = NULL;
     g_autoptr(GError)                              error = NULL;
     MbimDataClass                                  system_type;
-    MbimDataClassV2                                system_type_v2;
+    MbimDataClassV3                                system_type_v3;
     MbimDataSubclass                               system_subtype;
     g_autoptr(MbimCellInfoServingGsm)              gsm_serving_cell = NULL;
     g_autoptr(MbimCellInfoServingUmts)             umts_serving_cell = NULL;
@@ -965,7 +965,7 @@ query_base_stations_ready (MbimDevice   *device,
     if (mbim_device_check_ms_mbimex_version (device, 3, 0)) {
         if (!mbim_message_ms_basic_connect_extensions_v3_base_stations_info_response_parse (
                 response,
-                &system_type_v2,
+                &system_type_v3,
                 &system_subtype,
                 &gsm_serving_cell,
                 &umts_serving_cell,
@@ -1053,7 +1053,7 @@ query_base_stations_ready (MbimDevice   *device,
         g_autofree gchar *system_type_str = NULL;
         g_autofree gchar *system_subtype_str = NULL;
 
-        system_type_str = mbim_data_class_v2_build_string_from_mask (system_type_v2);
+        system_type_str = mbim_data_class_v3_build_string_from_mask (system_type_v3);
         g_print ("System type: %s\n", system_type_str);
         system_subtype_str = mbim_data_subclass_build_string_from_mask (system_subtype);
         g_print ("System subtype: %s\n", VALIDATE_UNKNOWN (system_subtype_str));