Clean up MdePkg source to correct some coding style issues, etc.

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

6 files changed, 34 insertions, 34 deletions

diff --git a/MdePkg/Include/Protocol/AtaPassThru.h b/MdePkg/Include/Protocol/AtaPassThru.h
index 86d56418e9..40e31d46a7 100644
--- a/MdePkg/Include/Protocol/AtaPassThru.h
+++ b/MdePkg/Include/Protocol/AtaPassThru.h
@@ -3,7 +3,7 @@
   to send ATA Command Blocks to any ATA device attached to that ATA controller. The information

   includes the attributes of the ATA controller.

 

-  Copyright (c) 2009, Intel Corporation                                                         

+  Copyright (c) 2009 - 2010, Intel Corporation                                                         

   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        

@@ -74,10 +74,10 @@ typedef struct _EFI_ATA_STATUS_BLOCK {
   UINT8 AtaSectorNumberExp;

   UINT8 AtaCylinderLowExp;

   UINT8 AtaCylinderHighExp; 

-  UINT8 Reserved;

+  UINT8 Reserved2;

   UINT8 AtaSectorCount;

   UINT8 AtaSectorCountExp;

-  UINT8 Reserved2[6];

+  UINT8 Reserved3[6];

 } EFI_ATA_STATUS_BLOCK;

 

 typedef UINT8 EFI_ATA_PASS_THRU_CMD_PROTOCOL;

diff --git a/MdePkg/Include/Protocol/Eap.h b/MdePkg/Include/Protocol/Eap.h
index cf775d5274..d301f6d69a 100644
--- a/MdePkg/Include/Protocol/Eap.h
+++ b/MdePkg/Include/Protocol/Eap.h
@@ -5,7 +5,7 @@
   The definitions in this file are defined in UEFI Specification 2.3, which have

   not been verified by one implementation yet.

 

-  Copyright (c) 2009, Intel Corporation

+  Copyright (c) 2009 - 2010, Intel Corporation

   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

@@ -101,7 +101,7 @@ EFI_STATUS
 typedef

 EFI_STATUS

 (EFIAPI *EFI_EAP_SET_DESIRED_AUTHENTICATION_METHOD)(

-  IN struct _EFI_EAP_PROTOCOL    *This, 

+  IN EFI_EAP_PROTOCOL            *This, 

   IN UINT8                       EapAuthType

   );

 

@@ -131,7 +131,7 @@ EFI_STATUS
 typedef

 EFI_STATUS

 (EFIAPI *EFI_EAP_REGISTER_AUTHENTICATION_METHOD)(

-  IN struct _EFI_EAP_PROTOCOL             *This, 

+  IN EFI_EAP_PROTOCOL                     *This, 

   IN UINT8                                EapAuthType, 

   IN EFI_EAP_BUILD_RESPONSE_PACKET        Handler

   );

diff --git a/MdePkg/Include/Protocol/EapManagement.h b/MdePkg/Include/Protocol/EapManagement.h
index 877b802c46..fae4a6a643 100644
--- a/MdePkg/Include/Protocol/EapManagement.h
+++ b/MdePkg/Include/Protocol/EapManagement.h
@@ -6,7 +6,7 @@
   The definitions in this file are defined in UEFI Specification 2.2, which have

   not been verified by one implementation yet.

 

-  Copyright (c) 2009, Intel Corporation

+  Copyright (c) 2009 - 2010, Intel Corporation

   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

