Move debugging functions to io folder.

mentos/CMakeLists.txt

@@ -167,6 +167,7 @@ if(USE_BUDDY_SYSTEM)
     src/io/mm_io.c
     src/io/video.c
     src/io/stdio.c
+    src/io/debug.c
     src/io/proc_video.c
     src/io/proc_running.c
     src/io/proc_system.c
@@ -197,7 +198,6 @@ if(USE_BUDDY_SYSTEM)
     src/mem/vmem_map.c
     src/mem/zone_allocator.c
     src/mem/buddysystem.c
-    src/misc/debug.c
     src/elf/elf.c
     src/descriptor_tables/gdt.c
     src/descriptor_tables/gdt.S
@@ -250,6 +250,7 @@ else(USE_BUDDY_SYSTEM)
     src/io/mm_io.c
     src/io/video.c
     src/io/stdio.c
+    src/io/debug.c
     src/io/proc_video.c
     src/io/proc_running.c
     src/io/proc_system.c
@@ -279,7 +280,6 @@ else(USE_BUDDY_SYSTEM)
     src/mem/slab.c
     src/mem/vmem_map.c
     src/mem/zone_allocator.c
-    src/misc/debug.c
     src/elf/elf.c
     src/descriptor_tables/gdt.c
     src/descriptor_tables/gdt.S

mentos/src/boot.c

@@ -55,7 +55,7 @@ static inline void __outportb(uint16_t port, uint8_t data)
 static inline void __debug_putchar(char c)
 {
 #if (defined(DEBUG_STDIO) || defined(DEBUG_LOG))
-    outportb(SERIAL_COM1, c);
+    __outportb(SERIAL_COM1, c);
 #endif
 }
 

mentos/src/descriptor_tables/exception.c

@@ -8,7 +8,7 @@
 #include "descriptor_tables/isr.h"
 #include "descriptor_tables/idt.h"
 #include "stdio.h"
