From 67267943426bd4520147f9d41de108bd50303bb8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=98yvind=20R=C3=B8nningstad?= Date: Fri, 26 Jan 2024 16:26:00 +0100 Subject: [PATCH] [nrf noup] nrfconnect/telink: Adapt to zcbor 0.8.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit New parameter to ZCBOR_STATE_D() Signed-off-by: Øyvind Rønningstad --- src/platform/nrfconnect/FactoryDataParser.c | 4 ++-- src/platform/telink/FactoryDataParser.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/platform/nrfconnect/FactoryDataParser.c b/src/platform/nrfconnect/FactoryDataParser.c index 29b8be9a95..7ab39e6bcb 100644 --- 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 index 1226063126..f271b8bfdc 100644 --- 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;