diff options
| author | Raghuram Subramani <raghus2247@gmail.com> | 2025-12-06 20:14:28 -0500 |
|---|---|---|
| committer | Raghuram Subramani <raghus2247@gmail.com> | 2025-12-06 20:14:28 -0500 |
| commit | 2cf843ae6de1f35e5a5d3a947d0179337e82752f (patch) | |
| tree | 7e7983be37568fb0f9cbd806de94573a61df83ca /kernel/boot | |
| parent | 096d9ab61281062b6672c6c9f413de97e034d3f7 (diff) | |
I know; it's POINTLESS! However, I do enjoy programming in C more than
C++ so I ended up spending the hour it takes converting this project
from C++ to C.
Diffstat (limited to 'kernel/boot')
| -rw-r--r-- | kernel/boot/gdt/gdt.c (renamed from kernel/boot/gdt/gdt.cc) | 11 | ||||
| -rw-r--r-- | kernel/boot/interrupts/exceptions.c (renamed from kernel/boot/interrupts/exceptions.cc) | 5 | ||||
| -rw-r--r-- | kernel/boot/interrupts/idt.c (renamed from kernel/boot/interrupts/idt.cc) | 13 | ||||
| -rw-r--r-- | kernel/boot/interrupts/interrupts.c (renamed from kernel/boot/interrupts/interrupts.cc) | 15 |
4 files changed, 12 insertions, 32 deletions
diff --git a/kernel/boot/gdt/gdt.cc b/kernel/boot/gdt/gdt.c index bf53566..3728b32 100644 --- a/kernel/boot/gdt/gdt.cc +++ b/kernel/boot/gdt/gdt.c @@ -18,10 +18,7 @@ #include <boot/gdt.h> -namespace GDT -{ - -entry_t l_entries[] = { +static gdt_entry_t l_entries[] = { /* NULL Descriptor */ GDT_ENTRY(0, 0, 0, 0), @@ -41,12 +38,10 @@ entry_t l_entries[] = { /* TODO: LDT? */ }; -descriptor_t descriptor = { sizeof(l_entries) - 1, l_entries }; +static gdt_descriptor_t descriptor = { sizeof(l_entries) - 1, l_entries }; void -load(void) +gdt_load(void) { _GDT_flush(&descriptor); } - -} diff --git a/kernel/boot/interrupts/exceptions.cc b/kernel/boot/interrupts/exceptions.c index 964d025..fadd3b0 100644 --- a/kernel/boot/interrupts/exceptions.cc +++ b/kernel/boot/interrupts/exceptions.c @@ -22,9 +22,6 @@ #include <libk/stdio.h> #include <stdbool.h> -namespace Interrupts -{ - void exception_handler(int irq_number) { @@ -34,5 +31,3 @@ exception_handler(int irq_number) while (true) __asm__ volatile("cli; hlt"); } - -} diff --git a/kernel/boot/interrupts/idt.cc b/kernel/boot/interrupts/idt.c index 1b42853..dadb7c1 100644 --- a/kernel/boot/interrupts/idt.cc +++ b/kernel/boot/interrupts/idt.c @@ -22,13 +22,10 @@ #include <kernel/io.h> #include <libk/stdio.h> -namespace Interrupts -{ - -extern "C" void *isr_stub_table[]; +extern void *isr_stub_table[]; -entry_t l_entries[256]; -descriptor_t descriptor = { sizeof(l_entries) - 1, l_entries }; +static entry_t l_entries[256]; +static descriptor_t descriptor = { sizeof(l_entries) - 1, l_entries }; static bool l_idt_loaded = false; bool @@ -38,7 +35,7 @@ idt_loaded(void) } void -load_idt(void) +idt_load(void) { for (uint16_t i = 0; i < 256; i++) l_entries[i] = (entry_t) { 0 }; @@ -53,5 +50,3 @@ load_idt(void) l_idt_loaded = true; } - -} diff --git a/kernel/boot/interrupts/interrupts.cc b/kernel/boot/interrupts/interrupts.c index b3f13a2..e15cbdc 100644 --- a/kernel/boot/interrupts/interrupts.cc +++ b/kernel/boot/interrupts/interrupts.c @@ -22,21 +22,18 @@ #include <kernel/io.h> #include <libk/stdio.h> -namespace Interrupts -{ - void -initialize() +interrupts_initialize(void) { - load_idt(); + idt_load(); printk("\ninterrupts", "IDT Loaded."); - enable(); + interrupts_enable(); printk("interrupts", "Initialized."); } void -enable(void) +interrupts_enable(void) { if (!idt_loaded()) { printk("interrupts", "Attempt to enable before IDT load."); @@ -48,10 +45,8 @@ enable(void) } void -disable(void) +interrupts_disable(void) { __asm__ volatile("cli"); // printk("\ninterrupts", "Disabled."); } - -} |
