Unstable: See below.

These changes are related to the current ticket regarding AHCI support.
This commit is just to upstream changes from local.

Signed-off-by: Amlal El Mahrouss <amlal@el-mahrouss-logic.com>

4 files changed, 5 insertions, 5 deletions

diff --git a/Private/Source/Storage/AHCI.cxx b/Private/Source/Storage/AHCIDeviceInterface.cxx
index 31fbce67..31fbce67 100644
--- a/Private/Source/Storage/AHCI.cxx
+++ b/Private/Source/Storage/AHCIDeviceInterface.cxx
diff --git a/Private/Source/Storage/ATA.cxx b/Private/Source/Storage/ATA-Wrapper.cxx
index 61a58fb1..407cd30f 100644
--- a/Private/Source/Storage/ATA.cxx
+++ b/Private/Source/Storage/ATA-Wrapper.cxx
@@ -27,7 +27,7 @@ bool set_prdt_struct(Ref<PRDT*>& refCtrl) {
     return true;
   }
 
-  kcout << "[set_prdt_struct] [WARNING] Tried to change PRDT.\n";
+  kcout << "[set_prdt_struct] [WARNING] Trying to change PRDT.\n";
   return false;
 }
 
@@ -64,7 +64,7 @@ const char* ata_read_48(ULong lba) {
   UIntPtr* packet = reinterpret_cast<UIntPtr*>(kPrdt.Leak()->PhysicalAddress());
 
   packet[0] = k48BitRead;
-  packet[1] = (UIntPtr)&buffer;
+  packet[1] = (UIntPtr)buffer;
   packet[4] = lba;
 
   rt_wait_400ns();
@@ -78,7 +78,7 @@ Int32 ata_write_48(ULong lba, const char* buffer) {
   UIntPtr* packet = reinterpret_cast<UIntPtr*>(kPrdt.Leak()->PhysicalAddress());
 
   packet[0] = k48BitWrite;
-  packet[1] = (UIntPtr)&buffer;
+  packet[1] = (UIntPtr)buffer;
   packet[2] = lba;
 
   rt_wait_400ns();
@@ -86,13 +86,13 @@ Int32 ata_write_48(ULong lba, const char* buffer) {
   return packet[1] == 2 ? kATAError : 0;
 }
 
-Int32 ata_write_28(ULong lba, const char* text) {
+Int32 ata_write_28(ULong lba, const char* buffer) {
   if (!kPrdt) return kATAError;
 
   UIntPtr* packet = (UIntPtr*)kPrdt.Leak()->PhysicalAddress();
 
   packet[0] = k28BitWrite;
-  packet[1] = (UIntPtr)&text;
+  packet[1] = (UIntPtr)buffer;
   packet[2] = lba;
 
   rt_wait_400ns();
diff --git a/Private/Source/Storage/NVME.cxx b/Private/Source/Storage/NVMEDeviceInterface.cxx
index fc75604d..fc75604d 100644
--- a/Private/Source/Storage/NVME.cxx
+++ b/Private/Source/Storage/NVMEDeviceInterface.cxx
diff --git a/Private/Source/Storage/Storage.cxx b/Private/Source/Storage/StorageBase.cxx
index bba4be1f..bba4be1f 100644
--- a/Private/Source/Storage/Storage.cxx
+++ b/Private/Source/Storage/StorageBase.cxx