Changeset 34120f10 in mainline for kernel/generic/include

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:

kernel/generic/include

Files:

• adt/fifo.h (deleted)
• adt/hash.h (deleted)
• adt/hash_table.h (deleted)
• adt/list.h (deleted)
• cc.h (modified) (1 diff)
• cpu/cpu_mask.h (modified) (1 diff)
• lib/memfnc.h (deleted)
• mem.h (deleted)
• memw.h (moved) (moved from kernel/generic/include/gsort.h ) (2 diffs)
• str.h (deleted)

kernel/generic/include/cc.h

@@ -38 +38 @@
 
 #ifndef __clang__
-#define ATTRIBUTE_OPTIMIZE(opt) \
-        __attribute__ ((optimize(opt)))
 #define ATTRIBUTE_USED \
         __attribute__ ((used))
 #else
-#define ATTRIBUTE_OPTIMIZE(opt)
 #define ATTRIBUTE_USED
 #endif

kernel/generic/include/cpu/cpu_mask.h

@@ -37 +37 @@
 #include <cpu.h>
 #include <config.h>
-#include <lib/memfnc.h>
+#include <memw.h>
 
 /** Iterates over all cpu id's whose bit is included in the cpu mask.

kernel/generic/include/memw.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2005 Sergey Bondari
+ * Copyright (c) 2001-2004 Jakub Jermar
  * All rights reserved.
  *
@@ -33 +33 @@
  */
 
-#ifndef KERN_GSORT_H_
-#define KERN_GSORT_H_
+#ifndef KERN_MEM_H_
+#define KERN_MEM_H_
 
-#include <stdbool.h>
 #include <stddef.h>
+#include <stdint.h>
 
-typedef int (*sort_cmp_t)(void *, void *, void *);
+#include <mem.h>
 
-extern bool gsort(void *, size_t, size_t, sort_cmp_t, void *);
+extern void memsetb(void *, size_t, uint8_t)
+    __attribute__((nonnull(1)));
+extern void memsetw(void *, size_t, uint16_t)
+    __attribute__((nonnull(1)));
 
 #endif