diff options
Diffstat (limited to 'dev/kernel/HALKit/AMD64')
| -rw-r--r-- | dev/kernel/HALKit/AMD64/Storage/AHCI+Generic.cc | 10 | ||||
| -rw-r--r-- | dev/kernel/HALKit/AMD64/Storage/PIO+Generic.cc | 4 |
2 files changed, 7 insertions, 7 deletions
diff --git a/dev/kernel/HALKit/AMD64/Storage/AHCI+Generic.cc b/dev/kernel/HALKit/AMD64/Storage/AHCI+Generic.cc index 1591fa56..deea30e1 100644 --- a/dev/kernel/HALKit/AMD64/Storage/AHCI+Generic.cc +++ b/dev/kernel/HALKit/AMD64/Storage/AHCI+Generic.cc @@ -24,7 +24,7 @@ #include <KernelKit/ProcessScheduler.h> #include <NewKit/Utils.h> #include <StorageKit/AHCI.h> -#include <StorageKit/DMA.h> +#include <StorageKit/DmaPool.h> #include <modules/AHCI/AHCI.h> #include <modules/ATA/ATA.h> @@ -151,10 +151,10 @@ STATIC Void drv_std_input_output_ahci(UInt64 lba, UInt8* buffer, SizeT sector_sz (volatile HbaCmdTbl*) (((UInt64) command_header->Ctbau << 32) | command_header->Ctba); rt_set_memory((VoidPtr) command_table, 0, sizeof(HbaCmdTbl)); - VoidPtr ptr = Kernel::rtl_dma_alloc(size_buffer, 4096); + VoidPtr ptr = rtl_dma_alloc(size_buffer, 4096); if (Write) { - Kernel::rt_copy_memory(buffer, ptr, size_buffer); + rt_copy_memory(buffer, ptr, size_buffer); } // Build the PRDT @@ -293,7 +293,7 @@ STATIC BOOL ahci_enable_and_probe() { STATIC Bool drv_init_command_structures_ahci() { // Allocate 4KiB for Command List (32 headers) - VoidPtr clb_mem = Kernel::rtl_dma_alloc(4096, 1024); + VoidPtr clb_mem = rtl_dma_alloc(4096, 1024); if (!clb_mem) { kout << "Failed to allocate CLB memory!\r"; return NO; @@ -312,7 +312,7 @@ STATIC Bool drv_init_command_structures_ahci() { for (Int32 i = 0; i < 32; ++i) { // Allocate 4KiB for Command Table - VoidPtr ct_mem = Kernel::rtl_dma_alloc(4096, 128); + VoidPtr ct_mem = rtl_dma_alloc(4096, 128); if (!ct_mem) { (Void)(kout << "Failed to allocate CTB memory for slot " << hex_number(i)); kout << "!\r"; diff --git a/dev/kernel/HALKit/AMD64/Storage/PIO+Generic.cc b/dev/kernel/HALKit/AMD64/Storage/PIO+Generic.cc index db9a1747..a024d2fe 100644 --- a/dev/kernel/HALKit/AMD64/Storage/PIO+Generic.cc +++ b/dev/kernel/HALKit/AMD64/Storage/PIO+Generic.cc @@ -173,7 +173,7 @@ namespace Kernel { /// @brief Initialize an PIO device (StorageKit function) /// @param is_master is the current PIO master? /// @return [io:master] for PIO device. -BOOL sk_init_pio_device(BOOL is_master, UInt16& io, UInt8& master) { +BOOL sk_init_ata_device(BOOL is_master, UInt16& io, UInt8& master) { return drv_pio_std_init(ATA_SECONDARY_IO, is_master, io, master); } @@ -225,7 +225,7 @@ namespace Detail { /// @brief Acquires a new PIO device with drv_index in mind. /// @param drv_index The drive index to assign. /// @return A wrapped device interface if successful, or error code. -ErrorOr<ATADeviceInterface> sk_acquire_pio_device(Int32 drv_index) { +ErrorOr<ATADeviceInterface> sk_acquire_ata_device(Int32 drv_index) { /// here we don't check if we probed ATA, since we'd need to grab IO after that. ATADeviceInterface device(Detail::sk_io_read_pio, Detail::sk_io_write_pio); |