From 14b109ea24dc5cb1db948de57a2a44c80ef4622e Mon Sep 17 00:00:00 2001 From: Brett Weiland Date: Wed, 24 Mar 2021 15:36:54 -0500 Subject: modified: README.md modified: compiler/create_crosscompiler.sh deleted: notes modified: src/.gdb_history deleted: src/amd64_vol2.pdf modified: src/bootloader/bios_functions/bios_disk.asm modified: src/bootloader/bios_functions/print.asm modified: src/bootloader/bootloader.asm modified: src/bootloader/cpu_check.asm modified: src/bootloader/enter_kernel.asm deleted: src/bootloader/enter_kernel_backup modified: src/bootloader/gdt.asm deleted: src/bootloader/multicore.asm deleted: src/bootloader/notes new file: src/debug/gdbinit.gdb deleted: src/indigo_os modified: src/kernel/include/libc.h modified: src/kernel/include/paging.h modified: src/kernel/include/video.h modified: src/kernel/kernel.c modified: src/kernel/libs/acpi.c modified: src/kernel/libs/drivers/serial.c modified: src/kernel/libs/drivers/video.c modified: src/kernel/libs/libc.c modified: src/kernel/libs/page.c modified: src/link.ld modified: src/makefile new file: tools/README.md modified: tools/page/page.py --- src/kernel/kernel.c | 22 +++++++--------------- 1 file changed, 7 insertions(+), 15 deletions(-) (limited to 'src/kernel/kernel.c') diff --git a/src/kernel/kernel.c b/src/kernel/kernel.c index 8db2e50..d7fc3e0 100644 --- a/src/kernel/kernel.c +++ b/src/kernel/kernel.c @@ -15,28 +15,20 @@ void main() { if(!(init_serial(COM1))) { printf("\nKernal started on CPU 1!\n"); // will detect cpu later } - + rsdp_t *rsdp; - struct memory_table *table = (struct memory_table *)&_meminfo_loc; - struct vbe_infoblock *vbe_info = (struct vbe_infoblock *)0x500; - debug_print_memory(); - rsdp = find_RSDP(); if(!(rsdp)) { - printf("Couldn't find the RSDP... uhh, not sure what to do now.\n"); + printf("Couldn't find the RSDP... not sure what to do now.\n"); panic(); } + + dump_video(); - - if(rsdp->v1.version) { - map_page(0x200000, (rsdp->v2.xsdt_addr / 0x1000) * 0x1000, PAGE_SIZE_4K); - } - else { - map_page(0x200000, (rsdp->v1.rsdt_addr / 0x1000) * 0x1000, PAGE_SIZE_4K); - struct acpi_header *acpi = (struct acpi_header *)((uint64_t)0x200000 + (rsdp->v1.rsdt_addr % 0x1000)); - } + debug_print_memory(); + + init_memory(); - printf("kernel is done, you can ignore this panic\n"); panic(); } -- cgit v1.2.3