From 586b68db872ca2be8ac3242ad7a6359d75c94698 Mon Sep 17 00:00:00 2001 From: Atheria Date: Sun, 7 Sep 2025 16:51:04 +0700 Subject: [PATCH] v0.0.2-development1 --- README.md | 2 +- docs/ARCHITECTURE.md | 2 +- kernel/core/Kernel.c | 5 ++--- kernel/etc/Console.h | 4 ++-- kernel/etc/Shell.c | 6 +++--- kernel/etc/objects/panic.o | Bin 1920592 -> 1920592 bytes kernel/etc/objects/splash1.o | Bin 1920600 -> 1920600 bytes meson.build | 2 +- 8 files changed, 10 insertions(+), 11 deletions(-) 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 80c5b5d683ff437b60b60ff4aef0e88e8202f4f3..bbf9f2e251c5fe4fdcd78caddb060ad9d1e8024c 100644 GIT binary patch delta 2659 zcma)8>q}fm6hG?f>aJO%#>eXQ{X&{pK?Ohf+8F6ZjhZNm@g0+>UwkXRU{wZ5K&VU9 zt48thMWfMZQnS$*Y<(nXq~vq|fzl796ap=zA9{aN@8vdKYYxo4Gjq>~4IUd)?aVm{25`7wWHWC1MjJ0bpC zZD?pH#l^*mvmb>Z^}whP2ne9W#6QgMdYU&$xoz=@@Qbdnq@;wOPhO6#VbS)s&u|&Uw%U0uQ=z zba?3K=!mAKrl_i_im!k7?wwi506P{cN?yEpL1krSl%1VTZ{NNp99l{_vREv&HB(n&au)Dj<$KW9#Wa{kfq>hdbd59=CQ)y`_Kam{^?J6lOETo2p2F@!l zFDEpKfW1^;aAvdFOi4*e)ZgFFrJz~LXx^7UpA`m<&v`OfYcLpicp>j(!ZC-3hXF$( zp`vYXZ_7OXFDNMBjzDZ49v;$z2M?4sFfbtY{wO&DakRL&s4yUeAO*=_Lk8KSCRA_` ztUx_elbVO5kqHi!69jXTfo7_&ujkog$3ngi8>p3_-__N{dH->QSUnV0Cqs0}gMYXdoy- z$POuM#7{p-fWsS)9zEg=d~kPYwOT%w0f!8(LYZ)z!AT(Cv9Pcpvv51}RF`>btj+}d z3=6r^{{tKs5*#KGBL8=tWn^T8S5?0B^wZYXhD_%b88se76m)WOLMXbR^JKQRw&?x) z_bBj6L+$&F;wd~loNqQiKTmM{(9n=l`r%YmXz<{i)YMe5_h;#XMd^TrunxfDF$0nv zfPPC$3q5=Gj4y^_`Mm;skaxIm;E470brJ*tOSp5+aRBi9=Yq9kon0mBh)3Z?5y2xU zIy&06@+iD{B{BUTS779R$x3@z>LxU6w${)X3b)|ep{ArS+cf$DiI2;@t!1VMqoSmJ?sif5z z_#+4%9UV}8Mn^}XP$?~|oGDv%k)53#Ucv2l!`9XojEsyh<3ALzwzdW>EiF9s7mh3#1&{nm zw(8_`PIUW7&CAP6n3S8|gM+ZNv_$3x zy2#W<(}!>(k>I}H?n;~GV%La6vo&b;yJN{O)dhvpaY><;+= diff --git a/kernel/etc/objects/splash1.o b/kernel/etc/objects/splash1.o index 45daf88be8a475686ccd8f724faeb04c6e76cc4f..283b44543ab1e7d1f5295519b564e05dcf50dd47 100644 GIT binary patch delta 2612 zcma)8YfMx}6h5$**TU}daDjyjf`G=h0tt|iR)sBMSD~J zQ@arv9}vZ)0VFDq;)-BsK`^N4Z__`mNt3oeOl;DmP5sf{Z)9#)1J#qv+&Od3oH_H& zIcM&(zP4w5Z5_;y`7;AkSO5!TK`fYsFe3|PVa&wL%)-K11dC)*Yz?!rXcog_nT^G< z_;1wA^W6EPSuv!ir}J8uIpGb?#_LKfiXl5YoBz{d-o#r|!WF}|ZQDHd&kaY89P!wP z2Zz2=L;1@YlTvZ@>Q(CP?WL}+E}EX6rkI!*@+Ch%KYEu=PfrhByLOFEo;*ojua|0S zYCQI|pyJ|UYHe-Rw(Z?+?(jI1c-_|~#gLViSxISXY7%=bd#USbKoMjc zH*VyA4yg%lNZ=$ktgo*ptJSJ2&&-?*s$RZnayUS-Me?wfddDGp21+C($Z3DXlS7L_;`n|jDe4L`aCv>jg6&}k`mg# ze?KKACJI?nQWEv`^@*k#_YMxLzZuIaDk{YJAOqVZTragQ1@Kckj%^eyV zN|Te5n4p4!0vaD5r_|I`u}H#fG#cr_g9o&4-#*IE&!@4mF)Au55;~_(pQgKa?^0b| z9p&Za2^nmGAcJk39aprpv_w~~T%p?9TCx7oqel)s@>lRsH!?9XK~+^%v~%Z9T3lSD zwQJW>WMm|{-EPrxb8}zA%wM*dl%jk0?hz6Qbo=&g3Jwky=L!o86LYego12qE@x|HS z(&4jzn>3WSo0TFsk(QPwG!cxr`>3cW!D|st2p~zvjvW)wLmvlI6h$;-gJy@n`c8u$ z5nEYVsS8t5Qt0Bvi^7J49?=PCCE+Mi26$aAmlP2)VRm*_@Q@)MBpp9~oZ8yjB#S6_ z(B8d!#fet%a780!Wo6Xd+$?0()zyTi5ukrzEXA1}4hQArl&$;s?@N*RI-O1dJVJ3{VS&z^Iit7E&Q5;nd)4*{ z!e(%AP!~W6F$t33LI=s>OIo4k?)Gq-8xwJ$n{I0$!l^(Xm)8 zNEz;G3AcKjVLbo5Mfp&cP#C&(>y`l8Y&MJ9fZzim3$*OuuYS-X9Jg@c!UZ8fhle33 zC`j-UXz1Xjlcc><;&Q+Pn;SQ7ND*o8u1IJpdk6Lo0sbl;3ZwrAJ{}%io<@l9-?fKx z)TA__div7Qqeqd_qVl4cqgaBTK7C3kuAq16OifMElP6C|E9A0q*9R7B#=3Rugz%a$$t)Gyl0iJAb9;0?k&E-p@ZArS|2`0!!6bLWm&48!vO z1ArjE@Qwia(a}*-RaLBi8?05L{q@Vaf_Ez#@eOxWR8$B2)U02>-a9g^2E6`XGH8X9 zfA)u(5QMtE%oK`h@A))#`TG%XZ8jD2jr3ZK;R{Z^ctRv{dM|hwgjDM{KEeVV0SB-^}~od~-V6e>&Tr zL=9@O1O+Tb9qREG8n6t@@ivNRL6_@!z>FgG^`>2zB0KiPWpRz5GIG}e1X;dM<-O>qshw6uUM%doMr!SkXh z!r|c|Xfzt0y9vf@Hgi06c6WDy_A2^F{GC`zoV`ZDRa;vNO-)VU^?Dh=VzEG1R~Ivr z$wYHokI&^&bs`@~Z%PzG3kwUpmCa^@Y&HvtM1mPVP@S2X8F0JZJoOI@seW#>lZ0Cm zNHQb%NkE@UjmkkeE-o(eR@8SoooX3* zmXd@m-?{u#75gatz$k>q$H&27Fu=;n3M+_4qtMgS!;7gy-%z|0*I-C|U9{H4<8j`g zqoV^RCMKBabUMavWMqV&@9gZ5?{7r=6>cXl>5|eJghC+(rE2f(?SWpeXR*WKV7o&D zb>KI~&;d)<_%)r0^oSmIPKA*odlKLoG|Dr@+oXKP$m&?KO@-k5Aizr=? fL`D=y?1${+UO)*~{9f9`XXC3vIMSYr1|8a88+9BE 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',