Changeset 34120f10 in mainline for boot/generic

Timestamp:

2023-10-27T19:38:31Z (2 years ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Branches:

master, topic/msim-upgrade, topic/simplify-dev-export

Children:

63ed840

Parents:

c89ae25 (diff), 694ca3d6 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge code deduplication work

TL;DR: Added directory /common, which now contains the sole existing
copy of ADT, printf_core, and a few other pieces. Should make changes
to any of those less of a headache.

Location:

boot/generic

Files:

• include/assert.h (moved) (moved from kernel/generic/include/stdlib.h ) (2 diffs)
• include/errno.h (modified) (1 diff)
• include/str.h (deleted)
• src/gzip.c (modified) (1 diff)
• src/inflate.c (modified) (1 diff)
• src/memstr.c (deleted)
• src/payload.c (modified) (1 diff)
• src/str.c (deleted)

boot/generic/include/assert.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2006 Ondrej Palkovsky
+ * Copyright (c) 2023 Jiří Zárevúcky
  * All rights reserved.
  *
@@ -27 +27 @@
  */
 
-/** @addtogroup kernel_generic_mm
- * @{
- */
-/** @file
- */
+#ifndef BOOT_ASSERT_H_
+#define BOOT_ASSERT_H_
 
-#ifndef KERN_STDLIB_H_
-#define KERN_STDLIB_H_
+#define assert(expr) ((void) (expr))
 
-#include <stddef.h>
-
-extern void *malloc(size_t)
-    __attribute__((malloc));
-extern void *realloc(void *, size_t)
-    __attribute__((warn_unused_result));
-extern void free(void *);
-
-#endif
-
-/** @}
- */
+#endif /* BOOT_ASSERT_H_ */

boot/generic/include/errno.h

@@ -39 +39 @@
 #define EINVAL     -14  /* Invalid value. */
 #define EOVERFLOW  -16  /* The result does not fit its size. */
+#define EIO        -17
 
 typedef int errno_t;

boot/generic/src/gzip.c

@@ -32 +32 @@
 #include <stddef.h>
 #include <errno.h>
-#include <memstr.h>
+#include <mem.h>
 #include <byteorder.h>
 #include <gzip.h>

boot/generic/src/inflate.c

@@ -69 +69 @@
 #include <stdint.h>
 #include <errno.h>
-#include <memstr.h>
+#include <mem.h>
 #include <inflate.h>
 

boot/generic/src/payload.c

@@ -36 +36 @@
 #include <gzip.h>
 #include <stdbool.h>
-#include <memstr.h>
+#include <mem.h>
 #include <errno.h>
 #include <str.h>