zcbor: Copy source and header files

from zcbor 0.8.1

Signed-off-by: Øyvind Rønningstad <[email protected]>

Author: oyvindronningstad

boot/zcbor/include/zcbor_common.h

@@ -1,6 +1,6 @@
 /*
  * This file has been copied from the zcbor library.
- * Commit zcbor 0.8.0
+ * Commit zcbor 0.8.1
  */
 
 /*
@@ -22,6 +22,23 @@
 extern "C" {
 #endif
 
+#define ZCBOR_STRINGIFY_PRE(x) #x
+#define ZCBOR_STRINGIFY(s) ZCBOR_STRINGIFY_PRE(s)
+
+#define ZCBOR_VERSION_MAJOR 0
+#define ZCBOR_VERSION_MINOR 8
+#define ZCBOR_VERSION_BUGFIX 1
+
+/** The version string with dots and not prefix. */
+#define ZCBOR_VERSION_STR   ZCBOR_STRINGIFY(ZCBOR_VERSION_MAJOR) \
+			"." ZCBOR_STRINGIFY(ZCBOR_VERSION_MINOR) \
+			"." ZCBOR_STRINGIFY(ZCBOR_VERSION_BUGFIX)
+
+/** Monotonically increasing integer representing the version. */
+#define ZCBOR_VERSION    ((ZCBOR_VERSION_MAJOR << 24) \
+			+ (ZCBOR_VERSION_MINOR << 16) \
+			+ (ZCBOR_VERSION_BUGFIX << 8))
+
 /** Convenience type that allows pointing to strings directly inside the payload
  *  without the need to copy out.
  */
@@ -488,6 +505,8 @@ static inline size_t zcbor_flags_to_states(size_t num_flags)
 #define ZCBOR_FLAG_STATES(n_flags) 0
 #endif
 
+size_t strnlen(const char *, size_t);
+
 #ifdef __cplusplus
 }
 #endif

boot/zcbor/include/zcbor_decode.h

@@ -1,6 +1,6 @@
 /*
  * This file has been copied from the zcbor library.
- * Commit zcbor 0.8.0
+ * Commit zcbor 0.8.1
  */
 
 /*

boot/zcbor/include/zcbor_encode.h

@@ -1,6 +1,6 @@
 /*
  * This file has been copied from the zcbor library.
- * Commit zcbor 0.8.0
+ * Commit zcbor 0.8.1
  */
 
 /*

boot/zcbor/include/zcbor_print.h

@@ -1,6 +1,6 @@
 /*
  * This file has been copied from the zcbor library.
- * Commit zcbor 0.8.0
+ * Commit zcbor 0.8.1
  */
 
 /*
@@ -93,23 +93,27 @@ static void zcbor_print_compare_lines(const uint8_t *str1, const uint8_t *str2,
 __attribute__((used))
 static void zcbor_print_compare_strings(const uint8_t *str1, const uint8_t *str2, size_t size)
 {
-	for (size_t i = 0; i <= size / 16; i++) {
-		zcbor_do_print("line %zu (char %zu)\r\n", i, i*16);
-		zcbor_print_compare_lines(&str1[i*16], &str2[i*16],
-			MIN(16, (size - i*16)));
+	const size_t col_width = 16;
+
+	for (size_t i = 0; i <= size / col_width; i++) {
+		zcbor_do_print("line %zu (char %zu)\r\n", i, i*col_width);
+		zcbor_print_compare_lines(&str1[i*col_width], &str2[i*col_width],
+			MIN(col_width, (size - i*col_width)));
 	}
 	zcbor_do_print("\r\n");
 }
 
 __attribute__((used))
 static void zcbor_print_compare_strings_diff(const uint8_t *str1, const uint8_t *str2, size_t size)
 {
+	const size_t col_width = 16;
 	bool printed = false;
-	for (size_t i = 0; i <= size / 16; i++) {
-		if (memcmp(&str1[i*16], &str2[i*16], MIN(16, (size - i*16))) != 0) {
-			zcbor_do_print("line %zu (char %zu)\r\n", i, i*16);
-			zcbor_print_compare_lines(&str1[i*16], &str2[i*16],
-				MIN(16, (size - i*16)));
+
+	for (size_t i = 0; i <= size / col_width; i++) {
+		if (memcmp(&str1[i*col_width], &str2[i*col_width], MIN(col_width, (size - i*col_width))) != 0) {
+			zcbor_do_print("line %zu (char %zu)\r\n", i, i*col_width);
+			zcbor_print_compare_lines(&str1[i*col_width], &str2[i*col_width],
+				MIN(col_width, (size - i*col_width)));
 			printed = true;
 		}
 	}

boot/zcbor/include/zcbor_tags.h

@@ -1,6 +1,6 @@
 /*
  * This file has been copied from the zcbor library.
- * Commit zcbor 0.8.0
+ * Commit zcbor 0.8.1
  */
 
 /*

boot/zcbor/src/zcbor_common.c

@@ -1,6 +1,6 @@
 /*
  * This file has been copied from the zcbor library.
- * Commit zcbor 0.8.0
+ * Commit zcbor 0.8.1
  */
 
 /*
@@ -355,30 +355,23 @@ float zcbor_float16_to_32(uint16_t input)
 				: (expo + (F32_BIAS - F16_BIAS));
 		uint32_t value32 = (sign << F32_SIGN_OFFS) | (new_expo << F32_EXPO_OFFS)
 			| (mantissa << (F32_EXPO_OFFS - F16_EXPO_OFFS));
-		float result;
-
-		memcpy(&result, &value32, sizeof(result));
-		return result;
+		return *(float *)&value32;
 	}
 }
 
 
 uint16_t zcbor_float32_to_16(float input)
 {
-	uint32_t value32;
-
-	memcpy(&value32, &input, sizeof(value32));
+	uint32_t value32 = *(uint32_t *)&input;
 
 	uint32_t sign = value32 >> F32_SIGN_OFFS;
 	uint32_t expo = (value32 >> F32_EXPO_OFFS) & F32_EXPO_MSK;
 	uint32_t mantissa = value32 & F32_MANTISSA_MSK;
 
 	uint16_t value16 = (uint16_t)(sign << F16_SIGN_OFFS);
 
-	uint32_t abs_value32 = value32 & ~(1 << F32_SIGN_OFFS);
 	float abs_input;
-
-	memcpy(&abs_input, &abs_value32, sizeof(abs_input));
+	*(uint32_t *)&abs_input = value32 & ~(1 << F32_SIGN_OFFS);
 
 	if (abs_input <= (F16_MIN / 2)) {
 		/* 0 or too small for float16. Round down to 0. value16 is already correct. */

boot/zcbor/src/zcbor_decode.c

@@ -1,6 +1,6 @@
 /*
  * This file has been copied from the zcbor library.
- * Commit zcbor 0.8.0
+ * Commit zcbor 0.8.1
  */
 
 /*

boot/zcbor/src/zcbor_encode.c

@@ -1,6 +1,6 @@
 /*
  * This file has been copied from the zcbor library.
- * Commit zcbor 0.8.0
+ * Commit zcbor 0.8.1
  */
 
 /*