wds: move common TLVs to the WDS spec

2 files changed, 373 insertions, 375 deletions

diff --git a/data/qmi-common.json b/data/qmi-common.json
index 49ee3b3..16c9724 100644
--- a/data/qmi-common.json
+++ b/data/qmi-common.json
@@ -20,379 +20,6 @@
       "type"       : "prerequisite",
       "field"      : "Result.Error Status",
       "operation"  : "!=",
-      "value"      : "QMI_STATUS_SUCCESS" },
-
-    // *********************************************************************************
-    // WDS common TLVs
-
-   { "common-ref"    : "WDS Extended Error Code",
-     "name"          : "Extended Error Code",
-     "id"            : "0xE0",
-     "type"          : "TLV",
-     "format"        : "guint16",
-     "public-format" : "QmiWdsDsProfileError",
-     "prerequisites" : [ { "field"     : "Result.Error Status",
-                           "operation" : "!=",
-                           "value"     : "QMI_STATUS_SUCCESS" },
-                         { "field"     : "Result.Error Code",
-                           "operation" : "==",
-                           "value"     : "QMI_PROTOCOL_ERROR_EXTENDED_INTERNAL" } ] },
-
-   { "common-ref" : "WDS Profile Identifier",
-     "name"       : "Profile Identifier",
-     "id"         : "0x01",
-     "type"       : "TLV",
-     "format"     : "sequence",
-     "contents"   : [ { "name"   : "Profile Type",
-                        "format" : "guint8",
-                        "public-format" : "QmiWdsProfileType" },
-                      { "name"   : "Profile Index",
-                        "format" : "guint8" } ] },
-
-    { "common-ref" : "WDS Profile Name",
-      "name"       : "Profile Name",
-      "id"         : "0x10",
-      "type"       : "TLV",
-      "format"     : "string" },
-
-    { "common-ref" : "WDS PDP Type",
-      "name"       : "PDP Type",
-      "id"         : "0x11",
-      "type"       : "TLV",
-      "format"     : "guint8",
-      "public-format" : "QmiWdsPdpType" },
-
-    { "common-ref" : "WDS PDP Header Compression Type",
-      "name"       : "PDP Header Compression Type",
-      "id"         : "0x12",
-      "type"       : "TLV",
-      "format"     : "guint8",
-      "public-format" : "QmiWdsPdpHeaderCompressionType" },
-
-    { "common-ref" : "WDS PDP Data Compression Type",
-      "name"       : "PDP Data Compression Type",
-      "id"         : "0x13",
-      "type"       : "TLV",
-      "format"     : "guint8",
-      "public-format" : "QmiWdsPdpDataCompressionType" },
-
-    { "common-ref" : "WDS APN Name",
-      "name"       : "APN Name",
-      "id"         : "0x14",
-      "type"       : "TLV",
-      "format"     : "string" },
-
-    { "common-ref" : "WDS Primary IPv4 DNS Address",
-      "name"       : "Primary IPv4 DNS Address",
-      "id"         : "0x15",
-      "type"       : "TLV",
-      "endian"     : "little",
-      "format"     : "guint32" },
-
-    { "common-ref" : "WDS Secondary IPv4 DNS Address",
-      "name"       : "Secondary IPv4 DNS Address",
-      "id"         : "0x16",
-      "type"       : "TLV",
-      "endian"     : "little",
-      "format"     : "guint32" },
-
-    { "common-ref" : "WDS UMTS Requested QoS",
-      "name"       : "UMTS Requested QoS",
-      "id"         : "0x17",
-      "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",
-      "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",
-      "type"       : "TLV",
-      "format"     : "sequence",
-      "contents"   : [ { "name"   : "Precedence Class",
-                        "format" : "guint32" },
-                      { "name"   : "Delay Class",
-                        "format" : "guint32" },
-                      { "name"   : "Reliability Class",
-                        "format" : "guint32" },
-                      { "name"   : "Peak Throughput Class",
-                        "format" : "guint32" },
-                      { "name"   : "Mean Throughput Class",
-                        "format" : "guint32" } ] },
-
-    { "common-ref" : "WDS GPRS Minimum QoS",
-      "name"       : "GPRS Minimum QoS",
-      "id"         : "0x1A",
-      "type"       : "TLV",
-      "format"     : "sequence",
-      "contents"   : [ { "name"   : "Precedence Class",
-                        "format" : "guint32" },
-                      { "name"   : "Delay Class",
-                        "format" : "guint32" },
-                      { "name"   : "Reliability Class",
-                        "format" : "guint32" },
-                      { "name"   : "Peak Throughput Class",
-                        "format" : "guint32" },
-                      { "name"   : "Mean Throughput Class",
-                        "format" : "guint32" } ] },
-
-    { "common-ref" : "WDS Username",
-      "name"       : "Username",
-      "id"         : "0x1B",
-      "type"       : "TLV",
-      "format"     : "string" },
-
-    { "common-ref" : "WDS Password",
-      "name"       : "Password",
-      "id"         : "0x1C",
-      "type"       : "TLV",
-      "format"     : "string" },
-
-    { "common-ref" : "WDS Authentication",
-      "name"       : "Authentication",
-      "id"         : "0x1D",
-      "type"       : "TLV",
-      "format"     : "guint8",
-      "public-format" : "QmiWdsAuthentication" },
-
-    { "common-ref" : "WDS IPv4 Address Preference",
-      "name"       : "IPv4 Address Preference",
-      "id"         : "0x1E",
-      "type"       : "TLV",
-      "endian"     : "little",
-      "format"     : "guint32" },
-
-    { "common-ref"    : "WDS PCSCF Address Using PCO",
-      "name"          : "PCSCF Address Using PCO",
-      "id"            : "0x1F",
-      "type"          : "TLV",
-      "format"        : "guint8",
-      "public-format" : "gboolean" },
-
-    { "common-ref"    : "WDS PCSCF Address Using DHCP",
-      "name"          : "PCSCF Address Using DHCP",
-      "id"            : "0x21",
-      "type"          : "TLV",
-      "format"        : "guint8",
-      "public-format" : "gboolean" },
-
-    { "common-ref"    : "WDS IMCN Flag",
-      "name"          : "IMCN Flag",
-      "id"            : "0x22",
-      "type"          : "TLV",
-      "format"        : "guint8",
-      "public-format" : "gboolean" },
-
-    { "common-ref"    : "WDS PDP Context Number",
-      "name"          : "PDP Context Number",
-      "id"            : "0x25",
-      "type"          : "TLV",
-      "format"        : "guint8" },
-
-    { "common-ref"    : "WDS PDP Context Secondary Flag",
-      "name"          : "PDP Context Secondary Flag",
-      "id"            : "0x26",
-      "type"          : "TLV",
-      "format"        : "guint8",
-      "public-format" : "gboolean" },
-
-    { "common-ref"    : "WDS PDP Context Primary ID",
-      "name"          : "PDP Context Primary ID",
-      "id"            : "0x27",
-      "type"          : "TLV",
-      "format"        : "guint8" },
-
-    { "common-ref" : "WDS IPv6 Address Preference",
-      "name"       : "IPv6 Address Preference",
-      "id"         : "0x28",
-      "type"       : "TLV",
-      "format"     : "sequence",
-      "contents"   : [ { "name"         : "Address",
-                        "format"        : "array",
-                        "fixed-size"    : "8",
-                        "array-element" : { "format": "guint16", "endian": "network" } } ] },
-
-    { "common-ref" : "WDS UMTS Requested QoS With Signaling Indication Flag",
-      "name"       : "UMTS Requested QoS With Signaling Indication Flag",
-      "id"         : "0x29",
-      "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" },
-                      { "name"   : "Signaling Indication",
-                        "format" : "gint8" } ] },
-
-    { "common-ref" : "WDS UMTS Minimum QoS With Signaling Indication Flag",
-      "name"       : "UMTS Minimum QoS With Signaling Indication Flag",
-      "id"         : "0x2A",
-      "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" },
-                      { "name"   : "Signaling Indication",
-                        "format" : "gint8" } ] },
-
-    { "common-ref"    : "WDS IPv6 Primary DNS Address Preference",
-      "name"          : "IPv6 Primary DNS Address Preference",
-      "id"            : "0x2B",
-      "type"          : "TLV",
-      "format"        : "array",
-      "fixed-size"    : "8",
-      "array-element" : { "format": "guint16", "endian": "network" } },
-
-    { "common-ref"    : "WDS IPv6 Secondary DNS Address Preference",
-      "name"          : "IPv6 Secondary DNS Address Preference",
-      "id"            : "0x2C",
-      "type"          : "TLV",
-      "format"        : "array",
-      "fixed-size"    : "8",
-      "array-element" : { "format": "guint16", "endian": "network" } },
-
-    { "common-ref" : "WDS LTE QoS Parameters",
-      "name"       : "LTE QoS Parameters",
-      "id"         : "0x2E",
-      "type"       : "TLV",
-      "format"     : "sequence",
-      "contents"   : [ { "name"         : "QoS Class Identifier",
-                        "format"        : "guint8",
-                        "public-format" : "QmiWdsQosClassIdentifier" },
-                      { "name"          : "Guaranteed Downlink Bitrate",
-                        "format"        : "guint32" },
-                      { "name"          : "Max Downlink Bitrate",
-                        "format"        : "guint32" },
-                      { "name"          : "Guaranteed Uplink Bitrate",
-                        "format"        : "guint32" },
-                      { "name"          : "Max Uplink Bitrate",
-                        "format"        : "guint32" } ] },
-
-    { "common-ref"    : "WDS APN Disabled Flag",
-      "name"          : "APN Disabled Flag",
-      "id"            : "0x2F",
-      "type"          : "TLV",
-      "format"        : "guint8",
-      "public-format" : "gboolean" },
-
-    { "common-ref"    : "WDS Roaming Disallowed Flag",
-      "name"          : "Roaming Disallowed Flag",
-      "id"            : "0x3E",
-      "type"          : "TLV",
-      "format"        : "guint8",
-      "public-format" : "gboolean" }
+      "value"      : "QMI_STATUS_SUCCESS" }
 
 ]
