Changeset 34120f10 in mainline for kernel/genarch

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/genarch/src

Files:

• acpi/acpi.c (modified) (1 diff)
• drivers/ega/ega.c (modified) (1 diff)
• drivers/via-cuda/cuda.c (modified) (1 diff)
• fb/fb.c (modified) (1 diff)
• mm/as_pt.c (modified) (1 diff)
• mm/page_pt.c (modified) (1 diff)
• ofw/ofw_tree.c (modified) (1 diff)

kernel/genarch/src/acpi/acpi.c

@@ -43 +43 @@
 #include <mm/km.h>
 #include <log.h>
-#include <mem.h>
+#include <memw.h>
 
 #define RSDP_SIGNATURE      "RSD PTR "

kernel/genarch/src/drivers/ega/ega.c

@@ -42 +42 @@
 #include <typedefs.h>
 #include <arch/asm.h>
-#include <mem.h>
+#include <memw.h>
 #include <str.h>
 #include <console/chardev.h>

kernel/genarch/src/drivers/via-cuda/cuda.c

@@ -41 +41 @@
 #include <stdlib.h>
 #include <synch/spinlock.h>
-#include <mem.h>
+#include <memw.h>
 
 static irq_ownership_t cuda_claim(irq_t *irq);

kernel/genarch/src/fb/fb.c

@@ -45 +45 @@
 #include <align.h>
 #include <panic.h>
-#include <mem.h>
+#include <memw.h>
 #include <config.h>
 #include <bitops.h>

kernel/genarch/src/mm/as_pt.c

@@ -44 +44 @@
 #include <arch/mm/as.h>
 #include <typedefs.h>
-#include <mem.h>
+#include <memw.h>
 #include <arch.h>
 

kernel/genarch/src/mm/page_pt.c

@@ -47 +47 @@
 #include <typedefs.h>
 #include <arch/asm.h>
-#include <mem.h>
+#include <memw.h>
 #include <align.h>
 #include <macros.h>

kernel/genarch/src/ofw/ofw_tree.c

@@ -39 +39 @@
 #include <stdlib.h>
 #include <sysinfo/sysinfo.h>
-#include <mem.h>
+#include <memw.h>
 #include <str.h>
 #include <panic.h>