Update definition aligned to UEFI2.3

1. TapeIo TAPE_HEADER is rename to EFI_TAPE_HEADER
2. Add IN modifier for parameter Direction and Type of TapeIo.TapeSpace
3. HII package header EFI_HII_DEVICE_PATH_PACKAGE is renamed to EFI_HII_DEVICE_PATH_PACKAGE_HDR.
4. HII package header EFI_HII_FORM_PACKAGE is renamed to EFI_HII_FORM_PACKAGE_HDR.

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

diff --git a/MdePkg/Include/Protocol/HiiDatabase.h b/MdePkg/Include/Protocol/HiiDatabase.h
index 45012717fc6aa16a6337983c65c69b996c0f6710..d3ae1ad0320f128d036bdd54332198550e684056 100644 (file)
--- a/MdePkg/Include/Protocol/HiiDatabase.h
+++ b/MdePkg/Include/Protocol/HiiDatabase.h
@@ -433,7 +433,7 @@ EFI_STATUS
 (EFIAPI *EFI_HII_GET_KEYBOARD_LAYOUT)(\r
   IN CONST  EFI_HII_DATABASE_PROTOCOL *This,\r
   IN CONST  EFI_GUID                  *KeyGuid,\r
-  IN OUT UINT16                        *KeyboardLayoutLength,\r
+  IN OUT UINT16                       *KeyboardLayoutLength,\r
   OUT       EFI_HII_KEYBOARD_LAYOUT   *KeyboardLayout\r
 );\r
 \r

diff --git a/MdePkg/Include/Protocol/LoadFile.h b/MdePkg/Include/Protocol/LoadFile.h
index 1f057550b5021eb96fccc27470a9be4e9912cd06..3ebfcb2b017a843826e8ab40c37b86119d459621 100644 (file)
--- a/MdePkg/Include/Protocol/LoadFile.h
+++ b/MdePkg/Include/Protocol/LoadFile.h
@@ -52,7 +52,7 @@ typedef EFI_LOAD_FILE_PROTOCOL  EFI_LOAD_FILE_INTERFACE;
                      Buffer. On output with a return code of EFI_BUFFER_TOO_SMALL,\r
                      the size of Buffer required to retrieve the requested file.\r
   @param  Buffer     The memory buffer to transfer the file to. IF Buffer is NULL,\r
-                     then no the size of the requested file is returned in\r
+                     then the size of the requested file is returned in\r
                      BufferSize.\r
 \r
   @retval EFI_SUCCESS           The file was loaded.\r

diff --git a/MdePkg/Include/Protocol/TapeIo.h b/MdePkg/Include/Protocol/TapeIo.h
index 6183a2083c61d4e19b97919c6a133dc8f58c61b2..00a046081eefc1d23a65b7a0c64b5134aef926f8 100644 (file)
--- a/MdePkg/Include/Protocol/TapeIo.h
+++ b/MdePkg/Include/Protocol/TapeIo.h
@@ -23,7 +23,7 @@
 \r
 typedef struct _EFI_TAPE_IO_PROTOCOL EFI_TAPE_IO_PROTOCOL;\r
 \r
-typedef struct {\r
+typedef struct _EFI_TAPE_HEADER {\r
   UINT64     Signature;\r
   UINT32     Revision;\r
   UINT32     BootDescSize;\r
@@ -41,7 +41,7 @@ typedef struct {
   CHAR8      SystemName[256];  // UTF-8\r
   CHAR8      TapeTitle[120];   // UTF-8\r
   CHAR8      pad[468];         // pad to 1024\r
-} TAPE_HEADER;\r
+} EFI_TAPE_HEADER;\r
 \r
 /**\r
   Reads from the tape.\r
@@ -164,8 +164,8 @@ typedef
 EFI_STATUS\r
 (EFIAPI *EFI_TAPE_SPACE)(\r
   IN EFI_TAPE_IO_PROTOCOL *This,\r
-  INTN                    Direction,\r
-  UINTN                   Type\r
+  IN INTN                 Direction,\r
+  IN UINTN                Type\r
   );   \r
 \r
 \r

diff --git a/MdePkg/Include/Uefi/UefiInternalFormRepresentation.h b/MdePkg/Include/Uefi/UefiInternalFormRepresentation.h
index fa35d602a05ec83575af3f4952df73fc442caa2f..38004789c9f3aa99d63e950deb362c75515cece8 100644 (file)
--- a/MdePkg/Include/Uefi/UefiInternalFormRepresentation.h
+++ b/MdePkg/Include/Uefi/UefiInternalFormRepresentation.h
@@ -258,10 +258,10 @@ typedef struct _EFI_HII_GIBT_SKIP2_BLOCK {
 /// The device path package is used to carry a device path\r
 /// associated with the package list.\r
 ///\r
-typedef struct _EFI_HII_DEVICE_PATH_PACKAGE {\r
+typedef struct _EFI_HII_DEVICE_PATH_PACKAGE_HDR {\r
   EFI_HII_PACKAGE_HEADER   Header;\r
   // EFI_DEVICE_PATH_PROTOCOL DevicePath[];\r
-} EFI_HII_DEVICE_PATH_PACKAGE;\r
+} EFI_HII_DEVICE_PATH_PACKAGE_HDR;\r
 \r
 //\r
 // Definitions for GUID Package\r
@@ -596,13 +596,13 @@ typedef struct _EFI_HII_IMAGE_PALETTE_INFO {
 //\r
 \r
 ///\r
-/// The Forms package is used to carry forms-based encoding data.\r
+/// The Form package is used to carry form-based encoding data.\r
 ///\r
-typedef struct _EFI_HII_FORM_PACKAGE {\r
+typedef struct _EFI_HII_FORM_PACKAGE_HDR {\r
   EFI_HII_PACKAGE_HEADER       Header;\r
   // EFI_IFR_OP_HEADER         OpCodeHeader;\r
   // More op-codes follow\r
-} EFI_HII_FORM_PACKAGE;\r
+} EFI_HII_FORM_PACKAGE_HDR;\r
 \r
 typedef struct {\r
   UINT8 Hour;\r