diff options
Diffstat (limited to 'dev/Kernel')
| -rw-r--r-- | dev/Kernel/HALKit/AMD64/Storage/AHCI.cc | 14 | ||||
| -rw-r--r-- | dev/Kernel/NewKit/Utils.h | 2 |
2 files changed, 8 insertions, 8 deletions
diff --git a/dev/Kernel/HALKit/AMD64/Storage/AHCI.cc b/dev/Kernel/HALKit/AMD64/Storage/AHCI.cc index b4915fb6..890e787f 100644 --- a/dev/Kernel/HALKit/AMD64/Storage/AHCI.cc +++ b/dev/Kernel/HALKit/AMD64/Storage/AHCI.cc @@ -45,11 +45,6 @@ using namespace NeOS; -STATIC PCI::Device kPCIDevice; -STATIC HbaMem* kSATA = nullptr; -STATIC SizeT kSATAIndex = 0UL; -STATIC Lba kHighestLBA = 0UL; - template <BOOL Write, BOOL CommandOrCTRL, BOOL Identify> STATIC Void drv_std_input_output(UInt64 lba, UInt8* buffer, SizeT sector_sz, SizeT size_buffer) noexcept; @@ -57,6 +52,13 @@ STATIC Int32 drv_find_cmd_slot(HbaPort* port) noexcept; STATIC Void drv_calculate_disk_geometry() noexcept; +STATIC PCI::Device kPCIDevice; +STATIC HbaMem* kSATA = nullptr; +STATIC SizeT kSATAIndex = 0UL; +STATIC Lba kHighestLBA = 0UL; + +BOOL kAHCICommandIssued = NO; + STATIC Void drv_calculate_disk_geometry() noexcept { kHighestLBA = 0UL; @@ -93,8 +95,6 @@ STATIC Int32 drv_find_cmd_slot(HbaPort* port) noexcept return ~0; } -BOOL kAHCICommandIssued = NO; - template <BOOL Write, BOOL CommandOrCTRL, BOOL Identify> STATIC Void drv_std_input_output(UInt64 lba, UInt8* buffer, SizeT sector_sz, SizeT size_buffer) noexcept { diff --git a/dev/Kernel/NewKit/Utils.h b/dev/Kernel/NewKit/Utils.h index 48137e1f..3df823ef 100644 --- a/dev/Kernel/NewKit/Utils.h +++ b/dev/Kernel/NewKit/Utils.h @@ -19,7 +19,7 @@ namespace NeOS const Char* rt_alloc_string(const Char* text); Size rt_string_len(const Char* str); Size rt_string_len(const Char* str, SizeT _len); - Boolean rt_to_string(Char* buf, UInt64 base, Int32 limit); + Boolean rt_to_string(Char* str_out, UInt64 base, Int32 limit); Boolean rt_is_newln(Char chr); Boolean rt_is_space(Char chr); Int32 rt_is_alnum(Int32 character); |