HCR-11 : SATA support phase 1, work in progress AHCI implementation.

Signed-off-by: Amlal El Mahrouss <amlalelmahrouss@icloud.com>

22 files changed, 544 insertions, 161 deletions

diff --git a/Private/Drivers/AHCI/Defines.hxx b/Private/Drivers/AHCI/Defines.hxx
new file mode 100644
index 00000000..ac0c9de0
--- /dev/null
+++ b/Private/Drivers/AHCI/Defines.hxx
@@ -0,0 +1,319 @@
+/* -------------------------------------------
+
+    Copyright Mahrouss Logic
+
+    File: Defines.hxx
+    Purpose: AHCI header.
+
+    Revision History:
+
+    03/02/24: Added file (amlel)
+
+------------------------------------------- */
+
+#pragma once
+
+#include <NewKit/Defines.hpp>
+
+using namespace HCore;
+
+// forward decl
+
+struct HbaPort;
+
+typedef enum {
+  FIS_TYPE_REG_H2D = 0x27,    // Register FIS - host to device
+  FIS_TYPE_REG_D2H = 0x34,    // Register FIS - device to host
+  FIS_TYPE_DMA_ACT = 0x39,    // DMA activate FIS - device to host
+  FIS_TYPE_DMA_SETUP = 0x41,  // DMA setup FIS - bidirectional
+  FIS_TYPE_DATA = 0x46,       // Data FIS - bidirectional
+  FIS_TYPE_BIST = 0x58,       // BIST activate FIS - bidirectional
+  FIS_TYPE_PIO_SETUP = 0x5F,  // PIO setup FIS - device to host
+  FIS_TYPE_DEV_BITS = 0xA1,   // Set device bits FIS - device to host
+} AHCI_FIS_TYPE;
+
+typedef enum {
+  AHCI_ATA_CMD_IDENTIFY = 0xEC,
+  AHCI_ATA_CMD_READ_DMA = 0xC8,
+  AHCI_ATA_CMD_READ_DMA_EX = 0x25,
+  AHCI_ATA_CMD_WRITE_DMA = 0xCA,
+  AHCI_ATA_CMD_WRITE_DMA_EX = 0x35
+} AHCI_FIS_COMMAND;
+
+typedef struct FisRegH2d {
+  // DWORD 0
+  UInt8 fisType;  // FIS_TYPE_REG_H2D
+
+  UInt8 portMul : 4;    // Port multiplier
+  UInt8 reserved0 : 3;  // Reserved
+  UInt8 cmdOrCtrl : 1;  // 1: Command, 0: Control
+
+  UInt8 command;   // Command register
+  UInt8 featurel;  // Feature register, 7:0
+
+  // DWORD 1
+  UInt8 lba0;    // LBA low register, 7:0
+  UInt8 lba1;    // LBA mid register, 15:8
+  UInt8 lba2;    // LBA high register, 23:16
+  UInt8 device;  // Device register
+
+  // DWORD 2
+  UInt8 lba3;         // LBA register, 31:24
+  UInt8 lba4;         // LBA register, 39:32
+  UInt8 lba5;         // LBA register, 47:40
+  UInt8 featureHigh;  // Feature register, 15:8
+
+  // DWORD 3
+  UInt8 countLow;   // Count register, 7:0
+  UInt8 countHigh;  // Count register, 15:8
+  UInt8 icc;        // Isochronous command completion
+  UInt8 control;    // Control register
+
+  // DWORD 4
+  UInt8 reserved1[4];  // Reserved
+} FisRegH2d;
+
+typedef struct FisRegD2h {
+  // DWORD 0
+  UInt8 fisType;  // FIS_TYPE_REG_D2H
+
+  UInt8 portMul : 4;       // Port multiplier
+  UInt8 reserved0 : 2;     // Reserved
+  UInt8 interruptBit : 1;  // Interrupt bit
+  UInt8 reserved1 : 1;     // Reserved
+
+  UInt8 status;  // Status register
+  UInt8 error;   // Error register
+
+  // DWORD 1
+  UInt8 lba0;    // LBA low register, 7:0
+  UInt8 lba1;    // LBA mid register, 15:8
+  UInt8 lba2;    // LBA high register, 23:16
+  UInt8 device;  // Device register
+
+  // DWORD 2
+  UInt8 lba3;  // LBA register, 31:24
+  UInt8 lba4;  // LBA register, 39:32
+  UInt8 lba5;  // LBA register, 47:40
+  UInt8 rsv2;  // Reserved
+
+  // DWORD 3
+  UInt8 countLow;   // Count register, 7:0
+  UInt8 countHigh;  // Count register, 15:8
+  UInt8 rsv3[2];    // Reserved
+
+  // DWORD 4
+  UInt8 rsv4[4];  // Reserved
+} FisRegD2h;
+
+typedef struct FisData {
+  // DWORD 0
+  UInt8 fisType;  // FIS_TYPE_DATA
+
+  UInt8 portMul : 4;    // Port multiplier
+  UInt8 reserved0 : 4;  // Reserved
+
+  UInt8 reserved1[2];  // Reserved
+
+  // DWORD 1 ~ N
+  UInt32 data[1];  // Payload
+} FisData;
+
+typedef struct FisPioSetup {
+  // DWORD 0
+  UInt8 fisType;  // FIS_TYPE_PIO_SETUP
+
+  UInt8 portMul : 4;       // Port multiplier
+  UInt8 reserved0 : 1;     // Reserved
+  UInt8 d : 1;             // Data transfer direction, 1 - device to host
+  UInt8 interruptBit : 1;  // Interrupt bit
+  UInt8 reserved1 : 1;
+
+  UInt8 status;  // Status register
+  UInt8 error;   // Error register
+
+  // DWORD 1
+  UInt8 lba0;    // LBA low register, 7:0
+  UInt8 lba1;    // LBA mid register, 15:8
+  UInt8 lba2;    // LBA high register, 23:16
+  UInt8 device;  // Device register
+
+  // DWORD 2
+  UInt8 lba3;  // LBA register, 31:24
+  UInt8 lba4;  // LBA register, 39:32
+  UInt8 lba5;  // LBA register, 47:40
+  UInt8 rsv2;  // Reserved
+
+  // DWORD 3
+  UInt8 countLow;   // Count register, 7:0
+  UInt8 countHigh;  // Count register, 15:8
+  UInt8 rsv3;       // Reserved
+  UInt8 e_status;   // New value of status register
+
+  // DWORD 4
+  UInt16 tc;      // Transfer count
+  UInt8 rsv4[2];  // Reserved
+} FisPioSetup;
+
+typedef struct FisDmaSetup {
+  // DWORD 0
+  UInt8 fisType;  // FIS_TYPE_DMA_SETUP
+
+  UInt8 portMul : 4;       // Port multiplier
+  UInt8 reserved0 : 1;     // Reserved
+  UInt8 dtd : 1;           // Data transfer direction, 1 - device to host
+  UInt8 interruptBit : 1;  // Interrupt bit
+  UInt8
+      autoEnable : 1;  // Auto-activate. Specifies if DMA Activate FIS is needed
+
+  UInt8 reserved1[2];  // Reserved
+
+  // DWORD 1&2
+  UInt64 dmaBufferId;  // DMA Buffer Identifier. Used to Identify DMA buffer in
+                       // host memory. SATA Spec says host specific and not in
+                       // Spec. Trying AHCI spec might work.
+
+  // DWORD 3
+  UInt32 rsvd;  // More reserved
+
+  // DWORD 4
+  UInt32 dmabufOffset;  // Byte offset into buffer. First 2 bits must be 0
+
+  // DWORD 5
+  UInt32 transferCount;  // Number of bytes to transfer. Bit 0 must be 0
+
+  // DWORD 6
+  UInt32 reserved3;  // Reserved
+} FisDmaSetup;
+
+typedef struct FisDevBits {
+  // DWORD 0
+  UInt8 fisType;  // FIS_TYPE_DMA_SETUP (A1h)
+
+  UInt8 reserved0 : 5;  // Reserved
+  UInt8 r0 : 1;
+  UInt8 interruptBit : 1;
+  UInt8 n : 1;
+
+  UInt8 statusLow : 3;
+  UInt8 r1 : 1;
+  UInt8 statusHigh : 3;
+
+  UInt8 r2 : 1;
+  UInt8 error;
+
+  // DWORD 1
+  UInt32 act;
+} FisDevBits;
+
+#ifndef AHCI_GHC_AE
+#define AHCI_GHC_AE (31)
+#endif  //! AHCI_GHC_AE
+
+typedef struct HbaPort {
+  UInt32 clb;            // 0x00, command list base address, 1K-byte aligned
+  UInt32 clbu;           // 0x04, command list base address upper 32 bits
+  UInt32 fb;             // 0x08, FIS base address, 256-byte aligned
+  UInt32 fbu;            // 0x0C, FIS base address upper 32 bits
+  UInt32 is;             // 0x10, interrupt status
+  UInt32 ie;             // 0x14, interrupt enable
+  UInt32 cmd;            // 0x18, command and status
+  UInt32 reserved0;      // 0x1C, Reserved
+  UInt32 tfd;            // 0x20, task file data
+  UInt32 sig;            // 0x24, signature
+  UInt32 ssts;           // 0x28, SATA status (SCR0:SStatus)
+  UInt32 sctl;           // 0x2C, SATA control (SCR2:SControl)
+  UInt32 serr;           // 0x30, SATA error (SCR1:SError)
+  UInt32 sact;           // 0x34, SATA active (SCR3:SActive)
+  UInt32 ci;             // 0x38, command issue
+  UInt32 sntf;           // 0x3C, SATA notification (SCR4:SNotification)
+  UInt32 fbs;            // 0x40, FIS-based switch control
+  UInt32 reserved1[11];  // 0x44 ~ 0x6F, Reserved
+  UInt32 vendor[4];      // 0x70 ~ 0x7F, vendor specific
+} HbaPort;
+
+typedef struct HbaMem {
+  // 0x00 - 0x2B, Generic Host Control
+  UInt32 cap;      // 0x00, Host capability
+  UInt32 ghc;      // 0x04, Global host control
+  UInt32 is;       // 0x08, Interrupt status
+  UInt32 pi;       // 0x0C, Port implemented
+  UInt32 vs;       // 0x10, Version
+  UInt32 ccc_ctl;  // 0x14, Command completion coalescing control
+  UInt32 ccc_pts;  // 0x18, Command completion coalescing ports
+  UInt32 em_loc;   // 0x1C, Enclosure management location
+  UInt32 em_ctl;   // 0x20, Enclosure management control
+  UInt32 cap2;     // 0x24, Host capabilities extended
+  UInt32 bohc;     // 0x28, BIOS/OS handoff control and status
+
+  UInt16 rsv;
+  UInt32 resv2;
+
+  HbaPort ports[1];  // 1 ~ 32
+} HbaMem;
+
+typedef struct HbaCmdHeader {
+  // DW0
+  UInt8 cfl : 5;           // Command FIS length in DWORDS, 2 ~ 16
+  UInt8 atapi : 1;         // ATAPI
+  UInt8 write : 1;         // Write, 1: H2D, 0: D2H
+  UInt8 prefetchable : 1;  // Prefetchable
+
+  UInt8 reset : 1;      // Reset
+  UInt8 BIST : 1;       // BIST
+  UInt8 clear : 1;      // Clear busy upon R_OK
+  UInt8 reserved0 : 1;  // Reserved
+  UInt8 pmp : 4;        // Port multiplier port
+
+  UInt16 prdtl;           // Physical region descriptor table length in entries
+  volatile UInt32 prdbc;  // Physical region descriptor byte count transferred
+
+  UInt32 ctba;   // Command table descriptor base address
+  UInt32 ctbau;  // Command table descriptor base address upper 32 bits
+
+  UInt32 reserved1[4];  // Reserved
+} HbaCmdHeader;
+
+typedef struct HbaFis {
+  // 0x00
+  FisDmaSetup dsfis;  // DMA Setup FIS
+  UInt8 pad0[4];
+  // 0x20
+  FisPioSetup psfis;  // PIO Setup FIS
+  UInt8 pad1[12];
+  // 0x40
+  FisRegD2h rfis;  // Register – Device to Host FIS
+  UInt8 pad2[4];
+  // 0x58
+  FisDevBits sdbfis;  // Set Device Bit FIS
+  // 0x60
+  UInt8 ufis[64];
+  // 0xA0
+  UInt8 rsv[0x100 - 0xA0];
+} HbaFis;
+
+typedef struct HbaPrdtEntry {
+  UInt32 dba;        // Data base address
+  UInt32 dbau;       // Data base address upper 32 bits
+  UInt32 reserved0;  // Reserved
+  // DW3
+  UInt32 dbc : 22;          // Byte count, 4M max
+  UInt32 reserved1 : 9;     // Reserved
+  UInt32 interruptBit : 1;  // Interrupt on completion
+} HbaPrdtEntry;
+
+typedef struct HbaCmdTbl {
+  UInt8 cfis[64];  // Command FIS
+  UInt8 acmd[16];  // ATAPI command, 12 or 16 bytes
+  UInt8 rsv[48];   // Reserved
+  HbaPrdtEntry
+      prdtEntries[1];  // Physical region descriptor table entries, 0 ~ 65535
+} HbaCmdTbl;
+
+/*
+ *
+ *
+ *
+ *
+ *
+ */
diff --git a/Private/Drivers/AHCI/compile_flags.txt b/Private/Drivers/AHCI/compile_flags.txt
index 2b0d1998..1bc51142 100644
--- a/Private/Drivers/AHCI/compile_flags.txt
+++ b/Private/Drivers/AHCI/compile_flags.txt
@@ -1,4 +1,4 @@
 -I./
 -I../
