diff options
| author | Amlal El Mahrouss <amlal@nekernel.org> | 2025-03-28 19:57:33 +0100 |
|---|---|---|
| committer | Amlal El Mahrouss <amlal@nekernel.org> | 2025-03-28 19:57:33 +0100 |
| commit | ba7b3ed69cd24970a28b72c54982735cd120e663 (patch) | |
| tree | 934b7645435ab1bfd2d8eb99fa861fc09e3dd5b4 /dev/kernel/HALKit/AMD64/Storage | |
| parent | 2205e801a6e84238dc8cbbb8f9de5a675eae1d81 (diff) | |
kernel: breaking: Change namespace from NeOS to Kernel.
sched: Fix redundancy in NeKernel's user scheduler macros, refactored
the other files using the redundant macros too.
part one of a series of commit for NeKernel.
Signed-off-by: Amlal El Mahrouss <amlal@nekernel.org>
Diffstat (limited to 'dev/kernel/HALKit/AMD64/Storage')
| -rw-r--r-- | dev/kernel/HALKit/AMD64/Storage/AHCI+Generic.cc | 6 | ||||
| -rw-r--r-- | dev/kernel/HALKit/AMD64/Storage/DMA+Generic.cc | 20 | ||||
| -rw-r--r-- | dev/kernel/HALKit/AMD64/Storage/PIO+Generic.cc | 4 |
3 files changed, 15 insertions, 15 deletions
diff --git a/dev/kernel/HALKit/AMD64/Storage/AHCI+Generic.cc b/dev/kernel/HALKit/AMD64/Storage/AHCI+Generic.cc index c941d2ba..318327f8 100644 --- a/dev/kernel/HALKit/AMD64/Storage/AHCI+Generic.cc +++ b/dev/kernel/HALKit/AMD64/Storage/AHCI+Generic.cc @@ -53,7 +53,7 @@ #define kSATASubClass (0x06) #define kSATABar5 (0x24) -using namespace NeOS; +using namespace Kernel; STATIC PCI::Device kSATADev; STATIC HbaMemRef kSATAHba; @@ -386,7 +386,7 @@ Bool drv_std_detected_ahci() return kSATADev.DeviceId() != (UShort)PCI::PciConfigKind::Invalid && kSATADev.Bar(kSATABar5) != 0; } -namespace NeOS +namespace Kernel { /// @brief Initialize an AHCI device (StorageKit) UInt16 sk_init_ahci_device(BOOL atapi) @@ -464,7 +464,7 @@ namespace NeOS return ErrorOr<AHCIDeviceInterface>(device); } -} // namespace NeOS +} // namespace Kernel // ================================================================================================ diff --git a/dev/kernel/HALKit/AMD64/Storage/DMA+Generic.cc b/dev/kernel/HALKit/AMD64/Storage/DMA+Generic.cc index 9624ea5b..261643fc 100644 --- a/dev/kernel/HALKit/AMD64/Storage/DMA+Generic.cc +++ b/dev/kernel/HALKit/AMD64/Storage/DMA+Generic.cc @@ -23,15 +23,15 @@ #define kATADataLen (256) -using namespace NeOS; -using namespace NeOS::HAL; +using namespace Kernel; +using namespace Kernel::HAL; /// BUGS: 0 STATIC Boolean kATADetected = false; STATIC Int32 kATADeviceType = kATADeviceCount; STATIC Char kATAData[kATADataLen] = {0}; -STATIC NeOS::PCI::Device kATADevice; +STATIC Kernel::PCI::Device kATADevice; STATIC Char kCurrentDiskModel[50] = {"UNKNOWN DMA DRIVE"}; Boolean drv_std_wait_io(UInt16 IO) @@ -105,7 +105,7 @@ Boolean drv_std_init(UInt16 Bus, UInt8 Drive, UInt16& OutBus, UInt8& OutMaster) for (SizeT i = 0ul; i < kATADataLen; ++i) { drv_std_wait_io(IO); - kATAData[i] = NeOS::HAL::rt_in16(IO + ATA_REG_DATA); + kATAData[i] = Kernel::HAL::rt_in16(IO + ATA_REG_DATA); drv_std_wait_io(IO); } @@ -131,7 +131,7 @@ Boolean drv_std_init(UInt16 Bus, UInt8 Drive, UInt16& OutBus, UInt8& OutMaster) return NO; } -namespace NeOS::Detail +namespace Kernel::Detail { struct PRDEntry { @@ -139,7 +139,7 @@ namespace NeOS::Detail UInt16 mByteCount; UInt16 mFlags; }; -} // namespace NeOS::Detail +} // namespace Kernel::Detail static UIntPtr kReadAddr = mib_cast(2); static UIntPtr kWriteAddr = mib_cast(4); @@ -166,7 +166,7 @@ Void drv_std_read(UInt64 Lba, UInt16 IO, UInt8 Master, Char* Buf, SizeT SectorSz rt_out8(IO + ATA_REG_LBA2, (Lba) >> 16); rt_out8(IO + ATA_REG_LBA3, (Lba) >> 24); - NeOS::Detail::PRDEntry* prd = (NeOS::Detail::PRDEntry*)(kATADevice.Bar(0x20) + 4); // The PRDEntry is not correct. + Kernel::Detail::PRDEntry* prd = (Kernel::Detail::PRDEntry*)(kATADevice.Bar(0x20) + 4); // The PRDEntry is not correct. prd->mAddress = (UInt32)(UIntPtr)kReadAddr; prd->mByteCount = Size - 1; @@ -209,7 +209,7 @@ Void drv_std_write(UInt64 Lba, UInt16 IO, UInt8 Master, Char* Buf, SizeT SectorS rt_out8(IO + ATA_REG_LBA2, (Lba) >> 16); rt_out8(IO + ATA_REG_LBA3, (Lba) >> 24); - NeOS::Detail::PRDEntry* prd = (NeOS::Detail::PRDEntry*)(kATADevice.Bar(0x20) + 4); + Kernel::Detail::PRDEntry* prd = (Kernel::Detail::PRDEntry*)(kATADevice.Bar(0x20) + 4); prd->mAddress = (UInt32)(UIntPtr)kWriteAddr; prd->mByteCount = Size - 1; @@ -243,7 +243,7 @@ Boolean drv_std_detected(Void) @return Number of sectors, or zero. */ /***********************************************************************************/ -NeOS::SizeT drv_get_sector_count() +Kernel::SizeT drv_get_sector_count() { return (kATAData[61] << 16) | kATAData[60]; } @@ -251,7 +251,7 @@ NeOS::SizeT drv_get_sector_count() /***********************************************************************************/ /// @brief Get the size of the current drive. /***********************************************************************************/ -NeOS::SizeT drv_get_size() +Kernel::SizeT drv_get_size() { return (drv_get_sector_count()) * kATASectorSize; } diff --git a/dev/kernel/HALKit/AMD64/Storage/PIO+Generic.cc b/dev/kernel/HALKit/AMD64/Storage/PIO+Generic.cc index e2891484..2bbdb0e5 100644 --- a/dev/kernel/HALKit/AMD64/Storage/PIO+Generic.cc +++ b/dev/kernel/HALKit/AMD64/Storage/PIO+Generic.cc @@ -20,8 +20,8 @@ #ifdef __ATA_PIO__ -using namespace NeOS; -using namespace NeOS::HAL; +using namespace Kernel; +using namespace Kernel::HAL; /// BUGS: 0 |
