summaryrefslogtreecommitdiffhomepage
path: root/Private/NewBoot
diff options
context:
space:
mode:
Diffstat (limited to 'Private/NewBoot')
-rw-r--r--Private/NewBoot/BootKit/Arch/ATA.hxx11
-rw-r--r--Private/NewBoot/Source/HEL/AMD64/BootMain.cxx5
2 files changed, 4 insertions, 12 deletions
diff --git a/Private/NewBoot/BootKit/Arch/ATA.hxx b/Private/NewBoot/BootKit/Arch/ATA.hxx
index 8cd948a3..8e0a15eb 100644
--- a/Private/NewBoot/BootKit/Arch/ATA.hxx
+++ b/Private/NewBoot/BootKit/Arch/ATA.hxx
@@ -8,6 +8,8 @@
#include <Builtins/ATA/Defines.hxx>
+using namespace HCore;
+
class BDeviceATA final {
public:
enum {
@@ -40,12 +42,3 @@ class BDeviceATA final {
private:
ATATrait mTrait;
};
-
-enum {
- kATADevicePATA,
- kATADeviceSATA,
- kATADevicePATA_PI,
- kATADeviceSATA_PI,
- kATADeviceCount,
-};
-
diff --git a/Private/NewBoot/Source/HEL/AMD64/BootMain.cxx b/Private/NewBoot/Source/HEL/AMD64/BootMain.cxx
index 5bff5929..a3f82275 100644
--- a/Private/NewBoot/Source/HEL/AMD64/BootMain.cxx
+++ b/Private/NewBoot/Source/HEL/AMD64/BootMain.cxx
@@ -31,8 +31,7 @@ EFI_EXTERN_C EFI_API Int EfiMain(EfiHandlePtr ImageHandle,
/// Splash screen stuff
writer.Write(L"MahroussLogic (R) NewBoot: ")
- .Write(BVersionString::Shared())
- .Write(L"\r\n");
+ .Write(BVersionString::Shared());
writer.Write(L"\r\nNewBoot: Firmware Vendor: ")
.Write(SystemTable->FirmwareVendor)
@@ -46,7 +45,7 @@ EFI_EXTERN_C EFI_API Int EfiMain(EfiHandlePtr ImageHandle,
kernelImg.ReadAll();
if (kernelImg.Error() == BFileReader::kOperationOkay) {
- // First check for a kernel.cfg inside the ESP.
+ // First check for a .MANIFEST inside the ESP.
// This will tell us about the current kernel.
BFileReader systemManifest(L".MANIFEST", ImageHandle);