aboutsummaryrefslogtreecommitdiff
path: root/kernel/include
diff options
context:
space:
mode:
authorAlex Auvolat <alex.auvolat@ens.fr>2014-11-30 19:58:32 +0100
committerAlex Auvolat <alex.auvolat@ens.fr>2014-11-30 19:58:32 +0100
commit54e7efbbd0e0c88d99bb6bddb82e9fc8d90eae50 (patch)
tree178f0d423d1708cbddf89c0e4c510a2022fa7eda /kernel/include
parentbee97e0b630976b96798246a3ef4eea8964099cf (diff)
downloadmacroscope-54e7efbbd0e0c88d99bb6bddb82e9fc8d90eae50.tar.gz
macroscope-54e7efbbd0e0c88d99bb6bddb82e9fc8d90eae50.zip
Add debug output and a few elementary stdlib functions.
Diffstat (limited to 'kernel/include')
-rw-r--r--kernel/include/dbglog.h7
-rw-r--r--kernel/include/multiboot.h6
-rw-r--r--kernel/include/printf.h8
-rw-r--r--kernel/include/stdlib.h7
-rw-r--r--kernel/include/sys.h14
5 files changed, 38 insertions, 4 deletions
diff --git a/kernel/include/dbglog.h b/kernel/include/dbglog.h
new file mode 100644
index 0000000..c8904c6
--- /dev/null
+++ b/kernel/include/dbglog.h
@@ -0,0 +1,7 @@
+#pragma once
+
+#include <config.h>
+
+void dbglog_setup();
+void dbg_print(const char* str);
+void dbg_printf(const char* format, ...);
diff --git a/kernel/include/multiboot.h b/kernel/include/multiboot.h
index 908274c..8fd9dee 100644
--- a/kernel/include/multiboot.h
+++ b/kernel/include/multiboot.h
@@ -1,5 +1,5 @@
-#ifndef HDR_MULTIBOOT
-#define HDR_MULTIBOOT
+#pragma once
+
#define MULTIBOOT_HEADER_MAGIC 0x1BADB002
#define MULTIBOOT_BOOTLOADER_MAGIC 0x2BADB002
@@ -60,5 +60,3 @@ struct memory_map_t {
unsigned long type;
};
-#endif
-
diff --git a/kernel/include/printf.h b/kernel/include/printf.h
new file mode 100644
index 0000000..4569827
--- /dev/null
+++ b/kernel/include/printf.h
@@ -0,0 +1,8 @@
+#pragma once
+
+#include <stdlib.h>
+#include <stdarg.h>
+
+int snprintf(char* s, size_t n, const char* format, ...);
+int vsnprintf(char* s, size_t n, const char* format, va_list arg);
+
diff --git a/kernel/include/stdlib.h b/kernel/include/stdlib.h
new file mode 100644
index 0000000..601e7c4
--- /dev/null
+++ b/kernel/include/stdlib.h
@@ -0,0 +1,7 @@
+#pragma once
+
+#include <stddef.h>
+#include <stdint.h>
+
+size_t strlen(const char*);
+
diff --git a/kernel/include/sys.h b/kernel/include/sys.h
new file mode 100644
index 0000000..b76ca26
--- /dev/null
+++ b/kernel/include/sys.h
@@ -0,0 +1,14 @@
+#pragma once
+
+#include <config.h>
+
+void outb(uint16_t port, uint8_t value);
+void outw(uint16_t port, uint16_t value);
+uint8_t inb(uint16_t port);
+uint16_t inw(uint16_t port);
+
+
+#define PANIC(s) panic(s, __FILE__, __LINE__);
+#define ASSERT(s) { if (!(s)) panic_assert(#s, __FILE__, __LINE__); }
+void panic(const char* message, const char* file, int line);
+void panic_assert(const char* assertion, const char* file, int line);