3 files changed, 19 insertions, 7 deletions
diff --git a/Private/Builtins/ACPI/ACPIFactoryInterface.hxx b/Private/Builtins/ACPI/ACPIFactoryInterface.hxx
index 6d2325fe..1f75ad2f 100644
--- a/Private/Builtins/ACPI/ACPIFactoryInterface.hxx
+++ b/Private/Builtins/ACPI/ACPIFactoryInterface.hxx
@@ -43,8 +43,8 @@ class ACPIFactoryInterface final {
   }
 
  private:
-  VoidPtr m_Rsdp;    // pointer to root descriptor.
-  SSizeT m_Entries;  // number of entries, -1 tells that no invalid entries were
+  VoidPtr fRsdp;    // pointer to root descriptor.
+  SSizeT fEntries;  // number of entries, -1 tells that no invalid entries were
                      // found.
 };
 }  // namespace NewOS
diff --git a/Private/Builtins/AHCI/Defines.hxx b/Private/Builtins/AHCI/Defines.hxx
index 44a19f38..afec2778 100644
--- a/Private/Builtins/AHCI/Defines.hxx
+++ b/Private/Builtins/AHCI/Defines.hxx
@@ -315,7 +315,7 @@ typedef struct HbaCmdTbl final {
 
 /* EOF */
 
-#ifdef __KERNEL__
+#if defined(__AHCI__)
 
 /// @brief Initializes an AHCI disk.
 /// @param PortsImplemented the amount of port that have been detected.
@@ -324,10 +324,22 @@ NewOS::Boolean drv_std_init(NewOS::UInt16& PortsImplemented);
 
 NewOS::Boolean drv_std_detected(NewOS::Void);
 
-NewOS::Void drv_std_read(NewOS::UInt64 Lba, NewOS::UInt16 IO, NewOS::UInt8 Master, NewOS::Char* Buf,
+/// @brief Read from disk.
+/// @param Lba 
+/// @param Buf 
+/// @param SectorSz 
+/// @param Size 
+/// @return 
+NewOS::Void drv_std_read(NewOS::UInt64 Lba, NewOS::Char* Buf,
                    NewOS::SizeT SectorSz, NewOS::SizeT Size);
 
-NewOS::Void drv_std_write(NewOS::UInt64 Lba, NewOS::UInt16 IO, NewOS::UInt8 Master, NewOS::Char* Buf,
+/// @brief Write to disk.
+/// @param Lba 
+/// @param Buf 
+/// @param SectorSz 
+/// @param Size 
+/// @return 
+NewOS::Void drv_std_write(NewOS::UInt64 Lba, NewOS::Char* Buf,
                     NewOS::SizeT SectorSz, NewOS::SizeT Size);
 
 #endif // ifdef __KERNEL__
diff --git a/Private/Builtins/ATA/Defines.hxx b/Private/Builtins/ATA/Defines.hxx
index c8a87384..9eed6039 100644
--- a/Private/Builtins/ATA/Defines.hxx
+++ b/Private/Builtins/ATA/Defines.hxx
@@ -118,7 +118,7 @@
 ///! ATA command register.
 #define ATA_COMMAND(x)  (x + 7)
 
-#define kATASectorSize 512
+#define kATASectorSize (512U)
 
 enum {
   kATADevicePATA,
@@ -128,7 +128,7 @@ enum {
   kATADeviceCount,
 };
 
-#ifdef __KERNEL__
+#if defined(__ATA_PIO__) || defined(__ATA_DMA__)
 
 NewOS::Boolean drv_std_init(NewOS::UInt16 Bus, NewOS::UInt8 Drive, NewOS::UInt16& OutBus,
                       NewOS::UInt8& OutMaster);