--I../Private
+-I../../
 -std=c++20
diff --git a/Private/Drivers/ATA/Defines.hxx b/Private/Drivers/ATA/Defines.hxx
new file mode 100644
index 00000000..f3392ace
--- /dev/null
+++ b/Private/Drivers/ATA/Defines.hxx
@@ -0,0 +1,116 @@
+/* -------------------------------------------
+
+    Copyright Mahrouss Logic
+
+    File: Defines.hxx
+    Purpose: ATA header.
+
+    Revision History:
+
+    03/02/24: Added file (amlel)
+
+------------------------------------------- */
+
+#pragma once
+
+#include <CompilerKit/CompilerKit.hpp>
+#include <NewKit/Defines.hpp>
+
+using namespace HCore;
+
+// Status register
+#define ATA_SR_BSY 0x80
+#define ATA_SR_DRDY 0x40
+#define ATA_SR_DF 0x20
+#define ATA_SR_DSC 0x10
+#define ATA_SR_DRQ 0x08
+#define ATA_SR_CORR 0x04
+#define ATA_SR_IDX 0x02
+#define ATA_SR_ERR 0x01
+
+// Error register
+#define ATA_ER_BBK 0x80
+#define ATA_ER_UNC 0x40
+#define ATA_ER_MC 0x20
+#define ATA_ER_IDNF 0x10
+#define ATA_ER_MCR 0x08
+#define ATA_ER_ABRT 0x04
+#define ATA_ER_TK0NF 0x02
+#define ATA_ER_AMNF 0x01
+
+#define ATA_CMD_READ_PIO 0x20
+#define ATA_CMD_READ_PIO_EXT 0x24
+#define ATA_CMD_READ_DMA 0xC8
+#define ATA_CMD_READ_DMA_EXT 0x25
+#define ATA_CMD_WRITE_PIO 0x30
+#define ATA_CMD_WRITE_PIO_EXT 0x34
+#define ATA_CMD_WRITE_DMA 0xCA
+#define ATA_CMD_WRITE_DMA_EXT 0x35
+#define ATA_CMD_CACHE_FLUSH 0xE7
+#define ATA_CMD_CACHE_FLUSH_EXT 0xEA
+#define ATA_CMD_PACKET 0xA0
+#define ATA_CMD_IDENTIFY_PACKET 0xA1
+#define ATA_CMD_IDENTIFY 0xEC
+
+#define ATA_IDENT_DEVICE_TYPE 0
+#define ATA_IDENT_CYLINDERS 2
+#define ATA_IDENT_HEADS 6
+#define ATA_IDENT_SECTORS 12
+#define ATA_IDENT_SERIAL 20
+#define ATA_IDENT_MODEL 54
+#define ATA_IDENT_CAPABILITIES 98
+#define ATA_IDENT_FIELDVALID 106
+#define ATA_IDENT_MAX_LBA 120
+#define ATA_IDENT_COMMANDSETS 164
+#define ATA_IDENT_MAX_LBA_EXT 200
+
+#define ATA_MASTER 0x00
+#define ATA_SLAVE 0x01
+
+// Register
+#define ATA_REG_DATA 0x00
+#define ATA_REG_ERROR 0x01
+#define ATA_REG_FEATURES 0x01
+#define ATA_REG_SEC_COUNT0 0x02
+#define ATA_REG_LBA0 0x03
+#define ATA_REG_LBA1 0x04
+#define ATA_REG_LBA2 0x05
+#define ATA_REG_HDDEVSEL 0x06
+#define ATA_REG_COMMAND 0x07
+#define ATA_REG_STATUS 0x07
+#define ATA_REG_SEC_COUNT1 0x08
+#define ATA_REG_LBA3 0x09
+#define ATA_REG_LBA4 0x0A
+#define ATA_REG_LBA5 0x0B
+#define ATA_REG_CONTROL 0x0C
+#define ATA_REG_ALT_STATUS 0x0C
+#define ATA_REG_DEV_ADDRESS 0x0D
+
+#define ATA_PRIMARY_IO 0x1F0
+#define ATA_SECONDARY_IO 0x170
+#define ATA_PRIMARY_DCR_AS 0x3F6
+#define ATA_SECONDARY_DCR_AS 0x376
+
+// Irq
+#define ATA_PRIMARY_IRQ 14
+#define ATA_SECONDARY_IRQ 15
+
+// Channels
+#define ATA_PRIMARY 0x00
+#define ATA_SECONDARY 0x01
+
+#define ATA_CYL_LOW 4
+#define ATA_CYL_HIGH 5
+
+// IO Direction
+#define ATA_READ 0x00
+#define ATA_WRITE 0x013
+
+#define ATA_PRIMARY_SEL 0xA0
+#define ATA_SECONDARY_SEL 0xB0
+
+// ATA Helpers
+#define ATA_ADDRESS1(x) (x + 3)
+#define ATA_ADDRESS2(x) (x + 4)
+#define ATA_ADDRESS3(x) (x + 5)
+#define ATA_COMMAND(x) (x + 7)
diff --git a/Private/Drivers/ATA/compile_flags.txt b/Private/Drivers/ATA/compile_flags.txt
new file mode 100644
index 00000000..1bc51142
--- /dev/null
+++ b/Private/Drivers/ATA/compile_flags.txt
@@ -0,0 +1,4 @@
+-I./
+-I../
+-I../../
+-std=c++20
diff --git a/Private/Drivers/Ethernet/compile_flags.txt b/Private/Drivers/Ethernet/compile_flags.txt
index 2b0d1998..545816fc 100644
--- a/Private/Drivers/Ethernet/compile_flags.txt
+++ b/Private/Drivers/Ethernet/compile_flags.txt
@@ -1,4 +1,4 @@
 -I./
 -I../
