Merge branch 'feature/vtop-fix' into feature/tcp

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

.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

@@ -15,3 +15,4 @@ localenv.json
 dockerout.txt
 AGENTS.md
 *.log
+/doc/*.md

src/driver/net/l1/net.pas

@@ -100,8 +100,8 @@ end;
 
 procedure send(p_data : void; p_len : uint16);
 begin
-    //push_trace('net.send');
+    push_trace('net.send');
-    //writeToLogLn('L1: net.send');
+    writeToLogLn('L1/NET: send');
     if CBSend <> nil then CBSend(p_data, p_len);
     pop_trace;
 end;
@@ -111,8 +111,7 @@ var
     context : PPacketContext;
 
 begin
-    //push_trace('net.recv');
+    push_trace('net.recv');
-    //writeToLogLn('L1: net.recv');
     context:= newPacketContext;
     if CBNext <> nil then CBNext(p_data, p_len, context);
     freePacketContext(context);
@@ -129,6 +128,7 @@ end;
 procedure init;
 begin
     push_trace('net.init');
+    writeToLogLn('L1/NET: init');
     //l2
     eth2.register;
     //l3
@@ -136,6 +136,7 @@ begin
     ipv4.register;
     //l4
     icmp.register;
+    tcp.register;
     udp.register;
     //l5
     dhcp.register;

src/driver/net/l2/eth2.pas

@@ -46,6 +46,7 @@ var
 
 procedure registerTypePromisc(eType : uint16; RecvCB : TRecvCallback);
 begin
+    push_trace('eth2.registerTypePromisc');
     register;
     if EthTypes[eType] = nil then EthTypes[eType]:= RecvCB;
     Promisc[eType]:= true;
@@ -53,6 +54,7 @@ end;
 
 procedure registerType(eType : uint16; RecvCB : TRecvCallback);
 begin
+    push_trace('eth2.registerType');
     register;
     if EthTypes[eType] = nil then EthTypes[eType]:= RecvCB;
 end;
@@ -93,7 +95,7 @@ var
     buf        : puint8;
 
 begin
-    //writeToLogLn('    L2: eth2.recv');
+    push_trace('eth2.recv');
     buf:= puint8(p_data);
     
     Header:= PEthernetHeader(buf);
@@ -120,6 +122,7 @@ var
 begin
     push_trace('eth2.register');
     if not Registered then begin
+        writeToLogLn('    L2/ETH: register');
         for i:=0 to 65535 do begin
             EthTypes[i]:= nil;
             Promisc[i]:= false;

src/driver/net/l3/arp.pas

@@ -96,6 +96,7 @@ var
     hSize, pSize : uint8;
 
 begin
+    push_trace('arp.send');
     if p_context <> nil then begin
         buf:= kalloc(sizeof(TARPHeader));
         hdr:= PARPHeader(buf);
@@ -135,6 +136,8 @@ var
     context : PPacketContext;
 
 begin
+     push_trace('arp.sendGratuitous');
+     writeToLogLn('      L3/ARP: sendGratuitous');
      context:= newPacketContext;
      CopyIPv4(@getIPv4Config^.Address[0], @context^.IP.Destination[0]);
      CopyIPv4(@getIPv4Config^.Address[0], @context^.IP.Source[0]);
@@ -150,6 +153,7 @@ var
     CacheRecord : PARPCacheRecord;
 
 begin
+     push_trace('arp.sendRequestGateway');
      context:= newPacketContext;
      CacheRecord:= findCacheRecordByIP(@getIPv4Config^.Gateway[0]);
      if CacheRecord <> nil then begin
@@ -168,6 +172,8 @@ var
     CacheRecord : PARPCacheRecord;
 
 begin
+     push_trace('arp.sendRequest');
+     writeToLogLn('      L3/ARP: sendRequest');
      context:= newPacketContext;
      CopyIPv4(ip, @context^.IP.Destination[0]);
      CopyIPv4(@getIPv4Config^.Address[0], @context^.IP.Source[0]);
@@ -184,6 +190,7 @@ var
     CacheRecord : PARPCacheRecord;
 
 begin
+    push_trace('arp.resolveIP');
     CacheRecord:= findCacheRecordByIP(ip);
     resolveIP:= nil;
     if CacheRecord = nil then begin
@@ -203,6 +210,7 @@ var
     context      : PPacketContext;
 
 begin
+    push_trace('arp.recv');
     { Get our converted Header }
     Header:= PARPHeader(p_data);
     AHeader.Hardware_Type:= (Header^.Hardware_Type_Hi SHL 8) + Header^.Hardware_Type_Lo;
@@ -298,6 +306,7 @@ procedure register;
 begin
     push_trace('arp.register');
     if not Registered then begin
+        writeToLogLn('      L3/ARP: register');
         Cache:= LL_New(sizeof(TARPCacheRecord));
         eth2.registerTypePromisc($0806, @recv);
         stdio.registerCommand('ARP', @terminal_command_arp, 'Get ARP Table.');

src/driver/net/l3/ipv4.pas

@@ -46,7 +46,9 @@ var
 
 function  getIPv4Config : PIPv4Configuration;
 begin
+    push_trace('ipv4.getIPv4Config');
     getIPv4Config:= @Config;
+    pop_trace;
 end;
 
 procedure send(p_data : void; p_len : uint16; p_context : PPacketContext);
@@ -57,6 +59,7 @@ var
     buffer : void;
 
 begin
+    push_trace('ipv4.send');
     inc(CurrentID);
     Header.version:= 4;
     Header.header_len:= 5;
@@ -84,6 +87,7 @@ begin
     memcpy(uint32(p_data), uint32(Buffer) + (Header.header_len * 4), p_len);
     eth2.send(Buffer, (Header.header_len * 4) + p_len, $0800, p_context);
     kfree(Buffer);
+    pop_trace;
 end;
 
 procedure recv(p_data : void; p_len : uint16; p_context : PPacketContext);
@@ -95,6 +99,7 @@ var
     len     : uint16;
 
 begin
+    push_trace('ipv4.recv');
     Header:= PIPV4Header(p_data);
     AHeader.version:= Header^.version;
     AHeader.header_len:= Header^.header_len;
@@ -195,6 +200,7 @@ var
 begin
     push_trace('ipv4.register');
     if not Registered then begin
+        writeToLogLn('      L3/IPv4: register');
         for i:=0 to 255 do begin
             Protocols[i]:= nil;
         end;
@@ -213,6 +219,7 @@ end;
 
 procedure registerProtocol(Protocol_ID : uint8; recv_callback : TRecvCallback);
 begin
+    push_trace('ipv4.registerProtocol');
     register;
     if Protocols[Protocol_ID] = nil then Protocols[Protocol_ID]:= recv_callback;
     pop_trace;

src/driver/net/l4/icmp.pas

@@ -23,7 +23,7 @@ interface
 
 uses
     bios_data_area,
-    lmemorymanager,
+    lmemorymanager, tracer,
     net, nettypes, netutils, ipv4, arp, util;
 
 type
@@ -55,6 +55,7 @@ var
     i : uint8;
 
 begin
+    push_trace('icmp.nextInactiveHandler');
     nextInactiveHandler:= 0;
     for i:=1 to 255 do begin
         if not Handlers[i].Active then begin
@@ -80,6 +81,8 @@ var
     Size     : uint32;
 
 begin
+    push_trace('icmp.sendICMPRequest');
+    writeToLogLn('        L4/ICMP: sendICMPRequest');
     handle:= nextInactiveHandler;
     Handlers[handle].Active:= true;
     Handlers[handle].OnReply:= OnRep;
@@ -135,6 +138,8 @@ var
     Handle : uint8;
 
 begin
+    push_trace('icmp.recv');
+    writeToLogLn('        L4/ICMP: recv');
     Header:= PICMPHeader(p_data);
     //writehexlnWND(Header^.ICMP_Type, getTerminalHWND); 
     case Header^.ICMP_Type of
@@ -243,6 +248,8 @@ var
     i : uint32;
 
 begin
+    push_trace('icmp.register');
+    writeToLogLn('        L4/ICMP: register');
     for i:=0 to 255 do begin
         Handlers[i].Active:= false;
         Handlers[i].OnError:= nil;

src/driver/net/l4/udp.pas

@@ -25,7 +25,7 @@ uses
     lmemorymanager,
     nettypes, netutils,
     ipv4, net,
-    util;
+    tracer, util;
 
 procedure register();
 function bind(bindContext : PUDPBindContext) : TUDPError;
@@ -71,6 +71,7 @@ begin
             nullend:= true;
         end;
         pseudoBuffer:= kalloc(sizeof(TUDPPseudoHeader) + pseudoSize);
+        push_trace('udp.CalculateChecksum');
         pseudoBuffer8:= puint8(pseudoBuffer);
         pseudoBuffer16:= puint16(pseudoBuffer);
         pseudoBuffer32:= puint32(pseudoBuffer);
@@ -118,6 +119,7 @@ var
 
 
 begin
+    push_trace('udp.send');
     if udpContext <> nil then begin
         size:= p_len + sizeof(TUDPHeader);
         buffer:= kalloc(size);
@@ -152,6 +154,7 @@ var
     context : PUDPBindContext;
 
 begin
+    push_trace('udp.bind');
     result:= tueGenericError;
     if bindContext <> nil then begin
         if Ports[bindContext^.port] = nil then begin
@@ -174,6 +177,7 @@ var
     context : PUDPBindContext;
 
 begin
+    push_trace('udp.unbind');
     result:= tueGenericError;
     if bindContext <> nil then begin
         context:= Ports[bindContext^.port];
@@ -203,6 +207,7 @@ var
     size    : uint16;
 
 begin
+    push_trace('udp.ProcessPacket');
     header:= PUDPHeader(p_data);
     if Ports[switchendian16(header^.DstPort)] <> nil then begin
         context:= PUDPPacketContext(kalloc(sizeof(TUDPPacketContext)));
@@ -245,6 +250,8 @@ var
     Checksum      : uint32;
 
 begin
+    push_trace('udp.register');
+    writeToLogLn('        L4/UDP: register');
     for i:=0 to 65535 do begin
         Ports[i]:= nil;
     end;

src/driver/net/l5/dhcp.pas

@@ -415,7 +415,7 @@ end;
 
 procedure processPacket_NAK(Header : PDHCPHeader; Options : PDHCPOptions);
 begin
-    syslog.logln('DHCP', 'Process NAK.'); 
+    writeToLogLn('          L5/DHCP: Process NAK.');
     { Server provided a NAK, NULL configuration ready for next DISCOVER/Request } 
     nullConfiguration();  
 end;
@@ -429,7 +429,7 @@ var
     cfgopt : void;
 
 begin
-    syslog.logln('DHCP', 'Process ACK.');
+    writeToLogLn('          L5/DHCP: Process ACK.');
     getIPv4Config^.UP:= false;
     
     //Copy new address
@@ -484,7 +484,7 @@ Var
 
 begin
     syslog.logln('DHCP', 'Process OFFER.');  
-
+    writeToLogLn('          L5/DHCP: Process OFFER.');
     { Check the Transaction ID matches our stored ID, discard if not. }
     if Header^.Transaction_ID = Configuration^.Transaction then begin
         syslog.logln('DHCP', 'XID Match');
@@ -566,6 +566,7 @@ var
 
 begin
     tracer.push_trace('dhcp.processPacket.enter');
+    writeToLogLn('          L5/DHCP: processPacket');
     syslog.logln('DHCP','processPacket');
     
     { Give access to header values & process to correct endianness. }
@@ -636,6 +637,7 @@ var
 
 begin
     tracer.push_trace('dhcp.DHCPDiscover.begin');
+    writeToLogLn('          L5/DHCP: DHCPDiscover');
     { Ensure we have a socket bound. }
     if Socket <> nil then begin    
         { Clear any current configuration }
@@ -711,6 +713,7 @@ var
 
 begin
     tracer.push_trace('dhcp.register');
+    writeToLogLn('          L5/DHCP: register');
     syslog.logln('DHCP', 'Register begin.');
     
     { Kalloc our Configuration Data }

src/driver/timers/graphicsrefresh.pas

@@ -0,0 +1,52 @@
+{
+    Driver->Timer->GraphicsRefresh - Timer-driven graphics refresh at ~120FPS.
+
+    Hooks into the 1024Hz timer (TMR_0_ISR) and calls the desktop, uidebug,
+    LVGL and video flush routines every ~9 ticks (1024/9 ≈ 113.8 FPS).
+
+    @author(Kieron Morris <[email protected]>)
+}
+unit graphicsrefresh;
+
+interface
+
+procedure init;
+
+implementation
+
+uses
+    util,
+    TMR_0_ISR,
+    desktop,
+    uidebug,
+    lvgl,
+    video,
+    syslog;
+
+const
+    { 1024 / 4 ≈ 256 FPS }
+    TICKS_PER_FRAME = 4;
+
+var
+    TickCounter : uint32;
+
+procedure on_tick(data : void);
+begin
+    TickCounter := TickCounter + 1;
+    if TickCounter >= TICKS_PER_FRAME then begin
+        TickCounter := 0;
+        desktop.update;
+        uidebug.update;
+        lvgl_handler;
+        video.Flush;
+    end;
+end;
+
+procedure init;
+begin
+    TickCounter := 0;
+    TMR_0_ISR.hook(uint32(@on_tick));
+    syslog.logln('GFXREFRESH', 'Hooked into 1024Hz timer (~120 FPS).');
+end;
+
+end.

src/driver/timers/usbhotplug.pas

@@ -0,0 +1,46 @@
+{
+    Driver->Timer->USBHotplug - Timer-driven USB hotplug polling at ~1Hz.
+
+    Hooks into the 1024Hz timer (TMR_0_ISR) and calls
+    usbcore.usb_check_hotplug every 1024 ticks (approximately once per second).
+
+    @author(Kieron Morris <[email protected]>)
+}
+unit usbhotplug;
+
+interface
+
+procedure init;
+
+implementation
+
+uses
+    util,
+    TMR_0_ISR,
+    usbcore,
+    syslog;
+
+const
+    { 1024 ticks at 1024Hz ≈ 1 second }
+    TICKS_PER_POLL = 1024;
+
+var
+    TickCounter : uint32;
+
+procedure on_tick(data : void);
+begin
+    TickCounter := TickCounter + 1;
+    if TickCounter >= TICKS_PER_POLL then begin
+        TickCounter := 0;
+        usbcore.usb_check_hotplug;
+    end;
+end;
+
+procedure init;
+begin
+    TickCounter := 0;
+    TMR_0_ISR.hook(uint32(@on_tick));
+    syslog.logln('USBHOTPLUG', 'Hooked into 1024Hz timer (~1Hz polling).');
+end;
+
+end.

src/kernel.pas

@@ -66,7 +66,8 @@ uses
      rand,
      hashmap, vfs,
      video, vesa, doublebuffer, color, lvgl, desktop, uidebug,
-     vterminal;
+     vterminal,
+     graphicsrefresh, usbhotplug;
  
 procedure kmain(mbinfo: Pmultiboot_info_t; mbmagic: uint32); stdcall;
  
@@ -103,18 +104,14 @@ begin
     pop_trace;
 end;
 
-procedure myUserLandFunction;
+procedure yield();
-var
-    i : uint32;
-
 begin
-    i:=0;
+    asm
-    while true do begin 
+         sti
-        i:=i+1;
+     @idle:
-        asm
+         hlt
-            MOV EAX, i
+         jmp @idle
-        end;
+     end;
-    end;
 end;
 
 procedure kmain(mbinfo: Pmultiboot_info_t; mbmagic: uint32); stdcall; [public, alias: 'kmain'];   
@@ -132,6 +129,7 @@ begin
 
      { Syslog Init — right after serial so log hooks work }
      syslog.init();
+     syslog.writestringln('Booting Asuro...');
 
      { Store Multiboot info }
      multibootinfo:= mbinfo;
@@ -140,10 +138,8 @@ begin
      { Ensure tracer is frozen }
      tracer.freeze();
 
-     syslog.writestringln('Booting Asuro...');
-
-     syslog.writestringln('Checking for Multiboot Compliance');
      { Check for Multiboot }
+     syslog.writestringln('Checking for Multiboot Compliance');
      if (multibootmagic <> MULTIBOOT_BOOTLOADER_MAGIC) then begin
         syslog.logln('KERNEL', 'Multiboot Compliant Boot-Loader Needed!');
         syslog.logln('KERNEL', 'HALTING.');
@@ -276,16 +272,13 @@ begin
      usb_keyboard.UnitTest;
      usb_mouse.UnitTest;
 
-     { Main render loop — USB completions are now interrupt-driven }
+     { Register timer-driven tasks }
-     syslog.logln('KERNEL', 'Entering main render loop.');
+     graphicsrefresh.init;
-     while true do begin
+     usbhotplug.init;
-        desktop.update;
-        uidebug.update;
-        lvgl_handler;
-        usbcore.usb_check_hotplug;
-        video.Flush();
-     end;
 
+     { All work is now driven by timer interrupts — idle the CPU }
+     syslog.logln('KERNEL', 'All tasks registered. Halting into idle.');
+     kernel.yield();
 end;
  
 end.

src/vmemorymanager.pas

@@ -190,7 +190,7 @@ begin
     push_trace('vmemorymanager.vtop');
     idx:= address SHR 22;
     paddress:= uint32(KERNEL_PAGE_DIRECTORY^[idx].address) SHL 12;
-    loadd:= address AND $FFFFFF;
+    loadd:= address AND $3FFFFF;
     vtop:= paddress + loadd;
     pop_trace;
 end;