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

diff --git a/MdePkg/Include/Arm/ProcessorBind.h b/MdePkg/Include/Arm/ProcessorBind.h
index 6b75325f8770cf90d2839f114fd90eb167caf43e..5ec371b55b84f9fc258df8fb31d7aea2858203aa 100644 (file)
--- a/MdePkg/Include/Arm/ProcessorBind.h
+++ b/MdePkg/Include/Arm/ProcessorBind.h
@@ -1,8 +1,7 @@
-\r

 /** @file\r
   Processor or Compiler specific defines and types for ARM.\r
 \r
 /** @file\r
   Processor or Compiler specific defines and types for ARM.\r
 \r

-  Copyright (c) 2006 - 2009, Intel Corporation<BR>                                                         \r
+  Copyright (c) 2006 - 2010, Intel Corporation<BR>                                                         \r

   Portions copyright (c) 2008-2009 Apple Inc. All rights reserved.<BR>\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
   Portions copyright (c) 2008-2009 Apple Inc. All rights reserved.<BR>\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

diff --git a/MdePkg/Include/Library/DxeServicesLib.h b/MdePkg/Include/Library/DxeServicesLib.h
index 944535d4a08ae0b4c6b982dd366c6e5f4b4c03a9..abfdde6d6237b22929702b9470ac43f3ae28fd31 100644 (file)
--- a/MdePkg/Include/Library/DxeServicesLib.h
+++ b/MdePkg/Include/Library/DxeServicesLib.h
@@ -2,7 +2,7 @@
   MDE DXE Services Library provides functions that simplify the development of DXE Drivers.  \r
   These functions help access data from sections of FFS files or from file path.\r
 \r
   MDE DXE Services Library provides functions that simplify the development of DXE Drivers.  \r
   These functions help access data from sections of FFS files or from file path.\r
 \r

-  Copyright (c) 2008 - 2009, Intel Corporation<BR>                                                         \r
+  Copyright (c) 2008 - 2010, Intel Corporation<BR>                                                         \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
   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


@@ -167,16 +167,15 @@ GetSectionFromFfs (
   If FileSize is NULL, then NULL is returned.\r
   If AuthenticationStatus is NULL, then NULL is returned.\r
 \r
   If FileSize is NULL, then NULL is returned.\r
   If AuthenticationStatus is NULL, then NULL is returned.\r
 \r

-  @param[in]       BootPolicy \r
-                             Policy for Open Image File.If TRUE, indicates that the request \r
-                             originates from the boot manager, and that the boot manager is\r
-                             attempting to load FilePath as a boot selection. If FALSE, \r
-                             then FilePath must match an exact file to be loaded.\r
-  @param[in]       File      Pointer to the device path of the file that is absracted to the file buffer.\r
-  @param[out]      FileSize  Pointer to the size of the abstracted file buffer.\r
-  @param[out]      AuthenticationStatus   \r
-                             Pointer to a caller-allocated UINT32 in which\r
-                             the authentication status is returned.\r
+  @param[in]       BootPolicy           Policy for Open Image File.If TRUE, indicates that the request \r
+                                        originates from the boot manager, and that the boot manager is\r
+                                        attempting to load FilePath as a boot selection. If FALSE, \r
+                                        then FilePath must match an exact file to be loaded.\r
+  @param[in]       FilePath             Pointer to the device path of the file that is absracted to\r
+                                        the file buffer.\r
+  @param[out]      FileSize             Pointer to the size of the abstracted file buffer.\r
+  @param[out]      AuthenticationStatus Pointer to a caller-allocated UINT32 in which the authentication\r
+                                        status is returned.\r

 \r
   @retval NULL   File is NULL, or FileSize is NULL. Or the file can't be found.\r
   @retval other  The abstracted file buffer. The caller is responsible to free memory.\r
 \r
   @retval NULL   File is NULL, or FileSize is NULL. Or the file can't be found.\r
   @retval other  The abstracted file buffer. The caller is responsible to free memory.\r

diff --git a/MdePkg/Include/Protocol/AtaPassThru.h b/MdePkg/Include/Protocol/AtaPassThru.h
index 86d56418e97ddc38bf5cd5b4f70ea6451495223d..40e31d46a70a889ba34e2b2ff4955ee4b7ede21c 100644 (file)
--- 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\r
   includes the attributes of the ATA controller.\r
 \r
   to send ATA Command Blocks to any ATA device attached to that ATA controller. The information\r
   includes the attributes of the ATA controller.\r
 \r

-  Copyright (c) 2009, Intel Corporation                                                         \r
+  Copyright (c) 2009 - 2010, 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
   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


@@ -74,10 +74,10 @@ typedef struct _EFI_ATA_STATUS_BLOCK {
   UINT8 AtaSectorNumberExp;\r
   UINT8 AtaCylinderLowExp;\r
   UINT8 AtaCylinderHighExp; \r
   UINT8 AtaSectorNumberExp;\r
   UINT8 AtaCylinderLowExp;\r
   UINT8 AtaCylinderHighExp; \r

-  UINT8 Reserved;\r
+  UINT8 Reserved2;\r

   UINT8 AtaSectorCount;\r
   UINT8 AtaSectorCountExp;\r
   UINT8 AtaSectorCount;\r
   UINT8 AtaSectorCountExp;\r

-  UINT8 Reserved2[6];\r
+  UINT8 Reserved3[6];\r

 } EFI_ATA_STATUS_BLOCK;\r
 \r
 typedef UINT8 EFI_ATA_PASS_THRU_CMD_PROTOCOL;\r
 } EFI_ATA_STATUS_BLOCK;\r
 \r
 typedef UINT8 EFI_ATA_PASS_THRU_CMD_PROTOCOL;\r

diff --git a/MdePkg/Include/Protocol/Eap.h b/MdePkg/Include/Protocol/Eap.h
index cf775d527428132ac2600a05745887a7ad5fde29..d301f6d69a46a3c84d198dc6f873340e72c5d33f 100644 (file)
--- 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\r
   not been verified by one implementation yet.\r
 \r
   The definitions in this file are defined in UEFI Specification 2.3, which have\r
   not been verified by one implementation yet.\r
 \r

-  Copyright (c) 2009, Intel Corporation\r
+  Copyright (c) 2009 - 2010, 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
   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


@@ -101,7 +101,7 @@ EFI_STATUS
 typedef\r
 EFI_STATUS\r
 (EFIAPI *EFI_EAP_SET_DESIRED_AUTHENTICATION_METHOD)(\r
 typedef\r
 EFI_STATUS\r
 (EFIAPI *EFI_EAP_SET_DESIRED_AUTHENTICATION_METHOD)(\r

-  IN struct _EFI_EAP_PROTOCOL    *This, \r
+  IN EFI_EAP_PROTOCOL            *This, \r

   IN UINT8                       EapAuthType\r
   );\r
 \r
   IN UINT8                       EapAuthType\r
   );\r
 \r


@@ -131,7 +131,7 @@ EFI_STATUS
 typedef\r
 EFI_STATUS\r
 (EFIAPI *EFI_EAP_REGISTER_AUTHENTICATION_METHOD)(\r
 typedef\r
 EFI_STATUS\r
 (EFIAPI *EFI_EAP_REGISTER_AUTHENTICATION_METHOD)(\r

-  IN struct _EFI_EAP_PROTOCOL             *This, \r
+  IN EFI_EAP_PROTOCOL                     *This, \r

   IN UINT8                                EapAuthType, \r
   IN EFI_EAP_BUILD_RESPONSE_PACKET        Handler\r
   );\r
   IN UINT8                                EapAuthType, \r
   IN EFI_EAP_BUILD_RESPONSE_PACKET        Handler\r
   );\r

diff --git a/MdePkg/Include/Protocol/EapManagement.h b/MdePkg/Include/Protocol/EapManagement.h
index 877b802c46b2f51ea3daf0a48aa82686eb0fb4e2..fae4a6a6434647f9889e9501e6f28fe3e23f37f8 100644 (file)
--- 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\r
   not been verified by one implementation yet.\r
 \r
   The definitions in this file are defined in UEFI Specification 2.2, which have\r
   not been verified by one implementation yet.\r
 \r

-  Copyright (c) 2009, Intel Corporation\r
+  Copyright (c) 2009 - 2010, 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
   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


@@ -202,7 +202,7 @@ typedef struct _EFI_EAPOL_SUPPLICANT_PAE_STATISTICS {
 typedef\r
 EFI_STATUS\r
 (EFIAPI *EFI_EAP_GET_SYSTEM_CONFIGURATION)(\r
 typedef\r
 EFI_STATUS\r
 (EFIAPI *EFI_EAP_GET_SYSTEM_CONFIGURATION)(\r

-  IN struct _EFI_EAP_MANAGEMENT_PROTOCOL  *This, \r
+  IN EFI_EAP_MANAGEMENT_PROTOCOL          *This, \r

   OUT BOOLEAN                             *SystemAuthControl, \r
   OUT EFI_EAPOL_PORT_INFO                 *PortInfo OPTIONAL\r
   );\r
   OUT BOOLEAN                             *SystemAuthControl, \r
   OUT EFI_EAPOL_PORT_INFO                 *PortInfo OPTIONAL\r
   );\r


@@ -226,7 +226,7 @@ EFI_STATUS
 typedef\r
 EFI_STATUS\r
 (EFIAPI *EFI_EAP_SET_SYSTEM_CONFIGURATION)(\r
 typedef\r
 EFI_STATUS\r
 (EFIAPI *EFI_EAP_SET_SYSTEM_CONFIGURATION)(\r

-  IN struct _EFI_EAP_MANAGEMENT_PROTOCOL  *This, \r
+  IN EFI_EAP_MANAGEMENT_PROTOCOL          *This, \r

   IN BOOLEAN                              SystemAuthControl\r
   );\r
 \r
   IN BOOLEAN                              SystemAuthControl\r
   );\r
 \r


@@ -244,7 +244,7 @@ EFI_STATUS
 typedef\r
 EFI_STATUS\r
 (EFIAPI *EFI_EAP_INITIALIZE_PORT)(\r
 typedef\r
 EFI_STATUS\r
 (EFIAPI *EFI_EAP_INITIALIZE_PORT)(\r

-  IN struct _EFI_EAP_MANAGEMENT_PROTOCOL  *This\r
+  IN EFI_EAP_MANAGEMENT_PROTOCOL            *This\r

   );\r
 \r
 /**\r
   );\r
 \r
 /**\r


@@ -262,7 +262,7 @@ EFI_STATUS
 typedef\r
 EFI_STATUS\r
 (EFIAPI *EFI_EAP_USER_LOGON)(\r
 typedef\r
 EFI_STATUS\r
 (EFIAPI *EFI_EAP_USER_LOGON)(\r

-  IN struct _EFI_EAP_MANAGEMENT_PROTOCOL  *This\r
+  IN EFI_EAP_MANAGEMENT_PROTOCOL          *This\r

   );\r
 \r
 /**\r
   );\r
 \r
 /**\r


@@ -280,7 +280,7 @@ EFI_STATUS
 typedef\r
 EFI_STATUS\r
 (EFIAPI *EFI_EAP_USER_LOGOFF)(\r
 typedef\r
 EFI_STATUS\r
 (EFIAPI *EFI_EAP_USER_LOGOFF)(\r

-  IN struct _EFI_EAP_MANAGEMENT_PROTOCOL  *This\r
+  IN EFI_EAP_MANAGEMENT_PROTOCOL          *This\r

   );\r
 \r
 /**\r
   );\r
 \r
 /**\r


@@ -318,7 +318,7 @@ EFI_STATUS
 typedef\r
 EFI_STATUS\r
 (EFIAPI *EFI_EAP_GET_SUPPLICANT_STATUS)(\r
 typedef\r
 EFI_STATUS\r
 (EFIAPI *EFI_EAP_GET_SUPPLICANT_STATUS)(\r

-  IN struct _EFI_EAP_MANAGEMENT_PROTOCOL          *This, \r
+  IN EFI_EAP_MANAGEMENT_PROTOCOL                  *This, \r

   OUT EFI_EAPOL_SUPPLICANT_PAE_STATE              *CurrentState, \r
   IN OUT EFI_EAPOL_SUPPLICANT_PAE_CONFIGURATION   *Configuration  OPTIONAL\r
   );\r
   OUT EFI_EAPOL_SUPPLICANT_PAE_STATE              *CurrentState, \r
   IN OUT EFI_EAPOL_SUPPLICANT_PAE_CONFIGURATION   *Configuration  OPTIONAL\r
   );\r


@@ -349,7 +349,7 @@ EFI_STATUS
 typedef\r
 EFI_STATUS\r
 (EFIAPI *EFI_EAP_SET_SUPPLICANT_CONFIGURATION)(\r
 typedef\r
 EFI_STATUS\r
 (EFIAPI *EFI_EAP_SET_SUPPLICANT_CONFIGURATION)(\r

-  IN struct _EFI_EAP_MANAGEMENT_PROTOCOL      *This, \r
+  IN EFI_EAP_MANAGEMENT_PROTOCOL              *This, \r

   IN EFI_EAPOL_SUPPLICANT_PAE_CONFIGURATION   *Configuration\r
   );\r
 \r
   IN EFI_EAPOL_SUPPLICANT_PAE_CONFIGURATION   *Configuration\r
   );\r
 \r


@@ -375,7 +375,7 @@ EFI_STATUS
 typedef\r
 EFI_STATUS\r
 (EFIAPI *EFI_EAP_GET_SUPPLICANT_STATISTICS)(\r
 typedef\r
 EFI_STATUS\r
 (EFIAPI *EFI_EAP_GET_SUPPLICANT_STATISTICS)(\r

-  IN struct _EFI_EAP_MANAGEMENT_PROTOCOL      *This, \r
+  IN EFI_EAP_MANAGEMENT_PROTOCOL              *This, \r

   OUT EFI_EAPOL_SUPPLICANT_PAE_STATISTICS     *Statistics\r
   );\r
 \r
   OUT EFI_EAPOL_SUPPLICANT_PAE_STATISTICS     *Statistics\r
   );\r
 \r

diff --git a/MdePkg/Include/Protocol/Ip6.h b/MdePkg/Include/Protocol/Ip6.h
index 590c9818013c98ac723242cbf485d7d73f4611e6..7fe7eeeb61ed2a66ed810869df6c6899b2c0608a 100644 (file)
--- 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\r
   Message Protocol (ICMPv6).\r
   \r
   Listener Discovery Protocol (MLD), and a subset of the Internet Control\r
   Message Protocol (ICMPv6).\r
   \r

-  Copyright (c) 2008 - 2009, Intel Corporation                                                         \r
+  Copyright (c) 2008 - 2010, 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
   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


@@ -838,7 +838,7 @@ EFI_STATUS
   is signaled.\r
 \r
   @param[in]  This               Pointer to the EFI_IP6_PROTOCOL instance.\r
   is signaled.\r
 \r
   @param[in]  This               Pointer to the EFI_IP6_PROTOCOL instance.\r

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

                                  \r
   @retval EFI_SUCCESS            The receive completion token was cached.\r
   @retval EFI_NOT_STARTED        This EFI IPv6 Protocol instance has not been started.\r
                                  \r
   @retval EFI_SUCCESS            The receive completion token was cached.\r
   @retval EFI_NOT_STARTED        This EFI IPv6 Protocol instance has not been started.\r

diff --git a/MdePkg/Include/Protocol/Ip6Config.h b/MdePkg/Include/Protocol/Ip6Config.h
index 3d7370843ac9adca6255e2283e9333443080910c..ad9d0bad1b3f2807d1859d204af752f43a15baa3 100644 (file)
--- 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\r
   Protocol.\r
 \r
   This file provides a definition of the EFI IPv6 Configuration\r
   Protocol.\r
 \r

-Copyright (c) 2008 - 2009, Intel Corporation.<BR>\r
+Copyright (c) 2008 - 2010, Intel Corporation.<BR>\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<BR>\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<BR>\r


@@ -231,7 +231,7 @@ typedef struct {
                                 - Data is NULL.\r
                                 - One or more fields in Data do not match the requirement of the \r
                                   data type indicated by DataType. \r
                                 - Data is NULL.\r
                                 - One or more fields in Data do not match the requirement of the \r
                                   data type indicated by DataType. \r

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

                                 configuration data can not be set under the current policy\r
   @retval EFI_ACCESS_DENIED     Another set operation on the specified configuration \r
                                 data is already in process.\r
                                 configuration data can not be set under the current policy\r
   @retval EFI_ACCESS_DENIED     Another set operation on the specified configuration \r
                                 data is already in process.\r


@@ -283,7 +283,7 @@ EFI_STATUS
                                 - This is NULL.\r
                                 - DataSize is NULL.\r
                                 - Data is NULL if *DataSize is not zero.\r
                                 - This is NULL.\r
                                 - DataSize is NULL.\r
                                 - Data is NULL if *DataSize is not zero.\r

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

                                 and the required size is returned in DataSize.\r
   @retval EFI_NOT_READY         The specified configuration data is not ready due to an already in \r
                                 progress asynchronous configuration process.\r
                                 and the required size is returned in DataSize.\r
   @retval EFI_NOT_READY         The specified configuration data is not ready due to an already in \r
                                 progress asynchronous configuration process.\r


@@ -315,7 +315,7 @@ EFI_STATUS
   @retval EFI_SUCCESS           The notification event for the specified configuration data is \r
                                 registered.\r
   @retval EFI_INVALID_PARAMETER This is NULL or Event is NULL.\r
   @retval EFI_SUCCESS           The notification event for the specified configuration data is \r
                                 registered.\r
   @retval EFI_INVALID_PARAMETER This is NULL or Event is NULL.\r

-  @rerval EFI_UNSUPPORTED       The configuration data type specified by DataType is not \r
+  @retval EFI_UNSUPPORTED       The configuration data type specified by DataType is not \r

                                 supported.\r
   @retval EFI_OUT_OF_RESOURCES  Required system resources could not be allocated.\r
   @retval EFI_ACCESS_DENIED     The Event is already registered for the DataType.\r
                                 supported.\r
   @retval EFI_OUT_OF_RESOURCES  Required system resources could not be allocated.\r
   @retval EFI_ACCESS_DENIED     The Event is already registered for the DataType.\r


@@ -340,7 +340,7 @@ EFI_STATUS
   \r
   @retval EFI_SUCCESS           The event registered for the specified configuration data is removed.\r
   @retval EFI_INVALID_PARAMETER This is NULL or Event is NULL.\r
   \r
   @retval EFI_SUCCESS           The event registered for the specified configuration data is removed.\r
   @retval EFI_INVALID_PARAMETER This is NULL or Event is NULL.\r

-  @rerval EFI_NOT_FOUND         The Event has not been registered for the specified \r
+  @retval EFI_NOT_FOUND         The Event has not been registered for the specified \r

                                 DataType.\r
   \r
 **/\r
                                 DataType.\r
   \r
 **/\r

