diff --git a/src/kernel/main.c b/src/kernel/main.c index 7a9ba36..0f80db7 100644 --- a/src/kernel/main.c +++ b/src/kernel/main.c @@ -19,15 +19,14 @@ #include #include #include -#include "../libs/version.h" -#include "../libs/boot/bootparams.h" +#include extern uint8_t __bss_start; extern uint8_t __end; uint16_t DEBUG_COM_PORT = COM1_PORT; -void __attribute__((section(".entry"))) start(BootParams* bootParams) { +void __attribute__((section(".entry"))) start() { // print logo clrscr(); @@ -62,16 +61,6 @@ void __attribute__((section(".entry"))) start(BootParams* bootParams) { // Memory_Page_Init(); printf("Done!\n"); - - - // Debug Info for Memory - Serial_Printf(DEBUG_COM_PORT, "MEMORY:> Boot Device: %x\n", bootParams->BootDevice); - Serial_Printf(DEBUG_COM_PORT, "MEMORY:> Region Count: %x\n", bootParams->Memory.RegionCount); - for (int i = 0; i < bootParams->Memory.RegionCount; i++) { - Serial_Printf(DEBUG_COM_PORT, "MEMORY:> start=0x%llx length=0x%llx type=0x%x\n", - bootParams->Memory.Regions[i].Begin, bootParams->Memory.Regions[i].Length, bootParams->Memory.Regions[i].Type); - } - end: for (;;); } diff --git a/src/libs/version.h b/src/kernel/version.h similarity index 60% rename from src/libs/version.h rename to src/kernel/version.h index 89c7b44..c7d891b 100644 --- a/src/libs/version.h +++ b/src/kernel/version.h @@ -6,5 +6,4 @@ #pragma once #define LOGO " _ _____ _ __________________\n / | / / | / | / / _/_ __/ ____/\n / |/ / /| | / |/ // / / / / __/ \n / /| / ___ |/ /| // / / / / /___ \n/_/ |_/_/ |_/_/ |_/___/ /_/ /_____/ \n" -#define VERSION "RD-00036" -#define BOOTLOGO " _ ______ ____ ____ ______\n / | / / __ )/ __ \\/ __ /_ __/\n / |/ / __ / / / / / / // / \n / /| / /_/ / /_/ / /_/ // / \n/_/ |_/_____/\\____/\\____//_/ \n" +#define VERSION "RD-00037" \ No newline at end of file diff --git a/src/libs/boot/bootparams.h b/src/libs/boot/bootparams.h deleted file mode 100644 index 1cfc604..0000000 --- a/src/libs/boot/bootparams.h +++ /dev/null @@ -1,27 +0,0 @@ -/*----------------*\ -|Nanite OS | -|Copyright (C) 2024| -|Tyler McGurrin | -\*----------------*/ -#pragma once - -#include - -typedef struct { - uint64_t Begin, Length; - uint32_t Type; - uint32_t ACPI; -} MemoryRegion; - -typedef struct -{ - int RegionCount; - MemoryRegion* Regions; -} MemoryInfo; - - -typedef struct { - MemoryInfo Memory; - char* KernelParams; - uint8_t BootDevice; -} BootParams;