Re: [PATCH 0/3] uqmi: sync libqmi and add more diagnostic commands;
On Mon, Nov 08, 2021 at 08:40:43PM +0200, Oskari Lemmelä wrote: > Thanks. I squashed it to parser commit and dropped json file modification. > > Updated patches are in same upstream branch > https://github.com/olemmela/uqmi.git Please rebase on upstream, I've already merged the series. ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
Re: [PATCH 0/3] uqmi: sync libqmi and add more diagnostic commands;
On 8.11.2021 12.47, Koen Vandeputte wrote:
>
> On 08.11.21 09:36, Koen Vandeputte wrote:
>>
>> On 24.10.21 17:05, Oskari Lemmela wrote:
>>> First patch updates dynamic code generator to handle newer data from
>>> libqmi project. After data is synced from libqmi project, more
>>> connection
>>> diagnostic commands are added to uqmi.
>>>
>>> Oskari Lemmela (3):
>>> uqmi: update code generator
>>> uqmi: sync data from libqmi project
>>> uqmi: add more diagnostics commands
>>>
>>> commands-nas.c | 663 +++-
>>> commands-nas.h | 10 +-
>>> commands-uim.c | 8 +-
>>> commands-wda.c | 3 +-
>>> commands-wds.c | 16 +-
>>> commands-wds.h | 2 +-
>>> data/gen-code.pl | 11 +-
>>> data/gen-common.pm | 10 +
>>> data/gen-error-list.pl | 2 +-
>>> data/gen-header.pl | 5 +-
>>> data/qmi-service-ctl.json | 40 +-
>>> data/qmi-service-dms.json | 533 +++---
>>> data/qmi-service-nas.json | 1703 +--
>>> data/qmi-service-oma.json | 52 +-
>>> data/qmi-service-pbm.json | 47 +-
>>> data/qmi-service-pds.json | 104 +-
>>> data/qmi-service-uim.json | 746 ++
>>> data/qmi-service-wda.json | 144 ++-
>>> data/qmi-service-wds.json | 2039
>>> +
>>> data/qmi-service-wms.json | 218 ++--
>>
>> I noticed the JSON files here seem edited compared to upstream to
>> avoid following original compile issue: (variables starting with a
>> number)
>>
There is 5 variables starting with number so I did took short cut and
just renamed them.
https://github.com/olemmela/uqmi/commit/ab6d00ac0f4fa22956f5c1dc9266d89d3ade983e
>>
>> /Tools/QMI/qmi-message-nas.h:820:19: error: invalid suffix
>> "gpp_eons_plmn_name" on integer constant
>> 820 | } 3gpp_eons_plmn_name;
>> | ^~~
>>
>> Maybe the perl scripts could be edited to simply prepend a "_" to
>> these vars to avoid the problem.
>> This would allow to use unmodified upstream json files which is a lot
>> less work to update it in the future.
>>
You are right. Better try keep files as close to upstream ones as
possible. There is still glib related lines
in headers files to be changed after syncing.
https://github.com/olemmela/uqmi/commit/5ee729f571e7ceab54cf33d27ef936a41c576255
https://github.com/olemmela/uqmi/commit/8d95a06037d572b5f31634fa50d4202006d5e8b4
>>
>> Regards,
>>
>> Koen
>>
>
> Patch proposal:
>
>
> 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);
> }
>
Thanks. I squashed it to parser commit and dropped json file modification.
Updated patches are in same upstream branch
https://github.com/olemmela/uqmi.git
>
> Regards,
>
> Koen
>
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel
Re: [PATCH 0/3] uqmi: sync libqmi and add more diagnostic commands;
On 08.11.21 09:36, Koen Vandeputte wrote:
On 24.10.21 17:05, Oskari Lemmela wrote:
First patch updates dynamic code generator to handle newer data from
libqmi project. After data is synced from libqmi project, more
connection
diagnostic commands are added to uqmi.
Oskari Lemmela (3):
uqmi: update code generator
uqmi: sync data from libqmi project
uqmi: add more diagnostics commands
commands-nas.c | 663 +++-
commands-nas.h | 10 +-
commands-uim.c | 8 +-
commands-wda.c | 3 +-
commands-wds.c | 16 +-
commands-wds.h | 2 +-
data/gen-code.pl | 11 +-
data/gen-common.pm | 10 +
data/gen-error-list.pl | 2 +-
data/gen-header.pl | 5 +-
data/qmi-service-ctl.json | 40 +-
data/qmi-service-dms.json | 533 +++---
data/qmi-service-nas.json | 1703 +--
data/qmi-service-oma.json | 52 +-
data/qmi-service-pbm.json | 47 +-
data/qmi-service-pds.json | 104 +-
data/qmi-service-uim.json | 746 ++
data/qmi-service-wda.json | 144 ++-
data/qmi-service-wds.json | 2039 +
data/qmi-service-wms.json | 218 ++--
I noticed the JSON files here seem edited compared to upstream to
avoid following original compile issue: (variables starting with a
number)
/Tools/QMI/qmi-message-nas.h:820:19: error: invalid suffix
"gpp_eons_plmn_name" on integer constant
820 | } 3gpp_eons_plmn_name;
| ^~~
Maybe the perl scripts could be edited to simply prepend a "_" to
these vars to avoid the problem.
This would allow to use unmodified upstream json files which is a lot
less work to update it in the future.
Regards,
Koen
Patch proposal:
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);
}
Regards,
Koen
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel
Re: [PATCH 0/3] uqmi: sync libqmi and add more diagnostic commands
On 24.10.21 17:05, Oskari Lemmela wrote: First patch updates dynamic code generator to handle newer data from libqmi project. After data is synced from libqmi project, more connection diagnostic commands are added to uqmi. Oskari Lemmela (3): uqmi: update code generator uqmi: sync data from libqmi project uqmi: add more diagnostics commands commands-nas.c| 663 +++- commands-nas.h| 10 +- commands-uim.c|8 +- commands-wda.c|3 +- commands-wds.c| 16 +- commands-wds.h|2 +- data/gen-code.pl | 11 +- data/gen-common.pm| 10 + data/gen-error-list.pl|2 +- data/gen-header.pl|5 +- data/qmi-service-ctl.json | 40 +- data/qmi-service-dms.json | 533 +++--- data/qmi-service-nas.json | 1703 +-- data/qmi-service-oma.json | 52 +- data/qmi-service-pbm.json | 47 +- data/qmi-service-pds.json | 104 +- data/qmi-service-uim.json | 746 ++ data/qmi-service-wda.json | 144 ++- data/qmi-service-wds.json | 2039 + data/qmi-service-wms.json | 218 ++-- I noticed the JSON files here seem edited compared to upstream to avoid following original compile issue: (variables starting with a number) /Tools/QMI/qmi-message-nas.h:820:19: error: invalid suffix "gpp_eons_plmn_name" on integer constant 820 | } 3gpp_eons_plmn_name; | ^~~ Maybe the perl scripts could be edited to simply prepend a "_" to these vars to avoid the problem. This would allow to use unmodified upstream json files which is a lot less work to update it in the future. Regards, Koen ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
Re: [PATCH 0/3] uqmi: sync libqmi and add more diagnostic commands
On 24.10.2021 18.05, Oskari Lemmela wrote: > First patch updates dynamic code generator to handle newer data from > libqmi project. After data is synced from libqmi project, more connection > diagnostic commands are added to uqmi. > > Oskari Lemmela (3): > uqmi: update code generator > uqmi: sync data from libqmi project > uqmi: add more diagnostics commands > > commands-nas.c| 663 +++- > commands-nas.h| 10 +- > commands-uim.c|8 +- > commands-wda.c|3 +- > commands-wds.c| 16 +- > commands-wds.h|2 +- > data/gen-code.pl | 11 +- > data/gen-common.pm| 10 + > data/gen-error-list.pl|2 +- > data/gen-header.pl|5 +- > data/qmi-service-ctl.json | 40 +- > data/qmi-service-dms.json | 533 +++--- > data/qmi-service-nas.json | 1703 +-- > data/qmi-service-oma.json | 52 +- > data/qmi-service-pbm.json | 47 +- > data/qmi-service-pds.json | 104 +- > data/qmi-service-uim.json | 746 ++ > data/qmi-service-wda.json | 144 ++- > data/qmi-service-wds.json | 2039 + > data/qmi-service-wms.json | 218 ++-- > qmi-enums-dms.h | 234 - > qmi-enums-nas.h | 856 +++- > qmi-enums-pds.h | 34 +- > qmi-enums-private.h |3 + > qmi-enums-uim.h | 246 - > qmi-enums-wda.h | 19 +- > qmi-enums-wds.h | 1286 +++ > qmi-enums-wms.h | 215 ++-- > qmi-enums.h | 228 +++-- > qmi-errors.h | 197 ++-- > qmi-flags64-dms.h | 28 +- > qmi-flags64-nas.h | 34 +- > 32 files changed, 7878 insertions(+), 1858 deletions(-) > Second patch was too big for mailing list. Patches are also available in https://github.com/olemmela/uqmi.git upstream branch. Oskari ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[PATCH 0/3] uqmi: sync libqmi and add more diagnostic commands
First patch updates dynamic code generator to handle newer data from libqmi project. After data is synced from libqmi project, more connection diagnostic commands are added to uqmi. Oskari Lemmela (3): uqmi: update code generator uqmi: sync data from libqmi project uqmi: add more diagnostics commands commands-nas.c| 663 +++- commands-nas.h| 10 +- commands-uim.c|8 +- commands-wda.c|3 +- commands-wds.c| 16 +- commands-wds.h|2 +- data/gen-code.pl | 11 +- data/gen-common.pm| 10 + data/gen-error-list.pl|2 +- data/gen-header.pl|5 +- data/qmi-service-ctl.json | 40 +- data/qmi-service-dms.json | 533 +++--- data/qmi-service-nas.json | 1703 +-- data/qmi-service-oma.json | 52 +- data/qmi-service-pbm.json | 47 +- data/qmi-service-pds.json | 104 +- data/qmi-service-uim.json | 746 ++ data/qmi-service-wda.json | 144 ++- data/qmi-service-wds.json | 2039 + data/qmi-service-wms.json | 218 ++-- qmi-enums-dms.h | 234 - qmi-enums-nas.h | 856 +++- qmi-enums-pds.h | 34 +- qmi-enums-private.h |3 + qmi-enums-uim.h | 246 - qmi-enums-wda.h | 19 +- qmi-enums-wds.h | 1286 +++ qmi-enums-wms.h | 215 ++-- qmi-enums.h | 228 +++-- qmi-errors.h | 197 ++-- qmi-flags64-dms.h | 28 +- qmi-flags64-nas.h | 34 +- 32 files changed, 7878 insertions(+), 1858 deletions(-) -- 2.25.1 ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
