From 5fbf41e967ed8e413ecf1e6abb72e8d285169df4 Mon Sep 17 00:00:00 2001 From: Alexey Gavrilov Date: Fri, 24 May 2024 14:07:47 +0700 Subject: Pic + Tuple + refactor PrimaryInitialization class --- kernel/kernel.c | 28 +++++++--------------------- 1 file changed, 7 insertions(+), 21 deletions(-) (limited to 'kernel/kernel.c') diff --git a/kernel/kernel.c b/kernel/kernel.c index 09152b8..c280755 100644 --- a/kernel/kernel.c +++ b/kernel/kernel.c @@ -1,6 +1,7 @@ + #include "../arch/SecondaryInit.h" -#include "../drivers/acpi/Acpi.h" -#include +#include "../arch/x86/ic/Pic.h" + void empty() {}; @@ -8,26 +9,11 @@ void main() { SecondaryInitialization init; - init.devicesInitialize(); init.processorInitialize(); + init.devicesInitialize(); out::display << "Hello, World!\n"; - Rsdp *rsdp = (Rsdp *)StringOperations::findInMemory(Rsdp::signatureString, - MemArea( - Rsdp::romAreaStart, - Rsdp::romAreaEnd)); - const Rsdt *rsdt = rsdp->getRsdt(); - const Entry *entry = rsdt->getEntry(1); - const Madt *madt = (Madt *)entry; - const Ics *icsEntry[10] = {madt->getIcs(0), - madt->getIcs(1), - madt->getIcs(2), - madt->getIcs(3), - madt->getIcs(4), - madt->getIcs(5), - madt->getIcs(6), - madt->getIcs(7), - madt->getIcs(8)}; - const IoapicStruct *ioapicStruct = (IoapicStruct *)icsEntry[1]; - empty(); + + asm("sti"); + while(true); }; -- cgit v1.2.3