From bacba9abf109bb09d5a95b12a10eef418392fffc Mon Sep 17 00:00:00 2001 From: Ruslan Isaev Date: Sat, 15 Mar 2025 00:02:33 +0300 Subject: [PATCH] cleanup --- include/idt.h | 2 -- include/utils.h | 2 +- src/boot.asm | 2 +- src/idt.c | 16 ---------------- src/kernel.c | 11 ----------- src/screen.c | 7 +------ 6 files changed, 3 insertions(+), 37 deletions(-) diff --git a/include/idt.h b/include/idt.h index fe563e3..7e5ca5b 100644 --- a/include/idt.h +++ b/include/idt.h @@ -21,8 +21,6 @@ typedef struct { static idtr_t idtr; -//void idt_init(void); -//void idt_set_descriptor(uint8_t vector, void* isr, uint8_t flags); void idt_set_descriptor(uint8 vector, uint32 isr, uint8_t flags); void idt_set(); diff --git a/include/utils.h b/include/utils.h index 7a6cce3..e0fab71 100644 --- a/include/utils.h +++ b/include/utils.h @@ -3,7 +3,7 @@ #include "../include/types.h" uint8 inportb(uint16 _port); -void outportb(uint16 _port, uint8 _data); +void outportb(uint16 _port, uint8 _data); #endif diff --git a/src/boot.asm b/src/boot.asm index 12f3ae0..a16f266 100644 --- a/src/boot.asm +++ b/src/boot.asm @@ -5,7 +5,7 @@ section .text dd 0x1BADB002 dd 0x00 dd - (0x1BADB002+0x00) - + global start extern kmain ; this function is gonna be located in our c code(kernel.c) diff --git a/src/idt.c b/src/idt.c index 67e3810..2211b2e 100644 --- a/src/idt.c +++ b/src/idt.c @@ -1,26 +1,11 @@ #include "../include/idt.h" #include -//IDT_MAX_DESCRIPTORS = 256 static bool vectors[sizeof(idt)]; extern void* isr_stub_table[]; #define KERNEL_CS 0x08 - -/*void idt_init() { - idtr.base = (uintptr_t)&idt[0]; - idtr.limit = (uint16_t)sizeof(idt_entry_t) * sizeof(idt) - 1; - - for (uint8_t vector = 0; vector < 32; vector++) { - idt_set_descriptor(vector, isr_stub_table[vector], 0x8E); - vectors[vector] = true; - } - - __asm__ volatile ("lidt %0" : : "m"(idtr)); // load the new IDT - __asm__ volatile ("sti"); // set the interrupt flag -}*/ - void idt_set() { idtr.base = (uint32) &idt; idtr.limit = sizeof(idt) * sizeof(idt_entry_t) - 1; @@ -28,7 +13,6 @@ void idt_set() { } -//void idt_set_descriptor(uint8_t vector, void* isr, uint8_t flags) void idt_set_descriptor(uint8_t vector, uint32 isr, uint8_t flags) { idt_entry_t* descriptor = &idt[vector]; diff --git a/src/kernel.c b/src/kernel.c index 9bc25c6..31b635b 100644 --- a/src/kernel.c +++ b/src/kernel.c @@ -4,17 +4,6 @@ #include "../include/stdio.h" #include "../include/utils.h" -/* Check if the compiler thinks you are targeting the wrong operating system. */ -/*#if defined(__linux__) -#error "You are not using a cross-compiler, you will most certainly run into trouble" -#endif -*/ -/* This tutorial will only work for the 32-bit ix86 targets. */ -/*#if !defined(__i386__) -#error "This tutorial needs to be compiled with a ix86-elf compiler" -#endif -*/ - void kmain() { terminal_initialize(); diff --git a/src/screen.c b/src/screen.c index 9184df4..f6e05bf 100644 --- a/src/screen.c +++ b/src/screen.c @@ -44,11 +44,6 @@ void terminal_putentryat(char c, uint8_t color, size_t x, size_t y) void terminal_putchar(char c) { - /*if(c == '\n') - { - terminal_column = 0; - terminal_row++; - }*/ if(c != '\n') terminal_putentryat(c, terminal_color, terminal_column, terminal_row); @@ -61,7 +56,7 @@ void terminal_putchar(char c) if(terminal_row >= VGA_HEIGHT){ terminal_row = 0; } - + if(c == '\n') { terminal_column = 0;