Kernel: Improve Drive Manager regarding the NewFS support.

HCFS is also planned, HCFS is a filesystem made for mass media storages.

Signed-off-by: Amlal El Mahrouss <amlal@el-mahrouss-logic.com>

15 files changed, 140 insertions, 51 deletions

diff --git a/Private/CFKit/IPCEndpoint.hxx b/Private/CFKit/IPCEndpoint.hxx
index a6e8f90d..bc697dc7 100644
--- a/Private/CFKit/IPCEndpoint.hxx
+++ b/Private/CFKit/IPCEndpoint.hxx
@@ -20,8 +20,8 @@
 #define kRemoteMaxLen 21
 
 namespace NewOS {
-    typedef UIntPtr ipc_method_type;
-    typedef Char ipc_remote_type[kRemoteMaxLen];
-} // namespace NewOS
+typedef UIntPtr ipc_method_type;
+typedef Char ipc_remote_type[kRemoteMaxLen];
+}  // namespace NewOS
 
-#endif // _INC_IPC_ENDPOINT_HXX_
\ No newline at end of file
+#endif  // _INC_IPC_ENDPOINT_HXX_
\ No newline at end of file
diff --git a/Private/HALKit/AMD64/HalCoreInterruptHandlerAMD64.cpp b/Private/HALKit/AMD64/HalCoreInterruptHandlerAMD64.cpp
index e87459ac..aa9c0e47 100644
--- a/Private/HALKit/AMD64/HalCoreInterruptHandlerAMD64.cpp
+++ b/Private/HALKit/AMD64/HalCoreInterruptHandlerAMD64.cpp
@@ -13,11 +13,11 @@
 EXTERN_C void idt_handle_gpf(NewOS::UIntPtr rsp) {
   MUST_PASS(NewOS::ProcessScheduler::Shared().Leak().GetCurrent());
 
-  NewOS::kcout << "NewKernel.exe: Stack Pointer: "
+  NewOS::kcout << "NewOS: Stack Pointer: "
                << NewOS::StringBuilder::FromInt("rsp{%}", rsp);
 
   NewOS::kcout
-      << "NewKernel.exe: General Protection Fault, caused by "
+      << "NewOS: General Protection Fault, caused by "
       << NewOS::ProcessScheduler::Shared().Leak().GetCurrent().Leak().GetName();
 
   NewOS::ProcessScheduler::Shared().Leak().GetCurrent().Leak().Crash();
@@ -29,13 +29,13 @@ EXTERN_C void idt_handle_scheduler(NewOS::UIntPtr rsp) {
   NewOS::kcout << NewOS::StringBuilder::FromInt("rsp{%}", rsp);
 
   NewOS::kcout
-      << "NewKernel.exe: Will be scheduled back later "
+      << "NewOS: Will be scheduled back later "
       << NewOS::ProcessScheduler::Shared().Leak().GetCurrent().Leak().GetName()
       << NewOS::end_line();
 
   /// schedule another process.
   if (!NewOS::ProcessHelper::StartScheduling()) {
-    NewOS::kcout << "NewKernel.exe: Continue schedule this process...\r\n";
+    NewOS::kcout << "NewOS: Continue schedule this process...\r\n";
   }
 }
 
@@ -46,7 +46,7 @@ EXTERN_C void idt_handle_pf(NewOS::UIntPtr rsp) {
   NewOS::kcout << NewOS::StringBuilder::FromInt("rsp{%}", rsp);
 
   NewOS::kcout
-      << "NewKernel.exe: Segmentation Fault, caused by "
+      << "NewOS: Segmentation Fault, caused by "
       << NewOS::ProcessScheduler::Shared().Leak().GetCurrent().Leak().GetName();
 
   NewOS::ProcessScheduler::Shared().Leak().GetCurrent().Leak().Crash();
@@ -59,7 +59,7 @@ EXTERN_C void idt_handle_math(NewOS::UIntPtr rsp) {
   NewOS::kcout << NewOS::StringBuilder::FromInt("rsp{%}", rsp);
 
   NewOS::kcout
-      << "NewKernel.exe: Math error, caused by "
+      << "NewOS: Math error, caused by "
       << NewOS::ProcessScheduler::Shared().Leak().GetCurrent().Leak().GetName();
 
   NewOS::ProcessScheduler::Shared().Leak().GetCurrent().Leak().Crash();
@@ -72,7 +72,7 @@ EXTERN_C void idt_handle_generic(NewOS::UIntPtr rsp) {
   NewOS::kcout << NewOS::StringBuilder::FromInt("sp{%}", rsp);
 
   NewOS::kcout
-      << "NewKernel.exe: Execution error, caused by "
+      << "NewOS: Execution error, caused by "
       << NewOS::ProcessScheduler::Shared().Leak().GetCurrent().Leak().GetName();
 
   NewOS::ProcessScheduler::Shared().Leak().GetCurrent().Leak().Crash();
@@ -83,11 +83,11 @@ EXTERN_C void idt_handle_generic(NewOS::UIntPtr rsp) {
 EXTERN_C void idt_handle_ud(NewOS::UIntPtr rsp) {
   MUST_PASS(NewOS::ProcessScheduler::Shared().Leak().GetCurrent());
 
-  NewOS::kcout << "NewKernel.exe: Stack Pointer: "
+  NewOS::kcout << "NewOS: Stack Pointer: "
                << NewOS::StringBuilder::FromInt("rsp{%}", rsp);
 
   NewOS::kcout
-      << "NewKernel.exe: Invalid interrupt, caused by "
+      << "NewOS: Invalid interrupt, caused by "
       << NewOS::ProcessScheduler::Shared().Leak().GetCurrent().Leak().GetName();
 
   NewOS::ProcessScheduler::Shared().Leak().GetCurrent().Leak().Crash();
diff --git a/Private/HALKit/AMD64/HalCoreMultiProcessingAMD64.cpp b/Private/HALKit/AMD64/HalCoreMultiProcessingAMD64.cpp
index f31e67c2..98d64215 100644
--- a/Private/HALKit/AMD64/HalCoreMultiProcessingAMD64.cpp
+++ b/Private/HALKit/AMD64/HalCoreMultiProcessingAMD64.cpp
@@ -92,14 +92,14 @@ STATIC MadtType* kApicInfoBlock = nullptr;
 ///////////////////////////////////////////////////////////////////////////////////////
 
 void hal_system_get_cores(voidPtr rsdPtr) {
-  kcout << "NewKernel.exe: Constructing ACPIFactoryInterface...\r\n";
+  kcout << "NewOS: Constructing ACPIFactoryInterface...\r\n";
 
   auto acpi = ACPIFactoryInterface(rsdPtr);
   kApicMadt = acpi.Find(kApicSignature).Leak().Leak();
 
   MUST_PASS(kApicMadt);  // MADT must exist.
 
-  kcout << "NewKernel.exe: Successfuly fetched the MADT!\r\n";
+  kcout << "NewOS: Successfuly fetched the MADT!\r\n";
 
   kApicInfoBlock = (MadtType*)kApicMadt;
 }
diff --git a/Private/HALKit/AMD64/Storage/ATA.cxx b/Private/HALKit/AMD64/Storage/ATA.cxx
index d9744153..b2191250 100644
--- a/Private/HALKit/AMD64/Storage/ATA.cxx
+++ b/Private/HALKit/AMD64/Storage/ATA.cxx
@@ -70,7 +70,7 @@ ATAInit_Retry:
   auto statRdy = In8(IO + ATA_REG_STATUS);
 
   if (statRdy & ATA_SR_ERR) {
-    kcout << "NewKernel.exe: ATA: Select error, not an IDE based hard-drive.\r\n";
+    kcout << "NewOS: ATA: Select error, not an IDE based hard-drive.\r\n";
 
     return false;
   }
@@ -105,21 +105,21 @@ ATAInit_Retry:
 
   /* differentiate ATA, ATAPI, SATA and SATAPI */
   if (cl == 0x14 && ch == 0xEB) {
-    kcout << "NewKernel.exe: PATAPI drive detected.\r\n";
+    kcout << "NewOS: PATAPI drive detected.\r\n";
     kATADeviceType = kATADevicePATA_PI;
   }
   if (cl == 0x69 && ch == 0x96) {
-    kcout << "NewKernel.exe: SATAPI drive detected.\r\n";
+    kcout << "NewOS: SATAPI drive detected.\r\n";
     kATADeviceType = kATADeviceSATA_PI;
   }
 
   if (cl == 0x0 && ch == 0x0) {
-    kcout << "NewKernel.exe: PATA drive detected.\r\n";
+    kcout << "NewOS: PATA drive detected.\r\n";
     kATADeviceType = kATADevicePATA;
   }
 
   if (cl == 0x3c && ch == 0xc3) {
-    kcout << "NewKernel.exe: SATA drive detected.\r\n";
+    kcout << "NewOS: SATA drive detected.\r\n";
     kATADeviceType = kATADeviceSATA;
   }
 
diff --git a/Private/KernelKit/DriveManager.hxx b/Private/KernelKit/DriveManager.hxx
index 36e0b681..d82c302b 100644
--- a/Private/KernelKit/DriveManager.hxx
+++ b/Private/KernelKit/DriveManager.hxx
@@ -48,6 +48,7 @@ struct DriveTrait final {
     SizeT fPacketSize;       //! packet size
     UInt32 fPacketCRC32;     //! sanity crc, in case if good is set to false
     Boolean fPacketGood;
+    Lba fLba;
   } fPacket;
 
   Void (*fInput)(DrivePacket* packetPtr);
@@ -91,7 +92,7 @@ class MountpointInterface final {
         return &mD;
       default: {
         DbgLastError() = kErrorNoSuchDisk;
-        kcout << "NewKernel.exe: No such disk.\n";
+        kcout << "NewOS: No such disk.\n";
 
         break;
       }
@@ -103,6 +104,20 @@ class MountpointInterface final {
  private:
   DriveDevicePtr mA, mB, mC, mD = nullptr;
 };
+
+
+/// @brief Unimplemented drive.
+/// @param pckt 
+/// @return 
+Void ke_drv_unimplemented(DriveTrait::DrivePacket* pckt);
+
+/// @brief Makes a new drive.
+/// @return the new drive.
+DriveTrait construct_drive() noexcept;
+
+/// @brief Fetches the main drive.
+/// @return the new drive.
+DriveTrait main_drive() noexcept;
 }  // namespace NewOS
 
 #endif /* ifndef __DRIVE_MANAGER__ */
diff --git a/Private/NewBoot/Source/HEL/AMD64/BootATA.cxx b/Private/NewBoot/Source/HEL/AMD64/BootATA.cxx
index 5b966813..ed591412 100644
--- a/Private/NewBoot/Source/HEL/AMD64/BootATA.cxx
+++ b/Private/NewBoot/Source/HEL/AMD64/BootATA.cxx
@@ -72,7 +72,7 @@ ATAInit_Retry:
 
   if (statRdy & ATA_SR_ERR) {
     writer.Write(
-        L"NewBoot.exe: ATA: Select error, not an IDE based hard-drive.\r\n");
+        L"NewOS: ATA: Select error, not an IDE based hard-drive.\r\n");
 
     return false;
   }
@@ -108,21 +108,21 @@ ATAInit_Retry:
 
   /* differentiate ATA, ATAPI, SATA and SATAPI */
   if (cl == 0x14 && ch == 0xEB) {
-    writer.Write(L"NewBoot.exe: PATAPI drive detected.\r\n");
+    writer.Write(L"NewOS: PATAPI drive detected.\r\n");
     kATADeviceType = kATADevicePATA_PI;
   }
   if (cl == 0x69 && ch == 0x96) {
-    writer.Write(L"NewBoot.exe: SATAPI drive detected.\r\n");
+    writer.Write(L"NewOS: SATAPI drive detected.\r\n");
     kATADeviceType = kATADeviceSATA_PI;
   }
 
   if (cl == 0x0 && ch == 0x0) {
-    writer.Write(L"NewBoot.exe: PATA drive detected.\r\n");
+    writer.Write(L"NewOS: PATA drive detected.\r\n");
     kATADeviceType = kATADevicePATA;
   }
 
   if (cl == 0x3c && ch == 0xc3) {
-    writer.Write(L"NewBoot.exe: SATA drive detected.\r\n");
+    writer.Write(L"NewOS: SATA drive detected.\r\n");
     kATADeviceType = kATADeviceSATA;
   }
 
@@ -211,7 +211,7 @@ BootDeviceATA::BootDeviceATA() noexcept {
 
     BTextWriter writer;
 
-    writer.Write(L"NewBoot.exe: Drive is OnLine.\r\n");
+    writer.Write(L"NewOS: Drive is OnLine.\r\n");
   }
 }
 /**
diff --git a/Private/NewBoot/Source/HEL/AMD64/BootEPM.cxx b/Private/NewBoot/Source/HEL/AMD64/BootEPM.cxx
index 029a28eb..e767cb2d 100644
--- a/Private/NewBoot/Source/HEL/AMD64/BootEPM.cxx
+++ b/Private/NewBoot/Source/HEL/AMD64/BootEPM.cxx
@@ -35,11 +35,11 @@ EXTERN_C Boolean boot_write_epm_partition(const Char* namePart, SizeT namePartLe
 
   BTextWriter writer;
 
-  writer.Write(L"NewBoot.exe: Checking for a NewFS partition...\r\n");
+  writer.Write(L"NewOS: Checking for a NewFS partition...\r\n");
 
   for (SizeT index = 0; index < kEPMMagicLength; ++index) {
     if (buf[index] != kEPMMagic[index]) {
-      writer.Write(L"NewBoot.exe: Writing a NewFS partition...\r\n");
+      writer.Write(L"NewOS: Writing a NewFS partition...\r\n");
 
       BootBlockType* bootBlock = (BootBlockType*)buf;
 
@@ -112,6 +112,6 @@ EXTERN_C Boolean boot_write_epm_partition(const Char* namePart, SizeT namePartLe
     }
   }
 
-  writer.Write(L"NewBoot.exe: Partition found, everything's OK.\r\n");
+  writer.Write(L"NewOS: Partition found, everything's OK.\r\n");
   return Yes;
 }
\ No newline at end of file
diff --git a/Private/NewBoot/Source/HEL/AMD64/BootFileReader.cxx b/Private/NewBoot/Source/HEL/AMD64/BootFileReader.cxx
index 01f4787f..b31f37de 100644
--- a/Private/NewBoot/Source/HEL/AMD64/BootFileReader.cxx
+++ b/Private/NewBoot/Source/HEL/AMD64/BootFileReader.cxx
@@ -46,12 +46,12 @@ BFileReader::BFileReader(const CharacterTypeUTF16* path, EfiHandlePtr ImageHandl
   EfiGUID guidImg = EfiGUID(EFI_LOADED_IMAGE_PROTOCOL_GUID);
 
   if (BS->HandleProtocol(ImageHandle, &guidImg, (void**)&img) != kEfiOk) {
-    mWriter.Write(L"NewBoot.exe: Fetch-Protocol: No-Such-Protocol").Write(L"\r\n");
+    mWriter.Write(L"NewOS: Fetch-Protocol: No-Such-Protocol").Write(L"\r\n");
     this->mErrorCode = kNotSupported;
   }
 
   if (BS->HandleProtocol(img->DeviceHandle, &guidEfp, (void**)&efp) != kEfiOk) {
-    mWriter.Write(L"NewBoot.exe: Fetch-Protocol: No-Such-Protocol").Write(L"\r\n");
+    mWriter.Write(L"NewOS: Fetch-Protocol: No-Such-Protocol").Write(L"\r\n");
     this->mErrorCode = kNotSupported;
     return;
   }
@@ -59,7 +59,7 @@ BFileReader::BFileReader(const CharacterTypeUTF16* path, EfiHandlePtr ImageHandl
   /// Start doing disk I/O
 
   if (efp->OpenVolume(efp, &rootFs) != kEfiOk) {
-    mWriter.Write(L"NewBoot.exe: Fetch-Protocol: No-Such-Volume").Write(L"\r\n");
+    mWriter.Write(L"NewOS: Fetch-Protocol: No-Such-Volume").Write(L"\r\n");
     this->mErrorCode = kNotSupported;
     return;
   }
@@ -68,7 +68,7 @@ BFileReader::BFileReader(const CharacterTypeUTF16* path, EfiHandlePtr ImageHandl
 
   if (rootFs->Open(rootFs, &kernelFile, mPath, kEFIFileRead, kEFIReadOnly) !=
       kEfiOk) {
-    mWriter.Write(L"NewBoot.exe: Fetch-Protocol: No-Such-Path: ")
+    mWriter.Write(L"NewOS: Fetch-Protocol: No-Such-Path: ")
         .Write(mPath)
         .Write(L"\r\n");
     this->mErrorCode = kNotSupported;
diff --git a/Private/NewBoot/Source/HEL/AMD64/BootMain.cxx b/Private/NewBoot/Source/HEL/AMD64/BootMain.cxx
index 599a533f..542d62b1 100644
--- a/Private/NewBoot/Source/HEL/AMD64/BootMain.cxx
+++ b/Private/NewBoot/Source/HEL/AMD64/BootMain.cxx
@@ -32,7 +32,7 @@ EFI_EXTERN_C EFI_API Int EfiMain(EfiHandlePtr ImageHandle,
   BTextWriter writer;
   /// Splash screen stuff
 
-  writer.Write(L"MahroussLogic (R) NewBoot.exe: ")
+  writer.Write(L"MahroussLogic (R) NewOS: ")
       .Write(BVersionString::Shared());
 
   writer.Write(L"\r\nNewBoot.exe: Firmware Vendor: ")
@@ -53,10 +53,10 @@ EFI_EXTERN_C EFI_API Int EfiMain(EfiHandlePtr ImageHandle,
     isIniNotFound =
         boot_write_epm_partition(namePart, kEPMNameLength, &ataDrv);
   } else if (SystemTable->FirmwareVendor[0] != '@') {
-    writer.Write(L"NewBoot.exe: This firmware can't understand NewOS, please use Mahrouss Logic products instead\r\nNewBoot.exe: Our website: www.el-mahrouss-logic.com\r\n");
+    writer.Write(L"NewOS: This firmware can't understand NewOS, please use Mahrouss Logic products instead\r\nNewBoot.exe: Our website: www.el-mahrouss-logic.com\r\n");
     return kEfiFail;
   } else if (!ataDrv) {
-    writer.Write(L"NewBoot.exe: This computer can't work with NewOS, please use Mahrouss Logic products instead\r\nNewBoot.exe: Our website: www.el-mahrouss-logic.com\r\n");
+    writer.Write(L"NewOS: This computer can't work with NewOS, please use Mahrouss Logic products instead\r\nNewBoot.exe: Our website: www.el-mahrouss-logic.com\r\n");
     return kEfiFail;
   }
 #else
@@ -142,7 +142,7 @@ EFI_EXTERN_C EFI_API Int EfiMain(EfiHandlePtr ImageHandle,
              handoverHdrPtr->f_FirmwareVendorLen);
 
 #ifdef __DEBUG__
-    writer.Write(L"NewBoot.exe: Fetching ACPI's 'RSD PTR'...").Write(L"\r\n");
+    writer.Write(L"NewOS: Fetching ACPI's 'RSD PTR'...").Write(L"\r\n");
 #endif
 
     for (SizeT indexVT = 0; indexVT < SystemTable->NumberOfTableEntries;
@@ -159,7 +159,7 @@ EFI_EXTERN_C EFI_API Int EfiMain(EfiHandlePtr ImageHandle,
 #ifdef __DEBUG__
         writer
             .Write(
-                L"NewBoot.exe: Found ACPI's 'RSD PTR' table on this machine.")
+                L"NewOS: Found ACPI's 'RSD PTR' table on this machine.")
             .Write(L"\r\n");
 #endif
 
@@ -168,12 +168,12 @@ EFI_EXTERN_C EFI_API Int EfiMain(EfiHandlePtr ImageHandle,
     }
 
     if (!isIniNotFound) {
-      writer.Write(L"NewBoot.exe: No partition found for NewOS. (HCR-1000)\r\n");
+      writer.Write(L"NewOS: No partition found for NewOS. (HCR-1000)\r\n");
     } else {
       handoverHdrPtr->f_Magic = kHandoverMagic;
       handoverHdrPtr->f_Version = kHandoverVersion;
 
-      writer.Write(L"NewBoot.exe: Running NewOS...\r\n");
+      writer.Write(L"NewOS: Running NewOS...\r\n");
 
       EFI::ExitBootServices(MapKey, ImageHandle);
 
@@ -184,7 +184,7 @@ EFI_EXTERN_C EFI_API Int EfiMain(EfiHandlePtr ImageHandle,
 
     return kEfiOk;
   } else {
-    writer.Write(L"NewBoot.exe: Error-Code: HLDR-0003\r\n");
+    writer.Write(L"NewOS: Error-Code: HLDR-0003\r\n");
   }
 
   EFI::Stop();
diff --git a/Private/Source/CxxAbi.cxx b/Private/Source/CxxAbi.cxx
index 41df73fd..d79d688c 100644
--- a/Private/Source/CxxAbi.cxx
+++ b/Private/Source/CxxAbi.cxx
@@ -13,7 +13,7 @@ atexit_func_entry_t __atexit_funcs[kDSOMaxObjects];
 uarch_t __atexit_func_count;
 
 extern "C" void __cxa_pure_virtual() {
-  NewOS::kcout << "NewKernel.exe: C++ placeholder method.\n";
+  NewOS::kcout << "NewOS: C++ placeholder method.\n";
 }
 
 extern "C" void ___chkstk_ms() {
diff --git a/Private/Source/DriveManager.cxx b/Private/Source/DriveManager.cxx
index 26cab611..41a623c9 100644
--- a/Private/Source/DriveManager.cxx
+++ b/Private/Source/DriveManager.cxx
@@ -6,5 +6,79 @@
 
 #include <KernelKit/DebugOutput.hpp>
 #include <KernelKit/DriveManager.hxx>
+#include <Builtins/ATA/Defines.hxx>
 
-namespace NewOS {}  // namespace NewOS
+namespace NewOS {
+static UInt16 kATAIO = 0U;
+static UInt8 kATAMaster = 0U;
+
+/// @brief reads from an ATA drive.
+/// @param pckt 
+/// @return 
+Void ke_drv_input(DriveTrait::DrivePacket* pckt) {
+    if (!pckt) {
+        return;
+    }
+    
+    pckt->fPacketGood = false;
+
+    drv_ata_read(pckt->fLba, kATAIO, kATAMaster, (Char*)pckt->fPacketContent, 1, pckt->fPacketSize);
+
+    pckt->fPacketGood = true;
+}
+
+/// @brief Writes to an ATA drive.
+/// @param pckt 
+/// @return 
+Void ke_drv_output(DriveTrait::DrivePacket* pckt) {
+    if (!pckt) {
+        return;
+    }
+    
+    pckt->fPacketGood = false;
+
+    drv_ata_write(pckt->fLba, kATAIO, kATAMaster, (Char*)pckt->fPacketContent, 1, pckt->fPacketSize);
+
+    pckt->fPacketGood = true;
+}
+
+/// @brief Executes a disk check on the ATA drive.
+/// @param pckt 
+/// @return 
+Void ke_drv_check_disk(DriveTrait::DrivePacket* pckt) {
+    if (!pckt) {
+        return;
+    }
+    
+    pckt->fPacketGood = false;
+}
+
+/// @brief Unimplemented drive.
+/// @param pckt 
+/// @return 
+Void ke_drv_unimplemented(DriveTrait::DrivePacket* pckt) {}
+
+/// @brief Makes a new drive.
+/// @return the new drive.
+DriveTrait construct_drive() noexcept {
+    DriveTrait trait;
+
+    trait.fInput = ke_drv_unimplemented;
+    trait.fOutput = ke_drv_unimplemented;
+    trait.fVerify = ke_drv_unimplemented;
+
+    return trait;
+}
+
+/// @brief Fetches the main drive.
+/// @return the new drive.
+DriveTrait main_drive() noexcept {
+    DriveTrait trait;
+
+    trait.fInput = ke_drv_input;
+    trait.fOutput = ke_drv_output;
+    trait.fVerify = ke_drv_check_disk;
+
+    return trait;
+}
+}  // namespace NewOS
diff --git a/Private/Source/IndexableProperty.cxx b/Private/Source/IndexableProperty.cxx
index 8a2c1132..c3978fe9 100644
--- a/Private/Source/IndexableProperty.cxx
+++ b/Private/Source/IndexableProperty.cxx
@@ -34,7 +34,7 @@ Void fs_index_file(const Char* filename, SizeT filenameLen, IndexableProperty& i
         indexer.AddFlag(kIndexerClaimed);
         rt_copy_memory((VoidPtr)indexer.LeakProperty().Path, (VoidPtr)filename, filenameLen);
 
-        kcout << "NewKernel.exe: FSKit: index new file: " << filename << endl;
+        kcout << "NewOS: FSKit: index new file: " << filename << endl;
     }
 }
 }  // namespace Indexer
diff --git a/Private/Source/NewFS+Journal.cxx b/Private/Source/NewFS+Journal.cxx
index 4eb2feb2..d6315603 100644
--- a/Private/Source/NewFS+Journal.cxx
+++ b/Private/Source/NewFS+Journal.cxx
@@ -45,7 +45,7 @@ class NewFSJournalRunner final {
     switch (operation) {
       case kNewFSOpLog: {
         if (!classPtr) {
-          kcout << "NewKernel.exe: Miss for classPtr at "
+          kcout << "NewOS: Miss for classPtr at "
                    "NewFSJournalManager::Run(classPtr) "
                 << __FILE__ << "\n";
           return false;
diff --git a/Private/Source/ThreadLocalStorage.cxx b/Private/Source/ThreadLocalStorage.cxx
index 9ee6a4be..20f9d337 100644
--- a/Private/Source/ThreadLocalStorage.cxx
+++ b/Private/Source/ThreadLocalStorage.cxx
@@ -31,7 +31,7 @@ Boolean tls_check_tib(ThreadInformationBlock* tib) {
   Encoder encoder;
   const char* tibAsBytes = encoder.AsBytes(tib);
 
-  kcout << "NewKernel.exe: Checking for a valid cookie...\n";
+  kcout << "NewOS: Checking for a valid cookie...\n";
 
   return tibAsBytes[0] == kCookieMag0 && tibAsBytes[1] == kCookieMag1 &&
          tibAsBytes[2] == kCookieMag2;
@@ -46,9 +46,9 @@ EXTERN_C Void tls_check_syscall_impl(NewOS::HAL::StackFramePtr stackPtr) noexcep
   ThreadInformationBlock* tib = (ThreadInformationBlock*)stackPtr->Gs;
 
   if (!tls_check_tib(tib)) {
-    kcout << "NewKernel.exe: Verification failed, Crashing...\n";
+    kcout << "NewOS: Verification failed, Crashing...\n";
     ProcessScheduler::Shared().Leak().GetCurrent().Leak().Crash();
   }
 
-  kcout << "NewKernel.exe: Verification succeeded! Keeping on...\n";
+  kcout << "NewOS: Verification succeeded! Keeping on...\n";
 }
diff --git a/Public/Documentation/Todo.md b/Public/Documentation/Todo.md
index 1e625233..2c4af6e5 100644
--- a/Public/Documentation/Todo.md
+++ b/Public/Documentation/Todo.md
@@ -16,6 +16,6 @@
 
 Status:
 
-NewBoot.exe: Need to boot from EPM partition.
-NewKernel.exe: New Filesystem in progress.
+NewBoot: Need to boot from EPM partition.
+NewKernel: New Filesystem in progress.