From 525a4903649fe6eaed6a5d80f1cda8fc3b85546c Mon Sep 17 00:00:00 2001 From: Aleksander Morgado Date: Wed, 23 Feb 2022 13:54:36 +0100 Subject: build-aux,codegen: require explicit array length definition Don't assume that if nothing given an size-prefix-format of 8 bits should be used; force the developer to provide a correct array size definition, either with size-prefix-format or fixed-size. --- data/qmi-service-ctl.json | 31 +-- data/qmi-service-dms.json | 188 ++++++------- data/qmi-service-dpm.json | 91 ++++--- data/qmi-service-loc.json | 80 +++--- data/qmi-service-nas.json | 668 ++++++++++++++++++++++++---------------------- data/qmi-service-pdc.json | 62 +++-- data/qmi-service-uim.json | 15 +- data/qmi-service-wds.json | 210 ++++++++------- 8 files changed, 708 insertions(+), 637 deletions(-) (limited to 'data') diff --git a/data/qmi-service-ctl.json b/data/qmi-service-ctl.json index a964066e..63f2a142 100644 --- a/data/qmi-service-ctl.json +++ b/data/qmi-service-ctl.json @@ -43,21 +43,22 @@ "id" : "0x0021", "since" : "1.0", "output" : [ { "common-ref" : "Operation Result" }, - { "name" : "Service list", - "id" : "0x01", - "type" : "TLV", - "since" : "1.0", - "format" : "array", - "array-element" : { "name" : "Service", - "format" : "struct", - "contents" : [ { "name" : "Service", - "format" : "guint8", - "public-format" : "QmiService" }, - { "name" : "Major version", - "format" : "guint16" }, - { "name" : "Minor version", - "format" : "guint16" } ] }, - "prerequisites": [ { "common-ref" : "Success" } ] } ] }, + { "name" : "Service list", + "id" : "0x01", + "type" : "TLV", + "since" : "1.0", + "format" : "array", + "size-prefix-format" : "guint8", + "array-element" : { "name" : "Service", + "format" : "struct", + "contents" : [ { "name" : "Service", + "format" : "guint8", + "public-format" : "QmiService" }, + { "name" : "Major version", + "format" : "guint16" }, + { "name" : "Minor version", + "format" : "guint16" } ] }, + "prerequisites" : [ { "common-ref" : "Success" } ] } ] }, // ********************************************************************************* { "name" : "Allocate CID", diff --git a/data/qmi-service-dms.json b/data/qmi-service-dms.json index f0065b8c..41ef5de4 100644 --- a/data/qmi-service-dms.json +++ b/data/qmi-service-dms.json @@ -176,9 +176,10 @@ "format" : "guint8", "public-format" : "QmiDmsSimCapability" }, { "name" : "Radio Interface List", - "format" : "array", - "array-element" : { "format" : "guint8", - "public-format" : "QmiDmsRadioInterface" } } ], + "format" : "array", + "size-prefix-format" : "guint8", + "array-element" : { "format" : "guint8", + "public-format" : "QmiDmsRadioInterface" } } ], "prerequisites": [ { "common-ref" : "Success" } ] } ] }, // ********************************************************************************* @@ -624,7 +625,7 @@ "format" : "sequence", "contents" : [ { "name" : "PRL total length", "format" : "guint16" }, - { "name" : "PRL segment", + { "name" : "PRL segment", "format" : "array", "size-prefix-format" : "guint16", "sequence-prefix-format" : "guint8", @@ -952,23 +953,24 @@ "id" : "0x0047", "since" : "1.0", "output" : [ { "common-ref" : "Operation Result" }, - { "name" : "List", - "id" : "0x01", - "type" : "TLV", - "since" : "1.0", - "format" : "array", - "array-element" : { "name" : "Image", - "format" : "struct", - "contents" : [ { "name" : "Type", - "format" : "guint8", - "public-format" : "QmiDmsFirmwareImageType" }, - { "name" : "Unique ID", - "format" : "array", - "fixed-size" : "16", - "array-element" : { "format": "guint8" } }, - { "name" : "Build ID", - "format" : "string" } ] }, - "prerequisites" : [ { "common-ref" : "Success" } ] } ] }, + { "name" : "List", + "id" : "0x01", + "type" : "TLV", + "since" : "1.0", + "format" : "array", + "size-prefix-format" : "guint8", + "array-element" : { "name" : "Image", + "format" : "struct", + "contents" : [ { "name" : "Type", + "format" : "guint8", + "public-format" : "QmiDmsFirmwareImageType" }, + { "name" : "Unique ID", + "format" : "array", + "fixed-size" : "16", + "array-element" : { "format": "guint8" } }, + { "name" : "Build ID", + "format" : "string" } ] }, + "prerequisites" : [ { "common-ref" : "Success" } ] } ] }, // ********************************************************************************* { "name" : "Set Firmware Preference", @@ -976,22 +978,23 @@ "service" : "DMS", "id" : "0x0048", "since" : "1.0", - "input" : [ { "name" : "List", - "id" : "0x01", - "type" : "TLV", - "since" : "1.0", - "format" : "array", - "array-element" : { "name" : "Image", - "format" : "struct", - "contents" : [ { "name" : "Type", - "format" : "guint8", - "public-format" : "QmiDmsFirmwareImageType" }, - { "name" : "Unique ID", - "format" : "array", - "fixed-size" : "16", - "array-element" : { "format": "guint8" } }, - { "name" : "Build ID", - "format" : "string" } ] } }, + "input" : [ { "name" : "List", + "id" : "0x01", + "type" : "TLV", + "since" : "1.0", + "format" : "array", + "size-prefix-format" : "guint8", + "array-element" : { "name" : "Image", + "format" : "struct", + "contents" : [ { "name" : "Type", + "format" : "guint8", + "public-format" : "QmiDmsFirmwareImageType" }, + { "name" : "Unique ID", + "format" : "array", + "fixed-size" : "16", + "array-element" : { "format": "guint8" } }, + { "name" : "Build ID", + "format" : "string" } ] } }, { "name" : "Download Override", "id" : "0x10", "type" : "TLV", @@ -1004,15 +1007,16 @@ "since" : "1.0", "format" : "guint8" } ], "output" : [ { "common-ref" : "Operation Result" }, - { "name" : "Image Download List", - "id" : "0x01", - "type" : "TLV", - "since" : "1.0", - "format" : "array", - "array-element" : { "name" : "Image Type", - "format" : "guint8", - "public-format" : "QmiDmsFirmwareImageType" }, - "prerequisites" : [ { "common-ref" : "Success" } ] } ] }, + { "name" : "Image Download List", + "id" : "0x01", + "type" : "TLV", + "since" : "1.0", + "format" : "array", + "size-prefix-format" : "guint8", + "array-element" : { "name" : "Image Type", + "format" : "guint8", + "public-format" : "QmiDmsFirmwareImageType" }, + "prerequisites" : [ { "common-ref" : "Success" } ] } ] }, // ********************************************************************************* { "name" : "List Stored Images", @@ -1021,35 +1025,37 @@ "id" : "0x0049", "since" : "1.0", "output" : [ { "common-ref" : "Operation Result" }, - { "name" : "List", - "id" : "0x01", - "type" : "TLV", - "since" : "1.0", - "format" : "array", - "array-element" : { "name" : "Image", - "format" : "struct", - "contents" : [ { "name" : "Type", - "format" : "guint8", - "public-format" : "QmiDmsFirmwareImageType" }, - { "name" : "Maximum Images", - "format" : "guint8" }, - { "name" : "Index Of Running Image", - "format" : "guint8" }, - { "name" : "Sublist", - "format" : "array", - "array-element" : { "name" : "Sublist Element", - "format" : "struct", - "contents" : [ { "name" : "Storage Index", - "format" : "guint8" }, - { "name" : "Failure Count", - "format" : "guint8" }, - { "name" : "Unique ID", - "format" : "array", - "fixed-size" : "16", - "array-element" : { "format": "guint8" } }, - { "name" : "Build ID", - "format" : "string" } ] } } ] }, - "prerequisites" : [ { "common-ref" : "Success" } ] } ] }, + { "name" : "List", + "id" : "0x01", + "type" : "TLV", + "since" : "1.0", + "format" : "array", + "size-prefix-format" : "guint8", + "array-element" : { "name" : "Image", + "format" : "struct", + "contents" : [ { "name" : "Type", + "format" : "guint8", + "public-format" : "QmiDmsFirmwareImageType" }, + { "name" : "Maximum Images", + "format" : "guint8" }, + { "name" : "Index Of Running Image", + "format" : "guint8" }, + { "name" : "Sublist", + "format" : "array", + "size-prefix-format" : "guint8", + "array-element" : { "name" : "Sublist Element", + "format" : "struct", + "contents" : [ { "name" : "Storage Index", + "format" : "guint8" }, + { "name" : "Failure Count", + "format" : "guint8" }, + { "name" : "Unique ID", + "format" : "array", + "fixed-size" : "16", + "array-element" : { "format": "guint8" } }, + { "name" : "Build ID", + "format" : "string" } ] } } ] }, + "prerequisites" : [ { "common-ref" : "Success" } ] } ] }, // ********************************************************************************* { "name" : "Delete Stored Image", @@ -1248,13 +1254,14 @@ "format" : "guint32", "public-format" : "QmiDmsMacType" } ], "output" : [ { "common-ref" : "Operation Result" }, - { "name" : "MAC Address", - "id" : "0x10", - "type" : "TLV", - "since" : "1.26", - "format" : "array", - "array-element" : { "format": "guint8" }, - "prerequisites": [ { "common-ref" : "Success" } ] } ] }, + { "name" : "MAC Address", + "id" : "0x10", + "type" : "TLV", + "since" : "1.26", + "format" : "array", + "size-prefix-format" : "guint8", + "array-element" : { "format": "guint8" }, + "prerequisites" : [ { "common-ref" : "Success" } ] } ] }, // ********************************************************************************* { "name" : "Get Supported Messages", @@ -1365,14 +1372,15 @@ "format" : "guint8", "public-format" : "QmiDmsSwiUsbComposition", "prerequisites" : [ { "common-ref" : "Success" } ] }, - { "name" : "Supported", - "id" : "0x11", - "type" : "TLV", - "since" : "1.20", - "format" : "array", - "array-element" : { "format" : "guint8", - "public-format" : "QmiDmsSwiUsbComposition" }, - "prerequisites" : [ { "common-ref" : "Success" } ] } ] }, + { "name" : "Supported", + "id" : "0x11", + "type" : "TLV", + "since" : "1.20", + "format" : "array", + "size-prefix-format" : "guint8", + "array-element" : { "format" : "guint8", + "public-format" : "QmiDmsSwiUsbComposition" }, + "prerequisites" : [ { "common-ref" : "Success" } ] } ] }, // ********************************************************************************* { "name" : "Swi Set USB Composition", diff --git a/data/qmi-service-dpm.json b/data/qmi-service-dpm.json index b0b35766..89a5a492 100644 --- a/data/qmi-service-dpm.json +++ b/data/qmi-service-dpm.json @@ -18,50 +18,53 @@ "service" : "DPM", "id" : "0x0020", "since" : "1.30", - "input" : [ { "name" : "Control Ports", - "id" : "0x10", - "type" : "TLV", - "since" : "1.30", - "format" : "array", - "array-element" : { "name" : "Element", - "format" : "struct", - "contents" : [ { "name" : "Port Name", - "format" : "string" }, - { "name" : "Endpoint Type", - "format" : "guint32", - "public-format" : "QmiDataEndpointType" }, - { "name" : "Interface Number", - "format" : "guint32" } ] } }, - { "name" : "Hardware Data Ports", - "id" : "0x11", - "type" : "TLV", - "since" : "1.30", - "format" : "array", - "array-element" : { "name" : "Element", - "format" : "struct", - "contents" : [ { "name" : "Endpoint Type", - "format" : "guint32", - "public-format" : "QmiDataEndpointType" }, - { "name" : "Interface Number", - "format" : "guint32" }, - { "name" : "RX Endpoint Number", - "format" : "guint32" }, - { "name" : "TX Endpoint Number", - "format" : "guint32" } ] } }, - { "name" : "Software Data Ports", - "id" : "0x12", - "type" : "TLV", - "since" : "1.30", - "format" : "array", - "array-element" : { "name" : "Element", - "format" : "struct", - "contents" : [ { "name" : "Endpoint Type", - "format" : "guint32", - "public-format" : "QmiDataEndpointType" }, - { "name" : "Interface Number", - "format" : "guint32" }, - { "name" : "Port Name", - "format" : "string" } ] } } ], + "input" : [ { "name" : "Control Ports", + "id" : "0x10", + "type" : "TLV", + "since" : "1.30", + "format" : "array", + "size-prefix-format" : "guint8", + "array-element" : { "name" : "Element", + "format" : "struct", + "contents" : [ { "name" : "Port Name", + "format" : "string" }, + { "name" : "Endpoint Type", + "format" : "guint32", + "public-format" : "QmiDataEndpointType" }, + { "name" : "Interface Number", + "format" : "guint32" } ] } }, + { "name" : "Hardware Data Ports", + "id" : "0x11", + "type" : "TLV", + "since" : "1.30", + "format" : "array", + "size-prefix-format" : "guint8", + "array-element" : { "name" : "Element", + "format" : "struct", + "contents" : [ { "name" : "Endpoint Type", + "format" : "guint32", + "public-format" : "QmiDataEndpointType" }, + { "name" : "Interface Number", + "format" : "guint32" }, + { "name" : "RX Endpoint Number", + "format" : "guint32" }, + { "name" : "TX Endpoint Number", + "format" : "guint32" } ] } }, + { "name" : "Software Data Ports", + "id" : "0x12", + "type" : "TLV", + "since" : "1.30", + "format" : "array", + "size-prefix-format" : "guint8", + "array-element" : { "name" : "Element", + "format" : "struct", + "contents" : [ { "name" : "Endpoint Type", + "format" : "guint32", + "public-format" : "QmiDataEndpointType" }, + { "name" : "Interface Number", + "format" : "guint32" }, + { "name" : "Port Name", + "format" : "string" } ] } } ], "output" : [ { "common-ref" : "Operation Result" } ] }, // ********************************************************************************* diff --git a/data/qmi-service-loc.json b/data/qmi-service-loc.json index 0f15b13e..0bfa02d8 100644 --- a/data/qmi-service-loc.json +++ b/data/qmi-service-loc.json @@ -57,9 +57,9 @@ "format" : "sequence", "contents" : [ { "name" : "IPv6 Address", "format" : "array", + "fixed-size" : "8", "array-element" : { "format" : "guint16", - "endian" : "network" } , - "fixed-size" : "8" }, + "endian" : "network" } }, { "name" : "IPv6 Port", "format" : "guint32" } ] }, @@ -297,11 +297,12 @@ "since" : "1.22", "format" : "guint32" }, { "name" : "Satellites Used", - "id" : "0x2C", - "type" : "TLV", - "since" : "1.22", - "format" : "array", - "array-element" : { "format" : "guint16" } }, + "id" : "0x2C", + "type" : "TLV", + "since" : "1.22", + "format" : "array", + "size-prefix-format" : "guint8", + "array-element" : { "format" : "guint16" } }, { "name" : "Altitude Assumed", "id" : "0x2D", "type" : "TLV", @@ -358,36 +359,37 @@ "since" : "1.22", "format" : "guint8", "public-format" : "gboolean" }, - { "name" : "List", - "id" : "0x10", - "type" : "TLV", - "since" : "1.22", - "format" : "array", - "array-element" : { "name" : "Element", - "format" : "struct", - "contents" : [ { "name" : "Valid Information", - "format" : "guint32", - "public-format" : "QmiLocSatelliteValidInformation" }, - { "name" : "System", - "format" : "guint32", - "public-format" : "QmiLocSystem" }, - { "name" : "GNSS Satellite ID", - "format" : "guint16" }, - { "name" : "Health Status", - "format" : "guint8", - "public-format" : "QmiLocHealthStatus" }, - { "name" : "Satellite Status", - "format" : "guint32", - "public-format" : "QmiLocSatelliteStatus" }, - { "name" : "Navigation Data", - "format" : "guint8", - "public-format" : "QmiLocNavigationData"}, - { "name" : "Elevation Degrees", - "format" : "gfloat" }, - { "name" : "Azimuth Degrees", - "format" : "gfloat" }, - { "name" : "Signal to Noise Ratio BHz", - "format" : "gfloat" } ] } } ] }, + { "name" : "List", + "id" : "0x10", + "type" : "TLV", + "since" : "1.22", + "format" : "array", + "size-prefix-format" : "guint8", + "array-element" : { "name" : "Element", + "format" : "struct", + "contents" : [ { "name" : "Valid Information", + "format" : "guint32", + "public-format" : "QmiLocSatelliteValidInformation" }, + { "name" : "System", + "format" : "guint32", + "public-format" : "QmiLocSystem" }, + { "name" : "GNSS Satellite ID", + "format" : "guint16" }, + { "name" : "Health Status", + "format" : "guint8", + "public-format" : "QmiLocHealthStatus" }, + { "name" : "Satellite Status", + "format" : "guint32", + "public-format" : "QmiLocSatelliteStatus" }, + { "name" : "Navigation Data", + "format" : "guint8", + "public-format" : "QmiLocNavigationData"}, + { "name" : "Elevation Degrees", + "format" : "gfloat" }, + { "name" : "Azimuth Degrees", + "format" : "gfloat" }, + { "name" : "Signal to Noise Ratio BHz", + "format" : "gfloat" } ] } } ] }, // ********************************************************************************* @@ -416,8 +418,8 @@ "type" : "TLV", "since" : "1.22", "format" : "array", - "array-element" : { "format" : "guint8" }, "size-prefix-format" : "guint16", + "array-element" : { "format" : "guint8" }, "max-size" : "1024" }, { "name" : "Format Type", "id" : "0x10", @@ -752,8 +754,8 @@ "type" : "TLV", "since" : "1.22", "format" : "array", - "array-element" : { "format" : "guint8" }, "size-prefix-format" : "guint16", + "array-element" : { "format" : "guint8" }, "max-size" : "1024" } ], "output" : [ { "common-ref" : "Operation Result" } ] }, diff --git a/data/qmi-service-nas.json b/data/qmi-service-nas.json index aa5daad2..eb3f6aea 100644 --- a/data/qmi-service-nas.json +++ b/data/qmi-service-nas.json @@ -54,6 +54,7 @@ "id" : "0x12", "type" : "TLV", "format" : "array", + "size-prefix-format" : "guint8", "array-element" : { "name" : "Element", "format" : "struct", "contents" : [ { "name" : "Name Encoding", @@ -68,12 +69,14 @@ { "name" : "Short Name Spare Bits", "format" : "guint8", "public-format" : "QmiNasPlmnNameSpareBits" }, - { "name" : "Long Name", - "format" : "array", - "array-element" : { "format" : "guint8" } }, - { "name" : "Short Name", - "format" : "array", - "array-element" : { "format" : "guint8" } } ] } }, + { "name" : "Long Name", + "format" : "array", + "size-prefix-format" : "guint8", + "array-element" : { "format" : "guint8" } }, + { "name" : "Short Name", + "format" : "array", + "size-prefix-format" : "guint8", + "array-element" : { "format" : "guint8" } } ] } }, { "common-ref" : "NAS Operator String Name", "name" : "Operator String Name", @@ -99,11 +102,13 @@ "format" : "guint8", "public-format" : "QmiNasPlmnNameSpareBits" }, { "name" : "Long Name", - "format" : "array", - "array-element" : { "format" : "guint8" } }, - { "name" : "Short Name", - "format" : "array", - "array-element" : { "format" : "guint8" } } ] }, + "format" : "array", + "size-prefix-format" : "guint8", + "array-element" : { "format" : "guint8" } }, + { "name" : "Short Name", + "format" : "array", + "size-prefix-format" : "guint8", + "array-element" : { "format" : "guint8" } } ] }, { "common-ref" : "NAS Preferred Networks", "name" : "Preferred Networks", @@ -158,9 +163,10 @@ "contents" : [ { "name" : "Report", "format" : "guint8", "public-format" : "gboolean" }, - { "name" : "Thresholds", - "format" : "array", - "array-element" : { "format" : "gint8" } } ] }, + { "name" : "Thresholds", + "format" : "array", + "size-prefix-format" : "guint8", + "array-element" : { "format" : "gint8" } } ] }, { "name" : "RF Band Information", "id" : "0x11", "type" : "TLV", @@ -227,9 +233,10 @@ "contents" : [ { "name" : "Report", "format" : "guint8", "public-format" : "gboolean" }, - { "name" : "Thresholds", - "format" : "array", - "array-element" : { "format" : "gint16" } } ] }, + { "name" : "Thresholds", + "format" : "array", + "size-prefix-format" : "guint8", + "array-element" : { "format" : "gint16" } } ] }, { "name" : "SINR Threshold", "id" : "0x1A", "type" : "TLV", @@ -238,9 +245,10 @@ "contents" : [ { "name" : "Report", "format" : "guint8", "public-format" : "gboolean" }, - { "name" : "Thresholds", - "format" : "array", - "array-element" : { "format" : "guint8" } } ] }, + { "name" : "Thresholds", + "format" : "array", + "size-prefix-format" : "guint8", + "array-element" : { "format" : "guint8" } } ] }, { "name" : "LTE SNR Delta", "id" : "0x1B", "type" : "TLV", @@ -283,6 +291,7 @@ "type" : "TLV", "since" : "1.0", "format" : "array", + "size-prefix-format" : "guint8", "array-element" : { "name" : "Element", "format" : "struct", "contents" : [ { "name" : "Radio Interface", @@ -745,10 +754,11 @@ { "name" : "Selected Network", "format" : "guint8", "public-format" : "QmiNasNetworkType" }, - { "name" : "Radio Interfaces", - "format" : "array", - "array-element" : { "format" : "gint8", - "public-format" : "QmiNasRadioInterface" } } ], + { "name" : "Radio Interfaces", + "format" : "array", + "size-prefix-format" : "guint8", + "array-element" : { "format" : "gint8", + "public-format" : "QmiNasRadioInterface" } } ], "prerequisites": [ { "common-ref" : "Success" } ] }, { "name" : "Roaming Indicator", "id" : "0x10", @@ -756,13 +766,14 @@ "since" : "1.0", "format" : "guint8", "public-format" : "QmiNasRoamingIndicatorStatus" }, - { "name" : "Data Service Capability", - "id" : "0x11", - "type" : "TLV", - "since" : "1.0", - "format" : "array", - "array-element" : { "format" : "guint8", - "public-format" : "QmiNasDataCapability" } }, + { "name" : "Data Service Capability", + "id" : "0x11", + "type" : "TLV", + "since" : "1.0", + "format" : "array", + "size-prefix-format" : "guint8", + "array-element" : { "format" : "guint8", + "public-format" : "QmiNasDataCapability" } }, { "name" : "Current PLMN", "id" : "0x12", "type" : "TLV", @@ -794,19 +805,20 @@ "format" : "gint32" }, { "name" : "Base Station Longitude", "format" : "gint32" } ] }, - { "name" : "Roaming Indicator List", - "id" : "0x15", - "type" : "TLV", - "since" : "1.0", - "format" : "array", - "array-element" : { "name" : "Element", - "format" : "struct", - "contents" : [ { "name" : "Radio Interface", - "format" : "guint8", - "public-format" : "QmiNasRadioInterface" }, - { "name" : "Roaming Indicator", - "format" : "guint8", - "public-format" : "QmiNasRoamingIndicatorStatus" } ] } }, + { "name" : "Roaming Indicator List", + "id" : "0x15", + "type" : "TLV", + "since" : "1.0", + "format" : "array", + "size-prefix-format" : "guint8", + "array-element" : { "name" : "Element", + "format" : "struct", + "contents" : [ { "name" : "Radio Interface", + "format" : "guint8", + "public-format" : "QmiNasRadioInterface" }, + { "name" : "Roaming Indicator", + "format" : "guint8", + "public-format" : "QmiNasRoamingIndicatorStatus" } ] } }, { "name" : "Default Roaming Indicator", "id" : "0x16", "type" : "TLV", @@ -965,23 +977,25 @@ { "name" : "Selected Network", "format" : "guint8", "public-format" : "QmiNasNetworkType" }, - { "name" : "Radio Interfaces", - "format" : "array", - "array-element" : { "format" : "gint8", - "public-format" : "QmiNasRadioInterface" } } ] }, + { "name" : "Radio Interfaces", + "format" : "array", + "size-prefix-format" : "guint8", + "array-element" : { "format" : "gint8", + "public-format" : "QmiNasRadioInterface" } } ] }, { "name" : "Roaming Indicator", "id" : "0x10", "type" : "TLV", "since" : "1.0", "format" : "guint8", "public-format" : "QmiNasRoamingIndicatorStatus" }, - { "name" : "Data Service Capability", - "id" : "0x11", - "type" : "TLV", - "since" : "1.0", - "format" : "array", - "array-element" : { "format" : "guint8", - "public-format" : "QmiNasDataCapability" } }, + { "name" : "Data Service Capability", + "id" : "0x11", + "type" : "TLV", + "since" : "1.0", + "format" : "array", + "size-prefix-format" : "guint8", + "array-element" : { "format" : "guint8", + "public-format" : "QmiNasDataCapability" } }, { "name" : "Current PLMN", "id" : "0x12", "type" : "TLV", @@ -1013,19 +1027,20 @@ "format" : "gint32" }, { "name" : "Base Station Longitude", "format" : "gint32" } ] }, - { "name" : "Roaming Indicator List", - "id" : "0x15", - "type" : "TLV", - "since" : "1.0", - "format" : "array", - "array-element" : { "name" : "Element", - "format" : "struct", - "contents" : [ { "name" : "Radio Interface", - "format" : "guint8", - "public-format" : "QmiNasRadioInterface" }, - { "name" : "Roaming Indicator", - "format" : "guint8", - "public-format" : "QmiNasRoamingIndicatorStatus" } ] } }, + { "name" : "Roaming Indicator List", + "id" : "0x15", + "type" : "TLV", + "since" : "1.0", + "format" : "array", + "size-prefix-format" : "guint8", + "array-element" : { "name" : "Element", + "format" : "struct", + "contents" : [ { "name" : "Radio Interface", + "format" : "guint8", + "public-format" : "QmiNasRadioInterface" }, + { "name" : "Roaming Indicator", + "format" : "guint8", + "public-format" : "QmiNasRoamingIndicatorStatus" } ] } }, { "name" : "Default Roaming Indicator", "id" : "0x16", "type" : "TLV", @@ -1236,9 +1251,10 @@ { "name" : "Description Encoding", "format" : "guint8", "public-format" : "QmiNasNetworkDescriptionEncoding" }, - { "name" : "Description", - "format" : "array", - "array-element" : { "format" : "guint8" } } ] }, + { "name" : "Description", + "format" : "array", + "size-prefix-format" : "guint8", + "array-element" : { "format" : "guint8" } } ] }, { "name" : "Home Network 3GPP MNC", "id" : "0x12", "type" : "TLV", @@ -1366,49 +1382,52 @@ "id" : "0x0031", "since" : "1.0", "output" : [ { "common-ref" : "Operation Result" }, - { "name" : "List", - "id" : "0x01", - "type" : "TLV", - "since" : "1.0", - "format" : "array", - "array-element" : { "name" : "Element", - "format" : "struct", - "contents" : [ { "name" : "Radio Interface", - "format" : "gint8", - "public-format" : "QmiNasRadioInterface" }, - { "name" : "Active Band Class", - "format" : "guint16", - "public-format" : "QmiNasActiveBand" }, - { "name" : "Active Channel", - "format" : "guint16" } ] } }, - { "name" : "Extended List", - "id" : "0x11", - "type" : "TLV", - "since" : "1.26", - "format" : "array", - "array-element" : { "name" : "Element", - "format" : "struct", - "contents" : [ { "name" : "Radio Interface", - "format" : "gint8", - "public-format" : "QmiNasRadioInterface" }, - { "name" : "Active Band Class", - "format" : "guint16", - "public-format" : "QmiNasActiveBand" }, - { "name" : "Active Channel", - "format" : "guint32" } ] } }, - { "name" : "Bandwidth List", - "id" : "0x12", - "type" : "TLV", - "since" : "1.26", - "format" : "array", - "array-element" : { "name" : "Element", - "format" : "struct", - "contents" : [ { "name" : "Radio Interface", - "format" : "gint8", - "public-format" : "QmiNasRadioInterface" }, - { "name" : "Bandwidth", - "format" : "guint32", - "public-format" : "QmiNasDLBandwidth" } ] } } ] }, + { "name" : "List", + "id" : "0x01", + "type" : "TLV", + "since" : "1.0", + "format" : "array", + "size-prefix-format" : "guint8", + "array-element" : { "name" : "Element", + "format" : "struct", + "contents" : [ { "name" : "Radio Interface", + "format" : "gint8", + "public-format" : "QmiNasRadioInterface" }, + { "name" : "Active Band Class", + "format" : "guint16", + "public-format" : "QmiNasActiveBand" }, + { "name" : "Active Channel", + "format" : "guint16" } ] } }, + { "name" : "Extended List", + "id" : "0x11", + "type" : "TLV", + "since" : "1.26", + "format" : "array", + "size-prefix-format" : "guint8", + "array-element" : { "name" : "Element", + "format" : "struct", + "contents" : [ { "name" : "Radio Interface", + "format" : "gint8", + "public-format" : "QmiNasRadioInterface" }, + { "name" : "Active Band Class", + "format" : "guint16", + "public-format" : "QmiNasActiveBand" }, + { "name" : "Active Channel", + "format" : "guint32" } ] } }, + { "name" : "Bandwidth List", + "id" : "0x12", + "type" : "TLV", + "since" : "1.26", + "format" : "array", + "size-prefix-format" : "guint8", + "array-element" : { "name" : "Element", + "format" : "struct", + "contents" : [ { "name" : "Radio Interface", + "format" : "gint8", + "public-format" : "QmiNasRadioInterface" }, + { "name" : "Bandwidth", + "format" : "guint32", + "public-format" : "QmiNasDLBandwidth" } ] } } ] }, // ********************************************************************************* { "name" : "Set System Selection Preference", @@ -1812,24 +1831,25 @@ "format" : "guint32" }, { "name" : "RX Level", "format" : "guint16" }, - { "name" : "Cell", - "format" : "array", - "array-element" : { "name" : "Element", - "format" : "struct", - "contents" : [ { "name" : "Cell ID", - "format" : "guint32" }, - { "name" : "PLMN", - "format" : "array", - "fixed-size" : "3", - "array-element" : { "format" : "guint8" } }, - { "name" : "LAC", - "format" : "guint16" }, - { "name" : "GERAN Absolute RF Channel Number", - "format" : "guint16" }, - { "name" : "Base Station Identity Code", - "format" : "guint8" }, - { "name" : "RX Level", - "format" : "guint16" } ] } } ] }, + { "name" : "Cell", + "format" : "array", + "size-prefix-format" : "guint8", + "array-element" : { "name" : "Element", + "format" : "struct", + "contents" : [ { "name" : "Cell ID", + "format" : "guint32" }, + { "name" : "PLMN", + "format" : "array", + "fixed-size" : "3", + "array-element" : { "format" : "guint8" } }, + { "name" : "LAC", + "format" : "guint16" }, + { "name" : "GERAN Absolute RF Channel Number", + "format" : "guint16" }, + { "name" : "Base Station Identity Code", + "format" : "guint8" }, + { "name" : "RX Level", + "format" : "guint16" } ] } } ] }, { "name" : "UMTS Info v2", "id" : "0x11", "type" : "TLV", @@ -1851,30 +1871,32 @@ "format" : "gint16" }, { "name" : "ECIO", "format" : "gint16" }, - { "name" : "Cell", - "format" : "array", - "array-element" : { "name" : "Element", - "format" : "struct", - "contents" : [ { "name" : "UTRA Absolute RF Channel Number", - "format" : "guint16" }, - { "name" : "Primary Scrambling Code", - "format" : "guint16" }, - { "name" : "RSCP", - "format" : "gint16" }, - { "name" : "ECIO", - "format" : "gint16" } ] } }, - { "name" : "Neighboring GERAN", - "format" : "array", - "array-element" : { "name" : "Element", - "format" : "struct", - "contents" : [ { "name" : "GERAN Absolute RF Channel Number", - "format" : "guint16" }, - { "name" : "Network Color Code", - "format" : "guint8" }, - { "name" : "Base Station Color Code", - "format" : "guint8" }, - { "name" : "RSSI", - "format" : "gint16" } ] } } ] }, + { "name" : "Cell", + "format" : "array", + "size-prefix-format" : "guint8", + "array-element" : { "name" : "Element", + "format" : "struct", + "contents" : [ { "name" : "UTRA Absolute RF Channel Number", + "format" : "guint16" }, + { "name" : "Primary Scrambling Code", + "format" : "guint16" }, + { "name" : "RSCP", + "format" : "gint16" }, + { "name" : "ECIO", + "format" : "gint16" } ] } }, + { "name" : "Neighboring GERAN", + "format" : "array", + "size-prefix-format" : "guint8", + "array-element" : { "name" : "Element", + "format" : "struct", + "contents" : [ { "name" : "GERAN Absolute RF Channel Number", + "format" : "guint16" }, + { "name" : "Network Color Code", + "format" : "guint8" }, + { "name" : "Base Station Color Code", + "format" : "guint8" }, + { "name" : "RSSI", + "format" : "gint16" } ] } } ] }, { "name" : "CDMA Info", "id" : "0x12", "type" : "TLV", @@ -1920,20 +1942,21 @@ "format" : "guint8" }, { "name" : "S Intra Search Threshold", "format" : "guint8" }, - { "name" : "Cell", - "format" : "array", - "array-element" : { "name" : "Element", - "format" : "struct", - "contents" : [ { "name" : "Physical Cell ID", - "format" : "guint16" }, - { "name" : "RSRQ", - "format" : "gint16" }, - { "name" : "RSRP", - "format" : "gint16" }, - { "name" : "RSSI", - "format" : "gint16" }, - { "name" : "Cell Selection RX Level", - "format" : "gint16" } ] } } ] }, + { "name" : "Cell", + "format" : "array", + "size-prefix-format" : "guint8", + "array-element" : { "name" : "Element", + "format" : "struct", + "contents" : [ { "name" : "Physical Cell ID", + "format" : "guint16" }, + { "name" : "RSRQ", + "format" : "gint16" }, + { "name" : "RSRP", + "format" : "gint16" }, + { "name" : "RSSI", + "format" : "gint16" }, + { "name" : "Cell Selection RX Level", + "format" : "gint16" } ] } } ] }, { "name" : "Interfrequency LTE Info", "id" : "0x14", "type" : "TLV", @@ -1942,32 +1965,34 @@ "contents" : [ { "name" : "UE In Idle", "format" : "guint8", "public-format" : "gboolean" }, - { "name" : "Frequency", - "format" : "array", - "array-element" : { "name" : "Element", - "format" : "struct", - "contents" : [ { "name" : "EUTRA Absolute RF Channel Number", - "format" : "guint16" }, - { "name" : "Cell Selection RX Level Low Threshold", - "format" : "guint8" }, - { "name" : "Cell Selection RX Level High Threshold", - "format" : "guint8" }, - { "name" : "Cell Reselection Priority", - "format" : "guint8" }, - { "name" : "Cell", - "format" : "array", - "array-element" : { "name" : "Element", - "format" : "struct", - "contents" : [ { "name" : "Physical Cell ID", - "format" : "guint16" }, - { "name" : "RSRQ", - "format" : "gint16" }, - { "name" : "RSRP", - "format" : "gint16" }, - { "name" : "RSSI", - "format" : "gint16" }, - { "name" : "Cell Selection RX Level", - "format" : "gint16" } ] } } ] } } ] }, + { "name" : "Frequency", + "format" : "array", + "size-prefix-format" : "guint8", + "array-element" : { "name" : "Element", + "format" : "struct", + "contents" : [ { "name" : "EUTRA Absolute RF Channel Number", + "format" : "guint16" }, + { "name" : "Cell Selection RX Level Low Threshold", + "format" : "guint8" }, + { "name" : "Cell Selection RX Level High Threshold", + "format" : "guint8" }, + { "name" : "Cell Reselection Priority", + "format" : "guint8" }, + { "name" : "Cell", + "format" : "array", + "size-prefix-format" : "guint8", + "array-element" : { "name" : "Element", + "format" : "struct", + "contents" : [ { "name" : "Physical Cell ID", + "format" : "guint16" }, + { "name" : "RSRQ", + "format" : "gint16" }, + { "name" : "RSRP", + "format" : "gint16" }, + { "name" : "RSSI", + "format" : "gint16" }, + { "name" : "Cell Selection RX Level", + "format" : "gint16" } ] } } ] } } ] }, { "name" : "LTE Info Neighboring GSM", "id" : "0x15", "type" : "TLV", @@ -1976,36 +2001,38 @@ "contents" : [ { "name" : "UE In Idle", "format" : "guint8", "public-format" : "gboolean" }, - { "name" : "Frequency", - "format" : "array", - "array-element" : { "name" : "Element", - "format" : "struct", - "contents" : [ { "name" : "Cell Reselection Priority", - "format" : "guint8" }, - { "name" : "Cell Reselection High Threshold", - "format" : "guint8" }, - { "name" : "Cell Reselection Low Threshold", - "format" : "guint8" }, - { "name" : "NCC Permitted", - "format" : "guint8" }, - { "name" : "Cell", - "format" : "array", - "array-element" : { "name" : "Element", - "format" : "struct", - "contents" : [ { "name" : "GERAN Absolute RF Channel Number", - "format" : "guint16" }, - { "name" : "Band Is 1900", - "format" : "guint8", - "public-format" : "gboolean" }, - { "name" : "Cell ID Valid", - "format" : "guint8", - "public-format" : "gboolean" }, - { "name" : "Base Station Identity Code", - "format" : "guint8" }, - { "name" : "RSSI", - "format" : "gint16" }, - { "name" : "Cell Selection RX Level", - "format" : "gint16" } ] } } ] } } ] }, + { "name" : "Frequency", + "format" : "array", + "size-prefix-format" : "guint8", + "array-element" : { "name" : "Element", + "format" : "struct", + "contents" : [ { "name" : "Cell Reselection Priority", + "format" : "guint8" }, + { "name" : "Cell Reselection High Threshold", + "format" : "guint8" }, + { "name" : "Cell Reselection Low Threshold", + "format" : "guint8" }, + { "name" : "NCC Permitted", + "format" : "guint8" }, + { "name" : "Cell", + "format" : "array", + "size-prefix-format" : "guint8", + "array-element" : { "name" : "Element", + "format" : "struct", + "contents" : [ { "name" : "GERAN Absolute RF Channel Number", + "format" : "guint16" }, + { "name" : "Band Is 1900", + "format" : "guint8", + "public-format" : "gboolean" }, + { "name" : "Cell ID Valid", + "format" : "guint8", + "public-format" : "gboolean" }, + { "name" : "Base Station Identity Code", + "format" : "guint8" }, + { "name" : "RSSI", + "format" : "gint16" }, + { "name" : "Cell Selection RX Level", + "format" : "gint16" } ] } } ] } } ] }, { "name" : "LTE Info Neighboring WCDMA", "id" : "0x16", "type" : "TLV", @@ -2014,30 +2041,32 @@ "contents" : [ { "name" : "UE In Idle", "format" : "guint8", "public-format" : "gboolean" }, - { "name" : "Frequency", - "format" : "array", - "array-element" : { "name" : "Element", - "format" : "struct", - "contents" : [ { "name" : "UTRA Absolute RF Channel Number", - "format" : "guint16" }, - { "name" : "Cell Reselection Priority", - "format" : "guint8" }, - { "name" : "Cell Reselection High Threshold", - "format" : "guint16" }, - { "name" : "Cell Reselection Low Threshold", - "format" : "guint16" }, - { "name" : "Cell", - "format" : "array", - "array-element" : { "name" : "Element", - "format" : "struct", - "contents" : [ { "name" : "Primary Scrambling Code", - "format" : "guint16" }, - { "name" : "CPICH RSCP", - "format" : "gint16" }, - { "name" : "CPICH EcNo", - "format" : "gint16" }, - { "name" : "Cell Selection RX Level", - "format" : "gint16" } ] } } ] } } ] }, + { "name" : "Frequency", + "format" : "array", + "size-prefix-format" : "guint8", + "array-element" : { "name" : "Element", + "format" : "struct", + "contents" : [ { "name" : "UTRA Absolute RF Channel Number", + "format" : "guint16" }, + { "name" : "Cell Reselection Priority", + "format" : "guint8" }, + { "name" : "Cell Reselection High Threshold", + "format" : "guint16" }, + { "name" : "Cell Reselection Low Threshold", + "format" : "guint16" }, + { "name" : "Cell", + "format" : "array", + "size-prefix-format" : "guint8", + "array-element" : { "name" : "Element", + "format" : "struct", + "contents" : [ { "name" : "Primary Scrambling Code", + "format" : "guint16" }, + { "name" : "CPICH RSCP", + "format" : "gint16" }, + { "name" : "CPICH EcNo", + "format" : "gint16" }, + { "name" : "Cell Selection RX Level", + "format" : "gint16" } ] } } ] } } ] }, { "name" : "UMTS Cell ID", "id" : "0x17", "type" : "TLV", @@ -2051,23 +2080,24 @@ "contents" : [ { "name" : "RRC state", "format" : "guint32", "public-format" : "QmiNasWcdmaRrcState" }, - { "name" : "Frequency", - "format" : "array", - "array-element" : { "name" : "Element", - "format" : "struct", - "contents" : [ { "name" : "EUTRA Absolute RF Channel Number", - "format" : "guint16" }, - { "name" : "Physical Cell ID", - "format" : "guint16" }, - { "name" : "RSRP", - "format" : "gfloat" }, - { "name" : "RSRQ", - "format" : "gfloat" }, - { "name" : "Cell Selection RX Level", - "format" : "gint16" }, - { "name" : "Is TDD", - "format" : "guint8", - "public-format" : "gboolean" } ] } } ] }, + { "name" : "Frequency", + "format" : "array", + "size-prefix-format" : "guint8", + "array-element" : { "name" : "Element", + "format" : "struct", + "contents" : [ { "name" : "EUTRA Absolute RF Channel Number", + "format" : "guint16" }, + { "name" : "Physical Cell ID", + "format" : "guint16" }, + { "name" : "RSRP", + "format" : "gfloat" }, + { "name" : "RSRQ", + "format" : "gfloat" }, + { "name" : "Cell Selection RX Level", + "format" : "gint16" }, + { "name" : "Is TDD", + "format" : "guint8", + "public-format" : "gboolean" } ] } } ] }, { "name" : "LTE Info Timing Advance", "id" : "0x1E", "type" : "TLV", @@ -3871,48 +3901,55 @@ "service" : "NAS", "id" : "0x0050", "since" : "1.0", - "input" : [ { "name" : "RSSI Threshold", - "id" : "0x10", - "type" : "TLV", - "since" : "1.0", - "format" : "array", - "array-element" : { "format" : "gint8" } }, - { "name" : "ECIO Threshold", - "id" : "0x11", - "type" : "TLV", - "since" : "1.0", - "format" : "array", - "array-element" : { "format" : "gint16" } }, - { "name" : "SINR Threshold", - "id" : "0x12", - "type" : "TLV", - "since" : "1.0", - "format" : "array", - "array-element" : { "format" : "guint8" } }, - { "name" : "LTE SNR Threshold", - "id" : "0x13", - "type" : "TLV", - "since" : "1.0", - "format" : "array", - "array-element" : { "format" : "gint16" } }, - { "name" : "IO Threshold", - "id" : "0x14", - "type" : "TLV", - "since" : "1.0", - "format" : "array", - "array-element" : { "format" : "gint32" } }, - { "name" : "RSRQ Threshold", - "id" : "0x15", - "type" : "TLV", - "since" : "1.0", - "format" : "array", - "array-element" : { "format" : "gint8" } }, - { "name" : "RSRP Threshold", - "id" : "0x16", - "type" : "TLV", - "since" : "1.0", - "format" : "array", - "array-element" : { "format" : "gint16" } }, + "input" : [ { "name" : "RSSI Threshold", + "id" : "0x10", + "type" : "TLV", + "since" : "1.0", + "format" : "array", + "size-prefix-format" : "guint8", + "array-element" : { "format" : "gint8" } }, + { "name" : "ECIO Threshold", + "id" : "0x11", + "type" : "TLV", + "since" : "1.0", + "format" : "array", + "size-prefix-format" : "guint8", + "array-element" : { "format" : "gint16" } }, + { "name" : "SINR Threshold", + "id" : "0x12", + "type" : "TLV", + "since" : "1.0", + "format" : "array", + "size-prefix-format" : "guint8", + "array-element" : { "format" : "guint8" } }, + { "name" : "LTE SNR Threshold", + "id" : "0x13", + "type" : "TLV", + "since" : "1.0", + "format" : "array", + "size-prefix-format" : "guint8", + "array-element" : { "format" : "gint16" } }, + { "name" : "IO Threshold", + "id" : "0x14", + "type" : "TLV", + "since" : "1.0", + "format" : "array", + "size-prefix-format" : "guint8", + "array-element" : { "format" : "gint32" } }, + { "name" : "RSRQ Threshold", + "id" : "0x15", + "type" : "TLV", + "since" : "1.0", + "format" : "array", + "size-prefix-format" : "guint8", + "array-element" : { "format" : "gint8" } }, + { "name" : "RSRP Threshold", + "id" : "0x16", + "type" : "TLV", + "since" : "1.0", + "format" : "array", + "size-prefix-format" : "guint8", + "array-element" : { "format" : "gint16" } }, { "name" : "LTE Report", "id" : "0x17", "type" : "TLV", @@ -3922,12 +3959,13 @@ "format" : "guint8" }, { "name" : "Average Period", "format" : "guint8" } ] }, - { "name" : "RSCP Threshold", - "id" : "0x18", - "type" : "TLV", - "since" : "1.0", - "format" : "array", - "array-element" : { "format" : "gint8" } } ], + { "name" : "RSCP Threshold", + "id" : "0x18", + "type" : "TLV", + "since" : "1.0", + "format" : "array", + "size-prefix-format" : "guint8", + "array-element" : { "format" : "gint8" } } ], "output" : [ { "common-ref" : "Operation Result" } ] }, // ********************************************************************************* diff --git a/data/qmi-service-pdc.json b/data/qmi-service-pdc.json index 59d08895..b4b09794 100644 --- a/data/qmi-service-pdc.json +++ b/data/qmi-service-pdc.json @@ -40,9 +40,10 @@ "contents" : [ { "name" : "Config Type", "format" : "guint32", "public-format" : "QmiPdcConfigurationType"}, - { "name" : "Id", - "format" : "array", - "array-element" : { "format" : "guint8" }} ]}, + { "name" : "Id", + "format" : "array", + "size-prefix-format" : "guint8", + "array-element" : { "format" : "guint8" }} ]}, // ********************************************************************************* { "common-ref" : "Token", @@ -113,18 +114,20 @@ "since" : "1.18" }, { "common-ref" : "Indication Result", "since" : "1.18" }, - { "name" : "Active Id", - "id" : "0x11", - "type" : "TLV", - "since" : "1.18", - "format" : "array", - "array-element" : { "format" : "guint8" } }, - { "name" : "Pending Id", - "id" : "0x12", - "type" : "TLV", - "since" : "1.18", - "format" : "array", - "array-element" : { "format" : "guint8" } }]}, + { "name" : "Active Id", + "id" : "0x11", + "type" : "TLV", + "since" : "1.18", + "format" : "array", + "size-prefix-format" : "guint8", + "array-element" : { "format" : "guint8" } }, + { "name" : "Pending Id", + "id" : "0x12", + "type" : "TLV", + "since" : "1.18", + "format" : "array", + "size-prefix-format" : "guint8", + "array-element" : { "format" : "guint8" } }]}, // ********************************************************************************* { "name" : "Set Selected Config", @@ -186,9 +189,10 @@ "contents" : [ { "name" : "Config Type", "format" : "guint32", "public-format" : "QmiPdcConfigurationType" }, - { "name" : "Id", - "format" : "array", - "array-element" : { "format" : "guint8" }}]}}]}, + { "name" : "Id", + "format" : "array", + "size-prefix-format" : "guint8", + "array-element" : { "format" : "guint8" } } ] } } ] }, // ********************************************************************************* { "name" : "Delete Config", @@ -200,13 +204,14 @@ "since" : "1.18" }, { "common-ref" : "Token", "since" : "1.18" }, - { "name" : "Id", - "id" : "0x11", - "mandatory" : "yes", - "type" : "TLV", - "since" : "1.18", - "format" : "array", - "array-element" : { "format" : "guint8" }}], + { "name" : "Id", + "id" : "0x11", + "mandatory" : "yes", + "type" : "TLV", + "since" : "1.18", + "format" : "array", + "size-prefix-format" : "guint8", + "array-element" : { "format" : "guint8" }}], "output" : [ { "common-ref" : "Operation Result" }, { "common-ref" : "Token", "since" : "1.18" }] }, @@ -225,9 +230,10 @@ "contents" : [ { "name" : "Type", "format" : "guint32", "public-format" : "QmiPdcConfigurationType"}, - { "name" : "Id", - "format" : "array", - "array-element" : { "format" : "guint8" }}, + { "name" : "Id", + "format" : "array", + "size-prefix-format" : "guint8", + "array-element" : { "format" : "guint8" }}, { "name" : "Total Size", "format" : "guint32" }, { "name" : "Chunk", diff --git a/data/qmi-service-uim.json b/data/qmi-service-uim.json index df41502d..1b6d2a4d 100644 --- a/data/qmi-service-uim.json +++ b/data/qmi-service-uim.json @@ -207,8 +207,9 @@ "contents" : [ { "name" : "File ID", "format" : "guint16" }, { "name" : "File Path", - "format" : "array", - "array-element" : { "format" : "guint8" } } ] }, + "format" : "array", + "size-prefix-format" : "guint8", + "array-element" : { "format" : "guint8" } } ] }, { "name" : "Read Information", "id" : "0x03", "type" : "TLV", @@ -277,8 +278,9 @@ "contents" : [ { "name" : "File ID", "format" : "guint16" }, { "name" : "File Path", - "format" : "array", - "array-element" : { "format" : "guint8" } } ] }, + "format" : "array", + "size-prefix-format" : "guint8", + "array-element" : { "format" : "guint8" } } ] }, { "name" : "Record", "id" : "0x03", "type" : "TLV", @@ -347,8 +349,9 @@ "contents" : [ { "name" : "File ID", "format" : "guint16" }, { "name" : "File Path", - "format" : "array", - "array-element" : { "format" : "guint8" } } ] }, + "format" : "array", + "size-prefix-format" : "guint8", + "array-element" : { "format" : "guint8" } } ] }, { "name" : "Response In Indication Token", "id" : "0x10", "type" : "TLV", diff --git a/data/qmi-service-wds.json b/data/qmi-service-wds.json index 57b25c46..e70f1aaf 100644 --- a/data/qmi-service-wds.json +++ b/data/qmi-service-wds.json @@ -347,7 +347,8 @@ "type" : "TLV", "format" : "array", "fixed-size" : "8", - "array-element" : { "format": "guint16", "endian": "network" } }, + "array-element" : { "format" : "guint16", + "endian" : "network" } }, { "common-ref" : "WDS IPv6 Secondary DNS Address Preference", "name" : "IPv6 Secondary DNS Address Preference", @@ -355,7 +356,8 @@ "type" : "TLV", "format" : "array", "fixed-size" : "8", - "array-element" : { "format": "guint16", "endian": "network" } }, + "array-element" : { "format" : "guint16", + "endian" : "network" } }, { "common-ref" : "WDS LTE QoS Parameters", "name" : "LTE QoS Parameters", @@ -663,10 +665,10 @@ "type" : "TLV", "since" : "1.18", "format" : "sequence", - "contents" : [ { "name" : "PDN Filter Handler", - "format" : "array", + "contents" : [ { "name" : "PDN Filter Handler", + "format" : "array", "size-prefix-format" : "guint8", - "array-element" : { "format": "guint32" } } ] }, + "array-element" : { "format": "guint32" } } ] }, { "name" : "Extended Data Bearer Technology", "id" : "0x2A", "type" : "TLV", @@ -1307,20 +1309,21 @@ "format" : "guint8", "public-format" : "QmiWdsProfileType" } ], "output" : [ { "common-ref" : "Operation Result" }, - { "name" : "Profile List", - "id" : "0x01", - "type" : "TLV", - "since" : "1.8", - "format" : "array", - "array-element" : { "name" : "Profile", - "format" : "struct", - "contents" : [ { "name" : "Profile Type", - "format" : "guint8", - "public-format" : "QmiWdsProfileType" }, - { "name" : "Profile Index", - "format" : "guint8" }, - { "name" : "Profile Name", - "format" : "string" } ] }, + { "name" : "Profile List", + "id" : "0x01", + "type" : "TLV", + "since" : "1.8", + "format" : "array", + "size-prefix-format" : "guint8", + "array-element" : { "name" : "Profile", + "format" : "struct", + "contents" : [ { "name" : "Profile Type", + "format" : "guint8", + "public-format" : "QmiWdsProfileType" }, + { "name" : "Profile Index", + "format" : "guint8" }, + { "name" : "Profile Name", + "format" : "string" } ] }, "prerequisites" : [ { "common-ref" : "Success" } ] }, { "common-ref" : "WDS Extended Error Code", "since" : "1.8" } ] }, @@ -1725,24 +1728,26 @@ "since" : "1.0", "format" : "guint8", "prerequisites" : [ { "common-ref" : "Success" } ] }, - { "name" : "PCSCF Server Address List", - "id" : "0x23", - "type" : "TLV", - "since" : "1.0", - "format" : "array", - "array-element" : { "name" : "IPv4 Address", - "endian" : "little", - "format" : "guint32" }, - "prerequisites" : [ { "common-ref" : "Success" } ] }, - { "name" : "PCSCF Domain Name List", - "id" : "0x24", - "type" : "TLV", - "since" : "1.0", - "format" : "array", - "array-element" : { "name" : "FQDN", - "format" : "string", - "size-prefix-format" : "guint16" }, - "prerequisites" : [ { "common-ref" : "Success" } ] }, + { "name" : "PCSCF Server Address List", + "id" : "0x23", + "type" : "TLV", + "since" : "1.0", + "format" : "array", + "size-prefix-format" : "guint8", + "array-element" : { "name" : "IPv4 Address", + "endian" : "little", + "format" : "guint32" }, + "prerequisites" : [ { "common-ref" : "Success" } ] }, + { "name" : "PCSCF Domain Name List", + "id" : "0x24", + "type" : "TLV", + "since" : "1.0", + "format" : "array", + "size-prefix-format" : "guint8", + "array-element" : { "name" : "FQDN", + "format" : "string", + "size-prefix-format" : "guint16" }, + "prerequisites" : [ { "common-ref" : "Success" } ] }, { "name" : "IPv6 Address", "id" : "0x25", "type" : "TLV", @@ -1767,20 +1772,20 @@ { "name" : "Prefix Length", "format" : "guint8" } ], "prerequisites" : [ { "common-ref" : "Success" } ] }, - { "name" : "IPv6 Primary DNS Address", - "id" : "0x27", - "type" : "TLV", - "since" : "1.0", - "format" : "array", - "fixed-size": "8", + { "name" : "IPv6 Primary DNS Address", + "id" : "0x27", + "type" : "TLV", + "since" : "1.0", + "format" : "array", + "fixed-size" : "8", "array-element" : { "format": "guint16", "endian": "network" }, "prerequisites" : [ { "common-ref" : "Success" } ] }, - { "name" : "IPv6 Secondary DNS Address", - "id" : "0x28", - "type" : "TLV", - "since" : "1.0", - "format" : "array", - "fixed-size": "8", + { "name" : "IPv6 Secondary DNS Address", + "id" : "0x28", + "type" : "TLV", + "since" : "1.0", + "format" : "array", + "fixed-size" : "8", "array-element" : { "format": "guint16", "endian": "network" }, "prerequisites" : [ { "common-ref" : "Success" } ] }, { "name" : "MTU", @@ -1789,15 +1794,16 @@ "since" : "1.0", "format" : "guint32", "prerequisites" : [ { "common-ref" : "Success" } ] }, - { "name" : "Domain Name List", - "id" : "0x2A", - "type" : "TLV", - "since" : "1.0", - "format" : "array", - "array-element" : { "name" : "Domain Name", - "format" : "string", - "size-prefix-format" : "guint16" }, - "prerequisites" : [ { "common-ref" : "Success" } ] }, + { "name" : "Domain Name List", + "id" : "0x2A", + "type" : "TLV", + "since" : "1.0", + "format" : "array", + "size-prefix-format" : "guint8", + "array-element" : { "name" : "Domain Name", + "format" : "string", + "size-prefix-format" : "guint16" }, + "prerequisites" : [ { "common-ref" : "Success" } ] }, { "name" : "IP Family", "id" : "0x2B", "type" : "TLV", @@ -2018,26 +2024,27 @@ "format" : "guint8", "public-format" : "QmiWdsDataSystemNetworkType" } ], "output" : [ { "common-ref" : "Operation Result" }, - { "name" : "Info", - "id" : "0x10", - "type" : "TLV", - "since" : "1.14", - "format" : "array", - "array-element" : { "name" : "Element", - "format" : "struct", - "contents" : [ { "name" : "IPv4 Throttled", - "format" : "gint8", - "public-format" : "gboolean" }, - { "name" : "IPv6 Throttled", - "format" : "gint8", - "public-format" : "gboolean" }, - { "name" : "IPv4 Throttle Time Left MS", - "format" : "guint32" }, - { "name" : "IPv6 Throttle Time Left MS", - "format" : "guint32" }, - { "name" : "APN", - "format" : "string" } ] }, - "prerequisites": [ { "common-ref" : "Success" } ] } ] }, + { "name" : "Info", + "id" : "0x10", + "type" : "TLV", + "since" : "1.14", + "format" : "array", + "size-prefix-format" : "guint8", + "array-element" : { "name" : "Element", + "format" : "struct", + "contents" : [ { "name" : "IPv4 Throttled", + "format" : "gint8", + "public-format" : "gboolean" }, + { "name" : "IPv6 Throttled", + "format" : "gint8", + "public-format" : "gboolean" }, + { "name" : "IPv4 Throttle Time Left MS", + "format" : "guint32" }, + { "name" : "IPv6 Throttle Time Left MS", + "format" : "guint32" }, + { "name" : "APN", + "format" : "string" } ] }, + "prerequisites" : [ { "common-ref" : "Success" } ] } ] }, // ********************************************************************************* { "name" : "Get LTE Attach Parameters", @@ -2101,13 +2108,14 @@ "service" : "WDS", "id" : "0x0093", "since" : "1.28", - "input" : [ { "name" : "List", - "id" : "0x01", - "type" : "TLV", - "since" : "1.28", - "format" : "array", - "array-element" : { "name" : "PDN Profile ID", - "format" : "guint16" }}, + "input" : [ { "name" : "List", + "id" : "0x01", + "type" : "TLV", + "since" : "1.28", + "format" : "array", + "size-prefix-format" : "guint8", + "array-element" : { "name" : "PDN Profile ID", + "format" : "guint16" }}, { "name" : "Action", "id" : "0x10", "type" : "TLV", @@ -2138,22 +2146,24 @@ "id" : "0x0094", "since" : "1.28", "output" : [ { "common-ref" : "Operation Result" }, - { "name" : "Current List", - "id" : "0x10", - "type" : "TLV", - "since" : "1.28", - "format" : "array", - "array-element" : { "name" : "PDN Profile ID", - "format" : "guint16" }, + { "name" : "Current List", + "id" : "0x10", + "type" : "TLV", + "since" : "1.28", + "format" : "array", + "size-prefix-format" : "guint8", + "array-element" : { "name" : "PDN Profile ID", + "format" : "guint16" }, "prerequisites" : [ { "common-ref" : "Success" } ] }, - { "name" : "Pending List", - "id" : "0x11", - "type" : "TLV", - "since" : "1.28", - "format" : "array", - "array-element" : { "name" : "PDN Profile ID", - "format" : "guint16" }, - "prerequisites" : [ { "common-ref" : "Success" } ] } ] }, + { "name" : "Pending List", + "id" : "0x11", + "type" : "TLV", + "since" : "1.28", + "format" : "array", + "size-prefix-format" : "guint8", + "array-element" : { "name" : "PDN Profile ID", + "format" : "guint16" }, + "prerequisites" : [ { "common-ref" : "Success" } ] } ] }, // ********************************************************************************* { "name" : "Bind Mux Data Port", -- cgit v1.2.1