From 15493aad092a3e2f0ebacc4fe38d40de02ea67de Mon Sep 17 00:00:00 2001 From: Amlal El Mahrouss Date: Fri, 28 Mar 2025 20:19:56 +0100 Subject: ahci: fix: report success when ahci is detected. mbci: reintroduce NeKernel's MBCI. cfkit: rename: CFKit -> CF libuser: rename ErrKind to ErrRef. coregfx: fix last unconsistent things about the module. Signed-off-by: Amlal El Mahrouss --- dev/kernel/HALKit/AMD64/Storage/AHCI+Generic.cc | 31 +++++++++++++++++-------- dev/kernel/HALKit/AMD64/Storage/DMA+Generic.cc | 4 ++-- dev/kernel/HALKit/AMD64/Storage/PIO+Generic.cc | 2 +- 3 files changed, 24 insertions(+), 13 deletions(-) (limited to 'dev/kernel/HALKit/AMD64/Storage') diff --git a/dev/kernel/HALKit/AMD64/Storage/AHCI+Generic.cc b/dev/kernel/HALKit/AMD64/Storage/AHCI+Generic.cc index 318327f8..2ef2fda7 100644 --- a/dev/kernel/HALKit/AMD64/Storage/AHCI+Generic.cc +++ b/dev/kernel/HALKit/AMD64/Storage/AHCI+Generic.cc @@ -5,7 +5,7 @@ ------------------------------------------- */ /** - * @file AHCI.cc + * @file AHCI+Generic.cc * @author Amlal El Mahrouss (amlal@nekernel.org) * @brief AHCI driver. * @version 0.1 @@ -19,17 +19,14 @@ #include #include #include - #include - +#include #include #include #include #include #include -#include - #define kHBAErrTaskFile (1 << 30) #define kHBAPxCmdST (0x0001) #define kHBAPxCmdFre (0x0010) @@ -345,8 +342,6 @@ STATIC Bool drv_std_init_ahci(UInt16& pi, BOOL& atapi) if (mem_ahci->Ports[ahci_index].Sig == kSATASignature) { - kout << "detect device: /dev/sat" << number(ahci_index) << kendl; - kSATAIndex = ahci_index; kSATAHba = mem_ahci; @@ -356,8 +351,6 @@ STATIC Bool drv_std_init_ahci(UInt16& pi, BOOL& atapi) } else if (atapi && kSATAPISignature == mem_ahci->Ports[ahci_index].Sig) { - kout << "detect device: /dev/atp" << number(ahci_index) << kendl; - kSATAIndex = ahci_index; kSATAHba = mem_ahci; @@ -370,6 +363,8 @@ STATIC Bool drv_std_init_ahci(UInt16& pi, BOOL& atapi) ++ahci_index; } + err_global_get() = kErrorSuccess; + return YES; } } @@ -476,38 +471,54 @@ namespace Kernel #ifdef __AHCI__ +//////////////////////////////////////////////////// +/// +//////////////////////////////////////////////////// Void drv_std_write(UInt64 lba, Char* buffer, SizeT sector_sz, SizeT size_buffer) { drv_std_input_output_ahci(lba, reinterpret_cast(buffer), sector_sz, size_buffer); } +//////////////////////////////////////////////////// +/// +//////////////////////////////////////////////////// Void drv_std_read(UInt64 lba, Char* buffer, SizeT sector_sz, SizeT size_buffer) { drv_std_input_output_ahci(lba, reinterpret_cast(buffer), sector_sz, size_buffer); } +//////////////////////////////////////////////////// +/// +//////////////////////////////////////////////////// Bool drv_std_init(UInt16& pi) { BOOL atapi = NO; return drv_std_init_ahci(pi, atapi); } +//////////////////////////////////////////////////// +/// +//////////////////////////////////////////////////// Bool drv_std_detected(Void) { return drv_std_detected_ahci(); } -/*** +//////////////////////////////////////////////////// +/** @brief Gets the number of sectors inside the drive. @return Sector size in bytes. */ +//////////////////////////////////////////////////// SizeT drv_get_sector_count() { return drv_get_sector_count_ahci(); } +//////////////////////////////////////////////////// /// @brief Get the drive size. /// @return Disk size in bytes. +//////////////////////////////////////////////////// SizeT drv_get_size() { return drv_get_size_ahci(); diff --git a/dev/kernel/HALKit/AMD64/Storage/DMA+Generic.cc b/dev/kernel/HALKit/AMD64/Storage/DMA+Generic.cc index 261643fc..e350228d 100644 --- a/dev/kernel/HALKit/AMD64/Storage/DMA+Generic.cc +++ b/dev/kernel/HALKit/AMD64/Storage/DMA+Generic.cc @@ -5,7 +5,7 @@ ------------------------------------------- */ /** - * @file ATA-PIO.cc + * @file DMA+Generic.cc * @author Amlal EL Mahrouss (amlal@nekernel.org) * @brief ATA driver (DMA mode). * @version 0.1 @@ -32,7 +32,7 @@ STATIC Boolean kATADetected = false; STATIC Int32 kATADeviceType = kATADeviceCount; STATIC Char kATAData[kATADataLen] = {0}; STATIC Kernel::PCI::Device kATADevice; -STATIC Char kCurrentDiskModel[50] = {"UNKNOWN DMA DRIVE"}; +STATIC Char kCurrentDiskModel[50] = {"UNKNOWN DMA DRIVE"}; Boolean drv_std_wait_io(UInt16 IO) { diff --git a/dev/kernel/HALKit/AMD64/Storage/PIO+Generic.cc b/dev/kernel/HALKit/AMD64/Storage/PIO+Generic.cc index 2bbdb0e5..d828839d 100644 --- a/dev/kernel/HALKit/AMD64/Storage/PIO+Generic.cc +++ b/dev/kernel/HALKit/AMD64/Storage/PIO+Generic.cc @@ -5,7 +5,7 @@ ------------------------------------------- */ /** - * @file PIO.cc + * @file PIO+Generic.cc * @author Amlal EL Mahrouss (amlal@nekernel.org) * @brief ATA driver (PIO mode). * @version 0.1 -- cgit v1.2.3