Merge pull request 'feat: VESA rendering implementation & LVGL for graphics drawing' (#10) from feature/lvgl into develop

Reviewed-on: #10

.gitignore

@@ -11,3 +11,7 @@
 /*.img
 src/include/asuro.pas
 localenv.json
+/lvgl/
+dockerout.txt
+AGENTS.md
+*.log

Dockerfile

@@ -5,7 +5,7 @@ VOLUME ["/code"]
 ENV DEBIAN_FRONTEND=noninteractive
 RUN dpkg --add-architecture i386
 RUN apt-get update && apt-get install -y \
-	curl dos2unix wget git make nasm binutils:i386 xorriso grub-pc-bin && \
+	curl dos2unix wget git make nasm binutils xorriso grub-pc-bin gcc gcc-multilib && \
 	apt-get clean my room
 
 SHELL ["/bin/bash", "-c"]

compile.sh

@@ -7,7 +7,7 @@ echo "Asuro Compilation"
 echo " "
 
 #Compile Stub.asm
-rm lib/*
+rm -f lib/*
 
 runOrFail() {
 	local binary=$1
@@ -23,6 +23,7 @@ runOrFail() {
 declare -a run_steps=(
 	"compile_stub.sh" "Failed to compile stub!"
 	"compile_vergen.sh" "Versions failed to compile"
+	"compile_lvgl.sh" "Failed to compile LVGL!"
 	"compile_sources.sh" "Failed to compile FPC Sources!"
 	"compile_link.sh" "Failed linking!"
 	"compile_isogen.sh" "Failed to create ISO!"

compile_link.sh

@@ -14,4 +14,9 @@ done;
 objstring=lib/stub.o" "$objstring 
 echo "Object Files: "$objstring
 echo " "
-ld -m elf_i386 -s --gc-sections -Tlinker.script -o bin/kernel.bin $objstring
+
+# Find libgcc for i386 (needed by LVGL compiled with gcc)
+LIBGCC=$(gcc -m32 -print-libgcc-file-name)
+echo "libgcc: ${LIBGCC}"
+
+ld -m elf_i386 -s --gc-sections -Tlinker.script -o bin/kernel.bin $objstring --start-group lib/liblvgl.a ${LIBGCC} --end-group

compile_lvgl.sh

@@ -0,0 +1,118 @@
+#!/usr/bin/env bash
+# compile_lvgl.sh — Download LVGL v9.2 source and compile into lib/liblvgl.a
+# Clone & compile in /tmp (fast container-local fs).
+# Copy source + objects to /lvgl (host mount) for debugging.
+set -e
+
+LVGL_VERSION="v9.2.2"
+LVGL_REPO="https://github.com/lvgl/lvgl.git"
+LVGL_DIR="/tmp/lvgl"
+OBJ_DIR="/tmp/lvgl_obj"
+CONF_DIR="$(pwd)/lvglh"
+OUT_DIR="$(pwd)/lib"
+
+CC="gcc"
+CFLAGS="-m32 -march=i686 -ffreestanding \
+    -fno-builtin -fno-stack-protector -fno-pic -fno-pie \
+    -O2 -Wall -Wno-unused-function -Wno-unused-variable \
+    -I${CONF_DIR} \
+    -I${LVGL_DIR} \
+    -I${LVGL_DIR}/.. \
+    -DLV_CONF_INCLUDE_SIMPLE"
+
+echo " "
+echo "======================="
+echo " "
+echo "Compiling LVGL..."
+echo " "
+
+# Clone LVGL into /tmp (container-local)
+rm -rf "$LVGL_DIR"
+echo "Downloading LVGL ${LVGL_VERSION}..."
+git clone --depth 1 --branch "${LVGL_VERSION}" "${LVGL_REPO}" "${LVGL_DIR}" 2>&1
+echo "Download complete."
+
+# Gather all LVGL .c source files (core library only, no demos/examples)
+SOURCES=$(find "${LVGL_DIR}/src" -name '*.c' -not -path '*/test/*')
+TOTAL=$(echo "$SOURCES" | wc -l)
+echo "Found ${TOTAL} LVGL source files."
+
+# Compile each .c file to .o (container-local)
+rm -rf "$OBJ_DIR"
+mkdir -p "$OBJ_DIR"
+
+COUNT=0
+ERRORS=0
+for src in $SOURCES; do
+    COUNT=$((COUNT + 1))
+    rel="${src#${LVGL_DIR}/src/}"
+    obj_path="${OBJ_DIR}/${rel%.c}.o"
+    mkdir -p "$(dirname "$obj_path")"
+
+    if ! $CC $CFLAGS -c "$src" -o "$obj_path" 2>&1; then
+        echo "FAILED: $rel"
+        ERRORS=$((ERRORS + 1))
+    fi
+
+    if [ $((COUNT % 50)) -eq 0 ]; then
+        echo "  Compiled ${COUNT}/${TOTAL}..."
+    fi
+done
+
+echo "Compiled ${COUNT} files (${ERRORS} errors)."
+
+if [ "$ERRORS" -ne 0 ]; then
+    echo "LVGL compilation FAILED with ${ERRORS} errors."
+    exit 1
+fi
+
+# Archive into static library
+OBJECTS=$(find "$OBJ_DIR" -name '*.o')
+ar rcs "${OUT_DIR}/liblvgl.a" $OBJECTS
+echo "Created ${OUT_DIR}/liblvgl.a"
+
+# Compile custom LVGL extension files from lvglh/
+LVGLH_SOURCES=$(find "${CONF_DIR}" -name '*.c' 2>/dev/null || true)
+if [ -n "$LVGLH_SOURCES" ]; then
+    echo " "
+    echo "Compiling custom LVGL files from lvglh/..."
+    LVGLH_OBJ_DIR="/tmp/lvglh_obj"
+    rm -rf "$LVGLH_OBJ_DIR"
+    mkdir -p "$LVGLH_OBJ_DIR"
+    HCOUNT=0
+    HERRORS=0
+    for src in $LVGLH_SOURCES; do
+        HCOUNT=$((HCOUNT + 1))
+        rel="${src#${CONF_DIR}/}"
+        obj_path="${LVGLH_OBJ_DIR}/${rel%.c}.o"
+        mkdir -p "$(dirname "$obj_path")"
+        echo "  [lvglh] $rel"
+        if ! $CC $CFLAGS -c "$src" -o "$obj_path" 2>&1; then
+            echo "  FAILED: $rel"
+            HERRORS=$((HERRORS + 1))
+        fi
+    done
+    echo "Compiled ${HCOUNT} custom files (${HERRORS} errors)."
+    if [ "$HERRORS" -ne 0 ]; then
+        echo "Custom LVGL compilation FAILED."
+        exit 1
+    fi
+    # Append custom objects into the existing archive
+    HOBJECTS=$(find "$LVGLH_OBJ_DIR" -name '*.o')
+    ar rcs "${OUT_DIR}/liblvgl.a" $HOBJECTS
+    echo "Updated ${OUT_DIR}/liblvgl.a with custom objects."
+else
+    echo "No custom LVGL files in lvglh/."
+fi
+
+# Copy source + objects to /lvgl host mount for debugging
+echo "Copying LVGL source and objects to host mount..."
+mkdir /code/lvgl 2>/dev/null || true
+rm -rf /code/lvgl/* /code/lvgl/.[!.]* /code/lvgl/..?* 2>/dev/null || true
+cp -a "$LVGL_DIR/src" /code/lvgl/src
+cp -a "$OBJ_DIR" /code/lvgl/obj
+echo "Done."
+
+echo " "
+echo "LVGL compilation complete."
+echo " "

compile_sources.sh

@@ -4,4 +4,4 @@ echo "======================="
 echo " "
 echo "Compiling FPC Sources..."
 echo " "
-fpc -Aelf -gw -g -gl -n -vlewn -O3 -OpPENTIUM3 -Si -Sc -Sg -Xd -CX -XXs -CfSSE -CfSSE2 -Rintel -Pi386 -Tlinux -FElib/ -Fusrc/* -Fusrc/driver/* -Fusrc/driver/net/* src/kernel.pas
+fpc -Aelf -gw -g -gl -n -v0ew -O3 -OpPENTIUM3 -Si -Sc -Sg -Xd -CX -XXs -CfSSE -CfSSE2 -Rintel -Pi386 -Tlinux -FElib/ -Fusrc/* -Fusrc/driver/* -Fusrc/driver/net/* src/kernel.pas

src/driver/bus/EHCI.pas

@@ -23,7 +23,7 @@ interface
 
 uses
     tracer,
-    Console,
+    syslog,
     PCI,
     drivertypes,
     pmemorymanager,
@@ -44,19 +44,19 @@ var
 begin
     tracer.push_trace('EHCI.load');
     devices:= PCI.getDeviceInfo($0C, $03, $20, count);
-    console.output('USB-EHCI Driver', 'Found ');
-    console.writeint(count);
-    console.writestringln(' USB Controller(s).');
+    syslog.log('USB-EHCI Driver', 'Found ');
+    syslog.writeint(count);
+    syslog.writestringln(' USB Controller(s).');
     if count > 0 then begin
         for i:=0 to count-1 do begin
-            console.output('USB-EHCI Driver', 'Controller[');
-            console.writeint(i);
-            console.writestring(']: ');
-            console.writehex(devices[i].device_id);
-            console.writestring(' ');
-            console.writehex(devices[i].vendor_id);
-            console.writestring(' ');
-            console.writehexln(devices[i].prog_if);
+            syslog.log('USB-EHCI Driver', 'Controller[');
+            syslog.writeint(i);
+            syslog.writestring(']: ');
+            syslog.writehex(devices[i].device_id);
+            syslog.writestring(' ');
+            syslog.writehex(devices[i].vendor_id);
+            syslog.writestring(' ');
+            syslog.writehexln(devices[i].prog_if);
         end;
     end;
     load:= true;

src/driver/bus/OHCI.pas

@@ -23,7 +23,7 @@ interface
 
 uses
     tracer,
-    Console,
+    syslog,
     PCI,
     drivertypes,
     pmemorymanager,
@@ -71,19 +71,19 @@ var
 begin
     tracer.push_trace('OHCI.load');
     devices:= PCI.getDeviceInfo($0C, $03, $10, count);
-    console.output('USB-OHCI Driver', 'Found ');
-    console.writeint(count);
-    console.writestringln(' USB Controller(s).');
+    syslog.log('USB-OHCI Driver', 'Found ');
+    syslog.writeint(count);
+    syslog.writestringln(' USB Controller(s).');
     if count > 0 then begin
         for i:=0 to count-1 do begin
-            console.output('USB-OHCI Driver', 'Controller[');
-            console.writeint(i);
-            console.writestring(']: ');
-            console.writehex(devices[i].device_id);
-            console.writestring(' ');
-            console.writehex(devices[i].vendor_id);
-            console.writestring(' ');
-            console.writehexln(devices[i].prog_if);
+            syslog.log('USB-OHCI Driver', 'Controller[');
+            syslog.writeint(i);
+            syslog.writestring(']: ');
+            syslog.writehex(devices[i].device_id);
+            syslog.writestring(' ');
+            syslog.writehex(devices[i].vendor_id);
+            syslog.writestring(' ');
+            syslog.writehexln(devices[i].prog_if);
             block:= devices[i].address0 SHR 22;
             force_alloc_block(block, 0);
             map_page(block, block);

src/driver/bus/PCI.pas

@@ -25,7 +25,7 @@ interface
 uses
     tracer,
     util,
-    console,
+    syslog,
     drivertypes,
     lmemorymanager, 
     vmemorymanager,
@@ -100,14 +100,14 @@ var
 
 begin
     push_trace('PCI.load');
-    console.outputln('PCI', 'Scanning Bus: 0');
+    syslog.logln('PCI', 'Scanning Bus: 0');
     scanBus(0);
     //while unscanned busses scan busses
     current_bus := 1;
     while true do begin
         if current_bus < bus_count then begin
-            console.output('PCI', 'Scanning Bus: ');
-            console.writeintln(bus_count);
+            syslog.log('PCI', 'Scanning Bus: ');
+            syslog.writeintln(bus_count);
             scanBus(current_bus);
             current_bus := current_bus + 1;
         end else break;
@@ -122,7 +122,7 @@ var
 
 begin
     push_trace('PCI.init');
-    console.outputln('PCI','INIT BEGIN.');
+    syslog.logln('PCI','INIT BEGIN.');
     DevID.Bus:= biUnknown;
     DevID.id0:= 0;
     DevID.id1:= 0;
@@ -130,7 +130,7 @@ begin
     DevID.id3:= 0;
     DevID.ex:= nil;
     drivermanagement.register_driver_ex('PCI Driver', @DevID, @load, true);
-    console.outputln('PCI', 'INIT END.');
+    syslog.logln('PCI', 'INIT END.');
     pop_trace;
 end;
 
@@ -388,16 +388,16 @@ begin
             DevID^.id4:= device.vendor_id;
             DevID^.ex:= nil;
 
-            console.output('PCI', 'Found Device: ');
-            console.writehex(device.header_type);
-            console.writestring('  ');
-            console.writehex(device.device_id);        
-            console.writestring('  ');        
-            console.writehex(device.class_code);        
-            console.writestring('  ');
-            console.writehex(device.subclass_class);        
-            console.writestring('  ');
-            console.writehexln(device.prog_if);
+            syslog.log('PCI', 'Found Device: ');
+            syslog.writehex(device.header_type);
+            syslog.writestring('  ');
+            syslog.writehex(device.device_id);        
+            syslog.writestring('  ');        
+            syslog.writehex(device.class_code);        
+            syslog.writestring('  ');
+            syslog.writehex(device.subclass_class);        
+            syslog.writestring('  ');
+            syslog.writehexln(device.prog_if);
 
             devices[device_count] := device;
             device_count := device_count + 1;

src/driver/bus/UHCI.pas

@@ -23,7 +23,7 @@ interface
 
 uses
     tracer,
-    Console,
+    syslog,
     PCI,
     drivertypes,
     pmemorymanager,
@@ -44,19 +44,19 @@ var
 begin
     tracer.push_trace('UHCI.load');
     devices:= PCI.getDeviceInfo($0C, $03, $00, count);
-    console.output('USB-UHCI Driver','Found ');
-    console.writeint(count);
-    console.writestringln(' USB Controller(s).');
+    syslog.log('USB-UHCI Driver','Found ');
+    syslog.writeint(count);
+    syslog.writestringln(' USB Controller(s).');
     if count > 0 then begin
         for i:=0 to count-1 do begin
-            console.output('USB-UHCI Driver','Controller[');
-            console.writeint(i);
-            console.writestring(']: ');
-            console.writehex(devices[i].device_id);
-            console.writestring(' ');
-            console.writehex(devices[i].vendor_id);
-            console.writestring(' ');
-            console.writehexln(devices[i].prog_if);
+            syslog.log('USB-UHCI Driver','Controller[');
+            syslog.writeint(i);
+            syslog.writestring(']: ');
+            syslog.writehex(devices[i].device_id);
+            syslog.writestring(' ');
+            syslog.writehex(devices[i].vendor_id);
+            syslog.writestring(' ');
+            syslog.writehexln(devices[i].prog_if);
         end;
     end;
     load:= true;

src/driver/bus/USB.pas

@@ -23,7 +23,7 @@ interface
 
 uses
     tracer,
-    Console,
+    syslog,
     PCI,
     drivertypes,
     pmemorymanager,
@@ -69,7 +69,7 @@ var
 
 begin
     push_trace('USB.init');
-    console.outputln('USB Driver', 'INIT BEGIN.');
+    syslog.logln('USB Driver', 'INIT BEGIN.');
     
     UHCI_ID.Bus:= biPCI;
     UHCI_ID.id0:= idANY;
@@ -108,7 +108,7 @@ begin
     drivermanagement.register_driver('USB-EHCI Driver', @EHCI_ID, @loadEHCI);
     drivermanagement.register_driver('USB-XHCI Driver', @XHCI_ID, @loadXHCI);
 
-    console.outputln('USB Driver', 'INIT END.');
+    syslog.logln('USB Driver', 'INIT END.');
     pop_trace;
 end;
 

src/driver/bus/XHCI.pas

@@ -23,7 +23,7 @@ interface
 
 uses
     tracer,
-    Console,
+    syslog,
     PCI,
     drivertypes,
     pmemorymanager,
@@ -44,19 +44,19 @@ var
 begin
     tracer.push_trace('XHCI.load');
     devices:= PCI.getDeviceInfo($0C, $03, $30, count);
-    console.output('USB-XHCI Driver', 'Found ');
-    console.writeint(count);
-    console.writestringln(' USB Controller(s).');
+    syslog.log('USB-XHCI Driver', 'Found ');
+    syslog.writeint(count);
+    syslog.writestringln(' USB Controller(s).');
     if count > 0 then begin
         for i:=0 to count-1 do begin
-            console.output('USB-XHCI Driver', 'Controller[');
-            console.writeint(i);
-            console.writestring(']: ');
-            console.writehex(devices[i].device_id);
-            console.writestring(' ');
-            console.writehex(devices[i].vendor_id);
-            console.writestring(' ');
-            console.writehexln(devices[i].prog_if);
+            syslog.log('USB-XHCI Driver', 'Controller[');
+            syslog.writeint(i);
+            syslog.writestring(']: ');
+            syslog.writehex(devices[i].device_id);
+            syslog.writestring(' ');
+            syslog.writehex(devices[i].vendor_id);
+            syslog.writestring(' ');
+            syslog.writehexln(devices[i].prog_if);
         end;
     end;
     load:= true;

src/driver/exp/testdriver.pas

@@ -22,7 +22,7 @@ unit testdriver;
 interface
 
 uses
-    tracer, console, drivermanagement;
+    tracer, syslog, drivermanagement;
 
 procedure init;
 
@@ -31,7 +31,7 @@ implementation
 function load(ptr : void) : boolean;
 begin
     push_trace('testdriver.load');
-    console.outputln('DUMMY DRIVER', 'LOADED.');
+    syslog.logln('DUMMY DRIVER', 'LOADED.');
     pop_trace;
 end;
 

src/driver/hid/PS2_KEYBOARD_ISR.pas

@@ -24,7 +24,6 @@ interface
 
 uses
     util,
-    console,
     isr_types,
     isrmanager,
     IDT;

src/driver/hid/keyboard.pas

@@ -22,7 +22,7 @@ unit keyboard;
 interface
 
 uses 
-    console,
+    syslog,
     util,
     PS2_KEYBOARD_ISR;
 
@@ -94,7 +94,7 @@ function load(ptr : void) : boolean;
 begin
     PS2_KEYBOARD_ISR.register();
     PS2_KEYBOARD_ISR.hook(uint32(@callback));
-    console.outputln('PS/2 KEYBOARD', 'LOADED.');
+    syslog.logln('PS/2 KEYBOARD', 'LOADED.');
     load:= true;
 end;
 
@@ -103,7 +103,7 @@ var
     devid : TDeviceIdentifier;
 
 begin
-    console.outputln('PS/2 KEYBOARD', 'INIT BEGIN.');
+    syslog.logln('PS/2 KEYBOARD', 'INIT BEGIN.');
     if keyboard_layout[1].key_code = 0 then lang_USA();
     devid.bus:= biUnknown;
     devid.id0:= 0;
@@ -113,7 +113,7 @@ begin
     devid.id4:= 0;
     devid.ex:= nil;
     drivermanagement.register_driver_ex('PS/2 Keyboard', @devid, @load, true);
-    console.outputln('PS/2 KEYBOARD', 'INIT END.');
+    syslog.logln('PS/2 KEYBOARD', 'INIT END.');
 end;
 //2A AA