Update video card preference policy, together with some memory leaks in Generic BDS...

[mirror_edk2.git] / EdkUnixPkg / Library / EdkGenericBdsLib / BdsConsole.c

diff --git a/EdkUnixPkg/Library/EdkGenericBdsLib/BdsConsole.c b/EdkUnixPkg/Library/EdkGenericBdsLib/BdsConsole.c
index 721d74363a077370195054f527e6d9de9544cd77..6c9097f142eb963ee2e1df3b763822f6157b2090 100644 (file)
--- a/EdkUnixPkg/Library/EdkGenericBdsLib/BdsConsole.c
+++ b/EdkUnixPkg/Library/EdkGenericBdsLib/BdsConsole.c
@@ -19,6 +19,30 @@ Abstract:
 \r
 --*/\r
 \r
+BOOLEAN\r
+IsNvNeed (\r
+  IN CHAR16 *ConVarName\r
+  )\r
+{\r
+  CHAR16 *Ptr;\r
+  \r
+  Ptr = ConVarName;\r
+  \r
+  //\r
+  // If the variable includes "Dev" at last, we consider\r
+  // it does not support NV attribute.\r
+  //\r
+  while (*Ptr) {\r
+    Ptr++;\r
+  }\r
+  \r
+  if ((*(Ptr - 3) == 'D') && (*(Ptr - 2) == 'e') && (*(Ptr - 1) == 'v')) {\r
+    return FALSE;\r
+  } else {\r
+    return TRUE;\r
+  }\r
+}\r
+\r
 EFI_STATUS\r
 BdsLibUpdateConsoleVariable (\r
   IN  CHAR16                    *ConVarName,\r
@@ -56,12 +80,12 @@ Returns:
   EFI_STATUS                Status;\r
   EFI_DEVICE_PATH_PROTOCOL  *VarConsole;\r
   UINTN                     DevicePathSize;\r
-  EFI_DEVICE_PATH_PROTOCOL  *Instance;\r
   EFI_DEVICE_PATH_PROTOCOL  *NewDevicePath;\r
+  EFI_DEVICE_PATH_PROTOCOL  *TempNewDevicePath;\r
+  UINT32                    Attributes;\r
 \r
   VarConsole      = NULL;\r
   DevicePathSize  = 0;\r
-  NewDevicePath   = NULL;\r
   Status          = EFI_UNSUPPORTED;\r
 \r
   //\r
@@ -79,73 +103,70 @@ Returns:
                 &gEfiGlobalVariableGuid,\r
                 &DevicePathSize\r
                 );\r
-\r
+                \r
+  //\r
+  // Initialize NewDevicePath\r
+  //\r
+  NewDevicePath  = VarConsole;\r
+  \r
+  //\r
+  // If ExclusiveDevicePath is even the part of the instance in VarConsole, delete it.\r
+  // In the end, NewDevicePath is the final device path.\r
+  //\r
   if (ExclusiveDevicePath != NULL && VarConsole != NULL) {\r
-    if (BdsLibMatchDevicePaths (VarConsole, ExclusiveDevicePath)) {\r
-\r
-      Instance = GetNextDevicePathInstance (&VarConsole, &DevicePathSize);\r
-\r
-      while (VarConsole != NULL) {\r
-        if (CompareMem (\r
-              Instance,\r
-              ExclusiveDevicePath,\r
-              DevicePathSize - sizeof (EFI_DEVICE_PATH_PROTOCOL)\r
-              ) == 0) {\r
-          //\r
-          // Remove the match part\r
-          //\r
-          NewDevicePath = AppendDevicePathInstance (NewDevicePath, VarConsole);\r
-          break;\r
-        } else {\r
-          //\r
-          // Continue the next instance\r
-          //\r
-          NewDevicePath = AppendDevicePathInstance (NewDevicePath, Instance);\r
-        }\r
-\r
-        Instance = GetNextDevicePathInstance (&VarConsole, &DevicePathSize);\r
-      }\r
-      //\r
-      // Reset the console variable with new device path\r
-      //\r
-      gRT->SetVariable (\r
-            ConVarName,\r
-            &gEfiGlobalVariableGuid,\r
-            EFI_VARIABLE_BOOTSERVICE_ACCESS | EFI_VARIABLE_RUNTIME_ACCESS | EFI_VARIABLE_NON_VOLATILE,\r
-            GetDevicePathSize (NewDevicePath),\r
-            NewDevicePath\r
-            );\r
-    }\r
+      NewDevicePath = BdsLibDelPartMatchInstance (VarConsole, ExclusiveDevicePath);\r
   }\r
   //\r
-  // Try to append customized device path\r
+  // Try to append customized device path to NewDevicePath.\r
   //\r
