Merge pull request 'feature/ci-cd-drone-migration' (#3) from feature/ci-cd-drone-migration into develop

Reviewed-on: #3

.drone.yml

@@ -0,0 +1,52 @@
+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"

.gitlab-ci.yml

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

Dockerfile

@@ -16,7 +16,7 @@ RUN curl -sL https://sourceforge.net/projects/freepascal/files/Linux/$FPC_VERSIO
 
 COPY compile.sh /compile.sh
 ADD https://raw.githubusercontent.com/fsaintjacques/semver-tool/master/src/semver /usr/bin/semver
-RUN mkdir /code && chmod +x /usr/bin/semver
+RUN chmod +x /usr/bin/semver
 WORKDIR /code
 RUN find . -type f -print0 | xargs -0 dos2unix
 ENTRYPOINT ["/bin/bash", "-c"]

compile.sh

@@ -20,26 +20,30 @@ runOrFail() {
 	fi
 }
 
-runOrFail $(pwd)/compile_stub.sh "Failed to compile stub!"
+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!"
+)
 
-#Generate .pas with versioning headers.
+for ((i=0; i<${#run_steps[@]}; i+=2))
-runOrFail $(pwd)/compile_vergen.sh "Versions failed to compile"
+do
-
+	if [ "$ERRCOUNT" -eq "0" ]
-#Compile all .pas sources
+	then
-runOrFail $(pwd)/compile_sources.sh "Failed to compile FPC Sources!"
+			script=$(pwd)/"${run_steps[$i]}"
-
+			message="${run_steps[$i+1]}"
-#Link into a binary.
+			runOrFail "$script" "$message"
-runOrFail $(pwd)/compile_link.sh "Failed linking!"
+	fi
-
+done
-#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 -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
+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

doc/flatfs.md

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

@@ -1 +0,0 @@
-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,4 +33,5 @@ SECTIONS
     . = ALIGN(4096);
   }
   end = .; _end = .; __end = .;
+  kernel_end = .;
 }

src/console.pas

@@ -1776,14 +1776,15 @@ var
    fb: puint32;
 
 Begin
+     Ready:= False;
      fb:= puint32(uint32(multibootinfo^.framebuffer_addr));
      Console_Properties.Width:= multibootinfo^.framebuffer_width;
      Console_Properties.Height:= multibootinfo^.framebuffer_height;
      Console_Properties.BitsPerPixel:= multibootinfo^.framebuffer_bpp;
      Console_Properties.MAX_CELL_X:= (Console_Properties.Width div 8) - 1;
      Console_Properties.MAX_CELL_Y:= (Console_Properties.Height div 16) - 1;
-     If Console_Properties.BitsPerPixel <> 16 then while true do begin
+     If Console_Properties.BitsPerPixel <> 16 then begin
-
+        exit;
      end;
      kpalloc(uint32(fb));
      keyboard.hook(@keyhook);

src/cpu.pas

@@ -291,6 +291,28 @@ begin
     end;
 end;
 
+procedure enableAVX();
+begin
+    if CPUID.Capabilities1^.AVX then begin
+        asm
+            PUSH EAX
+            PUSH ECX
+            PUSH EDX
+            XOR ECX, ECX
+            db $0F
+            db $01
+            db $D0
+            OR EAX, 7
+            db $0F
+            db $01
+            db $D1
+            POP EDX
+            POP ECX
+            POP EAX
+        end;
+    end;
+end;
+
 procedure init();
 begin
     terminal.registerCommand('CPU', @Terminal_Command_CPU, 'CPU Info.');
@@ -300,6 +322,7 @@ begin
     getCPUCapabilities;
     getCPUClockSpeed;
     enableSSE;
+    enableAVX;
 end;
 
 end.

src/driver/bus/PCI.pas

@@ -91,7 +91,6 @@ 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 
 
@@ -443,34 +442,4 @@ 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,29 +21,6 @@ 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;
@@ -67,7 +44,6 @@ type
         address1       : uint32;
         address2       : uint32;
         address3       : uint32;
-
         address4       : uint32;
         address5       : uint32;
         CIS_pointer    : uint32;

src/driver/storage/ATA_ISR.pas

@@ -0,0 +1,85 @@
+//  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/filesystemmanager.pas

@@ -1,120 +0,0 @@
-{
-    Driver->Storage->FilesystemManager - Filesystem driver registry and routing.
-
-    Filesystem drivers (FAT32, FlatFS, etc.) register themselves here.
-    When VolumeManager discovers a volume, FilesystemManager probes it
-    against all registered filesystem drivers to detect the filesystem type.
-
-    @author(Aaron Hance <[email protected]>)
-}
-unit filesystemmanager;
-
-interface
-
-uses
-    lists,
-    lmemorymanager,
-    storagetypes,
-    strings,
-    tracer,
-    util;
-
-var
-    filesystems : PLinkedListBase;
-
-procedure init();
-procedure register_filesystem(filesystem : PFilesystem);
-function get_filesystem_count() : uint32;
-function get_filesystem(index : uint32) : PFilesystem;
-function find_filesystem_by_name(name : pchar) : PFilesystem;
-function find_filesystem_by_id(system_id : uint8) : PFilesystem;
-procedure probe_volume(volume : PStorage_Volume);
-
-implementation
-
-procedure init();
-begin
-    push_trace('FilesystemManager.init');
-    filesystems := LL_New(sizeof(TFilesystem));
-end;
-
-procedure register_filesystem(filesystem : PFilesystem);
-var
-    elm : void;
-begin
-    push_trace('FilesystemManager.register_filesystem');
-
-    elm := LL_Add(filesystems);
-    memcpy(uint32(filesystem), uint32(elm), sizeof(TFilesystem));
-end;
-
-function get_filesystem_count() : uint32;
-begin
-    get_filesystem_count := LL_Size(filesystems);
-end;
-
-function get_filesystem(index : uint32) : PFilesystem;
-begin
-    if index < LL_Size(filesystems) then
-        get_filesystem := PFilesystem(LL_Get(filesystems, index))
-    else
-        get_filesystem := nil;
-end;
-
-function find_filesystem_by_name(name : pchar) : PFilesystem;
-var
-    i  : uint32;
-    fs : PFilesystem;
-begin
-    push_trace('FilesystemManager.find_filesystem_by_name');
-    find_filesystem_by_name := nil;
-
-    for i := 0 to LL_Size(filesystems) - 1 do begin
-        fs := PFilesystem(LL_Get(filesystems, i));
-        if stringEquals(fs^.sName, name) then begin
-            find_filesystem_by_name := fs;
-            exit;
-        end;
-    end;
-end;
-
-function find_filesystem_by_id(system_id : uint8) : PFilesystem;
-var
-    i  : uint32;
-    fs : PFilesystem;
-begin
-    push_trace('FilesystemManager.find_filesystem_by_id');
-    find_filesystem_by_id := nil;
-
-    for i := 0 to LL_Size(filesystems) - 1 do begin
-        fs := PFilesystem(LL_Get(filesystems, i));
-        if fs^.system_id = system_id then begin
-            find_filesystem_by_id := fs;
-            exit;
-        end;
-    end;
-end;
-
-procedure probe_volume(volume : PStorage_Volume);
-var
-    i  : uint32;
-    fs : PFilesystem;
-begin
-    push_trace('FilesystemManager.probe_volume.enter');
-
-    { Try each registered filesystem's identify callback against this volume }
-    for i := 0 to LL_Size(filesystems) - 1 do begin
-        fs := PFilesystem(LL_Get(filesystems, i));
-        if fs^.identifyCallback <> nil then begin
-            push_trace('FilesystemManager.probe_volume.tryFS');
-            if fs^.identifyCallback(volume) then begin
-                volume^.filesystem := fs;
-                push_trace('FilesystemManager.probe_volume.found');
-                exit;
-            end;
-        end;
-    end;
-    push_trace('FilesystemManager.probe_volume.exit');
-end;
-
-end.