diff --git a/MdePkg/Include/Protocol/S3SaveState.h b/MdePkg/Include/Protocol/S3SaveState.h
index 2d5c566420b85fab731865daf85d044849e007bd..ec2067226c29b9d790d6d8eb05ae6ff98c6d36a7 100644 (file)
--- a/MdePkg/Include/Protocol/S3SaveState.h
+++ b/MdePkg/Include/Protocol/S3SaveState.h
@@ -5,7 +5,7 @@
   to be replayed during an S3 resume.\r
   This protocol is not required for all platforms.\r
   \r
   to be replayed during an S3 resume.\r
   This protocol is not required for all platforms.\r
   \r

-  Copyright (c) 2009, Intel Corporation                                                         \r
+  Copyright (c) 2009 - 2010, 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
   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


@@ -51,8 +51,8 @@ typedef struct _EFI_S3_SAVE_STATE_PROTOCOL  EFI_S3_SAVE_STATE_PROTOCOL;
 typedef\r
 EFI_STATUS\r
 (EFIAPI *EFI_S3_SAVE_STATE_WRITE)(\r
 typedef\r
 EFI_STATUS\r
 (EFIAPI *EFI_S3_SAVE_STATE_WRITE)(\r

-   IN CONST struct _EFI_S3_SAVE_STATE_PROTOCOL  *This,\r
-   IN       UINT16                              OpCode,\r
+   IN CONST EFI_S3_SAVE_STATE_PROTOCOL  *This,\r
+   IN       UINT16                      OpCode,\r

    ...\r
 );\r
 \r
    ...\r
 );\r
 \r


