Sinipelto/banan-os
1
0
Fork 0
forked from Bananymous/banan-os
Code Pull Requests Activity

Fixes :)

Browse Source
This commit is contained in:
Bananymous
2022-11-15 21:42:14 +02:00
parent 35e21ca4ce
commit 123382eace
13 changed files with 299 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
kernel/kernel/kernel.cpp
View File

@@ -1,60 +1,43 @@
#include <kernel/GDT.h>
#include <kernel/kmalloc.h>
#include <kernel/multiboot.h>
#include <kernel/panic.h>
#include <kernel/tty.h>
#include <kernel/kprint.h>
#include <stdio.h>
#include <string.h>
#include <stdlib.h>
#define DISABLE_INTERRUPTS() asm volatile("cli")
#define ENABLE_INTERRUPTS() asm volatile("sti")
// https://www.gnu.org/software/grub/manual/multiboot/multiboot.html#Boot-information-format
struct multiboot_info_t
{
uint32_t flags;
uint32_t mem_lower;
uint32_t mem_upper;
uint32_t boot_device;
uint32_t cmdline;
uint32_t mods_count;
uint32_t mods_addr;
uint32_t syms[4];
uint32_t mmap_length;
uint32_t mmap_addr;
uint32_t drives_length;
uint32_t drives_addr;
uint32_t config_table;
uint32_t boot_loader_name;
uint32_t apm_table;
uint32_t vbe_control_info;
uint32_t vbe_mode_info;
uint16_t vbe_mode;
uint16_t vbe_interface_seg;
uint16_t vbe_interface_off;
uint16_t vbe_interface_len;
uint8_t framebuffer[22];
#if 1
uint8_t color_info[6];
#endif
} __attribute__((packed));
multiboot_info_t* s_multiboot_info;
extern "C"
void kernel_main(multiboot_info_t* mbi, uint32_t magic)
{
DISABLE_INTERRUPTS();
s_multiboot_info = mbi;
terminal_initialize();
if (magic != 0x2BADB002)
Kernel::panic("Invalid magic in multiboot");
if (mbi->flags & 0b00100000)
if (!(mbi->flags & (1 << 6)))
Kernel::panic("Bootloader did not provide memory map");
for (uint32_t i = 0; i < mbi->mmap_length;)
{
printf("mmap_length: %d\n", mbi->mmap_length);
printf("mmap_addr: %p\n", mbi->mmap_addr);
multiboot_memory_map_t* mmmt = (multiboot_memory_map_t*)(mbi->mmap_addr + i);
if (mmmt->type == 1)
kprint("Size: {}, Addr: {}, Length: {}, Type: {}\n", mmmt->size, (void*)mmmt->base_addr, (void*)mmmt->length, mmmt->type);
i += mmmt->size + sizeof(uint32_t);
}
printf("Hello from the kernel!\n");
kprint("Hello from the kernel!\n");
}