summaryrefslogtreecommitdiffhomepage
path: root/dev/modules
diff options
context:
space:
mode:
Diffstat (limited to 'dev/modules')
-rw-r--r--dev/modules/ACPI/ACPI.h2
-rw-r--r--dev/modules/ACPI/ACPIFactoryInterface.h2
-rw-r--r--dev/modules/AHCI/AHCI.h2
-rw-r--r--dev/modules/APM/APM.h6
-rw-r--r--dev/modules/ATA/ATA.h2
-rw-r--r--dev/modules/CoreGfx/CoreAccess.h8
-rw-r--r--dev/modules/CoreGfx/CoreGfx.h16
-rw-r--r--dev/modules/CoreGfx/MathGfx.h6
-rw-r--r--dev/modules/CoreGfx/TextGfx.h8
-rw-r--r--dev/modules/HPET/.gitkeep0
-rw-r--r--dev/modules/HPET/Defines.h2
-rw-r--r--dev/modules/LTE/LTE.h2
-rw-r--r--dev/modules/MBCI/MBCI.h2
-rw-r--r--dev/modules/NVME/NVME.h4
-rw-r--r--dev/modules/Power/PowerFactory.h8
-rw-r--r--dev/modules/SCSI/SCSI.h7
-rw-r--r--dev/modules/XHCI/XHCI.h6
17 files changed, 41 insertions, 42 deletions
diff --git a/dev/modules/ACPI/ACPI.h b/dev/modules/ACPI/ACPI.h
index cfa78ecc..34edbc9a 100644
--- a/dev/modules/ACPI/ACPI.h
+++ b/dev/modules/ACPI/ACPI.h
@@ -1,6 +1,6 @@
/* -------------------------------------------
- Copyright (C) 2024-2025, Amlal El Mahrouss, all rights reserved.
+ Copyright (C) 2024-2025, Amlal El Mahrouss, licensed under the Apache 2.0 license.
------------------------------------------- */
diff --git a/dev/modules/ACPI/ACPIFactoryInterface.h b/dev/modules/ACPI/ACPIFactoryInterface.h
index 3ff53535..f4c903f0 100644
--- a/dev/modules/ACPI/ACPIFactoryInterface.h
+++ b/dev/modules/ACPI/ACPIFactoryInterface.h
@@ -1,6 +1,6 @@
/* -------------------------------------------
- Copyright (C) 2024-2025, Amlal El Mahrouss, all rights reserved.
+ Copyright (C) 2024-2025, Amlal El Mahrouss, licensed under the Apache 2.0 license.
------------------------------------------- */
diff --git a/dev/modules/AHCI/AHCI.h b/dev/modules/AHCI/AHCI.h
index dcdc5faa..085c8b7a 100644
--- a/dev/modules/AHCI/AHCI.h
+++ b/dev/modules/AHCI/AHCI.h
@@ -1,6 +1,6 @@
/* -------------------------------------------
- Copyright (C) 2024-2025, Amlal El Mahrouss, all rights reserved.
+ Copyright (C) 2024-2025, Amlal El Mahrouss, licensed under the Apache 2.0 license.
File: AHCI.h
Purpose: AHCI protocol defines.
diff --git a/dev/modules/APM/APM.h b/dev/modules/APM/APM.h
index 29de5114..f282e141 100644
--- a/dev/modules/APM/APM.h
+++ b/dev/modules/APM/APM.h
@@ -1,6 +1,6 @@
/* -------------------------------------------
- Copyright (C) 2024-2025, Amlal El Mahrouss, all rights reserved.
+ Copyright (C) 2024-2025, Amlal El Mahrouss, licensed under the Apache 2.0 license.
------------------------------------------- */
@@ -21,9 +21,9 @@ enum {
kAPMPowerCommandReboot = 0x08,
};
-/// @brief Send a APM command into it's own IO space.
+/// @brief Send a APM command into it's controller. (Shutdown, Reboot, Sleep...)
/// @param base_dma the IO base port.
/// @param cmd the command.
-/// @return status code.
+/// @return status code of the APM command.
EXTERN_C Int32 apm_send_io_command(UInt16 cmd);
} // namespace Kernel
diff --git a/dev/modules/ATA/ATA.h b/dev/modules/ATA/ATA.h
index 34091a36..fa4356a7 100644
--- a/dev/modules/ATA/ATA.h
+++ b/dev/modules/ATA/ATA.h
@@ -1,6 +1,6 @@
/* -------------------------------------------
- Copyright (C) 2024-2025, Amlal El Mahrouss, all rights reserved.
+ Copyright (C) 2024-2025, Amlal El Mahrouss, licensed under the Apache 2.0 license.
File: Defines.h
Purpose: ATA header.
diff --git a/dev/modules/CoreGfx/CoreAccess.h b/dev/modules/CoreGfx/CoreAccess.h
index f092b5a6..246b386a 100644
--- a/dev/modules/CoreGfx/CoreAccess.h
+++ b/dev/modules/CoreGfx/CoreAccess.h
@@ -17,12 +17,12 @@ namespace FB {
using namespace Kernel;
/// @brief common User interface class.
-class FBAccessibilty final {
- explicit FBAccessibilty() = default;
- ~FBAccessibilty() = default;
+class CGAccessibilty final {
+ explicit CGAccessibilty() = default;
+ ~CGAccessibilty() = default;
public:
- NE_COPY_DELETE(FBAccessibilty)
+ NE_COPY_DELETE(CGAccessibilty)
static UInt64 Width() noexcept { return kHandoverHeader->f_GOP.f_Width; }
diff --git a/dev/modules/CoreGfx/CoreGfx.h b/dev/modules/CoreGfx/CoreGfx.h
index 7d23c17e..b4f513ef 100644
--- a/dev/modules/CoreGfx/CoreGfx.h
+++ b/dev/modules/CoreGfx/CoreGfx.h
@@ -1,6 +1,6 @@
/* -------------------------------------------
- Copyright (C) 2024-2025, Amlal El Mahrouss, all rights reserved.
+ Copyright (C) 2024-2025, Amlal El Mahrouss, licensed under the Apache 2.0 license.
------------------------------------------- */
@@ -8,13 +8,13 @@
#include <NeKit/Defines.h>
-#define fb_init() Kernel::UInt32 kCGCursor = 0
+#define cg_init() Kernel::UInt32 kCGCursor = 0
-#define fb_color(R, G, B) RGB(R, G, B)
+#define cg_color(R, G, B) RGB(R, G, B)
-#define fb_get_clear_clr() RGB(0x20, 0x20, 0x20)
+#define cg_get_clear_clr() RGB(0, 0, 0x80)
-#define fb_clear() kCGCursor = 0UL
+#define cg_clear() kCGCursor = 0UL
#ifdef __NE_AMD64__
/// @brief Performs Alpha drawing on the framebuffer.
@@ -57,7 +57,7 @@
for (Kernel::UInt32 u = base_y; u < (height + base_y); ++u) { \
*(((volatile Kernel::UInt32*) (kHandoverHeader->f_GOP.f_The + \
4 * kHandoverHeader->f_GOP.f_PixelPerLine * i + 4 * u))) = \
- fb_get_clear_clr(); \
+ cg_get_clear_clr(); \
} \
}
@@ -111,8 +111,8 @@
#endif // ifndef CORE_GFX_ACCESSIBILITY_H
namespace FB {
-inline Void fb_clear_video() noexcept {
- FBDrawInRegion(fb_get_clear_clr(), FB::FBAccessibilty::Height(), FB::FBAccessibilty::Width(), 0,
+inline Void cg_clear_video() noexcept {
+ FBDrawInRegion(cg_get_clear_clr(), FB::CGAccessibilty::Height(), FB::CGAccessibilty::Width(), 0,
0);
}
} // namespace FB \ No newline at end of file
diff --git a/dev/modules/CoreGfx/MathGfx.h b/dev/modules/CoreGfx/MathGfx.h
index 0b483fad..523f4b31 100644
--- a/dev/modules/CoreGfx/MathGfx.h
+++ b/dev/modules/CoreGfx/MathGfx.h
@@ -11,9 +11,9 @@
namespace UI {
#ifdef NE_CORE_GFX_USE_DOUBLE
-typedef double fb_real_t;
+typedef double cg_real_t;
#else
-typedef float fb_real_t;
+typedef float cg_real_t;
#endif
/// @brief Linear interpolation equation solver.
@@ -21,7 +21,7 @@ typedef float fb_real_t;
/// @param to to which value.
/// @param stat
/// @return Linear interop value.
-inline fb_real_t fb_math_lerp(fb_real_t to, fb_real_t from, fb_real_t stat) {
+inline cg_real_t cg_math_lerp(cg_real_t to, cg_real_t from, cg_real_t stat) {
return (from) + (to - from) * stat;
}
} // namespace UI \ No newline at end of file
diff --git a/dev/modules/CoreGfx/TextGfx.h b/dev/modules/CoreGfx/TextGfx.h
index 1bcc1397..b0545fcc 100644
--- a/dev/modules/CoreGfx/TextGfx.h
+++ b/dev/modules/CoreGfx/TextGfx.h
@@ -1,6 +1,6 @@
/* -------------------------------------------
- Copyright (C) 2024-2025, Amlal El Mahrouss, all rights reserved.
+ Copyright (C) 2024-2025, Amlal El Mahrouss, licensed under the Apache 2.0 license.
------------------------------------------- */
@@ -145,7 +145,7 @@ inline const Kernel::UInt8 kFontBitmap[kFontNOFChars][kFontSizeX] = {
};
-inline Kernel::Void fb_render_string_for_bitmap(const Kernel::UInt8* bitmap,
+inline Kernel::Void cg_render_string_for_bitmap(const Kernel::UInt8* bitmap,
const Kernel::SizeT x_sz, const Kernel::SizeT y_sz,
Kernel::Int32& x_dst, Kernel::Int32& y_dst,
Kernel::Int32& color) {
@@ -167,7 +167,7 @@ inline Kernel::Void fb_render_string_for_bitmap(const Kernel::UInt8* bitmap,
}
}
-inline Kernel::Void fb_render_string(const Kernel::Char* text, Kernel::Int32 x_dst,
+inline Kernel::Void cg_render_string(const Kernel::Char* text, Kernel::Int32 x_dst,
Kernel::Int32 y_dst, Kernel::Int32 color) {
#ifndef __BOOTZ__
auto len = Kernel::rt_string_len(text);
@@ -176,7 +176,7 @@ inline Kernel::Void fb_render_string(const Kernel::Char* text, Kernel::Int32 x_d
#endif
for (Kernel::SizeT i = 0; i < len; ++i) {
- fb_render_string_for_bitmap(&kFontBitmap[(Kernel::UInt8) text[i]][0], kFontSizeX, kFontSizeY,
+ cg_render_string_for_bitmap(&kFontBitmap[(Kernel::UInt8) text[i]][0], kFontSizeX, kFontSizeY,
x_dst, y_dst, color);
y_dst += kFontSizeY;
}
diff --git a/dev/modules/HPET/.gitkeep b/dev/modules/HPET/.gitkeep
deleted file mode 100644
index e69de29b..00000000
--- a/dev/modules/HPET/.gitkeep
+++ /dev/null
diff --git a/dev/modules/HPET/Defines.h b/dev/modules/HPET/Defines.h
index 5317c11f..78eb9280 100644
--- a/dev/modules/HPET/Defines.h
+++ b/dev/modules/HPET/Defines.h
@@ -1,6 +1,6 @@
/* -------------------------------------------
- Copyright (C) 2024-2025, Amlal El Mahrouss, all rights reserved.
+ Copyright (C) 2024-2025, Amlal El Mahrouss, licensed under the Apache 2.0 license.
File: HPET.h
Purpose: HPET builtin.
diff --git a/dev/modules/LTE/LTE.h b/dev/modules/LTE/LTE.h
index 5eb09f8e..2080f571 100644
--- a/dev/modules/LTE/LTE.h
+++ b/dev/modules/LTE/LTE.h
@@ -1,6 +1,6 @@
/* -------------------------------------------
-Copyright (C) 2024-2025, Amlal El Mahrouss, all rights reserved..
+Copyright (C) 2024-2025, Amlal El Mahrouss, licensed under the Apache 2.0 license..
File: LTE\LTE.h.
Purpose: LTE Standard Library.
diff --git a/dev/modules/MBCI/MBCI.h b/dev/modules/MBCI/MBCI.h
index aa1eb959..b877cae7 100644
--- a/dev/modules/MBCI/MBCI.h
+++ b/dev/modules/MBCI/MBCI.h
@@ -1,6 +1,6 @@
/* -------------------------------------------
- Copyright (C) 2024-2025, Amlal El Mahrouss, all rights reserved.
+ Copyright (C) 2024-2025, Amlal El Mahrouss, licensed under the Apache 2.0 license.
------------------------------------------- */
diff --git a/dev/modules/NVME/NVME.h b/dev/modules/NVME/NVME.h
index c0894194..1e82b10f 100644
--- a/dev/modules/NVME/NVME.h
+++ b/dev/modules/NVME/NVME.h
@@ -1,6 +1,6 @@
/* -------------------------------------------
- Copyright (C) 2024-2025, Amlal El Mahrouss, all rights reserved.
+ Copyright (C) 2024-2025, Amlal El Mahrouss, licensed under the Apache 2.0 license.
Revision History:
@@ -93,7 +93,7 @@ inline Bool nvme_create_io_command(HAL_NVME_QUEUE* entry, UInt64 baseAddress,
entry->CommandSpecific[9] = identify;
if (namespaceIdentify) {
- entry->CommandSpecific[0] = 1;
+ entry->CommandSpecific[0] = YES;
}
}
diff --git a/dev/modules/Power/PowerFactory.h b/dev/modules/Power/PowerFactory.h
index b7c13280..b3a663e2 100644
--- a/dev/modules/Power/PowerFactory.h
+++ b/dev/modules/Power/PowerFactory.h
@@ -1,6 +1,6 @@
/* -------------------------------------------
- Copyright (C) 2025, Amlal El Mahrouss, all rights reserved.
+ Copyright (C) 2025, Amlal El Mahrouss, licensed under the Apache 2.0 license.
------------------------------------------- */
@@ -15,8 +15,6 @@
#define NE_POWER_FACTORY : public PowerFactory
namespace Kernel {
-class PowerFactory;
-
class PowerFactory {
public:
explicit PowerFactory() = default;
@@ -26,7 +24,7 @@ class PowerFactory {
PowerFactory(const PowerFactory&) = default;
public:
- Bool Shutdown() { return NO; }; // shutdown
- Void Reboot(){}; // soft-reboot
+ virtual Bool Shutdown() { return NO; } // shutdown
+ virtual Void Reboot() {} // soft-reboot
};
} // namespace Kernel \ No newline at end of file
diff --git a/dev/modules/SCSI/SCSI.h b/dev/modules/SCSI/SCSI.h
index d9ede8b4..80a5b052 100644
--- a/dev/modules/SCSI/SCSI.h
+++ b/dev/modules/SCSI/SCSI.h
@@ -1,6 +1,6 @@
/* -------------------------------------------
- Copyright (C) 2024-2025, Amlal El Mahrouss, all rights reserved.
+ Copyright (C) 2024-2025, Amlal El Mahrouss, licensed under the Apache 2.0 license.
------------------------------------------- */
@@ -12,9 +12,10 @@
/// @brief Small Computer System Interface device.
namespace Kernel {
-template <int PacketBitLen>
+template <Int32 PacketBitLen>
using scsi_packet_type = Kernel::UInt16[PacketBitLen];
+
using scsi_packet_type_12 = scsi_packet_type<12>;
-extern const scsi_packet_type<12> kCDRomPacketTemplate;
+extern const scsi_packet_type_12 kCDRomPacketTemplate;
} // namespace Kernel \ No newline at end of file
diff --git a/dev/modules/XHCI/XHCI.h b/dev/modules/XHCI/XHCI.h
index 8829d29b..3efdf90c 100644
--- a/dev/modules/XHCI/XHCI.h
+++ b/dev/modules/XHCI/XHCI.h
@@ -1,6 +1,6 @@
/* -------------------------------------------
- Copyright (C) 2024-2025, Amlal El Mahrouss, all rights reserved.
+ Copyright (C) 2024-2025, Amlal El Mahrouss, licensed under the Apache 2.0 license.
File: Defines.h
Purpose: XHCI (and backwards) header.
@@ -16,8 +16,6 @@
#include <NeKit/Defines.h>
-using namespace Kernel;
-
#define kUSBCommand (UInt16) 0x0
#define kUSBStatus (UInt16) 0x2
#define kUSBInterruptEnable (UInt16) 0x4
@@ -27,6 +25,7 @@ using namespace Kernel;
#define kUSBPort1StatusCtrl (UInt16) 0x10
#define kUSBPort2StatusCtrl (UInt16) 0x12
+namespace Kernel {
typedef struct USBCommandRegister final {
UInt8 mReserved[8]; // Reserved
UInt8 mMaxPacket; // 0 = Max packet size 32 bits 1 = Max packet size 64 bits
@@ -64,3 +63,4 @@ typedef struct USBInterruptEnableRegister final {
32-bit physical adress of Frame List. Remember that first 12 bytes are
always 0. The Frame List must contain 1024 entries.
*/
+} // namespace Kernel \ No newline at end of file
generated by cgit v1.2.3 (git 2.39.1) at 2026-03-13 14:26:06 +0000