Add in HII enable support for PCD.

But the default value has not been enabled.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@498 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/EdkModulePkg/Universal/PCD/Dxe/Service.c b/EdkModulePkg/Universal/PCD/Dxe/Service.c
index 84bfae7bf0841cc8044c4052f3c8dca5a13473b1..36e859c779d15e114ca1303ae507971615230b47 100644 (file)
--- a/EdkModulePkg/Universal/PCD/Dxe/Service.c
+++ b/EdkModulePkg/Universal/PCD/Dxe/Service.c
@@ -95,10 +95,16 @@ GetWorker (
       Name = &(StringTable[VariableHead->StringIndex]);\r
 \r
       Status = GetHiiVariable (Guid, Name, &Data, &DataSize);\r
-      ASSERT_EFI_ERROR (Status);\r
-      ASSERT (DataSize >= (UINTN) (VariableHead->Offset + Size));\r
-\r
-      return (UINT8 *) Data + VariableHead->Offset;\r
+      if (Status == EFI_SUCCESS) {\r
+        ASSERT (DataSize >= (UINTN) (VariableHead->Offset + Size));\r
+        return (UINT8 *) Data + VariableHead->Offset;\r
+      } else {\r
+        //\r
+        // BugBug: Need to support default value. The current implementation\r
+        // will return a memory buffer with ALL ZERO.\r
+        // \r
+        return AllocateZeroPool (Size);\r
+       }\r
 \r
     case PCD_TYPE_STRING:\r
       StringTableIdx = (UINT16) *((UINT8 *) PcdDb + Offset);\r
@@ -343,19 +349,22 @@ GetHiiVariable (
     &Size,\r
     NULL\r
     );\r
-  ASSERT (Status == EFI_BUFFER_TOO_SMALL);\r
+  if (Status == EFI_BUFFER_TOO_SMALL) {\r
 \r
-  Buffer = AllocatePool (Size);\r
+    Buffer = AllocatePool (Size);\r
 \r
-  ASSERT (Buffer != NULL);\r
+    ASSERT (Buffer != NULL);\r
 \r
-  Status = EfiGetVariable (\r
-    VariableName,\r
-    VariableGuid,\r
-    NULL,\r
-    &Size,\r
-    Buffer\r
-    );\r
+    Status = EfiGetVariable (\r
+      VariableName,\r
+      VariableGuid,\r
+      NULL,\r
+      &Size,\r
+      Buffer\r
+      );\r
+\r
+    ASSERT (Status == EFI_SUCCESS);\r
+  }\r
 \r
   return Status;\r
 \r
@@ -470,6 +479,7 @@ SetWorker (
   UINT16              *StringTable;\r
   EFI_GUID            *Guid;\r
   UINT16              *Name;\r
+  UINTN               VariableOffset;\r
   VOID                *InternalData;\r
   VARIABLE_HEAD       *VariableHead;\r
   UINTN               Offset;\r
@@ -519,7 +529,7 @@ SetWorker (
     \r
     case PCD_TYPE_STRING:\r
       CopyMem (&StringTable[*((UINT16 *)InternalData)], Data, Size);\r
-      break;\r
+      return EFI_SUCCESS;\r
 \r
     case PCD_TYPE_HII:\r
       //\r
@@ -532,8 +542,9 @@ SetWorker (
       \r
       Guid = &(GuidTable[VariableHead->GuidTableIndex]);\r
       Name = &(StringTable[VariableHead->StringIndex]);\r
+      VariableOffset = VariableHead->Offset;\r
 \r
-      return EFI_SUCCESS;\r
+      return SetHiiVariable (Guid, Name, Data, Size, VariableOffset);\r
 \r
     case PCD_TYPE_DATA:\r
       if (PtrType) {\r
@@ -638,30 +649,41 @@ SetHiiVariable (
     NULL\r
     );\r
 \r
-  ASSERT (Status == EFI_BUFFER_TOO_SMALL);\r
+  if (Status == EFI_BUFFER_TOO_SMALL) {\r
 \r
-  Buffer = AllocatePool (Size);\r
+    Buffer = AllocatePool (Size);\r
 \r
-  ASSERT (Buffer != NULL);\r
+    ASSERT (Buffer != NULL);\r
 \r
-  Status = EfiGetVariable (\r
-    VariableName,\r
-    VariableGuid,\r
-    &Attribute,\r
-    &Size,\r
-    Buffer\r
-    );\r
+    Status = EfiGetVariable (\r
+      VariableName,\r
+      VariableGuid,\r
+      &Attribute,\r
+      &Size,\r
+      Buffer\r
+      );\r
+    \r
+    ASSERT_EFI_ERROR (Status);\r
 \r
+    CopyMem ((UINT8 *)Buffer + Offset, Data, DataSize);\r
 \r
-  CopyMem ((UINT8 *)Buffer + Offset, Data, DataSize);\r
+  } else {\r
+\r
+    Attribute = EFI_VARIABLE_NON_VOLATILE | EFI_VARIABLE_BOOTSERVICE_ACCESS | EFI_VARIABLE_RUNTIME_ACCESS;\r
+    Size = DataSize + Offset;\r
+    Buffer = AllocateZeroPool (Size);\r
+    ASSERT (Buffer != NULL);\r
+    CopyMem ((UINT8 *)Buffer + Offset, Data, DataSize);\r
+    \r
+  }\r
 \r
   return EfiSetVariable (\r
-    VariableName,\r
-    VariableGuid,\r
-    Attribute,\r
-    Size,\r
-    Buffer\r
-    );\r
+            VariableName,\r
+            VariableGuid,\r
+            Attribute,\r
+            Size,\r
+            Buffer\r
+            );\r
 \r
 }\r
 \r

diff --git a/EdkModulePkg/Universal/PCD/Dxe/Service.h b/EdkModulePkg/Universal/PCD/Dxe/Service.h
index 59ec06352e6b752ae2a957700dfbd1de43b31d3e..a1757ed056f162e97c2eba43e221755c766e795c 100644 (file)
--- a/EdkModulePkg/Universal/PCD/Dxe/Service.h
+++ b/EdkModulePkg/Universal/PCD/Dxe/Service.h
@@ -96,6 +96,16 @@ GetHiiVariable (
   )\r
 ;\r
 \r
+EFI_STATUS\r
+SetHiiVariable (\r
+  IN  EFI_GUID     *VariableGuid,\r
+  IN  UINT16       *VariableName,\r
+  IN  CONST VOID   *Data,\r
+  IN  UINTN        DataSize,\r
+  IN  UINTN        Offset\r
+  )\r
+;\r
+\r
 EFI_STATUS\r
 DxeRegisterCallBackWorker (\r
   IN  UINTN                   TokenNumber,\r

diff --git a/EdkModulePkg/Universal/PCD/Pei/Service.c b/EdkModulePkg/Universal/PCD/Pei/Service.c
index 2de061bdb061f1cf1bc0be11560e17dce50ec88d..0574ae40428a108c39a0f3aeb9c3efa6e3f89839 100644 (file)
--- a/EdkModulePkg/Universal/PCD/Pei/Service.c
+++ b/EdkModulePkg/Universal/PCD/Pei/Service.c
@@ -148,7 +148,6 @@ GetHiiVariable (
   ASSERT_EFI_ERROR (Status);\r
 \r
   Size = 0;\r
-\r
   Status = VariablePpi->PeiGetVariable (\r
                           GetPeiServicesTablePointer (),\r
                           VariableName,\r
@@ -157,25 +156,30 @@ GetHiiVariable (
                           &Size,\r
                           NULL\r
                             );\r
-  ASSERT (Status == EFI_BUFFER_TOO_SMALL);\r
+  if (Status == EFI_BUFFER_TOO_SMALL) {\r
 \r
-  Status = PeiServicesAllocatePool (Size, &Buffer);\r
-  ASSERT_EFI_ERROR (Status);\r
 \r
-  Status = VariablePpi->PeiGetVariable (\r
-                            GetPeiServicesTablePointer (),\r
-                            (UINT16 *) VariableName,\r
-                            (EFI_GUID *) VariableGuid,\r
-                            NULL,\r
-                            &Size,\r
-                            Buffer\r
-                            );\r
-  ASSERT_EFI_ERROR (Status);\r
+    Status = PeiServicesAllocatePool (Size, &Buffer);\r
+    ASSERT_EFI_ERROR (Status);\r
 \r
-  *VariableSize = Size;\r
-  *VariableData = Buffer;\r
+    Status = VariablePpi->PeiGetVariable (\r
+                              GetPeiServicesTablePointer (),\r
+                              (UINT16 *) VariableName,\r
+                              (EFI_GUID *) VariableGuid,\r
+                              NULL,\r
+                              &Size,\r
+                              Buffer\r
+                              );\r
+    ASSERT_EFI_ERROR (Status);\r
+\r
+    *VariableSize = Size;\r
+    *VariableData = Buffer;\r
+\r
+    return EFI_SUCCESS;\r
+  } else {\r
+    return EFI_NOT_FOUND;\r
+  }\r
 \r
-  return EFI_SUCCESS;\r
 }\r
 \r
 \r
@@ -454,10 +458,17 @@ GetWorker (
       Name = &StringTable[VariableHead->StringIndex];\r
 \r
       Status = GetHiiVariable (Guid, Name, &Data, &DataSize);\r
-      ASSERT_EFI_ERROR (Status);\r
-      ASSERT (DataSize >= (UINTN) (VariableHead->Offset + Size));\r
 \r
-      return (VOID *) ((UINT8 *) Data + VariableHead->Offset);\r
+      if (Status == EFI_SUCCESS) {\r
+        ASSERT (DataSize >= (UINTN) (VariableHead->Offset + Size));\r
+        return (VOID *) ((UINT8 *) Data + VariableHead->Offset);\r
+      } else {\r
+        //\r
+        // BugBug: Need to support default value. The current implementation\r
+        // will return a memory buffer with ALL ZERO.\r
+        // \r
+        return AllocateZeroPool (Size);\r
+      }\r
     }\r
 \r
     case PCD_TYPE_DATA:\r