Merged in MHR-5 (pull request #1)

MHR-5

6 files changed, 13 insertions, 12 deletions

diff --git a/Private/KernelKit/DriveManager.hxx b/Private/KernelKit/DriveManager.hxx
index e66dedc8..c3d7c484 100644
--- a/Private/KernelKit/DriveManager.hxx
+++ b/Private/KernelKit/DriveManager.hxx
@@ -92,7 +92,7 @@ class MountpointInterface final {
         return &mD;
       default: {
         DbgLastError() = kErrorNoSuchDisk;
-        kcout << "NewOS: No such disk.\n";
+        kcout << "New OS: No such disk.\n";
 
         break;
       }
@@ -106,13 +106,13 @@ class MountpointInterface final {
 };
 
 /// @brief Unimplemented drive.
-/// @param pckt 
-/// @return 
+/// @param pckt
+/// @return
 Void ke_drv_unimplemented(DriveTrait::DrivePacket* pckt);
 
 /// @brief Gets the drive kind (ATA, SCSI, AHCI...)
-/// @param  
-/// @return 
+/// @param
+/// @return
 const Char* ke_drive_kind(Void);
 
 /// @brief Makes a new drive.
diff --git a/Private/KernelKit/HError.hpp b/Private/KernelKit/HError.hpp
index a3ea5d61..b82f7c6b 100644
--- a/Private/KernelKit/HError.hpp
+++ b/Private/KernelKit/HError.hpp
@@ -35,6 +35,7 @@ inline constexpr HError kErrorOutOfTeamSlot = 51;
 inline constexpr HError kErrorHeapNotPresent = 52;
 inline constexpr HError kErrorNoEntrypoint = 53;
 inline constexpr HError kErrorDiskIsCorrupted = 54;
+inline constexpr HError kErrorDisk = 55;
 inline constexpr HError kErrorUnimplemented = 0;
 
 Boolean ke_bug_check(void) noexcept;
diff --git a/Private/KernelKit/KernelHeap.hpp b/Private/KernelKit/KernelHeap.hpp
index 5358236e..471dcb54 100644
--- a/Private/KernelKit/KernelHeap.hpp
+++ b/Private/KernelKit/KernelHeap.hpp
@@ -13,7 +13,7 @@
 #include <NewKit/Defines.hpp>
 
 namespace NewOS {
-    
+
 /// @brief Declare pointer as free.
 /// @param heapPtr the pointer.
 /// @return
@@ -31,7 +31,7 @@ Boolean ke_is_valid_heap(VoidPtr ptr);
 /// @return the pointer
 voidPtr ke_new_ke_heap(SizeT sz, const bool rw, const bool user);
 
-/// @brief Protect the heap pointer with a CRC32.
+/// @brief Protect the heap with a CRC value.
 /// @param heapPtr HIB pointer.
 /// @return if it valid: point has crc now., otherwise fail.
 Boolean ke_protect_ke_heap(VoidPtr heapPtr);
diff --git a/Private/KernelKit/PEFCodeManager.hxx b/Private/KernelKit/PEFCodeManager.hxx
index d9e857de..1f5269ae 100644
--- a/Private/KernelKit/PEFCodeManager.hxx
+++ b/Private/KernelKit/PEFCodeManager.hxx
@@ -24,7 +24,7 @@ class PEFLoader : public LoaderInterface {
 
  public:
   explicit PEFLoader(const VoidPtr blob);
-  explicit PEFLoader(const char *path);
+  explicit PEFLoader(const Char* path);
   ~PEFLoader() override;
 
  public:
diff --git a/Private/KernelKit/SMPManager.hpp b/Private/KernelKit/SMPManager.hpp
index 631b29ea..17ea9d38 100644
--- a/Private/KernelKit/SMPManager.hpp
+++ b/Private/KernelKit/SMPManager.hpp
@@ -31,7 +31,7 @@ enum ThreadKind {
 
 ///
 /// \name HardwareThread
-/// @brief CPU Hardware Thread (PowerPC, Intel, or NewCPU)
+/// @brief CPU Hardware Thread (POWER, x64, or 64x0)
 ///
 
 class HardwareThread final {
diff --git a/Private/KernelKit/XCOFF.hxx b/Private/KernelKit/XCOFF.hxx
index 35ca9896..631efdf3 100644
--- a/Private/KernelKit/XCOFF.hxx
+++ b/Private/KernelKit/XCOFF.hxx
@@ -16,14 +16,14 @@
 
 #include <NewKit/Defines.hpp>
 
-#define kXCOFF64Magic    0x01F7 
+#define kXCOFF64Magic    0x01F7
 
 #define kXCOFFRelFlg     0x0001
 #define kXCOFFExecutable 0x0002
 #define kXCOFFLnno       0x0004
 #define kXCOFFLSyms      0x0008
 
-/// @brief XCoff file header, meant for PowerPC programs.
+/// @brief XCoff file header, meant for POWER apps.
 typedef struct XCoffFileHeader
 {
     NewOS::UInt16 fMagic;
@@ -35,4 +35,4 @@ typedef struct XCoffFileHeader
     NewOS::UInt16 fOptHdr; // ?: Number of bytes in optional header
 } XCoffFileHeader;
 
-#endif // ifndef __XCOFF__
\ No newline at end of file
+#endif // ifndef __XCOFF__