@@ -95,10 +95,10 @@ EFI_STATUS
 typedef\r
 EFI_STATUS\r
 (EFIAPI *EFI_S3_SAVE_STATE_INSERT)(\r
 typedef\r
 EFI_STATUS\r
 (EFIAPI *EFI_S3_SAVE_STATE_INSERT)(\r

-   IN CONST struct _EFI_S3_SAVE_STATE_PROTOCOL  *This,\r
-   IN       BOOLEAN                             BeforeOrAfter,\r
-   IN OUT   EFI_S3_BOOT_SCRIPT_POSITION         *Position       OPTIONAL,\r
-   IN       UINT16                              OpCode,\r
+   IN CONST EFI_S3_SAVE_STATE_PROTOCOL  *This,\r
+   IN       BOOLEAN                     BeforeOrAfter,\r
+   IN OUT   EFI_S3_BOOT_SCRIPT_POSITION *Position       OPTIONAL,\r
+   IN       UINT16                      OpCode,\r

    ...\r
 );\r
 \r
    ...\r
 );\r
 \r


@@ -132,10 +132,10 @@ EFI_STATUS
 typedef\r
 EFI_STATUS\r
 (EFIAPI *EFI_S3_SAVE_STATE_LABEL)(\r
 typedef\r
 EFI_STATUS\r
 (EFIAPI *EFI_S3_SAVE_STATE_LABEL)(\r

-   IN CONST  struct _EFI_S3_SAVE_STATE_PROTOCOL    *This,\r
-   IN        BOOLEAN                               BeforeOrAfter,\r
-   IN        BOOLEAN                               CreateIfNotFound,\r
-   IN OUT    EFI_S3_BOOT_SCRIPT_POSITION           *Position OPTIONAL,\r
+   IN CONST  EFI_S3_SAVE_STATE_PROTOCOL      *This,\r
+   IN        BOOLEAN                         BeforeOrAfter,\r
+   IN        BOOLEAN                         CreateIfNotFound,\r
+   IN OUT    EFI_S3_BOOT_SCRIPT_POSITION     *Position OPTIONAL,\r

    IN CONST  CHAR8                           *Label\r
 );\r
 \r
    IN CONST  CHAR8                           *Label\r
 );\r
 \r


