fix: minor cleanup after namespace refactor

- Shorten 'driver.video.windows: ' label to 'Windows: ' in uidebug
- Shorten e1000 terminal command name from 'driver.net.dev.e1000' to 'E1000'
- Auto-generated version bump (build artifact)

3 files changed, 7 insertions(+), 7 deletions(-)

.drone.yml

@@ -22,9 +22,9 @@ steps:
     commands:
       - git fetch --tags
       - find . -type f -print0 | xargs -0 dos2unix
-      - chmod +x /drone/src/*.sh
+      - chmod +x /drone/src/toolchain/*.sh
-      - /drone/src/compile.sh
+      - /drone/src/toolchain/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,11 @@
 /*.img
 src/include/asuro.pas
 localenv.json
+/lvgl/
+dockerout.txt
+AGENTS.md
+lessons_learnt.md
+*.log
+/doc/*.md
+wasuro
+src/core/core.version.pas

.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,19 +5,18 @@ 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
 
-COPY compile.sh /compile.sh
 ADD https://raw.githubusercontent.com/fsaintjacques/semver-tool/master/src/semver /usr/bin/semver
 RUN chmod +x /usr/bin/semver
 WORKDIR /code
 RUN find . -type f -print0 | xargs -0 dos2unix
 ENTRYPOINT ["/bin/bash", "-c"]
-CMD ["/compile.sh"]
+CMD ["find toolchain -name '*.sh' -exec dos2unix {} + 2>/dev/null; find toolchain -name '*.sh' -exec chmod +x {} +; bash toolchain/compile.sh"]

compat/lmemorymanager.pas

@@ -0,0 +1,75 @@
+{ Compatibility shim: wasuro references the old unit name 'lmemorymanager'.
+  Since wasuro/ cannot be modified, this unit re-exports the public API of
+  memory.heap so that 'uses lmemorymanager' continues to compile. }
+unit lmemorymanager;
+
+interface
+
+uses
+    memory.heap;
+
+const
+    ALLOC_UNIT        = memory.heap.ALLOC_UNIT;
+    DATA_OFFSET       = memory.heap.DATA_OFFSET;
+    PAGE_SIZE_LMM     = memory.heap.PAGE_SIZE_LMM;
+    TOTAL_UNITS       = memory.heap.TOTAL_UNITS;
+    BITMAP_DWORDS     = memory.heap.BITMAP_DWORDS;
+    SIZE_PREFIX       = memory.heap.SIZE_PREFIX;
+    LARGE_ALLOC_MAGIC = memory.heap.LARGE_ALLOC_MAGIC;
+
+type
+    PHeapPageHeader = memory.heap.PHeapPageHeader;
+    THeapPageHeader = memory.heap.THeapPageHeader;
+
+procedure init;
+function kalloc(size : uint32) : void;
+function klalloc(size : uint32) : void;
+procedure klfree(address : uint32);
+function kpalloc(address : uint32) : void;
+procedure kfree(area : void);
+function lmm_total_free : uint32;
+function lmm_page_count : uint32;
+
+implementation
+
+procedure init;
+begin
+    memory.heap.init;
+end;
+
+function kalloc(size : uint32) : void; inline;
+begin
+    kalloc := memory.heap.kalloc(size);
+end;
+
+function klalloc(size : uint32) : void; inline;
+begin
+    klalloc := memory.heap.klalloc(size);
+end;
+
+procedure klfree(address : uint32); inline;
+begin
+    memory.heap.klfree(address);
+end;
+
+function kpalloc(address : uint32) : void; inline;
+begin
+    kpalloc := memory.heap.kpalloc(address);
+end;
+
+procedure kfree(area : void); inline;
+begin
+    memory.heap.kfree(area);
+end;
+
+function lmm_total_free : uint32; inline;
+begin
+    lmm_total_free := memory.heap.lmm_total_free;
+end;
+
+function lmm_page_count : uint32; inline;
+begin
+    lmm_page_count := memory.heap.lmm_page_count;
+end;
+
+end.

compat/types.pas

@@ -0,0 +1,7 @@
+unit types;
+
+interface
+
+implementation
+
+end.

compile_sources.sh

@@ -1,7 +0,0 @@
-#!/usr/bin/env bash
-echo " "
-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

compile_stub.sh

@@ -1,7 +0,0 @@
-#!/usr/bin/env bash
-echo " "
-echo "======================="
-echo " "
-echo "Compiling Stub..."
-echo " "
-nasm -f elf src/stub/stub.asm -o lib/stub.o

doc/flatfs.md

@@ -0,0 +1,32 @@
+#Flat filesystem
+
+A super simple filesystem for asuro. Folders are emulated in filenames.
+
+Starts with disk info sector, sector 0 of volume
+
+---
+#### disk info
+
+jmp2boot        : ubit24;
+OEMName         : array[0..7] of char;
+version         : uint16 // numerical version of filesystem
+sectorCount      : uint16;
+fileCount       : uint16
+signature       : uint32 = 0x0B00B1E5
+
+
+the Rest of the sector is reserved
+
+---
+
+Starting from sector 1 is the file table. Table size is determined by entry size (64) * fileCount
+
+---
+####File entry
+
+name : array[0..59] of char //file name max 60 chars
+fileStart : 16bit // start sector of data
+fileSize : 16bit // data size in sectors
+
+---
+

iso/hello.txt

@@ -0,0 +1 @@
+Hello from the Asuro ISO!

src/app/app.base64.pas

@@ -17,18 +17,18 @@
 	
 	@author(Angus C <angus@actm.uk>)
 }
-unit base64_prog;
+unit app.base64;
 
 interface
 
 uses
-    console, terminal, keyboard, util, strings, tracer, base64, lmemorymanager;
+    io.stdio, core.util, arch.x86.util, core.strings, debug.tracer, core.enc.base64, memory.heap;
 
 procedure init();
 
 implementation
 
-procedure run(Params : PParamList);
+procedure run(Params : PParamList; stdin_buf, stdout_buf, stderr_buf : POutBuf);
 var
     input     : pchar;
     pinput    : pchar;
@@ -38,7 +38,7 @@ var
     PSize     : uInt32;
 
 begin
-    tracer.push_trace('base64_prog.run');
+    debug.tracer.push_trace('base64_prog.run');
     if paramCount(Params) > 1 then begin
         encdec := getParam(0, Params);
         if stringEquals(encdec, 'encode') then begin
@@ -58,23 +58,23 @@ begin
             dec(pinput);
             pinput^ := #0;
             result := b64_encode_str(input);
-            writestringlnWND(result, getTerminalHWND);
+            io.stdio.bufWriteStrLn(stdout_buf, result);
             kfree(void(result));
         end else if stringEquals(encdec, 'decode') then begin
             input := getParam(1, Params);
             result := b64_decode_str(input);
-            writestringlnWND(result, getTerminalHWND);
+            io.stdio.bufWriteStrLn(stdout_buf, result);
             kfree(void(result));
-        end else writestringlnWND('Usage: base64 <encode/decode> <text>', getTerminalHWND);
+        end else io.stdio.bufWriteStrLn(stderr_buf, 'Usage: core.enc.base64 <encode/decode> <text>');
     end else begin
-        writestringlnWND('Usage: base64 <encode/decode> <text>', getTerminalHWND);
+        io.stdio.bufWriteStrLn(stderr_buf, 'Usage: core.enc.base64 <encode/decode> <text>');
     end;
 end;
 
 procedure init();
 begin
-    tracer.push_trace('base64_prog.init');
+    debug.tracer.push_trace('base64_prog.init');
-    terminal.registerCommand('BASE64', @Run, 'Perform Base64 Encode/Decode.');
+    io.stdio.registerCommand('BASE64', @Run, 'Perform Base64 Encode/Decode.');
 end;
 
 end.

src/app/app.dhclient.pas

@@ -17,27 +17,27 @@
 	
 	@author(Kieron Morris <kjm@kieronmorris.me>)
 }
-unit dhclient;
+unit app.dhclient;
 
 interface
 
 uses
-    console, terminal, keyboard, util, strings, tracer, dhcp;
+    io.stdio, core.util, arch.x86.util, core.strings, debug.tracer, driver.net.proto.dhcp;
 
 procedure init();
 
 implementation
 
-procedure run(Params : PParamList);
+procedure run(Params : PParamList; stdin_buf, stdout_buf, stderr_buf : POutBuf);
 begin
-    tracer.push_trace('dhclient.run');
+    debug.tracer.push_trace('dhclient.run');
     DHCPDiscover();
 end;
 
 procedure init();
 begin
-    tracer.push_trace('dhclient.init');
+    debug.tracer.push_trace('dhclient.init');
-    terminal.registerCommand('DHClient', @Run, 'Run the DHCP configuration utility.');
+    io.stdio.registerCommand('DHClient', @Run, 'Run the DHCP configuration utility.');
 end;
 
 end.