Skip to content

Development #118

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 7, 2025
Merged

Development #118

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
2 changes: 1 addition & 1 deletion docs/ARCHITECTURE.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# The VoidFrame monolithic kernel 💫 v0.0.2-rc1
# The VoidFrame monolithic kernel 💫 v0.0.2-development1

## Table of Contents

Expand Down
5 changes: 2 additions & 3 deletions kernel/core/Kernel.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
Expand Down Expand Up @@ -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: ");
Expand Down
4 changes: 2 additions & 2 deletions kernel/etc/Console.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions kernel/etc/Shell.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -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();
Expand Down
Binary file modified kernel/etc/objects/panic.o
View file
Open in desktop
Binary file not shown.
Binary file modified kernel/etc/objects/splash1.o
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion meson.build
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
project('voidframe', 'c',
version : '0.0.2-rc1',
version : '0.0.2-development1',
default_options : [
'c_std=c11',
'optimization=2',
Expand Down