Merge pull request #55 from nekernel-org/dev

v0.0.4

5 files changed, 94 insertions, 64 deletions

diff --git a/dev/kernel/FirmwareKit/EFI/EFI.h b/dev/kernel/FirmwareKit/EFI/EFI.h
index 97e3ad01..9b22f5b6 100644
--- a/dev/kernel/FirmwareKit/EFI/EFI.h
+++ b/dev/kernel/FirmwareKit/EFI/EFI.h
@@ -57,7 +57,7 @@ typedef Char16 EfiChar16Type;
 /// @brief Core Handle Kind
 /// Self is like NT's Win32 HANDLE type.
 typedef struct EfiHandle {
-} * EfiHandlePtr;
+}* EfiHandlePtr;
 
 /* UEFI uses wide characters by default. */
 typedef WideChar EfiCharType;
@@ -239,63 +239,85 @@ typedef struct EfiTableHeader {
   UInt32 Reserved;
 } EfiTableHeader;
 
-#define EFI_ACPI_TABLE_PROTOCOL_GUID                                               \
-  {                                                                                \
-    0xffe06bdd, 0x6107, 0x46a6, { 0x7b, 0xb2, 0x5a, 0x9c, 0x7e, 0xc5, 0x27, 0x5c } \
+#define EFI_ACPI_TABLE_PROTOCOL_GUID                 \
+  {                                                  \
+    0xffe06bdd, 0x6107, 0x46a6, {                    \
+      0x7b, 0xb2, 0x5a, 0x9c, 0x7e, 0xc5, 0x27, 0x5c \
+    }                                                \
   }
 
-#define EFI_LOAD_FILE_PROTOCOL_GUID                                                \
-  {                                                                                \
-    0x56EC3091, 0x954C, 0x11d2, { 0x8e, 0x3f, 0x00, 0xa0, 0xc9, 0x69, 0x72, 0x3b } \
+#define EFI_LOAD_FILE_PROTOCOL_GUID                  \
+  {                                                  \
+    0x56EC3091, 0x954C, 0x11d2, {                    \
+      0x8e, 0x3f, 0x00, 0xa0, 0xc9, 0x69, 0x72, 0x3b \
+    }                                                \
   }
 
-#define EFI_LOAD_FILE2_PROTOCOL_GUID                                               \
-  {                                                                                \
-    0x4006c0c1, 0xfcb3, 0x403e, { 0x99, 0x6d, 0x4a, 0x6c, 0x87, 0x24, 0xe0, 0x6d } \
+#define EFI_LOAD_FILE2_PROTOCOL_GUID                 \
+  {                                                  \
+    0x4006c0c1, 0xfcb3, 0x403e, {                    \
+      0x99, 0x6d, 0x4a, 0x6c, 0x87, 0x24, 0xe0, 0x6d \
+    }                                                \
   }
 
-#define EFI_LOADED_IMAGE_PROTOCOL_GUID                                             \
-  {                                                                                \
-    0x5B1B31A1, 0x9562, 0x11d2, { 0x8E, 0x3F, 0x00, 0xA0, 0xC9, 0x69, 0x72, 0x3B } \
+#define EFI_LOADED_IMAGE_PROTOCOL_GUID               \
+  {                                                  \
+    0x5B1B31A1, 0x9562, 0x11d2, {                    \
+      0x8E, 0x3F, 0x00, 0xA0, 0xC9, 0x69, 0x72, 0x3B \
+    }                                                \
   }
 
-#define EFI_GRAPHICS_OUTPUT_PROTOCOL_GUID                                          \
-  {                                                                                \
-    0x9042a9de, 0x23dc, 0x4a38, { 0x96, 0xfb, 0x7a, 0xde, 0xd0, 0x80, 0x51, 0x6a } \
+#define EFI_GRAPHICS_OUTPUT_PROTOCOL_GUID            \
+  {                                                  \
+    0x9042a9de, 0x23dc, 0x4a38, {                    \
+      0x96, 0xfb, 0x7a, 0xde, 0xd0, 0x80, 0x51, 0x6a \
+    }                                                \
   }
 
-#define EFI_SIMPLE_NETWORK_PROTOCOL_GUID                                           \
-  {                                                                                \
-    0xA19832B9, 0xAC25, 0x11D3, { 0x9A, 0x2D, 0x00, 0x90, 0x27, 0x3f, 0xc1, 0x4d } \
+#define EFI_SIMPLE_NETWORK_PROTOCOL_GUID             \
+  {                                                  \
+    0xA19832B9, 0xAC25, 0x11D3, {                    \
+      0x9A, 0x2D, 0x00, 0x90, 0x27, 0x3f, 0xc1, 0x4d \
+    }                                                \
   }
 
 #define EFI_SIMPLE_NETWORK_PROTOCOL_REVISION 0x00010000
 
-#define EFI_IP4_PROTOCOL_GUID                                                      \
-  {                                                                                \
-    0x41d94cd2, 0x35b6, 0x455a, { 0x82, 0x58, 0xd4, 0xe5, 0x13, 0x34, 0xaa, 0xdd } \
+#define EFI_IP4_PROTOCOL_GUID                        \
+  {                                                  \
+    0x41d94cd2, 0x35b6, 0x455a, {                    \
+      0x82, 0x58, 0xd4, 0xe5, 0x13, 0x34, 0xaa, 0xdd \
+    }                                                \
   }
 
 #define EFI_LOADED_IMAGE_PROTOCOL_REVISION 0x1000
 
-#define EFI_SIMPLE_FILE_SYSTEM_PROTOCOL_GUID                                        \
-  {                                                                                 \
-    0x0964e5b22, 0x6459, 0x11d2, { 0x8e, 0x39, 0x00, 0xa0, 0xc9, 0x69, 0x72, 0x3b } \
+#define EFI_SIMPLE_FILE_SYSTEM_PROTOCOL_GUID         \
+  {                                                  \
+    0x0964e5b22, 0x6459, 0x11d2, {                   \
+      0x8e, 0x39, 0x00, 0xa0, 0xc9, 0x69, 0x72, 0x3b \
+    }                                                \
   }
 
-#define EFI_LOADED_IMAGE_DEVICE_PATH_PROTOCOL_GUID                                 \
-  {                                                                                \
-    0xbc62157e, 0x3e33, 0x4fec, { 0x99, 0x20, 0x2d, 0x3b, 0x36, 0xd7, 0x50, 0xdf } \
+#define EFI_LOADED_IMAGE_DEVICE_PATH_PROTOCOL_GUID   \
+  {                                                  \
+    0xbc62157e, 0x3e33, 0x4fec, {                    \
+      0x99, 0x20, 0x2d, 0x3b, 0x36, 0xd7, 0x50, 0xdf \
+    }                                                \
   }
 
-#define EFI_DEVICE_PATH_PROTOCOL_GUID                                            \
-  {                                                                              \
-    0x9576e91, 0x6d3f, 0x11d2, { 0x8e, 0x39, 0x0, 0xa0, 0xc9, 0x69, 0x72, 0x3b } \
+#define EFI_DEVICE_PATH_PROTOCOL_GUID               \
+  {                                                 \
+    0x9576e91, 0x6d3f, 0x11d2, {                    \
+      0x8e, 0x39, 0x0, 0xa0, 0xc9, 0x69, 0x72, 0x3b \
+    }                                               \
   }
 
-#define EFI_SIMPLE_FILE_SYSTEM_PROTOCOL_GUID                                        \
-  {                                                                                 \
-    0x0964e5b22, 0x6459, 0x11d2, { 0x8e, 0x39, 0x00, 0xa0, 0xc9, 0x69, 0x72, 0x3b } \
+#define EFI_SIMPLE_FILE_SYSTEM_PROTOCOL_GUID         \
+  {                                                  \
+    0x0964e5b22, 0x6459, 0x11d2, {                   \
+      0x8e, 0x39, 0x00, 0xa0, 0xc9, 0x69, 0x72, 0x3b \
+    }                                                \
   }
 
 typedef UInt64(EfiImageUnload)(EfiHandlePtr ImageHandle);
@@ -351,17 +373,17 @@ typedef struct {
 
 typedef EFI_STATUS(EFIAPI* EFI_SIMPLE_NETWORK_TRANSMIT)(IN EFI_SIMPLE_NETWORK_PROTOCOL* This,
                                                         IN UInt32 HeaderSize, IN UInt32 BufferSize,
-                                                        IN Void* Buffer,
-                                                        IN EfiMacAddress* SrcAddr OPTIONAL,
+                                                        IN Void*                   Buffer,
+                                                        IN EfiMacAddress* SrcAddr  OPTIONAL,
                                                         IN EfiMacAddress* DestAddr OPTIONAL,
-                                                        IN UInt16* Protocol OPTIONAL);
+                                                        IN UInt16* Protocol        OPTIONAL);
 
 typedef EFI_STATUS(EFIAPI* EFI_SIMPLE_NETWORK_RECEIVE)(IN EFI_SIMPLE_NETWORK_PROTOCOL* This,
-                                                       OUT UInt32* HeaderSize OPTIONAL,
+                                                       OUT UInt32* HeaderSize          OPTIONAL,
                                                        IN OUT UInt32* BufferSize, OUT Void* Buffer,
-                                                       OUT EfiMacAddress* SrcAddr OPTIONAL,
+                                                       OUT EfiMacAddress* SrcAddr  OPTIONAL,
                                                        OUT EfiMacAddress* DestAddr OPTIONAL,
-                                                       OUT UInt16* Protocol OPTIONAL);
+                                                       OUT UInt16* Protocol        OPTIONAL);
 
 typedef struct EFI_SIMPLE_NETWORK_PROTOCOL {
   UInt64                        Revision;
@@ -506,9 +528,11 @@ typedef struct EFI_GUID EFI_FINAL {
  * Protocol stuff...
  */
 
-#define EFI_SIMPLE_TEXT_INPUT_PROTOCOL_GUID                                        \
-  {                                                                                \
-    0x387477c1, 0x69c7, 0x11d2, { 0x8e, 0x39, 0x00, 0xa0, 0xc9, 0x69, 0x72, 0x3b } \
+#define EFI_SIMPLE_TEXT_INPUT_PROTOCOL_GUID          \
+  {                                                  \
+    0x387477c1, 0x69c7, 0x11d2, {                    \
+      0x8e, 0x39, 0x00, 0xa0, 0xc9, 0x69, 0x72, 0x3b \
+    }                                                \
   }
 
 /** some helpers */
@@ -607,7 +631,7 @@ typedef struct {
 } EfiInputKey;
 
 typedef EfiStatusType(EFI_API* EfiInputReadKey)(IN EfiSimpleTextInputProtocol* This,
-                                                OUT EfiInputKey* Key);
+                                                OUT EfiInputKey*               Key);
 
 typedef EfiStatusType(EFI_API* EfiInputReset)(IN EfiSimpleTextInputProtocol* This,
                                               IN Boolean                     ExtendedChk);
@@ -665,7 +689,7 @@ typedef struct EfiSystemTable {
   struct {
     EFI_GUID VendorGUID;
     VoidPtr  VendorTable;
-  } * ConfigurationTable;
+  }* ConfigurationTable;
 } EfiSystemTable;
 
 #define kEfiOk 0
@@ -726,9 +750,11 @@ enum {
 
 #define EFI_EXTRA_DESCRIPTOR_SIZE 8
 
-#define EFI_MP_SERVICES_PROTOCOL_GUID                                              \
-  {                                                                                \
-    0x3fdda605, 0xa76e, 0x4f46, { 0xad, 0x29, 0x12, 0xf4, 0x53, 0x1b, 0x3d, 0x08 } \
+#define EFI_MP_SERVICES_PROTOCOL_GUID                \
+  {                                                  \
+    0x3fdda605, 0xa76e, 0x4f46, {                    \
+      0xad, 0x29, 0x12, 0xf4, 0x53, 0x1b, 0x3d, 0x08 \
+    }                                                \
   }
 
 #define PROCESSOR_AS_BSP_BIT 0x00000001
@@ -825,9 +851,11 @@ typedef struct EfiTime {
   UInt8  Pad2;
 } EfiTime;
 
-#define EFI_FILE_INFO_GUID                                                         \
-  {                                                                                \
-    0x09576e92, 0x6d3f, 0x11d2, { 0x8e, 0x39, 0x00, 0xa0, 0xc9, 0x69, 0x72, 0x3b } \
+#define EFI_FILE_INFO_GUID                           \
+  {                                                  \
+    0x09576e92, 0x6d3f, 0x11d2, {                    \
+      0x8e, 0x39, 0x00, 0xa0, 0xc9, 0x69, 0x72, 0x3b \
+    }                                                \
   }
 
 struct EfiFileInfo EFI_FINAL {
@@ -896,8 +924,8 @@ typedef EfiStatusType EFI_API (*EfiMpServicesStartupThisAP)(
     IN Void* ProcedureArgument OPTIONAL, OUT Boolean* Finished OPTIONAL);
 
 typedef EfiStatusType EFI_API (*EfiMpServicesDisableThisAP)(IN struct _EfiMpServicesProtocol* Self,
-                                                            IN UInt32  ProcessorNumber,
-                                                            IN Boolean EnableAP,
+                                                            IN UInt32             ProcessorNumber,
+                                                            IN Boolean            EnableAP,
                                                             IN UInt32* HealthFlag OPTIONAL);
 
 typedef EfiStatusType EFI_API (*EfiMpServicesWhoAmI)(IN struct _EfiMpServicesProtocol* Self,
diff --git a/dev/kernel/FirmwareKit/EPM.h b/dev/kernel/FirmwareKit/EPM.h
index 05291929..dcab3607 100644
--- a/dev/kernel/FirmwareKit/EPM.h
+++ b/dev/kernel/FirmwareKit/EPM.h
@@ -97,11 +97,13 @@ struct PACKED EPM_PART_BLOCK {
 ///! @brief Use in boot block version field.
 
 enum {
-  kEPMInvalid   = 0x00,
-  kEPMGeneric   = 0xcf,  /// @brief Generic OS
-  kEPMLinux     = 0x8f,  /// @brief Linux on EPM
-  kEPMBSD       = 0x9f,  /// @brief Berkeley Soft. Distribution
-  kEPMNeKernel  = 0x1f,  /// @brief NeKernel.
+  kEPMInvalid  = 0x00,
+  kEPMGeneric  = 0xcf,  /// @brief Generic OS
+  kEPMLinux    = 0x8f,  /// @brief Linux on EPM.
+  kEPMBSD      = 0x9f,  /// @brief BSD on EPM.
+  kEPMNeKernel = 0x1f,  /// @brief NeKernel.
+  kEPMVMKernel = 0x2f,  /// @brief VMKernel.
+  /// @note ... the rest is reserved for future OSes.
   kEPMInvalidOS = 0xff,
 };
 
diff --git a/dev/kernel/FirmwareKit/CoreBoot/BootNet.h b/dev/kernel/FirmwareKit/NeBoot/BootNet.h
index 3ed11363..3ed11363 100644
--- a/dev/kernel/FirmwareKit/CoreBoot/BootNet.h
+++ b/dev/kernel/FirmwareKit/NeBoot/BootNet.h
diff --git a/dev/kernel/FirmwareKit/CoreBoot/NS.h b/dev/kernel/FirmwareKit/NeBoot/NS.h
index 06197fcd..a4d6a251 100644
--- a/dev/kernel/FirmwareKit/CoreBoot/NS.h
+++ b/dev/kernel/FirmwareKit/NeBoot/NS.h
@@ -6,5 +6,5 @@
 
 #pragma once
 
-#include <FirmwareKit/CoreBoot/BootNet.h>
-#include <FirmwareKit/CoreBoot/CoreBoot.h>
\ No newline at end of file
+#include <FirmwareKit/NeBoot/BootNet.h>
+#include <FirmwareKit/NeBoot/NeBoot.h>
\ No newline at end of file
diff --git a/dev/kernel/FirmwareKit/CoreBoot/CoreBoot.h b/dev/kernel/FirmwareKit/NeBoot/NeBoot.h
index 9e756a70..621b3b64 100644
--- a/dev/kernel/FirmwareKit/CoreBoot/CoreBoot.h
+++ b/dev/kernel/FirmwareKit/NeBoot/NeBoot.h
@@ -8,14 +8,14 @@
 
 #include <NeKit/Defines.h>
 
-namespace Firmware::Detail::CoreBoot {
+namespace Firmware::Detail::NeBoot {
 using namespace Kernel;
 
-struct COREBOOT_LINEAR_EXEC;
+struct NEBOOT_LINEAR_EXEC;
 
 /// @brief Linear Executable Header
 /// @author Amlal El Mahrouss
-struct ATTRIBUTE(aligned(4)) COREBOOT_LINEAR_EXEC {
+struct ATTRIBUTE(aligned(4)) NEBOOT_LINEAR_EXEC {
   const Char   fMagic[2];      // magic number
   const Char   fName[10];      // operating system name
   const UInt32 fRevision;      // firmware revision
@@ -31,4 +31,4 @@ struct ATTRIBUTE(aligned(4)) COREBOOT_LINEAR_EXEC {
   UIntPtr fMBCIStructureVersion;  // MBCI structure version.
 #endif
 };
-}  // namespace Firmware::Detail::CoreBoot
+}  // namespace Firmware::Detail::NeBoot