xircon/Nanite
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Move version.h

Browse Source
This commit is contained in:
Tyler McGurrin 2025-06-05 21:11:38 -04:00
parent 2e8023e4e2
commit 7e6b8626c1
3 changed files with 3 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/kernel/main.c
View File

@ -19,15 +19,14 @@
#include <core/memory/page.h> #include <core/memory/page.h>
#include <util/param.h> #include <util/param.h>
#include <util/util.h> #include <util/util.h>
#include "../libs/version.h" #include <version.h>
#include "../libs/boot/bootparams.h"
extern uint8_t __bss_start; extern uint8_t __bss_start;
extern uint8_t __end; extern uint8_t __end;
uint16_t DEBUG_COM_PORT = COM1_PORT; uint16_t DEBUG_COM_PORT = COM1_PORT;
void __attribute__((section(".entry"))) start(BootParams* bootParams) { void __attribute__((section(".entry"))) start() {
// print logo // print logo
clrscr(); clrscr();
@ -62,16 +61,6 @@ void __attribute__((section(".entry"))) start(BootParams* bootParams) {
// Memory_Page_Init(); // Memory_Page_Init();
printf("Done!\n"); 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: end:
for (;;); for (;;);
} }

3
src/libs/version.h → src/kernel/version.h
View File

@ -6,5 +6,4 @@
#pragma once #pragma once
#define LOGO " _ _____ _ __________________\n / | / / | / | / / _/_ __/ ____/\n / |/ / /| | / |/ // / / / / __/ \n / /| / ___ |/ /| // / / / / /___ \n/_/ |_/_/ |_/_/ |_/___/ /_/ /_____/ \n" #define LOGO " _ _____ _ __________________\n / | / / | / | / / _/_ __/ ____/\n / |/ / /| | / |/ // / / / / __/ \n / /| / ___ |/ /| // / / / / /___ \n/_/ |_/_/ |_/_/ |_/___/ /_/ /_____/ \n"
#define VERSION "RD-00036" #define VERSION "RD-00037"
#define BOOTLOGO " _ ______ ____ ____ ______\n / | / / __ )/ __ \\/ __ /_ __/\n / |/ / __ / / / / / / // / \n / /| / /_/ / /_/ / /_/ // / \n/_/ |_/_____/\\____/\\____//_/ \n"

27
src/libs/boot/bootparams.h
View File

@ -1,27 +0,0 @@
/*----------------*\
|Nanite OS |
|Copyright (C) 2024|
|Tyler McGurrin |
\*----------------*/
#pragma once
#include <stdint.h>
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;