diff options
Diffstat (limited to 'dev')
| -rw-r--r-- | dev/zka/HALKit/AMD64/HalPagingMgr.cxx | 4 | ||||
| -rw-r--r-- | dev/zka/HALKit/AMD64/PCI/DMA.cxx (renamed from dev/zka/HALKit/AMD64/PCI/Dma.cxx) | 2 | ||||
| -rw-r--r-- | dev/zka/HALKit/AMD64/Storage/ATA-PIO.cxx | 6 | ||||
| -rw-r--r-- | dev/zka/KernelKit/PCI/DMA.hxx (renamed from dev/zka/KernelKit/PCI/Dma.hxx) | 2 | ||||
| -rw-r--r-- | dev/zka/KernelKit/PCI/DMA.inl (renamed from dev/zka/KernelKit/PCI/Dma.inl) | 0 | ||||
| -rw-r--r-- | dev/zka/StorageKit/PRDT.hxx | 2 |
6 files changed, 7 insertions, 9 deletions
diff --git a/dev/zka/HALKit/AMD64/HalPagingMgr.cxx b/dev/zka/HALKit/AMD64/HalPagingMgr.cxx index db27aaf5..06a8b7d2 100644 --- a/dev/zka/HALKit/AMD64/HalPagingMgr.cxx +++ b/dev/zka/HALKit/AMD64/HalPagingMgr.cxx @@ -114,9 +114,9 @@ namespace Kernel::HAL UInt64 pt_entry = (pt_base + pt_index * cPmlEntrySize); // Lastly, grab the pte entry. - ZKA_PTE* pte_struct = reinterpret_cast<ZKA_PTE*>(pt_entry); + ZKA_PDE* pte_struct = reinterpret_cast<ZKA_PDE*>(pt_base); - return mmi_map_page_table_entry(virtual_address, flags, pte_struct); + return mmi_map_page_table_entry(virtual_address, flags, pte_struct->fEntries[pt_entry]); } /// @brief Maps flags for a specific pte. diff --git a/dev/zka/HALKit/AMD64/PCI/Dma.cxx b/dev/zka/HALKit/AMD64/PCI/DMA.cxx index bf1730d8..d40e0e6d 100644 --- a/dev/zka/HALKit/AMD64/PCI/Dma.cxx +++ b/dev/zka/HALKit/AMD64/PCI/DMA.cxx @@ -4,7 +4,7 @@ ------------------------------------------- */ -#include <KernelKit/PCI/Dma.hxx> +#include <KernelKit/PCI/DMA.hxx> namespace Kernel { diff --git a/dev/zka/HALKit/AMD64/Storage/ATA-PIO.cxx b/dev/zka/HALKit/AMD64/Storage/ATA-PIO.cxx index e09a4277..2d02d89a 100644 --- a/dev/zka/HALKit/AMD64/Storage/ATA-PIO.cxx +++ b/dev/zka/HALKit/AMD64/Storage/ATA-PIO.cxx @@ -68,8 +68,6 @@ Boolean drv_std_init(UInt16 Bus, UInt8 Drive, UInt16& OutBus, UInt8& OutMaster) drv_std_select(IO); - kcout << "Initializing drive...\r"; - ATAInit_Retry: // Bus init, NEIN bit. Out8(IO + ATA_REG_NEIN, 1); @@ -80,7 +78,7 @@ ATAInit_Retry: if (statRdy & ATA_SR_ERR) { - kcout << "Failing drive...\r"; + kcout << "ERROR: ATA DRIVE RETURNED ERROR BIT! ABORTING...\r"; return false; } @@ -107,7 +105,7 @@ ATAInit_Retry: OutMaster = (Bus == ATA_PRIMARY_IO) ? ATA_MASTER : ATA_SLAVE; - kcout << "Created IDE module.\r"; + kcout << "INFO: INITIALIZED ATA DRIVE!\r"; return true; } diff --git a/dev/zka/KernelKit/PCI/Dma.hxx b/dev/zka/KernelKit/PCI/DMA.hxx index b265f738..6aa06d1e 100644 --- a/dev/zka/KernelKit/PCI/Dma.hxx +++ b/dev/zka/KernelKit/PCI/DMA.hxx @@ -78,4 +78,4 @@ namespace Kernel }; } // namespace Kernel -#include <KernelKit/PCI/Dma.inl> +#include <KernelKit/PCI/DMA.inl> diff --git a/dev/zka/KernelKit/PCI/Dma.inl b/dev/zka/KernelKit/PCI/DMA.inl index 1c164af8..1c164af8 100644 --- a/dev/zka/KernelKit/PCI/Dma.inl +++ b/dev/zka/KernelKit/PCI/DMA.inl diff --git a/dev/zka/StorageKit/PRDT.hxx b/dev/zka/StorageKit/PRDT.hxx index 6dec22c2..324a3f63 100644 --- a/dev/zka/StorageKit/PRDT.hxx +++ b/dev/zka/StorageKit/PRDT.hxx @@ -6,7 +6,7 @@ #pragma once -#include <KernelKit/PCI/Dma.hxx> +#include <KernelKit/PCI/DMA.hxx> #include <KernelKit/PCI/Iterator.hxx> #include <NewKit/Ref.hxx> |