bug: vtop incorrect bitmask

- Fix for issue #32 in which the incorrect bitmask ($FFFFFF) is used where
  $3FFFFF should be used instead. (24 vs 22 bits).

.drone.yml

@@ -24,7 +24,7 @@ steps:
       - find . -type f -print0 | xargs -0 dos2unix
       - chmod +x /drone/src/*.sh
       - /drone/src/compile.sh
-
+      
   - name: upload-iso-artifact
     image: alpine/git
     depends_on:
@@ -49,4 +49,18 @@ steps:
         -H "Authorization: token $GITEA_TOKEN" || echo "No previous latest version found."
       - |
         curl -X PUT https://gitea.spexeah.com/api/packages/Spexeah/generic/asuro-iso/latest/Asuro.iso \
-        -H "Authorization: token $GITEA_TOKEN" --upload-file "Asuro-$(git rev-parse --short HEAD).iso"
+        -H "Authorization: token $GITEA_TOKEN" --upload-file "Asuro-$(git rev-parse --short HEAD).iso"
+
+  - name: msg status
+    image: appleboy/drone-discord
+    failure: ignore
+    depends_on:
+      - compile
+    when:
+      status: [success, failure, changed]
+    settings:
+      webhook_id:
+        from_secret: discord_webhook_id
+      webhook_token:
+        from_secret: discord_webhook_secret
+      message: "**Asuro Build**\n\n{{#success build.status}}✅ Build successful!\n\n{{else}}❌ Build failed!\n\n{{/success}}Repository: `{{repo.namespace}}/{{repo.name}}`\nBranch: `{{commit.branch}}`\nCommit: `{{commit.sha}}`\nAuthor: `{{commit.author}} <{{commit.email}}>`\n\nGitea Diff: [Link](<{{commit.link}}>)\nDrone Build: [Link](<{{build.link}}>)\n\nMessage: {{commit.message}}"

.gitattributes

@@ -1 +1,8 @@
-* text=auto eol=lf
+* text=auto eol=lf
+lvglh/** linguist-vendored
+lvgl/** linguist-vendored
+.vscode/* linguist-vendored
+lib/* linguist-generated
+release/* linguist-generated
+iso/* linguist-generated
+*.asm linguist-detectable

.gitignore

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

.mailmap

@@ -0,0 +1,13 @@
+# Map all Aaron identities to a single preferred identity
+Aaron Hance <[email protected]> aaron <aaron@6dbc8c32-bb84-406f-8558-d1cf31a0ab0c>
+Aaron Hance <[email protected]> aaronhance <[email protected]>
+Aaron Hance <[email protected]> aaron hance <[email protected]>
+Aaron Hance <[email protected]> Aaron <[email protected]>
+
+# Map all Kieron identities to a single preferred identity
+Kieron Morris <[email protected]> kieron <kieron@6dbc8c32-bb84-406f-8558-d1cf31a0ab0c>
+Kieron Morris <[email protected]> Kieron <[email protected]>
+Kieron Morris <[email protected]> t3hn3rd <[email protected]>
+
+# Map goose's multiple identities
+goose <goose@6dbc8c32-bb84-406f-8558-d1cf31a0ab0c> goose <[email protected]>

Dockerfile

@@ -5,11 +5,11 @@ 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"]
-ARG FPC_VERSION=2.6.4
+ARG FPC_VERSION=3.2.2
 RUN curl -sL https://sourceforge.net/projects/freepascal/files/Linux/$FPC_VERSION/fpc-$FPC_VERSION.i386-linux.tar/download | tar -xf - && \
 	pushd fpc-$FPC_VERSION.i386-linux && ./install.sh && popd && \
 	rm -rf fpc-$FPC_VERSION.i386-linux

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 -Op3 -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/* -Fusrc/driver/bus/* -Fusrc/driver/bus/usb/* -Fusrc/driver/hid/* src/kernel.pas

linker.script

@@ -34,4 +34,14 @@ SECTIONS
   }
   end = .; _end = .; __end = .;
   kernel_end = .;
+
+  /DISCARD/ : {
+    *(.init_array*)
+    *(.fini_array*)
+    *(.ctors)
+    *(.dtors)
+    *(.eh_frame*)
+    *(.gcc_except_table*)
+    *(.note.GNU-stack)
+  }
 }

src/driver/bus/EHCI.pas

@@ -1,65 +0,0 @@
-//  Copyright 2021 Kieron Morris
-//
-//  Licensed under the Apache License, Version 2.0 (the "License");
-//  you may not use this file except in compliance with the License.
-//  You may obtain a copy of the License at
-//
-//  http://www.apache.org/licenses/LICENSE-2.0
-//
-//  Unless required by applicable law or agreed to in writing, software
-//  distributed under the License is distributed on an "AS IS" BASIS,
-//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-//  See the License for the specific language governing permissions and
-//  limitations under the License.
-
-{ 
-	Driver->Bus->EHCI - Enhanced Host Controller Interface Driver.
-	
-	@author(Kieron Morris <[email protected]>)
-}
-unit EHCI;
-
-interface
-
-uses
-    tracer,
-    Console,
-    PCI,
-    drivertypes,
-    pmemorymanager,
-    vmemorymanager,
-    util,
-    drivermanagement;
-
-function load : boolean;
-
-implementation
-
-function load : boolean;
-var
-    devices : TDeviceArray;
-    count   : uint32;
-    i       : uint32;
-
-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).');
-    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);
-        end;
-    end;
-    load:= true;
-end;
-
-end.

src/driver/bus/OHCI.pas

@@ -1,96 +0,0 @@
-//  Copyright 2021 Kieron Morris
-//
-//  Licensed under the Apache License, Version 2.0 (the "License");
-//  you may not use this file except in compliance with the License.
-//  You may obtain a copy of the License at
-//
-//  http://www.apache.org/licenses/LICENSE-2.0
-//
-//  Unless required by applicable law or agreed to in writing, software
-//  distributed under the License is distributed on an "AS IS" BASIS,
-//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-//  See the License for the specific language governing permissions and
-//  limitations under the License.
-
-{ 
-	Driver->Bus->OHCI - Open Host Controller Interface Driver.
-	
-	@author(Kieron Morris <[email protected]>)
-}
-unit OHCI;
-
-interface
-
-uses
-    tracer,
-    Console,
-    PCI,
-    drivertypes,
-    pmemorymanager,
-    vmemorymanager,
-    util,
-    drivermanagement;
-
-type
-    POHCI_MMR = ^TOHCI_MMR;
-    TOHCI_MMR = packed record
-        HcRevision : uint32;
-        HcControl  : uint32;
-        HcCommandStatus : uint32;
-        HcIntStatus  : uint32;
-        HcIntEnable  : uint32;
-        HcIntDisable : uint32;
-        HcHCCA : uint32;
-        HcPeriodCurrentED : uint32;
-        HcControlHeadED : uint32;
-        HcControlCurrentED : uint32;
-        HcBulkHeadED : uint32;
-        HcBulkCurrentED : uint32;
-        HcDoneHead : uint32;
-        HcFmRemaining : uint32;
-        HcFmNumber : uint32;
-        HcPeriodicStart : uint32;
-        HcLSThreshold : uint32;
-        HcRhDescriptorA : uint32;
-        HcRhDescriptorB : uint32;
-        HcRhStatus : uint32;
-    end;
-
-function load : boolean;
-
-implementation
-
-function load : boolean;
-var
-    devices : TDeviceArray;
-    count   : uint32;
-    i       : uint32;
-    block   : uint32;
-    MMR     : POHCI_MMR;
-
-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).');
-    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);
-            block:= devices[i].address0 SHR 22;
-            force_alloc_block(block, 0);
-            map_page(block, block);
-            MMR:= POHCI_MMR(devices[i].address0);
-        end;
-    end;
-    load:= true;
-end;
-
-end.

src/driver/bus/PCI.pas

@@ -18,14 +18,14 @@
 	@author(Aaron Hance <[email protected]>)
 	@author(Kieron Morris <[email protected]>)
 }
-unit PCI;
+unit pci;
 
 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

@@ -1,65 +0,0 @@
-//  Copyright 2021 Kieron Morris
-//
-//  Licensed under the Apache License, Version 2.0 (the "License");
-//  you may not use this file except in compliance with the License.
-//  You may obtain a copy of the License at
-//
-//  http://www.apache.org/licenses/LICENSE-2.0
-//
-//  Unless required by applicable law or agreed to in writing, software
-//  distributed under the License is distributed on an "AS IS" BASIS,
-//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-//  See the License for the specific language governing permissions and
-//  limitations under the License.
-
-{ 
-	Driver->Bus->UHCI - Universal Host Controller Interface Driver.
-	
-	@author(Kieron Morris <[email protected]>)
-}
-unit UHCI;
-
-interface
-
-uses
-    tracer,
-    Console,
-    PCI,
-    drivertypes,
-    pmemorymanager,
-    vmemorymanager,
-    util,
-    drivermanagement;
-
-function load : boolean;
-
-implementation
-
-function load : boolean;
-var
-    devices : TDeviceArray;
-    count   : uint32;
-    i       : uint32;
-
-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).');
-    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);
-        end;
-    end;
-    load:= true;
-end;
-
-end.