diff options
Diffstat (limited to 'dev')
| -rw-r--r-- | dev/Kernel/FSKit/NeFS.h | 2 | ||||
| -rw-r--r-- | dev/Kernel/HALKit/AMD64/Storage/AHCI.cc | 12 | ||||
| -rw-r--r-- | dev/Kernel/src/FS/NeFS.cc | 1 |
3 files changed, 8 insertions, 7 deletions
diff --git a/dev/Kernel/FSKit/NeFS.h b/dev/Kernel/FSKit/NeFS.h index bd11c86d..981cd0d9 100644 --- a/dev/Kernel/FSKit/NeFS.h +++ b/dev/Kernel/FSKit/NeFS.h @@ -92,7 +92,7 @@ default. /// @note Start after the partition map header. (Virtual addressing) #define kNeFSRootCatalogStartAddress (1024) -#define kNeFSCatalogStartAddress ((2048) + sizeof(NEFS_ROOT_PARTITION_BLOCK)) +#define kNeFSCatalogStartAddress (kNeFSRootCatalogStartAddress + sizeof(NEFS_ROOT_PARTITION_BLOCK)) #define kResourceTypeDialog (10) #define kResourceTypeString (11) diff --git a/dev/Kernel/HALKit/AMD64/Storage/AHCI.cc b/dev/Kernel/HALKit/AMD64/Storage/AHCI.cc index 22d52486..5726189a 100644 --- a/dev/Kernel/HALKit/AMD64/Storage/AHCI.cc +++ b/dev/Kernel/HALKit/AMD64/Storage/AHCI.cc @@ -60,7 +60,7 @@ STATIC Void drv_compute_disk_ahci() noexcept; STATIC PCI::Device kPCIDevice; STATIC HbaMem* kSATA[kSATAPortCnt] = {}; STATIC SizeT kSATAIndex = 0UL; -STATIC Lba kHighestLBA = 0UL; +STATIC Lba kSATASectorCount = 0UL; STATIC UInt16 kSATAPortsImplemented = 0U; @@ -68,7 +68,7 @@ BOOL kAHCICommandIssued = NO; STATIC Void drv_compute_disk_ahci() noexcept { - kHighestLBA = 0UL; + kSATASectorCount = 0UL; const UInt16 kSzIdent = 512U; @@ -78,10 +78,10 @@ STATIC Void drv_compute_disk_ahci() noexcept drv_std_input_output<NO, YES, YES>(0, identify_data, 0, kSzIdent); - kHighestLBA = (identify_data[61] << 16) | identify_data[60]; + kSATASectorCount = (identify_data[61] << 16) | identify_data[60]; kout << "Disk Size: " << number(drv_get_size()) << kendl; - kout << "Highest LBA: " << number(kHighestLBA) << kendl; + kout << "Highest LBA: " << number(kSATASectorCount) << kendl; } STATIC Int32 drv_find_cmd_slot(HbaPort* port) noexcept @@ -173,8 +173,8 @@ STATIC Void drv_std_input_output(UInt64 lba, UInt8* buffer, SizeT sector_sz, Siz */ SizeT drv_get_sector_count_ahci() { - MUST_PASS(kHighestLBA > 0); - return kHighestLBA; + MUST_PASS(kSATASectorCount > 0); + return kSATASectorCount; } /// @brief Get the drive size. diff --git a/dev/Kernel/src/FS/NeFS.cc b/dev/Kernel/src/FS/NeFS.cc index f5fdf63f..adee0322 100644 --- a/dev/Kernel/src/FS/NeFS.cc +++ b/dev/Kernel/src/FS/NeFS.cc @@ -587,6 +587,7 @@ bool NeFileSystemParser::Format(_Input _Output DriveTrait* drive, _Input const L part_block->StartCatalog = kNeFSCatalogStartAddress; part_block->Flags = kNeFSPartitionTypeStandard; part_block->CatalogCount = sectorCount / sizeof(NEFS_CATALOG_STRUCT); + part_block->FreeSectors = sectorCount / sizeof(NEFS_CATALOG_STRUCT); part_block->SectorCount = sectorCount; part_block->DiskSize = diskSize; part_block->FreeCatalog = sectorCount / sizeof(NEFS_CATALOG_STRUCT); |