Sync the HII GUID with EDK I code base. Please take note: This GUID is not the same...

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

diff --git a/MdePkg/Include/Protocol/Hii.h b/MdePkg/Include/Protocol/Hii.h
index 1de8dc34500efbf8a8192037975e94d3062faa2f..1fa0a2618c6baa78a30f31fed0c72137b18fc0e5 100644 (file)
--- a/MdePkg/Include/Protocol/Hii.h
+++ b/MdePkg/Include/Protocol/Hii.h
@@ -3,7 +3,7 @@
   be used by resources which want to publish IFR/Font/String data and have it \r
   collected by the Configuration engine.\r
 \r
-  Copyright (c) 2006, Intel Corporation                                                         \r
+  Copyright (c) 2006 - 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
@@ -26,7 +26,7 @@
 \r
 #define EFI_HII_PROTOCOL_GUID \\r
   { \\r
-    0xea816d2c, 0xcee5, 0x4f02, {0x99, 0xb5, 0xd3, 0x90, 0x5c, 0xbb, 0xd0, 0x77 } \\r
+    0xd7ad636e, 0xb997, 0x459b, {0xbf, 0x3f, 0x88, 0x46, 0x89, 0x79, 0x80, 0xe1} \\r
   }\r
 \r
 // BugBug:\r

diff --git a/MdePkg/MdePkg.spd b/MdePkg/MdePkg.spd
index 329ef245df13a62f33082da2dd910e7fb7c1749d..a7d6adae6efb1f0bc0c79380fe4a039fe1eef2e2 100644 (file)
--- a/MdePkg/MdePkg.spd
+++ b/MdePkg/MdePkg.spd
@@ -7,13 +7,13 @@
     <Abstract>Framework Module Development Environment Industry Standards</Abstract>\r
     <Description>This Package provides headers and libraries that conform to EFI/Framework Industry standards.</Description>\r
     <Copyright>Copyright (c) 2006 - 2007, Intel Corporation.</Copyright>\r
-    <License>All rights reserved.
-      This program and the accompanying materials are licensed and made available under
-      the terms and conditions of the BSD License which accompanies this distribution.
-      The full text of the license may be found at
-      http://opensource.org/licenses/bsd-license.php
-
-      THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+    <License>All rights reserved.\r
+      This program and the accompanying materials are licensed and made available under\r
+      the terms and conditions of the BSD License which accompanies this distribution.\r
+      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.</License>\r
     <Specification>FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00000052</Specification>\r
   </SpdHeader>\r
@@ -1620,7 +1620,7 @@
     </Entry>\r
     <Entry Name="Hii">\r
       <C_Name>gEfiHiiProtocolGuid</C_Name>\r
-      <GuidValue>EA816D2C-CEE5-4F02-99B5-D3905CBBD077</GuidValue>\r
+      <GuidValue>D7AD636E-B997-459B-BF3F-8846897980E1</GuidValue>\r
       <HelpText/>\r
     </Entry>\r
     <Entry Name="PcdProtocol">\r
@@ -2219,8 +2219,8 @@
       <DatumType>UINT32</DatumType>\r
       <ValidUsage>FIXED_AT_BUILD</ValidUsage>\r
       <DefaultValue>1000000</DefaultValue>\r
-      <HelpText>If PcdMaximumUnicodeStringLength is not zero, the maximum
-                number of characters (not counting the NULL-terminator) in a
+      <HelpText>If PcdMaximumUnicodeStringLength is not zero, the maximum\r
+                number of characters (not counting the NULL-terminator) in a\r
                 Unicode string cannot exceed it.</HelpText>\r
     </PcdEntry>\r
     <PcdEntry>\r
@@ -2230,8 +2230,8 @@
       <DatumType>UINT32</DatumType>\r
       <ValidUsage>FIXED_AT_BUILD</ValidUsage>\r
       <DefaultValue>1000000</DefaultValue>\r
-      <HelpText>If PcdMaximumAsciiStringLength is not zero, the maximum number
-                of characters (not counting the NULL-terminator) in an ASCII
+      <HelpText>If PcdMaximumAsciiStringLength is not zero, the maximum number\r
+                of characters (not counting the NULL-terminator) in an ASCII\r
                 string cannot exceed it.</HelpText>\r
     </PcdEntry>\r
     <PcdEntry>\r
