MdePkg:

1. Add AcpiTable & ComponentName2 Protocol definitions.
2. Add HardwareErrorVariable GUID definition.
EdkModulePkg:
1. Update DxeCore to let InsatllConfigurationTable() signal the event group whenever a table entry is inserted, modified or deleted.
2. Update ConPlatform to let Simple Text In and Out  not share a stop function .

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

diff --git a/EdkModulePkg/Core/Dxe/Misc/InstallConfigurationTable.c b/EdkModulePkg/Core/Dxe/Misc/InstallConfigurationTable.c
index ee42f224e85dd15842fdbb1309bb9b99a3888b0f..677a2108bf2f07e794b8f757bcc263ea4f6f012a 100644 (file)
--- a/EdkModulePkg/Core/Dxe/Misc/InstallConfigurationTable.c
+++ b/EdkModulePkg/Core/Dxe/Misc/InstallConfigurationTable.c
@@ -125,6 +125,12 @@ Returns:
       // Modify the table enty and return.\r
       //\r
       gDxeCoreST->ConfigurationTable[Index].VendorTable = Table;\r
       // Modify the table enty and return.\r
       //\r
       gDxeCoreST->ConfigurationTable[Index].VendorTable = Table;\r

+\r
+      //\r
+      // Signal Configuration Table change\r
+      //\r
+      CoreNotifySignalList (Guid);\r
+\r

       return EFI_SUCCESS;\r
     }\r
 \r
       return EFI_SUCCESS;\r
     }\r
 \r


@@ -210,5 +216,10 @@ Returns:
   //\r
   CalculateEfiHdrCrc (&gDxeCoreST->Hdr);\r
 \r
   //\r
   CalculateEfiHdrCrc (&gDxeCoreST->Hdr);\r
 \r

+  //\r
+  // Signal Configuration Table change\r
+  //\r
+  CoreNotifySignalList (Guid);\r
+\r

   return EFI_SUCCESS;\r
 }\r
   return EFI_SUCCESS;\r
 }\r

diff --git a/EdkModulePkg/Include/Common/Variable.h b/EdkModulePkg/Include/Common/Variable.h
index a6e5c3bdc5a0776ce016d429266d1f76e6bffcc7..a7323230059ea3f693e03aa5ebddd9a93d48c7ff 100644 (file)
--- a/EdkModulePkg/Include/Common/Variable.h
+++ b/EdkModulePkg/Include/Common/Variable.h
@@ -17,15 +17,20 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 \r
 #define VARIABLE_STORE_SIGNATURE  EFI_SIGNATURE_32 ('$', 'V', 'S', 'S')\r
 \r
 \r
 #define VARIABLE_STORE_SIGNATURE  EFI_SIGNATURE_32 ('$', 'V', 'S', 'S')\r
 \r

-#define MAX_VARIABLE_SIZE         1024\r
+#define MAX_VARIABLE_SIZE                 1024\r

 \r
 \r

-#define VARIABLE_DATA             0x55AA\r
+//\r
+// Enlarges the hardware error record maximum variable size to 32K bytes\r
+//\r
+#define MAX_HARDWARE_ERROR_VARIABLE_SIZE  0x8000\r
+\r
+#define VARIABLE_DATA                     0x55AA\r

 \r
 //\r
 // Variable Store Header flags\r
 //\r
 \r
 //\r
 // Variable Store Header flags\r
 //\r

-#define VARIABLE_STORE_FORMATTED  0x5a\r
-#define VARIABLE_STORE_HEALTHY    0xfe\r
+#define VARIABLE_STORE_FORMATTED          0x5a\r
+#define VARIABLE_STORE_HEALTHY            0xfe\r

 \r
 //\r
 // The alignment of variable's start offset.\r
 \r
 //\r
 // The alignment of variable's start offset.\r

