From b456c928fecf78157270b052e441a427f06afdda Mon Sep 17 00:00:00 2001 From: Amlal El Mahrouss Date: Sat, 29 Nov 2025 21:38:33 -0500 Subject: feat: kernel: Introduce Vet.h, better Ref.h, and more improved containers for better kernel code. Signed-off-by: Amlal El Mahrouss --- src/modules/ACPI/ACPI.h | 2 +- src/modules/ACPI/ACPIFactoryInterface.h | 2 +- src/modules/AHCI/AHCI.h | 2 +- src/modules/APM/APM.h | 2 +- src/modules/ATA/ATA.h | 4 ++-- src/modules/CoreGfx/CoreGfx.h | 2 +- src/modules/CoreGfx/TextGfx.h | 2 +- src/modules/HPET/Config.h | 39 +++++++++++++++++++++++++++++++++ src/modules/HPET/Defines.h | 39 --------------------------------- src/modules/LTE/LTE.h | 2 +- src/modules/MBCI/MBCI.h | 2 +- src/modules/NVME/NVME.h | 4 ++-- src/modules/Power/PowerFactory.h | 2 +- src/modules/SCSI/SCSI.h | 2 +- src/modules/XHCI/XHCI.h | 6 ++--- 15 files changed, 56 insertions(+), 56 deletions(-) create mode 100644 src/modules/HPET/Config.h delete mode 100644 src/modules/HPET/Defines.h (limited to 'src/modules') diff --git a/src/modules/ACPI/ACPI.h b/src/modules/ACPI/ACPI.h index b5bf3b69..5977da61 100644 --- a/src/modules/ACPI/ACPI.h +++ b/src/modules/ACPI/ACPI.h @@ -11,7 +11,7 @@ https://uefi.org/specs/ACPI/6.5/05_ACPI_Software_Programming_Model.html */ -#include +#include #define SDT_OBJECT : public Kernel::SDT diff --git a/src/modules/ACPI/ACPIFactoryInterface.h b/src/modules/ACPI/ACPIFactoryInterface.h index da91a62e..372175b3 100644 --- a/src/modules/ACPI/ACPIFactoryInterface.h +++ b/src/modules/ACPI/ACPIFactoryInterface.h @@ -8,7 +8,7 @@ #define __MOD_ACPI_H__ #include -#include +#include #include #include #include diff --git a/src/modules/AHCI/AHCI.h b/src/modules/AHCI/AHCI.h index 3c6fecc5..008c0d6e 100644 --- a/src/modules/AHCI/AHCI.h +++ b/src/modules/AHCI/AHCI.h @@ -13,7 +13,7 @@ #pragma once -#include +#include #include /// @file AHCI.h diff --git a/src/modules/APM/APM.h b/src/modules/APM/APM.h index d9b0621e..1c229c82 100644 --- a/src/modules/APM/APM.h +++ b/src/modules/APM/APM.h @@ -6,7 +6,7 @@ #pragma once -#include +#include namespace Kernel { typedef Int32 APMPowerCmd; diff --git a/src/modules/ATA/ATA.h b/src/modules/ATA/ATA.h index a1213b40..09305801 100644 --- a/src/modules/ATA/ATA.h +++ b/src/modules/ATA/ATA.h @@ -2,7 +2,7 @@ Copyright (C) 2024-2025, Amlal El Mahrouss, licensed under the Apache 2.0 license. - File: Defines.h + File: Config.h Purpose: ATA header. Revision History: @@ -14,7 +14,7 @@ #pragma once #include -#include +#include ///! Status register #define ATA_SR_BSY 0x80 diff --git a/src/modules/CoreGfx/CoreGfx.h b/src/modules/CoreGfx/CoreGfx.h index c217fbe3..81356452 100644 --- a/src/modules/CoreGfx/CoreGfx.h +++ b/src/modules/CoreGfx/CoreGfx.h @@ -6,7 +6,7 @@ #pragma once -#include +#include #define cg_init() Kernel::UInt32 kCGCursor = 0 diff --git a/src/modules/CoreGfx/TextGfx.h b/src/modules/CoreGfx/TextGfx.h index b5dcd9e5..52eead08 100644 --- a/src/modules/CoreGfx/TextGfx.h +++ b/src/modules/CoreGfx/TextGfx.h @@ -6,7 +6,7 @@ #pragma once -#include +#include #include #define kFontSizeX 8 diff --git a/src/modules/HPET/Config.h b/src/modules/HPET/Config.h new file mode 100644 index 00000000..9d1d9155 --- /dev/null +++ b/src/modules/HPET/Config.h @@ -0,0 +1,39 @@ +/* ======================================== + + Copyright (C) 2024-2025, Amlal El Mahrouss, licensed under the Apache 2.0 license. + + File: HPET.h + Purpose: HPET builtin. + + Revision History: + +======================================== */ + +#pragma once + +#include +#include + +namespace Kernel { +struct PACKED HPETAddressStructure final { + Kernel::UInt8 AddressSpaceId; // 0 - system memory, 1 - system I/O + Kernel::UInt8 RegisterBitWidth; + Kernel::UInt8 RegisterBitOffset; + Kernel::UInt8 Reserved; + Kernel::UInt64 Address; +}; + +struct PACKED HPETHeader final : public SDT { + Kernel::UInt8 HardwareRevId; + Kernel::UInt8 ComparatorCount : 5; + Kernel::UInt8 CounterSize : 1; + Kernel::UInt8 Reserved : 1; + Kernel::UInt8 LegacyReplacement : 1; + Kernel::UInt16 PciVendorId; + HPETAddressStructure Address; + Kernel::UInt8 HpetNumber; + Kernel::UInt16 MinimumTick; + Kernel::UInt8 PageProtection; +}; + +} // namespace Kernel diff --git a/src/modules/HPET/Defines.h b/src/modules/HPET/Defines.h deleted file mode 100644 index 56968a24..00000000 --- a/src/modules/HPET/Defines.h +++ /dev/null @@ -1,39 +0,0 @@ -/* ======================================== - - Copyright (C) 2024-2025, Amlal El Mahrouss, licensed under the Apache 2.0 license. - - File: HPET.h - Purpose: HPET builtin. - - Revision History: - -======================================== */ - -#pragma once - -#include -#include - -namespace Kernel { -struct PACKED HPETAddressStructure final { - Kernel::UInt8 AddressSpaceId; // 0 - system memory, 1 - system I/O - Kernel::UInt8 RegisterBitWidth; - Kernel::UInt8 RegisterBitOffset; - Kernel::UInt8 Reserved; - Kernel::UInt64 Address; -}; - -struct PACKED HPETHeader final : public SDT { - Kernel::UInt8 HardwareRevId; - Kernel::UInt8 ComparatorCount : 5; - Kernel::UInt8 CounterSize : 1; - Kernel::UInt8 Reserved : 1; - Kernel::UInt8 LegacyReplacement : 1; - Kernel::UInt16 PciVendorId; - HPETAddressStructure Address; - Kernel::UInt8 HpetNumber; - Kernel::UInt16 MinimumTick; - Kernel::UInt8 PageProtection; -}; - -} // namespace Kernel diff --git a/src/modules/LTE/LTE.h b/src/modules/LTE/LTE.h index 7cee2c8d..beac4891 100644 --- a/src/modules/LTE/LTE.h +++ b/src/modules/LTE/LTE.h @@ -10,7 +10,7 @@ Purpose: LTE Standard Library. #ifndef _INC_NETWORK_LTE_H_ #define _INC_NETWORK_LTE_H_ -#include +#include #include /// @brief Long Term Evolution I/O routines. diff --git a/src/modules/MBCI/MBCI.h b/src/modules/MBCI/MBCI.h index a96f8f3a..1cefe034 100644 --- a/src/modules/MBCI/MBCI.h +++ b/src/modules/MBCI/MBCI.h @@ -7,7 +7,7 @@ #ifndef _INC_MODULE_MBCI_H_ #define _INC_MODULE_MBCI_H_ -#include +#include #include #include diff --git a/src/modules/NVME/NVME.h b/src/modules/NVME/NVME.h index 9ad8a3ce..ee9002d4 100644 --- a/src/modules/NVME/NVME.h +++ b/src/modules/NVME/NVME.h @@ -5,14 +5,14 @@ Revision History: ??/??/24: Added file (amlel) - 23 Jul 24: Update filename to Defines.h and using NE_ALIGN_NVME for NVME structs. (amlel) + 23 Jul 24: Update filename to Config.h and using NE_ALIGN_NVME for NVME structs. (amlel) ======================================== */ #ifndef __MODULE_NVME_H__ #define __MODULE_NVME_H__ -#include +#include /// @file NVME.h /// @brief Non Volatile Memory. diff --git a/src/modules/Power/PowerFactory.h b/src/modules/Power/PowerFactory.h index 2e349011..dcc75936 100644 --- a/src/modules/Power/PowerFactory.h +++ b/src/modules/Power/PowerFactory.h @@ -7,7 +7,7 @@ #pragma once #include -#include +#include #include #include #include diff --git a/src/modules/SCSI/SCSI.h b/src/modules/SCSI/SCSI.h index e0bc2517..b6228e54 100644 --- a/src/modules/SCSI/SCSI.h +++ b/src/modules/SCSI/SCSI.h @@ -6,7 +6,7 @@ #pragma once -#include +#include /// @file SCSI.h /// @brief Small Computer System Interface device. diff --git a/src/modules/XHCI/XHCI.h b/src/modules/XHCI/XHCI.h index 40387c1e..6eb25fac 100644 --- a/src/modules/XHCI/XHCI.h +++ b/src/modules/XHCI/XHCI.h @@ -2,19 +2,19 @@ Copyright (C) 2024-2025, Amlal El Mahrouss, licensed under the Apache 2.0 license. - File: Defines.h + File: Config.h Purpose: XHCI (and backwards) header. Revision History: 01/02/24: Added file (amlel) - 03/02/24: Update filename to Defines.h (amlel) + 03/02/24: Update filename to Config.h (amlel) ======================================== */ #pragma once -#include +#include #define kUSBCommand (UInt16) 0x0 #define kUSBStatus (UInt16) 0x2 -- cgit v1.2.3