fix(workflow): add GH_TOKEN environment variable for GitHub CLI

I did this because on every reboot xauth directory was changing, and had to rebuild the container.

.devcontainer/Dockerfile

@@ -0,0 +1,127 @@
+FROM mcr.microsoft.com/devcontainers/cpp:1-ubuntu-24.04
+
+ARG REINSTALL_CMAKE_VERSION_FROM_SOURCE="none"
+
+COPY ./reinstall-cmake.sh /tmp/
+RUN <<EOF
+if [ "${REINSTALL_CMAKE_VERSION_FROM_SOURCE}" != "none" ]; then
+	chmod +x /tmp/reinstall-cmake.sh && /tmp/reinstall-cmake.sh ${REINSTALL_CMAKE_VERSION_FROM_SOURCE};
+fi
+rm -f /tmp/reinstall-cmake.sh
+EOF
+
+# Update system and set noninteractive env
+RUN export DEBIAN_FRONTEND=noninteractive && apt-get update
+
+# Required packages for building gcc & binutils
+RUN apt-get -y install --no-install-recommends \
+	build-essential \
+	bison \
+	flex \
+	libgmp-dev \
+	libmpfr-dev \
+	texinfo \
+	file \
+	python3-dev
+
+# Required packages for building qemu
+RUN apt-get -y install --no-install-recommends \
+	git \
+	libglib2.0-dev \
+	libfdt-dev \
+	libpixman-1-dev \
+	zlib1g-dev \
+	ninja-build \
+	libaio-dev \
+	libbluetooth-dev \
+	libcapstone-dev \
+	libbrlapi-dev \
+	libbz2-dev \
+	libcap-ng-dev \
+	libcurl4-gnutls-dev \
+	libgtk-3-dev \
+	libibverbs-dev \
+	libjpeg8-dev \
+	libncurses5-dev \
+	libnuma-dev \
+	librbd-dev \
+	librdmacm-dev \
+	libsasl2-dev \
+	libsdl2-dev \
+	libseccomp-dev \
+	libsnappy-dev \
+	libssh-dev \
+	libvde-dev \
+	libvdeplug-dev \
+	libvte-2.91-dev \
+	libxen-dev \
+	liblzo2-dev \
+	valgrind \
+	xfslibs-dev \
+	libnfs-dev \
+	libiscsi-dev \
+	python3-venv \
+	libslirp-dev \
+	ovmf
+
+# Required packages for building test apps in userspace
+RUN apt-get -y install --no-install-recommends \
+	mingw-w64 \
+	libtool \
+	libltdl-dev
+
+# Required packages for building the OS and misc
+RUN apt-get -y install --no-install-recommends \
+	grub2-common \
+	xorriso \
+	mtools \
+	grub-common \
+	grub-efi-amd64-bin \
+	grub-efi-amd64-signed \
+	grub-gfxpayload-lists \
+	grub-pc-bin \
+	grub-pc \
+	grub2-common \
+	pip \
+	cmake
+
+# Install git-cliff
+RUN pip install git-cliff --break-system-packages
+
+# Install meson
+RUN pip install meson --break-system-packages
+
+# Configure git
+RUN <<EOF
+git config --global advice.detachedHead false
+git config --global core.autocrlf input
+git config --global init.defaultbranch master
+EOF
+
+# Set display environment variable for QEMU
+ENV DISPLAY=:0
+ENV NO_AT_BRIDGE=1
+
+# Set PATH
+RUN <<EOF
+echo PATH=$PATH:/workspaces/Fennix/cross/bin >> /etc/profile
+EOF
+
+ENV CHMOD_KVM=1
+
+# Remove autoconf & automake
+RUN sudo apt-get -y remove autoconf automake
+
+# Required packages for building gcc & binutils
+RUN <<EOF
+wget https://launchpad.net/ubuntu/+archive/primary/+files/autoconf_2.69-11.1_all.deb -O /tmp/autoconf.deb
+sudo dpkg --force-all -i /tmp/autoconf.deb
+EOF
+
+# Required packages for building gcc & binutils
+RUN <<EOF
+wget https://ftp.gnu.org/gnu/automake/automake-1.15.1.tar.gz -O /tmp/automake.tar.gz
+tar -xzf /tmp/automake.tar.gz -C /tmp
+cd /tmp/automake-1.15.1
+./configure && make && sudo make install
+EOF

.devcontainer/devcontainer.json

@@ -0,0 +1,45 @@
+// For format details, see https://aka.ms/devcontainer.json. For config options, see the
+// README at: https://github.com/devcontainers/templates/tree/main/src/cpp
+{
+	"name": "Fennix",
+	"build": {
+		"dockerfile": "Dockerfile"
+	},
+	"customizations": {
+		"vscode": {
+			"extensions": [
+				"ms-azuretools.vscode-docker",
+				"eamodio.gitlens",
+				"EditorConfig.EditorConfig",
+				"naumovs.color-highlight",
+				"Gruntfuggly.todo-tree",
+				"ms-vscode.hexeditor",
+				"vivaxy.vscode-conventional-commits",
+				"webfreak.debug",
+				"maziac.asm-code-lens",
+				"Seven1bit.vscode-ext-ansi-color-highlight",
+				"ms-vsliveshare.vsliveshare",
+				"maziac.hex-hover-converter",
+				"ms-vscode.makefile-tools"
+			]
+		}
+	},
+	// From this line below are for qemu, so not that important.
+	"initializeCommand": "[ -x \"$(command -v xhost)\" ] && xhost +local:docker || true", // "xhost -local:docker" to disable
+	"mounts": [
+		{
+			"source": "/tmp/.X11-unix",
+			"target": "/tmp/.X11-unix",
+			"type": "bind"
+		},
+		{
+			"source": "/run/user/1000/pulse/native",
+			"target": "/run/user/1000/pulse/native",
+			"type": "bind"
+		}
+	],
+	"runArgs": [
+		"--privileged",
+		"--network=host"
+	]
+}

.devcontainer/reinstall-cmake.sh

@@ -0,0 +1,59 @@
+#!/usr/bin/env bash
+#-------------------------------------------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See https://go.microsoft.com/fwlink/?linkid=2090316 for license information.
+#-------------------------------------------------------------------------------------------------------------
+#
+set -e
+
+CMAKE_VERSION=${1:-"none"}
+
+if [ "${CMAKE_VERSION}" = "none" ]; then
+    echo "No CMake version specified, skipping CMake reinstallation"
+    exit 0
+fi
+
+# Cleanup temporary directory and associated files when exiting the script.
+cleanup() {
+    EXIT_CODE=$?
+    set +e
+    if [[ -n "${TMP_DIR}" ]]; then
+        echo "Executing cleanup of tmp files"
+        rm -Rf "${TMP_DIR}"
+    fi
+    exit $EXIT_CODE
+}
+trap cleanup EXIT
+
+
+echo "Installing CMake..."
+apt-get -y purge --auto-remove cmake
+mkdir -p /opt/cmake
+
+architecture=$(dpkg --print-architecture)
+case "${architecture}" in
+    arm64)
+        ARCH=aarch64 ;;
+    amd64)
+        ARCH=x86_64 ;;
+    *)
+        echo "Unsupported architecture ${architecture}."
+        exit 1
+        ;;
+esac
+
+CMAKE_BINARY_NAME="cmake-${CMAKE_VERSION}-linux-${ARCH}.sh"
+CMAKE_CHECKSUM_NAME="cmake-${CMAKE_VERSION}-SHA-256.txt"
+TMP_DIR=$(mktemp -d -t cmake-XXXXXXXXXX)
+
+echo "${TMP_DIR}"
+cd "${TMP_DIR}"
+
+curl -sSL "https://github.com/Kitware/CMake/releases/download/v${CMAKE_VERSION}/${CMAKE_BINARY_NAME}" -O
+curl -sSL "https://github.com/Kitware/CMake/releases/download/v${CMAKE_VERSION}/${CMAKE_CHECKSUM_NAME}" -O
+
+sha256sum -c --ignore-missing "${CMAKE_CHECKSUM_NAME}"
+sh "${TMP_DIR}/${CMAKE_BINARY_NAME}" --prefix=/opt/cmake --skip-license
+
+ln -s /opt/cmake/bin/cmake /usr/local/bin/cmake
+ln -s /opt/cmake/bin/ctest /usr/local/bin/ctest

.editorconfig

@@ -15,3 +15,12 @@ indent_style = tab
 [.github/**]
 indent_style = space
 indent_size = 2
+
+[{CMakeLists.txt,*.cmake}]
+indent_size = 2
+indent_style = space
+
+[*.md]
+indent_style = space
+indent_size = 4
+trim_trailing_whitespace = false

.github/workflows/makefile.yml

@@ -22,53 +22,19 @@ jobs:
         path: tools/cross
         key: ${{ runner.os }}-cross-${{ hashFiles('tools/Makefile') }}
 
-    - name: Update System
-      if: steps.cache-cross.outputs.cache-hit != 'true'
-      run: sudo apt update
-
-    - name: Install GCC Dependencies
-      if: steps.cache-cross.outputs.cache-hit != 'true'
-      run: sudo apt --no-install-recommends -y install build-essential bison flex libgmp3-dev libmpc-dev libmpfr-dev texinfo libzstd-dev libisl-dev m4 automake gettext gperf dejagnu guile-3.0 guile-3.0-dev expect tcl autogen tex-common sphinx-common git ssh diffutils patch autoconf2.69 libtool wget dpkg
-
-    - name: Check autoconf
-      if: steps.cache-cross.outputs.cache-hit != 'true'
+    - name: Prepare Environment for Dev Container
       run: |
-        if [ "$(autoconf --version | head -n 1 | awk '{print $NF}')" != "2.69" ]; then
-          echo "Autoconf version is not 2.69, performing additional steps..."
-          wget https://launchpad.net/ubuntu/+archive/primary/+files/autoconf_2.69-11.1_all.deb
-          sudo dpkg --force-all -i ./autoconf_2.69-11.1_all.deb
-        fi
+        sudo mkdir -p /tmp/.X11-unix
+        sudo mkdir -p /run/user/1000/pulse
+        sudo touch /run/user/1000/pulse/native
 
-    - name: Check automake
+    - name: Run make ci-setup in dev container
       if: steps.cache-cross.outputs.cache-hit != 'true'
-      run: |
-        if [ "$(automake --version | head -n 1 | awk '{print $NF}')" != "1.15.1" ]; then
-          echo "Automake version is not 1.15.1, performing additional steps..."
-          wget https://ftp.gnu.org/gnu/automake/automake-1.15.1.tar.gz
-          tar -xzf automake-1.15.1.tar.gz
-          cd automake-1.15.1
-          ./configure
-          make
-          sudo make install
-        fi
-
-    - name: Clone All
-      if: steps.cache-cross.outputs.cache-hit != 'true'
-      run: make --quiet -C tools __clone_all_no_qemu
-
-    - name: Compile Binutils
-      if: steps.cache-cross.outputs.cache-hit != 'true'
-      run: make --quiet -C tools do_binutils
-
-    - name: Compile GCC
-      if: steps.cache-cross.outputs.cache-hit != 'true'
-      run: make --quiet -C tools do_gcc
-
-    - name: Clean Up
-      if: steps.cache-cross.outputs.cache-hit != 'true'
-      run: |
-        cd tools
-        rm -rf binutils-gdb gcc
+      uses: devcontainers/ci@v0.3
+      with:
+        push: never
+        runCmd: |
+          /usr/bin/make ci-setup
 
   analyze:
     name: Analyze (${{ matrix.language }})
@@ -145,47 +111,15 @@ jobs:
       with:
         category: "/language:${{matrix.language}}"
 
-  deploydoc:
-    name: Deploy Documentation to GitHub Pages
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-        with:
-          submodules: recursive
-
-      - name: Update System
-        run: sudo apt update
-
-      - name: Install Doxygen
-        run: sudo apt --no-install-recommends -y install doxygen make
-
-      - name: Generate Documentation
-        run: make doxygen
-
-      - name: Copy GitHub Pages Website
-        run: cp -r tools/website/* doxygen-doc/
-
-      - name: Deploy documentation
-        uses: JamesIves/github-pages-deploy-action@v4
-        with:
-          folder: doxygen-doc
-
-  compile_amd64:
-    name: Build amd64
+  compile:
+    name: Build OS
     runs-on: ubuntu-latest
     needs: [buildcompiler]
     steps:
     - uses: actions/checkout@v4
       with:
         submodules: recursive
-
-    - name: Update & Install Required Packages
-      run: |
-        sudo apt update
-        sudo apt --no-install-recommends -y install rustc xorriso mtools genisoimage ovmf nasm doxygen make meson gcc-10 g++-10 gcc-mingw-w64-x86-64 gcc-mingw-w64-i686 mingw-w64
-        make --quiet -C tools do_limine
-        make --quiet prepare
+        fetch-depth: 0
 
     - name: Cache cross Folder
       id: cache-cross
@@ -194,167 +128,98 @@ jobs:
         path: tools/cross
         key: ${{ runner.os }}-cross-${{ hashFiles('tools/Makefile') }}
 
-    - name: Configure config.mk
-      run: sed -i 's/.*OSARCH = .*/OSARCH = amd64/' ./config.mk && cat config.mk | grep OSARCH
-
-    - name: Compile Debug and Release ISO
+    - name: Prepare Environment for Dev Container
       run: |
-        make build
-        mv Fennix.iso Fennix-debug.iso
-        make clean
-        sed -i 's/.*DEBUG = .*/DEBUG = 0/' ./config.mk && cat config.mk | grep DEBUG
-        make build
-        mv Fennix.iso Fennix-release.iso
+        sudo mkdir -p /tmp/.X11-unix
+        sudo mkdir -p /run/user/1000/pulse
+        sudo touch /run/user/1000/pulse/native
 
-    - name: Upload Artifact (Fennix-debug.iso)
+    - name: Build AMD64 Debug
+      if: always()
+      uses: devcontainers/ci@v0.3
+      with:
+        push: never
+        runCmd: /usr/bin/make __ci-amd64-debug
+
+    - name: Build AMD64 Release
+      if: always()
+      uses: devcontainers/ci@v0.3
+      with:
+        push: never
+        runCmd: /usr/bin/make __ci-amd64-release
+
+    - name: Build i386 Debug
+      if: always()
+      uses: devcontainers/ci@v0.3
+      with:
+        push: never
+        runCmd: /usr/bin/make __ci-i386-debug
+
+    - name: Build i386 Release
+      if: always()
+      uses: devcontainers/ci@v0.3
+      with:
+        push: never
+        runCmd: /usr/bin/make __ci-i386-release
+
+    - name: Build ARM Debug
+      if: always()
+      uses: devcontainers/ci@v0.3
+      with:
+        push: never
+        runCmd: /usr/bin/make __ci-arm-debug
+
+    - name: Build ARM Release
+      if: always()
+      uses: devcontainers/ci@v0.3
+      with:
+        push: never
+        runCmd: /usr/bin/make __ci-arm-release
+
+    - name: Build AArch64 Debug
+      if: always()
+      uses: devcontainers/ci@v0.3
+      with:
+        push: never
+        runCmd: /usr/bin/make __ci-aarch64-debug
+
+    - name: Build AArch64 Release
+      if: always()
+      uses: devcontainers/ci@v0.3
+      with:
+        push: never
+        runCmd: /usr/bin/make __ci-aarch64-release
+
+    - name: Build Prepare Archive
+      if: always()
+      uses: devcontainers/ci@v0.3
+      with:
+        push: never
+        runCmd: /usr/bin/make __ci-prepare-archive
+
+    - name: Upload Artifact
+      if: always()
       uses: actions/upload-artifact@v4
       with:
-        name: Fennix-amd64-debug
-        path: Fennix-debug.iso
+        name: artifacts
+        path: artifacts/
 
-    - name: Upload Artifact (Fennix-release.iso)
-      uses: actions/upload-artifact@v4
-      with:
-        name: Fennix-amd64-release
-        path: Fennix-release.iso
-
-  compile_i386:
-    name: Build i386
+  nightly:
+    if: always()
+    name: Upload Nightly Build to GitHub Releases
     runs-on: ubuntu-latest
-    needs: [buildcompiler]
+    needs: [compile]
     steps:
     - uses: actions/checkout@v4
       with:
         submodules: recursive
+        fetch-depth: 0
 
-    - name: Update & Install Required Packages
-      run: |
-        sudo apt update
-        sudo apt --no-install-recommends -y install rustc xorriso mtools genisoimage ovmf nasm doxygen make meson gcc-10 g++-10 gcc-mingw-w64-x86-64 gcc-mingw-w64-i686 mingw-w64
-        make --quiet -C tools do_limine
-        make --quiet prepare
+    - name: Download All Builds
+      uses: actions/download-artifact@v4
 
-    - name: Cache cross Folder
-      id: cache-cross
-      uses: actions/cache@v4
-      with:
-        path: tools/cross
-        key: ${{ runner.os }}-cross-${{ hashFiles('tools/Makefile') }}
+    - name: Update Nightly
+      run: gh release upload nightly artifacts/* -R ${{github.repository}} --clobber
 
-    - name: Configure config.mk
-      run: sed -i 's/.*OSARCH = .*/OSARCH = i386/' ./config.mk && cat config.mk | grep OSARCH
-
-    - name: Compile Debug and Release ISO
-      run: |
-        make build
-        mv Fennix.iso Fennix-debug.iso
-        make clean
-        sed -i 's/.*DEBUG = .*/DEBUG = 0/' ./config.mk && cat config.mk | grep DEBUG
-        make build
-        mv Fennix.iso Fennix-release.iso
-
-    - name: Upload Artifact (Fennix-debug.iso)
-      uses: actions/upload-artifact@v4
-      with:
-        name: Fennix-i386-debug
-        path: Fennix-debug.iso
-
-    - name: Upload Artifact (Fennix-release.iso)
-      uses: actions/upload-artifact@v4
-      with:
-        name: Fennix-i386-release
-        path: Fennix-release.iso
-
-  compile_aarch64:
-    name: Build aarch64
-    runs-on: ubuntu-latest
-    needs: [buildcompiler]
-    steps:
-    - uses: actions/checkout@v4
-      with:
-        submodules: recursive
-
-    - name: Update & Install Required Packages
-      run: |
-        sudo apt update
-        sudo apt --no-install-recommends -y install rustc xorriso mtools genisoimage ovmf nasm doxygen make meson gcc-10 g++-10 gcc-mingw-w64-x86-64 gcc-mingw-w64-i686 mingw-w64
-        make --quiet -C tools do_limine
-        make --quiet prepare
-
-    - name: Cache cross Folder
-      id: cache-cross
-      uses: actions/cache@v4
-      with:
-        path: tools/cross
-        key: ${{ runner.os }}-cross-${{ hashFiles('tools/Makefile') }}
-
-    - name: Configure config.mk
-      run: sed -i 's/.*OSARCH = .*/OSARCH = aarch64/' ./config.mk && cat config.mk | grep OSARCH
-
-    - name: Compile Debug and Release ISO
-      run: |
-        make build
-        mv Fennix.iso Fennix-debug.iso
-        make clean
-        sed -i 's/.*DEBUG = .*/DEBUG = 0/' ./config.mk && cat config.mk | grep DEBUG
-        make build
-        mv Fennix.iso Fennix-release.iso
-
-    - name: Upload Artifact (Fennix-debug.iso)
-      uses: actions/upload-artifact@v4
-      with:
-        name: Fennix-aarch64-debug
-        path: Fennix-debug.iso
-
-    - name: Upload Artifact (Fennix-release.iso)
-      uses: actions/upload-artifact@v4
-      with:
-        name: Fennix-aarch64-release
-        path: Fennix-release.iso
-
-  compile_arm:
-    name: Build arm
-    runs-on: ubuntu-latest
-    needs: [buildcompiler]
-    steps:
-    - uses: actions/checkout@v4
-      with:
-        submodules: recursive
-
-    - name: Update & Install Required Packages
-      run: |
-        sudo apt update
-        sudo apt --no-install-recommends -y install rustc xorriso mtools genisoimage ovmf nasm doxygen make meson gcc-10 g++-10 gcc-mingw-w64-x86-64 gcc-mingw-w64-i686 mingw-w64
-        make --quiet -C tools do_limine
-        make --quiet prepare
-
-    - name: Cache cross Folder
-      id: cache-cross
-      uses: actions/cache@v4
-      with:
-        path: tools/cross
-        key: ${{ runner.os }}-cross-${{ hashFiles('tools/Makefile') }}
-
-    - name: Configure config.mk
-      run: sed -i 's/.*OSARCH = .*/OSARCH = arm/' ./config.mk && cat config.mk | grep OSARCH
-
-    - name: Compile Debug and Release ISO
-      run: |
-        make build
-        mv Fennix.iso Fennix-debug.iso
-        make clean
-        sed -i 's/.*DEBUG = .*/DEBUG = 0/' ./config.mk && cat config.mk | grep DEBUG
-        make build
-        mv Fennix.iso Fennix-release.iso
-
-    - name: Upload Artifact (Fennix-debug.iso)
-      uses: actions/upload-artifact@v4
-      with:
-        name: Fennix-arm-debug
-        path: Fennix-debug.iso
-
-    - name: Upload Artifact (Fennix-release.iso)
-      uses: actions/upload-artifact@v4
-      with:
-        name: Fennix-arm-release
-        path: Fennix-release.iso
+    env:
+      GH_TOKEN: ${{ github.token }}

.github/workflows/website.yml

@@ -0,0 +1,33 @@
+name: Deploy Website
+
+on:
+  push:
+    branches: [ master ]
+    paths:
+      - tools/website/**
+      - Kernel/include/interface/**
+      - Doxyfile
+
+jobs:
+  deploydoc:
+    name: Deploy Website to GitHub Pages
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code 🛎️
+        uses: actions/checkout@v4
+
+      - name: Install Doxygen 📦
+        run: |
+          sudo apt update
+          sudo apt --no-install-recommends -y install doxygen make
+
+      - name: Generate Documentation 📚
+        run: make doxygen
+
+      - name: Copy GitHub Pages Website 📁
+        run: cp -r tools/website/* doxygen-doc/
+
+      - name: Deploy documentation 🚀
+        uses: JamesIves/github-pages-deploy-action@v4
+        with:
+          folder: doxygen-doc

.gitignore

@@ -1,9 +1,10 @@
 iso_tmp_data
-initrd_tmp_data
-initrd/usr/include/*
-!initrd/usr/include/.gitkeep
+artifacts
+tmp_rootfs
+rootfs/usr/include/*
+!rootfs/usr/include/.gitkeep
 doxygen-doc
-initrd.tar
+rootfs.tar.gz
 .dccache
 *.log
 *.log.*

.vscode/launch.json

@@ -19,15 +19,20 @@
 					"description": "Make breakpoint pending on future shared library load."
 				},
 				{
-					"text": "add-symbol-file ${workspaceFolder}/../initrd_tmp_data/bin/utest",
-					"description": "Load /bin/utest",
+					"text": "add-symbol-file ${workspaceFolder}/../tmp_rootfs/bin/utest",
+					"description": "/bin/utest (0x00400000)",
+					"ignoreFailures": true
+				},
+				{
+					"text": "add-symbol-file ${workspaceFolder}/../tmp_rootfs/bin/libc_test",
+					"description": "/bin/libc_test (0x00600000)",
 					"ignoreFailures": true
 				},
 				{
 					"text": "source ${workspaceFolder}/../tools/.gdbinit"
 				}
 			],
-			"preLaunchTask": "launch-qemu"
+			"preLaunchTask": "QEMU"
 		},
 		{
 			"name": "Debug Kernel (x86)",
@@ -47,15 +52,20 @@
 					"description": "Make breakpoint pending on future shared library load."
 				},
 				{
-					"text": "add-symbol-file ${workspaceFolder}/../initrd_tmp_data/bin/utest",
-					"description": "Load /bin/utest",
+					"text": "add-symbol-file ${workspaceFolder}/../tmp_rootfs/bin/utest",
+					"description": "/bin/utest (0x00400000)",
+					"ignoreFailures": true
+				},
+				{
+					"text": "add-symbol-file ${workspaceFolder}/../tmp_rootfs/bin/libc_test",
+					"description": "/bin/libc_test (0x00600000)",
 					"ignoreFailures": true
 				},
 				{
 					"text": "source ${workspaceFolder}/../tools/.gdbinit"
 				}
 			],
-			"preLaunchTask": "launch-qemu"
+			"preLaunchTask": "QEMU"
 		},
 		{
 			"name": "Debug Kernel (arm64)",
@@ -75,15 +85,20 @@
 					"description": "Make breakpoint pending on future shared library load."
 				},
 				{
-					"text": "add-symbol-file ${workspaceFolder}/../initrd_tmp_data/bin/utest",
-					"description": "Load /bin/utest",
+					"text": "add-symbol-file ${workspaceFolder}/../tmp_rootfs/bin/utest",
+					"description": "/bin/utest (0x00400000)",
+					"ignoreFailures": true
+				},
+				{
+					"text": "add-symbol-file ${workspaceFolder}/../tmp_rootfs/bin/libc_test",
+					"description": "/bin/libc_test (0x00600000)",
 					"ignoreFailures": true
 				},
 				{
 					"text": "source ${workspaceFolder}/../tools/.gdbinit"
 				}
 			],
-			"preLaunchTask": "launch-qemu"
+			"preLaunchTask": "QEMU"
 		},
 		{
 			"name": "Debug Kernel (arm)",
@@ -103,15 +118,20 @@
 					"description": "Make breakpoint pending on future shared library load."
 				},
 				{
-					"text": "add-symbol-file ${workspaceFolder}/../initrd_tmp_data/bin/utest",
-					"description": "Load /bin/utest",
+					"text": "add-symbol-file ${workspaceFolder}/../tmp_rootfs/bin/utest",
+					"description": "/bin/utest (0x00400000)",
+					"ignoreFailures": true
+				},
+				{
+					"text": "add-symbol-file ${workspaceFolder}/../tmp_rootfs/bin/libc_test",
+					"description": "/bin/libc_test (0x00600000)",
 					"ignoreFailures": true
 				},
 				{
 					"text": "source ${workspaceFolder}/../tools/.gdbinit"
 				}
 			],
-			"preLaunchTask": "launch-qemu"
+			"preLaunchTask": "QEMU"
 		},
 		{
 			"type": "gdb",
@@ -129,7 +149,7 @@
 			],
 			"internalConsoleOptions": "neverOpen",
 			"printCalls": false,
-			"preLaunchTask": "launch-qemu"
+			"preLaunchTask": "QEMU"
 		},
 	]
 }

.vscode/settings.json

@@ -16,5 +16,6 @@
         "**/tools/qemu/**": true,
         "**/tools/cross/**": true,
         "**/doxygen-doc/**": true,
-    }
+    },
+    "cmake.ignoreCMakeListsMissing": true
 }

.vscode/tasks.json

@@ -2,13 +2,240 @@
 	"version": "2.0.0",
 	"tasks": [
 		{
-			"label": "launch-qemu",
+			"label": "Clean",
 			"type": "shell",
-			"command": "make -C ../ build && make -C ../ vscode_debug_only",
-			"isBackground": true,
-			"problemMatcher": [],
+			"command": "make clean",
+			"isBackground": false,
+			"hide": false,
 			"group": {
 				"kind": "build",
+				"isDefault": false
+			},
+			"presentation": {
+				"reveal": "never",
+				"panel": "shared"
+			},
+			"options": {
+				"cwd": "${workspaceFolder}/../",
+				"shell": {
+					"executable": "bash",
+					"args": [
+						"-c"
+					]
+				}
+			}
+		},
+		{
+			"label": "Build",
+			"type": "shell",
+			"command": "make build",
+			"isBackground": false,
+			"hide": false,
+			"group": {
+				"kind": "build",
+				"isDefault": false
+			},
+			"presentation": {
+				"reveal": "always",
+				"panel": "shared"
+			},
+			"options": {
+				"cwd": "${workspaceFolder}/../",
+				"shell": {
+					"executable": "bash",
+					"args": [
+						"-c"
+					]
+				}
+			}
+		},
+		{
+			"label": "Run",
+			"type": "shell",
+			"command": "make qemu",
+			"isBackground": false,
+			"hide": false,
+			"dependsOn": [
+				"Build"
+			],
+			"group": {
+				"kind": "test",
+				"isDefault": true
+			},
+			"presentation": {
+				"reveal": "always",
+				"panel": "shared"
+			},
+			"options": {
+				"cwd": "${workspaceFolder}/../",
+				"shell": {
+					"executable": "bash",
+					"args": [
+						"-c"
+					]
+				}
+			}
+		},
+		{
+			"label": "Build Bootloader",
+			"type": "shell",
+			"command": "make -C ../ build_bootloader",
+			"isBackground": false,
+			"hide": true,
+			"group": {
+				"kind": "build",
+				"isDefault": false
+			},
+			"presentation": {
+				"reveal": "always",
+				"panel": "shared"
+			},
+			"options": {
+				"shell": {
+					"executable": "bash",
+					"args": [
+						"-c"
+					]
+				}
+			}
+		},
+		{
+			"label": "Build Kernel",
+			"type": "shell",
+			"command": "make -C ../ build_kernel",
+			"isBackground": false,
+			"hide": true,
+			"dependsOn": [
+				"Build Bootloader"
+			],
+			"group": {
+				"kind": "build",
+				"isDefault": false
+			},
+			"presentation": {
+				"reveal": "always",
+				"panel": "shared"
+			},
+			"options": {
+				"shell": {
+					"executable": "bash",
+					"args": [
+						"-c"
+					]
+				}
+			}
+		},
+		{
+			"label": "Build Drivers",
+			"type": "shell",
+			"command": "make -C ../ build_drivers",
+			"isBackground": false,
+			"hide": true,
+			"dependsOn": [
+				"Build Kernel"
+			],
+			"group": {
+				"kind": "build",
+				"isDefault": false
+			},
+			"presentation": {
+				"reveal": "always",
+				"panel": "shared"
+			},
+			"options": {
+				"shell": {
+					"executable": "bash",
+					"args": [
+						"-c"
+					]
+				}
+			}
+		},
+		{
+			"label": "Build Userspace",
+			"type": "shell",
+			"command": "make -C ../ build_userspace",
+			"isBackground": false,
+			"hide": true,
+			"dependsOn": [
+				"Build Drivers"
+			],
+			"group": {
+				"kind": "build",
+				"isDefault": false
+			},
+			"presentation": {
+				"reveal": "always",
+				"panel": "shared"
+			},
+			"options": {
+				"shell": {
+					"executable": "bash",
+					"args": [
+						"-c"
+					]
+				}
+			}
+		},
+		{
+			"label": "Build Image",
+			"type": "shell",
+			"command": "make -C ../ build_image",
+			"isBackground": false,
+			"hide": true,
+			"dependsOn": [
+				"Build Userspace"
+			],
+			"group": {
+				"kind": "build",
+				"isDefault": false
+			},
+			"presentation": {
+				"reveal": "always",
+				"panel": "shared"
+			},
+			"options": {
+				"shell": {
+					"executable": "bash",
+					"args": [
+						"-c"
+					]
+				}
+			}
+		},
+		{
+			"label": "QEMU",
+			"type": "shell",
+			"command": "make",
+			"args": [
+				"-C",
+				"../",
+				"vscode_debug_only"
+			],
+			"isBackground": true,
+			// "problemMatcher": "$tsc-watch",
+			"problemMatcher": [
+				{
+					"pattern": [
+						{
+							"regexp": ".",
+							"file": 1,
+							"location": 2,
+							"message": 3
+						}
+					],
+					"background": {
+						"activeOnStart": true,
+						"beginsPattern": ".",
+						"endsPattern": "CPU Reset",
+					}
+				}
+			],
+			"dependsOn": [
+				"Build Image"
+			],
+			"group": {
+				"kind": "test",
 				"isDefault": true
 			},
 			"presentation": {
@@ -23,6 +250,249 @@
 					]
 				}
 			}
+		},
+		{
+			"label": "CI AMD64 Debug",
+			"type": "shell",
+			"command": "make __ci-amd64-debug",
+			"isBackground": false,
+			"hide": true,
+			"dependsOn": [
+				"Clean"
+			],
+			"group": {
+				"kind": "build",
+				"isDefault": false
+			},
+			"presentation": {
+				"reveal": "always",
+				"panel": "shared"
+			},
+			"options": {
+				"cwd": "${workspaceFolder}/../",
+				"shell": {
+					"executable": "bash",
+					"args": [
+						"-c"
+					]
+				}
+			}
+		},
+		{
+			"label": "CI AMD64 Release",
+			"type": "shell",
+			"command": "make __ci-amd64-release",
+			"isBackground": false,
+			"hide": true,
+			"dependsOn": [
+				"CI AMD64 Debug"
+			],
+			"group": {
+				"kind": "build",
+				"isDefault": false
+			},
+			"presentation": {
+				"reveal": "always",
+				"panel": "shared"
+			},
+			"options": {
+				"cwd": "${workspaceFolder}/../",
+				"shell": {
+					"executable": "bash",
+					"args": [
+						"-c"
+					]
+				}
+			}
+		},
+		{
+			"label": "CI i386 Debug",
+			"type": "shell",
+			"command": "make __ci-i386-debug",
+			"isBackground": false,
+			"hide": true,
+			"dependsOn": [
+				"CI AMD64 Release"
+			],
+			"group": {
+				"kind": "build",
+				"isDefault": false
+			},
+			"presentation": {
+				"reveal": "always",
+				"panel": "shared"
+			},
+			"options": {
+				"cwd": "${workspaceFolder}/../",
+				"shell": {
+					"executable": "bash",
+					"args": [
+						"-c"
+					]
+				}
+			}
+		},
+		{
+			"label": "CI i386 Release",
+			"type": "shell",
+			"command": "make __ci-i386-release",
+			"isBackground": false,
+			"hide": true,
+			"dependsOn": [
+				"CI i386 Debug"
+			],
+			"group": {
+				"kind": "build",
+				"isDefault": false
+			},
+			"presentation": {
+				"reveal": "always",
+				"panel": "shared"
+			},
+			"options": {
+				"cwd": "${workspaceFolder}/../",
+				"shell": {
+					"executable": "bash",
+					"args": [
+						"-c"
+					]
+				}
+			}
+		},
+		{
+			"label": "CI ARM Debug",
+			"type": "shell",
+			"command": "make __ci-arm-debug",
+			"isBackground": false,
+			"hide": true,
+			"dependsOn": [
+				"CI i386 Release"
+			],
+			"group": {
+				"kind": "build",
+				"isDefault": false
+			},
+			"presentation": {
+				"reveal": "always",
+				"panel": "shared"
+			},
+			"options": {
+				"cwd": "${workspaceFolder}/../",
+				"shell": {
+					"executable": "bash",
+					"args": [
+						"-c"
+					]
+				}
+			}
+		},
+		{
+			"label": "CI ARM Release",
+			"type": "shell",
+			"command": "make __ci-arm-release",
+			"isBackground": false,
+			"hide": true,
+			"dependsOn": [
+				"CI ARM Debug"
+			],
+			"group": {
+				"kind": "build",
+				"isDefault": false
+			},
+			"presentation": {
+				"reveal": "always",
+				"panel": "shared"
+			},
+			"options": {
+				"cwd": "${workspaceFolder}/../",
+				"shell": {
+					"executable": "bash",
+					"args": [
+						"-c"
+					]
+				}
+			}
+		},
+		{
+			"label": "CI AARCH64 Debug",
+			"type": "shell",
+			"command": "make __ci-aarch64-debug",
+			"isBackground": false,
+			"hide": true,
+			"dependsOn": [
+				"CI ARM Release"
+			],
+			"group": {
+				"kind": "build",
+				"isDefault": false
+			},
+			"presentation": {
+				"reveal": "always",
+				"panel": "shared"
+			},
+			"options": {
+				"cwd": "${workspaceFolder}/../",
+				"shell": {
+					"executable": "bash",
+					"args": [
+						"-c"
+					]
+				}
+			}
+		},
+		{
+			"label": "CI AARCH64 Release",
+			"type": "shell",
+			"command": "make __ci-aarch64-release",
+			"isBackground": false,
+			"hide": true,
+			"dependsOn": [
+				"CI AARCH64 Debug"
+			],
+			"group": {
+				"kind": "build",
+				"isDefault": false
+			},
+			"presentation": {
+				"reveal": "always",
+				"panel": "shared"
+			},
+			"options": {
+				"cwd": "${workspaceFolder}/../",
+				"shell": {
+					"executable": "bash",
+					"args": [
+						"-c"
+					]
+				}
+			}
+		},
+		{
+			"label": "Test CI Build",
+			"type": "shell",
+			"command": "make __ci-restore-config",
+			"isBackground": false,
+			"dependsOn": [
+				"CI AARCH64 Release",
+				"clean"
+			],
+			"group": {
+				"kind": "build",
+				"isDefault": false
+			},
+			"presentation": {
+				"reveal": "always",
+				"panel": "shared"
+			},
+			"options": {
+				"cwd": "${workspaceFolder}/../",
+				"shell": {
+					"executable": "bash",
+					"args": [
+						"-c"
+					]
+				}
+			}
 		}
 	]
 }

CONTRIBUTING.md

@@ -62,6 +62,8 @@ Follow the coding style used in the repository to ensure consistency. Adhere to:
 - Start function and global declaration names with an uppercase letter.
 - Start local variable names with a lowercase letter.
 - Maintain consistent formatting and commenting guidelines.
+- Commit messages must follow [Conventional Commits](https://conventionalcommits.org).
+- Release versions must follow [Semantic Versioning](https://semver.org).
 
 Refer to the [style guide document](STYLE_GUIDE.md) if available.
 

CREDITS.md

@@ -27,6 +27,9 @@ License information can be found in the [LICENSES.md](LICENSES.md) file.
 ## CPUID 0x7
 - [CPUID](https://en.wikipedia.org/wiki/CPUID)
 
+## KVM CPUID
+- [kernel.org KVM CPUID](https://www.kernel.org/doc/html/v6.9/virt/kvm/x86/cpuid.html?highlight=cpuid)
+
 ## Network
 - [Beej's Guide to Network Programming](https://web.archive.org/web/20051210132103/http://users.pcnet.ro/dmoroian/beej/Beej.html)
 - [UDP Socket Programming](https://web.archive.org/web/20060229214053/http://www.cs.rutgers.edu/~pxk/417/notes/sockets/udp.html)
@@ -120,6 +123,18 @@ License information can be found in the [LICENSES.md](LICENSES.md) file.
 ## UART
 - [Interfacing the Serial / RS232 Port V5.0](http://www.senet.com.au/~cpeacock)
 
+## UEFI
+- [U-Boot EFI Commands](https://docs.u-boot.org/en/latest/usage/cmd/efi.html)
+- [UEFI Specification 2.10](https://uefi.org/sites/default/files/resources/UEFI_Spec_2_10_Aug29.pdf)
+- [UEFI Boot Process Overview](https://gist.github.com/Velocet/d394281d96191e235ff46a8aa2018d80)
+- [Rust OS Development: UEFI](https://blog.malware.re/2023/09/01/rust-os-part2/index.html)
+- [GUIDs Database](https://github.com/DSecurity/efiSeek/blob/master/data/guids-db.ini)
+
+## BGRT
+- [BGRT on OSDev](https://wiki.osdev.org/BGRT)
+- [BMP File Structure @ Gdansk University of Technology](http://www.ue.eti.pg.gda.pl/fpgalab/zadania.spartan3/zad_vga_struktura_pliku_bmp_en.html)
+- [BGRT @ Purdue University](https://engineering.purdue.edu/ece264/16au/hw/HW13)
+
 ---
 
 Special thanks to all contributors and the creators of the referenced projects and resources!

Drivers/Makefile

@@ -43,30 +43,47 @@ endif
 export DRIVER_LDFLAGS
 export DRIVER_CFLAGS
 
+copy_driver_signatures:
+	@TMP_FILE="$(OUTPUT_DIR)../../Kernel/drivers/trusted.c.tmp"; \
+	OUT_FILE="$(OUTPUT_DIR)../../Kernel/drivers/trusted.c"; \
+	mkdir -p $(OUTPUT_DIR)../../Kernel/drivers/; \
+	echo "const char *trusted_drivers[] = {" > $$TMP_FILE; \
+	find $(OUTPUT_DIR) -name "*.drv" -exec sha512sum {} \; | awk '{gsub(/.*\//, "", $$2); gsub(/\./, "_", $$2); sub(/_drv$$/, "_drv", $$2); print "\"" $$1 "\"," }' >> $$TMP_FILE; \
+	echo "};" >> $$TMP_FILE; \
+	echo "const __SIZE_TYPE__ trusted_drivers_count = sizeof(trusted_drivers) / sizeof(trusted_drivers[0]);" >> $$TMP_FILE; \
+	if [ ! -f $$OUT_FILE ] || ! cmp -s $$TMP_FILE $$OUT_FILE; then \
+		mv $$TMP_FILE $$OUT_FILE; \
+		printf '\033[0;32m[trusted.c updated]\033[0m\n'; \
+	else \
+		rm $$TMP_FILE; \
+		printf '\033[0;33m[trusted.c unchanged]\033[0m\n'; \
+	fi
+
 build:
 	cp -rf ../Kernel/include/interface/* include/
 	mkdir -p out
-	make -C library build
+	$(MAKE) -C library build
 ifneq ($(filter amd64 i386,$(OSARCH)),)
-	make -C audio build
-	make -C input build
-	make -C misc build
-	make -C network build
-	make -C storage build
-	make -C filesystem build
+	$(MAKE) -C audio build
+	$(MAKE) -C input build
+	$(MAKE) -C misc build
+	$(MAKE) -C network build
+	$(MAKE) -C storage build
+	$(MAKE) -C filesystem build
 endif
+	$(MAKE) copy_driver_signatures
 
 prepare:
 	$(info Nothing to prepare)
 
 clean:
 	rm -rf out
-	make -C library clean
+	$(MAKE) -C library clean
 ifneq ($(filter amd64 i386,$(OSARCH)),)
-	make -C audio clean
-	make -C input clean
-	make -C misc clean
-	make -C network clean
-	make -C storage clean
-	make -C filesystem clean
+	$(MAKE) -C audio clean
+	$(MAKE) -C input clean
+	$(MAKE) -C misc clean
+	$(MAKE) -C network clean
+	$(MAKE) -C storage clean
+	$(MAKE) -C filesystem clean
 endif

Drivers/audio/ac97/Makefile

@@ -1,35 +0,0 @@
-default:
-	$(error Do not run this Makefile directly!)
-
-S_SOURCES = $(shell find ./ -type f -name '*.S')
-C_SOURCES = $(shell find ./ -type f -name '*.c')
-CXX_SOURCES = $(shell find ./ -type f -name '*.cpp')
-HEADERS = $(sort $(dir $(wildcard ../../include/*)))
-OBJ = $(C_SOURCES:.c=.o) $(CXX_SOURCES:.cpp=.o) $(S_SOURCES:.S=.o)
-STACK_USAGE_OBJ = $(C_SOURCES:.c=.su) $(CXX_SOURCES:.cpp=.su)
-
-FILENAME = $(notdir $(shell pwd)).drv
-
-build: $(FILENAME)
-	mv $(FILENAME) $(OUTPUT_DIR)$(FILENAME)
-
-$(FILENAME): $(OBJ)
-	$(info Linking $@)
-	$(CC) $(DRIVER_LDFLAGS) $(OBJ) $(OUTPUT_DIR)dcrt0.o -L$(OUTPUT_DIR) -lkernel -o $@
-
-WARNCFLAG = -Wall -Wextra
-
-%.o: %.c $(HEADERS)
-	$(info Compiling $<)
-	$(CC) $(DRIVER_CFLAGS) $(WARNCFLAG) -std=c17 -c $< -o $@
-
-%.o: %.cpp $(HEADERS)
-	$(info Compiling $<)
-	$(CXX) $(DRIVER_CFLAGS) $(WARNCFLAG) -std=c++20 -fno-exceptions -fno-rtti -c $< -o $@
-
-%.o: %.S
-	$(info Compiling $<)
-	$(AS) -o $@ $<
-
-clean:
-	rm -f file.map $(OBJ) $(STACK_USAGE_OBJ)

Drivers/audio/ac97/ac97.cpp

@@ -1,881 +0,0 @@
-/*
-	This file is part of Fennix Kernel.
-
-	Fennix Kernel is free software: you can redistribute it and/or
-	modify it under the terms of the GNU General Public License as
-	published by the Free Software Foundation, either version 3 of
-	the License, or (at your option) any later version.
-
-	Fennix Kernel is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with Fennix Kernel. If not, see <https://www.gnu.org/licenses/>.
-*/
-
-#include <errno.h>
-#include <audio.h>
-#include <regs.h>
-#include <base.h>
-#include <pci.h>
-#include <io.h>
-#include <fs.h>
-
-#define DescriptorListLength 0x20
-
-enum AudioVolumeValues
-{
-	AV_Maximum = 0x0,
-	AV_Minimum = 0x3F,
-};
-
-enum AudioEncodingValues
-{
-	AE_PCMs8,
-	AE_PCMu8,
-
-	AE_PCMs16le,
-	AE_PCMs20le,
-	AE_PCMs24le,
-	AE_PCMs32le,
-
-	AE_PCMu16le,
-	AE_PCMu20le,
-	AE_PCMu24le,
-	AE_PCMu32le,
-
-	AE_PCMs16be,
-	AE_PCMs20be,
-	AE_PCMs24be,
-	AE_PCMs32be,
-
-	AE_PCMu16be,
-	AE_PCMu20be,
-	AE_PCMu24be,
-	AE_PCMu32be,
-};
-
-enum NativeAudioMixerRegisters
-{
-	/**
-	 * @brief Reset Register
-	 * @note Length: word
-	 */
-	NAM_Reset = 0x00,
-
-	/**
-	 * @brief Master Volume Register
-	 * @note Length: word
-	 */
-	NAM_MasterVolume = 0x02,
-
-	/**
-	 * @brief Microphone Volume Register
-	 * @note Length: word
-	 */
-	NAM_MicrophoneVolume = 0x0E,
-
-	/**
-	 * @brief PCM Out Volume Register
-	 * @note Length: word
-	 */
-	NAM_PCMOutVolume = 0x18,
-
-	/**
-	 * @brief Select Record Input Register
-	 * @note Length: word
-	 */
-	NAM_SelectRecordInput = 0x1A,
-
-	/**
-	 * @brief Record Gain Register
-	 * @note Length: word
-	 */
-	NAM_RecordGain = 0x1C,
-
-	/**
-	 * @brief Record Gain Microphone Register
-	 * @note Length: word
-	 */
-	NAM_RecordGainMicrophone = 0x1E,
-};
-
-enum NativeAudioBusMasterRegisters
-{
-	/**
-	 * @brief Register box for PCM IN
-	 * @note Length: below
-	 */
-	NABM_PCMInBox = 0x00,
-
-	/**
-	 * @brief Register box for PCM OUT
-	 * @note Length: below
-	 */
-	NABM_PCMOutBox = 0x10,
-
-	/**
-	 * @brief Register box for Microphone
-	 * @note Length: below
-	 */
-	NABM_MicrophoneBox = 0x20,
-
-	/**
-	 * @brief Global Control Register
-	 * @note Length: dword
-	 */
-	NABM_GlobalControl = 0x2C, /* 0x30 */
-
-	/**
-	 * @brief Global Status Register
-	 * @note Length: dword
-	 */
-	NABM_GlobalStatus = 0x30, /* 0x34 */
-};
-
-enum NativeAudioBusMasterBoxOffsets
-{
-	/**
-	 * @brief Physical Address of Buffer Descriptor List
-	 * @note Length: dword
-	 */
-	NABMBOFF_BufferDescriptorList = 0x00,
-
-	/**
-	 * @brief Number of Actual Processed Buffer Descriptor Entry
-	 * @note Length: byte
-	 */
-	NABMBOFF_BufferDescriptorEntry = 0x04,
-
-	/**
-	 * @brief Number of all Descriptor Entries
-	 * @note Length: byte
-	 */
-	NABMBOFF_DescriptorEntries = 0x05,
-
-	/**
-	 * @brief Status of transferring Data
-	 * @note Length: word
-	 */
-	NABMBOFF_Status = 0x06,
-
-	/**
-	 * @brief Number of transferred Samples in Actual Processed Entry
-	 * @note Length: word
-	 */
-	NABMBOFF_TransferredSamples = 0x08,
-
-	/**
-	 * @brief Number of next processed Buffer Entry
-	 * @note Length: byte
-	 */
-	NABMBOFF_NextProcessedBufferEntry = 0x0A,
-
-	/**
-	 * @brief Transfer Control
-	 * @note Length: byte
-	 */
-	NABMBOFF_TransferControl = 0x0B,
-};
-
-enum OutputPulseCodeModulationRegisters
-{
-	/**
-	 * @brief Physical Address of Buffer Descriptor List
-	 * @note Length: dword
-	 */
-	PCMOUT_BufferDescriptorList = (int)NABM_PCMOutBox + (int)NABMBOFF_BufferDescriptorList,
-
-	/**
-	 * @brief Number of Actual Processed Buffer Descriptor Entry
-	 * @note Length: byte
-	 */
-	PCMOUT_BufferDescriptorEntry = (int)NABM_PCMOutBox + (int)NABMBOFF_BufferDescriptorEntry,
-
-	/**
-	 * @brief Number of all Descriptor Entries
-	 * @note Length: byte
-	 */
-	PCMOUT_DescriptorEntries = (int)NABM_PCMOutBox + (int)NABMBOFF_DescriptorEntries,
-
-	/**
-	 * @brief Status of transferring Data
-	 * @note Length: word
-	 */
-	PCMOUT_Status = (int)NABM_PCMOutBox + (int)NABMBOFF_Status,
-
-	/**
-	 * @brief Number of transferred Samples in Actual Processed Entry
-	 * @note Length: word
-	 */
-	PCMOUT_TransferredSamples = (int)NABM_PCMOutBox + (int)NABMBOFF_TransferredSamples,
-
-	/**
-	 * @brief Number of next processed Buffer Entry
-	 * @note Length: byte
-	 */
-	PCMOUT_NextProcessedBufferEntry = (int)NABM_PCMOutBox + (int)NABMBOFF_NextProcessedBufferEntry,
-
-	/**
-	 * @brief Transfer Control
-	 * @note Length: byte
-	 */
-	PCMOUT_TransferControl = (int)NABM_PCMOutBox + (int)NABMBOFF_TransferControl,
-};
-
-enum TransferControlRegisters
-{
-	/**
-	 * @brief DMA controller control
-	 *
-	 * 0 = Pause transfer
-	 * 1 = Transfer sound data
-	 */
-	TC_DMAControllerControl = 0x01,
-
-	/**
-	 * @brief Reset
-	 *
-	 * 0 = Remove reset condition
-	 * 1 = Reset this NABM register box, this bit is cleared by card when is reset complete
-	 */
-	TC_TransferReset = 0x02,
-
-	/**
-	 * @brief Last Buffer Entry Interrupt enable
-	 *
-	 * 0 = Disable interrupt
-	 * 1 = Enable interrupt
-	 */
-	TC_LastBufferEntryInterruptEnable = 0x04,
-
-	/**
-	 * @brief IOC Interrupt enable
-	 *
-	 * 0 = Disable interrupt
-	 * 1 = Enable interrupt
-	 */
-	TC_IOCInterruptEnable = 0x08,
-
-	/**
-	 * @brief Fifo ERROR Interrupt enable
-	 *
-	 * 0 = Disable interrupt
-	 * 1 = Enable interrupt
-	 */
-	TC_FifoERRORInterruptEnable = 0x10,
-};
-
-enum GlobalControlRegisters
-{
-	/**
-	 * @brief Global Interrupt Enable
-	 *
-	 * 0 = Disable Interrupts
-	 * 1 = Enable Interrupts
-	 */
-	GC_GlobalInterruptEnable = 0x01,
-
-	/**
-	 * @brief Cold reset
-	 *
-	 * 0 = Device is in reset and can not be used
-	 * 1 = Resume to operational state
-	 */
-	GC_ColdReset = 0x02,
-
-	/**
-	 * @brief Warm reset
-	 */
-	GC_WarmReset = 0x04,
-
-	/**
-	 * @brief Shut down
-	 *
-	 * 0 = Device is powered
-	 * 1 = Shut down
-	 */
-	GC_ShutDown = 0x08,
-
-	/**
-	 * @brief Channels for PCM Output
-	 *
-	 * 00 = 2 channels
-	 * 01 = 4 channels
-	 * 10 = 6 channels
-	 * 11 = Reserved
-	 */
-	GC_ChannelsForPCMOutput = 0x30,
-
-	/**
-	 * @brief PCM Output mode
-	 *
-	 * 00 = 16 bit samples
-	 * 01 = 20 bit samples
-	 */
-	GC_PCMOutputMode = 0xC0,
-};
-
-struct BufferDescriptorList
-{
-	/**
-	 * @brief Physical Address to sound data in memory
-	 * @note Length: dword
-	 */
-	uint32_t Address;
-
-	/**
-	 * @brief Number of samples in this buffer
-	 * @note Length: word
-	 */
-	uint16_t SampleCount;
-
-	/**
-	 * @brief Flags
-	 * @note Length: word
-	 *
-	 * Bit 15 = Interrupt fired when data from this entry is transferred
-	 * Bit 14 = Last entry of buffer, stop playing
-	 * Other bits = Reserved
-	 */
-	uint16_t Flags;
-} __attribute__((packed));
-
-uint16_t MixerVolume(uint8_t Left, uint8_t Right, bool Mute)
-{
-	return ((uint16_t)((Right & 0x3F) |
-					   ((Left & 0x3F) << 0x8) |
-					   (Mute & 1 << 0xF)));
-}
-
-class AC97Device
-{
-private:
-	PCIHeader0 *Header;
-	BufferDescriptorList *DescriptorList = nullptr;
-
-	uint16_t MixerAddress;
-	uint16_t BusMasterAddress;
-
-	AudioEncodingValues Encoding = AE_PCMs16le;
-	char Channels = 2;
-	uint8_t Volume = AV_Maximum;
-	bool Mute = false;
-	int SampleRate = 48000;
-	char SampleSize = 2;
-
-public:
-	size_t write(uint8_t *Buffer, size_t Size)
-	{
-		if (Buffer == nullptr)
-		{
-			KernelLog("Invalid buffer.");
-			return -EINVAL;
-		}
-
-		if ((Size == 0) || (Size % (SampleSize * Channels)))
-		{
-			KernelLog("Invalid buffer length.");
-			return -EINVAL;
-		}
-
-		int TotalBDLToFill = (int)((Size + PAGE_SIZE - 1) >> 12);
-
-		while (Size > 0)
-		{
-			bool ActiveDMA = !(inw(BusMasterAddress + PCMOUT_Status) & TC_DMAControllerControl);
-
-			if (ActiveDMA)
-			{
-				int RemainingBDL = 0;
-
-				do
-				{
-					int CurrentBDL = inb(BusMasterAddress + PCMOUT_BufferDescriptorEntry);
-					int LastBDL = inb(BusMasterAddress + PCMOUT_DescriptorEntries);
-
-					RemainingBDL = LastBDL - CurrentBDL;
-					if (RemainingBDL < 0)
-						RemainingBDL += DescriptorListLength;
-
-					RemainingBDL += 1;
-
-					if (RemainingBDL >= DescriptorListLength - 1)
-					{
-						long SampleCount = DescriptorList[(CurrentBDL + 1) % DescriptorListLength].SampleCount / Channels;
-						if (SampleCount > 0)
-							Sleep(SampleCount * 1000 / SampleRate);
-					}
-
-				} while (RemainingBDL >= DescriptorListLength - 1 &&
-						 !(inw(BusMasterAddress + PCMOUT_Status) & TC_DMAControllerControl));
-			}
-
-			uint8_t CurrentBDL = inb(BusMasterAddress + PCMOUT_BufferDescriptorEntry);
-			uint8_t LastBDL = inb(BusMasterAddress + PCMOUT_DescriptorEntries);
-			uint8_t NextBDL = LastBDL % DescriptorListLength;
-
-			ActiveDMA = !(inw(BusMasterAddress + PCMOUT_Status) & TC_DMAControllerControl);
-			if (ActiveDMA)
-			{
-				NextBDL = (uint8_t)((LastBDL + 1) % DescriptorListLength);
-				if (NextBDL == CurrentBDL)
-					continue;
-			}
-
-			do
-			{
-				size_t Wrote = (PAGE_SIZE > Size) ? size_t(Size)
-												  : size_t(PAGE_SIZE);
-
-				if (Wrote == 0)
-				{
-					KernelLog("Wrote 0 bytes.");
-					break;
-				}
-
-				memcpy((void *)((uint64_t)DescriptorList[NextBDL].Address), Buffer, Wrote);
-				DescriptorList[NextBDL].Flags = 0;
-
-				Buffer += Wrote;
-				Size -= (unsigned int)Wrote;
-
-				DescriptorList[NextBDL].SampleCount = uint16_t(Wrote / SampleSize);
-				TotalBDLToFill--;
-				NextBDL = (uint8_t)((NextBDL + 1) % DescriptorListLength);
-			} while (TotalBDLToFill-- && NextBDL != CurrentBDL);
-
-			outb(BusMasterAddress + PCMOUT_DescriptorEntries, NextBDL - 1);
-
-			ActiveDMA = !(inw(BusMasterAddress + PCMOUT_Status) & TC_DMAControllerControl);
-			if (!ActiveDMA)
-			{
-				// Start DMA
-				outb(BusMasterAddress + PCMOUT_TransferControl,
-					 inb(BusMasterAddress + PCMOUT_TransferControl) | TC_DMAControllerControl);
-			}
-		}
-		return Size;
-	}
-
-	int ioctl(AudioIoctl, void *)
-	{
-		// if (Data->AudioCallback.Adjust._Volume)
-		// {
-		// 	Volume = (uint8_t)(0x3F - (0x3F * Data->AudioCallback.Adjust.Volume / 100));
-		// 	outw(BAR.MixerAddress + NAM_MasterVolume, MixerVolume(Volume, Volume, Mute));
-		// 	// outw(BAR.MixerAddress + NAM_PCMOutVolume, MixerVolume(Volume, Volume, Mute));
-		// }
-		// else if (Data->AudioCallback.Adjust._Encoding)
-		// {
-		// 	fixme("Encoding changing not supported yet.");
-		// }
-		// else if (Data->AudioCallback.Adjust._SampleRate)
-		// {
-		// 	switch (Data->AudioCallback.Adjust.SampleRate)
-		// 	{
-		// 	case 0:
-		// 	{
-		// 		SampleRate = 8000;
-		// 		break;
-		// 	}
-		// 	case 1:
-		// 	{
-		// 		SampleRate = 11025;
-		// 		break;
-		// 	}
-		// 	case 2:
-		// 	{
-		// 		SampleRate = 16000;
-		// 		break;
-		// 	}
-		// 	case 3:
-		// 	{
-		// 		SampleRate = 22050;
-		// 		break;
-		// 	}
-		// 	case 4:
-		// 	{
-		// 		SampleRate = 32000;
-		// 		break;
-		// 	}
-		// 	case 5:
-		// 	{
-		// 		SampleRate = 44100;
-		// 		break;
-		// 	}
-		// 	case 6:
-		// 	{
-		// 		SampleRate = 48000;
-		// 		break;
-		// 	}
-		// 	case 7:
-		// 	{
-		// 		SampleRate = 88200;
-		// 		break;
-		// 	}
-		// 	case 8:
-		// 	{
-		// 		SampleRate = 96000;
-		// 		break;
-		// 	}
-		// 	default:
-		// 	{
-		// 		SampleRate = 16000;
-		// 		error("Invalid sample rate. Defaulting to 16000.");
-		// 		break;
-		// 	}
-		// 	}
-		// }
-		// else if (Data->AudioCallback.Adjust._Channels)
-		// {
-		// 	switch (Data->AudioCallback.Adjust.Channels)
-		// 	{
-		// 	case 0:
-		// 	{
-		// 		Channels = 1; // Mono
-		// 		break;
-		// 	}
-		// 	case 1:
-		// 	{
-		// 		Channels = 2; // Stereo
-		// 		break;
-		// 	}
-		// 	default:
-		// 	{
-		// 		Channels = 2;
-		// 		error("Invalid channel count. Defaulting to 2.");
-		// 		break;
-		// 	}
-		// 	}
-		// }
-		return 0;
-	}
-
-	void OnInterruptReceived(TrapFrame *)
-	{
-		uint16_t Status = inw(MixerAddress + PCMOUT_Status);
-		if (Status & TC_IOCInterruptEnable)
-		{
-			DebugLog("IOC");
-			outw(MixerAddress + PCMOUT_Status, TC_IOCInterruptEnable);
-			uint16_t CurrentBDL = inb(BusMasterAddress + PCMOUT_BufferDescriptorEntry);
-			uint16_t LastBDL = (CurrentBDL + 2) & (DescriptorListLength - 1);
-			outb(BusMasterAddress + PCMOUT_DescriptorEntries, LastBDL);
-			KernelLog("FIXME: CurrentBDL: %d, LastBDL: %d", CurrentBDL, LastBDL);
-		}
-		else if (Status & TC_LastBufferEntryInterruptEnable)
-		{
-			DebugLog("Last buffer entry");
-			// Stop DMA
-			uint8_t TransferControl = inb((uint16_t)(BusMasterAddress + PCMOUT_TransferControl));
-			TransferControl &= ~TC_DMAControllerControl;
-			outb((uint16_t)(BusMasterAddress + PCMOUT_TransferControl), TransferControl);
-
-			outw(MixerAddress + PCMOUT_Status, TC_LastBufferEntryInterruptEnable);
-		}
-		else if (Status & TC_FifoERRORInterruptEnable)
-		{
-			KernelLog("FIFO error");
-			outw(MixerAddress + PCMOUT_Status, TC_FifoERRORInterruptEnable);
-		}
-		else
-		{
-			DebugLog("Unknown interrupt status %#x", Status);
-			outw(MixerAddress + PCMOUT_Status, 0xFFFF);
-		}
-	}
-
-	void Panic()
-	{
-		uint8_t TransferControl = inb((uint16_t)(BusMasterAddress + PCMOUT_TransferControl));
-		TransferControl &= ~(TC_LastBufferEntryInterruptEnable |
-							 TC_IOCInterruptEnable |
-							 TC_FifoERRORInterruptEnable);
-		outb((uint16_t)(BusMasterAddress + PCMOUT_TransferControl), TransferControl);
-
-		uint32_t GlobalControl = inl((uint16_t)(BusMasterAddress + NABM_GlobalControl));
-		GlobalControl &= ~GC_GlobalInterruptEnable;
-		GlobalControl |= GC_ShutDown;
-		outl((uint16_t)(BusMasterAddress + NABM_GlobalControl), GlobalControl);
-	}
-
-	AC97Device(PCIHeader0 *_Header)
-		: Header(_Header)
-	{
-		/* Native Audio Mixer Base Address */
-		uint32_t PCIBAR0 = Header->BAR0;
-
-		/* Native Audio Bus Master Base Address */
-		uint32_t PCIBAR1 = Header->BAR1;
-
-		// uint8_t Type = PCIBAR0 & 1;
-		MixerAddress = (uint16_t)(PCIBAR0 & (~3));
-		BusMasterAddress = PCIBAR1 & (~15);
-
-		uint16_t OutputPCMTransferControl = BusMasterAddress + PCMOUT_TransferControl;
-
-		/* DescriptorList address MUST be physical. */
-		DescriptorList = (BufferDescriptorList *)AllocateMemory(TO_PAGES(sizeof(BufferDescriptorList) * DescriptorListLength));
-		memset(DescriptorList, 0, sizeof(BufferDescriptorList) * DescriptorListLength);
-
-		uint16_t DLSampleCount = (uint16_t)(PAGE_SIZE / SampleSize);
-		for (int i = 0; i < DescriptorListLength; i++)
-		{
-			DescriptorList[i].Address = (uint32_t)(uintptr_t)AllocateMemory(TO_PAGES(sizeof(uint16_t *)));
-			DescriptorList[i].SampleCount = DLSampleCount;
-			DescriptorList[i].Flags = 0;
-			DebugLog("DescriptorList[%d] = { Address: %#lx, SampleCount: %d, Flags: %#lx }",
-					 i,
-					 DescriptorList[i].Address,
-					 DescriptorList[i].SampleCount,
-					 DescriptorList[i].Flags);
-		}
-
-		outw(MixerAddress + NAM_MasterVolume, MixerVolume(Volume, Volume, Mute));
-		outw(MixerAddress + NAM_PCMOutVolume, MixerVolume(Volume, Volume, Mute));
-
-		Volume = 0x3F - (0x3F * /* VOL 50% */ 50 / 100);
-		outw(MixerAddress + NAM_MasterVolume, MixerVolume(Volume, Volume, Mute));
-
-		outb(OutputPCMTransferControl, inb(OutputPCMTransferControl) | TC_TransferReset);
-		while (inb(OutputPCMTransferControl) & TC_TransferReset)
-			;
-
-		uint32_t GlobalControl = inl(BusMasterAddress + NABM_GlobalControl);
-		GlobalControl = (GlobalControl & ~((0x3U) << 0x16)); /* PCM 16-bit mode */
-		GlobalControl = (GlobalControl & ~((0x3U) << 20));	 /* 2 channels */
-		GlobalControl |= GC_GlobalInterruptEnable;
-		GlobalControl &= ~GC_ShutDown;
-
-		outl(BusMasterAddress + PCMOUT_BufferDescriptorList,
-			 (uint32_t)(uint64_t)DescriptorList);
-
-		outl(BusMasterAddress + NABM_GlobalControl, GlobalControl);
-
-		uint8_t TransferControl = inb(OutputPCMTransferControl);
-		TransferControl |= TC_IOCInterruptEnable |
-						   TC_FifoERRORInterruptEnable;
-		outb(OutputPCMTransferControl, TransferControl);
-
-		// Stop DMA
-		outb(OutputPCMTransferControl, inb(OutputPCMTransferControl) & ~TC_DMAControllerControl);
-	}
-
-	~AC97Device()
-	{
-		outw(MixerAddress + NAM_MasterVolume, MixerVolume(AV_Maximum, AV_Maximum, true));
-		outw(MixerAddress + NAM_PCMOutVolume, MixerVolume(AV_Maximum, AV_Maximum, true));
-
-		// Stop DMA
-		outb((uint16_t)(BusMasterAddress + PCMOUT_TransferControl),
-			 inb((uint16_t)(BusMasterAddress + PCMOUT_TransferControl)) & ~TC_DMAControllerControl);
-
-		// Disable interrupts
-		uint8_t TransferControl = inb((uint16_t)(BusMasterAddress + PCMOUT_TransferControl));
-
-		TransferControl &= ~(TC_LastBufferEntryInterruptEnable |
-							 TC_IOCInterruptEnable |
-							 TC_FifoERRORInterruptEnable);
-		outb((uint16_t)(BusMasterAddress + PCMOUT_TransferControl), TransferControl);
-
-		// Disable global control
-		uint32_t GlobalControl = inl((uint16_t)(BusMasterAddress + NABM_GlobalControl));
-		GlobalControl &= ~GC_GlobalInterruptEnable;
-		GlobalControl |= GC_ShutDown;
-		outl((uint16_t)(BusMasterAddress + NABM_GlobalControl), GlobalControl);
-	}
-};
-
-AC97Device *Drivers[4] = {nullptr};
-dev_t AudioID[4] = {(dev_t)-1};
-
-#define OIR(x) OIR_##x
-#define CREATE_OIR(x) \
-	void OIR_##x(TrapFrame *f) { Drivers[x]->OnInterruptReceived(f); }
-
-CREATE_OIR(0);
-CREATE_OIR(1);
-CREATE_OIR(2);
-CREATE_OIR(3);
-
-int __fs_Open(struct Inode *, int, mode_t) { return 0; }
-int __fs_Close(struct Inode *) { return 0; }
-ssize_t __fs_Read(struct Inode *, void *, size_t, off_t) { return 0; }
-
-ssize_t __fs_Write(struct Inode *Node, const void *Buffer, size_t Size, off_t)
-{
-	return Drivers[AudioID[Node->GetMinor()]]->write((uint8_t *)Buffer, Size);
-}
-
-int __fs_Ioctl(struct Inode *Node, unsigned long Request, void *Argp)
-{
-	return Drivers[AudioID[Node->GetMinor()]]->ioctl((AudioIoctl)Request, Argp);
-}
-
-const struct InodeOperations AudioOps = {
-	.Lookup = nullptr,
-	.Create = nullptr,
-	.Remove = nullptr,
-	.Rename = nullptr,
-	.Read = __fs_Read,
-	.Write = __fs_Write,
-	.Truncate = nullptr,
-	.Open = __fs_Open,
-	.Close = __fs_Close,
-	.Ioctl = __fs_Ioctl,
-	.ReadDir = nullptr,
-	.MkDir = nullptr,
-	.RmDir = nullptr,
-	.SymLink = nullptr,
-	.ReadLink = nullptr,
-	.Seek = nullptr,
-	.Stat = nullptr,
-};
-
-PCIArray *Devices;
-EXTERNC int cxx_Panic()
-{
-	PCIArray *ctx = Devices;
-	short Count = 0;
-	while (ctx != nullptr)
-	{
-		if (Drivers[Count] != nullptr)
-			Drivers[Count]->Panic();
-		Count++;
-		ctx = (PCIArray *)ctx->Next;
-	}
-
-	return 0;
-}
-
-EXTERNC int cxx_Probe()
-{
-	uint16_t VendorIDs[] = {0x8086, PCI_END};
-	uint16_t DeviceIDs[] = {0x2415, PCI_END};
-	Devices = GetPCIDevices(VendorIDs, DeviceIDs);
-	if (Devices == nullptr)
-	{
-		KernelLog("No AC'97 device found.");
-		return -ENODEV;
-	}
-
-	PCIArray *ctx = Devices;
-	bool Found = false;
-	size_t Count = 0;
-	while (ctx != nullptr)
-	{
-		if (Count++ > sizeof(Drivers) / sizeof(AC97Device *))
-			break;
-
-		PCIHeader0 *PCIBaseAddress = (PCIHeader0 *)ctx->Device->Header;
-		uint32_t PCIBAR0 = PCIBaseAddress->BAR0;
-		uint8_t Type = PCIBAR0 & 1;
-		if (Type != 1)
-		{
-			KernelLog("Device %x:%x.%d BAR0 is not I/O.",
-					  PCIBaseAddress->Header.VendorID,
-					  PCIBaseAddress->Header.DeviceID,
-					  PCIBaseAddress->Header.ProgIF);
-			continue;
-		}
-
-		Found = true;
-		ctx = (PCIArray *)ctx->Next;
-	}
-
-	if (!Found)
-	{
-		KernelLog("No valid AC'97 device found.");
-		return -EINVAL;
-	}
-	return 0;
-}
-
-EXTERNC int cxx_Initialize()
-{
-	PCIArray *ctx = Devices;
-	size_t Count = 0;
-	while (ctx != nullptr)
-	{
-		if (Count > sizeof(Drivers) / sizeof(AC97Device *))
-			break;
-
-		PCIHeader0 *PCIBaseAddress = (PCIHeader0 *)ctx->Device->Header;
-		uint32_t PCIBAR0 = PCIBaseAddress->BAR0;
-		uint8_t Type = PCIBAR0 & 1;
-		if (Type != 1)
-		{
-			KernelLog("Device %x:%x.%d BAR0 is not I/O.",
-					  PCIBaseAddress->Header.VendorID,
-					  PCIBaseAddress->Header.DeviceID,
-					  PCIBaseAddress->Header.ProgIF);
-			continue;
-		}
-
-		InitializePCI(ctx->Device);
-
-		Drivers[Count] = new AC97Device((PCIHeader0 *)ctx->Device->Header);
-		/* FIXME: bad code */
-		switch (Count)
-		{
-		case 0:
-			RegisterInterruptHandler(iLine(ctx->Device), (void *)OIR(0));
-			break;
-		case 1:
-			RegisterInterruptHandler(iLine(ctx->Device), (void *)OIR(1));
-			break;
-		case 2:
-			RegisterInterruptHandler(iLine(ctx->Device), (void *)OIR(2));
-			break;
-		case 3:
-			RegisterInterruptHandler(iLine(ctx->Device), (void *)OIR(3));
-			break;
-		default:
-			break;
-		}
-		dev_t ret = RegisterDevice(AUDIO_TYPE_PCM, &AudioOps);
-		AudioID[Count] = ret;
-		Count++;
-		ctx = (PCIArray *)ctx->Next;
-	}
-
-	return 0;
-}
-
-EXTERNC int cxx_Finalize()
-{
-	PCIArray *ctx = Devices;
-	size_t Count = 0;
-	while (ctx != nullptr)
-	{
-		if (Count++ > sizeof(Drivers) / sizeof(AC97Device *))
-			break;
-
-		PCIHeader0 *PCIBaseAddress = (PCIHeader0 *)ctx->Device->Header;
-		uint32_t PCIBAR0 = PCIBaseAddress->BAR0;
-		uint8_t Type = PCIBAR0 & 1;
-		if (Type != 1)
-		{
-			KernelLog("Device %x:%x.%d BAR0 is not I/O.",
-					  PCIBaseAddress->Header.VendorID,
-					  PCIBaseAddress->Header.DeviceID,
-					  PCIBaseAddress->Header.ProgIF);
-			continue;
-		}
-
-		delete Drivers[Count++];
-		ctx->Device->Header->Command |= PCI_COMMAND_INTX_DISABLE;
-		ctx = (PCIArray *)ctx->Next;
-	}
-
-	for (size_t i = 0; i < sizeof(AudioID) / sizeof(dev_t); i++)
-	{
-		if (AudioID[i] != (dev_t)-1)
-			UnregisterDevice(AudioID[i]);
-	}
-
-	return 0;
-}

Drivers/audio/ac97/main.c

@@ -1,31 +0,0 @@
-/*
-	This file is part of Fennix Drivers.
-
-	Fennix Drivers is free software: you can redistribute it and/or
-	modify it under the terms of the GNU General Public License as
-	published by the Free Software Foundation, either version 3 of
-	the License, or (at your option) any later version.
-
-	Fennix Drivers is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with Fennix Drivers. If not, see <https://www.gnu.org/licenses/>.
-*/
-
-#include <base.h>
-
-#include "ac97.hpp"
-
-int DriverEntry() { return cxx_Initialize(); }
-int DriverFinal() { return cxx_Finalize(); }
-int DriverPanic() { return cxx_Panic(); }
-int DriverProbe() { return cxx_Probe(); }
-
-DriverInfo("ac97",
-		   "Audio Codec '97 Driver",
-		   "EnderIce2",
-		   0, 0, 1,
-		   "GPLv3");

Drivers/audio/hda/Makefile

@@ -1,35 +0,0 @@
-default:
-	$(error Do not run this Makefile directly!)
-
-S_SOURCES = $(shell find ./ -type f -name '*.S')
-C_SOURCES = $(shell find ./ -type f -name '*.c')
-CXX_SOURCES = $(shell find ./ -type f -name '*.cpp')
-HEADERS = $(sort $(dir $(wildcard ../../include/*)))
-OBJ = $(C_SOURCES:.c=.o) $(CXX_SOURCES:.cpp=.o) $(S_SOURCES:.S=.o)
-STACK_USAGE_OBJ = $(C_SOURCES:.c=.su) $(CXX_SOURCES:.cpp=.su)
-
-FILENAME = $(notdir $(shell pwd)).drv
-
-build: $(FILENAME)
-	mv $(FILENAME) $(OUTPUT_DIR)$(FILENAME)
-
-$(FILENAME): $(OBJ)
-	$(info Linking $@)
-	$(CC) $(DRIVER_LDFLAGS) $(OBJ) $(OUTPUT_DIR)dcrt0.o -L$(OUTPUT_DIR) -lkernel -o $@
-
-WARNCFLAG = -Wall -Wextra
-
-%.o: %.c $(HEADERS)
-	$(info Compiling $<)
-	$(CC) $(DRIVER_CFLAGS) $(WARNCFLAG) -std=c17 -c $< -o $@
-
-%.o: %.cpp $(HEADERS)
-	$(info Compiling $<)
-	$(CXX) $(DRIVER_CFLAGS) $(WARNCFLAG) -std=c++20 -fno-exceptions -fno-rtti -c $< -o $@
-
-%.o: %.S
-	$(info Compiling $<)
-	$(AS) -o $@ $<
-
-clean:
-	rm -f file.map $(OBJ) $(STACK_USAGE_OBJ)

Drivers/audio/hda/hda.cpp

@@ -1,263 +0,0 @@
-/*
-	This file is part of Fennix Kernel.
-
-	Fennix Kernel is free software: you can redistribute it and/or
-	modify it under the terms of the GNU General Public License as
-	published by the Free Software Foundation, either version 3 of
-	the License, or (at your option) any later version.
-
-	Fennix Kernel is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with Fennix Kernel. If not, see <https://www.gnu.org/licenses/>.
-*/
-
-#include <errno.h>
-#include <audio.h>
-#include <regs.h>
-#include <base.h>
-#include <pci.h>
-#include <io.h>
-#include <fs.h>
-
-#include "hda.hpp"
-
-class HDADevice
-{
-private:
-	PCIHeader0 *Header;
-	bool Initialized = false;
-
-	ControllerRegisters *CTL;
-
-	uint32_t *CORB;
-	uint64_t *RIRB;
-
-public:
-	bool IsInitialized() { return Initialized; }
-
-	size_t write(uint8_t *, size_t Size)
-	{
-		return Size;
-	}
-
-	int ioctl(AudioIoctl, void *)
-	{
-		return 0;
-	}
-
-	void OnInterruptReceived(TrapFrame *)
-	{
-	}
-
-	void Panic()
-	{
-	}
-
-	HDADevice(PCIHeader0 *_Header)
-		: Header(_Header),
-		  CORB((uint32_t *)(uintptr_t)AllocateMemory(1)),
-		  RIRB((uint64_t *)AllocateMemory(1))
-	{
-		CTL = (ControllerRegisters *)(uintptr_t)Header->BAR0;
-		KernelLog("Unimplemented HDA driver");
-		return;
-		Initialized = true;
-	}
-
-	~HDADevice()
-	{
-		if (!Initialized)
-			return;
-	}
-};
-
-HDADevice *Drivers[4] = {nullptr};
-dev_t AudioID[4] = {(dev_t)-1};
-
-#define OIR(x) OIR_##x
-#define CREATE_OIR(x) \
-	void OIR_##x(TrapFrame *f) { Drivers[x]->OnInterruptReceived(f); }
-
-CREATE_OIR(0);
-CREATE_OIR(1);
-CREATE_OIR(2);
-CREATE_OIR(3);
-
-int __fs_Open(struct Inode *, int, mode_t) { return 0; }
-int __fs_Close(struct Inode *) { return 0; }
-ssize_t __fs_Read(struct Inode *, void *, size_t, off_t) { return 0; }
-
-ssize_t __fs_Write(struct Inode *Node, const void *Buffer, size_t Size, off_t)
-{
-	return Drivers[AudioID[Node->GetMinor()]]->write((uint8_t *)Buffer, Size);
-}
-
-int __fs_Ioctl(struct Inode *Node, unsigned long Request, void *Argp)
-{
-	return Drivers[AudioID[Node->GetMinor()]]->ioctl((AudioIoctl)Request, Argp);
-}
-
-const struct InodeOperations AudioOps = {
-	.Lookup = nullptr,
-	.Create = nullptr,
-	.Remove = nullptr,
-	.Rename = nullptr,
-	.Read = __fs_Read,
-	.Write = __fs_Write,
-	.Truncate = nullptr,
-	.Open = __fs_Open,
-	.Close = __fs_Close,
-	.Ioctl = __fs_Ioctl,
-	.ReadDir = nullptr,
-	.MkDir = nullptr,
-	.RmDir = nullptr,
-	.SymLink = nullptr,
-	.ReadLink = nullptr,
-	.Seek = nullptr,
-	.Stat = nullptr,
-};
-
-PCIArray *Devices;
-EXTERNC int cxx_Panic()
-{
-	PCIArray *ctx = Devices;
-	short Count = 0;
-	while (ctx != nullptr)
-	{
-		if (Drivers[Count] != nullptr)
-			Drivers[Count]->Panic();
-		Count++;
-		ctx = (PCIArray *)ctx->Next;
-	}
-
-	return 0;
-}
-
-EXTERNC int cxx_Probe()
-{
-	uint16_t VendorIDs[] = {0x8086, /* Intel */
-							0x15AD, /* VMware */
-							PCI_END};
-	uint16_t DeviceIDs[] = {0x9D71 /* Sunrise Point-LP HD Audio */,
-							0x2668 /* ICH6 */,
-							0x293E /* ICH9 */,
-							PCI_END};
-	Devices = GetPCIDevices(VendorIDs, DeviceIDs);
-	if (Devices == nullptr)
-	{
-		KernelLog("No HDA device found.");
-		return -ENODEV;
-	}
-
-	PCIArray *ctx = Devices;
-	bool Found = false;
-	size_t Count = 0;
-	while (ctx != nullptr)
-	{
-		if (Count++ > sizeof(Drivers) / sizeof(HDADevice *))
-			break;
-
-		PCIHeader0 *PCIBaseAddress = (PCIHeader0 *)ctx->Device->Header;
-		uint32_t PCIBAR0 = PCIBaseAddress->BAR0;
-		uint8_t Type = PCIBAR0 & 1;
-		if (Type == 1)
-		{
-			KernelLog("Device %x:%x.%d BAR0 is I/O.",
-					  PCIBaseAddress->Header.VendorID,
-					  PCIBaseAddress->Header.DeviceID,
-					  PCIBaseAddress->Header.ProgIF);
-			continue;
-		}
-
-		Found = true;
-		ctx = (PCIArray *)ctx->Next;
-	}
-
-	if (!Found)
-	{
-		KernelLog("No valid HDA device found.");
-		return -EINVAL;
-	}
-	return 0;
-}
-
-EXTERNC int cxx_Initialize()
-{
-	PCIArray *ctx = Devices;
-	size_t Count = 0;
-	while (ctx != nullptr)
-	{
-		if (Count > sizeof(Drivers) / sizeof(HDADevice *))
-			break;
-
-		PCIHeader0 *PCIBaseAddress = (PCIHeader0 *)ctx->Device->Header;
-		uint32_t PCIBAR0 = PCIBaseAddress->BAR0;
-		uint8_t Type = PCIBAR0 & 1;
-		if (Type == 1)
-		{
-			KernelLog("Device %x:%x.%d BAR0 is I/O.",
-					  PCIBaseAddress->Header.VendorID,
-					  PCIBaseAddress->Header.DeviceID,
-					  PCIBaseAddress->Header.ProgIF);
-			continue;
-		}
-
-		InitializePCI(ctx->Device);
-
-		Drivers[Count] = new HDADevice((PCIHeader0 *)ctx->Device->Header);
-
-		if (Drivers[Count]->IsInitialized())
-		{
-			dev_t ret = RegisterDevice(AUDIO_TYPE_PCM, &AudioOps);
-			AudioID[Count] = ret;
-			Count++;
-		}
-		ctx = (PCIArray *)ctx->Next;
-	}
-
-	if (Count == 0)
-	{
-		KernelLog("No valid HDA device found.");
-		return -EINVAL;
-	}
-
-	return 0;
-}
-
-EXTERNC int cxx_Finalize()
-{
-	PCIArray *ctx = Devices;
-	size_t Count = 0;
-	while (ctx != nullptr)
-	{
-		if (Count++ > sizeof(Drivers) / sizeof(HDADevice *))
-			break;
-
-		PCIHeader0 *PCIBaseAddress = (PCIHeader0 *)ctx->Device->Header;
-		uint32_t PCIBAR0 = PCIBaseAddress->BAR0;
-		uint8_t Type = PCIBAR0 & 1;
-		if (Type == 1)
-		{
-			KernelLog("Device %x:%x.%d BAR0 is I/O.",
-					  PCIBaseAddress->Header.VendorID,
-					  PCIBaseAddress->Header.DeviceID,
-					  PCIBaseAddress->Header.ProgIF);
-			continue;
-		}
-
-		delete Drivers[Count++];
-		ctx = (PCIArray *)ctx->Next;
-	}
-
-	for (size_t i = 0; i < sizeof(AudioID) / sizeof(dev_t); i++)
-	{
-		if (AudioID[i] != (dev_t)-1)
-			UnregisterDevice(AudioID[i]);
-	}
-
-	return 0;
-}

Drivers/audio/hda/main.c

@@ -1,31 +0,0 @@
-/*
-	This file is part of Fennix Drivers.
-
-	Fennix Drivers is free software: you can redistribute it and/or
-	modify it under the terms of the GNU General Public License as
-	published by the Free Software Foundation, either version 3 of
-	the License, or (at your option) any later version.
-
-	Fennix Drivers is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with Fennix Drivers. If not, see <https://www.gnu.org/licenses/>.
-*/
-
-#include <base.h>
-
-#include "hda.hpp"
-
-int DriverEntry() { return cxx_Initialize(); }
-int DriverFinal() { return cxx_Finalize(); }
-int DriverPanic() { return cxx_Panic(); }
-int DriverProbe() { return cxx_Probe(); }
-
-DriverInfo("hda",
-		   "Intel High Definition Audio Driver",
-		   "EnderIce2",
-		   0, 0, 1,
-		   "GPLv3");

Drivers/filesystem/fat/Makefile

@@ -1,35 +0,0 @@
-default:
-	$(error Do not run this Makefile directly!)
-
-S_SOURCES = $(shell find ./ -type f -name '*.S')
-C_SOURCES = $(shell find ./ -type f -name '*.c')
-CXX_SOURCES = $(shell find ./ -type f -name '*.cpp')
-HEADERS = $(sort $(dir $(wildcard ../../include/*)))
-OBJ = $(C_SOURCES:.c=.o) $(CXX_SOURCES:.cpp=.o) $(S_SOURCES:.S=.o)
-STACK_USAGE_OBJ = $(C_SOURCES:.c=.su) $(CXX_SOURCES:.cpp=.su)
-
-FILENAME = $(notdir $(shell pwd)).drv
-
-build: $(FILENAME)
-	mv $(FILENAME) $(OUTPUT_DIR)$(FILENAME)
-
-$(FILENAME): $(OBJ)
-	$(info Linking $@)
-	$(CC) $(DRIVER_LDFLAGS) $(OBJ) $(OUTPUT_DIR)dcrt0.o -L$(OUTPUT_DIR) -lkernel -o $@
-
-WARNCFLAG = -Wall -Wextra
-
-%.o: %.c $(HEADERS)
-	$(info Compiling $<)
-	$(CC) $(DRIVER_CFLAGS) $(WARNCFLAG) -std=c17 -c $< -o $@
-
-%.o: %.cpp $(HEADERS)
-	$(info Compiling $<)
-	$(CXX) $(DRIVER_CFLAGS) $(WARNCFLAG) -std=c++20 -fno-exceptions -fno-rtti -c $< -o $@
-
-%.o: %.S
-	$(info Compiling $<)
-	$(AS) -o $@ $<
-
-clean:
-	rm -f file.map $(OBJ) $(STACK_USAGE_OBJ)

Drivers/filesystem/fat/main.c

@@ -1,45 +0,0 @@
-/*
-	This file is part of Fennix Drivers.
-
-	Fennix Drivers is free software: you can redistribute it and/or
-	modify it under the terms of the GNU General Public License as
-	published by the Free Software Foundation, either version 3 of
-	the License, or (at your option) any later version.
-
-	Fennix Drivers is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with Fennix Drivers. If not, see <https://www.gnu.org/licenses/>.
-*/
-
-#include <base.h>
-
-int DriverEntry()
-{
-	return 0;
-}
-
-int DriverFinal()
-{
-	return 0;
-}
-
-int DriverPanic()
-{
-	return 0;
-}
-
-int DriverProbe()
-{
-	/* Nothing to do */
-	return 0;
-}
-
-DriverInfo("fat",
-		   "File Allocation Table Driver",
-		   "EnderIce2",
-		   0, 0, 1,
-		   "GPLv3");

Drivers/include/aip.h

@@ -103,6 +103,7 @@ typedef union
 	uint8_t Raw;
 } PS2_OUTPUT_PORT;
 
+#ifndef __kernel__
 void PIC_EOI(uint8_t IRQ);
 void IRQ_MASK(uint8_t IRQ);
 void IRQ_UNMASK(uint8_t IRQ);
@@ -114,11 +115,11 @@ uint8_t PS2ReadStatus();
 uint8_t PS2ReadAfterACK();
 void PS2ClearOutputBuffer();
 int PS2ACKTimeout();
+#endif // !__kernel__
 
 #define WaitOutput PS2Wait(DriverID, true)
 #define WaitInput PS2Wait(DriverID, false)
 
-
 #define PS2_KBD_CMD_SET_LEDS 0xED
 #define PS2_KBD_CMD_ECHO 0xEE
 #define PS2_KBD_CMD_SCAN_CODE_SET 0xF0
@@ -189,7 +190,6 @@ typedef union
 	uint8_t Raw;
 } PS2_KBD_TYPEMATIC;
 
-
 #define PS2_MOUSE_CMD_SET_SCALING_1_1 0xE6
 #define PS2_MOUSE_CMD_SET_SCALING_2_1 0xE7
 #define PS2_MOUSE_CMD_SET_RESOLUTION 0xE8

Drivers/include/block.h

@@ -0,0 +1,110 @@
+/*
+	This file is part of Fennix Kernel.
+
+	Fennix Kernel is free software: you can redistribute it and/or
+	modify it under the terms of the GNU General Public License as
+	published by the Free Software Foundation, either version 3 of
+	the License, or (at your option) any later version.
+
+	Fennix Kernel is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with Fennix Kernel. If not, see <https://www.gnu.org/licenses/>.
+*/
+
+#ifndef __FENNIX_API_BLOCK_H__
+#define __FENNIX_API_BLOCK_H__
+
+#include <types.h>
+
+#if __has_include(<interface/fs.h>)
+#include <interface/fs.h>
+#else
+#include <fs.h>
+#endif
+
+struct BlockDevice
+{
+	/**
+	 * @brief Base name of the device.
+	 *
+	 * This name is used to identify the device in the system. It should be unique
+	 * across all block devices. The kernel may append a number to this name to
+	 * create a unique device name (e.g., "ahci0", "ahci1").
+	 */
+	const char *Name;
+
+	/**
+	 * @brief Total size of the device in bytes.
+	 *
+	 * This value represents the total addressable storage capacity of the device.
+	 * It is used for bounds checking and partitioning.
+	 */
+	size_t Size;
+
+	/**
+	 * @brief Size of a single block in bytes.
+	 *
+	 * All read and write operations are performed in multiples of this block size.
+	 * Typical values are 512 or 4096 bytes.
+	 */
+	uint32_t BlockSize;
+
+	/**
+	 * @brief Number of blocks in the device.
+	 *
+	 * This value is calculated as Size / BlockSize. It represents the total number
+	 * of addressable blocks on the device.
+	 */
+	size_t BlockCount;
+
+	/**
+	 * @brief Pointer to the block device operations structure.
+	 *
+	 * This structure contains function pointers for various operations that can
+	 * be performed on the block device, such as read, write, and ioctl.
+	 * 
+	 * Yea, inode operations are used for block devices too.
+	 */
+	const InodeOperations *Ops;
+
+	/**
+	 * @brief Opaque pointer to driver-specific or hardware-specific data.
+	 *
+	 * This field allows the driver to associate private context or state with the
+	 * device, such as controller registers or internal buffers.
+	 */
+	void *PrivateData;
+};
+
+#ifndef __kernel__
+/**
+ * @brief Registers a block device with the kernel block subsystem.
+ *
+ * This function should be called by block device drivers after initializing
+ * a device. The kernel will take ownership of the device structure and assign
+ * it a unique device ID. The device will then be accessible for filesystem
+ * mounting and I/O operations.
+ *
+ * @param Device Pointer to a fully initialized BlockDevice structure. All required fields must be set and valid for the lifetime of the device.
+ * @return Device ID (dev_t) assigned by the kernel on success, or an error code on failure.
+ */
+dev_t RegisterBlockDevice(struct BlockDevice *Device);
+
+/**
+ * @brief Unregisters a block device from the kernel block subsystem.
+ *
+ * This function should be called by drivers when a device is being removed
+ * or is no longer available. The kernel will release any resources associated
+ * with the device and invalidate its device ID.
+ *
+ * @param DeviceID The device ID (dev_t) previously returned by RegisterBlockDevice().
+ * @return 0 on success, or an error code.
+ */
+int UnregisterBlockDevice(dev_t DeviceID);
+#endif // __kernel__
+
+#endif // __FENNIX_API_BLOCK_H__

Drivers/include/device.h

@@ -69,7 +69,10 @@ typedef enum
 	BLOCK_TYPE_FLOPPY = DEVICE_TYPE_BLOCK + 128,
 } DeviceType;
 
+#ifndef __kernel__
+EXTERNC dev_t CreateDeviceFile(const char *name, mode_t mode, const struct InodeOperations *Operations);
 EXTERNC dev_t RegisterDevice(DeviceType Type, const struct InodeOperations *Operations);
 EXTERNC int UnregisterDevice(dev_t Device);
+#endif // !__kernel__
 
 #endif // !__FENNIX_API_DEVICE_H__

Drivers/include/errno.h

@@ -25,12 +25,11 @@
  * Full list:
  *  https://pubs.opengroup.org/onlinepubs/9699919799.2018edition/basedefs/errno.h.html
  */
-typedef enum
-{
+
 /**
  * No Error
  */
-	EOK = 0,
+#define EOK 0
 
 /**
  * Argument list too long. The sum of the number of bytes used by the
@@ -41,50 +40,50 @@ typedef enum
  * or:
  * Argument is greater than the system-imposed maximum.
  */
-	E2BIG = 1,
+#define E2BIG 1
 
 /**
  * Permission denied. An attempt was made to access a file in a way
  *  forbidden by its file access permissions.
  */
-	EACCES = 2,
+#define EACCES 2
 
 /**
  * Address in use. The specified address is in use.
  */
-	EADDRINUSE = 3,
+#define EADDRINUSE 3
 
 /**
  * Address not available. The specified address is not available from
  *  the local system.
  */
-	EADDRNOTAVAIL = 4,
+#define EADDRNOTAVAIL 4
 
 /**
  * Address family not supported. The implementation does not support
  *  the specified address family, or the specified address is not a
  *  valid address for the address family of the specified socket.
  */
-	EAFNOSUPPORT = 5,
+#define EAFNOSUPPORT 5
 
 /**
  * Resource temporarily unavailable. This is a temporary condition
  *  and later calls to the same routine may complete normally.
  */
-	EAGAIN = 6,
+#define EAGAIN 6
 
 /**
  * Connection already in progress. A connection request is already in
  *  progress for the specified socket.
  */
-	EALREADY = 7,
+#define EALREADY 7
 
 /**
  * Bad file descriptor. A file descriptor argument is out of range,
  *  refers to no open file, or a read (write) request is made to a
  *  file that is only open for writing (reading).
  */
-	EBADF = 8,
+#define EBADF 8
 
 /**
  * Bad message. During a read(), getmsg(), getpmsg(), or ioctl()
@@ -99,7 +98,7 @@ typedef enum
  * Control or data information was received instead of a file
  *  descriptor when I_RECVFD was specified.
  */
-	EBADMSG = 9,
+#define EBADMSG 9
 
 /**
  * Resource busy. An attempt was made to make use of a system
@@ -107,25 +106,25 @@ typedef enum
  *  used by another process in a manner that would have
  *  conflicted with the request being made by this process.
  */
-	EBUSY = 10,
+#define EBUSY 10
 
 /**
  * Operation canceled. The associated asynchronous operation was
  *  canceled before completion.
  */
-	ECANCELED = 11,
+#define ECANCELED 11
 
 /**
  * No child process. A wait(), waitid(), or waitpid() function was
  *  executed by a process that had no existing or unwaited-for
  *  child process.
  */
-	ECHILD = 12,
+#define ECHILD 12
 
 /**
  * Connection aborted. The connection has been aborted.
  */
-	ECONNABORTED = 13,
+#define ECONNABORTED 13
 
 /**
  * Connection refused. An attempt to connect to a socket was refused
@@ -133,40 +132,40 @@ typedef enum
  *  connection requests was full and the underlying protocol does not
  *  support retransmissions.
  */
-	ECONNREFUSED = 14,
+#define ECONNREFUSED 14
 
 /**
  * Connection reset. The connection was forcibly closed by the peer.
  */
-	ECONNRESET = 15,
+#define ECONNRESET 15
 
 /**
  * Resource deadlock would occur. An attempt was made to lock a system
  *  resource that would have resulted in a deadlock situation.
  */
-	EDEADLK = 16,
+#define EDEADLK 16
 
 /**
  * Destination address required. No bind address was established.
  */
-	EDESTADDRREQ = 17,
+#define EDESTADDRREQ 17
 
 /**
  * Domain error. An input argument is outside the defined domain of the
  *  mathematical function (defined in the ISO C standard).
  */
-	EDOM = 18,
+#define EDOM 18
 
 /**
  * Reserved.
  */
-	EDQUOT = 19,
+#define EDQUOT 19
 
 /**
  * File exists. An existing file was mentioned in an inappropriate
  *  context; for example, as a new link name in the link() function.
  */
-	EEXIST = 20,
+#define EEXIST 20
 
 /**
  * Bad address. The system detected an invalid address in attempting
@@ -175,34 +174,34 @@ typedef enum
  *  generation of a signal, indicating an address violation, which is
  *  sent to the process.
  */
-	EFAULT = 21,
+#define EFAULT 21
 
 /**
  * File too large. The size of a file would exceed the maximum file
  *  size of an implementation or offset maximum established in the
  *  corresponding file description.
  */
-	EFBIG = 22,
+#define EFBIG 22
 
 /**
  * Host is unreachable. The destination host cannot be reached
  *  (probably because the host is down or a remote router cannot
  *  reach it).
  */
-	EHOSTUNREACH = 23,
+#define EHOSTUNREACH 23
 
 /**
  * Identifier removed. Returned during XSI interprocess communication
  *  if an identifier has been removed from the system.
  */
-	EIDRM = 24,
+#define EIDRM 24
 
 /**
  * Illegal byte sequence. A wide-character code has been detected that
  *  does not correspond to a valid character, or a byte sequence does
  *  not form a valid wide-character code (defined in the ISO C standard).
  */
-	EILSEQ = 25,
+#define EILSEQ 25
 
 /**
  * Operation in progress. This code is used to indicate that an
@@ -211,7 +210,7 @@ typedef enum
  * O_NONBLOCK is set for the socket file descriptor and the connection
  *  cannot be immediately established.
  */
-	EINPROGRESS = 26,
+#define EINPROGRESS 26
 
 /**
  * Interrupted function call. An asynchronous signal was caught by the
@@ -220,14 +219,14 @@ typedef enum
  *  call may return this condition (see the Base Definitions volume
  *  of POSIX.1-2017, <signal.h>).
  */
-	EINTR = 27,
+#define EINTR 27
 
 /**
  * Invalid argument. Some invalid argument was supplied; for example,
  *  specifying an undefined signal in a signal() function or a
  *  kill() function.
  */
-	EINVAL = 28,
+#define EINVAL 28
 
 /**
  * Input/output error. Some physical input or output error has occurred.
@@ -235,18 +234,18 @@ typedef enum
  *  file descriptor. Any other error-causing operation on the same file
  *  descriptor may cause the [EIO] error indication to be lost.
  */
-	EIO = 29,
+#define EIO 29
 
 /**
  * Socket is connected. The specified socket is already connected.
  */
-	EISCONN = 30,
+#define EISCONN 30
 
 /**
  * Is a directory. An attempt was made to open a directory with write
  *  mode specified.
  */
-	EISDIR = 31,
+#define EISDIR 31
 
 /**
  * Symbolic link loop. A loop exists in symbolic links encountered
@@ -254,7 +253,7 @@ typedef enum
  *  more than {SYMLOOP_MAX} symbolic links are encountered during
  *  pathname resolution.
  */
-	ELOOP = 32,
+#define ELOOP 32
 
 /**
  * File descriptor value too large or too many open streams. An
@@ -262,13 +261,13 @@ typedef enum
  *  than or equal to {OPEN_MAX}, or an attempt was made to open more
  *  than the maximum number of streams allowed in the process.
  */
-	EMFILE = 33,
+#define EMFILE 33
 
 /**
  * Too many links. An attempt was made to have the link count of a
  *  single file exceed {LINK_MAX}.
  */
-	EMLINK = 34,
+#define EMLINK 34
 
 /**
  * Message too large. A message sent on a transport provider was
@@ -276,12 +275,12 @@ typedef enum
  * or:
  * Inappropriate message buffer length.
  */
-	EMSGSIZE = 35,
+#define EMSGSIZE 35
 
 /**
  * Reserved.
  */
-	EMULTIHOP = 36,
+#define EMULTIHOP 36
 
 /**
  * Filename too long. The length of a pathname exceeds {PATH_MAX} and
@@ -291,23 +290,23 @@ typedef enum
  *  symbolic link during pathname resolution, results in a pathname
  *  string the size of which exceeds {PATH_MAX}.
  */
-	ENAMETOOLONG = 37,
+#define ENAMETOOLONG 37
 
 /**
  * Network is down. The local network interface used to reach the
  *  destination is down.
  */
-	ENETDOWN = 38,
+#define ENETDOWN 38
 
 /**
  * The connection was aborted by the network.
  */
-	ENETRESET = 39,
+#define ENETRESET 39
 
 /**
  * Network unreachable. No route to the network is present.
  */
-	ENETUNREACH = 40,
+#define ENETUNREACH 40
 
 /**
  * Too many files open in system. Too many files are currently open
@@ -315,77 +314,77 @@ typedef enum
  *  simultaneously open files and temporarily cannot accept requests
  *  to open another one.
  */
-	ENFILE = 41,
+#define ENFILE 41
 
 /**
  * No buffer space available. Insufficient buffer resources were
  *  available in the system to perform the socket operation.
  */
-	ENOBUFS = 42,
+#define ENOBUFS 42
 
 /**
  * No message available. No message is available on the STREAM head
  *  read queue.
  */
-	ENODATA = 43,
+#define ENODATA 43
 
 /**
  * No such device. An attempt was made to apply an inappropriate
  *  function to a device; for example, trying to read a write-only
  *  device such as a printer.
  */
-	ENODEV = 44,
+#define ENODEV 44
 
 /**
  * No such file or directory. A component of a specified pathname
  *  does not exist, or the pathname is an empty string.
  */
-	ENOENT = 45,
+#define ENOENT 45
 
 /**
  * Executable file format error. A request is made to execute a file
  *  that, although it has appropriate privileges, is not in the
  *  format required by the implementation for executable files.
  */
-	ENOEXEC = 46,
+#define ENOEXEC 46
 
 /**
  * No locks available. A system-imposed limit on the number of
  *  simultaneous file and record locks has been reached and no more
  *  are currently available.
  */
-	ENOLCK = 47,
+#define ENOLCK 47
 
 /**
  * Reserved.
  */
-	ENOLINK = 48,
+#define ENOLINK 48
 
 /**
  * Not enough space. The new process image requires more memory than
  *  is allowed by the hardware or system-imposed memory management
  *  constraints.
  */
-	ENOMEM = 49,
+#define ENOMEM 49
 
 /**
  * No message of the desired type. The message queue does not contain
  *  a message of the required type during XSI interprocess communication.
  */
-	ENOMSG = 50,
+#define ENOMSG 50
 
 /**
  * Protocol not available. The protocol option specified to
  *  setsockopt() is not supported by the implementation.
  */
-	ENOPROTOOPT = 51,
+#define ENOPROTOOPT 51
 
 /**
  * No space left on a device. During the write() function on a
  *  regular file or when extending a directory, there is no free
  *  space left on the device.
  */
-	ENOSPC = 52,
+#define ENOSPC 52
 
 /**
  * No STREAM resources. Insufficient STREAMS memory resources are
@@ -393,24 +392,24 @@ typedef enum
  *  temporary condition; it may be recovered from if other
  *  processes release resources.
  */
-	ENOSR = 53,
+#define ENOSR 53
 
 /**
  * Not a STREAM. A STREAM function was attempted on a file descriptor
  *  that was not associated with a STREAMS device.
  */
-	ENOSTR = 54,
+#define ENOSTR 54
 
 /**
  * Functionality not supported. An attempt was made to use optional
  *  functionality that is not supported in this implementation.
  */
-	ENOSYS = 55,
+#define ENOSYS 55
 
 /**
  * Socket not connected. The socket is not connected.
  */
-	ENOTCONN = 56,
+#define ENOTCONN 56
 
 /**
  * Not a directory. A component of the specified pathname exists, but
@@ -419,37 +418,37 @@ typedef enum
  *  pathname contains at least one non- \<slash\> character and ends
  *  with one or more trailing \<slash\> characters.
  */
-	ENOTDIR = 57,
+#define ENOTDIR 57
 
 /**
  * Directory not empty. A directory other than an empty directory
  *  was supplied when an empty directory was expected.
  */
-	ENOTEMPTY = 58,
+#define ENOTEMPTY 58
 
 /**
  * State not recoverable. The state protected by a robust mutex
  *  is not recoverable.
  */
-	ENOTRECOVERABLE = 59,
+#define ENOTRECOVERABLE 59
 
 /**
  * Not a socket. The file descriptor does not refer to a socket.
  */
-	ENOTSOCK = 60,
+#define ENOTSOCK 60
 
 /**
  * Not supported. The implementation does not support the requested
  *  feature or value.
  */
-	ENOTSUP = 61,
+#define ENOTSUP 61
 
 /**
  * Inappropriate I/O control operation. A control function has been
  *  attempted for a file or special file for which the operation
  *  is inappropriate.
  */
-	ENOTTY = 62,
+#define ENOTTY 62
 
 /**
  * No such device or address. Input or output on a special file
@@ -457,13 +456,13 @@ typedef enum
  *  beyond the capabilities of the device. It may also occur when,
  *  for example, a tape drive is not on-line.
  */
-	ENXIO = 63,
+#define ENXIO 63
 
 /**
  * Operation not supported on socket. The type of socket (address
  *  family or protocol) does not support the requested operation.
  */
-	EOPNOTSUPP = 64,
+#define EOPNOTSUPP 64
 
 /**
  * Value too large to be stored in data type. An operation was
@@ -471,76 +470,76 @@ typedef enum
  *  range of values that can be represented in the relevant data
  *  type or that are allowed for a given data item.
  */
-	EOVERFLOW = 65,
+#define EOVERFLOW 65
 
 /**
  * Previous owner died. The owner of a robust mutex terminated
  *  while holding the mutex lock.
  */
-	EOWNERDEAD = 66,
+#define EOWNERDEAD 66
 
 /**
  * Operation not permitted. An attempt was made to perform an
  *  operation limited to processes with appropriate privileges or
  *  to the owner of a file or other resource.
  */
-	EPERM = 67,
+#define EPERM 67
 
 /**
  * Broken pipe. A write was attempted on a socket, pipe, or FIFO
  *  for which there is no process to read the data.
  */
-	EPIPE = 68,
+#define EPIPE 68
 
 /**
  * Protocol error. Some protocol error occurred. This error is
  *  device-specific, but is generally not related to a
  *  hardware failure.
  */
-	EPROTO = 69,
+#define EPROTO 69
 
 /**
  * Protocol not supported. The protocol is not supported by the
  *  address family, or the protocol is not supported by
  *  the implementation.
  */
-	EPROTONOSUPPORT = 70,
+#define EPROTONOSUPPORT 70
 
 /**
  * Protocol wrong type for socket. The socket type is not
  *  supported by the protocol.
  */
-	EPROTOTYPE = 71,
+#define EPROTOTYPE 71
 
 /**
  * Result too large or too small. The result of the function
  *  is too large (overflow) or too small (underflow) to be
  *  represented in the available space.
  */
-	ERANGE = 72,
+#define ERANGE 72
 
 /**
  * Read-only file system. An attempt was made to modify a file
  *  or directory on a file system that is read-only.
  */
-	EROFS = 73,
+#define EROFS 73
 
 /**
  * Invalid seek. An attempt was made to access the file offset
  *  associated with a pipe or FIFO.
  */
-	ESPIPE = 74,
+#define ESPIPE 74
 
 /**
  * No such process. No process can be found corresponding to that
  *  specified by the given process ID.
  */
-	ESRCH = 75,
+#define ESRCH 75
 
 /**
  * Reserved.
  */
-	ESTALE = 76,
+#define ESTALE 76
 
 /**
  * STREAM ioctl() timeout. The timer set for a STREAMS ioctl() call
@@ -549,7 +548,7 @@ typedef enum
  *  value that is too short for the specific operation. The status
  *  of the ioctl() operation is unspecified.
  */
-	ETIME = 77,
+#define ETIME 77
 
 /**
  * Connection timed out. The connection to a remote machine has
@@ -563,7 +562,7 @@ typedef enum
  * Operation timed out. The time limit associated with the operation
  *  was exceeded before the operation completed.
  */
-	ETIMEDOUT = 78,
+#define ETIMEDOUT 78
 
 /**
  * Text file busy. An attempt was made to execute a pure-procedure
@@ -571,35 +570,22 @@ typedef enum
  *  been made to open for writing a pure-procedure program that
  *  is being executed.
  */
-	ETXTBSY = 79,
+#define ETXTBSY 79
 
 /**
  * Operation would block. An operation on a socket marked as
  *  non-blocking has encountered a situation such as no data available
  *  that otherwise would have caused the function to suspend execution.
  */
-	EWOULDBLOCK = 80,
+#define EWOULDBLOCK 80
 
 /**
  * Improper link. A link to a file on another file system was attempted.
  */
-	EXDEV = 81,
+#define EXDEV 81
 
-	__ERRNO_MAX
-} KernelErrors;
-
-#ifdef __cplusplus
-extern "C"
-{
+#ifdef __kernel__
+#define __ERRNO_MAX 82
 #endif
 
-	int *__errno_location(void) __attribute__((const));
-	char *strerror(int errnum);
-
-#ifdef __cplusplus
-}
-#endif
-
-#define errno (*__errno_location())
-
 #endif // !__FENNIX_API_ERRNO_H__

Drivers/include/fcntl.h

@@ -0,0 +1,109 @@
+/*
+	This file is part of Fennix Kernel.
+
+	Fennix Kernel is free software: you can redistribute it and/or
+	modify it under the terms of the GNU General Public License as
+	published by the Free Software Foundation, either version 3 of
+	the License, or (at your option) any later version.
+
+	Fennix Kernel is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with Fennix Kernel. If not, see <https://www.gnu.org/licenses/>.
+*/
+
+#ifndef __FENNIX_API_FCNTL_H__
+#define __FENNIX_API_FCNTL_H__
+
+#ifdef __kernel__
+#include <types.h>
+#endif
+
+/* cmd */
+#define F_DUPFD 0x1
+#define F_DUPFD_CLOEXEC 0x101
+#define F_DUPFD_CLOFORK 0x201
+#define F_GETFD 0x2
+#define F_SETFD 0x3
+#define F_GETFL 0x4
+#define F_SETFL 0x5
+#define F_GETLK 0x6
+#define F_SETLK 0x7
+#define F_SETLKW 0x8
+#define F_OFD_GETLK 0x9
+#define F_OFD_SETLK 0xA
+#define F_OFD_SETLKW 0xB
+#define F_GETOWN 0xC
+#define F_GETOWN_EX 0xD
+#define F_SETOWN 0xE
+#define F_SETOWN_EX 0xF
+
+#define FD_CLOEXEC 0x1
+#define FD_CLOFORK 0x2
+
+/* l_type */
+#define F_RDLCK 0x1
+#define F_UNLCK 0x2
+#define F_WRLCK 0x3
+
+/* type */
+#define F_OWNER_PID 0
+#define F_OWNER_PGRP 1
+
+/* oflag */
+#define O_CLOEXEC 02000000
+#define O_CLOFORK 04000000
+#define O_CREAT 0x8
+#define O_DIRECTORY 0200000
+#define O_EXCL 0x20
+#define O_NOCTTY 0x40
+#define O_NOFOLLOW 0400000
+#define O_TRUNC 0x400
+#define O_TTY_INIT 0x800
+
+#define O_APPEND 0x4
+#define O_DSYNC 0x10
+#define O_NONBLOCK 0x80
+#define O_RSYNC 0x100
+#define O_SYNC 0x200
+
+#define O_ACCMODE 0x3
+
+#define O_EXEC 0x4
+#define O_RDONLY 0x1
+#define O_RDWR 0x3
+#define O_SEARCH 0x10
+#define O_WRONLY 0x2
+
+#define AT_FDCWD
+#define AT_EACCESS
+#define AT_SYMLINK_NOFOLLOW
+#define AT_SYMLINK_FOLLOW
+#define AT_REMOVEDIR
+
+#define POSIX_FADV_DONTNEED
+#define POSIX_FADV_NOREUSE
+#define POSIX_FADV_NORMAL
+#define POSIX_FADV_RANDOM
+#define POSIX_FADV_SEQUENTIAL
+#define POSIX_FADV_WILLNEED
+
+typedef struct f_owner_ex
+{
+	int type;  /* Discriminator for pid. */
+	pid_t pid; /* Process ID or process group ID. */
+} f_owner_ex;
+
+typedef struct flock
+{
+	short l_type;	/* Type of lock; F_RDLCK, F_WRLCK, F_UNLCK. */
+	short l_whence; /* Flag for starting offset. */
+	off_t l_start;	/* Relative offset in bytes. */
+	off_t l_len;	/* Size; if 0 then until EOF. */
+	pid_t l_pid;	/* For a process-owned file lock, ignored on input or the process ID of the owning process on output; for an OFD-owned file lock, zero on input or (pid_t)-1 on output. */
+} flock;
+
+#endif // !__FENNIX_API_FCNTL_H__

Drivers/include/fs.h

@@ -95,16 +95,6 @@
 /** Other:   X */
 #define S_IXOTH 0001
 
-#define O_RDONLY 00
-#define O_WRONLY 01
-#define O_RDWR 02
-#define O_CREAT 0100
-#define O_EXCL 0200
-#define O_TRUNC 01000
-#define O_APPEND 02000
-#define O_NOFOLLOW 0400000
-#define O_CLOEXEC 02000000
-
 #define S_ISDIR(mode) (((mode) & S_IFMT) == S_IFDIR)
 #define S_ISCHR(mode) (((mode) & S_IFMT) == S_IFCHR)
 #define S_ISBLK(mode) (((mode) & S_IFMT) == S_IFBLK)
@@ -332,11 +322,29 @@ struct InodeOperations
 	int (*Stat)(struct Inode *Node, struct kstat *Stat);
 } __attribute__((packed));
 
-#define I_FLAG_ROOT 0x1
-#define I_FLAG_MOUNTPOINT 0x2
-#define I_FLAG_CACHE_KEEP 0x4
-
 struct FileSystemInfo;
+
+struct FileSystemDevice
+{
+	struct
+	{
+		/**
+		 * @brief Inode
+		 *
+		 * If the device is a block device, this will be NULL.
+		 */
+		struct Inode *node;
+		struct InodeOperations *ops;
+	} inode;
+
+	/**
+	 * @brief Block Device
+	 *
+	 * If the device is a block device, this will be non-NULL.
+	 */
+	struct BlockDevice *Block;
+};
+
 struct SuperBlockOperations
 {
 	int (*AllocateInode)(struct FileSystemInfo *Info, struct Inode **Result);
@@ -347,8 +355,8 @@ struct SuperBlockOperations
 	 *
 	 * Write all pending changes to the disk.
 	 *
-	 * @param Info Inode to synchronize. If NULL, synchronize all inodes.
-	 * @param Node Inode to synchronize.
+	 * @param Info Inode to synchronize.
+	 * @param Node Inode to synchronize. If NULL, synchronize all inodes.
 	 *
 	 * @return Zero on success, otherwise an error code.
 	 */
@@ -364,20 +372,62 @@ struct SuperBlockOperations
 	 * @return Zero on success, otherwise an error code.
 	 */
 	int (*Destroy)(struct FileSystemInfo *Info);
+
+	/**
+	 * Probe the filesystem.
+	 *
+	 * Check if the filesystem is supported by the driver.
+	 *
+	 * @param Device Device to probe.
+	 *
+	 * @return Zero on success, otherwise an error code.
+	 */
+	int (*Probe)(struct FileSystemDevice *Device);
+
+	/**
+	 * Mount the filesystem.
+	 *
+	 * Mount the filesystem on the given device.
+	 *
+	 * @param FS Filesystem to mount.
+	 * @param Root Pointer to the root inode.
+	 * @param Device Device to mount. This pointer will be undefined after the function returns!
+	 *
+	 * @return Zero on success, otherwise an error code.
+	 */
+	int (*Mount)(struct FileSystemInfo *FS, struct Inode **Root, struct FileSystemDevice *Device);
+
+	/**
+	 * Unmount the filesystem.
+	 *
+	 * Unmount the filesystem from the given device.
+	 *
+	 * @param FS Filesystem to unmount.
+	 *
+	 * @return Zero on success, otherwise an error code.
+	 */
+	int (*Unmount)(struct FileSystemInfo *FS);
 } __attribute__((packed));
 
 struct FileSystemInfo
 {
 	const char *Name;
-	const char *RootName;
+
 	int Flags;
+	int Capabilities;
+
 	struct SuperBlockOperations SuperOps;
 	struct InodeOperations Ops;
 
 	void *PrivateData;
 } __attribute__((packed));
 
+#ifndef __kernel__
+dev_t RegisterMountPoint(FileSystemInfo *fsi, Inode *Root);
+int UnregisterMountPoint(dev_t Device);
+
 dev_t RegisterFileSystem(struct FileSystemInfo *Info, struct Inode *Root);
 int UnregisterFileSystem(dev_t Device);
+#endif // !__kernel__
 
 #endif // !__FENNIX_API_FILESYSTEM_H__

Drivers/include/input.h

@@ -239,6 +239,8 @@ typedef struct
 	};
 } InputReport;
 
+#ifndef __kernel__
 EXTERNC int ReportInputEvent(InputReport *Report);
+#endif // !__kernel__
 
 #endif // !__FENNIX_API_INPUT_H__

Drivers/include/pci.h

@@ -171,11 +171,13 @@ extern "C"
 {
 #endif
 
+#ifndef __kernel__
 	PCIArray *GetPCIDevices(uint16_t Vendors[], uint16_t Devices[]);
 	void InitializePCI(PCIDevice *Device);
 	uint32_t GetBAR(uint8_t Index, PCIDevice *Device);
 	uint8_t iLine(PCIDevice *Device);
 	uint8_t iPin(PCIDevice *Device);
+#endif // !__kernel__
 
 #ifdef __cplusplus
 }

Drivers/include/syscalls.h

@@ -15,13 +15,44 @@
 	along with Fennix Kernel. If not, see <https://www.gnu.org/licenses/>.
 */
 
-#ifndef __FENNIX_API_SYSCALLS_LIST_H__
-#define __FENNIX_API_SYSCALLS_LIST_H__
+#ifndef __FENNIX_API_SYSTEM_CALLS_LIST_H__
+#define __FENNIX_API_SYSTEM_CALLS_LIST_H__
+
+#if __has_include(<interface/fcntl.h>)
+#include <interface/fcntl.h>
+#else
+#include <fcntl.h>
+#endif
+
+#ifndef __fennix__
+#error "__fennix__ not defined"
+#endif
 
 #pragma region Syscall Wrappers
 
 #define scarg __UINTPTR_TYPE__
 
+#ifdef __arm__
+#ifdef __thumb__
+#define __thumb_r7
+#define __arm_call(...)
+#warning "arm thumb code not implemented"
+#else /* __thumb__ */
+#define __thumb_r7 __asm__("r7")
+#define __arm_call(...)                \
+	__asm__ __volatile__("svc 0"       \
+						 : "=r"(r0)    \
+						 : __VA_ARGS__ \
+						 : "memory")
+#endif /* __thumb__ */
+
+#ifdef __thumb2__
+#define __r7_operand "rI"(r7)
+#else /* __thumb2__ */
+#define __r7_operand "r"(r7)
+#endif /* __thumb2__ */
+#endif /* __arm__ */
+
 /**
  * @brief Syscall wrapper with 0 arguments
  *
@@ -39,12 +70,17 @@ static inline scarg syscall0(scarg syscall)
 						 : "a"(syscall)
 						 : "rcx", "r11", "memory");
 #elif defined(__i386__)
-#warning "i386 syscall wrapper not implemented"
+	__asm__ __volatile__("int $0x30"
+						 : "=a"(ret)
+						 : "a"(syscall)
+						 : "memory");
 #elif defined(__arm__)
-#warning "arm syscall wrapper not implemented"
+	register scarg r7 __thumb_r7 = syscall;
+	register scarg r0 __asm__("r0");
+	__arm_call(__r7_operand);
 #elif defined(__aarch64__)
-	register long x8 __asm__("x8") = syscall;
-	register long x0 __asm__("x0");
+	register scarg x8 __asm__("x8") = syscall;
+	register scarg x0 __asm__("x0");
 	__asm__ __volatile__("svc 0"
 						 : "=r"(x0)
 						 : "r"(x8)
@@ -73,12 +109,17 @@ static inline scarg syscall1(scarg syscall, scarg arg1)
 						 : "a"(syscall), "D"(arg1)
 						 : "rcx", "r11", "memory");
 #elif defined(__i386__)
-#warning "i386 syscall wrapper not implemented"
+	__asm__ __volatile__("int $0x30"
+						 : "=a"(ret)
+						 : "a"(syscall), "b"(arg1)
+						 : "memory");
 #elif defined(__arm__)
-#warning "arm syscall wrapper not implemented"
+	register scarg r7 __thumb_r7 = syscall;
+	register scarg r0 __asm__("r0") = arg1;
+	__arm_call(__r7_operand, "0"(r0));
 #elif defined(__aarch64__)
-	register long x8 __asm__("x8") = syscall;
-	register long x0 __asm__("x0") = arg1;
+	register scarg x8 __asm__("x8") = syscall;
+	register scarg x0 __asm__("x0") = arg1;
 	__asm__ __volatile__("svc 0"
 						 : "=r"(ret)
 						 : "r"(x8), "0"(x0)
@@ -108,13 +149,19 @@ static inline scarg syscall2(scarg syscall, scarg arg1, scarg arg2)
 						 : "a"(syscall), "D"(arg1), "S"(arg2)
 						 : "rcx", "r11", "memory");
 #elif defined(__i386__)
-#warning "i386 syscall wrapper not implemented"
+	__asm__ __volatile__("int $0x30"
+						 : "=a"(ret)
+						 : "a"(syscall), "b"(arg1), "c"(arg2)
+						 : "memory");
 #elif defined(__arm__)
-#warning "arm syscall wrapper not implemented"
+	register scarg r7 __thumb_r7 = syscall;
+	register scarg r0 __asm__("r0") = arg1;
+	register scarg r1 __asm__("r1") = arg2;
+	__arm_call(__r7_operand, "0"(r0), "r"(r1));
 #elif defined(__aarch64__)
-	register long x8 __asm__("x8") = syscall;
-	register long x0 __asm__("x0") = arg1;
-	register long x1 __asm__("x1") = arg2;
+	register scarg x8 __asm__("x8") = syscall;
+	register scarg x0 __asm__("x0") = arg1;
+	register scarg x1 __asm__("x1") = arg2;
 	__asm__ __volatile__("svc 0"
 						 : "=r"(ret)
 						 : "r"(x8), "0"(x0), "r"(x1)
@@ -145,14 +192,21 @@ static inline scarg syscall3(scarg syscall, scarg arg1, scarg arg2, scarg arg3)
 						 : "a"(syscall), "D"(arg1), "S"(arg2), "d"(arg3)
 						 : "rcx", "r11", "memory");
 #elif defined(__i386__)
-#warning "i386 syscall wrapper not implemented"
+	__asm__ __volatile__("int $0x30"
+						 : "=a"(ret)
+						 : "a"(syscall), "b"(arg1), "c"(arg2), "d"(arg3)
+						 : "memory");
 #elif defined(__arm__)
-#warning "arm syscall wrapper not implemented"
+	register scarg r7 __thumb_r7 = syscall;
+	register scarg r0 __asm__("r0") = arg1;
+	register scarg r1 __asm__("r1") = arg2;
+	register scarg r2 __asm__("r2") = arg3;
+	__arm_call(__r7_operand, "0"(r0), "r"(r1), "r"(r2));
 #elif defined(__aarch64__)
-	register long x8 __asm__("x8") = syscall;
-	register long x0 __asm__("x0") = arg1;
-	register long x1 __asm__("x1") = arg2;
-	register long x2 __asm__("x2") = arg3;
+	register scarg x8 __asm__("x8") = syscall;
+	register scarg x0 __asm__("x0") = arg1;
+	register scarg x1 __asm__("x1") = arg2;
+	register scarg x2 __asm__("x2") = arg3;
 	__asm__ __volatile__("svc 0"
 						 : "=r"(ret)
 						 : "r"(x8), "0"(x0), "r"(x1), "r"(x2)
@@ -185,15 +239,23 @@ static inline scarg syscall4(scarg syscall, scarg arg1, scarg arg2, scarg arg3,
 						 : "a"(syscall), "D"(arg1), "S"(arg2), "d"(arg3), "r"(r10)
 						 : "rcx", "r11", "memory");
 #elif defined(__i386__)
-#warning "i386 syscall wrapper not implemented"
+	__asm__ __volatile__("int $0x30"
+						 : "=a"(ret)
+						 : "a"(syscall), "b"(arg1), "c"(arg2), "d"(arg3), "S"(arg4)
+						 : "memory");
 #elif defined(__arm__)
-#warning "arm syscall wrapper not implemented"
+	register scarg r7 __thumb_r7 = syscall;
+	register scarg r0 __asm__("r0") = arg1;
+	register scarg r1 __asm__("r1") = arg2;
+	register scarg r2 __asm__("r2") = arg3;
+	register scarg r3 __asm__("r3") = arg4;
+	__arm_call(__r7_operand, "0"(r0), "r"(r1), "r"(r2), "r"(r3));
 #elif defined(__aarch64__)
-	register long x8 __asm__("x8") = syscall;
-	register long x0 __asm__("x0") = arg1;
-	register long x1 __asm__("x1") = arg2;
-	register long x2 __asm__("x2") = arg3;
-	register long x3 __asm__("x3") = arg4;
+	register scarg x8 __asm__("x8") = syscall;
+	register scarg x0 __asm__("x0") = arg1;
+	register scarg x1 __asm__("x1") = arg2;
+	register scarg x2 __asm__("x2") = arg3;
+	register scarg x3 __asm__("x3") = arg4;
 	__asm__ __volatile__("svc 0"
 						 : "=r"(ret)
 						 : "r"(x8), "0"(x0), "r"(x1), "r"(x2), "r"(x3)
@@ -228,16 +290,25 @@ static inline scarg syscall5(scarg syscall, scarg arg1, scarg arg2, scarg arg3,
 						 : "a"(syscall), "D"(arg1), "S"(arg2), "d"(arg3), "r"(r10), "r"(r8)
 						 : "rcx", "r11", "memory");
 #elif defined(__i386__)
-#warning "i386 syscall wrapper not implemented"
+	__asm__ __volatile__("int $0x30"
+						 : "=a"(ret)
+						 : "a"(syscall), "b"(arg1), "c"(arg2), "d"(arg3), "S"(arg4), "D"(arg5)
+						 : "memory");
 #elif defined(__arm__)
-#warning "arm syscall wrapper not implemented"
+	register scarg r7 __thumb_r7 = syscall;
+	register scarg r0 __asm__("r0") = arg1;
+	register scarg r1 __asm__("r1") = arg2;
+	register scarg r2 __asm__("r2") = arg3;
+	register scarg r3 __asm__("r3") = arg4;
+	register scarg r4 __asm__("r4") = arg5;
+	__arm_call(__r7_operand, "0"(r0), "r"(r1), "r"(r2), "r"(r3), "r"(r4));
 #elif defined(__aarch64__)
-	register long x8 __asm__("x8") = syscall;
-	register long x0 __asm__("x0") = arg1;
-	register long x1 __asm__("x1") = arg2;
-	register long x2 __asm__("x2") = arg3;
-	register long x3 __asm__("x3") = arg4;
-	register long x4 __asm__("x4") = arg5;
+	register scarg x8 __asm__("x8") = syscall;
+	register scarg x0 __asm__("x0") = arg1;
+	register scarg x1 __asm__("x1") = arg2;
+	register scarg x2 __asm__("x2") = arg3;
+	register scarg x3 __asm__("x3") = arg4;
+	register scarg x4 __asm__("x4") = arg5;
 	__asm__ __volatile__("svc 0"
 						 : "=r"(ret)
 						 : "r"(x8), "0"(x0), "r"(x1), "r"(x2), "r"(x3), "r"(x4)
@@ -274,17 +345,27 @@ static inline scarg syscall6(scarg syscall, scarg arg1, scarg arg2, scarg arg3,
 						 : "a"(syscall), "D"(arg1), "S"(arg2), "d"(arg3), "r"(r10), "r"(r8), "r"(r9)
 						 : "rcx", "r11", "memory");
 #elif defined(__i386__)
-#warning "i386 syscall wrapper not implemented"
+	__asm__ __volatile__("int $0x30"
+						 : "=a"(ret)
+						 : "a"(syscall), "b"(arg1), "c"(arg2), "d"(arg3), "S"(arg4), "D"(arg5), "g"(arg6)
+						 : "memory");
 #elif defined(__arm__)
-#warning "arm syscall wrapper not implemented"
+	register scarg r7 __thumb_r7 = syscall;
+	register scarg r0 __asm__("r0") = arg1;
+	register scarg r1 __asm__("r1") = arg2;
+	register scarg r2 __asm__("r2") = arg3;
+	register scarg r3 __asm__("r3") = arg4;
+	register scarg r4 __asm__("r4") = arg5;
+	register scarg r5 __asm__("r5") = arg6;
+	__arm_call(__r7_operand, "0"(r0), "r"(r1), "r"(r2), "r"(r3), "r"(r4), "r"(r5));
 #elif defined(__aarch64__)
-	register long x8 __asm__("x8") = syscall;
-	register long x0 __asm__("x0") = arg1;
-	register long x1 __asm__("x1") = arg2;
-	register long x2 __asm__("x2") = arg3;
-	register long x3 __asm__("x3") = arg4;
-	register long x4 __asm__("x4") = arg5;
-	register long x5 __asm__("x5") = arg6;
+	register scarg x8 __asm__("x8") = syscall;
+	register scarg x0 __asm__("x0") = arg1;
+	register scarg x1 __asm__("x1") = arg2;
+	register scarg x2 __asm__("x2") = arg3;
+	register scarg x3 __asm__("x3") = arg4;
+	register scarg x4 __asm__("x4") = arg5;
+	register scarg x5 __asm__("x5") = arg6;
 	__asm__ __volatile__("svc 0"
 						 : "=r"(ret)
 						 : "r"(x8), "0"(x0), "r"(x1), "r"(x2), "r"(x3), "r"(x4), "r"(x5)
@@ -322,18 +403,18 @@ typedef enum
 
 typedef enum
 {
-	__SYS_O_RDONLY = 0x1,
-	__SYS_O_WRONLY = 0x2,
-	__SYS_O_RDWR = 0x3,
-	__SYS_O_APPEND = 0x4,
-	__SYS_O_CREAT = 0x8,
-	__SYS_O_DSYNC = 0x10,
-	__SYS_O_EXCL = 0x20,
-	__SYS_O_NOCTTY = 0x40,
-	__SYS_O_NONBLOCK = 0x80,
-	__SYS_O_RSYNC = 0x100,
-	__SYS_O_SYNC = 0x200,
-	__SYS_O_TRUNC = 0x400
+	__SYS_O_RDONLY = O_RDONLY,
+	__SYS_O_WRONLY = O_WRONLY,
+	__SYS_O_RDWR = O_RDWR,
+	__SYS_O_APPEND = O_APPEND,
+	__SYS_O_CREAT = O_CREAT,
+	__SYS_O_DSYNC = O_DSYNC,
+	__SYS_O_EXCL = O_EXCL,
+	__SYS_O_NOCTTY = O_NOCTTY,
+	__SYS_O_NONBLOCK = O_NONBLOCK,
+	__SYS_O_RSYNC = O_RSYNC,
+	__SYS_O_SYNC = O_SYNC,
+	__SYS_O_TRUNC = O_TRUNC
 } syscall_open_flags_t;
 
 typedef enum
@@ -531,6 +612,36 @@ static_assert((int)__SYS_SIG_IGN == (int)___SYS_SIG_IGN, "SIG_IGN values do not
 typedef int __SYS_clockid_t;
 typedef unsigned int __SYS_socklen_t;
 
+typedef struct FramebufferScreenInfo
+{
+	__UINT32_TYPE__ Width;
+	__UINT32_TYPE__ Height;
+	__UINT32_TYPE__ Pitch;
+	__UINT32_TYPE__ Bpp;
+	__UINT32_TYPE__ Size;
+} FramebufferScreenInfo;
+
+/**
+ * @brief Get framebuffer screen info
+ *
+ * @code
+ * struct FramebufferScreenInfo info;
+ * int ioctl(fd, FBIOGET_SCREEN_INFO, &info);
+ * @endcode
+ *
+ * @param fd File descriptor of the framebuffer device
+ * @param info Pointer to the framebuffer screen info structure
+ */
+#define FBIOGET_SCREEN_INFO 0xf0
+
+struct kutsname
+{
+	char sysname[65];
+	char release[65];
+	char version[65];
+	char machine[65];
+};
+
 /**
  * @brief List of syscalls
  *
@@ -563,6 +674,8 @@ typedef enum
 	 */
 	SYS_API_VERSION = 0,
 
+	SYS_DEBUG_REPORT = 1,
+
 	/* I/O */
 
 	/**
@@ -719,6 +832,25 @@ typedef enum
 	 * - #EINVAL if the request is invalid
 	 */
 	SYS_IOCTL,
+	/**
+	 * @brief Function control
+	 *
+	 * @code
+	 * int fcntl(int fd, int cmd, void *arg);
+	 * @endcode
+	 *
+	 * @details Manipulates the underlying parameters of a device.
+	 *
+	 * @param fd File descriptor referring to the device
+	 * @param cmd Device-specific request code
+	 * @param arg Argument for the request
+	 *
+	 * @return
+	 * - #EOK on success
+	 * - #EBADF if `fd` is not valid
+	 * - #EINVAL if the request is invalid
+	 */
+	SYS_FCNTL,
 
 	/* File Status */
 
@@ -1508,6 +1640,22 @@ typedef enum
 	 * - #EACCES if permission is denied
 	 */
 	SYS_RENAME,
+	/**
+	 * @brief Get unix name information
+	 *
+	 * @code
+	 * int uname(struct kutsname *buf);
+	 * @endcode
+	 *
+	 * @details Retrieves information about the operating system.
+	 *
+	 * @param buf Pointer to `kutsname` structure to store information
+	 *
+	 * @return
+	 * - #EOK on success
+	 * - #EFAULT if `buf` is outside accessible address space
+	 */
+	SYS_UNAME,
 
 	/**
 	 * @brief Max number of syscalls
@@ -1551,6 +1699,9 @@ typedef enum
 /** @copydoc SYS_IOCTL */
 #define call_ioctl(fd, request, argp) syscall3(SYS_IOCTL, (scarg)fd, (scarg)request, (scarg)argp)
 
+/** @copydoc SYS_FCNTL */
+#define call_fcntl(fd, cmd, arg) syscall3(SYS_FCNTL, (scarg)fd, (scarg)cmd, (scarg)arg)
+
 /* File Status */
 
 /** @copydoc SYS_STAT */
@@ -1658,7 +1809,7 @@ typedef enum
 /* Time */
 
 /** @copydoc SYS_TIME */
-#define call_time(t) syscall1(SYS_TIME, t)
+#define call_time(t) syscall1(SYS_TIME, (scarg)t)
 
 /** @copydoc SYS_CLOCK_GETTIME */
 #define call_clock_gettime(clockid, tp) syscall2(SYS_CLOCK_GETTIME, (scarg)clockid, (scarg)tp)
@@ -1689,4 +1840,7 @@ typedef enum
 /** @copydoc SYS_RENAME */
 #define call_rename(oldpath, newpath) syscall2(SYS_RENAME, (scarg)oldpath, (scarg)newpath)
 
-#endif // !__FENNIX_API_SYSCALLS_LIST_H__
+/** @copydoc SYS_UNAME */
+#define call_uname(buf) syscall1(SYS_UNAME, (scarg)buf)
+
+#endif // !__FENNIX_API_SYSTEM_CALLS_LIST_H__

Drivers/input/aip/Makefile

@@ -1,35 +0,0 @@
-default:
-	$(error Do not run this Makefile directly!)
-
-S_SOURCES = $(shell find ./ -type f -name '*.S')
-C_SOURCES = $(shell find ./ -type f -name '*.c')
-CXX_SOURCES = $(shell find ./ -type f -name '*.cpp')
-HEADERS = $(sort $(dir $(wildcard ../../include/*)))
-OBJ = $(C_SOURCES:.c=.o) $(CXX_SOURCES:.cpp=.o) $(S_SOURCES:.S=.o)
-STACK_USAGE_OBJ = $(C_SOURCES:.c=.su) $(CXX_SOURCES:.cpp=.su)
-
-FILENAME = $(notdir $(shell pwd)).drv
-
-build: $(FILENAME)
-	mv $(FILENAME) $(OUTPUT_DIR)$(FILENAME)
-
-$(FILENAME): $(OBJ)
-	$(info Linking $@)
-	$(CC) $(DRIVER_LDFLAGS) $(OBJ) $(OUTPUT_DIR)dcrt0.o -L$(OUTPUT_DIR) -lkernel -o $@
-
-WARNCFLAG = -Wall -Wextra
-
-%.o: %.c $(HEADERS)
-	$(info Compiling $<)
-	$(CC) $(DRIVER_CFLAGS) $(WARNCFLAG) -std=c17 -c $< -o $@
-
-%.o: %.cpp $(HEADERS)
-	$(info Compiling $<)
-	$(CXX) $(DRIVER_CFLAGS) $(WARNCFLAG) -std=c++20 -fno-exceptions -fno-rtti -c $< -o $@
-
-%.o: %.S
-	$(info Compiling $<)
-	$(AS) -o $@ $<
-
-clean:
-	rm -f file.map $(OBJ) $(STACK_USAGE_OBJ)

Drivers/input/aip/aip.h

@@ -1,39 +0,0 @@
-/*
-	This file is part of Fennix Drivers.
-
-	Fennix Drivers is free software: you can redistribute it and/or
-	modify it under the terms of the GNU General Public License as
-	published by the Free Software Foundation, either version 3 of
-	the License, or (at your option) any later version.
-
-	Fennix Drivers is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with Fennix Drivers. If not, see <https://www.gnu.org/licenses/>.
-*/
-
-#ifndef __FENNIX_DRIVER_AIP_H__
-#define __FENNIX_DRIVER_AIP_H__
-
-#include <types.h>
-#include <aip.h>
-#include <regs.h>
-
-extern uint8_t Device1ID[];
-extern uint8_t Device2ID[];
-
-void PS2KbdInterruptHandler(TrapFrame *);
-int InitializeKeyboard();
-int FinalizeKeyboard();
-int DetectPS2Keyboard();
-
-void PS2MouseInterruptHandler(TrapFrame *);
-int InitializeMouse();
-int FinalizeMouse();
-int DetectPS2Mouse();
-int DetectUART();
-
-#endif // !__FENNIX_DRIVER_AIP_H__

Drivers/input/aip/main.c

@@ -1,235 +0,0 @@
-/*
-	This file is part of Fennix Drivers.
-
-	Fennix Drivers is free software: you can redistribute it and/or
-	modify it under the terms of the GNU General Public License as
-	published by the Free Software Foundation, either version 3 of
-	the License, or (at your option) any later version.
-
-	Fennix Drivers is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with Fennix Drivers. If not, see <https://www.gnu.org/licenses/>.
-*/
-
-#include "aip.h"
-
-#include <errno.h>
-#include <base.h>
-
-bool IsKeyboard(uint8_t ID)
-{
-	/* Common keyboard IDs */
-	return ID == 0xAB || ID == 0xAC || ID == 0x5D ||
-		   ID == 0x2B || ID == 0x47 || ID == 0x60;
-}
-
-bool IsMouse(uint8_t ID)
-{
-	/* Common mouse IDs */
-	return ID == 0x00 || ID == 0x03 || ID == 0x04;
-}
-
-const char *GetPS2DeviceName(uint8_t ID, uint8_t SubID)
-{
-	switch (ID)
-	{
-	case 0x00:
-		return "Standard PS/2 Mouse";
-	case 0x03:
-		return "Mouse with scroll wheel";
-	case 0x04:
-		return "Mouse 5 buttons";
-	case 0xAB:
-	{
-		switch (SubID)
-		{
-		case 0x83: /* Normal */
-		case 0x41: /* Translated */
-		case 0xC1: /* Normal + Translated */
-			return "Standard PS/2 Keyboard";
-		case 0x84:
-		case 0x54:
-			return "IBM Thinkpad/Spacesaver Keyboard";
-		case 0x85:
-			return "NCD N-97/122-Key Host Connect(ed) Keyboard";
-		case 0x86:
-			return "122-Key Keyboard";
-		case 0x90:
-			return "Japanese \"G\" Keyboard";
-		case 0x91:
-			return "Japanese \"P\" Keyboard";
-		case 0x92:
-			return "Japanese \"A\" Keyboard";
-		default:
-			return "Unknown PS/2 Keyboard";
-		}
-	}
-	case 0xAC:
-	{
-		switch (SubID)
-		{
-		case 0xA1:
-			return "NCD Sun Keyboard";
-		default:
-			return "Unknown NCD Sun Keyboard";
-		}
-	}
-	case 0x5D:
-	case 0x2B:
-		return "Trust Keyboard";
-	case 0x47:
-	case 0x60:
-		return "NMB SGI Keyboard";
-	default:
-		return "Unknown PS/2 Device";
-	}
-}
-
-uint8_t Device1ID[2] = {0x00, 0x00};
-uint8_t Device2ID[2] = {0x00, 0x00};
-bool DualChannel = false;
-
-int DriverEntry()
-{
-	PS2WriteCommand(PS2_CMD_DISABLE_PORT_1);
-	PS2WriteCommand(PS2_CMD_DISABLE_PORT_2);
-	PS2ClearOutputBuffer();
-
-	PS2WriteCommand(PS2_CMD_READ_CONFIG);
-	PS2_CONFIGURATION cfg = {.Raw = PS2ReadData()};
-
-	DualChannel = cfg.Port2Clock;
-	if (DualChannel)
-		KernelLog("Dual channel PS/2 controller detected");
-	cfg.Port1Interrupt = 1;
-	cfg.Port2Interrupt = 1;
-	cfg.Port1Translation = 1;
-
-	PS2WriteCommand(PS2_CMD_WRITE_CONFIG);
-	PS2WriteData(cfg.Raw);
-
-	PS2WriteCommand(PS2_CMD_TEST_CONTROLLER);
-	uint8_t test = PS2ReadData();
-	if (test != PS2_TEST_PASSED)
-	{
-		KernelLog("PS/2 controller self test failed (%#x)", test);
-		return -EFAULT;
-	}
-
-	PS2WriteCommand(PS2_CMD_WRITE_CONFIG);
-	PS2WriteData(cfg.Raw);
-
-	// bool port2avail = false;
-	// if (DualChannel)
-	// {
-	// 	PS2WriteCommand(PS2_CMD_ENABLE_PORT_1);
-	// 	PS2WriteCommand(PS2_CMD_READ_CONFIG);
-	// 	cfg.Raw = PS2ReadData();
-	// 	port2avail = cfg.Port2Clock;
-	// 	PS2WriteCommand(PS2_CMD_DISABLE_PORT_1);
-	// }
-
-	PS2WriteCommand(PS2_CMD_TEST_PORT_1);
-	test = PS2ReadData();
-	if (test != 0x00)
-	{
-		KernelLog("PS/2 Port 1 self test failed (%#x)", test);
-		return -EFAULT;
-	}
-
-	if (DualChannel)
-	{
-		PS2WriteCommand(PS2_CMD_TEST_PORT_2);
-		test = PS2ReadData();
-		if (test != 0x00)
-		{
-			KernelLog("PS/2 Port 2 self test failed (%#x)", test);
-			return -EFAULT;
-		}
-	}
-
-	PS2WriteCommand(PS2_CMD_ENABLE_PORT_1);
-	if (DualChannel)
-		PS2WriteCommand(PS2_CMD_ENABLE_PORT_2);
-
-	int errK = InitializeKeyboard();
-
-	int errM = 0;
-	if (DualChannel)
-		errM = InitializeMouse();
-
-	/** A device may fail, but if the other one works,
-	 * we can still use it.
-	 */
-	if (errK != 0 && errM != 0)
-		return -ENODEV;
-	return 0;
-}
-
-int DriverFinal()
-{
-	FinalizeKeyboard();
-	FinalizeMouse();
-	PS2WriteCommand(PS2_CMD_DISABLE_PORT_1);
-	PS2WriteCommand(PS2_CMD_DISABLE_PORT_2);
-	return 0;
-}
-
-int DriverPanic()
-{
-	PS2WriteCommand(PS2_CMD_DISABLE_PORT_1);
-	PS2WriteCommand(PS2_CMD_DISABLE_PORT_2);
-	return 0;
-}
-
-void __intStub() {}
-int DriverProbe()
-{
-	RegisterInterruptHandler(1, __intStub);
-	RegisterInterruptHandler(12, __intStub);
-
-	int kbd = DetectPS2Keyboard();
-	int mouse = DetectPS2Mouse();
-	int uart = DetectUART();
-
-	UnregisterAllInterruptHandlers(__intStub);
-
-	if (kbd != 0 && mouse != 0 && uart != 0)
-		return -ENODEV;
-
-	if (kbd == 0)
-	{
-		if (!IsKeyboard(Device1ID[0]))
-		{
-			KernelLog("PS/2 Port 1 is not a keyboard");
-			// return -EINVAL;
-		}
-	}
-
-	if (mouse == 0)
-	{
-		if (!IsMouse(Device2ID[0]))
-		{
-			KernelLog("PS/2 Port 2 is not a mouse");
-			// return -EINVAL;
-		}
-	}
-
-	KernelPrint("PS/2 Port 1: %s (0x%X 0x%X)",
-				GetPS2DeviceName(Device1ID[0], Device1ID[1]),
-				Device1ID[0], Device1ID[1]);
-	KernelPrint("PS/2 Port 2: %s (0x%X 0x%X)",
-				GetPS2DeviceName(Device2ID[0], Device2ID[1]),
-				Device2ID[0], Device2ID[1]);
-	return 0;
-}
-
-DriverInfo("aip",
-		   "Advanced Integrated Peripheral Driver",
-		   "EnderIce2",
-		   0, 0, 1,
-		   "GPLv3");

Drivers/input/aip/mouse.c

@@ -1,244 +0,0 @@
-/*
-	This file is part of Fennix Drivers.
-
-	Fennix Drivers is free software: you can redistribute it and/or
-	modify it under the terms of the GNU General Public License as
-	published by the Free Software Foundation, either version 3 of
-	the License, or (at your option) any later version.
-
-	Fennix Drivers is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with Fennix Drivers. If not, see <https://www.gnu.org/licenses/>.
-*/
-
-#include "aip.h"
-
-#include <errno.h>
-#include <base.h>
-#include <fs.h>
-#include <input.h>
-
-dev_t MouseDevID = -1;
-bool PacketReady = false;
-bool FourPackets = false;
-bool MouseButton45 = false;
-uint8_t Cycle = 0;
-PS2_MOUSE_PACKET Packet = {0};
-
-InputReport mir = {0};
-void PS2MouseInterruptHandler(TrapFrame *)
-{
-	uint8_t data = PS2ReadData();
-	if (data == PS2_MOUSE_RESP_ACK ||
-		data == PS2_MOUSE_RESP_RESEND)
-		return;
-
-	if (!PacketReady)
-	{
-		switch (Cycle)
-		{
-		case 0:
-		{
-			if ((data & 0b00001000 /* Always 1 */) == 0)
-				return;
-
-			Packet.Base.Raw = data;
-			Cycle++;
-			break;
-		}
-		case 1:
-		{
-			Packet.XMovement = data;
-			Cycle++;
-			break;
-		}
-		case 2:
-		{
-			Packet.YMovement = data;
-			if (FourPackets)
-				Cycle++;
-			else
-			{
-				Cycle = 0;
-				PacketReady = true;
-			}
-			break;
-		}
-		case 3:
-		{
-			Packet.ZMovement.Raw = data;
-			Cycle = 0;
-			PacketReady = true;
-			break;
-		}
-		default:
-			break;
-		}
-		return;
-	}
-
-/* https://stackoverflow.com/a/3208376/9352057 */
-#define BYTE_TO_BINARY_PATTERN "%c%c%c%c%c%c%c%c"
-#define BYTE_TO_BINARY(byte)         \
-	((byte) & 0x80 ? '1' : '0'),     \
-		((byte) & 0x40 ? '1' : '0'), \
-		((byte) & 0x20 ? '1' : '0'), \
-		((byte) & 0x10 ? '1' : '0'), \
-		((byte) & 0x08 ? '1' : '0'), \
-		((byte) & 0x04 ? '1' : '0'), \
-		((byte) & 0x02 ? '1' : '0'), \
-		((byte) & 0x01 ? '1' : '0')
-
-	DebugLog("PS/2 Mouse Packet: [" BYTE_TO_BINARY_PATTERN ":" BYTE_TO_BINARY_PATTERN ":" BYTE_TO_BINARY_PATTERN ":" BYTE_TO_BINARY_PATTERN "] LB:%d RB:%d MB:%d A1:%d XS:%d YS:%d XO:%d YO:%d | X:%03d Y:%03d | Z:%d B4:%d B5:%d A0:%d A0:%d",
-			 BYTE_TO_BINARY(Packet.Base.Raw),
-			 BYTE_TO_BINARY(Packet.XMovement),
-			 BYTE_TO_BINARY(Packet.YMovement),
-			 BYTE_TO_BINARY(Packet.ZMovement.Raw),
-			 Packet.Base.LeftButton, Packet.Base.RightButton, Packet.Base.MiddleButton,
-			 Packet.Base.Always1,
-			 Packet.Base.XSign, Packet.Base.YSign,
-			 Packet.Base.XOverflow, Packet.Base.YOverflow,
-			 Packet.XMovement, Packet.YMovement,
-			 Packet.ZMovement.Z, Packet.ZMovement.Button4, Packet.ZMovement.Button5,
-			 Packet.ZMovement.Always0, Packet.ZMovement.Always0_2);
-
-	int X, Y;
-	X = Packet.XMovement - (Packet.Base.XSign ? 256 : 0);
-	Y = Packet.YMovement - (Packet.Base.YSign ? 256 : 0);
-
-	if (Packet.Base.XOverflow)
-		X = 0;
-
-	if (Packet.Base.YOverflow)
-		Y = 0;
-
-	mir.Type = INPUT_TYPE_MOUSE;
-	mir.Device = MouseDevID;
-	mir.Mouse.LeftButton = Packet.Base.LeftButton;
-	mir.Mouse.RightButton = Packet.Base.RightButton;
-	mir.Mouse.MiddleButton = Packet.Base.MiddleButton;
-	mir.Mouse.Button4 = Packet.ZMovement.Button4;
-	mir.Mouse.Button5 = Packet.ZMovement.Button5;
-	mir.Mouse.X = X;
-	mir.Mouse.Y = -Y;
-	mir.Mouse.Z = Packet.ZMovement.Z;
-	ReportInputEvent(&mir);
-	PacketReady = false;
-}
-
-void MouseSampleRate(uint8_t SampleRate)
-{
-	PS2WriteCommand(PS2_CMD_WRITE_NEXT_BYTE_TO_PS2_PORT_2_INPUT);
-	PS2WriteData(PS2_MOUSE_CMD_SET_SAMPLE_RATE);
-	PS2ReadData();
-
-	PS2WriteCommand(PS2_CMD_WRITE_NEXT_BYTE_TO_PS2_PORT_2_INPUT);
-	PS2WriteData(SampleRate);
-	PS2ReadData();
-}
-
-int __fs_ms_Ioctl(struct Inode *, unsigned long, void *)
-{
-	return 0;
-}
-
-const struct InodeOperations MouseOps = {
-	.Ioctl = __fs_ms_Ioctl,
-};
-
-int InitializeMouse()
-{
-	PS2WriteData(PS2_CMD_WRITE_NEXT_BYTE_TO_PS2_PORT_2_INPUT);
-	PS2WriteData(PS2_MOUSE_CMD_RESET);
-	uint8_t test = PS2ReadData();
-	if (test != PS2_MOUSE_RESP_TEST_PASSED &&
-		test != PS2_MOUSE_RESP_ACK)
-	{
-		KernelLog("PS/2 mouse reset failed! (%#x)", test);
-		return -EFAULT;
-	}
-
-	RegisterInterruptHandler(12, PS2MouseInterruptHandler);
-
-	MouseDevID = RegisterDevice(INPUT_TYPE_MOUSE, &MouseOps);
-
-	PS2WriteCommand(PS2_CMD_WRITE_NEXT_BYTE_TO_PS2_PORT_2_INPUT);
-	PS2WriteData(PS2_MOUSE_CMD_SET_DEFAULTS);
-	PS2ReadData();
-
-	PS2WriteCommand(PS2_CMD_WRITE_NEXT_BYTE_TO_PS2_PORT_2_INPUT);
-	PS2WriteData(PS2_MOUSE_CMD_ENABLE_DATA_REPORTING);
-
-	MouseSampleRate(200);
-	MouseSampleRate(100);
-	MouseSampleRate(80);
-
-	PS2WriteCommand(PS2_CMD_WRITE_NEXT_BYTE_TO_PS2_PORT_2_INPUT);
-	PS2WriteData(PS2_MOUSE_CMD_READ_ID);
-	uint8_t Device2ID = PS2ReadData();
-	KernelLog("PS/2 Mouse ID: %#x", Device2ID);
-
-	MouseSampleRate(200);
-	MouseSampleRate(200);
-	MouseSampleRate(80);
-
-	PS2WriteCommand(PS2_CMD_WRITE_NEXT_BYTE_TO_PS2_PORT_2_INPUT);
-	PS2WriteData(PS2_MOUSE_CMD_READ_ID);
-	Device2ID = PS2ReadData();
-	KernelLog("PS/2 Mouse ID: %#x", Device2ID);
-
-	if (Device2ID >= 3 && Device2ID <= 4)
-		FourPackets = true;
-	if (Device2ID == 4)
-		MouseButton45 = true;
-
-	return 0;
-}
-
-int FinalizeMouse()
-{
-	PS2WriteCommand(PS2_CMD_WRITE_NEXT_BYTE_TO_PS2_PORT_2_INPUT);
-	PS2WriteData(PS2_MOUSE_CMD_DISABLE_DATA_REPORTING);
-
-	UnregisterDevice(MouseDevID);
-	return 0;
-}
-
-int DetectPS2Mouse()
-{
-	PS2WriteCommand(PS2_CMD_WRITE_NEXT_BYTE_TO_PS2_PORT_2_INPUT);
-	PS2WriteData(PS2_MOUSE_CMD_DISABLE_DATA_REPORTING);
-	if (PS2ACKTimeout() != 0)
-		KernelLog("PS/2 mouse failed to disable data reporting!");
-
-	PS2WriteCommand(PS2_CMD_WRITE_NEXT_BYTE_TO_PS2_PORT_2_INPUT);
-	PS2WriteData(PS2_MOUSE_CMD_READ_ID);
-	if (PS2ACKTimeout() != 0)
-		KernelLog("PS/2 mouse failed to read ID!");
-
-	uint8_t recByte;
-	int timeout = 1000000;
-	while (timeout--)
-	{
-		recByte = PS2ReadData();
-		if (recByte != PS2_ACK)
-			break;
-	}
-	Device2ID[0] = recByte;
-
-	timeout = 1000000;
-	while (timeout--)
-	{
-		recByte = PS2ReadData();
-		if (recByte != PS2_ACK)
-			break;
-	}
-	Device2ID[1] = recByte;
-
-	KernelLog("PS2 Mouse Device: 0x%X 0x%X", Device2ID[0], Device2ID[1]);
-	return 0;
-}

Drivers/input/aip/uart.c

@@ -1,646 +0,0 @@
-/*
-	This file is part of Fennix Drivers.
-
-	Fennix Drivers is free software: you can redistribute it and/or
-	modify it under the terms of the GNU General Public License as
-	published by the Free Software Foundation, either version 3 of
-	the License, or (at your option) any later version.
-
-	Fennix Drivers is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with Fennix Drivers. If not, see <https://www.gnu.org/licenses/>.
-*/
-
-#include "aip.h"
-
-#include <errno.h>
-#include <base.h>
-#include <fs.h>
-#include <input.h>
-#include <io.h>
-
-#define SERIAL_ENABLE_DLAB 0x80
-#define SERIAL_BUFFER_EMPTY 0x20
-
-enum Ports
-{
-	COM1 = 0x3F8,
-	COM2 = 0x2F8,
-	COM3 = 0x3E8,
-	COM4 = 0x2E8,
-	COM5 = 0x5F8,
-	COM6 = 0x4F8,
-	COM7 = 0x5E8,
-	COM8 = 0x4E8,
-
-	LPT1 = 0x378,
-	LPT2 = 0x278,
-	LPT3 = 0x3BC
-};
-
-enum SerialSpeed
-{
-	RATE_50_HI = 0x09,
-	RATE_50_LO = 0x00,
-
-	RATE_300_HI = 0x01,
-	RATE_300_LO = 0x80,
-
-	RATE_600_HI = 0x00,
-	RATE_600_LO = 0xC0,
-
-	RATE_2400_HI = 0x00,
-	RATE_2400_LO = 0x30,
-
-	RATE_4800_HI = 0x00,
-	RATE_4800_LO = 0x18,
-
-	RATE_9600_HI = 0x00,
-	RATE_9600_LO = 0x0C,
-
-	RATE_19200_HI = 0x00,
-	RATE_19200_LO = 0x06,
-
-	RATE_38400_HI = 0x00,
-	RATE_38400_LO = 0x03,
-
-	RATE_57600_HI = 0x00,
-	RATE_57600_LO = 0x02,
-
-	RATE_115200_HI = 0x00,
-	RATE_115200_LO = 0x01
-};
-
-/*
-.                          Table of Registers                         .
-/---------------------------------------------------------------------\
-| Base Address | DLAB | R/W | Abr |           Register Name           |
-|---------------------------------------------------------------------|
-|      +0      |  =0  |  W  |  -  |    Transmitter Holding Buffer     |
-|              |  =0  |  R  |  -  |          Receiver Buffer          |
-|              |  =1  | R/W |  -  |      Divisor Latch Low Byte       |
-|      +1      |  =0  | R/W | IER |     Interrupt Enable Register     |
-|              |  =1  | R/W |  -  |      Divisor Latch High Byte      |
-|      +2      |  -   |  R  | IIR | Interrupt Identification Register |
-|              |  -   |  W  | FCR |       FIFO Control Register       |
-|      +3      |  -   | R/W | LCR |       Line Control Register       |
-|      +4      |  -   | R/W | MCR |       Modem Control Register      |
-|      +5      |  -   |  R  | LSR |       Line Status Register        |
-|      +6      |  -   |  R  | MSR |       Modem Status Register       |
-|      +7      |  -   | R/W |  -  |         Scratch Register          |
-\---------------------------------------------------------------------/
-
-  Source:
-	Interfacing the Serial / RS232 Port V5.0
-	  Table 5 : Table of Registers
-*/
-
-/** Interrupt Enable Register */
-typedef union
-{
-	struct
-	{
-		/* Enable Received Data Available Interrupt */
-		uint8_t InterruptOnReceive : 1;
-
-		/* Enable Transmitter Holding Register Empty Interrupt */
-		uint8_t InterruptOnTransmitter : 1;
-
-		/* Enable Receiver Line Status Interrupt */
-		uint8_t LineStatusInterrupt : 1;
-
-		/* Enable Modem Status Interrupt */
-		uint8_t ModemStatusInterrupt : 1;
-
-		/* Enables Sleep Mode (16750) */
-		uint8_t SleepMode : 1;
-
-		/* Enables Low Power Mode (16750) */
-		uint8_t LowPowerMode : 1;
-
-		/* Reserved */
-		uint8_t __reserved : 2;
-	};
-	uint8_t raw;
-} IER;
-
-/** Interrupt Identification Register */
-typedef union
-{
-	struct
-	{
-		/* Interrupt pending */
-		uint8_t InterruptPending : 1;
-
-		/**
-		 * Interrupt Status
-		 *
-		 * 00b = Modem Status Interrupt
-		 * 01b = Transmitter Holding Register Empty Interrupt
-		 * 10b = Received Data Available Interrupt
-		 * 11b = Receiver Line Status Interrupt
-		 */
-		uint8_t InterruptStatus : 2;
-
-		/**
-		 * 16550 Time-out Interrupt Pending
-		 *
-		 * @note Reserved on 8250, 16450
-		 */
-		uint8_t TimeOutIP : 1;
-
-		/** Reserved */
-		uint8_t __reserved : 1;
-
-		/** 64 Byte Fifo Enabled (16750 only) */
-		uint8_t FIFO64 : 1;
-
-		/**
-		 * Enable FIFO
-		 *
-		 * 00b = No FIFO
-		 * 01b = FIFO Enabled but Unusable
-		 * 11b = FIFO Enabled
-		 */
-		uint8_t FIFO : 2;
-	};
-	uint8_t raw;
-} IIR;
-
-/** First In / First Out Control Register */
-typedef union
-{
-	struct
-	{
-		/** Enable FIFO's */
-		uint8_t FIFO : 1;
-
-		/** Clear Receive FIFO */
-		uint8_t ClearRX : 1;
-
-		/** Clear Transmit FIFO */
-		uint8_t ClearTX : 1;
-
-		/** DMA Mode Select.
-		 *
-		 * Change status of RXRDY & TXRDY pins from mode 1 to mode 2.
-		 */
-		uint8_t DMAMode : 1;
-
-		/** Reserved */
-		uint8_t __reserved : 1;
-
-		/** Enable 64 Byte FIFO (16750 only) */
-		uint8_t FIFO64 : 1;
-
-		/** Interrupt Trigger Level
-		 *
-		 * 00b = 1 Byte
-		 * 01b = 4 Bytes
-		 * 10b = 8 Bytes
-		 * 11b = 14 Bytes
-		 */
-		uint8_t TriggerLevel : 2;
-	};
-	uint8_t raw;
-} FCR;
-
-/** Line Control Register */
-typedef union
-{
-	struct
-	{
-		/** Word Length
-		 *
-		 * 00b = 5 bits
-		 * 01b = 6 bits
-		 * 10b = 7 bits
-		 * 11b = 8 bits
-		 */
-		uint8_t WordLength : 2;
-
-		/** Length of Stop Bit
-		 *
-		 * 0b = One Stop Bit
-		 * 1b = 2 Stop bits for words of length 6,7 or 8 bits or 1.5 Stop Bits for Word lengths of 5 bits.
-		 */
-		uint8_t StopBit : 1;
-
-		/** Parity Select
-		 *
-		 *   0b = No Parity
-		 * 001b = Odd Parity
-		 * 011b = Even Parity
-		 * 101b = High Parity (Sticky)
-		 * 111b = Low Parity (Sticky)
-		 */
-		uint8_t Parity : 3;
-
-		/** Set Break Enable */
-		uint8_t SetBreak : 1;
-
-		/**
-		 * Divisor Latch Access
-		 *
-		 * 0b = Access to Receiver buffer, Transmitter buffer & Interrupt Enable Register
-		 * 1b = Divisor Latch Access Bit
-		 */
-		uint8_t DLAB : 1;
-	};
-	uint8_t raw;
-} LCR;
-
-/** Modem Control Register */
-typedef union
-{
-	struct
-	{
-		/** Force Data Terminal Ready */
-		uint8_t DataTerminalReady : 1;
-
-		/** Force Request to Send */
-		uint8_t RequestToSend : 1;
-
-		/** Auxiliary Output 1 */
-		uint8_t Out1 : 1;
-
-		/** Auxiliary Output 2 */
-		uint8_t Out2 : 1;
-
-		/** Loopback Mode */
-		uint8_t Loopback : 1;
-
-		/** Autoflow Control Enabled (16750 only) */
-		uint8_t Autoflow : 1;
-
-		/** Reserved */
-		uint8_t __reserved : 2;
-	};
-	uint8_t raw;
-} MCR;
-
-/** Line Status Register */
-typedef union
-{
-	struct
-	{
-		/** Data Ready */
-		uint8_t DataReady : 1;
-
-		/** Overrun Error */
-		uint8_t OverrunError : 1;
-
-		/** Parity Error */
-		uint8_t ParityError : 1;
-
-		/** Framing Error */
-		uint8_t FramingError : 1;
-
-		/** Break Interrupt */
-		uint8_t BreakInterrupt : 1;
-
-		/** Empty Transmitter Holding Register */
-		uint8_t EmptyTransmitterHolding : 1;
-
-		/** Empty Data Holding Registers */
-		uint8_t EmptyDataHolding : 1;
-
-		/** Error in Received FIFO */
-		uint8_t ErrorReceivedFIFO : 1;
-	};
-	uint8_t raw;
-} LSR;
-
-/** Modem Status Register */
-typedef union
-{
-	struct
-	{
-		/** Delta Clear to Send */
-		uint8_t DeltaClearToSend : 1;
-
-		/** Delta Data Set Ready */
-		uint8_t DeltaDataSetReady : 1;
-
-		/** Trailing Edge Ring Indicator */
-		uint8_t TrailingEdgeRingIndicator : 1;
-
-		/** Delta Data Carrier Detect */
-		uint8_t DeltaDataCarrierDetect : 1;
-
-		/** Clear To Send */
-		uint8_t ClearToSend : 1;
-
-		/** Data Set Ready */
-		uint8_t DataSetReady : 1;
-
-		/** Ring Indicator */
-		uint8_t RingIndicator : 1;
-
-		/** Carrier Detect */
-		uint8_t CarrierDetect : 1;
-	};
-	uint8_t raw;
-} MSR;
-
-union UARTs
-{
-	struct
-	{
-		uint8_t com1 : 1;
-		uint8_t com2 : 1;
-		uint8_t com3 : 1;
-		uint8_t com4 : 1;
-		uint8_t com5 : 1;
-		uint8_t com6 : 1;
-		uint8_t com7 : 1;
-		uint8_t com8 : 1;
-
-		uint8_t lpt1 : 1;
-		uint8_t lpt2 : 1;
-		uint8_t lpt3 : 1;
-
-		uint8_t __reserved : 5;
-	};
-	uint16_t raw;
-} uart;
-
-bool IsDataReady(uint16_t Port)
-{
-	LSR lsr;
-	lsr.raw = inb(Port + 5);
-	return lsr.DataReady;
-}
-
-bool IsTransmitEmpty(uint16_t Port)
-{
-	LSR lsr;
-	lsr.raw = inb(Port + 5);
-	return lsr.EmptyTransmitterHolding;
-}
-
-char ReadSerial(uint16_t Port)
-{
-	while (!IsDataReady(Port))
-		Yield();
-	return inb(Port);
-}
-
-void WriteSerial(uint16_t Port, char Character)
-{
-	while (!IsTransmitEmpty(Port))
-		Yield();
-	outb(Port, Character);
-}
-
-void ReportSerialReceived(uint8_t Data)
-{
-	DebugLog("%c", Data);
-}
-
-void UartCOM24(TrapFrame *)
-{
-	LSR lsr2, lsr4;
-	do
-	{
-		lsr2.raw = inb(COM2 + 5);
-		if (lsr2.DataReady)
-			ReportSerialReceived(inb(COM2));
-		lsr4.raw = inb(COM4 + 5);
-		if (lsr4.DataReady)
-			ReportSerialReceived(inb(COM4));
-	} while (lsr2.DataReady || lsr4.DataReady);
-}
-
-void UartCOM13(TrapFrame *)
-{
-	LSR lsr1, lsr3;
-	do
-	{
-		lsr1.raw = inb(COM1 + 5);
-		if (lsr1.DataReady)
-			ReportSerialReceived(inb(COM1));
-		lsr3.raw = inb(COM3 + 5);
-		if (lsr3.DataReady)
-			ReportSerialReceived(inb(COM3));
-	} while (lsr1.DataReady || lsr3.DataReady);
-}
-
-bool InitializePort(uint16_t Port)
-{
-	ECS;
-	LCR lcr = {0};
-	IER ier = {0};
-	FCR fcr = {0};
-	MCR mcr = {0};
-
-	outb(Port + 3, lcr.raw);
-	outb(Port + 1, ier.raw);
-
-	lcr.DLAB = 1;
-	outb(Port + 3, lcr.raw);
-
-	outb(Port + 0, RATE_115200_LO);
-	outb(Port + 1, RATE_115200_HI);
-
-	lcr.DLAB = 0;
-	lcr.WordLength = 0b11;
-	outb(Port + 3, lcr.raw);
-
-	fcr.FIFO = 1;
-	fcr.ClearRX = 1;
-	fcr.ClearTX = 1;
-	fcr.TriggerLevel = 0b11;
-	outb(Port + 2, fcr.raw);
-
-	mcr.DataTerminalReady = 1;
-	mcr.RequestToSend = 1;
-	mcr.Out2 = 1;
-	mcr.Loopback = 1;
-	outb(Port + 4, mcr.raw);
-
-	/* Test the serial port */
-	outb(Port + 0, 0x48);
-	uint8_t result = inb(Port + 0);
-	if (result != 0x48)
-	{
-		/* FIXME: DETECT BAUD RATE
-			Do multiple test to check if the output is garbage.
-			If so, reduce the baud rate until it works. */
-
-		LCS;
-		KernelPrint("Port %#X test failed!", Port);
-		return false;
-	}
-
-	/* Set normal operation mode */
-	mcr.DataTerminalReady = 1;
-	mcr.RequestToSend = 1;
-	mcr.Out1 = 1;
-	mcr.Out2 = 1;
-	mcr.Loopback = 0;
-	outb(Port + 4, mcr.raw);
-
-	/* Enable interrupts on receive */
-	ier.InterruptOnReceive = 1;
-	outb(Port + 1, ier.raw);
-	RegisterInterruptHandler(3, UartCOM24);
-	RegisterInterruptHandler(4, UartCOM13);
-
-	LCS;
-	KernelPrint("Port %#X initialized", Port);
-	return true;
-}
-
-int DetectUART()
-{
-	uart.com1 = inb(COM1) != 0xFF ? true : false;
-	uart.com2 = inb(COM2) != 0xFF ? true : false;
-	uart.com3 = inb(COM3) != 0xFF ? true : false;
-	uart.com4 = inb(COM4) != 0xFF ? true : false;
-	uart.com5 = inb(COM5) != 0xFF ? true : false;
-	uart.com6 = inb(COM6) != 0xFF ? true : false;
-	uart.com7 = inb(COM7) != 0xFF ? true : false;
-	uart.com8 = inb(COM8) != 0xFF ? true : false;
-
-	uart.lpt1 = inb(LPT1) != 0xFF ? true : false;
-	uart.lpt2 = inb(LPT2) != 0xFF ? true : false;
-	uart.lpt3 = inb(LPT3) != 0xFF ? true : false;
-
-	if (uart.com1 == true)
-		if (InitializePort(COM1) == false)
-			uart.com1 = false;
-
-	if (uart.com2 == true)
-		if (InitializePort(COM2) == false)
-			uart.com1 = false;
-
-	if (uart.com3 == true)
-		if (InitializePort(COM3) == false)
-			uart.com1 = false;
-
-	if (uart.com4 == true)
-		if (InitializePort(COM4) == false)
-			uart.com1 = false;
-
-	if (uart.com5 == true)
-		if (InitializePort(COM5) == false)
-			uart.com1 = false;
-
-	if (uart.com6 == true)
-		if (InitializePort(COM6) == false)
-			uart.com1 = false;
-
-	if (uart.com7 == true)
-		if (InitializePort(COM7) == false)
-			uart.com1 = false;
-
-	if (uart.com8 == true)
-		if (InitializePort(COM8) == false)
-			uart.com1 = false;
-
-	if (uart.lpt1 == true)
-		KernelPrint("LPT1 is present");
-
-	if (uart.lpt2 == true)
-		KernelPrint("LPT2 is present");
-
-	if (uart.lpt3 == true)
-		KernelPrint("LPT3 is present");
-	return 0;
-}
-
-// static int once = 0;
-// static uint8_t com4 = 0xFF;
-// if (!once++)
-// 	com4 = inb(0x2E8);
-// if (com4 == 0xFF)
-// 	CPU::Halt(true);
-// char UserInputBuffer[256]{'\0'};
-// int BackSpaceLimit = 0;
-// while (true)
-// {
-// 	while ((inb(0x2E8 + 5) & 1) == 0)
-// 		CPU::Pause();
-// 	char key = inb(0x2E8);
-// 	// debug("key: %d", key);
-// 	if (key == '\x7f') /* Backspace (DEL) */
-// 	{
-// 		if (BackSpaceLimit <= 0)
-// 			continue;
-// 		char keyBuf[5] = {'\b', '\x1b', '[', 'K', '\0'};
-// 		ExPrint(keyBuf);
-// 		backspace(UserInputBuffer);
-// 		BackSpaceLimit--;
-// 		continue;
-// 	}
-// 	else if (key == '\x0d') /* Enter (CR) */
-// 	{
-// 		UserInput(UserInputBuffer);
-// 		BackSpaceLimit = 0;
-// 		UserInputBuffer[0] = '\0';
-// 		continue;
-// 	}
-// 	else if (key == '\x1b') /* Escape */
-// 	{
-// 		char tmp[16]{'\0'};
-// 		append(tmp, key);
-// 		while ((inb(0x2E8 + 5) & 1) == 0)
-// 			CPU::Pause();
-// 		char key = inb(0x2E8);
-// 		append(tmp, key);
-// 		if (key == '[')
-// 		{
-// 			// 27 91
-// 			// <  68
-// 			// > 67
-// 			// 	down 66
-// 			// 	up 65
-// 			while ((inb(0x2E8 + 5) & 1) == 0)
-// 				CPU::Pause();
-// 			key = inb(0x2E8);
-// 			append(tmp, key);
-// 			switch (key)
-// 			{
-// 			case 'A':
-// 				key = KEY_D_UP;
-// 				break;
-// 			case 'B':
-// 				key = KEY_D_DOWN;
-// 				break;
-// 			case 'C':
-// 				key = KEY_D_RIGHT;
-// 				break;
-// 			case 'D':
-// 				key = KEY_D_LEFT;
-// 				break;
-// 			default:
-// 			{
-// 				for (size_t i = 0; i < strlen(tmp); i++)
-// 				{
-// 					if ((int)sizeof(UserInputBuffer) <= BackSpaceLimit)
-// 						continue;
-// 					append(UserInputBuffer, tmp[i]);
-// 					BackSpaceLimit++;
-// 					char keyBuf[2] = {(char)tmp[i], '\0'};
-// 					ExPrint(keyBuf);
-// 				}
-// 				continue;
-// 			}
-// 			}
-// 			ArrowInput(key);
-// 			continue;
-// 		}
-// 	}
-
-// 	if ((int)sizeof(UserInputBuffer) <= BackSpaceLimit)
-// 		continue;
-// 	append(UserInputBuffer, key);
-// 	BackSpaceLimit++;
-// 	char keyBuf[2] = {(char)key, '\0'};
-// 	ExPrint(keyBuf);
-// }

Drivers/misc/vmware/Makefile

@@ -1,35 +0,0 @@
-default:
-	$(error Do not run this Makefile directly!)
-
-S_SOURCES = $(shell find ./ -type f -name '*.S')
-C_SOURCES = $(shell find ./ -type f -name '*.c')
-CXX_SOURCES = $(shell find ./ -type f -name '*.cpp')
-HEADERS = $(sort $(dir $(wildcard ../../include/*)))
-OBJ = $(C_SOURCES:.c=.o) $(CXX_SOURCES:.cpp=.o) $(S_SOURCES:.S=.o)
-STACK_USAGE_OBJ = $(C_SOURCES:.c=.su) $(CXX_SOURCES:.cpp=.su)
-
-FILENAME = $(notdir $(shell pwd)).drv
-
-build: $(FILENAME)
-	mv $(FILENAME) $(OUTPUT_DIR)$(FILENAME)
-
-$(FILENAME): $(OBJ)
-	$(info Linking $@)
-	$(CC) $(DRIVER_LDFLAGS) $(OBJ) $(OUTPUT_DIR)dcrt0.o -L$(OUTPUT_DIR) -lkernel -o $@
-
-WARNCFLAG = -Wall -Wextra
-
-%.o: %.c $(HEADERS)
-	$(info Compiling $<)
-	$(CC) $(DRIVER_CFLAGS) $(WARNCFLAG) -std=c17 -c $< -o $@
-
-%.o: %.cpp $(HEADERS)
-	$(info Compiling $<)
-	$(CXX) $(DRIVER_CFLAGS) $(WARNCFLAG) -std=c++20 -fno-exceptions -fno-rtti -c $< -o $@
-
-%.o: %.S
-	$(info Compiling $<)
-	$(AS) -o $@ $<
-
-clean:
-	rm -f file.map $(OBJ) $(STACK_USAGE_OBJ)

Drivers/misc/vmware/main.c

@@ -1,897 +0,0 @@
-/*
-	This file is part of Fennix Drivers.
-
-	Fennix Drivers is free software: you can redistribute it and/or
-	modify it under the terms of the GNU General Public License as
-	published by the Free Software Foundation, either version 3 of
-	the License, or (at your option) any later version.
-
-	Fennix Drivers is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with Fennix Drivers. If not, see <https://www.gnu.org/licenses/>.
-*/
-
-#include <driver.h>
-#include <errno.h>
-#include <fs.h>
-#include <input.h>
-#include <regs.h>
-#include <base.h>
-#include <aip.h>
-#include <io.h>
-
-enum RPCMessages
-{
-	MSG_OPEN,
-	MSG_SENDSIZE,
-	MSG_SENDPAYLOAD,
-	MSG_RECVSIZE,
-	MSG_RECVPAYLOAD,
-	MSG_RECVSTATUS,
-	MSG_CLOSE,
-};
-
-enum RPCStatus
-{
-	STATUS_SUCCESS = 0x1,
-	STATUS_DORECV = 0x2,
-	STATUS_CPT = 0x10,
-	STATUS_HB = 0x80,
-};
-
-typedef struct
-{
-	union
-	{
-		uint32_t ax;
-		uint32_t magic;
-	};
-	union
-	{
-		uint32_t bx;
-		size_t size;
-	};
-	union
-	{
-		uint32_t cx;
-		uint16_t command;
-	};
-	union
-	{
-		uint32_t dx;
-		uint16_t port;
-	};
-	uint32_t si;
-	uint32_t di;
-} VMwareCommand;
-
-#define VMWARE_MAGIC 0x564D5868
-
-#define VMWARE_PORT 0x5658
-#define VMWARE_PORTHB 0x5659
-
-#define VMWARE_HYPERVISOR_HB 0x00000000
-#define VMWARE_HYPERVISOR_OUT 0x00000001
-
-#define CMD_GETVERSION 0xA
-#define CMD_MESSAGE 0x1E
-#define CMD_ABSPOINTER_DATA 0x27
-#define CMD_ABSPOINTER_STATUS 0x28
-#define CMD_ABSPOINTER_COMMAND 0x29
-
-#define ABSPOINTER_ENABLE 0x45414552
-#define ABSPOINTER_RELATIVE 0xF5
-#define ABSPOINTER_ABSOLUTE 0x53424152
-
-#define MESSAGE_RPCI 0x49435052
-#define MESSAGE_TCLO 0x4f4c4354
-
-#define FLAG_COOKIE 0x80000000
-
-#define ToMsg(x) ((x) << 16 | CMD_MESSAGE)
-#define HighWord(x) ((x & 0xFFFF0000) >> 16)
-
-#define MESSAGE_HB_MSG 0
-
-#define MESSAGE_OPEN_CHANNEL ToMsg(MSG_OPEN)
-#define MESSAGE_CLOSE_CHANNEL ToMsg(MSG_CLOSE)
-
-#define MESSAGE_SEND_SIZE ToMsg(MSG_SENDSIZE)
-#define MESSAGE_SEND_PAYLOAD ToMsg(MSG_SENDPAYLOAD)
-
-#define MESSAGE_RECV_SIZE ToMsg(MSG_RECVSIZE)
-#define MESSAGE_RECV_PAYLOAD ToMsg(MSG_RECVPAYLOAD)
-#define MESSAGE_RECV_STATUS ToMsg(MSG_RECVSTATUS)
-
-#if defined(__amd64__)
-
-#define VM_PORT(cmd, in_ebx, isi, idi,          \
-				flags, magic,                   \
-				ax, bx, cx, dx, si, di)         \
-	__asm__ __volatile__("movw $0x5658, %%dx\n" \
-						 "inl %%dx, %%eax\n"    \
-						 : "=a"(ax),            \
-						   "=b"(bx),            \
-						   "=c"(cx),            \
-						   "=d"(dx),            \
-						   "=S"(si),            \
-						   "=D"(di)             \
-						 : "a"(magic),          \
-						   "b"(in_ebx),         \
-						   "c"(cmd),            \
-						   "d"(flags),          \
-						   "S"(isi),            \
-						   "D"(idi) : "memory")
-
-#define VM_PORT_HB_OUT(cmd, in_ecx, isi, idi,   \
-					   flags, magic, bp,        \
-					   ax, bx, cx, dx, si, di)  \
-	__asm__ __volatile__("push %%rbp\n"         \
-						 "mov %12, %%rbp\n"     \
-						 "movw $0x5659, %%dx\n" \
-						 "rep outsb\n"          \
-						 "pop %%rbp\n"          \
-						 : "=a"(ax),            \
-						   "=b"(bx),            \
-						   "=c"(cx),            \
-						   "=d"(dx),            \
-						   "=S"(si),            \
-						   "=D"(di)             \
-						 : "a"(magic),          \
-						   "b"(cmd),            \
-						   "c"(in_ecx),         \
-						   "d"(flags),          \
-						   "S"(isi),            \
-						   "D"(idi),            \
-						   "r"(bp) : "memory", "cc")
-
-#define VM_PORT_HB_IN(cmd, in_ecx, isi, idi,    \
-					  flags, magic, bp,         \
-					  ax, bx, cx, dx, si, di)   \
-	__asm__ __volatile__("push %%rbp\n"         \
-						 "mov %12, %%rbp\n"     \
-						 "movw $0x5659, %%dx\n" \
-						 "rep insb\n"           \
-						 "pop %%rbp\n"          \
-						 : "=a"(ax),            \
-						   "=b"(bx),            \
-						   "=c"(cx),            \
-						   "=d"(dx),            \
-						   "=S"(si),            \
-						   "=D"(di)             \
-						 : "a"(magic),          \
-						   "b"(cmd),            \
-						   "c"(in_ecx),         \
-						   "d"(flags),          \
-						   "S"(isi),            \
-						   "D"(idi),            \
-						   "r"(bp) : "memory", "cc")
-
-#elif defined(__i386__)
-
-#define VM_PORT(cmd, in_ebx, isi, idi, \
-				flags, magic,          \
-				ax, bx, cx, dx, si, di)
-
-#define VM_PORT_HB_OUT(cmd, in_ecx, isi, idi, \		
-					   flags,         \
-					   magic, bp, ax, \
-					   bx, cx, dx, si, di)
-
-#define VM_PORT_HB_IN(cmd, in_ecx, isi, idi, \
-					  flags, magic, bp,      \
-					  ax, bx, cx, dx, si, di)
-
-#endif
-
-/* TODO:
-	- use vmcall or vmmcall instead of "out" and "in" if available
-*/
-
-typedef struct
-{
-	int TCLOChannel;
-	uint16_t ChannelID;
-	uint32_t CookieHigh;
-	uint32_t CookieLow;
-} ToolboxContext;
-
-dev_t MouseDevID = -1;
-
-int __strcmp(const char *l, const char *r)
-{
-	for (; *l == *r && *l; l++, r++)
-		;
-
-	return *(unsigned char *)l - *(unsigned char *)r;
-}
-
-void __cpuid(uint32_t Function,
-			 uint32_t *eax, uint32_t *ebx,
-			 uint32_t *ecx, uint32_t *edx)
-{
-	asmv("cpuid"
-		 : "=a"(*eax), "=b"(*ebx), "=c"(*ecx), "=d"(*edx)
-		 : "a"(Function));
-}
-
-bool __CheckHypervisorBit()
-{
-	uint32_t eax, ebx, ecx, edx;
-	__cpuid(0x1, &eax, &ebx, &ecx, &edx);
-	if (!(ecx & (1 << 31)))
-		return false; /* Hypervisor not detected */
-	return true;
-}
-
-bool __VMwareBackdoorHypervisors()
-{
-	const char hv[13] = {0};
-	uint32_t eax, ebx, ecx, edx;
-	__cpuid(0x40000000, &eax, &ebx, &ecx, &edx);
-
-	*(uint32_t *)hv = ebx;
-	*(uint32_t *)(hv + 4) = ecx;
-	*(uint32_t *)(hv + 8) = edx;
-
-	if (__strcmp(hv, "VMwareVMware") != 0 &&
-		__strcmp(hv, "KVMKVMKVM") != 0 &&
-		__strcmp(hv, "TCGTCGTCGTCG") != 0)
-	{
-		return false;
-	}
-	return true;
-}
-
-bool IsVMwareBackdoorAvailable()
-{
-	if (!__CheckHypervisorBit())
-		return false;
-
-	if (!__VMwareBackdoorHypervisors())
-		return false;
-
-	struct
-	{
-		union
-		{
-			uint32_t ax;
-			uint32_t magic;
-		};
-		union
-		{
-			uint32_t bx;
-			size_t size;
-		};
-		union
-		{
-			uint32_t cx;
-			uint16_t command;
-		};
-		union
-		{
-			uint32_t dx;
-			uint16_t port;
-		};
-		uint32_t si;
-		uint32_t di;
-	} cmd;
-
-	cmd.si = cmd.di = 0;
-	cmd.bx = ~0x564D5868;
-	cmd.command = 0xA;
-	cmd.magic = 0x564D5868;
-	cmd.port = 0x5658;
-
-	asmv("in %%dx, %0"
-		 : "+a"(cmd.ax), "+b"(cmd.bx),
-		   "+c"(cmd.cx), "+d"(cmd.dx),
-		   "+S"(cmd.si), "+D"(cmd.di));
-
-	if (cmd.bx != 0x564D5868 ||
-		cmd.ax == 0xFFFFFFFF)
-		return false;
-	return true;
-}
-
-static int OpenMessageChannel(ToolboxContext *ctx, uint32_t Protocol)
-{
-	uintptr_t ax, bx, cx, dx, si = 0, di = 0;
-
-	VM_PORT(MESSAGE_OPEN_CHANNEL,
-			(Protocol | FLAG_COOKIE), si, di,
-			0, VMWARE_MAGIC,
-			ax, bx, cx, dx, si, di);
-
-	if ((HighWord(cx) & STATUS_SUCCESS) == 0)
-	{
-		KernelLog("Failed to open message channel %#lx", Protocol);
-		return -EINVAL;
-	}
-
-	DebugLog("Opened message channel %d (Protocol: %#lx)",
-			 HighWord(dx), Protocol);
-	ctx->ChannelID = (uint16_t)HighWord(dx);
-	ctx->CookieHigh = si;
-	ctx->CookieLow = di;
-	return 0;
-}
-
-static void MessageClose(ToolboxContext *ctx)
-{
-	uintptr_t ax, bx, cx, dx,
-		si = ctx->CookieHigh,
-		di = ctx->CookieLow;
-
-	VM_PORT(MESSAGE_CLOSE_CHANNEL,
-			0, si, di,
-			ctx->ChannelID << 16,
-			VMWARE_MAGIC,
-			ax, bx, cx, dx, si, di);
-
-	DebugLog("Closed message channel %d", ctx->ChannelID);
-}
-
-static uintptr_t MessageSendHB(ToolboxContext *ctx,
-							   const char *Message)
-{
-	uintptr_t ax, bx, cx, dx,
-		si = (uintptr_t)Message,
-		di = ctx->CookieLow,
-		bp = ctx->CookieHigh;
-
-	uint32_t ChannelID = ctx->ChannelID << 16;
-	size_t Size = StringLength(Message);
-
-	VM_PORT_HB_OUT((STATUS_SUCCESS << 16) | MESSAGE_HB_MSG,
-				   Size, si, di,
-				   VMWARE_HYPERVISOR_HB | ChannelID | VMWARE_HYPERVISOR_OUT,
-				   VMWARE_MAGIC, bp,
-				   ax, bx, cx, dx, si, di);
-
-	return bx;
-}
-
-static uintptr_t MessageSendLB(ToolboxContext *ctx,
-							   const char *Message)
-{
-	uintptr_t ax, bx,
-		cx = STATUS_SUCCESS << 16,
-		dx, si, di;
-
-	size_t Size = StringLength(Message);
-	while (Size &&
-		   (HighWord(cx) & STATUS_SUCCESS))
-	{
-		uint32_t TotalBytes = MIN((uint32_t)Size, (uint32_t)4);
-		uint32_t Word = 0;
-		MemoryCopy(&Word, Message, TotalBytes);
-		Message += TotalBytes;
-
-		si = ctx->CookieHigh;
-		di = ctx->CookieLow;
-
-		VM_PORT(MESSAGE_SEND_PAYLOAD,
-				Word, si, di,
-				ctx->ChannelID << 16,
-				VMWARE_MAGIC,
-				ax, bx, cx, dx, si, di);
-	}
-
-	return cx;
-}
-
-static uintptr_t MessageReceiveHB(ToolboxContext *ctx,
-								  char *Buffer,
-								  size_t BufferSize)
-{
-	uintptr_t ax, bx, cx, dx,
-		si = ctx->CookieHigh,
-		di = (uintptr_t)Buffer,
-		bp = ctx->CookieLow;
-
-	uint32_t ChannelID = ctx->ChannelID << 16;
-
-	VM_PORT_HB_IN((STATUS_SUCCESS << 16) | MESSAGE_HB_MSG,
-				  BufferSize, si, di,
-				  VMWARE_HYPERVISOR_HB | ChannelID | VMWARE_HYPERVISOR_OUT,
-				  VMWARE_MAGIC, bp,
-				  ax, bx, cx, dx, si, di);
-
-	return bx;
-}
-
-static uintptr_t MessageReceiveLB(ToolboxContext *ctx,
-								  char *Buffer,
-								  size_t BufferSize)
-{
-	uintptr_t ax, bx,
-		cx = STATUS_SUCCESS << 16,
-		dx, si, di;
-
-	while (BufferSize)
-	{
-		uint32_t TotalBytes = MIN((uint32_t)BufferSize, (uint32_t)4);
-
-		si = ctx->CookieHigh;
-		di = ctx->CookieLow;
-
-		VM_PORT(MESSAGE_RECV_PAYLOAD,
-				STATUS_SUCCESS, si, di,
-				ctx->ChannelID << 16,
-				VMWARE_MAGIC,
-				ax, bx, cx, dx, si, di);
-
-		if ((HighWord(cx) & STATUS_SUCCESS) == 0)
-			break;
-
-		MemoryCopy(Buffer, &bx, TotalBytes);
-		Buffer += TotalBytes;
-		BufferSize -= TotalBytes;
-	}
-
-	return cx;
-}
-
-static int MessageSend(ToolboxContext *ctx,
-					   const char *Message)
-{
-	uintptr_t ax, bx, cx, dx, si, di;
-	size_t Size = StringLength(Message);
-	int Retries = 0;
-
-	while (Retries < 2)
-	{
-		Retries++;
-		si = ctx->CookieHigh;
-		di = ctx->CookieLow;
-
-		VM_PORT(MESSAGE_SEND_SIZE,
-				Size, si, di,
-				ctx->ChannelID << 16,
-				VMWARE_MAGIC,
-				ax, bx, cx, dx, si, di);
-
-		if ((HighWord(cx) & STATUS_SUCCESS) == 0)
-		{
-			KernelLog("Failed to send message size for \"%s\": %d",
-					  Message, cx);
-			return -EINVAL;
-		}
-
-		bool HighBand = (HighWord(cx) & STATUS_HB) != 0;
-		if (HighBand)
-			bx = MessageSendHB(ctx, Message);
-		else
-			bx = MessageSendLB(ctx, Message);
-
-		int status = HighWord(bx);
-
-		if ((status & STATUS_SUCCESS) != 0)
-		{
-			DebugLog("Message \"%s\" sent", Message);
-			return 0;
-		}
-		else if ((status & STATUS_CPT) == 0)
-		{
-			KernelLog("Checkpoint occurred for message \"%s\"", Message);
-			continue;
-		}
-		else
-			break;
-	}
-
-	KernelLog("Failed to send message \"%s\": %#lx", Message, bx);
-	return -EINVAL;
-}
-
-static int MessageReceive(ToolboxContext *ctx,
-						  char **Buffer,
-						  size_t *BufferSize)
-{
-	uintptr_t ax, bx, cx, dx, si, di;
-	int Retries = 0;
-
-	*Buffer = NULL;
-	*BufferSize = 0;
-
-	char *ReplyBuf = NULL;
-	size_t ReplyBufPages = 0;
-	size_t ReplySize = 0;
-	while (Retries < 2)
-	{
-		Retries++;
-		si = ctx->CookieHigh;
-		di = ctx->CookieLow;
-
-		VM_PORT(MESSAGE_RECV_SIZE,
-				0, si, di,
-				ctx->ChannelID << 16,
-				VMWARE_MAGIC,
-				ax, bx, cx, dx, si, di);
-
-		if ((HighWord(cx) & STATUS_SUCCESS) == 0)
-		{
-			KernelLog("Failed to receive message size: %d", cx);
-			return -EINVAL;
-		}
-		else if ((HighWord(cx) & STATUS_DORECV) == 0)
-		{
-			DebugLog("No message to receive");
-			return -EAGAIN;
-		}
-
-		ReplySize = bx;
-
-		if (ReplyBuf != NULL)
-			FreeMemory(ReplyBuf, ReplyBufPages);
-		ReplyBufPages = ReplySize / 0x1000 + 1;
-		ReplyBuf = AllocateMemory(ReplyBufPages);
-
-		bool HighBand = (HighWord(cx) & STATUS_HB) != 0;
-		if (HighBand)
-			bx = MessageReceiveHB(ctx, ReplyBuf, ReplySize);
-		else
-			bx = MessageReceiveLB(ctx, ReplyBuf, ReplySize);
-
-		if ((HighWord(bx) & STATUS_SUCCESS) == 0)
-		{
-			if ((HighWord(bx) & STATUS_CPT) == 0)
-			{
-				KernelLog("Checkpoint occurred for message payload");
-				continue;
-			}
-
-			KernelLog("Failed to receive message payload: %d", HighWord(bx));
-			FreeMemory(ReplyBuf, ReplyBufPages);
-			return -EINVAL;
-		}
-
-		ReplyBuf[ReplySize] = '\0';
-
-		si = ctx->CookieHigh;
-		di = ctx->CookieLow;
-
-		VM_PORT(MESSAGE_RECV_STATUS,
-				STATUS_SUCCESS, si, di,
-				ctx->ChannelID << 16,
-				VMWARE_MAGIC,
-				ax, bx, cx, dx, si, di);
-
-		if ((HighWord(cx) & STATUS_SUCCESS) == 0)
-		{
-			if ((HighWord(cx) & STATUS_CPT) == 0)
-			{
-				KernelLog("Retrying message receive");
-				continue;
-			}
-
-			KernelLog("Failed to receive message status: %d", HighWord(cx));
-			FreeMemory(ReplyBuf, ReplyBufPages);
-			return -EINVAL;
-		}
-
-		break;
-	}
-
-	if (ReplyBuf == NULL)
-	{
-		KernelLog("Failed to receive message");
-		return -EINVAL;
-	}
-
-	*Buffer = ReplyBuf;
-	*BufferSize = ReplySize;
-	DebugLog("Received message \"%s\"", ReplyBuf);
-	return 0;
-}
-
-static int SendRPCI(ToolboxContext *, const char *Request)
-{
-	ToolboxContext rpci_ctx = {0};
-	int status = OpenMessageChannel(&rpci_ctx, MESSAGE_RPCI);
-	if (status < 0)
-	{
-		KernelLog("Failed to open RPCI channel: %d", status);
-		return status;
-	}
-
-	status = MessageSend(&rpci_ctx, Request);
-	if (status < 0)
-	{
-		KernelLog("Failed to send RPCI request: %d", status);
-		return status;
-	}
-
-	MessageClose(&rpci_ctx);
-	return 0;
-}
-
-int MsgEqual(const char *haystack, const char *needle)
-{
-	return strstr(haystack, needle) == haystack;
-}
-
-static int DisplayGetSize(ToolboxContext *ctx)
-{
-	if (ctx->TCLOChannel != -1)
-		MessageClose(ctx);
-	OpenMessageChannel(ctx, MESSAGE_TCLO);
-
-	char EmptyBuffer[256] = {'\0'};
-	MessageSend(ctx, EmptyBuffer);
-
-	while (true)
-	{
-		/* FIXME: buf memory leak */
-		char *buf;
-		size_t len;
-
-		int status = MessageReceive(ctx, &buf, &len);
-		if (status == -EAGAIN)
-		{
-			Sleep(1000);
-			continue;
-		}
-		else if (status < 0)
-		{
-			KernelLog("Failed to receive message");
-			return 1;
-		}
-
-		buf[StringLength(buf)] = '\0';
-		if (MsgEqual(buf, "reset"))
-		{
-			if (MessageSend(ctx, "OK ATR toolbox") < 0)
-				return 1;
-		}
-		else if (MsgEqual(buf, "ping"))
-		{
-			if (MessageSend(ctx, "OK ") < 0)
-				return 1;
-		}
-		else if (MsgEqual(buf, "Capabilities_Register"))
-		{
-			SendRPCI(ctx, "tools.capability.resolution_set 1");
-			SendRPCI(ctx, "tools.capability.resolution_server toolbox 1");
-			SendRPCI(ctx, "tools.capability.display_topology_set 1");
-			SendRPCI(ctx, "tools.capability.color_depth_set 1");
-			SendRPCI(ctx, "tools.capability.resolution_min 0 0");
-			SendRPCI(ctx, "tools.capability.unity 1");
-
-			if (MessageSend(ctx, "OK ") < 0)
-				return 1;
-		}
-		else if (MsgEqual(buf, "Resolution_Set"))
-		{
-			DebugLog("%s", buf);
-			if (MessageSend(ctx, "OK ") < 0)
-				return 1;
-			MessageClose(ctx);
-			return 0;
-		}
-		else
-		{
-			if (MessageSend(ctx, "ERROR Unknown command") < 0)
-				return 1;
-		}
-	}
-}
-
-pid_t dst_id = -1;
-pid_t dst_pid = -1;
-ToolboxContext *tb_ctx = NULL;
-void DisplayScaleThread()
-{
-	/* sizeof ToolboxContext */
-	tb_ctx = AllocateMemory(1);
-	Sleep(2000);
-
-	while (true)
-	{
-		if (DisplayGetSize(tb_ctx) != 0)
-			KernelLog("Failed to scale display");
-		Sleep(1000);
-	}
-}
-
-void CommandSend(VMwareCommand *cmd)
-{
-	cmd->magic = VMWARE_MAGIC;
-	cmd->port = VMWARE_PORT;
-	asm volatile("in %%dx, %0"
-				 : "+a"(cmd->ax), "+b"(cmd->bx),
-				   "+c"(cmd->cx), "+d"(cmd->dx),
-				   "+S"(cmd->si), "+D"(cmd->di));
-}
-
-void Absolute()
-{
-	VMwareCommand cmd = {0};
-
-	/* Enable */
-	cmd.bx = ABSPOINTER_ENABLE;
-	cmd.command = CMD_ABSPOINTER_COMMAND;
-	CommandSend(&cmd);
-
-	/* Status */
-	cmd.bx = 0;
-	cmd.command = CMD_ABSPOINTER_STATUS;
-	CommandSend(&cmd);
-
-	/* Read data (1) */
-	cmd.bx = 1;
-	cmd.command = CMD_ABSPOINTER_DATA;
-	CommandSend(&cmd);
-
-	/* Enable absolute */
-	cmd.bx = ABSPOINTER_ABSOLUTE;
-	cmd.command = CMD_ABSPOINTER_COMMAND;
-	CommandSend(&cmd);
-}
-
-void Relative()
-{
-	VMwareCommand cmd = {0};
-	cmd.bx = ABSPOINTER_RELATIVE;
-	cmd.command = CMD_ABSPOINTER_COMMAND;
-	CommandSend(&cmd);
-}
-
-InputReport ir = {0};
-void InterruptHandler(TrapFrame *)
-{
-	uint8_t Data = inb(0x60);
-	(void)Data;
-
-	VMwareCommand cmd = {0};
-	cmd.bx = 0;
-	cmd.command = CMD_ABSPOINTER_STATUS;
-	CommandSend(&cmd);
-
-	if (cmd.ax == 0xFFFF0000)
-	{
-		KernelLog("VMware mouse is not connected?");
-		Relative();
-		Absolute();
-		return;
-	}
-
-	if ((cmd.ax & 0xFFFF) < 4)
-		return;
-
-	cmd.bx = 4;
-	cmd.command = CMD_ABSPOINTER_DATA;
-	CommandSend(&cmd);
-
-	int Buttons = (cmd.ax & 0xFFFF);
-
-	/**
-	 * How should I handle this?
-	 * (cmd.[bx,cx] * Width) / 0xFFFF
-	 * Maybe TODO: Width and Height API?
-	 */
-	uintptr_t AbsoluteX = cmd.bx;
-	uintptr_t AbsoluteY = cmd.cx;
-
-	ir.Type = INPUT_TYPE_MOUSE;
-	ir.Device = MouseDevID;
-	ir.Mouse.X = AbsoluteX;
-	ir.Mouse.Y = AbsoluteY;
-	ir.Mouse.Z = (int8_t)cmd.dx;
-	ir.Mouse.Absolute = 1;
-	ir.Mouse.LeftButton = Buttons & 0x20;
-	ir.Mouse.RightButton = Buttons & 0x10;
-	ir.Mouse.MiddleButton = Buttons & 0x08;
-	// ir.Mouse.Button4 = 0x0;
-	// ir.Mouse.Button5 = 0x0;
-	// ir.Mouse.Button6 = 0x0;
-	// ir.Mouse.Button7 = 0x0;
-	// ir.Mouse.Button8 = 0x0;
-	ReportInputEvent(&ir);
-}
-
-int __fs_Ioctl(struct Inode *, unsigned long Request, void *)
-{
-	switch (Request)
-	{
-	case 0x1:
-		Relative();
-		break;
-	case 0x2:
-		Absolute();
-		break;
-	default:
-		return -EINVAL;
-	}
-	return 0;
-}
-
-const struct InodeOperations MouseOps = {
-	.Ioctl = __fs_Ioctl,
-};
-
-bool ToolboxSupported = false;
-int DriverEntry()
-{
-	ToolboxContext tb_ctx = {0};
-	/* Test if it's supported */
-	int status = OpenMessageChannel(&tb_ctx, MESSAGE_TCLO);
-	if (status == 0)
-	{
-		ToolboxSupported = true;
-		MessageClose(&tb_ctx);
-		dst_id = CreateKernelThread(0, "VMware Display Scale",
-									(void *)DisplayScaleThread, NULL);
-		dst_pid = GetCurrentProcess();
-	}
-
-	PS2WriteCommand(PS2_CMD_ENABLE_PORT_2);
-	PS2WriteCommand(PS2_CMD_READ_CONFIG);
-	PS2_CONFIGURATION config = {.Raw = PS2ReadData()};
-	config.Port2Interrupt = 1;
-	PS2WriteCommand(PS2_CMD_WRITE_CONFIG);
-	PS2WriteData(config.Raw);
-
-	PS2WriteCommand(PS2_CMD_WRITE_NEXT_BYTE_TO_PS2_PORT_2_INPUT);
-	PS2WriteData(PS2_MOUSE_CMD_SET_DEFAULTS);
-	PS2ReadData();
-
-	PS2WriteCommand(PS2_CMD_WRITE_NEXT_BYTE_TO_PS2_PORT_2_INPUT);
-	PS2WriteData(PS2_MOUSE_CMD_ENABLE_DATA_REPORTING);
-	PS2ReadData();
-	Absolute();
-
-	/**
-	 * If we have another driver using the PS/2 mouse, we need to
-	 * override its interrupt handler.
-	 */
-	OverrideInterruptHandler(12, InterruptHandler);
-
-	MouseDevID = RegisterDevice(INPUT_TYPE_MOUSE, &MouseOps);
-	return 0;
-}
-
-int DriverFinal()
-{
-	PS2WriteCommand(PS2_CMD_WRITE_NEXT_BYTE_TO_PS2_PORT_2_INPUT);
-	PS2WriteData(PS2_MOUSE_CMD_DISABLE_DATA_REPORTING);
-
-	Relative();
-
-	UnregisterDevice(MouseDevID);
-
-	if (ToolboxSupported)
-	{
-		KillThread(dst_id, dst_pid, 0);
-		if (tb_ctx->TCLOChannel != -1)
-			MessageClose(tb_ctx);
-		FreeMemory(tb_ctx, 1);
-	}
-	return 0;
-}
-
-int DriverPanic()
-{
-	Relative();
-	PS2WriteCommand(PS2_CMD_WRITE_NEXT_BYTE_TO_PS2_PORT_2_INPUT);
-	PS2WriteData(PS2_MOUSE_CMD_DISABLE_DATA_REPORTING);
-	return 0;
-}
-
-int DriverProbe()
-{
-	if (!IsVMwareBackdoorAvailable())
-		return -ENODEV;
-	return 0;
-}
-
-DriverInfo("vmware",
-		   "VMware Tools Driver",
-		   "EnderIce2",
-		   0, 0, 1,
-		   "GPLv3");

Drivers/network/e1000/Makefile

@@ -1,35 +0,0 @@
-default:
-	$(error Do not run this Makefile directly!)
-
-S_SOURCES = $(shell find ./ -type f -name '*.S')
-C_SOURCES = $(shell find ./ -type f -name '*.c')
-CXX_SOURCES = $(shell find ./ -type f -name '*.cpp')
-HEADERS = $(sort $(dir $(wildcard ../../include/*)))
-OBJ = $(C_SOURCES:.c=.o) $(CXX_SOURCES:.cpp=.o) $(S_SOURCES:.S=.o)
-STACK_USAGE_OBJ = $(C_SOURCES:.c=.su) $(CXX_SOURCES:.cpp=.su)
-
-FILENAME = $(notdir $(shell pwd)).drv
-
-build: $(FILENAME)
-	mv $(FILENAME) $(OUTPUT_DIR)$(FILENAME)
-
-$(FILENAME): $(OBJ)
-	$(info Linking $@)
-	$(CC) $(DRIVER_LDFLAGS) $(OBJ) $(OUTPUT_DIR)dcrt0.o -L$(OUTPUT_DIR) -lkernel -o $@
-
-WARNCFLAG = -Wall -Wextra
-
-%.o: %.c $(HEADERS)
-	$(info Compiling $<)
-	$(CC) $(DRIVER_CFLAGS) $(WARNCFLAG) -std=c17 -c $< -o $@
-
-%.o: %.cpp $(HEADERS)
-	$(info Compiling $<)
-	$(CXX) $(DRIVER_CFLAGS) $(WARNCFLAG) -std=c++20 -fno-exceptions -fno-rtti -c $< -o $@
-
-%.o: %.S
-	$(info Compiling $<)
-	$(AS) -o $@ $<
-
-clean:
-	rm -f file.map $(OBJ) $(STACK_USAGE_OBJ)

Drivers/network/e1000/e1000.cpp

@@ -1,512 +0,0 @@
-/*
-	This file is part of Fennix Kernel.
-
-	Fennix Kernel is free software: you can redistribute it and/or
-	modify it under the terms of the GNU General Public License as
-	published by the Free Software Foundation, either version 3 of
-	the License, or (at your option) any later version.
-
-	Fennix Kernel is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with Fennix Kernel. If not, see <https://www.gnu.org/licenses/>.
-*/
-
-#include <netools.h>
-#include <errno.h>
-#include <regs.h>
-#include <base.h>
-#include <pci.h>
-#include <network.h>
-#include <io.h>
-
-#include "e1000.hpp"
-
-class E1000Device
-{
-private:
-	PCIHeader0 *Header;
-	uint16_t DeviceID;
-	bool Initialized = false;
-
-	bool EEPROMAvailable;
-
-	struct BARData
-	{
-		uint8_t Type;
-		uint16_t IOBase;
-		uint64_t MemoryBase;
-	} BAR;
-
-#define E1000_NUM_RX_DESC 32
-#define E1000_NUM_TX_DESC 8
-	RXDescriptor *RX[E1000_NUM_RX_DESC];
-	TXDescriptor *TX[E1000_NUM_TX_DESC];
-
-	uint16_t RXCurrent;
-	uint16_t TXCurrent;
-
-	const int BaseBufferSize = 8192;
-	const int AdditionalBytes = 16;
-
-	uint32_t CurrentPacket;
-
-	void WriteCMD(uint16_t Address, uint32_t Value)
-	{
-		if (BAR.Type == 0)
-			mmoutl((void *)(BAR.MemoryBase + Address), Value);
-		else
-		{
-			outl(BAR.IOBase, Address);
-			outl(BAR.IOBase + 4, Value);
-		}
-	}
-
-	uint32_t ReadCMD(uint16_t Address)
-	{
-		if (BAR.Type == 0)
-			return mminl((void *)(BAR.MemoryBase + Address));
-		else
-		{
-			outl(BAR.IOBase, Address);
-			return inl(BAR.IOBase + 0x4);
-		}
-	}
-
-	uint32_t ReadEEPROM(uint8_t Address)
-	{
-		uint16_t Data = 0;
-		uint32_t temp = 0;
-		if (EEPROMAvailable)
-		{
-			WriteCMD(REG::EEPROM, (1) | ((uint32_t)(Address) << 8));
-			while (!((temp = ReadCMD(REG::EEPROM)) & (1 << 4)))
-				;
-		}
-		else
-		{
-			WriteCMD(REG::EEPROM, (1) | ((uint32_t)(Address) << 2));
-			while (!((temp = ReadCMD(REG::EEPROM)) & (1 << 1)))
-				;
-		}
-		Data = (uint16_t)((temp >> 16) & 0xFFFF);
-		return Data;
-	}
-
-	void InitializeRX()
-	{
-		DebugLog("Initializing RX...");
-		uintptr_t Ptr = (uintptr_t)AllocateMemory(TO_PAGES(sizeof(RXDescriptor) *
-															   E1000_NUM_RX_DESC +
-														   AdditionalBytes));
-
-		for (int i = 0; i < E1000_NUM_RX_DESC; i++)
-		{
-			RX[i] = (RXDescriptor *)(Ptr + i * 16);
-			RX[i]->Address = (uint64_t)AllocateMemory(TO_PAGES(BaseBufferSize + AdditionalBytes));
-			RX[i]->Status = 0;
-		}
-
-#pragma GCC diagnostic ignored "-Wshift-count-overflow"
-
-		WriteCMD(REG::TXDESCLO, (uint32_t)(Ptr >> 32));
-		WriteCMD(REG::TXDESCHI, (uint32_t)(Ptr & 0xFFFFFFFF));
-
-		WriteCMD(REG::RXDESCLO, (uint32_t)Ptr);
-		WriteCMD(REG::RXDESCHI, 0);
-
-		WriteCMD(REG::RXDESCLEN, E1000_NUM_RX_DESC * 16);
-
-		WriteCMD(REG::RXDESCHEAD, 0);
-		WriteCMD(REG::RXDESCTAIL, E1000_NUM_RX_DESC - 1);
-		RXCurrent = 0;
-		WriteCMD(REG::RCTRL, RCTL::EN | RCTL::SBP | RCTL::UPE |
-								 RCTL::MPE | RCTL::LBM_NONE |
-								 RTCL::RDMTS_HALF | RCTL::BAM |
-								 RCTL::SECRC | RCTL::BSIZE_8192);
-	}
-
-	void InitializeTX()
-	{
-		DebugLog("Initializing TX...");
-		uintptr_t Ptr = (uintptr_t)AllocateMemory(TO_PAGES(sizeof(TXDescriptor) *
-															   E1000_NUM_RX_DESC +
-														   AdditionalBytes));
-
-		for (short i = 0; i < E1000_NUM_TX_DESC; i++)
-		{
-			TX[i] = (TXDescriptor *)((uintptr_t)Ptr + i * 16);
-			TX[i]->Address = 0;
-			TX[i]->Command = 0;
-			TX[i]->Status = TSTA::DD;
-		}
-
-		WriteCMD(REG::TXDESCHI, (uint32_t)((uint64_t)Ptr >> 32));
-		WriteCMD(REG::TXDESCLO, (uint32_t)((uint64_t)Ptr & 0xFFFFFFFF));
-
-		WriteCMD(REG::TXDESCLEN, E1000_NUM_TX_DESC * 16);
-
-		WriteCMD(REG::TXDESCHEAD, 0);
-		WriteCMD(REG::TXDESCTAIL, 0);
-		TXCurrent = 0;
-		WriteCMD(REG::TCTRL, TCTL::EN_ | TCTL::PSP |
-								 (15 << TCTL::CT_SHIFT) |
-								 (64 << TCTL::COLD_SHIFT) |
-								 TCTL::RTLC);
-
-		WriteCMD(REG::TCTRL, 0b0110000000000111111000011111010);
-		WriteCMD(REG::TIPG, 0x0060200A);
-	}
-
-public:
-	dev_t ID;
-
-	bool IsInitialized() { return Initialized; }
-
-	size_t write(uint8_t *Buffer, size_t Size)
-	{
-		TX[TXCurrent]->Address = (uint64_t)Buffer;
-		TX[TXCurrent]->Length = (uint16_t)Size;
-		TX[TXCurrent]->Command = CMD::EOP | CMD::IFCS | CMD::RS;
-		TX[TXCurrent]->Status = 0;
-		uint16_t OldTXCurrent = TXCurrent;
-		TXCurrent = (uint16_t)((TXCurrent + 1) % E1000_NUM_TX_DESC);
-		WriteCMD(REG::TXDESCTAIL, TXCurrent);
-		while (!(TX[OldTXCurrent]->Status & 0xFF))
-			Yield();
-		return Size;
-	}
-
-	MediaAccessControl GetMAC()
-	{
-		MediaAccessControl mac;
-		if (EEPROMAvailable)
-		{
-			uint32_t temp;
-			temp = ReadEEPROM(0);
-			mac.Address[0] = temp & 0xff;
-			mac.Address[1] = (uint8_t)(temp >> 8);
-			temp = ReadEEPROM(1);
-			mac.Address[2] = temp & 0xff;
-			mac.Address[3] = (uint8_t)(temp >> 8);
-			temp = ReadEEPROM(2);
-			mac.Address[4] = temp & 0xff;
-			mac.Address[5] = (uint8_t)(temp >> 8);
-		}
-		else
-		{
-			uint8_t *BaseMac8 = (uint8_t *)(BAR.MemoryBase + 0x5400);
-			uint32_t *BaseMac32 = (uint32_t *)(BAR.MemoryBase + 0x5400);
-			if (BaseMac32[0] != 0)
-				for (int i = 0; i < 6; i++)
-					mac.Address[i] = BaseMac8[i];
-			else
-			{
-				KernelLog("No MAC address found.");
-				return MediaAccessControl();
-			}
-		}
-
-		return mac;
-	}
-
-	int ioctl(NetIoctl req, void *arg)
-	{
-		switch (req)
-		{
-		case IOCTL_NET_GET_MAC:
-		{
-			MediaAccessControl mac = GetMAC();
-			*((uint48_t *)arg) = mac.ToHex(); /* UNTESTED */
-			return 0;
-		}
-		default:
-			return -EINVAL;
-		}
-		return 0;
-	}
-
-	void OnInterruptReceived(TrapFrame *)
-	{
-		WriteCMD(REG::IMASK, 0x1);
-		uint32_t status = ReadCMD(0xC0);
-		UNUSED(status);
-
-		while ((RX[RXCurrent]->Status & 0x1))
-		{
-			uint8_t *data = (uint8_t *)RX[RXCurrent]->Address;
-			uint16_t dataSz = RX[RXCurrent]->Length;
-
-			// ReportNetworkPacket(ID, data, dataSz);
-			/* FIXME: Implement */
-			KernelLog("FIXME: Received packet");
-			(void)data;
-			(void)dataSz;
-
-			RX[RXCurrent]->Status = 0;
-			uint16_t OldRXCurrent = RXCurrent;
-			RXCurrent = (uint16_t)((RXCurrent + 1) % E1000_NUM_RX_DESC);
-			WriteCMD(REG::RXDESCTAIL, OldRXCurrent);
-		}
-	}
-
-	void Panic()
-	{
-		WriteCMD(REG::IMASK, 0x00000000);
-		WriteCMD(REG::ITR, 0x00000000);
-		WriteCMD(REG::IAM, 0x00000000);
-	}
-
-	E1000Device(PCIHeader0 *_Header, uint16_t _DeviceID)
-		: Header(_Header),
-		  DeviceID(_DeviceID)
-	{
-		uint32_t PCIBAR0 = Header->BAR0;
-		uint32_t PCIBAR1 = Header->BAR1;
-		BAR.Type = PCIBAR0 & 1;
-		BAR.IOBase = (uint16_t)(PCIBAR0 & (~3));
-		BAR.MemoryBase = PCIBAR1 & (~15);
-
-		switch (DeviceID)
-		{
-		case 0x100E:
-		{
-			KernelLog("Found Intel 82540EM Gigabit Ethernet Controller.");
-
-			/* Detect EEPROM */
-			WriteCMD(REG::EEPROM, 0x1);
-			for (int i = 0; i < 1000 && !EEPROMAvailable; i++)
-				if (ReadCMD(REG::EEPROM) & 0x10)
-					EEPROMAvailable = true;
-				else
-					EEPROMAvailable = false;
-
-			if (!GetMAC().Valid())
-			{
-				KernelLog("Failed to get MAC");
-				return;
-			}
-
-			/* Start link */
-			uint32_t cmdret = ReadCMD(REG::CTRL);
-			WriteCMD(REG::CTRL, cmdret | ECTRL::SLU);
-
-			for (int i = 0; i < 0x80; i++)
-				WriteCMD((uint16_t)(0x5200 + i * 4), 0);
-
-			WriteCMD(REG::IMASK, 0x1F6DC);
-			WriteCMD(REG::IMASK, 0xFF & ~4);
-			ReadCMD(0xC0);
-
-			InitializeRX();
-			InitializeTX();
-			break;
-		}
-		default:
-		{
-			KernelLog("Unimplemented E1000 device.");
-			return;
-		}
-		}
-
-		Initialized = true;
-	}
-
-	~E1000Device()
-	{
-		if (!Initialized)
-			return;
-
-		switch (DeviceID)
-		{
-		case 0x100E:
-		{
-			// Clearing Enable bit in Receive Control Register
-			uint32_t cmdret = ReadCMD(REG::RCTRL);
-			WriteCMD(REG::RCTRL, cmdret & ~RCTL::EN);
-
-			// Masking Interrupt Mask, Interrupt Throttling Rate & Interrupt Auto-Mask
-			WriteCMD(REG::IMASK, 0x00000000);
-			WriteCMD(REG::ITR, 0x00000000);
-			WriteCMD(REG::IAM, 0x00000000);
-
-			// Clearing SLU bit in Device Control Register
-			cmdret = ReadCMD(REG::CTRL);
-			WriteCMD(REG::CTRL, cmdret & ~ECTRL::SLU);
-
-			// Clear the Interrupt Cause Read register by reading it
-			ReadCMD(REG::ICR);
-
-			// Powering down the device (?)
-			WriteCMD(REG::CTRL, PCTRL::POWER_DOWN);
-			/* TODO: Stop link; further testing required */
-			break;
-		}
-		default:
-		{
-			KernelLog("Unimplemented E1000 device.");
-			return;
-		}
-		}
-	}
-};
-
-E1000Device *Drivers[4] = {nullptr};
-dev_t NetID[4] = {(dev_t)-1};
-
-#define OIR(x) OIR_##x
-#define CREATE_OIR(x) \
-	void OIR_##x(TrapFrame *f) { Drivers[x]->OnInterruptReceived(f); }
-
-CREATE_OIR(0);
-CREATE_OIR(1);
-CREATE_OIR(2);
-CREATE_OIR(3);
-
-int __fs_Open(struct Inode *, int, mode_t) { return 0; }
-int __fs_Close(struct Inode *) { return 0; }
-ssize_t __fs_Read(struct Inode *, void *, size_t, off_t) { return 0; }
-
-ssize_t __fs_Write(struct Inode *Node, const void *Buffer, size_t Size, off_t)
-{
-	return Drivers[NetID[Node->GetMinor()]]->write((uint8_t *)Buffer, Size);
-}
-
-int __fs_Ioctl(struct Inode *Node, unsigned long Request, void *Argp)
-{
-	return Drivers[NetID[Node->GetMinor()]]->ioctl((NetIoctl)Request, Argp);
-}
-
-const struct InodeOperations NetOps = {
-	.Lookup = nullptr,
-	.Create = nullptr,
-	.Remove = nullptr,
-	.Rename = nullptr,
-	.Read = __fs_Read,
-	.Write = __fs_Write,
-	.Truncate = nullptr,
-	.Open = __fs_Open,
-	.Close = __fs_Close,
-	.Ioctl = __fs_Ioctl,
-	.ReadDir = nullptr,
-	.MkDir = nullptr,
-	.RmDir = nullptr,
-	.SymLink = nullptr,
-	.ReadLink = nullptr,
-	.Seek = nullptr,
-	.Stat = nullptr,
-};
-
-PCIArray *Devices;
-EXTERNC int cxx_Panic()
-{
-	PCIArray *ctx = Devices;
-	short Count = 0;
-	while (ctx != nullptr)
-	{
-		if (Drivers[Count] != nullptr)
-			Drivers[Count]->Panic();
-		Count++;
-		ctx = (PCIArray *)ctx->Next;
-	}
-
-	return 0;
-}
-
-EXTERNC int cxx_Probe()
-{
-	uint16_t VendorIDs[] = {0x8086, /* Intel */
-							PCI_END};
-	uint16_t DeviceIDs[] = {0x100E, /* 82540EM */
-							0x100F, /* 82545EM */
-							0x10D3, /* 82574L */
-							0x10EA, /* I217-LM */
-							0x153A, /* 82577LM */
-							PCI_END};
-	Devices = GetPCIDevices(VendorIDs, DeviceIDs);
-	if (Devices == nullptr)
-	{
-		KernelLog("No E1000 device found.");
-		return -ENODEV;
-	}
-	return 0;
-}
-
-EXTERNC int cxx_Initialize()
-{
-	PCIArray *ctx = Devices;
-	size_t Count = 0;
-	while (ctx != nullptr)
-	{
-		if (Count > sizeof(Drivers) / sizeof(E1000Device *))
-			break;
-
-		InitializePCI(ctx->Device);
-
-		Drivers[Count] = new E1000Device((PCIHeader0 *)ctx->Device->Header,
-										 ctx->Device->Header->DeviceID);
-
-		if (Drivers[Count]->IsInitialized())
-		{
-			dev_t ret = RegisterDevice(NETWORK_TYPE_ETHERNET, &NetOps);
-			NetID[Count] = ret;
-			Drivers[Count]->ID = ret;
-
-			/* FIXME: bad code */
-			switch (Count)
-			{
-			case 0:
-				RegisterInterruptHandler(iLine(ctx->Device), (void *)OIR(0));
-				break;
-			case 1:
-				RegisterInterruptHandler(iLine(ctx->Device), (void *)OIR(1));
-				break;
-			case 2:
-				RegisterInterruptHandler(iLine(ctx->Device), (void *)OIR(2));
-				break;
-			case 3:
-				RegisterInterruptHandler(iLine(ctx->Device), (void *)OIR(3));
-				break;
-			default:
-				break;
-			}
-
-			Count++;
-		}
-		ctx = (PCIArray *)ctx->Next;
-	}
-
-	if (Count == 0)
-	{
-		KernelLog("No valid E1000 device found.");
-		return -EINVAL;
-	}
-
-	return 0;
-}
-
-EXTERNC int cxx_Finalize()
-{
-	PCIArray *ctx = Devices;
-	size_t Count = 0;
-	while (ctx != nullptr)
-	{
-		if (Count++ > sizeof(Drivers) / sizeof(E1000Device *))
-			break;
-
-		delete Drivers[Count++];
-		ctx->Device->Header->Command |= PCI_COMMAND_INTX_DISABLE;
-		ctx = (PCIArray *)ctx->Next;
-	}
-
-	for (size_t i = 0; i < sizeof(NetID) / sizeof(dev_t); i++)
-	{
-		if (NetID[i] != (dev_t)-1)
-			UnregisterDevice(NetID[i]);
-	}
-
-	return 0;
-}

Drivers/network/e1000/main.c

@@ -1,31 +0,0 @@
-/*
-	This file is part of Fennix Drivers.
-
-	Fennix Drivers is free software: you can redistribute it and/or
-	modify it under the terms of the GNU General Public License as
-	published by the Free Software Foundation, either version 3 of
-	the License, or (at your option) any later version.
-
-	Fennix Drivers is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with Fennix Drivers. If not, see <https://www.gnu.org/licenses/>.
-*/
-
-#include <base.h>
-
-#include "e1000.hpp"
-
-int DriverEntry() { return cxx_Initialize(); }
-int DriverFinal() { return cxx_Finalize(); }
-int DriverPanic() { return cxx_Panic(); }
-int DriverProbe() { return cxx_Probe(); }
-
-DriverInfo("e1000",
-		   "Intel(R) PRO/1000 Network Driver",
-		   "EnderIce2",
-		   0, 0, 1,
-		   "GPLv3");

Drivers/network/rtl8139/Makefile

@@ -1,35 +0,0 @@
-default:
-	$(error Do not run this Makefile directly!)
-
-S_SOURCES = $(shell find ./ -type f -name '*.S')
-C_SOURCES = $(shell find ./ -type f -name '*.c')
-CXX_SOURCES = $(shell find ./ -type f -name '*.cpp')
-HEADERS = $(sort $(dir $(wildcard ../../include/*)))
-OBJ = $(C_SOURCES:.c=.o) $(CXX_SOURCES:.cpp=.o) $(S_SOURCES:.S=.o)
-STACK_USAGE_OBJ = $(C_SOURCES:.c=.su) $(CXX_SOURCES:.cpp=.su)
-
-FILENAME = $(notdir $(shell pwd)).drv
-
-build: $(FILENAME)
-	mv $(FILENAME) $(OUTPUT_DIR)$(FILENAME)
-
-$(FILENAME): $(OBJ)
-	$(info Linking $@)
-	$(CC) $(DRIVER_LDFLAGS) $(OBJ) $(OUTPUT_DIR)dcrt0.o -L$(OUTPUT_DIR) -lkernel -o $@
-
-WARNCFLAG = -Wall -Wextra
-
-%.o: %.c $(HEADERS)
-	$(info Compiling $<)
-	$(CC) $(DRIVER_CFLAGS) $(WARNCFLAG) -std=c17 -c $< -o $@
-
-%.o: %.cpp $(HEADERS)
-	$(info Compiling $<)
-	$(CXX) $(DRIVER_CFLAGS) $(WARNCFLAG) -std=c++20 -fno-exceptions -fno-rtti -c $< -o $@
-
-%.o: %.S
-	$(info Compiling $<)
-	$(AS) -o $@ $<
-
-clean:
-	rm -f file.map $(OBJ) $(STACK_USAGE_OBJ)

Drivers/network/rtl8139/main.c

@@ -1,31 +0,0 @@
-/*
-	This file is part of Fennix Drivers.
-
-	Fennix Drivers is free software: you can redistribute it and/or
-	modify it under the terms of the GNU General Public License as
-	published by the Free Software Foundation, either version 3 of
-	the License, or (at your option) any later version.
-
-	Fennix Drivers is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with Fennix Drivers. If not, see <https://www.gnu.org/licenses/>.
-*/
-
-#include <base.h>
-
-#include "rtl8139.hpp"
-
-int DriverEntry() { return cxx_Initialize(); }
-int DriverFinal() { return cxx_Finalize(); }
-int DriverPanic() { return cxx_Panic(); }
-int DriverProbe() { return cxx_Probe(); }
-
-DriverInfo("rtl8139",
-		   "Realtek RTL8139 Network Driver",
-		   "EnderIce2",
-		   0, 0, 1,
-		   "GPLv3");

Drivers/network/rtl8139/rtl8139.cpp

@@ -1,325 +0,0 @@
-/*
-	This file is part of Fennix Kernel.
-
-	Fennix Kernel is free software: you can redistribute it and/or
-	modify it under the terms of the GNU General Public License as
-	published by the Free Software Foundation, either version 3 of
-	the License, or (at your option) any later version.
-
-	Fennix Kernel is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with Fennix Kernel. If not, see <https://www.gnu.org/licenses/>.
-*/
-
-#include <netools.h>
-#include <errno.h>
-#include <regs.h>
-#include <base.h>
-#include <pci.h>
-#include <network.h>
-#include <io.h>
-
-#include "rtl8139.hpp"
-
-class RTL8139Device
-{
-private:
-	PCIHeader0 *Header;
-	bool Initialized = false;
-
-	struct BARData
-	{
-		uint8_t Type;
-		uint16_t IOBase;
-		uint64_t MemoryBase;
-	} BAR;
-
-	const int BaseBufferSize = 8192;
-	const int WRAPBytes = 1500;
-	const int AdditionalBytes = 16;
-	const int BufferSize = BaseBufferSize +
-						   WRAPBytes +
-						   AdditionalBytes;
-
-	uint8_t *RXBuffer = nullptr;
-	int TXCurrent = 0;
-	uint16_t CurrentPacket = 0;
-
-	uint8_t TSAD[4] = {0x20, 0x24, 0x28, 0x2C};
-	uint8_t TSD[4] = {0x10, 0x14, 0x18, 0x1C};
-
-public:
-	dev_t ID;
-
-	bool IsInitialized() { return Initialized; }
-
-	size_t write(uint8_t *Buffer, size_t Size)
-	{
-		outl(TSAD[TXCurrent], (uint32_t)(reinterpret_cast<uint64_t>(Buffer)));
-		outl(TSD[TXCurrent++], (uint32_t)Size);
-		if (TXCurrent > 3)
-			TXCurrent = 0;
-		return Size;
-	}
-
-	MediaAccessControl GetMAC()
-	{
-		return MediaAccessControl();
-	}
-
-	int ioctl(NetIoctl req, void *)
-	{
-		switch (req)
-		{
-		case IOCTL_NET_GET_MAC:
-		{
-			return -ENOSYS;
-		}
-		default:
-			return -EINVAL;
-		}
-		return 0;
-	}
-
-	void OnInterruptReceived(TrapFrame *)
-	{
-		/* Acknowledge interrupt */
-		uint16_t status = inw(RegISR);
-		DebugLog("%#lx", status);
-
-		/* Read status */
-		if (status & RecOK)
-		{
-			/* Get the current packet */
-			uint16_t *data = (uint16_t *)(RXBuffer + CurrentPacket);
-			uint16_t dataSz = *(data + 1);
-			data += 2;
-
-			// ReportNetworkPacket(ID, data, dataSz);
-			/* FIXME: Implement */
-			KernelLog("FIXME: Received packet");
-			(void)data;
-			(void)dataSz;
-
-			/* Update CAPR */
-#define RX_READ_PTR_MASK (~0x3)
-			CurrentPacket = (uint16_t)((CurrentPacket + dataSz + 4 + 3) & RX_READ_PTR_MASK);
-			if (CurrentPacket > BufferSize)
-				CurrentPacket -= uint16_t(BufferSize);
-			outw(RegCAPR, CurrentPacket - 0x10);
-		}
-
-		/* Clear interrupt */
-		outw(RegISR, (RecOK | RecBad | SendOK | SendBad));
-	}
-
-	void Panic()
-	{
-	}
-
-	RTL8139Device(PCIHeader0 *_Header)
-		: Header(_Header)
-	{
-		uint32_t PCIBAR0 = Header->BAR0;
-		uint32_t PCIBAR1 = Header->BAR1;
-		BAR.Type = PCIBAR0 & 1;
-		BAR.IOBase = (uint16_t)(PCIBAR0 & (~3));
-		BAR.MemoryBase = PCIBAR1 & (~15);
-
-		RXBuffer = (uint8_t *)AllocateMemory(TO_PAGES(BufferSize));
-
-		/* Power on */
-		outb(RegCONFIG1, 0x0);
-
-		/* Software Reset */
-		outb(RegCMD, 0x10);
-		while (inb(RegCMD) & 0x10)
-			Yield();
-
-		/* Initialize receive buffer */
-		outl(RegRBSTART, (uint32_t)(reinterpret_cast<uintptr_t>(RXBuffer)));
-
-		/* Configure interrupt mask register */
-		outw(RegIMR, (RecOK | RecBad | SendOK | SendBad));
-		outl(regRCR, (RcAB | RcAM | RcAPM | RcAAP) | RcWRAP);
-
-		/* Enable receive and transmit */
-		outb(RegCMD, 0xC); /* 0xC = RE and TE bit */
-
-		uint32_t MAC1 = inl(RegMAC);
-		uint16_t MAC2 = inw(RegMAR);
-		MediaAccessControl mac = {
-			mac.Address[0] = (uint8_t)MAC1,
-			mac.Address[1] = (uint8_t)(MAC1 >> 8),
-			mac.Address[2] = (uint8_t)(MAC1 >> 16),
-			mac.Address[3] = (uint8_t)(MAC1 >> 24),
-			mac.Address[4] = (uint8_t)MAC2,
-			mac.Address[5] = (uint8_t)(MAC2 >> 8)};
-
-		Initialized = true;
-	}
-
-	~RTL8139Device()
-	{
-		if (!Initialized)
-			return;
-
-		/* FIXME: Shutdown code */
-	}
-};
-
-RTL8139Device *Drivers[4] = {nullptr};
-dev_t NetID[4] = {(dev_t)-1};
-
-#define OIR(x) OIR_##x
-#define CREATE_OIR(x) \
-	void OIR_##x(TrapFrame *f) { Drivers[x]->OnInterruptReceived(f); }
-
-CREATE_OIR(0);
-CREATE_OIR(1);
-CREATE_OIR(2);
-CREATE_OIR(3);
-
-int __fs_Open(struct Inode *, int, mode_t) { return 0; }
-int __fs_Close(struct Inode *) { return 0; }
-ssize_t __fs_Read(struct Inode *, void *, size_t, off_t) { return 0; }
-
-ssize_t __fs_Write(struct Inode *Node, const void *Buffer, size_t Size, off_t)
-{
-	return Drivers[NetID[Node->GetMinor()]]->write((uint8_t *)Buffer, Size);
-}
-
-int __fs_Ioctl(struct Inode *Node, unsigned long Request, void *Argp)
-{
-	return Drivers[NetID[Node->GetMinor()]]->ioctl((NetIoctl)Request, Argp);
-}
-
-const struct InodeOperations NetOps = {
-	.Lookup = nullptr,
-	.Create = nullptr,
-	.Remove = nullptr,
-	.Rename = nullptr,
-	.Read = __fs_Read,
-	.Write = __fs_Write,
-	.Truncate = nullptr,
-	.Open = __fs_Open,
-	.Close = __fs_Close,
-	.Ioctl = __fs_Ioctl,
-	.ReadDir = nullptr,
-	.MkDir = nullptr,
-	.RmDir = nullptr,
-	.SymLink = nullptr,
-	.ReadLink = nullptr,
-	.Seek = nullptr,
-	.Stat = nullptr,
-};
-
-PCIArray *Devices;
-EXTERNC int cxx_Panic()
-{
-	PCIArray *ctx = Devices;
-	short Count = 0;
-	while (ctx != nullptr)
-	{
-		if (Drivers[Count] != nullptr)
-			Drivers[Count]->Panic();
-		Count++;
-		ctx = (PCIArray *)ctx->Next;
-	}
-
-	return 0;
-}
-
-EXTERNC int cxx_Probe()
-{
-	uint16_t VendorIDs[] = {0x10EC, /* Realtek */
-							PCI_END};
-	uint16_t DeviceIDs[] = {0x8139, /* RTL8139 */
-							PCI_END};
-	Devices = GetPCIDevices(VendorIDs, DeviceIDs);
-	if (Devices == nullptr)
-	{
-		KernelLog("No RTL8139 device found.");
-		return -ENODEV;
-	}
-	return 0;
-}
-
-EXTERNC int cxx_Initialize()
-{
-	PCIArray *ctx = Devices;
-	size_t Count = 0;
-	while (ctx != nullptr)
-	{
-		if (Count > sizeof(Drivers) / sizeof(RTL8139Device *))
-			break;
-
-		InitializePCI(ctx->Device);
-
-		Drivers[Count] = new RTL8139Device((PCIHeader0 *)ctx->Device->Header);
-
-		if (Drivers[Count]->IsInitialized())
-		{
-			dev_t ret = RegisterDevice(NETWORK_TYPE_ETHERNET, &NetOps);
-			NetID[Count] = ret;
-			Drivers[Count]->ID = ret;
-
-			/* FIXME: bad code */
-			switch (Count)
-			{
-			case 0:
-				RegisterInterruptHandler(iLine(ctx->Device), (void *)OIR(0));
-				break;
-			case 1:
-				RegisterInterruptHandler(iLine(ctx->Device), (void *)OIR(1));
-				break;
-			case 2:
-				RegisterInterruptHandler(iLine(ctx->Device), (void *)OIR(2));
-				break;
-			case 3:
-				RegisterInterruptHandler(iLine(ctx->Device), (void *)OIR(3));
-				break;
-			default:
-				break;
-			}
-
-			Count++;
-		}
-		ctx = (PCIArray *)ctx->Next;
-	}
-
-	if (Count == 0)
-	{
-		KernelLog("No valid RTL8139 device found.");
-		return -EINVAL;
-	}
-
-	return 0;
-}
-
-EXTERNC int cxx_Finalize()
-{
-	PCIArray *ctx = Devices;
-	size_t Count = 0;
-	while (ctx != nullptr)
-	{
-		if (Count++ > sizeof(Drivers) / sizeof(RTL8139Device *))
-			break;
-
-		delete Drivers[Count++];
-		ctx->Device->Header->Command |= PCI_COMMAND_INTX_DISABLE;
-		ctx = (PCIArray *)ctx->Next;
-	}
-
-	for (size_t i = 0; i < sizeof(NetID) / sizeof(dev_t); i++)
-	{
-		if (NetID[i] != (dev_t)-1)
-			UnregisterDevice(NetID[i]);
-	}
-
-	return 0;
-}

Drivers/storage/Makefile

@@ -1,7 +1,9 @@
-build:
-	make -C ahci build
-	make -C ata build
+MAKE_TARGETS := build clean
+DIRECTORIES := $(sort $(dir $(wildcard ./*/)))
 
-clean:
-	make -C ahci clean
-	make -C ata clean
+.PHONY: $(MAKE_TARGETS) $(DIRECTORIES)
+
+$(MAKE_TARGETS): $(DIRECTORIES)
+
+$(DIRECTORIES):
+	$(MAKE) -C $@ $(MAKECMDGOALS)

Drivers/storage/ahci/Makefile

@@ -1,35 +0,0 @@
-default:
-	$(error Do not run this Makefile directly!)
-
-S_SOURCES = $(shell find ./ -type f -name '*.S')
-C_SOURCES = $(shell find ./ -type f -name '*.c')
-CXX_SOURCES = $(shell find ./ -type f -name '*.cpp')
-HEADERS = $(sort $(dir $(wildcard ../../include/*)))
-OBJ = $(C_SOURCES:.c=.o) $(CXX_SOURCES:.cpp=.o) $(S_SOURCES:.S=.o)
-STACK_USAGE_OBJ = $(C_SOURCES:.c=.su) $(CXX_SOURCES:.cpp=.su)
-
-FILENAME = $(notdir $(shell pwd)).drv
-
-build: $(FILENAME)
-	mv $(FILENAME) $(OUTPUT_DIR)$(FILENAME)
-
-$(FILENAME): $(OBJ)
-	$(info Linking $@)
-	$(CC) $(DRIVER_LDFLAGS) $(OBJ) $(OUTPUT_DIR)dcrt0.o -L$(OUTPUT_DIR) -lkernel -o $@
-
-WARNCFLAG = -Wall -Wextra
-
-%.o: %.c $(HEADERS)
-	$(info Compiling $<)
-	$(CC) $(DRIVER_CFLAGS) $(WARNCFLAG) -std=c17 -c $< -o $@
-
-%.o: %.cpp $(HEADERS)
-	$(info Compiling $<)
-	$(CXX) $(DRIVER_CFLAGS) $(WARNCFLAG) -std=c++20 -fno-exceptions -fno-rtti -c $< -o $@
-
-%.o: %.S
-	$(info Compiling $<)
-	$(AS) -o $@ $<
-
-clean:
-	rm -f file.map $(OBJ) $(STACK_USAGE_OBJ)

Drivers/storage/ahci/main.c

@@ -1,31 +0,0 @@
-/*
-	This file is part of Fennix Drivers.
-
-	Fennix Drivers is free software: you can redistribute it and/or
-	modify it under the terms of the GNU General Public License as
-	published by the Free Software Foundation, either version 3 of
-	the License, or (at your option) any later version.
-
-	Fennix Drivers is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with Fennix Drivers. If not, see <https://www.gnu.org/licenses/>.
-*/
-
-#include <base.h>
-
-#include "ahci.hpp"
-
-int DriverEntry() { return cxx_Initialize(); }
-int DriverFinal() { return cxx_Finalize(); }
-int DriverPanic() { return cxx_Panic(); }
-int DriverProbe() { return cxx_Probe(); }
-
-DriverInfo("ahci",
-		   "Advanced Host Controller Interface Driver",
-		   "EnderIce2",
-		   0, 0, 1,
-		   "GPLv3");

Drivers/storage/ata/Makefile

@@ -1,35 +0,0 @@
-default:
-	$(error Do not run this Makefile directly!)
-
-S_SOURCES = $(shell find ./ -type f -name '*.S')
-C_SOURCES = $(shell find ./ -type f -name '*.c')
-CXX_SOURCES = $(shell find ./ -type f -name '*.cpp')
-HEADERS = $(sort $(dir $(wildcard ../../include/*)))
-OBJ = $(C_SOURCES:.c=.o) $(CXX_SOURCES:.cpp=.o) $(S_SOURCES:.S=.o)
-STACK_USAGE_OBJ = $(C_SOURCES:.c=.su) $(CXX_SOURCES:.cpp=.su)
-
-FILENAME = $(notdir $(shell pwd)).drv
-
-build: $(FILENAME)
-	mv $(FILENAME) $(OUTPUT_DIR)$(FILENAME)
-
-$(FILENAME): $(OBJ)
-	$(info Linking $@)
-	$(CC) $(DRIVER_LDFLAGS) $(OBJ) $(OUTPUT_DIR)dcrt0.o -L$(OUTPUT_DIR) -lkernel -o $@
-
-WARNCFLAG = -Wall -Wextra
-
-%.o: %.c $(HEADERS)
-	$(info Compiling $<)
-	$(CC) $(DRIVER_CFLAGS) $(WARNCFLAG) -std=c17 -c $< -o $@
-
-%.o: %.cpp $(HEADERS)
-	$(info Compiling $<)
-	$(CXX) $(DRIVER_CFLAGS) $(WARNCFLAG) -std=c++20 -fno-exceptions -fno-rtti -c $< -o $@
-
-%.o: %.S
-	$(info Compiling $<)
-	$(AS) -o $@ $<
-
-clean:
-	rm -f file.map $(OBJ) $(STACK_USAGE_OBJ)

Drivers/storage/ata/main.c

@@ -1,76 +0,0 @@
-/*
-	This file is part of Fennix Drivers.
-
-	Fennix Drivers is free software: you can redistribute it and/or
-	modify it under the terms of the GNU General Public License as
-	published by the Free Software Foundation, either version 3 of
-	the License, or (at your option) any later version.
-
-	Fennix Drivers is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with Fennix Drivers. If not, see <https://www.gnu.org/licenses/>.
-*/
-
-#include <errno.h>
-#include <regs.h>
-#include <base.h>
-#include <io.h>
-
-bool IsATAPresent()
-{
-	outb(0x1F0 + 2, 0);
-	outb(0x1F0 + 3, 0);
-	outb(0x1F0 + 4, 0);
-	outb(0x1F0 + 5, 0);
-	outb(0x1F0 + 7, 0xEC);
-	if (inb(0x1F0 + 7) == 0 || inb(0x1F0 + 1) != 0)
-		return false;
-	return true;
-}
-
-void MasterInterruptHandler(TrapFrame *)
-{
-}
-
-void SlaveInterruptHandler(TrapFrame *)
-{
-}
-
-int DriverEntry()
-{
-	RegisterInterruptHandler(14, MasterInterruptHandler);
-	RegisterInterruptHandler(15, SlaveInterruptHandler);
-
-	return 0;
-}
-
-int DriverFinal()
-{
-	UnregisterInterruptHandler(14, MasterInterruptHandler);
-	UnregisterInterruptHandler(15, SlaveInterruptHandler);
-
-	return 0;
-}
-
-int DriverPanic()
-{
-	return 0;
-}
-
-int DriverProbe()
-{
-	if (!IsATAPresent())
-		return -ENODEV;
-
-	return 0;
-}
-
-DriverInfo("ata",
-		   "Advanced Technology Attachment Driver",
-		   "EnderIce2",
-		   0, 0, 1,
-		   "GPLv3");

Fennix Bootloader.code-workspace

@@ -7,9 +7,8 @@
 	"settings": {
 		"terminal.integrated.cwd": "../",
 		"debug.allowBreakpointsEverywhere": true,
-		"git.alwaysSignOff": true,
 		"git.defaultBranchName": "master",
 		"git.openRepositoryInParentFolders": "always",
-		"C_Cpp.autoAddFileAssociations": false
+		"C_Cpp.autoAddFileAssociations": false,
 	}
 }

Fennix Drivers.code-workspace

@@ -7,9 +7,8 @@
 	"settings": {
 		"terminal.integrated.cwd": "../",
 		"debug.allowBreakpointsEverywhere": true,
-		"git.alwaysSignOff": true,
 		"git.defaultBranchName": "master",
 		"git.openRepositoryInParentFolders": "always",
-		"C_Cpp.autoAddFileAssociations": false
+		"C_Cpp.autoAddFileAssociations": false,
 	}
 }

Fennix Kernel.code-workspace

@@ -7,25 +7,25 @@
 	"settings": {
 		"terminal.integrated.cwd": "../",
 		"debug.allowBreakpointsEverywhere": true,
-		"editor.tabCompletion": "on",
-		"diffEditor.codeLens": true,
-		"editor.quickSuggestionsDelay": 100,
-		"zenMode.hideLineNumbers": false,
-		"zenMode.hideActivityBar": false,
-		"zenMode.hideStatusBar": true,
-		"zenMode.centerLayout": true,
-		"zenMode.fullScreen": true,
-		"zenMode.restore": true,
-		"zenMode.silentNotifications": true,
-		"window.commandCenter": false,
-		"window.density.editorTabHeight": "default",
-		"editor.cursorBlinking": "blink",
-		"editor.cursorSmoothCaretAnimation": "on",
-		"editor.cursorStyle": "line",
-		"editor.cursorWidth": 2,
-		"git.alwaysSignOff": true,
 		"git.defaultBranchName": "master",
 		"git.openRepositoryInParentFolders": "always",
-		"C_Cpp.autoAddFileAssociations": false
+		"C_Cpp.autoAddFileAssociations": false,
+		"conventionalCommits.scopes": [
+			"kernel/api",
+			"kernel/syscalls",
+			"vscode",
+			"kernel",
+			"kernel/pci",
+			"kernel/driver",
+			"kernel/drivers",
+			"kernel/elf",
+			"kernel/scheduler",
+			"kernel/tty",
+			"kernel/std",
+			"kernel/vfs",
+			"kernel/memory",
+			"kernel/efi",
+			"kernel/bootstrap"
+		]
 	}
 }

Fennix Userspace.code-workspace

@@ -7,9 +7,20 @@
 	"settings": {
 		"terminal.integrated.cwd": "../",
 		"debug.allowBreakpointsEverywhere": true,
-		"git.alwaysSignOff": true,
 		"git.defaultBranchName": "master",
 		"git.openRepositoryInParentFolders": "always",
-		"C_Cpp.autoAddFileAssociations": false
+		"C_Cpp.autoAddFileAssociations": false,
+		"conventionalCommits.scopes": [
+			"userspace",
+			"userspace/libc",
+			"userspace/coreutils",
+			"userspace/apps",
+			"userspace/libs",
+			"userspace/apps/sys",
+			"userspace/apps/test",
+			"userspace/apps/usr",
+			"devcontainer",
+			"vscode"
+		]
 	}
 }

Fennix Website.code-workspace

@@ -6,7 +6,6 @@
 	],
 	"settings": {
 		"debug.allowBreakpointsEverywhere": true,
-		"git.alwaysSignOff": true,
 		"git.defaultBranchName": "master",
 		"git.openRepositoryInParentFolders": "always",
 		"C_Cpp.autoAddFileAssociations": false

Fennix.code-workspace

@@ -6,9 +6,14 @@
 	],
 	"settings": {
 		"debug.allowBreakpointsEverywhere": true,
-		"git.alwaysSignOff": true,
 		"git.defaultBranchName": "master",
 		"git.openRepositoryInParentFolders": "always",
-		"C_Cpp.autoAddFileAssociations": false
+		"C_Cpp.autoAddFileAssociations": false,
+		"conventionalCommits.scopes": [
+			"rootfs",
+			"tools",
+			"devcontainer",
+			"workspace"
+		]
 	}
 }

INSTALL.md

@@ -0,0 +1,72 @@
+# 🚀 Installation Guide
+
+This guide will help you install Fennix on your system.
+
+## 🛠️ Preparing the Environment
+
+There are two ways to build the project:
+
+1.  **🐳 Use Dev Container (Recommended)**
+    * This is the easiest way to prepare the environment for building the project. But firstly, you need to install [Docker](https://docs.docker.com/get-docker/) and [Visual Studio Code](https://code.visualstudio.com/).
+    * After installing Docker and Visual Studio Code, you can open the project in Visual Studio Code and click on the "Reopen in Container" button.
+    * This will open the project in a Dev Container with all the required tools installed.
+    * If you encounter errors while the Dev Container is building, ensure the following are correctly configured:
+        * `/tmp/.X11-unix`
+        * Environment variable `XAUTHORITY`
+        * `/run/user/1000/pulse/native`
+        * **Note:** These configurations are only necessary if you plan to use QEMU inside the container.
+2.  **💻 Build the Project Locally**
+    * The instructions below will guide you through the process of building the project locally.
+
+**NOTE:** You MUST have `autoconf 2.69` and `automake 1.15.1` versions installed on your system. A complete list of dependencies can be found in the [.devcontainer/Dockerfile](.devcontainer/Dockerfile) file.
+
+Before building the project, you need to build the cross-compiler toolchain and QEMU.  
+You can do this by running the following command:
+
+```sh
+make setup
+```
+
+This will clone, patch, and build the required tools for you.
+
+Alternatively, if you wish to skip building QEMU, you can run `make setup-no-qemu`.  
+However, in this case, you will need to manually specify the path to the QEMU binary in the `config.mk` file.
+
+## 🏗️ Building the Project
+
+To build the project, run:
+
+```sh
+make build
+```
+
+This will build the kernel, userspace, and drivers. The resulting ISO image will be `Fennix.iso`.
+
+## 🚀 Running the OS
+
+To run the OS, execute:
+
+```sh
+make run
+```
+
+The `run` target will automatically build the project if it hasn't been built yet.
+
+## ⚙️ Additional Configuration
+
+You can customize the project by editing the `config.mk` file.
+
+## 🧪 Debugging
+
+If you use Visual Studio Code, you can press `F5` to start debugging the OS.  
+The configuration is already set up for you.
+
+Alternatively, you can run the following command to start debugging:
+
+```sh
+make debug
+```
+
+This will start QEMU in debug mode, allowing you to connect to it using GDB.
+
+The GDB FIFO file is located at `/tmp/gdb-fennix`.

Kernel/.editorconfig

@@ -9,5 +9,9 @@ insert_final_newline = true
 indent_style = tab
 indent_size = 4
 
+[*.py]
+indent_size = 4
+indent_style = space
+
 [Makefile]
 indent_style = tab

Kernel/.gdbinit

@@ -1,91 +0,0 @@
-# Usage: add-symbol-file-all <filename> [<offset>]
-#        remove-symbol-file-all <filename> [<offset>]
-#
-# Credit: https://stackoverflow.com/a/33087762/9352057
-#         CC BY-SA 4.0
-
-python
-import subprocess
-import re
-
-def relocatesections(filename, addr):
-    p = subprocess.Popen(["readelf", "-S", filename], stdout = subprocess.PIPE)
-
-    sections = []
-    textaddr = '0'
-    for line in p.stdout.readlines():
-        line = line.decode("utf-8").strip()
-        if not line.startswith('[') or line.startswith('[Nr]'):
-            continue
-
-        line = re.sub(r' +', ' ', line)
-        line = re.sub(r'\[ *(\d+)\]', '\g<1>', line)
-        fieldsvalue = line.split(' ')
-        fieldsname = ['number', 'name', 'type', 'addr', 'offset', 'size', 'entsize', 'flags', 'link', 'info', 'addralign']
-        sec = dict(zip(fieldsname, fieldsvalue))
-
-        if sec['number'] == '0':
-            continue
-
-        sections.append(sec)
-
-        if sec['name'] == '.text':
-            textaddr = sec['addr']
-
-    return (textaddr, sections)
-
-
-class AddSymbolFileAll(gdb.Command):
-    """The right version for add-symbol-file"""
-
-    def __init__(self):
-        super(AddSymbolFileAll, self).__init__("add-symbol-file-all", gdb.COMMAND_USER)
-        self.dont_repeat()
-
-    def invoke(self, arg, from_tty):
-        argv = gdb.string_to_argv(arg)
-        filename = argv[0]
-
-        if len(argv) > 1:
-            offset = int(str(gdb.parse_and_eval(argv[1])), 0)
-        else:
-            offset = 0
-
-        (textaddr, sections) = relocatesections(filename, offset)
-
-        cmd = "add-symbol-file %s 0x%08x" % (filename, int(textaddr, 16) + offset)
-
-        for s in sections:
-            addr = int(s['addr'], 16)
-            if s['name'] == '.text' or addr == 0:
-                continue
-
-            cmd += " -s %s 0x%08x" % (s['name'], addr + offset)
-
-        gdb.execute(cmd)
-
-class RemoveSymbolFileAll(gdb.Command):
-    """The right version for remove-symbol-file"""
-
-    def __init__(self):
-        super(RemoveSymbolFileAll, self).__init__("remove-symbol-file-all", gdb.COMMAND_USER)
-        self.dont_repeat()
-
-    def invoke(self, arg, from_tty):
-        argv = gdb.string_to_argv(arg)
-        filename = argv[0]
-
-        if len(argv) > 1:
-            offset = int(str(gdb.parse_and_eval(argv[1])), 0)
-        else:
-            offset = 0
-
-        (textaddr, _) = relocatesections(filename, offset)
-
-        cmd = "remove-symbol-file -a 0x%08x" % (int(textaddr, 16) + offset)
-        gdb.execute(cmd)
-
-
-AddSymbolFileAll()
-RemoveSymbolFileAll()
-end

Kernel/.vscode/extensions.json

@@ -0,0 +1,16 @@
+{
+	"recommendations": [
+		"ms-vscode.cpptools",
+		"maziac.asm-code-lens",
+		"editorconfig.editorconfig",
+		"vivaxy.vscode-conventional-commits",
+		"ms-vscode.hexeditor",
+		"webfreak.debug",
+		"ibm.output-colorizer",
+		"gruntfuggly.todo-tree",
+		"naumovs.color-highlight",
+		"seven1bit.vscode-ext-ansi-color-highlight",
+		"jeff-hykin.better-cpp-syntax",
+		"aaron-bond.better-comments"
+	]
+}

Kernel/.vscode/preinclude.h

@@ -9,6 +9,6 @@
 #define __kernel__ 1
 #define KERNEL_NAME "Fennix"
 #define KERNEL_ARCH "amd64"
-#define KERNEL_VERSION "1.0"
+#define KERNEL_VERSION "1.0.0"
 #define GIT_COMMIT "0000000000000000000000000000000000000000"
 #define GIT_COMMIT_SHORT "0000000"

Kernel/Makefile

@@ -10,14 +10,14 @@ define find-sources
 	$(shell find ./ -type f -name '$1' $(shell echo $(foreach arch,$(filter-out $(OSARCH),$(AVAILABLE_ARCHS)), -not -path \"./arch/$(arch)/*\")) -print0 | xargs -0)
 endef
 
-BMP_SOURCES := $(call find-sources,*.bmp)
+PNG_SOURCES := $(call find-sources,*.png)
 PSF_SOURCES := $(call find-sources,*.psf)
 S_SOURCES := $(call find-sources,*.S)
 s_SOURCES := $(call find-sources,*.s)
 C_SOURCES := $(call find-sources,*.c)
 CXX_SOURCES := $(call find-sources,*.cpp)
 
-OBJ = $(BMP_SOURCES:.bmp=.o) $(PSF_SOURCES:.psf=.o) $(s_SOURCES:.s=.o) $(S_SOURCES:.S=.o) $(C_SOURCES:.c=.o) $(CXX_SOURCES:.cpp=.o)
+OBJ = $(PNG_SOURCES:.png=.o) $(PSF_SOURCES:.psf=.o) $(s_SOURCES:.s=.o) $(S_SOURCES:.S=.o) $(C_SOURCES:.c=.o) $(CXX_SOURCES:.cpp=.o)
 STACK_USAGE_OBJ = $(C_SOURCES:.c=.su) $(CXX_SOURCES:.cpp=.su)
 GCNO_OBJ = $(C_SOURCES:.c=.gcno) $(CXX_SOURCES:.cpp=.gcno)
 
@@ -68,6 +68,7 @@ ifeq ($(DEBUG), 1)
 #	CFLAGS += -pg
 #	CFLAGS += -finstrument-functions
 	CFLAGS += -DDEBUG -ggdb3 -O0 -fdiagnostics-color=always -fstack-usage -fsanitize=undefined
+	CXXFLAGS += -fdiagnostics-all-candidates
 ifeq ($(OSARCH), amd64)
 	CFLAGS += -fverbose-asm
 endif # amd64
@@ -111,7 +112,7 @@ $(KERNEL_FILENAME): $(OBJ)
 # https://gcc.gnu.org/projects/cxx-status.html
 %.o: %.cpp $(HEADERS)
 	$(info Compiling $<)
-	$(__CONF_CXX) $(CFLAGS) -fcoroutines $(CFLAG_STACK_PROTECTOR) $(WARNCFLAG) -std=c++20 -c $< -o $@ -fno-rtti
+	$(__CONF_CXX) $(CFLAGS) $(CXXFLAGS) -fcoroutines $(CFLAG_STACK_PROTECTOR) $(WARNCFLAG) -std=c++20 -c $< -o $@ -fno-rtti
 
 %.o: %.S
 	$(info Compiling $<)
@@ -133,7 +134,7 @@ else ifeq ($(OSARCH), aarch64)
 endif
 	$(__CONF_NM) $@
 
-%.o: %.bmp
+%.o: %.png
 ifeq ($(OSARCH), amd64)
 	$(__CONF_OBJCOPY) -O elf64-x86-64 -I binary $< $@
 else ifeq ($(OSARCH), i386)

Kernel/TODO.md

@@ -9,7 +9,7 @@
 - [ ] ~~Do not map the entire memory. Map only the needed memory address at allocation time.~~ (we just copy the pages for userland, see `Fork()` inside [core/memory/page_table.cpp](core/memory/page_table.cpp))
 - [ ] Implementation of logging (beside serial) with log rotation.
 - [x] Implement a better task manager. (replace struct P/TCB with classes)
-- [ ] Rewrite virtual file system.
+- [x] Rewrite virtual file system.
 - [ ] Colors in crash screen are not following the kernel color scheme.
 - [x] ~~Find a way to add intrinsics.~~ (not feasible, use inline assembly)
 - [ ] Rework PSF1 font loader.

Kernel/arch/aarch64/linker.ld

@@ -77,6 +77,14 @@ SECTIONS
 		*(.rodata .rodata.*)
 	} :rodata
 
+	.builtin_drivers ALIGN(CONSTANT(MAXPAGESIZE)) : AT(ADDR(.builtin_drivers) - KERNEL_VMA)
+	{
+		__kernel_builtin_drivers_start = .;
+		KEEP(*(SORT(.builtin_drivers.*)))
+		KEEP(*(.builtin_drivers))
+		__kernel_builtin_drivers_end = .;
+	} :rodata
+
 	.init_array ALIGN(CONSTANT(MAXPAGESIZE)) : AT(ADDR(.init_array) - KERNEL_VMA)
 	{
 		PROVIDE_HIDDEN(__init_array_start = .);

Kernel/arch/amd64/bootstrap/limine/limine.c

@@ -25,33 +25,41 @@
 
 void InitLimine();
 
-static volatile struct limine_entry_point_request EntryPointRequest = {
+#define LIMREQ __attribute__((used, section(".limine_requests"))) static volatile
+#define LIMREQ_S __attribute__((used, section(".limine_requests_start"))) static volatile
+#define LIMREQ_E __attribute__((used, section(".limine_requests_end"))) static volatile
+
+LIMREQ LIMINE_BASE_REVISION(3);
+LIMREQ_S LIMINE_REQUESTS_START_MARKER;
+LIMREQ_E LIMINE_REQUESTS_END_MARKER;
+
+LIMREQ struct limine_entry_point_request EntryPointRequest = {
 	.id = LIMINE_ENTRY_POINT_REQUEST,
 	.revision = 0,
 	.response = NULL,
 	.entry = InitLimine};
-static volatile struct limine_bootloader_info_request BootloaderInfoRequest = {
+LIMREQ struct limine_bootloader_info_request BootloaderInfoRequest = {
 	.id = LIMINE_BOOTLOADER_INFO_REQUEST,
 	.revision = 0};
-static volatile struct limine_framebuffer_request FramebufferRequest = {
+LIMREQ struct limine_framebuffer_request FramebufferRequest = {
 	.id = LIMINE_FRAMEBUFFER_REQUEST,
 	.revision = 0};
-static volatile struct limine_memmap_request MemmapRequest = {
+LIMREQ struct limine_memmap_request MemmapRequest = {
 	.id = LIMINE_MEMMAP_REQUEST,
 	.revision = 0};
-static volatile struct limine_kernel_address_request KernelAddressRequest = {
+LIMREQ struct limine_kernel_address_request KernelAddressRequest = {
 	.id = LIMINE_KERNEL_ADDRESS_REQUEST,
 	.revision = 0};
-static volatile struct limine_rsdp_request RsdpRequest = {
+LIMREQ struct limine_rsdp_request RsdpRequest = {
 	.id = LIMINE_RSDP_REQUEST,
 	.revision = 0};
-static volatile struct limine_kernel_file_request KernelFileRequest = {
+LIMREQ struct limine_kernel_file_request KernelFileRequest = {
 	.id = LIMINE_KERNEL_FILE_REQUEST,
 	.revision = 0};
-static volatile struct limine_module_request ModuleRequest = {
+LIMREQ struct limine_module_request ModuleRequest = {
 	.id = LIMINE_MODULE_REQUEST,
 	.revision = 0};
-static volatile struct limine_smbios_request SmbiosRequest = {
+LIMREQ struct limine_smbios_request SmbiosRequest = {
 	.id = LIMINE_SMBIOS_REQUEST,
 	.revision = 0};
 
@@ -84,7 +92,7 @@ __naked __used __no_stack_protector void InitLimine()
 	asmv("jmp InitLimineAfterStack");
 }
 
-nsa NIF void InitLimineAfterStack()
+nsa nif void InitLimineAfterStack()
 {
 	struct BootInfo binfo = {};
 	struct limine_bootloader_info_response *BootloaderInfoResponse = BootloaderInfoRequest.response;

Kernel/arch/amd64/bootstrap/multiboot/Paging/mb_64bit_map.cpp

@@ -38,14 +38,14 @@ union __attribute__((packed)) PageTableEntry
 	};
 	uint64_t raw;
 
-	__always_inline inline nsa NIF void SetAddress(uintptr_t _Address)
+	__always_inline inline nsa nif void SetAddress(uintptr_t _Address)
 	{
 		_Address &= 0x000000FFFFFFFFFF;
 		this->raw &= 0xFFF0000000000FFF;
 		this->raw |= (_Address << 12);
 	}
 
-	__always_inline inline nsa NIF uintptr_t GetAddress() { return (this->raw & 0x000FFFFFFFFFF000) >> 12; }
+	__always_inline inline nsa nif uintptr_t GetAddress() { return (this->raw & 0x000FFFFFFFFFF000) >> 12; }
 };
 
 struct __attribute__((packed)) PageTableEntryPtr
@@ -72,14 +72,14 @@ union __attribute__((packed)) PageDirectoryEntry
 	};
 	uint64_t raw;
 
-	__always_inline inline nsa NIF void SetAddress(uintptr_t _Address)
+	__always_inline inline nsa nif void SetAddress(uintptr_t _Address)
 	{
 		_Address &= 0x000000FFFFFFFFFF;
 		this->raw &= 0xFFF0000000000FFF;
 		this->raw |= (_Address << 12);
 	}
 
-	__always_inline inline nsa NIF uintptr_t GetAddress() { return (this->raw & 0x000FFFFFFFFFF000) >> 12; }
+	__always_inline inline nsa nif uintptr_t GetAddress() { return (this->raw & 0x000FFFFFFFFFF000) >> 12; }
 };
 
 struct __attribute__((packed)) PageDirectoryEntryPtr
@@ -106,14 +106,14 @@ union __attribute__((packed)) PageDirectoryPointerTableEntry
 	};
 	uint64_t raw;
 
-	__always_inline inline nsa NIF void SetAddress(uintptr_t _Address)
+	__always_inline inline nsa nif void SetAddress(uintptr_t _Address)
 	{
 		_Address &= 0x000000FFFFFFFFFF;
 		this->raw &= 0xFFF0000000000FFF;
 		this->raw |= (_Address << 12);
 	}
 
-	__always_inline inline nsa NIF uintptr_t GetAddress() { return (this->raw & 0x000FFFFFFFFFF000) >> 12; }
+	__always_inline inline nsa nif uintptr_t GetAddress() { return (this->raw & 0x000FFFFFFFFFF000) >> 12; }
 };
 
 struct __attribute__((packed)) PageDirectoryPointerTableEntryPtr
@@ -140,14 +140,14 @@ union __attribute__((packed)) PageMapLevel4
 	};
 	uint64_t raw;
 
-	__always_inline inline nsa NIF void SetAddress(uintptr_t _Address)
+	__always_inline inline nsa nif void SetAddress(uintptr_t _Address)
 	{
 		_Address &= 0x000000FFFFFFFFFF;
 		this->raw &= 0xFFF0000000000FFF;
 		this->raw |= (_Address << 12);
 	}
 
-	__always_inline inline nsa NIF uintptr_t GetAddress() { return (this->raw & 0x000FFFFFFFFFF000) >> 12; }
+	__always_inline inline nsa nif uintptr_t GetAddress() { return (this->raw & 0x000FFFFFFFFFF000) >> 12; }
 };
 
 struct PageTable4
@@ -161,7 +161,7 @@ extern uintptr_t _kernel_start, _kernel_end;
 __attribute__((section(".bootstrap.data"))) static PageTable4 *BPTable = (PageTable4 *)BootPageTable;
 __attribute__((section(".bootstrap.data"))) static size_t BPT_Allocated = 0x4000;
 
-__always_inline inline nsa NIF void *RequestPage()
+__always_inline inline nsa nif void *RequestPage()
 {
 	void *Page = (void *)(BootPageTable + BPT_Allocated);
 	BPT_Allocated += 0x1000;
@@ -180,7 +180,7 @@ public:
 	uintptr_t PDPTEIndex = 0;
 	uintptr_t PDEIndex = 0;
 	uintptr_t PTEIndex = 0;
-	__always_inline inline nsa NIF PageMapIndexer(uintptr_t VirtualAddress)
+	__always_inline inline nsa nif PageMapIndexer(uintptr_t VirtualAddress)
 	{
 		uintptr_t Address = VirtualAddress;
 		Address >>= 12;
@@ -194,7 +194,7 @@ public:
 	}
 };
 
-__attribute__((section(".bootstrap.text"))) nsa NIF void MB2_64_Map(void *VirtualAddress, void *PhysicalAddress, uint64_t Flags)
+__attribute__((section(".bootstrap.text"))) nsa nif void MB2_64_Map(void *VirtualAddress, void *PhysicalAddress, uint64_t Flags)
 {
 	PageMapIndexer Index = PageMapIndexer((uintptr_t)VirtualAddress);
 	// Clear any flags that are not 1 << 0 (Present) - 1 << 5 (Accessed) because rest are for page table entries only
@@ -280,7 +280,7 @@ __attribute__((section(".bootstrap.text"))) nsa NIF void MB2_64_Map(void *Virtua
 		 : "memory");
 }
 
-EXTERNC __attribute__((section(".bootstrap.text"))) nsa NIF __attribute__((section(".bootstrap.text"))) void UpdatePageTable64()
+EXTERNC __attribute__((section(".bootstrap.text"))) nsa nif __attribute__((section(".bootstrap.text"))) void UpdatePageTable64()
 {
 	BPTable = (PageTable4 *)BootPageTable;
 

Kernel/arch/amd64/bootstrap/multiboot/mb2_parse.cpp

@@ -24,10 +24,8 @@
 
 void multiboot2_parse(BootInfo &mb2binfo, uintptr_t Magic, uintptr_t Info)
 {
-	auto InfoAddress = Info;
-	for (auto Tag = (struct multiboot_tag *)((uint8_t *)InfoAddress + 8);
-		 ;
-		 Tag = (struct multiboot_tag *)((multiboot_uint8_t *)Tag + ((Tag->size + 7) & ~7)))
+	auto infoAddr = Info;
+	for (auto Tag = (struct multiboot_tag *)((uint8_t *)infoAddr + 8);; Tag = (struct multiboot_tag *)((multiboot_uint8_t *)Tag + ((Tag->size + 7) & ~7)))
 	{
 		if (Tag->type == MULTIBOOT_TAG_TYPE_END)
 		{
@@ -39,17 +37,17 @@ void multiboot2_parse(BootInfo &mb2binfo, uintptr_t Magic, uintptr_t Info)
 		{
 		case MULTIBOOT_TAG_TYPE_CMDLINE:
 		{
-			strncpy(mb2binfo.Kernel.CommandLine,
-					((multiboot_tag_string *)Tag)->string,
-					strlen(((multiboot_tag_string *)Tag)->string));
+			multiboot_tag_string *cmdline = (multiboot_tag_string *)Tag;
+			strncpy(mb2binfo.Kernel.CommandLine, cmdline->string, strlen(cmdline->string));
+
 			debug("Kernel command line: %s", mb2binfo.Kernel.CommandLine);
 			break;
 		}
 		case MULTIBOOT_TAG_TYPE_BOOT_LOADER_NAME:
 		{
-			strncpy(mb2binfo.Bootloader.Name,
-					((multiboot_tag_string *)Tag)->string,
-					strlen(((multiboot_tag_string *)Tag)->string));
+			multiboot_tag_string *blName = (multiboot_tag_string *)Tag;
+			strncpy(mb2binfo.Bootloader.Name, blName->string, strlen(blName->string));
+
 			debug("Bootloader name: %s", mb2binfo.Bootloader.Name);
 			break;
 		}
@@ -60,24 +58,29 @@ void multiboot2_parse(BootInfo &mb2binfo, uintptr_t Magic, uintptr_t Info)
 			mb2binfo.Modules[module_count].Address = (void *)(uint64_t)module->mod_start;
 			mb2binfo.Modules[module_count].Size = module->mod_end - module->mod_start;
 			strncpy(mb2binfo.Modules[module_count].Path, "(null)", 6);
-			strncpy(mb2binfo.Modules[module_count].CommandLine, module->cmdline,
-					strlen(module->cmdline));
-			debug("Module: %s", mb2binfo.Modules[module_count].Path);
+			strncpy(mb2binfo.Modules[module_count].CommandLine, module->cmdline, strlen(module->cmdline));
+
+			debug("Module: %s", mb2binfo.Modules[module_count].CommandLine);
 			module_count++;
 			break;
 		}
 		case MULTIBOOT_TAG_TYPE_BASIC_MEMINFO:
 		{
 			multiboot_tag_basic_meminfo *meminfo = (multiboot_tag_basic_meminfo *)Tag;
+
 			fixme("basic_meminfo->[mem_lower: %#x, mem_upper: %#x]",
-				  meminfo->mem_lower, meminfo->mem_upper);
+				  meminfo->mem_lower,
+				  meminfo->mem_upper);
 			break;
 		}
 		case MULTIBOOT_TAG_TYPE_BOOTDEV:
 		{
 			multiboot_tag_bootdev *bootdev = (multiboot_tag_bootdev *)Tag;
+
 			fixme("bootdev->[biosdev: %#x, slice: %#x, part: %#x]",
-				  bootdev->biosdev, bootdev->slice, bootdev->part);
+				  bootdev->biosdev,
+				  bootdev->slice,
+				  bootdev->part);
 			break;
 		}
 		case MULTIBOOT_TAG_TYPE_MMAP:
@@ -92,6 +95,7 @@ void multiboot2_parse(BootInfo &mb2binfo, uintptr_t Magic, uintptr_t Info)
 					warn("Too many memory entries, skipping the rest...");
 					break;
 				}
+
 				multiboot_mmap_entry entry = mmap->entries[i];
 				mb2binfo.Memory.Size += entry.len;
 				switch (entry.type)
@@ -127,6 +131,7 @@ void multiboot2_parse(BootInfo &mb2binfo, uintptr_t Magic, uintptr_t Info)
 					mb2binfo.Memory.Entry[i].Type = Unknown;
 					break;
 				}
+
 				debug("Memory entry: [BaseAddress: %#x, Length: %#x, Type: %d]",
 					  mb2binfo.Memory.Entry[i].BaseAddress,
 					  mb2binfo.Memory.Entry[i].Length,
@@ -137,54 +142,52 @@ void multiboot2_parse(BootInfo &mb2binfo, uintptr_t Magic, uintptr_t Info)
 		case MULTIBOOT_TAG_TYPE_VBE:
 		{
 			multiboot_tag_vbe *vbe = (multiboot_tag_vbe *)Tag;
+
 			fixme("vbe->[vbe_mode: %#x, vbe_interface_seg: %#x, vbe_interface_off: %#x, vbe_interface_len: %#x]",
-				  vbe->vbe_mode, vbe->vbe_interface_seg, vbe->vbe_interface_off, vbe->vbe_interface_len);
+				  vbe->vbe_mode,
+				  vbe->vbe_interface_seg,
+				  vbe->vbe_interface_off,
+				  vbe->vbe_interface_len);
 			break;
 		}
 		case MULTIBOOT_TAG_TYPE_FRAMEBUFFER:
 		{
 			multiboot_tag_framebuffer *fb = (multiboot_tag_framebuffer *)Tag;
-			static int fb_count = 0;
-			mb2binfo.Framebuffer[fb_count].BaseAddress = (void *)fb->common.framebuffer_addr;
-			mb2binfo.Framebuffer[fb_count].Width = fb->common.framebuffer_width;
-			mb2binfo.Framebuffer[fb_count].Height = fb->common.framebuffer_height;
-			mb2binfo.Framebuffer[fb_count].Pitch = fb->common.framebuffer_pitch;
-			mb2binfo.Framebuffer[fb_count].BitsPerPixel = fb->common.framebuffer_bpp;
+			static int fbCount = 0;
+			mb2binfo.Framebuffer[fbCount].BaseAddress = (void *)fb->common.framebuffer_addr;
+			mb2binfo.Framebuffer[fbCount].Width = fb->common.framebuffer_width;
+			mb2binfo.Framebuffer[fbCount].Height = fb->common.framebuffer_height;
+			mb2binfo.Framebuffer[fbCount].Pitch = fb->common.framebuffer_pitch;
+			mb2binfo.Framebuffer[fbCount].BitsPerPixel = fb->common.framebuffer_bpp;
 			switch (fb->common.framebuffer_type)
 			{
 			case MULTIBOOT_FRAMEBUFFER_TYPE_INDEXED:
-			{
-				mb2binfo.Framebuffer[fb_count].Type = Indexed;
+				mb2binfo.Framebuffer[fbCount].Type = Indexed;
 				break;
-			}
 			case MULTIBOOT_FRAMEBUFFER_TYPE_RGB:
-			{
-				mb2binfo.Framebuffer[fb_count].Type = RGB;
-				mb2binfo.Framebuffer[fb_count].RedMaskSize = fb->framebuffer_red_mask_size;
-				mb2binfo.Framebuffer[fb_count].RedMaskShift = fb->framebuffer_red_field_position;
-				mb2binfo.Framebuffer[fb_count].GreenMaskSize = fb->framebuffer_green_mask_size;
-				mb2binfo.Framebuffer[fb_count].GreenMaskShift = fb->framebuffer_green_field_position;
-				mb2binfo.Framebuffer[fb_count].BlueMaskSize = fb->framebuffer_blue_mask_size;
-				mb2binfo.Framebuffer[fb_count].BlueMaskShift = fb->framebuffer_blue_field_position;
+				mb2binfo.Framebuffer[fbCount].Type = RGB;
+				mb2binfo.Framebuffer[fbCount].RedMaskSize = fb->framebuffer_red_mask_size;
+				mb2binfo.Framebuffer[fbCount].RedMaskShift = fb->framebuffer_red_field_position;
+				mb2binfo.Framebuffer[fbCount].GreenMaskSize = fb->framebuffer_green_mask_size;
+				mb2binfo.Framebuffer[fbCount].GreenMaskShift = fb->framebuffer_green_field_position;
+				mb2binfo.Framebuffer[fbCount].BlueMaskSize = fb->framebuffer_blue_mask_size;
+				mb2binfo.Framebuffer[fbCount].BlueMaskShift = fb->framebuffer_blue_field_position;
 				break;
-			}
 			case MULTIBOOT_FRAMEBUFFER_TYPE_EGA_TEXT:
-			{
-				mb2binfo.Framebuffer[fb_count].Type = EGA;
+				mb2binfo.Framebuffer[fbCount].Type = EGA;
 				break;
-			}
 			default:
-			{
-				mb2binfo.Framebuffer[fb_count].Type = Unknown_Framebuffer_Type;
+				mb2binfo.Framebuffer[fbCount].Type = Unknown_Framebuffer_Type;
 				break;
 			}
-			}
-			debug("Framebuffer %d: %dx%d %d bpp", fb_count, fb->common.framebuffer_width, fb->common.framebuffer_height, fb->common.framebuffer_bpp);
-			debug("More info:\nAddress: %p\nPitch: %d\nMemoryModel: %d\nRedMaskSize: %d\nRedMaskShift: %d\nGreenMaskSize: %d\nGreenMaskShift: %d\nBlueMaskSize: %d\nBlueMaskShift: %d",
+
+			debug("fb %d: %dx%d %d bpp", fbCount, fb->common.framebuffer_width, fb->common.framebuffer_height, fb->common.framebuffer_bpp);
+			debug("More info: addr:%#lx pitch:%d mm:%d RMSize:%d RMShift:%d GMSize:%d GMShift:%d BMSize:%d BMShift:%d",
 				  fb->common.framebuffer_addr, fb->common.framebuffer_pitch, fb->common.framebuffer_type,
-				  fb->framebuffer_red_mask_size, fb->framebuffer_red_field_position, fb->framebuffer_green_mask_size,
-				  fb->framebuffer_green_field_position, fb->framebuffer_blue_mask_size, fb->framebuffer_blue_field_position);
-			fb_count++;
+				  fb->framebuffer_red_mask_size, fb->framebuffer_red_field_position,
+				  fb->framebuffer_green_mask_size, fb->framebuffer_green_field_position,
+				  fb->framebuffer_blue_mask_size, fb->framebuffer_blue_field_position);
+			fbCount++;
 			break;
 		}
 		case MULTIBOOT_TAG_TYPE_ELF_SECTIONS:
@@ -194,73 +197,115 @@ void multiboot2_parse(BootInfo &mb2binfo, uintptr_t Magic, uintptr_t Info)
 			mb2binfo.Kernel.Symbols.EntSize = elf->entsize;
 			mb2binfo.Kernel.Symbols.Shndx = elf->shndx;
 			mb2binfo.Kernel.Symbols.Sections = r_cst(uintptr_t, elf->sections);
+
+			debug("elf_sections->[num: %d, entsize: %d, shndx: %d, sections: %#lx]",
+				  elf->num, elf->entsize, elf->shndx, elf->sections);
 			break;
 		}
 		case MULTIBOOT_TAG_TYPE_APM:
 		{
 			multiboot_tag_apm *apm = (multiboot_tag_apm *)Tag;
+
 			fixme("apm->[version:%d, cseg:%d, offset:%d, cseg_16:%d, dseg:%d, flags:%d, cseg_len:%d, cseg_16_len:%d, dseg_len:%d]",
-				  apm->version, apm->cseg, apm->offset, apm->cseg_16, apm->dseg, apm->flags, apm->cseg_len, apm->cseg_16_len, apm->dseg_len);
+				  apm->version, apm->cseg, apm->offset, apm->cseg_16, apm->dseg,
+				  apm->flags, apm->cseg_len, apm->cseg_16_len, apm->dseg_len);
 			break;
 		}
 		case MULTIBOOT_TAG_TYPE_EFI32:
 		{
+			mb2binfo.EFI.Info.Enabled = 1;
+			mb2binfo.EFI.Info.ST = 1;
+
 			multiboot_tag_efi32 *efi32 = (multiboot_tag_efi32 *)Tag;
-			fixme("efi32->[pointer: %p, size: %d]", efi32->pointer, efi32->size);
+			mb2binfo.EFI.SystemTable = (void *)(uintptr_t)efi32->pointer;
+
+			debug("efi32->[pointer: %#lx, size: %d]", efi32->pointer, efi32->size);
 			break;
 		}
 		case MULTIBOOT_TAG_TYPE_EFI64:
 		{
+			mb2binfo.EFI.Info.Enabled = 1;
+			mb2binfo.EFI.Info.ST = 1;
+
 			multiboot_tag_efi64 *efi64 = (multiboot_tag_efi64 *)Tag;
-			fixme("efi64->[pointer: %p, size: %d]", efi64->pointer, efi64->size);
+			mb2binfo.EFI.SystemTable = (void *)(uintptr_t)efi64->pointer;
+
+			debug("efi64->[pointer: %#lx, size: %d]", efi64->pointer, efi64->size);
 			break;
 		}
 		case MULTIBOOT_TAG_TYPE_SMBIOS:
 		{
 			multiboot_tag_smbios *smbios = (multiboot_tag_smbios *)Tag;
-			fixme("smbios->[major: %d, minor: %d]", smbios->major, smbios->minor);
+			mb2binfo.SMBIOSPtr = (void *)smbios->tables;
+
+			debug("smbios->[major: %d, minor: %d]", smbios->major, smbios->minor);
 			break;
 		}
 		case MULTIBOOT_TAG_TYPE_ACPI_OLD:
 		{
 			mb2binfo.RSDP = (BootInfo::RSDPInfo *)((multiboot_tag_old_acpi *)Tag)->rsdp;
-			debug("OLD ACPI RSDP: %p", mb2binfo.RSDP);
+
+			debug("OLD ACPI RSDP: %#lx", mb2binfo.RSDP);
 			break;
 		}
 		case MULTIBOOT_TAG_TYPE_ACPI_NEW:
 		{
 			mb2binfo.RSDP = (BootInfo::RSDPInfo *)((multiboot_tag_new_acpi *)Tag)->rsdp;
-			debug("NEW ACPI RSDP: %p", mb2binfo.RSDP);
+
+			debug("NEW ACPI RSDP: %#lx", mb2binfo.RSDP);
 			break;
 		}
 		case MULTIBOOT_TAG_TYPE_NETWORK:
 		{
 			multiboot_tag_network *net = (multiboot_tag_network *)Tag;
-			fixme("network->[dhcpack: %p]", net->dhcpack);
+
+			fixme("network->[dhcpack: %#lx]", net->dhcpack);
 			break;
 		}
 		case MULTIBOOT_TAG_TYPE_EFI_MMAP:
 		{
+			mb2binfo.EFI.Info.Enabled = 1;
+			mb2binfo.EFI.Info.MemoryMap = 1;
+
 			multiboot_tag_efi_mmap *efi_mmap = (multiboot_tag_efi_mmap *)Tag;
-			fixme("efi_mmap->[descr_size: %d, descr_vers: %d, efi_mmap: %p]",
+			mb2binfo.EFI.MemoryMap.BaseAddress = (void *)efi_mmap->efi_mmap;
+			mb2binfo.EFI.MemoryMap.DescriptorSize = efi_mmap->descr_size;
+			mb2binfo.EFI.MemoryMap.DescriptorVersion = efi_mmap->descr_vers;
+			mb2binfo.EFI.MemoryMap.NumberOfEntries = (efi_mmap->size - sizeof(multiboot_tag_efi_mmap)) / efi_mmap->descr_size;
+			// mb2binfo.EFI.MemoryMap.NumberOfEntries = efi_mmap->size / efi_mmap->descr_size;
+
+			debug("efi_mmap->[descr_size: %d, descr_vers: %d, efi_mmap: %#lx]",
 				  efi_mmap->descr_size, efi_mmap->descr_vers, efi_mmap->efi_mmap);
 			break;
 		}
 		case MULTIBOOT_TAG_TYPE_EFI_BS:
 		{
-			fixme("efi_bs->[%p] (unknown structure)", Tag);
+			mb2binfo.EFI.Info.Enabled = 1;
+			mb2binfo.EFI.Info.BS = 1;
+
+			debug("efi_bs");
 			break;
 		}
 		case MULTIBOOT_TAG_TYPE_EFI32_IH:
 		{
+			mb2binfo.EFI.Info.Enabled = 1;
+			mb2binfo.EFI.Info.IH = 1;
+
 			multiboot_tag_efi32_ih *efi32_ih = (multiboot_tag_efi32_ih *)Tag;
-			fixme("efi32_ih->[pointer: %p]", efi32_ih->pointer);
+			mb2binfo.EFI.ImageHandle = (void *)(uintptr_t)efi32_ih->pointer;
+
+			debug("efi32_ih->[pointer: %#lx]", efi32_ih->pointer);
 			break;
 		}
 		case MULTIBOOT_TAG_TYPE_EFI64_IH:
 		{
+			mb2binfo.EFI.Info.Enabled = 1;
+			mb2binfo.EFI.Info.IH = 1;
+
 			multiboot_tag_efi64_ih *efi64_ih = (multiboot_tag_efi64_ih *)Tag;
-			fixme("efi64_ih->[pointer: %p]", efi64_ih->pointer);
+			mb2binfo.EFI.ImageHandle = (void *)(uintptr_t)efi64_ih->pointer;
+
+			debug("efi64_ih->[pointer: %#lx]", efi64_ih->pointer);
 			break;
 		}
 		case MULTIBOOT_TAG_TYPE_LOAD_BASE_ADDR:
@@ -269,7 +314,8 @@ void multiboot2_parse(BootInfo &mb2binfo, uintptr_t Magic, uintptr_t Info)
 			mb2binfo.Kernel.PhysicalBase = (void *)(uint64_t)load_base_addr->load_base_addr;
 			mb2binfo.Kernel.VirtualBase = (void *)(uint64_t)(load_base_addr->load_base_addr + 0xFFFFFFFF80000000);
 			mb2binfo.Kernel.Size = ((uint64_t)&_kernel_end - (uint64_t)&_kernel_start) + ((uint64_t)&_bootstrap_end - (uint64_t)&_bootstrap_start);
-			debug("Kernel base: %p (physical) %p (virtual)", mb2binfo.Kernel.PhysicalBase, mb2binfo.Kernel.VirtualBase);
+
+			debug("Kernel base: %#lx (physical) %#lx (virtual)", mb2binfo.Kernel.PhysicalBase, mb2binfo.Kernel.VirtualBase);
 			break;
 		}
 		default:

Kernel/arch/amd64/bootstrap/multiboot/start.s

@@ -68,8 +68,10 @@ Multiboot_start:
 	je x32Hang
 
 	mov %cr4, %ecx
-	or $0x00000010, %ecx /* PSE */
-	or $0x00000020, %ecx /* PAE  */
+	or $0x10, %ecx  /* PSE */
+	or $0x20, %ecx  /* PAE */
+	or $0x200, %ecx /* OSFXSR */
+	or $0x400, %ecx /* OSXMMEXCPT */
 	mov %ecx, %cr4
 
 	call LoadGDT32
@@ -86,6 +88,8 @@ Multiboot_start:
 	wrmsr
 
 	mov %cr0, %ecx
+	and $~0x4, %ecx /* EM */
+	or $0x2, %ecx   /* MP */
 	or $0x80000000, %ecx /* PG */
 	or $0x1, %ecx   /* PE */
 	mov %ecx, %cr0

Kernel/arch/amd64/cpu/apic.cpp

@@ -442,7 +442,7 @@ namespace APIC
 			this->lapic->Write(APIC_TICR, 0xFFFFFFFF);
 		}
 
-		TimeManager->Sleep(1, Time::Units::Milliseconds);
+		TimeManager->Sleep(Time::FromMilliseconds(1));
 
 		// Mask the timer
 		if (this->lapic->x2APIC)

Kernel/arch/amd64/cpu/idt.cpp

@@ -650,7 +650,7 @@ namespace InterruptDescriptorTable
 #ifdef DEBUG
 		EnableISRs = !DebuggerIsAttached;
 		if (!EnableISRs)
-			KPrint("\x1b[34mThe debugger is attached, disabling all ISRs.");
+			KPrint("\x1b[32mThe debugger is attached, disabling all ISRs.");
 #endif
 
 		/* ISR */

Kernel/arch/amd64/cpu/smp.cpp

@@ -167,14 +167,14 @@ namespace SMP
 				}
 
 				apic->SendInitIPI(lapic->APICId);
-				TimeManager->Sleep(20, Time::Units::Milliseconds);
+				TimeManager->Sleep(Time::FromMilliseconds(20));
 				apic->SendStartupIPI(lapic->APICId, TRAMPOLINE_START);
 				debug("Waiting for CPU %d to load...", lapic->APICId);
 
-				uint64_t Timeout = TimeManager->CalculateTarget(2, Time::Units::Seconds);
+				uint64_t Timeout = TimeManager->GetTimeNs() + Time::FromSeconds(2);
 				while (CPUEnabled.load(std::memory_order_acquire) == false)
 				{
-					if (TimeManager->GetCounter() > Timeout)
+					if (TimeManager->GetTimeNs() > Timeout)
 					{
 						error("CPU %d failed to load!", lapic->APICId);
 						KPrint("\x1b[1;37;41mCPU %d failed to load!",

Kernel/arch/amd64/linker.ld

@@ -46,9 +46,17 @@ SECTIONS
 		*(.bootstrap .bootstrap.*)
 	} :bootstrap
 	_bootstrap_end = ALIGN(CONSTANT(MAXPAGESIZE));
-
 	. += KERNEL_VMA;
 
+	/* . += KERNEL_VMA;
+	_bootstrap_start = .;
+    .limine_requests : {
+        KEEP(*(.limine_requests_start))
+        KEEP(*(.limine_requests))
+        KEEP(*(.limine_requests_end))
+    } :bootstrap
+	_bootstrap_end = ALIGN(CONSTANT(MAXPAGESIZE)); */
+
 	_kernel_start = ALIGN(CONSTANT(MAXPAGESIZE));
 	_kernel_text_start = ALIGN(CONSTANT(MAXPAGESIZE));
 	.text ALIGN(CONSTANT(MAXPAGESIZE)) : AT(ADDR(.text) - KERNEL_VMA)
@@ -80,6 +88,14 @@ SECTIONS
 		*(.rodata .rodata.*)
 	} :rodata
 
+	.builtin_drivers ALIGN(CONSTANT(MAXPAGESIZE)) : AT(ADDR(.builtin_drivers) - KERNEL_VMA)
+	{
+		__kernel_builtin_drivers_start = .;
+		KEEP(*(SORT(.builtin_drivers.*)))
+		KEEP(*(.builtin_drivers))
+		__kernel_builtin_drivers_end = .;
+	} :rodata
+
 	.init_array ALIGN(CONSTANT(MAXPAGESIZE)) : AT(ADDR(.init_array) - KERNEL_VMA)
 	{
 		PROVIDE_HIDDEN(__init_array_start = .);

Kernel/arch/arm/linker.ld

@@ -58,6 +58,14 @@ SECTIONS
 	}
 	. = ALIGN(4096);
 
+	.builtin_drivers :
+	{
+		__kernel_builtin_drivers_start = .;
+		KEEP(*(SORT(.builtin_drivers.*)))
+		KEEP(*(.builtin_drivers))
+		__kernel_builtin_drivers_end = .;
+	}
+
 	.init_array :
 	{
 		PROVIDE_HIDDEN(__init_array_start = .);

Kernel/arch/i386/cpu/apic.cpp

@@ -383,7 +383,7 @@ namespace APIC
 		this->lapic->Write(APIC_TDCR, Divider);
 		this->lapic->Write(APIC_TICR, 0xFFFFFFFF);
 
-		TimeManager->Sleep(1, Time::Units::Milliseconds);
+		TimeManager->Sleep(Time::FromMilliseconds(1));
 
 		// Mask the timer
 		this->lapic->Write(APIC_TIMER, 0x10000 /* LVTTimer.Mask flag */);

Kernel/arch/i386/cpu/idt.cpp

@@ -464,7 +464,7 @@ namespace InterruptDescriptorTable
 // #ifdef DEBUG
 		EnableISRs = !DebuggerIsAttached;
 		if (!EnableISRs)
-			KPrint("\x1b[34mThe debugger is attached, disabling all ISRs.");
+			KPrint("\x1b[32mThe debugger is attached, disabling all ISRs.");
 // #endif
 
 		SetEntry(0x0, InterruptHandler_0x0, TRAP_GATE_32BIT, RING0, EnableISRs, GDT_KERNEL_CODE);

Kernel/arch/i386/linker.ld

@@ -80,6 +80,14 @@ SECTIONS
 		*(.rodata .rodata.*)
 	} :rodata
 
+	.builtin_drivers ALIGN(CONSTANT(MAXPAGESIZE)) : AT(ADDR(.builtin_drivers) - KERNEL_VMA)
+	{
+		__kernel_builtin_drivers_start = .;
+		KEEP(*(SORT(.builtin_drivers.*)))
+		KEEP(*(.builtin_drivers))
+		__kernel_builtin_drivers_end = .;
+	} :rodata
+
 	.init_array ALIGN(CONSTANT(MAXPAGESIZE)) : AT(ADDR(.init_array) - KERNEL_VMA)
 	{
 		PROVIDE_HIDDEN(__init_array_start = .);

Kernel/core/console.cpp

@@ -20,13 +20,16 @@
 #include <memory.hpp>
 #include <stropts.h>
 #include <string.h>
+#include <thread>
 #include <ini.h>
 
 #include "../kernel.h"
 
+using namespace std::chrono_literals;
+
 namespace KernelConsole
 {
-	int TermColors[] = {
+	static int TermColors[] = {
 		[TerminalColor::BLACK] = 0x000000,
 		[TerminalColor::RED] = 0xAA0000,
 		[TerminalColor::GREEN] = 0x00AA00,
@@ -37,7 +40,7 @@ namespace KernelConsole
 		[TerminalColor::GREY] = 0xAAAAAA,
 	};
 
-	int TermBrightColors[] = {
+	static int TermBrightColors[] = {
 		[TerminalColor::BLACK] = 0x858585,
 		[TerminalColor::RED] = 0xFF5555,
 		[TerminalColor::GREEN] = 0x55FF55,
@@ -112,6 +115,33 @@ namespace KernelConsole
 
 	FontRenderer Renderer;
 
+	ConsoleTerminal *Terminals[16] = {nullptr};
+	std::atomic<ConsoleTerminal *> CurrentTerminal = nullptr;
+
+	void paint_blinker(bool Enable)
+	{
+		if (CurrentTerminal == nullptr)
+			return;
+
+		ConsoleTerminal *term = CurrentTerminal.load();
+		ConsoleTerminal::Blinker &blinker = term->Blink;
+		size_t cellIndex = Renderer.Cursor.Y * term->Term->GetWinsize()->ws_col + Renderer.Cursor.X;
+		TerminalCell *cell = term->Term->GetCell(cellIndex);
+		uint32_t bgColor = cell->attr.Bright ? TermBrightColors[cell->attr.Background] : TermColors[cell->attr.Background];
+		Renderer.Paint(Renderer.Cursor.X, Renderer.Cursor.Y, blinker.Character, Enable ? blinker.Color : bgColor, bgColor);
+	}
+
+	void paint_blinker_thread()
+	{
+		bool blink = false;
+		while (true)
+		{
+			paint_blinker(blink);
+			blink = !blink;
+			std::this_thread::sleep_for(std::chrono::milliseconds(CurrentTerminal.load()->Blink.Delay));
+		}
+	}
+
 	void paint_callback(TerminalCell *cell, long x, long y)
 	{
 		if (cell->attr.Bright)
@@ -123,22 +153,20 @@ namespace KernelConsole
 	void cursor_callback(TerminalCursor *cur)
 	{
 		Renderer.Cursor = {cur->X, cur->Y};
+		paint_blinker(false);
 	}
 
-	VirtualTerminal *Terminals[16] = {nullptr};
-	std::atomic<VirtualTerminal *> CurrentTerminal = nullptr;
-
 	bool SetTheme(std::string Theme)
 	{
-		FileNode *rn = fs->GetByPath("/etc/term", thisProcess->Info.RootNode);
+		Node rn = fs->Lookup(thisProcess->Info.RootNode, "/sys/cfg/term");
 		if (rn == nullptr)
 			return false;
 
-		kstat st{};
-		rn->Stat(&st);
+		kstat st;
+		fs->Stat(rn, &st);
 
 		char *sh = new char[st.Size];
-		rn->Read(sh, st.Size, 0);
+		fs->Read(rn, sh, st.Size, 0);
 
 		ini_t *ini = ini_load(sh, NULL);
 		int themeSection, c0, c1, c2, c3, c4, c5, c6, c7, colorsIdx;
@@ -267,24 +295,15 @@ namespace KernelConsole
 		size_t Rows = Display->GetWidth / Renderer.CurrentFont->GetInfo().Width;
 		size_t Cols = Display->GetHeight / Renderer.CurrentFont->GetInfo().Height;
 		debug("Terminal size: %ux%u", Rows, Cols);
-		Terminals[0] = new VirtualTerminal(Rows, Cols, Display->GetWidth, Display->GetHeight, paint_callback, cursor_callback);
-		Terminals[0]->Clear(0, 0, Rows, Cols - 1);
+		Terminals[0] = new ConsoleTerminal;
+		Terminals[0]->Term = new VirtualTerminal(Rows, Cols, Display->GetWidth, Display->GetHeight, paint_callback, cursor_callback);
+		Terminals[0]->Term->Clear(0, 0, Rows, Cols - 1);
 		CurrentTerminal.store(Terminals[0], std::memory_order_release);
 	}
 
-	void LateInit()
+	void LoadConsoleConfig(std::string &Config)
 	{
-		FileNode *rn = fs->GetByPath("/etc/term", thisProcess->Info.RootNode);
-		if (rn == nullptr)
-			return;
-
-		kstat st{};
-		rn->Stat(&st);
-
-		char *sh = new char[st.Size];
-		rn->Read(sh, st.Size, 0);
-
-		ini_t *ini = ini_load(sh, NULL);
+		ini_t *ini = ini_load(Config.c_str(), NULL);
 		int general = ini_find_section(ini, "general", NULL);
 		int cursor = ini_find_section(ini, "cursor", NULL);
 		assert(general != INI_NOT_FOUND && cursor != INI_NOT_FOUND);
@@ -292,16 +311,22 @@ namespace KernelConsole
 		int themeIndex = ini_find_property(ini, general, "theme", NULL);
 		assert(themeIndex != INI_NOT_FOUND);
 
-		int cursorColor = ini_find_property(ini, cursor, "color", NULL);
 		int cursorBlink = ini_find_property(ini, cursor, "blink", NULL);
-		assert(cursorColor != INI_NOT_FOUND && cursorBlink != INI_NOT_FOUND);
+		int cursorColor = ini_find_property(ini, cursor, "color", NULL);
+		int cursorChar = ini_find_property(ini, cursor, "char", NULL);
+		int cursorDelay = ini_find_property(ini, cursor, "delay", NULL);
+		assert(cursorBlink != INI_NOT_FOUND && cursorColor != INI_NOT_FOUND && cursorChar != INI_NOT_FOUND && cursorDelay != INI_NOT_FOUND);
 
 		const char *colorThemeStr = ini_property_value(ini, general, themeIndex);
 		const char *cursorColorStr = ini_property_value(ini, cursor, cursorColor);
 		const char *cursorBlinkStr = ini_property_value(ini, cursor, cursorBlink);
+		const char *cursorCharStr = ini_property_value(ini, cursor, cursorChar);
+		const char *cursorDelayStr = ini_property_value(ini, cursor, cursorDelay);
 		debug("colorThemeStr=%s", colorThemeStr);
-		debug("cursorColorStr=%s", cursorColorStr);
 		debug("cursorBlinkStr=%s", cursorBlinkStr);
+		debug("cursorColorStr=%s", cursorColorStr);
+		debug("cursorCharStr=%s", cursorCharStr);
+		debug("cursorDelayStr=%s", cursorDelayStr);
 
 		auto getColorComponent = [](const char *str, int &index) -> int
 		{
@@ -335,11 +360,36 @@ namespace KernelConsole
 			uint32_t blinkColor = 0xFFFFFF;
 			if (cursorColorStr != 0)
 				blinkColor = parseColor(cursorColorStr);
-			fixme("cursor blink with colors %X", blinkColor);
+			debug("cursor blink with colors %X and char '%s' and delay %s", blinkColor, cursorCharStr, cursorDelayStr);
+			Terminals[0]->Blink.Enabled = true;
+			Terminals[0]->Blink.Color = blinkColor;
+			Terminals[0]->Blink.Character = *cursorCharStr;
+			Terminals[0]->Blink.Delay = atoi(cursorDelayStr);
 		}
 
 		ini_destroy(ini);
-		delete[] sh;
+	}
+
+	void LateInit()
+	{
+		Node rn = fs->Lookup(thisProcess->Info.RootNode, "/sys/cfg/term");
+		if (rn == nullptr)
+			return;
+
+		{
+			kstat st;
+			fs->Stat(rn, &st);
+			std::string cfg;
+			cfg.resize(st.Size);
+			fs->Read(rn, cfg.data(), st.Size, 0);
+			LoadConsoleConfig(cfg);
+		}
+
+		if (Terminals[0]->Blink.Enabled)
+		{
+			std::thread t = std::thread(paint_blinker_thread);
+			t.detach();
+		}
 
 #ifdef DEBUG
 		// __test_themes();

Kernel/core/debugger.cpp

@@ -27,12 +27,12 @@ NewLock(DebuggerLock);
 
 extern bool serialports[8];
 
-EXTERNC NIF void uart_wrapper(char c, void *)
+EXTERNC nif void uart_wrapper(char c, void *)
 {
 	uart.DebugWrite(c);
 }
 
-static inline NIF bool WritePrefix(DebugLevel Level, const char *File, int Line, const char *Function, const char *Format, va_list args)
+static inline nif bool WritePrefix(DebugLevel Level, const char *File, int Line, const char *Function, const char *Format, va_list args)
 {
 	const char *DbgLvlString;
 	switch (Level)
@@ -79,7 +79,7 @@ static inline NIF bool WritePrefix(DebugLevel Level, const char *File, int Line,
 
 namespace SysDbg
 {
-	NIF void Write(DebugLevel Level, const char *File, int Line, const char *Function, const char *Format, ...)
+	nif void Write(DebugLevel Level, const char *File, int Line, const char *Function, const char *Format, ...)
 	{
 		va_list args;
 		va_start(args, Format);
@@ -92,7 +92,7 @@ namespace SysDbg
 		va_end(args);
 	}
 
-	NIF void WriteLine(DebugLevel Level, const char *File, int Line, const char *Function, const char *Format, ...)
+	nif void WriteLine(DebugLevel Level, const char *File, int Line, const char *Function, const char *Format, ...)
 	{
 		va_list args;
 		va_start(args, Format);
@@ -106,7 +106,7 @@ namespace SysDbg
 		uart_wrapper('\n', nullptr);
 	}
 
-	NIF void LockedWrite(DebugLevel Level, const char *File, int Line, const char *Function, const char *Format, ...)
+	nif void LockedWrite(DebugLevel Level, const char *File, int Line, const char *Function, const char *Format, ...)
 	{
 		SmartTimeoutLock(DebuggerLock, 1000);
 		va_list args;
@@ -120,7 +120,7 @@ namespace SysDbg
 		va_end(args);
 	}
 
-	NIF void LockedWriteLine(DebugLevel Level, const char *File, int Line, const char *Function, const char *Format, ...)
+	nif void LockedWriteLine(DebugLevel Level, const char *File, int Line, const char *Function, const char *Format, ...)
 	{
 		SmartTimeoutLock(DebuggerLock, 1000);
 		va_list args;
@@ -137,7 +137,7 @@ namespace SysDbg
 }
 
 // C compatibility
-extern "C" NIF void SysDbgWrite(enum DebugLevel Level, const char *File, int Line, const char *Function, const char *Format, ...)
+extern "C" nif void SysDbgWrite(enum DebugLevel Level, const char *File, int Line, const char *Function, const char *Format, ...)
 {
 	va_list args;
 	va_start(args, Format);
@@ -151,7 +151,7 @@ extern "C" NIF void SysDbgWrite(enum DebugLevel Level, const char *File, int Lin
 }
 
 // C compatibility
-extern "C" NIF void SysDbgWriteLine(enum DebugLevel Level, const char *File, int Line, const char *Function, const char *Format, ...)
+extern "C" nif void SysDbgWriteLine(enum DebugLevel Level, const char *File, int Line, const char *Function, const char *Format, ...)
 {
 	va_list args;
 	va_start(args, Format);
@@ -166,7 +166,7 @@ extern "C" NIF void SysDbgWriteLine(enum DebugLevel Level, const char *File, int
 }
 
 // C compatibility
-extern "C" NIF void SysDbgLockedWrite(enum DebugLevel Level, const char *File, int Line, const char *Function, const char *Format, ...)
+extern "C" nif void SysDbgLockedWrite(enum DebugLevel Level, const char *File, int Line, const char *Function, const char *Format, ...)
 {
 	SmartTimeoutLock(DebuggerLock, 1000);
 	va_list args;
@@ -181,7 +181,7 @@ extern "C" NIF void SysDbgLockedWrite(enum DebugLevel Level, const char *File, i
 }
 
 // C compatibility
-extern "C" NIF void SysDbgLockedWriteLine(enum DebugLevel Level, const char *File, int Line, const char *Function, const char *Format, ...)
+extern "C" nif void SysDbgLockedWriteLine(enum DebugLevel Level, const char *File, int Line, const char *Function, const char *Format, ...)
 {
 	SmartTimeoutLock(DebuggerLock, 1000);
 	va_list args;

Kernel/core/driver/api.cpp

@@ -15,6 +15,7 @@
 	along with Fennix Kernel. If not, see <https://www.gnu.org/licenses/>.
 */
 
+#define NO_API_IN_HEADER 1
 #include <driver.hpp>
 #include <interface/driver.h>
 #include <interface/fs.h>
@@ -66,12 +67,10 @@ namespace v0
 		uintptr_t Flags;
 #if defined(__x86_64__)
 		asmv("pushfq");
-		asmv("popq %0"
-			 : "=r"(Flags));
+		asmv("popq %0" : "=r"(Flags));
 #else
 		asmv("pushfl");
-		asmv("popl %0"
-			 : "=r"(Flags));
+		asmv("popl %0" : "=r"(Flags));
 #endif
 		cs = Flags & (1 << 9);
 		asmv("cli");
@@ -192,11 +191,11 @@ namespace v0
 
 	/* --------- */
 
-	dev_t RegisterFileSystem(dev_t DriverID, FileSystemInfo *Info, struct Inode *Root)
+	dev_t RegisterFileSystem(dev_t DriverID, FileSystemInfo *Info)
 	{
-		dbg_api("%d, %#lx, %#lx", DriverID, Info, Root);
+		dbg_api("%d, %#lx", DriverID, Info);
 
-		return fs->RegisterFileSystem(Info, Root);
+		return fs->RegisterFileSystem(Info);
 	}
 
 	int UnregisterFileSystem(dev_t DriverID, dev_t Device)
@@ -274,7 +273,7 @@ namespace v0
 	{
 		dbg_api("%d, %d", DriverID, Milliseconds);
 
-		TaskManager->Sleep(Milliseconds);
+		TaskManager->Sleep(Time::FromMilliseconds(Milliseconds));
 	}
 
 	/* --------- */
@@ -334,7 +333,7 @@ namespace v0
 
 	void PS2Wait(dev_t DriverID, const bool Output)
 	{
-		dbg_api("%d, %d", DriverID, Output);
+		// dbg_api("%d, %d", DriverID, Output);
 
 #if defined(__amd64__) || defined(__i386__)
 		int Timeout = 100000;
@@ -380,7 +379,7 @@ namespace v0
 
 	uint8_t PS2ReadData(dev_t DriverID)
 	{
-		dbg_api("%d", DriverID);
+		// dbg_api("%d", DriverID);
 
 #if defined(__amd64__) || defined(__i386__)
 		WaitOutput;
@@ -453,29 +452,13 @@ namespace v0
 	void *AllocateMemory(dev_t DriverID, size_t Pages)
 	{
 		dbg_api("%d, %d", DriverID, Pages);
-
-		std::unordered_map<dev_t, Driver::DriverObject> &Drivers =
-			DriverManager->GetDrivers();
-
-		auto itr = Drivers.find(DriverID);
-		assert(itr != Drivers.end());
-
-		void *ptr = itr->second.vma->RequestPages(Pages);
-		memset(ptr, 0, FROM_PAGES(Pages));
-		return ptr;
+		return DriverManager->AllocateMemory(DriverID, Pages);
 	}
 
 	void FreeMemory(dev_t DriverID, void *Pointer, size_t Pages)
 	{
 		dbg_api("%d, %#lx, %d", DriverID, Pointer, Pages);
-
-		std::unordered_map<dev_t, Driver::DriverObject> &Drivers =
-			DriverManager->GetDrivers();
-
-		auto itr = Drivers.find(DriverID);
-		assert(itr != Drivers.end());
-
-		itr->second.vma->FreePages(Pointer, Pages);
+		DriverManager->FreeMemory(DriverID, Pointer, Pages);
 	}
 
 	void *MemoryCopy(dev_t DriverID, void *Destination, const void *Source, size_t Length)
@@ -588,7 +571,7 @@ namespace v0
 		__PCIArray *head = nullptr;
 		__PCIArray *array = nullptr;
 
-		foreach (auto &dev in Devices)
+		for (auto &dev : Devices)
 		{
 			/* TODO: optimize memory allocation */
 			PCI::PCIDevice *dptr = (PCI::PCIDevice *)vma->RequestPages(TO_PAGES(sizeof(PCI::PCIDevice)));
@@ -621,131 +604,7 @@ namespace v0
 	void InitializePCI(dev_t DriverID, void *_Header)
 	{
 		dbg_api("%d, %#lx", DriverID, _Header);
-
-		PCI::PCIDevice *__device = (PCI::PCIDevice *)_Header;
-		PCI::PCIDeviceHeader *Header = (PCI::PCIDeviceHeader *)__device->Header;
-
-		debug("Header Type: %d", Header->HeaderType);
-		switch (Header->HeaderType)
-		{
-		case 128:
-			warn("Unknown header type %d! Guessing PCI Header 0",
-				 Header->HeaderType);
-			[[fallthrough]];
-		case 0: /* PCI Header 0 */
-		{
-			PCI::PCIHeader0 *hdr0 = (PCI::PCIHeader0 *)Header;
-
-			uint32_t BAR[6];
-			size_t BARsSize[6];
-
-			BAR[0] = hdr0->BAR0;
-			BAR[1] = hdr0->BAR1;
-			BAR[2] = hdr0->BAR2;
-			BAR[3] = hdr0->BAR3;
-			BAR[4] = hdr0->BAR4;
-			BAR[5] = hdr0->BAR5;
-
-			debug("Type: %d; IOBase: %#lx; MemoryBase: %#lx",
-				  BAR[0] & 1, BAR[1] & (~3), BAR[0] & (~15));
-
-			/* BARs Size */
-			for (short i = 0; i < 6; i++)
-			{
-				if (BAR[i] == 0)
-					continue;
-
-				size_t size;
-				if ((BAR[i] & 1) == 0) /* Memory Base */
-				{
-					hdr0->BAR0 = 0xFFFFFFFF;
-					size = hdr0->BAR0;
-					hdr0->BAR0 = BAR[i];
-					BARsSize[i] = size & (~15);
-					BARsSize[i] = ~BARsSize[i] + 1;
-					BARsSize[i] = BARsSize[i] & 0xFFFFFFFF;
-					debug("BAR%d %#lx size: %d",
-						  i, BAR[i], BARsSize[i]);
-				}
-				else if ((BAR[i] & 1) == 1) /* I/O Base */
-				{
-					hdr0->BAR1 = 0xFFFFFFFF;
-					size = hdr0->BAR1;
-					hdr0->BAR1 = BAR[i];
-					BARsSize[i] = size & (~3);
-					BARsSize[i] = ~BARsSize[i] + 1;
-					BARsSize[i] = BARsSize[i] & 0xFFFF;
-					debug("BAR%d %#lx size: %d",
-						  i, BAR[i], BARsSize[i]);
-				}
-			}
-
-			Memory::Virtual vmm(KernelPageTable);
-
-			/* Mapping the BARs */
-			for (short i = 0; i < 6; i++)
-			{
-				if (BAR[i] == 0)
-					continue;
-
-				if ((BAR[i] & 1) == 0) /* Memory Base */
-				{
-					uintptr_t BARBase = BAR[i] & (~15);
-					size_t BARSize = BARsSize[i];
-
-					debug("Mapping BAR%d %#lx-%#lx",
-						  i, BARBase, BARBase + BARSize);
-
-					if (BARSize == 0)
-					{
-						warn("BAR%d size is zero!", i);
-						BARSize++;
-					}
-
-					vmm.Map((void *)BARBase, (void *)BARBase,
-							BARSize, Memory::RW | Memory::PWT | Memory::PCD);
-				}
-				else if ((BAR[i] & 1) == 1) /* I/O Base */
-				{
-					uintptr_t BARBase = BAR[i] & (~3);
-					size_t BARSize = BARsSize[i];
-
-					debug("Mapping BAR%d %#x-%#x",
-						  i, BARBase, BARBase + BARSize);
-
-					if (BARSize == 0)
-					{
-						warn("BAR%d size is zero!", i);
-						BARSize++;
-					}
-
-					vmm.Map((void *)BARBase, (void *)BARBase,
-							BARSize, Memory::RW | Memory::PWT | Memory::PCD);
-				}
-			}
-			break;
-		}
-		case 1: /* PCI Header 1 (PCI-to-PCI Bridge) */
-		{
-			fixme("PCI Header 1 (PCI-to-PCI Bridge) not implemented yet");
-			break;
-		}
-		case 2: /* PCI Header 2 (PCI-to-CardBus Bridge) */
-		{
-			fixme("PCI Header 2 (PCI-to-CardBus Bridge) not implemented yet");
-			break;
-		}
-		default:
-		{
-			error("Unknown header type %d", Header->HeaderType);
-			break;
-		}
-		}
-
-		Header->Command |= PCI_COMMAND_MASTER |
-						   PCI_COMMAND_IO |
-						   PCI_COMMAND_MEMORY;
-		Header->Command &= ~PCI_COMMAND_INTX_DISABLE;
+		PCIManager->InitializeDevice(*(PCI::PCIDevice *)_Header, KernelPageTable);
 	}
 
 	uint32_t GetBAR(dev_t DriverID, uint8_t i, void *_Header)
@@ -824,6 +683,13 @@ namespace v0
 
 	/* --------- */
 
+	dev_t CreateDeviceFile(dev_t DriverID, const char *name, mode_t mode, const InodeOperations *Operations)
+	{
+		dbg_api("%d, %s, %#o, %#lx", DriverID, name, mode, Operations);
+
+		return DriverManager->CreateDeviceFile(DriverID, name, mode, Operations);
+	}
+
 	dev_t RegisterDevice(dev_t DriverID, DeviceType Type, const InodeOperations *Operations)
 	{
 		dbg_api("%d, %d, %#lx", DriverID, Type, Operations);
@@ -844,6 +710,20 @@ namespace v0
 
 		return DriverManager->ReportInputEvent(DriverID, Report);
 	}
+
+	dev_t RegisterBlockDevice(dev_t DriverID, struct BlockDevice *Device)
+	{
+		dbg_api("%d, %#lx", DriverID, Device);
+
+		return DriverManager->RegisterBlockDevice(DriverID, Device);
+	}
+
+	int UnregisterBlockDevice(dev_t DriverID, dev_t DeviceID)
+	{
+		dbg_api("%d, %d", DriverID, DeviceID);
+
+		return DriverManager->UnregisterBlockDevice(DriverID, DeviceID);
+	}
 }
 
 struct APISymbols
@@ -907,9 +787,12 @@ static struct APISymbols APISymbols_v0[] = {
 	{"__iLine", (void *)v0::iLine},
 	{"__iPin", (void *)v0::iPin},
 
+	{"__CreateDeviceFile", (void *)v0::CreateDeviceFile},
 	{"__RegisterDevice", (void *)v0::RegisterDevice},
 	{"__UnregisterDevice", (void *)v0::UnregisterDevice},
 	{"__ReportInputEvent", (void *)v0::ReportInputEvent},
+	{"__RegisterBlockDevice", (void *)v0::RegisterBlockDevice},
+	{"__UnregisterBlockDevice", (void *)v0::UnregisterBlockDevice},
 };
 
 long __KernelUndefinedFunction(long arg0, long arg1, long arg2, long arg3,

Kernel/core/driver/daemon.cpp

@@ -1,890 +0,0 @@
-/*
-	This file is part of Fennix Kernel.
-
-	Fennix Kernel is free software: you can redistribute it and/or
-	modify it under the terms of the GNU General Public License as
-	published by the Free Software Foundation, either version 3 of
-	the License, or (at your option) any later version.
-
-	Fennix Kernel is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with Fennix Kernel. If not, see <https://www.gnu.org/licenses/>.
-*/
-
-#include <driver.hpp>
-
-#include <interface/driver.h>
-#include <interface/input.h>
-#include <memory.hpp>
-#include <stropts.h>
-#include <ints.hpp>
-#include <task.hpp>
-#include <printf.h>
-#include <exec.hpp>
-#include <rand.hpp>
-#include <cwalk.h>
-#include <md5.h>
-
-#include "../../kernel.h"
-
-using namespace vfs;
-
-namespace Driver
-{
-	/**
-	 * maj = 0
-	 *	min:
-	 *		0 - <ROOT>
-	 *		1 - /proc/self
-	 *		2 - /dev/null
-	 *		3 - /dev/zero
-	 *		4 - /dev/random
-	 *		5 - /dev/mem
-	 *		6 - /dev/kcon
-	 *      7 - /dev/tty
-	 *      8 - /dev/ptmx
-	 *
-	 * maj = 1
-	 * 	min:
-	 * 		0 - /dev/input/keyboard
-	 * 		1 - /dev/input/mouse
-	 * 		..- /dev/input/eventX
-	 */
-
-	TTY::PTMXDevice *ptmx = nullptr;
-
-	int __fs_Lookup(struct Inode *_Parent, const char *Name, struct Inode **Result)
-	{
-		func("%#lx %s %#lx", _Parent, Name, Result);
-
-		assert(_Parent != nullptr);
-
-		const char *basename;
-		size_t length;
-		cwk_path_get_basename(Name, &basename, &length);
-		if (basename == NULL)
-		{
-			error("Invalid name %s", Name);
-			return -EINVAL;
-		}
-
-		auto Parent = (Manager::DeviceInode *)_Parent;
-		for (const auto &child : Parent->Children)
-		{
-			debug("Comparing %s with %s", basename, child->Name.c_str());
-			if (strcmp(child->Name.c_str(), basename) != 0)
-				continue;
-
-			*Result = &child->Node;
-			return 0;
-		}
-
-		debug("Not found %s", Name);
-		return -ENOENT;
-	}
-
-	int __fs_Create(struct Inode *_Parent, const char *Name, mode_t Mode, struct Inode **Result)
-	{
-		func("%#lx %s %d", _Parent, Name, Mode);
-
-		assert(_Parent != nullptr);
-
-		/* We expect to be /dev or children of it */
-		auto Parent = (Manager::DeviceInode *)_Parent;
-		auto _dev = new Manager::DeviceInode;
-		_dev->Parent = nullptr;
-		_dev->ParentInode = _Parent;
-		_dev->Name = Name;
-		_dev->Node.Mode = Mode;
-		_dev->Node.Index = Parent->Node.Index + Parent->Children.size();
-		Parent->Children.push_back(_dev);
-
-		*Result = &_dev->Node;
-		return 0;
-	}
-
-	ssize_t __fs_Read(struct Inode *Node, void *Buffer, size_t Size, off_t Offset)
-	{
-		func("%#lx %d %d", Node, Size, Offset);
-		switch (Node->GetMajor())
-		{
-		case 0:
-		{
-			switch (Node->GetMinor())
-			{
-			case 2: /* /dev/null */
-			{
-				return 0;
-			}
-			case 3: /* /dev/zero */
-			{
-				if (Size <= 0)
-					return 0;
-
-				memset(Buffer, 0, Size);
-				return Size;
-			}
-			case 4: /* /dev/random */
-			{
-				if (Size <= 0)
-					return 0;
-
-				if (Size < sizeof(uint64_t))
-				{
-					uint8_t *buf = (uint8_t *)Buffer;
-					for (size_t i = 0; i < Size; i++)
-						buf[i] = (uint8_t)(Random::rand16() & 0xFF);
-					return Size;
-				}
-
-				uint64_t *buf = (uint64_t *)Buffer;
-				for (size_t i = 0; i < Size / sizeof(uint64_t); i++)
-					buf[i] = Random::rand64();
-				return Size;
-			}
-			case 5: /* /dev/mem */
-			{
-				stub;
-				return 0;
-			}
-			case 6: /* /dev/kcon */
-				return KernelConsole::CurrentTerminal.load()->Read(Buffer, Size, Offset);
-			case 7: /* /dev/tty */
-			{
-				TTY::TeletypeDriver *tty = (TTY::TeletypeDriver *)thisProcess->tty;
-				if (tty == nullptr)
-					return -ENOTTY;
-				return tty->Read(Buffer, Size, Offset);
-			}
-			case 8: /* /dev/ptmx */
-				return -ENOSYS;
-			default:
-				return -ENOENT;
-			};
-			break;
-		}
-		case 1:
-		{
-			switch (Node->GetMinor())
-			{
-			case 0: /* /dev/input/keyboard */
-			{
-				if (Size < sizeof(KeyboardReport))
-					return -EINVAL;
-
-				size_t nReads = Size / sizeof(KeyboardReport);
-
-				KeyboardReport *report = (KeyboardReport *)Buffer;
-
-				while (DriverManager->GlobalKeyboardInputReports.Count() == 0)
-					TaskManager->Yield();
-
-				DriverManager->GlobalKeyboardInputReports.Read(report, nReads);
-				return sizeof(KeyboardReport) * nReads;
-			}
-			case 1: /* /dev/input/mouse */
-			{
-				if (Size < sizeof(MouseReport))
-					return -EINVAL;
-
-				size_t nReads = Size / sizeof(MouseReport);
-
-				MouseReport *report = (MouseReport *)Buffer;
-
-				while (DriverManager->GlobalMouseInputReports.Count() == 0)
-					TaskManager->Yield();
-
-				DriverManager->GlobalMouseInputReports.Read(report, nReads);
-				return sizeof(MouseReport) * nReads;
-			}
-			default:
-				return -ENOENT;
-			};
-		}
-		default:
-		{
-			std::unordered_map<dev_t, Driver::DriverObject> &drivers =
-				DriverManager->GetDrivers();
-			const auto it = drivers.find(Node->GetMajor());
-			if (it == drivers.end())
-				ReturnLogError(-EINVAL, "Driver %d not found", Node->GetMajor());
-			const Driver::DriverObject *drv = &it->second;
-
-			auto dop = drv->DeviceOperations;
-			auto dOps = dop->find(Node->GetMinor());
-			if (dOps == dop->end())
-				ReturnLogError(-EINVAL, "Device %d not found", Node->GetMinor());
-			AssertReturnError(dOps->second.Ops, -ENOTSUP);
-			AssertReturnError(dOps->second.Ops->Read, -ENOTSUP);
-			return dOps->second.Ops->Read(Node, Buffer, Size, Offset);
-		}
-		}
-	}
-
-	ssize_t __fs_Write(struct Inode *Node, const void *Buffer, size_t Size, off_t Offset)
-	{
-		func("%#lx %p %d %d", Node, Buffer, Size, Offset);
-
-		switch (Node->GetMajor())
-		{
-		case 0:
-		{
-			switch (Node->GetMinor())
-			{
-			case 2: /* /dev/null */
-			{
-				return Size;
-			}
-			case 3: /* /dev/zero */
-			{
-				return Size;
-			}
-			case 4: /* /dev/random */
-			{
-				return Size;
-			}
-			case 5: /* /dev/mem */
-			{
-				stub;
-				return 0;
-			}
-			case 6: /* /dev/kcon */
-				return KernelConsole::CurrentTerminal.load()->Write(Buffer, Size, Offset);
-			case 7: /* /dev/tty */
-			{
-				TTY::TeletypeDriver *tty = (TTY::TeletypeDriver *)thisProcess->tty;
-				if (tty == nullptr)
-					return -ENOTTY;
-				return tty->Write(Buffer, Size, Offset);
-			}
-			case 8: /* /dev/ptmx */
-				return -ENOSYS;
-			default:
-				return -ENOENT;
-			};
-		}
-		case 1:
-		{
-			switch (Node->GetMinor())
-			{
-			case 0: /* /dev/input/keyboard */
-			{
-				return -ENOTSUP;
-			}
-			case 1: /* /dev/input/mouse */
-			{
-				return -ENOTSUP;
-			}
-			default:
-				return -ENOENT;
-			};
-		}
-		default:
-		{
-			std::unordered_map<dev_t, Driver::DriverObject> &drivers =
-				DriverManager->GetDrivers();
-			const auto it = drivers.find(Node->GetMajor());
-			if (it == drivers.end())
-				ReturnLogError(-EINVAL, "Driver %d not found", Node->GetMajor());
-			const Driver::DriverObject *drv = &it->second;
-
-			auto dop = drv->DeviceOperations;
-			auto dOps = dop->find(Node->GetMinor());
-			if (dOps == dop->end())
-				ReturnLogError(-EINVAL, "Device %d not found", Node->GetMinor());
-			AssertReturnError(dOps->second.Ops, -ENOTSUP);
-			AssertReturnError(dOps->second.Ops->Write, -ENOTSUP);
-			return dOps->second.Ops->Write(Node, Buffer, Size, Offset);
-		}
-		}
-	}
-
-	int __fs_Open(struct Inode *Node, int Flags, mode_t Mode)
-	{
-		func("%#lx %d %d", Node, Flags, Mode);
-
-		switch (Node->GetMajor())
-		{
-		case 0:
-		{
-			switch (Node->GetMinor())
-			{
-			case 2: /* /dev/null */
-			case 3: /* /dev/zero */
-			case 4: /* /dev/random */
-			case 5: /* /dev/mem */
-				return -ENOSYS;
-			case 6: /* /dev/kcon */
-				return KernelConsole::CurrentTerminal.load()->Open(Flags, Mode);
-			case 7: /* /dev/tty */
-			{
-				TTY::TeletypeDriver *tty = (TTY::TeletypeDriver *)thisProcess->tty;
-				if (tty == nullptr)
-					return -ENOTTY;
-				return tty->Open(Flags, Mode);
-			}
-			case 8: /* /dev/ptmx */
-				return ptmx->Open();
-			default:
-				return -ENOENT;
-			};
-		}
-		case 1:
-		{
-			switch (Node->GetMinor())
-			{
-			case 0: /* /dev/input/keyboard */
-			case 1: /* /dev/input/mouse */
-				return -ENOTSUP;
-			default:
-				return -ENOENT;
-			};
-		}
-		default:
-		{
-			std::unordered_map<dev_t, Driver::DriverObject> &drivers =
-				DriverManager->GetDrivers();
-			const auto it = drivers.find(Node->GetMajor());
-			if (it == drivers.end())
-				ReturnLogError(-EINVAL, "Driver %d not found", Node->GetMajor());
-			const Driver::DriverObject *drv = &it->second;
-
-			auto dop = drv->DeviceOperations;
-			auto dOps = dop->find(Node->GetMinor());
-			if (dOps == dop->end())
-				ReturnLogError(-EINVAL, "Device %d not found", Node->GetMinor());
-			AssertReturnError(dOps->second.Ops, -ENOTSUP);
-			AssertReturnError(dOps->second.Ops->Open, -ENOTSUP);
-			return dOps->second.Ops->Open(Node, Flags, Mode);
-		}
-		}
-	}
-
-	int __fs_Close(struct Inode *Node)
-	{
-		func("%#lx", Node);
-
-		switch (Node->GetMajor())
-		{
-		case 0:
-		{
-			switch (Node->GetMinor())
-			{
-			case 2: /* /dev/null */
-			case 3: /* /dev/zero */
-			case 4: /* /dev/random */
-			case 5: /* /dev/mem */
-				return -ENOSYS;
-			case 6: /* /dev/kcon */
-				return KernelConsole::CurrentTerminal.load()->Close();
-			case 7: /* /dev/tty */
-			{
-				TTY::TeletypeDriver *tty = (TTY::TeletypeDriver *)thisProcess->tty;
-				if (tty == nullptr)
-					return -ENOTTY;
-				return tty->Close();
-			}
-			case 8: /* /dev/ptmx */
-				return ptmx->Close();
-			default:
-				return -ENOENT;
-			};
-		}
-		case 1:
-		{
-			switch (Node->GetMinor())
-			{
-			case 0: /* /dev/input/keyboard */
-			case 1: /* /dev/input/mouse */
-				return -ENOTSUP;
-			default:
-				return -ENOENT;
-			};
-		}
-		default:
-		{
-			std::unordered_map<dev_t, Driver::DriverObject> &drivers =
-				DriverManager->GetDrivers();
-			const auto it = drivers.find(Node->GetMajor());
-			if (it == drivers.end())
-				ReturnLogError(-EINVAL, "Driver %d not found", Node->GetMajor());
-			const Driver::DriverObject *drv = &it->second;
-
-			auto dop = drv->DeviceOperations;
-			auto dOps = dop->find(Node->GetMinor());
-			if (dOps == dop->end())
-				ReturnLogError(-EINVAL, "Device %d not found", Node->GetMinor());
-			AssertReturnError(dOps->second.Ops, -ENOTSUP);
-			AssertReturnError(dOps->second.Ops->Close, -ENOTSUP);
-			return dOps->second.Ops->Close(Node);
-		}
-		}
-	}
-
-	int __fs_Ioctl(struct Inode *Node, unsigned long Request, void *Argp)
-	{
-		func("%#lx %lu %#lx", Node, Request, Argp);
-
-		switch (Node->GetMajor())
-		{
-		case 0:
-		{
-			switch (Node->GetMinor())
-			{
-			case 2: /* /dev/null */
-			case 3: /* /dev/zero */
-			case 4: /* /dev/random */
-			case 5: /* /dev/mem */
-				return -ENOSYS;
-			case 6: /* /dev/kcon */
-				return KernelConsole::CurrentTerminal.load()->Ioctl(Request, Argp);
-			case 7: /* /dev/tty */
-			{
-				TTY::TeletypeDriver *tty = (TTY::TeletypeDriver *)thisProcess->tty;
-				if (tty == nullptr)
-					return -ENOTTY;
-				return tty->Ioctl(Request, Argp);
-			}
-			case 8: /* /dev/ptmx */
-				return -ENOSYS;
-			default:
-				return -ENOENT;
-			};
-			break;
-		}
-		case 1:
-		{
-			switch (Node->GetMinor())
-			{
-			case 0: /* /dev/input/keyboard */
-			case 1: /* /dev/input/mouse */
-				return -ENOSYS;
-			default:
-				return -ENOENT;
-			};
-		}
-		default:
-		{
-			std::unordered_map<dev_t, Driver::DriverObject> &drivers =
-				DriverManager->GetDrivers();
-			const auto it = drivers.find(Node->GetMajor());
-			if (it == drivers.end())
-				ReturnLogError(-EINVAL, "Driver %d not found", Node->GetMajor());
-			const Driver::DriverObject *drv = &it->second;
-
-			auto dop = drv->DeviceOperations;
-			auto dOps = dop->find(Node->GetMinor());
-			if (dOps == dop->end())
-				ReturnLogError(-EINVAL, "Device %d not found", Node->GetMinor());
-			AssertReturnError(dOps->second.Ops, -ENOTSUP);
-			AssertReturnError(dOps->second.Ops->Ioctl, -ENOTSUP);
-			return dOps->second.Ops->Ioctl(Node, Request, Argp);
-		}
-		}
-	}
-
-	__no_sanitize("alignment")
-		ssize_t __fs_Readdir(struct Inode *_Node, struct kdirent *Buffer, size_t Size, off_t Offset, off_t Entries)
-	{
-		func("%#lx %#lx %d %d %d", _Node, Buffer, Size, Offset, Entries);
-
-		auto Node = (Manager::DeviceInode *)_Node;
-
-		off_t realOffset = Offset;
-
-		size_t totalSize = 0;
-		uint16_t reclen = 0;
-		struct kdirent *ent = nullptr;
-
-		if (Offset == 0)
-		{
-			reclen = (uint16_t)(offsetof(struct kdirent, d_name) + strlen(".") + 1);
-			if (totalSize + reclen >= Size)
-				return -EINVAL;
-
-			ent = (struct kdirent *)((uintptr_t)Buffer + totalSize);
-			ent->d_ino = Node->Node.Index;
-			ent->d_off = Offset++;
-			ent->d_reclen = reclen;
-			ent->d_type = DT_DIR;
-			strcpy(ent->d_name, ".");
-			totalSize += reclen;
-		}
-
-		if (Offset <= 1)
-		{
-			reclen = (uint16_t)(offsetof(struct kdirent, d_name) + strlen("..") + 1);
-			if (totalSize + reclen >= Size)
-			{
-				if (realOffset == 1)
-					return -EINVAL;
-				return totalSize;
-			}
-
-			ent = (struct kdirent *)((uintptr_t)Buffer + totalSize);
-
-			if (Node->Parent)
-				ent->d_ino = Node->Parent->Node->Index;
-			else if (Node->ParentInode)
-				ent->d_ino = Node->ParentInode->Index;
-			else
-			{
-				warn("Parent is null for %s", Node->Name.c_str());
-				ent->d_ino = Node->Node.Index;
-			}
-			ent->d_off = Offset++;
-			ent->d_reclen = reclen;
-			ent->d_type = DT_DIR;
-			strcpy(ent->d_name, "..");
-			totalSize += reclen;
-		}
-
-		if (!S_ISDIR(Node->Node.Mode))
-			return -ENOTDIR;
-
-		if ((Offset >= 2 ? (Offset - 2) : Offset) > (off_t)Node->Children.size())
-			return -EINVAL;
-
-		off_t entries = 0;
-		for (const auto &var : Node->Children)
-		{
-			debug("iterating \"%s\" inside \"%s\"", var->Name.c_str(), Node->Name.c_str());
-			if (var->Node.Offset < realOffset)
-			{
-				debug("skipping \"%s\" (%d < %d)", var->Name.c_str(), var->Node.Offset, Offset);
-				continue;
-			}
-
-			if (entries >= Entries)
-				break;
-
-			reclen = (uint16_t)(offsetof(struct kdirent, d_name) + strlen(var->Name.c_str()) + 1);
-
-			if (totalSize + reclen >= Size)
-				break;
-
-			ent = (struct kdirent *)((uintptr_t)Buffer + totalSize);
-			ent->d_ino = var->Node.Index;
-			ent->d_off = var->Node.Offset;
-			ent->d_reclen = reclen;
-			ent->d_type = IFTODT(var->Node.Mode);
-			strncpy(ent->d_name, var->Name.c_str(), strlen(var->Name.c_str()));
-
-			totalSize += reclen;
-			entries++;
-		}
-
-		if (totalSize + sizeof(struct kdirent) >= Size)
-			return totalSize;
-
-		ent = (struct kdirent *)((uintptr_t)Buffer + totalSize);
-		ent->d_ino = 0;
-		ent->d_off = 0;
-		ent->d_reclen = 0;
-		ent->d_type = DT_UNKNOWN;
-		ent->d_name[0] = '\0';
-		return totalSize;
-	}
-
-	void ManagerDaemonWrapper() { DriverManager->Daemon(); }
-
-	void Manager::Daemon()
-	{
-		while (true)
-		{
-			TaskManager->Sleep(1000);
-		}
-	}
-
-	dev_t Manager::RegisterInputDevice(std::unordered_map<dev_t, DriverHandlers> *dop,
-									   dev_t DriverID, size_t i, const InodeOperations *Operations)
-	{
-		std::string prefix = "event";
-		for (size_t j = 0; j < 128; j++)
-		{
-			std::string deviceName = prefix + std::to_string(j);
-			FileNode *node = fs->GetByPath(deviceName.c_str(), devInputNode);
-			if (node)
-				continue;
-
-			/* c rwx r-- r-- */
-			mode_t mode = S_IRWXU |
-						  S_IRGRP |
-						  S_IROTH |
-						  S_IFCHR;
-
-			node = fs->ForceCreate(devInputNode, deviceName.c_str(), mode);
-			node->Node->SetDevice(DriverID, i);
-
-			DriverHandlers dh{};
-			dh.Ops = Operations;
-			dh.Node = node->Node;
-			dh.InputReports = new RingBuffer<InputReport>(16);
-			dop->insert({i, std::move(dh)});
-			return i;
-		}
-
-		ReturnLogError(-1, "No available slots for device %d", DriverID);
-		return -1; /* -Werror=return-type */
-	}
-
-	dev_t Manager::RegisterBlockDevice(std::unordered_map<dev_t, DriverHandlers> *dop,
-									   dev_t DriverID, size_t i, const InodeOperations *Operations)
-	{
-		std::string prefix = "event";
-		for (size_t j = 0; j < 128; j++)
-		{
-			std::string deviceName = prefix + std::to_string(j);
-			FileNode *node = fs->GetByPath(deviceName.c_str(), devInputNode);
-			if (node)
-				continue;
-
-			/* c rwx r-- r-- */
-			mode_t mode = S_IRWXU |
-						  S_IRGRP |
-						  S_IROTH |
-						  S_IFBLK;
-
-			node = fs->ForceCreate(devInputNode, deviceName.c_str(), mode);
-			node->Node->SetDevice(DriverID, i);
-
-			DriverHandlers dh{};
-			dh.Ops = Operations;
-			dh.Node = node->Node;
-			dh.InputReports = new RingBuffer<InputReport>(16);
-			dop->insert({i, std::move(dh)});
-			return i;
-		}
-
-		ReturnLogError(-1, "No available slots for device %d", DriverID);
-		return -1; /* -Werror=return-type */
-	}
-
-	dev_t Manager::RegisterDevice(dev_t DriverID, DeviceType Type, const InodeOperations *Operations)
-	{
-		std::unordered_map<dev_t, Driver::DriverObject> &drivers =
-			DriverManager->GetDrivers();
-		const auto it = drivers.find(DriverID);
-		if (it == drivers.end())
-			ReturnLogError(-EINVAL, "Driver %d not found", DriverID);
-		const Driver::DriverObject *drv = &it->second;
-
-		auto dop = drv->DeviceOperations;
-		for (size_t i = 0; i < 128; i++)
-		{
-			const auto dOps = dop->find(i);
-			const auto dOpsEnd = dop->end();
-			if (dOps != dOpsEnd)
-				continue;
-
-			DeviceType devType = (DeviceType)(Type & DEVICE_TYPE_MASK);
-			switch (devType)
-			{
-			case DEVICE_TYPE_INPUT:
-				return RegisterInputDevice(dop, DriverID, i, Operations);
-			case DEVICE_TYPE_BLOCK:
-				return RegisterBlockDevice(dop, DriverID, i, Operations);
-			default:
-				ReturnLogError(-1, "Invalid device type %d", Type);
-			}
-		}
-
-		ReturnLogError(-1, "No available slots for device %d", DriverID);
-	}
-
-	int Manager::UnregisterDevice(dev_t DriverID, dev_t Device)
-	{
-		std::unordered_map<dev_t, Driver::DriverObject> &drivers =
-			DriverManager->GetDrivers();
-		const auto it = drivers.find(DriverID);
-		if (it == drivers.end())
-			ReturnLogError(-EINVAL, "Driver %d not found", DriverID);
-		const Driver::DriverObject *drv = &it->second;
-
-		auto dop = drv->DeviceOperations;
-		const auto dOps = dop->find(Device);
-		if (dOps == dop->end())
-			ReturnLogError(-EINVAL, "Device %d not found", Device);
-		dop->erase(dOps);
-		fixme("remove eventX from /dev/input");
-		fixme("delete InputReports");
-		return 0;
-	}
-
-	int Manager::ReportInputEvent(dev_t DriverID, InputReport *Report)
-	{
-		std::unordered_map<dev_t, Driver::DriverObject> &drivers =
-			DriverManager->GetDrivers();
-		const auto it = drivers.find(DriverID);
-		if (it == drivers.end())
-			ReturnLogError(-EINVAL, "Driver %d not found", DriverID);
-		const Driver::DriverObject *drv = &it->second;
-
-		auto dop = drv->DeviceOperations;
-		auto dOps = dop->find(Report->Device);
-		if (dOps == dop->end())
-			ReturnLogError(-EINVAL, "Device %d not found", Report->Device);
-
-		dOps->second.InputReports->Write(Report, 1);
-
-		switch (Report->Type)
-		{
-		case INPUT_TYPE_KEYBOARD:
-		{
-			KeyboardReport *kReport = &Report->Keyboard;
-			GlobalKeyboardInputReports.Write(kReport, 1);
-			break;
-		}
-		case INPUT_TYPE_MOUSE:
-		{
-			MouseReport *mReport = &Report->Mouse;
-			GlobalMouseInputReports.Write(mReport, 1);
-			break;
-		}
-		default:
-			assert(!"Invalid input type");
-		}
-		return 0;
-	}
-
-	void Manager::InitializeDaemonFS()
-	{
-		ptmx = new TTY::PTMXDevice;
-
-		dev_t MinorID = 0;
-		DeviceInode *_dev = new DeviceInode;
-		_dev->Name = "dev";
-
-		/* d rwx r-- r-- */
-		mode_t mode = S_IRWXU |
-					  S_IRGRP |
-					  S_IROTH |
-					  S_IFDIR;
-		Inode *dev = (Inode *)_dev;
-		dev->Mode = mode;
-		dev->Flags = I_FLAG_MOUNTPOINT | I_FLAG_CACHE_KEEP;
-
-		FileSystemInfo *fsi = new FileSystemInfo;
-		fsi->Name = "Device Virtual File System";
-		fsi->RootName = "dev";
-		fsi->Flags = I_FLAG_ROOT | I_FLAG_MOUNTPOINT | I_FLAG_CACHE_KEEP;
-		fsi->SuperOps = {};
-		fsi->Ops.Lookup = __fs_Lookup;
-		fsi->Ops.Create = __fs_Create;
-		fsi->Ops.Read = __fs_Read;
-		fsi->Ops.Write = __fs_Write;
-		fsi->Ops.Open = __fs_Open;
-		fsi->Ops.Close = __fs_Close;
-		fsi->Ops.Ioctl = __fs_Ioctl;
-		fsi->Ops.ReadDir = __fs_Readdir;
-
-		dev->Device = fs->RegisterFileSystem(fsi, dev);
-		dev->SetDevice(0, MinorID++);
-		MinorID++; /* 1 = /proc/self */
-
-		devNode = fs->Mount(fs->GetRoot(0), dev, "/dev");
-		_dev->Parent = devNode->Parent;
-		_dev->ParentInode = devNode->Parent->Node;
-
-		/* d rwx r-- r-- */
-		mode = S_IRWXU |
-			   S_IRGRP |
-			   S_IROTH |
-			   S_IFDIR;
-		DeviceInode *input = new DeviceInode;
-		input->Parent = devNode;
-		input->ParentInode = devNode->Node;
-		input->Name = "input";
-		input->Node.Device = dev->Device;
-		input->Node.Mode = mode;
-		input->Node.Flags = I_FLAG_CACHE_KEEP;
-		input->Node.Offset = _dev->Children.size();
-		_dev->Children.push_back(input);
-		devInputNode = fs->GetByPath("input", devNode);
-
-		auto createDevice = [](DeviceInode *p1, FileNode *p2, const std::string &name, dev_t maj, dev_t min, mode_t mode)
-		{
-			DeviceInode *device = new DeviceInode;
-			device->Parent = p2;
-			device->ParentInode = p2->Node;
-			device->Name = name;
-			device->Node.Device = p2->Node->Device;
-			device->Node.Mode = mode;
-			device->Node.SetDevice(maj, min);
-			device->Node.Flags = I_FLAG_CACHE_KEEP;
-			device->Node.Offset = p1->Children.size();
-			p1->Children.push_back(device);
-		};
-
-		/* c rw- rw- rw- */
-		mode = S_IRUSR | S_IWUSR |
-			   S_IRGRP | S_IWGRP |
-			   S_IROTH | S_IWOTH |
-			   S_IFCHR;
-		createDevice(_dev, devNode, "null", 0, MinorID++, mode);
-
-		/* c rw- rw- rw- */
-		mode = S_IRUSR | S_IWUSR |
-			   S_IRGRP | S_IWGRP |
-			   S_IROTH | S_IWOTH |
-			   S_IFCHR;
-		createDevice(_dev, devNode, "zero", 0, MinorID++, mode);
-
-		/* c rw- rw- rw- */
-		mode = S_IRUSR | S_IWUSR |
-			   S_IRGRP | S_IWGRP |
-			   S_IROTH | S_IWOTH |
-			   S_IFCHR;
-		createDevice(_dev, devNode, "random", 0, MinorID++, mode);
-
-		/* c rw- r-- --- */
-		mode = S_IRUSR | S_IWUSR |
-			   S_IRGRP |
-
-			   S_IFCHR;
-		createDevice(_dev, devNode, "mem", 0, MinorID++, mode);
-
-		/* c rw- r-- --- */
-		mode = S_IRUSR | S_IWUSR |
-			   S_IRGRP |
-
-			   S_IFCHR;
-		createDevice(_dev, devNode, "kcon", 0, MinorID++, mode);
-
-		/* c rw- rw- rw- */
-		mode = S_IRUSR | S_IWUSR |
-			   S_IRGRP | S_IWGRP |
-			   S_IRUSR | S_IWUSR |
-			   S_IFCHR;
-		createDevice(_dev, devNode, "tty", 0, MinorID++, mode);
-
-		/* c rw- rw- rw- */
-		mode = S_IRUSR | S_IWUSR |
-			   S_IRGRP | S_IWGRP |
-			   S_IRUSR | S_IWUSR |
-			   S_IFCHR;
-		createDevice(_dev, devNode, "ptmx", 0, MinorID++, mode);
-
-		/* ------------------------------------------------------ */
-
-		MinorID = 0;
-
-		/* c rw- r-- --- */
-		mode = S_IRUSR | S_IWUSR |
-			   S_IRGRP |
-
-			   S_IFCHR;
-		createDevice(input, devInputNode, "keyboard", 1, MinorID++, mode);
-
-		/* c rw- r-- --- */
-		mode = S_IRUSR | S_IWUSR |
-			   S_IRGRP |
-
-			   S_IFCHR;
-		createDevice(input, devInputNode, "mouse", 1, MinorID++, mode);
-	}
-}

Kernel/core/driver/dev.cpp

@@ -0,0 +1,483 @@
+/*
+	This file is part of Fennix Kernel.
+
+	Fennix Kernel is free software: you can redistribute it and/or
+	modify it under the terms of the GNU General Public License as
+	published by the Free Software Foundation, either version 3 of
+	the License, or (at your option) any later version.
+
+	Fennix Kernel is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with Fennix Kernel. If not, see <https://www.gnu.org/licenses/>.
+*/
+
+#include <driver.hpp>
+
+#include "../../kernel.h"
+
+namespace Driver
+{
+	dev_t DeviceDirID;
+
+	int __fs_Lookup(struct Inode *_Parent, const char *Name, struct Inode **Result)
+	{
+		func("%#lx %s %#lx", _Parent, Name, Result);
+
+		assert(_Parent != nullptr);
+
+		const char *basename;
+		size_t length;
+		cwk_path_get_basename(Name, &basename, &length);
+		if (basename == NULL)
+		{
+			error("Invalid name %s", Name);
+			return -EINVAL;
+		}
+
+		auto Parent = (Manager::DeviceInode *)_Parent;
+		for (const auto &child : Parent->Children)
+		{
+			debug("Comparing %s with %s", basename, child->Name.c_str());
+			if (strcmp(child->Name.c_str(), basename) != 0)
+				continue;
+
+			*Result = &child->inode;
+			return 0;
+		}
+
+		debug("Not found %s", Name);
+		return -ENOENT;
+	}
+
+	int __fs_Create(struct Inode *_Parent, const char *Name, mode_t Mode, struct Inode **Result)
+	{
+		func("%#lx %s %d", _Parent, Name, Mode);
+
+		assert(_Parent != nullptr);
+
+		/* We expect to be /dev or children of it */
+		auto Parent = (Manager::DeviceInode *)_Parent;
+		auto _dev = new Manager::DeviceInode;
+		_dev->Parent = nullptr;
+		_dev->ParentInode = _Parent;
+		_dev->Name = Name;
+		_dev->inode.Device = Parent->inode.Device;
+		_dev->inode.Mode = Mode;
+		_dev->inode.Index = Parent->inode.Index + Parent->Children.size();
+		_dev->inode.Offset = Parent->Children.size();
+		Parent->Children.push_back(_dev);
+
+		*Result = &_dev->inode;
+		return 0;
+	}
+
+	ssize_t __fs_Read(struct Inode *Node, void *Buffer, size_t Size, off_t Offset)
+	{
+		func("%#lx %d %d", Node, Size, Offset);
+
+		if ((dev_t)Node->GetMajor() == DeviceDirID)
+		{
+			switch (Node->GetMinor())
+			{
+			case 0: /* /dev/input/keyboard */
+			{
+				if (Size < sizeof(KeyboardReport))
+					return -EINVAL;
+
+				size_t nReads = Size / sizeof(KeyboardReport);
+
+				KeyboardReport *report = (KeyboardReport *)Buffer;
+
+				while (DriverManager->GlobalKeyboardInputReports.Count() == 0)
+					TaskManager->Yield();
+
+				DriverManager->GlobalKeyboardInputReports.Read(report, nReads);
+				return sizeof(KeyboardReport) * nReads;
+			}
+			case 1: /* /dev/input/mouse */
+			{
+				if (Size < sizeof(MouseReport))
+					return -EINVAL;
+
+				size_t nReads = Size / sizeof(MouseReport);
+
+				MouseReport *report = (MouseReport *)Buffer;
+
+				while (DriverManager->GlobalMouseInputReports.Count() == 0)
+					TaskManager->Yield();
+
+				DriverManager->GlobalMouseInputReports.Read(report, nReads);
+				return sizeof(MouseReport) * nReads;
+			}
+			default:
+				return -ENOENT;
+			};
+		}
+
+		std::unordered_map<dev_t, Driver::DriverObject> &drivers =
+			DriverManager->GetDrivers();
+		const auto it = drivers.find(Node->GetMajor());
+		if (it == drivers.end())
+			ReturnLogError(-EINVAL, "Driver %d not found", Node->GetMajor());
+		const Driver::DriverObject *drv = &it->second;
+
+		auto dop = drv->DeviceOperations;
+		auto dOps = dop->find(Node->GetMinor());
+		if (dOps == dop->end())
+			ReturnLogError(-EINVAL, "Device %d not found", Node->GetMinor());
+		AssertReturnError(dOps->second.Ops, -ENOTSUP);
+		AssertReturnError(dOps->second.Ops->Read, -ENOTSUP);
+		return dOps->second.Ops->Read(Node, Buffer, Size, Offset);
+	}
+
+	ssize_t __fs_Write(struct Inode *Node, const void *Buffer, size_t Size, off_t Offset)
+	{
+		func("%#lx %p %d %d", Node, Buffer, Size, Offset);
+
+		if ((dev_t)Node->GetMajor() == DeviceDirID)
+		{
+			switch (Node->GetMinor())
+			{
+			case 0: /* /dev/input/keyboard */
+			{
+				return -ENOTSUP;
+			}
+			case 1: /* /dev/input/mouse */
+			{
+				return -ENOTSUP;
+			}
+			default:
+				return -ENOENT;
+			};
+		}
+
+		std::unordered_map<dev_t, Driver::DriverObject> &drivers =
+			DriverManager->GetDrivers();
+		const auto it = drivers.find(Node->GetMajor());
+		if (it == drivers.end())
+			ReturnLogError(-EINVAL, "Driver %d not found", Node->GetMajor());
+		const Driver::DriverObject *drv = &it->second;
+
+		auto dop = drv->DeviceOperations;
+		auto dOps = dop->find(Node->GetMinor());
+		if (dOps == dop->end())
+			ReturnLogError(-EINVAL, "Device %d not found", Node->GetMinor());
+		AssertReturnError(dOps->second.Ops, -ENOTSUP);
+		AssertReturnError(dOps->second.Ops->Write, -ENOTSUP);
+		return dOps->second.Ops->Write(Node, Buffer, Size, Offset);
+	}
+
+	int __fs_Open(struct Inode *Node, int Flags, mode_t Mode)
+	{
+		func("%#lx %d %d", Node, Flags, Mode);
+
+		if ((dev_t)Node->GetMajor() == DeviceDirID)
+		{
+			switch (Node->GetMinor())
+			{
+			case 0: /* /dev/input/keyboard */
+			case 1: /* /dev/input/mouse */
+				return -ENOTSUP;
+			default:
+				return -ENOENT;
+			};
+		}
+
+		std::unordered_map<dev_t, Driver::DriverObject> &drivers =
+			DriverManager->GetDrivers();
+		const auto it = drivers.find(Node->GetMajor());
+		if (it == drivers.end())
+			ReturnLogError(-EINVAL, "Driver %d not found", Node->GetMajor());
+		const Driver::DriverObject *drv = &it->second;
+
+		auto dop = drv->DeviceOperations;
+		auto dOps = dop->find(Node->GetMinor());
+		if (dOps == dop->end())
+			ReturnLogError(-EINVAL, "Device %d not found", Node->GetMinor());
+		AssertReturnError(dOps->second.Ops, -ENOTSUP);
+		AssertReturnError(dOps->second.Ops->Open, -ENOTSUP);
+		return dOps->second.Ops->Open(Node, Flags, Mode);
+	}
+
+	int __fs_Close(struct Inode *Node)
+	{
+		func("%#lx", Node);
+
+		if ((dev_t)Node->GetMajor() == DeviceDirID)
+		{
+			switch (Node->GetMinor())
+			{
+			case 0: /* /dev/input/keyboard */
+			case 1: /* /dev/input/mouse */
+				return -ENOTSUP;
+			default:
+				return -ENOENT;
+			};
+		}
+
+		std::unordered_map<dev_t, Driver::DriverObject> &drivers =
+			DriverManager->GetDrivers();
+		const auto it = drivers.find(Node->GetMajor());
+		if (it == drivers.end())
+			ReturnLogError(-EINVAL, "Driver %d not found", Node->GetMajor());
+		const Driver::DriverObject *drv = &it->second;
+
+		auto dop = drv->DeviceOperations;
+		auto dOps = dop->find(Node->GetMinor());
+		if (dOps == dop->end())
+			ReturnLogError(-EINVAL, "Device %d not found", Node->GetMinor());
+		AssertReturnError(dOps->second.Ops, -ENOTSUP);
+		AssertReturnError(dOps->second.Ops->Close, -ENOTSUP);
+		return dOps->second.Ops->Close(Node);
+	}
+
+	int __fs_Ioctl(struct Inode *Node, unsigned long Request, void *Argp)
+	{
+		func("%#lx %lu %#lx", Node, Request, Argp);
+
+		if ((dev_t)Node->GetMajor() == DeviceDirID)
+		{
+			switch (Node->GetMinor())
+			{
+			case 0: /* /dev/input/keyboard */
+			case 1: /* /dev/input/mouse */
+				return -ENOSYS;
+			default:
+				return -ENOENT;
+			};
+		}
+
+		std::unordered_map<dev_t, Driver::DriverObject> &drivers =
+			DriverManager->GetDrivers();
+		const auto it = drivers.find(Node->GetMajor());
+		if (it == drivers.end())
+			ReturnLogError(-EINVAL, "Driver %d not found", Node->GetMajor());
+		const Driver::DriverObject *drv = &it->second;
+
+		auto dop = drv->DeviceOperations;
+		auto dOps = dop->find(Node->GetMinor());
+		if (dOps == dop->end())
+			ReturnLogError(-EINVAL, "Device %d not found", Node->GetMinor());
+		AssertReturnError(dOps->second.Ops, -ENOTSUP);
+		AssertReturnError(dOps->second.Ops->Ioctl, -ENOTSUP);
+		return dOps->second.Ops->Ioctl(Node, Request, Argp);
+	}
+
+	__no_sanitize("alignment") ssize_t __fs_Readdir(struct Inode *_Node, struct kdirent *Buffer, size_t Size, off_t Offset, off_t Entries)
+	{
+		func("%#lx %#lx %d %d %d", _Node, Buffer, Size, Offset, Entries);
+
+		auto node = (Manager::DeviceInode *)_Node;
+		off_t realOffset = Offset;
+		size_t totalSize = 0;
+		uint16_t reclen = 0;
+		struct kdirent *ent = nullptr;
+
+		if (!S_ISDIR(node->inode.Mode))
+			return -ENOTDIR;
+
+		if (Offset == 0)
+		{
+			reclen = (uint16_t)(offsetof(struct kdirent, d_name) + strlen(".") + 1);
+			if (totalSize + reclen > Size)
+				return -EINVAL;
+			ent = (struct kdirent *)((uintptr_t)Buffer + totalSize);
+			ent->d_ino = node->inode.Index;
+			ent->d_off = 0;
+			ent->d_reclen = reclen;
+			ent->d_type = DT_DIR;
+			strcpy(ent->d_name, ".");
+			totalSize += reclen;
+			Offset++;
+		}
+
+		if (Offset == 1)
+		{
+			reclen = (uint16_t)(offsetof(struct kdirent, d_name) + strlen("..") + 1);
+			if (totalSize + reclen > Size)
+				return totalSize;
+			ent = (struct kdirent *)((uintptr_t)Buffer + totalSize);
+			if (node->Parent)
+				ent->d_ino = node->Parent->inode->Index;
+			else if (node->ParentInode)
+				ent->d_ino = node->ParentInode->Index;
+			else
+				ent->d_ino = node->inode.Index;
+			ent->d_off = 1;
+			ent->d_reclen = reclen;
+			ent->d_type = DT_DIR;
+			strcpy(ent->d_name, "..");
+			totalSize += reclen;
+			Offset++;
+		}
+
+		off_t entryIndex = 0;
+		for (const auto &var : node->Children)
+		{
+			if (entryIndex + 2 < realOffset)
+			{
+				entryIndex++;
+				continue;
+			}
+			if (Entries && entryIndex >= Entries)
+				break;
+
+			reclen = (uint16_t)(offsetof(struct kdirent, d_name) + strlen(var->Name.c_str()) + 1);
+			if (totalSize + reclen > Size)
+				break;
+			ent = (struct kdirent *)((uintptr_t)Buffer + totalSize);
+			ent->d_ino = var->inode.Index;
+			ent->d_off = entryIndex + 2;
+			ent->d_reclen = reclen;
+			ent->d_type = IFTODT(var->inode.Mode);
+			strcpy(ent->d_name, var->Name.c_str());
+			totalSize += reclen;
+			entryIndex++;
+		}
+
+		if (totalSize + offsetof(struct kdirent, d_name) + 1 > Size)
+			return totalSize;
+
+		ent = (struct kdirent *)((uintptr_t)Buffer + totalSize);
+		ent->d_ino = 0;
+		ent->d_off = 0;
+		ent->d_reclen = 0;
+		ent->d_type = DT_UNKNOWN;
+		ent->d_name[0] = '\0';
+		return totalSize;
+	}
+
+	int __fs_Stat(struct Inode *_Node, struct kstat *Stat)
+	{
+		func("%#lx %#lx", _Node, Stat);
+		auto node = (Manager::DeviceInode *)_Node;
+
+		assert(node != nullptr);
+		assert(Stat != nullptr);
+
+		Stat->Device = node->inode.Device;
+		Stat->Index = node->inode.Index;
+		Stat->HardLinks = 1;
+		Stat->UserID = 0;
+		Stat->GroupID = 0;
+		Stat->RawDevice = node->inode.RawDevice;
+		Stat->Size = node->Size;
+		Stat->AccessTime = node->AccessTime;
+		Stat->ModifyTime = node->ModifyTime;
+		Stat->ChangeTime = node->ChangeTime;
+		Stat->BlockSize = node->BlockSize;
+		Stat->Blocks = node->Blocks;
+		Stat->Attribute = 0;
+
+		return 0;
+	}
+
+	void Manager::InitializeDeviceDirectory()
+	{
+		dev_t MinorID = 0;
+		DeviceInode *_dev = new DeviceInode;
+		_dev->Name = "dev";
+
+		/* d rwx r-- r-- */
+		mode_t mode = S_IRWXU |
+					  S_IRGRP |
+					  S_IROTH |
+					  S_IFDIR;
+		Inode *dev = (Inode *)_dev;
+		dev->Mode = mode;
+
+		FileSystemInfo *fsi = new FileSystemInfo;
+		fsi->Name = "devfs";
+		fsi->SuperOps = {};
+		fsi->Ops.Lookup = __fs_Lookup;
+		fsi->Ops.Create = __fs_Create;
+		fsi->Ops.Remove = nullptr;
+		fsi->Ops.Rename = nullptr;
+		fsi->Ops.Read = __fs_Read;
+		fsi->Ops.Write = __fs_Write;
+		fsi->Ops.Truncate = nullptr;
+		fsi->Ops.Open = __fs_Open;
+		fsi->Ops.Close = __fs_Close;
+		fsi->Ops.Ioctl = __fs_Ioctl;
+		fsi->Ops.ReadDir = __fs_Readdir;
+		fsi->Ops.MkDir = nullptr;
+		fsi->Ops.RmDir = nullptr;
+		fsi->Ops.SymLink = nullptr;
+		fsi->Ops.ReadLink = nullptr;
+		fsi->Ops.Seek = nullptr;
+		fsi->Ops.Stat = __fs_Stat;
+
+		DeviceDirID = dev->Device = fs->RegisterFileSystem(fsi);
+		dev->SetDevice(0, MinorID++);
+
+		Node root = fs->GetRoot(0);
+		devNode = fs->Mount(root, dev, "dev", fsi);
+		assert(devNode->Parent != nullptr);
+
+		_dev->Parent = devNode->Parent;
+		_dev->ParentInode = devNode->Parent->inode;
+
+		/* d rwx r-- r-- */
+		mode = S_IRWXU |
+			   S_IRGRP |
+			   S_IROTH |
+			   S_IFDIR;
+		DeviceInode *blk = new DeviceInode;
+		blk->Parent = devNode;
+		blk->ParentInode = devNode->inode;
+		blk->Name = "block";
+		blk->inode.Device = dev->Device;
+		blk->inode.Mode = mode;
+		blk->inode.Offset = _dev->Children.size();
+		_dev->Children.push_back(blk);
+		devBlockNode = fs->Lookup(devNode, "block");
+
+		/* d rwx r-- r-- */
+		mode = S_IRWXU |
+			   S_IRGRP |
+			   S_IROTH |
+			   S_IFDIR;
+		DeviceInode *input = new DeviceInode;
+		input->Parent = devNode;
+		input->ParentInode = devNode->inode;
+		input->Name = "input";
+		input->inode.Device = dev->Device;
+		input->inode.Mode = mode;
+		input->inode.Offset = _dev->Children.size();
+		_dev->Children.push_back(input);
+		devInputNode = fs->Lookup(devNode, "input");
+
+		auto createDevice = [](DeviceInode *p1, Node p2, const std::string &name, dev_t maj, dev_t min, mode_t mode)
+		{
+			DeviceInode *device = new DeviceInode;
+			device->Parent = p2;
+			device->ParentInode = p2->inode;
+			device->Name = name;
+			device->inode.Device = p2->inode->Device;
+			device->inode.Mode = mode;
+			device->inode.SetDevice(maj, min);
+			device->inode.Offset = p1->Children.size();
+			p1->Children.push_back(device);
+		};
+
+		MinorID = 0;
+
+		/* c rw- r-- --- */
+		mode = S_IRUSR | S_IWUSR |
+			   S_IRGRP |
+
+			   S_IFCHR;
+		createDevice(input, devInputNode, "keyboard", DeviceDirID, MinorID++, mode);
+
+		/* c rw- r-- --- */
+		mode = S_IRUSR | S_IWUSR |
+			   S_IRGRP |
+
+			   S_IFCHR;
+		createDevice(input, devInputNode, "mouse", DeviceDirID, MinorID++, mode);
+	}
+}

Kernel/core/driver/driver.cpp

@@ -26,19 +26,84 @@
 #include <exec.hpp>
 #include <rand.hpp>
 #include <cwalk.h>
+#include <sha512.h>
 #include <md5.h>
 
 #include "../../kernel.h"
 
 using namespace vfs;
 
+extern const char *trusted_drivers[];
+extern const __SIZE_TYPE__ trusted_drivers_count;
+
 namespace Driver
 {
+	bool Manager::IsDriverTrusted(Node File)
+	{
+		kstat st;
+		fs->Stat(File, &st);
+		std::unique_ptr<uint8_t[]> ptr(new uint8_t[st.Size]);
+		fs->Read(File, ptr.get(), st.Size, 0);
+		uint8_t *sha = sha512_sum(ptr.get(), st.Size);
+		char hash_str[129];
+		for (int j = 0; j < 64; j++)
+			sprintf(hash_str + j * 2, "%02x", sha[j]);
+		hash_str[128] = '\0';
+
+		for (__SIZE_TYPE__ i = 0; i < trusted_drivers_count; i++)
+		{
+			if (strcmp(hash_str, trusted_drivers[i]) == 0)
+			{
+				kfree(sha);
+				return true;
+			}
+			else
+			{
+				trace("Expected \"%s\" but got \"%s\" for driver %s",
+					  trusted_drivers[i], hash_str, File->GetName().c_str());
+			}
+		}
+
+		kfree(sha);
+		return false;
+	}
+
 	void Manager::PreloadDrivers()
 	{
 		debug("Initializing driver manager");
+
+		auto &bs = __kernel_builtin_drivers_start;
+		auto &be = __kernel_builtin_drivers_end;
+		for (const BuiltInDriver *drv = bs; drv < be; ++drv)
+		{
+			debug("Loading built-in driver %s", drv->Name);
+
+			DriverObject drvObj = {};
+			strncpy(drvObj.Name, drv->Name, sizeof(drvObj.Name));
+			strncpy(drvObj.Description, drv->Description, sizeof(drvObj.Description));
+			strncpy(drvObj.Author, drv->Author, sizeof(drvObj.Author));
+			drvObj.Version.Major = drv->Version.Major;
+			drvObj.Version.Minor = drv->Version.Minor;
+			drvObj.Version.Patch = drv->Version.Patch;
+			drvObj.Entry = drv->Entry;
+			drvObj.Final = drv->Final;
+			drvObj.Panic = drv->Panic;
+			drvObj.Probe = drv->Probe;
+
+			drvObj.IsBuiltIn = true;
+			drvObj.BaseAddress = 0;
+			drvObj.EntryPoint = drv->EntryPoint;
+			drvObj.vma = new Memory::VirtualMemoryArea(thisProcess->PageTable);
+			drvObj.Path = "<builtin>";
+			drvObj.InterruptHandlers = new std::unordered_map<uint8_t, void *>();
+			drvObj.DeviceOperations = new std::unordered_map<dev_t, DriverHandlers>();
+			drvObj.ID = DriverIDCounter;
+			Drivers.insert({DriverIDCounter++, drvObj});
+		}
+
 		const char *DriverDirectory = Config.DriverDirectory;
-		FileNode *drvDirNode = fs->GetByPath(DriverDirectory, nullptr);
+		Node root = fs->GetRoot(0);
+		Node drvDirNode = fs->Lookup(root, DriverDirectory);
 		if (!drvDirNode)
 		{
 			error("Failed to open driver directory %s", DriverDirectory);
@@ -46,25 +111,37 @@ namespace Driver
 			return;
 		}
 
-		foreach (const auto &drvNode in drvDirNode->Children)
+		for (const auto &drvNode : fs->ReadDirectory(drvDirNode))
 		{
 			debug("Checking driver %s", drvNode->Path.c_str());
 			if (!drvNode->IsRegularFile())
 				continue;
 
+			if (std::string(drvNode->Path).find(".drv") == std::string::npos)
+				continue;
+
 			if (Execute::GetBinaryType(drvNode->Path) != Execute::BinTypeELF)
 			{
-				error("Driver %s is not an ELF binary", drvNode->Path.c_str());
+				error("Driver %s is not an ELF binary", drvNode->GetPath().c_str());
 				continue;
 			}
 
-			DriverObject drvObj = {.BaseAddress = 0,
-								   .EntryPoint = 0,
-								   .vma = new Memory::VirtualMemoryArea(thisProcess->PageTable),
-								   .Path = drvNode->Path,
-								   .InterruptHandlers = new std::unordered_map<uint8_t, void *>(),
-								   .DeviceOperations = new std::unordered_map<dev_t, DriverHandlers>(),
-								   .ID = DriverIDCounter};
+			if (!IsDriverTrusted(drvNode))
+			{
+				error("Driver %s is not trusted", drvNode->GetName().c_str());
+				KPrint("%s is not in the list of trusted drivers", drvNode->GetName().c_str());
+				continue;
+			}
+
+			DriverObject drvObj = {};
+			drvObj.IsBuiltIn = false;
+			drvObj.BaseAddress = 0;
+			drvObj.EntryPoint = 0;
+			drvObj.vma = new Memory::VirtualMemoryArea(thisProcess->PageTable);
+			drvObj.Path = drvNode->Path;
+			drvObj.InterruptHandlers = new std::unordered_map<uint8_t, void *>();
+			drvObj.DeviceOperations = new std::unordered_map<dev_t, DriverHandlers>();
+			drvObj.ID = DriverIDCounter;
 
 			int err = this->LoadDriverFile(drvObj, drvNode);
 			debug("err = %d (%s)", err, strerror(err));
@@ -93,7 +170,7 @@ namespace Driver
 			return;
 		}
 
-		foreach (auto &var in Drivers)
+		for (auto &var : Drivers)
 		{
 			DriverObject &Drv = var.second;
 
@@ -111,7 +188,7 @@ namespace Driver
 				continue;
 			}
 
-			KPrint("Loading driver %s", Drv.Name);
+			KPrint("Loading driver %s (%d)", Drv.Name, Drv.ID);
 
 			debug("Calling Probe()=%#lx on driver %s",
 				  Drv.Probe, Drv.Path.c_str());
@@ -148,7 +225,7 @@ namespace Driver
 
 	void Manager::UnloadAllDrivers()
 	{
-		foreach (auto &var in Drivers)
+		for (auto &var : Drivers)
 		{
 			DriverObject *Drv = &var.second;
 			if (!Drv->Initialized)
@@ -164,7 +241,7 @@ namespace Driver
 
 			if (!Drv->InterruptHandlers->empty())
 			{
-				foreach (auto &rInt in * Drv->InterruptHandlers)
+				for (auto &rInt : *Drv->InterruptHandlers)
 				{
 					Interrupts::RemoveHandler((void (*)(CPU::TrapFrame *))rInt.second);
 				}
@@ -180,7 +257,7 @@ namespace Driver
 		if (Drivers.size() == 0)
 			return;
 
-		foreach (auto Driver in Drivers)
+		for (auto Driver : Drivers)
 		{
 			if (!Driver.second.Initialized)
 				continue;
@@ -197,12 +274,12 @@ namespace Driver
 		}
 	}
 
-	int Manager::LoadDriverFile(DriverObject &Drv, FileNode *File)
+	int Manager::LoadDriverFile(DriverObject &Drv, Node File)
 	{
 		trace("Loading driver %s in memory", File->Name.c_str());
 
 		Elf_Ehdr ELFHeader{};
-		File->Read(&ELFHeader, sizeof(Elf_Ehdr), 0);
+		fs->Read(File, &ELFHeader, sizeof(Elf_Ehdr), 0);
 
 		AssertReturnError(ELFHeader.e_ident[EI_CLASS] == ELFCLASS64, -ENOEXEC);
 		AssertReturnError(ELFHeader.e_ident[EI_DATA] == ELFDATA2LSB, -ENOEXEC);
@@ -219,7 +296,7 @@ namespace Driver
 		Elf_Phdr phdr{};
 		for (Elf_Half i = 0; i < ELFHeader.e_phnum; i++)
 		{
-			File->Read(&phdr, sizeof(Elf_Phdr), ELFHeader.e_phoff + (i * sizeof(Elf_Phdr)));
+			fs->Read(File, &phdr, sizeof(Elf_Phdr), ELFHeader.e_phoff + (i * sizeof(Elf_Phdr)));
 			if (phdr.p_type == PT_LOAD || phdr.p_type == PT_DYNAMIC)
 			{
 				if (segSize < phdr.p_vaddr + phdr.p_memsz)
@@ -230,7 +307,7 @@ namespace Driver
 			if (phdr.p_type == PT_INTERP)
 			{
 				char interp[17];
-				File->Read(interp, sizeof(interp), phdr.p_offset);
+				fs->Read(File, interp, sizeof(interp), phdr.p_offset);
 				if (strncmp(interp, "/boot/fennix.elf", sizeof(interp)) != 0)
 				{
 					error("Interpreter is not /boot/fennix.elf");
@@ -250,13 +327,13 @@ namespace Driver
 		Elf_Shdr shstrtab{};
 		Elf_Shdr shdr{};
 		__DriverInfo driverInfo{};
-		File->Read(&shstrtab, sizeof(Elf_Shdr), ELFHeader.e_shoff + (ELFHeader.e_shstrndx * ELFHeader.e_shentsize));
+		fs->Read(File, &shstrtab, sizeof(Elf_Shdr), ELFHeader.e_shoff + (ELFHeader.e_shstrndx * ELFHeader.e_shentsize));
 		for (Elf_Half i = 0; i < ELFHeader.e_shnum; i++)
 		{
 			if (i == ELFHeader.e_shstrndx)
 				continue;
 
-			File->Read(&shdr, ELFHeader.e_shentsize, ELFHeader.e_shoff + (i * ELFHeader.e_shentsize));
+			fs->Read(File, &shdr, ELFHeader.e_shentsize, ELFHeader.e_shoff + (i * ELFHeader.e_shentsize));
 
 			switch (shdr.sh_type)
 			{
@@ -274,11 +351,11 @@ namespace Driver
 			}
 
 			char symName[16];
-			File->Read(symName, sizeof(symName), shstrtab.sh_offset + shdr.sh_name);
+			fs->Read(File, symName, sizeof(symName), shstrtab.sh_offset + shdr.sh_name);
 			if (strcmp(symName, ".driver.info") != 0)
 				continue;
 
-			File->Read(&driverInfo, sizeof(__DriverInfo), shdr.sh_offset);
+			fs->Read(File, &driverInfo, sizeof(__DriverInfo), shdr.sh_offset);
 
 			/* Perform relocations */
 			driverInfo.Name = (const char *)(Drv.BaseAddress + (uintptr_t)driverInfo.Name);
@@ -287,17 +364,17 @@ namespace Driver
 			driverInfo.License = (const char *)(Drv.BaseAddress + (uintptr_t)driverInfo.License);
 		}
 
-		for (size_t h = 0; h < (sht_symtab.sh_size / sizeof(Elf64_Sym)); h++)
+		for (size_t h = 0; h < (sht_symtab.sh_size / sizeof(Elf_Sym)); h++)
 		{
-			Elf64_Sym symEntry{};
-			uintptr_t symOffset = sht_symtab.sh_offset + (h * sizeof(Elf64_Sym));
-			File->Read(&symEntry, sizeof(Elf64_Sym), symOffset);
+			Elf_Sym symEntry{};
+			uintptr_t symOffset = sht_symtab.sh_offset + (h * sizeof(Elf_Sym));
+			fs->Read(File, &symEntry, sizeof(Elf_Sym), symOffset);
 
 			if (symEntry.st_name == 0)
 				continue;
 
 			char symName[16];
-			File->Read(symName, sizeof(symName), sht_strtab.sh_offset + symEntry.st_name);
+			fs->Read(File, symName, sizeof(symName), sht_strtab.sh_offset + symEntry.st_name);
 
 			switch (symEntry.st_shndx)
 			{
@@ -329,7 +406,7 @@ namespace Driver
 
 		for (Elf_Half i = 0; i < ELFHeader.e_phnum; i++)
 		{
-			File->Read(&phdr, sizeof(Elf_Phdr), ELFHeader.e_phoff + (i * sizeof(Elf_Phdr)));
+			fs->Read(File, &phdr, sizeof(Elf_Phdr), ELFHeader.e_phoff + (i * sizeof(Elf_Phdr)));
 
 			switch (phdr.p_type)
 			{
@@ -345,7 +422,7 @@ namespace Driver
 					  phdr.p_filesz, phdr.p_memsz);
 
 				if (phdr.p_filesz > 0)
-					File->Read(dest, phdr.p_filesz, phdr.p_offset);
+					fs->Read(File, (void *)dest, phdr.p_filesz, phdr.p_offset);
 
 				if (phdr.p_memsz - phdr.p_filesz > 0)
 				{
@@ -401,10 +478,10 @@ namespace Driver
 					{
 						AssertReturnError(relaSize != nullptr, -ENOEXEC);
 
-						Elf64_Rela *rela = (Elf64_Rela *)(Drv.BaseAddress + dyn->d_un.d_ptr);
-						for (size_t i = 0; i < (relaSize->d_un.d_val / sizeof(Elf64_Rela)); i++)
+						Elf_Rela *rela = (Elf_Rela *)(Drv.BaseAddress + dyn->d_un.d_ptr);
+						for (size_t i = 0; i < (relaSize->d_un.d_val / sizeof(Elf_Rela)); i++)
 						{
-							Elf64_Rela *r = &rela[i];
+							Elf_Rela *r = &rela[i];
 							uintptr_t *reloc = (uintptr_t *)(Drv.BaseAddress + r->r_offset);
 							uintptr_t relocTarget = 0;
 
@@ -424,8 +501,7 @@ namespace Driver
 							}
 							default:
 							{
-								fixme("Unhandled relocation type: %#lx",
-									  ELF64_R_TYPE(r->r_info));
+								fixme("Unhandled relocation type: %#lx", ELF_R_TYPE(r->r_info));
 								break;
 							}
 							}
@@ -441,26 +517,26 @@ namespace Driver
 					{
 						AssertReturnError(pltrelSize != nullptr, -ENOEXEC);
 
-						std::vector<Elf64_Dyn> symtab = Execute::ELFGetDynamicTag_x86_64(File, DT_SYMTAB);
-						Elf64_Sym *symbols = (Elf64_Sym *)((uintptr_t)Drv.BaseAddress + symtab[0].d_un.d_ptr);
+						std::vector<Elf_Dyn> symtab = Execute::ELFGetDynamicTag(File, DT_SYMTAB);
+						Elf_Sym *symbols = (Elf_Sym *)((uintptr_t)Drv.BaseAddress + symtab[0].d_un.d_ptr);
 
-						std::vector<Elf64_Dyn> StrTab = Execute::ELFGetDynamicTag_x86_64(File, DT_STRTAB);
-						char *DynStr = (char *)((uintptr_t)Drv.BaseAddress + StrTab[0].d_un.d_ptr);
+						std::vector<Elf_Dyn> StrTab = Execute::ELFGetDynamicTag(File, DT_STRTAB);
+						char *dynStr = (char *)((uintptr_t)Drv.BaseAddress + StrTab[0].d_un.d_ptr);
 
-						Elf64_Rela *rela = (Elf64_Rela *)(Drv.BaseAddress + dyn->d_un.d_ptr);
-						for (size_t i = 0; i < (pltrelSize->d_un.d_val / sizeof(Elf64_Rela)); i++)
+						Elf_Rela *rela = (Elf_Rela *)(Drv.BaseAddress + dyn->d_un.d_ptr);
+						for (size_t i = 0; i < (pltrelSize->d_un.d_val / sizeof(Elf_Rela)); i++)
 						{
-							Elf64_Rela *r = &rela[i];
+							Elf_Rela *r = &rela[i];
 							uintptr_t *reloc = (uintptr_t *)(Drv.BaseAddress + r->r_offset);
 
-							switch (ELF64_R_TYPE(r->r_info))
+							switch (ELF_R_TYPE(r->r_info))
 							{
 							case R_X86_64_JUMP_SLOT:
 							{
-								Elf64_Xword symIndex = ELF64_R_SYM(r->r_info);
-								Elf64_Sym *sym = symbols + symIndex;
+								Elf_Xword symIndex = ELF_R_SYM(r->r_info);
+								Elf_Sym *sym = symbols + symIndex;
 
-								const char *symName = DynStr + sym->st_name;
+								const char *symName = dynStr + sym->st_name;
 								debug("Resolving symbol %s", symName);
 
 								*reloc = (uintptr_t)GetSymbolByName(symName, driverInfo.Version.APIVersion);
@@ -468,8 +544,7 @@ namespace Driver
 							}
 							default:
 							{
-								fixme("Unhandled relocation type: %#lx",
-									  ELF64_R_TYPE(r->r_info));
+								fixme("Unhandled relocation type: %#lx", ELF_R_TYPE(r->r_info));
 								break;
 							}
 							}
@@ -514,7 +589,104 @@ namespace Driver
 		return 0;
 	}
 
-	Manager::Manager() { this->InitializeDaemonFS(); }
+	void Manager::ReloadDriver(dev_t driverID)
+	{
+		auto it = Drivers.find(driverID);
+		if (it == Drivers.end())
+		{
+			error("Driver with ID %d not found", driverID);
+			return;
+		}
+
+		DriverObject &Drv = it->second;
+		if (!Drv.Initialized)
+		{
+			error("Driver %s is not initialized", Drv.Name);
+			return;
+		}
+
+		debug("Reloading driver %s", Drv.Name);
+
+		/* Unload the driver */
+		int err = Drv.Final();
+		if (err < 0)
+		{
+			warn("Failed to unload driver %s: %s", Drv.Name, strerror(err));
+		}
+
+		/* Free resources */
+		Drv.vma->FreeAllPages();
+		delete Drv.vma;
+		delete Drv.InterruptHandlers;
+		delete Drv.DeviceOperations;
+
+		/* Reload the driver */
+		Node root = fs->GetRoot(0);
+		Node drvNode = fs->Lookup(root, Drv.Path);
+		if (!drvNode)
+		{
+			error("Failed to open driver file %s", Drv.Path.c_str());
+			return;
+		}
+
+		DriverObject newDrvObj = {};
+		newDrvObj.IsBuiltIn = false;
+		newDrvObj.BaseAddress = 0;
+		newDrvObj.EntryPoint = 0;
+		newDrvObj.vma = new Memory::VirtualMemoryArea(thisProcess->PageTable);
+		newDrvObj.Path = drvNode->Path;
+		newDrvObj.InterruptHandlers = new std::unordered_map<uint8_t, void *>();
+		newDrvObj.DeviceOperations = new std::unordered_map<dev_t, DriverHandlers>();
+		newDrvObj.ID = driverID;
+
+		err = this->LoadDriverFile(newDrvObj, drvNode);
+		if (err != 0)
+		{
+			error("Failed to load driver %s: %s", drvNode->Path.c_str(), strerror(err));
+			delete newDrvObj.vma;
+			delete newDrvObj.InterruptHandlers;
+			delete newDrvObj.DeviceOperations;
+			return;
+		}
+
+		Drivers[driverID] = newDrvObj;
+
+		/* Initialize the driver */
+		int (*DrvInit)(dev_t) = (int (*)(dev_t))newDrvObj.EntryPoint;
+		newDrvObj.ErrorCode = DrvInit(newDrvObj.ID);
+		if (newDrvObj.ErrorCode < 0)
+		{
+			KPrint("FATAL: _start() failed for %s: %s", newDrvObj.Name, strerror(newDrvObj.ErrorCode));
+			error("Failed to load driver %s: %s", newDrvObj.Path.c_str(), strerror(newDrvObj.ErrorCode));
+			newDrvObj.vma->FreeAllPages();
+			return;
+		}
+
+		KPrint("Loading driver %s", newDrvObj.Name);
+
+		newDrvObj.ErrorCode = newDrvObj.Probe();
+		if (newDrvObj.ErrorCode < 0)
+		{
+			KPrint("Probe() failed for %s: %s", newDrvObj.Name, strerror(newDrvObj.ErrorCode));
+			error("Failed to probe driver %s: %s", newDrvObj.Path.c_str(), strerror(newDrvObj.ErrorCode));
+			newDrvObj.vma->FreeAllPages();
+			return;
+		}
+
+		newDrvObj.ErrorCode = newDrvObj.Entry();
+		if (newDrvObj.ErrorCode < 0)
+		{
+			KPrint("Entry() failed for %s: %s", newDrvObj.Name, strerror(newDrvObj.ErrorCode));
+			error("Failed to initialize driver %s: %s", newDrvObj.Path.c_str(), strerror(newDrvObj.ErrorCode));
+			newDrvObj.vma->FreeAllPages();
+			return;
+		}
+
+		debug("Reloaded driver %s", newDrvObj.Path.c_str());
+		newDrvObj.Initialized = true;
+	}
+
+	Manager::Manager() { this->InitializeDeviceDirectory(); }
 
 	Manager::~Manager()
 	{

Kernel/core/driver/manager.cpp

@@ -0,0 +1,256 @@
+/*
+	This file is part of Fennix Kernel.
+
+	Fennix Kernel is free software: you can redistribute it and/or
+	modify it under the terms of the GNU General Public License as
+	published by the Free Software Foundation, either version 3 of
+	the License, or (at your option) any later version.
+
+	Fennix Kernel is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with Fennix Kernel. If not, see <https://www.gnu.org/licenses/>.
+*/
+
+#include <driver.hpp>
+
+#include <interface/driver.h>
+#include <interface/input.h>
+#include <memory.hpp>
+#include <stropts.h>
+#include <ints.hpp>
+#include <task.hpp>
+#include <printf.h>
+#include <exec.hpp>
+#include <rand.hpp>
+#include <cwalk.h>
+#include <md5.h>
+
+#include "../../kernel.h"
+
+using namespace vfs;
+
+namespace Driver
+{
+	dev_t Manager::RegisterDevice(dev_t DriverID, DeviceType Type, const InodeOperations *Operations)
+	{
+		std::unordered_map<dev_t, Driver::DriverObject> &drivers = DriverManager->GetDrivers();
+		const auto it = drivers.find(DriverID);
+		if (it == drivers.end())
+			ReturnLogError(-EINVAL, "Driver %d not found", DriverID);
+		const Driver::DriverObject *drv = &it->second;
+
+		auto dop = drv->DeviceOperations;
+		for (size_t i = 0; i < 128; i++)
+		{
+			const auto dOps = dop->find(i);
+			const auto dOpsEnd = dop->end();
+			if (dOps != dOpsEnd)
+				continue;
+
+			DeviceType devType = (DeviceType)(Type & DEVICE_TYPE_MASK);
+			switch (devType)
+			{
+			case DEVICE_TYPE_INPUT:
+			{
+				std::string prefix = "event";
+				for (size_t j = 0; j < 128; j++)
+				{
+					std::string deviceName = prefix + std::to_string(j);
+					Node node = fs->Lookup(devInputNode, deviceName);
+					if (node)
+						continue;
+
+					/* c rwx r-- r-- */
+					mode_t mode = S_IRWXU |
+								  S_IRGRP |
+								  S_IROTH |
+								  S_IFCHR;
+
+					node = fs->Create(devInputNode, deviceName, mode);
+					node->inode->SetDevice(DriverID, i);
+
+					DriverHandlers dh{};
+					dh.Ops = Operations;
+					dh.Node = node->inode;
+					dh.InputReports = new RingBuffer<InputReport>(16);
+					dop->insert({i, std::move(dh)});
+					return i;
+				}
+
+				ReturnLogError(-EOVERFLOW, "No available slots for device %d", DriverID);
+			}
+			default:
+				ReturnLogError(-EINVAL, "Invalid device type %d", Type);
+			}
+		}
+
+		ReturnLogError(-EOVERFLOW, "No available slots for device %d", DriverID);
+	}
+
+	dev_t Manager::CreateDeviceFile(dev_t DriverID, const char *name, mode_t mode, const InodeOperations *Operations)
+	{
+		std::unordered_map<dev_t, Driver::DriverObject> &drivers = DriverManager->GetDrivers();
+		const auto it = drivers.find(DriverID);
+		if (it == drivers.end())
+			ReturnLogError(-EINVAL, "Driver %d not found", DriverID);
+		const Driver::DriverObject *drv = &it->second;
+
+		auto dop = drv->DeviceOperations;
+		for (size_t i = 0; i < 128; i++)
+		{
+			const auto dOps = dop->find(i);
+			if (dOps != dop->end())
+				continue;
+
+			eNode node = fs->Lookup(devNode, name);
+			if (node == true)
+				ReturnLogError(-EEXIST, "Device file %s already exists", name);
+
+			node = fs->Create(devNode, name, mode);
+			if (node == false)
+				ReturnLogError(-node.Error, "Failed to create device file %s; %s", name, node.what());
+
+			node.Value->inode->SetDevice(DriverID, i);
+
+			DriverHandlers dh{};
+			dh.Ops = Operations;
+			dh.Node = node.Value->inode;
+			dh.InputReports = new RingBuffer<InputReport>(16);
+			dop->insert({i, std::move(dh)});
+			return i;
+		}
+
+		ReturnLogError(-EOVERFLOW, "No available slots for device %d", DriverID);
+	}
+
+	int Manager::UnregisterDevice(dev_t DriverID, dev_t Device)
+	{
+		std::unordered_map<dev_t, Driver::DriverObject> &drivers = DriverManager->GetDrivers();
+		const auto it = drivers.find(DriverID);
+		if (it == drivers.end())
+			ReturnLogError(-EINVAL, "Driver %d not found", DriverID);
+		const Driver::DriverObject *drv = &it->second;
+
+		auto dop = drv->DeviceOperations;
+		const auto dOps = dop->find(Device);
+		if (dOps == dop->end())
+			ReturnLogError(-EINVAL, "Device %d not found", Device);
+		dop->erase(dOps);
+		fixme("remove eventX from /dev/input");
+		fixme("delete InputReports");
+		return 0;
+	}
+
+	dev_t Manager::RegisterBlockDevice(dev_t DriverID, struct BlockDevice *Device)
+	{
+		std::unordered_map<dev_t, Driver::DriverObject> &drivers = DriverManager->GetDrivers();
+		const auto it = drivers.find(DriverID);
+		if (it == drivers.end())
+			ReturnLogError(-EINVAL, "Driver %d not found", DriverID);
+		const Driver::DriverObject *drv = &it->second;
+
+		auto dop = drv->DeviceOperations;
+		std::string prefix = Device->Name;
+		for (size_t j = 0; j < 128; j++)
+		{
+			std::string deviceName = prefix + std::to_string(j);
+			Node node = fs->Lookup(devBlockNode, deviceName);
+			if (node)
+				continue;
+			debug("Creating \"%s\"", deviceName.c_str());
+
+			/* b rwx --- --- */
+			mode_t mode = S_IRWXU |
+						  S_IFBLK;
+
+			node = fs->Create(devBlockNode, deviceName, mode);
+			node->inode->SetDevice(DriverID, j);
+			auto devNode = (Manager::DeviceInode *)node->inode;
+			devNode->Size = Device->Size;
+			devNode->BlockSize = Device->BlockSize;
+			devNode->Blocks = Device->BlockCount;
+			devNode->inode.PrivateData = Device->PrivateData;
+
+			DriverHandlers dh{};
+			dh.Ops = Device->Ops;
+			dh.Node = node->inode;
+			dop->insert({j, std::move(dh)});
+			debug("dh ops:%#lx node:%#lx %d", dh.Ops, dh.Node, j);
+			return j;
+		}
+
+		ReturnLogError(-EOVERFLOW, "No available slots for device %d", DriverID);
+	}
+
+	int Manager::UnregisterBlockDevice(dev_t DriverID, dev_t DeviceID)
+	{
+		std::unordered_map<dev_t, Driver::DriverObject> &drivers = DriverManager->GetDrivers();
+		const auto it = drivers.find(DriverID);
+		if (it == drivers.end())
+			ReturnLogError(-EINVAL, "Driver %d not found", DriverID);
+		const Driver::DriverObject *drv = &it->second;
+
+		auto dop = drv->DeviceOperations;
+		const auto dOps = dop->find(DeviceID);
+		if (dOps == dop->end())
+			ReturnLogError(-EINVAL, "Device %d not found", DeviceID);
+		dop->erase(dOps);
+		return 0;
+	}
+
+	void *Manager::AllocateMemory(dev_t DriverID, size_t Pages)
+	{
+		auto itr = Drivers.find(DriverID);
+		assert(itr != Drivers.end());
+		void *ptr = itr->second.vma->RequestPages(Pages);
+		memset(ptr, 0, FROM_PAGES(Pages));
+		return ptr;
+	}
+
+	void Manager::FreeMemory(dev_t DriverID, void *Pointer, size_t Pages)
+	{
+		auto itr = Drivers.find(DriverID);
+		assert(itr != Drivers.end());
+		itr->second.vma->FreePages(Pointer, Pages);
+	}
+
+	int Manager::ReportInputEvent(dev_t DriverID, InputReport *Report)
+	{
+		std::unordered_map<dev_t, Driver::DriverObject> &drivers =
+			DriverManager->GetDrivers();
+		const auto it = drivers.find(DriverID);
+		if (it == drivers.end())
+			ReturnLogError(-EINVAL, "Driver %d not found", DriverID);
+		const Driver::DriverObject *drv = &it->second;
+
+		auto dop = drv->DeviceOperations;
+		auto dOps = dop->find(Report->Device);
+		if (dOps == dop->end())
+			ReturnLogError(-EINVAL, "Device %d not found", Report->Device);
+
+		dOps->second.InputReports->Write(Report, 1);
+
+		switch (Report->Type)
+		{
+		case INPUT_TYPE_KEYBOARD:
+		{
+			KeyboardReport *kReport = &Report->Keyboard;
+			GlobalKeyboardInputReports.Write(kReport, 1);
+			break;
+		}
+		case INPUT_TYPE_MOUSE:
+		{
+			MouseReport *mReport = &Report->Mouse;
+			GlobalMouseInputReports.Write(mReport, 1);
+			break;
+		}
+		default:
+			assert(!"Invalid input type");
+		}
+		return 0;
+	}
+}

Kernel/core/driver/scancode.cpp

@@ -331,6 +331,80 @@ namespace Driver
 				   : ScanCodeConversionTableLower[ScanCode];
 	}
 
+	char GetControlCharacter(KeyScanCodes ScanCode)
+	{
+		ScanCode = static_cast<KeyScanCodes>(static_cast<int>(ScanCode) & 0x7F); /* Remove KEY_PRESSED bit */
+		switch (ScanCode)
+		{
+		case KEY_2:
+			return 0x00; /* Ctrl-@ (NUL) */
+		case KEY_A:
+			return 0x01; /* Ctrl-A (SOH) */
+		case KEY_B:
+			return 0x02; /* Ctrl-B (STX) */
+		case KEY_C:
+			return 0x03; /* Ctrl-C (ETX) */
+		case KEY_D:
+			return 0x04; /* Ctrl-D (EOT) */
+		case KEY_E:
+			return 0x05; /* Ctrl-E (ENQ) */
+		case KEY_F:
+			return 0x06; /* Ctrl-F (ACK) */
+		case KEY_G:
+			return 0x07; /* Ctrl-G (BEL) */
+		case KEY_H:
+			return 0x08; /* Ctrl-H (BS) */
+		case KEY_I:
+			return 0x09; /* Ctrl-I (HT) */
+		case KEY_J:
+			return 0x0A; /* Ctrl-J (LF) */
+		case KEY_K:
+			return 0x0B; /* Ctrl-K (VT) */
+		case KEY_L:
+			return 0x0C; /* Ctrl-L (FF) */
+		case KEY_M:
+			return 0x0D; /* Ctrl-M (CR) */
+		case KEY_N:
+			return 0x0E; /* Ctrl-N (SO) */
+		case KEY_O:
+			return 0x0F; /* Ctrl-O (SI) */
+		case KEY_P:
+			return 0x10; /* Ctrl-P (DLE) */
+		case KEY_Q:
+			return 0x11; /* Ctrl-Q (DC1) */
+		case KEY_R:
+			return 0x12; /* Ctrl-R (DC2) */
+		case KEY_S:
+			return 0x13; /* Ctrl-S (DC3) */
+		case KEY_T:
+			return 0x14; /* Ctrl-T (DC4) */
+		case KEY_U:
+			return 0x15; /* Ctrl-U (NAK) */
+		case KEY_V:
+			return 0x16; /* Ctrl-V (SYN) */
+		case KEY_W:
+			return 0x17; /* Ctrl-W (ETB) */
+		case KEY_X:
+			return 0x18; /* Ctrl-X (CAN) */
+		case KEY_Y:
+			return 0x19; /* Ctrl-Y (EM) */
+		case KEY_Z:
+			return 0x1A; /* Ctrl-Z (SUB) */
+		case KEY_LEFT_BRACKET:
+			return 0x1B; /* Ctrl-[ (ESC) */
+		case KEY_BACKSLASH:
+			return 0x1C; /* Ctrl-\ (FS) */
+		case KEY_RIGHT_BRACKET:
+			return 0x1D; /* Ctrl-] (GS) */
+		case KEY_6:
+			return 0x1E; /* Ctrl-^ (RS) */
+		case KEY_MINUS:
+			return 0x1F; /* Ctrl-_ (US) */
+		default:
+			return 0x00; /* Not a control character */
+		}
+	}
+
 	bool IsValidChar(uint8_t ScanCode)
 	{
 		ScanCode &= 0x7F; /* Remove KEY_PRESSED bit */

Kernel/core/interrupts_manager.cpp

@@ -191,7 +191,7 @@ namespace Interrupts
 					void *ctx, bool Critical)
 	{
 		/* Just log a warning if the interrupt is already registered. */
-		foreach (auto ev in RegisteredEvents)
+		for (auto ev : RegisteredEvents)
 		{
 			if (ev.IRQ == InterruptNumber &&
 				ev.Callback == Callback)
@@ -264,7 +264,7 @@ namespace Interrupts
 		warn("IRQ%d not found.", InterruptNumber);
 	}
 
-	nsa inline void ReturnFromInterrupt()
+	nsa hot inline void ReturnFromInterrupt()
 	{
 #if defined(__amd64__) || defined(__i386__)
 		CPUData *CoreData = GetCurrentCPU();
@@ -279,7 +279,7 @@ namespace Interrupts
 								  { return a.Priority < b.Priority; });
 
 #ifdef DEBUG
-			foreach (auto ev in RegisteredEvents)
+			for (auto ev : RegisteredEvents)
 			{
 				void *fct = ev.IsHandler
 								? ev.Data
@@ -309,7 +309,7 @@ namespace Interrupts
 		CPU::Stop();
 	}
 
-	extern "C" nsa void MainInterruptHandler(void *Data)
+	extern "C" nsa hot void MainInterruptHandler(void *Data)
 	{
 		class AutoSwitchPageTable
 		{
@@ -384,7 +384,7 @@ namespace Interrupts
 #endif
 	}
 
-	extern "C" nsa void SchedulerInterruptHandler(void *Data)
+	extern "C" nsa hot void SchedulerInterruptHandler(void *Data)
 	{
 #if defined(__amd64__) || defined(__i386__)
 		KernelPageTable->Update();
@@ -421,13 +421,12 @@ namespace Interrupts
 
 	Handler::Handler(int InterruptNumber, bool Critical)
 	{
-		foreach (auto ev in RegisteredEvents)
+		for (auto ev : RegisteredEvents)
 		{
-			if (ev.IRQ == InterruptNumber)
-			{
-				warn("IRQ%d is already registered.",
-					 InterruptNumber);
-			}
+			if (ev.IRQ != InterruptNumber)
+				continue;
+
+			warn("IRQ%d is already registered.", InterruptNumber);
 		}
 
 		this->InterruptNumber = InterruptNumber;
@@ -441,15 +440,12 @@ namespace Interrupts
 			 0,				  /* Priority */
 			 Critical};		  /* Critical */
 		RegisteredEvents.push_back(newEvent);
-		debug("Registered interrupt handler for IRQ%d.",
-			  InterruptNumber);
+		debug("Registered interrupt handler for IRQ%d.", InterruptNumber);
 	}
 
 	Handler::Handler(PCI::PCIDevice Device, bool Critical)
+		: Handler(((PCI::PCIHeader0 *)Device.Header)->InterruptLine, Critical)
 	{
-		PCI::PCIHeader0 *hdr0 =
-			(PCI::PCIHeader0 *)Device.Header;
-		Handler(hdr0->InterruptLine, Critical);
 	}
 
 	Handler::Handler()
@@ -459,17 +455,15 @@ namespace Interrupts
 
 	Handler::~Handler()
 	{
-		debug("Unregistering interrupt handler for IRQ%d.",
-			  this->InterruptNumber);
-
+		debug("Unregistering interrupt handler for IRQ%d.", this->InterruptNumber);
 		forItr(itr, RegisteredEvents)
 		{
-			if (itr->IRQ == this->InterruptNumber)
-			{
+			if (itr->IRQ != this->InterruptNumber)
+				continue;
+
 			RegisteredEvents.erase(itr);
 			return;
 		}
-		}
 		warn("Event %d not found.", this->InterruptNumber);
 	}
 

Kernel/core/lock.cpp

@@ -195,7 +195,7 @@ void LockClass::TimeoutDeadLock(SpinLockData &Lock, uint64_t Timeout)
 	if (CoreData != nullptr)
 		CCore = CoreData->ID;
 
-	uint64_t Counter = TimeManager->GetCounter();
+	uint64_t Counter = TimeManager->GetTimeNs();
 
 	warn("Potential deadlock in lock '%s' held by '%s'! %ld %s in queue. Interrupts are %s. Core %ld held by %ld. Timeout in %ld (%ld ticks remaining).",
 		 Lock.AttemptingToGet, Lock.CurrentHolder, Lock.Count, Lock.Count > 1 ? "locks" : "lock",
@@ -235,8 +235,7 @@ Retry:
 	if (i >= DEADLOCK_TIMEOUT)
 	{
 		if (Target.load() == 0)
-			Target.store(TimeManager->CalculateTarget(Timeout,
-													  Time::Units::Milliseconds));
+			Target.store(TimeManager->GetTimeNs() + Timeout);
 		TimeoutDeadLock(LockData, Target.load());
 		goto Retry;
 	}

Kernel/core/memory/find_bitmap_region.cpp

@@ -28,8 +28,7 @@
 
 namespace Memory
 {
-	__no_sanitize("alignment") void Physical::FindBitmapRegion(uintptr_t &BitmapAddress,
-															   size_t &BitmapAddressSize)
+	__no_sanitize("alignment") void Physical::FindBitmapRegion(uintptr_t &BitmapAddress, size_t &BitmapAddressSize)
 	{
 		size_t BitmapSize = (size_t)(bInfo.Memory.Size / PAGE_SIZE) / 8 + 1;
 
@@ -47,24 +46,19 @@ namespace Memory
 		uintptr_t RSDPStart = 0x0;
 		uintptr_t RSDPEnd = 0x0;
 
-		if (bInfo.Kernel.Symbols.Num &&
-			bInfo.Kernel.Symbols.EntSize &&
-			bInfo.Kernel.Symbols.Shndx)
+		if (bInfo.Kernel.Symbols.Num && bInfo.Kernel.Symbols.EntSize && bInfo.Kernel.Symbols.Shndx)
 		{
 			char *sections = r_cst(char *, bInfo.Kernel.Symbols.Sections);
 
 			SectionsStart = (uintptr_t)sections;
-			SectionsEnd = (uintptr_t)sections + bInfo.Kernel.Symbols.EntSize *
-													bInfo.Kernel.Symbols.Num;
+			SectionsEnd = (uintptr_t)sections + bInfo.Kernel.Symbols.EntSize * bInfo.Kernel.Symbols.Num;
 
 			for (size_t i = 0; i < bInfo.Kernel.Symbols.Num; ++i)
 			{
 				Elf_Shdr *sym = (Elf_Shdr *)&sections[bInfo.Kernel.Symbols.EntSize * i];
-				Elf_Shdr *str = (Elf_Shdr *)&sections[bInfo.Kernel.Symbols.EntSize *
-													  sym->sh_link];
+				Elf_Shdr *str = (Elf_Shdr *)&sections[bInfo.Kernel.Symbols.EntSize * sym->sh_link];
 
-				if (sym->sh_type == SHT_SYMTAB &&
-					str->sh_type == SHT_STRTAB)
+				if (sym->sh_type == SHT_SYMTAB && str->sh_type == SHT_STRTAB)
 				{
 					Symbols = (uintptr_t)sym->sh_addr;
 					StringAddress = (uintptr_t)str->sh_addr;
@@ -95,8 +89,7 @@ namespace Memory
 
 			if (Memory::Virtual().Check(ACPIPtr))
 			{
-				size_t TableSize = ((ACPIPtr->Length - sizeof(ACPI::ACPI::ACPIHeader)) /
-									(XSDT ? 8 : 4));
+				size_t TableSize = ((ACPIPtr->Length - sizeof(ACPI::ACPI::ACPIHeader)) / (XSDT ? 8 : 4));
 				debug("There are %d ACPI tables", TableSize);
 			}
 #endif
@@ -131,6 +124,7 @@ namespace Memory
 				{
 					uintptr_t Start;
 					uintptr_t End;
+					char Description[16];
 				};
 
 				auto SortAddresses = [](AddrRange *Array, size_t n)
@@ -151,62 +145,58 @@ namespace Memory
 
 				AddrRange PtrArray[] =
 					{
-						{KernelStart,
-						 KernelEnd},
-						{SectionsStart,
-						 SectionsEnd},
-						{Symbols,
-						 Symbols + SymbolSize},
-						{StringAddress,
-						 StringAddress + StringSize},
-						{RSDPStart,
-						 RSDPEnd},
-						{(uintptr_t)bInfo.Kernel.FileBase,
-						 (uintptr_t)bInfo.Kernel.FileBase + bInfo.Kernel.Size},
-						{(uintptr_t)bInfo.Modules[0].Address,
-						 (uintptr_t)bInfo.Modules[0].Address + bInfo.Modules[0].Size},
-						{(uintptr_t)bInfo.Modules[1].Address,
-						 (uintptr_t)bInfo.Modules[1].Address + bInfo.Modules[1].Size},
-						{(uintptr_t)bInfo.Modules[2].Address,
-						 (uintptr_t)bInfo.Modules[2].Address + bInfo.Modules[2].Size},
-						{(uintptr_t)bInfo.Modules[3].Address,
-						 (uintptr_t)bInfo.Modules[3].Address + bInfo.Modules[3].Size},
+						{KernelStart, KernelEnd, "kernel"},
+						{SectionsStart, SectionsEnd, "sections"},
+						{Symbols, Symbols + SymbolSize, "symbols"},
+						{StringAddress, StringAddress + StringSize, "string"},
+						{RSDPStart, RSDPEnd, "rsdp"},
+						{(uintptr_t)bInfo.Kernel.FileBase, (uintptr_t)bInfo.Kernel.FileBase + bInfo.Kernel.Size, "file"},
+						{(uintptr_t)bInfo.Modules[0].Address, (uintptr_t)bInfo.Modules[0].Address + bInfo.Modules[0].Size, "module 0"},
+						{(uintptr_t)bInfo.Modules[1].Address, (uintptr_t)bInfo.Modules[1].Address + bInfo.Modules[1].Size, "module 1"},
+						{(uintptr_t)bInfo.Modules[2].Address, (uintptr_t)bInfo.Modules[2].Address + bInfo.Modules[2].Size, "module 2"},
+						{(uintptr_t)bInfo.Modules[3].Address, (uintptr_t)bInfo.Modules[3].Address + bInfo.Modules[3].Size, "module 3"},
 						/* MAX_MODULES == 4 */
 					};
 
 				SortAddresses(PtrArray, sizeof(PtrArray) / sizeof(PtrArray[0]));
 
+				uintptr_t MaxEnd = RegionAddress;
 				for (size_t i = 0; i < sizeof(PtrArray) / sizeof(PtrArray[0]); i++)
 				{
 					if (PtrArray[i].Start == 0x0)
+					{
+						debug("skipping %#lx %zu %s", PtrArray[i].Start, i, PtrArray[i].Description);
 						continue;
+					}
 
 					uintptr_t Start = PtrArray[i].Start;
 					uintptr_t End = PtrArray[i].End;
-					debug("%#lx - %#lx", Start, End);
+					debug("[%s] %#lx - %#lx", PtrArray[i].Description, Start, End);
 
-					if (RegionAddress >= Start &&
-						End <= (RegionAddress + RegionSize))
+					if ((Start < (RegionAddress + RegionSize)) && (End > RegionAddress))
 					{
-						BitmapAddress = End;
-						BitmapAddressSize = RegionSize - (End - RegionAddress);
+						if (End > MaxEnd)
+							MaxEnd = End;
 					}
 				}
 
+				if (MaxEnd >= RegionAddress && MaxEnd < (RegionAddress + RegionSize))
+				{
+					BitmapAddress = MaxEnd;
+					BitmapAddressSize = RegionAddress + RegionSize - MaxEnd;
+
+					debug("BitmapAddress = %#lx; Size = %zu", BitmapAddress, BitmapAddressSize);
+
 					if ((BitmapSize + 0x100) > BitmapAddressSize)
 					{
-					debug("Region %p-%p (%d MiB) is too small for bitmap.",
-						  (void *)BitmapAddress,
-						  (void *)(BitmapAddress + BitmapAddressSize),
-						  TO_MiB(BitmapAddressSize));
+						debug("Region %#lx-%#lx (%d MiB) is too small for bitmap.", BitmapAddress, BitmapAddress + BitmapAddressSize, TO_MiB(BitmapAddressSize));
 						continue;
 					}
 
-				debug("Found free memory for bitmap: %p (%d MiB)",
-					  (void *)BitmapAddress,
-					  TO_MiB(BitmapAddressSize));
+					debug("Found free memory for bitmap: %#lx (%d MiB)", BitmapAddress, TO_MiB(BitmapAddressSize));
 					break;
 				}
 			}
 		}
 	}
+}

Kernel/core/memory/memory.cpp

@@ -52,7 +52,7 @@ Xalloc::V1 *XallocV1Allocator = nullptr;
 Xalloc::V2 *XallocV2Allocator = nullptr;
 
 #ifdef DEBUG
-NIF void tracepagetable(PageTable *pt)
+nif void tracepagetable(PageTable *pt)
 {
 	for (int i = 0; i < 512; i++)
 	{
@@ -71,7 +71,7 @@ NIF void tracepagetable(PageTable *pt)
 }
 #endif
 
-NIF void MapEntries(PageTable *PT)
+nif void MapEntries(PageTable *PT)
 {
 	debug("mapping %d memory entries", bInfo.Memory.Entries);
 	Virtual vmm = Virtual(PT);
@@ -89,7 +89,7 @@ NIF void MapEntries(PageTable *PT)
 	vmm.Unmap((void *)0);
 }
 
-NIF void MapFramebuffer(PageTable *PT)
+nif void MapFramebuffer(PageTable *PT)
 {
 	debug("Mapping Framebuffer");
 	Virtual vmm = Virtual(PT);
@@ -123,7 +123,7 @@ NIF void MapFramebuffer(PageTable *PT)
 	}
 }
 
-NIF void MapKernel(PageTable *PT)
+nif void MapKernel(PageTable *PT)
 {
 	debug("Mapping Kernel");
 
@@ -237,7 +237,7 @@ NIF void MapKernel(PageTable *PT)
 		info("Cannot determine kernel file address. Ignoring.");
 }
 
-NIF void CreatePageTable(PageTable *pt)
+nif void CreatePageTable(PageTable *pt)
 {
 	static int check_cpuid = 0;
 
@@ -286,7 +286,7 @@ NIF void CreatePageTable(PageTable *pt)
 #endif
 }
 
-NIF void InitializeMemoryManagement()
+nif void InitializeMemoryManagement()
 {
 #ifdef DEBUG
 #ifndef __i386__
@@ -340,7 +340,7 @@ NIF void InitializeMemoryManagement()
 	KernelAllocator.Init();
 	debug("Memory Info:\n\n%lld MiB / %lld MiB (%lld MiB reserved)\n",
 		  TO_MiB(KernelAllocator.GetUsedMemory()),
-		  TO_MiB(KernelAllocator.GetTotalMemory()),
+		  TO_MiB(KernelAllocator.GetTotalMemory() - KernelAllocator.GetReservedMemory()),
 		  TO_MiB(KernelAllocator.GetReservedMemory()));
 
 	/* -- Debugging --
@@ -361,8 +361,7 @@ NIF void InitializeMemoryManagement()
 
 	CreatePageTable(KernelPageTable);
 
-	trace("Applying new page table from address %#lx",
-		  KernelPageTable);
+	trace("Applying new page table from address %#lx", KernelPageTable);
 	CPU::PageTable(KernelPageTable);
 	debug("Page table updated.");
 

Kernel/core/memory/page_table.cpp

@@ -1,6 +1,6 @@
 #include <memory.hpp>
 
-#include <filesystem.hpp>
+#include <fs/vfs.hpp>
 #include <signal.hpp>
 #include <utsname.h>
 #include <time.h>

Kernel/core/memory/pmm.cpp

@@ -264,7 +264,7 @@ namespace Memory
 			uintptr_t Index = ((uintptr_t)Address + (t * PAGE_SIZE)) / PAGE_SIZE;
 
 			if (unlikely(PageBitmap[Index] == true))
-				return;
+				continue;
 
 			if (PageBitmap.Set(Index, true))
 			{
@@ -322,8 +322,7 @@ namespace Memory
 		SmartLock(this->MemoryLock);
 
 		uint64_t MemorySize = bInfo.Memory.Size;
-		debug("Memory size: %lld bytes (%ld pages)",
-			  MemorySize, TO_PAGES(MemorySize));
+		debug("Memory size: %lld bytes (%ld pages)", MemorySize, TO_PAGES(MemorySize));
 		TotalMemory.store(MemorySize);
 		FreeMemory.store(MemorySize);
 
@@ -338,16 +337,10 @@ namespace Memory
 			CPU::Stop();
 		}
 
-		debug("Initializing Bitmap at %p-%p (%d Bytes)",
-			  BitmapAddress,
-			  (void *)(BitmapAddress + BitmapSize),
-			  BitmapSize);
-
+		debug("Initializing Bitmap at %#lx-%#lx (%zu Bytes)", BitmapAddress, BitmapAddress + BitmapSize, BitmapSize);
 		PageBitmap.Size = BitmapSize;
 		PageBitmap.Buffer = (uint8_t *)BitmapAddress;
-		for (size_t i = 0; i < BitmapSize; i++)
-			*(uint8_t *)(PageBitmap.Buffer + i) = 0;
-
+		memset((void *)BitmapAddress, 0, BitmapSize);
 		ReserveEssentials();
 	}
 

Kernel/core/memory/reserve_essentials.cpp

@@ -80,12 +80,9 @@ namespace Memory
 		{
 			char *sections = r_cst(char *, bInfo.Kernel.Symbols.Sections);
 			debug("Reserving sections region %#lx-%#lx...",
-				  sections,
-				  (void *)((uintptr_t)sections + bInfo.Kernel.Symbols.EntSize *
-													 bInfo.Kernel.Symbols.Num));
+				  sections, (uintptr_t)sections + bInfo.Kernel.Symbols.EntSize * bInfo.Kernel.Symbols.Num);
 
-			this->ReservePages(sections, TO_PAGES(bInfo.Kernel.Symbols.EntSize *
-												  bInfo.Kernel.Symbols.Num));
+			this->ReservePages(sections, TO_PAGES(bInfo.Kernel.Symbols.EntSize * bInfo.Kernel.Symbols.Num));
 
 			Elf_Sym *Symbols = nullptr;
 			uint8_t *StringAddress = nullptr;
@@ -101,11 +98,9 @@ namespace Memory
 			for (size_t i = 0; i < bInfo.Kernel.Symbols.Num; ++i)
 			{
 				Elf_Shdr *sym = (Elf_Shdr *)&sections[bInfo.Kernel.Symbols.EntSize * i];
-				Elf_Shdr *str = (Elf_Shdr *)&sections[bInfo.Kernel.Symbols.EntSize *
-													  sym->sh_link];
+				Elf_Shdr *str = (Elf_Shdr *)&sections[bInfo.Kernel.Symbols.EntSize * sym->sh_link];
 
-				if (sym->sh_type == SHT_SYMTAB &&
-					str->sh_type == SHT_STRTAB)
+				if (sym->sh_type == SHT_SYMTAB && str->sh_type == SHT_STRTAB)
 				{
 					Symbols = (Elf_Sym *)sym->sh_addr;
 					StringAddress = (uint8_t *)str->sh_addr;
@@ -145,8 +140,7 @@ namespace Memory
 				  bInfo.Modules[i].Address,
 				  (void *)((uintptr_t)bInfo.Modules[i].Address + bInfo.Modules[i].Size));
 
-			this->ReservePages((void *)bInfo.Modules[i].Address,
-							   TO_PAGES(bInfo.Modules[i].Size));
+			this->ReservePages((void *)bInfo.Modules[i].Address, TO_PAGES(bInfo.Modules[i].Size));
 		}
 
 #if defined(__amd64__) || defined(__i386__)
@@ -200,6 +194,15 @@ namespace Memory
 #pragma GCC diagnostic pop
 				this->ReservePages(SDTHdr, TO_PAGES(SDTHdr->Length));
 			}
+
+			if (bInfo.EFI.Info.Enabled)
+			{
+				debug("Reserving EFI related...");
+				if (bInfo.EFI.Info.IH)
+					this->ReservePage(bInfo.EFI.ImageHandle);
+				if (bInfo.EFI.Info.ST)
+					this->ReservePage(bInfo.EFI.SystemTable);
+			}
 		}
 #elif defined(__aarch64__)
 #endif

Kernel/core/memory/stack_guard.cpp

@@ -79,7 +79,7 @@ namespace Memory
 		this->Expanded = Parent->Expanded;
 
 		std::list<AllocatedPages> ParentAllocatedPages = Parent->GetAllocatedPages();
-		foreach (auto Page in ParentAllocatedPages)
+		for (auto Page : ParentAllocatedPages)
 		{
 			void *NewPhysical = vma->RequestPages(1);
 			debug("Forking address %#lx to %#lx", Page.PhysicalAddress, NewPhysical);

Kernel/core/memory/va.cpp

@@ -82,7 +82,7 @@ namespace Memory
 		func("%#lx, %lld", Address, Count);
 
 		SmartLock(MgrLock);
-		foreach (auto &apl in AllocatedPagesList)
+		for (auto &apl : AllocatedPagesList)
 		{
 			if (apl.VirtualAddress != Address)
 				continue;
@@ -128,7 +128,7 @@ namespace Memory
 		/* No need to remap pages, the page table will be destroyed */
 
 		Virtual vmm(this->Table);
-		foreach (auto ap in AllocatedPagesList)
+		for (auto ap : AllocatedPagesList)
 		{
 			KernelAllocator.FreePages(ap.PhysicalAddress, ap.PageCount);
 

Kernel/core/memory/vma.cpp

@@ -29,7 +29,7 @@ namespace Memory
 	{
 		SmartLock(MgrLock);
 		uint64_t Size = 0;
-		foreach (auto ap in AllocatedPagesList)
+		for (auto ap : AllocatedPagesList)
 			Size += ap.PageCount;
 		return FROM_PAGES(Size);
 	}
@@ -214,7 +214,7 @@ namespace Memory
 			return false;
 		}
 
-		foreach (auto sr in SharedRegions)
+		for (auto sr : SharedRegions)
 		{
 			uintptr_t Start = (uintptr_t)sr.Address;
 			uintptr_t End = (uintptr_t)sr.Address + sr.Length;
@@ -263,7 +263,7 @@ namespace Memory
 	void VirtualMemoryArea::FreeAllPages()
 	{
 		SmartLock(MgrLock);
-		foreach (auto ap in AllocatedPagesList)
+		for (auto ap : AllocatedPagesList)
 		{
 			KernelAllocator.FreePages(ap.Address, ap.PageCount);
 			Virtual vmm(this->Table);
@@ -287,7 +287,7 @@ namespace Memory
 
 		Virtual vmm(this->Table);
 		SmartLock(MgrLock);
-		foreach (auto &ap in Parent->AllocatedPagesList)
+		for (auto &ap : Parent->AllocatedPagesList)
 		{
 			if (ap.Protected)
 			{
@@ -339,7 +339,7 @@ namespace Memory
 				  (uintptr_t)ap.Address + (ap.PageCount * PAGE_SIZE));
 		}
 
-		foreach (auto &sr in Parent->SharedRegions)
+		for (auto &sr : Parent->SharedRegions)
 		{
 			MgrLock.Unlock();
 			void *Address = this->CreateCoWRegion(sr.Address, sr.Length,
@@ -496,7 +496,7 @@ namespace Memory
 		/* No need to remap pages, the page table will be destroyed */
 
 		SmartLock(MgrLock);
-		foreach (auto ap in AllocatedPagesList)
+		for (auto ap : AllocatedPagesList)
 			KernelAllocator.FreePages(ap.Address, ap.PageCount);
 	}
 }

Kernel/core/panic/diag.cpp

@@ -64,7 +64,7 @@ struct DiagnosticFile
 	} Data;
 };
 
-nsa bool WriteDiagDataToNode(FileNode *node)
+nsa bool WriteDiagDataToNode(Node node)
 {
 	uintptr_t KStart = (uintptr_t)&_kernel_start;
 	uintptr_t kEnd = (uintptr_t)&_kernel_end;
@@ -89,7 +89,7 @@ nsa bool WriteDiagDataToNode(FileNode *node)
 	memcpy(file->Data.KernelMemory, (void *)KStart, kSize);
 
 	ExPrint("Writing to %s\n", node->Path.c_str());
-	size_t w = node->Write(buf, fileSize, 0);
+	size_t w = fs->Write(node, buf, fileSize, 0);
 	if (w != fileSize)
 	{
 		debug("%d out of %d bytes written", w, fileSize);
@@ -115,22 +115,23 @@ nsa void DiagnosticDataCollection()
 				  S_IROTH |
 				  S_IFDIR;
 
-	FileNode *panicDir = fs->ForceCreate(nullptr, "/var/panic", mode);
+	Node root = fs->GetRoot(0);
+	Node panicDir = fs->Create(root, "/sys/log/panic", mode);
 	if (!panicDir)
 	{
-		ExPrint("\x1b[0;30;41mFailed to create /var/panic\x1b[0m\n");
+		ExPrint("\x1b[0;30;41mFailed to create /sys/log/panic\x1b[0m\n");
 		Display->UpdateBuffer();
 		return;
 	}
 
-	FileNode *dumpFile;
+	Node dumpFile;
 	Time::Clock clock = Time::ReadClock();
 	char filename[64];
 	for (int i = 0; i < INT32_MAX; i++)
 	{
 		sprintf(filename, "dump-%d-%d-%d-%d.dmp",
 				clock.Year, clock.Month, clock.Day, i);
-		if (fs->PathExists(filename, panicDir))
+		if (fs->Lookup(panicDir, filename))
 			continue;
 
 		mode = S_IRWXU |
@@ -145,6 +146,6 @@ nsa void DiagnosticDataCollection()
 	if (!WriteDiagDataToNode(dumpFile))
 		return;
 
-	ExPrint("You can find the diagnostic file in /var/panic/%s\n", filename);
+	ExPrint("You can find the diagnostic file in /sys/log/panic/%s\n", filename);
 	Display->UpdateBuffer();
 }

Kernel/core/panic/handler.cpp

@@ -52,7 +52,7 @@ void *FbBeforePanic = nullptr;
 size_t FbPagesBeforePanic = 0;
 FontRenderer CrashFontRenderer;
 
-int ExTermColors[] = {
+static int ExTermColors[] = {
 	[TerminalColor::BLACK] = 0x000000,
 	[TerminalColor::RED] = 0xAA0000,
 	[TerminalColor::GREEN] = 0x00AA00,
@@ -63,7 +63,7 @@ int ExTermColors[] = {
 	[TerminalColor::GREY] = 0xAAAAAA,
 };
 
-int ExTermBrightColors[] = {
+static int ExTermBrightColors[] = {
 	[TerminalColor::BLACK] = 0x858585,
 	[TerminalColor::RED] = 0xFF5555,
 	[TerminalColor::GREEN] = 0x55FF55,
@@ -84,7 +84,7 @@ void paint_callback(TerminalCell *cell, long x, long y)
 
 nsa void __printfWrapper(char c, void *)
 {
-	KernelConsole::Terminals[15]->Process(c);
+	KernelConsole::Terminals[15]->Term->Process(c);
 }
 
 nsa void ExPrint(const char *Format, ...)
@@ -162,7 +162,8 @@ nsa void InitFont()
 	{
 		size_t Cols = Display->GetWidth / CrashFontRenderer.CurrentFont->GetInfo().Width;
 		size_t Rows = Display->GetHeight / CrashFontRenderer.CurrentFont->GetInfo().Height;
-		Terminals[15] = new VirtualTerminal(Cols, Rows, Display->GetWidth, Display->GetHeight, paint_callback, nullptr);
+		Terminals[15] = new ConsoleTerminal;
+		Terminals[15]->Term = new VirtualTerminal(Cols, Rows, Display->GetWidth, Display->GetHeight, paint_callback, nullptr);
 	}
 }
 
@@ -372,7 +373,8 @@ nsa void BaseBufferStackError(bool Stack)
 	{
 		size_t Cols = Display->GetWidth / CrashFontRenderer.CurrentFont->GetInfo().Width;
 		size_t Rows = Display->GetHeight / CrashFontRenderer.CurrentFont->GetInfo().Height;
-		Terminals[15] = new VirtualTerminal(Cols, Rows, Display->GetWidth, Display->GetHeight, paint_callback, nullptr);
+		Terminals[15] = new ConsoleTerminal;
+		Terminals[15]->Term = new VirtualTerminal(Cols, Rows, Display->GetWidth, Display->GetHeight, paint_callback, nullptr);
 	}
 
 	ExceptionLock.store(true, std::memory_order_release);
@@ -406,8 +408,7 @@ nsa __noreturn void HandleBufferOverflow()
 	CPU::Stop();
 }
 
-EXTERNC nsa __noreturn void HandleAssertionFailed(const char *File, int Line,
-												  const char *Expression)
+EXTERNC nsa __noreturn void HandleAssertionFailed(const char *File, int Line, const char *Expression)
 {
 	DisplayAssertionFailed(File, Line, Expression);
 	CPU::Stop();

Kernel/core/panic/kbd/xhci.cpp

@@ -58,7 +58,7 @@ nsa bool CrashXHCIKeyboardDriver::TakeOwnership()
 		return true;
 
 	exCap->USBLEGSUP.OSOwnsHC = 1;
-	TimeManager->Sleep(200, Time::Milliseconds);
+	TimeManager->Sleep(Time::FromMilliseconds(200));
 	if (exCap->USBLEGSUP.BIOSOwnsHC == 0)
 		return true;
 

Kernel/core/panic/ui.cpp

@@ -489,12 +489,12 @@ nsa void DisplayProcessScreen(CPU::ExceptionFrame *Frame, bool IgnoreReady = tru
 	bool pRdy = false;
 	bool showNote = false;
 	/* FIXME: This is slow */
-	foreach (auto Process in Plist)
+	for (auto Process : Plist)
 	{
 		bool ignore = true;
 		if (Process->State == Tasking::Ready && IgnoreReady)
 		{
-			foreach (auto Thread in Process->Threads)
+			for (auto Thread : Process->Threads)
 			{
 				if (Thread->State == Tasking::Ready)
 					continue;
@@ -522,7 +522,7 @@ nsa void DisplayProcessScreen(CPU::ExceptionFrame *Frame, bool IgnoreReady = tru
 					: "none");
 
 		bool tRdy = false;
-		foreach (auto Thread in Process->Threads)
+		for (auto Thread : Process->Threads)
 		{
 			if (Thread->State == Tasking::Ready && IgnoreReady)
 			{
@@ -571,6 +571,7 @@ nsa void DisplayCrashScreen(CPU::ExceptionFrame *Frame)
 
 	DisplayTopOverlay();
 	DisplayMainScreen(Frame);
+	DisplayStackScreen(Frame);
 	InitializeKeyboards();
 	DisplayBottomOverlay();
 

Kernel/core/pci.cpp

@@ -887,8 +887,8 @@ namespace PCI
 		{
 			PCIHeader0 *hdr0 = (PCIHeader0 *)Device.Header;
 
-			uint32_t BAR[6];
-			size_t BARsSize[6];
+			uint32_t BAR[6] = {};
+			size_t BARsSize[6] = {};
 
 			BAR[0] = hdr0->BAR0;
 			BAR[1] = hdr0->BAR1;
@@ -897,8 +897,7 @@ namespace PCI
 			BAR[4] = hdr0->BAR4;
 			BAR[5] = hdr0->BAR5;
 
-			debug("Type: %d; IOBase: %#lx; MemoryBase: %#lx",
-				  BAR[0] & 1, BAR[1] & (~3), BAR[0] & (~15));
+			debug("Type: %d; IOBase: %#lx; MemoryBase: %#lx", BAR[0] & 1, BAR[1] & (~3), BAR[0] & (~15));
 
 			/* BARs Size */
 			for (short i = 0; i < 6; i++)
@@ -909,26 +908,46 @@ namespace PCI
 				size_t size;
 				if ((BAR[i] & 1) == 0) /* Memory Base */
 				{
-					hdr0->BAR0 = 0xFFFFFFFF;
+					hdr0->BAR0 = UINT32_MAX;
 					size = hdr0->BAR0;
 					hdr0->BAR0 = BAR[i];
-					BARsSize[i] = size & (~15);
-					BARsSize[i] = ~BARsSize[i] + 1;
-					BARsSize[i] = BARsSize[i] & 0xFFFFFFFF;
-					debug("BAR%d %#lx size: %d",
-						  i, BAR[i], BARsSize[i]);
+
+					/* FIXME: further testing required */
+					// if ((BAR[i] & 0x6) == 0x4) /* 64-bit address */
+					// {
+					// 	hdr0->BAR1 = UINT32_MAX;
+					// 	size |= ((size_t)hdr0->BAR1 << 32);
+					// 	hdr0->BAR1 = BAR[i + 1];
+					// 	i++; /* Skip the next BAR since it's part of the 64-bit address */
+					// }
+
+					size = size & (~15);
+					size = ~size + 1;
+					size = size & UINT32_MAX;
+					if (size == 0)
+					{
+						warn("MEM BAR%d size is zero! Device: %#x:%#x", i, Device.Header->VendorID, Device.Header->DeviceID);
+						size++;
+					}
+					BARsSize[i] = size;
 				}
 				else if ((BAR[i] & 1) == 1) /* I/O Base */
 				{
-					hdr0->BAR1 = 0xFFFFFFFF;
+					hdr0->BAR1 = UINT32_MAX;
 					size = hdr0->BAR1;
 					hdr0->BAR1 = BAR[i];
-					BARsSize[i] = size & (~3);
-					BARsSize[i] = ~BARsSize[i] + 1;
-					BARsSize[i] = BARsSize[i] & 0xFFFF;
-					debug("BAR%d %#lx size: %d",
-						  i, BAR[i], BARsSize[i]);
+
+					size = size & (~3);
+					size = ~size + 1;
+					size = size & UINT16_MAX;
+					if (size == 0)
+					{
+						warn("I/O BAR%d size is zero! Device: %#x:%#x", i, Device.Header->VendorID, Device.Header->DeviceID);
+						size++;
 					}
+					BARsSize[i] = size;
+				}
+				debug("BAR%d %#lx size: %zu", i, BAR[i], BARsSize[i]);
 			}
 
 			/* Mapping the BARs */
@@ -942,24 +961,17 @@ namespace PCI
 					uintptr_t BARBase = BAR[i] & (~15);
 					size_t BARSize = BARsSize[i];
 
-					debug("Mapping BAR%d %#lx-%#lx",
-						  i, BARBase, BARBase + BARSize);
+					debug("Mapping BAR%d %#lx-%#lx", i, BARBase, BARBase + BARSize);
 
-					if (BARSize > 0)
 					Memory::Virtual(Table).Map((void *)BARBase, (void *)BARBase,
-												   BARSize, Memory::RW | Memory::PWT);
+											   BARSize, Memory::RW | Memory::PWT | Memory::PCD);
 				}
 				else if ((BAR[i] & 1) == 1) /* I/O Base */
 				{
 					uintptr_t BARBase = BAR[i] & (~3);
 					size_t BARSize = BARsSize[i];
 
-					debug("Mapping BAR%d %#x-%#x",
-						  i, BARBase, BARBase + BARSize);
-
-					if (BARSize > 0)
-						Memory::Virtual(Table).Map((void *)BARBase, (void *)BARBase,
-												   BARSize, Memory::RW | Memory::PWT);
+					debug("no need to map BAR%d %#x-%#x as it's an I/O space", i, BARBase, BARBase + BARSize);
 				}
 			}
 			break;
@@ -982,6 +994,18 @@ namespace PCI
 		}
 	}
 
+	void Manager::InitializeDevice(PCIDevice Device, Memory::PageTable *Table)
+	{
+		this->MapPCIAddresses(Device, Table);
+
+		PCI::PCIDeviceHeader *Header = Device.Header;
+
+		Header->Command |= PCI_COMMAND_MASTER |
+						   PCI_COMMAND_IO |
+						   PCI_COMMAND_MEMORY;
+		Header->Command &= ~PCI_COMMAND_INTX_DISABLE;
+	}
+
 	void Manager::EnumerateFunction(uint64_t DeviceAddress, uint32_t Function, PCIDevice dev)
 	{
 		dev.Function = Function;
@@ -1051,7 +1075,7 @@ namespace PCI
 	std::list<PCIDevice> Manager::FindPCIDevice(uint8_t Class, uint8_t Subclass, uint8_t ProgIF)
 	{
 		std::list<PCIDevice> DeviceFound;
-		foreach (auto dev in Devices)
+		for (auto dev : Devices)
 		{
 			if (dev.Header->Class == Class &&
 				dev.Header->Subclass == Subclass &&
@@ -1066,7 +1090,7 @@ namespace PCI
 	std::list<PCIDevice> Manager::FindPCIDevice(uint16_t VendorID, uint16_t DeviceID)
 	{
 		std::list<PCIDevice> DeviceFound;
-		foreach (auto dev in Devices)
+		for (auto dev : Devices)
 		{
 			if (dev.Header->VendorID == VendorID &&
 				dev.Header->DeviceID == DeviceID)
@@ -1081,11 +1105,11 @@ namespace PCI
 												std::list<uint16_t> DeviceIDs)
 	{
 		std::list<PCIDevice> DeviceFound;
-		foreach (auto dev in Devices)
+		for (auto dev : Devices)
 		{
-			foreach (auto VendorID in VendorIDs)
+			for (auto VendorID : VendorIDs)
 			{
-				foreach (auto DeviceID in DeviceIDs)
+				for (auto DeviceID : DeviceIDs)
 				{
 					if (dev.Header->VendorID == VendorID &&
 						dev.Header->DeviceID == DeviceID)

Kernel/core/random.cpp

@@ -67,8 +67,7 @@ namespace Random
 		if (RDRANDFlag)
 		{
 			uint16_t RDRANDValue = 0;
-			asmv("1: rdrand %0; jnc 1b"
-				 : "=r"(RDRANDValue));
+			asmv("1: rdrand %0; jnc 1b" : "=r"(RDRANDValue));
 			return RDRANDValue;
 		}
 
@@ -84,8 +83,7 @@ namespace Random
 		if (RDRANDFlag)
 		{
 			uint32_t RDRANDValue = 0;
-			asmv("1: rdrand %0; jnc 1b"
-				 : "=r"(RDRANDValue));
+			asmv("1: rdrand %0; jnc 1b" : "=r"(RDRANDValue));
 			return RDRANDValue;
 		}
 
@@ -101,8 +99,7 @@ namespace Random
 		if (RDRANDFlag)
 		{
 			uintptr_t RDRANDValue = 0;
-			asmv("1: rdrand %0; jnc 1b"
-				 : "=r"(RDRANDValue));
+			asmv("1: rdrand %0; jnc 1b" : "=r"(RDRANDValue));
 			return RDRANDValue;
 		}