From ba7b3ed69cd24970a28b72c54982735cd120e663 Mon Sep 17 00:00:00 2001 From: Amlal El Mahrouss Date: Fri, 28 Mar 2025 19:57:33 +0100 Subject: kernel: breaking: Change namespace from NeOS to Kernel. sched: Fix redundancy in NeKernel's user scheduler macros, refactored the other files using the redundant macros too. part one of a series of commit for NeKernel. Signed-off-by: Amlal El Mahrouss --- dev/kernel/FirmwareKit/CoreBoot/CoreBoot.h | 2 +- dev/kernel/FirmwareKit/CoreBoot/NetBoot.h | 20 +++++++++---------- dev/kernel/FirmwareKit/EFI/EFI.h | 2 +- dev/kernel/FirmwareKit/EFI/NS.h | 2 +- dev/kernel/FirmwareKit/EPM.h | 32 +++++++++++++++--------------- dev/kernel/FirmwareKit/GPT.h | 12 +++++------ dev/kernel/FirmwareKit/Handover.h | 6 +++--- 7 files changed, 38 insertions(+), 38 deletions(-) (limited to 'dev/kernel/FirmwareKit') diff --git a/dev/kernel/FirmwareKit/CoreBoot/CoreBoot.h b/dev/kernel/FirmwareKit/CoreBoot/CoreBoot.h index 5fe3f4ea..68e401a2 100644 --- a/dev/kernel/FirmwareKit/CoreBoot/CoreBoot.h +++ b/dev/kernel/FirmwareKit/CoreBoot/CoreBoot.h @@ -10,7 +10,7 @@ namespace Firmware::Detail::CoreBoot { - using namespace NeOS; + using namespace Kernel; struct LEHeader; diff --git a/dev/kernel/FirmwareKit/CoreBoot/NetBoot.h b/dev/kernel/FirmwareKit/CoreBoot/NetBoot.h index 21ce02ba..040fbbc8 100644 --- a/dev/kernel/FirmwareKit/CoreBoot/NetBoot.h +++ b/dev/kernel/FirmwareKit/CoreBoot/NetBoot.h @@ -11,15 +11,15 @@ /// @brief the internet header is used to download updates OTA. typedef struct NETBOOT_INTERNET_HEADER { - NeOS::Char NB1; /// magic char 1 'N' - NeOS::Char NB2; /// magic char 2 'E' - NeOS::Char NB3; /// magic char 3 'T' - NeOS::Char NB4; /// magic char 4 'B' + Kernel::Char NB1; /// magic char 1 'N' + Kernel::Char NB2; /// magic char 2 'E' + Kernel::Char NB3; /// magic char 3 'T' + Kernel::Char NB4; /// magic char 4 'B' - NeOS::Char PatchName[256U]; /// example: ColdChoco - NeOS::Int32 PatchLength; /// the patch length. - NeOS::Char PatchTarget[256U]; /// the target file. - NeOS::Boolean ImpliesROM; /// does it imply an EEPROM reprogram? - NeOS::Boolean Preflight; /// is it a preflight packet. - NeOS::Char Patch[]; /// non preflight packet has a patch blob for a **PatchTarget** + Kernel::Char PatchName[256U]; /// example: ColdChoco + Kernel::Int32 PatchLength; /// the patch length. + Kernel::Char PatchTarget[256U]; /// the target file. + Kernel::Boolean ImpliesROM; /// does it imply an EEPROM reprogram? + Kernel::Boolean Preflight; /// is it a preflight packet. + Kernel::Char Patch[]; /// non preflight packet has a patch blob for a **PatchTarget** } NETBOOT_INTERNET_HEADER; diff --git a/dev/kernel/FirmwareKit/EFI/EFI.h b/dev/kernel/FirmwareKit/EFI/EFI.h index ff97f7d6..fdcd8251 100644 --- a/dev/kernel/FirmwareKit/EFI/EFI.h +++ b/dev/kernel/FirmwareKit/EFI/EFI.h @@ -13,7 +13,7 @@ #include -using namespace NeOS; +using namespace Kernel; /* we always use stdcall in EFI, the pascal way of calling functions. */ diff --git a/dev/kernel/FirmwareKit/EFI/NS.h b/dev/kernel/FirmwareKit/EFI/NS.h index 18da8aaa..4d9decac 100644 --- a/dev/kernel/FirmwareKit/EFI/NS.h +++ b/dev/kernel/FirmwareKit/EFI/NS.h @@ -10,7 +10,7 @@ namespace Firmware::Detail::EFI { - using namespace NeOS; + using namespace Kernel; EXTERN_C { diff --git a/dev/kernel/FirmwareKit/EPM.h b/dev/kernel/FirmwareKit/EPM.h index b50a0943..31e9cff0 100644 --- a/dev/kernel/FirmwareKit/EPM.h +++ b/dev/kernel/FirmwareKit/EPM.h @@ -68,10 +68,10 @@ struct EPM_PART_BLOCK; /// @brief EPM GUID structure. typedef struct EPM_GUID { - NeOS::UInt32 Data1; - NeOS::UInt16 Data2; - NeOS::UInt16 Data3; - NeOS::UInt8 Data4[8]; + Kernel::UInt32 Data1; + Kernel::UInt16 Data2; + Kernel::UInt16 Data3; + Kernel::UInt8 Data4[8]; } PACKED EPM_GUID; /** @@ -80,19 +80,19 @@ typedef struct EPM_GUID */ struct PACKED EPM_PART_BLOCK { - NeOS::Char Magic[kEPMMagicLength]; - NeOS::Char Name[kEPMNameLength]; + Kernel::Char Magic[kEPMMagicLength]; + Kernel::Char Name[kEPMNameLength]; EPM_GUID Guid; - NeOS::Int32 Version; - NeOS::Int64 NumBlocks; - NeOS::Int64 SectorSz; - NeOS::Int64 LbaStart; // base offset - NeOS::Int64 LbaEnd; // end offset - NeOS::Int16 Kind; - NeOS::Int16 Flags; - NeOS::Int32 FsVersion; - NeOS::Char Fs[kEPMFilesystemLength]; /* NeFS, HeFS... */ - NeOS::Char Reserved[kEPMReserveLen]; // to fill a full sector. + Kernel::Int32 Version; + Kernel::Int64 NumBlocks; + Kernel::Int64 SectorSz; + Kernel::Int64 LbaStart; // base offset + Kernel::Int64 LbaEnd; // end offset + Kernel::Int16 Kind; + Kernel::Int16 Flags; + Kernel::Int32 FsVersion; + Kernel::Char Fs[kEPMFilesystemLength]; /* NeFS, HeFS... */ + Kernel::Char Reserved[kEPMReserveLen]; // to fill a full sector. }; ///! @brief Version kind enum. diff --git a/dev/kernel/FirmwareKit/GPT.h b/dev/kernel/FirmwareKit/GPT.h index 91838bc7..d129eab7 100644 --- a/dev/kernel/FirmwareKit/GPT.h +++ b/dev/kernel/FirmwareKit/GPT.h @@ -11,7 +11,7 @@ #define kSectorSizeGPT (512U) -namespace NeOS +namespace Kernel { struct GPT_GUID; struct GPT_PARTITION_TABLE; @@ -20,10 +20,10 @@ namespace NeOS /// @brief GPT GUID structure. typedef struct GPT_GUID { - NeOS::UInt32 Data1; - NeOS::UInt16 Data2; - NeOS::UInt16 Data3; - NeOS::UInt8 Data4[8]; + Kernel::UInt32 Data1; + Kernel::UInt16 Data2; + Kernel::UInt16 Data3; + Kernel::UInt8 Data4[8]; } GPT_GUID; struct PACKED GPT_PARTITION_TABLE final @@ -54,4 +54,4 @@ namespace NeOS UInt64 Attributes; UInt8 Name[72]; }; -} // namespace NeOS +} // namespace Kernel diff --git a/dev/kernel/FirmwareKit/Handover.h b/dev/kernel/FirmwareKit/Handover.h index 095e59be..caefb27a 100644 --- a/dev/kernel/FirmwareKit/Handover.h +++ b/dev/kernel/FirmwareKit/Handover.h @@ -26,7 +26,7 @@ #define kHandoverBitMapSz (gib_cast(4)) #define kHandoverStructSz sizeof(HEL::BootInfoHeader) -namespace NeOS::HEL +namespace Kernel::HEL { /** @brief The executable type enum. @@ -102,7 +102,7 @@ namespace NeOS::HEL /// @brief Alias of bootloader main type. typedef Int32 (*HandoverProc)(BootInfoHeader* boot_info); -} // namespace NeOS::HEL +} // namespace Kernel::HEL /// @brief Bootloader information header global variable. -inline NeOS::HEL::BootInfoHeader* kHandoverHeader = nullptr; +inline Kernel::HEL::BootInfoHeader* kHandoverHeader = nullptr; -- cgit v1.2.3