diff options
| author | Amlal El Mahrouss <amlal.elmahrouss@icloud.com> | 2024-10-11 17:32:44 +0200 |
|---|---|---|
| committer | Amlal El Mahrouss <amlal.elmahrouss@icloud.com> | 2024-10-11 17:32:44 +0200 |
| commit | ad999c3e2e5ca4379e90d4e019b7671a1eaa3fbd (patch) | |
| tree | 9b8df3af900389d9e693ac32a3c28af7519db384 /dev | |
| parent | 25fa708c31a5a189fac7ad98d61f5541f3f7fa84 (diff) | |
IMP: Add new targets for OS X, Xcode.
FIX: Refactored kernel's source code according to codebase standards.
Signed-off-by: Amlal El Mahrouss <amlal.elmahrouss@icloud.com>
Diffstat (limited to 'dev')
29 files changed, 232 insertions, 227 deletions
diff --git a/dev/base/View/pdf.hxx b/dev/base/View/pdf.hxx index e984ef29..e129e247 100644 --- a/dev/base/View/pdf.hxx +++ b/dev/base/View/pdf.hxx @@ -29,7 +29,7 @@ namespace View::PDF virtual IPDFDocument* GetLastPage() = 0; virtual IPDFDocument* GetPage(const UInt32& page_number); - virtual SInt32 SetPage(const UInt32& page_number, IPDFDocument* new_page); + virtual SInt32 SetPage(const UInt32& page_number, IPDFDocument* new_page); virtual Void SetProducer(const Char*) = 0; virtual Void SetTitle(const Char*) = 0; diff --git a/dev/ddk/ddk.h b/dev/ddk/ddk.h index 8a2e2483..64b16eda 100644 --- a/dev/ddk/ddk.h +++ b/dev/ddk/ddk.h @@ -66,7 +66,7 @@ struct DDK_STATUS_STRUCT DK_FINAL /// \brief Simple Message Struct structure. struct DDK_SMS_STRUCT DK_FINAL { - char s_msg[DDK_SMS_MAX_SZ]; + char s_msg[DDK_SMS_MAX_SZ]; int32_t s_type; int64_t s_sender; int64_t s_receiver; diff --git a/dev/ddk/dev.h b/dev/ddk/dev.h index 8dad5736..8b0084a0 100644 --- a/dev/ddk/dev.h +++ b/dev/ddk/dev.h @@ -19,9 +19,9 @@ typedef struct _DDK_DEVICE DK_FINAL char d_name[255]; // the device name. Could be /./DEVICE_NAME/ void* (*d_read)(void* arg, int len); // read from device. void (*d_write)(void* arg, int len); - void (*d_wait)(void); // write to device. + void (*d_wait)(void); // write to device. struct _DDK_DEVICE* (*d_open)(const char* path); // open device. - void (*d_close)(struct _DDK_DEVICE* dev); // close device. + void (*d_close)(struct _DDK_DEVICE* dev); // close device. } KERNEL_DEVICE, *KERNEL_DEVICE_PTR; /// @brief Open a new device from path. diff --git a/dev/modules/LTE/LTE.hxx b/dev/modules/LTE/LTE.hxx index 1a0dfcd7..d04b80fc 100644 --- a/dev/modules/LTE/LTE.hxx +++ b/dev/modules/LTE/LTE.hxx @@ -26,15 +26,15 @@ Kernel::Boolean lte_send_at_command(Kernel::Char* buf, Kernel::Size bufReadSz,
Kernel::Int32 simSlot);
-Kernel::Boolean lte_write_sim_file(Kernel::Char* file,
- Kernel::VoidPtr buf,
- Kernel::Size bufSz,
- Kernel::Size offset,
- Kernel::Int32 simSlot);
+Kernel::Boolean lte_write_sim_file(Kernel::Char* file,
+ Kernel::VoidPtr buf,
+ Kernel::Size bufSz,
+ Kernel::Size offset,
+ Kernel::Int32 simSlot);
Kernel::VoidPtr lte_read_sim_file(Kernel::Char* file,
- Kernel::Size bufSz,
- Kernel::Size offset,
- Kernel::Int32 simSlot);
+ Kernel::Size bufSz,
+ Kernel::Size offset,
+ Kernel::Int32 simSlot);
#endif // ifndef _INC_NETWORK_LTE_HXX_
diff --git a/dev/modules/NVME/NVME.hxx b/dev/modules/NVME/NVME.hxx index b0795cb4..403597a0 100644 --- a/dev/modules/NVME/NVME.hxx +++ b/dev/modules/NVME/NVME.hxx @@ -54,9 +54,7 @@ namespace Kernel /// @brief Creates an admin command for a DMA operation. template <Int32 Opcode> - inline Bool nvme_create_admin_command(HAL_NVME_QUEUE* entry, UInt32 nsid, - UInt32 prpTransfer[3], UInt32 startingLba[2], - UInt32 lowTransferBlocks) + inline Bool nvme_create_admin_command(HAL_NVME_QUEUE* entry, UInt32 nsid, UInt32 prpTransfer[3], UInt32 startingLba[2], UInt32 lowTransferBlocks) { if (entry == nullptr) return false; @@ -77,10 +75,7 @@ namespace Kernel /// @brief Creates an I/O command for a DMA operation. template <Int32 Opcode> - inline Bool nvme_create_io_command(HAL_NVME_QUEUE* entry, UInt64 baseAddress, - UInt32 identLoAndQueueSizeHi, UInt32 flagsLoAndQueueComplIdHi, - UInt32 identify, Bool provideIdentify = false, - Bool namespaceIdentify = false) + inline Bool nvme_create_io_command(HAL_NVME_QUEUE* entry, UInt64 baseAddress, UInt32 identLoAndQueueSizeHi, UInt32 flagsLoAndQueueComplIdHi, UInt32 identify, Bool provideIdentify = false, Bool namespaceIdentify = false) { if (entry == nullptr) return false; diff --git a/dev/sci/sci_base.hxx b/dev/sci/sci_base.hxx index 58a31837..7eedbb8a 100644 --- a/dev/sci/sci_base.hxx +++ b/dev/sci/sci_base.hxx @@ -216,7 +216,7 @@ IMPORT_C Void MmSetHeapFlags(_Input VoidPtr heap, _Input UInt32 flags); /// @brief Change protection flags of a memory region.
IMPORT_C UInt32 MmGetHeapFlags(_Input VoidPtr heap);
-/// @brief Fill memory region with CRC32.
+/// @brief Fill memory region with CRC32.
IMPORT_C UInt32 MmFillCRC32Heap(_Input VoidPtr heap);
/// @brief Copy memory region.
@@ -248,7 +248,7 @@ IMPORT_C Void ThrExitMainThread(_Input SInt32 exit_code); /// @param exit_code the exit code.
IMPORT_C Void ThrExitThread(_Input ThreadObject thread, _Input SInt32 exit_code);
-typedef Void(*ThreadProc)(Void);
+typedef Void (*ThreadProc)(Void);
/// @brief Create a thread.
/// @param procedure the thread procedure.
diff --git a/dev/sci/sci_lpc.hxx b/dev/sci/sci_lpc.hxx index c8fb0b55..99b9ed9d 100644 --- a/dev/sci/sci_lpc.hxx +++ b/dev/sci/sci_lpc.hxx @@ -12,38 +12,37 @@ typedef SInt32 ErrObject; -inline constexpr ErrObject kErrorSuccess = 0; -inline constexpr ErrObject kErrorExecutable = 33; -inline constexpr ErrObject kErrorExecutableLib = 34; -inline constexpr ErrObject kErrorFileNotFound = 35; -inline constexpr ErrObject kErrorDirectoryNotFound = 36; -inline constexpr ErrObject kErrorDiskReadOnly = 37; -inline constexpr ErrObject kErrorDiskIsFull = 38; -inline constexpr ErrObject kErrorProcessFault = 39; -inline constexpr ErrObject kErrorSocketHangUp = 40; +inline constexpr ErrObject kErrorSuccess = 0; +inline constexpr ErrObject kErrorExecutable = 33; +inline constexpr ErrObject kErrorExecutableLib = 34; +inline constexpr ErrObject kErrorFileNotFound = 35; +inline constexpr ErrObject kErrorDirectoryNotFound = 36; +inline constexpr ErrObject kErrorDiskReadOnly = 37; +inline constexpr ErrObject kErrorDiskIsFull = 38; +inline constexpr ErrObject kErrorProcessFault = 39; +inline constexpr ErrObject kErrorSocketHangUp = 40; inline constexpr ErrObject kErrorThreadLocalStorage = 41; -inline constexpr ErrObject kErrorMath = 42; -inline constexpr ErrObject kErrorNoNetwork = 43; -inline constexpr ErrObject kErrorHeapOutOfMemory = 44; -inline constexpr ErrObject kErrorNoSuchDisk = 45; -inline constexpr ErrObject kErrorFileExists = 46; -inline constexpr ErrObject kErrorFormatFailed = 47; -inline constexpr ErrObject kErrorNetworkTimeout = 48; -inline constexpr ErrObject kErrorInternal = 49; -inline constexpr ErrObject kErrorForkAlreadyExists = 50; -inline constexpr ErrObject kErrorOutOfTeamSlot = 51; -inline constexpr ErrObject kErrorHeapNotPresent = 52; -inline constexpr ErrObject kErrorNoEntrypoint = 53; -inline constexpr ErrObject kErrorDiskIsCorrupted = 54; -inline constexpr ErrObject kErrorDisk = 55; -inline constexpr ErrObject kErrorInvalidData = 56; -inline constexpr ErrObject kErrorAsync = 57; -inline constexpr ErrObject kErrorNonBlocking = 58; -inline constexpr ErrObject kErrorIPC = 59; -inline constexpr ErrObject kErrorSign = 60; -inline constexpr ErrObject kErrorInvalidCreds = 61; -inline constexpr ErrObject kErrorUnimplemented = 0; +inline constexpr ErrObject kErrorMath = 42; +inline constexpr ErrObject kErrorNoNetwork = 43; +inline constexpr ErrObject kErrorHeapOutOfMemory = 44; +inline constexpr ErrObject kErrorNoSuchDisk = 45; +inline constexpr ErrObject kErrorFileExists = 46; +inline constexpr ErrObject kErrorFormatFailed = 47; +inline constexpr ErrObject kErrorNetworkTimeout = 48; +inline constexpr ErrObject kErrorInternal = 49; +inline constexpr ErrObject kErrorForkAlreadyExists = 50; +inline constexpr ErrObject kErrorOutOfTeamSlot = 51; +inline constexpr ErrObject kErrorHeapNotPresent = 52; +inline constexpr ErrObject kErrorNoEntrypoint = 53; +inline constexpr ErrObject kErrorDiskIsCorrupted = 54; +inline constexpr ErrObject kErrorDisk = 55; +inline constexpr ErrObject kErrorInvalidData = 56; +inline constexpr ErrObject kErrorAsync = 57; +inline constexpr ErrObject kErrorNonBlocking = 58; +inline constexpr ErrObject kErrorIPC = 59; +inline constexpr ErrObject kErrorSign = 60; +inline constexpr ErrObject kErrorInvalidCreds = 61; +inline constexpr ErrObject kErrorUnimplemented = 0; /// @brief The last error reported by the system to the process. IMPORT_C ErrObject kLastError; - diff --git a/dev/sci/src/sci_mm.cxx b/dev/sci/src/sci_mm.cxx index eff54501..34bf4936 100644 --- a/dev/sci/src/sci_mm.cxx +++ b/dev/sci/src/sci_mm.cxx @@ -10,8 +10,8 @@ /// @brief Base Memory Manager functions for SCI.dll
/// @brief Debug error prompt, when a function misbehaves.
-/// @param msg
-/// @return
+/// @param msg
+/// @return
IMPORT_C Void __RtlRaiseSoftError(const char* msg);
/// @brief Copy memory region.
@@ -29,7 +29,7 @@ IMPORT_C VoidPtr MmCopyMemory(_Input VoidPtr dest, _Input VoidPtr src, _Input Si {
((Char*)dest)[i] = ((Char*)src)[i];
}
-
+
return dest;
}
@@ -47,6 +47,6 @@ IMPORT_C VoidPtr MmFillMemory(_Input VoidPtr dest, _Input SizeT len, _Input UInt {
((Char*)dest)[i] = value;
}
-
+
return dest;
}
diff --git a/dev/sci/xpcom_core.hxx b/dev/sci/xpcom_core.hxx index ef82733e..fd289091 100644 --- a/dev/sci/xpcom_core.hxx +++ b/dev/sci/xpcom_core.hxx @@ -20,7 +20,7 @@ Purpose: Base code of XPCOM. protocol IUnknown; // Refrenced from an IDB entry.
protocol ICLSID; // From the IDB, the constructor of the object, e.g: TextUCLSID.
object UUID;
-object IStr;
+object IStr;
/// @brief Unknown XPCOM interface
protocol clsid("d7c144b6-0792-44b8-b06b-02b227b547df") IUnknown
diff --git a/dev/zba/src/HEL/AMD64/BootATA.cxx b/dev/zba/src/HEL/AMD64/BootATA.cxx index 0595f49c..171fe371 100644 --- a/dev/zba/src/HEL/AMD64/BootATA.cxx +++ b/dev/zba/src/HEL/AMD64/BootATA.cxx @@ -124,7 +124,7 @@ Void boot_ata_read(UInt64 Lba, UInt16 IO, UInt8 Master, CharacterTypeUTF8* Buf, Out8(IO + ATA_REG_SEC_COUNT0, ((Size + SectorSz) / SectorSz)); - Out8(IO + ATA_REG_LBA0, (Lba) & 0xFF); + Out8(IO + ATA_REG_LBA0, (Lba)&0xFF); Out8(IO + ATA_REG_LBA1, (Lba) >> 8); Out8(IO + ATA_REG_LBA2, (Lba) >> 16); Out8(IO + ATA_REG_LBA3, (Lba) >> 24); @@ -154,7 +154,7 @@ Void boot_ata_write(UInt64 Lba, UInt16 IO, UInt8 Master, CharacterTypeUTF8* Buf, Out8(IO + ATA_REG_SEC_COUNT0, ((Size + (SectorSz)) / SectorSz)); - Out8(IO + ATA_REG_LBA0, (Lba) & 0xFF); + Out8(IO + ATA_REG_LBA0, (Lba)&0xFF); Out8(IO + ATA_REG_LBA1, (Lba) >> 8); Out8(IO + ATA_REG_LBA2, (Lba) >> 16); Out8(IO + ATA_REG_LBA3, (Lba) >> 24); diff --git a/dev/zka/FSKit/NeFS.hxx b/dev/zka/FSKit/NeFS.hxx index 9e61c1c4..e1341dca 100644 --- a/dev/zka/FSKit/NeFS.hxx +++ b/dev/zka/FSKit/NeFS.hxx @@ -238,15 +238,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); @@ -256,7 +256,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); @@ -266,12 +266,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); diff --git a/dev/zka/FirmwareKit/EFI/EFI.hxx b/dev/zka/FirmwareKit/EFI/EFI.hxx index 76a1d933..be319336 100644 --- a/dev/zka/FirmwareKit/EFI/EFI.hxx +++ b/dev/zka/FirmwareKit/EFI/EFI.hxx @@ -50,7 +50,7 @@ typedef UInt64 EfiStatusType; /// This is like NT's Win32 HANDLE type. typedef struct EfiHandle { -}* EfiHandlePtr; +} * EfiHandlePtr; /* UEFI uses wide characters by default. */ typedef WideChar EfiCharType; @@ -593,7 +593,7 @@ typedef struct EfiSystemTable { EfiGUID VendorGUID; VoidPtr VendorTable; - }* ConfigurationTable; + } * ConfigurationTable; } EfiSystemTable; #define kEfiOk 0 @@ -823,11 +823,11 @@ typedef struct _EfiProcessorInformation typedef EfiStatusType EFI_API (*EFI_MP_SERVICES_GET_NUMBER_OF_PROCESSORS)( IN struct _EfiMpServicesProtocol* Self, - OUT UInt32* NumberOfProcessors, - OUT UInt32* NumberOfEnabledProcessors); + OUT UInt32* NumberOfProcessors, + OUT UInt32* NumberOfEnabledProcessors); typedef EfiStatusType EFI_API (*EFI_MP_SERVICES_GET_PROCESSOR_INFO)( - IN struct _EfiMpServicesProtocol* Self, + IN struct _EfiMpServicesProtocol* Self, IN UInt32* ProcessorNumber, OUT struct _EfiProcessorInformation* NumberOfEnabledProcessors); @@ -842,8 +842,8 @@ typedef EfiStatusType EFI_API (*EFI_MP_SERVICES_STARTUP_ALL_APS)( IN Boolean SingleThread, IN VoidPtr WaitEvent OPTIONAL, // EFI_EVENT first, but unused here. IN UInt32 TimeoutInMicroSeconds, - IN Void* ProcedureArgument OPTIONAL, - OUT UInt32** FailedCpuList OPTIONAL); + IN Void* ProcedureArgument OPTIONAL, + OUT UInt32** FailedCpuList OPTIONAL); typedef EfiStatusType EFI_API (*EFI_MP_SERVICES_SWITCH_BSP)( IN struct _EfiMpServicesProtocol* This, @@ -856,18 +856,18 @@ typedef EfiStatusType EFI_API (*EFI_MP_SERVICES_STARTUP_THIS_AP)( IN UInt32 ProcessorNumber, IN VoidPtr WaitEvent OPTIONAL, IN UInt32 TimeoutInMicroseconds, - IN Void* ProcedureArgument OPTIONAL, - OUT Boolean* Finished OPTIONAL); + IN Void* ProcedureArgument OPTIONAL, + OUT Boolean* Finished OPTIONAL); typedef EfiStatusType EFI_API (*EFI_MP_SERVICES_ENABLEDISABLEAP)( IN struct _EfiMpServicesProtocol* This, IN UInt32 ProcessorNumber, IN Boolean EnableAP, - IN UInt32* HealthFlag OPTIONAL); + IN UInt32* HealthFlag OPTIONAL); typedef EfiStatusType EFI_API (*EFI_MP_SERVICES_WHOAMI)( IN struct _EfiMpServicesProtocol* This, - OUT UInt32* ProcessorNumber); + OUT UInt32* ProcessorNumber); typedef struct _EfiMpServicesProtocol { diff --git a/dev/zka/HALKit/AMD64/CPUID.hxx b/dev/zka/HALKit/AMD64/CPUID.hxx index 966996fd..81d3b86d 100644 --- a/dev/zka/HALKit/AMD64/CPUID.hxx +++ b/dev/zka/HALKit/AMD64/CPUID.hxx @@ -15,67 +15,67 @@ enum { - eCPUFeatureSSE3 = 1 << 0, - eCPUFeaturePCLMUL = 1 << 1, - eCPUFeatureDTES64 = 1 << 2, - eCPUFeatureMONITOR = 1 << 3, - eCPUFeatureDS_CPL = 1 << 4, - eCPUFeatureVMX = 1 << 5, - eCPUFeatureSMX = 1 << 6, - eCPUFeatureEST = 1 << 7, - eCPUFeatureTM2 = 1 << 8, - eCPUFeatureSSSE3 = 1 << 9, - eCPUFeatureCID = 1 << 10, - eCPUFeatureSDBG = 1 << 11, - eCPUFeatureFMA = 1 << 12, - eCPUFeatureCX16 = 1 << 13, - eCPUFeatureXTPR = 1 << 14, - eCPUFeaturePDCM = 1 << 15, - eCPUFeaturePCID = 1 << 17, - eCPUFeatureDCA = 1 << 18, - eCPUFeatureSSE4_1 = 1 << 19, - eCPUFeatureSSE4_2 = 1 << 20, - eCPUFeatureX2APIC = 1 << 21, - eCPUFeatureMOVBE = 1 << 22, - eCPUFeaturePOP3C = 1 << 23, - eCPUFeatureECXTSC = 1 << 24, - eCPUFeatureAES = 1 << 25, - eCPUFeatureXSAVE = 1 << 26, - eCPUFeatureOSXSAVE = 1 << 27, - eCPUFeatureAVX = 1 << 28, - eCPUFeatureF16C = 1 << 29, - eCPUFeatureRDRAND = 1 << 30, + eCPUFeatureSSE3 = 1 << 0, + eCPUFeaturePCLMUL = 1 << 1, + eCPUFeatureDTES64 = 1 << 2, + eCPUFeatureMONITOR = 1 << 3, + eCPUFeatureDS_CPL = 1 << 4, + eCPUFeatureVMX = 1 << 5, + eCPUFeatureSMX = 1 << 6, + eCPUFeatureEST = 1 << 7, + eCPUFeatureTM2 = 1 << 8, + eCPUFeatureSSSE3 = 1 << 9, + eCPUFeatureCID = 1 << 10, + eCPUFeatureSDBG = 1 << 11, + eCPUFeatureFMA = 1 << 12, + eCPUFeatureCX16 = 1 << 13, + eCPUFeatureXTPR = 1 << 14, + eCPUFeaturePDCM = 1 << 15, + eCPUFeaturePCID = 1 << 17, + eCPUFeatureDCA = 1 << 18, + eCPUFeatureSSE4_1 = 1 << 19, + eCPUFeatureSSE4_2 = 1 << 20, + eCPUFeatureX2APIC = 1 << 21, + eCPUFeatureMOVBE = 1 << 22, + eCPUFeaturePOP3C = 1 << 23, + eCPUFeatureECXTSC = 1 << 24, + eCPUFeatureAES = 1 << 25, + eCPUFeatureXSAVE = 1 << 26, + eCPUFeatureOSXSAVE = 1 << 27, + eCPUFeatureAVX = 1 << 28, + eCPUFeatureF16C = 1 << 29, + eCPUFeatureRDRAND = 1 << 30, eCPUFeatureHYPERVISOR = 1 << 31, - eCPUFeatureFPU = 1 << 0, - eCPUFeatureVME = 1 << 1, - eCPUFeatureDE = 1 << 2, - eCPUFeaturePSE = 1 << 3, - eCPUFeatureEDXTSC = 1 << 4, - eCPUFeatureMSR = 1 << 5, - eCPUFeaturePAE = 1 << 6, - eCPUFeatureMCE = 1 << 7, - eCPUFeatureCX8 = 1 << 8, - eCPUFeatureAPIC = 1 << 9, - eCPUFeatureSEP = 1 << 11, - eCPUFeatureMTRR = 1 << 12, - eCPUFeaturePGE = 1 << 13, - eCPUFeatureMCA = 1 << 14, - eCPUFeatureCMOV = 1 << 15, - eCPUFeaturePAT = 1 << 16, - eCPUFeaturePSE36 = 1 << 17, - eCPUFeaturePSN = 1 << 18, - eCPUFeatureCLFLUSH = 1 << 19, - eCPUFeatureDS = 1 << 21, - eCPUFeatureACPI = 1 << 22, - eCPUFeatureMMX = 1 << 23, - eCPUFeatureFXSR = 1 << 24, - eCPUFeatureSSE = 1 << 25, - eCPUFeatureSSE2 = 1 << 26, - eCPUFeatureSS = 1 << 27, - eCPUFeatureHTT = 1 << 28, - eCPUFeatureTM = 1 << 29, - eCPUFeatureIA64 = 1 << 30, - eCPUFeaturePBE = 1 << 31 + eCPUFeatureFPU = 1 << 0, + eCPUFeatureVME = 1 << 1, + eCPUFeatureDE = 1 << 2, + eCPUFeaturePSE = 1 << 3, + eCPUFeatureEDXTSC = 1 << 4, + eCPUFeatureMSR = 1 << 5, + eCPUFeaturePAE = 1 << 6, + eCPUFeatureMCE = 1 << 7, + eCPUFeatureCX8 = 1 << 8, + eCPUFeatureAPIC = 1 << 9, + eCPUFeatureSEP = 1 << 11, + eCPUFeatureMTRR = 1 << 12, + eCPUFeaturePGE = 1 << 13, + eCPUFeatureMCA = 1 << 14, + eCPUFeatureCMOV = 1 << 15, + eCPUFeaturePAT = 1 << 16, + eCPUFeaturePSE36 = 1 << 17, + eCPUFeaturePSN = 1 << 18, + eCPUFeatureCLFLUSH = 1 << 19, + eCPUFeatureDS = 1 << 21, + eCPUFeatureACPI = 1 << 22, + eCPUFeatureMMX = 1 << 23, + eCPUFeatureFXSR = 1 << 24, + eCPUFeatureSSE = 1 << 25, + eCPUFeatureSSE2 = 1 << 26, + eCPUFeatureSS = 1 << 27, + eCPUFeatureHTT = 1 << 28, + eCPUFeatureTM = 1 << 29, + eCPUFeatureIA64 = 1 << 30, + eCPUFeaturePBE = 1 << 31 }; typedef __INT64_TYPE__ hal_cpu_feature_type; diff --git a/dev/zka/HALKit/AMD64/HalAPICController.cxx b/dev/zka/HALKit/AMD64/HalAPICController.cxx index 2c2c8765..0d8846ab 100644 --- a/dev/zka/HALKit/AMD64/HalAPICController.cxx +++ b/dev/zka/HALKit/AMD64/HalAPICController.cxx @@ -19,7 +19,7 @@ namespace Kernel::HAL MUST_PASS(this->fApic); UInt32 volatile* io_apic = (UInt32 volatile*)this->fApic; - io_apic[cIOAPICRegReg] = (reg & 0xFF); + io_apic[cIOAPICRegReg] = (reg & 0xFF); return io_apic[cIOAPICRegVal]; } diff --git a/dev/zka/HALKit/AMD64/Processor.hxx b/dev/zka/HALKit/AMD64/Processor.hxx index 25ea105d..b0a8aa0a 100644 --- a/dev/zka/HALKit/AMD64/Processor.hxx +++ b/dev/zka/HALKit/AMD64/Processor.hxx @@ -21,13 +21,13 @@ EXTERN_C { -# include <cpuid.h> +#include <cpuid.h> } #include <HALKit/AMD64/CPUID.hxx> /// @brief Maximum entries of the interrupt descriptor table. -#define kKernelIdtSize (0x100) +#define kKernelIdtSize (0x100) /// @brief interrupt for system call. #define kKernelInterruptId (0x32) diff --git a/dev/zka/HALKit/AMD64/Storage/AHCI.cxx b/dev/zka/HALKit/AMD64/Storage/AHCI.cxx index aa701112..60ea6d46 100644 --- a/dev/zka/HALKit/AMD64/Storage/AHCI.cxx +++ b/dev/zka/HALKit/AMD64/Storage/AHCI.cxx @@ -26,7 +26,7 @@ enum }; STATIC Kernel::PCI::Device kAhciDevice; -STATIC HbaPort* kAhciPort = nullptr; +STATIC HbaPort* kAhciPort = nullptr; /// @brief Initializes an AHCI disk. /// @param PortsImplemented the amount of port that have been detected. diff --git a/dev/zka/HALKit/AMD64/Storage/ATA-PIO.cxx b/dev/zka/HALKit/AMD64/Storage/ATA-PIO.cxx index f3d0c54b..0a80787f 100644 --- a/dev/zka/HALKit/AMD64/Storage/ATA-PIO.cxx +++ b/dev/zka/HALKit/AMD64/Storage/ATA-PIO.cxx @@ -123,7 +123,7 @@ Void drv_std_read(UInt64 Lba, UInt16 IO, UInt8 Master, Char* Buf, SizeT SectorSz Out8(IO + ATA_REG_SEC_COUNT0, ((Size + SectorSz) / SectorSz)); - Out8(IO + ATA_REG_LBA0, (Lba) & 0xFF); + Out8(IO + ATA_REG_LBA0, (Lba)&0xFF); Out8(IO + ATA_REG_LBA1, (Lba) >> 8); Out8(IO + ATA_REG_LBA2, (Lba) >> 16); Out8(IO + ATA_REG_LBA3, (Lba) >> 24); @@ -155,7 +155,7 @@ Void drv_std_write(UInt64 Lba, UInt16 IO, UInt8 Master, Char* Buf, SizeT SectorS Out8(IO + ATA_REG_SEC_COUNT0, ((Size + (SectorSz)) / SectorSz)); - Out8(IO + ATA_REG_LBA0, (Lba) & 0xFF); + Out8(IO + ATA_REG_LBA0, (Lba)&0xFF); Out8(IO + ATA_REG_LBA1, (Lba) >> 8); Out8(IO + ATA_REG_LBA2, (Lba) >> 16); Out8(IO + ATA_REG_LBA3, (Lba) >> 24); diff --git a/dev/zka/KernelKit/DebugOutput.hxx b/dev/zka/KernelKit/DebugOutput.hxx index 162e2ed4..dcef8d67 100644 --- a/dev/zka/KernelKit/DebugOutput.hxx +++ b/dev/zka/KernelKit/DebugOutput.hxx @@ -192,5 +192,6 @@ namespace Kernel #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/zka/KernelKit/HardwareThreadScheduler.hxx b/dev/zka/KernelKit/HardwareThreadScheduler.hxx index c76b037d..085d929a 100644 --- a/dev/zka/KernelKit/HardwareThreadScheduler.hxx +++ b/dev/zka/KernelKit/HardwareThreadScheduler.hxx @@ -105,7 +105,7 @@ namespace Kernel public: Ref<HardwareThread*> operator[](const SizeT& idx); bool operator!() noexcept; - operator bool() noexcept; + operator bool() noexcept; const Bool IsUser() override { diff --git a/dev/zka/KernelKit/PCI/DMA.hxx b/dev/zka/KernelKit/PCI/DMA.hxx index 6aa06d1e..1de5d4d6 100644 --- a/dev/zka/KernelKit/PCI/DMA.hxx +++ b/dev/zka/KernelKit/PCI/DMA.hxx @@ -52,7 +52,7 @@ namespace Kernel T* Get(const UIntPtr off = 0); public: - operator bool(); + operator bool(); bool operator!(); public: diff --git a/dev/zka/KernelKit/User.hxx b/dev/zka/KernelKit/User.hxx index 9acd6ef7..3fabec25 100644 --- a/dev/zka/KernelKit/User.hxx +++ b/dev/zka/KernelKit/User.hxx @@ -16,7 +16,7 @@ #define kSuperUser "ZKA AUTHORITY\\SUPER" #define kGuestUser "ZKA AUTHORITY\\GUEST" -#define kUsersDir "\\Users\\" +#define kUsersDir "\\Users\\" #define kMaxUserNameLen (255) #define kMaxUserTokenLen (255) diff --git a/dev/zka/KernelKit/UserProcessScheduler.hxx b/dev/zka/KernelKit/UserProcessScheduler.hxx index 157eebe0..07ae55c9 100644 --- a/dev/zka/KernelKit/UserProcessScheduler.hxx +++ b/dev/zka/KernelKit/UserProcessScheduler.hxx @@ -268,7 +268,7 @@ namespace Kernel ZKA_COPY_DEFAULT(UserProcessScheduler) - operator bool(); + operator bool(); bool operator!(); public: @@ -311,8 +311,8 @@ namespace Kernel class UserProcessHelper final { public: - STATIC bool Switch(VoidPtr image_ptr, UInt8* stack_ptr, HAL::StackFramePtr frame_ptr, const PID& new_pid); - STATIC bool CanBeScheduled(const UserProcess& process); + STATIC bool Switch(VoidPtr image_ptr, UInt8* stack_ptr, HAL::StackFramePtr frame_ptr, const PID& new_pid); + STATIC bool CanBeScheduled(const UserProcess& process); STATIC PID& TheCurrentPID(); STATIC SizeT StartScheduling(); }; diff --git a/dev/zka/NewKit/Json.hxx b/dev/zka/NewKit/Json.hxx index 614eb78e..e40b3ec6 100644 --- a/dev/zka/NewKit/Json.hxx +++ b/dev/zka/NewKit/Json.hxx @@ -77,8 +77,8 @@ namespace Kernel { STATIC JSON In(const Char* full_array) { - auto start_val = '{'; - auto end_val = '}'; + auto start_val = '{'; + auto end_val = '}'; Boolean probe_value = false; if (full_array[0] != start_val) @@ -87,12 +87,12 @@ namespace Kernel return JSON::kNull; start_val = '['; - end_val = ']'; + end_val = ']'; probe_value = true; } - SizeT len = rt_string_len(full_array); + SizeT len = rt_string_len(full_array); SizeT key_len = 0; SizeT value_len = 0; @@ -123,7 +123,7 @@ namespace Kernel } else { - if (start_val == '[') + if (start_val == '[') continue; if (full_array[i] == ':') diff --git a/dev/zka/NewKit/Macros.hxx b/dev/zka/NewKit/Macros.hxx index 7d666228..ca33cb16 100644 --- a/dev/zka/NewKit/Macros.hxx +++ b/dev/zka/NewKit/Macros.hxx @@ -11,7 +11,7 @@ #endif #ifndef kib_cast -#define kib_cast(X) (Kernel::UInt64)((X) * 1024) +#define kib_cast(X) (Kernel::UInt64)((X)*1024) #endif #ifndef MIB diff --git a/dev/zka/src/Crc32.cxx b/dev/zka/src/Crc32.cxx index 42dc9b8e..efa4f329 100644 --- a/dev/zka/src/Crc32.cxx +++ b/dev/zka/src/Crc32.cxx @@ -11,51 +11,60 @@ namespace Kernel { - /// @brief The CRC32 table. - UInt kCrcTbl[kCrcCnt] = { - 0x00000000, 0x77073096, 0xee0e612c, 0x990951ba, 0x076dc419, 0x706af48f, - 0xe963a535, 0x9e6495a3, 0x0edb8832, 0x79dcb8a4, 0xe0d5e91e, 0x97d2d988, - 0x09b64c2b, 0x7eb17cbd, 0xe7b82d07, 0x90bf1d91, 0x1db71064, 0x6ab020f2, - 0xf3b97148, 0x84be41de, 0x1adad47d, 0x6ddde4eb, 0xf4d4b551, 0x83d385c7, - 0x136c9856, 0x646ba8c0, 0xfd62f97a, 0x8a65c9ec, 0x14015c4f, 0x63066cd9, - 0xfa0f3d63, 0x8d080df5, 0x3b6e20c8, 0x4c69105e, 0xd56041e4, 0xa2677172, - 0x3c03e4d1, 0x4b04d447, 0xd20d85fd, 0xa50ab56b, 0x35b5a8fa, 0x42b2986c, - 0xdbbbc9d6, 0xacbcf940, 0x32d86ce3, 0x45df5c75, 0xdcd60dcf, 0xabd13d59, - 0x26d930ac, 0x51de003a, 0xc8d75180, 0xbfd06116, 0x21b4f4b5, 0x56b3c423, - 0xcfba9599, 0xb8bda50f, 0x2802b89e, 0x5f058808, 0xc60cd9b2, 0xb10be924, - 0x2f6f7c87, 0x58684c11, 0xc1611dab, 0xb6662d3d, 0x76dc4190, 0x01db7106, - 0x98d220bc, 0xefd5102a, 0x71b18589, 0x06b6b51f, 0x9fbfe4a5, 0xe8b8d433, - 0x7807c9a2, 0x0f00f934, 0x9609a88e, 0xe10e9818, 0x7f6a0dbb, 0x086d3d2d, - 0x91646c97, 0xe6635c01, 0x6b6b51f4, 0x1c6c6162, 0x856530d8, 0xf262004e, - 0x6c0695ed, 0x1b01a57b, 0x8208f4c1, 0xf50fc457, 0x65b0d9c6, 0x12b7e950, - 0x8bbeb8ea, 0xfcb9887c, 0x62dd1ddf, 0x15da2d49, 0x8cd37cf3, 0xfbd44c65, - 0x4db26158, 0x3ab551ce, 0xa3bc0074, 0xd4bb30e2, 0x4adfa541, 0x3dd895d7, - 0xa4d1c46d, 0xd3d6f4fb, 0x4369e96a, 0x346ed9fc, 0xad678846, 0xda60b8d0, - 0x44042d73, 0x33031de5, 0xaa0a4c5f, 0xdd0d7cc9, 0x5005713c, 0x270241aa, - 0xbe0b1010, 0xc90c2086, 0x5768b525, 0x206f85b3, 0xb966d409, 0xce61e49f, - 0x5edef90e, 0x29d9c998, 0xb0d09822, 0xc7d7a8b4, 0x59b33d17, 0x2eb40d81, - 0xb7bd5c3b, 0xc0ba6cad, 0xedb88320, 0x9abfb3b6, 0x03b6e20c, 0x74b1d29a, - 0xead54739, 0x9dd277af, 0x04db2615, 0x73dc1683, 0xe3630b12, 0x94643b84, - 0x0d6d6a3e, 0x7a6a5aa8, 0xe40ecf0b, 0x9309ff9d, 0x0a00ae27, 0x7d079eb1, - 0xf00f9344, 0x8708a3d2, 0x1e01f268, 0x6906c2fe, 0xf762575d, 0x806567cb, - 0x196c3671, 0x6e6b06e7, 0xfed41b76, 0x89d32be0, 0x10da7a5a, 0x67dd4acc, - 0xf9b9df6f, 0x8ebeeff9, 0x17b7be43, 0x60b08ed5, 0xd6d6a3e8, 0xa1d1937e, - 0x38d8c2c4, 0x4fdff252, 0xd1bb67f1, 0xa6bc5767, 0x3fb506dd, 0x48b2364b, - 0xd80d2bda, 0xaf0a1b4c, 0x36034af6, 0x41047a60, 0xdf60efc3, 0xa867df55, - 0x316e8eef, 0x4669be79, 0xcb61b38c, 0xbc66831a, 0x256fd2a0, 0x5268e236, - 0xcc0c7795, 0xbb0b4703, 0x220216b9, 0x5505262f, 0xc5ba3bbe, 0xb2bd0b28, - 0x2bb45a92, 0x5cb36a04, 0xc2d7ffa7, 0xb5d0cf31, 0x2cd99e8b, 0x5bdeae1d, - 0x9b64c2b0, 0xec63f226, 0x756aa39c, 0x026d930a, 0x9c0906a9, 0xeb0e363f, - 0x72076785, 0x05005713, 0x95bf4a82, 0xe2b87a14, 0x7bb12bae, 0x0cb61b38, - 0x92d28e9b, 0xe5d5be0d, 0x7cdcefb7, 0x0bdbdf21, 0x86d3d2d4, 0xf1d4e242, - 0x68ddb3f8, 0x1fda836e, 0x81be16cd, 0xf6b9265b, 0x6fb077e1, 0x18b74777, - 0x88085ae6, 0xff0f6a70, 0x66063bca, 0x11010b5c, 0x8f659eff, 0xf862ae69, - 0x616bffd3, 0x166ccf45, 0xa00ae278, 0xd70dd2ee, 0x4e048354, 0x3903b3c2, - 0xa7672661, 0xd06016f7, 0x4969474d, 0x3e6e77db, 0xaed16a4a, 0xd9d65adc, - 0x40df0b66, 0x37d83bf0, 0xa9bcae53, 0xdebb9ec5, 0x47b2cf7f, 0x30b5ffe9, - 0xbdbdf21c, 0xcabac28a, 0x53b39330, 0x24b4a3a6, 0xbad03605, 0xcdd70693, - 0x54de5729, 0x23d967bf, 0xb3667a2e, 0xc4614ab8, 0x5d681b02, 0x2a6f2b94, - 0xb40bbe37, 0xc30c8ea1, 0x5a05df1b, 0x2d02ef8d}; + /// @brief The CRC32 seed table. + UInt32 kCrcTbl[kCrcCnt] = { + 0x00000000L, 0xF26B8303L, 0xE13B70F7L, 0x1350F3F4L, 0xC79A971FL, + 0x35F1141CL, 0x26A1E7E8L, 0xD4CA64EBL, 0x8AD958CFL, 0x78B2DBCCL, + 0x6BE22838L, 0x9989AB3BL, 0x4D43CFD0L, 0xBF284CD3L, 0xAC78BF27L, + 0x5E133C24L, 0x105EC76FL, 0xE235446CL, 0xF165B798L, 0x030E349BL, + 0xD7C45070L, 0x25AFD373L, 0x36FF2087L, 0xC494A384L, 0x9A879FA0L, + 0x68EC1CA3L, 0x7BBCEF57L, 0x89D76C54L, 0x5D1D08BFL, 0xAF768BBCL, + 0xBC267848L, 0x4E4DFB4BL, 0x20BD8EDEL, 0xD2D60DDDL, 0xC186FE29L, + 0x33ED7D2AL, 0xE72719C1L, 0x154C9AC2L, 0x061C6936L, 0xF477EA35L, + 0xAA64D611L, 0x580F5512L, 0x4B5FA6E6L, 0xB93425E5L, 0x6DFE410EL, + 0x9F95C20DL, 0x8CC531F9L, 0x7EAEB2FAL, 0x30E349B1L, 0xC288CAB2L, + 0xD1D83946L, 0x23B3BA45L, 0xF779DEAEL, 0x05125DADL, 0x1642AE59L, + 0xE4292D5AL, 0xBA3A117EL, 0x4851927DL, 0x5B016189L, 0xA96AE28AL, + 0x7DA08661L, 0x8FCB0562L, 0x9C9BF696L, 0x6EF07595L, 0x417B1DBCL, + 0xB3109EBFL, 0xA0406D4BL, 0x522BEE48L, 0x86E18AA3L, 0x748A09A0L, + 0x67DAFA54L, 0x95B17957L, 0xCBA24573L, 0x39C9C670L, 0x2A993584L, + 0xD8F2B687L, 0x0C38D26CL, 0xFE53516FL, 0xED03A29BL, 0x1F682198L, + 0x5125DAD3L, 0xA34E59D0L, 0xB01EAA24L, 0x42752927L, 0x96BF4DCCL, + 0x64D4CECFL, 0x77843D3BL, 0x85EFBE38L, 0xDBFC821CL, 0x2997011FL, + 0x3AC7F2EBL, 0xC8AC71E8L, 0x1C661503L, 0xEE0D9600L, 0xFD5D65F4L, + 0x0F36E6F7L, 0x61C69362L, 0x93AD1061L, 0x80FDE395L, 0x72966096L, + 0xA65C047DL, 0x5437877EL, 0x4767748AL, 0xB50CF789L, 0xEB1FCBADL, + 0x197448AEL, 0x0A24BB5AL, 0xF84F3859L, 0x2C855CB2L, 0xDEEEDFB1L, + 0xCDBE2C45L, 0x3FD5AF46L, 0x7198540DL, 0x83F3D70EL, 0x90A324FAL, + 0x62C8A7F9L, 0xB602C312L, 0x44694011L, 0x5739B3E5L, 0xA55230E6L, + 0xFB410CC2L, 0x092A8FC1L, 0x1A7A7C35L, 0xE811FF36L, 0x3CDB9BDDL, + 0xCEB018DEL, 0xDDE0EB2AL, 0x2F8B6829L, 0x82F63B78L, 0x709DB87BL, + 0x63CD4B8FL, 0x91A6C88CL, 0x456CAC67L, 0xB7072F64L, 0xA457DC90L, + 0x563C5F93L, 0x082F63B7L, 0xFA44E0B4L, 0xE9141340L, 0x1B7F9043L, + 0xCFB5F4A8L, 0x3DDE77ABL, 0x2E8E845FL, 0xDCE5075CL, 0x92A8FC17L, + 0x60C37F14L, 0x73938CE0L, 0x81F80FE3L, 0x55326B08L, 0xA759E80BL, + 0xB4091BFFL, 0x466298FCL, 0x1871A4D8L, 0xEA1A27DBL, 0xF94AD42FL, + 0x0B21572CL, 0xDFEB33C7L, 0x2D80B0C4L, 0x3ED04330L, 0xCCBBC033L, + 0xA24BB5A6L, 0x502036A5L, 0x4370C551L, 0xB11B4652L, 0x65D122B9L, + 0x97BAA1BAL, 0x84EA524EL, 0x7681D14DL, 0x2892ED69L, 0xDAF96E6AL, + 0xC9A99D9EL, 0x3BC21E9DL, 0xEF087A76L, 0x1D63F975L, 0x0E330A81L, + 0xFC588982L, 0xB21572C9L, 0x407EF1CAL, 0x532E023EL, 0xA145813DL, + 0x758FE5D6L, 0x87E466D5L, 0x94B49521L, 0x66DF1622L, 0x38CC2A06L, + 0xCAA7A905L, 0xD9F75AF1L, 0x2B9CD9F2L, 0xFF56BD19L, 0x0D3D3E1AL, + 0x1E6DCDEEL, 0xEC064EEDL, 0xC38D26C4L, 0x31E6A5C7L, 0x22B65633L, + 0xD0DDD530L, 0x0417B1DBL, 0xF67C32D8L, 0xE52CC12CL, 0x1747422FL, + 0x49547E0BL, 0xBB3FFD08L, 0xA86F0EFCL, 0x5A048DFFL, 0x8ECEE914L, + 0x7CA56A17L, 0x6FF599E3L, 0x9D9E1AE0L, 0xD3D3E1ABL, 0x21B862A8L, + 0x32E8915CL, 0xC083125FL, 0x144976B4L, 0xE622F5B7L, 0xF5720643L, + 0x07198540L, 0x590AB964L, 0xAB613A67L, 0xB831C993L, 0x4A5A4A90L, + 0x9E902E7BL, 0x6CFBAD78L, 0x7FAB5E8CL, 0x8DC0DD8FL, 0xE330A81AL, + 0x115B2B19L, 0x020BD8EDL, 0xF0605BEEL, 0x24AA3F05L, 0xD6C1BC06L, + 0xC5914FF2L, 0x37FACCF1L, 0x69E9F0D5L, 0x9B8273D6L, 0x88D28022L, + 0x7AB90321L, 0xAE7367CAL, 0x5C18E4C9L, 0x4F48173DL, 0xBD23943EL, + 0xF36E6F75L, 0x0105EC76L, 0x12551F82L, 0xE03E9C81L, 0x34F4F86AL, + 0xC69F7B69L, 0xD5CF889DL, 0x27A40B9EL, 0x79B737BAL, 0x8BDCB4B9L, + 0x988C474DL, 0x6AE7C44EL, 0xBE2DA0A5L, 0x4C4623A6L, 0x5F16D052L, + 0xAD7D5351L}; /// @brief Calculate CRC32 of p /// @param p the data to compute. diff --git a/dev/zka/src/FS/NeFS.cxx b/dev/zka/src/FS/NeFS.cxx index 1e92ca02..46c5d8b4 100644 --- a/dev/zka/src/FS/NeFS.cxx +++ b/dev/zka/src/FS/NeFS.cxx @@ -60,7 +60,7 @@ STATIC MountpointInterface sMountpointInterface; /// @return the fork /***********************************************************************************/ _Output NFS_FORK_STRUCT* NeFSParser::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) @@ -172,8 +172,8 @@ _Output NFS_FORK_STRUCT* NeFSParser::CreateFork(_Input NFS_CATALOG_STRUCT* catal /// @return the fork. /***********************************************************************************/ _Output NFS_FORK_STRUCT* NeFSParser::FindFork(_Input NFS_CATALOG_STRUCT* catalog, - _Input const Char* name, - Boolean isDataFork) + _Input const Char* name, + Boolean isDataFork) { auto drv = sMountpointInterface.A(); NFS_FORK_STRUCT* the_fork = nullptr; @@ -238,7 +238,7 @@ _Output NFS_CATALOG_STRUCT* NeFSParser::CreateCatalog(_Input const Char* name) /// @param kind the catalog kind. /// @return catalog pointer. /***********************************************************************************/ -_Output NFS_CATALOG_STRUCT* NeFSParser::CreateCatalog(_Input const Char* name, +_Output NFS_CATALOG_STRUCT* NeFSParser::CreateCatalog(_Input const Char* name, _Input const Int32& flags, _Input const Int32& kind) { @@ -938,7 +938,7 @@ Boolean NeFSParser::RemoveCatalog(_Input const Char* catalogName) VoidPtr NeFSParser::ReadCatalog(_Input _Output NFS_CATALOG_STRUCT* catalog, _Input Bool is_rsrc_fork, _Input SizeT dataSz, - _Input const Char* forkName) + _Input const Char* forkName) { if (!catalog) { diff --git a/dev/zka/src/FileMgr.cxx b/dev/zka/src/FileMgr.cxx index 50736448..66e07ae9 100644 --- a/dev/zka/src/FileMgr.cxx +++ b/dev/zka/src/FileMgr.cxx @@ -12,23 +12,23 @@ namespace Kernel { - STATIC IFilesystemMgr* kMounted = nullptr; + STATIC IFilesystemMgr* kMountedFilesystem = nullptr; /// @brief FilesystemMgr getter. /// @return The mounted filesystem. _Output IFilesystemMgr* IFilesystemMgr::GetMounted() { - return kMounted; + return kMountedFilesystem; } /// @brief Unmount filesystem. /// @return The unmounted filesystem. _Output IFilesystemMgr* IFilesystemMgr::Unmount() { - if (kMounted) + if (kMountedFilesystem) { - auto mount = kMounted; - kMounted = nullptr; + auto mount = kMountedFilesystem; + kMountedFilesystem = nullptr; return mount; } @@ -43,7 +43,7 @@ namespace Kernel { if (mount_ptr != nullptr) { - kMounted = mount_ptr; + kMountedFilesystem = mount_ptr; return true; } diff --git a/dev/zka/src/PEFCodeMgr.cxx b/dev/zka/src/PEFCodeMgr.cxx index bed5b32f..77a2f14a 100644 --- a/dev/zka/src/PEFCodeMgr.cxx +++ b/dev/zka/src/PEFCodeMgr.cxx @@ -89,7 +89,7 @@ namespace Kernel if (fCachedBlob) mm_delete_heap(fCachedBlob); - kcout << "PEFLoader: Warning: Executable format error!\r"; + kcout << "PEFLoader: warn: Executable format error!\r"; fCachedBlob = nullptr; } @@ -117,42 +117,43 @@ namespace Kernel constexpr auto cMangleCharacter = '$'; const Char* cContainerKinds[] = {".code64", ".data64", ".zero64", nullptr}; - ErrorOr<StringView> errOrSym; + ErrorOr<StringView> error_or_symbol; switch (kind) { case kPefCode: { - errOrSym = StringBuilder::Construct(cContainerKinds[0]); // code symbol. + error_or_symbol = StringBuilder::Construct(cContainerKinds[0]); // code symbol. break; } case kPefData: { - errOrSym = StringBuilder::Construct(cContainerKinds[1]); // data symbol. + error_or_symbol = StringBuilder::Construct(cContainerKinds[1]); // data symbol. break; } case kPefZero: { - errOrSym = StringBuilder::Construct(cContainerKinds[2]); // block starting symbol. + error_or_symbol = StringBuilder::Construct(cContainerKinds[2]); // block starting symbol. break; } default: - return nullptr; + return nullptr; // prevent that from the kernel's mode perspective, let that happen if it were + // a user process. } - char* unconstSymbol = const_cast<char*>(name); + Char* unconst_symbol = const_cast<Char*>(name); - for (SizeT i = 0UL; i < rt_string_len(unconstSymbol, kPefNameLen); ++i) + for (SizeT i = 0UL; i < rt_string_len(unconst_symbol, kPefNameLen); ++i) { - if (unconstSymbol[i] == ' ') + if (unconst_symbol[i] == ' ') { - unconstSymbol[i] = cMangleCharacter; + unconst_symbol[i] = cMangleCharacter; } } - errOrSym.Leak().Leak() += name; + error_or_symbol.Leak().Leak() += name; for (SizeT index = 0; index < container->Count; ++index) { if (StringBuilder::Equals(container_header->Name, - errOrSym.Leak().Leak().CData())) + error_or_symbol.Leak().Leak().CData())) { if (container_header->Kind == kind) { @@ -165,14 +166,14 @@ namespace Kernel } } - Char* blobRet = new Char[container_header->Size]; + Char* container_blob_value = new Char[container_header->Size]; - rt_copy_memory((VoidPtr)((Char*)blob + sizeof(PEFCommandHeader)), blobRet, container_header->Size); + rt_copy_memory((VoidPtr)((Char*)blob + sizeof(PEFCommandHeader)), container_blob_value, container_header->Size); mm_delete_heap(blob); kcout << "PEFLoader: INFO: Load stub: " << container_header->Name << "!\r"; - return blobRet; + return container_blob_value; } } } diff --git a/dev/zka/src/UserProcessTeam.cxx b/dev/zka/src/UserProcessTeam.cxx index 1ae206e8..6de124f0 100644 --- a/dev/zka/src/UserProcessTeam.cxx +++ b/dev/zka/src/UserProcessTeam.cxx @@ -37,7 +37,7 @@ namespace Kernel /// @brief Get current process getter as Ref. /// @return The current process header. /***********************************************************************************/ - + Ref<UserProcess>& UserProcessTeam::AsRef() { return mCurrentProcess; |
