From 15493aad092a3e2f0ebacc4fe38d40de02ea67de Mon Sep 17 00:00:00 2001 From: Amlal El Mahrouss Date: Fri, 28 Mar 2025 20:19:56 +0100 Subject: ahci: fix: report success when ahci is detected. mbci: reintroduce NeKernel's MBCI. cfkit: rename: CFKit -> CF libuser: rename ErrKind to ErrRef. coregfx: fix last unconsistent things about the module. Signed-off-by: Amlal El Mahrouss --- dev/kernel/ArchKit/ArchKit.h | 8 +++--- dev/kernel/CFKit/GUIDWizard.h | 6 ++-- dev/kernel/CFKit/GUIDWrapper.h | 4 +-- dev/kernel/CFKit/Property.h | 6 ++-- dev/kernel/CFKit/Utils.h | 4 +-- dev/kernel/FSKit/HeFS.h | 14 ++++----- dev/kernel/FSKit/NeFS.h | 12 ++++---- dev/kernel/FirmwareKit/CoreBoot/NetBoot.h | 16 +++++------ dev/kernel/FirmwareKit/EPM.h | 14 ++++----- dev/kernel/FirmwareKit/GPT.h | 2 +- dev/kernel/HALKit/AMD64/HalDebugOutput.cc | 2 +- dev/kernel/HALKit/AMD64/HalKernelMain.cc | 2 +- dev/kernel/HALKit/AMD64/HalTimerAMD64.cc | 16 +++++------ dev/kernel/HALKit/AMD64/PCI/Device.cc | 12 ++++---- dev/kernel/HALKit/AMD64/Processor.h | 2 +- dev/kernel/HALKit/AMD64/Storage/AHCI+Generic.cc | 31 +++++++++++++------- dev/kernel/HALKit/AMD64/Storage/DMA+Generic.cc | 4 +-- dev/kernel/HALKit/AMD64/Storage/PIO+Generic.cc | 2 +- dev/kernel/HALKit/ARM64/Processor.h | 2 +- dev/kernel/HALKit/POWER/AP.h | 6 ++-- dev/kernel/HALKit/RISCV/AP.h | 6 ++-- dev/kernel/KernelKit/MSDOS.h | 38 ++++++++++++------------- dev/kernel/KernelKit/PE.h | 6 ++-- dev/kernel/KernelKit/ThreadLocalStorage.h | 4 +-- dev/kernel/KernelKit/UserProcessScheduler.h | 2 +- dev/kernel/KernelKit/XCOFF.h | 12 ++++---- dev/kernel/NewKit/Macros.h | 2 +- dev/kernel/obj/.gitkeep | 0 dev/kernel/obj/.hgkeep | 0 dev/kernel/src/GUIDWizard.cc | 4 +-- dev/kernel/src/GUIDWrapper.cc | 2 +- dev/kernel/src/Property.cc | 4 +-- 32 files changed, 128 insertions(+), 117 deletions(-) create mode 100644 dev/kernel/obj/.gitkeep delete mode 100644 dev/kernel/obj/.hgkeep (limited to 'dev/kernel') diff --git a/dev/kernel/ArchKit/ArchKit.h b/dev/kernel/ArchKit/ArchKit.h index 76e62a4e..51d47bc8 100644 --- a/dev/kernel/ArchKit/ArchKit.h +++ b/dev/kernel/ArchKit/ArchKit.h @@ -73,8 +73,8 @@ typedef Kernel::Void (*rt_syscall_proc)(Kernel::VoidPtr); struct HalSyscallEntry final { - Kernel::Int64 fHash; - Kernel::Bool fHooked; + Kernel::Int64 fHash; + Kernel::Bool fHooked; rt_syscall_proc fProc; operator bool() @@ -84,11 +84,11 @@ struct HalSyscallEntry final }; inline Kernel::Array + kKernelMaxSystemCalls> kSyscalls; inline Kernel::Array + kKernelMaxSystemCalls> kKerncalls; EXTERN_C Kernel::HAL::StackFramePtr mp_get_current_context(Kernel::Int64 pid); diff --git a/dev/kernel/CFKit/GUIDWizard.h b/dev/kernel/CFKit/GUIDWizard.h index 45572d32..6383ce5d 100644 --- a/dev/kernel/CFKit/GUIDWizard.h +++ b/dev/kernel/CFKit/GUIDWizard.h @@ -15,10 +15,10 @@ #include #include -namespace CFKit::XRN::Version1 +namespace CF::XRN::Version1 { using namespace Kernel; - Ref cf_make_sequence(const ArrayList& seq); + Ref cf_make_sequence(const ArrayList& seq); ErrorOr> cf_try_guid_to_string(Ref& guid); -} // namespace CFKit::XRN::Version1 +} // namespace CF::XRN::Version1 diff --git a/dev/kernel/CFKit/GUIDWrapper.h b/dev/kernel/CFKit/GUIDWrapper.h index 68c43033..7d0252c5 100644 --- a/dev/kernel/CFKit/GUIDWrapper.h +++ b/dev/kernel/CFKit/GUIDWrapper.h @@ -15,7 +15,7 @@ #define kXRNNil "@{........-....-M...-N...-............}" // eXtensible Resource Information -namespace CFKit::XRN +namespace CF::XRN { using namespace Kernel; @@ -57,4 +57,4 @@ namespace CFKit::XRN private: GUIDSequence fUUID; }; -} // namespace CFKit::XRN +} // namespace CF::XRN diff --git a/dev/kernel/CFKit/Property.h b/dev/kernel/CFKit/Property.h index b43434f6..effd4739 100644 --- a/dev/kernel/CFKit/Property.h +++ b/dev/kernel/CFKit/Property.h @@ -15,7 +15,7 @@ #define kMaxPropLen (256U) -namespace CFKit +namespace CF { using namespace Kernel; @@ -46,11 +46,11 @@ namespace CFKit template using PropertyArray = Array; -} // namespace CFKit +} // namespace CF namespace Kernel { - using namespace CFKit; + using namespace CF; } #endif // !CFKIT_PROPS_H diff --git a/dev/kernel/CFKit/Utils.h b/dev/kernel/CFKit/Utils.h index 1de15c18..cc65bbee 100644 --- a/dev/kernel/CFKit/Utils.h +++ b/dev/kernel/CFKit/Utils.h @@ -4,7 +4,7 @@ #include #include -namespace CFKit +namespace CF { using namespace Kernel; @@ -50,6 +50,6 @@ namespace CFKit { return ldr_find_opt_exec_header((DosHeaderPtr)ptrDos); } -} // namespace CFKit +} // namespace CF #endif // ifndef CFKIT_UTILS_H diff --git a/dev/kernel/FSKit/HeFS.h b/dev/kernel/FSKit/HeFS.h index cd547afb..b0e38e56 100644 --- a/dev/kernel/FSKit/HeFS.h +++ b/dev/kernel/FSKit/HeFS.h @@ -34,26 +34,26 @@ struct HeFS_BOOT_NODE; struct HeFS_BOOT_NODE final { - Kernel::Char fMagic[kHeFSMagicLen]; - Kernel::Char fPartName[kHeFSPartNameLen]; + Kernel::Char fMagic[kHeFSMagicLen]; + Kernel::Char fPartName[kHeFSPartNameLen]; Kernel::UInt32 fVersion; Kernel::UInt64 fBadSectors; Kernel::UInt64 fSectorCount; Kernel::UInt64 fSectorSize; Kernel::UInt32 fChecksum; - Kernel::UInt8 fDriveKind; - Kernel::UInt8 fTextEncoding; + Kernel::UInt8 fDriveKind; + Kernel::UInt8 fTextEncoding; Kernel::UInt64 fRootINode; Kernel::UInt64 fRecoveryINode; }; struct HeFS_INDEX_NODE { - Kernel::Char fName[kHeFSFileNameLen]; + Kernel::Char fName[kHeFSFileNameLen]; Kernel::UInt32 fFlags; Kernel::UInt16 fKind; Kernel::UInt32 fSize; - Kernel::Lba fFirstINode; - Kernel::Lba fLastINode; + Kernel::Lba fFirstINode; + Kernel::Lba fLastINode; Kernel::UInt32 fChecksum; }; \ No newline at end of file diff --git a/dev/kernel/FSKit/NeFS.h b/dev/kernel/FSKit/NeFS.h index d0e376a7..3b4a1244 100644 --- a/dev/kernel/FSKit/NeFS.h +++ b/dev/kernel/FSKit/NeFS.h @@ -143,7 +143,7 @@ struct PACKED NEFS_CATALOG_STRUCT final BOOL ForkOrCatalog : 1 {0}; Kernel::Char Name[kNeFSCatalogNameLen] = {0}; - Kernel::Char Mime[kNeFSMimeNameLen] = {0}; + Kernel::Char Mime[kNeFSMimeNameLen] = {0}; /// Catalog flags. Kernel::UInt16 Flags; @@ -186,7 +186,7 @@ struct PACKED NEFS_FORK_STRUCT final { BOOL ForkOrCatalog : 1 {1}; - Kernel::Char ForkName[kNeFSForkNameLen] = {0}; + Kernel::Char ForkName[kNeFSForkNameLen] = {0}; Kernel::Char CatalogName[kNeFSCatalogNameLen] = {0}; Kernel::Int32 Flags; @@ -196,8 +196,8 @@ struct PACKED NEFS_FORK_STRUCT final Kernel::Int32 ResourceKind; Kernel::Int32 ResourceFlags; - Kernel::Lba DataOffset; // 8 Where to look for this data? - Kernel::SizeT DataSize; /// Data size according using sector count. + Kernel::Lba DataOffset; // 8 Where to look for this data? + Kernel::SizeT DataSize; /// Data size according using sector count. Kernel::Lba NextSibling; Kernel::Lba PreviousSibling; @@ -208,13 +208,13 @@ struct PACKED NEFS_FORK_STRUCT final /// @brief Partition block type struct PACKED NEFS_ROOT_PARTITION_BLOCK final { - Kernel::Char Ident[kNeFSIdentLen] = {0}; + Kernel::Char Ident[kNeFSIdentLen] = {0}; Kernel::Char PartitionName[kNeFSPartLen] = {0}; Kernel::Int32 Flags; Kernel::Int32 Kind; - Kernel::Lba StartCatalog; + Kernel::Lba StartCatalog; Kernel::SizeT CatalogCount; Kernel::SizeT DiskSize; diff --git a/dev/kernel/FirmwareKit/CoreBoot/NetBoot.h b/dev/kernel/FirmwareKit/CoreBoot/NetBoot.h index 040fbbc8..a9c90327 100644 --- a/dev/kernel/FirmwareKit/CoreBoot/NetBoot.h +++ b/dev/kernel/FirmwareKit/CoreBoot/NetBoot.h @@ -9,17 +9,17 @@ #include /// @brief the internet header is used to download updates OTA. -typedef struct NETBOOT_INTERNET_HEADER +typedef struct BOOTNET_INTERNET_HEADER { 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' - 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; + 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** +} BOOTNET_INTERNET_HEADER; diff --git a/dev/kernel/FirmwareKit/EPM.h b/dev/kernel/FirmwareKit/EPM.h index 31e9cff0..de616b18 100644 --- a/dev/kernel/FirmwareKit/EPM.h +++ b/dev/kernel/FirmwareKit/EPM.h @@ -71,7 +71,7 @@ typedef struct EPM_GUID Kernel::UInt32 Data1; Kernel::UInt16 Data2; Kernel::UInt16 Data3; - Kernel::UInt8 Data4[8]; + Kernel::UInt8 Data4[8]; } PACKED EPM_GUID; /** @@ -80,19 +80,19 @@ typedef struct EPM_GUID */ struct PACKED EPM_PART_BLOCK { - Kernel::Char Magic[kEPMMagicLength]; - Kernel::Char Name[kEPMNameLength]; - EPM_GUID Guid; + Kernel::Char Magic[kEPMMagicLength]; + Kernel::Char Name[kEPMNameLength]; + EPM_GUID Guid; Kernel::Int32 Version; Kernel::Int64 NumBlocks; Kernel::Int64 SectorSz; Kernel::Int64 LbaStart; // base offset - Kernel::Int64 LbaEnd; // end 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. + 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 d129eab7..198b1a17 100644 --- a/dev/kernel/FirmwareKit/GPT.h +++ b/dev/kernel/FirmwareKit/GPT.h @@ -23,7 +23,7 @@ namespace Kernel Kernel::UInt32 Data1; Kernel::UInt16 Data2; Kernel::UInt16 Data3; - Kernel::UInt8 Data4[8]; + Kernel::UInt8 Data4[8]; } GPT_GUID; struct PACKED GPT_PARTITION_TABLE final diff --git a/dev/kernel/HALKit/AMD64/HalDebugOutput.cc b/dev/kernel/HALKit/AMD64/HalDebugOutput.cc index 1aab95aa..acf7dffd 100644 --- a/dev/kernel/HALKit/AMD64/HalDebugOutput.cc +++ b/dev/kernel/HALKit/AMD64/HalDebugOutput.cc @@ -125,7 +125,7 @@ namespace Kernel fb_init(); - FBDrawInRegion(fb_get_clear_clr(), FB::UIAccessibilty::Height(), FB::UIAccessibilty::Width(), + FBDrawInRegion(fb_get_clear_clr(), FB::FBAccessibilty::Height(), FB::FBAccessibilty::Width(), 0, 0); fb_clear(); diff --git a/dev/kernel/HALKit/AMD64/HalKernelMain.cc b/dev/kernel/HALKit/AMD64/HalKernelMain.cc index fadb37e4..30463f5d 100644 --- a/dev/kernel/HALKit/AMD64/HalKernelMain.cc +++ b/dev/kernel/HALKit/AMD64/HalKernelMain.cc @@ -22,7 +22,7 @@ STATIC Kernel::Void hal_init_scheduler_team() { for (Kernel::SizeT i = 0U; i < Kernel::UserProcessScheduler::The().CurrentTeam().AsArray().Count(); ++i) { - Kernel::UserProcessScheduler::The().CurrentTeam().AsArray()[i] = Kernel::UserProcess(); + Kernel::UserProcessScheduler::The().CurrentTeam().AsArray()[i] = Kernel::UserProcess(); Kernel::UserProcessScheduler::The().CurrentTeam().AsArray()[i].Status = Kernel::ProcessStatusKind::kKilled; } } diff --git a/dev/kernel/HALKit/AMD64/HalTimerAMD64.cc b/dev/kernel/HALKit/AMD64/HalTimerAMD64.cc index 55e92dfe..cddd4a1b 100644 --- a/dev/kernel/HALKit/AMD64/HalTimerAMD64.cc +++ b/dev/kernel/HALKit/AMD64/HalTimerAMD64.cc @@ -30,16 +30,16 @@ namespace Kernel::Detail { struct HPET_BLOCK : public Kernel::SDT { - Kernel::UInt8 hardware_rev_id; - Kernel::UInt8 comparator_count : 5; - Kernel::UInt8 counter_size : 1; - Kernel::UInt8 reserved : 1; - Kernel::UInt8 legacy_replacement : 1; + Kernel::UInt8 hardware_rev_id; + Kernel::UInt8 comparator_count : 5; + Kernel::UInt8 counter_size : 1; + Kernel::UInt8 reserved : 1; + Kernel::UInt8 legacy_replacement : 1; Kernel::UInt16 pci_vendor_id; - ACPI_ADDRESS address; - Kernel::UInt8 hpet_number; + ACPI_ADDRESS address; + Kernel::UInt8 hpet_number; Kernel::UInt16 minimum_tick; - Kernel::UInt8 page_protection; + Kernel::UInt8 page_protection; } PACKED; } // namespace Kernel::Detail diff --git a/dev/kernel/HALKit/AMD64/PCI/Device.cc b/dev/kernel/HALKit/AMD64/PCI/Device.cc index 553ffad4..32ea9e1f 100644 --- a/dev/kernel/HALKit/AMD64/PCI/Device.cc +++ b/dev/kernel/HALKit/AMD64/PCI/Device.cc @@ -15,11 +15,11 @@ Kernel::UInt NE_PCIReadRaw(Kernel::UInt bar, Kernel::UShort bus, Kernel::UShort dev, Kernel::UShort fun) { Kernel::UInt target = 0x80000000 | ((Kernel::UInt)bus << 16) | - ((Kernel::UInt)dev << 11) | ((Kernel::UInt)fun << 8) | - (bar & 0xFC); + ((Kernel::UInt)dev << 11) | ((Kernel::UInt)fun << 8) | + (bar & 0xFC); Kernel::HAL::rt_out32((Kernel::UShort)Kernel::PCI::PciConfigKind::ConfigAddress, - target); + target); Kernel::HAL::rt_wait_400ns(); @@ -29,11 +29,11 @@ Kernel::UInt NE_PCIReadRaw(Kernel::UInt bar, Kernel::UShort bus, Kernel::UShort void NE_PCISetCfgTarget(Kernel::UInt bar, Kernel::UShort bus, Kernel::UShort dev, Kernel::UShort fun) { Kernel::UInt target = 0x80000000 | ((Kernel::UInt)bus << 16) | - ((Kernel::UInt)dev << 11) | ((Kernel::UInt)fun << 8) | - (bar & 0xFC); + ((Kernel::UInt)dev << 11) | ((Kernel::UInt)fun << 8) | + (bar & 0xFC); Kernel::HAL::rt_out32((Kernel::UShort)Kernel::PCI::PciConfigKind::ConfigAddress, - target); + target); Kernel::HAL::rt_wait_400ns(); } diff --git a/dev/kernel/HALKit/AMD64/Processor.h b/dev/kernel/HALKit/AMD64/Processor.h index 83fde9ba..57f50a48 100644 --- a/dev/kernel/HALKit/AMD64/Processor.h +++ b/dev/kernel/HALKit/AMD64/Processor.h @@ -323,4 +323,4 @@ EXTERN_C ATTRIBUTE(naked) Kernel::Void hal_load_idt(Kernel::HAL::Register64 ptr) EXTERN_C ATTRIBUTE(naked) Kernel::Void hal_load_gdt(Kernel::HAL::RegisterGDT ptr); inline Kernel::VoidPtr kKernelBitMpStart = nullptr; -inline Kernel::UIntPtr kKernelBitMpSize = 0UL; +inline Kernel::UIntPtr kKernelBitMpSize = 0UL; diff --git a/dev/kernel/HALKit/AMD64/Storage/AHCI+Generic.cc b/dev/kernel/HALKit/AMD64/Storage/AHCI+Generic.cc index 318327f8..2ef2fda7 100644 --- a/dev/kernel/HALKit/AMD64/Storage/AHCI+Generic.cc +++ b/dev/kernel/HALKit/AMD64/Storage/AHCI+Generic.cc @@ -5,7 +5,7 @@ ------------------------------------------- */ /** - * @file AHCI.cc + * @file AHCI+Generic.cc * @author Amlal El Mahrouss (amlal@nekernel.org) * @brief AHCI driver. * @version 0.1 @@ -19,17 +19,14 @@ #include #include #include - #include - +#include #include #include #include #include #include -#include - #define kHBAErrTaskFile (1 << 30) #define kHBAPxCmdST (0x0001) #define kHBAPxCmdFre (0x0010) @@ -345,8 +342,6 @@ STATIC Bool drv_std_init_ahci(UInt16& pi, BOOL& atapi) if (mem_ahci->Ports[ahci_index].Sig == kSATASignature) { - kout << "detect device: /dev/sat" << number(ahci_index) << kendl; - kSATAIndex = ahci_index; kSATAHba = mem_ahci; @@ -356,8 +351,6 @@ STATIC Bool drv_std_init_ahci(UInt16& pi, BOOL& atapi) } else if (atapi && kSATAPISignature == mem_ahci->Ports[ahci_index].Sig) { - kout << "detect device: /dev/atp" << number(ahci_index) << kendl; - kSATAIndex = ahci_index; kSATAHba = mem_ahci; @@ -370,6 +363,8 @@ STATIC Bool drv_std_init_ahci(UInt16& pi, BOOL& atapi) ++ahci_index; } + err_global_get() = kErrorSuccess; + return YES; } } @@ -476,38 +471,54 @@ namespace Kernel #ifdef __AHCI__ +//////////////////////////////////////////////////// +/// +//////////////////////////////////////////////////// Void drv_std_write(UInt64 lba, Char* buffer, SizeT sector_sz, SizeT size_buffer) { drv_std_input_output_ahci(lba, reinterpret_cast(buffer), sector_sz, size_buffer); } +//////////////////////////////////////////////////// +/// +//////////////////////////////////////////////////// Void drv_std_read(UInt64 lba, Char* buffer, SizeT sector_sz, SizeT size_buffer) { drv_std_input_output_ahci(lba, reinterpret_cast(buffer), sector_sz, size_buffer); } +//////////////////////////////////////////////////// +/// +//////////////////////////////////////////////////// Bool drv_std_init(UInt16& pi) { BOOL atapi = NO; return drv_std_init_ahci(pi, atapi); } +//////////////////////////////////////////////////// +/// +//////////////////////////////////////////////////// Bool drv_std_detected(Void) { return drv_std_detected_ahci(); } -/*** +//////////////////////////////////////////////////// +/** @brief Gets the number of sectors inside the drive. @return Sector size in bytes. */ +//////////////////////////////////////////////////// SizeT drv_get_sector_count() { return drv_get_sector_count_ahci(); } +//////////////////////////////////////////////////// /// @brief Get the drive size. /// @return Disk size in bytes. +//////////////////////////////////////////////////// SizeT drv_get_size() { return drv_get_size_ahci(); diff --git a/dev/kernel/HALKit/AMD64/Storage/DMA+Generic.cc b/dev/kernel/HALKit/AMD64/Storage/DMA+Generic.cc index 261643fc..e350228d 100644 --- a/dev/kernel/HALKit/AMD64/Storage/DMA+Generic.cc +++ b/dev/kernel/HALKit/AMD64/Storage/DMA+Generic.cc @@ -5,7 +5,7 @@ ------------------------------------------- */ /** - * @file ATA-PIO.cc + * @file DMA+Generic.cc * @author Amlal EL Mahrouss (amlal@nekernel.org) * @brief ATA driver (DMA mode). * @version 0.1 @@ -32,7 +32,7 @@ STATIC Boolean kATADetected = false; STATIC Int32 kATADeviceType = kATADeviceCount; STATIC Char kATAData[kATADataLen] = {0}; STATIC Kernel::PCI::Device kATADevice; -STATIC Char kCurrentDiskModel[50] = {"UNKNOWN DMA DRIVE"}; +STATIC Char kCurrentDiskModel[50] = {"UNKNOWN DMA DRIVE"}; Boolean drv_std_wait_io(UInt16 IO) { diff --git a/dev/kernel/HALKit/AMD64/Storage/PIO+Generic.cc b/dev/kernel/HALKit/AMD64/Storage/PIO+Generic.cc index 2bbdb0e5..d828839d 100644 --- a/dev/kernel/HALKit/AMD64/Storage/PIO+Generic.cc +++ b/dev/kernel/HALKit/AMD64/Storage/PIO+Generic.cc @@ -5,7 +5,7 @@ ------------------------------------------- */ /** - * @file PIO.cc + * @file PIO+Generic.cc * @author Amlal EL Mahrouss (amlal@nekernel.org) * @brief ATA driver (PIO mode). * @version 0.1 diff --git a/dev/kernel/HALKit/ARM64/Processor.h b/dev/kernel/HALKit/ARM64/Processor.h index cf600122..cc48c856 100644 --- a/dev/kernel/HALKit/ARM64/Processor.h +++ b/dev/kernel/HALKit/ARM64/Processor.h @@ -84,7 +84,7 @@ namespace Kernel::HAL } // namespace Kernel::HAL inline Kernel::VoidPtr kKernelBitMpStart = nullptr; -inline Kernel::UIntPtr kKernelBitMpSize = 0UL; +inline Kernel::UIntPtr kKernelBitMpSize = 0UL; inline Kernel::VoidPtr kKernelPhysicalStart = nullptr; diff --git a/dev/kernel/HALKit/POWER/AP.h b/dev/kernel/HALKit/POWER/AP.h index b97b6d3e..12ba467c 100644 --- a/dev/kernel/HALKit/POWER/AP.h +++ b/dev/kernel/HALKit/POWER/AP.h @@ -26,9 +26,9 @@ namespace Kernel typedef struct HAL_HARDWARE_THREAD { Kernel::UIntPtr fStartAddress; - Kernel::UInt8 fPrivleged : 1; - Kernel::UInt32 fPageMemoryFlags; - hal_ap_kind fIdentNumber; + Kernel::UInt8 fPrivleged : 1; + Kernel::UInt32 fPageMemoryFlags; + hal_ap_kind fIdentNumber; } HAL_HARDWARE_THREAD; /// @brief Set PC to specific hart. diff --git a/dev/kernel/HALKit/RISCV/AP.h b/dev/kernel/HALKit/RISCV/AP.h index 33ca3192..2be2013e 100644 --- a/dev/kernel/HALKit/RISCV/AP.h +++ b/dev/kernel/HALKit/RISCV/AP.h @@ -22,9 +22,9 @@ namespace Kernel typedef struct HAL_HARDWARE_THREAD { Kernel::UIntPtr fStartAddress; - Kernel::UInt8 fPrivleged : 1; - Kernel::UInt32 fPageMemoryFlags; - hal_ap_kind fIdentNumber; + Kernel::UInt8 fPrivleged : 1; + Kernel::UInt32 fPageMemoryFlags; + hal_ap_kind fIdentNumber; } HAL_HARDWARE_THREAD; /// @brief Set PC to specific hart. diff --git a/dev/kernel/KernelKit/MSDOS.h b/dev/kernel/KernelKit/MSDOS.h index 8d18b884..d0d2533b 100644 --- a/dev/kernel/KernelKit/MSDOS.h +++ b/dev/kernel/KernelKit/MSDOS.h @@ -24,29 +24,29 @@ #define kMagMz1 'Z' typedef Kernel::UInt32 DosWord; -typedef Kernel::Long DosLong; +typedef Kernel::Long DosLong; typedef struct _DosHeader { Kernel::UInt8 eMagic[2]; - DosWord eMagLen; - DosWord ePagesCount; - DosWord eCrlc; - DosWord eCParHdr; - DosWord eMinAlloc; - DosWord eMaxAlloc; - DosWord eStackSeg; - DosWord eStackPtr; - DosWord eChksum; - DosWord eIp; - DosWord eCs; - DosWord eLfarlc; - DosWord eOvno; - DosWord eRes[4]; - DosWord eOemid; - DosWord eOeminfo; - DosWord eRes2[10]; - DosLong eLfanew; + DosWord eMagLen; + DosWord ePagesCount; + DosWord eCrlc; + DosWord eCParHdr; + DosWord eMinAlloc; + DosWord eMaxAlloc; + DosWord eStackSeg; + DosWord eStackPtr; + DosWord eChksum; + DosWord eIp; + DosWord eCs; + DosWord eLfarlc; + DosWord eOvno; + DosWord eRes[4]; + DosWord eOemid; + DosWord eOeminfo; + DosWord eRes2[10]; + DosLong eLfanew; } DosHeader, *DosHeaderPtr; #endif /* ifndef __MSDOS_EXEC__ */ diff --git a/dev/kernel/KernelKit/PE.h b/dev/kernel/KernelKit/PE.h index 3746cf90..313cddd2 100644 --- a/dev/kernel/KernelKit/PE.h +++ b/dev/kernel/KernelKit/PE.h @@ -42,8 +42,8 @@ typedef struct LDR_EXEC_HEADER final typedef struct LDR_OPTIONAL_HEADER final { Kernel::UInt16 Magic; // 0x010b - PE32, 0x020b - PE32+ (64 bit) - Kernel::UInt8 MajorLinkerVersion; - Kernel::UInt8 MinorLinkerVersion; + Kernel::UInt8 MajorLinkerVersion; + Kernel::UInt8 MinorLinkerVersion; Kernel::UInt32 SizeOfCode; Kernel::UInt32 SizeOfInitializedData; Kernel::UInt32 SizeOfUninitializedData; @@ -75,7 +75,7 @@ typedef struct LDR_OPTIONAL_HEADER final typedef struct LDR_SECTION_HEADER final { - Kernel::Char Name[8]; + Kernel::Char Name[8]; Kernel::UInt32 VirtualSize; Kernel::UInt32 VirtualAddress; Kernel::UInt32 SizeOfRawData; diff --git a/dev/kernel/KernelKit/ThreadLocalStorage.h b/dev/kernel/KernelKit/ThreadLocalStorage.h index 98747ca7..5f80d7c7 100644 --- a/dev/kernel/KernelKit/ThreadLocalStorage.h +++ b/dev/kernel/KernelKit/ThreadLocalStorage.h @@ -28,8 +28,8 @@ struct THREAD_INFORMATION_BLOCK; /// Located in GS on AMD64, other architectures have their own stuff. (64x0, 32x0, ARM64) struct PACKED THREAD_INFORMATION_BLOCK final { - Kernel::Char Cookie[kTLSCookieLen]{0}; //! Thread magic number. - Kernel::VoidPtr Record{nullptr}; //! Thread information record. + Kernel::Char Cookie[kTLSCookieLen]{0}; //! Thread magic number. + Kernel::VoidPtr Record{nullptr}; //! Thread information record. }; ///! @brief Cookie Sanity check. diff --git a/dev/kernel/KernelKit/UserProcessScheduler.h b/dev/kernel/KernelKit/UserProcessScheduler.h index dc90dc96..b9c1676b 100644 --- a/dev/kernel/KernelKit/UserProcessScheduler.h +++ b/dev/kernel/KernelKit/UserProcessScheduler.h @@ -19,7 +19,7 @@ #define kSchedMaxMemoryLimit gib_cast(128) /* max physical memory limit */ #define kSchedMaxStackSz mib_cast(8) /* maximum stack size */ -#define kSchedNameLen (128U) +#define kSchedNameLen (128U) //////////////////////////////////////////////////// // Last revision date is: Fri Mar 28 2025 // diff --git a/dev/kernel/KernelKit/XCOFF.h b/dev/kernel/KernelKit/XCOFF.h index 037a52bb..d38c2e02 100644 --- a/dev/kernel/KernelKit/XCOFF.h +++ b/dev/kernel/KernelKit/XCOFF.h @@ -29,13 +29,13 @@ struct XCoffForkHeader; /// @brief XCoff file header, meant for POWER apps. typedef struct XCoffFileHeader { - Kernel::UInt16 fMagic; - Kernel::UInt16 fTarget; - Kernel::UInt16 fNumSecs; - Kernel::UInt32 fTimeDat; + Kernel::UInt16 fMagic; + Kernel::UInt16 fTarget; + Kernel::UInt16 fNumSecs; + Kernel::UInt32 fTimeDat; Kernel::UIntPtr fSymPtr; - Kernel::UInt32 fNumSyms; - Kernel::UInt16 fOptHdr; // ?: Number of bytes in optional header + Kernel::UInt32 fNumSyms; + Kernel::UInt16 fOptHdr; // ?: Number of bytes in optional header } XCoffFileHeader64; #define kForkNameLen (256U) diff --git a/dev/kernel/NewKit/Macros.h b/dev/kernel/NewKit/Macros.h index 660877f6..bf1283e2 100644 --- a/dev/kernel/NewKit/Macros.h +++ b/dev/kernel/NewKit/Macros.h @@ -131,7 +131,7 @@ #define dbg_break_point() ((void)0) #endif -#define RTL_ENDIAN(address, value) \ +#define RTL_ENDIAN(address, value) \ (((reinterpret_cast(address)[0]) == (value)) \ ? (Kernel::Endian::kEndianBig) \ : (Kernel::Endian::kEndianLittle)) diff --git a/dev/kernel/obj/.gitkeep b/dev/kernel/obj/.gitkeep new file mode 100644 index 00000000..e69de29b diff --git a/dev/kernel/obj/.hgkeep b/dev/kernel/obj/.hgkeep deleted file mode 100644 index e69de29b..00000000 diff --git a/dev/kernel/src/GUIDWizard.cc b/dev/kernel/src/GUIDWizard.cc index 96e15d85..1aff3a21 100644 --- a/dev/kernel/src/GUIDWizard.cc +++ b/dev/kernel/src/GUIDWizard.cc @@ -17,7 +17,7 @@ // @brief Size of UUID. #define kUUIDSize 37 -namespace CFKit::XRN::Version1 +namespace CF::XRN::Version1 { auto cf_make_sequence(const ArrayList& uuidSeq) -> Ref { @@ -69,4 +69,4 @@ namespace CFKit::XRN::Version1 return ErrorOr>{-1}; } -} // namespace CFKit::XRN::Version1 +} // namespace CF::XRN::Version1 diff --git a/dev/kernel/src/GUIDWrapper.cc b/dev/kernel/src/GUIDWrapper.cc index cd4a6aa3..cd25e3cf 100644 --- a/dev/kernel/src/GUIDWrapper.cc +++ b/dev/kernel/src/GUIDWrapper.cc @@ -6,6 +6,6 @@ #include -namespace CFKit::XRN +namespace CF::XRN { } diff --git a/dev/kernel/src/Property.cc b/dev/kernel/src/Property.cc index 8f3b5314..1493b027 100644 --- a/dev/kernel/src/Property.cc +++ b/dev/kernel/src/Property.cc @@ -6,7 +6,7 @@ #include -namespace CFKit +namespace CF { /***********************************************************************************/ /// @brief Destructor. @@ -42,4 +42,4 @@ namespace CFKit { return fValue; } -} // namespace CFKit +} // namespace CF -- cgit v1.2.3