From 33e53c70b2f28492d1b359fbc8d0f2d8e8638f61 Mon Sep 17 00:00:00 2001 From: rami Date: Tue, 21 May 2024 23:32:44 -0500 Subject: [PATCH] updated compile commands json --- .../clangd/index/kmain.c.9B04FE5F8A3537CE.idx | Bin 2780 -> 1284 bytes compile_commands.json | 2 +- include/ide.h | 2 ++ kmain.c | 4 ++++ multiboot.asm | 1 + vga.c | 2 +- 6 files changed, 9 insertions(+), 2 deletions(-) diff --git a/.cache/clangd/index/kmain.c.9B04FE5F8A3537CE.idx b/.cache/clangd/index/kmain.c.9B04FE5F8A3537CE.idx index ef1136de84f3e4ab093b6ece2cbba76080e0d229..d0e39c97490395a7f17e179c5dc26b88dbec633c 100644 GIT binary patch literal 1284 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 diff --git a/compile_commands.json b/compile_commands.json index bb46126..11ded02 100644 --- a/compile_commands.json +++ b/compile_commands.json @@ -2,6 +2,6 @@ { "directory": "/home/rami/rk", "file": "kmain.c", - "command": "i686-elf-gcc -Wall -Wextra -Werror -ffreestanding -I./ -c kmain.c -o build/kmain.o" + "command": "i686-elf-gcc -Wall -Wextra -Werror -ffreestanding -I./include -c kmain.c -o build/kmain.o" } ] diff --git a/include/ide.h b/include/ide.h index 5d68f4f..926aa0c 100644 --- a/include/ide.h +++ b/include/ide.h @@ -12,4 +12,6 @@ enum IDE_MODE { PCI_CAN_SWITCH_BUS_MASTERING = 0x8f, }; + + #endif diff --git a/kmain.c b/kmain.c index 8015ef3..4c55917 100644 --- a/kmain.c +++ b/kmain.c @@ -84,6 +84,10 @@ void kmain(struct multiboot_info *info) { printf("Found FADT at 0x%x\n", fadt); if (fadt->Flags & 1) printf("Legacy devices are supported.\n"); + else { + printf("Legacy devices are not supported. I'm too lazy to support modern devices, bye bye.\n"); + goto halt; + } pic_remap(PIC_1_START, PIC_2_START); // ACPI version 1.0 is so old that we assume that our PC supports the 8042 ps/2 controller initialize_8042ps2(); diff --git a/multiboot.asm b/multiboot.asm index a1d0275..9eb1e4f 100644 --- a/multiboot.asm +++ b/multiboot.asm @@ -48,6 +48,7 @@ ps2_isr: extern ps2_handler pushad cld + and esp, 0xFFFFFFF0 call ps2_handler popad iret diff --git a/vga.c b/vga.c index a60ddee..a4f65f8 100644 --- a/vga.c +++ b/vga.c @@ -55,7 +55,7 @@ void _putchar(char character) { set_cursor_pos(next_line); } else { video_memory[0] = character; - //video_memory[1] = WHITE_ON_BLACK; + video_memory[1] = WHITE_ON_BLACK; set_cursor_pos(pos + 1); } }