Skip to content

Commit 5467512

Browse files
oyvindronningstadoyvindronningstad
committed
lwm2m_senml_cbor.patch: Update patch file to match current changes
File created by commiting changes and running git diff HEAD~1.. > lwm2m_senml_cbor.patch Signed-off-by: Øyvind Rønningstad <[email protected]>
1 parent d899018 commit 5467512

File tree

1 file changed

+90
-60
lines changed

1 file changed

+90
-60
lines changed

‎subsys/net/lib/lwm2m/lwm2m_senml_cbor.patch

Lines changed: 90 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,5 @@
1-
From f4609477c99e5921c1f744d318a3534d3d70530e Mon Sep 17 00:00:00 2001
2-
From: =?UTF-8?q?=C3=98yvind=20R=C3=B8nningstad?=
3-
<[email protected]>
4-
Date: Fri, 1 Jul 2022 09:54:09 +0200
5-
Subject: [PATCH] patch
6-
7-
---
8-
.../net/lib/lwm2m/lwm2m_senml_cbor_decode.c | 29 ++++++-----
9-
.../net/lib/lwm2m/lwm2m_senml_cbor_decode.h | 16 +++----
10-
.../net/lib/lwm2m/lwm2m_senml_cbor_encode.c | 48 ++++++++++---------
11-
.../net/lib/lwm2m/lwm2m_senml_cbor_encode.h | 16 +++----
12-
subsys/net/lib/lwm2m/lwm2m_senml_cbor_types.h | 25 ++++++++--
13-
5 files changed, 78 insertions(+), 56 deletions(-)
14-
151
diff --git a/subsys/net/lib/lwm2m/lwm2m_senml_cbor_decode.c b/subsys/net/lib/lwm2m/lwm2m_senml_cbor_decode.c
16-
index 1a64bd3502..8dfa3bb03a 100644
2+
index 45eec7f404..b1cabba34b 100644
173
--- a/subsys/net/lib/lwm2m/lwm2m_senml_cbor_decode.c
184
+++ b/subsys/net/lib/lwm2m/lwm2m_senml_cbor_decode.c
195
@@ -1,20 +1,21 @@
@@ -23,7 +9,7 @@ index 1a64bd3502..8dfa3bb03a 100644
239
+ * SPDX-License-Identifier: Apache-2.0
2410
+ */
2511
/*
26-
* Generated using zcbor version 0.5.1
12+
* Generated using zcbor version 0.6.0
2713
- * https://github.com/NordicSemiconductor/zcbor
2814
+ * https://github.com/zephyrproject-rtos/zcbor
2915
* Generated with a --default-max-qty of 99
@@ -44,8 +30,30 @@ index 1a64bd3502..8dfa3bb03a 100644
4430
+#include "lwm2m_senml_cbor_decode.h"
4531

4632
static bool decode_repeated_record_bn(zcbor_state_t *state, struct record_bn *result);
47-
static bool decode_repeated_record_n(zcbor_state_t *state, struct record_n *result);
48-
@@ -60,8 +61,8 @@ static bool decode_repeated_record_union(zcbor_state_t *state, struct record_uni
33+
static bool decode_repeated_record_bt(zcbor_state_t *state, struct record_bt *result);
34+
@@ -47,8 +48,8 @@ static bool decode_repeated_record_bt(zcbor_state_t *state, struct record_bt *re
35+
36+
bool tmp_result = ((((zcbor_int32_expect(state, (-3)))) &&
37+
(zcbor_int64_decode(state, (&(*result)._record_bt))) &&
38+
- ((((*result)._record_bt >= -9223372036854775807LL) &&
39+
- ((*result)._record_bt <= 9223372036854775807LL)) ||
40+
+ ((((*result)._record_bt >= INT64_MIN) &&
41+
+ ((*result)._record_bt <= INT64_MAX)) ||
42+
(zcbor_error(state, ZCBOR_ERR_WRONG_RANGE), false))));
43+
44+
if (!tmp_result)
45+
@@ -76,8 +77,8 @@ static bool decode_repeated_record_t(zcbor_state_t *state, struct record_t *resu
46+
47+
bool tmp_result = ((((zcbor_uint32_expect(state, (6)))) &&
48+
(zcbor_int64_decode(state, (&(*result)._record_t))) &&
49+
- ((((*result)._record_t >= -9223372036854775807LL) &&
50+
- ((*result)._record_t <= 9223372036854775807LL)) ||
51+
+ ((((*result)._record_t >= INT64_MIN) &&
52+
+ ((*result)._record_t <= INT64_MAX)) ||
53+
(zcbor_error(state, ZCBOR_ERR_WRONG_RANGE), false))));
54+
55+
if (!tmp_result)
56+
@@ -94,8 +95,8 @@ static bool decode_repeated_record_union(zcbor_state_t *state, struct record_uni
4957
bool tmp_result = (((zcbor_union_start_code(state) &&
5058
(int_res = (((((zcbor_uint32_expect_union(state, (2)))) &&
5159
(zcbor_int64_decode(state, (&(*result)._union_vi))) &&
@@ -54,41 +62,41 @@ index 1a64bd3502..8dfa3bb03a 100644
5462
+ ((((*result)._union_vi >= INT64_MIN) &&
5563
+ ((*result)._union_vi <= INT64_MAX)) ||
5664
(zcbor_error(state, ZCBOR_ERR_WRONG_RANGE), false))) &&
57-
(((*result)._record_union_choice = _union_vi) || 1)) ||
65+
(((*result)._record_union_choice = _union_vi), true)) ||
5866
((((zcbor_uint32_expect_union(state, (2)))) &&
59-
@@ -96,8 +97,8 @@ static bool decode_value(zcbor_state_t *state, struct value_ *result)
67+
@@ -130,8 +131,8 @@ static bool decode_value(zcbor_state_t *state, struct value_ *result)
6068
(((zcbor_bstr_decode(state, (&(*result)._value_bstr)))) &&
61-
(((*result)._value_choice = _value_bstr) || 1)) ||
69+
(((*result)._value_choice = _value_bstr), true)) ||
6270
(((zcbor_int64_decode(state, (&(*result)._value_int))) &&
6371
- ((((*result)._value_int >= -9223372036854775807LL) &&
6472
- ((*result)._value_int <= 9223372036854775807LL)) ||
6573
+ ((((*result)._value_int >= INT64_MIN) &&
6674
+ ((*result)._value_int <= INT64_MAX)) ||
6775
(zcbor_error(state, ZCBOR_ERR_WRONG_RANGE), false))) &&
68-
(((*result)._value_choice = _value_int) || 1)) ||
76+
(((*result)._value_choice = _value_int), true)) ||
6977
(((zcbor_float_decode(state, (&(*result)._value_float)))) &&
70-
@@ -153,7 +154,8 @@ static bool decode_record(zcbor_state_t *state, struct record *result)
78+
@@ -193,7 +194,8 @@ static bool decode_record(zcbor_state_t *state, struct record *result)
7179
zcbor_present_decode(&((*result)._record_union_present),
7280
(zcbor_decoder_t *)decode_repeated_record_union, state,
7381
(&(*result)._record_union)) &&
74-
- zcbor_multi_decode(0, 3, &(*result)._record__key_value_pair_count,
75-
+ zcbor_multi_decode(0, ARRAY_SIZE(result->_record__key_value_pair),
82+
- zcbor_multi_decode(0, 5, &(*result)._record__key_value_pair_count,
83+
+ zcbor_multi_decode(0, ZCBOR_ARRAY_SIZE(result->_record__key_value_pair),
7684
+ &(*result)._record__key_value_pair_count,
7785
(zcbor_decoder_t *)decode_repeated_record__key_value_pair,
7886
state, (&(*result)._record__key_value_pair),
7987
sizeof(struct record__key_value_pair))) ||
80-
@@ -172,7 +174,8 @@ static bool decode_lwm2m_senml(zcbor_state_t *state, struct lwm2m_senml *result)
88+
@@ -212,7 +214,8 @@ static bool decode_lwm2m_senml(zcbor_state_t *state, struct lwm2m_senml *result)
8189

8290
bool tmp_result = ((
8391
(zcbor_list_start_decode(state) &&
8492
- ((zcbor_multi_decode(1, 99, &(*result)._lwm2m_senml__record_count,
85-
+ ((zcbor_multi_decode(1, ARRAY_SIZE(result->_lwm2m_senml__record),
93+
+ ((zcbor_multi_decode(1, ZCBOR_ARRAY_SIZE(result->_lwm2m_senml__record),
8694
+ &(*result)._lwm2m_senml__record_count,
8795
(zcbor_decoder_t *)decode_record, state,
8896
(&(*result)._lwm2m_senml__record), sizeof(struct record))) ||
8997
(zcbor_list_map_end_force_decode(state), false)) &&
9098
diff --git a/subsys/net/lib/lwm2m/lwm2m_senml_cbor_decode.h b/subsys/net/lib/lwm2m/lwm2m_senml_cbor_decode.h
91-
index 1bc78642d3..ddff913391 100644
99+
index ea2c98fbe5..cf425e9006 100644
92100
--- a/subsys/net/lib/lwm2m/lwm2m_senml_cbor_decode.h
93101
+++ b/subsys/net/lib/lwm2m/lwm2m_senml_cbor_decode.h
94102
@@ -1,23 +1,23 @@
@@ -98,7 +106,7 @@ index 1bc78642d3..ddff913391 100644
98106
+ * SPDX-License-Identifier: Apache-2.0
99107
+ */
100108
/*
101-
* Generated using zcbor version 0.5.1
109+
* Generated using zcbor version 0.6.0
102110
- * https://github.com/NordicSemiconductor/zcbor
103111
+ * https://github.com/zephyrproject-rtos/zcbor
104112
* Generated with a --default-max-qty of 99
@@ -124,7 +132,7 @@ index 1bc78642d3..ddff913391 100644
124132
int cbor_decode_lwm2m_senml(const uint8_t *payload, size_t payload_len, struct lwm2m_senml *result,
125133
size_t *payload_len_out);
126134
diff --git a/subsys/net/lib/lwm2m/lwm2m_senml_cbor_encode.c b/subsys/net/lib/lwm2m/lwm2m_senml_cbor_encode.c
127-
index 07dc20e3a9..11007bd92f 100644
135+
index cd02029d11..3c0c190981 100644
128136
--- a/subsys/net/lib/lwm2m/lwm2m_senml_cbor_encode.c
129137
+++ b/subsys/net/lib/lwm2m/lwm2m_senml_cbor_encode.c
130138
@@ -1,20 +1,21 @@
@@ -134,7 +142,7 @@ index 07dc20e3a9..11007bd92f 100644
134142
+ * SPDX-License-Identifier: Apache-2.0
135143
+ */
136144
/*
137-
* Generated using zcbor version 0.5.1
145+
* Generated using zcbor version 0.6.0
138146
- * https://github.com/NordicSemiconductor/zcbor
139147
+ * https://github.com/zephyrproject-rtos/zcbor
140148
* Generated with a --default-max-qty of 99
@@ -156,8 +164,30 @@ index 07dc20e3a9..11007bd92f 100644
156164
+#include "lwm2m_senml_cbor_types.h"
157165

158166
static bool encode_repeated_record_bn(zcbor_state_t *state, const struct record_bn *input);
159-
static bool encode_repeated_record_n(zcbor_state_t *state, const struct record_n *input);
160-
@@ -59,8 +60,8 @@ static bool encode_repeated_record_union(zcbor_state_t *state, const struct reco
167+
static bool encode_repeated_record_bt(zcbor_state_t *state, const struct record_bt *input);
168+
@@ -46,8 +47,8 @@ static bool encode_repeated_record_bt(zcbor_state_t *state, const struct record_
169+
zcbor_print("%s\r\n", __func__);
170+
171+
bool tmp_result = ((((zcbor_int32_put(state, (-3)))) &&
172+
- ((((*input)._record_bt >= -9223372036854775807LL) &&
173+
- ((*input)._record_bt <= 9223372036854775807LL)) ||
174+
+ ((((*input)._record_bt >= INT64_MIN) &&
175+
+ ((*input)._record_bt <= INT64_MAX)) ||
176+
(zcbor_error(state, ZCBOR_ERR_WRONG_RANGE), false)) &&
177+
(zcbor_int64_encode(state, (&(*input)._record_bt)))));
178+
179+
@@ -75,8 +76,8 @@ static bool encode_repeated_record_t(zcbor_state_t *state, const struct record_t
180+
zcbor_print("%s\r\n", __func__);
181+
182+
bool tmp_result = ((((zcbor_uint32_put(state, (6)))) &&
183+
- ((((*input)._record_t >= -9223372036854775807LL) &&
184+
- ((*input)._record_t <= 9223372036854775807LL)) ||
185+
+ ((((*input)._record_t >= INT64_MIN) &&
186+
+ ((*input)._record_t <= INT64_MAX)) ||
187+
(zcbor_error(state, ZCBOR_ERR_WRONG_RANGE), false)) &&
188+
(zcbor_int64_encode(state, (&(*input)._record_t)))));
189+
190+
@@ -93,8 +94,8 @@ static bool encode_repeated_record_union(zcbor_state_t *state, const struct reco
161191
bool tmp_result = (((
162192
((*input)._record_union_choice == _union_vi)
163193
? (((zcbor_uint32_put(state, (2)))) &&
@@ -168,7 +198,7 @@ index 07dc20e3a9..11007bd92f 100644
168198
(zcbor_error(state, ZCBOR_ERR_WRONG_RANGE), false)) &&
169199
(zcbor_int64_encode(state, (&(*input)._union_vi))))
170200
: (((*input)._record_union_choice == _union_vf)
171-
@@ -78,8 +79,8 @@ static bool encode_repeated_record_union(zcbor_state_t *state, const struct reco
201+
@@ -112,8 +113,8 @@ static bool encode_repeated_record_union(zcbor_state_t *state, const struct reco
172202
? (((zcbor_uint32_put(state,
173203
(8)))) &&
174204
(zcbor_bstr_encode(
@@ -179,19 +209,20 @@ index 07dc20e3a9..11007bd92f 100644
179209
: false)))))));
180210

181211
if (!tmp_result)
182-
@@ -99,9 +100,9 @@ static bool encode_value(zcbor_state_t *state, const struct value_ *input)
212+
@@ -132,10 +133,8 @@ static bool encode_value(zcbor_state_t *state, const struct value_ *input)
213+
: (((*input)._value_choice == _value_bstr)
183214
? ((zcbor_bstr_encode(state, (&(*input)._value_bstr))))
184215
: (((*input)._value_choice == _value_int)
185-
? (((((*input)._value_int >=
216+
- ? (((((*input)._value_int >=
186217
- -9223372036854775807LL) &&
187-
+ INT64_MIN) &&
188-
((*input)._value_int <=
218+
- ((*input)._value_int <=
189219
- 9223372036854775807LL)) ||
190-
+ INT64_MAX)) ||
220+
+ ? (((((*input)._value_int >= INT64_MIN) &&
221+
+ ((*input)._value_int <= INT64_MAX)) ||
191222
(zcbor_error(state, ZCBOR_ERR_WRONG_RANGE),
192223
false)) &&
193224
(zcbor_int64_encode(state,
194-
@@ -112,8 +113,8 @@ static bool encode_value(zcbor_state_t *state, const struct value_ *input)
225+
@@ -146,8 +145,8 @@ static bool encode_value(zcbor_state_t *state, const struct value_ *input)
195226
(&(*input)._value_float))))
196227
: (((*input)._value_choice == _value_bool)
197228
? ((zcbor_bool_encode(
@@ -202,37 +233,37 @@ index 07dc20e3a9..11007bd92f 100644
202233
: false)))))));
203234

204235
if (!tmp_result)
205-
@@ -152,7 +153,9 @@ static bool encode_record(zcbor_state_t *state, const struct record *input)
236+
@@ -186,7 +185,9 @@ static bool encode_record(zcbor_state_t *state, const struct record *input)
206237
{
207238
zcbor_print("%s\r\n", __func__);
208239

209-
- bool tmp_result = (((zcbor_map_start_encode(state, 6) &&
210-
+ int max_keys = ARRAY_SIZE(input->_record__key_value_pair);
240+
- bool tmp_result = (((zcbor_map_start_encode(state, 10) &&
241+
+ int max_keys = ZCBOR_ARRAY_SIZE(input->_record__key_value_pair);
211242
+
212-
+ bool tmp_result = (((zcbor_map_start_encode(state, max_keys + 3) &&
243+
+ bool tmp_result = (((zcbor_map_start_encode(state, max_keys + 5) &&
213244
((zcbor_present_encode(&((*input)._record_bn_present),
214245
(zcbor_encoder_t *)encode_repeated_record_bn,
215246
state, (&(*input)._record_bn)) &&
216-
@@ -163,12 +166,12 @@ static bool encode_record(zcbor_state_t *state, const struct record *input)
247+
@@ -203,12 +204,12 @@ static bool encode_record(zcbor_state_t *state, const struct record *input)
217248
(zcbor_encoder_t *)encode_repeated_record_union,
218249
state, (&(*input)._record_union)) &&
219250
zcbor_multi_encode_minmax(
220-
- 0, 3, &(*input)._record__key_value_pair_count,
251+
- 0, 5, &(*input)._record__key_value_pair_count,
221252
+ 0, max_keys, &(*input)._record__key_value_pair_count,
222253
(zcbor_encoder_t *)encode_repeated_record__key_value_pair,
223254
state, (&(*input)._record__key_value_pair),
224255
sizeof(struct record__key_value_pair))) ||
225256
(zcbor_list_map_end_force_encode(state), false)) &&
226-
- zcbor_map_end_encode(state, 6))));
227-
+ zcbor_map_end_encode(state, max_keys + 3))));
257+
- zcbor_map_end_encode(state, 10))));
258+
+ zcbor_map_end_encode(state, max_keys + 5))));
228259

229260
if (!tmp_result)
230261
zcbor_trace();
231-
@@ -179,14 +182,15 @@ static bool encode_record(zcbor_state_t *state, const struct record *input)
262+
@@ -219,14 +220,15 @@ static bool encode_record(zcbor_state_t *state, const struct record *input)
232263
static bool encode_lwm2m_senml(zcbor_state_t *state, const struct lwm2m_senml *input)
233264
{
234265
zcbor_print("%s\r\n", __func__);
235-
+ size_t max_records = ARRAY_SIZE(input->_lwm2m_senml__record);
266+
+ size_t max_records = ZCBOR_ARRAY_SIZE(input->_lwm2m_senml__record);
236267

237268
- bool tmp_result = (((zcbor_list_start_encode(state, 99) &&
238269
+ bool tmp_result = (((zcbor_list_start_encode(state, max_records) &&
@@ -248,7 +279,7 @@ index 07dc20e3a9..11007bd92f 100644
248279
if (!tmp_result)
249280
zcbor_trace();
250281
diff --git a/subsys/net/lib/lwm2m/lwm2m_senml_cbor_encode.h b/subsys/net/lib/lwm2m/lwm2m_senml_cbor_encode.h
251-
index 431bc18760..563b82a917 100644
282+
index e9f7433e06..1a3591ba62 100644
252283
--- a/subsys/net/lib/lwm2m/lwm2m_senml_cbor_encode.h
253284
+++ b/subsys/net/lib/lwm2m/lwm2m_senml_cbor_encode.h
254285
@@ -1,23 +1,23 @@
@@ -258,7 +289,7 @@ index 431bc18760..563b82a917 100644
258289
+ * SPDX-License-Identifier: Apache-2.0
259290
+ */
260291
/*
261-
* Generated using zcbor version 0.5.1
292+
* Generated using zcbor version 0.6.0
262293
- * https://github.com/NordicSemiconductor/zcbor
263294
+ * https://github.com/zephyrproject-rtos/zcbor
264295
* Generated with a --default-max-qty of 99
@@ -284,17 +315,17 @@ index 431bc18760..563b82a917 100644
284315
int cbor_encode_lwm2m_senml(uint8_t *payload, size_t payload_len, const struct lwm2m_senml *input,
285316
size_t *payload_len_out);
286317
diff --git a/subsys/net/lib/lwm2m/lwm2m_senml_cbor_types.h b/subsys/net/lib/lwm2m/lwm2m_senml_cbor_types.h
287-
index f02b7df151..d8e7d3405a 100644
318+
index 8614d551f4..f7cf2c1baa 100644
288319
--- a/subsys/net/lib/lwm2m/lwm2m_senml_cbor_types.h
289320
+++ b/subsys/net/lib/lwm2m/lwm2m_senml_cbor_types.h
290-
@@ -1,18 +1,33 @@
321+
@@ -1,18 +1,35 @@
291322
+/*
292323
+ * Copyright (c) 2022 Nordic Semiconductor ASA
293324
+ *
294325
+ * SPDX-License-Identifier: Apache-2.0
295326
+ */
296327
/*
297-
* Generated using zcbor version 0.5.1
328+
* Generated using zcbor version 0.6.0
298329
- * https://github.com/NordicSemiconductor/zcbor
299330
+ * https://github.com/zephyrproject-rtos/zcbor
300331
* Generated with a --default-max-qty of 99
@@ -314,7 +345,9 @@ index f02b7df151..d8e7d3405a 100644
314345
+
315346
+enum lwm2m_senml_cbor_key {
316347
+ lwm2m_senml_cbor_key_bn = -2,
348+
+ lwm2m_senml_cbor_key_bt = -3,
317349
+ lwm2m_senml_cbor_key_n = 0,
350+
+ lwm2m_senml_cbor_key_t = 6,
318351
+ lwm2m_senml_cbor_key_vi = 2,
319352
+ lwm2m_senml_cbor_key_vf = 2,
320353
+ lwm2m_senml_cbor_key_vs = 3,
@@ -324,7 +357,7 @@ index f02b7df151..d8e7d3405a 100644
324357

325358
/** Which value for --default-max-qty this file was created with.
326359
*
327-
@@ -21,7 +36,7 @@
360+
@@ -21,7 +38,7 @@
328361
*
329362
* See `zcbor --help` for more information about --default-max-qty
330363
*/
@@ -333,7 +366,7 @@ index f02b7df151..d8e7d3405a 100644
333366

334367
struct record_bn {
335368
struct zcbor_string _record_bn;
336-
@@ -96,7 +111,7 @@ struct record {
369+
@@ -108,7 +125,7 @@ struct record {
337370
};
338371

339372
struct lwm2m_senml {
@@ -342,6 +375,3 @@ index f02b7df151..d8e7d3405a 100644
342375
uint_fast32_t _lwm2m_senml__record_count;
343376
};
344377

345-
--
346-
2.37.0
347-

0 commit comments

Comments
 (0)