aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Williams <dcbw@redhat.com>2016-09-30 11:29:03 -0500
committerDan Williams <dcbw@redhat.com>2016-10-06 10:12:04 -0500
commit7de80b7cf71a211fef816ada777349180b5371c3 (patch)
tree3304cdebf69739eceaeb57b18de1bc6ff5b6b534
parentffa1cf2447e4af350d87f8b5e071c471f5bbf805 (diff)
wds: add more Profile-related TLVs
-rw-r--r--data/qmi-common.json88
-rw-r--r--data/qmi-service-wds.json28
-rw-r--r--docs/reference/libqmi-glib/libqmi-glib-common.sections10
-rw-r--r--src/libqmi-glib/qmi-enums-wds.h38
4 files changed, 155 insertions, 9 deletions
diff --git a/data/qmi-common.json b/data/qmi-common.json
index 3c2c87b..631eda4 100644
--- a/data/qmi-common.json
+++ b/data/qmi-common.json
@@ -41,6 +41,22 @@
"format" : "guint8",
"public-format" : "QmiWdsPdpType" },
+ { "common-ref" : "WDS PDP Header Compression Type",
+ "name" : "PDP Header Compression Type",
+ "id" : "0x12",
+ "mandatory" : "no",
+ "type" : "TLV",
+ "format" : "guint8",
+ "public-format" : "QmiWdsPdpHeaderCompressionType" },
+
+ { "common-ref" : "WDS PDP Data Compression Type",
+ "name" : "PDP Data Compression Type",
+ "id" : "0x13",
+ "mandatory" : "no",
+ "type" : "TLV",
+ "format" : "guint8",
+ "public-format" : "QmiWdsPdpDataCompressionType" },
+
{ "common-ref" : "WDS APN Name",
"name" : "APN Name",
"id" : "0x14",
@@ -64,6 +80,78 @@
"endian" : "little",
"format" : "guint32" },
+ { "common-ref" : "WDS UMTS Requested QoS",
+ "name" : "UMTS Requested QoS",
+ "id" : "0x17",
+ "mandatory" : "no",
+ "type" : "TLV",
+ "format" : "sequence",
+ "contents" : [ { "name" : "Traffic Class",
+ "format" : "guint8",
+ "public-format" : "QmiWdsTrafficClass" },
+ { "name" : "Max uplink bitrate",
+ "format" : "guint32" },
+ { "name" : "Max downlink bitrate",
+ "format" : "guint32" },
+ { "name" : "Guaranteed uplink bitrate",
+ "format" : "guint32" },
+ { "name" : "Guaranteed downlink bitrate",
+ "format" : "guint32" },
+ { "name" : "QoS Delivery Order",
+ "format" : "guint8",
+ "public-format" : "QmiWdsDeliveryOrder" },
+ { "name" : "Maximum SDU Size",
+ "format" : "guint32" },
+ { "name" : "SDU Error Ratio",
+ "format" : "guint8",
+ "public-format" : "QmiWdsSduErrorRatio" },
+ { "name" : "Residual Bit Error Ratio",
+ "format" : "guint8",
+ "public-format" : "QmiWdsSduResidualBitErrorRatio" },
+ { "name" : "Delivery Erroneous SDU",
+ "format" : "guint8",
+ "public-format" : "QmiWdsSduErroneousDelivery" },
+ { "name" : "Transfer Delay",
+ "format" : "guint32" },
+ { "name" : "Traffic Handling Priority",
+ "format" : "guint32" } ] },
+
+ { "common-ref" : "WDS UMTS Minimum QoS",
+ "name" : "UMTS Minimum QoS",
+ "id" : "0x18",
+ "mandatory" : "no",
+ "type" : "TLV",
+ "format" : "sequence",
+ "contents" : [ { "name" : "Traffic Class",
+ "format" : "guint8",
+ "public-format" : "QmiWdsTrafficClass" },
+ { "name" : "Max uplink bitrate",
+ "format" : "guint32" },
+ { "name" : "Max downlink bitrate",
+ "format" : "guint32" },
+ { "name" : "Guaranteed uplink bitrate",
+ "format" : "guint32" },
+ { "name" : "Guaranteed downlink bitrate",
+ "format" : "guint32" },
+ { "name" : "QoS Delivery Order",
+ "format" : "guint8",
+ "public-format" : "QmiWdsDeliveryOrder" },
+ { "name" : "Maximum SDU Size",
+ "format" : "guint32" },
+ { "name" : "SDU Error Ratio",
+ "format" : "guint8",
+ "public-format" : "QmiWdsSduErrorRatio" },
+ { "name" : "Residual Bit Error Ratio",
+ "format" : "guint8",
+ "public-format" : "QmiWdsSduResidualBitErrorRatio" },
+ { "name" : "Delivery Erroneous SDU",
+ "format" : "guint8",
+ "public-format" : "QmiWdsSduErroneousDelivery" },
+ { "name" : "Transfer Delay",
+ "format" : "guint32" },
+ { "name" : "Traffic Handling Priority",
+ "format" : "guint32" } ] },
+
{ "common-ref" : "WDS GPRS Requested QoS",
"name" : "GPRS Requested QoS",
"id" : "0x19",
diff --git a/data/qmi-service-wds.json b/data/qmi-service-wds.json
index f93edf7..62373c3 100644
--- a/data/qmi-service-wds.json
+++ b/data/qmi-service-wds.json
@@ -676,13 +676,13 @@
"public-format" : "QmiWdsProfileType" },
{ "common-ref" : "WDS Profile Name" },
{ "common-ref" : "WDS PDP Type" },
- // 0x12 PDP Header Compression Type
- // 0x13 PDP Data Compression Type
+ { "common-ref" : "WDS PDP Header Compression Type" },
+ { "common-ref" : "WDS PDP Data Compression Type" },
{ "common-ref" : "WDS APN Name" },
{ "common-ref" : "WDS Primary IPv4 DNS Address" },
{ "common-ref" : "WDS Secondary IPv4 DNS Address" },
- // 0x17 UMTS Requested QoS
- // 0x18 UMTS Minimum QoS
+ { "common-ref" : "WDS UMTS Requested QoS" },
+ { "common-ref" : "WDS UMTS Minimum QoS" },
{ "common-ref" : "WDS GPRS Requested QoS" },
{ "common-ref" : "WDS GPRS Minimum QoS" },
{ "common-ref" : "WDS Username" },
@@ -823,14 +823,20 @@
"prerequisites" : [ { "common-ref" : "Success" } ] },
{ "common-ref" : "WDS PDP Type",
"prerequisites" : [ { "common-ref" : "Success" } ] },
+ { "common-ref" : "WDS PDP Header Compression Type",
+ "prerequisites" : [ { "common-ref" : "Success" } ] },
+ { "common-ref" : "WDS PDP Data Compression Type",
+ "prerequisites" : [ { "common-ref" : "Success" } ] },
{ "common-ref" : "WDS APN Name",
"prerequisites" : [ { "common-ref" : "Success" } ] },
{ "common-ref" : "WDS Primary IPv4 DNS Address",
"prerequisites" : [ { "common-ref" : "Success" } ] },
{ "common-ref" : "WDS Secondary IPv4 DNS Address",
"prerequisites" : [ { "common-ref" : "Success" } ] },
- // 0x17 UMTS Requested QoS
- // 0x18 UMTS Minimum QoS
+ { "common-ref" : "WDS UMTS Requested QoS",
+ "prerequisites" : [ { "common-ref" : "Success" } ] },
+ { "common-ref" : "WDS UMTS Minimum QoS",
+ "prerequisites" : [ { "common-ref" : "Success" } ] },
{ "common-ref" : "WDS GPRS Requested QoS",
"prerequisites" : [ { "common-ref" : "Success" } ] },
{ "common-ref" : "WDS GPRS Minimum QoS",
@@ -926,14 +932,20 @@
"prerequisites" : [ { "common-ref" : "Success" } ] },
{ "common-ref" : "WDS PDP Type",
"prerequisites" : [ { "common-ref" : "Success" } ] },
+ { "common-ref" : "WDS PDP Header Compression Type",
+ "prerequisites" : [ { "common-ref" : "Success" } ] },
+ { "common-ref" : "WDS PDP Data Compression Type",
+ "prerequisites" : [ { "common-ref" : "Success" } ] },
{ "common-ref" : "WDS APN Name",
"prerequisites" : [ { "common-ref" : "Success" } ] },
{ "common-ref" : "WDS Primary IPv4 DNS Address",
"prerequisites" : [ { "common-ref" : "Success" } ] },
{ "common-ref" : "WDS Secondary IPv4 DNS Address",
"prerequisites" : [ { "common-ref" : "Success" } ] },
- // 0x17 UMTS Requested QoS
- // 0x18 UMTS Minimum QoS
+ { "common-ref" : "WDS UMTS Requested QoS",
+ "prerequisites" : [ { "common-ref" : "Success" } ] },
+ { "common-ref" : "WDS UMTS Minimum QoS",
+ "prerequisites" : [ { "common-ref" : "Success" } ] },
{ "common-ref" : "WDS GPRS Requested QoS",
"prerequisites" : [ { "common-ref" : "Success" } ] },
{ "common-ref" : "WDS GPRS Minimum QoS",
diff --git a/docs/reference/libqmi-glib/libqmi-glib-common.sections b/docs/reference/libqmi-glib/libqmi-glib-common.sections
index 6c8bd32..a153821 100644
--- a/docs/reference/libqmi-glib/libqmi-glib-common.sections
+++ b/docs/reference/libqmi-glib/libqmi-glib-common.sections
@@ -449,6 +449,8 @@ QmiWdsSoCdma1x
QmiWdsSoEvdoRevA
QmiWdsGetCurrentSettingsRequestedSettings
QmiWdsPdpType
+QmiWdsPdpHeaderCompressionType
+QmiWdsPdpDataCompressionType
QmiWdsTrafficClass
QmiWdsAuthentication
QmiWdsProfileType
@@ -496,6 +498,8 @@ qmi_wds_so_cdma1x_build_string_from_mask
qmi_wds_so_evdo_reva_build_string_from_mask
qmi_wds_get_current_settings_requested_settings_get_string
qmi_wds_pdp_type_get_string
+qmi_wds_pdp_header_compression_type_get_string
+qmi_wds_pdp_data_compression_type_get_string
qmi_wds_traffic_class_get_string
qmi_wds_authentication_build_string_from_mask
qmi_wds_profile_type_get_string
@@ -542,6 +546,8 @@ qmi_wds_so_cdma1x_get_string
qmi_wds_so_evdo_reva_get_string
qmi_wds_get_current_settings_requested_settings_build_string_from_mask
qmi_wds_pdp_type_build_string_from_mask
+qmi_wds_pdp_header_compression_type_build_string_from_mask
+qmi_wds_pdp_data_compression_type_build_string_from_mask
qmi_wds_traffic_class_build_string_from_mask
qmi_wds_delivery_order_build_string_from_mask
qmi_wds_sdu_error_ratio_build_string_from_mask
@@ -578,6 +584,8 @@ QMI_TYPE_WDS_IP_FAMILY
QMI_TYPE_WDS_NETWORK_TYPE
QMI_TYPE_WDS_DATA_SYSTEM_NETWORK_TYPE
QMI_TYPE_WDS_PDP_TYPE
+QMI_TYPE_WDS_PDP_HEADER_COMPRESSION_TYPE
+QMI_TYPE_WDS_PDP_DATA_COMPRESSION_TYPE
QMI_TYPE_WDS_PROFILE_TYPE
QMI_TYPE_WDS_RAT_3GPP
QMI_TYPE_WDS_RAT_3GPP2
@@ -623,6 +631,8 @@ qmi_wds_ip_family_get_type
qmi_wds_network_type_get_type
qmi_wds_data_system_network_type_get_type
qmi_wds_pdp_type_get_type
+qmi_wds_pdp_header_compression_type_get_type
+qmi_wds_pdp_data_compression_type_get_type
qmi_wds_profile_type_get_type
qmi_wds_rat_3gpp2_get_type
qmi_wds_rat_3gpp_get_type
diff --git a/src/libqmi-glib/qmi-enums-wds.h b/src/libqmi-glib/qmi-enums-wds.h
index 3a0c5fd..d755846 100644
--- a/src/libqmi-glib/qmi-enums-wds.h
+++ b/src/libqmi-glib/qmi-enums-wds.h
@@ -1252,7 +1252,6 @@ typedef enum {
QMI_WDS_AUTOCONNECT_SETTING_ROAMING_HOME_ONLY = 1,
} QmiWdsAutoconnectSettingRoaming;
-
/*****************************************************************************/
/* Helper enums for the 'QMI WDS Set Event Report' message */
@@ -1449,4 +1448,41 @@ typedef enum {
QMI_WDS_EXTENDED_DATA_BEARER_TECHNOLOGY_3GPP2_HDR_EVDO_FMC = 1 << 12,
} QmiWdsExtendedDataBearerTechnology3gpp2;
+/*****************************************************************************/
+/* Helper enums for the 'QMI WDS Profile'-related messages */
+
+/**
+ * QmiWdsPdpHeaderCompressionType:
+ * @QMI_WDS_PDP_HEADER_COMPRESSION_TYPE_OFF: no header compression
+ * @QMI_WDS_PDP_HEADER_COMPRESSION_TYPE_MANUFACTURER_PREFERRED: manufacturer preferred
+ * @QMI_WDS_PDP_HEADER_COMPRESSION_TYPE_RFC1144: RFC1144
+ * @QMI_WDS_PDP_HEADER_COMPRESSION_TYPE_RFC2507: RFC2507
+ * @QMI_WDS_PDP_HEADER_COMPRESSION_TYPE_RFC3095: RFC3095
+ *
+ * PDP header compression types.
+ */
+typedef enum { /*< underscore_name=qmi_wds_pdp_header_compression_type >*/
+ QMI_WDS_PDP_HEADER_COMPRESSION_TYPE_OFF = 0,
+ QMI_WDS_PDP_HEADER_COMPRESSION_TYPE_MANUFACTURER_PREFERRED = 1,
+ QMI_WDS_PDP_HEADER_COMPRESSION_TYPE_RFC1144 = 2,
+ QMI_WDS_PDP_HEADER_COMPRESSION_TYPE_RFC2507 = 3,
+ QMI_WDS_PDP_HEADER_COMPRESSION_TYPE_RFC3095 = 4,
+} QmiWdsPdpHeaderCompressionType;
+
+/**
+ * QmiWdsPdpDataCompressionType:
+ * @QMI_WDS_PDP_DATA_COMPRESSION_TYPE_OFF: no data compression
+ * @QMI_WDS_PDP_DATA_COMPRESSION_TYPE_MANUFACTURER_PREFERRED: manufacturer preferred
+ * @QMI_WDS_PDP_DATA_COMPRESSION_TYPE_V42BIS: V42bis
+ * @QMI_WDS_PDP_DATA_COMPRESSION_TYPE_V44: V44
+ *
+ * PDP data compression types.
+ */
+typedef enum { /*< underscore_name=qmi_wds_pdp_data_compression_type >*/
+ QMI_WDS_PDP_DATA_COMPRESSION_TYPE_OFF = 0,
+ QMI_WDS_PDP_DATA_COMPRESSION_TYPE_MANUFACTURER_PREFERRED = 1,
+ QMI_WDS_PDP_DATA_COMPRESSION_TYPE_V42BIS = 2,
+ QMI_WDS_PDP_DATA_COMPRESSION_TYPE_V44 = 3,
+} QmiWdsPdpDataCompressionType;
+
#endif /* _LIBQMI_GLIB_QMI_ENUMS_WDS_H_ */