From d94ffac4a584dc7a4f6f2ec567b8caab05ce9253 Mon Sep 17 00:00:00 2001
From: Marvin Borner
Date: Wed, 6 May 2020 19:04:05 +0200
Subject: New build parameters and shared includes
This changes many files but I've just applied some replace commands.. So
- nothing special!
---
src/kernel/lib/stdio/debug.c | 14 +++++++-------
src/kernel/lib/stdio/printf.c | 2 +-
src/kernel/lib/stdio/putch.c | 2 +-
src/kernel/lib/stdio/vprintf.c | 14 +++++++-------
4 files changed, 16 insertions(+), 16 deletions(-)
(limited to 'src/kernel/lib/stdio')
diff --git a/src/kernel/lib/stdio/debug.c b/src/kernel/lib/stdio/debug.c
index 0942d49..a96d73a 100644
--- a/src/kernel/lib/stdio/debug.c
+++ b/src/kernel/lib/stdio/debug.c
@@ -1,19 +1,19 @@
#include <stdarg.h>
#include <stdint.h>
-#include <kernel/lib/string.h>
-#include <kernel/lib/stdlib.h>
-#include <kernel/io/io.h>
-#include <kernel/memory/alloc.h>
+#include <lib/string.h>
+#include <lib/stdlib.h>
+#include <io/io.h>
+#include <memory/alloc.h>
void serial_print(const char *data)
{
- for (size_t i = 0; i < strlen(data); i++)
+ for (u32 i = 0; i < strlen(data); i++)
serial_put(data[i]);
}
void serial_vprintf(const char *fmt, va_list args)
{
- uint8_t readyToFormat = 0;
+ u8 readyToFormat = 0;
char buff = 0;
@@ -31,7 +31,7 @@ void serial_vprintf(const char *fmt, va_list args)
serial_print(str);
readyToFormat = 0;
} else if (buff == 'x') {
- char *p = htoa((uint32_t)va_arg(args, int));
+ char *p = htoa((u32)va_arg(args, int));
serial_print(p);
kfree(p);
readyToFormat = 0;
diff --git a/src/kernel/lib/stdio/printf.c b/src/kernel/lib/stdio/printf.c
index 5c3eb8e..cc65463 100644
--- a/src/kernel/lib/stdio/printf.c
+++ b/src/kernel/lib/stdio/printf.c
@@ -1,5 +1,5 @@
#include <stdarg.h>
-#include <kernel/lib/stdio.h>
+#include <lib/stdio.h>
void printf(const char *fmt, ...)
{
diff --git a/src/kernel/lib/stdio/putch.c b/src/kernel/lib/stdio/putch.c
index f7e0248..2689ac7 100644
--- a/src/kernel/lib/stdio/putch.c
+++ b/src/kernel/lib/stdio/putch.c
@@ -1,4 +1,4 @@
-#include <kernel/graphics/vesa.h>
+#include <graphics/vesa.h>
void putch(char c)
{
diff --git a/src/kernel/lib/stdio/vprintf.c b/src/kernel/lib/stdio/vprintf.c
index 2431a48..15d210a 100644
--- a/src/kernel/lib/stdio/vprintf.c
+++ b/src/kernel/lib/stdio/vprintf.c
@@ -1,19 +1,19 @@
#include <stdarg.h>
#include <stdint.h>
-#include <kernel/lib/stdio.h>
-#include <kernel/lib/string.h>
-#include <kernel/lib/stdlib.h>
-#include <kernel/memory/alloc.h>
+#include <lib/stdio.h>
+#include <lib/string.h>
+#include <lib/stdlib.h>
+#include <memory/alloc.h>
void _puts(const char *data)
{
- for (size_t i = 0; i < strlen(data); i++)
+ for (u32 i = 0; i < strlen(data); i++)
putch(data[i]);
}
void vprintf(const char *fmt, va_list args)
{
- uint8_t readyToFormat = 0;
+ u8 readyToFormat = 0;
char buff = 0;
@@ -31,7 +31,7 @@ void vprintf(const char *fmt, va_list args)
_puts(str);
readyToFormat = 0;
} else if (buff == 'x') {
- char *p = htoa((uint32_t)va_arg(args, int));
+ char *p = htoa((u32)va_arg(args, int));
_puts(p);
kfree(p);
readyToFormat = 0;
--
cgit v1.2.3