working storage system

# Conflicts:
#	src/include/lists.pas

.drone.yml

@@ -1,66 +0,0 @@
-kind: pipeline
-type: docker
-name: build
-
-steps:
-  - name: build-image
-    image: plugins/docker
-    settings:
-      repo: t3hn3rd/asuro-build
-      tags: latest
-      dockerfile: Dockerfile
-      registry: docker.io
-      username:
-        from_secret: docker_username
-      password:
-        from_secret: docker_password
-
-  - name: compile
-    image: t3hn3rd/asuro-build:latest
-    depends_on:
-      - build-image
-    commands:
-      - git fetch --tags
-      - 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:
-      - compile
-    when:
-      branch:
-        - master
-    environment:
-      GITEA_TOKEN:
-        from_secret: gitea_token
-    commands:
-      - apk add --no-cache curl
-      - chmod +w Asuro.iso
-      - cp Asuro.iso "Asuro-$(git rev-parse --short HEAD).iso"
-      - echo "Uploading Asuro-$(git rev-parse --short HEAD).iso to Gitea Packages..."
-      - |
-         curl -X PUT "https://gitea.spexeah.com/api/packages/Spexeah/generic/asuro-iso/$(git rev-parse --short HEAD)/Asuro.iso" \
-         -H "Authorization: token $GITEA_TOKEN" --upload-file "Asuro-$(git rev-parse --short HEAD).iso"
-      - echo "Updating latest ISO reference..."
-      - |
-        curl -X DELETE https://gitea.spexeah.com/api/packages/Spexeah/generic/asuro-iso/latest/Asuro.iso \
-        -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"
-
-  - 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}}"

.gitlab-ci.yml

