VirtualBox

Ignore:
Timestamp:
Oct 28, 2015 8:17:18 PM (9 years ago)
Author:
vboxsync
svn:sync-xref-src-repo-rev:
103761
Message:

EFI/Firmware: 'svn merge /vendor/edk2/UDK2010.SR1 /vendor/edk2/current .', reverting and removing files+dirs listed in ReadMe.vbox, resolving conflicts with help from ../UDK2014.SP1/. This is a raw untested merge.

Location:
trunk/src/VBox/Devices/EFI/Firmware
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/VBox/Devices/EFI/Firmware

  • trunk/src/VBox/Devices/EFI/Firmware/MdePkg/Library/DxePcdLib/DxePcdLib.c

    r48674 r58459  
    22Implementation of PcdLib class library for DXE phase.
    33
    4 Copyright (c) 2006 - 2010, Intel Corporation. All rights reserved.<BR>
     4Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.<BR>
    55This program and the accompanying materials                         
    66are licensed and made available under the terms and conditions of the BSD License         
    … …  
    1919#include <Protocol/Pcd.h>
    2020#include <Protocol/PiPcd.h>
     21#include <Protocol/PcdInfo.h>
     22#include <Protocol/PiPcdInfo.h>
    2123
    2224#include <Library/PcdLib.h>
    … …  
    2527#include <Library/BaseMemoryLib.h>
    2628
    27 PCD_PROTOCOL     *mPcd   = NULL;
    28 EFI_PCD_PROTOCOL *mPiPcd = NULL;
     29PCD_PROTOCOL                *mPcd       = NULL;
     30EFI_PCD_PROTOCOL            *mPiPcd     = NULL;
     31GET_PCD_INFO_PROTOCOL       *mPcdInfo   = NULL;
     32EFI_GET_PCD_INFO_PROTOCOL   *mPiPcdInfo = NULL;
    2933
    3034/**
    3135  Retrieves the PI PCD protocol from the handle database.
     36
     37  @retval EFI_PCD_PROTOCOL * The pointer to the EFI_PCD_PROTOCOL.
    3238**/
    3339EFI_PCD_PROTOCOL *
    … …  
    5359/**
    5460  Retrieves the PCD protocol from the handle database.
     61
     62  @retval PCD_PROTOCOL * The pointer to the PCD_PROTOCOL.
    5563**/
    5664PCD_PROTOCOL *
    … …  
    7482}
    7583
     84/**
     85  Retrieves the PI PCD info protocol from the handle database.
     86
     87  @retval EFI_GET_PCD_INFO_PROTOCOL * The pointer to the EFI_GET_PCD_INFO_PROTOCOL defined in PI 1.2.1 Vol 3.
     88**/
     89EFI_GET_PCD_INFO_PROTOCOL *
     90GetPiPcdInfoProtocolPointer (
     91  VOID
     92  )
     93{
     94  EFI_STATUS  Status;
     95
     96  if (mPiPcdInfo == NULL) {
     97    Status = gBS->LocateProtocol (&gEfiGetPcdInfoProtocolGuid, NULL, (VOID **)&mPiPcdInfo);
     98    ASSERT_EFI_ERROR (Status);
     99    ASSERT (mPiPcdInfo != NULL);
     100  }
     101  return mPiPcdInfo;
     102}
     103
     104/**
     105  Retrieves the PCD info protocol from the handle database.
     106
     107  @retval GET_PCD_INFO_PROTOCOL * The pointer to the GET_PCD_INFO_PROTOCOL.
     108**/
     109GET_PCD_INFO_PROTOCOL *
     110GetPcdInfoProtocolPointer (
     111  VOID
     112  )
     113{
     114  EFI_STATUS  Status;
     115
     116  if (mPcdInfo == NULL) {
     117    Status = gBS->LocateProtocol (&gGetPcdInfoProtocolGuid, NULL, (VOID **)&mPcdInfo);
     118    ASSERT_EFI_ERROR (Status);
     119    ASSERT (mPcdInfo != NULL);
     120  }
     121  return mPcdInfo;
     122}
    76123
    77124/**
    … …  
    443490  Sets the 8-bit value for the token specified by TokenNumber
    444491  to the value specified by Value.  Value is returned.
    445  
     492
     493  If the set operation was not correctly performed, then ASSERT().
     494
    446495  @param[in]  TokenNumber   The PCD token number to set a current value for.
    447496  @param[in]  Value         The 8-bit value to set.
    … …  
    472521  Sets the 16-bit value for the token specified by TokenNumber
    473522  to the value specified by Value.  Value is returned.
    474  
     523
     524  If the set operation was not correctly performed, then ASSERT().
     525
    475526  @param[in]  TokenNumber   The PCD token number to set a current value for.
    476527  @param[in]  Value         The 16-bit value to set.
    … …  
    501552  Sets the 32-bit value for the token specified by TokenNumber
    502553  to the value specified by Value.  Value is returned.
    503  
     554
     555  If the set operation was not correctly performed, then ASSERT().
     556
    504557  @param[in]  TokenNumber   The PCD token number to set a current value for.
    505558  @param[in]  Value         The 32-bit value to set.
    … …  
    530583  Sets the 64-bit value for the token specified by TokenNumber
    531584  to the value specified by Value.  Value is returned.
     585
     586  If the set operation was not correctly performed, then ASSERT().
    532587 
    533588  @param[in]  TokenNumber   The PCD token number to set a current value for.
    … …  
    561616  If SizeOfBuffer is greater than the maximum size support by TokenNumber,
    562617  then set SizeOfBuffer to the maximum size supported by TokenNumber and
    563   return NULL to indicate that the set operation was not actually performed. 
     618  return NULL to indicate that the set operation was not actually performed,
     619  or ASSERT() if the set operation was not correctly performed.
    564620
    565621  If SizeOfBuffer is set to MAX_ADDRESS, then SizeOfBuffer must be set to the
    … …  
    585641{
    586642  EFI_STATUS Status;
     643  UINTN      InputSizeOfBuffer;
    587644
    588645  ASSERT (SizeOfBuffer != NULL);
    … …  
    592649  }
    593650
     651  InputSizeOfBuffer = *SizeOfBuffer;
    594652  Status = GetPcdProtocol()->SetPtr (TokenNumber, SizeOfBuffer, (VOID *) Buffer);
    595   if (EFI_ERROR (Status)) {
     653  if (EFI_ERROR (Status) && (*SizeOfBuffer < InputSizeOfBuffer)) {
    596654    return NULL;
    597655  }
     656  ASSERT_EFI_ERROR (Status);
    598657
    599658  return (VOID *)Buffer;
    … …  
    607666  Sets the Boolean value for the token specified by TokenNumber
    608667  to the value specified by Value.  Value is returned.
    609  
     668
     669  If the set operation was not correctly performed, then ASSERT().
     670
    610671  @param[in]  TokenNumber   The PCD token number to set a current value for.
    611672  @param[in]  Value         The boolean value to set.
    … …  
    636697  Sets the 8-bit value for the token specified by TokenNumber and
    637698  Guid to the value specified by Value. Value is returned.
    638  
     699
    639700  If Guid is NULL, then ASSERT().
    640  
     701  If the set operation was not correctly performed, then ASSERT().
     702
    641703  @param[in]  Guid          The pointer to a 128-bit unique value that
    642704                            designates which namespace to set a value from.
    … …  
    672734  Sets the 16-bit value for the token specified by TokenNumber and
    673735  Guid to the value specified by Value. Value is returned.
    674  
     736
    675737  If Guid is NULL, then ASSERT().
    676  
     738  If the set operation was not correctly performed, then ASSERT().
     739
    677740  @param[in]  Guid          The pointer to a 128-bit unique value that
    678741                            designates which namespace to set a value from.
    … …  
    708771  Sets the 32-bit value for the token specified by TokenNumber and
    709772  Guid to the value specified by Value. Value is returned.
    710  
     773
    711774  If Guid is NULL, then ASSERT().
    712  
     775  If the set operation was not correctly performed, then ASSERT().
     776
    713777  @param[in]  Guid          The pointer to a 128-bit unique value that
    714778                            designates which namespace to set a value from.
    … …  
    744808  Sets the 64-bit value for the token specified by TokenNumber and
    745809  Guid to the value specified by Value. Value is returned.
     810
    746811  If Guid is NULL, then ASSERT().
    747  
     812  If the set operation was not correctly performed, then ASSERT().
     813
    748814  @param[in]  Guid          The pointer to a 128-bit unique value that
    749815                            designates which namespace to set a value from.
    … …  
    781847  the maximum size support by TokenNumber, then set SizeOfBuffer to the maximum size
    782848  supported by TokenNumber and return NULL to indicate that the set operation
    783   was not actually performed.
     849  was not actually performed, or ASSERT() if the set operation was not corretly performed.
    784850 
    785851  If Guid is NULL, then ASSERT().
    … …  
    806872{
    807873  EFI_STATUS  Status;
     874  UINTN       InputSizeOfBuffer;
    808875
    809876  ASSERT (Guid != NULL);
    … …  
    815882  }
    816883
     884  InputSizeOfBuffer = *SizeOfBuffer;
    817885  Status = GetPiPcdProtocol()->SetPtr (Guid, TokenNumber, SizeOfBuffer, Buffer);
    818   if (EFI_ERROR (Status)) {
     886  if (EFI_ERROR (Status) && (*SizeOfBuffer < InputSizeOfBuffer)) {
    819887    return NULL;
    820888  }
     889  ASSERT_EFI_ERROR (Status);
    821890
    822891  return Buffer;
    … …  
    830899  Sets the Boolean value for the token specified by TokenNumber and
    831900  Guid to the value specified by Value. Value is returned.
    832  
     901
    833902  If Guid is NULL, then ASSERT().
    834  
     903  If the set operation was not correctly performed, then ASSERT().
     904
    835905  @param[in]  Guid          The pointer to a 128-bit unique value that
    836906                            designates which namespace to set a value from.
    … …  
    9561026  )
    9571027{
    958   EFI_STATUS Status;
     1028  EFI_STATUS    Status;
    9591029
    9601030  Status = GetPiPcdProtocol()->GetNextToken (Guid, &TokenNumber);
    961   ASSERT_EFI_ERROR (Status);
     1031  ASSERT (!EFI_ERROR (Status) || TokenNumber == 0);
    9621032
    9631033  return TokenNumber;
    … …  
    9851055  )
    9861056{
    987   EFI_STATUS Status;
    988 
    989   Status = GetPiPcdProtocol()->GetNextTokenSpace (&TokenSpaceGuid);
    990   ASSERT_EFI_ERROR (Status);
     1057  GetPiPcdProtocol()->GetNextTokenSpace (&TokenSpaceGuid);
    9911058
    9921059  return (GUID *)TokenSpaceGuid;
    … …  
    10441111}
    10451112
    1046 
    1047 
     1113/**
     1114  Retrieve additional information associated with a PCD token.
     1115
     1116  This includes information such as the type of value the TokenNumber is associated with as well as possible
     1117  human readable name that is associated with the token.
     1118
     1119  If TokenNumber is not in the default token space specified, then ASSERT().
     1120
     1121  @param[in]    TokenNumber The PCD token number.
     1122  @param[out]   PcdInfo     The returned information associated with the requested TokenNumber.
     1123                            The caller is responsible for freeing the buffer that is allocated by callee for PcdInfo->PcdName.
     1124**/
     1125VOID
     1126EFIAPI
     1127LibPcdGetInfo (
     1128  IN        UINTN           TokenNumber,
     1129  OUT       PCD_INFO        *PcdInfo
     1130  )
     1131{
     1132  EFI_STATUS Status;
     1133
     1134  Status = GetPcdInfoProtocolPointer()->GetInfo (TokenNumber, (EFI_PCD_INFO *) PcdInfo);
     1135  ASSERT_EFI_ERROR (Status);
     1136}
     1137
     1138/**
     1139  Retrieve additional information associated with a PCD token.
     1140
     1141  This includes information such as the type of value the TokenNumber is associated with as well as possible
     1142  human readable name that is associated with the token.
     1143
     1144  If TokenNumber is not in the token space specified by Guid, then ASSERT().
     1145
     1146  @param[in]    Guid        The 128-bit unique value that designates the namespace from which to extract the value.
     1147  @param[in]    TokenNumber The PCD token number.
     1148  @param[out]   PcdInfo     The returned information associated with the requested TokenNumber.
     1149                            The caller is responsible for freeing the buffer that is allocated by callee for PcdInfo->PcdName.
     1150**/
     1151VOID
     1152EFIAPI
     1153LibPcdGetInfoEx (
     1154  IN CONST  GUID            *Guid,
     1155  IN        UINTN           TokenNumber,
     1156  OUT       PCD_INFO        *PcdInfo
     1157  )
     1158{
     1159  EFI_STATUS Status;
     1160
     1161  Status = GetPiPcdInfoProtocolPointer()->GetInfo (Guid, TokenNumber, (EFI_PCD_INFO *) PcdInfo);
     1162  ASSERT_EFI_ERROR (Status);
     1163}
     1164
     1165/**
     1166  Retrieve the currently set SKU Id.
     1167
     1168  If the sku id got >= PCD_MAX_SKU_ID, then ASSERT().
     1169
     1170  @return   The currently set SKU Id. If the platform has not set at a SKU Id, then the
     1171            default SKU Id value of 0 is returned. If the platform has set a SKU Id, then the currently set SKU
     1172            Id is returned.
     1173**/
     1174UINTN
     1175EFIAPI
     1176LibPcdGetSku (
     1177  VOID
     1178  )
     1179{
     1180  UINTN SkuId;
     1181
     1182  SkuId = GetPiPcdInfoProtocolPointer()->GetSku ();
     1183  ASSERT (SkuId < PCD_MAX_SKU_ID);
     1184
     1185  return SkuId;
     1186}
     1187

  • trunk/src/VBox/Devices/EFI/Firmware/MdePkg/Library/DxePcdLib/DxePcdLib.inf

    r48674 r58459  
    22# Instance of PCD Library using PCD Protocol.
    33#
    4 # There are two PCD PPIs as follows:
     4# There are two PCD protocols as follows:
    55#   1) PCD_PROTOCOL
    66#      It is EDKII implementation which support Dynamic/DynamicEx Pcds.
    … …  
    1414# EFI_PCD_PROTOCOL to handle dynamicEx type PCD.
    1515#
    16 # Copyright (c) 2007 - 2011, Intel Corporation. All rights reserved.<BR>
     16# Note: A driver of type DXE_RUNTIME_DRIVER and DXE_SMM_DRIVER can only use this DxePcdLib
     17#  in their initialization without any issues to access Dynamic and DynamicEx PCD. They can't
     18#  access Dynamic and DynamicEx PCD in the implementation of runtime services and SMI handlers.
     19#  Because EFI_PCD_PROTOCOL is DXE protocol that is not aviable in OS runtime phase. 
     20#
     21# Copyright (c) 2007 - 2014, Intel Corporation. All rights reserved.<BR>
    1722#
    1823#  This program and the accompanying materials
    … …  
    2934  INF_VERSION                    = 0x00010005
    3035  BASE_NAME                      = DxePcdLib
     36  MODULE_UNI_FILE                = DxePcdLib.uni
    3137  FILE_GUID                      = af97eb89-4cc6-45f8-a514-ca025b346480
    3238  MODULE_TYPE                    = DXE_DRIVER
    … …  
    5359
    5460[Protocols]
    55   gPcdProtocolGuid                              ## CONSUMES
     61  gPcdProtocolGuid                              ## SOMETIMES_CONSUMES
    5662  gEfiPcdProtocolGuid                           ## CONSUMES
     63  gGetPcdInfoProtocolGuid                       ## SOMETIMES_CONSUMES
     64  gEfiGetPcdInfoProtocolGuid                    ## SOMETIMES_CONSUMES
    5765
    5866[Depex.common.DXE_DRIVER, Depex.common.DXE_RUNTIME_DRIVER, Depex.common.DXE_SAL_DRIVER, Depex.common.DXE_SMM_DRIVER]
Note: See TracChangeset for help on using the changeset viewer.

© 2025 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette