From 5b1bb6cc086047e99a1d246fd2d337bf76887bd8 Mon Sep 17 00:00:00 2001 From: Amlal El Mahrouss Date: Sun, 29 Dec 2024 08:39:20 +0100 Subject: META: Ran format command. Signed-off-by: Amlal El Mahrouss --- dev/Boot/BootKit/BootKit.h | 4 +-- dev/Boot/Mod/SysChk/Module.cc | 2 +- dev/Boot/src/BootThread.cc | 2 +- dev/Kernel/FSKit/NeFS.h | 28 +++++++-------- dev/Kernel/FirmwareKit/EFI/EFI.h | 19 +++++----- dev/Kernel/FirmwareKit/EPM.h | 36 +++++++++---------- dev/Kernel/HALKit/AMD64/Storage/AHCI-DMA.cc | 2 +- dev/Kernel/KernelKit/CodeMgr.h | 6 ++-- dev/Kernel/KernelKit/DebugOutput.h | 4 +-- dev/Kernel/KernelKit/LoaderInterface.h | 6 ++-- dev/Kernel/KernelKit/UserProcessScheduler.h | 4 +-- dev/Kernel/NewKit/DriverMgr.h | 6 ++-- dev/Kernel/SystemKit/SwapMgr.h | 2 +- dev/Kernel/SystemKit/ThreadMgr.h | 8 ++--- dev/Kernel/src/CodeMgr.cc | 2 +- dev/Kernel/src/DriveMgr.cc | 2 +- dev/Kernel/src/FS/NeFS.cc | 30 ++++++++-------- dev/Kernel/src/FileMgr.cc | 2 +- dev/Kernel/src/KernelMain.cc | 10 +++--- dev/Kernel/src/Mgr/SwapMgr.cc | 34 +++++++++--------- dev/Kernel/src/NeFS+FileMgr.cc | 4 +-- dev/Kernel/src/SoftwareTimer.cc | 2 +- dev/Mod/GfxMgr/AccessibilityMgr.h | 2 +- dev/Mod/GfxMgr/FBMgr.h | 56 ++++++++++++++--------------- public/tools/src/CLI.cc | 1 - 25 files changed, 135 insertions(+), 139 deletions(-) diff --git a/dev/Boot/BootKit/BootKit.h b/dev/Boot/BootKit/BootKit.h index 33400d02..a92614f4 100644 --- a/dev/Boot/BootKit/BootKit.h +++ b/dev/Boot/BootKit/BootKit.h @@ -360,7 +360,7 @@ namespace Boot epm_boot.FsVersion = kNeFSVersionInteger; epm_boot.LbaStart = kNeFSRootCatalogStartAddress; epm_boot.SectorSz = partBlock.SectorSize; - epm_boot.Kind = kEPMZkaOS; + epm_boot.Kind = kEPMZkaOS; epm_boot.NumBlocks = partBlock.CatalogCount; CopyMem(epm_boot.Name, reinterpret_cast(const_cast(kBlockName)), StrLen(kBlockName)); @@ -382,7 +382,7 @@ namespace Boot else { fb_init(); - FBDrawBitMapInRegion(zka_no_disk, ZKA_NO_DISK_WIDTH, ZKA_NO_DISK_HEIGHT, (kHandoverHeader->f_GOP.f_Width - ZKA_NO_DISK_WIDTH) / 2, (kHandoverHeader->f_GOP.f_Height - ZKA_NO_DISK_HEIGHT) / 2); + FBDrawBitMapInRegion(zka_no_disk, ZKA_NO_DISK_WIDTH, ZKA_NO_DISK_HEIGHT, (kHandoverHeader->f_GOP.f_Width - ZKA_NO_DISK_WIDTH) / 2, (kHandoverHeader->f_GOP.f_Height - ZKA_NO_DISK_HEIGHT) / 2); EFI::ThrowError(L"Filesystem-Failure-Part", L"Filesystem couldn't be partitioned, this drive cannot be formatted as an explicit partition map."); } diff --git a/dev/Boot/Mod/SysChk/Module.cc b/dev/Boot/Mod/SysChk/Module.cc index 93ddf088..b2545db6 100644 --- a/dev/Boot/Mod/SysChk/Module.cc +++ b/dev/Boot/Mod/SysChk/Module.cc @@ -27,6 +27,6 @@ EXTERN_C Int32 ModuleMain(Kernel::HEL::BootInfoHeader* handover) return kEfiFail; Boot::BDiskFormatFactory partition_factory; - + return !partition_factory.IsPartitionValid() ? kEfiOk : kEfiFail; } diff --git a/dev/Boot/src/BootThread.cc b/dev/Boot/src/BootThread.cc index 72f47d78..a3bc3500 100644 --- a/dev/Boot/src/BootThread.cc +++ b/dev/Boot/src/BootThread.cc @@ -184,7 +184,7 @@ namespace Boot fHandover = handover; if (own_stack) - { + { rt_jump_to_address(fStartAddress, fHandover, &fStack[mib_cast(8) - 1]); } else diff --git a/dev/Kernel/FSKit/NeFS.h b/dev/Kernel/FSKit/NeFS.h index 2dbc7e26..6d0b6bfe 100644 --- a/dev/Kernel/FSKit/NeFS.h +++ b/dev/Kernel/FSKit/NeFS.h @@ -76,7 +76,7 @@ default. #define kNeFSCatalogKindTTF (13) #define kNeFSCatalogKindRIFF (14) #define kNeFSCatalogKindMPEG (15) -#define kNeFSCatalogKindDVX (16) +#define kNeFSCatalogKindDVX (16) #define kNeFSSeparator '/' #define kNeFSSeparatorAlt '/' @@ -111,9 +111,9 @@ default. #define kNeFSMimeNameLen (200) #define kNeFSForkNameLen (200) -#define kNeFSFrameworkExt ".fwrk" +#define kNeFSFrameworkExt ".fwrk" #define kNeFSApplicationExt ".app" -#define kNeFSJournalExt ".jrnl" +#define kNeFSJournalExt ".jrnl" struct NFS_CATALOG_STRUCT; struct NFS_FORK_STRUCT; @@ -203,7 +203,7 @@ struct PACKED NFS_ROOT_PARTITION_BLOCK final Kernel::UInt64 Version; Kernel::Lba EpmBlock; - + Kernel::Char Pad[kNeFSPadLen]; }; @@ -250,15 +250,15 @@ namespace Kernel /// @param theFork the fork itself. /// @return the fork _Output NFS_FORK_STRUCT* CreateFork(_Input NFS_CATALOG_STRUCT* catalog, - _Input NFS_FORK_STRUCT& theFork); + _Input NFS_FORK_STRUCT& theFork); /// @brief Find fork inside New filesystem. /// @param catalog the catalog. /// @param name the fork name. /// @return the fork. _Output NFS_FORK_STRUCT* FindFork(_Input NFS_CATALOG_STRUCT* catalog, - _Input const Char* name, - Boolean dataOrRsrc); + _Input const Char* name, + Boolean dataOrRsrc); _Output Void RemoveFork(_Input NFS_FORK_STRUCT* fork); @@ -268,7 +268,7 @@ namespace Kernel _Output NFS_CATALOG_STRUCT* GetCatalog(_Input const Char* name); - _Output NFS_CATALOG_STRUCT* CreateCatalog(_Input const Char* name, + _Output NFS_CATALOG_STRUCT* CreateCatalog(_Input const Char* name, _Input const Int32& flags, _Input const Int32& kind); @@ -278,12 +278,12 @@ namespace Kernel _Input Bool isRsrcFork, _Input VoidPtr data, _Input SizeT sizeOfData, - _Input const Char* forkName); + _Input const Char* forkName); VoidPtr ReadCatalog(_Input _Output NFS_CATALOG_STRUCT* catalog, _Input Bool isRsrcFork, _Input SizeT dataSz, - _Input const Char* forkName); + _Input const Char* forkName); bool Seek(_Input _Output NFS_CATALOG_STRUCT* catalog, SizeT off); @@ -345,7 +345,7 @@ namespace Kernel return NO; mNode = parser->CreateCatalog(mStamp); - + if (!mNode) return NO; @@ -367,7 +367,8 @@ namespace Kernel } Bool Commit(NeFileSystemParser* parser, - KString xml_data, KString journal_name) + KString xml_data, + KString journal_name) { if (!parser) return NO; @@ -376,8 +377,7 @@ namespace Kernel } private: - Char mStamp[255] = { "/Boot/Journal" kNeFSJournalExt }; - + Char mStamp[255] = {"/Boot/Journal" kNeFSJournalExt}; }; namespace Detail diff --git a/dev/Kernel/FirmwareKit/EFI/EFI.h b/dev/Kernel/FirmwareKit/EFI/EFI.h index bca77f32..45788a0c 100644 --- a/dev/Kernel/FirmwareKit/EFI/EFI.h +++ b/dev/Kernel/FirmwareKit/EFI/EFI.h @@ -576,7 +576,7 @@ typedef struct EfiSimpleTextOutputProtocol typedef struct { - UInt16 ScanCode; + UInt16 ScanCode; EfiChar16Type UnicodeChar; } EfiInputKey; @@ -586,21 +586,18 @@ typedef EfiStatusType(EFI_API* EfiInputReadKey)( typedef EfiStatusType(EFI_API* EfiInputReset)( IN EfiSimpleTextInputProtocol* This, - IN Boolean ExtendedChk ); + IN Boolean ExtendedChk); -typedef -EfiStatusType -(EFI_API *EfiWaitForEvent) ( - IN UInt32 NumberOfEvents, - IN VoidPtr Event, - OUT UInt32 *Index - ); +typedef EfiStatusType(EFI_API* EfiWaitForEvent)( + IN UInt32 NumberOfEvents, + IN VoidPtr Event, + OUT UInt32* Index); typedef struct EfiSimpleTextInputProtocol { - EfiInputReset Reset; + EfiInputReset Reset; EfiInputReadKey ReadKeyStroke; - EfiWaitForEvent WaitForKey; + EfiWaitForEvent WaitForKey; } EfiSimpleTextInputProtocol; /// @biref Open Volume procedure ptr. diff --git a/dev/Kernel/FirmwareKit/EPM.h b/dev/Kernel/FirmwareKit/EPM.h index 5be69baa..8987ae6f 100644 --- a/dev/Kernel/FirmwareKit/EPM.h +++ b/dev/Kernel/FirmwareKit/EPM.h @@ -80,18 +80,18 @@ typedef struct EPM_GUID */ struct PACKED EPM_BOOT_BLOCK { - Kernel::Char Magic[kEPMMagicLength]; - Kernel::Char Name[kEPMNameLength]; - EPM_GUID Guid; - Kernel::Int32 Version; - Kernel::Int64 NumBlocks; - Kernel::Int64 SectorSz; - Kernel::Int64 LbaStart; // base offset - Kernel::Int64 LbaEnd; // addition of lba_start to get the end of partition. - Kernel::Int16 Kind; - Kernel::Int32 FsVersion; - Kernel::Char Fs[kEPMFilesystemLength]; /* NeFS, ffs2... */ - Kernel::Char Reserved[kEPMReserveLen]; // to fill a full sector. + Kernel::Char Magic[kEPMMagicLength]; + Kernel::Char Name[kEPMNameLength]; + EPM_GUID Guid; + Kernel::Int32 Version; + Kernel::Int64 NumBlocks; + Kernel::Int64 SectorSz; + Kernel::Int64 LbaStart; // base offset + Kernel::Int64 LbaEnd; // addition of lba_start to get the end of partition. + Kernel::Int16 Kind; + Kernel::Int32 FsVersion; + Kernel::Char Fs[kEPMFilesystemLength]; /* NeFS, ffs2... */ + Kernel::Char Reserved[kEPMReserveLen]; // to fill a full sector. }; ///! @brief Version kind enum. @@ -99,12 +99,12 @@ struct PACKED EPM_BOOT_BLOCK enum { - kEPMInvalid = 0x00, - kEPMGenericOS = 0xcf, // Generic OS - kEPMLinux = 0x8f, // Linux on EPM - kEPMBSD = 0x9f, // Berkeley Soft. Distribution - kEPMZkaOS = 0x1f, // This OS. - kEPMInvalidOS = 0xff, + kEPMInvalid = 0x00, + kEPMGenericOS = 0xcf, // Generic OS + kEPMLinux = 0x8f, // Linux on EPM + kEPMBSD = 0x9f, // Berkeley Soft. Distribution + kEPMZkaOS = 0x1f, // This OS. + kEPMInvalidOS = 0xff, }; typedef struct EPM_BOOT_BLOCK BOOT_BLOCK_STRUCT; diff --git a/dev/Kernel/HALKit/AMD64/Storage/AHCI-DMA.cc b/dev/Kernel/HALKit/AMD64/Storage/AHCI-DMA.cc index 811ad738..2f8ea774 100644 --- a/dev/Kernel/HALKit/AMD64/Storage/AHCI-DMA.cc +++ b/dev/Kernel/HALKit/AMD64/Storage/AHCI-DMA.cc @@ -52,7 +52,7 @@ enum }; STATIC Kernel::PCI::Device kAhciDevice; -STATIC HbaPort* kAhciPort = nullptr; +STATIC HbaPort* kAhciPort = nullptr; STATIC Kernel::Lba kCurrentDiskSectorCount = 0UL; Kernel::Void drv_calculate_disk_geometry() diff --git a/dev/Kernel/KernelKit/CodeMgr.h b/dev/Kernel/KernelKit/CodeMgr.h index d623a47b..d3b9f39a 100644 --- a/dev/Kernel/KernelKit/CodeMgr.h +++ b/dev/Kernel/KernelKit/CodeMgr.h @@ -22,12 +22,12 @@ namespace Kernel { /// @brief Main process entrypoint. typedef void (*rtl_main_kind)(const SizeT argc, Char** argv, Char** envp, const SizeT envp_len); - + /// @brief C++ Constructor entrypoint. - typedef void(*rtl_ctor_kind)(void); + typedef void (*rtl_ctor_kind)(void); /// @brief C++ Destructor entrypoint. - typedef void(*rtl_dtor_kind)(void); + typedef void (*rtl_dtor_kind)(void); /// @brief Executes a new process from a function. Kernel code only. /// @note This sets up a new stack, anything on the main function that calls the Kernel will not be accessible. diff --git a/dev/Kernel/KernelKit/DebugOutput.h b/dev/Kernel/KernelKit/DebugOutput.h index dae58a07..da285329 100644 --- a/dev/Kernel/KernelKit/DebugOutput.h +++ b/dev/Kernel/KernelKit/DebugOutput.h @@ -191,8 +191,8 @@ namespace Kernel #undef kcout #endif // ifdef kcout -#define kcout \ +#define kcout \ (Kernel::TerminalDevice::The() << "\e[0;31m [ (" << __FILE__ << ") Line: " << Kernel::number(__LINE__)); \ - (Kernel::TerminalDevice::The() << " ] \e[0m" \ + (Kernel::TerminalDevice::The() << " ] \e[0m" \ << ": ") #define endl Kernel::TerminalDevice::The() << Kernel::end_line() diff --git a/dev/Kernel/KernelKit/LoaderInterface.h b/dev/Kernel/KernelKit/LoaderInterface.h index 7bdff05e..e70c2448 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/UserProcessScheduler.h b/dev/Kernel/KernelKit/UserProcessScheduler.h index d2e73afc..73780dc3 100644 --- a/dev/Kernel/KernelKit/UserProcessScheduler.h +++ b/dev/Kernel/KernelKit/UserProcessScheduler.h @@ -186,9 +186,9 @@ namespace Kernel UIntPtr SignalID; }; - UserProcessSignal ProcessSignal; + UserProcessSignal ProcessSignal; ProcessMemoryHeapList* ProcessMemoryHeap{nullptr}; - UserProcessTeam* ProcessParentTeam; + UserProcessTeam* ProcessParentTeam; VoidPtr VMRegister{0UL}; diff --git a/dev/Kernel/NewKit/DriverMgr.h b/dev/Kernel/NewKit/DriverMgr.h index a8294ee5..709c626d 100644 --- a/dev/Kernel/NewKit/DriverMgr.h +++ b/dev/Kernel/NewKit/DriverMgr.h @@ -14,6 +14,6 @@ namespace Kernel { - class UserDriver; - class KernelDriver; -} \ No newline at end of file + class UserDriver; + class KernelDriver; +} // namespace Kernel \ No newline at end of file diff --git a/dev/Kernel/SystemKit/SwapMgr.h b/dev/Kernel/SystemKit/SwapMgr.h index 8b565a09..9f1ecc3e 100644 --- a/dev/Kernel/SystemKit/SwapMgr.h +++ b/dev/Kernel/SystemKit/SwapMgr.h @@ -10,7 +10,7 @@ #include #define kSwapMgrBlockMaxSize mib_cast(16) -#define KSwapMgrBlockMagic "SWEP " +#define KSwapMgrBlockMagic "SWEP " #define kSwapMgrPageFile "/System/pagefile.sys" diff --git a/dev/Kernel/SystemKit/ThreadMgr.h b/dev/Kernel/SystemKit/ThreadMgr.h index c943e1c9..27a9707a 100644 --- a/dev/Kernel/SystemKit/ThreadMgr.h +++ b/dev/Kernel/SystemKit/ThreadMgr.h @@ -14,7 +14,7 @@ namespace Kernel { - class UserSubsystem; - class UserEnvVar; - class UserEnv; -} \ No newline at end of file + class UserSubsystem; + class UserEnvVar; + class UserEnv; +} // namespace Kernel \ No newline at end of file diff --git a/dev/Kernel/src/CodeMgr.cc b/dev/Kernel/src/CodeMgr.cc index 74d4dd84..53576b2c 100644 --- a/dev/Kernel/src/CodeMgr.cc +++ b/dev/Kernel/src/CodeMgr.cc @@ -16,7 +16,7 @@ namespace Kernel /// @param main the start of the process. /// @return if the process was started or not. /***********************************************************************************/ - + ProcessID rtl_create_process(rtl_main_kind main, const Char* process_name) noexcept { if (!process_name || diff --git a/dev/Kernel/src/DriveMgr.cc b/dev/Kernel/src/DriveMgr.cc index b2098e5e..b588bb0a 100644 --- a/dev/Kernel/src/DriveMgr.cc +++ b/dev/Kernel/src/DriveMgr.cc @@ -175,7 +175,7 @@ namespace Kernel { trait->fPacket.fPacketReadOnly = NO; trait->fKind = kMassStorageDisc | kEPMDrive; - + kcout << "Formatted Disc is EPM (and Mass Storage too.)\r"; } else diff --git a/dev/Kernel/src/FS/NeFS.cc b/dev/Kernel/src/FS/NeFS.cc index 57ef103f..27a027cd 100644 --- a/dev/Kernel/src/FS/NeFS.cc +++ b/dev/Kernel/src/FS/NeFS.cc @@ -61,7 +61,7 @@ STATIC MountpointInterface kDiskMountpoint; /// @return the fork /***********************************************************************************/ _Output NFS_FORK_STRUCT* NeFileSystemParser::CreateFork(_Input NFS_CATALOG_STRUCT* catalog, - _Input NFS_FORK_STRUCT& the_fork) + _Input NFS_FORK_STRUCT& the_fork) { if (catalog && the_fork.ForkName[0] != 0 && the_fork.DataSize <= kNeFSForkDataSz) @@ -170,8 +170,8 @@ _Output NFS_FORK_STRUCT* NeFileSystemParser::CreateFork(_Input NFS_CATALOG_STRUC /// @return the fork. /***********************************************************************************/ _Output NFS_FORK_STRUCT* NeFileSystemParser::FindFork(_Input NFS_CATALOG_STRUCT* catalog, - _Input const Char* name, - Boolean isDataFork) + _Input const Char* name, + Boolean isDataFork) { auto drv = kDiskMountpoint.A(); NFS_FORK_STRUCT* the_fork = nullptr; @@ -236,9 +236,9 @@ _Output NFS_CATALOG_STRUCT* NeFileSystemParser::CreateCatalog(_Input const Char* /// @param kind the catalog kind. /// @return catalog pointer. /***********************************************************************************/ -_Output NFS_CATALOG_STRUCT* NeFileSystemParser::CreateCatalog(_Input const Char* name, - _Input const Int32& flags, - _Input const Int32& kind) +_Output NFS_CATALOG_STRUCT* NeFileSystemParser::CreateCatalog(_Input const Char* name, + _Input const Int32& flags, + _Input const Int32& kind) { kcout << "CreateCatalog(...)\r"; @@ -509,8 +509,8 @@ bool NeFileSystemParser::Format(_Input _Output DriveTrait* drive, _Input const L 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; + epm_boot->LbaStart = start; + epm_boot->SectorSz = kNeFSSectorSz; 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)); @@ -537,7 +537,7 @@ bool NeFileSystemParser::Format(_Input _Output DriveTrait* drive, _Input const L if (epm_boot->LbaStart) epm_boot->LbaStart = outEpmLba; - epm_boot->LbaEnd = endLba; + epm_boot->LbaEnd = endLba; epm_boot->NumBlocks = cnt; drive->fPacket.fPacketContent = bufEpmHdr; @@ -720,7 +720,7 @@ bool NeFileSystemParser::WriteCatalog(_Input _Output NFS_CATALOG_STRUCT* catalog /// @param catalog_name the catalog name. /// @return the newly found catalog. _Output NFS_CATALOG_STRUCT* NeFileSystemParser::FindCatalog(_Input const Char* catalog_name, - Lba& out_lba) + Lba& out_lba) { if (!catalog_name || *catalog_name == 0) @@ -742,7 +742,7 @@ _Output NFS_CATALOG_STRUCT* NeFileSystemParser::FindCatalog(_Input const Char* c NFS_ROOT_PARTITION_BLOCK* part = (NFS_ROOT_PARTITION_BLOCK*)&fs_buf; - auto start_catalog_lba = part->StartCatalog; + auto start_catalog_lba = part->StartCatalog; const auto kStartCatalogList = start_catalog_lba; auto localSearchFirst = false; @@ -838,7 +838,7 @@ NeFSSearchThroughCatalogList: if (localSearchFirst) { - localSearchFirst = false; + localSearchFirst = false; start_catalog_lba = kStartCatalogList; goto NeFSSearchThroughCatalogList; @@ -938,9 +938,9 @@ Boolean NeFileSystemParser::RemoveCatalog(_Input const Char* catalog_name) /***********************************************************************************/ VoidPtr NeFileSystemParser::ReadCatalog(_Input _Output NFS_CATALOG_STRUCT* catalog, - _Input Bool is_rsrc_fork, - _Input SizeT dataSz, - _Input const Char* forkName) + _Input Bool is_rsrc_fork, + _Input SizeT dataSz, + _Input const Char* forkName) { if (!catalog) { diff --git a/dev/Kernel/src/FileMgr.cc b/dev/Kernel/src/FileMgr.cc index e316286a..1b806d2c 100644 --- a/dev/Kernel/src/FileMgr.cc +++ b/dev/Kernel/src/FileMgr.cc @@ -28,7 +28,7 @@ namespace Kernel if (kMountedFilesystem) { auto mount = kMountedFilesystem; - kMountedFilesystem = nullptr; + kMountedFilesystem = nullptr; return mount; } diff --git a/dev/Kernel/src/KernelMain.cc b/dev/Kernel/src/KernelMain.cc index 900bb944..d62fe3b2 100644 --- a/dev/Kernel/src/KernelMain.cc +++ b/dev/Kernel/src/KernelMain.cc @@ -42,8 +42,8 @@ namespace Kernel::Detail { mJournal.CreateJournal(mNeFS); - constexpr auto kFolderInfo = "META-XML"; - const SizeT kFolderCount = 7; + constexpr auto kFolderInfo = "META-XML"; + const SizeT kFolderCount = 7; const Char* kFolderStr[kFolderCount] = { "/Boot/", "/System/", "/Support/", "/Applications/", "/Users/", "/Library/", "/Mount/"}; @@ -61,7 +61,7 @@ namespace Kernel::Detail } catalog_folder = mNeFS->CreateCatalog(kFolderStr[dir_index], 0, - kNeFSCatalogKindDir); + kNeFSCatalogKindDir); NFS_FORK_STRUCT fork_folder{0}; @@ -90,7 +90,7 @@ namespace Kernel::Detail Kernel::KString folder_name(2048); folder_name += catalog_folder->Name; - mJournal.Commit(mNeFS, folder_metadata,folder_name); + mJournal.Commit(mNeFS, folder_metadata, folder_name); const Kernel::SizeT kMetaDataSz = kNeFSSectorSz; @@ -110,7 +110,7 @@ namespace Kernel::Detail { if (mNeFS) delete mNeFS; - + mNeFS = nullptr; } diff --git a/dev/Kernel/src/Mgr/SwapMgr.cc b/dev/Kernel/src/Mgr/SwapMgr.cc index a45913c2..a909846f 100644 --- a/dev/Kernel/src/Mgr/SwapMgr.cc +++ b/dev/Kernel/src/Mgr/SwapMgr.cc @@ -9,20 +9,20 @@ namespace Kernel { - class SwapMgrDiskMgr; - - class SwapMgrDiskMgr final - { - static BOOL DumpToDisk(const Char* fork_name, const SizeT fork_name_len, VoidPtr data, const SizeT data_len) - { - if (!fork_name || !fork_name_len) - return NO; - - FileStream file(kSwapMgrPageFile, "wb"); - - file.Write(fork_name, data, data_len); - - return YES; - } - } -} \ No newline at end of file + class SwapMgrDiskMgr; + + class SwapMgrDiskMgr final + { + static BOOL DumpToDisk(const Char* fork_name, const SizeT fork_name_len, VoidPtr data, const SizeT data_len) + { + if (!fork_name || !fork_name_len) + return NO; + + FileStream file(kSwapMgrPageFile, "wb"); + + file.Write(fork_name, data, data_len); + + return YES; + } + } +} // namespace Kernel \ No newline at end of file diff --git a/dev/Kernel/src/NeFS+FileMgr.cc b/dev/Kernel/src/NeFS+FileMgr.cc index 4530a1e5..ba3e6718 100644 --- a/dev/Kernel/src/NeFS+FileMgr.cc +++ b/dev/Kernel/src/NeFS+FileMgr.cc @@ -170,7 +170,7 @@ namespace Kernel if ((reinterpret_cast(node))->Kind == kNeFSCatalogKindFile) mParser->WriteCatalog(reinterpret_cast(node), (flags & kFileFlagRsrc ? true : false), data, size, - name); + name); } _Output VoidPtr NeFileSystemMgr::Read(_Input const Char* name, @@ -188,7 +188,7 @@ namespace Kernel if ((reinterpret_cast(node))->Kind == kNeFSCatalogKindFile) return mParser->ReadCatalog(reinterpret_cast(node), (flags & kFileFlagRsrc ? true : false), sz, - name); + name); return nullptr; } diff --git a/dev/Kernel/src/SoftwareTimer.cc b/dev/Kernel/src/SoftwareTimer.cc index 1bd2bc2a..5d401b09 100644 --- a/dev/Kernel/src/SoftwareTimer.cc +++ b/dev/Kernel/src/SoftwareTimer.cc @@ -21,7 +21,7 @@ SoftwareTimer::~SoftwareTimer() { delete fDigitalTimer; fDigitalTimer = nullptr; - + fWaitFor = 0; } diff --git a/dev/Mod/GfxMgr/AccessibilityMgr.h b/dev/Mod/GfxMgr/AccessibilityMgr.h index 5d130d7e..45e32529 100644 --- a/dev/Mod/GfxMgr/AccessibilityMgr.h +++ b/dev/Mod/GfxMgr/AccessibilityMgr.h @@ -36,6 +36,6 @@ namespace UI return kHandoverHeader->f_GOP.f_Height; } }; -} // namespace CG +} // namespace UI #endif // !GFX_MGR_ACCESSIBILITY_H_ diff --git a/dev/Mod/GfxMgr/FBMgr.h b/dev/Mod/GfxMgr/FBMgr.h index c3ccc064..62023346 100644 --- a/dev/Mod/GfxMgr/FBMgr.h +++ b/dev/Mod/GfxMgr/FBMgr.h @@ -17,54 +17,54 @@ #define fb_clear() kCGCursor = 0 /// @brief Performs Alpha drawing on the framebuffer. -#define FBDrawBitMapInRegionA(reg_ptr, height, width, base_x, base_y) \ - for (Kernel::SizeT i = base_x; i < (width + base_x); ++i) \ +#define FBDrawBitMapInRegionA(reg_ptr, height, width, base_x, base_y) \ + for (Kernel::SizeT i = base_x; i < (width + base_x); ++i) \ { \ for (Kernel::SizeT u = base_y; u < (height + base_y); ++u) \ { \ *(((Kernel::UInt32*)(kHandoverHeader->f_GOP.f_The + \ 4 * kHandoverHeader->f_GOP.f_PixelPerLine * \ i + \ - 4 * u))) |= (reg_ptr)[kCGCursor]; \ + 4 * u))) |= (reg_ptr)[kCGCursor]; \ \ ++kCGCursor; \ } \ } /// @brief Performs drawing on the framebuffer. -#define FBDrawBitMapInRegion(reg_ptr, height, width, base_x, base_y) \ - for (Kernel::SizeT i = base_x; i < (width + base_x); ++i) \ +#define FBDrawBitMapInRegion(reg_ptr, height, width, base_x, base_y) \ + for (Kernel::SizeT i = base_x; i < (width + base_x); ++i) \ { \ for (Kernel::SizeT u = base_y; u < (height + base_y); ++u) \ { \ *(((Kernel::UInt32*)(kHandoverHeader->f_GOP.f_The + \ 4 * kHandoverHeader->f_GOP.f_PixelPerLine * \ i + \ - 4 * u))) = (reg_ptr)[kCGCursor]; \ + 4 * u))) = (reg_ptr)[kCGCursor]; \ \ ++kCGCursor; \ } \ } #define FBDrawBitMapInRegionToRgn(_Rgn, reg_ptr, height, width, base_x, base_y) \ - for (Kernel::SizeT i = base_x; i < (width + base_x); ++i) \ - { \ - for (Kernel::SizeT u = base_y; u < (height + base_y); ++u) \ - { \ - *(((Kernel::UInt32*)(_Rgn + \ - 4 * kHandoverHeader->f_GOP.f_PixelPerLine * \ - i + \ - 4 * u))) = (reg_ptr)[kCGCursor]; \ - \ - ++kCGCursor; \ - } \ + for (Kernel::SizeT i = base_x; i < (width + base_x); ++i) \ + { \ + for (Kernel::SizeT u = base_y; u < (height + base_y); ++u) \ + { \ + *(((Kernel::UInt32*)(_Rgn + \ + 4 * kHandoverHeader->f_GOP.f_PixelPerLine * \ + i + \ + 4 * u))) = (reg_ptr)[kCGCursor]; \ + \ + ++kCGCursor; \ + } \ } /// @brief Cleans a resource. -#define CGClearRegion(height, width, base_x, base_y) \ +#define CGClearRegion(height, width, base_x, base_y) \ for (Kernel::SizeT i = base_x; i < (width + base_x); ++i) \ { \ - for (Kernel::SizeT u = base_y; u < (height + base_y); ++u) \ + for (Kernel::SizeT u = base_y; u < (height + base_y); ++u) \ { \ *(((volatile Kernel::UInt32*)(kHandoverHeader->f_GOP.f_The + \ 4 * kHandoverHeader->f_GOP.f_PixelPerLine * \ @@ -74,10 +74,10 @@ } /// @brief Draws inside a zone. -#define FBDrawInRegion(_Clr, height, width, base_x, base_y) \ - for (Kernel::SizeT x_base = base_x; x_base < (width + base_x); ++x_base) \ +#define FBDrawInRegion(_Clr, height, width, base_x, base_y) \ + for (Kernel::SizeT x_base = base_x; x_base < (width + base_x); ++x_base) \ { \ - for (Kernel::SizeT y_base = base_y; y_base < (height + base_y); ++y_base) \ + for (Kernel::SizeT y_base = base_y; y_base < (height + base_y); ++y_base) \ { \ *(((volatile Kernel::UInt32*)(kHandoverHeader->f_GOP.f_The + \ 4 * kHandoverHeader->f_GOP.f_PixelPerLine * \ @@ -87,10 +87,10 @@ } /// @brief Draws inside a zone. -#define FBDrawInRegionToRgn(_Rgn, _Clr, height, width, base_x, base_y) \ - for (Kernel::SizeT x_base = base_x; x_base < (width + base_x); ++x_base) \ +#define FBDrawInRegionToRgn(_Rgn, _Clr, height, width, base_x, base_y) \ + for (Kernel::SizeT x_base = base_x; x_base < (width + base_x); ++x_base) \ { \ - for (Kernel::SizeT y_base = base_y; y_base < (height + base_y); ++y_base) \ + for (Kernel::SizeT y_base = base_y; y_base < (height + base_y); ++y_base) \ { \ *(((volatile Kernel::UInt32*)(_Rgn + \ 4 * kHandoverHeader->f_GOP.f_PixelPerLine * \ @@ -100,10 +100,10 @@ } \ } -#define FBDrawInRegionA(_Clr, height, width, base_x, base_y) \ - for (Kernel::SizeT x_base = base_x; x_base < (width + base_x); ++x_base) \ +#define FBDrawInRegionA(_Clr, height, width, base_x, base_y) \ + for (Kernel::SizeT x_base = base_x; x_base < (width + base_x); ++x_base) \ { \ - for (Kernel::SizeT y_base = base_y; y_base < (height + base_y); ++y_base) \ + for (Kernel::SizeT y_base = base_y; y_base < (height + base_y); ++y_base) \ { \ *(((volatile Kernel::UInt32*)(kHandoverHeader->f_GOP.f_The + \ 4 * kHandoverHeader->f_GOP.f_PixelPerLine * \ diff --git a/public/tools/src/CLI.cc b/public/tools/src/CLI.cc index 6296f5f1..ed686294 100644 --- a/public/tools/src/CLI.cc +++ b/public/tools/src/CLI.cc @@ -45,7 +45,6 @@ int main(int argc, char* argv[]) continue; } - files.push_back(argv[i]); } -- cgit v1.2.3