2 files changed, 9 insertions, 8 deletions
diff --git a/dev/boot/BootKit/BootKit.h b/dev/boot/BootKit/BootKit.h
index 181be973..cc80e359 100644
--- a/dev/boot/BootKit/BootKit.h
+++ b/dev/boot/BootKit/BootKit.h
@@ -40,7 +40,7 @@
 /***********************************************************************************/
 
 namespace Boot {
-EXTERN void ThrowError(const WideChar* errorCode, const WideChar* reason) noexcept;
+void ThrowError(const WideChar* errorCode, const WideChar* reason) noexcept;
 
 class BootTextWriter;
 class BootFileReader;
@@ -51,7 +51,8 @@ typedef Char* PEFImagePtr;
 typedef Char* PEImagePtr;
 
 typedef WideChar CharacterTypeUTF16;
-typedef Char     CharacterTypeUTF8;
+typedef Char     CharacterTypeASCII;
+typedef char8_t  CharacterTypeUTF8;
 
 using namespace Kernel;
 
@@ -86,7 +87,7 @@ class BootTextWriter final {
 
 Kernel::SizeT BCopyMem(CharacterTypeUTF16* dest, CharacterTypeUTF16* src, const Kernel::SizeT len);
 
-Kernel::SizeT BSetMem(CharacterTypeUTF8* src, const CharacterTypeUTF8 byte,
+Kernel::SizeT BSetMem(CharacterTypeASCII* src, const CharacterTypeASCII byte,
                       const Kernel::SizeT len);
 
 /// String length functions.
@@ -151,7 +152,7 @@ typedef UInt8* BlobType;
 /// @brief Bootloader Version String.
 class BVersionString final {
  public:
-  static const CharacterTypeUTF8* The() { return BOOTLOADER_VERSION; }
+  static const CharacterTypeASCII* The() { return BOOTLOADER_VERSION; }
 };
 
 /***********************************************************************************/
diff --git a/dev/boot/BootKit/HW/SATA.h b/dev/boot/BootKit/HW/SATA.h
index 8cf48ec7..eecf426d 100644
--- a/dev/boot/BootKit/HW/SATA.h
+++ b/dev/boot/BootKit/HW/SATA.h
@@ -10,6 +10,8 @@
 #include <CompilerKit/CompilerKit.h>
 #include <modules/AHCI/AHCI.h>
 
+#define kAHCISectorSz (4096)
+
 class BootDeviceSATA final {
  public:
   explicit BootDeviceSATA() noexcept;
@@ -32,13 +34,11 @@ class BootDeviceSATA final {
 
   constexpr static auto kSectorSize = kAHCISectorSize;
 
-  BootDeviceSATA& Read(Boot::CharacterTypeUTF8* Buf, const Kernel::SizeT SecCount);
-  BootDeviceSATA& Write(Boot::CharacterTypeUTF8* Buf, const Kernel::SizeT SecCount);
+  BootDeviceSATA& Read(Boot::CharacterTypeASCII* Buf, const Kernel::SizeT SecCount);
+  BootDeviceSATA& Write(Boot::CharacterTypeASCII* Buf, const Kernel::SizeT SecCount);
 
   SATATrait& Leak();
 
  private:
   SATATrait mTrait;
 };
-
-#define kAHCISectorSz 4096