feat! breaking changes on kernel sources.

Signed-off-by: Amlal El Mahrouss <amlal@nekernel.org>

6 files changed, 71 insertions, 71 deletions

diff --git a/tools/chk.hefs.cc b/tools/chk.hefs.cc
index cb6bd0d6..41c04b0f 100644
--- a/tools/chk.hefs.cc
+++ b/tools/chk.hefs.cc
@@ -57,7 +57,7 @@ int main(int argc, char** argv) {
 
   output_device.read(reinterpret_cast<char*>(&boot_node), sizeof(boot_node));
 
-  if (strncmp(boot_node.magic, kHeFSMagic, kHeFSMagicLen) != 0 || boot_node.sectorCount < 1 ||
+  if (strncmp(boot_node.magic, kOpenHeFSMagic, kOpenHeFSMagicLen) != 0 || boot_node.sectorCount < 1 ||
       boot_node.sectorSize < kMkFsSectorSz) {
     mkfs::console_out() << "hefs: error: Device is not an OpenHeFS disk: " << opt_disk << "\n";
     return EXIT_FAILURE;
diff --git a/tools/chk.hefs.json b/tools/chk.hefs.json
index 58918613..649c5e7f 100644
--- a/tools/chk.hefs.json
+++ b/tools/chk.hefs.json
@@ -9,8 +9,8 @@
     ],
     "output_name": "./dist/chk.hefs",
     "cpp_macros": [
-        "kFsckHeFSVersion=0x0100",
-        "kFsckHeFSVersionHighest=0x0100",
-        "kFsckHeFSVersionLowest=0x0100"
+        "kFsckOpenHeFSVersion=0x0100",
+        "kFsckOpenHeFSVersionHighest=0x0100",
+        "kFsckOpenHeFSVersionLowest=0x0100"
     ]
 }
\ No newline at end of file
diff --git a/tools/libmkfs/openhefs.h b/tools/libmkfs/openhefs.h
index 36d300f3..fcfd9d23 100644
--- a/tools/libmkfs/openhefs.h
+++ b/tools/libmkfs/openhefs.h
@@ -9,90 +9,90 @@
 #include <cstdint>
 #include <cstring>
 
-#define kHeFSVersion (0x0101)
-#define kHeFSMagic "OpenHeFS"
-#define kHeFSMagicLen (9U)
+#define kOpenHeFSVersion (0x0101)
+#define kOpenHeFSMagic "OpenHeFS"
+#define kOpenHeFSMagicLen (9U)
 
-#define kHeFSFileNameLen (256U)
-#define kHeFSPartNameLen (128U)
+#define kOpenHeFSFileNameLen (256U)
+#define kOpenHeFSPartNameLen (128U)
 
-#define kHeFSDefaultVolumeName u8"OpenHeFS Volume"
+#define kOpenHeFSDefaultVolumeName u8"OpenHeFS Volume"
 
 namespace mkfs::hefs {
 
 // Drive kinds
 enum {
-  kHeFSHardDrive         = 0xC0,  // Hard Drive
-  kHeFSSolidStateDrive   = 0xC1,  // Solid State Drive
-  kHeFSOpticalDrive      = 0x0C,  // Blu-Ray/DVD
-  kHeFSMassStorageDevice = 0xCC,  // USB
-  kHeFSScsiDrive         = 0xC4,  // SCSI Hard Drive
-  kHeFSFlashDrive        = 0xC6,
-  kHeFSUnknown           = 0xFF,  // Unknown device.
-  kHeFSDriveCount        = 8,
+  kOpenHeFSHardDrive         = 0xC0,  // Hard Drive
+  kOpenHeFSSolidStateDrive   = 0xC1,  // Solid State Drive
+  kOpenHeFSOpticalDrive      = 0x0C,  // Blu-Ray/DVD
+  kOpenHeFSMassStorageDevice = 0xCC,  // USB
+  kOpenHeFSScsiDrive         = 0xC4,  // SCSI Hard Drive
+  kOpenHeFSFlashDrive        = 0xC6,
+  kOpenHeFSUnknown           = 0xFF,  // Unknown device.
+  kOpenHeFSDriveCount        = 8,
 };
 
 // Disk status
 enum {
-  kHeFSStatusUnlocked = 0x18,
-  kHeFSStatusLocked,
-  kHeFSStatusError,
-  kHeFSStatusInvalid,
-  kHeFSStatusCount,
+  kOpenHeFSStatusUnlocked = 0x18,
+  kOpenHeFSStatusLocked,
+  kOpenHeFSStatusError,
+  kOpenHeFSStatusInvalid,
+  kOpenHeFSStatusCount,
 };
 
 // Encodings
 enum {
-  kHeFSEncodingFlagsUTF8 = 0x50,
-  kHeFSEncodingFlagsUTF16,
-  kHeFSEncodingFlagsUTF32,
-  kHeFSEncodingFlagsUTF16BE,
-  kHeFSEncodingFlagsUTF16LE,
-  kHeFSEncodingFlagsUTF32BE,
-  kHeFSEncodingFlagsUTF32LE,
-  kHeFSEncodingFlagsUTF8BE,
-  kHeFSEncodingFlagsUTF8LE,
-  kHeFSEncodingFlagsBinary,
-  kHeFSEncodingFlagsCount = 11,
-  kHeFSFlagsNone          = 0,
-  kHeFSFlagsReadOnly      = 0x100,
-  kHeFSFlagsHidden,
-  kHeFSFlagsSystem,
-  kHeFSFlagsArchive,
-  kHeFSFlagsDevice,
-  kHeFSFlagsCount = 7
+  kOpenHeFSEncodingFlagsUTF8 = 0x50,
+  kOpenHeFSEncodingFlagsUTF16,
+  kOpenHeFSEncodingFlagsUTF32,
+  kOpenHeFSEncodingFlagsUTF16BE,
+  kOpenHeFSEncodingFlagsUTF16LE,
+  kOpenHeFSEncodingFlagsUTF32BE,
+  kOpenHeFSEncodingFlagsUTF32LE,
+  kOpenHeFSEncodingFlagsUTF8BE,
+  kOpenHeFSEncodingFlagsUTF8LE,
+  kOpenHeFSEncodingFlagsBinary,
+  kOpenHeFSEncodingFlagsCount = 11,
+  kOpenHeFSFlagsNone          = 0,
+  kOpenHeFSFlagsReadOnly      = 0x100,
+  kOpenHeFSFlagsHidden,
+  kOpenHeFSFlagsSystem,
+  kOpenHeFSFlagsArchive,
+  kOpenHeFSFlagsDevice,
+  kOpenHeFSFlagsCount = 7
 };
 
 // Time type
 using ATime = std::uint64_t;
 
 // File kinds
-inline constexpr uint16_t kHeFSFileKindRegular      = 0x00;
-inline constexpr uint16_t kHeFSFileKindDirectory    = 0x01;
-inline constexpr uint16_t kHeFSFileKindBlock        = 0x02;
-inline constexpr uint16_t kHeFSFileKindCharacter    = 0x03;
-inline constexpr uint16_t kHeFSFileKindFIFO         = 0x04;
-inline constexpr uint16_t kHeFSFileKindSocket       = 0x05;
-inline constexpr uint16_t kHeFSFileKindSymbolicLink = 0x06;
-inline constexpr uint16_t kHeFSFileKindUnknown      = 0x07;
-inline constexpr uint16_t kHeFSFileKindCount        = 0x08;
+inline constexpr uint16_t kOpenHeFSFileKindRegular      = 0x00;
+inline constexpr uint16_t kOpenHeFSFileKindDirectory    = 0x01;
+inline constexpr uint16_t kOpenHeFSFileKindBlock        = 0x02;
+inline constexpr uint16_t kOpenHeFSFileKindCharacter    = 0x03;
+inline constexpr uint16_t kOpenHeFSFileKindFIFO         = 0x04;
+inline constexpr uint16_t kOpenHeFSFileKindSocket       = 0x05;
+inline constexpr uint16_t kOpenHeFSFileKindSymbolicLink = 0x06;
+inline constexpr uint16_t kOpenHeFSFileKindUnknown      = 0x07;
+inline constexpr uint16_t kOpenHeFSFileKindCount        = 0x08;
 
 // Red-black tree colors
 enum {
-  kHeFSInvalidColor = 0,
-  kHeFSRed          = 100,
-  kHeFSBlack,
-  kHeFSColorCount,
+  kOpenHeFSInvalidColor = 0,
+  kOpenHeFSRed          = 100,
+  kOpenHeFSBlack,
+  kOpenHeFSColorCount,
 };
 
 // Time constants
-inline constexpr ATime kHeFSTimeInvalid = 0x0000000000000000;
-inline constexpr ATime kHeFSTimeMax     = 0xFFFFFFFFFFFFFFFF - 1;
+inline constexpr ATime kOpenHeFSTimeInvalid = 0x0000000000000000;
+inline constexpr ATime kOpenHeFSTimeMax     = 0xFFFFFFFFFFFFFFFF - 1;
 
 // Boot Node
 struct __attribute__((packed)) BootNode {
-  char          magic[kHeFSMagicLen]{};
-  char8_t       volumeName[kHeFSPartNameLen]{};
+  char          magic[kOpenHeFSMagicLen]{};
+  char8_t       volumeName[kOpenHeFSPartNameLen]{};
   std::uint32_t version{};
   std::uint64_t badSectors{};
   std::uint64_t sectorCount{};
diff --git a/tools/mk_app.py b/tools/mk_app.py
index 7f7cef17..90aa2df5 100755
--- a/tools/mk_app.py
+++ b/tools/mk_app.py
@@ -46,7 +46,7 @@ def create_directory_structure(base_path, project_name):
     manifest = {
         "compiler_path": "clang++",
         "compiler_std": "c++20",
-        "headers_path": ["./", "../../../dev/kernel", "../../../public/frameworks/", "../../../dev/", "./"],
+        "headers_path": ["./", "../../../src/kernel", "../../../public/frameworks/", "../../../src/", "./"],
         "sources_path": [
             
         ],
diff --git a/tools/mk_fwrk.py b/tools/mk_fwrk.py
index b2ef99ff..d47e4609 100755
--- a/tools/mk_fwrk.py
+++ b/tools/mk_fwrk.py
@@ -52,7 +52,7 @@ def create_directory_structure(base_path_fwrk, project_file_name, project_name):
     manifest = {
         "compiler_path": "clang++",
         "compiler_std": "c++20",
-        "headers_path": ["./", "../../../dev/kernel", "../../../public/frameworks/", "../../../dev/", "./"],
+        "headers_path": ["./", "../../../src/kernel", "../../../public/frameworks/", "../../../src/", "./"],
         "sources_path": [
 
         ],
diff --git a/tools/mkfs.hefs.cc b/tools/mkfs.hefs.cc
index 1324735d..507d9bab 100644
--- a/tools/mkfs.hefs.cc
+++ b/tools/mkfs.hefs.cc
@@ -12,7 +12,7 @@
 #include <fstream>
 #include <limits>
 
-static uint16_t kVersion       = kHeFSVersion;
+static uint16_t kVersion       = kOpenHeFSVersion;
 static uint16_t kNumericalBase = 10;
 
 static size_t        kDiskSize = mkfs::detail::gib_cast(4UL);
@@ -58,8 +58,8 @@ int main(int argc, char** argv) {
     for (char c : opt_L) kDiskLabel.push_back(static_cast<char8_t>(c));
   } else {
     kDiskLabel.clear();
-    for (size_t i = 0; i < kHeFSPartNameLen && kHeFSDefaultVolumeName[i] != u'\0'; ++i) {
-      kDiskLabel.push_back(static_cast<char8_t>(kHeFSDefaultVolumeName[i]));
+    for (size_t i = 0; i < kOpenHeFSPartNameLen && kOpenHeFSDefaultVolumeName[i] != u'\0'; ++i) {
+      kDiskLabel.push_back(static_cast<char8_t>(kOpenHeFSDefaultVolumeName[i]));
     }
   }
 
@@ -135,8 +135,8 @@ int main(int argc, char** argv) {
   std::memset(&boot_node, 0, sizeof(boot_node));
 
   boot_node.version     = kVersion;
-  boot_node.diskKind    = mkfs::hefs::kHeFSHardDrive;
-  boot_node.encoding    = mkfs::hefs::kHeFSEncodingFlagsUTF8;
+  boot_node.diskKind    = mkfs::hefs::kOpenHeFSHardDrive;
+  boot_node.encoding    = mkfs::hefs::kOpenHeFSEncodingFlagsUTF8;
   boot_node.diskSize    = kDiskSize;
   boot_node.sectorSize  = kDiskSectorSz;
   boot_node.sectorCount = kDiskSize / kDiskSectorSz;
@@ -147,18 +147,18 @@ int main(int argc, char** argv) {
   boot_node.startBlock  = static_cast<size_t>(start_block);
   boot_node.endBlock    = static_cast<size_t>(end_block);
   boot_node.indCount    = 0UL;
-  boot_node.diskStatus  = mkfs::hefs::kHeFSStatusUnlocked;
+  boot_node.diskStatus  = mkfs::hefs::kOpenHeFSStatusUnlocked;
 
-  static_assert(sizeof(boot_node.magic) >= kHeFSMagicLen,
-                "BootNode::magic too small to hold kHeFSMagicLen");
+  static_assert(sizeof(boot_node.magic) >= kOpenHeFSMagicLen,
+                "BootNode::magic too small to hold kOpenHeFSMagicLen");
 
   std::memset(boot_node.magic, 0, sizeof(boot_node.magic));
   size_t magic_copy =
-      (sizeof(boot_node.magic) < kHeFSMagicLen - 1) ? sizeof(boot_node.magic) : (kHeFSMagicLen - 1);
-  std::memcpy(boot_node.magic, kHeFSMagic, magic_copy);
+      (sizeof(boot_node.magic) < kOpenHeFSMagicLen - 1) ? sizeof(boot_node.magic) : (kOpenHeFSMagicLen - 1);
+  std::memcpy(boot_node.magic, kOpenHeFSMagic, magic_copy);
   boot_node.magic[magic_copy] = 0;
 
-  constexpr size_t vol_slots = kHeFSPartNameLen;
+  constexpr size_t vol_slots = kOpenHeFSPartNameLen;
 
   std::memset(boot_node.volumeName, 0, sizeof(boot_node.volumeName));