@@ -0,0 +1,73 @@
+stages:
+  - Compile Versions
+  - Compile Sources
+  - Link
+  - Generate Documentation
+  - Deploy
+
+cache:
+  - key: ${CI_COMMIT_REF_SLUG}
+    paths:
+      - lib/*.o
+      - bin/kernel.bin
+      - doc
+
+before_script:
+  - chmod +x *.sh
+
+versions:
+  stage: Compile Versions
+  script:
+    - ./compile_vergen.sh
+  artifacts:
+    paths:
+      - release/*.svg
+      - src/include/asuro.pas
+
+compile_sources:
+  stage: Compile Sources
+  script:
+    - rm -f lib/*.so
+    - ./compile_sources.sh
+  needs:
+    - versions
+
+link:
+  stage: Link
+  script:
+    - ./compile_stub.sh
+    - ./compile_link.sh
+  needs:
+    - versions
+    - compile_sources
+
+isogen:
+  stage: Deploy
+  script:
+    - ./compile_isogen.sh
+    - ./compile_sumgen.sh
+  artifacts:
+    paths:
+      - ./Asuro.iso
+      - ./release/checksum.svg
+  needs:
+    - link
+
+docgen:
+  stage: Generate Documentation
+  only:
+    - master
+    - develop
+  script:
+    - ./compile_sourcelist.sh
+    - ./compile_docs.sh
+    # Remove comments when we want to use gitlab pages.
+    #- cp doc public
+  allow_failure: true
+  artifacts:
+    paths:
+      - doc
+      #- public/*
+      #- ./sources.list
+  needs:
+    - versions

.mailmap

@@ -1,13 +0,0 @@
-# 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

@@ -9,14 +9,14 @@ RUN apt-get update && apt-get install -y \
 	apt-get clean my room
 
 SHELL ["/bin/bash", "-c"]
-ARG FPC_VERSION=3.2.2
+ARG FPC_VERSION=2.6.4
 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
+RUN mkdir /code && chmod +x /usr/bin/semver
 WORKDIR /code
 RUN find . -type f -print0 | xargs -0 dos2unix
 ENTRYPOINT ["/bin/bash", "-c"]

compile.sh

@@ -20,30 +20,26 @@ runOrFail() {
 	fi
 }
 
-declare -a run_steps=(
-	"compile_stub.sh" "Failed to compile stub!"
-	"compile_vergen.sh" "Versions failed to compile"
-	"compile_sources.sh" "Failed to compile FPC Sources!"
-	"compile_link.sh" "Failed linking!"
-	"compile_isogen.sh" "Failed to create ISO!"
-)
+runOrFail $(pwd)/compile_stub.sh "Failed to compile stub!"
 
-for ((i=0; i<${#run_steps[@]}; i+=2))
-do
-	if [ "$ERRCOUNT" -eq "0" ]
-	then
-			script=$(pwd)/"${run_steps[$i]}"
-			message="${run_steps[$i+1]}"
-			runOrFail "$script" "$message"
-	fi
-done
+#Generate .pas with versioning headers.
+runOrFail $(pwd)/compile_vergen.sh "Versions failed to compile"
+
+#Compile all .pas sources
+runOrFail $(pwd)/compile_sources.sh "Failed to compile FPC Sources!"
+
+#Link into a binary.
+runOrFail $(pwd)/compile_link.sh "Failed linking!"
+
+#Generate an ISO with GRUB as the Bootloader.
+runOrFail ./compile_isogen.sh "Failed to create ISO!"
 
 #Call generate final artifacts based on failure or success of the above.
 if [ "$ERRCOUNT" -ne "0" ]
 then
-	. ./compile_finish.sh "failed"
+	./compile_finish.sh "failed"
 else
-	. ./compile_finish.sh "success"
+	./compile_finish.sh "success"
 fi
 
 cd ..

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 -n -O3 -Op3 -Si -Sc -Sg -Xd -CX -XXs -CfSSE -CfSSE2 -Rintel -Pi386 -Tlinux -FElib/ -Fusrc/* -Fusrc/driver/storage/* -Fusrc/driver/storage/AHCI/* -Fusrc/driver/* -Fusrc/driver/net/* -Fusrc/prog/*  src/kernel.pas

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!

linker.script

@@ -2,7 +2,7 @@ ENTRY(loader)
 SECTIONS
 {
   . = 0xC0100000;
-  kernel_start = .;
+
   .text : AT(ADDR(.text) - 0xC0000000)
   {
     text = .; _text = .; __text = .;
@@ -33,15 +33,4 @@ SECTIONS
     . = ALIGN(4096);
   }
   end = .; _end = .; __end = .;
-  kernel_end = .;
-
-  /DISCARD/ : {
-    *(.init_array*)
-    *(.fini_array*)
-    *(.ctors)
-    *(.dtors)
-    *(.eh_frame*)
-    *(.gcc_except_table*)
-    *(.note.GNU-stack)
-  }
 }

src/driver/bus/PCI.pas

@@ -91,6 +91,7 @@ function getDeviceInfo(class_code : uint8; subclass_code : uint8; prog_if : uint
 procedure requestConfig(bus : uint8; slot : uint8; func : uint8; row : uint8);
 procedure writeConfig(bus: uint8; slot : uint8; func : uint8; row : uint8; val : uint32);
 procedure setBusMaster(bus : uint8; slot : uint8; func : uint8; master : boolean);
+procedure enableDevice(bus : uint8; slot : uint8; func : uint8);
 
 implementation 
 
@@ -442,4 +443,34 @@ begin
     pop_trace;
 end;
 
+//Enable device inturrupts and set bus master
+procedure enableDevice(bus : uint8; slot : uint8; func : uint8);
+var
+    addr : uint32;
+    cmd : uint32;
+begin
+    push_trace('PCI.enableDevice');
+
+    addr := ($1 shl 31);
+    addr := addr or (bus shl 16);
+    addr := addr or ((slot) shl 11);
+    addr := addr or ((func) shl 8);
+    addr := addr or ($04 and $FC);
+
+    outl(PCI_CONFIG_ADDRESS_PORT, addr);
+    cmd := inl(PCI_CONFIG_DATA_PORT);
+    cmd := cmd or PCI_COMMAND_MEM_SPACE;
+    cmd := cmd or PCI_COMMAND_BUS_MASTER;
+    cmd := cmd or (3 shl 1);
+
+    //enable interrupts, remove disable interrupt bit maybe
+    cmd := cmd and not PCI_COMMAND_INT_DISABLE;
+    // cmd := cmd and not (1 shl 9);
+
+    outl(PCI_CONFIG_ADDRESS_PORT, addr);
+    outl(PCI_CONFIG_DATA_PORT, cmd);
+
+    pop_trace;
+end;
+
 end.

src/driver/include/drivertypes.pas

@@ -21,6 +21,29 @@ unit drivertypes;
 
 interface
 
+const
+    PCI_CONFIG_ADDRESS_PORT = $0CF8;
+    PCI_CONFIG_DATA_PORT    = $0CFC;
+
+    PCI_COMMAND_IO_SPACE    = $0001;
+    PCI_COMMAND_MEM_SPACE   = $0002;
+    PCI_COMMAND_BUS_MASTER  = $0004;
+    PCI_COMMAND_SPECIAL_CYC = $0008;
+    PCI_COMMAND_MEM_WRITE   = $0010;
+    PCI_COMMAND_VGA_PALETTE = $0020;
+    PCI_COMMAND_PARITY      = $0040;
+    PCI_COMMAND_WAIT        = $0080;
+    PCI_COMMAND_SERR        = $0100;
+    PCI_COMMAND_FAST_BACK   = $0200;
+    PCI_COMMAND_INT_DISABLE = $0400;
+    PCI_COMMAND_SERR_ENABLE = $8000;
+
+    PCI_CAP_ID_MSI           = $05;
+
+    // Bits in the MSI Control register (16-bit):
+    MSI_CONTROL_ENABLE       = 1 shl 0;  // Bit 0
+    MSI_CONTROL_64BIT        = 1 shl 7;  // Bit 7
+    MSI_CONTROL_PVMASK       = 1 shl 8;  // Bit 8 (optional: per-vector masking)
 type
 
     PPCI_Device = ^TPCI_Device;
@@ -44,6 +67,7 @@ type
         address1       : uint32;
         address2       : uint32;
         address3       : uint32;
+
         address4       : uint32;
         address5       : uint32;
         CIS_pointer    : uint32;

src/driver/interface/serial.pas

@@ -58,19 +58,16 @@ begin
 end;
 
 function sinb(port : uint16) : uint8;
-var
-     tmp : uint8;
 begin
      asm
           PUSH EAX
           PUSH EDX
           MOV DX, port
           IN AL, DX
-          MOV tmp, AL
+          MOV sinb, AL
           POP EDX
           POP EAX
      end;
-     sinb := tmp;
      io_wait;
 end;
 

src/driver/net/l5/dhcp.pas

@@ -491,26 +491,22 @@ begin
         
         { Create a new header to the use in our DHCP REQUEST packet }
         SendHeader:= createHeader();
-        CopyIPv4(@getIPv4Config^.Address[0], puint8(@SendHeader^.Client_IP[0]));
+        CopyIPv4(puint8(@Header^.Your_IP[0]), puint8(@SendHeader^.Client_IP[0]));
         CopyIPv4(puint8(@Header^.Server_IP[0]), puint8(@SendHeader^.Server_IP[0]));
         processHeader(SendHeader);
 
         { Setup Options }
         SendOptions:= newOptions();
-
         { Create a message type option and assign it the value REQUEST }
         SendMsgType:= ord(TDHCPMessageType.REQUEST);
         NewOption(SendOptions, TDHCPOpCode.DHCP_MESSAGE_TYPE, void(@SendMsgType), 1, false);
-
         { Create a Requested IP option and assign it the value from the OFFER packet header }
-        NewOption(SendOptions, TDHCPOpCode.REQUESTED_IP_ADDRESS, void(@Header^.Your_IP[0]), 4, false);
-
+        NewOption(SendOptions, TDHCPOpCode.REQUESTED_IP_ADDRESS, void(@SendHeader^.Client_IP[0]), 4, false);
         { Create a Server Identifier Option and assign it the value from the OFFER packet options }
         Option:= getOptionByOpcode(Options, TDHCPOpCode.SERVER_IDENTIFIER);
         if Option <> nil then begin
             NewOption(SendOptions, TDHCPOpCode.SERVER_IDENTIFIER, void(@Option^.Value[0]), 4, false);
         end;
-
         { Create a Parameter Request List, Request the following: Netmask, Gateway, DNS Name & DNS Server }
         RequestParams[0]:= Ord(TDHCPOpCode.SUBNET_MASK);
         RequestParams[1]:= Ord(TDHCPOpCode.ROUTER);
@@ -526,13 +522,9 @@ begin
         MAC:= getMAC();
         packetCtx:= PPacketContext(Kalloc(sizeof(TPacketContext)));
         packetCtx^.TTL:= 128;
-
-        { Copy over MAC - src: broadcast - dst: DHCP Server }
-        copyMAC(MAC, @packetCtx^.MAC.Source[0]);
         copyMAC(@BROADCAST_MAC[0], @packetCtx^.MAC.Destination[0]);
-        
-        { Copy over IP - src: NULL - dst: Broadcast }
-        CopyIPv4(@getIPv4Config^.Address[0], @packetCtx^.IP.Source[0]);
+        copyMAC(MAC, @packetCtx^.MAC.Source[0]);
+        copyIPv4(@NULL_IP[0], @packetCtx^.IP.Source[0]);
         copyIPv4(@BROADCAST_IP[0], @packetCtx^.IP.Destination[0]);
 
         { Setup UDPContext (UDP) & copy in the correct details }
@@ -578,7 +570,7 @@ begin
 
     { Check the frame is for us and then process }
     MAC:= getMAC;
-    if MACEqual(@context^.PacketContext^.MAC.Destination[0], MAC) or MACEqual(@context^.PacketContext^.MAC.Destination[0], BROADCAST_MAC) then begin
+    if MACEqual(@context^.PacketContext^.MAC.Destination[0], MAC) then begin
         Outputln('DHCP','Frame is addressed to us.');
         { Check the message type is client specific }
         If Header^.Message_Type = $02 then begin
@@ -663,7 +655,7 @@ begin
         copyMAC(@BROADCAST_MAC[0], @packetCtx^.MAC.Destination[0]);
         MAC:= getMAC;
         copyMAC(MAC, @packetCtx^.MAC.Source[0]);
-        CopyIPv4(@getIPv4Config^.Address[0], @packetCtx^.IP.Source[0]);
+        copyIPv4(@NULL_IP[0], @packetCtx^.IP.Source[0]);
         copyIPv4(@BROADCAST_IP[0], @packetCtx^.IP.Destination[0]);
 
         { Setup UDPContext (UDP) }

src/driver/storage/ATA_ISR.pas

@@ -1,85 +0,0 @@
-//  Copyright 2021 Aaron Hance
-//
-//  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.
-
-{ 
-	Drivers->Storage->ATA_ISR - Primary ATA IRQ.
-	
-	@author(Aaron Hance <[email protected]>)
-}
-unit ATA_ISR;
-
-interface
-
-uses
-    util,
-    console,
-    isr_types,
-    isrmanager,
-    IDT;
-
-procedure register();
-procedure hook(hook_method : uint32);
-procedure unhook(hook_method : uint32);
-
-implementation
-
-var
-    Hooks : Array[1..MAX_HOOKS] of pp_hook_method;
-
-procedure Main(); interrupt;
-var
-    i : integer;
-    
-begin
-    CLI;
-    for i:=0 to MAX_HOOKS-1 do begin
-        if uint32(Hooks[i]) <> 0 then Hooks[i](void($00000000));
-    end;
-    console.writestringln('Disk Operation Complete');
-end;
-
-procedure register();
-begin
-    memset(uint32(@Hooks[0]), 0, sizeof(pp_hook_method)*MAX_HOOKS);
-    //isrmanager.registerISR(76, @Main);
-    //IDT.set_gate(76, uint32(@Main), $08, ISR_RING_0);
-end;
-
-procedure hook(hook_method : uint32);
-var
-    i : uint32;
-
-begin
-    for i:=0 to MAX_HOOKS-1 do begin
-        if uint32(Hooks[i]) = hook_method then exit;
-    end;
-    for i:=0 to MAX_HOOKS-1 do begin
-        if uint32(Hooks[i]) = 0 then begin
-            Hooks[i]:= pp_hook_method(hook_method);
-            exit;
-        end;
-    end;
-end;
-
-procedure unhook(hook_method : uint32);
-var
-    i : uint32;
-begin
-    for i:=0 to MAX_HOOKS-1 do begin
-        If uint32(Hooks[i]) = hook_method then Hooks[i]:= nil;
-        exit;
-    end;
-end;
-
-end.

src/driver/storage/Filesystems/asfs.pas

@@ -23,14 +23,15 @@ interface
 
 uses
     console,
-    storagemanagement,
-    util, terminal,
-    lmemorymanager,
-    strings,
     lists,
-    tracer,
+    lmemorymanager,
+    rtc,
     serial,
-    rtc;
+    storagemanagement,
+    strings,
+    terminal,
+    tracer,
+    util;
 
 type