diff --git a/README.md b/README.md index c281e93..ca22175 100644 --- a/README.md +++ b/README.md @@ -14,7 +14,7 @@ ![License](https://img.shields.io/badge/License-GPLv2-orange) -![Version](https://img.shields.io/badge/Current%20Version-v0.0.2%20rc1-blue) +![Version](https://img.shields.io/badge/Current%20Version-v0.0.2%20development1-blue) ![Build](https://img.shields.io/badge/Build-passing-brightgreen) diff --git a/docs/ARCHITECTURE.md b/docs/ARCHITECTURE.md index 781c0df..3d807c6 100644 --- a/docs/ARCHITECTURE.md +++ b/docs/ARCHITECTURE.md @@ -1,4 +1,4 @@ -# The VoidFrame monolithic kernel 💫 v0.0.2-rc1 +# The VoidFrame monolithic kernel 💫 v0.0.2-development1 ## Table of Contents diff --git a/kernel/core/Kernel.c b/kernel/core/Kernel.c index 027abcb..f2807e2 100644 --- a/kernel/core/Kernel.c +++ b/kernel/core/Kernel.c @@ -1,11 +1,10 @@ // VoidFrame Kernel Entry File #include "Kernel.h" -#include "../../drivers/ethernet/realtek/RTL8139.h" +#include "realtek/RTL8139.h" #include "Compositor.h" #include "Console.h" #include "EXT/Ext2.h" #include "FAT/FAT1x.h" -#include "Format.h" #include "Gdt.h" #include "ISA.h" #include "Ide.h" @@ -786,7 +785,7 @@ asmlinkage void KernelMain(const uint32_t magic, const uint32_t info) { console.buffer = (volatile uint16_t*)VGA_BUFFER_ADDR; ClearScreen(); - PrintKernelSuccess("System: VoidFrame Kernel - Version 0.0.2-rc1 loaded\n"); + PrintKernelSuccess("System: VoidFrame Kernel - Version 0.0.2-development1 loaded\n"); PrintKernel("Magic: "); PrintKernelHex(magic); PrintKernel(", Info: "); diff --git a/kernel/etc/Console.h b/kernel/etc/Console.h index 7c399f4..589745b 100644 --- a/kernel/etc/Console.h +++ b/kernel/etc/Console.h @@ -28,8 +28,8 @@ #define VGA_COLOR_ERROR VGA_COLOR_LIGHT_RED #define VGA_COLOR_WARNING VGA_COLOR_LIGHT_YELLOW -#define STATUS_LABEL_ROW 29 -#define STATUS_LABEL_COL 31 // future use +#define STATUS_LABEL_ROW 50 +#define STATUS_LABEL_COL 0 // future use #include "stdint.h" // Console state diff --git a/kernel/etc/Shell.c b/kernel/etc/Shell.c index f9bd95b..319ee39 100644 --- a/kernel/etc/Shell.c +++ b/kernel/etc/Shell.c @@ -147,9 +147,9 @@ static void ARPTestHandler(const char * args) { static void VersionHandler(const char * args) { (void)args; - PrintKernelSuccess("VoidFrame v0.0.2-rc1\n"); + PrintKernelSuccess("VoidFrame v0.0.2-development1\n"); PrintKernelF("Built on %s at %s\n", DATE, TIME); - PrintKernelSuccess("VoidFrame Shell v0.0.2-rc1\n"); + PrintKernelSuccess("VoidFrame Shell v0.0.2-development1\n"); } typedef struct { @@ -1214,7 +1214,7 @@ void ShellInit(void) { } void ShellProcess(void) { - PrintKernelSuccess("System: VoidFrame Shell v0.0.2-rc1 ('help' for list of commands)\n"); + PrintKernelSuccess("System: VoidFrame Shell v0.0.2-development1 ('help' for list of commands)\n"); while (1) { if (HasInput()) { const char c = GetChar(); diff --git a/kernel/etc/objects/panic.o b/kernel/etc/objects/panic.o index 80c5b5d..bbf9f2e 100644 Binary files a/kernel/etc/objects/panic.o and b/kernel/etc/objects/panic.o differ diff --git a/kernel/etc/objects/splash1.o b/kernel/etc/objects/splash1.o index 45daf88..283b445 100644 Binary files a/kernel/etc/objects/splash1.o and b/kernel/etc/objects/splash1.o differ diff --git a/meson.build b/meson.build index 2942dda..7ac2e1e 100644 --- a/meson.build +++ b/meson.build @@ -1,5 +1,5 @@ project('voidframe', 'c', - version : '0.0.2-rc1', + version : '0.0.2-development1', default_options : [ 'c_std=c11', 'optimization=2',