-  VarConsole = BdsLibGetVariableAndSize (\r
-                ConVarName,\r
-                &gEfiGlobalVariableGuid,\r
-                &DevicePathSize\r
-                );\r
-\r
   if (CustomizedConDevicePath != NULL) {\r
-    if (!BdsLibMatchDevicePaths (VarConsole, CustomizedConDevicePath)) {\r
+    if (!BdsLibMatchDevicePaths (NewDevicePath, CustomizedConDevicePath)) {\r
       //\r
-      // In the first check, the default console variable will be null,\r
-      // just append current customized device path\r
+      // Check if there is part of CustomizedConDevicePath in NewDevicePath, delete it.\r
       //\r
-      VarConsole = AppendDevicePathInstance (VarConsole, CustomizedConDevicePath);\r
-\r
+      NewDevicePath = BdsLibDelPartMatchInstance (NewDevicePath, CustomizedConDevicePath);\r
       //\r
-      // Update the variable of the default console\r
+      // In the first check, the default console variable will be null,\r
+      // just append current customized device path\r
       //\r
-      gRT->SetVariable (\r
-            ConVarName,\r
-            &gEfiGlobalVariableGuid,\r
-            EFI_VARIABLE_BOOTSERVICE_ACCESS | EFI_VARIABLE_RUNTIME_ACCESS | EFI_VARIABLE_NON_VOLATILE,\r
-            GetDevicePathSize (VarConsole),\r
-            VarConsole\r
-            );\r
+      TempNewDevicePath = NewDevicePath;\r
+      NewDevicePath = AppendDevicePathInstance (NewDevicePath, CustomizedConDevicePath);\r
+      BdsLibSafeFreePool(TempNewDevicePath);\r
     }\r
   }\r
+  \r
+  //\r
+  // The attribute for ConInDev, ConOutDev and ErrOutDev does not include NV.\r
+  //\r
+  if (IsNvNeed(ConVarName)) {\r
+    //\r
+    // ConVarName has NV attribute.\r
+    //\r
+    Attributes = EFI_VARIABLE_BOOTSERVICE_ACCESS | EFI_VARIABLE_RUNTIME_ACCESS | EFI_VARIABLE_NON_VOLATILE;\r
+  } else {\r
+    //\r
+    // ConVarName does not have NV attribute.\r
+    //\r
+    Attributes = EFI_VARIABLE_BOOTSERVICE_ACCESS | EFI_VARIABLE_RUNTIME_ACCESS;\r
+  }\r
+  \r
+  //\r
+  // Finally, Update the variable of the default console by NewDevicePath\r
+  //\r
+  gRT->SetVariable (\r
+        ConVarName,\r
+        &gEfiGlobalVariableGuid,\r
+        Attributes,\r
+        GetDevicePathSize (NewDevicePath),\r
+        NewDevicePath\r
+        );\r
+\r
+  if (VarConsole == NewDevicePath) {\r
+    BdsLibSafeFreePool(VarConsole);\r
+  } else {\r
+    BdsLibSafeFreePool(VarConsole);\r
+    BdsLibSafeFreePool(NewDevicePath);\r
+  }\r
 \r
   return EFI_SUCCESS;\r
 \r
@@ -201,7 +222,7 @@ Returns:
     return EFI_UNSUPPORTED;\r
   }\r
 \r
-  CopyOfDevicePath = DuplicateDevicePath (StartDevicePath);\r
+  CopyOfDevicePath = StartDevicePath;\r
   do {\r
     //\r
     // Check every instance of the console variable\r
@@ -226,7 +247,7 @@ Returns:
     } else {\r
       DeviceExist = TRUE;\r
     }\r
-\r
+    BdsLibSafeFreePool(Instance);\r
   } while (CopyOfDevicePath != NULL);\r
 \r
   gBS->FreePool (StartDevicePath);\r
@@ -289,6 +310,8 @@ Returns:
     BdsLibUpdateConsoleVariable (L"ConIn", ConDevicePath, NULL);\r
   }\r
 \r
+  BdsLibSafeFreePool(HandleBuffer);\r
+\r
   Status = gBS->LocateHandleBuffer (\r
                   ByProtocol,\r
                   &gEfiSimpleTextOutProtocolGuid,\r
@@ -305,6 +328,9 @@ Returns:
     BdsLibUpdateConsoleVariable (L"ConOut", ConDevicePath, NULL);\r
     BdsLibUpdateConsoleVariable (L"ErrOut", ConDevicePath, NULL);\r
   }\r
+\r
+  BdsLibSafeFreePool(HandleBuffer);\r
+\r
   //\r
   // Connect all console variables\r
   //\r
@@ -337,8 +363,6 @@ Returns:
 --*/\r
 {\r
   EFI_STATUS                Status;\r
-  EFI_DEVICE_PATH_PROTOCOL  *VarErrout;\r
-  UINTN                     DevicePathSize;\r
 \r
   //\r
   // Connect all default console variables\r
@@ -356,14 +380,7 @@ Returns:
   // Special treat the err out device, becaues the null\r
   // err out var is legal.\r
   //\r
-  VarErrout = BdsLibGetVariableAndSize (\r
-                L"ErrOut",\r
-                &gEfiGlobalVariableGuid,\r
-                &DevicePathSize\r
-                );\r
-  if (VarErrout != NULL) {\r
-    BdsLibConnectConsoleVariable (L"ErrOut");\r
-  }\r
+  BdsLibConnectConsoleVariable (L"ErrOut");\r
 \r
   return EFI_SUCCESS;\r
 \r