summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorAmlal EL Mahrouss <amlalelmahrouss@icloud.com>2024-07-04 23:53:20 +0200
committerAmlal EL Mahrouss <amlalelmahrouss@icloud.com>2024-07-04 23:53:56 +0200
commit175296c1e85d2747fb4b1063199e933978320231 (patch)
tree161659f9af65a0c37802630209ec2654cfec1659
parent16c2e132b39836a3e312f3bda7ee0e6de60d6dd9 (diff)
MHR-36: Running run_format.
Signed-off-by: Amlal EL Mahrouss <amlalelmahrouss@icloud.com>
-rw-r--r--Boot/BootKit/BootKit.hxx10
-rw-r--r--Boot/BootKit/HW/SATA.hxx2
-rw-r--r--Boot/Sources/HEL/AMD64/BootFileReader.cxx9
-rw-r--r--Boot/Sources/HEL/AMD64/BootJump.S2
-rw-r--r--Boot/Sources/HEL/AMD64/BootMain.cxx84
-rw-r--r--Boot/Sources/HEL/AMD64/BootPlatform.cxx3
-rw-r--r--Boot/Sources/HEL/AMD64/New+Delete.cxx2
-rw-r--r--Boot/Sources/HEL/AMD64/Support.cxx6
-rw-r--r--Boot/Sources/Root/splash.text (renamed from Boot/Sources/Root/SplashScreen.fmt)0
-rw-r--r--Comm/herror.hxx6
-rw-r--r--Comm/newstd.hxx17
-rw-r--r--DDK/KernelCall.c3
-rw-r--r--DDK/KernelDev.h6
-rw-r--r--DDK/KernelPrint.c6
-rw-r--r--DDK/KernelStd.h2
-rw-r--r--DDK/KernelString.c6
-rw-r--r--Drv/Hello/Hello.c18
-rw-r--r--Kernel/ArchKit/ArchKit.hpp6
-rw-r--r--Kernel/CFKit/GUIDWizard.hpp2
-rw-r--r--Kernel/FSKit/NewFS.hxx20
-rw-r--r--Kernel/FirmwareKit/EFI/API.hxx2
-rw-r--r--Kernel/FirmwareKit/EPM.hxx10
-rw-r--r--Kernel/HALKit/AMD64/HalCoreMultiProcessingAMD64.cpp6
-rw-r--r--Kernel/HALKit/AMD64/HalKernelMain.cxx40
-rw-r--r--Kernel/HALKit/AMD64/HalKernelMouse.cxx10
-rw-r--r--Kernel/HALKit/AMD64/HalPageAlloc.hpp14
-rw-r--r--Kernel/HALKit/AMD64/PCI/Device.cxx12
-rw-r--r--Kernel/HALKit/POWER/Hart.hxx6
-rw-r--r--Kernel/KernelKit/HError.hpp9
-rw-r--r--Kernel/KernelKit/MSDOS.hxx (renamed from Kernel/KernelKit/MSDOS.hpp)40
-rw-r--r--Kernel/KernelKit/PCI/Dma.inl2
-rw-r--r--Kernel/KernelKit/PCI/IO-Impl-AMD64.inl2
-rw-r--r--Kernel/KernelKit/PE.hxx68
-rw-r--r--Kernel/KernelKit/ProcessScheduler.hxx22
-rw-r--r--Kernel/KernelKit/ThreadLocalStorage.hxx8
-rw-r--r--Kernel/KernelKit/XCOFF.hxx12
-rw-r--r--Kernel/Modules/AHCI/AHCI.hxx162
-rw-r--r--Kernel/Modules/CoreCG/CoreCG.hxx79
-rw-r--r--Kernel/Modules/LTE/IO.hxx2
-rw-r--r--Kernel/Modules/MBCI/MBCI.hxx2
-rw-r--r--Kernel/NetworkKit/IPCEP.hxx6
-rw-r--r--Kernel/NetworkKit/NetworkDevice.inl2
-rw-r--r--Kernel/NewKit/Defines.hpp2
-rw-r--r--Kernel/Sources/FS/NewFS.cxx4
-rw-r--r--Kernel/Sources/FileManager.cxx12
-rw-r--r--Kernel/Sources/Framebuffer.cxx8
-rw-r--r--Kernel/Sources/KeMain.cxx16
-rw-r--r--Kernel/Sources/KernelHeap.cxx8
-rw-r--r--Kernel/Sources/Network/IPCEP.cxx11
-rw-r--r--Kernel/Sources/ProcessScheduler.cxx5
-rw-r--r--newoskrnl.files2
-rw-r--r--newoskrnl.includes3
52 files changed, 390 insertions, 407 deletions
diff --git a/Boot/BootKit/BootKit.hxx b/Boot/BootKit/BootKit.hxx
index 309755df..c83b3c63 100644
--- a/Boot/BootKit/BootKit.hxx
+++ b/Boot/BootKit/BootKit.hxx
@@ -39,19 +39,19 @@ class BFileReader;
class BFileRunner;
class BVersionString;
-using namespace Kernel;
-
typedef Char* PEFImagePtr;
typedef Char* PEImagePtr;
typedef WideChar CharacterTypeUTF16;
typedef Char CharacterTypeUTF8;
+using namespace Kernel;
+
namespace EFI
{
- extern void ThrowError(const CharacterTypeUTF16* ErrorCode,
- const CharacterTypeUTF16* Reason) noexcept;
-}
+ extern void ThrowError(const CharacterTypeUTF16* errorCode,
+ const CharacterTypeUTF16* reason) noexcept;
+} // namespace EFI
/**
* @brief BootKit Text Writer class
diff --git a/Boot/BootKit/HW/SATA.hxx b/Boot/BootKit/HW/SATA.hxx
index bf6c7e82..6d523fcd 100644
--- a/Boot/BootKit/HW/SATA.hxx
+++ b/Boot/BootKit/HW/SATA.hxx
@@ -19,7 +19,7 @@ public:
struct SATATrait final
{
- Kernel::SizeT mBase{1024};
+ Kernel::SizeT mBase{1024};
Kernel::Boolean mErr{false};
Kernel::Boolean mDetected{false};
diff --git a/Boot/Sources/HEL/AMD64/BootFileReader.cxx b/Boot/Sources/HEL/AMD64/BootFileReader.cxx
index b5498cf9..46d4f2ab 100644
--- a/Boot/Sources/HEL/AMD64/BootFileReader.cxx
+++ b/Boot/Sources/HEL/AMD64/BootFileReader.cxx
@@ -13,7 +13,7 @@
#include <BootKit/BootKit.hxx>
#include <FirmwareKit/Handover.hxx>
#include <FirmwareKit/EFI/API.hxx>
-#include <cstddef>
+#include <climits>
/// @file BootFileReader
/// @brief Bootloader File reader.
@@ -111,8 +111,9 @@ BFileReader::~BFileReader()
}
/**
- @brief this reads all of the buffer.
- @param until read until size is reached.
+ @brief Reads all of the file into a buffer.
+ @param **until** size of file
+ @param **chunk** chunk to read each time.
*/
Void BFileReader::ReadAll(SizeT until, SizeT chunk)
{
@@ -121,7 +122,7 @@ Void BFileReader::ReadAll(SizeT until, SizeT chunk)
if (auto err = BS->AllocatePool(EfiLoaderCode, until, (VoidPtr*)&mBlob) !=
kEfiOk)
{
- mWriter.Write(L"*** EFI-Code: ").Write(err).Write(L" ***\r");
+ mWriter.Write(L"*** error: ").Write(err).Write(L" ***\r");
EFI::ThrowError(L"OutOfMemory", L"Out of memory.");
}
}
diff --git a/Boot/Sources/HEL/AMD64/BootJump.S b/Boot/Sources/HEL/AMD64/BootJump.S
index c2f03921..e807ab52 100644
--- a/Boot/Sources/HEL/AMD64/BootJump.S
+++ b/Boot/Sources/HEL/AMD64/BootJump.S
@@ -12,7 +12,7 @@ rt_jump_to_address:
mov rdi, rcx
mov rdx, rbp
push rax
- mov r8, rcx
+ mov r8, rcx
call rdi
pop rax
ret
diff --git a/Boot/Sources/HEL/AMD64/BootMain.cxx b/Boot/Sources/HEL/AMD64/BootMain.cxx
index c786c16d..e98be361 100644
--- a/Boot/Sources/HEL/AMD64/BootMain.cxx
+++ b/Boot/Sources/HEL/AMD64/BootMain.cxx
@@ -10,7 +10,7 @@
#include <FirmwareKit/EFI.hxx>
#include <FirmwareKit/EFI/API.hxx>
#include <FirmwareKit/Handover.hxx>
-#include <KernelKit/MSDOS.hpp>
+#include <KernelKit/MSDOS.hxx>
#include <KernelKit/PE.hxx>
#include <KernelKit/PEF.hpp>
#include <NewKit/Macros.hpp>
@@ -166,36 +166,24 @@ EFI_EXTERN_C EFI_API Int Main(EfiHandlePtr ImageHandle,
Descriptor = new EfiMemoryDescriptor[*SzDesc];
BS->GetMemoryMap(SizePtr, Descriptor, MapKey, SzDesc, RevDesc);
- writer.Write(L"Kernel-Desc-Count: ");
- writer.Write(*SzDesc);
- writer.Write(L"\r");
+ auto cDefaultMemoryMap = 0; // The sixth entry.
- auto cDefaultMemoryMap = 0; /// The sixth entry.
+ //-----------------------------------------------------------//
+ // A simple loop which finds a usable memory region for us.
+ //-----------------------------------------------------------//
- /// A simple loop which finds a usable memory region for us.
- SizeT i = 0UL;
- for (; Descriptor[i].Kind != EfiMemoryType::EfiConventionalMemory; ++i)
+ SizeT lookIndex = 0UL;
+
+ for (; Descriptor[lookIndex].Kind != EfiMemoryType::EfiConventionalMemory; ++lookIndex)
{
;
}
- cDefaultMemoryMap = i;
-
- writer.Write(L"Number-Of-Pages: ")
- .Write(Descriptor[cDefaultMemoryMap].NumberOfPages)
- .Write(L"\r");
- writer.Write(L"Virtual-Address: ")
- .Write(Descriptor[cDefaultMemoryMap].VirtualStart)
- .Write(L"\r");
- writer.Write(L"Phyiscal-Address: ")
- .Write(Descriptor[cDefaultMemoryMap].PhysicalStart)
- .Write(L"\r");
- writer.Write(L"Page-Kind: ")
- .Write(Descriptor[cDefaultMemoryMap].Kind)
- .Write(L"\r");
- writer.Write(L"Page-Attribute: ")
- .Write(Descriptor[cDefaultMemoryMap].Attribute)
- .Write(L"\r");
+ cDefaultMemoryMap = lookIndex;
+
+ //-----------------------------------------------------------//
+ // Update handover file specific table and phyiscal start field.
+ //-----------------------------------------------------------//
handoverHdrPtr->f_PhysicalStart =
(VoidPtr)Descriptor[cDefaultMemoryMap].PhysicalStart;
@@ -214,41 +202,18 @@ EFI_EXTERN_C EFI_API Int Main(EfiHandlePtr ImageHandle,
handoverHdrPtr->f_FirmwareVendorLen = BStrLen(SystemTable->FirmwareVendor);
- BFileReader reader(L"SplashScreen.fmt", ImageHandle);
- reader.ReadAll(512, 16);
-
- if (reader.Blob())
- {
- Char* buf = (Char*)reader.Blob();
-
- for (SizeT i = 0; i < reader.Size(); ++i)
- {
- if (buf[i] != '\n' && buf[i] != '\r')
- {
- if (buf[i] == '*')
- {
- writer.WriteCharacter('\t');
- }
- else
- {
- writer.WriteCharacter(buf[i]);
- }
- }
- else
- writer.Write(L"\r");
- }
- }
-
- ///
- /// The following checks for an exisiting partition
- /// inside the disk, if it doesn't have one,
- /// format the disk.
- //
+ // ---------------------------------------------------- //
+ // The following checks for an exisiting partition
+ // inside the disk, if it doesn't have one,
+ // format the disk.
+ // ---------------------------------------------------- //
BDiskFormatFactory<BootDeviceATA> diskFormatter;
- /// if not formated yet, then format it with the following folders:
- /// /, /Boot, /Applications.
+ // ---------------------------------------------------- //
+ // if not formated yet, then format it with the following folders:
+ // /, /Boot, /Applications.
+ // ---------------------------------------------------- //
if (!diskFormatter.IsPartitionValid())
{
BDiskFormatFactory<BootDeviceATA>::BFileDescriptor rootDesc{0};
@@ -261,7 +226,10 @@ EFI_EXTERN_C EFI_API Int Main(EfiHandlePtr ImageHandle,
EFI::ExitBootServices(*MapKey, ImageHandle);
- /// Fallback to builtin kernel.
+ // ---------------------------------------------------- //
+ // Fallback to builtin kernel.
+ // ---------------------------------------------------- //
+
hal_init_platform(handoverHdrPtr);
EFI::Stop();
diff --git a/Boot/Sources/HEL/AMD64/BootPlatform.cxx b/Boot/Sources/HEL/AMD64/BootPlatform.cxx
index e700a8de..3db0bb6b 100644
--- a/Boot/Sources/HEL/AMD64/BootPlatform.cxx
+++ b/Boot/Sources/HEL/AMD64/BootPlatform.cxx
@@ -7,7 +7,6 @@
#include <BootKit/Platform.hxx>
#include <BootKit/Protocol.hxx>
#include <BootKit/BootKit.hxx>
-#include "HALKit/AMD64/Processor.hpp"
#ifdef __STANDALONE__
@@ -94,6 +93,8 @@ EXTERN_C UInt32 In32(UInt16 port)
#else
+#include <HALKit/AMD64/Processor.hpp>
+
void rt_hlt()
{
Kernel::HAL::rt_halt();
diff --git a/Boot/Sources/HEL/AMD64/New+Delete.cxx b/Boot/Sources/HEL/AMD64/New+Delete.cxx
index 647cddb1..7a90285b 100644
--- a/Boot/Sources/HEL/AMD64/New+Delete.cxx
+++ b/Boot/Sources/HEL/AMD64/New+Delete.cxx
@@ -7,9 +7,9 @@
#include <BootKit/Platform.hxx>
#include <BootKit/Protocol.hxx>
#include <BootKit/BootKit.hxx>
-#include <cstddef> /* Since we're using GCC for this EFI program. */
#ifdef __STANDALONE__
+#include <cstddef> /* Since we're using GCC for this EFI program. */
/// @brief Allocates a new object.
/// @param sz the size.
diff --git a/Boot/Sources/HEL/AMD64/Support.cxx b/Boot/Sources/HEL/AMD64/Support.cxx
index 8ebfb2ff..393c18b4 100644
--- a/Boot/Sources/HEL/AMD64/Support.cxx
+++ b/Boot/Sources/HEL/AMD64/Support.cxx
@@ -4,9 +4,13 @@
------------------------------------------- */
+#include <BootKit/BootKit.hxx>
+#include <FirmwareKit/EFI/API.hxx>
#include <FirmwareKit/EFI/EFI.hxx>
#include <FirmwareKit/Handover.hxx>
#include <BootKit/Vendor/Support.hxx>
+#include <KernelKit/MSDOS.hxx>
+#include <KernelKit/PE.hxx>
#ifdef __STANDALONE__
@@ -54,7 +58,7 @@ EXTERN_C size_t strlen(const char* whatToCheck)
return len;
}
-/// @brief somthing specific to the microsoft ABI, regarding checking the stack.
+/// @brief somthing specific to the Microsoft's ABI, When the stack grows too big.
EXTERN_C void ___chkstk_ms(void)
{
}
diff --git a/Boot/Sources/Root/SplashScreen.fmt b/Boot/Sources/Root/splash.text
index 4a851dc1..4a851dc1 100644
--- a/Boot/Sources/Root/SplashScreen.fmt
+++ b/Boot/Sources/Root/splash.text
diff --git a/Comm/herror.hxx b/Comm/herror.hxx
index 1115e357..725a710c 100644
--- a/Comm/herror.hxx
+++ b/Comm/herror.hxx
@@ -12,9 +12,9 @@
#error !!! including header in kernel mode !!!
#endif // __KERNEL__
-#define ErrLocalIsOk() (kLastError == kErrorSuccess)
-#define ErrLocalFailed() (kLastError != kErrorSuccess)
-#define ErrLocal() (kLastError)
+#define ErrLocalIsOk() (kLastError == kErrorSuccess)
+#define ErrLocalFailed() (kLastError != kErrorSuccess)
+#define ErrLocal() (kLastError)
typedef SInt32 HError;
diff --git a/Comm/newstd.hxx b/Comm/newstd.hxx
index 0eaa2c50..2ec50df6 100644
--- a/Comm/newstd.hxx
+++ b/Comm/newstd.hxx
@@ -22,7 +22,7 @@ Purpose: System Call Interface.
#define cRestrictW "w"
#define cRestrictRW "rw"
-class NSyscall; /// @brief System call class.
+class NSyscall; /// @brief System call class.
typedef int OSType;
typedef bool Bool;
@@ -54,23 +54,23 @@ public:
virtual ~NSyscall() = default;
NSyscall& operator=(const NSyscall&) = default;
- NSyscall(const NSyscall&) = default;
+ NSyscall(const NSyscall&) = default;
public:
/// @brief disable device.
- virtual UInt0 PowerOff(MBCIType) = 0;
+ virtual UInt0 PowerOff(MBCIType) = 0;
/// @brief enable device.
- virtual UInt0 PowerOn(MBCIType) = 0;
+ virtual UInt0 PowerOn(MBCIType) = 0;
/// @brief reboot device.
- virtual UInt0 PowerReboot(MBCIType) = 0;
+ virtual UInt0 PowerReboot(MBCIType) = 0;
/// @brief check if MBCI device is wokeup.
- virtual Bool PowerIsWokeup(MBCIType) = 0;
+ virtual Bool PowerIsWokeup(MBCIType) = 0;
/// @brief probe MBCI device from phone.
- virtual MBCIType PowerProbeDevice(const char* namepace, const int index) = 0;
+ virtual MBCIType PowerProbeDevice(const char* namepace, const int index) = 0;
// THOSE DOESNT REQUIRE PERMISSIONS FROM THE USER. //
@@ -114,7 +114,6 @@ public:
/// @brief Write descriptor.
virtual UInt0* WriteStorage(const UTFChar* cmdNameOrData, SizeT cmdSize, OSType descriptorType) = 0;
-
};
/// @brief Request syscall object.
@@ -123,6 +122,6 @@ ML_IMPORT_C NSyscall* NRequestSyscall(UInt0);
/// @brief Release syscall object.
/// @param syscall System call object.
-ML_IMPORT_C UInt0 NReleaseSyscall(NSyscall* syscall);
+ML_IMPORT_C UInt0 NReleaseSyscall(NSyscall* syscall);
#endif // ifndef _INC_COMM_NEWSTD_HXX_
diff --git a/DDK/KernelCall.c b/DDK/KernelCall.c
index 88343abd..9db0c639 100644
--- a/DDK/KernelCall.c
+++ b/DDK/KernelCall.c
@@ -26,11 +26,10 @@ DK_EXTERN void* kernelCall(const char* kernelRpcName, int32_t cnt, void* data, s
return __kernelDispatchCall(kernelRpcName, cnt, data, sz);
}
-
/// @brief add system call.
/// @param slot system call slot
/// @param slotFn, syscall slot.
-DK_EXTERN void kernelAddSyscall(const int slot, void(*slotFn)(void* a0))
+DK_EXTERN void kernelAddSyscall(const int slot, void (*slotFn)(void* a0))
{
kernelCall("AddSyscall", slot, slotFn, 0);
} \ No newline at end of file
diff --git a/DDK/KernelDev.h b/DDK/KernelDev.h
index e4dfad2f..bd24e2b0 100644
--- a/DDK/KernelDev.h
+++ b/DDK/KernelDev.h
@@ -15,10 +15,10 @@ struct _kernelDevice;
/// @brief Kernel Device driver.
typedef struct _kernelDevice
{
- char name[255]; // the device name. Could be /./DEVICE_NAME/
- void* (*read)(void* arg, int len); // read from device.
+ char name[255]; // the device name. Could be /./DEVICE_NAME/
+ void* (*read)(void* arg, int len); // read from device.
void (*write)(void* arg, int len);
- void (*wait)(void); // write to device.
+ void (*wait)(void); // write to device.
struct _kernelDevice* (*open)(const char* path); // open device.
void (*close)(struct _kernelDevice* dev); // close device.
} kernelDevice, *kernelDeviceRef;
diff --git a/DDK/KernelPrint.c b/DDK/KernelPrint.c
index 2d39a09d..c805aabd 100644
--- a/DDK/KernelPrint.c
+++ b/DDK/KernelPrint.c
@@ -10,9 +10,9 @@
DK_EXTERN void kernelPrintChar(const char ch)
{
- char assembled[2] = { 0 };
- assembled[0] = ch;
- assembled[1] = 0;
+ char assembled[2] = {0};
+ assembled[0] = ch;
+ assembled[1] = 0;
kernelCall("WriteCharacter", 1, assembled, 1);
}
diff --git a/DDK/KernelStd.h b/DDK/KernelStd.h
index e4279af4..e483d10b 100644
--- a/DDK/KernelStd.h
+++ b/DDK/KernelStd.h
@@ -30,7 +30,7 @@ DK_EXTERN void* kernelCall(const char* kernelRpcName, int32_t cnt, void* dat, si
/// @brief add system call.
/// @param slot system call slot
/// @param slotFn, syscall slot.
-DK_EXTERN void kernelAddSyscall(const int slot, void(*slotFn)(void* a0));
+DK_EXTERN void kernelAddSyscall(const int slot, void (*slotFn)(void* a0));
/// @brief allocate ptr.
/// @param sz size of ptr.
diff --git a/DDK/KernelString.c b/DDK/KernelString.c
index 64116399..93c4cdf6 100644
--- a/DDK/KernelString.c
+++ b/DDK/KernelString.c
@@ -10,8 +10,10 @@
DK_EXTERN size_t kernelStringLength(const char* in)
{
- if (in == nil) return 0;
- if (*in == 0) return 0;
+ if (in == nil)
+ return 0;
+ if (*in == 0)
+ return 0;
size_t index = 0;
diff --git a/Drv/Hello/Hello.c b/Drv/Hello/Hello.c
index ff62755c..ba3d9733 100644
--- a/Drv/Hello/Hello.c
+++ b/Drv/Hello/Hello.c
@@ -13,11 +13,10 @@ struct HelloMasterConfigHeaderInput;
struct HelloMasterConfigHeaderInput
{
- size_t fSizeOfOutput;
+ size_t fSizeOfOutput;
struct HelloMasterConfigHeader* fOutput;
};
-
/// @file Hello.c
/// @brief Zero configuration protocol, a much more better protocol for zero configuration.
@@ -28,15 +27,15 @@ typedef struct HelloMasterConfigHeader
int64_t fMagic;
int64_t fVersion;
int64_t fSourceAddress;
- size_t fDataLength;
+ size_t fDataLength;
wchar_t fUTF16Data[cHMCHMaxDataLength];
} __attribute__((packed)) HelloMasterConfigHeader;
#define cHMCHDeviceLen 255
-static kernelDeviceRef cDev = nil;
-static char* cDeviceUUID = nil; // 3ed40738-c7d6-4b59-afdf-3c104b05fbf
-static HelloMasterConfigHeader* cHeader = nil;
+static kernelDeviceRef cDev = nil;
+static char* cDeviceUUID = nil; // 3ed40738-c7d6-4b59-afdf-3c104b05fbf
+static HelloMasterConfigHeader* cHeader = nil;
/// @brief Link to master device to attribute DHCP lease.
static void __hello_link_device(void* a0)
@@ -66,13 +65,14 @@ static void __hello_link_device(void* a0)
static void __hello_get_hmch(void* a0)
{
- if (a0 == nil) return;
+ if (a0 == nil)
+ return;
kernelPrintStr("Hello: returning header...\r");
struct HelloMasterConfigHeaderInput* in = a0;
- in->fOutput = cHeader;
- in->fSizeOfOutput = sizeof(in->fOutput);
+ in->fOutput = cHeader;
+ in->fSizeOfOutput = sizeof(in->fOutput);
}
static void __hello_unlink_device(void* a0)
diff --git a/Kernel/ArchKit/ArchKit.hpp b/Kernel/ArchKit/ArchKit.hpp
index 622d7219..144c4e35 100644
--- a/Kernel/ArchKit/ArchKit.hpp
+++ b/Kernel/ArchKit/ArchKit.hpp
@@ -86,16 +86,16 @@ typedef Kernel::Void (*rt_syscall_proc)(Kernel::VoidPtr);
struct RTSyscallInfoHdr final
{
Kernel::Int64 fHash;
- Kernel::Bool fHooked;
+ Kernel::Bool fHooked;
rt_syscall_proc fProc;
};
inline Kernel::Array<RTSyscallInfoHdr,
- kKernelMaxSystemCalls>
+ kKernelMaxSystemCalls>
kSyscalls;
inline Kernel::Array<RTSyscallInfoHdr,
- kKernelMaxSystemCalls>
+ kKernelMaxSystemCalls>
kKerncalls;
EXTERN_C Kernel::HAL::StackFramePtr rt_get_current_context();
diff --git a/Kernel/CFKit/GUIDWizard.hpp b/Kernel/CFKit/GUIDWizard.hpp
index 6fd747e9..b5df04bf 100644
--- a/Kernel/CFKit/GUIDWizard.hpp
+++ b/Kernel/CFKit/GUIDWizard.hpp
@@ -17,6 +17,6 @@
namespace Kernel::XRN::Version1
{
- Ref<GUIDSequence*> make_sequence(const ArrayList<UShort>& seq);
+ Ref<GUIDSequence*> make_sequence(const ArrayList<UShort>& seq);
ErrorOr<Ref<Kernel::StringView>> try_guid_to_string(Ref<GUIDSequence*>& guid);
} // namespace Kernel::XRN::Version1
diff --git a/Kernel/FSKit/NewFS.hxx b/Kernel/FSKit/NewFS.hxx
index bcef3797..60622c03 100644
--- a/Kernel/FSKit/NewFS.hxx
+++ b/Kernel/FSKit/NewFS.hxx
@@ -143,7 +143,7 @@ struct PACKED NewCatalog final
/// whereas the data fork is reserved for file data.
struct PACKED NewFork final
{
- NewCharType ForkName[kNewFSForkNameLen];
+ NewCharType ForkName[kNewFSForkNameLen];
Kernel::Char CatalogName[kNewFSNodeNameLen];
Kernel::Int32 Flags;
@@ -153,8 +153,8 @@ struct PACKED NewFork final
Kernel::Int32 ResourceKind;
Kernel::Int32 ResourceFlags;
- Kernel::Lba DataOffset; // 8 Where to look for this data?
- Kernel::SizeT DataSize; /// Data size according using sector count.
+ Kernel::Lba DataOffset; // 8 Where to look for this data?
+ Kernel::SizeT DataSize; /// Data size according using sector count.
Kernel::Lba NextSibling;
Kernel::Lba PreviousSibling;
@@ -169,7 +169,7 @@ struct PACKED NewPartitionBlock final
Kernel::Int32 Flags;
Kernel::Int32 Kind;
- Kernel::Lba StartCatalog;
+ Kernel::Lba StartCatalog;
Kernel::SizeT CatalogCount;
Kernel::SizeT DiskSize;
@@ -225,7 +225,7 @@ namespace Kernel
/// @param theFork the fork itself.
/// @return the fork
_Output NewFork* CreateFork(_Input NewCatalog* catalog,
- _Input NewFork& theFork);
+ _Input NewFork& theFork);
/// @brief Find fork inside New filesystem.
/// @param catalog the catalog.
@@ -243,7 +243,7 @@ namespace Kernel
_Output NewCatalog* GetCatalog(_Input const char* name);
- _Output NewCatalog* CreateCatalog(_Input const char* name,
+ _Output NewCatalog* CreateCatalog(_Input const char* name,
_Input const Int32& flags,
_Input const Int32& kind);
@@ -300,8 +300,8 @@ namespace Kernel
/// @param DrvIndex drive index.
/// @return
Kernel::Int32 fs_newfs_write(Kernel::MountpointInterface* Mnt,
- Kernel::DriveTrait& DrvTrait,
- Kernel::Int32 DrvIndex);
+ Kernel::DriveTrait& DrvTrait,
+ Kernel::Int32 DrvIndex);
/// @brief Read from newfs disk.
/// @param Mnt mounted interface.
@@ -309,5 +309,5 @@ Kernel::Int32 fs_newfs_write(Kernel::MountpointInterface* Mnt,
/// @param DrvIndex drive index.
/// @return
Kernel::Int32 fs_newfs_read(Kernel::MountpointInterface* Mnt,
- Kernel::DriveTrait& DrvTrait,
- Kernel::Int32 DrvIndex);
+ Kernel::DriveTrait& DrvTrait,
+ Kernel::Int32 DrvIndex);
diff --git a/Kernel/FirmwareKit/EFI/API.hxx b/Kernel/FirmwareKit/EFI/API.hxx
index 691c19d7..7ec87227 100644
--- a/Kernel/FirmwareKit/EFI/API.hxx
+++ b/Kernel/FirmwareKit/EFI/API.hxx
@@ -9,7 +9,7 @@
#include <FirmwareKit/EFI/EFI.hxx>
#include <FirmwareKit/Handover.hxx>
-#include <KernelKit/MSDOS.hpp>
+#include <KernelKit/MSDOS.hxx>
#include <KernelKit/PE.hxx>
#ifdef __NEWBOOT__
diff --git a/Kernel/FirmwareKit/EPM.hxx b/Kernel/FirmwareKit/EPM.hxx
index 9669e324..5458fcde 100644
--- a/Kernel/FirmwareKit/EPM.hxx
+++ b/Kernel/FirmwareKit/EPM.hxx
@@ -34,17 +34,17 @@ typedef struct BlockGUID
*/
struct PACKED BootBlock
{
- Kernel::Char Magic[kEPMMagicLength];
- Kernel::Char Name[kEPMNameLength];
- BlockGUID Uuid;
+ Kernel::Char Magic[kEPMMagicLength];
+ Kernel::Char Name[kEPMNameLength];
+ BlockGUID Uuid;
Kernel::Int32 Version;
Kernel::Int64 NumBlocks;
Kernel::Int64 SectorSz;
Kernel::Int64 LbaStart;
Kernel::Int16 Kind;
Kernel::Int32 FsVersion;
- Kernel::Char Fs[kEPMFilesystemLength]; /* NewFS, ffs2... */
- Kernel::Char Reserved[409]; // to fill a full sector.
+ Kernel::Char Fs[kEPMFilesystemLength]; /* NewFS, ffs2... */
+ Kernel::Char Reserved[409]; // to fill a full sector.
};
/* @brief AMD64 magic for EPM */
diff --git a/Kernel/HALKit/AMD64/HalCoreMultiProcessingAMD64.cpp b/Kernel/HALKit/AMD64/HalCoreMultiProcessingAMD64.cpp
index 94fe68ad..ce121da4 100644
--- a/Kernel/HALKit/AMD64/HalCoreMultiProcessingAMD64.cpp
+++ b/Kernel/HALKit/AMD64/HalCoreMultiProcessingAMD64.cpp
@@ -159,8 +159,8 @@ namespace Kernel::HAL
Kernel::ke_dma_write(targetAddress, kAPIC_ICR_Low, kAPIC_EIPI_Vector | vector);
}
- STATIC HAL::StackFramePtr cFramePtr = nullptr;
- STATIC Int32 cSMPInterrupt = 0x40;
+ STATIC HAL::StackFramePtr cFramePtr = nullptr;
+ STATIC Int32 cSMPInterrupt = 0x40;
EXTERN_C Void hal_apic_acknowledge_cont(Void)
{
@@ -247,7 +247,7 @@ namespace Kernel::HAL
cProgramInitialized = new Boolean(true);
- constexpr auto cWhatCore = 1;
+ constexpr auto cWhatCore = 1;
hal_send_start_ipi(cWhatCore, cSMPInterrupt, cBaseAddressAPIC);
}
diff --git a/Kernel/HALKit/AMD64/HalKernelMain.cxx b/Kernel/HALKit/AMD64/HalKernelMain.cxx
index 628314b5..dd08b7fb 100644
--- a/Kernel/HALKit/AMD64/HalKernelMain.cxx
+++ b/Kernel/HALKit/AMD64/HalKernelMain.cxx
@@ -19,11 +19,10 @@
#include <Modules/ACPI/ACPIFactoryInterface.hxx>
#include <NetworkKit/IPCEP.hxx>
-#define KERNEL_INIT(X) X; \
+#define KERNEL_INIT(X) \
+ X; \
Kernel::ke_stop(RUNTIME_CHECK_BOOTSTRAP);
-
-
/// @brief This symbol is the kernel main symbol.
EXTERN_C void KeMain();
@@ -32,7 +31,7 @@ EXTERN_C Kernel::VoidPtr kInterruptVectorTable[];
struct PACKED HeapAllocInfo final
{
Kernel::VoidPtr fThe;
- Kernel::Size fTheSz;
+ Kernel::Size fTheSz;
};
struct PACKED ProcessBlockInfo final
@@ -46,7 +45,7 @@ struct PACKED ProcessExitInfo final
STATIC constexpr auto cReasonLen = 512;
Kernel::Int64 fCode;
- Kernel::Char fReason[cReasonLen];
+ Kernel::Char fReason[cReasonLen];
};
namespace Kernel::HAL
@@ -121,9 +120,9 @@ EXTERN_C void hal_init_platform(
constexpr auto cCatalogCreate = 0x22;
constexpr auto cRebootInterrupt = 0x23;
constexpr auto cShutdownInterrupt = 0x24;
- constexpr auto cLPCSendMsg = 0x25;
- constexpr auto cLPCOpenMsg = 0x26;
- constexpr auto cLPCCloseMsg = 0x27;
+ constexpr auto cLPCSendMsg = 0x25;
+ constexpr auto cLPCOpenMsg = 0x26;
+ constexpr auto cLPCCloseMsg = 0x27;
constexpr auto cLPCSanitizeMsg = 0x28;
kSyscalls[cSerialAlertInterrupt].Leak().Leak()->fProc = [](Kernel::VoidPtr rdx) -> void {
@@ -142,8 +141,9 @@ EXTERN_C void hal_init_platform(
kSyscalls[cNewInterrupt].Leak().Leak()->fProc = [](Kernel::VoidPtr rdx) -> void {
// get HAC struct.
HeapAllocInfo* rdxInf = reinterpret_cast<HeapAllocInfo*>(rdx);
-
- if (!rdxInf) return;
+
+ if (!rdxInf)
+ return;
// assign the fThe field with the pointer.
rdxInf->fThe = Kernel::ProcessScheduler::The().Leak().TheCurrent().Leak().New(rdxInf->fTheSz);
@@ -153,7 +153,8 @@ EXTERN_C void hal_init_platform(
// get HAC struct.
HeapAllocInfo* rdxInf = reinterpret_cast<HeapAllocInfo*>(rdx);
- if (!rdxInf) return;
+ if (!rdxInf)
+ return;
// delete ptr with sz in mind.
Kernel::ProcessScheduler::The().Leak().TheCurrent().Leak().Delete(rdxInf->fThe, rdxInf->fTheSz);
@@ -161,8 +162,9 @@ EXTERN_C void hal_init_platform(
kSyscalls[cTlsInstallInterrupt].Leak().Leak()->fProc = [](Kernel::VoidPtr rdx) -> void {
ProcessBlockInfo* rdxPb = reinterpret_cast<ProcessBlockInfo*>(rdx);
-
- if (!rdxPb) return;
+
+ if (!rdxPb)
+ return;
// install the fTIB and fPIB.
rt_install_tib(rdxPb->fTIB, rdxPb->fPIB);
@@ -170,8 +172,9 @@ EXTERN_C void hal_init_platform(
kSyscalls[cExitInterrupt].Leak().Leak()->fProc = [](Kernel::VoidPtr rdx) -> void {
ProcessExitInfo* rdxEi = reinterpret_cast<ProcessExitInfo*>(rdx);
-
- if (!rdxEi) return;
+
+ if (!rdxEi)
+ return;
Kernel::kcout << "newoskrnl: " << rdxEi->fReason << "\r";
Kernel::ProcessScheduler::The().Leak().TheCurrent().Leak().Exit(rdxEi->fCode);
@@ -179,10 +182,11 @@ EXTERN_C void hal_init_platform(
kSyscalls[cLastExitInterrupt].Leak().Leak()->fProc = [](Kernel::VoidPtr rdx) -> void {
ProcessExitInfo* rdxEi = reinterpret_cast<ProcessExitInfo*>(rdx);
-
- if (!rdxEi) return;
- rdxEi->fCode = Kernel::rt_get_exit_code();
+ if (!rdxEi)
+ return;
+
+ rdxEi->fCode = Kernel::rt_get_exit_code();
};
kSyscalls[cRebootInterrupt].Leak().Leak()->fProc = [](Kernel::VoidPtr rdx) -> void {
diff --git a/Kernel/HALKit/AMD64/HalKernelMouse.cxx b/Kernel/HALKit/AMD64/HalKernelMouse.cxx
index 9cad6d35..2aeb8119 100644
--- a/Kernel/HALKit/AMD64/HalKernelMouse.cxx
+++ b/Kernel/HALKit/AMD64/HalKernelMouse.cxx
@@ -14,13 +14,13 @@
EXTERN_C Kernel::Boolean _hal_draw_mouse();
EXTERN_C Kernel::Void _hal_init_mouse();
-STATIC Kernel::Int32 kPrevX = 10;
-STATIC Kernel::Int32 kPrevY = 10;
-STATIC Kernel::Int32 kX = 10;
-STATIC Kernel::Int32 kY = 10;
+STATIC Kernel::Int32 kPrevX = 10;
+STATIC Kernel::Int32 kPrevY = 10;
+STATIC Kernel::Int32 kX = 10;
+STATIC Kernel::Int32 kY = 10;
STATIC Kernel::Int32 kMouseCycle = 0;
STATIC Kernel::PS2MouseInterface kMousePS2;
-STATIC Kernel::Char kMousePacket[4] = {};
+STATIC Kernel::Char kMousePacket[4] = {};
STATIC Kernel::Boolean kMousePacketReady = false;
STATIC GXInit();
diff --git a/Kernel/HALKit/AMD64/HalPageAlloc.hpp b/Kernel/HALKit/AMD64/HalPageAlloc.hpp
index 55193686..8887b623 100644
--- a/Kernel/HALKit/AMD64/HalPageAlloc.hpp
+++ b/Kernel/HALKit/AMD64/HalPageAlloc.hpp
@@ -38,16 +38,16 @@ namespace Kernel::HAL
{
struct PACKED PageTable64 final
{
- bool Present : 1;
- bool Rw : 1;
- bool User : 1;
- bool Wt : 1;
- bool Cache : 1;
- bool Accessed : 1;
+ bool Present : 1;
+ bool Rw : 1;
+ bool User : 1;
+ bool Wt : 1;
+ bool Cache : 1;
+ bool Accessed : 1;
Kernel::Int32 Reserved : 6;
Kernel::UInt64 PhysicalAddress : 36;
Kernel::Int32 Reserved1 : 15;
- bool ExecDisable : 1;
+ bool ExecDisable : 1;
};
namespace Detail
diff --git a/Kernel/HALKit/AMD64/PCI/Device.cxx b/Kernel/HALKit/AMD64/PCI/Device.cxx
index c1fdc401..4fea0cc4 100644
--- a/Kernel/HALKit/AMD64/PCI/Device.cxx
+++ b/Kernel/HALKit/AMD64/PCI/Device.cxx
@@ -10,11 +10,11 @@
Kernel::UInt NewOSPCIReadRaw(Kernel::UInt bar, Kernel::UShort bus, Kernel::UShort dev, Kernel::UShort fun)
{
Kernel::UInt target = 0x80000000 | ((Kernel::UInt)bus << 16) |
- ((Kernel::UInt)dev << 11) | ((Kernel::UInt)fun << 8) |
- (bar & 0xFC);
+ ((Kernel::UInt)dev << 11) | ((Kernel::UInt)fun << 8) |
+ (bar & 0xFC);
Kernel::HAL::Out32((Kernel::UShort)Kernel::PCI::PciConfigKind::ConfigAddress,
- target);
+ target);
return Kernel::HAL::In32((Kernel::UShort)Kernel::PCI::PciConfigKind::ConfigData);
}
@@ -22,11 +22,11 @@ Kernel::UInt NewOSPCIReadRaw(Kernel::UInt bar, Kernel::UShort bus, Kernel::UShor
void NewOSPCISetCfgTarget(Kernel::UInt bar, Kernel::UShort bus, Kernel::UShort dev, Kernel::UShort fun)
{
Kernel::UInt target = 0x80000000 | ((Kernel::UInt)bus << 16) |
- ((Kernel::UInt)dev << 11) | ((Kernel::UInt)fun << 8) |
- (bar & ~3);
+ ((Kernel::UInt)dev << 11) | ((Kernel::UInt)fun << 8) |
+ (bar & ~3);
Kernel::HAL::Out32((Kernel::UShort)Kernel::PCI::PciConfigKind::ConfigAddress,
- target);
+ target);
}
namespace Kernel::PCI
diff --git a/Kernel/HALKit/POWER/Hart.hxx b/Kernel/HALKit/POWER/Hart.hxx
index 8f466098..a4783de2 100644
--- a/Kernel/HALKit/POWER/Hart.hxx
+++ b/Kernel/HALKit/POWER/Hart.hxx
@@ -22,9 +22,9 @@ typedef Kernel::Int32 PPCHartType;
typedef struct HalHardwareThread
{
Kernel::UIntPtr fStartAddress;
- Kernel::UInt8 fPrivleged : 1;
- Kernel::UInt32 fPageFlags;
- PPCHartType fIdentNumber;
+ Kernel::UInt8 fPrivleged : 1;
+ Kernel::UInt32 fPageFlags;
+ PPCHartType fIdentNumber;
} HalHardwareThread;
/// @brief Set PC to specific hart.
diff --git a/Kernel/KernelKit/HError.hpp b/Kernel/KernelKit/HError.hpp
index caee5718..24d5c505 100644
--- a/Kernel/KernelKit/HError.hpp
+++ b/Kernel/KernelKit/HError.hpp
@@ -11,9 +11,9 @@
/// @file HError.hpp
/// @brief Local Process Codes.
-#define ErrLocalIsOk() (Kernel::ProcessScheduler::The().Leak().TheCurrent().Leak().GetLocalCode() == Kernel::kErrorSuccess)
-#define ErrLocalFailed() (Kernel::ProcessScheduler::The().Leak().TheCurrent().Leak().GetLocalCode() != Kernel::kErrorSuccess)
-#define ErrLocal() Kernel::ProcessScheduler::The().Leak().TheCurrent().Leak().GetLocalCode()
+#define ErrLocalIsOk() (Kernel::ProcessScheduler::The().Leak().TheCurrent().Leak().GetLocalCode() == Kernel::kErrorSuccess)
+#define ErrLocalFailed() (Kernel::ProcessScheduler::The().Leak().TheCurrent().Leak().GetLocalCode() != Kernel::kErrorSuccess)
+#define ErrLocal() Kernel::ProcessScheduler::The().Leak().TheCurrent().Leak().GetLocalCode()
namespace Kernel
{
@@ -50,7 +50,6 @@ namespace Kernel
inline constexpr HError kErrorSign = 60;
inline constexpr HError kErrorUnimplemented = 0;
- Void err_bug_check_raise(void) noexcept;
+ Void err_bug_check_raise(void) noexcept;
Boolean err_bug_check(void) noexcept;
} // namespace Kernel
-
diff --git a/Kernel/KernelKit/MSDOS.hpp b/Kernel/KernelKit/MSDOS.hxx
index 12d67488..7b0c2a2f 100644
--- a/Kernel/KernelKit/MSDOS.hpp
+++ b/Kernel/KernelKit/MSDOS.hxx
@@ -24,29 +24,29 @@
#define kMagMz1 'Z'
typedef Kernel::UInt32 DosWord;
-typedef Kernel::Long DosLong;
+typedef Kernel::Long DosLong;
typedef struct _DosHeader
{
Kernel::UInt8 eMagic[2];
- DosWord eMagLen;
- DosWord ePagesCount;
- DosWord eCrlc;
- DosWord eCParHdr;
- DosWord eMinAlloc;
- DosWord eMaxAlloc;
- DosWord eStackSeg;
- DosWord eStackPtr;
- DosWord eChksum;
- DosWord eIp;
- DosWord eCs;
- DosWord eLfarlc;
- DosWord eOvno;
- DosWord eRes[4];
- DosWord eOemid;
- DosWord eOeminfo;
- DosWord eRes2[10];
- DosLong eLfanew;
+ DosWord eMagLen;
+ DosWord ePagesCount;
+ DosWord eCrlc;
+ DosWord eCParHdr;
+ DosWord eMinAlloc;
+ DosWord eMaxAlloc;
+ DosWord eStackSeg;
+ DosWord eStackPtr;
+ DosWord eChksum;
+ DosWord eIp;
+ DosWord eCs;
+ DosWord eLfarlc;
+ DosWord eOvno;
+ DosWord eRes[4];
+ DosWord eOemid;
+ DosWord eOeminfo;
+ DosWord eRes2[10];
+ DosLong eLfanew;
} DosHeader, *DosHeaderPtr;
namespace Kernel
@@ -56,8 +56,10 @@ namespace Kernel
{
if (!ptrDos)
return nullptr;
+
if (ptrDos->eMagic[0] != kMagMz0)
return nullptr;
+
if (ptrDos->eMagic[1] != kMagMz1)
return nullptr;
diff --git a/Kernel/KernelKit/PCI/Dma.inl b/Kernel/KernelKit/PCI/Dma.inl
index 1eca8081..4a0facae 100644
--- a/Kernel/KernelKit/PCI/Dma.inl
+++ b/Kernel/KernelKit/PCI/Dma.inl
@@ -17,4 +17,4 @@ namespace Kernel
{
return reinterpret_cast<T*>((UIntPtr)fAddress + offset);
}
-} // namespace NewOS
+} // namespace Kernel
diff --git a/Kernel/KernelKit/PCI/IO-Impl-AMD64.inl b/Kernel/KernelKit/PCI/IO-Impl-AMD64.inl
index 08d33945..7b1e75dd 100644
--- a/Kernel/KernelKit/PCI/IO-Impl-AMD64.inl
+++ b/Kernel/KernelKit/PCI/IO-Impl-AMD64.inl
@@ -51,4 +51,4 @@ namespace Kernel
break;
}
}
-} // namespace NewOS
+} // namespace Kernel
diff --git a/Kernel/KernelKit/PE.hxx b/Kernel/KernelKit/PE.hxx
index 30b71cc9..c71f5fc2 100644
--- a/Kernel/KernelKit/PE.hxx
+++ b/Kernel/KernelKit/PE.hxx
@@ -28,7 +28,7 @@ typedef struct ExecHeader final
Kernel::UInt32 mNumberOfSymbols;
Kernel::UInt16 mSizeOfOptionalHeader;
Kernel::UInt16 mCharacteristics;
-} ALIGN(8) ExecHeader, *ExecHeaderPtr;
+} PACKED ExecHeader, *ExecHeaderPtr;
#define kMagPE32 0x010b
#define kMagPE64 0x020b
@@ -38,50 +38,50 @@ typedef struct ExecHeader final
typedef struct ExecOptionalHeader final
{
- Kernel::UInt16 mMagic; // 0x010b - PE32, 0x020b - PE32+ (64 bit)
- Kernel::UChar mMajorLinkerVersion;
- Kernel::UChar mMinorLinkerVersion;
+ Kernel::UInt16 mMagic; // 0x010b - PE32, 0x020b - PE32+ (64 bit)
+ Kernel::UChar mMajorLinkerVersion;
+ Kernel::UChar mMinorLinkerVersion;
Kernel::UIntPtr mSizeOfCode;
Kernel::UIntPtr mSizeOfInitializedData;
Kernel::UIntPtr mSizeOfUninitializedData;
- Kernel::UInt32 mAddressOfEntryPoint;
- Kernel::UInt32 mBaseOfCode;
+ Kernel::UInt32 mAddressOfEntryPoint;
+ Kernel::UInt32 mBaseOfCode;
Kernel::UIntPtr mImageBase;
- Kernel::UInt32 mSectionAlignment;
- Kernel::UInt32 mFileAlignment;
- Kernel::UInt16 mMajorOperatingSystemVersion;
- Kernel::UInt16 mMinorOperatingSystemVersion;
- Kernel::UInt16 mMajorImageVersion;
- Kernel::UInt16 mMinorImageVersion;
- Kernel::UInt16 mMajorSubsystemVersion;
- Kernel::UInt16 mMinorSubsystemVersion;
- Kernel::UInt32 mWin32VersionValue;
+ Kernel::UInt32 mSectionAlignment;
+ Kernel::UInt32 mFileAlignment;
+ Kernel::UInt16 mMajorOperatingSystemVersion;
+ Kernel::UInt16 mMinorOperatingSystemVersion;
+ Kernel::UInt16 mMajorImageVersion;
+ Kernel::UInt16 mMinorImageVersion;
+ Kernel::UInt16 mMajorSubsystemVersion;
+ Kernel::UInt16 mMinorSubsystemVersion;
+ Kernel::UInt32 mWin32VersionValue;
Kernel::UIntPtr mSizeOfImage;
Kernel::UIntPtr mSizeOfHeaders;
- Kernel::UInt32 mCheckSum;
- Kernel::UInt16 mSubsystem;
- Kernel::UInt16 mDllCharacteristics;
+ Kernel::UInt32 mCheckSum;
+ Kernel::UInt16 mSubsystem;
+ Kernel::UInt16 mDllCharacteristics;
Kernel::UIntPtr mSizeOfStackReserve;
Kernel::UIntPtr mSizeOfStackCommit;
Kernel::UIntPtr mSizeOfHeapReserve;
Kernel::UIntPtr mSizeOfHeapCommit;
- Kernel::UInt32 mLoaderFlags;
- Kernel::UInt32 mNumberOfRvaAndSizes;
-} ExecOptionalHeader, *ExecOptionalHeaderPtr;
+ Kernel::UInt32 mLoaderFlags;
+ Kernel::UInt32 mNumberOfRvaAndSizes;
+} PACKED ExecOptionalHeader, *ExecOptionalHeaderPtr;
typedef struct ExecSectionHeader final
{
CONST Kernel::UChar mName[8];
- Kernel::UInt32 mVirtualSize;
- Kernel::UInt32 mVirtualAddress;
- Kernel::UInt32 mSizeOfRawData;
- Kernel::UInt32 mPointerToRawData;
- Kernel::UInt32 mPointerToRelocations;
- Kernel::UInt32 mPointerToLinenumbers;
- Kernel::UInt16 mNumberOfRelocations;
- Kernel::UInt16 mNumberOfLinenumbers;
- Kernel::UInt32 mCharacteristics;
-} ExecSectionHeader, *ExecSectionHeaderPtr;
+ Kernel::UInt32 mVirtualSize;
+ Kernel::UInt32 mVirtualAddress;
+ Kernel::UInt32 mSizeOfRawData;
+ Kernel::UInt32 mPointerToRawData;
+ Kernel::UInt32 mPointerToRelocations;
+ Kernel::UInt32 mPointerToLinenumbers;
+ Kernel::UInt16 mNumberOfRelocations;
+ Kernel::UInt16 mNumberOfLinenumbers;
+ Kernel::UInt32 mCharacteristics;
+} PACKED ExecSectionHeader, *ExecSectionHeaderPtr;
enum kExecDataDirParams
{
@@ -104,7 +104,7 @@ typedef struct ExecExportDirectory
Kernel::UInt32 mAddressOfFunctions; // export table rva
Kernel::UInt32 mAddressOfNames;
Kernel::UInt32 mAddressOfNameOrdinal; // ordinal table rva
-} ExecExportDirectory, *ExecExportDirectoryPtr;
+} PACKED ExecExportDirectory, *ExecExportDirectoryPtr;
typedef struct ExecImportDirectory
{
@@ -116,8 +116,8 @@ typedef struct ExecImportDirectory
Kernel::UInt32 mForwarderChain;
Kernel::UInt32 mNameRva;
Kernel::UInt32 mThunkTableRva;
-} ExecImportDirectory, *ExecImportDirectoryPtr;
+} PACKED ExecImportDirectory, *ExecImportDirectoryPtr;
-#define kPeStart "__hcore_subsys_start"
+#define kPeStart "__ImageStart"
#endif /* ifndef __PE__ */
diff --git a/Kernel/KernelKit/ProcessScheduler.hxx b/Kernel/KernelKit/ProcessScheduler.hxx
index 7d8518bb..866841f7 100644
--- a/Kernel/KernelKit/ProcessScheduler.hxx
+++ b/Kernel/KernelKit/ProcessScheduler.hxx
@@ -140,8 +140,8 @@ namespace Kernel
NEWOS_COPY_DEFAULT(ProcessHeader)
public:
- void SetEntrypoint(UIntPtr& imageStart) noexcept;
- const Int32& GetExitCode() noexcept;
+ void SetEntrypoint(UIntPtr& imageStart) noexcept;
+ const Int32& GetExitCode() noexcept;
public:
Char Name[kProcessLen] = {"Process"};
@@ -179,24 +179,24 @@ namespace Kernel
}
//! @brief Crash the app, exits with code ~0.
- Void Crash();
+ Void Crash();
//! @brief Exits app.
- Void Exit(Int32 exitCode = 0);
+ Void Exit(Int32 exitCode = 0);
//! @brief TLS Allocate
- VoidPtr New(const SizeT& sz);
+ VoidPtr New(const SizeT& sz);
//! @brief TLS Free.
- Boolean Delete(VoidPtr ptr, const SizeT& sz);
+ Boolean Delete(VoidPtr ptr, const SizeT& sz);
//! @brief Wakes up threads.
- Void Wake(const bool wakeup = false);
+ Void Wake(const bool wakeup = false);
// ProcessHeader getters.
public:
//! @brief ProcessHeader name getter, example: "C RunTime"
- const Char* GetName() noexcept;
+ const Char* GetName() noexcept;
//! @brief return local error code of process.
//! @return Int32 local error code.
@@ -207,8 +207,8 @@ namespace Kernel
const AffinityKind& GetAffinity() noexcept;
private:
- Int32 fLastExitCode{0};
- Int32 fLocalCode{0};
+ Int32 fLastExitCode{0};
+ Int32 fLocalCode{0};
friend ProcessScheduler;
friend ProcessHelper;
@@ -226,7 +226,7 @@ namespace Kernel
MutableArray<Ref<ProcessHeader>>& AsArray();
Ref<ProcessHeader>& AsRef();
- UInt64& Id() noexcept;
+ UInt64& Id() noexcept;
public:
MutableArray<Ref<ProcessHeader>> mProcessList;
diff --git a/Kernel/KernelKit/ThreadLocalStorage.hxx b/Kernel/KernelKit/ThreadLocalStorage.hxx
index fb3eec9b..50c53fa4 100644
--- a/Kernel/KernelKit/ThreadLocalStorage.hxx
+++ b/Kernel/KernelKit/ThreadLocalStorage.hxx
@@ -21,11 +21,11 @@
/// Located in GS on AMD64, other architectures have their own stuff. (64x0, 32x0, ARM64)
struct PACKED ThreadInformationBlock final
{
- Kernel::Char Cookie[kTLSCookieLen];
- Kernel::UIntPtr StartCode; // Start Address
- Kernel::UIntPtr StartData; // Allocation Heap
+ Kernel::Char Cookie[kTLSCookieLen];
+ Kernel::UIntPtr StartCode; // Start Address
+ Kernel::UIntPtr StartData; // Allocation Heap
Kernel::UIntPtr StartStack; // Stack Pointer.
- Kernel::Int32 ThreadID; // Thread execution ID.
+ Kernel::Int32 ThreadID; // Thread execution ID.
};
typedef struct ThreadInformationBlock ProcessInformationBlock;
diff --git a/Kernel/KernelKit/XCOFF.hxx b/Kernel/KernelKit/XCOFF.hxx
index f5063900..2487a401 100644
--- a/Kernel/KernelKit/XCOFF.hxx
+++ b/Kernel/KernelKit/XCOFF.hxx
@@ -29,13 +29,13 @@ struct XCoffForkHeader;
/// @brief XCoff file header, meant for POWER apps.
typedef struct XCoffFileHeader
{
- Kernel::UInt16 fMagic;
- Kernel::UInt16 fTarget;
- Kernel::UInt16 fNumSecs;
- Kernel::UInt32 fTimeDat;
+ Kernel::UInt16 fMagic;
+ Kernel::UInt16 fTarget;
+ Kernel::UInt16 fNumSecs;
+ Kernel::UInt32 fTimeDat;
Kernel::UIntPtr fSymPtr;
- Kernel::UInt32 fNumSyms;
- Kernel::UInt16 fOptHdr; // ?: Number of bytes in optional header
+ Kernel::UInt32 fNumSyms;
+ Kernel::UInt16 fOptHdr; // ?: Number of bytes in optional header
} XCoffFileHeader32, XCoffFileHeader64;
#define cForkNameLen (255)
diff --git a/Kernel/Modules/AHCI/AHCI.hxx b/Kernel/Modules/AHCI/AHCI.hxx
index c616cae3..7b6cc797 100644
--- a/Kernel/Modules/AHCI/AHCI.hxx
+++ b/Kernel/Modules/AHCI/AHCI.hxx
@@ -50,30 +50,30 @@ typedef struct FisRegH2D final
// DWORD 0
Kernel::UInt8 FisType; // FIS_TYPE_REG_H2D
- Kernel::UInt8 PortMul : 4; // Port multiplier
+ Kernel::UInt8 PortMul : 4; // Port multiplier
Kernel::UInt8 Reserved0 : 3; // Reserved
Kernel::UInt8 CmdOrCtrl : 1; // 1: Command, 0: Control
- Kernel::UInt8 Command; // Command register
+ Kernel::UInt8 Command; // Command register
Kernel::UInt8 Featurel; // Feature register, 7:0
// DWORD 1
- Kernel::UInt8 Lba0; // LBA low register, 7:0
- Kernel::UInt8 Lba1; // LBA mid register, 15:8
- Kernel::UInt8 Lba2; // LBA high register, 23:16
+ Kernel::UInt8 Lba0; // LBA low register, 7:0
+ Kernel::UInt8 Lba1; // LBA mid register, 15:8
+ Kernel::UInt8 Lba2; // LBA high register, 23:16
Kernel::UInt8 Device; // Device register
// DWORD 2
- Kernel::UInt8 Lba3; // LBA register, 31:24
- Kernel::UInt8 Lba4; // LBA register, 39:32
- Kernel::UInt8 Lba5; // LBA register, 47:40
+ Kernel::UInt8 Lba3; // LBA register, 31:24
+ Kernel::UInt8 Lba4; // LBA register, 39:32
+ Kernel::UInt8 Lba5; // LBA register, 47:40
Kernel::UInt8 FeatureHigh; // Feature register, 15:8
// DWORD 3
- Kernel::UInt8 CountLow; // Count register, 7:0
+ Kernel::UInt8 CountLow; // Count register, 7:0
Kernel::UInt8 CountHigh; // Count register, 15:8
- Kernel::UInt8 Icc; // Isochronous command completion
- Kernel::UInt8 Control; // Control register
+ Kernel::UInt8 Icc; // Isochronous command completion
+ Kernel::UInt8 Control; // Control register
// DWORD 4
Kernel::UInt8 Reserved1[4]; // Reserved
@@ -84,18 +84,18 @@ typedef struct FisRegD2H final
// DWORD 0
Kernel::UInt8 FisType; // FIS_TYPE_REG_D2H
- Kernel::UInt8 PortMul : 4; // Port multiplier
- Kernel::UInt8 Reserved0 : 2; // Reserved
+ Kernel::UInt8 PortMul : 4; // Port multiplier
+ Kernel::UInt8 Reserved0 : 2; // Reserved
Kernel::UInt8 InterruptBit : 1; // Interrupt bit
- Kernel::UInt8 Reserved1 : 1; // Reserved
+ Kernel::UInt8 Reserved1 : 1; // Reserved
Kernel::UInt8 Status; // Status register
- Kernel::UInt8 Rrror; // Error register
+ Kernel::UInt8 Rrror; // Error register
// DWORD 1
- Kernel::UInt8 Lba0; // LBA low register, 7:0
- Kernel::UInt8 Lba1; // LBA mid register, 15:8
- Kernel::UInt8 Lba2; // LBA high register, 23:16
+ Kernel::UInt8 Lba0; // LBA low register, 7:0
+ Kernel::UInt8 Lba1; // LBA mid register, 15:8
+ Kernel::UInt8 Lba2; // LBA high register, 23:16
Kernel::UInt8 Device; // Device register
// DWORD 2
@@ -105,9 +105,9 @@ typedef struct FisRegD2H final
Kernel::UInt8 Rsv2; // Reserved
// DWORD 3
- Kernel::UInt8 CountLow; // Count register, 7:0
+ Kernel::UInt8 CountLow; // Count register, 7:0
Kernel::UInt8 CountHigh; // Count register, 15:8
- Kernel::UInt8 Rsv3[2]; // Reserved
+ Kernel::UInt8 Rsv3[2]; // Reserved
// DWORD 4
Kernel::UInt8 Rsv4[4]; // Reserved
@@ -118,7 +118,7 @@ typedef struct FisData final
// DWORD 0
Kernel::UInt8 FisType; // FIS_TYPE_DATA
- Kernel::UInt8 PortMul : 4; // Port multiplier
+ Kernel::UInt8 PortMul : 4; // Port multiplier
Kernel::UInt8 Reserved0 : 4; // Reserved
Kernel::UInt8 Reserved1[2]; // Reserved
@@ -132,19 +132,19 @@ typedef struct FisPioSetup final
// DWORD 0
Kernel::UInt8 FisType; // FIS_TYPE_PIO_SETUP
- Kernel::UInt8 PortMul : 4; // Port multiplier
- Kernel::UInt8 Reserved0 : 1; // Reserved
- Kernel::UInt8 DTD : 1; // Data transfer direction, 1 - device to host
+ Kernel::UInt8 PortMul : 4; // Port multiplier
+ Kernel::UInt8 Reserved0 : 1; // Reserved
+ Kernel::UInt8 DTD : 1; // Data transfer direction, 1 - device to host
Kernel::UInt8 InterruptBit : 1; // Interrupt bit
Kernel::UInt8 Reserved1 : 1;
Kernel::UInt8 Status; // Status register
- Kernel::UInt8 Error; // Error register
+ Kernel::UInt8 Error; // Error register
// DWORD 1
- Kernel::UInt8 Lba0; // LBA low register, 7:0
- Kernel::UInt8 Lba1; // LBA mid register, 15:8
- Kernel::UInt8 Lba2; // LBA high register, 23:16
+ Kernel::UInt8 Lba0; // LBA low register, 7:0
+ Kernel::UInt8 Lba1; // LBA mid register, 15:8
+ Kernel::UInt8 Lba2; // LBA high register, 23:16
Kernel::UInt8 Device; // Device register
// DWORD 2
@@ -154,14 +154,14 @@ typedef struct FisPioSetup final
Kernel::UInt8 Rsv2; // Reserved
// DWORD 3
- Kernel::UInt8 CountLow; // Count register, 7:0
+ Kernel::UInt8 CountLow; // Count register, 7:0
Kernel::UInt8 CountHigh; // Count register, 15:8
- Kernel::UInt8 Rsv3; // Reserved
- Kernel::UInt8 EStatus; // New value of status register
+ Kernel::UInt8 Rsv3; // Reserved
+ Kernel::UInt8 EStatus; // New value of status register
// DWORD 4
Kernel::UInt16 TranferCount; // Transfer count
- Kernel::UInt8 Rsv4[2]; // Reserved
+ Kernel::UInt8 Rsv4[2]; // Reserved
} FisPioSetup;
typedef struct FisDmaSetup final
@@ -169,18 +169,18 @@ typedef struct FisDmaSetup final
// DWORD 0
Kernel::UInt8 FisType; // FIS_TYPE_DMA_SETUP
- Kernel::UInt8 PortMul : 4; // Port multiplier
- Kernel::UInt8 Reserved0 : 1; // Reserved
- Kernel::UInt8 DTD : 1; // Data transfer direction, 1 - device to host
+ Kernel::UInt8 PortMul : 4; // Port multiplier
+ Kernel::UInt8 Reserved0 : 1; // Reserved
+ Kernel::UInt8 DTD : 1; // Data transfer direction, 1 - device to host
Kernel::UInt8 InterruptBit : 1; // Interrupt bit
- Kernel::UInt8 AutoEnable : 1; // Auto-activate. Specifies if DMA Activate FIS is needed
+ Kernel::UInt8 AutoEnable : 1; // Auto-activate. Specifies if DMA Activate FIS is needed
Kernel::UInt8 Reserved1[2]; // Reserved
// DWORD 1&2
Kernel::UInt64 DmaBufferId; // DMA Buffer Identifier. Used to Identify DMA buffer in
- // host memory. SATA Spec says host specific and not in
- // Spec. Trying AHCI spec might work.
+ // host memory. SATA Spec says host specific and not in
+ // Spec. Trying AHCI spec might work.
// DWORD 3
Kernel::UInt32 Rsvd; // More reserved
@@ -223,41 +223,41 @@ typedef struct FisDevBits final
typedef struct HbaPort final
{
- Kernel::UInt32 Clb; // 0x00, command list base address, 1K-byte aligned
- Kernel::UInt32 Clbu; // 0x04, command list base address upper 32 bits
- Kernel::UInt32 Fb; // 0x08, FIS base address, 256-byte aligned
- Kernel::UInt32 Fbu; // 0x0C, FIS base address upper 32 bits
- Kernel::UInt32 Is; // 0x10, interrupt status
- Kernel::UInt32 Ie; // 0x14, interrupt enable
- Kernel::UInt32 Cmd; // 0x18, command and status
- Kernel::UInt32 Reserved0; // 0x1C, Reserved
- Kernel::UInt32 Tfd; // 0x20, task file data
- Kernel::UInt32 Sig; // 0x24, signature
- Kernel::UInt32 Ssts; // 0x28, SATA status (SCR0:SStatus)
- Kernel::UInt32 Sctl; // 0x2C, SATA control (SCR2:SControl)
- Kernel::UInt32 Serr; // 0x30, SATA error (SCR1:SError)
- Kernel::UInt32 Sact; // 0x34, SATA active (SCR3:SActive)
- Kernel::UInt32 Ci; // 0x38, command issue
- Kernel::UInt32 Sntf; // 0x20, SATA notification (SCR4:SNotification)
- Kernel::UInt32 Fbs; // 0x40, FIS-based switch control
+ Kernel::UInt32 Clb; // 0x00, command list base address, 1K-byte aligned
+ Kernel::UInt32 Clbu; // 0x04, command list base address upper 32 bits
+ Kernel::UInt32 Fb; // 0x08, FIS base address, 256-byte aligned
+ Kernel::UInt32 Fbu; // 0x0C, FIS base address upper 32 bits
+ Kernel::UInt32 Is; // 0x10, interrupt status
+ Kernel::UInt32 Ie; // 0x14, interrupt enable
+ Kernel::UInt32 Cmd; // 0x18, command and status
+ Kernel::UInt32 Reserved0; // 0x1C, Reserved
+ Kernel::UInt32 Tfd; // 0x20, task file data
+ Kernel::UInt32 Sig; // 0x24, signature
+ Kernel::UInt32 Ssts; // 0x28, SATA status (SCR0:SStatus)
+ Kernel::UInt32 Sctl; // 0x2C, SATA control (SCR2:SControl)
+ Kernel::UInt32 Serr; // 0x30, SATA error (SCR1:SError)
+ Kernel::UInt32 Sact; // 0x34, SATA active (SCR3:SActive)
+ Kernel::UInt32 Ci; // 0x38, command issue
+ Kernel::UInt32 Sntf; // 0x20, SATA notification (SCR4:SNotification)
+ Kernel::UInt32 Fbs; // 0x40, FIS-based switch control
Kernel::UInt32 Reserved1[11]; // 0x44 ~ 0x6F, Reserved
- Kernel::UInt32 Vendor[4]; // 0x70 ~ 0x7F, vendor specific
+ Kernel::UInt32 Vendor[4]; // 0x70 ~ 0x7F, vendor specific
} HbaPort;
typedef struct HbaMem final
{
// 0x00 - 0x2B, Generic Host Control
- Kernel::UInt32 Cap; // 0x00, Host capability
- Kernel::UInt32 Ghc; // 0x04, Global host control
- Kernel::UInt32 Is; // 0x08, Interrupt status
- Kernel::UInt32 Pi; // 0x0C, Port implemented
- Kernel::UInt32 Vs; // 0x10, Version
+ Kernel::UInt32 Cap; // 0x00, Host capability
+ Kernel::UInt32 Ghc; // 0x04, Global host control
+ Kernel::UInt32 Is; // 0x08, Interrupt status
+ Kernel::UInt32 Pi; // 0x0C, Port implemented
+ Kernel::UInt32 Vs; // 0x10, Version
Kernel::UInt32 Ccc_ctl; // 0x14, Command completion coalescing control
Kernel::UInt32 Ccc_pts; // 0x18, Command completion coalescing ports
- Kernel::UInt32 Em_loc; // 0x1C, Enclosure management location
- Kernel::UInt32 Em_ctl; // 0x20, Enclosure management control
- Kernel::UInt32 Cap2; // 0x24, Host capabilities extended
- Kernel::UInt32 Bohc; // 0x28, BIOS/OS handoff control and status
+ Kernel::UInt32 Em_loc; // 0x1C, Enclosure management location
+ Kernel::UInt32 Em_ctl; // 0x20, Enclosure management control
+ Kernel::UInt32 Cap2; // 0x24, Host capabilities extended
+ Kernel::UInt32 Bohc; // 0x28, BIOS/OS handoff control and status
Kernel::UInt16 Resv0;
Kernel::UInt32 Resv2;
@@ -268,21 +268,21 @@ typedef struct HbaMem final
typedef struct HbaCmdHeader final
{
// DW0
- Kernel::UInt8 Cfl : 5; // Command FIS length in DWORDS, 2 ~ 16
- Kernel::UInt8 Atapi : 1; // ATAPI
- Kernel::UInt8 Write : 1; // Write, 1: H2D, 0: D2H
+ Kernel::UInt8 Cfl : 5; // Command FIS length in DWORDS, 2 ~ 16
+ Kernel::UInt8 Atapi : 1; // ATAPI
+ Kernel::UInt8 Write : 1; // Write, 1: H2D, 0: D2H
Kernel::UInt8 Prefetchable : 1; // Prefetchable
- Kernel::UInt8 Reset : 1; // Reset
- Kernel::UInt8 BIST : 1; // BIST
- Kernel::UInt8 Clear : 1; // Clear busy upon R_OK
+ Kernel::UInt8 Reset : 1; // Reset
+ Kernel::UInt8 BIST : 1; // BIST
+ Kernel::UInt8 Clear : 1; // Clear busy upon R_OK
Kernel::UInt8 Reserved0 : 1; // Reserved
- Kernel::UInt8 Pmp : 4; // Port multiplier port
+ Kernel::UInt8 Pmp : 4; // Port multiplier port
- Kernel::UInt16 Prdtl; // Physical region descriptor table length in entries
+ Kernel::UInt16 Prdtl; // Physical region descriptor table length in entries
volatile Kernel::UInt32 Prdbc; // Physical region descriptor byte count transferred
- Kernel::UInt32 Ctba; // Command table descriptor base address
+ Kernel::UInt32 Ctba; // Command table descriptor base address
Kernel::UInt32 Ctbau; // Command table descriptor base address upper 32 bits
Kernel::UInt32 Reserved1[4]; // Reserved
@@ -291,13 +291,13 @@ typedef struct HbaCmdHeader final
typedef struct HbaFis final
{
// 0x00
- FisDmaSetup Dsfis; // DMA Setup FIS
+ FisDmaSetup Dsfis; // DMA Setup FIS
Kernel::UInt8 Pad0[4];
// 0x20
- FisPioSetup Psfis; // PIO Setup FIS
+ FisPioSetup Psfis; // PIO Setup FIS
Kernel::UInt8 Pad1[12];
// 0x40
- FisRegD2H Rfis; // Register – Device to Host FIS
+ FisRegD2H Rfis; // Register – Device to Host FIS
Kernel::UInt8 Pad2[4];
// 0x58
FisDevBits Sdbfis; // Set Device Bit FIS
@@ -309,12 +309,12 @@ typedef struct HbaFis final
typedef struct HbaPrdtEntry final
{
- Kernel::UInt32 Dba; // Data base address
- Kernel::UInt32 Dbau; // Data base address upper 32 bits
+ Kernel::UInt32 Dba; // Data base address
+ Kernel::UInt32 Dbau; // Data base address upper 32 bits
Kernel::UInt32 Reserved0; // Reserved
// DW3
- Kernel::UInt32 Dbc : 22; // Byte count, 4M max
- Kernel::UInt32 Reserved1 : 9; // Reserved
+ Kernel::UInt32 Dbc : 22; // Byte count, 4M max
+ Kernel::UInt32 Reserved1 : 9; // Reserved
Kernel::UInt32 InterruptBit : 1; // Interrupt on completion
} HbaPrdtEntry;
diff --git a/Kernel/Modules/CoreCG/CoreCG.hxx b/Kernel/Modules/CoreCG/CoreCG.hxx
index 013cb08a..a0f1ede1 100644
--- a/Kernel/Modules/CoreCG/CoreCG.hxx
+++ b/Kernel/Modules/CoreCG/CoreCG.hxx
@@ -17,66 +17,63 @@
#define GXFini() __GXCursor = 0
/// @brief Performs OR drawing on the framebuffer.
-#define GXDrawAlphaImg(ImgPtr, _Height, _Width, BaseX, BaseY) \
- __GXCursor = 0; \
- \
+#define GXDrawAlphaImg(ImgPtr, _Height, _Width, BaseX, BaseY) \
+ __GXCursor = 0; \
+ \
for (Kernel::SizeT i = BaseX; i < (_Height + BaseX); ++i) \
- { \
+ { \
for (Kernel::SizeT u = BaseY; u < (_Width + BaseY); ++u) \
- { \
+ { \
*(((volatile Kernel::UInt32*)(kHandoverHeader->f_GOP.f_The + \
- 4 * kHandoverHeader->f_GOP.f_PixelPerLine * \
- i + \
- 4 * u))) |= ImgPtr[__GXCursor]; \
- \
- ++__GXCursor; \
- } \
+ 4 * kHandoverHeader->f_GOP.f_PixelPerLine * \
+ i + \
+ 4 * u))) |= ImgPtr[__GXCursor]; \
+ \
+ ++__GXCursor; \
+ } \
}
/// @brief Draws a resource.
-#define GXDrawImg(ImgPtr, _Height, _Width, BaseX, BaseY) \
- __GXCursor = 0; \
- \
+#define GXDrawImg(ImgPtr, _Height, _Width, BaseX, BaseY) \
+ __GXCursor = 0; \
+ \
for (Kernel::SizeT i = BaseX; i < (_Height + BaseX); ++i) \
- { \
+ { \
for (Kernel::SizeT u = BaseY; u < (_Width + BaseY); ++u) \
- { \
+ { \
*(((volatile Kernel::UInt32*)(kHandoverHeader->f_GOP.f_The + \
- 4 * kHandoverHeader->f_GOP.f_PixelPerLine * \
- i + \
- 4 * u))) = ImgPtr[__GXCursor]; \
- \
- ++__GXCursor; \
- } \
+ 4 * kHandoverHeader->f_GOP.f_PixelPerLine * \
+ i + \
+ 4 * u))) = ImgPtr[__GXCursor]; \
+ \
+ ++__GXCursor; \
+ } \
}
/// @brief Cleans a resource.
-#define GXClear(_Height, _Width, BaseX, BaseY) \
- \
+#define GXClear(_Height, _Width, BaseX, BaseY) \
+ \
for (Kernel::SizeT i = BaseX; i < _Height + BaseX; ++i) \
- { \
+ { \
for (Kernel::SizeT u = BaseY; u < _Width + BaseY; ++u) \
- { \
+ { \
*(((volatile Kernel::UInt32*)(kHandoverHeader->f_GOP.f_The + \
- 4 * kHandoverHeader->f_GOP.f_PixelPerLine * \
- i + \
- 4 * u))) = gxClearClr; \
- } \
+ 4 * kHandoverHeader->f_GOP.f_PixelPerLine * \
+ i + \
+ 4 * u))) = gxClearClr; \
+ } \
}
/// @brief Draws inside a zone.
-#define GXDraw(_Clr, _Height, _Width, BaseX, BaseY) \
- \
+#define GXDraw(_Clr, _Height, _Width, BaseX, BaseY) \
+ \
for (Kernel::SizeT i = BaseX; i < (_Width + BaseX); ++i) \
- { \
+ { \
for (Kernel::SizeT u = BaseY; u < (_Height + BaseY); ++u) \
- { \
+ { \
*(((volatile Kernel::UInt32*)(kHandoverHeader->f_GOP.f_The + \
- 4 * kHandoverHeader->f_GOP.f_PixelPerLine * \
- i + \
- 4 * u))) = _Clr; \
- } \
+ 4 * kHandoverHeader->f_GOP.f_PixelPerLine * \
+ i + \
+ 4 * u))) = _Clr; \
+ } \
}
-
-
-
diff --git a/Kernel/Modules/LTE/IO.hxx b/Kernel/Modules/LTE/IO.hxx
index 1aaee7bf..8278a21d 100644
--- a/Kernel/Modules/LTE/IO.hxx
+++ b/Kernel/Modules/LTE/IO.hxx
@@ -23,6 +23,6 @@ Kernel::Boolean lte_turn_off_slot(Kernel::Int32 slot);
/// @brief Send AT command.
Kernel::Boolean lte_send_at_command(Kernel::Char* buf,
- Kernel::Size bufSz);
+ Kernel::Size bufSz);
#endif // ifndef _INC_NETWORK_LTE_IO_HXX_
diff --git a/Kernel/Modules/MBCI/MBCI.hxx b/Kernel/Modules/MBCI/MBCI.hxx
index e8b48501..354b9a26 100644
--- a/Kernel/Modules/MBCI/MBCI.hxx
+++ b/Kernel/Modules/MBCI/MBCI.hxx
@@ -21,7 +21,7 @@
*/
#define cMBCIZeroSz (8)
-#define cMBCIMagic "MBCI "
+#define cMBCIMagic "MBCI "
namespace Kernel
{
diff --git a/Kernel/NetworkKit/IPCEP.hxx b/Kernel/NetworkKit/IPCEP.hxx
index 48b5b6fd..947f206a 100644
--- a/Kernel/NetworkKit/IPCEP.hxx
+++ b/Kernel/NetworkKit/IPCEP.hxx
@@ -19,7 +19,7 @@
#define cRemoteSeparator "."
/// Interchange address, consists of PID:TEAM.
-#define cRemoteInvalid "00:00"
+#define cRemoteInvalid "00:00"
#define cRemoteHeaderMagic (0x4950434)
@@ -59,8 +59,8 @@ namespace Kernel
/// @brief IPCEP connection header, message cannot be greater than 6K.
typedef struct IPCEPMessageHeader final
{
- UInt32 IpcHeaderMagic; // cRemoteHeaderMagic
- UInt8 IpcEndianess; // 0 : LE, 1 : BE
+ UInt32 IpcHeaderMagic; // cRemoteHeaderMagic
+ UInt8 IpcEndianess; // 0 : LE, 1 : BE
SizeT IpcPacketSize;
IPCEPAddressType IpcFrom;
IPCEPAddressType IpcTo;
diff --git a/Kernel/NetworkKit/NetworkDevice.inl b/Kernel/NetworkKit/NetworkDevice.inl
index df1b9c81..68d0fbad 100644
--- a/Kernel/NetworkKit/NetworkDevice.inl
+++ b/Kernel/NetworkKit/NetworkDevice.inl
@@ -29,4 +29,4 @@ namespace Kernel
if (fCleanup)
fCleanup();
}
-} // namespace NewOS
+} // namespace Kernel
diff --git a/Kernel/NewKit/Defines.hpp b/Kernel/NewKit/Defines.hpp
index af8978da..f4d143c0 100644
--- a/Kernel/NewKit/Defines.hpp
+++ b/Kernel/NewKit/Defines.hpp
@@ -133,7 +133,7 @@ namespace Kernel
};
} // namespace Kernel
-#define DEDUCE_ENDIAN(address, value) \
+#define DEDUCE_ENDIAN(address, value) \
(((reinterpret_cast<Kernel::Char*>(address)[0]) == (value)) \
? (Kernel::Endian::kEndianBig) \
: (Kernel::Endian::kEndianLittle))
diff --git a/Kernel/Sources/FS/NewFS.cxx b/Kernel/Sources/FS/NewFS.cxx
index 1eef02d8..c07ec6d7 100644
--- a/Kernel/Sources/FS/NewFS.cxx
+++ b/Kernel/Sources/FS/NewFS.cxx
@@ -38,7 +38,7 @@ STATIC MountpointInterface sMountpointInterface;
/// @param theFork the fork itself.
/// @return the fork
_Output NewFork* NewFSParser::CreateFork(_Input NewCatalog* catalog,
- _Input NewFork& theFork)
+ _Input NewFork& theFork)
{
if (!sMountpointInterface.GetAddressOf(this->fDriveIndex))
return nullptr;
@@ -207,7 +207,7 @@ _Output NewCatalog* NewFSParser::CreateCatalog(_Input const char* name)
/// @param flags the flags of the catalog.
/// @param kind the catalog kind.
/// @return catalog pointer.
-_Output NewCatalog* NewFSParser::CreateCatalog(_Input const char* name,
+_Output NewCatalog* NewFSParser::CreateCatalog(_Input const char* name,
_Input const Int32& flags,
_Input const Int32& kind)
{
diff --git a/Kernel/Sources/FileManager.cxx b/Kernel/Sources/FileManager.cxx
index 35913b85..1da46540 100644
--- a/Kernel/Sources/FileManager.cxx
+++ b/Kernel/Sources/FileManager.cxx
@@ -81,8 +81,10 @@ namespace Kernel
/// @return
Void NewFilesystemManager::Write(_Input NodePtr node, _Input VoidPtr data, _Input Int32 flags, _Input SizeT size)
{
- if (!node) return;
- if (!size) return;
+ if (!node)
+ return;
+ if (!size)
+ return;
constexpr auto cDataForkName = kNewFSDataFork;
this->Write(cDataForkName, node, data, flags, size);
@@ -95,8 +97,10 @@ namespace Kernel
/// @return
VoidPtr NewFilesystemManager::Read(_Input NodePtr node, _Input Int32 flags, _Input SizeT size)
{
- if (!node) return nullptr;
- if (!size) return nullptr;
+ if (!node)
+ return nullptr;
+ if (!size)
+ return nullptr;
constexpr auto cDataForkName = kNewFSDataFork;
return this->Read(cDataForkName, node, flags, size);
diff --git a/Kernel/Sources/Framebuffer.cxx b/Kernel/Sources/Framebuffer.cxx
index 205291bb..2e0333d7 100644
--- a/Kernel/Sources/Framebuffer.cxx
+++ b/Kernel/Sources/Framebuffer.cxx
@@ -78,8 +78,8 @@ Framebuffer& Framebuffer::DrawRect(SizeT width, SizeT height, SizeT x, SizeT y,
for (Kernel::SizeT u = y; u < height + y; ++u)
{
*(((volatile Kernel::UInt32*)(fFrameBufferAddr.Leak()->fBase +
- 4 * fFrameBufferAddr.Leak()->fBpp * i +
- 4 * u))) = color;
+ 4 * fFrameBufferAddr.Leak()->fBpp * i +
+ 4 * u))) = color;
}
}
@@ -89,8 +89,8 @@ Framebuffer& Framebuffer::DrawRect(SizeT width, SizeT height, SizeT x, SizeT y,
Framebuffer& Framebuffer::PutPixel(SizeT x, SizeT y, UInt32 color)
{
*(((volatile Kernel::UInt32*)(fFrameBufferAddr.Leak()->fBase +
- 4 * fFrameBufferAddr.Leak()->fBpp * x +
- 4 * y))) = color;
+ 4 * fFrameBufferAddr.Leak()->fBpp * x +
+ 4 * y))) = color;
return *this;
} \ No newline at end of file
diff --git a/Kernel/Sources/KeMain.cxx b/Kernel/Sources/KeMain.cxx
index 7ec96539..a4b087c3 100644
--- a/Kernel/Sources/KeMain.cxx
+++ b/Kernel/Sources/KeMain.cxx
@@ -77,11 +77,11 @@ namespace Kernel::Detail
const Kernel::Char* cSrcName = cFolderInfo;
Kernel::rt_copy_memory((Kernel::VoidPtr)(cSrcName), theFork.ForkName,
- Kernel::rt_string_len(cSrcName));
+ Kernel::rt_string_len(cSrcName));
Kernel::rt_copy_memory((Kernel::VoidPtr)(catalogDir->Name),
- theFork.CatalogName,
- Kernel::rt_string_len(catalogDir->Name));
+ theFork.CatalogName,
+ Kernel::rt_string_len(catalogDir->Name));
delete catalogDir;
@@ -146,11 +146,11 @@ namespace Kernel::Detail
NewFork theDiskFork{0};
Kernel::rt_copy_memory((Kernel::VoidPtr)(cSrcName), theDiskFork.ForkName,
- Kernel::rt_string_len(cSrcName));
+ Kernel::rt_string_len(cSrcName));
Kernel::rt_copy_memory((Kernel::VoidPtr)(catalogDisk->Name),
- theDiskFork.CatalogName,
- Kernel::rt_string_len(catalogDisk->Name));
+ theDiskFork.CatalogName,
+ Kernel::rt_string_len(catalogDisk->Name));
theDiskFork.DataSize = kNewFSForkSize;
theDiskFork.ResourceId = 0;
@@ -195,7 +195,7 @@ namespace Kernel::Detail
}
Kernel::Utils::execute_from_image(launchDevil,
- Kernel::ProcessHeader::kAppKind);
+ Kernel::ProcessHeader::kAppKind);
/// load middleware service.
Kernel::PEFLoader stageBoard("C:\\System\\stageboard");
@@ -206,7 +206,7 @@ namespace Kernel::Detail
}
Kernel::Utils::execute_from_image(stageBoard,
- Kernel::ProcessHeader::kAppKind);
+ Kernel::ProcessHeader::kAppKind);
}
} // namespace Kernel::Detail
diff --git a/Kernel/Sources/KernelHeap.cxx b/Kernel/Sources/KernelHeap.cxx
index 7bfd9c07..295c4e76 100644
--- a/Kernel/Sources/KernelHeap.cxx
+++ b/Kernel/Sources/KernelHeap.cxx
@@ -130,10 +130,10 @@ namespace Kernel
}
heapInfoBlk->fTargetPtrSize = 0UL;
- heapInfoBlk->fPresent = false;
- heapInfoBlk->fTargetPtr = 0;
- heapInfoBlk->fCRC32 = 0;
- heapInfoBlk->fMagic = 0;
+ heapInfoBlk->fPresent = false;
+ heapInfoBlk->fTargetPtr = 0;
+ heapInfoBlk->fCRC32 = 0;
+ heapInfoBlk->fMagic = 0;
PTEWrapper pageWrapper(false, false, false, reinterpret_cast<UIntPtr>(heapInfoBlk));
Ref<PTEWrapper*> pteAddress{&pageWrapper};
diff --git a/Kernel/Sources/Network/IPCEP.cxx b/Kernel/Sources/Network/IPCEP.cxx
index 1869035b..5663076b 100644
--- a/Kernel/Sources/Network/IPCEP.cxx
+++ b/Kernel/Sources/Network/IPCEP.cxx
@@ -14,21 +14,20 @@ using namespace Kernel;
/// @brief The internal sanitize function.
Bool __ipc_sanitize_packet(IPCEPMessageHeader* pckt)
{
- if (!pckt) return false;
+ if (!pckt)
+ return false;
auto endian = DEDUCE_ENDIAN(pckt, ((char*)pckt)[0]);
switch (endian)
{
- case Endian::kEndianBig:
- {
+ case Endian::kEndianBig: {
if (pckt->IpcEndianess == eIPCEPLittleEndian)
goto _Fail;
break;
}
- case Endian::kEndianLittle:
- {
+ case Endian::kEndianLittle: {
if (pckt->IpcEndianess == eIPCEPBigEndian)
goto _Fail;
@@ -71,4 +70,4 @@ namespace Kernel
return true;
}
-}
+} // namespace Kernel
diff --git a/Kernel/Sources/ProcessScheduler.cxx b/Kernel/Sources/ProcessScheduler.cxx
index 316a9362..98851d41 100644
--- a/Kernel/Sources/ProcessScheduler.cxx
+++ b/Kernel/Sources/ProcessScheduler.cxx
@@ -55,7 +55,10 @@ namespace Kernel
this->Exit(kErrorProcessFault);
}
- Int32& ProcessHeader::GetLocalCode() noexcept { return fLocalCode; }
+ Int32& ProcessHeader::GetLocalCode() noexcept
+ {
+ return fLocalCode;
+ }
void ProcessHeader::Wake(const bool should_wakeup)
{
diff --git a/newoskrnl.files b/newoskrnl.files
index 43aea6e1..6e800ffb 100644
--- a/newoskrnl.files
+++ b/newoskrnl.files
@@ -161,7 +161,7 @@ Kernel/KernelKit/HError.hpp
Kernel/KernelKit/KernelHeap.hpp
Kernel/KernelKit/LoaderInterface.hpp
Kernel/KernelKit/LockDelegate.hpp
-Kernel/KernelKit/MSDOS.hpp
+Kernel/KernelKit/MSDOS.hxx
Kernel/KernelKit/PCI/Database.hpp
Kernel/KernelKit/PCI/Device.hpp
Kernel/KernelKit/PCI/Dma.hpp
diff --git a/newoskrnl.includes b/newoskrnl.includes
index 396902fb..ab714c7e 100644
--- a/newoskrnl.includes
+++ b/newoskrnl.includes
@@ -1,2 +1,3 @@
./
-./Kernel
+./Kernel/
+./Boot/