summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorAmlal El Mahrouss <amlal.elmahrouss@icloud.com>2025-02-07 08:52:52 +0100
committerAmlal El Mahrouss <amlal.elmahrouss@icloud.com>2025-02-07 08:52:52 +0100
commit1116a56bfbac1e2019313368ee648a4af31097ac (patch)
treed7ba2010aabf0499261628d24a65a6eba6d3f6df
parent8b73f2bac34c36a0ec008fb1e55aad77eb219afa (diff)
ADD: Pre-merge commit.
Signed-off-by: Amlal El Mahrouss <amlal.elmahrouss@icloud.com>
-rw-r--r--dev/Kernel/HALKit/AMD64/PCI/DMA.cc3
-rw-r--r--dev/Kernel/HALKit/AMD64/Storage/SATA.cc2
2 files changed, 3 insertions, 2 deletions
diff --git a/dev/Kernel/HALKit/AMD64/PCI/DMA.cc b/dev/Kernel/HALKit/AMD64/PCI/DMA.cc
index 1b54ad30..541e9533 100644
--- a/dev/Kernel/HALKit/AMD64/PCI/DMA.cc
+++ b/dev/Kernel/HALKit/AMD64/PCI/DMA.cc
@@ -22,8 +22,9 @@ namespace Kernel
{
if (!fAddress)
return false;
+
if (offset == 0)
- return true;
+ return false;
kout << "[DMAWrapper::IsIn] Checking offset..\n";
return reinterpret_cast<UIntPtr>(fAddress) >= offset;
diff --git a/dev/Kernel/HALKit/AMD64/Storage/SATA.cc b/dev/Kernel/HALKit/AMD64/Storage/SATA.cc
index dc60a723..1ecdb0c3 100644
--- a/dev/Kernel/HALKit/AMD64/Storage/SATA.cc
+++ b/dev/Kernel/HALKit/AMD64/Storage/SATA.cc
@@ -152,7 +152,7 @@ Kernel::Boolean drv_std_init(Kernel::UInt16& PortsImplemented)
Kernel::Boolean drv_std_detected(Kernel::Void)
{
- return kPCIDevice.DeviceId() != 0xFFFF;
+ return kPCIDevice.DeviceId() != 0xFFFF && kCurrentDiskSectorCount > 0;
}
Kernel::Void drv_std_write(Kernel::UInt64 lba, Kernel::Char* buffer, Kernel::SizeT sector_sz, Kernel::SizeT size_buffer)