From 20cd9075df2dffd4db0aa05addec31733af4f6cb Mon Sep 17 00:00:00 2001 From: Daniel Golle Date: Sat, 13 Nov 2021 23:07:49 +0000 Subject: [PATCH] uqmi: use unmodified upstream JSON files MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Extend code generator to handle also identifiers starting with a numerical character. Suggested-by: Koen Vandeputte Acked-by: Oskari Lemmelä Signed-off-by: Daniel Golle --- data/gen-common.pm | 1 + data/qmi-service-nas.json | 6 +++--- data/qmi-service-wms.json | 4 ++-- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/data/gen-common.pm b/data/gen-common.pm index e951776..278afce 100644 --- a/data/gen-common.pm +++ b/data/gen-common.pm @@ -32,6 +32,7 @@ sub gen_cname($) { my $name = shift; $name =~ s/[^a-zA-Z0-9_]/_/g; + $name = "_${name}" if $name =~ /^\d/; return lc($name); } diff --git a/data/qmi-service-nas.json b/data/qmi-service-nas.json index fbf79c2..2602e40 100644 --- a/data/qmi-service-nas.json +++ b/data/qmi-service-nas.json @@ -2074,7 +2074,7 @@ "format" : "guint8", "public-format" : "gboolean" } ], "output" : [ { "common-ref" : "Operation Result" }, - { "name" : "EONS PLMN Name 3GPP", + { "name" : "3GPP EONS PLMN Name", "id" : "0x10", "type" : "TLV", "since" : "1.28", @@ -3765,7 +3765,7 @@ "format" : "gint32" }, { "name" : "SINR", "format" : "gint32" } ] }, - { "name" : "Signal Strength 5G", + { "name" : "5G Signal Strength", "id" : "0x17", "type" : "TLV", "since" : "1.26.2", @@ -3774,7 +3774,7 @@ "format" : "gint16" }, { "name" : "SNR", "format" : "gint16" } ] }, - { "name" : "Signal Strength 5G Extended", + { "name" : "5G Signal Strength Extended", "id" : "0x18", "type" : "TLV", "since" : "1.26.2", diff --git a/data/qmi-service-wms.json b/data/qmi-service-wms.json index 7bd105a..ea23cf7 100644 --- a/data/qmi-service-wms.json +++ b/data/qmi-service-wms.json @@ -515,7 +515,7 @@ { "name" : "Success", "format" : "guint8", "public-format" : "gboolean" } ] }, - { "name" : "Failure Information 3GPP2", + { "name" : "3GPP2 Failure Information", "id" : "0x10", "type" : "TLV", "since" : "1.28", @@ -526,7 +526,7 @@ { "name" : "Cause Code", "format" : "guint8", "public-format" : "QmiWmsCdmaCauseCode" } ] }, - { "name" : "Failure Information 3GPP", + { "name" : "3GPP Failure Information", "id" : "0x11", "type" : "TLV", "since" : "1.28", -- 2.30.2