--I../Private
+-I../../Private
 -std=c++20
diff --git a/Private/Drivers/NVME/compile_flags.txt b/Private/Drivers/NVME/compile_flags.txt
index 2b0d1998..1bc51142 100644
--- a/Private/Drivers/NVME/compile_flags.txt
+++ b/Private/Drivers/NVME/compile_flags.txt
@@ -1,4 +1,4 @@
 -I./
 -I../
--I../Private
+-I../../
 -std=c++20
diff --git a/Private/Drivers/WiFi/compile_flags.txt b/Private/Drivers/WiFi/compile_flags.txt
index 2b0d1998..1bc51142 100644
--- a/Private/Drivers/WiFi/compile_flags.txt
+++ b/Private/Drivers/WiFi/compile_flags.txt
@@ -1,4 +1,4 @@
 -I./
 -I../
--I../Private
+-I../../
 -std=c++20
diff --git a/Private/Drivers/XHCI/Defines.hxx b/Private/Drivers/XHCI/Defines.hxx
index 38ca7853..d67809af 100644
--- a/Private/Drivers/XHCI/Defines.hxx
+++ b/Private/Drivers/XHCI/Defines.hxx
@@ -3,7 +3,7 @@
     Copyright Mahrouss Logic
 
     File: Defines.hxx