@@ -157,7 +157,7 @@ EFI_STATUS
 typedef\r
 EFI_STATUS\r
 (EFIAPI *EFI_S3_SAVE_STATE_COMPARE)(\r
 typedef\r
 EFI_STATUS\r
 (EFIAPI *EFI_S3_SAVE_STATE_COMPARE)(\r

-   IN CONST struct _EFI_S3_SAVE_STATE_PROTOCOL  *This,\r
+   IN CONST EFI_S3_SAVE_STATE_PROTOCOL          *This,\r

    IN       EFI_S3_BOOT_SCRIPT_POSITION         Position1,\r
    IN       EFI_S3_BOOT_SCRIPT_POSITION         Position2,\r
    OUT      UINTN                               *RelativePosition\r
    IN       EFI_S3_BOOT_SCRIPT_POSITION         Position1,\r
    IN       EFI_S3_BOOT_SCRIPT_POSITION         Position2,\r
    OUT      UINTN                               *RelativePosition\r

diff --git a/MdePkg/Library/BaseLib/Arm/GccInline.c b/MdePkg/Library/BaseLib/Arm/GccInline.c
index 97e7d82c028e1e9754ecb89e85cca64d04f2e2df..03290178e717faaeec94f47657b47a8e5fbba08b 100644 (file)
--- a/MdePkg/Library/BaseLib/Arm/GccInline.c
+++ b/MdePkg/Library/BaseLib/Arm/GccInline.c
@@ -1,7 +1,7 @@
 /** @file\r
   GCC inline implementation of BaseLib processor specific functions.\r
   \r
 /** @file\r
   GCC inline implementation of BaseLib processor specific functions.\r
   \r

-  Copyright (c) 2006 - 2007, Intel Corporation<BR>\r
+  Copyright (c) 2006 - 2010, Intel Corporation<BR>\r

   Portions copyright (c) 2008-2009 Apple Inc. All rights reserved.<BR>\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
   Portions copyright (c) 2008-2009 Apple Inc. All rights reserved.<BR>\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


@@ -37,11 +37,26 @@ CpuPause (
     );\r
 }\r
 \r
     );\r
 }\r
 \r

+/**\r
+  Transfers control to a function starting with a new stack.\r
+\r
+  This internal worker function transfers control to the function\r
+  specified by EntryPoint using the new stack specified by NewStack\r
+  and passing in the parameters specified by Context1 and Context2.\r
+  Context1 and Context2 are optional and may be NULL.\r
+  The function EntryPoint must never return.\r
+\r
+  @param EntryPoint   The pointer to the function to enter.\r
+  @param Context1     The first parameter to pass in.\r
+  @param Context2     The second Parameter to pass in\r
+  @param NewStack     The new Location of the stack\r
+\r
+**/\r

 VOID\r
 EFIAPI\r
 InternalSwitchStackAsm (\r
   SWITCH_STACK_ENTRY_POINT EntryPoint,\r
 VOID\r
 EFIAPI\r
 InternalSwitchStackAsm (\r
   SWITCH_STACK_ENTRY_POINT EntryPoint,\r

-  VOID  *Context,\r
+  VOID  *Context1,\r

   VOID  *Context2,\r
   VOID  *NewStack\r
   )\r
   VOID  *Context2,\r
   VOID  *NewStack\r
   )\r


@@ -54,7 +69,7 @@ InternalSwitchStackAsm (
     "bx   lr\n\t"\r
     : /* no output operand */\r
     : "r" (EntryPoint),\r
     "bx   lr\n\t"\r
     : /* no output operand */\r
     : "r" (EntryPoint),\r

-      "r" (Context),\r
+      "r" (Context1),\r

       "r" (Context2),\r
       "r" (NewStack)\r
     );\r
       "r" (Context2),\r
       "r" (NewStack)\r
     );\r

diff --git a/MdePkg/Library/BaseLib/Arm/InternalSwitchStack.c b/MdePkg/Library/BaseLib/Arm/InternalSwitchStack.c
index 0bff206fad1def6debbbcbbd5aa493b4035a7438..3147b28bbbcc0a4940b70d79771c209eedb251cf 100644 (file)
--- a/MdePkg/Library/BaseLib/Arm/InternalSwitchStack.c
+++ b/MdePkg/Library/BaseLib/Arm/InternalSwitchStack.c
@@ -1,7 +1,7 @@
 /** @file\r
   SwitchStack() function for ARM.\r
 \r
 /** @file\r
   SwitchStack() function for ARM.\r
 \r

-  Copyright (c) 2006 - 2007, Intel Corporation<BR>\r
+  Copyright (c) 2006 - 2010, Intel Corporation<BR>\r

   Portions copyright (c) 2008-2009 Apple Inc. All rights reserved.<BR>\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
   Portions copyright (c) 2008-2009 Apple Inc. All rights reserved.<BR>\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


@@ -15,6 +15,21 @@
 \r
 #include "BaseLibInternals.h"\r
 \r
 \r
 #include "BaseLibInternals.h"\r
 \r

+/**\r
+  Transfers control to a function starting with a new stack.\r
+\r
+  This internal worker function transfers control to the function\r
+  specified by EntryPoint using the new stack specified by NewStack\r
+  and passing in the parameters specified by Context1 and Context2.\r
+  Context1 and Context2 are optional and may be NULL.\r
+  The function EntryPoint must never return.\r
+\r
+  @param EntryPoint   The pointer to the function to enter.\r
+  @param Context1     The first parameter to pass in.\r
+  @param Context2     The second Parameter to pass in\r
+  @param NewStack     The new Location of the stack\r
+\r
+**/\r

 VOID\r
 EFIAPI\r
 InternalSwitchStackAsm (\r
 VOID\r
 EFIAPI\r
 InternalSwitchStackAsm (\r

diff --git a/MdePkg/Library/BaseLib/Ia32/GccInline.c b/MdePkg/Library/BaseLib/Ia32/GccInline.c
index fcb0665866eafda1829c4ddd33bfad06f66ac457..d603b3f1d5c3ea1eeb569103846ea9d6ca4e5b7d 100644 (file)
--- a/MdePkg/Library/BaseLib/Ia32/GccInline.c
+++ b/MdePkg/Library/BaseLib/Ia32/GccInline.c
@@ -1,7 +1,7 @@
 /** @file\r
   GCC inline implementation of BaseLib processor specific functions.\r
   \r
 /** @file\r
   GCC inline implementation of BaseLib processor specific functions.\r
   \r

-  Copyright (c) 2006 - 2007, Intel Corporation<BR>\r
+  Copyright (c) 2006 - 2010, Intel Corporation<BR>\r

   Portions copyright (c) 2008-2009 Apple Inc. All rights reserved.<BR>\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
   Portions copyright (c) 2008-2009 Apple Inc. All rights reserved.<BR>\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


@@ -1078,12 +1078,12 @@ InternalX86WriteGdtr (
 VOID\r
 EFIAPI\r
 InternalX86ReadIdtr (\r
 VOID\r
 EFIAPI\r
 InternalX86ReadIdtr (\r

-  OUT     IA32_DESCRIPTOR           *Ldtr\r
+  OUT     IA32_DESCRIPTOR           *Idtr\r

   )\r
 {\r
   __asm__ __volatile__ (\r
     "sldt  %0"\r
   )\r
 {\r
   __asm__ __volatile__ (\r
     "sldt  %0"\r

-    : "=m" (*Ldtr)\r
+    : "=m" (*Idtr)\r

     );\r
 }\r
 \r
     );\r
 }\r
 \r


@@ -1100,13 +1100,13 @@ InternalX86ReadIdtr (
 VOID\r
 EFIAPI\r
 InternalX86WriteIdtr (\r
 VOID\r
 EFIAPI\r
 InternalX86WriteIdtr (\r

-  IN      CONST IA32_DESCRIPTOR     *Ldtr\r
+  IN      CONST IA32_DESCRIPTOR     *Idtr\r

   )\r
 {\r
   __asm__ __volatile__ (\r
     "lidt %0"\r
     :\r
   )\r
 {\r
   __asm__ __volatile__ (\r
     "lidt %0"\r
     :\r

-    : "m" (*Ldtr)\r
+    : "m" (*Idtr)\r

     );\r
 }\r
 \r
     );\r
 }\r
 \r

diff --git a/MdePkg/Library/BaseLib/Ipf/InternalSwitchStack.c b/MdePkg/Library/BaseLib/Ipf/InternalSwitchStack.c
index ff11405b3d1535c8865757654d01b013e1a9db47..8ff5832f0b9c9da221c73df4f4451c30ec444d42 100644 (file)
--- a/MdePkg/Library/BaseLib/Ipf/InternalSwitchStack.c
+++ b/MdePkg/Library/BaseLib/Ipf/InternalSwitchStack.c
@@ -1,7 +1,7 @@
 /** @file\r
   SwitchStack() function for IPF.\r
 \r
 /** @file\r
   SwitchStack() function for IPF.\r
 \r

-  Copyright (c) 2007 - 2008, Intel Corporation<BR>\r
+  Copyright (c) 2007 - 2010, Intel Corporation<BR>\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
   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


@@ -47,7 +47,6 @@ InternalSwitchStack (
   IN      VOID                      *NewStack,\r
   IN      VA_LIST                   Marker\r
   )\r
   IN      VOID                      *NewStack,\r
   IN      VA_LIST                   Marker\r
   )\r

-\r

 {\r
   VOID                      *NewBsp;\r
 \r
 {\r
   VOID                      *NewBsp;\r
 \r

diff --git a/MdePkg/Library/BaseLib/X64/GccInline.c b/MdePkg/Library/BaseLib/X64/GccInline.c
index 2473ca9fbecddec752e7917a468054a91743d070..d559e3be55ed81172ce5c99f57c32ae5fdf9368c 100644 (file)
--- a/MdePkg/Library/BaseLib/X64/GccInline.c
+++ b/MdePkg/Library/BaseLib/X64/GccInline.c
@@ -1,7 +1,7 @@
 /** @file\r
   GCC inline implementation of BaseLib processor specific functions.\r
   \r
 /** @file\r
   GCC inline implementation of BaseLib processor specific functions.\r
   \r

-  Copyright (c) 2006 - 2007, Intel Corporation<BR>\r
+  Copyright (c) 2006 - 2010, Intel Corporation<BR>\r

   Portions copyright (c) 2008-2009 Apple Inc. All rights reserved.<BR> \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
   Portions copyright (c) 2008-2009 Apple Inc. All rights reserved.<BR> \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


@@ -1088,12 +1088,12 @@ InternalX86WriteGdtr (
 VOID\r
 EFIAPI\r
 InternalX86ReadIdtr (\r
 VOID\r
 EFIAPI\r
 InternalX86ReadIdtr (\r

-  OUT     IA32_DESCRIPTOR           *Ldtr\r
+  OUT     IA32_DESCRIPTOR           *Idtr\r

   )\r
 {\r
   __asm__ __volatile__ (\r
     "sldt  %0"\r
   )\r
 {\r
   __asm__ __volatile__ (\r
     "sldt  %0"\r

-    : "=m" (*Ldtr)\r
+    : "=m" (*Idtr)\r

     );\r
 }\r
 \r
     );\r
 }\r
 \r


@@ -1110,13 +1110,13 @@ InternalX86ReadIdtr (
 VOID\r
 EFIAPI\r
 InternalX86WriteIdtr (\r
 VOID\r
 EFIAPI\r
 InternalX86WriteIdtr (\r

-  IN      CONST IA32_DESCRIPTOR     *Ldtr\r
+  IN      CONST IA32_DESCRIPTOR     *Idtr\r

   )\r
 {\r
   __asm__ __volatile__ (\r
     "lidt %0"\r
     :\r
   )\r
 {\r
   __asm__ __volatile__ (\r
     "lidt %0"\r
     :\r

-    : "m" (*Ldtr)\r
+    : "m" (*Idtr)\r

     );\r
 }\r
 \r
     );\r
 }\r
 \r

diff --git a/MdePkg/Library/BaseMemoryLib/SetMem.c b/MdePkg/Library/BaseMemoryLib/SetMem.c
index 32183d4393afae29778600db54e2ea1625d4d7d8..2394f4878bb6dc299060474331487af9538cabc2 100644 (file)
--- a/MdePkg/Library/BaseMemoryLib/SetMem.c
+++ b/MdePkg/Library/BaseMemoryLib/SetMem.c
@@ -4,7 +4,7 @@
   build for a particular platform easily if an optimized version\r
   is desired.\r
 \r
   build for a particular platform easily if an optimized version\r
   is desired.\r
 \r

-  Copyright (c) 2006 - 2008, Intel Corporation<BR>\r
+  Copyright (c) 2006 - 2010, Intel Corporation<BR>\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
   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


@@ -33,7 +33,7 @@
 VOID *\r
 EFIAPI\r
 InternalMemSetMem (\r
 VOID *\r
 EFIAPI\r
 InternalMemSetMem (\r

-  IN      VOID                      *Buffer,\r
+  OUT     VOID                      *Buffer,\r

   IN      UINTN                     Length,\r
   IN      UINT8                     Value\r
   )\r
   IN      UINTN                     Length,\r
   IN      UINT8                     Value\r
   )\r

diff --git a/MdePkg/Library/BaseSynchronizationLib/Arm/Synchronization.c b/MdePkg/Library/BaseSynchronizationLib/Arm/Synchronization.c
index e046e1b373c55649a3a882b53bb92df9214be2da..56f4d3c481873d3db0c0a27b570bf97a4c325e13 100644 (file)
--- a/MdePkg/Library/BaseSynchronizationLib/Arm/Synchronization.c
+++ b/MdePkg/Library/BaseSynchronizationLib/Arm/Synchronization.c
@@ -1,7 +1,7 @@
 /** @file\r
   Implementation of synchronization functions. Still needs to be ported\r
 \r
 /** @file\r
   Implementation of synchronization functions. Still needs to be ported\r
 \r

-  Copyright (c) 2006 - 2009, Intel Corporation<BR>\r
+  Copyright (c) 2006 - 2010, Intel Corporation<BR>\r

   Portions copyright (c) 2008-2009 Apple Inc. All rights reserved.<BR> \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
   Portions copyright (c) 2008-2009 Apple Inc. All rights reserved.<BR> \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


@@ -13,6 +13,23 @@
 \r
 **/\r
 \r
 \r
 **/\r
 \r

+/**\r
+  Performs an atomic compare exchange operation on a 32-bit unsigned integer.\r
+\r
+  Performs an atomic compare exchange operation on the 32-bit unsigned integer\r
+  specified by Value.  If Value is equal to CompareValue, then Value is set to\r
+  ExchangeValue and CompareValue is returned.  If Value is not equal to CompareValue,\r
+  then Value is returned.  The compare exchange operation must be performed using\r
+  MP safe mechanisms.\r
+\r
+  @param  Value         A pointer to the 32-bit value for the compare exchange\r
+                        operation.\r
+  @param  CompareValue  32-bit value used in compare operation.\r
+  @param  ExchangeValue 32-bit value used in exchange operation.\r
+\r
+  @return The original *Value before exchange.\r
+\r
+**/\r

 UINT32\r
 EFIAPI\r
 InternalSyncCompareExchange32 (\r
 UINT32\r
 EFIAPI\r
 InternalSyncCompareExchange32 (\r

diff --git a/MdePkg/Library/DxeServicesLib/DxeServicesLib.c b/MdePkg/Library/DxeServicesLib/DxeServicesLib.c
index e44833f19f234b1ee5380b7471f186853f7e1758..bd7b95c400da73ad3a097d78a5007d5545f00f20 100644 (file)
--- a/MdePkg/Library/DxeServicesLib/DxeServicesLib.c
+++ b/MdePkg/Library/DxeServicesLib/DxeServicesLib.c
@@ -2,7 +2,7 @@
   MDE DXE Services Library provides functions that simplify the development of DXE Drivers.  \r
   These functions help access data from sections of FFS files or from file path.\r
 \r
   MDE DXE Services Library provides functions that simplify the development of DXE Drivers.  \r
   These functions help access data from sections of FFS files or from file path.\r
 \r

-  Copyright (c) 2007 - 2009, Intel Corporation<BR>\r
+  Copyright (c) 2007 - 2010, Intel Corporation<BR>\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
   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


@@ -401,7 +401,7 @@ GetSectionFromFfs (
 /**\r
   Get the image file buffer data and buffer size by its device path. \r
   \r
 /**\r
   Get the image file buffer data and buffer size by its device path. \r
   \r

-  Access the file either from a a firmware volume, from a file system interface, \r
+  Access the file either from a firmware volume, from a file system interface, \r

   or from the load file interface.\r
   \r
   Allocate memory to store the found image. The caller is responsible to free memory.\r
   or from the load file interface.\r
   \r
   Allocate memory to store the found image. The caller is responsible to free memory.\r


@@ -410,16 +410,15 @@ GetSectionFromFfs (
   If FileSize is NULL, then NULL is returned.\r
   If AuthenticationStatus is NULL, then NULL is returned.\r
 \r
   If FileSize is NULL, then NULL is returned.\r
   If AuthenticationStatus is NULL, then NULL is returned.\r
 \r

-  @param[in]       BootPolicy \r
-                             Policy for Open Image File.If TRUE, indicates that the request \r
-                             originates from the boot manager, and that the boot manager is\r
-                             attempting to load FilePath as a boot selection. If FALSE, \r
-                             then FilePath must match an exact file to be loaded.\r
-  @param[in]       FilePath  Pointer to the device path of the file that is absracted to the file buffer.\r
-  @param[out]      FileSize  Pointer to the size of the abstracted file buffer.\r
-  @param[out]      AuthenticationStatus   \r
-                             Pointer to a caller-allocated UINT32 in which\r
-                             the authentication status is returned.\r
+  @param[in]       BootPolicy           Policy for Open Image File.If TRUE, indicates that the request \r
+                                        originates from the boot manager, and that the boot manager is\r
+                                        attempting to load FilePath as a boot selection. If FALSE, \r
+                                        then FilePath must match an exact file to be loaded.\r
+  @param[in]       FilePath             Pointer to the device path of the file that is absracted to\r
+                                        the file buffer.\r
+  @param[out]      FileSize             Pointer to the size of the abstracted file buffer.\r
+  @param[out]      AuthenticationStatus Pointer to a caller-allocated UINT32 in which the authentication\r
+                                        status is returned.\r

 \r
   @retval NULL   File is NULL, or FileSize is NULL. Or the file can't be found.\r
   @retval other  The abstracted file buffer. The caller is responsible to free memory.\r
 \r
   @retval NULL   File is NULL, or FileSize is NULL. Or the file can't be found.\r
   @retval other  The abstracted file buffer. The caller is responsible to free memory.\r