diff options
| author | Amlal El Mahrouss <amlal@el-mahrouss-logic.com> | 2024-03-15 08:03:35 +0100 |
|---|---|---|
| committer | Amlal El Mahrouss <amlal@el-mahrouss-logic.com> | 2024-03-15 08:03:35 +0100 |
| commit | b3e76bf866b4223390585589786600475c9fdcae (patch) | |
| tree | 7b10c496e94aa98dedf441f67fb39d0aaa7fbda9 /Private | |
| parent | 159d312c0dd3c02995950270e173cc10ade273cf (diff) | |
API: Inconsitency fix.
Signed-off-by: Amlal El Mahrouss <amlal@el-mahrouss-logic.com>
Diffstat (limited to 'Private')
23 files changed, 56 insertions, 39 deletions
diff --git a/Private/CompilerKit/CompilerKit.hxx b/Private/CompilerKit/CompilerKit.hxx new file mode 100644 index 00000000..7bed48f9 --- /dev/null +++ b/Private/CompilerKit/CompilerKit.hxx @@ -0,0 +1,13 @@ +/* ------------------------------------------- + + Copyright Mahrouss Logic + +------------------------------------------- */ + +#ifndef _INC_CL_HPP +#define _INC_CL_HPP + +#include <CompilerKit/Detail.hxx> +#include <CompilerKit/Version.hxx> + +#endif /* ifndef _INC_CL_HPP */ diff --git a/Private/CompilerKit/CompilerKit.hpp b/Private/CompilerKit/Detail.hxx index 34f69ccc..0c7a7c46 100644 --- a/Private/CompilerKit/CompilerKit.hpp +++ b/Private/CompilerKit/Detail.hxx @@ -4,8 +4,7 @@ ------------------------------------------- */ -#ifndef _INC_CL_HPP -#define _INC_CL_HPP +#pragma once #include <NewKit/Defines.hpp> @@ -28,8 +27,3 @@ KLASS &operator=(KLASS &&) = default; \ KLASS(KLASS &&) = default; - - -#include <CompilerKit/Version.hxx> - -#endif /* ifndef _INC_CL_HPP */ diff --git a/Private/Drivers/ATA/Defines.hxx b/Private/Drivers/ATA/Defines.hxx index 058f0758..cc1c191f 100644 --- a/Private/Drivers/ATA/Defines.hxx +++ b/Private/Drivers/ATA/Defines.hxx @@ -13,7 +13,7 @@ #pragma once -#include <CompilerKit/CompilerKit.hpp> +#include <CompilerKit/CompilerKit.hxx> #include <NewKit/Defines.hpp> using namespace HCore; diff --git a/Private/Drivers/PS2/Mouse.hxx b/Private/Drivers/PS2/Mouse.hxx index 9e9607e1..30fb5620 100644 --- a/Private/Drivers/PS2/Mouse.hxx +++ b/Private/Drivers/PS2/Mouse.hxx @@ -14,7 +14,7 @@ #pragma once #include <ArchKit/ArchKit.hpp> -#include <CompilerKit/CompilerKit.hpp> +#include <CompilerKit/CompilerKit.hxx> #include <NewKit/Defines.hpp> namespace HCore { diff --git a/Private/FSKit/IndexableProperty.hxx b/Private/FSKit/IndexableProperty.hxx index 1dd09b7d..36416c82 100644 --- a/Private/FSKit/IndexableProperty.hxx +++ b/Private/FSKit/IndexableProperty.hxx @@ -7,7 +7,7 @@ #pragma once #include <CFKit/Property.hpp> -#include <CompilerKit/CompilerKit.hpp> +#include <CompilerKit/CompilerKit.hxx> #include <KernelKit/DriveManager.hpp> namespace HCore { diff --git a/Private/FSKit/NewFS.hxx b/Private/FSKit/NewFS.hxx index b340aef5..3cc4ceba 100644 --- a/Private/FSKit/NewFS.hxx +++ b/Private/FSKit/NewFS.hxx @@ -14,7 +14,7 @@ #pragma once -#include <CompilerKit/CompilerKit.hpp> +#include <CompilerKit/CompilerKit.hxx> #include <HintKit/CompilerHint.hxx> #include <KernelKit/DriveManager.hpp> #include <NewKit/Defines.hpp> diff --git a/Private/KernelKit/DebugOutput.hpp b/Private/KernelKit/DebugOutput.hpp index 683c0903..75031687 100644 --- a/Private/KernelKit/DebugOutput.hpp +++ b/Private/KernelKit/DebugOutput.hpp @@ -7,7 +7,7 @@ #pragma once #include <KernelKit/DeviceManager.hpp> -#include <CompilerKit/CompilerKit.hpp> +#include <CompilerKit/CompilerKit.hxx> #include <NewKit/OwnPtr.hpp> #include <NewKit/Stream.hpp> diff --git a/Private/KernelKit/DriveManager.hpp b/Private/KernelKit/DriveManager.hpp index 6cfb007b..027c9391 100644 --- a/Private/KernelKit/DriveManager.hpp +++ b/Private/KernelKit/DriveManager.hpp @@ -7,7 +7,7 @@ #ifndef __DRIVE_MANAGER__ #define __DRIVE_MANAGER__ -#include <CompilerKit/CompilerKit.hpp> +#include <CompilerKit/CompilerKit.hxx> #include <KernelKit/DebugOutput.hpp> #include <KernelKit/DeviceManager.hpp> #include <KernelKit/HError.hpp> @@ -37,7 +37,7 @@ typedef Int64 rt_drive_id_type; struct DriveTraits final { Char fName[kDriveNameLen]; // /System, /Boot, //./Devices/USB... Int32 fKind; // fMassStorage, fFloppy, fOpticalDisc. - rt_drive_id_type fId; // Drive id. + rt_drive_id_type fId; // Drive id. Int32 fFlags; // fReadOnly, fXPMDrive, fXPTDrive //! for StorageKit. @@ -61,7 +61,8 @@ typedef DriveDevice* DriveDevicePtr; /** * @brief Abstracted hard-drive container class. - * @note This class has all of it's drive set to nullptr, allocate them using GetAddressOf(index). + * @note This class has all of it's drive set to nullptr, allocate them using + * GetAddressOf(index). */ class Mountpoint final { public: @@ -91,7 +92,7 @@ class Mountpoint final { default: { DbgLastError() = kErrorNoSuchDisk; kcout << "HCoreKrnl\\Mountpoint: Check HError.\n"; - + break; } } diff --git a/Private/KernelKit/FileManager.hpp b/Private/KernelKit/FileManager.hpp index 4b4a63a4..22c229db 100644 --- a/Private/KernelKit/FileManager.hpp +++ b/Private/KernelKit/FileManager.hpp @@ -18,7 +18,7 @@ #include <FSKit/NewFS.hxx> #endif // __FSKIT_NEWFS__ -#include <CompilerKit/CompilerKit.hpp> +#include <CompilerKit/CompilerKit.hxx> #include <HintKit/CompilerHint.hxx> #include <NewKit/ErrorID.hpp> #include <NewKit/Ref.hpp> diff --git a/Private/KernelKit/Loader.hpp b/Private/KernelKit/LoaderInterface.hpp index fb97c3a4..a19ba483 100644 --- a/Private/KernelKit/Loader.hpp +++ b/Private/KernelKit/LoaderInterface.hpp @@ -6,24 +6,25 @@ #pragma once -#include <CompilerKit/CompilerKit.hpp> +#include <CompilerKit/CompilerKit.hxx> #include <NewKit/Defines.hpp> #include <NewKit/ErrorOr.hpp> namespace HCore { -/// This interface is used to make loader contracts (MSCOFF, PEF). -class Loader { +/// @brief This interface is used to make loader contracts (MSCOFF, PEF). +/// @author @Amlal-El-Mahrouss +class LoaderInterface { public: - explicit Loader() = default; - virtual ~Loader() = default; + explicit LoaderInterface() = default; + virtual ~LoaderInterface() = default; - HCORE_COPY_DEFAULT(Loader); + HCORE_COPY_DEFAULT(LoaderInterface); public: virtual const char* Format() = 0; virtual const char* MIME() = 0; virtual const char* Path() = 0; - virtual ErrorOr<VoidPtr> LoadStart() = 0; + virtual ErrorOr<VoidPtr> FindStart() = 0; virtual VoidPtr FindSymbol(const char* name, Int32 kind) = 0; }; } // namespace HCore diff --git a/Private/KernelKit/PEF.hpp b/Private/KernelKit/PEF.hpp index 69919f93..e1750242 100644 --- a/Private/KernelKit/PEF.hpp +++ b/Private/KernelKit/PEF.hpp @@ -14,8 +14,8 @@ #ifndef __PEF__ #define __PEF__ -#include <CompilerKit/CompilerKit.hpp> -#include <KernelKit/Loader.hpp> +#include <CompilerKit/CompilerKit.hxx> +#include <KernelKit/LoaderInterface.hpp> #include <NewKit/Defines.hpp> #define kPefMagic "PEF" diff --git a/Private/KernelKit/PEFCodeManager.hxx b/Private/KernelKit/PEFCodeManager.hxx index 73bc8ea3..e952d40f 100644 --- a/Private/KernelKit/PEFCodeManager.hxx +++ b/Private/KernelKit/PEFCodeManager.hxx @@ -18,7 +18,7 @@ namespace HCore { /// \name PEFLoader /// \brief PEF loader class. /// -class PEFLoader : public Loader { +class PEFLoader : public LoaderInterface { private: explicit PEFLoader() = delete; @@ -39,7 +39,7 @@ class PEFLoader : public Loader { const char *MIME() override; public: - ErrorOr<VoidPtr> LoadStart() override; + ErrorOr<VoidPtr> FindStart() override; VoidPtr FindSymbol(const char *name, Int32 kind) override; public: diff --git a/Private/KernelKit/PEFSharedObject.hxx b/Private/KernelKit/PEFSharedObject.hxx index 263f08f4..becac43e 100644 --- a/Private/KernelKit/PEFSharedObject.hxx +++ b/Private/KernelKit/PEFSharedObject.hxx @@ -10,7 +10,7 @@ #ifndef __KERNELKIT_SHARED_OBJECT_HXX__ #define __KERNELKIT_SHARED_OBJECT_HXX__ -#include <KernelKit/Loader.hpp> +#include <KernelKit/LoaderInterface.hpp> #include <KernelKit/PEF.hpp> #include <KernelKit/PEFCodeManager.hxx> #include <NewKit/Defines.hpp> diff --git a/Private/KernelKit/PermissionSelector.hxx b/Private/KernelKit/PermissionSelector.hxx index 477e0f0c..c5a55fee 100644 --- a/Private/KernelKit/PermissionSelector.hxx +++ b/Private/KernelKit/PermissionSelector.hxx @@ -7,7 +7,7 @@ #ifndef _INC_PERMISSION_SEL_HPP #define _INC_PERMISSION_SEL_HPP -#include <CompilerKit/CompilerKit.hpp> +#include <CompilerKit/CompilerKit.hxx> #include <NewKit/Defines.hpp> // kernel mode user. diff --git a/Private/KernelKit/SMPManager.hpp b/Private/KernelKit/SMPManager.hpp index 465ff1fc..49406f1b 100644 --- a/Private/KernelKit/SMPManager.hpp +++ b/Private/KernelKit/SMPManager.hpp @@ -8,7 +8,7 @@ #define _INC_SMP_MANAGER_HPP #include <ArchKit/ArchKit.hpp> -#include <CompilerKit/CompilerKit.hpp> +#include <CompilerKit/CompilerKit.hxx> #include <NewKit/Ref.hpp> // Last Rev diff --git a/Private/KernelKit/Semaphore.hpp b/Private/KernelKit/Semaphore.hpp index 8897a135..6be56f21 100644 --- a/Private/KernelKit/Semaphore.hpp +++ b/Private/KernelKit/Semaphore.hpp @@ -7,7 +7,7 @@ #pragma once #include <NewKit/Defines.hpp> -#include <CompilerKit/CompilerKit.hpp> +#include <CompilerKit/CompilerKit.hxx> namespace HCore { diff --git a/Private/KernelKit/Timer.hpp b/Private/KernelKit/Timer.hpp index ddfac06a..f60f6e0e 100644 --- a/Private/KernelKit/Timer.hpp +++ b/Private/KernelKit/Timer.hpp @@ -7,7 +7,7 @@ #pragma once #include <ArchKit/ArchKit.hpp> -#include <CompilerKit/CompilerKit.hpp> +#include <CompilerKit/CompilerKit.hxx> #include <NewKit/ErrorID.hpp> diff --git a/Private/NetworkKit/NetworkDevice.hpp b/Private/NetworkKit/NetworkDevice.hpp index 1550afd1..74b60068 100644 --- a/Private/NetworkKit/NetworkDevice.hpp +++ b/Private/NetworkKit/NetworkDevice.hpp @@ -43,9 +43,17 @@ struct PACKED NetworkDeviceCommand final { UInt32 DmaHigh; }; +/// @brief TCP device. using TCPNetworkDevice = NetworkDevice; + +/// @brief UDP device. using UDPNetworkDevice = NetworkDevice; + +/// @brief PPP device. using PPPNetworkDevice = NetworkDevice; + +/// @brief HPC device. +using HPCNetworkDevice = NetworkDevice; } // namespace HCore #include <NetworkKit/NetworkDevice.inl> diff --git a/Private/NewBoot/BootKit/Arch/AHCI.hxx b/Private/NewBoot/BootKit/Arch/AHCI.hxx index 78a2c9c6..2047c404 100644 --- a/Private/NewBoot/BootKit/Arch/AHCI.hxx +++ b/Private/NewBoot/BootKit/Arch/AHCI.hxx @@ -6,7 +6,7 @@ #pragma once -#include <CompilerKit/CompilerKit.hpp> +#include <CompilerKit/CompilerKit.hxx> #include <Drivers/AHCI/Defines.hxx> class BDeviceAHCI final { diff --git a/Private/NewKit/Json.hpp b/Private/NewKit/Json.hpp index 6b6d90c0..3a7aa7cb 100644 --- a/Private/NewKit/Json.hpp +++ b/Private/NewKit/Json.hpp @@ -9,7 +9,7 @@ // last-rev: 30/01/24 -#include <CompilerKit/CompilerKit.hpp> +#include <CompilerKit/CompilerKit.hxx> #include <NewKit/Defines.hpp> #include <NewKit/Stream.hpp> #include <NewKit/String.hpp> diff --git a/Private/NewKit/MutableArray.hpp b/Private/NewKit/MutableArray.hpp index 1b1e9229..24bb06d4 100644 --- a/Private/NewKit/MutableArray.hpp +++ b/Private/NewKit/MutableArray.hpp @@ -5,7 +5,7 @@ ------------------------------------------- */ #pragma once -#include <CompilerKit/CompilerKit.hpp> +#include <CompilerKit/CompilerKit.hxx> #include <NewKit/Array.hpp> #include <NewKit/Defines.hpp> diff --git a/Private/Source/IndexableProperty.cxx b/Private/Source/IndexableProperty.cxx index cdc7b93d..4341038c 100644 --- a/Private/Source/IndexableProperty.cxx +++ b/Private/Source/IndexableProperty.cxx @@ -6,7 +6,7 @@ //! @brief Filesystem Indexer. -#include <CompilerKit/CompilerKit.hpp> +#include <CompilerKit/CompilerKit.hxx> #include <FSKit/IndexableProperty.hxx> #include <NewKit/MutableArray.hpp> #include <NewKit/Utils.hpp> diff --git a/Private/Source/PEFCodeManager.cxx b/Private/Source/PEFCodeManager.cxx index 4c599856..d0ca40d3 100644 --- a/Private/Source/PEFCodeManager.cxx +++ b/Private/Source/PEFCodeManager.cxx @@ -126,7 +126,7 @@ VoidPtr PEFLoader::FindSymbol(const char *name, Int32 kind) { return nullptr; } -ErrorOr<VoidPtr> PEFLoader::LoadStart() { +ErrorOr<VoidPtr> PEFLoader::FindStart() { if (auto sym = this->FindSymbol(kPefStart, kPefCode); sym) return ErrorOr<VoidPtr>(sym); @@ -137,7 +137,7 @@ bool PEFLoader::IsLoaded() noexcept { return !fBad && fCachedBlob; } namespace Utils { bool execute_from_image(PEFLoader &exec) noexcept { - auto errOrStart = exec.LoadStart(); + auto errOrStart = exec.FindStart(); if (errOrStart.Error() != 0) return false; |