-#include "misc/debug.h"
+#include "io/debug.h"
 
 // Default error messages for exceptions.
 static const char *exception_messages[32] = {

mentos/src/descriptor_tables/gdt.c

@@ -4,7 +4,7 @@
 /// @copyright (c) 2014-2021 This file is distributed under the MIT License.
 /// See LICENSE.md for details.
 
-#include "misc/debug.h"
+#include "io/debug.h"
 #include "descriptor_tables/gdt.h"
 #include "descriptor_tables/tss.h"
 

mentos/src/descriptor_tables/interrupt.c

@@ -11,7 +11,7 @@
 #include "system/printk.h"
 #include "assert.h"
 #include "stdio.h"
-#include "misc/debug.h"
+#include "io/debug.h"
 #include "descriptor_tables/idt.h"
 
 /// @brief Shared interrupt handlers, stored into a double-linked list.

mentos/src/descriptor_tables/tss.c

@@ -7,7 +7,7 @@
 #include "descriptor_tables/tss.h"
 
 #include "string.h"
-#include "misc/debug.h"
+#include "io/debug.h"
 #include "descriptor_tables/gdt.h"
 
 static tss_entry_t kernel_tss;

mentos/src/devices/fpu.c

@@ -6,7 +6,7 @@
 
 #include "devices/fpu.h"
 #include "descriptor_tables/isr.h"
-#include "misc/debug.h"
+#include "io/debug.h"
 #include "string.h"
 #include "assert.h"
 #include "process/scheduler.h"

mentos/src/devices/pci.c

@@ -6,7 +6,7 @@
 ///! @cond Doxygen_Suppress
 
 #include "devices/pci.h"
-#include "misc/debug.h"
+#include "io/debug.h"
 #include "string.h"
 #include "io/port_io.h"
 

mentos/src/drivers/ata.c

@@ -16,7 +16,7 @@
 #include "descriptor_tables/isr.h"
 #include "fs/vfs.h"
 #include "devices/pci.h"
-#include "misc/debug.h"
+#include "io/debug.h"
 #include "mem/kheap.h"
 #include "assert.h"
 #include "string.h"

mentos/src/drivers/keyboard/keyboard.c

@@ -13,7 +13,7 @@
 #include "drivers/keyboard/keymap.h"
 #include "sys/bitops.h"
 #include "io/video.h"
-#include "misc/debug.h"
+#include "io/debug.h"
 #include "ctype.h"
 #include "descriptor_tables/isr.h"
 #include "process/scheduler.h"

mentos/src/elf/elf.c

@@ -14,7 +14,7 @@
 #include "process/process.h"
 #include "string.h"
 #include "stddef.h"
-#include "misc/debug.h"
+#include "io/debug.h"
 #include "stdio.h"
 #include "mem/slab.h"
 #include "fs/vfs.h"

mentos/src/fs/initrd.c

@@ -10,7 +10,7 @@
 #include "system/panic.h"
 #include "fs/vfs.h"
 #include "sys/errno.h"
-#include "misc/debug.h"
+#include "io/debug.h"
 #include "mem/kheap.h"
 #include "fcntl.h"
 #include "sys/bitops.h"

mentos/src/fs/open.c

@@ -11,7 +11,7 @@
 #include "system/syscall.h"
 #include "string.h"
 #include "limits.h"
-#include "misc/debug.h"
+#include "io/debug.h"
 #include "sys/errno.h"
 #include "stdio.h"
 #include "fs/vfs.h"

mentos/src/fs/procfs.c

@@ -11,7 +11,7 @@
 #include "fs/vfs.h"
 #include "string.h"
 #include "sys/errno.h"
-#include "misc/debug.h"
+#include "io/debug.h"
 #include "fcntl.h"
 #include "libgen.h"
 #include "assert.h"

mentos/src/fs/stat.c

@@ -4,7 +4,7 @@
 /// @copyright (c) 2014-2021 This file is distributed under the MIT License.
 /// See LICENSE.md for details.
 
-#include "misc/debug.h"
+#include "io/debug.h"
 #include "sys/errno.h"
 #include "fs/vfs.h"
 #include "mem/kheap.h"

mentos/src/fs/vfs.c

@@ -15,7 +15,7 @@
 #include "fs/procfs.h"
 #include "assert.h"
 #include "libgen.h"
-#include "misc/debug.h"
+#include "io/debug.h"
 #include "system/panic.h"
 #include "stdio.h"
 

mentos/src/hardware/timer.c

@@ -12,7 +12,7 @@
 #include "io/port_io.h"
 #include "stdint.h"
 #include "mem/kheap.h"
-#include "misc/debug.h"
+#include "io/debug.h"
 #include "process/wait.h"
 #include "drivers/rtc.h"
 #include "descriptor_tables/isr.h"

mentos/src/io/debug.c

@@ -5,7 +5,7 @@
 /// See LICENSE.md for details.
 
 #include "sys/bitops.h"
-#include "misc/debug.h"
+#include "io/debug.h"
 #include "klib/spinlock.h"
 #include "io/port_io.h"
 #include "kernel.h"

mentos/src/io/proc_running.c

@@ -9,7 +9,7 @@
 #include "libgen.h"
 #include "stdio.h"
 #include "sys/errno.h"
-#include "misc/debug.h"
+#include "io/debug.h"
 #include "process/prio.h"
 
 /// @brief Returns the character identifying the process state.

mentos/src/io/proc_system.c

@@ -10,7 +10,7 @@
 #include "string.h"
 #include "stdio.h"
 #include "sys/errno.h"
-#include "misc/debug.h"
+#include "io/debug.h"
 #include "hardware/timer.h"
 
 static ssize_t procs_do_uptime(char *buffer, size_t bufsize);

mentos/src/io/proc_video.c

@@ -8,7 +8,7 @@
 #include "bits/ioctls.h"
 #include "sys/bitops.h"
 #include "io/video.h"
-#include "misc/debug.h"
+#include "io/debug.h"
 #include "sys/errno.h"
 #include "fcntl.h"
 #include "fs/vfs.h"

mentos/src/io/vga/vga.c

@@ -7,7 +7,7 @@
 #include "io/port_io.h"
 #include "stdbool.h"
 #include "string.h"
-#include "misc/debug.h"
+#include "io/debug.h"
 #include "math.h"
 
 #define COUNT_OF(x) ((sizeof(x) / sizeof(0 [x])) / ((size_t)(!(sizeof(x) % sizeof(0 [x])))))

mentos/src/kernel.c

@@ -17,7 +17,7 @@
 #include "version.h"
 #include "io/video.h"
 #include "hardware/pic8259.h"
-#include "misc/debug.h"
+#include "io/debug.h"
 #include "drivers/fdc.h"
 #include "fs/initrd.h"
 #include "klib/irqflags.h"

mentos/src/klib/mutex.c

@@ -5,7 +5,7 @@
 /// See LICENSE.md for details.
 
 #include "klib/mutex.h"
-#include "misc/debug.h"
+#include "io/debug.h"
 
 void mutex_lock(mutex_t *mutex, uint32_t owner)
 {

mentos/src/klib/ndtree.c

@@ -4,7 +4,7 @@
 /// @copyright (c) 2014-2021 This file is distributed under the MIT License.
 /// See LICENSE.md for details.
 
-#include "misc/debug.h"
+#include "io/debug.h"
 #include "klib/ndtree.h"
 #include "assert.h"
 #include "klib/list_head.h"

mentos/src/klib/rbtree.c

@@ -7,7 +7,7 @@
 #include "klib/rbtree.h"
 
 #include "assert.h"
-#include "misc/debug.h"
+#include "io/debug.h"
 #include "mem/slab.h"
 
 /// @brief Stores information of a node.

mentos/src/klib/time.c

@@ -4,7 +4,7 @@
 /// @copyright (c) 2014-2021 This file is distributed under the MIT License.
 /// See LICENSE.md for details.
 
-#include "misc/debug.h"
+#include "io/debug.h"
 #include "time.h"
 #include "stdio.h"
 #include "stddef.h"

mentos/src/klib/vscanf.c

@@ -7,7 +7,7 @@
 #include "fs/vfs.h"
 #include "ctype.h"
 #include "string.h"
-#include "misc/debug.h"
+#include "io/debug.h"
 #include "stdio.h"
 
 static int vsscanf(const char *buf, const char *s, va_list ap)

mentos/src/mem/buddysystem.c

@@ -11,7 +11,7 @@
 #include "mem/buddysystem.h"
 #include "mem/paging.h"
 #include "assert.h"
-#include "misc/debug.h"
+#include "io/debug.h"
 #include "system/panic.h"
 
 /// @brief Cache level low limit after which allocation starts.

mentos/src/mem/kheap.c

@@ -9,7 +9,7 @@
 
 #include "mem/kheap.h"
 #include "math.h"
-#include "misc/debug.h"
+#include "io/debug.h"
 #include "string.h"
 #include "mem/paging.h"
 #include "assert.h"

mentos/src/mem/paging.c

@@ -12,7 +12,7 @@
 #include "mem/vmem_map.h"
 #include "mem/zone_allocator.h"
 #include "mem/kheap.h"
-#include "misc/debug.h"
+#include "io/debug.h"
 #include "assert.h"
 #include "string.h"
 #include "system/panic.h"

mentos/src/mem/slab.c

@@ -10,7 +10,7 @@
 #include "mem/zone_allocator.h"
 #include "mem/paging.h"
 #include "assert.h"
-#include "misc/debug.h"
+#include "io/debug.h"
 #include "mem/slab.h"
 
 /// @brief Use it to manage cached pages.

mentos/src/mem/zone_allocator.c

@@ -14,7 +14,7 @@
 #include "assert.h"
 #include "mem/paging.h"
 #include "string.h"
-#include "misc/debug.h"
+#include "io/debug.h"
 
 /// TODO: Comment.
 #define MIN_PAGE_ALIGN(addr) ((addr) & (~(PAGE_SIZE - 1)))

mentos/src/multiboot.c

@@ -11,7 +11,7 @@
 #include "kernel.h"
 #include "sys/bitops.h"
 #include "stddef.h"
-#include "misc/debug.h"
+#include "io/debug.h"
 #include "system/panic.h"
 #include "stddef.h"
 

mentos/src/process/process.c

@@ -20,7 +20,7 @@
 #include "sys/errno.h"
 #include "fcntl.h"
 #include "system/panic.h"
-#include "misc/debug.h"
+#include "io/debug.h"
 #include "process/wait.h"
 #include "process/prio.h"
 #include "fs/vfs.h"

mentos/src/process/scheduler.c

@@ -17,7 +17,7 @@
 #include "process/wait.h"
 #include "mem/kheap.h"
 #include "system/panic.h"
-#include "misc/debug.h"
+#include "io/debug.h"
 #include "time.h"
 #include "sys/errno.h"
 #include "klib/list_head.h"

mentos/src/process/scheduler_algorithm.c

@@ -6,7 +6,7 @@
 
 #include "hardware/timer.h"
 #include "process/prio.h"
-#include "misc/debug.h"
+#include "io/debug.h"
 #include "assert.h"
 #include "klib/list_head.h"
 #include "process/wait.h"

mentos/src/sys/module.c

@@ -8,7 +8,7 @@
 #include "sys/module.h"
 #include "string.h"
 #include "sys/bitops.h"
-#include "misc/debug.h"
+#include "io/debug.h"
 
 /// Defined in kernel.ld, points at the end of kernel's data segment.
 extern void *_kernel_end;

mentos/src/sys/utsname.c

@@ -7,7 +7,7 @@
 #include "string.h"
 #include "sys/utsname.h"
 #include "version.h"
-#include "misc/debug.h"
+#include "io/debug.h"
 #include "sys/errno.h"
 #include "fcntl.h"
 #include "fs/vfs.h"

mentos/src/system/panic.c

@@ -5,7 +5,7 @@
 /// See LICENSE.md for details.
 
 #include "system/panic.h"
-#include "misc/debug.h"
+#include "io/debug.h"
 
 void kernel_panic(const char *msg)
 {

mentos/src/system/signal.c

@@ -13,7 +13,7 @@
 #include "process/process.h"
 #include "sys/errno.h"
 #include "assert.h"
-#include "misc/debug.h"
+#include "io/debug.h"
 #include "string.h"
 #include "klib/irqflags.h"