From 9032052e236a65ff4d14182265c7449543033e83 Mon Sep 17 00:00:00 2001 From: Tom-on64 Date: Fri, 26 Apr 2024 12:11:44 +0200 Subject: [PATCH] Minor changes --- src/calc.c | 4 ++-- src/kernel.c | 2 -- src/kernel.ld | 1 - 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/src/calc.c b/src/calc.c index 144334d..1b29286 100644 --- a/src/calc.c +++ b/src/calc.c @@ -3,9 +3,9 @@ __attribute__ ((section ("entry"))) void main() { - uint32_t wait = 0xffffffff; + uint32_t wait = 0x1fffffff; - putc('a'); + print("kern.\n\n"); while (wait--); diff --git a/src/kernel.c b/src/kernel.c index 2de06de..cd459c7 100644 --- a/src/kernel.c +++ b/src/kernel.c @@ -19,7 +19,6 @@ uint32_t memmapAddr = 0x30000; void printFiletable(char* ft); void printPhysicalMemmap(); -__attribute__ ((section ("entry"))) // Make sure that main() is at the start of kernel.bin void main() { // Interrupts setupIdt(); @@ -50,7 +49,6 @@ void main() { // Screen setup // TODO: Find font in filetable diskRead(36, 4, (char*)0x6000); // Read font from disk - // loadFont((char*)0x6000); clear(); print("kern.\n\n"); diff --git a/src/kernel.ld b/src/kernel.ld index 0a4ca21..b95856d 100644 --- a/src/kernel.ld +++ b/src/kernel.ld @@ -1,6 +1,5 @@ SECTIONS { .text 0x1000 : { - *(entry); *(.text*); } .data : {