[nrf noup] nrfconnect/telink: Adapt to zcbor 0.8.1

oyvindronningstad · oyvindronningstad · commit 53cf5a88a8de · 2024-02-01T14:31:30.000+01:00
New parameter to ZCBOR_STATE_D()

Signed-off-by: Øyvind Rønningstad &lt;oyvind.ronningstad@nordicsemi.no&gt;
diff --git a/src/platform/nrfconnect/FactoryDataParser.c b/src/platform/nrfconnect/FactoryDataParser.c
@@ -92,7 +92,7 @@ bool FindUserDataEntry(struct FactoryData * factoryData, const char * entry, voi
         return false;
     }
 
-    ZCBOR_STATE_D(states, MAX_FACTORY_DATA_NESTING_LEVEL - 1, factoryData->user.data, factoryData->user.len, 1);
+    ZCBOR_STATE_D(states, MAX_FACTORY_DATA_NESTING_LEVEL - 1, factoryData->user.data, factoryData->user.len, 1, 0);
 
     bool res      = zcbor_map_start_decode(states);
     bool keyFound = false;
@@ -130,7 +130,7 @@ bool ParseFactoryData(uint8_t * buffer, uint16_t bufferSize, struct FactoryData
     }
 
     memset(factoryData, 0, sizeof(*factoryData));
-    ZCBOR_STATE_D(states, MAX_FACTORY_DATA_NESTING_LEVEL, buffer, bufferSize, 1);
+    ZCBOR_STATE_D(states, MAX_FACTORY_DATA_NESTING_LEVEL, buffer, bufferSize, 1, 0);
 
     bool res = zcbor_map_start_decode(states);
     struct zcbor_string currentString;
diff --git a/src/platform/telink/FactoryDataParser.c b/src/platform/telink/FactoryDataParser.c
@@ -43,7 +43,7 @@ static inline bool uint16_decode(zcbor_state_t * states, uint16_t * value)
 bool ParseFactoryData(uint8_t * buffer, uint16_t bufferSize, struct FactoryData * factoryData)
 {
     memset(factoryData, 0, sizeof(*factoryData));
-    ZCBOR_STATE_D(states, MAX_FACTORY_DATA_NESTING_LEVEL, buffer, bufferSize, 1);
+    ZCBOR_STATE_D(states, MAX_FACTORY_DATA_NESTING_LEVEL, buffer, bufferSize, 1, 0);
 
     bool res = zcbor_map_start_decode(states);
     struct zcbor_string currentString;

Original file line number	Diff line number	Diff line change
`@@ -92,7 +92,7 @@ bool FindUserDataEntry(struct FactoryData * factoryData, const char * entry, voi`
`92`	`92`	`return false;`
`93`	`93`	`}`
`94`	`94`
`95`		`- ZCBOR_STATE_D(states, MAX_FACTORY_DATA_NESTING_LEVEL - 1, factoryData->user.data, factoryData->user.len, 1);`
	`95`	`+ ZCBOR_STATE_D(states, MAX_FACTORY_DATA_NESTING_LEVEL - 1, factoryData->user.data, factoryData->user.len, 1, 0);`
`96`	`96`
`97`	`97`	`bool res = zcbor_map_start_decode(states);`
`98`	`98`	`bool keyFound = false;`
`@@ -130,7 +130,7 @@ bool ParseFactoryData(uint8_t * buffer, uint16_t bufferSize, struct FactoryData`
`130`	`130`	`}`
`131`	`131`
`132`	`132`	`memset(factoryData, 0, sizeof(*factoryData));`
`133`		`- ZCBOR_STATE_D(states, MAX_FACTORY_DATA_NESTING_LEVEL, buffer, bufferSize, 1);`
	`133`	`+ ZCBOR_STATE_D(states, MAX_FACTORY_DATA_NESTING_LEVEL, buffer, bufferSize, 1, 0);`
`134`	`134`
`135`	`135`	`bool res = zcbor_map_start_decode(states);`
`136`	`136`	`struct zcbor_string currentString;`
Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ static inline bool uint16_decode(zcbor_state_t * states, uint16_t * value)`
`43`	`43`	`bool ParseFactoryData(uint8_t * buffer, uint16_t bufferSize, struct FactoryData * factoryData)`
`44`	`44`	`{`
`45`	`45`	`memset(factoryData, 0, sizeof(*factoryData));`
`46`		`- ZCBOR_STATE_D(states, MAX_FACTORY_DATA_NESTING_LEVEL, buffer, bufferSize, 1);`
	`46`	`+ ZCBOR_STATE_D(states, MAX_FACTORY_DATA_NESTING_LEVEL, buffer, bufferSize, 1, 0);`
`47`	`47`
`48`	`48`	`bool res = zcbor_map_start_decode(states);`
`49`	`49`	`struct zcbor_string currentString;`