@@ -2241,8 +2241,8 @@
       <DatumType>UINT32</DatumType>\r
       <ValidUsage>FIXED_AT_BUILD</ValidUsage>\r
       <DefaultValue>1000000</DefaultValue>\r
-      <HelpText>If PcdMaximumLinkedListLength is not zero, the maximum number
-                of nodes (not counting the list header) in a linked list
+      <HelpText>If PcdMaximumLinkedListLength is not zero, the maximum number\r
+                of nodes (not counting the list header) in a linked list\r
                 cannot exceed it.</HelpText>\r
     </PcdEntry>\r
     <PcdEntry>\r
@@ -2252,7 +2252,7 @@
       <DatumType>UINT32</DatumType>\r
       <ValidUsage>FIXED_AT_BUILD</ValidUsage>\r
       <DefaultValue>10000000</DefaultValue>\r
-      <HelpText>If PcdSpinLockTimeout is not zero, it stands for the timeout
+      <HelpText>If PcdSpinLockTimeout is not zero, it stands for the timeout\r
                 value (unit: millisecond) for spin lock.</HelpText>\r
     </PcdEntry>\r
     <PcdEntry>\r
@@ -2262,8 +2262,8 @@
       <DatumType>UINT8</DatumType>\r
       <ValidUsage>FIXED_AT_BUILD</ValidUsage>\r
       <DefaultValue>0x0f</DefaultValue>\r
-      <HelpText>The bitmask of flags that specify the enable/disable of Debug
-                Assert, Debug Print, Debug Code, Clear Memory, Assert
+      <HelpText>The bitmask of flags that specify the enable/disable of Debug\r
+                Assert, Debug Print, Debug Code, Clear Memory, Assert\r
                 Breakpoint and Assert Deadloop.</HelpText>\r
     </PcdEntry>\r
     <PcdEntry>\r
@@ -2273,7 +2273,7 @@
       <DatumType>UINT32</DatumType>\r
       <ValidUsage>FIXED_AT_BUILD PATCHABLE_IN_MODULE</ValidUsage>\r
       <DefaultValue>0x80000000</DefaultValue>\r
-      <HelpText>The bitmask of flags that specify the kind of debug message
+      <HelpText>The bitmask of flags that specify the kind of debug message\r
                 output when Debug Print is enabled.</HelpText>\r
     </PcdEntry>\r
     <PcdEntry>\r
@@ -2283,7 +2283,7 @@
       <DatumType>UINT8</DatumType>\r
       <ValidUsage>FIXED_AT_BUILD</ValidUsage>\r
       <DefaultValue>0x06</DefaultValue>\r
-      <HelpText>The bitmask of flags that specify the enable/disable of
+      <HelpText>The bitmask of flags that specify the enable/disable of\r
                 Progress Code, Error Code and Debug Code.</HelpText>\r
     </PcdEntry>\r
     <PcdEntry>\r
@@ -2293,7 +2293,7 @@
       <DatumType>UINT8</DatumType>\r
       <ValidUsage>FIXED_AT_BUILD</ValidUsage>\r
       <DefaultValue>0xAF</DefaultValue>\r
-      <HelpText>The value used by DebugClearMemory () to fill a certain range
+      <HelpText>The value used by DebugClearMemory () to fill a certain range\r
                 of memory.</HelpText>\r
     </PcdEntry>\r
     <PcdEntry>\r
@@ -2303,7 +2303,7 @@
       <DatumType>UINT8</DatumType>\r
       <ValidUsage>FIXED_AT_BUILD</ValidUsage>\r
       <DefaultValue>0</DefaultValue>\r
-      <HelpText>The bitmask of flags that specify the enable/disable of
+      <HelpText>The bitmask of flags that specify the enable/disable of\r
                 Performance Measurement.</HelpText>\r
     </PcdEntry>\r
     <PcdEntry>\r
@@ -2313,7 +2313,7 @@
       <DatumType>UINT8</DatumType>\r
       <ValidUsage>FIXED_AT_BUILD</ValidUsage>\r
       <DefaultValue>0</DefaultValue>\r
-      <HelpText>The bitmask of flags that specify the enable/disable of Post
+      <HelpText>The bitmask of flags that specify the enable/disable of Post\r
                 Code, Post Code Description.</HelpText>\r
     </PcdEntry>\r
     <PcdEntry>\r