From 1eb441d2f2755034997a7102d41305a27ee9c7aa Mon Sep 17 00:00:00 2001 From: Amlal El Mahrouss Date: Sat, 14 Mar 2026 08:06:30 +0100 Subject: [FEAT] src/kernel features for BootZ, X11 and GPUBasic driver in WiP. Signed-off-by: Amlal El Mahrouss --- drivers/GPUBasic.drv/GPUBasic.drv.json | 21 +++++++++++++++++++++ drivers/GPUBasic.drv/dist/.keep | 0 drivers/X11.drv/X11.drv.json | 21 +++++++++++++++++++++ drivers/X11.drv/X11.json | 21 --------------------- src/kernel | 2 +- updater/updater.py | 8 ++++---- 6 files changed, 47 insertions(+), 26 deletions(-) create mode 100644 drivers/GPUBasic.drv/GPUBasic.drv.json create mode 100644 drivers/GPUBasic.drv/dist/.keep create mode 100644 drivers/X11.drv/X11.drv.json delete mode 100644 drivers/X11.drv/X11.json diff --git a/drivers/GPUBasic.drv/GPUBasic.drv.json b/drivers/GPUBasic.drv/GPUBasic.drv.json new file mode 100644 index 0000000..49c4fe6 --- /dev/null +++ b/drivers/GPUBasic.drv/GPUBasic.drv.json @@ -0,0 +1,21 @@ +{ + "compiler_path": "x86_64-w64-mingw32-g++", + "compiler_std": "c++20", + "headers_path": ["../", "./", "../src/kernel/src", "../src/kernel/src/kernel"], + "sources_path": ["src/*.cc"], + "output_name": "./dist/gpubasic.ddk.out", + "compiler_flags": [ + "-ffreestanding", + "-shared", + "-fno-rtti", + "-fno-exceptions", + "-Wl,--subsystem=17" + ], + "cpp_macros": [ + "kKTVersion=0x0100", + "kKTVersionHighest=0x0100", + "kKTVersionLowest=0x0100", + "__NE_AMD64__" + ] + } + diff --git a/drivers/GPUBasic.drv/dist/.keep b/drivers/GPUBasic.drv/dist/.keep new file mode 100644 index 0000000..e69de29 diff --git a/drivers/X11.drv/X11.drv.json b/drivers/X11.drv/X11.drv.json new file mode 100644 index 0000000..7bc61c5 --- /dev/null +++ b/drivers/X11.drv/X11.drv.json @@ -0,0 +1,21 @@ +{ + "compiler_path": "x86_64-w64-mingw32-g++", + "compiler_std": "c++20", + "headers_path": ["../", "./", "../src/kernel/src/", "../src/kernel/src/kernel"], + "sources_path": ["src/*.cc"], + "output_name": "./dist/x11.ddk.out", + "compiler_flags": [ + "-ffreestanding", + "-shared", + "-fno-rtti", + "-fno-exceptions", + "-Wl,--subsystem=17" + ], + "cpp_macros": [ + "kKTVersion=0x0100", + "kKTVersionHighest=0x0100", + "kKTVersionLowest=0x0100", + "__NE_AMD64__" + ] + } + diff --git a/drivers/X11.drv/X11.json b/drivers/X11.drv/X11.json deleted file mode 100644 index a53c801..0000000 --- a/drivers/X11.drv/X11.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "compiler_path": "x86_64-w64-mingw32-g++", - "compiler_std": "c++20", - "headers_path": ["../", "./", "../../../src", "../../../src/kernel"], - "sources_path": ["src/*.cc"], - "output_name": "./dist/x11.ddk.out", - "compiler_flags": [ - "-ffreestanding", - "-shared", - "-fno-rtti", - "-fno-exceptions", - "-Wl,--subsystem=17" - ], - "cpp_macros": [ - "kKTVersion=0x0100", - "kKTVersionHighest=0x0100", - "kKTVersionLowest=0x0100", - "__NE_AMD64__" - ] - } - diff --git a/src/kernel b/src/kernel index 999f4e4..bf2892e 160000 --- a/src/kernel +++ b/src/kernel @@ -1 +1 @@ -Subproject commit 999f4e4dc191eb710abfc691043c5a0da9eadeea +Subproject commit bf2892edf4185326c0d47d16106eaead05859f07 diff --git a/updater/updater.py b/updater/updater.py index 0f6f855..f6a19e4 100755 --- a/updater/updater.py +++ b/updater/updater.py @@ -6,10 +6,10 @@ from os import system class UpdateFunctor: def __init__(self): - system("cd libs && cd kernel && git pull && cd ..") - system("cd libs && cd nectar && git pull && cd ..") - system("cd libs && cd build && git pull && cd ..") - system("cd libs && cd boot && git pull && cd ..") + system("cd src && cd kernel && git pull && cd ..") + system("cd src && cd nectar && git pull && cd ..") + system("cd src && cd build && git pull && cd ..") + system("cd src && cd boot && git pull && cd ..") system("cd papers && git pull") system("git add src/kernel src/nectar papers src/build src/boot") system("git commit -s -S") -- cgit v1.2.3