summaryrefslogtreecommitdiff
path: root/kernel/include
diff options
context:
space:
mode:
Diffstat (limited to 'kernel/include')
-rw-r--r--kernel/include/comus/drivers/acpi.h21
-rw-r--r--kernel/include/comus/mboot.h15
-rw-r--r--kernel/include/comus/memory.h2
3 files changed, 36 insertions, 2 deletions
diff --git a/kernel/include/comus/drivers/acpi.h b/kernel/include/comus/drivers/acpi.h
new file mode 100644
index 0000000..b28633c
--- /dev/null
+++ b/kernel/include/comus/drivers/acpi.h
@@ -0,0 +1,21 @@
+/**
+ * @file acpi.h
+ *
+ * @author Freya Murphy <freya@freyacat.org>
+ *
+ * ACPI definitions
+ */
+
+/**
+ * Loads the ACPI tables
+ * https://en.wikipedia.org/wiki/ACPI
+ * @param rsdp - pointer to the Root System Description Pointer
+ * usually passed from the bootloader
+ */
+void acpi_init(void *rsdp);
+
+/**
+ * Shutdowns down the system
+ */
+__attribute__((noreturn))
+void acpi_shutdown(void);
diff --git a/kernel/include/comus/mboot.h b/kernel/include/comus/mboot.h
index f89427e..ebd5dad 100644
--- a/kernel/include/comus/mboot.h
+++ b/kernel/include/comus/mboot.h
@@ -11,6 +11,19 @@
#include <comus/memory.h>
-void mboot_load_mmap(volatile void *mboot, struct memory_map *map);
+/**
+ * Load the multiboot information passed from the bootloader
+ */
+void mboot_init(long magic, volatile void *mboot);
+
+/**
+ * Get the memory map from multiboot
+ */
+int mboot_get_mmap(struct memory_map *map);
+
+/**
+ * Get the ACPI rsdp addr from multiboot
+ */
+void *mboot_get_rsdp(void);
#endif /* mboot.h */
diff --git a/kernel/include/comus/memory.h b/kernel/include/comus/memory.h
index 294c795..77d64ff 100644
--- a/kernel/include/comus/memory.h
+++ b/kernel/include/comus/memory.h
@@ -28,7 +28,7 @@ struct memory_map {
/**
* Initalize system memory allocator
*/
-void memory_init(struct memory_map *map);
+void memory_init(void);
/**
* @returns how much memory the system has