-    Purpose: XHCI (and backwards) defines.
+    Purpose: XHCI (and backwards) header.
 
     Revision History:
 
@@ -16,6 +16,8 @@
 
 #include <NewKit/Defines.hpp>
 
+using namespace HCore;
+
 #define kUSBCommand (UInt16)0x0
 #define kUSBStatus (UInt16)0x2
 #define kUSBInterruptEnable (UInt16)0x4
diff --git a/Private/Drivers/XHCI/compile_flags.txt b/Private/Drivers/XHCI/compile_flags.txt
index 2b0d1998..1bc51142 100644
--- a/Private/Drivers/XHCI/compile_flags.txt
+++ b/Private/Drivers/XHCI/compile_flags.txt
@@ -1,4 +1,4 @@
 -I./
 -I../
--I../Private
+-I../../
 -std=c++20
diff --git a/Private/EFIKit/EFI.hxx b/Private/EFIKit/EFI.hxx
index b11164de..0dba118d 100644
--- a/Private/EFIKit/EFI.hxx
+++ b/Private/EFIKit/EFI.hxx
@@ -19,6 +19,8 @@
 
 using namespace HCore;
 
+/* we always use stdcall in EFI, the pascal way of calling functions. */
+
 #ifndef EPI_API
 #define EFI_API __attribute__((stdcall))
 #endif  // ifndef EPI_API
