diff --git a/src/kernel/multiboot.asm b/src/kernel/arch/i686/multiboot.asm similarity index 95% rename from src/kernel/multiboot.asm rename to src/kernel/arch/i686/multiboot.asm index c42b256..a614a3f 100644 --- a/src/kernel/multiboot.asm +++ b/src/kernel/arch/i686/multiboot.asm @@ -1,6 +1,6 @@ ;/////////////////////; ;Nanite OS ; -;COPYRIGHT (C) 2024 ; +;COPYRIGHT (C) 2025 ; ;Tyler McGurrin ; ;/////////////////////; [bits 32] diff --git a/src/kernel/main.c b/src/kernel/main.c index 0f80db7..5b5ecbd 100644 --- a/src/kernel/main.c +++ b/src/kernel/main.c @@ -26,8 +26,11 @@ extern uint8_t __end; uint16_t DEBUG_COM_PORT = COM1_PORT; -void __attribute__((section(".entry"))) start() { +void __attribute__((section(".entry"))) start(uint64_t multiboot_magic, void *multiboot_data) { + // multiboot 2 shit + // int padded_size = tag->size + ((tag->size % 8)?(8-(tag->size%8)):0); + // tag = incptr(tag, padded_size); // print logo clrscr(); printf("%s", LOGO); @@ -60,6 +63,7 @@ void __attribute__((section(".entry"))) start() { printf("Initializing Memory Paging..."); // Memory_Page_Init(); printf("Done!\n"); + printf("Multiboot Magic: %d\n", multiboot_magic); end: for (;;); diff --git a/src/kernel/util/util.h b/src/kernel/util/util.h index fad2799..cef5dac 100644 --- a/src/kernel/util/util.h +++ b/src/kernel/util/util.h @@ -3,6 +3,10 @@ |Copyright (C) 2025| |Tyler McGurrin | \*----------------*/ +#pragma once + +#define incptr(p, n) ((void *)(((uintptr_t)(p)) + (n))) + int string_length(char s[]); void append(char s[], char n); void Print_Storage_Types(int masterFDDType, int slaveFDDType); \ No newline at end of file diff --git a/src/kernel/version.h b/src/kernel/version.h index d01e3bc..b8e0ae1 100644 --- a/src/kernel/version.h +++ b/src/kernel/version.h @@ -6,4 +6,4 @@ #pragma once #define LOGO " _ _____ _ __________________\n / | / / | / | / / _/_ __/ ____/\n / |/ / /| | / |/ // / / / / __/ \n / /| / ___ |/ /| // / / / / /___ \n/_/ |_/_/ |_/_/ |_/___/ /_/ /_____/ \n" -#define VERSION "RD-00041" \ No newline at end of file +#define VERSION "RD-00042" \ No newline at end of file