diff options
| author | Amlal El Mahrouss <amlal@nekernel.org> | 2025-04-08 10:19:56 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-04-08 10:19:56 +0200 |
| commit | 29828ef52df7a51e22057b4557b8d9a3d5550839 (patch) | |
| tree | 8f809bcf67e1c77beae47bce71877bd546db5146 /dev/kernel/src | |
| parent | b18c5e09961d8bc0b2368176d9fb23789afebb87 (diff) | |
| parent | 1f6dd86d548ec8194c79bd9e2a8b27991061cd9e (diff) | |
Merge pull request #12 from amlel-el-mahrouss/dev
pr/ahci: generic driver improvements.
Diffstat (limited to 'dev/kernel/src')
| -rw-r--r-- | dev/kernel/src/DriveMgr.cc | 16 | ||||
| -rw-r--r-- | dev/kernel/src/FS/NeFS.cc | 5 |
2 files changed, 8 insertions, 13 deletions
diff --git a/dev/kernel/src/DriveMgr.cc b/dev/kernel/src/DriveMgr.cc index c83e63c8..36e0a7e4 100644 --- a/dev/kernel/src/DriveMgr.cc +++ b/dev/kernel/src/DriveMgr.cc @@ -89,12 +89,11 @@ namespace Kernel #elif defined(__AHCI__) kAHCIPortsImplemented = 0; - if (!drv_std_init(kAHCIPortsImplemented)) + if (drv_std_init(kAHCIPortsImplemented)) { - return; + pckt.fPacketGood = YES; } - pckt.fPacketGood = YES; #endif // if defined(__ATA_PIO__) || defined (__ATA_DMA__) } @@ -106,23 +105,20 @@ namespace Kernel { return "ATA-PIO"; } -#endif -#ifdef __ATA_DMA__ +#elif defined(__ATA_DMA__) const Char* io_drv_kind(Void) { return "ATA-DMA"; } -#endif -#ifdef __AHCI__ +#elif defined( __AHCI__) const Char* io_drv_kind(Void) { return "AHCI"; } -#endif -#ifdef __NE_MINIMAL_OS__ +#else const Char* io_drv_kind(Void) { - return "Not Loaded"; + return "null"; } #endif diff --git a/dev/kernel/src/FS/NeFS.cc b/dev/kernel/src/FS/NeFS.cc index 90c5995a..7bc02b39 100644 --- a/dev/kernel/src/FS/NeFS.cc +++ b/dev/kernel/src/FS/NeFS.cc @@ -505,18 +505,17 @@ bool NeFileSystemParser::Format(_Input _Output DriveTrait* drive, _Input const L constexpr auto kFsName = "NeFS"; constexpr auto kBlockName = "NeKernel:"; - rt_copy_memory(reinterpret_cast<VoidPtr>(const_cast<Char*>(kFsName)), epm_boot->Fs, rt_string_len(kFsName)); - epm_boot->FsVersion = kNeFSVersionInteger; epm_boot->LbaStart = start; epm_boot->SectorSz = kNeFSSectorSz; + rt_copy_memory(reinterpret_cast<VoidPtr>(const_cast<Char*>(kFsName)), epm_boot->Fs, rt_string_len(kFsName)); rt_copy_memory(reinterpret_cast<VoidPtr>(const_cast<Char*>(kBlockName)), epm_boot->Name, rt_string_len(kBlockName)); rt_copy_memory(reinterpret_cast<VoidPtr>(const_cast<Char*>(kEPMMagic)), epm_boot->Magic, rt_string_len(kEPMMagic)); Lba outEpmLba = kEPMBootBlockLba; - Char buf[kNeFSSectorSz]; + Char buf[kNeFSSectorSz] = {0}; Lba prevStart = 0; SizeT cnt = 0; |