From 595a52436c86b4cdc37f26d9562cd55ccdb1a4ec Mon Sep 17 00:00:00 2001 From: Amlal Date: Fri, 17 Jan 2025 21:53:27 +0100 Subject: META: Tweaks and patches applied to mostly the kernel. Signed-off-by: Amlal --- dev/Kernel/KernelKit/DriveMgr.h | 14 +++++++------- dev/Kernel/KernelKit/HardwareThreadScheduler.h | 2 +- dev/Kernel/KernelKit/IPEFDylibObject.h | 2 +- dev/Kernel/KernelKit/LoaderInterface.h | 6 +++--- dev/Kernel/KernelKit/PCI/DMA.h | 2 +- dev/Kernel/KernelKit/UserProcessScheduler.h | 2 +- 6 files changed, 14 insertions(+), 14 deletions(-) (limited to 'dev/Kernel/KernelKit') diff --git a/dev/Kernel/KernelKit/DriveMgr.h b/dev/Kernel/KernelKit/DriveMgr.h index d2765840..c1e42ba3 100644 --- a/dev/Kernel/KernelKit/DriveMgr.h +++ b/dev/Kernel/KernelKit/DriveMgr.h @@ -51,11 +51,9 @@ namespace Kernel { Char fName[kDriveNameLen]; // /System, /Boot, //./Devices/USB... Int32 fKind; // fMassStorage, fFloppy, fOpticalDisc. - Int32 fFlags; // fReadOnly, fXPMDrive, fXPTDrive - UInt64 fLbaEnd{0}; - UInt64 fLbaStart{0}; - UInt64 fSectorSz{512}; - /// @brief Packet drive (StorageKit compilant.) + Int32 fFlags; // fReadOnly, fEPMDrive... + + /// @brief Packet drive (StorageKit compilant.) struct DrivePacket final { VoidPtr fPacketContent{nullptr}; //! packet body. @@ -64,9 +62,11 @@ namespace Kernel UInt32 fPacketCRC32{0UL}; //! sanity crc, in case if good is set to false Boolean fPacketGood{YES}; Lba fPacketLba{0UL}; + SizeT fSectorSz{512}; Boolean fPacketReadOnly{NO}; - DriveTrait* fPacketDrive{nullptr}; - } fPacket; + } fPacket; + + Lba fLbaStart{0}, fLbaEnd{0}; Void (*fInput)(DrivePacket* packet_ptr); Void (*fOutput)(DrivePacket* packet_ptr); diff --git a/dev/Kernel/KernelKit/HardwareThreadScheduler.h b/dev/Kernel/KernelKit/HardwareThreadScheduler.h index 90ccd0d0..db4063bd 100644 --- a/dev/Kernel/KernelKit/HardwareThreadScheduler.h +++ b/dev/Kernel/KernelKit/HardwareThreadScheduler.h @@ -105,7 +105,7 @@ namespace Kernel public: Ref operator[](const SizeT& idx); bool operator!() noexcept; - operator bool() noexcept; + operator bool() noexcept; const Bool IsUser() override { diff --git a/dev/Kernel/KernelKit/IPEFDylibObject.h b/dev/Kernel/KernelKit/IPEFDylibObject.h index 1450ee89..a679c17d 100644 --- a/dev/Kernel/KernelKit/IPEFDylibObject.h +++ b/dev/Kernel/KernelKit/IPEFDylibObject.h @@ -100,7 +100,7 @@ namespace Kernel typedef IPEFDylibObject* IDylibRef; EXTERN_C IDylibRef rtl_init_dylib(UserProcess& header); - EXTERN_C Void rtl_fini_dylib(UserProcess& header, IDylibRef lib, Bool* successful); + EXTERN_C Void rtl_fini_dylib(UserProcess& header, IDylibRef lib, Bool* successful); } // namespace Kernel #endif /* ifndef __KERNELKIT_SHARED_OBJECT_H__ */ diff --git a/dev/Kernel/KernelKit/LoaderInterface.h b/dev/Kernel/KernelKit/LoaderInterface.h index e9bd7d7d..25cceac9 100644 --- a/dev/Kernel/KernelKit/LoaderInterface.h +++ b/dev/Kernel/KernelKit/LoaderInterface.h @@ -25,9 +25,9 @@ namespace Kernel public: virtual _Output ErrorOr GetBlob() = 0; - virtual _Output const Char* AsString() = 0; - virtual _Output const Char* MIME() = 0; - virtual _Output const Char* Path() = 0; + virtual _Output const Char* AsString() = 0; + virtual _Output const Char* MIME() = 0; + virtual _Output const Char* Path() = 0; virtual _Output ErrorOr FindStart() = 0; virtual _Output VoidPtr FindSymbol(_Input const Char* name, _Input Int32 kind) = 0; }; diff --git a/dev/Kernel/KernelKit/PCI/DMA.h b/dev/Kernel/KernelKit/PCI/DMA.h index c3978bec..bfe335ce 100644 --- a/dev/Kernel/KernelKit/PCI/DMA.h +++ b/dev/Kernel/KernelKit/PCI/DMA.h @@ -52,7 +52,7 @@ namespace Kernel T* Get(const UIntPtr off = 0); public: - operator bool(); + operator bool(); bool operator!(); public: diff --git a/dev/Kernel/KernelKit/UserProcessScheduler.h b/dev/Kernel/KernelKit/UserProcessScheduler.h index 060426c7..cc947ec1 100644 --- a/dev/Kernel/KernelKit/UserProcessScheduler.h +++ b/dev/Kernel/KernelKit/UserProcessScheduler.h @@ -288,7 +288,7 @@ namespace Kernel ZKA_COPY_DEFAULT(UserProcessScheduler) - operator bool(); + operator bool(); bool operator!(); public: -- cgit v1.2.3