diff --git a/data/qmi-service-wds.json b/data/qmi-service-wds.json
index 2993f32..ac500af 100644
--- a/data/qmi-service-wds.json
+++ b/data/qmi-service-wds.json
@@ -15,7 +15,378 @@
 
   // *********************************************************************************
   {  "name"    : "QMI Indication WDS",
-     "type"    : "Indication-ID-Enum" } ,
+     "type"    : "Indication-ID-Enum" },
+
+  // *********************************************************************************
+   { "common-ref"    : "WDS Extended Error Code",
+     "name"          : "Extended Error Code",
+     "id"            : "0xE0",
+     "type"          : "TLV",
+     "format"        : "guint16",
+     "public-format" : "QmiWdsDsProfileError",
+     "prerequisites" : [ { "field"     : "Result.Error Status",
+                           "operation" : "!=",
+                           "value"     : "QMI_STATUS_SUCCESS" },
+                         { "field"     : "Result.Error Code",
+                           "operation" : "==",
+                           "value"     : "QMI_PROTOCOL_ERROR_EXTENDED_INTERNAL" } ] },
+
+   { "common-ref" : "WDS Profile Identifier",
+     "name"       : "Profile Identifier",
+     "id"         : "0x01",
+     "type"       : "TLV",
+     "format"     : "sequence",
+     "contents"   : [ { "name"   : "Profile Type",
+                        "format" : "guint8",
+                        "public-format" : "QmiWdsProfileType" },
+                      { "name"   : "Profile Index",
+                        "format" : "guint8" } ] },
+
+    { "common-ref" : "WDS Profile Name",
+      "name"       : "Profile Name",
+      "id"         : "0x10",
+      "type"       : "TLV",
+      "format"     : "string" },
+
+    { "common-ref" : "WDS PDP Type",
+      "name"       : "PDP Type",
+      "id"         : "0x11",
+      "type"       : "TLV",
+      "format"     : "guint8",
+      "public-format" : "QmiWdsPdpType" },
+
+    { "common-ref" : "WDS PDP Header Compression Type",
+      "name"       : "PDP Header Compression Type",
+      "id"         : "0x12",
+      "type"       : "TLV",
+      "format"     : "guint8",
+      "public-format" : "QmiWdsPdpHeaderCompressionType" },
+
+    { "common-ref" : "WDS PDP Data Compression Type",
+      "name"       : "PDP Data Compression Type",
+      "id"         : "0x13",
+      "type"       : "TLV",
+      "format"     : "guint8",
+      "public-format" : "QmiWdsPdpDataCompressionType" },
+
+    { "common-ref" : "WDS APN Name",
+      "name"       : "APN Name",
+      "id"         : "0x14",
+      "type"       : "TLV",
+      "format"     : "string" },
+
+    { "common-ref" : "WDS Primary IPv4 DNS Address",
+      "name"       : "Primary IPv4 DNS Address",
+      "id"         : "0x15",
+      "type"       : "TLV",
+      "endian"     : "little",
+      "format"     : "guint32" },
+
+    { "common-ref" : "WDS Secondary IPv4 DNS Address",
+      "name"       : "Secondary IPv4 DNS Address",
+      "id"         : "0x16",
+      "type"       : "TLV",
+      "endian"     : "little",
+      "format"     : "guint32" },
+
+    { "common-ref" : "WDS UMTS Requested QoS",
+      "name"       : "UMTS Requested QoS",
+      "id"         : "0x17",
+      "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",
+      "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",
+      "type"       : "TLV",
+      "format"     : "sequence",
+      "contents"   : [ { "name"   : "Precedence Class",
+                        "format" : "guint32" },
+                      { "name"   : "Delay Class",
+                        "format" : "guint32" },
+                      { "name"   : "Reliability Class",
+                        "format" : "guint32" },
+                      { "name"   : "Peak Throughput Class",
+                        "format" : "guint32" },
+                      { "name"   : "Mean Throughput Class",
+                        "format" : "guint32" } ] },
+
+    { "common-ref" : "WDS GPRS Minimum QoS",
+      "name"       : "GPRS Minimum QoS",
+      "id"         : "0x1A",
+      "type"       : "TLV",
+      "format"     : "sequence",
+      "contents"   : [ { "name"   : "Precedence Class",
+                        "format" : "guint32" },
+                      { "name"   : "Delay Class",
+                        "format" : "guint32" },
+                      { "name"   : "Reliability Class",
+                        "format" : "guint32" },
+                      { "name"   : "Peak Throughput Class",
+                        "format" : "guint32" },
+                      { "name"   : "Mean Throughput Class",
+                        "format" : "guint32" } ] },
+
+    { "common-ref" : "WDS Username",
+      "name"       : "Username",
+      "id"         : "0x1B",
+      "type"       : "TLV",
+      "format"     : "string" },
+
+    { "common-ref" : "WDS Password",
+      "name"       : "Password",
+      "id"         : "0x1C",
+      "type"       : "TLV",
+      "format"     : "string" },
+
+    { "common-ref" : "WDS Authentication",
+      "name"       : "Authentication",
+      "id"         : "0x1D",
+      "type"       : "TLV",
+      "format"     : "guint8",
+      "public-format" : "QmiWdsAuthentication" },
+
+    { "common-ref" : "WDS IPv4 Address Preference",
+      "name"       : "IPv4 Address Preference",
+      "id"         : "0x1E",
+      "type"       : "TLV",
+      "endian"     : "little",
+      "format"     : "guint32" },
+
+    { "common-ref"    : "WDS PCSCF Address Using PCO",
+      "name"          : "PCSCF Address Using PCO",
+      "id"            : "0x1F",
+      "type"          : "TLV",
+      "format"        : "guint8",
+      "public-format" : "gboolean" },
+
+    { "common-ref"    : "WDS PCSCF Address Using DHCP",
+      "name"          : "PCSCF Address Using DHCP",
+      "id"            : "0x21",
+      "type"          : "TLV",
+      "format"        : "guint8",
+      "public-format" : "gboolean" },
+
+    { "common-ref"    : "WDS IMCN Flag",
+      "name"          : "IMCN Flag",
+      "id"            : "0x22",
+      "type"          : "TLV",
+      "format"        : "guint8",
+      "public-format" : "gboolean" },
+
+    { "common-ref"    : "WDS PDP Context Number",
+      "name"          : "PDP Context Number",
+      "id"            : "0x25",
+      "type"          : "TLV",
+      "format"        : "guint8" },
+
+    { "common-ref"    : "WDS PDP Context Secondary Flag",
+      "name"          : "PDP Context Secondary Flag",
+      "id"            : "0x26",
+      "type"          : "TLV",
+      "format"        : "guint8",
+      "public-format" : "gboolean" },
+
+    { "common-ref"    : "WDS PDP Context Primary ID",
+      "name"          : "PDP Context Primary ID",
+      "id"            : "0x27",
+      "type"          : "TLV",
+      "format"        : "guint8" },
+
+    { "common-ref" : "WDS IPv6 Address Preference",
+      "name"       : "IPv6 Address Preference",
+      "id"         : "0x28",
+      "type"       : "TLV",
+      "format"     : "sequence",
+      "contents"   : [ { "name"         : "Address",
+                        "format"        : "array",
+                        "fixed-size"    : "8",
+                        "array-element" : { "format": "guint16", "endian": "network" } } ] },
+
+    { "common-ref" : "WDS UMTS Requested QoS With Signaling Indication Flag",
+      "name"       : "UMTS Requested QoS With Signaling Indication Flag",
+      "id"         : "0x29",
+      "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" },
+                      { "name"   : "Signaling Indication",
+                        "format" : "gint8" } ] },
+
+    { "common-ref" : "WDS UMTS Minimum QoS With Signaling Indication Flag",
+      "name"       : "UMTS Minimum QoS With Signaling Indication Flag",
+      "id"         : "0x2A",
+      "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" },
+                      { "name"   : "Signaling Indication",
+                        "format" : "gint8" } ] },
+
+    { "common-ref"    : "WDS IPv6 Primary DNS Address Preference",
+      "name"          : "IPv6 Primary DNS Address Preference",
+      "id"            : "0x2B",
+      "type"          : "TLV",
+      "format"        : "array",
+      "fixed-size"    : "8",
+      "array-element" : { "format": "guint16", "endian": "network" } },
+
+    { "common-ref"    : "WDS IPv6 Secondary DNS Address Preference",
+      "name"          : "IPv6 Secondary DNS Address Preference",
+      "id"            : "0x2C",
+      "type"          : "TLV",
+      "format"        : "array",
+      "fixed-size"    : "8",
+      "array-element" : { "format": "guint16", "endian": "network" } },
+
+    { "common-ref" : "WDS LTE QoS Parameters",
+      "name"       : "LTE QoS Parameters",
+      "id"         : "0x2E",
+      "type"       : "TLV",
+      "format"     : "sequence",
+      "contents"   : [ { "name"         : "QoS Class Identifier",
+                        "format"        : "guint8",
+                        "public-format" : "QmiWdsQosClassIdentifier" },
+                      { "name"          : "Guaranteed Downlink Bitrate",
+                        "format"        : "guint32" },
+                      { "name"          : "Max Downlink Bitrate",
+                        "format"        : "guint32" },
+                      { "name"          : "Guaranteed Uplink Bitrate",
+                        "format"        : "guint32" },
+                      { "name"          : "Max Uplink Bitrate",
+                        "format"        : "guint32" } ] },
+
+    { "common-ref"    : "WDS APN Disabled Flag",
+      "name"          : "APN Disabled Flag",
+      "id"            : "0x2F",
+      "type"          : "TLV",
+      "format"        : "guint8",
+      "public-format" : "gboolean" },
+
+    { "common-ref"    : "WDS Roaming Disallowed Flag",
+      "name"          : "Roaming Disallowed Flag",
+      "id"            : "0x3E",
+      "type"          : "TLV",
+      "format"        : "guint8",
+      "public-format" : "gboolean" },
 
   // *********************************************************************************
   {  "name"    : "Reset",