diff options
| author | Amlal El Mahrouss <amlal@nekernel.org> | 2025-06-03 09:18:18 +0200 |
|---|---|---|
| committer | Amlal El Mahrouss <amlal@nekernel.org> | 2025-06-03 09:19:02 +0200 |
| commit | 71dddecbce68f803820b780ccb8c744935256b49 (patch) | |
| tree | 16f8c56159af12f3728cb74fc671a1e2aa3b55fa | |
| parent | 6506875ad0ab210b82a5c4ce227bf851508de17d (diff) | |
feat: Last changes before `0.0.3`
Signed-off-by: Amlal El Mahrouss <amlal@nekernel.org>
| -rw-r--r-- | .github/workflows/boot-pio.yml | 3 | ||||
| -rw-r--r-- | .github/workflows/kernel-ahci.yml | 4 | ||||
| -rw-r--r-- | .github/workflows/kernel-pio.yml | 4 | ||||
| -rw-r--r-- | dev/boot/amd64-desktop.make | 2 | ||||
| -rw-r--r-- | dev/boot/src/HEL/AMD64/BootATA.cc (renamed from dev/boot/src/HEL/AMD64/BootATAcc) | 4 | ||||
| -rw-r--r-- | dev/kernel/KernelKit/UserMgr.h | 4 | ||||
| -rw-r--r-- | dev/kernel/src/UserMgr.cc | 4 | ||||
| -rw-r--r-- | dev/kernel/src/Utils.cc | 27 |
8 files changed, 26 insertions, 26 deletions
diff --git a/.github/workflows/boot-pio.yml b/.github/workflows/boot-pio.yml index 80c5b932..3a8c087b 100644 --- a/.github/workflows/boot-pio.yml +++ b/.github/workflows/boot-pio.yml @@ -15,6 +15,5 @@ jobs: - uses: actions/checkout@v4 - name: Install Packages run: sudo apt update && sudo apt install mingw-w64 qemu-utils nasm - - name: Build BootZ (ATA PIO) - run: cd dev/boot && export ATA_PIO_SUPPORT=1 && make -f amd64-ci.make all + diff --git a/.github/workflows/kernel-ahci.yml b/.github/workflows/kernel-ahci.yml index a328a0f7..17a68a30 100644 --- a/.github/workflows/kernel-ahci.yml +++ b/.github/workflows/kernel-ahci.yml @@ -15,6 +15,4 @@ jobs: - uses: actions/checkout@v4 - name: Install Packages run: sudo apt update && sudo apt install mingw-w64 qemu-utils nasm - - name: Build NeKernel (AHCI) - run: ./setup_x64_project.sh && cd dev/kernel && export AHCI_SUPPORT=1 && make -f amd64-ci.make all - + diff --git a/.github/workflows/kernel-pio.yml b/.github/workflows/kernel-pio.yml index 69f14a83..6c4fbb6a 100644 --- a/.github/workflows/kernel-pio.yml +++ b/.github/workflows/kernel-pio.yml @@ -15,6 +15,4 @@ jobs: - uses: actions/checkout@v4 - name: Install Packages run: sudo apt update && sudo apt install mingw-w64 qemu-utils nasm - - name: Build NeKernel (ATA PIO) - run: ./setup_x64_project.sh && cd dev/kernel && export ATA_PIO_SUPPORT=1 && make -f amd64-ci.make all - +
\ No newline at end of file diff --git a/dev/boot/amd64-desktop.make b/dev/boot/amd64-desktop.make index d39c3bcd..d7515367 100644 --- a/dev/boot/amd64-desktop.make +++ b/dev/boot/amd64-desktop.make @@ -128,7 +128,7 @@ run-efi-amd64-ata-dma: $(EMU) $(EMU_FLAGS) -device piix4-ide,id=ide -drive id=disk,file=$(IMG),format=raw,if=none -device ide-hd,drive=disk,bus=ide.0 -s -S -boot menu=on .PHONY: run-efi-amd64-ata -run-efi-amd64-ata: run-efi-amd64-ata-dma +run-efi-amd64-ata: run-efi-amd64-ata-pio # img_2 is the rescue disk. img is the bootable disk, as provided by the NeKernel specs. .PHONY: epm-img diff --git a/dev/boot/src/HEL/AMD64/BootATAcc b/dev/boot/src/HEL/AMD64/BootATA.cc index 4fd6dc16..e5e0d8c2 100644 --- a/dev/boot/src/HEL/AMD64/BootATAcc +++ b/dev/boot/src/HEL/AMD64/BootATA.cc @@ -1,6 +1,6 @@ /* ------------------------------------------- - Copyright (C) 2024-2025, Amlal El Mahrouss, all rights reserved. + Copyright (C) 2024-2025, Amlal El Mahrouss/Symphony Corp, all rights reserved. ------------------------------------------- */ @@ -74,7 +74,7 @@ ATAInit_Retry: auto status_rdy = rt_in8(IO + ATA_REG_STATUS); if (status_rdy & ATA_SR_ERR) { - writer.Write(L"BootZ: ATA: Not an IDE based drive.\r"); + writer.Write(L"VMBoot: ATA: Not an IDE based drive.\r"); return false; } diff --git a/dev/kernel/KernelKit/UserMgr.h b/dev/kernel/KernelKit/UserMgr.h index 89436025..ef1cc659 100644 --- a/dev/kernel/KernelKit/UserMgr.h +++ b/dev/kernel/KernelKit/UserMgr.h @@ -20,8 +20,8 @@ #include <NeKit/Defines.h> #include <NeKit/KString.h> -///! We got the Super, Standard (%s format) and Guest user, -///! all are used to make authorization operations on the OS. +///! We got the MGMT, STD (%s format) and GUEST users, +///! all are used to make authorized operations. #define kSuperUser "OS AUTHORITY/MGMT/%s" #define kGuestUser "OS AUTHORITY/GUEST/%s" #define kStdUser "OS AUTHORITY/STD/%s" diff --git a/dev/kernel/src/UserMgr.cc b/dev/kernel/src/UserMgr.cc index c41b445b..8eade85e 100644 --- a/dev/kernel/src/UserMgr.cc +++ b/dev/kernel/src/UserMgr.cc @@ -4,8 +4,8 @@ * NeKernel * Copyright (C) 2024-2025, Amlal El Mahrouss, all rights reserved. * - * File: User.cc - * Purpose: User class, used to provide authentication and security. + * File: UserMgr.cc + * Purpose: User Manager, used to provide authentication and security. * * ======================================================== */ diff --git a/dev/kernel/src/Utils.cc b/dev/kernel/src/Utils.cc index 6c770798..087b6d5f 100644 --- a/dev/kernel/src/Utils.cc +++ b/dev/kernel/src/Utils.cc @@ -57,8 +57,8 @@ STATIC Int rt_copy_memory_safe(const voidPtr src, voidPtr dst, Size len, Size ds } return -1; } - auto s = reinterpret_cast<const unsigned char*>(src); - auto d = reinterpret_cast<unsigned char*>(dst); + auto s = reinterpret_cast<const UInt8*>(src); + auto d = reinterpret_cast<UInt8*>(dst); for (Size i = 0; i < len; ++i) d[i] = s[i]; return static_cast<Int>(len); @@ -66,8 +66,8 @@ STATIC Int rt_copy_memory_safe(const voidPtr src, voidPtr dst, Size len, Size ds STATIC voidPtr rt_set_memory_safe(voidPtr dst, UInt32 value, Size len, Size dst_size) { if (!dst || len > dst_size) return nullptr; - auto p = reinterpret_cast<unsigned char*>(dst); - unsigned char v = static_cast<unsigned char>(value & 0xFF); + auto p = reinterpret_cast<UInt8*>(dst); + UInt8 v = static_cast<UInt8>(value & 0xFF); for (Size i = 0; i < len; ++i) p[i] = v; return dst; @@ -77,24 +77,29 @@ Void rt_zero_memory(voidPtr pointer, Size len) { rt_set_memory_safe(pointer, 0, len, len); } - +#ifdef __NE_ENFORCE_DEPRECATED_WARNINGS [[deprecated("Use rt_set_memory_safe instead")]] +#endif voidPtr rt_set_memory(voidPtr src, UInt32 value, Size len) { if (!src) return nullptr; - auto p = reinterpret_cast<unsigned char*>(src); - unsigned char v = static_cast<unsigned char>(value & 0xFF); + auto p = reinterpret_cast<UInt8*>(src); + UInt8 v = static_cast<UInt8>(value & 0xFF); for (Size i = 0; i < len; ++i) p[i] = v; return src; } +#ifdef __NE_ENFORCE_DEPRECATED_WARNINGS [[deprecated("Use rt_copy_memory_safe instead")]] +#endif Int rt_copy_memory(const voidPtr src, voidPtr dst, Size len) { if (!src || !dst) return -1; - auto s = reinterpret_cast<const unsigned char*>(src); - auto d = reinterpret_cast<unsigned char*>(dst); + auto s = reinterpret_cast<const UInt8*>(src); + auto d = reinterpret_cast<UInt8*>(dst); + for (Size i = 0; i < len; ++i) d[i] = s[i]; + return static_cast<Int>(len); } @@ -168,8 +173,8 @@ Int32 rt_strcmp(const Char* a, const Char* b) { while (a[i] != '\0' && b[i] != '\0' && a[i] == b[i]) { ++i; } - return static_cast<Int32>(static_cast<unsigned char>(a[i]) - - static_cast<unsigned char>(b[i])); + return static_cast<Int32>(static_cast<UInt8>(a[i]) - + static_cast<UInt8>(b[i])); } // @uses the deprecated version callers should ensure 'len' is valid. |
