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

4 files changed, 11 insertions, 11 deletions

diff --git a/MdePkg/Include/Protocol/HiiDatabase.h b/MdePkg/Include/Protocol/HiiDatabase.h
index 45012717fc..d3ae1ad032 100644
--- a/MdePkg/Include/Protocol/HiiDatabase.h
+++ b/MdePkg/Include/Protocol/HiiDatabase.h
@@ -433,7 +433,7 @@ EFI_STATUS
 (EFIAPI *EFI_HII_GET_KEYBOARD_LAYOUT)(

   IN CONST  EFI_HII_DATABASE_PROTOCOL *This,

   IN CONST  EFI_GUID                  *KeyGuid,

-  IN OUT UINT16                        *KeyboardLayoutLength,

+  IN OUT UINT16                       *KeyboardLayoutLength,

   OUT       EFI_HII_KEYBOARD_LAYOUT   *KeyboardLayout

 );

 

diff --git a/MdePkg/Include/Protocol/LoadFile.h b/MdePkg/Include/Protocol/LoadFile.h
index 1f057550b5..3ebfcb2b01 100644
--- 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,

                      the size of Buffer required to retrieve the requested file.

   @param  Buffer     The memory buffer to transfer the file to. IF Buffer is NULL,

-                     then no the size of the requested file is returned in

+                     then the size of the requested file is returned in

                      BufferSize.

 

   @retval EFI_SUCCESS           The file was loaded.

diff --git a/MdePkg/Include/Protocol/TapeIo.h b/MdePkg/Include/Protocol/TapeIo.h
index 6183a2083c..00a046081e 100644
--- a/MdePkg/Include/Protocol/TapeIo.h
+++ b/MdePkg/Include/Protocol/TapeIo.h
@@ -23,7 +23,7 @@
 

 typedef struct _EFI_TAPE_IO_PROTOCOL EFI_TAPE_IO_PROTOCOL;

 

-typedef struct {

+typedef struct _EFI_TAPE_HEADER {

   UINT64     Signature;

   UINT32     Revision;

   UINT32     BootDescSize;

@@ -41,7 +41,7 @@ typedef struct {
   CHAR8      SystemName[256];  // UTF-8

   CHAR8      TapeTitle[120];   // UTF-8

   CHAR8      pad[468];         // pad to 1024

-} TAPE_HEADER;

+} EFI_TAPE_HEADER;

 

 /**

   Reads from the tape.

@@ -164,8 +164,8 @@ typedef
 EFI_STATUS

 (EFIAPI *EFI_TAPE_SPACE)(

   IN EFI_TAPE_IO_PROTOCOL *This,

-  INTN                    Direction,

-  UINTN                   Type

+  IN INTN                 Direction,

+  IN UINTN                Type

   );   

 

 

diff --git a/MdePkg/Include/Uefi/UefiInternalFormRepresentation.h b/MdePkg/Include/Uefi/UefiInternalFormRepresentation.h
index fa35d602a0..38004789c9 100644
--- 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

 /// associated with the package list.

 ///

-typedef struct _EFI_HII_DEVICE_PATH_PACKAGE {

+typedef struct _EFI_HII_DEVICE_PATH_PACKAGE_HDR {

   EFI_HII_PACKAGE_HEADER   Header;

   // EFI_DEVICE_PATH_PROTOCOL DevicePath[];

-} EFI_HII_DEVICE_PATH_PACKAGE;

+} EFI_HII_DEVICE_PATH_PACKAGE_HDR;

 

 //

 // Definitions for GUID Package

@@ -596,13 +596,13 @@ typedef struct _EFI_HII_IMAGE_PALETTE_INFO {
 //

 

 ///

-/// The Forms package is used to carry forms-based encoding data.

+/// The Form package is used to carry form-based encoding data.

 ///

-typedef struct _EFI_HII_FORM_PACKAGE {

+typedef struct _EFI_HII_FORM_PACKAGE_HDR {

   EFI_HII_PACKAGE_HEADER       Header;

   // EFI_IFR_OP_HEADER         OpCodeHeader;

   // More op-codes follow

-} EFI_HII_FORM_PACKAGE;

+} EFI_HII_FORM_PACKAGE_HDR;

 

 typedef struct {

   UINT8 Hour;