From 460999b964114f98b219ec3488bd32ad9236332b Mon Sep 17 00:00:00 2001 From: Amlal El Mahrouss Date: Sun, 6 Apr 2025 08:03:27 +0200 Subject: adding an align function designed for AHCI's needs and drivemgr's AHCI detection system. Signed-off-by: Amlal El Mahrouss --- dev/kernel/src/DriveMgr.cc | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'dev/kernel/src') diff --git a/dev/kernel/src/DriveMgr.cc b/dev/kernel/src/DriveMgr.cc index c83e63c8..a3087979 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__) } -- cgit v1.2.3 From 2998c211a523673dcf50ad3f6973996f89fc7e5b Mon Sep 17 00:00:00 2001 From: Amlal El Mahrouss Date: Sun, 6 Apr 2025 08:14:54 +0200 Subject: kernel/storage: use correct if branching to avoid future compiler errors. Signed-off-by: Amlal El Mahrouss --- dev/kernel/src/DriveMgr.cc | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) (limited to 'dev/kernel/src') diff --git a/dev/kernel/src/DriveMgr.cc b/dev/kernel/src/DriveMgr.cc index a3087979..36e0a7e4 100644 --- a/dev/kernel/src/DriveMgr.cc +++ b/dev/kernel/src/DriveMgr.cc @@ -105,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 -- cgit v1.2.3 From 78a02453f8da25a0f29bf486ee4f41f12a7f7495 Mon Sep 17 00:00:00 2001 From: Amlal El Mahrouss Date: Sun, 6 Apr 2025 16:25:31 +0200 Subject: fs/nefs: Optimize ::Format method for EPM inside NeFileSystemParser. TL;DR: - Avoiding unecessary delays, when copying filesystem name to part block (EPM) Signed-off-by: Amlal El Mahrouss --- dev/kernel/src/FS/NeFS.cc | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'dev/kernel/src') diff --git a/dev/kernel/src/FS/NeFS.cc b/dev/kernel/src/FS/NeFS.cc index 90c5995a..85e2cd6e 100644 --- a/dev/kernel/src/FS/NeFS.cc +++ b/dev/kernel/src/FS/NeFS.cc @@ -505,12 +505,11 @@ bool NeFileSystemParser::Format(_Input _Output DriveTrait* drive, _Input const L constexpr auto kFsName = "NeFS"; constexpr auto kBlockName = "NeKernel:"; - rt_copy_memory(reinterpret_cast(const_cast(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(const_cast(kFsName)), epm_boot->Fs, rt_string_len(kFsName)); rt_copy_memory(reinterpret_cast(const_cast(kBlockName)), epm_boot->Name, rt_string_len(kBlockName)); rt_copy_memory(reinterpret_cast(const_cast(kEPMMagic)), epm_boot->Magic, rt_string_len(kEPMMagic)); -- cgit v1.2.3 From a4974ed81a6f695a4ecdea87401d6ca83432d671 Mon Sep 17 00:00:00 2001 From: Amlal El Mahrouss Date: Sun, 6 Apr 2025 18:55:40 +0200 Subject: fs/NeFS.cc: `buf` must be zeroed out. Signed-off-by: Amlal El Mahrouss --- dev/kernel/src/FS/NeFS.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'dev/kernel/src') diff --git a/dev/kernel/src/FS/NeFS.cc b/dev/kernel/src/FS/NeFS.cc index 85e2cd6e..7bc02b39 100644 --- a/dev/kernel/src/FS/NeFS.cc +++ b/dev/kernel/src/FS/NeFS.cc @@ -515,7 +515,7 @@ bool NeFileSystemParser::Format(_Input _Output DriveTrait* drive, _Input const L Lba outEpmLba = kEPMBootBlockLba; - Char buf[kNeFSSectorSz]; + Char buf[kNeFSSectorSz] = {0}; Lba prevStart = 0; SizeT cnt = 0; -- cgit v1.2.3