Nigel/BarinkOS
1
0
Fork 0
Code Issues 1 Pull Requests 2 Releases Activity

Cleanup of PCI API

Browse Source
This commit is contained in:
Nigel Barink
2023-02-17 14:42:42 +01:00
parent c9a036bfbb
commit 4ce7cc093b
4 changed files with 180 additions and 261 deletions
Download Patch File Download Diff File Expand all files Collapse all files

71
source/kernel/kernel.cpp
View File

@ -1,22 +1,16 @@
extern "C"
{
#include "../lib/include/string.h"
/*
Copyright © Nigel Barink 2023
*/
extern "C"{
#include "../lib/include/string.h"
}
#include "prekernel/bootstructure.h"
#include "memory/memory.h"
#include "memory/memoryinfo.h"
#include "memory/memory.h"
#include "memory/VirtualMemoryManager.h"
#include "memory/KernelHeap.h"
#include "memory/gdt/gdtc.h"
#include "memory/TaskStateSegment.h"
#include "supervisorterminal/superVisorTerminal.h"
#include "drivers/io/io.h"
#include "drivers/vga/VBE.h"
#include "drivers/pci/pci.h"
#include "drivers/pit/pit.h"
@ -24,59 +18,50 @@ extern "C"
#include "drivers/ide/ide.h"
#include "terminal/kterm.h"
#include "prekernel/multiboot.h"
#include "bootinfo.h"
#include "bootcheck.h"
#include "interrupts/idt.h"
#include "time.h"
#include "cpu.h"
#include "serial.h"
#include "time.h"
#include "definitions.h"
extern "C" void LoadGlobalDescriptorTable();
/*
Copyright © Nigel Barink 2023
*/
extern "C" void kernel_main ()
void set_protected_bit()
{
/*
* Show a little banner for cuteness
*/
printf("|=== BarinkOS ===|\n");
startSuperVisorTerminal();
}
// Set the protected bit of control register 0
// this will put the CPU into protected mode
// NOTE: This should really be a assembly procedure
// We cant directly write to control register 0
// therefor we copy the value of control register 0 into eax
// once we are done manipulating the value we write the value in
// eax back to control register 0
extern "C" void early_main()
asm volatile("mov %cr0, %eax ");
asm volatile("or $1, %eax");
asm volatile("mov %eax, %cr0");
}
extern "C" void kernel ()
{
init_serial();
kterm_init();
setup_tss();
initGDT();
initidt();
LoadGlobalDescriptorTable();
flush_tss();
printf("Memory setup complete!\n");
// Enable interrupts
asm volatile("STI");
initHeap();
pit_initialise();
ACPI::initialize();
PCI_Enumerate();
PCI::Scan();
TestIDEController();
initHeap();
TestIDEController();
printf("Enable Protected mode and jump to kernel main\n");
// Set the protected bit of control register 0
// this will put the CPU into protected mode
@ -92,6 +77,4 @@ extern "C" void early_main()
pit_initialise();
kernel_main();
}
}