@@ -40,8 +42,7 @@ struct EfiBitmask;
 
 /// @brief Core Handle Type
 /// This is like NT's Win32 HANDLE type.
-typedef struct EfiHandle {
-} *EfiHandlePtr;
+typedef struct EfiHandle {} *EfiHandlePtr;
 
 /* UEFI uses wide characters by default. */
 typedef WideChar EfiCharType;
diff --git a/Private/FSKit/NewFS.hxx b/Private/FSKit/NewFS.hxx
index 8aace190..0be6ece0 100644
--- a/Private/FSKit/NewFS.hxx
+++ b/Private/FSKit/NewFS.hxx
@@ -17,23 +17,25 @@
 #define kInvalidCatalog -1
 #define kNameLen 256
 
-#define kNewFSIdentLen 6
-#define kNewFSIdent "NewFS"
+#define kNewFSIdentLen 4
+#define kNewFSIdent "HCFS"
 #define kPadLen 16
 
 #define kNewFSVersion 1
 
+typedef HCore::WideChar NewCharType;
+
 enum {
   kNewFSHardDrive = 0xC0,          // Hard Drive
   kNewFSOpticalDrive = 0x0C,       // Blu-Ray/DVD
   kNewFSMassStorageDevice = 0xCC,  // USB
-  kNewFSUnknowmn = 0xFF,           // unknown device or unsupported (floppy)
+  kNewFSUnknown = 0xFF,            // unknown device or unsupported (floppy)
   kNewFSDriveCount = 4,
 };
 
 struct PACKED NewBootBlock final {
-  HCore::WideChar Ident[kNewFSIdentLen];
-  HCore::WideChar Shell[kNameLen];
+  NewCharType Ident[kNewFSIdentLen];
+  NewCharType Shell[kNameLen];
 
   HCore::Int64 NumParts;
   HCore::Int64 FreeSectors;
@@ -59,7 +61,7 @@ struct PACKED NewBootBlock final {
 #define kKindPartition 4
 
 struct PACKED NewCatalog final {
-  HCore::WideChar Name[kNameLen];
+  NewCharType Name[kNameLen];
 
   HCore::Int32 Flags;
   HCore::Int32 Kind;
@@ -93,8 +95,8 @@ struct PACKED NewFork final {
 #define kPartLen 32
 
 struct PACKED NewPartitionBlock final {
-  HCore::WideChar Ident[kNewFSIdentLen];
-  HCore::WideChar PartitionName[kPartLen];
+  NewCharType Ident[kNewFSIdentLen];
+  NewCharType PartitionName[kPartLen];
 
   HCore::Int32 Flags;
   HCore::Int32 Kind;
@@ -129,31 +131,31 @@ struct PACKED NewPartitionBlock final {
 #define kCatalogKindDevice 9
 #define kCatalogKindLock 10
 
-#define kFilesystemSeparator '/'
+#define kFilesystemSeparator '\\'
 
 #define kFilesystemUpDir ".."
-#define kFilesystemRoot "/"
+#define kFilesystemRoot "\\"
 
 #define kFilesystemLE '\r'
-#define kFilesystemEOF 0xFF11
+#define kFilesystemEOF (-1)
 
-#define kFilesystemBitWidth sizeof(HCore::WideChar)
+#define kFilesystemBitWidth sizeof(NewCharType)
 #define kFilesystemLbaType HCore::Lba
 
 namespace HCore {
 ///
-/// \name NewFSImpl
-/// NewFS filesystem operations. (catalog creation, remove removal, root
+/// \name NewFSImplementation
+/// \brief HCFS filesystem operations. (catalog creation, remove removal, root
 /// fork...)
 ///
 
-class NewFSImpl {
+class NewFSImplementation {
  public:
-  explicit NewFSImpl() = default;
-  virtual ~NewFSImpl() = default;
+  explicit NewFSImplementation() = default;
+  virtual ~NewFSImplementation() = default;
 
  public:
-  HCORE_COPY_DEFAULT(NewFSImpl);
+  HCORE_COPY_DEFAULT(NewFSImplementation);
 
   virtual NewFork* ForkFrom(NewCatalog& catalog, const Int64& id) = 0;
 
diff --git a/Private/FSKit/NewFSIndexer.hxx b/Private/FSKit/NewFSIndexer.hxx
index 3ff77858..bb6c9f99 100644
--- a/Private/FSKit/NewFSIndexer.hxx
+++ b/Private/FSKit/NewFSIndexer.hxx
@@ -32,11 +32,11 @@ class INewFSIterator {
   HCORE_COPY_DEFAULT(INewFSIterator);
 
  public:
-  void Add(IndexableProperty& indexProp) { fProps.Add(indexProp); }
+  void Append(IndexableProperty& indexProp) { fProps.Add(indexProp); }
 
-  void Remove(const SizeT& indexProp) { fProps.Remove(indexProp); }
+  MutableArray<IndexableProperty>& Leak() { return fProps; }
 
-  Boolean FindLinear(IndexProperty& filters) {
+  Boolean Find(IndexProperty& filters) {
     for (size_t i = 0; i < fProps.Count(); ++i) {
       if (StringBuilder::Equals(fProps[i].Leak().LeakProperty().Path,
                                 filters.Path)) {
diff --git a/Private/KernelKit/FileManager.hpp b/Private/KernelKit/FileManager.hpp
index b65bdfe1..cfd06f07 100644
--- a/Private/KernelKit/FileManager.hpp
+++ b/Private/KernelKit/FileManager.hpp
@@ -145,7 +145,7 @@ class NewFilesystemManager final : public IFilesystemManager {
   }
 
  public:
-  NewFSImpl *fIO{nullptr};
+  NewFSImplementation *fImpl{nullptr};
 };
 
 /**
diff --git a/Private/NewBoot/BootKit/Arch/AHCI.hxx b/Private/NewBoot/BootKit/Arch/AHCI.hxx
index 2e3739b5..0735baad 100644
--- a/Private/NewBoot/BootKit/Arch/AHCI.hxx
+++ b/Private/NewBoot/BootKit/Arch/AHCI.hxx
@@ -9,4 +9,41 @@
 
 #pragma once
 
+#include <CompilerKit/CompilerKit.hpp>
 #include <Drivers/AHCI/Defines.hxx>
+
+class BDeviceAHCI final {
+ public:
+  explicit BDeviceAHCI() noexcept;
+  ~BDeviceAHCI() = default;
+
+  HCORE_COPY_DEFAULT(BDeviceAHCI);
+
+  struct AHCITraits final {
+    SizeT mBase{1024};
+    Boolean mErr{false};
+    Boolean mDetected{false};
+
+    operator bool() { return !mErr; }
+  };
+
+  operator bool() { return Leak().mDetected; }
+
+  BDeviceAHCI& Read(WideChar* Buf, const SizeT& SecCount);
+  BDeviceAHCI& Write(WideChar* Buf, const SizeT& SecCount);
+
+  AHCITraits& Leak();
+
+ private:
+  AHCITraits mTraits;
+};
+
+enum {
+  kATADevicePATA,
+  kATADeviceSATA,
+  kATADevicePATA_PI,
+  kATADeviceSATA_PI,
+  kATADeviceCount,
+};
+
+#define kATASectorSz 512
diff --git a/Private/NewBoot/BootKit/Arch/ATA.hxx b/Private/NewBoot/BootKit/Arch/ATA.hxx
index 4b4eb399..fd413705 100644
--- a/Private/NewBoot/BootKit/Arch/ATA.hxx
+++ b/Private/NewBoot/BootKit/Arch/ATA.hxx
@@ -9,121 +9,21 @@
 
 #pragma once
 
-#include <CompilerKit/CompilerKit.hpp>
-#include <NewKit/Defines.hpp>
+#include <Drivers/ATA/Defines.hxx>
 
-using namespace HCore;
+Boolean IsATADetected(Void);
 
-// Status register
-#define ATA_SR_BSY 0x80
-#define ATA_SR_DRDY 0x40
-#define ATA_SR_DF 0x20
-#define ATA_SR_DSC 0x10
-#define ATA_SR_DRQ 0x08
-#define ATA_SR_CORR 0x04
-#define ATA_SR_IDX 0x02
-#define ATA_SR_ERR 0x01
-
-// Error register
-#define ATA_ER_BBK 0x80
-#define ATA_ER_UNC 0x40
-#define ATA_ER_MC 0x20
-#define ATA_ER_IDNF 0x10
-#define ATA_ER_MCR 0x08
-#define ATA_ER_ABRT 0x04
-#define ATA_ER_TK0NF 0x02
-#define ATA_ER_AMNF 0x01
-
-#define ATA_CMD_READ_PIO 0x20
-#define ATA_CMD_READ_PIO_EXT 0x24
-#define ATA_CMD_READ_DMA 0xC8
-#define ATA_CMD_READ_DMA_EXT 0x25
-#define ATA_CMD_WRITE_PIO 0x30
-#define ATA_CMD_WRITE_PIO_EXT 0x34
-#define ATA_CMD_WRITE_DMA 0xCA
-#define ATA_CMD_WRITE_DMA_EXT 0x35
-#define ATA_CMD_CACHE_FLUSH 0xE7
-#define ATA_CMD_CACHE_FLUSH_EXT 0xEA
-#define ATA_CMD_PACKET 0xA0
-#define ATA_CMD_IDENTIFY_PACKET 0xA1
-#define ATA_CMD_IDENTIFY 0xEC
-
-#define ATA_IDENT_DEVICE_TYPE 0
-#define ATA_IDENT_CYLINDERS 2
-#define ATA_IDENT_HEADS 6
-#define ATA_IDENT_SECTORS 12
-#define ATA_IDENT_SERIAL 20
-#define ATA_IDENT_MODEL 54
-#define ATA_IDENT_CAPABILITIES 98
-#define ATA_IDENT_FIELDVALID 106
-#define ATA_IDENT_MAX_LBA 120
-#define ATA_IDENT_COMMANDSETS 164
-#define ATA_IDENT_MAX_LBA_EXT 200
-
-#define ATA_MASTER 0x00
-#define ATA_SLAVE 0x01
-
-// Register
-#define ATA_REG_DATA 0x00
-#define ATA_REG_ERROR 0x01
-#define ATA_REG_FEATURES 0x01
-#define ATA_REG_SEC_COUNT0 0x02
-#define ATA_REG_LBA0 0x03
-#define ATA_REG_LBA1 0x04
-#define ATA_REG_LBA2 0x05
-#define ATA_REG_HDDEVSEL 0x06
-#define ATA_REG_COMMAND 0x07
-#define ATA_REG_STATUS 0x07
-#define ATA_REG_SEC_COUNT1 0x08
-#define ATA_REG_LBA3 0x09
-#define ATA_REG_LBA4 0x0A
-#define ATA_REG_LBA5 0x0B
-#define ATA_REG_CONTROL 0x0C
-#define ATA_REG_ALT_STATUS 0x0C
-#define ATA_REG_DEV_ADDRESS 0x0D
-
-#define ATA_PRIMARY_IO 0x1F0
-#define ATA_SECONDARY_IO 0x170
-#define ATA_PRIMARY_DCR_AS 0x3F6
-#define ATA_SECONDARY_DCR_AS 0x376
-
-// Irq
-#define ATA_PRIMARY_IRQ 14
-#define ATA_SECONDARY_IRQ 15
-
-// Channels
-#define ATA_PRIMARY 0x00
-#define ATA_SECONDARY 0x01
-
-#define ATA_CYL_LOW 4
-#define ATA_CYL_HIGH 5
-
-// IO Direction
-#define ATA_READ 0x00
-#define ATA_WRITE 0x013
-
-#define ATA_PRIMARY_SEL 0xA0
-#define ATA_SECONDARY_SEL 0xB0
-
-// ATA Helpers
-#define ATA_ADDRESS1(x) (x + 3)
-#define ATA_ADDRESS2(x) (x + 4)
-#define ATA_ADDRESS3(x) (x + 5)
-#define ATA_COMMAND(x) (x + 7)
-
-Boolean ATAIsDetected(Void);
-
-class BATADevice final {
+class BDeviceATA final {
  public:
   enum {
     kPrimary = ATA_PRIMARY_IO,
     kSecondary = ATA_SECONDARY_IO,
   };
 
-  explicit BATADevice() noexcept;
-  ~BATADevice() = default;
+  explicit BDeviceATA() noexcept;
+  ~BDeviceATA() = default;
 
-  HCORE_COPY_DEFAULT(BATADevice);
+  HCORE_COPY_DEFAULT(BDeviceATA);
 
   struct ATATraits final {
     SizeT mBase{1024};
@@ -134,10 +34,10 @@ class BATADevice final {
     operator bool() { return !mErr; }
   };
 
-  operator bool() { return ATAIsDetected(); }
+  operator bool() { return IsATADetected(); }
 
-  BATADevice& Read(WideChar* Buf, const SizeT& SecCount);
-  BATADevice& Write(WideChar* Buf, const SizeT& SecCount);
+  BDeviceATA& Read(WideChar* Buf, const SizeT& SecCount);
+  BDeviceATA& Write(WideChar* Buf, const SizeT& SecCount);
 
   ATATraits& Leak();
 
diff --git a/Private/NewBoot/BootKit/BootKit.hxx b/Private/NewBoot/BootKit/BootKit.hxx
index d1584d8a..45f54cb4 100644
--- a/Private/NewBoot/BootKit/BootKit.hxx
+++ b/Private/NewBoot/BootKit/BootKit.hxx
@@ -85,7 +85,7 @@ class BFileReader final {
   Int32 mErrorCode{kOperationOkay};
   CharacterType mPath[kPathLen];
   BTextWriter mWriter;
-  BATADevice mDevice;
+  BDeviceATA mDevice;
   bool mCached{false};
 };
 
diff --git a/Private/NewBoot/Source/Entrypoint.cxx b/Private/NewBoot/Source/Entrypoint.cxx
index d2134746..39769b87 100644
--- a/Private/NewBoot/Source/Entrypoint.cxx
+++ b/Private/NewBoot/Source/Entrypoint.cxx
@@ -7,6 +7,7 @@
  *      ========================================================
  */
 
+#include "BootKit/Arch/ATA.hxx"
 #define __BOOTLOADER__ 1
 
 #include <BootKit/BootKit.hxx>
diff --git a/Private/NewBoot/Source/HEL/AMD64/AMD64-AHCI.cxx b/Private/NewBoot/Source/HEL/AMD64/AMD64-AHCI.cxx
index 2d449bbb..2363f8cb 100644
--- a/Private/NewBoot/Source/HEL/AMD64/AMD64-AHCI.cxx
+++ b/Private/NewBoot/Source/HEL/AMD64/AMD64-AHCI.cxx
@@ -17,3 +17,5 @@
  * @copyright Copyright (c) 2024 Mahrouss Logic
  *
  */
+
+#include <BootKit/Arch/AHCI.hxx>
diff --git a/Private/NewBoot/Source/HEL/AMD64/AMD64-ATA.cxx b/Private/NewBoot/Source/HEL/AMD64/AMD64-ATA.cxx
index 3414d060..20af043d 100644
--- a/Private/NewBoot/Source/HEL/AMD64/AMD64-ATA.cxx
+++ b/Private/NewBoot/Source/HEL/AMD64/AMD64-ATA.cxx
@@ -22,8 +22,6 @@
 #include <BootKit/BootKit.hxx>
 #include <EFIKit/Api.hxx>
 
-#include "BootKit/Platform.hxx"
-
 /// bugs: 0
 
 #define kATADataLen 256
@@ -94,7 +92,7 @@ ATAInit_Retry:
 
   writer.WriteString(L"\r\n");
 
-  OutBus = (Bus == ATA_PRIMARY) ? BATADevice::kPrimary : BATADevice::kSecondary;
+  OutBus = (Bus == ATA_PRIMARY) ? BDeviceATA::kPrimary : BDeviceATA::kSecondary;
   OutMaster = (Bus == ATA_PRIMARY) ? ATA_MASTER : ATA_SLAVE;
 
   Out8(Bus + ATA_REG_HDDEVSEL, 0xA0 | ATA_MASTER << 4);
@@ -172,12 +170,13 @@ Void ATAWriteLba(UInt32 Lba, UInt8 IO, UInt8 Master, wchar_t* Buf,
   }
 }
 
-Boolean ATAIsDetected(Void) { return kATADetected; }
+/// @check is ATA detected?
+Boolean IsATADetected(Void) { return kATADetected; }
 
 /***
  *
  *
- * ATA Device class.
+ * @brief ATA Device class.
  *
  *
  */
@@ -186,8 +185,8 @@ Boolean ATAIsDetected(Void) { return kATADetected; }
  * @brief ATA Device constructor.
  * @param void none.
  */
-BATADevice::BATADevice() noexcept {
-  if (ATAIsDetected()) return;
+BDeviceATA::BDeviceATA() noexcept {
+  if (IsATADetected()) return;
 
   if (ATAInitDriver(ATA_PRIMARY_IO, true, this->Leak().mBus,
                     this->Leak().mMaster) ||
@@ -209,8 +208,8 @@ BATADevice::BATADevice() noexcept {
     @param Sz Sector size
     @param Buf buffer
 */
-BATADevice& BATADevice::Read(CharacterType* Buf, const SizeT& SectorSz) {
-  if (!ATAIsDetected()) {
+BDeviceATA& BDeviceATA::Read(CharacterType* Buf, const SizeT& SectorSz) {
+  if (!IsATADetected()) {
     Leak().mErr = true;
     return *this;
   }
@@ -232,8 +231,8 @@ BATADevice& BATADevice::Read(CharacterType* Buf, const SizeT& SectorSz) {
     @param Sz Sector size
     @param Buf buffer
 */
-BATADevice& BATADevice::Write(CharacterType* Buf, const SizeT& SectorSz) {
-  if (!ATAIsDetected()) {
+BDeviceATA& BDeviceATA::Write(CharacterType* Buf, const SizeT& SectorSz) {
+  if (!IsATADetected()) {
     Leak().mErr = true;
     return *this;
   }
@@ -256,6 +255,6 @@ BATADevice& BATADevice::Write(CharacterType* Buf, const SizeT& SectorSz) {
 
 /**
  * @brief ATA Config getter.
- * @return BATADevice::ATATraits& the drive config.
+ * @return BDeviceATA::ATATraits& the drive config.
  */
-BATADevice::ATATraits& BATADevice::Leak() { return mTraits; }
+BDeviceATA::ATATraits& BDeviceATA::Leak() { return mTraits; }
diff --git a/Private/Source/NewFS.cxx b/Private/Source/NewFS.cxx
index 28e102fd..114c1e6b 100644
--- a/Private/Source/NewFS.cxx
+++ b/Private/Source/NewFS.cxx
@@ -23,21 +23,21 @@ NewFilesystemManager::~NewFilesystemManager() = default;
 bool NewFilesystemManager::Remove(const char* node_name) {
   if (node_name == nullptr || *node_name == 0) return false;
 
-  if (auto catalog = fIO->GetCatalog(node_name); catalog)
-    return fIO->RemoveCatalog(*catalog);
+  if (auto catalog = fImpl->GetCatalog(node_name); catalog)
+    return fImpl->RemoveCatalog(*catalog);
 
   return false;
 }
 
 NodePtr NewFilesystemManager::Create(const char* path) {
-  return node_cast(fIO->CreateCatalog(path, 0, kCatalogKindFile));
+  return node_cast(fImpl->CreateCatalog(path, 0, kCatalogKindFile));
 }
 
 NodePtr NewFilesystemManager::CreateDirectory(const char* path) {
-  return node_cast(fIO->CreateCatalog(path, 0, kCatalogKindDir));
+  return node_cast(fImpl->CreateCatalog(path, 0, kCatalogKindDir));
 }
 
 NodePtr NewFilesystemManager::CreateAlias(const char* path) {
-  return node_cast(fIO->CreateCatalog(path, 0, kCatalogKindAlias));
+  return node_cast(fImpl->CreateCatalog(path, 0, kCatalogKindAlias));
 }
 }  // namespace HCore
diff --git a/Private/Source/Storage/Storage.cxx b/Private/Source/Storage/Storage.cxx
index d9b997e1..7d4ba70a 100644
--- a/Private/Source/Storage/Storage.cxx
+++ b/Private/Source/Storage/Storage.cxx
@@ -9,5 +9,5 @@
 
 #include <StorageKit/Storage.hpp>
 
-const OSScsiPacket kCDRomPacketTemplate = {0x43, 0,  1,    0, 0, 0,
+const SKScsiPacket kCDRomPacketTemplate = {0x43, 0,  1,    0, 0, 0,
                                            0,    12, 0x40, 0, 0};
diff --git a/Private/StorageKit/Storage.hpp b/Private/StorageKit/Storage.hpp
index e1d152fc..f32e8851 100644
--- a/Private/StorageKit/Storage.hpp
+++ b/Private/StorageKit/Storage.hpp
@@ -13,9 +13,9 @@
 #include <StorageKit/ATA.hpp>
 #include <StorageKit/NVME.hpp>
 
-typedef HCore::UInt16 OSScsiPacket[12];
+typedef HCore::UInt16 SKScsiPacket[12];
 
-extern const OSScsiPacket kCDRomPacketTemplate;
+extern const SKScsiPacket kCDRomPacketTemplate;
 
 #define f_kDriveSectorSize 512
 #define f_kDriveSize(last_lba) ((last_lba + 1) * f_kDriveSectorSize)