WIP: changes for checking boot nvram

mikebeaton · Feb 14, 2021 · fb8e429 · fb8e429
1 parent 4cb9e92
commit fb8e429
Show file tree

Hide file tree

Showing 6 changed files with 53 additions and 27 deletions.
diff --git a/Application/BootHelper/BhConfig.c b/Application/BootHelper/BhConfig.c
@@ -251,10 +251,11 @@ BhConfigurationInit (
   IN  UINT32             Size
   )
 {
-  BOOLEAN  Success;
+  BOOLEAN   Success;
+  UINT32    ErrorCount;
 
   BH_GLOBAL_CONFIG_CONSTRUCT (Config, sizeof (*Config));
-  Success = ParseSerialized (Config, &mRootConfigurationInfo, Buffer, Size);
+  Success = ParseSerialized (Config, &mRootConfigurationInfo, Buffer, Size, &ErrorCount);
 
   if (!Success) {
     BH_GLOBAL_CONFIG_DESTRUCT (Config, sizeof (*Config));

diff --git a/Application/BootHelper/BhConfig.h b/Application/BootHelper/BhConfig.h
@@ -22,7 +22,7 @@
 #include <Library/DebugLib.h>
 #include <Library/OcSerializeLib.h>
 #include <Library/OcBootManagementLib.h>
-#include <Library/OcConfigurationConstants.h>
+#include <Library/OcConfigurationLib.h>
 
 /**
   Config section

diff --git a/Application/BootHelper/BootHelper.c b/Application/BootHelper/BootHelper.c
@@ -33,8 +33,9 @@
 #include "Utils.h"
 
 BOOLEAN mInteractive            = TRUE;
-BOOLEAN mClearScreen            = FALSE;
+BOOLEAN mClearScreen            = TRUE;
 BOOLEAN mKeyPromptOnExit        = FALSE;
+BOOLEAN mLoadConfig             = FALSE;
 BH_ON_EXIT mBhOnExit            = BhOnExitExit;
 
 #if false
@@ -56,9 +57,13 @@ UefiUnload (
   { 0x4d1fda02, 0x38c7, 0x4a6a, {0x9c, 0xc6, 0x4b, 0xcc, 0xa8, 0xb3, 0x01, 0x02} }
 STATIC EFI_GUID gEfiOpenCoreGuid = EFI_OPEN_CORE_GUID;
 
-#define EFI_APPLE_GUID \
+#define EFI_APPLE_BOOT_GUID \
   { 0x7c436110, 0xab2a, 0x4bbb, {0xa8, 0x80, 0xfe, 0x41, 0x99, 0x5c, 0x9f, 0x82} }
-STATIC EFI_GUID gEfiAppleGuid = EFI_APPLE_GUID;
+STATIC EFI_GUID gEfiAppleBootGuid = EFI_APPLE_BOOT_GUID;
+
+#define EFI_APPLE_VENDOR_GUID \
+  { 0x4d1ede05, 0x38c7, 0x4a6a, {0x9c, 0xc6, 0x4b, 0xcc, 0xa8, 0xb3, 0x8c, 0x14} }
+STATIC EFI_GUID gEfiAppleVendorGuid = EFI_APPLE_VENDOR_GUID;
 
 // with zero terminator
 STATIC CHAR8 gBootArgsVal[] = "-no_compat_check";
@@ -72,7 +77,7 @@ DisplayAppleVar(
   BOOLEAN isString
   )
 {
-  DisplayNvramValueWithoutGuid(Name, &gEfiAppleGuid, isString);
+  DisplayNvramValueWithoutGuid(Name, &gEfiAppleBootGuid, isString);
 }
 
 EFI_STATUS
@@ -82,7 +87,7 @@ ToggleAppleVar(
   UINTN PreferredSize
   )
 {
-  return ToggleOrSetVar(Name, &gEfiAppleGuid, PreferredValue, PreferredSize, TRUE);
+  return ToggleOrSetVar(Name, &gEfiAppleBootGuid, PreferredValue, PreferredSize, TRUE);
 }
 
 EFI_STATUS
@@ -92,7 +97,7 @@ SetAppleVar(
   UINTN PreferredSize
   )
 {
-  return ToggleOrSetVar(Name, &gEfiAppleGuid, PreferredValue, PreferredSize, FALSE);
+  return ToggleOrSetVar(Name, &gEfiAppleBootGuid, PreferredValue, PreferredSize, FALSE);
 }
 
 void ToggleBootArgs()
@@ -124,18 +129,19 @@ EFI_STATUS
 EFIAPI
 BhMain ()
 {
-  BOOLEAN showOCVersion = FALSE;
+  BOOLEAN showOCVersion = TRUE;
 
   while (TRUE) {
     // inter alia, we want to clear the other stuff on the hidden text screen, before switching to viewing the text...
     if (mClearScreen) gST->ConOut->ClearScreen(gST->ConOut);
 
     SetColour(EFI_LIGHTMAGENTA);
     Print(L"macOS NVRAM Boot Helper\n");
-    Print(L"0.2.8 oc-340\n");
+    Print(L"0.2.9 guid\n");
     SetColour(EFI_WHITE);
-    Print(L"\n");
 
+#if 0
+    Print(L"\n");
     CONST CHAR8 *AsciiPicker;
     AsciiPicker = OC_BLOB_GET (&mBootHelperConfiguration.Config.Xanana);
     for (UINTN i = 0; ; i++) {
@@ -144,15 +150,27 @@ BhMain ()
       Print (L"%c", (CHAR16)c);
     }
     Print(L"\n");
+#endif
+
+    if (showOCVersion) {
+      Print(L"\n");
+      DisplayNvramValueWithoutGuid(L"opencore-version", &gEfiOpenCoreGuid, TRUE);
+    }
+
+    Print(L"\n");
+    DisplayNvramValueWithoutGuid(L"SSN", &gEfiAppleVendorGuid, TRUE);
+    DisplayNvramValueWithoutGuid(L"system-id", &gEfiAppleVendorGuid, TRUE);
+    DisplayNvramValueWithoutGuid(L"ROM", &gEfiAppleVendorGuid, TRUE);
+    DisplayNvramValueWithoutGuid(L"HW_ROM", &gEfiAppleVendorGuid, TRUE);
+    DisplayNvramValueWithoutGuid(L"MLB", &gEfiAppleVendorGuid, TRUE);
+    DisplayNvramValueWithoutGuid(L"HW_MLB", &gEfiAppleVendorGuid, TRUE);
 
 #if 1
+    Print(L"\n");
     DisplayAppleVar(L"boot-args", TRUE);
     DisplayAppleVar(L"csr-active-config", FALSE);
     DisplayAppleVar(L"StartupMute", TRUE);
 #endif
-    if (showOCVersion) {
-      DisplayNvramValueWithoutGuid(L"opencore-version", &gEfiOpenCoreGuid, TRUE);
-    }
 
     SetColour(EFI_LIGHTRED);
     Print(L"\nboot-[A]rgs; [B]ig Sur; [C]atalina; Startup[M]ute\n[R]eboot; [S]hutdown; [Q]uit; E[x]it; [L]ist\n");
@@ -284,20 +302,26 @@ BhConfigAndMain (
 {
   EFI_STATUS                Status;
 
-  DEBUG ((DEBUG_INFO, "BH: BhConfigAndMain calling BhConfigLoad...\n"));
-  Status = BhConfigLoad (
-    Storage,
-    &mBootHelperConfiguration,
-    mOpenCoreVaultKey
-    );
+  if (mLoadConfig) {
+    DEBUG ((DEBUG_INFO, "BH: BhConfigAndMain calling BhConfigLoad...\n"));
+    Status = BhConfigLoad (
+      Storage,
+      &mBootHelperConfiguration,
+      mOpenCoreVaultKey
+      );
 
-  if (EFI_ERROR (Status)) {
-    return Status;
+    if (EFI_ERROR (Status)) {
+      return Status;
+    }
+  } else {
+    DEBUG ((DEBUG_WARN, "BH: Load config disabled\n"));
   }
 
   Status = BhMain();
 
-  BhConfigurationFree (&mBootHelperConfiguration);
+  if (mLoadConfig) {
+    BhConfigurationFree (&mBootHelperConfiguration);
+  }
 
   return Status;
 }

diff --git a/Application/BootHelper/BootHelper.inf b/Application/BootHelper/BootHelper.inf
@@ -51,7 +51,8 @@
 [LibraryClasses]
   BaseLib
   BaseMemoryLib
-  MemoryAllocationLib
+  MemoryAllocationLib ### TEST - What does removing this break? And why do(n't) we need OcConfigurationLib?
+  OcConfigurationLib
   OcConsoleControlEntryModeGenericLib
   OcStorageLib
   UefiApplicationEntryPoint

diff --git a/Application/BootHelper/DisplayVars.c b/Application/BootHelper/DisplayVars.c
@@ -186,7 +186,7 @@ DisplayNvramValueOptionalGuid (
   VOID *Data;
 
   if (displayGuid) {
-      Print(L"%g:", Name);
+      Print(L"%g:", Guid);
   }
 
     Print(L"%s", Name);

diff --git a/BootHelperPkg.dsc b/BootHelperPkg.dsc
@@ -30,7 +30,7 @@
   DebugPrintErrorLevelLib|MdePkg/Library/BaseDebugPrintErrorLevelLib/BaseDebugPrintErrorLevelLib.inf
   DevicePathLib|MdePkg/Library/UefiDevicePathLib/UefiDevicePathLib.inf
   MemoryAllocationLib|MdePkg/Library/UefiMemoryAllocationLib/UefiMemoryAllocationLib.inf
-#  OcConfigurationLib|OpenCorePkg/Library/OcConfigurationLib/OcConfigurationLib.inf
+  OcConfigurationLib|OpenCorePkg/Library/OcConfigurationLib/OcConfigurationLib.inf
   OcConsoleControlEntryModeGenericLib|OpenCorePkg/Library/OcConsoleControlEntryModeLib/OcConsoleControlEntryModeGenericLib.inf
   OcStorageLib|OpenCorePkg/Library/OcStorageLib/OcStorageLib.inf
   PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf