diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/kernel/KernelKit/DriveMgr.h | 15 | ||||
| -rw-r--r-- | src/kernel/NetworkKit/IP.h | 4 | ||||
| -rw-r--r-- | src/kernel/SignalKit/Signals.h | 8 | ||||
| -rw-r--r-- | src/kernel/src/DriveMgr.cpp | 23 | ||||
| -rw-r--r-- | src/kernel/src/Swap/DiskSwap.cpp | 2 | ||||
| -rw-r--r-- | src/kernel/src/User.cpp (renamed from src/kernel/src/UserMgr+User.cpp) | 4 | ||||
| -rw-r--r-- | src/kernel/src/UserMgr.cpp | 21 | ||||
| -rw-r--r-- | src/libMsg/scripts/window_client.json (renamed from src/libMsg/script/window_client.json) | 0 | ||||
| -rw-r--r-- | src/libPOSIXWrapper/.keep (renamed from src/libPOSIX/.keep) | 0 | ||||
| -rw-r--r-- | src/libPOSIXWrapper/POSIXKit/.keep (renamed from src/libPOSIX/POSIXKit/.keep) | 0 | ||||
| -rw-r--r-- | src/libPOSIXWrapper/POSIXKit/unistd.h (renamed from src/libPOSIX/POSIXKit/unistd.h) | 0 | ||||
| -rw-r--r-- | src/libPOSIXWrapper/libPOSIX.json (renamed from src/libPOSIX/libPOSIX.json) | 0 | ||||
| -rw-r--r-- | src/libPOSIXWrapper/src/.keep (renamed from src/libPOSIX/src/.keep) | 0 | ||||
| -rw-r--r-- | src/libSoundSystem/SoundSystemKit/VirtualMixer.h (renamed from src/libASN/AsnKit/VirtualMixer.h) | 0 | ||||
| -rw-r--r-- | src/libSoundSystem/libASN.json (renamed from src/libASN/libASN.json) | 0 | ||||
| -rw-r--r-- | src/libSoundSystem/libSoundSystem.json | 23 | ||||
| -rw-r--r-- | src/libSoundSystem/src/VirtualMixer.cpp (renamed from src/libASN/src/VirtualMixer.cpp) | 2 |
17 files changed, 60 insertions, 42 deletions
diff --git a/src/kernel/KernelKit/DriveMgr.h b/src/kernel/KernelKit/DriveMgr.h index f4ca294e..5abb7518 100644 --- a/src/kernel/KernelKit/DriveMgr.h +++ b/src/kernel/KernelKit/DriveMgr.h @@ -1,4 +1,4 @@ -// Copyright 2024-2025, Amlal El Mahrouss (amlal@nekernel.org) +// Copyright 2024-2026, Amlal El Mahrouss (amlal@nekernel.org) // Licensed under the Apache License, Version 2.0 (see LICENSE file) // Official repository: https://github.com/ne-foss-org/nekernel @@ -6,7 +6,7 @@ #define INC_DRIVE_MANAGER_H /// @file DriveMgr.h -/// @brief Drive Manager. +/// @brief NeKernel's drive manager. /// @author Amlal El Mahrouss (amlal@nekernel.org) #include <CompilerKit/CompilerKit.h> @@ -111,7 +111,7 @@ class IMountpoint final { kDriveIndexInvalid, }; - DriveTraitPtr GetAddressOf(const Int32& index) { + DriveTraitPtr GetAddressOf(const UInt32& index) { err_local_get() = kErrorSuccess; switch (index) { @@ -125,7 +125,7 @@ class IMountpoint final { return &mD; default: { err_local_get() = kErrorNoSuchDisk; - kout << "No such disc letter.\n"; + kout << "No such disc letter.\r"; break; } @@ -155,12 +155,7 @@ DriveTrait io_construct_blank_drive(Void); /// @brief Fetches the main drive. /// @param trait the new drive as a trait. Void io_construct_main_drive(DriveTrait& trait); - -/// @brief Fetches the main drive. -/// @return the new drive as a trait. -/// @deprecated use io_construct_main_drive(DriveTrait& trait) instead. -DriveTrait io_construct_main_drive(Void); - + namespace Detect { Void io_detect_drive(DriveTrait& trait); } diff --git a/src/kernel/NetworkKit/IP.h b/src/kernel/NetworkKit/IP.h index ceab7a24..3377ae3f 100644 --- a/src/kernel/NetworkKit/IP.h +++ b/src/kernel/NetworkKit/IP.h @@ -1,4 +1,4 @@ -// Copyright 2024-2025, Amlal El Mahrouss (amlal@nekernel.org) +// Copyright 2024-2026, Amlal El Mahrouss (amlal@nekernel.org) // Licensed under the Apache License, Version 2.0 (see LICENSE file) // Official repository: https://github.com/ne-foss-org/nekernel @@ -11,6 +11,7 @@ #include <NeKit/Ref.h> namespace Kernel { + class RawIPAddress6; class RawIPAddress; class IPFactory; @@ -74,6 +75,7 @@ class IPFactory final { static ErrorOr<KBasicString<UInt8>> ToKString(Ref<RawIPAddress>& ipv4); static bool IpCheckVersion4(const Char* ip); }; + } // namespace Kernel #endif diff --git a/src/kernel/SignalKit/Signals.h b/src/kernel/SignalKit/Signals.h index 2070e19e..bf3f8cd8 100644 --- a/src/kernel/SignalKit/Signals.h +++ b/src/kernel/SignalKit/Signals.h @@ -1,4 +1,4 @@ -// Copyright 2024-2025, Amlal El Mahrouss (amlal@nekernel.org) +// Copyright 2024-2026, Amlal El Mahrouss (amlal@nekernel.org) // Licensed under the Apache License, Version 2.0 (see LICENSE file) // Official repository: https://github.com/ne-foss-org/nekernel @@ -25,7 +25,7 @@ namespace Kernel { -typedef SizeT rt_signal_kind; +using rt_signal_kind = SizeT; /// @brief Standard signal seed for general purpose usage. inline constexpr auto kUserSignalSeed = 0x0895034fUL; @@ -42,12 +42,12 @@ inline rt_signal_kind sig_generate_unique() { /// @brief Checks if the signal matches the seed (user_seed or kernel_seed) template <SizeT Seed> -inline BOOL sig_matches_seed(rt_signal_kind sig) { +inline BOOL sig_matches_seed(const rt_signal_kind& sig) { return (sig & 0xFF000000) == (Seed & 0xFF000000); } /// @brief Validate signal from **sig** and whtether the signal is greater than SIGDTCH. -inline BOOL sig_validate_unique(rt_signal_kind sig) { +inline BOOL sig_validate_unique(const rt_signal_kind& sig) { return sig > SIGBAD && sig > SIGDTCH; } diff --git a/src/kernel/src/DriveMgr.cpp b/src/kernel/src/DriveMgr.cpp index 1ab81def..0247fba8 100644 --- a/src/kernel/src/DriveMgr.cpp +++ b/src/kernel/src/DriveMgr.cpp @@ -201,7 +201,7 @@ namespace Probe { trait.fPacket.fPacketReadOnly = YES; trait.fKind = kMassStorageDrive | kUnformattedDrive | kReadOnlyDrive; - trait.fSectorSz = 512; + trait.fSectorSz = 0x200; trait.fLbaEnd = drv_std_get_sector_count() - 1; trait.fLbaStart = 0x400; } @@ -215,27 +215,6 @@ namespace Probe { } } // namespace Probe -/// @brief Fetches the main drive. -/// @return the new drive. (returns kEPMDrive if EPM formatted) -DriveTrait io_construct_main_drive() { - constexpr auto kMainDrive = "/media/main/"; - - DriveTrait trait; - - rt_copy_memory((VoidPtr) kMainDrive, trait.fName, rt_string_len(kMainDrive)); - MUST_PASS(trait.fName[0] != 0); - - trait.fVerify = io_drv_unimplemented; - trait.fOutput = io_drv_output; - trait.fInput = io_drv_input; - trait.fInit = io_drv_init; - trait.fProtocol = io_drv_kind; - - Probe::io_detect_drive(trait); - - return trait; -} - /// @brief Replacement for io_construct_main_drive that works with IMountpoint. /// @return the new drive. (returns kEPMDrive if EPM formatted) Void io_construct_main_drive(DriveTrait& trait) { diff --git a/src/kernel/src/Swap/DiskSwap.cpp b/src/kernel/src/Swap/DiskSwap.cpp index cef7aa94..a22305ec 100644 --- a/src/kernel/src/Swap/DiskSwap.cpp +++ b/src/kernel/src/Swap/DiskSwap.cpp @@ -17,7 +17,6 @@ Int64 IDiskSwap::Write(SwapDiskHdrPtr data) { if (!data || data->fMagic != kSwapDiskHeaderMagic) return 0UL; FileStream file(kSwapPageFilePath, kRestrictWRB); - Ref<Int64> ret = file.Write(data->fOffset, data, sizeof(SwapDiskHdr) + data->fBlobSz); return ret.Leak(); @@ -32,7 +31,6 @@ SwapDiskHdrPtr IDiskSwap::Read(const UIntPtr offset, SizeT data_len) { if (data_len == 0UL) return nullptr; FileStream file(kSwapPageFilePath, kRestrictRB); - ErrorOrAny blob = file.Read(offset, sizeof(SwapDiskHdr) + data_len); if (blob.HasError() || diff --git a/src/kernel/src/UserMgr+User.cpp b/src/kernel/src/User.cpp index 0102beea..66d22d24 100644 --- a/src/kernel/src/UserMgr+User.cpp +++ b/src/kernel/src/User.cpp @@ -1,6 +1,6 @@ // Copyright 2024-2026, Amlal El Mahrouss (amlal@nekernel.org) // Licensed under the Apache License, Version 2.0 (see LICENSE file) -// Official repository: https://github.com/ne-foss-org/nekernel +// Official repository: https://github.com/ne-foss-org/kernel #include <KernelKit/FileMgr.h> #include <KernelKit/HeapMgr.h> @@ -11,7 +11,7 @@ #include <NeKit/KernelPanic.h> #include <NeKit/Utils.h> -/// @file UserMgr.cc +/// @file UserMgr+User.cpp /// @brief Multi-user support. namespace Kernel { diff --git a/src/kernel/src/UserMgr.cpp b/src/kernel/src/UserMgr.cpp new file mode 100644 index 00000000..c1b5140e --- /dev/null +++ b/src/kernel/src/UserMgr.cpp @@ -0,0 +1,21 @@ +// Copyright 2024-2026, Amlal El Mahrouss (amlal@nekernel.org) +// Licensed under the Apache License, Version 2.0 (see LICENSE file) +// Official repository: https://github.com/ne-foss-org/kernel + +#include <KernelKit/FileMgr.h> +#include <KernelKit/HeapMgr.h> +#include <KernelKit/KPC.h> +#include <KernelKit/ThreadLocalStorage.h> +#include <KernelKit/UserMgr+User.h> +#include <NeKit/KString.h> +#include <NeKit/KernelPanic.h> +#include <NeKit/Utils.h> + +/// @file UserMgr+User.cpp +/// @brief Multi-user support. + +namespace Kernel { + + + +} diff --git a/src/libMsg/script/window_client.json b/src/libMsg/scripts/window_client.json index 4c8a21ba..4c8a21ba 100644 --- a/src/libMsg/script/window_client.json +++ b/src/libMsg/scripts/window_client.json diff --git a/src/libPOSIX/.keep b/src/libPOSIXWrapper/.keep index e69de29b..e69de29b 100644 --- a/src/libPOSIX/.keep +++ b/src/libPOSIXWrapper/.keep diff --git a/src/libPOSIX/POSIXKit/.keep b/src/libPOSIXWrapper/POSIXKit/.keep index e69de29b..e69de29b 100644 --- a/src/libPOSIX/POSIXKit/.keep +++ b/src/libPOSIXWrapper/POSIXKit/.keep diff --git a/src/libPOSIX/POSIXKit/unistd.h b/src/libPOSIXWrapper/POSIXKit/unistd.h index a2be3a30..a2be3a30 100644 --- a/src/libPOSIX/POSIXKit/unistd.h +++ b/src/libPOSIXWrapper/POSIXKit/unistd.h diff --git a/src/libPOSIX/libPOSIX.json b/src/libPOSIXWrapper/libPOSIX.json index a38d1db9..a38d1db9 100644 --- a/src/libPOSIX/libPOSIX.json +++ b/src/libPOSIXWrapper/libPOSIX.json diff --git a/src/libPOSIX/src/.keep b/src/libPOSIXWrapper/src/.keep index e69de29b..e69de29b 100644 --- a/src/libPOSIX/src/.keep +++ b/src/libPOSIXWrapper/src/.keep diff --git a/src/libASN/AsnKit/VirtualMixer.h b/src/libSoundSystem/SoundSystemKit/VirtualMixer.h index ab705882..ab705882 100644 --- a/src/libASN/AsnKit/VirtualMixer.h +++ b/src/libSoundSystem/SoundSystemKit/VirtualMixer.h diff --git a/src/libASN/libASN.json b/src/libSoundSystem/libASN.json index f1a5e267..f1a5e267 100644 --- a/src/libASN/libASN.json +++ b/src/libSoundSystem/libASN.json diff --git a/src/libSoundSystem/libSoundSystem.json b/src/libSoundSystem/libSoundSystem.json new file mode 100644 index 00000000..9f198100 --- /dev/null +++ b/src/libSoundSystem/libSoundSystem.json @@ -0,0 +1,23 @@ +{ + "compiler_path": "x86_64-w64-mingw32-g++", + "compiler_std": "c++20", + "headers_path": ["../", "./"], + "sources_path": ["src/*.cpp"], + "output_name": "libSoundSystem.dll", + "compiler_flags": [ + "-ffreestanding", + "-shared", + "-fno-rtti", + "-fno-exceptions", + "-Wl,--subsystem=17" + ], + "cpp_macros": [ + "__NEOSKRNL__", + "__ASN_AMD64__", + "__ASN__", + "kASNVersionHighest=0x0100", + "kASNVersionLowest=0x0100", + "kASNVersion=0x0100" + ], + "description": "Audio Subsystem for NeKernel. Handles multimedia requests." +} diff --git a/src/libASN/src/VirtualMixer.cpp b/src/libSoundSystem/src/VirtualMixer.cpp index 9613cb84..af9cbeb5 100644 --- a/src/libASN/src/VirtualMixer.cpp +++ b/src/libSoundSystem/src/VirtualMixer.cpp @@ -2,5 +2,5 @@ // Licensed under the Apache License, Version 2.0 (see LICENSE file) // Official repository: https://github.com/ne-foss-org/nekernel -#include <AsnKit/VirtualMixer.h> +#include <SoundSystemKit/VirtualMixer.h> |