diff --git a/EdkModulePkg/Universal/ConPlatform/Dxe/ConPlatform.c b/EdkModulePkg/Universal/ConPlatform/Dxe/ConPlatform.c
index 15e7693d1d9eea99bca83d4b6007f2f91d8b904c..1972e0c6aa90eec1ade1f90d63c6876d4161cd15 100644 (file)
--- a/EdkModulePkg/Universal/ConPlatform/Dxe/ConPlatform.c
+++ b/EdkModulePkg/Universal/ConPlatform/Dxe/ConPlatform.c
@@ -22,7 +22,7 @@ Abstract:
 EFI_DRIVER_BINDING_PROTOCOL gConPlatformTextInDriverBinding = {\r
   ConPlatformTextInDriverBindingSupported,\r
   ConPlatformTextInDriverBindingStart,\r
 EFI_DRIVER_BINDING_PROTOCOL gConPlatformTextInDriverBinding = {\r
   ConPlatformTextInDriverBindingSupported,\r
   ConPlatformTextInDriverBindingStart,\r

-  ConPlatformDriverBindingStop,\r
+  ConPlatformTextInDriverBindingStop,\r

   0xa,\r
   NULL,\r
   NULL\r
   0xa,\r
   NULL,\r
   NULL\r


@@ -31,7 +31,7 @@ EFI_DRIVER_BINDING_PROTOCOL gConPlatformTextInDriverBinding = {
 EFI_DRIVER_BINDING_PROTOCOL gConPlatformTextOutDriverBinding = {\r
   ConPlatformTextOutDriverBindingSupported,\r
   ConPlatformTextOutDriverBindingStart,\r
 EFI_DRIVER_BINDING_PROTOCOL gConPlatformTextOutDriverBinding = {\r
   ConPlatformTextOutDriverBindingSupported,\r
   ConPlatformTextOutDriverBindingStart,\r

-  ConPlatformDriverBindingStop,\r
+  ConPlatformTextOutDriverBindingStop,\r

   0xa,\r
   NULL,\r
   NULL\r
   0xa,\r
   NULL,\r
   NULL\r


@@ -287,7 +287,6 @@ Returns:
   EFI_STATUS                    Status;\r
   EFI_DEVICE_PATH_PROTOCOL      *DevicePath;\r
   EFI_SIMPLE_TEXT_OUT_PROTOCOL  *TextOut;\r
   EFI_STATUS                    Status;\r
   EFI_DEVICE_PATH_PROTOCOL      *DevicePath;\r
   EFI_SIMPLE_TEXT_OUT_PROTOCOL  *TextOut;\r

-\r

   BOOLEAN                       NeedClose;\r
 \r
   NeedClose = TRUE;\r
   BOOLEAN                       NeedClose;\r
 \r
   NeedClose = TRUE;\r


@@ -360,6 +359,7 @@ Returns:
               DevicePath,\r
               CHECK\r
               );\r
               DevicePath,\r
               CHECK\r
               );\r

+\r

     if (!EFI_ERROR (Status)) {\r
       NeedClose = FALSE;\r
       Status = gBS->InstallMultipleProtocolInterfaces (\r
     if (!EFI_ERROR (Status)) {\r
       NeedClose = FALSE;\r
       Status = gBS->InstallMultipleProtocolInterfaces (\r


@@ -403,7 +403,7 @@ Returns:
 \r
 EFI_STATUS\r
 EFIAPI\r
 \r
 EFI_STATUS\r
 EFIAPI\r

-ConPlatformDriverBindingStop (\r
+ConPlatformTextInDriverBindingStop (\r

   IN  EFI_DRIVER_BINDING_PROTOCOL  *This,\r
   IN  EFI_HANDLE                   ControllerHandle,\r
   IN  UINTN                        NumberOfChildren,\r
   IN  EFI_DRIVER_BINDING_PROTOCOL  *This,\r
   IN  EFI_HANDLE                   ControllerHandle,\r
   IN  UINTN                        NumberOfChildren,\r


@@ -443,13 +443,81 @@ Returns:
                     );\r
     if (!EFI_ERROR (Status)) {\r
       //\r
                     );\r
     if (!EFI_ERROR (Status)) {\r
       //\r

-      // Remove DevicePath from ConInDev, ConOutDev, and StdErrDev\r
+      // Remove DevicePath from ConInDev\r

       //\r
       ConPlatformUpdateDeviceVariable (\r
         VarConsoleInpDev,\r
         DevicePath,\r
         DELETE\r
         );\r
       //\r
       ConPlatformUpdateDeviceVariable (\r
         VarConsoleInpDev,\r
         DevicePath,\r
         DELETE\r
         );\r

+    }\r
+  }\r
+  //\r
+  // Uninstall the Console Device GUIDs from Controller Handle\r
+  //\r
+  ConPlatformUnInstallProtocol (\r
+    This,\r
+    ControllerHandle,\r
+    &gEfiConsoleInDeviceGuid\r
+    );\r
+\r
+  //\r
+  // Close the Simple Input Protocol\r
+  //\r
+  gBS->CloseProtocol (\r
+        ControllerHandle,\r
+        &gEfiSimpleTextInProtocolGuid,\r
+        This->DriverBindingHandle,\r
+        ControllerHandle\r
+        );\r
+\r
+  return EFI_SUCCESS;\r
+}\r
+\r
+EFI_STATUS\r
+EFIAPI\r
+ConPlatformTextOutDriverBindingStop (\r
+  IN  EFI_DRIVER_BINDING_PROTOCOL  *This,\r
+  IN  EFI_HANDLE                   ControllerHandle,\r
+  IN  UINTN                        NumberOfChildren,\r
+  IN  EFI_HANDLE                   *ChildHandleBuffer\r
+  )\r
+/*++\r
+\r
+Routine Description:\r
+\r
+Arguments:\r
+  (Standard DriverBinding Protocol Stop() function)\r
+\r
+Returns:\r
+\r
+  None\r
+\r
+--*/\r
+{\r
+  EFI_STATUS                Status;\r
+  EFI_DEVICE_PATH_PROTOCOL  *DevicePath;\r
+\r
+  //\r
+  // hot plug device is not included into the console associated variables,\r
+  // so no need to check variable for those hot plug devices.\r
+  //\r
+  if (!IsHotPlugDevice (This->DriverBindingHandle, ControllerHandle)) {\r
+    //\r
+    // Get the Device Path Protocol so the environment variables can be updated\r
+    //\r
+    Status = gBS->OpenProtocol (\r
+                    ControllerHandle,\r
+                    &gEfiDevicePathProtocolGuid,\r
+                    (VOID **) &DevicePath,\r
+                    This->DriverBindingHandle,\r
+                    ControllerHandle,\r
+                    EFI_OPEN_PROTOCOL_GET_PROTOCOL\r
+                    );\r
+    if (!EFI_ERROR (Status)) {\r
+      //\r
+      // Remove DevicePath from ConOutDev, and StdErrDev\r
+      //\r

       ConPlatformUpdateDeviceVariable (\r
         VarConsoleOutDev,\r
         DevicePath,\r
       ConPlatformUpdateDeviceVariable (\r
         VarConsoleOutDev,\r
         DevicePath,\r


@@ -465,12 +533,6 @@ Returns:
   //\r
   // Uninstall the Console Device GUIDs from Controller Handle\r
   //\r
   //\r
   // Uninstall the Console Device GUIDs from Controller Handle\r
   //\r

-  ConPlatformUnInstallProtocol (\r
-    This,\r
-    ControllerHandle,\r
-    &gEfiConsoleInDeviceGuid\r
-    );\r
-\r

   ConPlatformUnInstallProtocol (\r
     This,\r
     ControllerHandle,\r
   ConPlatformUnInstallProtocol (\r
     This,\r
     ControllerHandle,\r


@@ -484,15 +546,8 @@ Returns:
     );\r
 \r
   //\r
     );\r
 \r
   //\r

-  // Close the Simple Input and Simple Text Output Protocols\r
+  // Close the Simple Text Output Protocol\r

   //\r
   //\r

-  gBS->CloseProtocol (\r
-        ControllerHandle,\r
-        &gEfiSimpleTextInProtocolGuid,\r
-        This->DriverBindingHandle,\r
-        ControllerHandle\r
-        );\r
-\r

   gBS->CloseProtocol (\r
         ControllerHandle,\r
         &gEfiSimpleTextOutProtocolGuid,\r
   gBS->CloseProtocol (\r
         ControllerHandle,\r
         &gEfiSimpleTextOutProtocolGuid,\r


@@ -503,6 +558,7 @@ Returns:
   return EFI_SUCCESS;\r
 }\r
 \r
   return EFI_SUCCESS;\r
 }\r
 \r

+\r

 VOID\r
 ConPlatformUnInstallProtocol (\r
   IN  EFI_DRIVER_BINDING_PROTOCOL  *This,\r
 VOID\r
 ConPlatformUnInstallProtocol (\r
   IN  EFI_DRIVER_BINDING_PROTOCOL  *This,\r

diff --git a/EdkModulePkg/Universal/ConPlatform/Dxe/ConPlatform.h b/EdkModulePkg/Universal/ConPlatform/Dxe/ConPlatform.h
index cedda9e0d173bd622f0adc3dc89b5fcaeb9d193e..c14a5ed16e73d903169b2552caae150d2202e666 100644 (file)
--- a/EdkModulePkg/Universal/ConPlatform/Dxe/ConPlatform.h
+++ b/EdkModulePkg/Universal/ConPlatform/Dxe/ConPlatform.h
@@ -75,7 +75,16 @@ ConPlatformTextOutDriverBindingStart (
 \r
 EFI_STATUS\r
 EFIAPI\r
 \r
 EFI_STATUS\r
 EFIAPI\r

-ConPlatformDriverBindingStop (\r
+ConPlatformTextInDriverBindingStop (\r
+  IN  EFI_DRIVER_BINDING_PROTOCOL  *This,\r
+  IN  EFI_HANDLE                   Handle,\r
+  IN  UINTN                        NumberOfChildren,\r
+  IN  EFI_HANDLE                   *ChildHandleBuffer\r
+  );\r
+\r
+EFI_STATUS\r
+EFIAPI\r
+ConPlatformTextOutDriverBindingStop (\r

   IN  EFI_DRIVER_BINDING_PROTOCOL  *This,\r
   IN  EFI_HANDLE                   Handle,\r
   IN  UINTN                        NumberOfChildren,\r
   IN  EFI_DRIVER_BINDING_PROTOCOL  *This,\r
   IN  EFI_HANDLE                   Handle,\r
   IN  UINTN                        NumberOfChildren,\r

diff --git a/OldMdePkg/Include/Guid/HardwareErrorVariable.h b/OldMdePkg/Include/Guid/HardwareErrorVariable.h
new file mode 100644 (file)
index 0000000..afae5ec
--- /dev/null
+++ b/OldMdePkg/Include/Guid/HardwareErrorVariable.h
@@ -0,0 +1,30 @@
+/** @file\r
+  GUID for hardware error record variables.\r
+\r
+  Copyright (c) 2007, Intel Corporation\r
+  All rights reserved. This program and the accompanying materials\r
+  are licensed and made available under the terms and conditions of the BSD License\r
+  which accompanies this distribution.  The full text of the license may be found at\r
+  http://opensource.org/licenses/bsd-license.php\r
+\r
+  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
+  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
+\r
+  Module Name:  HardwareErrorVariable.h\r
+\r
+  @par Revision Reference:\r
+  GUID defined in UEFI 2.1.\r
+\r
+**/\r
+\r
+#ifndef _HARDWARE_ERROR_VARIABLE_GUID_H_\r
+#define _HARDWARE_ERROR_VARIABLE_GUID_H_\r
+\r
+#define EFI_HARDWARE_ERROR_VARIABLE_GUID \\r
+  { \\r
+    0x414E6BDD, 0xE47B, 0x47cc, {0xB2, 0x44, 0xBB, 0x61, 0x02, 0x0C, 0xF5, 0x16} \\r
+  }\r
+\r
+extern EFI_GUID gEfiHardwareErrorVariableGuid;\r
+\r
+#endif\r

diff --git a/OldMdePkg/Include/Protocol/AcpiTable.h b/OldMdePkg/Include/Protocol/AcpiTable.h
new file mode 100644 (file)
index 0000000..d46116d
--- /dev/null
+++ b/OldMdePkg/Include/Protocol/AcpiTable.h
@@ -0,0 +1,97 @@
+/** @file\r
+  This protocol may be used to install or remove an ACPI table from a platform.\r
+\r
+  Copyright (c) 2007, Intel Corporation                                                     \r
+  All rights reserved. This program and the accompanying materials                          \r
+  are licensed and made available under the terms and conditions of the BSD License         \r
+  which accompanies this distribution.  The full text of the license may be found at        \r
+  http://opensource.org/licenses/bsd-license.php                                            \r
+                                                                                            \r
+  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     \r
+  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             \r
+\r
+  Module Name: AcpiTable.h\r
+\r
+  @par Revision Reference:\r
+  ACPI Table Protocol from the UEFI 2.1 specification.\r
+\r
+**/\r
+\r
+#ifndef __ACPI_TABLE_H__\r
+#define __ACPI_TABLE_H__\r
+\r
+//\r
+// Global ID for the Acpi Table Protocol\r
+//\r
+#define EFI_ACPI_TABLE_PROTOCOL_GUID \\r
+  { \\r
+    0xffe06bdd, 0x6107, 0x46a6, {0x7b, 0xb2, 0x5a, 0x9c, 0x7e, 0xc5, 0x27, 0x5c} \\r
+  }\r
+\r
+typedef struct _EFI_ACPI_TABLE_PROTOCOL   EFI_ACPI_TABLE_PROTOCOL;\r
+\r
+#define UEFI_ACPI_TABLE_SIGNATURE         EFI_SIGNATURE_32 ('U', 'E', 'F', 'I')\r
+\r
+/**\r
+  Installs an ACPI table into the RSDT/XSDT.\r
+\r
+  @param  This                   Protocol instance pointer. \r
+  @param  AcpiTableBuffer        A pointer to a buffer containing the ACPI table \r
+                                 to be installed. \r
+  @param  AcpiTableBufferSize    Specifies the size, in bytes, of the \r
+                                 AcpiTableBuffer buffer. \r
+  @param  TableKey               Reurns a key to refer to the ACPI table. \r
+\r
+  @retval EFI_SUCCESS            The table was successfully inserted. \r
+  @retval EFI_INVALID_PARAMETER  Either AcpiTableBuffer is NULL, TableKey is \r
+                                 NULL, or AcpiTableBufferSize  and the size field \r
+                                 embedded in the ACPI table pointed to by \r
+                                 AcpiTableBuffer are not in sync. \r
+  @retval EFI_OUT_OF_RESOURCES   Insufficient resources exist to complete the \r
+                                 request. \r
+\r
+**/\r
+typedef\r
+EFI_STATUS\r
+(EFIAPI *EFI_ACPI_TABLE_INSTALL_ACPI_TABLE) (\r
+  IN EFI_ACPI_TABLE_PROTOCOL                    *This,\r
+  IN VOID                                       *AcpiTableBuffer,\r
+  IN UINTN                                      AcpiTableBufferSize,\r
+  OUT UINTN                                     *TableKey\r
+  )\r
+;\r
+\r
+/**\r
+  Removes an ACPI table from the RSDT/XSDT.\r
+\r
+  @param  This                   Protocol instance pointer. \r
+  @param  TableKey               Specifies the table to uninstall.  The key was \r
+                                 returned from InstallAcpiTable(). \r
+\r
+  @retval EFI_SUCCESS            The table was successfully uninstalled. \r
+  @retval EFI_NOT_FOUND          TableKey does not refer to a valid key for a \r
+                                 table entry. \r
+\r
+**/\r
+typedef\r
+EFI_STATUS\r
+(EFIAPI *EFI_ACPI_TABLE_UNINSTALL_ACPI_TABLE) (\r
+  IN EFI_ACPI_TABLE_PROTOCOL                    *This,\r
+  IN UINTN                                      TableKey\r
+  )\r
+;\r
+\r
+//\r
+// Interface structure for the ACPI Table Protocol\r
+//\r
+struct _EFI_ACPI_TABLE_PROTOCOL {\r
+  EFI_ACPI_TABLE_INSTALL_ACPI_TABLE    InstallAcpiTable;\r
+  EFI_ACPI_TABLE_UNINSTALL_ACPI_TABLE  UninstallAcpiTable;\r
+};\r
+\r
+//\r
+// Extern the GUID for protocol users.\r
+//\r
+extern EFI_GUID gEfiAcpiTableProtocolGuid;\r
+\r
+#endif\r

diff --git a/OldMdePkg/Include/Protocol/ComponentName2.h b/OldMdePkg/Include/Protocol/ComponentName2.h
new file mode 100644 (file)
index 0000000..9187635
--- /dev/null
+++ b/OldMdePkg/Include/Protocol/ComponentName2.h
@@ -0,0 +1,136 @@
+/** @file\r
+  EFI Component Name 2 Protocol\r
+\r
+  Copyright (c) 2007, Intel Corporation                                                         \r
+  All rights reserved. This program and the accompanying materials                          \r
+  are licensed and made available under the terms and conditions of the BSD License         \r
+  which accompanies this distribution.  The full text of the license may be found at        \r
+  http://opensource.org/licenses/bsd-license.php                                            \r
+                                                                                            \r
+  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     \r
+  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             \r
+\r
+  Module Name:  ComponentName2.h\r
+\r
+  @par Revision Reference:\r
+  Component Name 2 Protocol from the UEFI 2.1 specification.\r
+\r
+**/\r
+\r
+#ifndef _EFI_COMPONENT_NAME2_H_\r
+#define _EFI_COMPONENT_NAME2_H_\r
+\r
+//\r
+// Global ID for the Component Name Protocol\r
+//\r
+\r
+#define EFI_COMPONENT_NAME2_PROTOCOL_GUID \\r
+  { \\r
+    0x6a7a5cff, 0xe8d9, 0x4f70, {0xba, 0xda, 0x75, 0xab, 0x30, 0x25, 0xce, 0x14} \\r
+  }\r
+\r
+typedef struct _EFI_COMPONENT_NAME2_PROTOCOL  EFI_COMPONENT_NAME2_PROTOCOL;\r
+\r
+/**\r
+  Retrieves a Unicode string that is the user readable name of the EFI Driver.\r
+\r
+  @param  This                   A pointer to the EFI_COMPONENT_NAME_PROTOCOL \r
+                                 instance. \r
+  @param  Language               A pointer to a Null-terminated ASCII string array indicating the\r
+                                 language. This is the language of the driver name that the caller\r
+                                 is requesting, and it must match one of the languages specified in\r
+                                 SupportedLanguages. The number of languages supported by a\r
+                                 driver is up to the driver writer. Language is specified in RFC\r
+                                 3066 language code format.\r
+  @param  DriverName             A pointer to the Unicode string to return.  This \r
+                                 Unicode string is the name of the driver \r
+                                 specified by This in the language  specified by \r
+                                 Language. \r
+\r
+  @retval EFI_SUCCESS            The Unicode string for the Driver specified by \r
+                                 This and the language specified by Language was \r
+                                 returned  in DriverName. \r
+  @retval EFI_INVALID_PARAMETER  Language is NULL or DriverName is NULL. \r
+  @retval EFI_UNSUPPORTED        The driver specified by This does not support \r
+                                 the  language specified by Language. \r
+\r
+**/\r
+typedef\r
+EFI_STATUS\r
+(EFIAPI *EFI_COMPONENT_NAME2_GET_DRIVER_NAME) (\r
+  IN  EFI_COMPONENT_NAME2_PROTOCOL         *This,\r
+  IN  CHAR8                                *Language,\r
+  OUT CHAR16                               **DriverName\r
+  );\r
+\r
+/**\r
+  Retrieves a Unicode string that is the user readable name of the controller\r
+  that is being managed by an EFI Driver.\r
+\r
+  @param  This                   A pointer to the EFI_COMPONENT_NAME_PROTOCOL \r
+                                 instance. \r
+  @param  ControllerHandle       The handle of a controller that the driver \r
+                                 specified by  This is managing.  This handle \r
+                                 specifies the controller  whose name is to be \r
+                                 returned. \r
+  @param  ChildHandle            The handle of the child controller to retrieve \r
+                                 the name  of.  This is an optional parameter \r
+                                 that may be NULL.  It  will be NULL for device \r
+                                 drivers.  It will also be NULL  for a bus \r
+                                 drivers that wish to retrieve the name of the  \r
+                                 bus controller.  It will not be NULL for a bus \r
+                                 driver  that wishes to retrieve the name of a \r
+                                 child controller. \r
+  @param  Language               A pointer to a Null- terminated ASCII string array indicating the\r
+                                 language. This is the language of the controller name that the\r
+                                 caller is requesting, and it must match one of the languages\r
+                                 specified in SupportedLanguages. The number of languages\r
+                                 supported by a driver is up to the driver writer. Language is\r
+                                 specified in RFC 3066 language code format.\r
+  @param  ControllerName         A pointer to the Unicode string to return.  This \r
+                                 Unicode string is the name of the controller \r
+                                 specified by  ControllerHandle and ChildHandle \r
+                                 in the language specified by Language from the \r
+                                 point of view of the driver specified by This. \r
+\r
+  @retval EFI_SUCCESS            The Unicode string for the user readable name in \r
+                                 the  language specified by Language for the \r
+                                 driver  specified by This was returned in \r
+                                 DriverName. \r
+  @retval EFI_INVALID_PARAMETER  ControllerHandle is not a valid EFI_HANDLE; \r
+                                 ChildHandle  is not NULL and it is not a valid \r
+                                 EFI_HANDLE;Language  is NULL;ControllerName is \r
+                                 NULL. \r
+  @retval EFI_UNSUPPORTED        The driver specified by This is not currently \r
+                                 managing  the controller specified by \r
+                                 ControllerHandle and  ChildHandle;The driver \r
+                                 specified by This does not support the  language \r
+                                 specified by Language. \r
+\r
+**/\r
+typedef\r
+EFI_STATUS\r
+(EFIAPI *EFI_COMPONENT_NAME2_GET_CONTROLLER_NAME) (\r
+  IN  EFI_COMPONENT_NAME2_PROTOCOL                            *This,\r
+  IN  EFI_HANDLE                                              ControllerHandle,\r
+  IN  EFI_HANDLE                                              ChildHandle        OPTIONAL,\r
+  IN  CHAR8                                                   *Language,\r
+  OUT CHAR16                                                  **ControllerName\r
+  );\r
+\r
+\r
+//\r
+// Interface structure for the Component Name 2 Protocol\r
+//\r
+struct _EFI_COMPONENT_NAME2_PROTOCOL {\r
+  EFI_COMPONENT_NAME2_GET_DRIVER_NAME      GetDriverName;\r
+  EFI_COMPONENT_NAME2_GET_CONTROLLER_NAME  GetControllerName;\r
+  CHAR8                                    *SupportedLanguages;\r
+};\r
+\r
+//\r
+// Extern the GUID for protocol users.\r
+//\r
+extern EFI_GUID gEfiComponentName2ProtocolGuid;\r
+\r
+#endif\r

diff --git a/OldMdePkg/Include/Uefi/UefiSpec.h b/OldMdePkg/Include/Uefi/UefiSpec.h
index 15b3ac22d2a5ad7b9833dc96294afc20f932d388..6f3407706859baca103b6d30da3af03cea7d648a 100644 (file)
--- a/OldMdePkg/Include/Uefi/UefiSpec.h
+++ b/OldMdePkg/Include/Uefi/UefiSpec.h
@@ -580,9 +580,10 @@ VOID
 //\r
 // Variable attributes\r
 //\r
 //\r
 // Variable attributes\r
 //\r

-#define EFI_VARIABLE_NON_VOLATILE       0x00000001\r
-#define EFI_VARIABLE_BOOTSERVICE_ACCESS 0x00000002\r
-#define EFI_VARIABLE_RUNTIME_ACCESS     0x00000004\r
+#define EFI_VARIABLE_NON_VOLATILE           0x00000001\r
+#define EFI_VARIABLE_BOOTSERVICE_ACCESS     0x00000002\r
+#define EFI_VARIABLE_RUNTIME_ACCESS         0x00000004\r
+#define EFI_VARIABLE_HARDWARE_ERROR_RECORD  0x00000008\r

 \r
 /**\r
   Returns the value of a variable.\r
 \r
 /**\r
   Returns the value of a variable.\r


@@ -2329,7 +2330,7 @@ typedef enum {
 \r
 \r
 //\r
 \r
 \r
 //\r

-// Protocols from EFI 1.10 that got thier names fixed in UEFI 2.0\r
+// Protocols from EFI 1.10 that got their names fixed in UEFI 2.0\r

 //\r
 #include <Protocol/LoadedImage.h>\r
 #include <Protocol/SimpleTextIn.h>\r
 //\r
 #include <Protocol/LoadedImage.h>\r
 #include <Protocol/SimpleTextIn.h>\r


@@ -2409,8 +2410,11 @@ typedef enum {
 #include <Protocol/Mtftp4.h>\r
 #include <Protocol/ServiceBinding.h>\r
 #include <Protocol/Hash.h>\r
 #include <Protocol/Mtftp4.h>\r
 #include <Protocol/ServiceBinding.h>\r
 #include <Protocol/Hash.h>\r

+#include <Protocol/AcpiTable.h>\r
+#include <Protocol/ComponentName2.h>\r

 \r
 #include <Guid/EventGroup.h>\r
 \r
 #include <Guid/EventGroup.h>\r

+#include <Guid/HardwareErrorVariable.h>\r

 #endif\r
 \r
 \r
 #endif\r
 \r
 \r

diff --git a/OldMdePkg/MdePkg.spd b/OldMdePkg/MdePkg.spd
index e01c5840f4e4be10e80e91e3f8f6a4a1ebd065ca..0c109527f7adb6e49adb35781287008a56d301c4 100644 (file)
--- a/OldMdePkg/MdePkg.spd
+++ b/OldMdePkg/MdePkg.spd
@@ -352,6 +352,10 @@
       <IncludeHeader>Include/Guid/EventGroup.h</IncludeHeader>\r
       <HelpText/>\r
     </IndustryStdHeader>\r
       <IncludeHeader>Include/Guid/EventGroup.h</IncludeHeader>\r
       <HelpText/>\r
     </IndustryStdHeader>\r

+    <IndustryStdHeader Name="HardwareErrorVariable">\r
+      <IncludeHeader>Include/Guid/HardwareErrorVariable.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r

     <IndustryStdHeader Name="EventLegacyBios">\r
       <IncludeHeader>Include/Guid/EventLegacyBios.h</IncludeHeader>\r
       <HelpText/>\r
     <IndustryStdHeader Name="EventLegacyBios">\r
       <IncludeHeader>Include/Guid/EventLegacyBios.h</IncludeHeader>\r
       <HelpText/>\r


@@ -708,6 +712,10 @@
       <IncludeHeader>Include/Protocol/AcpiSupport.h</IncludeHeader>\r
       <HelpText/>\r
     </IndustryStdHeader>\r
       <IncludeHeader>Include/Protocol/AcpiSupport.h</IncludeHeader>\r
       <HelpText/>\r
     </IndustryStdHeader>\r

+    <IndustryStdHeader Name="AcpiTable">\r
+      <IncludeHeader>Include/Protocol/AcpiTable.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r

     <IndustryStdHeader Name="Arp">\r
       <IncludeHeader>Include/Protocol/Arp.h</IncludeHeader>\r
       <HelpText/>\r
     <IndustryStdHeader Name="Arp">\r
       <IncludeHeader>Include/Protocol/Arp.h</IncludeHeader>\r
       <HelpText/>\r


@@ -736,6 +744,10 @@
       <IncludeHeader>Include/Protocol/ComponentName.h</IncludeHeader>\r
       <HelpText/>\r
     </IndustryStdHeader>\r
       <IncludeHeader>Include/Protocol/ComponentName.h</IncludeHeader>\r
       <HelpText/>\r
     </IndustryStdHeader>\r

+    <IndustryStdHeader Name="ComponentName2">\r
+      <IncludeHeader>Include/Protocol/ComponentName2.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r

     <IndustryStdHeader Name="CpuIo">\r
       <IncludeHeader>Include/Protocol/CpuIo.h</IncludeHeader>\r
       <HelpText/>\r
     <IndustryStdHeader Name="CpuIo">\r
       <IncludeHeader>Include/Protocol/CpuIo.h</IncludeHeader>\r
       <HelpText/>\r


@@ -1305,6 +1317,11 @@
       <GuidValue>1BA0062E-C779-4582-8566-336AE8F78F09</GuidValue>\r
       <HelpText/>\r
     </Entry>\r
       <GuidValue>1BA0062E-C779-4582-8566-336AE8F78F09</GuidValue>\r
       <HelpText/>\r
     </Entry>\r

+    <Entry Name="HardwareErrorVariable">\r
+      <C_Name>gEfiHardwareErrorVariableGuid</C_Name>\r
+      <GuidValue>414E6BDD-E47B-47CC-B244-BB61020CF516</GuidValue>\r
+      <HelpText/>\r
+    </Entry>\r

     <Entry Name="HobList">\r
       <C_Name>gEfiHobListGuid</C_Name>\r
       <GuidValue>7739F24C-93D7-11D4-9A3A-0090273FC14D</GuidValue>\r
     <Entry Name="HobList">\r
       <C_Name>gEfiHobListGuid</C_Name>\r
       <GuidValue>7739F24C-93D7-11D4-9A3A-0090273FC14D</GuidValue>\r


@@ -1657,6 +1674,11 @@
       <GuidValue>107A772C-D5E1-11D4-9A46-0090273FC14D</GuidValue>\r
       <HelpText/>\r
     </Entry>\r
       <GuidValue>107A772C-D5E1-11D4-9A46-0090273FC14D</GuidValue>\r
       <HelpText/>\r
     </Entry>\r

+    <Entry Name="ComponentName2">\r
+      <C_Name>gEfiComponentName2ProtocolGuid</C_Name>\r
+      <GuidValue>6A7A5CFF-E8D9-4F70-BADA-75AB3025CE14</GuidValue>\r
+      <HelpText/>\r
+    </Entry>\r

     <Entry Name="DebugPort">\r
       <C_Name>gEfiDebugPortProtocolGuid</C_Name>\r
       <GuidValue>EBA4E8D2-3858-41EC-A281-2647BA9660D0</GuidValue>\r
     <Entry Name="DebugPort">\r
       <C_Name>gEfiDebugPortProtocolGuid</C_Name>\r
       <GuidValue>EBA4E8D2-3858-41EC-A281-2647BA9660D0</GuidValue>\r


@@ -1997,6 +2019,11 @@
       <GuidValue>DBFF9D55-89B7-46DA-BDDF-677D3DC0241D</GuidValue>\r
       <HelpText/>\r
     </Entry>\r
       <GuidValue>DBFF9D55-89B7-46DA-BDDF-677D3DC0241D</GuidValue>\r
       <HelpText/>\r
     </Entry>\r

+    <Entry Name="AcpiSupport">\r
+      <C_Name>gEfiAcpiTableProtocolGuid</C_Name>\r
+      <GuidValue>FFE06BDD-6107-46A6-7BB2-5A9C7EC5275C</GuidValue>\r
+      <HelpText/>\r
+    </Entry>\r

     <Entry Name="BootScriptSave">\r
       <C_Name>gEfiBootScriptSaveProtocolGuid</C_Name>\r
       <GuidValue>470E1529-B79E-4E32-A0FE-6A156D29F9B2</GuidValue>\r
     <Entry Name="BootScriptSave">\r
       <C_Name>gEfiBootScriptSaveProtocolGuid</C_Name>\r
       <GuidValue>470E1529-B79E-4E32-A0FE-6A156D29F9B2</GuidValue>\r