aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRaghuram Subramani <raghus2247@gmail.com>2025-09-16 11:51:33 -0400
committerRaghuram Subramani <raghus2247@gmail.com>2025-09-16 11:51:33 -0400
commit3af3975c523e170fdf2555830b74c6045ea8c314 (patch)
tree416f5c691e5cb080030cb84d873675c43b17dfa8
parentfa7e8e6534451c0e8f755bcb9c7bad1d99de001f (diff)
kernel: boot: interrupts: split interrupt-specific functions into its
own file
-rw-r--r--kernel/CMakeLists.txt1
-rw-r--r--kernel/boot/interrupts/idt.cc28
-rw-r--r--kernel/boot/interrupts/interrupts.cc57
-rw-r--r--kernel/include/boot/interrupts.h5
4 files changed, 62 insertions, 29 deletions
diff --git a/kernel/CMakeLists.txt b/kernel/CMakeLists.txt
index e8d366c..56b783a 100644
--- a/kernel/CMakeLists.txt
+++ b/kernel/CMakeLists.txt
@@ -9,6 +9,7 @@ set(SRC
boot/init/crtn.s
boot/interrupts/exceptions.cc
boot/interrupts/idt.cc
+ boot/interrupts/interrupts.cc
boot/interrupts/isr.s
drivers/serial.cc
drivers/vga_text_buffer.cc
diff --git a/kernel/boot/interrupts/idt.cc b/kernel/boot/interrupts/idt.cc
index 014ef15..1b42853 100644
--- a/kernel/boot/interrupts/idt.cc
+++ b/kernel/boot/interrupts/idt.cc
@@ -38,15 +38,6 @@ idt_loaded(void)
}
void
-initialize()
-{
- load_idt();
- printk("\nInterrupts", "IDT Loaded.");
- enable();
- printk("Interrupts", "Initialized.");
-}
-
-void
load_idt(void)
{
for (uint16_t i = 0; i < 256; i++)
@@ -63,23 +54,4 @@ load_idt(void)
l_idt_loaded = true;
}
-void
-enable(void)
-{
- if (!l_idt_loaded) {
- printk("Interrupts", "Attempt to enable before IDT load.");
- ASSERT_NOT_REACHED();
- }
-
- __asm__ volatile("sti");
- // printk("\ninterrupts", "Enabled.");
-}
-
-void
-disable(void)
-{
- __asm__ volatile("cli");
- // printk("\ninterrupts", "Disabled.");
-}
-
}
diff --git a/kernel/boot/interrupts/interrupts.cc b/kernel/boot/interrupts/interrupts.cc
new file mode 100644
index 0000000..dd96214
--- /dev/null
+++ b/kernel/boot/interrupts/interrupts.cc
@@ -0,0 +1,57 @@
+/*
+ * bubbl
+ * Copyright (C) 2025 Raghuram Subramani <raghus2247@gmail.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <boot/interrupts.h>
+#include <common.h>
+#include <kernel/halt.h>
+#include <kernel/io.h>
+#include <libk/stdio.h>
+
+namespace Interrupts
+{
+
+void
+initialize()
+{
+ load_idt();
+ printk("\nInterrupts", "IDT Loaded.");
+
+ enable();
+ printk("Interrupts", "Initialized.");
+}
+
+void
+enable(void)
+{
+ if (!idt_loaded()) {
+ printk("Interrupts", "Attempt to enable before IDT load.");
+ ASSERT_NOT_REACHED();
+ }
+
+ __asm__ volatile("sti");
+ // printk("\ninterrupts", "Enabled.");
+}
+
+void
+disable(void)
+{
+ __asm__ volatile("cli");
+ // printk("\ninterrupts", "Disabled.");
+}
+
+}
diff --git a/kernel/include/boot/interrupts.h b/kernel/include/boot/interrupts.h
index 5fbe696..2bd4493 100644
--- a/kernel/include/boot/interrupts.h
+++ b/kernel/include/boot/interrupts.h
@@ -58,10 +58,13 @@ typedef struct {
entry_t *ptr; /* Address of IDT */
} PACKED descriptor_t;
+/* Simply loads IDT and enables interrupts */
void initialize(void);
-void load_idt(void);
void enable(void);
void disable(void);
+
+/* IDT */
+void load_idt(void);
bool idt_loaded(void);
extern "C" NORETURN void exception_handler(void);