@@ -202,7 +202,7 @@ typedef struct _EFI_EAPOL_SUPPLICANT_PAE_STATISTICS {
 typedef

 EFI_STATUS

 (EFIAPI *EFI_EAP_GET_SYSTEM_CONFIGURATION)(

-  IN struct _EFI_EAP_MANAGEMENT_PROTOCOL  *This, 

+  IN EFI_EAP_MANAGEMENT_PROTOCOL          *This, 

   OUT BOOLEAN                             *SystemAuthControl, 

   OUT EFI_EAPOL_PORT_INFO                 *PortInfo OPTIONAL

   );

@@ -226,7 +226,7 @@ EFI_STATUS
 typedef

 EFI_STATUS

 (EFIAPI *EFI_EAP_SET_SYSTEM_CONFIGURATION)(

-  IN struct _EFI_EAP_MANAGEMENT_PROTOCOL  *This, 

+  IN EFI_EAP_MANAGEMENT_PROTOCOL          *This, 

   IN BOOLEAN                              SystemAuthControl

   );

 

@@ -244,7 +244,7 @@ EFI_STATUS
 typedef

 EFI_STATUS

 (EFIAPI *EFI_EAP_INITIALIZE_PORT)(

-  IN struct _EFI_EAP_MANAGEMENT_PROTOCOL  *This

+  IN EFI_EAP_MANAGEMENT_PROTOCOL            *This

   );

 

 /**

@@ -262,7 +262,7 @@ EFI_STATUS
 typedef

 EFI_STATUS

 (EFIAPI *EFI_EAP_USER_LOGON)(

-  IN struct _EFI_EAP_MANAGEMENT_PROTOCOL  *This

+  IN EFI_EAP_MANAGEMENT_PROTOCOL          *This

   );

 

 /**

@@ -280,7 +280,7 @@ EFI_STATUS
 typedef

 EFI_STATUS

 (EFIAPI *EFI_EAP_USER_LOGOFF)(

-  IN struct _EFI_EAP_MANAGEMENT_PROTOCOL  *This

+  IN EFI_EAP_MANAGEMENT_PROTOCOL          *This

   );

 

 /**

@@ -318,7 +318,7 @@ EFI_STATUS
 typedef

 EFI_STATUS

 (EFIAPI *EFI_EAP_GET_SUPPLICANT_STATUS)(

-  IN struct _EFI_EAP_MANAGEMENT_PROTOCOL          *This, 

+  IN EFI_EAP_MANAGEMENT_PROTOCOL                  *This, 

   OUT EFI_EAPOL_SUPPLICANT_PAE_STATE              *CurrentState, 

   IN OUT EFI_EAPOL_SUPPLICANT_PAE_CONFIGURATION   *Configuration  OPTIONAL

   );

@@ -349,7 +349,7 @@ EFI_STATUS
 typedef

 EFI_STATUS

 (EFIAPI *EFI_EAP_SET_SUPPLICANT_CONFIGURATION)(

-  IN struct _EFI_EAP_MANAGEMENT_PROTOCOL      *This, 

+  IN EFI_EAP_MANAGEMENT_PROTOCOL              *This, 

   IN EFI_EAPOL_SUPPLICANT_PAE_CONFIGURATION   *Configuration

   );

 

@@ -375,7 +375,7 @@ EFI_STATUS
 typedef

 EFI_STATUS

 (EFIAPI *EFI_EAP_GET_SUPPLICANT_STATISTICS)(

-  IN struct _EFI_EAP_MANAGEMENT_PROTOCOL      *This, 

+  IN EFI_EAP_MANAGEMENT_PROTOCOL              *This, 

   OUT EFI_EAPOL_SUPPLICANT_PAE_STATISTICS     *Statistics

   );

 

diff --git a/MdePkg/Include/Protocol/Ip6.h b/MdePkg/Include/Protocol/Ip6.h
index 590c981801..7fe7eeeb61 100644
--- a/MdePkg/Include/Protocol/Ip6.h
+++ b/MdePkg/Include/Protocol/Ip6.h
@@ -10,7 +10,7 @@
   Listener Discovery Protocol (MLD), and a subset of the Internet Control

   Message Protocol (ICMPv6).

   

-  Copyright (c) 2008 - 2009, Intel Corporation                                                         

+  Copyright (c) 2008 - 2010, Intel Corporation                                                         

   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        

@@ -838,7 +838,7 @@ EFI_STATUS
   is signaled.

 

   @param[in]  This               Pointer to the EFI_IP6_PROTOCOL instance.

-  @param]in]  Token              Pointer to a token that is associated with the receive data descriptor.

+  @param[in]  Token              Pointer to a token that is associated with the receive data descriptor.

                                  

   @retval EFI_SUCCESS            The receive completion token was cached.

   @retval EFI_NOT_STARTED        This EFI IPv6 Protocol instance has not been started.

diff --git a/MdePkg/Include/Protocol/Ip6Config.h b/MdePkg/Include/Protocol/Ip6Config.h
index 3d7370843a..ad9d0bad1b 100644
--- a/MdePkg/Include/Protocol/Ip6Config.h
+++ b/MdePkg/Include/Protocol/Ip6Config.h
@@ -2,7 +2,7 @@
   This file provides a definition of the EFI IPv6 Configuration

   Protocol.

 

-Copyright (c) 2008 - 2009, Intel Corporation.<BR>

+Copyright (c) 2008 - 2010, Intel Corporation.<BR>

 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<BR>

@@ -231,7 +231,7 @@ typedef struct {
                                 - Data is NULL.

                                 - One or more fields in Data do not match the requirement of the 

                                   data type indicated by DataType. 

-  @rerval EFI_WRITE_PROTECTED   The specified configuration data is read-only or the specified 

+  @retval EFI_WRITE_PROTECTED   The specified configuration data is read-only or the specified 

                                 configuration data can not be set under the current policy

   @retval EFI_ACCESS_DENIED     Another set operation on the specified configuration 

                                 data is already in process.

@@ -283,7 +283,7 @@ EFI_STATUS
                                 - This is NULL.

                                 - DataSize is NULL.

                                 - Data is NULL if *DataSize is not zero.

-  @rerval EFI_BUFFER_TOO_SMALL  The size of Data is too small for the specified configuration data 

+  @retval EFI_BUFFER_TOO_SMALL  The size of Data is too small for the specified configuration data 

                                 and the required size is returned in DataSize.

   @retval EFI_NOT_READY         The specified configuration data is not ready due to an already in 

                                 progress asynchronous configuration process.

@@ -315,7 +315,7 @@ EFI_STATUS
   @retval EFI_SUCCESS           The notification event for the specified configuration data is 

                                 registered.

   @retval EFI_INVALID_PARAMETER This is NULL or Event is NULL.

-  @rerval EFI_UNSUPPORTED       The configuration data type specified by DataType is not 

+  @retval EFI_UNSUPPORTED       The configuration data type specified by DataType is not 

                                 supported.

   @retval EFI_OUT_OF_RESOURCES  Required system resources could not be allocated.

   @retval EFI_ACCESS_DENIED     The Event is already registered for the DataType.

@@ -340,7 +340,7 @@ EFI_STATUS
   

   @retval EFI_SUCCESS           The event registered for the specified configuration data is removed.

   @retval EFI_INVALID_PARAMETER This is NULL or Event is NULL.

-  @rerval EFI_NOT_FOUND         The Event has not been registered for the specified 

+  @retval EFI_NOT_FOUND         The Event has not been registered for the specified 

                                 DataType.

   

 **/

diff --git a/MdePkg/Include/Protocol/S3SaveState.h b/MdePkg/Include/Protocol/S3SaveState.h
index 2d5c566420..ec2067226c 100644
--- a/MdePkg/Include/Protocol/S3SaveState.h
+++ b/MdePkg/Include/Protocol/S3SaveState.h
@@ -5,7 +5,7 @@
   to be replayed during an S3 resume.

   This protocol is not required for all platforms.

   

-  Copyright (c) 2009, Intel Corporation                                                         

+  Copyright (c) 2009 - 2010, Intel Corporation                                                         

   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        

@@ -51,8 +51,8 @@ typedef struct _EFI_S3_SAVE_STATE_PROTOCOL  EFI_S3_SAVE_STATE_PROTOCOL;
 typedef

 EFI_STATUS

 (EFIAPI *EFI_S3_SAVE_STATE_WRITE)(

-   IN CONST struct _EFI_S3_SAVE_STATE_PROTOCOL  *This,

-   IN       UINT16                              OpCode,

+   IN CONST EFI_S3_SAVE_STATE_PROTOCOL  *This,

+   IN       UINT16                      OpCode,

    ...

 );

 

@@ -95,10 +95,10 @@ EFI_STATUS
 typedef

 EFI_STATUS

 (EFIAPI *EFI_S3_SAVE_STATE_INSERT)(

-   IN CONST struct _EFI_S3_SAVE_STATE_PROTOCOL  *This,

-   IN       BOOLEAN                             BeforeOrAfter,

-   IN OUT   EFI_S3_BOOT_SCRIPT_POSITION         *Position       OPTIONAL,

-   IN       UINT16                              OpCode,

+   IN CONST EFI_S3_SAVE_STATE_PROTOCOL  *This,

+   IN       BOOLEAN                     BeforeOrAfter,

+   IN OUT   EFI_S3_BOOT_SCRIPT_POSITION *Position       OPTIONAL,

+   IN       UINT16                      OpCode,

    ...

 );

 

@@ -132,10 +132,10 @@ EFI_STATUS
 typedef

 EFI_STATUS

 (EFIAPI *EFI_S3_SAVE_STATE_LABEL)(

-   IN CONST  struct _EFI_S3_SAVE_STATE_PROTOCOL    *This,

-   IN        BOOLEAN                               BeforeOrAfter,

-   IN        BOOLEAN                               CreateIfNotFound,

-   IN OUT    EFI_S3_BOOT_SCRIPT_POSITION           *Position OPTIONAL,

+   IN CONST  EFI_S3_SAVE_STATE_PROTOCOL      *This,

+   IN        BOOLEAN                         BeforeOrAfter,

+   IN        BOOLEAN                         CreateIfNotFound,

+   IN OUT    EFI_S3_BOOT_SCRIPT_POSITION     *Position OPTIONAL,

    IN CONST  CHAR8                           *Label

 );

 

@@ -157,7 +157,7 @@ EFI_STATUS
 typedef

 EFI_STATUS

 (EFIAPI *EFI_S3_SAVE_STATE_COMPARE)(

-   IN CONST struct _EFI_S3_SAVE_STATE_PROTOCOL  *This,

+   IN CONST EFI_S3_SAVE_STATE_PROTOCOL          *This,

    IN       EFI_S3_BOOT_SCRIPT_POSITION         Position1,

    IN       EFI_S3_BOOT_SCRIPT_POSITION         Position2,

    OUT      UINTN                               *RelativePosition