diff options
| author | Liming Gao <liming.gao@intel.com> | 2018-06-27 21:08:52 +0800 |
|---|---|---|
| committer | Liming Gao <liming.gao@intel.com> | 2018-06-28 11:19:45 +0800 |
| commit | d1102dba7210b95e41d06c2338a22ba6af248645 (patch) | |
| tree | 8b4af076b5d6f2aa7f35563d4defcca4d4bfdd87 /MdeModulePkg/Universal | |
| parent | ca79bab7af4770c5eb578f6d495af01705aedb79 (diff) | |
| download | edk2-d1102dba7210b95e41d06c2338a22ba6af248645.zip edk2-d1102dba7210b95e41d06c2338a22ba6af248645.tar.gz edk2-d1102dba7210b95e41d06c2338a22ba6af248645.tar.bz2 | |
MdeModulePkg: Clean up source files
1. Do not use tab characters
2. No trailing white space in one line
3. All files must end with CRLF
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Liming Gao <liming.gao@intel.com>
Reviewed-by: Star Zeng <star.zeng@intel.com>
Diffstat (limited to 'MdeModulePkg/Universal')
485 files changed, 6846 insertions, 6846 deletions
diff --git a/MdeModulePkg/Universal/Acpi/AcpiPlatformDxe/AcpiPlatform.c b/MdeModulePkg/Universal/Acpi/AcpiPlatformDxe/AcpiPlatform.c index 8f335bd..c6238fd 100644 --- a/MdeModulePkg/Universal/Acpi/AcpiPlatformDxe/AcpiPlatform.c +++ b/MdeModulePkg/Universal/Acpi/AcpiPlatformDxe/AcpiPlatform.c @@ -10,7 +10,7 @@ THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
-**/
+**/
#include <PiDxe.h>
diff --git a/MdeModulePkg/Universal/Acpi/AcpiPlatformDxe/AcpiPlatform.uni b/MdeModulePkg/Universal/Acpi/AcpiPlatformDxe/AcpiPlatform.uni index 68b3e48..f5aa4f4 100644 --- a/MdeModulePkg/Universal/Acpi/AcpiPlatformDxe/AcpiPlatform.uni +++ b/MdeModulePkg/Universal/Acpi/AcpiPlatformDxe/AcpiPlatform.uni @@ -3,13 +3,13 @@ //
// Sample ACPI Platform Driver
//
-// Copyright (c) 2008 - 2014, Intel Corporation. All rights reserved.<BR>
+// Copyright (c) 2008 - 2018, Intel Corporation. All rights reserved.<BR>
//
// 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,
// WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
//
diff --git a/MdeModulePkg/Universal/Acpi/AcpiPlatformDxe/AcpiPlatformDxe.inf b/MdeModulePkg/Universal/Acpi/AcpiPlatformDxe/AcpiPlatformDxe.inf index 34b1600..f4860cd 100644 --- a/MdeModulePkg/Universal/Acpi/AcpiPlatformDxe/AcpiPlatformDxe.inf +++ b/MdeModulePkg/Universal/Acpi/AcpiPlatformDxe/AcpiPlatformDxe.inf @@ -1,15 +1,15 @@ ## @file
# Sample ACPI Platform Driver
#
-# Copyright (c) 2008 - 2014, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2008 - 2018, Intel Corporation. All rights reserved.<BR>
# 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,
# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
-#
+#
##
[Defines]
diff --git a/MdeModulePkg/Universal/Acpi/AcpiPlatformDxe/AcpiPlatformExtra.uni b/MdeModulePkg/Universal/Acpi/AcpiPlatformDxe/AcpiPlatformExtra.uni index e976c59..9e8d6ea 100644 --- a/MdeModulePkg/Universal/Acpi/AcpiPlatformDxe/AcpiPlatformExtra.uni +++ b/MdeModulePkg/Universal/Acpi/AcpiPlatformDxe/AcpiPlatformExtra.uni @@ -1,7 +1,7 @@ // /** @file
// AcpiPlatform Localized Strings and Content
//
-// Copyright (c) 2013 - 2014, Intel Corporation. All rights reserved.<BR>
+// Copyright (c) 2013 - 2018, Intel Corporation. All rights reserved.<BR>
//
// This program and the accompanying materials
// are licensed and made available under the terms and conditions of the BSD License
@@ -13,8 +13,8 @@ //
// **/
-#string STR_PROPERTIES_MODULE_NAME
-#language en-US
+#string STR_PROPERTIES_MODULE_NAME
+#language en-US
"ACPI Platform Sample DXE Driver"
diff --git a/MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiSdt.c b/MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiSdt.c index 2b3bb35..aae529e 100644 --- a/MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiSdt.c +++ b/MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiSdt.c @@ -1,7 +1,7 @@ /** @file
ACPI Sdt Protocol Driver
- Copyright (c) 2010 - 2016, Intel Corporation. All rights reserved. <BR>
+ Copyright (c) 2010 - 2018, Intel Corporation. All rights reserved. <BR>
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
@@ -196,7 +196,7 @@ SdtNotifyAcpiList ( /**
Returns a requested ACPI table.
-
+
The GetAcpiTable() function returns a pointer to a buffer containing the ACPI table associated
with the Index that was input. The following structures are not considered elements in the list of
ACPI tables:
@@ -206,19 +206,19 @@ SdtNotifyAcpiList ( Version is updated with a bit map containing all the versions of ACPI of which the table is a
member. For tables installed via the EFI_ACPI_TABLE_PROTOCOL.InstallAcpiTable() interface,
the function returns the value of EFI_ACPI_STD_PROTOCOL.AcpiVersion.
-
+
@param[in] Index The zero-based index of the table to retrieve.
@param[out] Table Pointer for returning the table buffer.
@param[out] Version On return, updated with the ACPI versions to which this table belongs. Type
EFI_ACPI_TABLE_VERSION is defined in "Related Definitions" in the
- EFI_ACPI_SDT_PROTOCOL.
+ EFI_ACPI_SDT_PROTOCOL.
@param[out] TableKey On return, points to the table key for the specified ACPI system definition table.
This is identical to the table key used in the EFI_ACPI_TABLE_PROTOCOL.
The TableKey can be passed to EFI_ACPI_TABLE_PROTOCOL.UninstallAcpiTable()
to uninstall the table.
@retval EFI_SUCCESS The function completed successfully.
- @retval EFI_NOT_FOUND The requested index is too large and a table was not found.
-**/
+ @retval EFI_NOT_FOUND The requested index is too large and a table was not found.
+**/
EFI_STATUS
EFIAPI
GetAcpiTable2 (
@@ -278,9 +278,9 @@ GetAcpiTable2 ( /**
Register a callback when an ACPI table is installed.
-
+
This function registers a function which will be called whenever a new ACPI table is installed.
-
+
@param[in] Notification Points to the callback function to be registered
**/
VOID
@@ -318,13 +318,13 @@ SdtRegisterNotify ( /**
Unregister a callback when an ACPI table is installed.
-
+
This function unregisters a function which will be called whenever a new ACPI table is installed.
-
+
@param[in] Notification Points to the callback function to be unregistered.
-
+
@retval EFI_SUCCESS Callback successfully unregistered.
- @retval EFI_INVALID_PARAMETER Notification does not match a known registration function.
+ @retval EFI_INVALID_PARAMETER Notification does not match a known registration function.
**/
EFI_STATUS
SdtUnregisterNotify (
@@ -371,17 +371,17 @@ SdtUnregisterNotify ( /**
Register or unregister a callback when an ACPI table is installed.
-
+
This function registers or unregisters a function which will be called whenever a new ACPI table is
installed.
-
+
@param[in] Register If TRUE, then the specified function will be registered. If FALSE, then the specified
function will be unregistered.
@param[in] Notification Points to the callback function to be registered or unregistered.
-
+
@retval EFI_SUCCESS Callback successfully registered or unregistered.
@retval EFI_INVALID_PARAMETER Notification is NULL
- @retval EFI_INVALID_PARAMETER Register is FALSE and Notification does not match a known registration function.
+ @retval EFI_INVALID_PARAMETER Register is FALSE and Notification does not match a known registration function.
**/
EFI_STATUS
EFIAPI
@@ -413,12 +413,12 @@ RegisterNotify ( /**
Create a handle for the first ACPI opcode in an ACPI system description table.
-
+
@param[in] TableKey The table key for the ACPI table, as returned by GetTable().
@param[out] Handle On return, points to the newly created ACPI handle.
@retval EFI_SUCCESS Handle created successfully.
- @retval EFI_NOT_FOUND TableKey does not refer to a valid ACPI table.
+ @retval EFI_NOT_FOUND TableKey does not refer to a valid ACPI table.
**/
EFI_STATUS
SdtOpenSdtTable (
@@ -466,12 +466,12 @@ SdtOpenSdtTable ( /**
Create a handle for the first ACPI opcode in an ACPI system description table.
-
+
@param[in] TableKey The table key for the ACPI table, as returned by GetTable().
@param[out] Handle On return, points to the newly created ACPI handle.
@retval EFI_SUCCESS Handle created successfully.
- @retval EFI_NOT_FOUND TableKey does not refer to a valid ACPI table.
+ @retval EFI_NOT_FOUND TableKey does not refer to a valid ACPI table.
**/
EFI_STATUS
EFIAPI
@@ -489,21 +489,21 @@ OpenSdt ( /**
Create a handle from an ACPI opcode
-
+
@param[in] Buffer Points to the ACPI opcode.
@param[in] BufferSize Max buffer size.
@param[out] Handle Upon return, holds the handle.
-
+
@retval EFI_SUCCESS Success
@retval EFI_INVALID_PARAMETER Buffer is NULL or Handle is NULL or Buffer points to an
invalid opcode.
-
+
**/
EFI_STATUS
SdtOpenEx (
IN VOID *Buffer,
IN UINTN BufferSize,
- OUT EFI_ACPI_HANDLE *Handle
+ OUT EFI_ACPI_HANDLE *Handle
)
{
AML_BYTE_ENCODING *AmlByteEncoding;
@@ -526,7 +526,7 @@ SdtOpenEx ( //
AmlHandle = AllocatePool (sizeof(*AmlHandle));
ASSERT (AmlHandle != NULL);
-
+
AmlHandle->Signature = EFI_AML_HANDLE_SIGNATURE;
AmlHandle->Buffer = Buffer;
AmlHandle->AmlByteEncoding = AmlByteEncoding;
@@ -545,20 +545,20 @@ SdtOpenEx ( /**
Create a handle from an ACPI opcode
-
+
@param[in] Buffer Points to the ACPI opcode.
@param[out] Handle Upon return, holds the handle.
-
+
@retval EFI_SUCCESS Success
@retval EFI_INVALID_PARAMETER Buffer is NULL or Handle is NULL or Buffer points to an
invalid opcode.
-
+
**/
EFI_STATUS
EFIAPI
Open (
IN VOID *Buffer,
- OUT EFI_ACPI_HANDLE *Handle
+ OUT EFI_ACPI_HANDLE *Handle
)
{
EFI_STATUS Status;
@@ -583,11 +583,11 @@ Open ( /**
Close an ACPI handle.
-
+
@param[in] Handle Returns the handle.
-
+
@retval EFI_SUCCESS Success
- @retval EFI_INVALID_PARAMETER Handle is NULL or does not refer to a valid ACPI object.
+ @retval EFI_INVALID_PARAMETER Handle is NULL or does not refer to a valid ACPI object.
**/
EFI_STATUS
EFIAPI
@@ -628,7 +628,7 @@ Close ( /**
Retrieve information about an ACPI object.
-
+
@param[in] Handle ACPI object handle.
@param[in] Index Index of the data to retrieve from the object. In general, indexes read from left-to-right
in the ACPI encoding, with index 0 always being the ACPI opcode.
@@ -636,7 +636,7 @@ Close ( for the specified index.
@param[out] Data Upon return, points to the pointer to the data.
@param[out] DataSize Upon return, points to the size of Data.
-
+
@retval EFI_SUCCESS Success.
@retval EFI_INVALID_PARAMETER Handle is NULL or does not refer to a valid ACPI object.
**/
@@ -692,7 +692,7 @@ GetOption ( /**
Change information about an ACPI object.
-
+
@param[in] Handle ACPI object handle.
@param[in] Index Index of the data to retrieve from the object. In general, indexes read from left-to-right
in the ACPI encoding, with index 0 always being the ACPI opcode.
@@ -769,14 +769,14 @@ SetOption ( /**
Return the child ACPI objects.
-
+
@param[in] ParentHandle Parent handle.
@param[in, out] Handle On entry, points to the previously returned handle or NULL to start with the first
handle. On return, points to the next returned ACPI handle or NULL if there are no
child objects.
@retval EFI_SUCCESS Success
- @retval EFI_INVALID_PARAMETER ParentHandle is NULL or does not refer to a valid ACPI object.
+ @retval EFI_INVALID_PARAMETER ParentHandle is NULL or does not refer to a valid ACPI object.
**/
EFI_STATUS
EFIAPI
@@ -834,14 +834,14 @@ GetChild ( /**
Returns the handle of the ACPI object representing the specified ACPI path
-
+
@param[in] HandleIn Points to the handle of the object representing the starting point for the path search.
@param[in] AmlPath Points to the AML path.
@param[out] HandleOut On return, points to the ACPI object which represents AcpiPath, relative to
HandleIn.
-
+
@retval EFI_SUCCESS Success
- @retval EFI_INVALID_PARAMETER HandleIn is NULL or does not refer to a valid ACPI object.
+ @retval EFI_INVALID_PARAMETER HandleIn is NULL or does not refer to a valid ACPI object.
**/
EFI_STATUS
SdtFindPathFromNonRoot (
@@ -873,9 +873,9 @@ SdtFindPathFromNonRoot ( /**
Duplicate AML handle.
-
+
@param[in] AmlHandle Handle to be duplicated.
-
+
@return Duplicated AML handle.
**/
EFI_AML_HANDLE *
@@ -894,14 +894,14 @@ SdtDuplicateHandle ( /**
Returns the handle of the ACPI object representing the specified ACPI path
-
+
@param[in] HandleIn Points to the handle of the object representing the starting point for the path search.
@param[in] AmlPath Points to the AML path.
@param[out] HandleOut On return, points to the ACPI object which represents AcpiPath, relative to
HandleIn.
-
+
@retval EFI_SUCCESS Success
- @retval EFI_INVALID_PARAMETER HandleIn is NULL or does not refer to a valid ACPI object.
+ @retval EFI_INVALID_PARAMETER HandleIn is NULL or does not refer to a valid ACPI object.
**/
EFI_STATUS
SdtFindPathFromRoot (
@@ -977,14 +977,14 @@ SdtFindPathFromRoot ( /**
Returns the handle of the ACPI object representing the specified ACPI path
-
+
@param[in] HandleIn Points to the handle of the object representing the starting point for the path search.
@param[in] AcpiPath Points to the ACPI path, which conforms to the ACPI encoded path format.
@param[out] HandleOut On return, points to the ACPI object which represents AcpiPath, relative to
HandleIn.
-
+
@retval EFI_SUCCESS Success
- @retval EFI_INVALID_PARAMETER HandleIn is NULL or does not refer to a valid ACPI object.
+ @retval EFI_INVALID_PARAMETER HandleIn is NULL or does not refer to a valid ACPI object.
**/
EFI_STATUS
EFIAPI
@@ -1006,7 +1006,7 @@ FindPath ( }
AmlHandle = (EFI_AML_HANDLE *)HandleIn;
-
+
//
// Convert ASL path to AML path
//
diff --git a/MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiSdt.h b/MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiSdt.h index f11bdee..9e39c22 100644 --- a/MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiSdt.h +++ b/MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiSdt.h @@ -1,7 +1,7 @@ /** @file
ACPI Sdt Protocol Driver
- Copyright (c) 2010 - 2015, Intel Corporation. All rights reserved. <BR>
+ Copyright (c) 2010 - 2018, Intel Corporation. All rights reserved. <BR>
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
@@ -130,7 +130,7 @@ typedef UINT32 AML_OP_ATTRIBUTE; #define AML_HAS_CHILD_OBJ 0x4 // it is ACPI attribute - if OpCode has Child Object.
#define AML_IN_NAMESPACE 0x10000 // It is UEFI SDT attribute - if OpCode will be in NameSpace
// NOTE; Not all OBJECT will be in NameSpace
- // For example, BankField | CreateBitField | CreateByteField | CreateDWordField |
+ // For example, BankField | CreateBitField | CreateByteField | CreateDWordField |
// CreateField | CreateQWordField | CreateWordField | Field | IndexField.
struct _AML_BYTE_ENCODING {
@@ -147,7 +147,7 @@ struct _AML_BYTE_ENCODING { /**
Returns a requested ACPI table.
-
+
The GetAcpiTable() function returns a pointer to a buffer containing the ACPI table associated
with the Index that was input. The following structures are not considered elements in the list of
ACPI tables:
@@ -157,20 +157,20 @@ struct _AML_BYTE_ENCODING { Version is updated with a bit map containing all the versions of ACPI of which the table is a
member. For tables installed via the EFI_ACPI_TABLE_PROTOCOL.InstallAcpiTable() interface,
the function returns the value of EFI_ACPI_STD_PROTOCOL.AcpiVersion.
-
+
@param[in] Index The zero-based index of the table to retrieve.
@param[out] Table Pointer for returning the table buffer.
@param[out] Version On return, updated with the ACPI versions to which this table belongs. Type
EFI_ACPI_TABLE_VERSION is defined in "Related Definitions" in the
- EFI_ACPI_SDT_PROTOCOL.
+ EFI_ACPI_SDT_PROTOCOL.
@param[out] TableKey On return, points to the table key for the specified ACPI system definition table.
This is identical to the table key used in the EFI_ACPI_TABLE_PROTOCOL.
The TableKey can be passed to EFI_ACPI_TABLE_PROTOCOL.UninstallAcpiTable()
to uninstall the table.
-
+
@retval EFI_SUCCESS The function completed successfully.
- @retval EFI_NOT_FOUND The requested index is too large and a table was not found.
-**/
+ @retval EFI_NOT_FOUND The requested index is too large and a table was not found.
+**/
EFI_STATUS
EFIAPI
GetAcpiTable2 (
@@ -182,17 +182,17 @@ GetAcpiTable2 ( /**
Register or unregister a callback when an ACPI table is installed.
-
+
This function registers or unregisters a function which will be called whenever a new ACPI table is
installed.
-
+
@param[in] Register If TRUE, then the specified function will be registered. If FALSE, then the specified
function will be unregistered.
@param[in] Notification Points to the callback function to be registered or unregistered.
-
+
@retval EFI_SUCCESS Callback successfully registered or unregistered.
@retval EFI_INVALID_PARAMETER Notification is NULL
- @retval EFI_INVALID_PARAMETER Register is FALSE and Notification does not match a known registration function.
+ @retval EFI_INVALID_PARAMETER Register is FALSE and Notification does not match a known registration function.
**/
EFI_STATUS
EFIAPI
@@ -203,12 +203,12 @@ RegisterNotify ( /**
Create a handle for the first ACPI opcode in an ACPI system description table.
-
+
@param[in] TableKey The table key for the ACPI table, as returned by GetTable().
@param[out] Handle On return, points to the newly created ACPI handle.
@retval EFI_SUCCESS Handle created successfully.
- @retval EFI_NOT_FOUND TableKey does not refer to a valid ACPI table.
+ @retval EFI_NOT_FOUND TableKey does not refer to a valid ACPI table.
**/
EFI_STATUS
EFIAPI
@@ -219,29 +219,29 @@ OpenSdt ( /**
Create a handle from an ACPI opcode
-
+
@param[in] Buffer Points to the ACPI opcode.
@param[out] Handle Upon return, holds the handle.
-
+
@retval EFI_SUCCESS Success
@retval EFI_INVALID_PARAMETER Buffer is NULL or Handle is NULL or Buffer points to an
invalid opcode.
-
+
**/
EFI_STATUS
EFIAPI
Open (
IN VOID *Buffer,
- OUT EFI_ACPI_HANDLE *Handle
+ OUT EFI_ACPI_HANDLE *Handle
);
/**
Close an ACPI handle.
-
+
@param[in] Handle Returns the handle.
-
+
@retval EFI_SUCCESS Success
- @retval EFI_INVALID_PARAMETER Handle is NULL or does not refer to a valid ACPI object.
+ @retval EFI_INVALID_PARAMETER Handle is NULL or does not refer to a valid ACPI object.
**/
EFI_STATUS
EFIAPI
@@ -251,7 +251,7 @@ Close ( /**
Retrieve information about an ACPI object.
-
+
@param[in] Handle ACPI object handle.
@param[in] Index Index of the data to retrieve from the object. In general, indexes read from left-to-right
in the ACPI encoding, with index 0 always being the ACPI opcode.
@@ -259,7 +259,7 @@ Close ( for the specified index.
@param[out] Data Upon return, points to the pointer to the data.
@param[out] DataSize Upon return, points to the size of Data.
-
+
@retval EFI_SUCCESS Success.
@retval EFI_INVALID_PARAMETER Handle is NULL or does not refer to a valid ACPI object.
**/
@@ -275,7 +275,7 @@ GetOption ( /**
Change information about an ACPI object.
-
+
@param[in] Handle ACPI object handle.
@param[in] Index Index of the data to retrieve from the object. In general, indexes read from left-to-right
in the ACPI encoding, with index 0 always being the ACPI opcode.
@@ -299,14 +299,14 @@ SetOption ( /**
Return the child ACPI objects.
-
+
@param[in] ParentHandle Parent handle.
@param[in, out] Handle On entry, points to the previously returned handle or NULL to start with the first
handle. On return, points to the next returned ACPI handle or NULL if there are no
child objects.
@retval EFI_SUCCESS Success
- @retval EFI_INVALID_PARAMETER ParentHandle is NULL or does not refer to a valid ACPI object.
+ @retval EFI_INVALID_PARAMETER ParentHandle is NULL or does not refer to a valid ACPI object.
**/
EFI_STATUS
EFIAPI
@@ -317,14 +317,14 @@ GetChild ( /**
Returns the handle of the ACPI object representing the specified ACPI path
-
+
@param[in] HandleIn Points to the handle of the object representing the starting point for the path search.
@param[in] AcpiPath Points to the ACPI path, which conforms to the ACPI encoded path format.
@param[out] HandleOut On return, points to the ACPI object which represents AcpiPath, relative to
HandleIn.
-
+
@retval EFI_SUCCESS Success
- @retval EFI_INVALID_PARAMETER HandleIn is NULL or does not refer to a valid ACPI object.
+ @retval EFI_INVALID_PARAMETER HandleIn is NULL or does not refer to a valid ACPI object.
**/
EFI_STATUS
EFIAPI
@@ -340,21 +340,21 @@ FindPath ( /**
Create a handle from an ACPI opcode
-
+
@param[in] Buffer Points to the ACPI opcode.
@param[in] BufferSize Max buffer size.
@param[out] Handle Upon return, holds the handle.
-
+
@retval EFI_SUCCESS Success
@retval EFI_INVALID_PARAMETER Buffer is NULL or Handle is NULL or Buffer points to an
invalid opcode.
-
+
**/
EFI_STATUS
SdtOpenEx (
IN VOID *Buffer,
IN UINTN BufferSize,
- OUT EFI_ACPI_HANDLE *Handle
+ OUT EFI_ACPI_HANDLE *Handle
);
//
@@ -365,8 +365,8 @@ SdtOpenEx ( Get AML NameString size.
@param[in] Buffer AML NameString.
- @param[out] BufferSize AML NameString size
-
+ @param[out] BufferSize AML NameString size
+
@retval EFI_SUCCESS Success.
@retval EFI_INVALID_PARAMETER Buffer does not refer to a valid AML NameString.
**/
@@ -416,11 +416,11 @@ AmlSearchByOpByte ( /**
Return object size.
-
+
@param[in] AmlByteEncoding AML Byte Encoding.
@param[in] Buffer AML object buffer.
@param[in] MaxBufferSize AML object buffer MAX size. The parser can not parse any data exceed this region.
-
+
@return Size of the object.
**/
UINTN
@@ -432,9 +432,9 @@ AmlGetObjectSize ( /**
Return object name.
-
+
@param[in] AmlHandle AML handle.
-
+
@return Name of the object.
**/
CHAR8 *
@@ -444,7 +444,7 @@ AmlGetObjectName ( /**
Retrieve information according to AmlHandle
-
+
@param[in] AmlHandle AML handle.
@param[in] Index Index of the data to retrieve from the object. In general, indexes read from left-to-right
in the ACPI encoding, with index 0 always being the ACPI opcode.
@@ -452,7 +452,7 @@ AmlGetObjectName ( for the specified index.
@param[out] Data Upon return, points to the pointer to the data.
@param[out] DataSize Upon return, points to the size of Data.
-
+
@retval EFI_SUCCESS Success.
@retval EFI_INVALID_PARAMETER AmlHandle does not refer to a valid ACPI object.
**/
@@ -467,10 +467,10 @@ AmlParseOptionHandleCommon ( /**
Return offset of last option.
-
+
@param[in] AmlHandle AML Handle.
@param[out] Buffer Upon return, points to the offset after last option.
-
+
@retval EFI_SUCCESS Success.
@retval EFI_INVALID_PARAMETER AmlHandle does not refer to a valid ACPI object.
**/
@@ -482,14 +482,14 @@ AmlGetOffsetAfterLastOption ( /**
Return the child ACPI objects from Root Handle.
-
+
@param[in] AmlParentHandle Parent handle. It is Root Handle.
@param[in] AmlHandle The previously returned handle or NULL to start with the first handle.
@param[out] Buffer On return, points to the next returned ACPI handle or NULL if there are no
child objects.
@retval EFI_SUCCESS Success
- @retval EFI_INVALID_PARAMETER ParentHandle is NULL or does not refer to a valid ACPI object.
+ @retval EFI_INVALID_PARAMETER ParentHandle is NULL or does not refer to a valid ACPI object.
**/
EFI_STATUS
AmlGetChildFromRoot (
@@ -500,14 +500,14 @@ AmlGetChildFromRoot ( /**
Return the child ACPI objects from Non-Root Handle.
-
+
@param[in] AmlParentHandle Parent handle. It is Non-Root Handle.
@param[in] AmlHandle The previously returned handle or NULL to start with the first handle.
@param[out] Buffer On return, points to the next returned ACPI handle or NULL if there are no
child objects.
@retval EFI_SUCCESS Success
- @retval EFI_INVALID_PARAMETER ParentHandle is NULL or does not refer to a valid ACPI object.
+ @retval EFI_INVALID_PARAMETER ParentHandle is NULL or does not refer to a valid ACPI object.
**/
EFI_STATUS
AmlGetChildFromNonRoot (
@@ -531,16 +531,16 @@ AmlNameFromAslName ( /**
Returns the handle of the ACPI object representing the specified ACPI AML path
-
+
@param[in] AmlHandle Points to the handle of the object representing the starting point for the path search.
@param[in] AmlPath Points to the ACPI AML path.
@param[out] Buffer On return, points to the ACPI object which represents AcpiPath, relative to
HandleIn.
@param[in] FromRoot TRUE means to find AML path from \ (Root) Node.
FALSE means to find AML path from this Node (The HandleIn).
-
+
@retval EFI_SUCCESS Success
- @retval EFI_INVALID_PARAMETER HandleIn does not refer to a valid ACPI object.
+ @retval EFI_INVALID_PARAMETER HandleIn does not refer to a valid ACPI object.
**/
EFI_STATUS
AmlFindPath (
@@ -574,7 +574,7 @@ AmlPrintNameSeg ( Check if it is AML Root name
@param[in] Buffer AML path.
-
+
@retval TRUE AML path is root.
@retval FALSE AML path is not root.
**/
diff --git a/MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiTable.h b/MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiTable.h index d6d81ae..a2b419d 100644 --- a/MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiTable.h +++ b/MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiTable.h @@ -1,7 +1,7 @@ /** @file
ACPI Table Protocol Driver
- Copyright (c) 2006 - 2016, Intel Corporation. All rights reserved.<BR>
+ Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>
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
@@ -150,14 +150,14 @@ AcpiTableAcpiTableConstructor ( /**
Entry point of the ACPI table driver.
- Creates and initializes an instance of the ACPI Table
+ Creates and initializes an instance of the ACPI Table
Protocol and installs it on a new handle.
@param ImageHandle A handle for the image that is initializing this driver
@param SystemTable A pointer to the EFI system table
@return EFI_SUCCESS Driver initialized successfully
- @return EFI_LOAD_ERROR Failed to Initialize or has been loaded
+ @return EFI_LOAD_ERROR Failed to Initialize or has been loaded
@return EFI_OUT_OF_RESOURCES Could not allocate needed resources
**/
@@ -176,7 +176,7 @@ InitializeAcpiTableDxe ( @param[in] Handle Table to find.
@param[in] TableList Table list to search
- @param[out] Table Pointer to table found.
+ @param[out] Table Pointer to table found.
@retval EFI_SUCCESS The function completed successfully.
@retval EFI_NOT_FOUND No table found matching the handle specified.
diff --git a/MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiTableDxe.inf b/MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiTableDxe.inf index ffb8d08..32c6678 100644 --- a/MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiTableDxe.inf +++ b/MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiTableDxe.inf @@ -1,16 +1,16 @@ ## @file
# ACPI Table Protocol Driver
#
-# This driver initializes ACPI tables (Rsdp, Rsdt and Xsdt) and produces UEFI/PI
+# This driver initializes ACPI tables (Rsdp, Rsdt and Xsdt) and produces UEFI/PI
# services to install/uninstall/manage ACPI tables.
#
-# Copyright (c) 2006 - 2016, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>
# Copyright (c) 2016, Linaro Ltd. All rights reserved.<BR>
# 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,
# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
#
diff --git a/MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiTableDxe.uni b/MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiTableDxe.uni index b8d82f3..60fbc2f 100644 --- a/MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiTableDxe.uni +++ b/MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiTableDxe.uni @@ -1,13 +1,13 @@ // /** @file
// AcpiTableDxe Module Localized Abstract and Description Content
//
-// Copyright (c) 2012 - 2016, Intel Corporation. All rights reserved.<BR>
+// Copyright (c) 2012 - 2018, Intel Corporation. All rights reserved.<BR>
//
// 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,
// WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
//
diff --git a/MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiTableDxeExtra.uni b/MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiTableDxeExtra.uni index ea2b025..ebd6aa5 100644 --- a/MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiTableDxeExtra.uni +++ b/MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiTableDxeExtra.uni @@ -1,7 +1,7 @@ // /** @file
// AcpiTableDxe Localized Strings and Content
//
-// Copyright (c) 2013 - 2014, Intel Corporation. All rights reserved.<BR>
+// Copyright (c) 2013 - 2018, Intel Corporation. All rights reserved.<BR>
//
// This program and the accompanying materials are
// licensed and made available under the terms and conditions of the BSD License
@@ -13,8 +13,8 @@ //
// **/
-#string STR_PROPERTIES_MODULE_NAME
-#language en-US
+#string STR_PROPERTIES_MODULE_NAME
+#language en-US
"ACPI Table DXE Driver"
diff --git a/MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiTableProtocol.c b/MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiTableProtocol.c index 05340f8..429ff57 100644 --- a/MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiTableProtocol.c +++ b/MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiTableProtocol.c @@ -1,7 +1,7 @@ /** @file
ACPI Table Protocol Implementation
- Copyright (c) 2006 - 2016, Intel Corporation. All rights reserved.<BR>
+ Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>
Copyright (c) 2016, Linaro Ltd. All rights reserved.<BR>
This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License
@@ -18,9 +18,9 @@ //
#include "AcpiTable.h"
//
-// The maximum number of tables that pre-allocated.
+// The maximum number of tables that pre-allocated.
//
-UINTN mEfiAcpiMaxNumTables = EFI_ACPI_MAX_NUM_TABLES;
+UINTN mEfiAcpiMaxNumTables = EFI_ACPI_MAX_NUM_TABLES;
//
// Allocation strategy to use for AllocatePages ().
@@ -196,7 +196,7 @@ PublishTables ( @param TableKey Reurns a key to refer to the ACPI table.
@return EFI_SUCCESS The table was successfully inserted.
- @return EFI_INVALID_PARAMETER Either AcpiTableBuffer is NULL, TableKey is NULL, or AcpiTableBufferSize
+ @return EFI_INVALID_PARAMETER Either AcpiTableBuffer is NULL, TableKey is NULL, or AcpiTableBufferSize
and the size field embedded in the ACPI table pointed to by AcpiTableBuffer
are not in sync.
@return EFI_OUT_OF_RESOURCES Insufficient resources exist to complete the request.
@@ -253,7 +253,7 @@ InstallAcpiTable ( );
}
FreePool (AcpiTableBufferConst);
-
+
//
// Add a new table successfully, notify registed callback
//
@@ -342,8 +342,8 @@ ReallocateAcpiTableBuffer ( EFI_ACPI_TABLE_INSTANCE TempPrivateData;
EFI_STATUS Status;
UINT64 CurrentData;
-
- CopyMem (&TempPrivateData, AcpiTableInstance, sizeof (EFI_ACPI_TABLE_INSTANCE));
+
+ CopyMem (&TempPrivateData, AcpiTableInstance, sizeof (EFI_ACPI_TABLE_INSTANCE));
//
// Enlarge the max table number from mEfiAcpiMaxNumTables to mEfiAcpiMaxNumTables + EFI_ACPI_MAX_NUM_TABLES
//
@@ -384,7 +384,7 @@ ReallocateAcpiTableBuffer ( Pointer = (UINT8 *) (UINTN) PageAddress;
ZeroMem (Pointer, TotalSize);
-
+
AcpiTableInstance->Rsdt1 = (EFI_ACPI_DESCRIPTION_HEADER *) Pointer;
if ((PcdGet32 (PcdAcpiExposedTableVersions) & EFI_ACPI_TABLE_VERSION_1_0B) != 0) {
Pointer += (sizeof (EFI_ACPI_DESCRIPTION_HEADER) + NewMaxTableNumber * sizeof (UINT32));
@@ -404,14 +404,14 @@ ReallocateAcpiTableBuffer ( CopyMem (&AcpiTableInstance->Rsdp3->XsdtAddress, &CurrentData, sizeof (UINT64));
//
- // copy the original Rsdt1, Rsdt3 and Xsdt structure to new buffer
+ // copy the original Rsdt1, Rsdt3 and Xsdt structure to new buffer
//
if ((PcdGet32 (PcdAcpiExposedTableVersions) & EFI_ACPI_TABLE_VERSION_1_0B) != 0) {
- CopyMem (AcpiTableInstance->Rsdt1, TempPrivateData.Rsdt1, (sizeof (EFI_ACPI_DESCRIPTION_HEADER) + mEfiAcpiMaxNumTables * sizeof (UINT32)));
- CopyMem (AcpiTableInstance->Rsdt3, TempPrivateData.Rsdt3, (sizeof (EFI_ACPI_DESCRIPTION_HEADER) + mEfiAcpiMaxNumTables * sizeof (UINT32)));
+ CopyMem (AcpiTableInstance->Rsdt1, TempPrivateData.Rsdt1, (sizeof (EFI_ACPI_DESCRIPTION_HEADER) + mEfiAcpiMaxNumTables * sizeof (UINT32)));
+ CopyMem (AcpiTableInstance->Rsdt3, TempPrivateData.Rsdt3, (sizeof (EFI_ACPI_DESCRIPTION_HEADER) + mEfiAcpiMaxNumTables * sizeof (UINT32)));
}
CopyMem (AcpiTableInstance->Xsdt, TempPrivateData.Xsdt, (sizeof (EFI_ACPI_DESCRIPTION_HEADER) + mEfiAcpiMaxNumTables * sizeof (UINT64)));
-
+
//
// Calculate orignal ACPI table buffer size
//
@@ -426,10 +426,10 @@ ReallocateAcpiTableBuffer ( }
gBS->FreePages ((EFI_PHYSICAL_ADDRESS)(UINTN)TempPrivateData.Rsdt1, EFI_SIZE_TO_PAGES (TotalSize));
-
+
//
// Update the Max ACPI table number
- //
+ //
mEfiAcpiMaxNumTables = NewMaxTableNumber;
return EFI_SUCCESS;
}
@@ -508,7 +508,7 @@ AddTableToList ( //
// Allocation memory type depends on the type of the table
//
- if ((CurrentTableSignature == EFI_ACPI_2_0_FIRMWARE_ACPI_CONTROL_STRUCTURE_SIGNATURE) ||
+ if ((CurrentTableSignature == EFI_ACPI_2_0_FIRMWARE_ACPI_CONTROL_STRUCTURE_SIGNATURE) ||
(CurrentTableSignature == EFI_ACPI_4_0_UEFI_ACPI_DATA_TABLE_SIGNATURE)) {
//
// Allocate memory for the FACS. This structure must be aligned
@@ -634,7 +634,7 @@ AddTableToList ( //
// Update pointers in FADT. If tables don't exist this will put NULL pointers there.
- // Note: If the FIRMWARE_CTRL is non-zero, then X_FIRMWARE_CTRL must be zero, and
+ // Note: If the FIRMWARE_CTRL is non-zero, then X_FIRMWARE_CTRL must be zero, and
// vice-versa.
//
if ((UINT64)(UINTN)AcpiTableInstance->Facs3 < BASE_4GB) {
@@ -682,7 +682,7 @@ AddTableToList ( &AcpiTableInstance->Fadt3->Header.OemId,
6
);
-
+
if ((PcdGet32 (PcdAcpiExposedTableVersions) & EFI_ACPI_TABLE_VERSION_1_0B) != 0) {
//
// RSDT OEM information is updated to match FADT OEM information.
@@ -714,7 +714,7 @@ AddTableToList ( sizeof (UINT64)
);
AcpiTableInstance->Xsdt->OemRevision = AcpiTableInstance->Fadt3->Header.OemRevision;
- }
+ }
//
// Checksum the table
//
@@ -782,7 +782,7 @@ AddTableToList ( //
if (AcpiTableInstance->Fadt3 != NULL) {
//
- // Note: If the FIRMWARE_CTRL is non-zero, then X_FIRMWARE_CTRL must be zero, and
+ // Note: If the FIRMWARE_CTRL is non-zero, then X_FIRMWARE_CTRL must be zero, and
// vice-versa.
//
if ((UINT64)(UINTN)AcpiTableInstance->Facs3 < BASE_4GB) {
@@ -854,7 +854,7 @@ AddTableToList ( );
}
}
-
+
if ((Version & ACPI_TABLE_VERSION_GTE_2_0) != 0) {
//
// Save a pointer to the table
@@ -900,7 +900,7 @@ AddTableToList ( Checksum)
);
}
- }
+ }
//
// Checksum the table
//
@@ -1050,7 +1050,7 @@ AddTableToList ( @param Handle Table to find.
@param TableList Table list to search
- @param Table Pointer to table found.
+ @param Table Pointer to table found.
@return EFI_SUCCESS The function completed successfully.
@return EFI_NOT_FOUND No table found matching the handle specified.
@@ -1100,7 +1100,7 @@ FindTableByHandle ( For Acpi 1.0 tables, pass in the Rsdt.
For Acpi 2.0 tables, pass in both Rsdt and Xsdt.
- @param Table Pointer to table found.
+ @param Table Pointer to table found.
@param NumberOfTableEntries Current number of table entries in the RSDT/XSDT
@param Rsdt Pointer to the RSDT to remove from
@param Xsdt Pointer to the Xsdt to remove from
@@ -1320,7 +1320,7 @@ DeleteTable ( // Remove this version from the table
//
Table->Version = Table->Version &~(Version & ACPI_TABLE_VERSION_GTE_2_0);
-
+
//
// Remove from Rsdt and Xsdt. We don't care about the return value
// because it is acceptable for the table to not exist in Rsdt/Xsdt.
@@ -1334,7 +1334,7 @@ DeleteTable ( AcpiTableInstance->Xsdt
);
}
- }
+ }
//
// Free the table, clean up any dependent tables and our private data pointers.
//
@@ -1392,7 +1392,7 @@ DeleteTable ( Checksum)
);
}
- }
+ }
break;
case EFI_ACPI_3_0_DIFFERENTIATED_SYSTEM_DESCRIPTION_TABLE_SIGNATURE:
@@ -1417,7 +1417,7 @@ DeleteTable ( }
}
-
+
if ((Version & ACPI_TABLE_VERSION_GTE_2_0) != 0) {
AcpiTableInstance->Dsdt3 = NULL;
@@ -1640,7 +1640,7 @@ ChecksumCommonTables ( OFFSET_OF (EFI_ACPI_DESCRIPTION_HEADER,
Checksum)
);
-
+
return EFI_SUCCESS;
}
diff --git a/MdeModulePkg/Universal/Acpi/AcpiTableDxe/Aml.c b/MdeModulePkg/Universal/Acpi/AcpiTableDxe/Aml.c index 30f71bd..6ff11d8 100644 --- a/MdeModulePkg/Universal/Acpi/AcpiTableDxe/Aml.c +++ b/MdeModulePkg/Universal/Acpi/AcpiTableDxe/Aml.c @@ -1,7 +1,7 @@ /** @file
ACPI Sdt Protocol Driver
- Copyright (c) 2010 - 2014, Intel Corporation. All rights reserved. <BR>
+ Copyright (c) 2010 - 2018, Intel Corporation. All rights reserved. <BR>
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
@@ -209,7 +209,7 @@ AmlSearchByOpByte ( return &mAmlByteEncoding[Index];
}
}
-
+
return NULL;
}
@@ -250,7 +250,7 @@ AmlGetPkgLength ( UINT8 ByteCount;
UINTN RealLength;
UINTN Offset;
-
+
//
// <bit 7-6: ByteData count that follows (0-3)>
// <bit 5-4: Only used if PkgLength < 63>
@@ -265,8 +265,8 @@ AmlGetPkgLength ( // package length value. The next ByteData will become the next least significant 8 bits
// of the resulting value and so on, up to 3 ByteData bytes. Thus, the maximum package
// length is 2**28.
- //
-
+ //
+
LeadByte = *Buffer;
ByteCount = (UINT8)((LeadByte >> 6) & 0x03);
Offset = ByteCount + 1;
@@ -295,7 +295,7 @@ AmlGetPkgLength ( ASSERT (0);
break;
}
-
+
*PkgLength = RealLength;
return Offset;
}
diff --git a/MdeModulePkg/Universal/Acpi/AcpiTableDxe/AmlChild.c b/MdeModulePkg/Universal/Acpi/AcpiTableDxe/AmlChild.c index c7e8af9..28d8204 100644 --- a/MdeModulePkg/Universal/Acpi/AcpiTableDxe/AmlChild.c +++ b/MdeModulePkg/Universal/Acpi/AcpiTableDxe/AmlChild.c @@ -1,7 +1,7 @@ /** @file
ACPI Sdt Protocol Driver
- Copyright (c) 2010 - 2014, Intel Corporation. All rights reserved. <BR>
+ Copyright (c) 2010 - 2018, Intel Corporation. All rights reserved. <BR>
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
@@ -16,14 +16,14 @@ /**
Return the child objects buffer from AML Handle's buffer.
-
+
@param[in] AmlParentHandle Parent handle.
@param[in] CurrentBuffer The current child buffer.
@param[out] Buffer On return, points to the next returned child buffer or NULL if there are no
child buffer.
@retval EFI_SUCCESS Success
- @retval EFI_INVALID_PARAMETER AmlParentHandle does not refer to a valid ACPI object.
+ @retval EFI_INVALID_PARAMETER AmlParentHandle does not refer to a valid ACPI object.
**/
EFI_STATUS
AmlGetChildFromObjectBuffer (
@@ -72,14 +72,14 @@ AmlGetChildFromObjectBuffer ( /**
Return the child ACPI objects from Root Handle.
-
+
@param[in] AmlParentHandle Parent handle. It is Root Handle.
@param[in] AmlHandle The previously returned handle or NULL to start with the first handle.
@param[out] Buffer On return, points to the next returned ACPI handle or NULL if there are no
child objects.
@retval EFI_SUCCESS Success
- @retval EFI_INVALID_PARAMETER ParentHandle is NULL or does not refer to a valid ACPI object.
+ @retval EFI_INVALID_PARAMETER ParentHandle is NULL or does not refer to a valid ACPI object.
**/
EFI_STATUS
AmlGetChildFromRoot (
@@ -104,14 +104,14 @@ AmlGetChildFromRoot ( /**
Return the child objects buffer from AML Handle's option list.
-
+
@param[in] AmlParentHandle Parent handle.
@param[in] AmlHandle The current child handle.
@param[out] Buffer On return, points to the next returned child buffer or NULL if there are no
child buffer.
@retval EFI_SUCCESS Success
- @retval EFI_INVALID_PARAMETER AmlParentHandle does not refer to a valid ACPI object.
+ @retval EFI_INVALID_PARAMETER AmlParentHandle does not refer to a valid ACPI object.
**/
EFI_STATUS
AmlGetChildFromOptionList (
@@ -170,14 +170,14 @@ AmlGetChildFromOptionList ( /**
Return the child objects buffer from AML Handle's object child list.
-
+
@param[in] AmlParentHandle Parent handle.
@param[in] AmlHandle The current child handle.
@param[out] Buffer On return, points to the next returned child buffer or NULL if there are no
child buffer.
@retval EFI_SUCCESS Success
- @retval EFI_INVALID_PARAMETER AmlParentHandle does not refer to a valid ACPI object.
+ @retval EFI_INVALID_PARAMETER AmlParentHandle does not refer to a valid ACPI object.
**/
EFI_STATUS
AmlGetChildFromObjectChildList (
@@ -237,14 +237,14 @@ AmlGetChildFromObjectChildList ( /**
Return the child ACPI objects from Non-Root Handle.
-
+
@param[in] AmlParentHandle Parent handle. It is Non-Root Handle.
@param[in] AmlHandle The previously returned handle or NULL to start with the first handle.
@param[out] Buffer On return, points to the next returned ACPI handle or NULL if there are no
child objects.
@retval EFI_SUCCESS Success
- @retval EFI_INVALID_PARAMETER ParentHandle is NULL or does not refer to a valid ACPI object.
+ @retval EFI_INVALID_PARAMETER ParentHandle is NULL or does not refer to a valid ACPI object.
**/
EFI_STATUS
AmlGetChildFromNonRoot (
diff --git a/MdeModulePkg/Universal/Acpi/AcpiTableDxe/AmlNamespace.c b/MdeModulePkg/Universal/Acpi/AcpiTableDxe/AmlNamespace.c index 03b7394..d1372d7 100644 --- a/MdeModulePkg/Universal/Acpi/AcpiTableDxe/AmlNamespace.c +++ b/MdeModulePkg/Universal/Acpi/AcpiTableDxe/AmlNamespace.c @@ -1,7 +1,7 @@ /** @file
ACPI Sdt Protocol Driver
- Copyright (c) 2010 - 2014, Intel Corporation. All rights reserved. <BR>
+ Copyright (c) 2010 - 2018, Intel Corporation. All rights reserved. <BR>
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
@@ -16,11 +16,11 @@ /**
Construct node list according to the AML handle.
-
+
@param[in] AmlHandle AML handle.
@param[in] AmlRootNodeList AML root node list.
@param[in] AmlParentNodeList AML parent node list.
-
+
@retval EFI_SUCCESS Success.
@retval EFI_INVALID_PARAMETER AML handle does not refer to a valid ACPI object.
**/
@@ -33,11 +33,11 @@ AmlConstructNodeList ( /**
Create AML Node.
-
+
@param[in] NameSeg AML NameSeg.
@param[in] Parent AML parent node list.
@param[in] AmlByteEncoding AML Byte Encoding.
-
+
@return AML Node.
**/
EFI_AML_NODE_LIST *
@@ -66,11 +66,11 @@ AmlCreateNode ( /**
Find the AML NameSeg in the children of AmlParentNodeList.
-
+
@param[in] NameSeg AML NameSeg.
@param[in] AmlParentNodeList AML parent node list.
@param[in] Create TRUE means to create node if not found.
-
+
@return AmlChildNode whoes name is same as NameSeg.
**/
EFI_AML_NODE_LIST *
@@ -120,12 +120,12 @@ AmlFindNodeInThis ( /**
Find the AML NameString in the children of AmlParentNodeList or AmlRootNodeList.
-
+
@param[in] NameString AML NameString.
@param[in] AmlRootNodeList AML root node list.
@param[in] AmlParentNodeList AML parent node list.
@param[in] Create TRUE means to create node if not found.
-
+
@return AmlChildNode whoes name is same as NameSeg.
**/
EFI_AML_NODE_LIST *
@@ -166,7 +166,7 @@ AmlFindNodeInTheTree ( } else {
AmlCurrentNodeList = AmlParentNodeList;
}
-
+
//
// Handle name segment
//
@@ -206,13 +206,13 @@ AmlFindNodeInTheTree ( /**
Insert the NameString to the AmlNodeList.
-
+
@param[in] NameString AML NameString.
@param[in] Buffer Buffer for the Node.
@param[in] Size Size for the Node.
@param[in] AmlRootNodeList AML root node list.
@param[in] AmlParentNodeList AML parent node list.
-
+
@return AmlChildNode whoes name is NameString.
**/
EFI_AML_NODE_LIST *
@@ -278,11 +278,11 @@ AmlInsertNodeToTree ( /**
Construct child node list according to the AML handle.
-
+
@param[in] AmlHandle AML handle.
@param[in] AmlRootNodeList AML root node list.
@param[in] AmlParentNodeList AML parent node list.
-
+
@retval EFI_SUCCESS Success.
@retval EFI_INVALID_PARAMETER AML handle does not refer to a valid ACPI object.
**/
@@ -369,11 +369,11 @@ AmlConstructNodeListForChild ( /**
Construct node list according to the AML handle.
-
+
@param[in] AmlHandle AML handle.
@param[in] AmlRootNodeList AML root node list.
@param[in] AmlParentNodeList AML parent node list.
-
+
@retval EFI_SUCCESS Success.
@retval EFI_INVALID_PARAMETER AML handle does not refer to a valid ACPI object.
**/
@@ -420,7 +420,7 @@ AmlConstructNodeList ( /**
Destruct node list
-
+
@param[in] AmlParentNodeList AML parent node list.
**/
VOID
@@ -465,7 +465,7 @@ AmlDestructNodeList ( /**
Dump node list
-
+
@param[in] AmlParentNodeList AML parent node list.
@param[in] Level Output debug level.
**/
@@ -502,16 +502,16 @@ AmlDumpNodeInfo ( /**
Returns the handle of the ACPI object representing the specified ACPI AML path
-
+
@param[in] AmlHandle Points to the handle of the object representing the starting point for the path search.
@param[in] AmlPath Points to the ACPI AML path.
@param[out] Buffer On return, points to the ACPI object which represents AcpiPath, relative to
HandleIn.
@param[in] FromRoot TRUE means to find AML path from \ (Root) Node.
FALSE means to find AML path from this Node (The HandleIn).
-
+
@retval EFI_SUCCESS Success
- @retval EFI_INVALID_PARAMETER HandleIn does not refer to a valid ACPI object.
+ @retval EFI_INVALID_PARAMETER HandleIn does not refer to a valid ACPI object.
**/
EFI_STATUS
AmlFindPath (
diff --git a/MdeModulePkg/Universal/Acpi/AcpiTableDxe/AmlOption.c b/MdeModulePkg/Universal/Acpi/AcpiTableDxe/AmlOption.c index f4cad10..79aefa5 100644 --- a/MdeModulePkg/Universal/Acpi/AcpiTableDxe/AmlOption.c +++ b/MdeModulePkg/Universal/Acpi/AcpiTableDxe/AmlOption.c @@ -1,7 +1,7 @@ /** @file
ACPI Sdt Protocol Driver
- Copyright (c) 2010, Intel Corporation. All rights reserved. <BR>
+ Copyright (c) 2010 - 2018, Intel Corporation. All rights reserved. <BR>
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
@@ -16,7 +16,7 @@ /**
Retrieve option term according to AmlByteEncoding and Buffer.
-
+
@param[in] AmlByteEncoding AML Byte Encoding.
@param[in] Buffer AML buffer.
@param[in] MaxBufferSize AML buffer MAX size. The parser can not parse any data exceed this region.
@@ -25,7 +25,7 @@ for the specified index.
@param[out] Data Upon return, points to the pointer to the data.
@param[out] DataSize Upon return, points to the size of Data.
-
+
@retval EFI_SUCCESS Success.
@retval EFI_INVALID_PARAMETER Buffer does not refer to a valid ACPI object.
**/
@@ -125,7 +125,7 @@ AmlParseOptionTerm ( /**
Retrieve information according to AmlByteEncoding and Buffer.
-
+
@param[in] AmlByteEncoding AML Byte Encoding.
@param[in] Buffer AML buffer.
@param[in] MaxBufferSize AML buffer MAX size. The parser can not parse any data exceed this region.
@@ -135,7 +135,7 @@ AmlParseOptionTerm ( for the specified index.
@param[out] Data Upon return, points to the pointer to the data.
@param[out] DataSize Upon return, points to the size of Data.
-
+
@retval EFI_SUCCESS Success.
@retval EFI_INVALID_PARAMETER Buffer does not refer to a valid ACPI object.
**/
@@ -286,11 +286,11 @@ AmlParseOptionCommon ( /**
Return object size.
-
+
@param[in] AmlByteEncoding AML Byte Encoding.
@param[in] Buffer AML object buffer.
@param[in] MaxBufferSize AML object buffer MAX size. The parser can not parse any data exceed this region.
-
+
@return Size of the object.
**/
UINTN
@@ -321,9 +321,9 @@ AmlGetObjectSize ( /**
Return object name.
-
+
@param[in] AmlHandle AML handle.
-
+
@return Name of the object.
**/
CHAR8 *
@@ -374,10 +374,10 @@ AmlGetObjectName ( /**
Return offset of last option.
-
+
@param[in] AmlHandle AML Handle.
@param[out] Buffer Upon return, points to the offset after last option.
-
+
@retval EFI_SUCCESS Success.
@retval EFI_INVALID_PARAMETER AmlHandle does not refer to a valid ACPI object.
**/
@@ -419,7 +419,7 @@ AmlGetOffsetAfterLastOption ( /**
Retrieve information according to AmlHandle
-
+
@param[in] AmlHandle AML handle.
@param[in] Index Index of the data to retrieve from the object. In general, indexes read from left-to-right
in the ACPI encoding, with index 0 always being the ACPI opcode.
@@ -427,7 +427,7 @@ AmlGetOffsetAfterLastOption ( for the specified index.
@param[out] Data Upon return, points to the pointer to the data.
@param[out] DataSize Upon return, points to the size of Data.
-
+
@retval EFI_SUCCESS Success.
@retval EFI_INVALID_PARAMETER AmlHandle does not refer to a valid ACPI object.
**/
diff --git a/MdeModulePkg/Universal/Acpi/AcpiTableDxe/AmlString.c b/MdeModulePkg/Universal/Acpi/AcpiTableDxe/AmlString.c index 9f47b48..3f0ce72 100644 --- a/MdeModulePkg/Universal/Acpi/AcpiTableDxe/AmlString.c +++ b/MdeModulePkg/Universal/Acpi/AcpiTableDxe/AmlString.c @@ -1,7 +1,7 @@ /** @file
ACPI Sdt Protocol Driver
- Copyright (c) 2010 - 2011, Intel Corporation. All rights reserved. <BR>
+ Copyright (c) 2010 - 2018, Intel Corporation. All rights reserved. <BR>
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
@@ -18,7 +18,7 @@ Check if it is AML Root name
@param[in] Buffer AML path.
-
+
@retval TRUE AML path is root.
@retval FALSE AML path is not root.
**/
@@ -38,7 +38,7 @@ AmlIsRootPath ( Check if it is AML LeadName.
@param[in] Ch Char.
-
+
@retval TRUE Char is AML LeadName.
@retval FALSE Char is not AML LeadName.
**/
@@ -58,7 +58,7 @@ AmlIsLeadName ( Check if it is AML Name.
@param[in] Ch Char.
-
+
@retval TRUE Char is AML Name.
@retval FALSE Char is not AML Name.
**/
@@ -78,7 +78,7 @@ AmlIsName ( Return is buffer is AML NameSeg.
@param[in] Buffer AML NameSement.
-
+
@retval TRUE It is AML NameSegment.
@retval FALSE It is not AML NameSegment.
**/
@@ -103,8 +103,8 @@ AmlIsNameSeg ( Get AML NameString size.
@param[in] Buffer AML NameString.
- @param[out] BufferSize AML NameString size
-
+ @param[out] BufferSize AML NameString size
+
@retval EFI_SUCCESS Success.
@retval EFI_INVALID_PARAMETER Buffer does not refer to a valid AML NameString.
**/
@@ -183,7 +183,7 @@ AmlGetNameStringSize ( Check if it is ASL LeadName.
@param[in] Ch Char.
-
+
@retval TRUE Char is ASL LeadName.
@retval FALSE Char is not ASL LeadName.
**/
@@ -203,7 +203,7 @@ AmlIsAslLeadName ( Check if it is ASL Name.
@param[in] Ch Char.
-
+
@retval TRUE Char is ASL Name.
@retval FALSE Char is not ASL Name.
**/
@@ -223,7 +223,7 @@ AmlIsAslName ( Get ASL NameString size.
@param[in] Buffer ASL NameString.
-
+
@return ASL NameString size.
**/
UINTN
@@ -237,7 +237,7 @@ AmlGetAslNameSegLength ( if (*Buffer == 0) {
return 0;
}
-
+
Length = 0;
//
// 1st
@@ -275,7 +275,7 @@ AmlGetAslNameSegLength ( @param[out] Root On return, points to Root char number.
@param[out] Parent On return, points to Parent char number.
@param[out] SegCount On return, points to Segment count.
-
+
@return ASL NameString size.
**/
UINTN
@@ -532,7 +532,7 @@ AmlPrintNameString ( //
SegCount = 1;
}
-
+
AmlPrintNameSeg (Buffer);
Buffer += AML_NAME_SEG_SIZE;
for (Index = 0; Index < SegCount - 1; Index++) {
diff --git a/MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResourceTableDxe.inf b/MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResourceTableDxe.inf index bc1c10e..080a939 100644 --- a/MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResourceTableDxe.inf +++ b/MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResourceTableDxe.inf @@ -7,10 +7,10 @@ # 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,
# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
-#
+#
##
[Defines]
diff --git a/MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResourceTableDxe.uni b/MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResourceTableDxe.uni index cda6ae1..20ab0fb 100644 --- a/MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResourceTableDxe.uni +++ b/MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResourceTableDxe.uni @@ -3,13 +3,13 @@ //
// This module installs the ACPI Boot Graphics Resource Table (BGRT).
//
-// Copyright (c) 2011 - 2014, Intel Corporation. All rights reserved.<BR>
+// Copyright (c) 2011 - 2018, Intel Corporation. All rights reserved.<BR>
//
// 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,
// WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
//
diff --git a/MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResourceTableDxeExtra.uni b/MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResourceTableDxeExtra.uni index a64b857..0c48e6b 100644 --- a/MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResourceTableDxeExtra.uni +++ b/MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResourceTableDxeExtra.uni @@ -1,7 +1,7 @@ // /** @file
// BootGraphicsResourceTableDxe Localized Strings and Content
//
-// Copyright (c) 2013 - 2014, Intel Corporation. All rights reserved.<BR>
+// Copyright (c) 2013 - 2018, Intel Corporation. All rights reserved.<BR>
//
// This program and the accompanying materials
// are licensed and made available under the terms and conditions of the BSD License
@@ -13,8 +13,8 @@ //
// **/
-#string STR_PROPERTIES_MODULE_NAME
-#language en-US
+#string STR_PROPERTIES_MODULE_NAME
+#language en-US
"ACPI Boot Graphics Resource Table DXE Driver"
diff --git a/MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/BootScriptExecutorDxe.inf b/MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/BootScriptExecutorDxe.inf index 0dc329c..ecde9bf 100644 --- a/MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/BootScriptExecutorDxe.inf +++ b/MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/BootScriptExecutorDxe.inf @@ -38,11 +38,11 @@ ScriptExecute.c
[Sources.X64]
- X64/SetIdtEntry.c
+ X64/SetIdtEntry.c
X64/S3Asm.nasm
-
+
[Sources.Ia32]
- IA32/SetIdtEntry.c
+ IA32/SetIdtEntry.c
IA32/S3Asm.nasm
[Packages]
diff --git a/MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/BootScriptExecutorDxe.uni b/MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/BootScriptExecutorDxe.uni index f362a02..a111b9c 100644 --- a/MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/BootScriptExecutorDxe.uni +++ b/MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/BootScriptExecutorDxe.uni @@ -4,13 +4,13 @@ // This is a standalone Boot Script Executor. Standalone means it does not
// depends on any PEI or DXE service.
//
-// Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.<BR>
+// Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>
//
// 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,
// WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
//
diff --git a/MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/BootScriptExecutorDxeExtra.uni b/MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/BootScriptExecutorDxeExtra.uni index 3fd8ad6..7e40a8a 100644 --- a/MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/BootScriptExecutorDxeExtra.uni +++ b/MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/BootScriptExecutorDxeExtra.uni @@ -1,7 +1,7 @@ // /** @file
// BootScriptExecutorDxe Localized Strings and Content
//
-// Copyright (c) 2013 - 2014, Intel Corporation. All rights reserved.<BR>
+// Copyright (c) 2013 - 2018, Intel Corporation. All rights reserved.<BR>
//
// This program and the accompanying materials are
// licensed and made available under the terms and conditions of the BSD License
@@ -13,8 +13,8 @@ //
// **/
-#string STR_PROPERTIES_MODULE_NAME
-#language en-US
+#string STR_PROPERTIES_MODULE_NAME
+#language en-US
"Boot Script Execution DXE Driver"
diff --git a/MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/ScriptExecute.c b/MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/ScriptExecute.c index 263a282..e76abb7 100644 --- a/MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/ScriptExecute.c +++ b/MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/ScriptExecute.c @@ -4,7 +4,7 @@ This driver is dispatched by Dxe core and the driver will reload itself to ACPI reserved memory
in the entry point. The functionality is to interpret and restore the S3 boot script
-Copyright (c) 2006 - 2017, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>
Copyright (c) 2017, AMD Incorporated. All rights reserved.<BR>
This program and the accompanying materials
@@ -72,12 +72,12 @@ S3BootScriptExecutorEntryFunction ( // for that parameter.
//
Status = S3BootScriptExecute ();
-
+
//
// If invalid script table or opcode in S3 boot script table.
//
ASSERT_EFI_ERROR (Status);
-
+
if (EFI_ERROR (Status)) {
CpuDeadLoop ();
return Status;
@@ -95,7 +95,7 @@ S3BootScriptExecutorEntryFunction ( //
if (PeiS3ResumeState != 0) {
//
- // Need report status back to S3ResumePeim.
+ // Need report status back to S3ResumePeim.
// If boot script execution is failed, S3ResumePeim wil report the error status code.
//
PeiS3ResumeState->ReturnStatus = (UINT64)(UINTN)Status;
@@ -145,7 +145,7 @@ S3BootScriptExecutorEntryFunction ( CpuDeadLoop();
return EFI_UNSUPPORTED;
}
-
+
//
// S3ResumePeim does not provide a way to jump back to itself, so resume to OS here directly
//
@@ -254,9 +254,9 @@ RegisterMemoryProfileImage ( /**
This is the Event notification function to reload BootScriptExecutor image
to RESERVED mem and save it to LockBox.
-
+
@param Event Pointer to this event
- @param Context Event handler private data
+ @param Context Event handler private data
**/
VOID
EFIAPI
diff --git a/MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/ScriptExecute.h b/MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/ScriptExecute.h index 94deae8..4ae07a0 100644 --- a/MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/ScriptExecute.h +++ b/MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/ScriptExecute.h @@ -1,10 +1,10 @@ /** @file
The header file for Boot Script Executer module.
-
- This driver is dispatched by Dxe core and the driver will reload itself to ACPI reserved memory
- in the entry point. The functionality is to interpret and restore the S3 boot script
-
-Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.<BR>
+
+ This driver is dispatched by Dxe core and the driver will reload itself to ACPI reserved memory
+ in the entry point. The functionality is to interpret and restore the S3 boot script
+
+Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>
Copyright (c) 2017, AMD Incorporated. All rights reserved.<BR>
This program and the accompanying materials
@@ -51,9 +51,9 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. /**
a ASM function to transfer control to OS.
-
+
@param S3WakingVector The S3 waking up vector saved in ACPI Facs table
- @param AcpiLowMemoryBase a buffer under 1M which could be used during the transfer
+ @param AcpiLowMemoryBase a buffer under 1M which could be used during the transfer
**/
VOID
AsmTransferControl (
@@ -62,9 +62,9 @@ AsmTransferControl ( );
/**
a 32bit ASM function to transfer control to OS.
-
+
@param S3WakingVector The S3 waking up vector saved in ACPI Facs table
- @param AcpiLowMemoryBase a buffer under 1M which could be used during the transfer
+ @param AcpiLowMemoryBase a buffer under 1M which could be used during the transfer
**/
VOID
AsmTransferControl32 (
@@ -79,13 +79,13 @@ AsmTransferControl16 ( VOID
);
/**
- Set a IDT entry for interrupt vector 3 for debug purpose.
-
- @param AcpiS3Context a pointer to a structure of ACPI_S3_CONTEXT
-
+ Set a IDT entry for interrupt vector 3 for debug purpose.
+
+ @param AcpiS3Context a pointer to a structure of ACPI_S3_CONTEXT
+
**/
VOID
-SetIdtEntry (
+SetIdtEntry (
IN ACPI_S3_CONTEXT *AcpiS3Context
);
diff --git a/MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/X64/SetIdtEntry.c b/MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/X64/SetIdtEntry.c index 70eecf5..1c6bb47 100644 --- a/MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/X64/SetIdtEntry.c +++ b/MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/X64/SetIdtEntry.c @@ -3,7 +3,7 @@ Set a IDT entry for interrupt vector 3 for debug purpose for x64 platform
-Copyright (c) 2006 - 2017, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>
Copyright (c) 2017, AMD Incorporated. All rights reserved.<BR>
@@ -218,7 +218,7 @@ AcquirePage ( /**
The page fault handler that on-demand read >4G memory/MMIO.
-
+
@retval TRUE The page fault is correctly handled.
@retval FALSE The page fault is not handled and is passed through to original handler.
diff --git a/MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTableDxe/FirmwarePerformanceDxe.c b/MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTableDxe/FirmwarePerformanceDxe.c index ded817f..3d8e832 100644 --- a/MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTableDxe/FirmwarePerformanceDxe.c +++ b/MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTableDxe/FirmwarePerformanceDxe.c @@ -2,7 +2,7 @@ This module install ACPI Firmware Performance Data Table (FPDT).
This module register report status code listener to collect performance data
- for Firmware Basic Boot Performance Record and other boot performance records,
+ for Firmware Basic Boot Performance Record and other boot performance records,
and install FPDT to ACPI table.
Copyright (c) 2011 - 2018, Intel Corporation. All rights reserved.<BR>
@@ -438,7 +438,7 @@ FpdtStatusCodeListenerDxe ( if ((CodeType & EFI_STATUS_CODE_TYPE_MASK) != EFI_PROGRESS_CODE) {
return EFI_UNSUPPORTED;
}
-
+
if (Value == (EFI_SOFTWARE_DXE_CORE | EFI_SW_DXE_CORE_PC_HANDOFF_TO_NEXT)) {
//
// DxeCore ReportStatusCode Enable so that the capability can be supported.
@@ -552,7 +552,7 @@ FpdtExitBootServicesEventNotify ( {
if (!mDxeCoreReportStatusCodeEnable) {
//
- // When DxeCore Report Status Code is disabled,
+ // When DxeCore Report Status Code is disabled,
// Unregister boot time report status code listener at ExitBootService Event.
//
mRscHandlerProtocol->Unregister (FpdtStatusCodeListenerDxe);
diff --git a/MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTableDxe/FirmwarePerformanceDxe.inf b/MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTableDxe/FirmwarePerformanceDxe.inf index 3d2dd6e..843cda7 100644 --- a/MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTableDxe/FirmwarePerformanceDxe.inf +++ b/MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTableDxe/FirmwarePerformanceDxe.inf @@ -2,7 +2,7 @@ # This module installs ACPI Firmware Performance Data Table (FPDT).
#
# This module registers report status code listener to collect performance data
-# for Firmware Basic Boot Performance Record and other boot performance records,
+# for Firmware Basic Boot Performance Record and other boot performance records,
# and install FPDT to ACPI table.
#
# Copyright (c) 2011 - 2018, Intel Corporation. All rights reserved.<BR>
@@ -10,7 +10,7 @@ # 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,
# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
#
diff --git a/MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTableDxe/FirmwarePerformanceDxe.uni b/MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTableDxe/FirmwarePerformanceDxe.uni index e35fa48..4173125 100644 --- a/MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTableDxe/FirmwarePerformanceDxe.uni +++ b/MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTableDxe/FirmwarePerformanceDxe.uni @@ -5,13 +5,13 @@ // for Firmware Basic Boot Performance Record and other boot performance records,
// and install FPDT to ACPI table.
//
-// Copyright (c) 2011 - 2014, Intel Corporation. All rights reserved.<BR>
+// Copyright (c) 2011 - 2018, Intel Corporation. All rights reserved.<BR>
//
// 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,
// WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
//
diff --git a/MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTableDxe/FirmwarePerformanceDxeExtra.uni b/MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTableDxe/FirmwarePerformanceDxeExtra.uni index 5a6d683..2cacc83 100644 --- a/MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTableDxe/FirmwarePerformanceDxeExtra.uni +++ b/MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTableDxe/FirmwarePerformanceDxeExtra.uni @@ -1,7 +1,7 @@ // /** @file
// FirmwarePerformanceDxe Localized Strings and Content
//
-// Copyright (c) 2013 - 2014, Intel Corporation. All rights reserved.<BR>
+// Copyright (c) 2013 - 2018, Intel Corporation. All rights reserved.<BR>
//
// This program and the accompanying materials
// are licensed and made available under the terms and conditions of the BSD License
@@ -13,8 +13,8 @@ //
// **/
-#string STR_PROPERTIES_MODULE_NAME
-#language en-US
+#string STR_PROPERTIES_MODULE_NAME
+#language en-US
"ACPI Firmware Performance DXE Driver"
diff --git a/MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTablePei/FirmwarePerformancePei.inf b/MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTablePei/FirmwarePerformancePei.inf index a6ce5e6..1b69e49 100644 --- a/MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTablePei/FirmwarePerformancePei.inf +++ b/MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTablePei/FirmwarePerformancePei.inf @@ -11,7 +11,7 @@ # 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,
# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
#
diff --git a/MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTablePei/FirmwarePerformancePei.uni b/MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTablePei/FirmwarePerformancePei.uni index 3ae182c..4eb031b 100644 --- a/MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTablePei/FirmwarePerformancePei.uni +++ b/MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTablePei/FirmwarePerformancePei.uni @@ -2,17 +2,17 @@ // Firmware Performance Pei Module.
//
// In S3 resume boot mode, it updates S3 Resume Performance Record in ACPI Firmware Performance Data Table.
-//
+//
// This module register report status code listener to collect performance data
// for S3 Resume Performance Record on S3 resume boot path.
//
-// Copyright (c) 2011 - 2017, Intel Corporation. All rights reserved.<BR>
+// Copyright (c) 2011 - 2018, Intel Corporation. All rights reserved.<BR>
//
// 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,
// WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
//
diff --git a/MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTablePei/FirmwarePerformancePeiExtra.uni b/MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTablePei/FirmwarePerformancePeiExtra.uni index 0602948..a4e8f9c 100644 --- a/MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTablePei/FirmwarePerformancePeiExtra.uni +++ b/MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTablePei/FirmwarePerformancePeiExtra.uni @@ -1,7 +1,7 @@ // /** @file
// FirmwarePerformancePei Localized Strings and Content
//
-// Copyright (c) 2013 - 2014, Intel Corporation. All rights reserved.<BR>
+// Copyright (c) 2013 - 2018, Intel Corporation. All rights reserved.<BR>
//
// This program and the accompanying materials
// are licensed and made available under the terms and conditions of the BSD License
@@ -13,8 +13,8 @@ //
// **/
-#string STR_PROPERTIES_MODULE_NAME
-#language en-US
+#string STR_PROPERTIES_MODULE_NAME
+#language en-US
"Firmware Performance PEI Module"
diff --git a/MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTableSmm/FirmwarePerformanceSmm.c b/MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTableSmm/FirmwarePerformanceSmm.c index b011ec1..711272e 100644 --- a/MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTableSmm/FirmwarePerformanceSmm.c +++ b/MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTableSmm/FirmwarePerformanceSmm.c @@ -11,7 +11,7 @@ FpdtSmiHandler() will receive untrusted input and do basic validation.
- Copyright (c) 2011 - 2016, Intel Corporation. All rights reserved.<BR>
+ Copyright (c) 2011 - 2018, Intel Corporation. All rights reserved.<BR>
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
@@ -90,7 +90,7 @@ FpdtStatusCodeListenerSmm ( if ((CodeType & EFI_STATUS_CODE_TYPE_MASK) != EFI_PROGRESS_CODE) {
return EFI_UNSUPPORTED;
}
-
+
//
// Collect one or more Boot records in boot time
//
@@ -163,7 +163,7 @@ FpdtStatusCodeListenerSmm ( /**
Communication service SMI Handler entry.
- This SMI handler provides services for report SMM boot records.
+ This SMI handler provides services for report SMM boot records.
Caution: This function may receive untrusted input.
Communicate buffer and buffer size are external input, so this function will do basic validation.
@@ -175,11 +175,11 @@ FpdtStatusCodeListenerSmm ( be conveyed from a non-SMM environment into an SMM environment.
@param[in, out] CommBufferSize The size of the CommBuffer.
- @retval EFI_SUCCESS The interrupt was handled and quiesced. No other handlers
+ @retval EFI_SUCCESS The interrupt was handled and quiesced. No other handlers
should still be called.
- @retval EFI_WARN_INTERRUPT_SOURCE_QUIESCED The interrupt has been quiesced but other handlers should
+ @retval EFI_WARN_INTERRUPT_SOURCE_QUIESCED The interrupt has been quiesced but other handlers should
still be called.
- @retval EFI_WARN_INTERRUPT_SOURCE_PENDING The interrupt is still pending and other handlers should still
+ @retval EFI_WARN_INTERRUPT_SOURCE_PENDING The interrupt is still pending and other handlers should still
be called.
@retval EFI_INTERRUPT_PENDING The interrupt could not be quiesced.
@@ -212,7 +212,7 @@ FpdtSmiHandler ( if(TempCommBufferSize < sizeof (SMM_BOOT_RECORD_COMMUNICATE)) {
return EFI_SUCCESS;
}
-
+
if (!SmmIsBufferOutsideSmmValid ((UINTN)CommBuffer, TempCommBufferSize)) {
DEBUG ((EFI_D_ERROR, "FpdtSmiHandler: SMM communication data buffer in SMRAM or overflow!\n"));
return EFI_SUCCESS;
@@ -242,7 +242,7 @@ FpdtSmiHandler ( Status = EFI_INVALID_PARAMETER;
break;
}
-
+
//
// Sanity check
//
@@ -255,10 +255,10 @@ FpdtSmiHandler ( Status = EFI_ACCESS_DENIED;
break;
}
-
+
CopyMem (
- (UINT8*)BootRecordData,
- mBootRecordBuffer + BootRecordOffset,
+ (UINT8*)BootRecordData,
+ mBootRecordBuffer + BootRecordOffset,
BootRecordSize
);
break;
@@ -268,7 +268,7 @@ FpdtSmiHandler ( }
SmmCommData->ReturnStatus = Status;
-
+
return EFI_SUCCESS;
}
@@ -295,8 +295,8 @@ FirmwarePerformanceSmmEntryPoint ( //
// Initialize spin lock
//
- InitializeSpinLock (&mSmmFpdtLock);
-
+ InitializeSpinLock (&mSmmFpdtLock);
+
//
// Get SMM Report Status Code Handler Protocol.
//
diff --git a/MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTableSmm/FirmwarePerformanceSmm.inf b/MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTableSmm/FirmwarePerformanceSmm.inf index cae0111..67cd136 100644 --- a/MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTableSmm/FirmwarePerformanceSmm.inf +++ b/MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTableSmm/FirmwarePerformanceSmm.inf @@ -4,12 +4,12 @@ # This module registers report status code listener to collect performance data
# for SMM boot performance records and S3 Suspend Performance Record.
#
-# Copyright (c) 2011 - 2015, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2011 - 2018, Intel Corporation. All rights reserved.<BR>
# 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,
# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
#
diff --git a/MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTableSmm/FirmwarePerformanceSmm.uni b/MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTableSmm/FirmwarePerformanceSmm.uni index 94f3b8e..8c55fff 100644 --- a/MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTableSmm/FirmwarePerformanceSmm.uni +++ b/MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTableSmm/FirmwarePerformanceSmm.uni @@ -4,13 +4,13 @@ // This module registers report status code listener to collect performance data
// for SMM boot performance records and S3 Suspend Performance Record.
//
-// Copyright (c) 2011 - 2014, Intel Corporation. All rights reserved.<BR>
+// Copyright (c) 2011 - 2018, Intel Corporation. All rights reserved.<BR>
//
// 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,
// WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
//
diff --git a/MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTableSmm/FirmwarePerformanceSmmExtra.uni b/MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTableSmm/FirmwarePerformanceSmmExtra.uni index d96e87f..59cb8c7 100644 --- a/MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTableSmm/FirmwarePerformanceSmmExtra.uni +++ b/MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTableSmm/FirmwarePerformanceSmmExtra.uni @@ -1,7 +1,7 @@ // /** @file
// FirmwarePerformanceSmm Localized Strings and Content
//
-// Copyright (c) 2013 - 2014, Intel Corporation. All rights reserved.<BR>
+// Copyright (c) 2013 - 2018, Intel Corporation. All rights reserved.<BR>
//
// This program and the accompanying materials
// are licensed and made available under the terms and conditions of the BSD License
@@ -13,8 +13,8 @@ //
// **/
-#string STR_PROPERTIES_MODULE_NAME
-#language en-US
+#string STR_PROPERTIES_MODULE_NAME
+#language en-US
"SMM Firmware Performance Driver"
diff --git a/MdeModulePkg/Universal/Acpi/S3SaveStateDxe/AcpiS3ContextSave.c b/MdeModulePkg/Universal/Acpi/S3SaveStateDxe/AcpiS3ContextSave.c index 3c05558..3f99023 100644 --- a/MdeModulePkg/Universal/Acpi/S3SaveStateDxe/AcpiS3ContextSave.c +++ b/MdeModulePkg/Universal/Acpi/S3SaveStateDxe/AcpiS3ContextSave.c @@ -1,7 +1,7 @@ /** @file
This is the implementation to save ACPI S3 Context.
-Copyright (c) 2006 - 2017, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>
This program and the accompanying materials
are licensed and made available under the terms and conditions
@@ -43,7 +43,7 @@ EFI_GUID mAcpiS3IdtrProfileGuid = { @param MemoryType Memory type of memory to allocate.
@param Size Size of memory to allocate.
-
+
@return Allocated address for output.
**/
@@ -101,7 +101,7 @@ ScanTableInRSDT ( }
EntryCount = (Rsdt->Length - sizeof (EFI_ACPI_DESCRIPTION_HEADER)) / sizeof(UINT32);
-
+
EntryPtr = (UINT32 *)(Rsdt + 1);
for (Index = 0; Index < EntryCount; Index ++, EntryPtr ++) {
Table = (EFI_ACPI_DESCRIPTION_HEADER *)((UINTN)(*EntryPtr));
@@ -109,7 +109,7 @@ ScanTableInRSDT ( return Table;
}
}
-
+
return NULL;
}
@@ -140,7 +140,7 @@ ScanTableInXSDT ( }
EntryCount = (Xsdt->Length - sizeof (EFI_ACPI_DESCRIPTION_HEADER)) / sizeof(UINT64);
-
+
BasePtr = (UINTN)(Xsdt + 1);
for (Index = 0; Index < EntryCount; Index ++) {
CopyMem (&EntryPtr, (VOID *)(BasePtr + Index * sizeof(UINT64)), sizeof(UINT64));
@@ -149,7 +149,7 @@ ScanTableInXSDT ( return Table;
}
}
-
+
return NULL;
}
@@ -157,7 +157,7 @@ ScanTableInXSDT ( To find Facs in FADT.
@param Fadt FADT table pointer
-
+
@return Facs table pointer.
**/
EFI_ACPI_2_0_FIRMWARE_ACPI_CONTROL_STRUCTURE *
@@ -187,12 +187,12 @@ FindAcpiFacsFromFadt ( /**
To find Facs in Acpi tables.
-
- To find Firmware ACPI control strutcure in Acpi Tables since the S3 waking vector is stored
+
+ To find Firmware ACPI control strutcure in Acpi Tables since the S3 waking vector is stored
in the table.
@param AcpiTableGuid The guid used to find ACPI table in UEFI ConfigurationTable.
-
+
@return Facs table pointer.
**/
EFI_ACPI_2_0_FIRMWARE_ACPI_CONTROL_STRUCTURE *
@@ -256,10 +256,10 @@ FindAcpiFacsTableByAcpiGuid ( /**
To find Facs in Acpi tables.
-
- To find Firmware ACPI control strutcure in Acpi Tables since the S3 waking vector is stored
+
+ To find Firmware ACPI control strutcure in Acpi Tables since the S3 waking vector is stored
in the table.
-
+
@return Facs table pointer.
**/
EFI_ACPI_2_0_FIRMWARE_ACPI_CONTROL_STRUCTURE *
@@ -315,20 +315,20 @@ IsLongModeWakingVectorSupport ( @param[in] LongModeWakingVectorSupport Support long mode waking vector or not.
- If BootScriptExector driver will run in 64-bit mode, this function will establish the 1:1
+ If BootScriptExector driver will run in 64-bit mode, this function will establish the 1:1
virtual to physical mapping page table when long mode waking vector is supported, otherwise
create 4G page table when long mode waking vector is not supported and let PF handler to
handle > 4G request.
- If BootScriptExector driver will not run in 64-bit mode, this function will do nothing.
-
- @return Page table base address.
+ If BootScriptExector driver will not run in 64-bit mode, this function will do nothing.
+
+ @return Page table base address.
**/
EFI_PHYSICAL_ADDRESS
S3AllocatePageTablesBuffer (
IN BOOLEAN LongModeWakingVectorSupport
)
-{
+{
if (FeaturePcdGet (PcdDxeIplSwitchToLongMode)) {
UINTN ExtraPageTablePages;
UINT32 RegEax;
@@ -419,7 +419,7 @@ S3AllocatePageTablesBuffer ( //
// If DXE is running 32-bit mode, no need to establish page table.
//
- return (EFI_PHYSICAL_ADDRESS) 0;
+ return (EFI_PHYSICAL_ADDRESS) 0;
}
}
diff --git a/MdeModulePkg/Universal/Acpi/S3SaveStateDxe/InternalS3SaveState.h b/MdeModulePkg/Universal/Acpi/S3SaveStateDxe/InternalS3SaveState.h index 2cc638a..1960008 100644 --- a/MdeModulePkg/Universal/Acpi/S3SaveStateDxe/InternalS3SaveState.h +++ b/MdeModulePkg/Universal/Acpi/S3SaveStateDxe/InternalS3SaveState.h @@ -1,7 +1,7 @@ /** @file
Internal header file for S3 Boot Script Saver state driver.
- Copyright (c) 2006 - 2016, Intel Corporation. All rights reserved.<BR>
+ Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>
This program and the accompanying materials
are licensed and made available under the terms and conditions
@@ -48,25 +48,25 @@ AcpiS3ContextSaveOnEndOfDxe ( Adds a record into S3 boot script table.
This function is used to store a boot script record into a given boot
- script table. If the table specified by TableName is nonexistent in the
- system, a new table will automatically be created and then the script record
- will be added into the new table. This function is responsible for allocating
+ script table. If the table specified by TableName is nonexistent in the
+ system, a new table will automatically be created and then the script record
+ will be added into the new table. This function is responsible for allocating
necessary memory for the script.
- This function has a variable parameter list. The exact parameter list depends on
- the OpCode that is passed into the function. If an unsupported OpCode or illegal
+ This function has a variable parameter list. The exact parameter list depends on
+ the OpCode that is passed into the function. If an unsupported OpCode or illegal
parameter list is passed in, this function returns EFI_INVALID_PARAMETER.
If there are not enough resources available for storing more scripts, this function returns
EFI_OUT_OF_RESOURCES.
@param This A pointer to the EFI_S3_SAVE_STATE_PROTOCOL instance.
@param OpCode The operation code (opcode) number.
- @param ... Argument list that is specific to each opcode.
+ @param ... Argument list that is specific to each opcode.
@retval EFI_SUCCESS The operation succeeded. A record was added into the
specified script table.
@retval EFI_INVALID_PARAMETER The parameter is illegal or the given boot script is not supported.
- If the opcode is unknow or not supported because of the PCD
+ If the opcode is unknow or not supported because of the PCD
Feature Flags.
@retval EFI_OUT_OF_RESOURCES There is insufficient memory to store the boot script.
@@ -98,7 +98,7 @@ BootScriptWrite ( inserted, either before or after, depending on BeforeOrAfter. On exit, specifies
the position of the inserted opcode in the boot script table.
@param OpCode The operation code (opcode) number.
- @param ... Argument list that is specific to each opcode.
+ @param ... Argument list that is specific to each opcode.
@retval EFI_SUCCESS The operation succeeded. A record was added into the
specified script table.
@@ -139,7 +139,7 @@ BootScriptInsert ( @retval EFI_SUCCESS The label already exists or was inserted.
@retval EFI_INVALID_PARAMETER The Opcode is an invalid opcode value or the Position is not a valid position in the boot script table..
-
+
**/
EFI_STATUS
EFIAPI
@@ -152,27 +152,27 @@ BootScriptLabel ( );
/**
Compare two positions in the boot script table and return their relative position.
-
+
This function compares two positions in the boot script table and returns their relative positions. If
Position1 is before Position2, then -1 is returned. If Position1 is equal to Position2,
then 0 is returned. If Position1 is after Position2, then 1 is returned.
-
+
@param This A pointer to the EFI_S3_SAVE_STATE_PROTOCOL instance.
@param Position1 The positions in the boot script table to compare
@param Position2 The positions in the boot script table to compare
@param RelativePosition On return, points to the result of the comparison
- @retval EFI_SUCCESS The operation succeeded.
+ @retval EFI_SUCCESS The operation succeeded.
@retval EFI_INVALID_PARAMETER The Position1 or Position2 is not a valid position in the boot script table.
**/
EFI_STATUS
-EFIAPI
+EFIAPI
BootScriptCompare (
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
);
-
+
#endif //_INTERNAL_S3_SAVE_STATE_H_
diff --git a/MdeModulePkg/Universal/Acpi/S3SaveStateDxe/S3SaveState.c b/MdeModulePkg/Universal/Acpi/S3SaveStateDxe/S3SaveState.c index d730051..274f3be 100644 --- a/MdeModulePkg/Universal/Acpi/S3SaveStateDxe/S3SaveState.c +++ b/MdeModulePkg/Universal/Acpi/S3SaveStateDxe/S3SaveState.c @@ -1,7 +1,7 @@ /** @file
Implementation for S3 Boot Script Saver state driver.
- Copyright (c) 2006 - 2017, Intel Corporation. All rights reserved.<BR>
+ Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>
This program and the accompanying materials
are licensed and made available under the terms and conditions
@@ -46,7 +46,7 @@ BootScriptWriteIoWrite ( Address = VA_ARG (Marker, UINT64);
Count = VA_ARG (Marker, UINTN);
Buffer = VA_ARG (Marker, UINT8 *);
-
+
return S3BootScriptSaveIoWrite (Width, Address, Count, Buffer);
}
/**
@@ -68,12 +68,12 @@ BootScriptWriteIoReadWrite ( UINT64 Address;
UINT8 *Data;
UINT8 *DataMask;
-
+
Width = VA_ARG (Marker, S3_BOOT_SCRIPT_LIB_WIDTH);
Address = VA_ARG (Marker, UINT64);
Data = VA_ARG (Marker, UINT8 *);
DataMask = VA_ARG (Marker, UINT8 *);
-
+
return S3BootScriptSaveIoReadWrite (Width, Address, Data, DataMask);
}
@@ -96,7 +96,7 @@ BootScriptWriteMemWrite ( UINT64 Address;
UINTN Count;
UINT8 *Buffer;
-
+
Width = VA_ARG (Marker, S3_BOOT_SCRIPT_LIB_WIDTH);
Address = VA_ARG (Marker, UINT64);
Count = VA_ARG (Marker, UINTN);
@@ -124,7 +124,7 @@ BootScriptWriteMemReadWrite ( UINT64 Address;
UINT8 *Data;
UINT8 *DataMask;
-
+
Width = VA_ARG (Marker, S3_BOOT_SCRIPT_LIB_WIDTH);
Address = VA_ARG (Marker, UINT64);
Data = VA_ARG (Marker, UINT8 *);
@@ -238,13 +238,13 @@ BootScriptWritePciCfg2ReadWrite ( UINT64 Address;
UINT8 *Data;
UINT8 *DataMask;
-
+
Width = VA_ARG (Marker, S3_BOOT_SCRIPT_LIB_WIDTH);
Segment = VA_ARG (Marker, UINT16);
Address = VA_ARG (Marker, UINT64);
Data = VA_ARG (Marker, UINT8 *);
DataMask = VA_ARG (Marker, UINT8 *);
-
+
return S3BootScriptSavePciCfg2ReadWrite (Width, Segment, Address, Data, DataMask);
}
/**
@@ -269,15 +269,15 @@ BootScriptWriteSmbusExecute ( VOID *Buffer;
UINTN *DataSize;
UINTN SmBusAddress;
-
+
SlaveAddress.SmbusDeviceAddress = VA_ARG (Marker, UINTN);
Command = VA_ARG (Marker, EFI_SMBUS_DEVICE_COMMAND);
Operation = VA_ARG (Marker, EFI_SMBUS_OPERATION);
PecCheck = VA_ARG (Marker, BOOLEAN);
SmBusAddress = SMBUS_LIB_ADDRESS (SlaveAddress.SmbusDeviceAddress,Command,0,PecCheck);
- DataSize = VA_ARG (Marker, UINTN *);
+ DataSize = VA_ARG (Marker, UINTN *);
Buffer = VA_ARG (Marker, VOID *);
-
+
return S3BootScriptSaveSmbusExecute (SmBusAddress, Operation, DataSize, Buffer);
}
/**
@@ -303,7 +303,7 @@ BootScriptWriteStall ( }
/**
- Internal function to add Save jmp address according to DISPATCH_OPCODE.
+ Internal function to add Save jmp address according to DISPATCH_OPCODE.
We ignore "Context" parameter
@param Marker The variable argument list to get the opcode
@@ -325,8 +325,8 @@ BootScriptWriteDispatch ( }
/**
- Internal function to add memory pool operation to the table.
-
+ Internal function to add memory pool operation to the table.
+
@param Marker The variable argument list to get the opcode
and associated attributes.
@@ -339,18 +339,18 @@ BootScriptWriteMemPoll ( IN VA_LIST Marker
)
{
- S3_BOOT_SCRIPT_LIB_WIDTH Width;
- UINT64 Address;
- VOID *Data;
- VOID *DataMask;
+ S3_BOOT_SCRIPT_LIB_WIDTH Width;
+ UINT64 Address;
+ VOID *Data;
+ VOID *DataMask;
UINT64 Delay;
UINT64 LoopTimes;
UINT32 Remainder;
- Width = VA_ARG (Marker, S3_BOOT_SCRIPT_LIB_WIDTH);
- Address = VA_ARG (Marker, UINT64);
- Data = VA_ARG (Marker, VOID *);
- DataMask = VA_ARG (Marker, VOID *);
+ Width = VA_ARG (Marker, S3_BOOT_SCRIPT_LIB_WIDTH);
+ Address = VA_ARG (Marker, UINT64);
+ Data = VA_ARG (Marker, VOID *);
+ DataMask = VA_ARG (Marker, VOID *);
Delay = VA_ARG (Marker, UINT64);
//
// According to the spec, the interval between 2 polls is 100ns,
@@ -375,7 +375,7 @@ BootScriptWriteMemPoll ( }
/**
- Internal function to add Save jmp address according to DISPATCH_OPCODE2.
+ Internal function to add Save jmp address according to DISPATCH_OPCODE2.
The "Context" parameter is not ignored.
@param Marker The variable argument list to get the opcode
@@ -391,7 +391,7 @@ BootScriptWriteDispatch2 ( )
{
VOID *EntryPoint;
- VOID *Context;
+ VOID *Context;
EntryPoint = (VOID*)(UINTN)VA_ARG (Marker, EFI_PHYSICAL_ADDRESS);
Context = (VOID*)(UINTN)VA_ARG (Marker, EFI_PHYSICAL_ADDRESS);
@@ -414,7 +414,7 @@ BootScriptWriteInformation ( )
{
UINT32 InformationLength;
- EFI_PHYSICAL_ADDRESS Information;
+ EFI_PHYSICAL_ADDRESS Information;
InformationLength = VA_ARG (Marker, UINT32);
Information = VA_ARG (Marker, EFI_PHYSICAL_ADDRESS);
@@ -435,17 +435,17 @@ BootScriptWriteIoPoll ( )
{
S3_BOOT_SCRIPT_LIB_WIDTH Width;
- UINT64 Address;
- VOID *Data;
- VOID *DataMask;
- UINT64 Delay;
-
- Width = VA_ARG (Marker, S3_BOOT_SCRIPT_LIB_WIDTH);
- Address = VA_ARG (Marker, UINT64);
- Data = VA_ARG (Marker, VOID *);
- DataMask = VA_ARG (Marker, VOID *);
- Delay = (UINT64)VA_ARG (Marker, UINT64);
-
+ UINT64 Address;
+ VOID *Data;
+ VOID *DataMask;
+ UINT64 Delay;
+
+ Width = VA_ARG (Marker, S3_BOOT_SCRIPT_LIB_WIDTH);
+ Address = VA_ARG (Marker, UINT64);
+ Data = VA_ARG (Marker, VOID *);
+ DataMask = VA_ARG (Marker, VOID *);
+ Delay = (UINT64)VA_ARG (Marker, UINT64);
+
return S3BootScriptSaveIoPoll (Width, Address, Data, DataMask, Delay);
}
/**
@@ -469,13 +469,13 @@ BootScriptWritePciConfigPoll ( VOID *DataMask;
UINT64 Delay;
-
- Width = VA_ARG (Marker, S3_BOOT_SCRIPT_LIB_WIDTH);
- Address = VA_ARG (Marker, UINT64);
- Data = VA_ARG (Marker, VOID *);
- DataMask = VA_ARG (Marker, VOID *);
- Delay = (UINT64)VA_ARG (Marker, UINT64);
-
+
+ Width = VA_ARG (Marker, S3_BOOT_SCRIPT_LIB_WIDTH);
+ Address = VA_ARG (Marker, UINT64);
+ Data = VA_ARG (Marker, VOID *);
+ DataMask = VA_ARG (Marker, VOID *);
+ Delay = (UINT64)VA_ARG (Marker, UINT64);
+
return S3BootScriptSavePciPoll (Width, Address, Data, DataMask, Delay);
}
/**
@@ -499,14 +499,14 @@ BootScriptWritePciConfig2Poll ( VOID *Data;
VOID *DataMask;
UINT64 Delay;
-
- Width = VA_ARG (Marker, S3_BOOT_SCRIPT_LIB_WIDTH);
- Segment = VA_ARG (Marker, UINT16);
- Address = VA_ARG (Marker, UINT64);
- Data = VA_ARG (Marker, VOID *);
- DataMask = VA_ARG (Marker, VOID *);
- Delay = (UINT64)VA_ARG (Marker, UINT64);
-
+
+ Width = VA_ARG (Marker, S3_BOOT_SCRIPT_LIB_WIDTH);
+ Segment = VA_ARG (Marker, UINT16);
+ Address = VA_ARG (Marker, UINT64);
+ Data = VA_ARG (Marker, VOID *);
+ DataMask = VA_ARG (Marker, VOID *);
+ Delay = (UINT64)VA_ARG (Marker, UINT64);
+
return S3BootScriptSavePci2Poll (Width, Segment, Address, Data, DataMask, Delay);
}
@@ -515,25 +515,25 @@ BootScriptWritePciConfig2Poll ( Adds a record into S3 boot script table.
This function is used to store a boot script record into a given boot
- script table. If the table specified by TableName is nonexistent in the
- system, a new table will automatically be created and then the script record
- will be added into the new table. This function is responsible for allocating
+ script table. If the table specified by TableName is nonexistent in the
+ system, a new table will automatically be created and then the script record
+ will be added into the new table. This function is responsible for allocating
necessary memory for the script.
- This function has a variable parameter list. The exact parameter list depends on
- the OpCode that is passed into the function. If an unsupported OpCode or illegal
+ This function has a variable parameter list. The exact parameter list depends on
+ the OpCode that is passed into the function. If an unsupported OpCode or illegal
parameter list is passed in, this function returns EFI_INVALID_PARAMETER.
If there are not enough resources available for storing more scripts, this function returns
EFI_OUT_OF_RESOURCES.
@param This A pointer to the EFI_S3_SAVE_STATE_PROTOCOL instance.
@param OpCode The operation code (opcode) number.
- @param ... Argument list that is specific to each opcode.
-
+ @param ... Argument list that is specific to each opcode.
+
@retval EFI_SUCCESS The operation succeeded. A record was added into the
specified script table.
@retval EFI_INVALID_PARAMETER The parameter is illegal or the given boot script is not supported.
- If the opcode is unknow or not supported because of the PCD
+ If the opcode is unknow or not supported because of the PCD
Feature Flags.
@retval EFI_OUT_OF_RESOURCES There is insufficient memory to store the boot script.
@@ -547,7 +547,7 @@ BootScriptWrite ( )
{
EFI_STATUS Status;
- VA_LIST Marker;
+ VA_LIST Marker;
//
// Build script according to opcode
//
@@ -568,7 +568,7 @@ BootScriptWrite ( case EFI_BOOT_SCRIPT_MEM_WRITE_OPCODE:
VA_START (Marker, OpCode);
Status = BootScriptWriteMemWrite (Marker);
- VA_END (Marker);
+ VA_END (Marker);
break;
case EFI_BOOT_SCRIPT_MEM_READ_WRITE_OPCODE:
@@ -599,7 +599,7 @@ BootScriptWrite ( VA_START (Marker, OpCode);
Status = BootScriptWriteStall (Marker);
VA_END (Marker);
-
+
break;
case EFI_BOOT_SCRIPT_DISPATCH_OPCODE:
@@ -638,23 +638,23 @@ BootScriptWrite ( VA_END (Marker);
break;
- case EFI_BOOT_SCRIPT_IO_POLL_OPCODE:
+ case EFI_BOOT_SCRIPT_IO_POLL_OPCODE:
VA_START (Marker, OpCode);
Status = BootScriptWriteIoPoll (Marker);
VA_END (Marker);
- break;
-
- case EFI_BOOT_SCRIPT_PCI_CONFIG_POLL_OPCODE:
+ break;
+
+ case EFI_BOOT_SCRIPT_PCI_CONFIG_POLL_OPCODE:
VA_START (Marker, OpCode);
Status = BootScriptWritePciConfigPoll (Marker);
VA_END (Marker);
- break;
-
+ break;
+
case EFI_BOOT_SCRIPT_PCI_CONFIG2_POLL_OPCODE:
VA_START (Marker, OpCode);
Status = BootScriptWritePciConfig2Poll (Marker);
VA_END (Marker);
- break;
+ break;
default:
Status = EFI_INVALID_PARAMETER;
@@ -683,7 +683,7 @@ BootScriptWrite ( inserted, either before or after, depending on BeforeOrAfter. On exit, specifies
the position of the inserted opcode in the boot script table.
@param OpCode The operation code (opcode) number.
- @param ... Argument list that is specific to each opcode.
+ @param ... Argument list that is specific to each opcode.
@retval EFI_SUCCESS The operation succeeded. A record was added into the
specified script table.
@@ -702,7 +702,7 @@ BootScriptInsert ( )
{
EFI_STATUS Status;
- VA_LIST Marker;
+ VA_LIST Marker;
//
// Build script according to opcode
//
@@ -723,7 +723,7 @@ BootScriptInsert ( case EFI_BOOT_SCRIPT_MEM_WRITE_OPCODE:
VA_START (Marker, OpCode);
Status = BootScriptWriteMemWrite (Marker);
- VA_END (Marker);
+ VA_END (Marker);
break;
case EFI_BOOT_SCRIPT_MEM_READ_WRITE_OPCODE:
@@ -754,7 +754,7 @@ BootScriptInsert ( VA_START (Marker, OpCode);
Status = BootScriptWriteStall (Marker);
VA_END (Marker);
-
+
break;
case EFI_BOOT_SCRIPT_DISPATCH_OPCODE:
@@ -792,30 +792,30 @@ BootScriptInsert ( Status = BootScriptWritePciCfg2ReadWrite (Marker);
VA_END (Marker);
break;
-
- case EFI_BOOT_SCRIPT_IO_POLL_OPCODE:
+
+ case EFI_BOOT_SCRIPT_IO_POLL_OPCODE:
VA_START (Marker, OpCode);
Status = BootScriptWriteIoPoll (Marker);
VA_END (Marker);
- break;
-
- case EFI_BOOT_SCRIPT_PCI_CONFIG_POLL_OPCODE:
+ break;
+
+ case EFI_BOOT_SCRIPT_PCI_CONFIG_POLL_OPCODE:
VA_START (Marker, OpCode);
Status = BootScriptWritePciConfigPoll (Marker);
VA_END (Marker);
- break;
-
+ break;
+
case EFI_BOOT_SCRIPT_PCI_CONFIG2_POLL_OPCODE:
VA_START (Marker, OpCode);
Status = BootScriptWritePciConfig2Poll (Marker);
VA_END (Marker);
- break;
+ break;
default:
Status = EFI_INVALID_PARAMETER;
break;
}
-
+
if (!EFI_ERROR (Status)) {
Status = S3BootScriptMoveLastOpcode (BeforeOrAfter, Position);
}
@@ -846,7 +846,7 @@ BootScriptInsert ( @retval EFI_SUCCESS The label already exists or was inserted.
@retval EFI_INVALID_PARAMETER The Label is NULL or points to an empty string.
@retval EFI_INVALID_PARAMETER The Position is not a valid position in the boot script table.
-
+
**/
EFI_STATUS
EFIAPI
@@ -858,27 +858,27 @@ BootScriptLabel ( IN CONST CHAR8 *Label
)
{
- return S3BootScriptLabel (BeforeOrAfter, CreateIfNotFound, Position, Label);
+ return S3BootScriptLabel (BeforeOrAfter, CreateIfNotFound, Position, Label);
}
/**
Compare two positions in the boot script table and return their relative position.
-
+
This function compares two positions in the boot script table and returns their relative positions. If
Position1 is before Position2, then -1 is returned. If Position1 is equal to Position2,
then 0 is returned. If Position1 is after Position2, then 1 is returned.
-
+
@param This A pointer to the EFI_S3_SAVE_STATE_PROTOCOL instance.
@param Position1 The positions in the boot script table to compare
@param Position2 The positions in the boot script table to compare
@param RelativePosition On return, points to the result of the comparison
- @retval EFI_SUCCESS The operation succeeded.
+ @retval EFI_SUCCESS The operation succeeded.
@retval EFI_INVALID_PARAMETER The Position1 or Position2 is not a valid position in the boot script table.
@retval EFI_INVALID_PARAMETER The RelativePosition is NULL.
**/
EFI_STATUS
-EFIAPI
+EFIAPI
BootScriptCompare (
IN CONST EFI_S3_SAVE_STATE_PROTOCOL *This,
IN EFI_S3_BOOT_SCRIPT_POSITION Position1,
@@ -886,7 +886,7 @@ BootScriptCompare ( OUT UINTN *RelativePosition
)
{
- return S3BootScriptCompare (Position1, Position2, RelativePosition);
+ return S3BootScriptCompare (Position1, Position2, RelativePosition);
}
/**
This routine is entry point of ScriptSave driver.
diff --git a/MdeModulePkg/Universal/Acpi/S3SaveStateDxe/S3SaveStateDxe.inf b/MdeModulePkg/Universal/Acpi/S3SaveStateDxe/S3SaveStateDxe.inf index 05e98f4..a418421 100644 --- a/MdeModulePkg/Universal/Acpi/S3SaveStateDxe/S3SaveStateDxe.inf +++ b/MdeModulePkg/Universal/Acpi/S3SaveStateDxe/S3SaveStateDxe.inf @@ -3,7 +3,7 @@ #
# It will install S3 Save State protocol to store or record various IO operations to be replayed during an S3 resume.
#
-# Copyright (c) 2009 - 2016, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2009 - 2018, Intel Corporation. All rights reserved.<BR>
#
# This program and the accompanying materials are
# licensed and made available under the terms and conditions of the BSD License
@@ -74,4 +74,4 @@ TRUE
[UserExtensions.TianoCore."ExtraFiles"]
- S3SaveStateDxeExtra.uni
\ No newline at end of file + S3SaveStateDxeExtra.uni
diff --git a/MdeModulePkg/Universal/Acpi/S3SaveStateDxe/S3SaveStateDxe.uni b/MdeModulePkg/Universal/Acpi/S3SaveStateDxe/S3SaveStateDxe.uni index 312803e..579cce2 100644 --- a/MdeModulePkg/Universal/Acpi/S3SaveStateDxe/S3SaveStateDxe.uni +++ b/MdeModulePkg/Universal/Acpi/S3SaveStateDxe/S3SaveStateDxe.uni @@ -3,13 +3,13 @@ //
// It will install S3 Save State protocol to store or record various IO operations to be replayed during an S3 resume.
//
-// Copyright (c) 2009 - 2014, Intel Corporation. All rights reserved.<BR>
+// Copyright (c) 2009 - 2018, Intel Corporation. All rights reserved.<BR>
//
// 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,
// WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
//
diff --git a/MdeModulePkg/Universal/Acpi/S3SaveStateDxe/S3SaveStateDxeExtra.uni b/MdeModulePkg/Universal/Acpi/S3SaveStateDxe/S3SaveStateDxeExtra.uni index c648ff8..20728e1 100644 --- a/MdeModulePkg/Universal/Acpi/S3SaveStateDxe/S3SaveStateDxeExtra.uni +++ b/MdeModulePkg/Universal/Acpi/S3SaveStateDxe/S3SaveStateDxeExtra.uni @@ -1,7 +1,7 @@ // /** @file
// S3SaveStateDxe Localized Strings and Content
//
-// Copyright (c) 2013 - 2014, Intel Corporation. All rights reserved.<BR>
+// Copyright (c) 2013 - 2018, Intel Corporation. All rights reserved.<BR>
//
// This program and the accompanying materials are
// licensed and made available under the terms and conditions of the BSD License
@@ -13,8 +13,8 @@ //
// **/
-#string STR_PROPERTIES_MODULE_NAME
-#language en-US
+#string STR_PROPERTIES_MODULE_NAME
+#language en-US
"S3 Save State DXE Driver"
diff --git a/MdeModulePkg/Universal/Acpi/SmmS3SaveState/InternalSmmSaveState.h b/MdeModulePkg/Universal/Acpi/SmmS3SaveState/InternalSmmSaveState.h index d6263fd..51cf9db 100644 --- a/MdeModulePkg/Universal/Acpi/SmmS3SaveState/InternalSmmSaveState.h +++ b/MdeModulePkg/Universal/Acpi/SmmS3SaveState/InternalSmmSaveState.h @@ -1,7 +1,7 @@ /** @file
Internal header file for SMM S3 Boot Script Saver state driver.
- Copyright (c) 2006 - 2010, Intel Corporation. All rights reserved.<BR>
+ Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>
This program and the accompanying materials
are licensed and made available under the terms and conditions
@@ -31,25 +31,25 @@ Adds a record into S3 boot script table.
This function is used to store a boot script record into a given boot
- script table. If the table specified by TableName is nonexistent in the
- system, a new table will automatically be created and then the script record
- will be added into the new table. This function is responsible for allocating
+ script table. If the table specified by TableName is nonexistent in the
+ system, a new table will automatically be created and then the script record
+ will be added into the new table. This function is responsible for allocating
necessary memory for the script.
- This function has a variable parameter list. The exact parameter list depends on
- the OpCode that is passed into the function. If an unsupported OpCode or illegal
+ This function has a variable parameter list. The exact parameter list depends on
+ the OpCode that is passed into the function. If an unsupported OpCode or illegal
parameter list is passed in, this function returns EFI_INVALID_PARAMETER.
If there are not enough resources available for storing more scripts, this function returns
EFI_OUT_OF_RESOURCES.
@param This A pointer to the EFI_S3_SAVE_STATE_PROTOCOL instance.
@param OpCode The operation code (opcode) number.
- @param ... Argument list that is specific to each opcode.
+ @param ... Argument list that is specific to each opcode.
@retval EFI_SUCCESS The operation succeeded. A record was added into the
specified script table.
@retval EFI_INVALID_PARAMETER The parameter is illegal or the given boot script is not supported.
- If the opcode is unknow or not supported because of the PCD
+ If the opcode is unknow or not supported because of the PCD
Feature Flags.
@retval EFI_OUT_OF_RESOURCES There is insufficient memory to store the boot script.
@@ -81,7 +81,7 @@ BootScriptWrite ( inserted, either before or after, depending on BeforeOrAfter. On exit, specifies
the position of the inserted opcode in the boot script table.
@param OpCode The operation code (opcode) number.
- @param ... Argument list that is specific to each opcode.
+ @param ... Argument list that is specific to each opcode.
@retval EFI_SUCCESS The operation succeeded. A record was added into the
specified script table.
@@ -122,7 +122,7 @@ BootScriptInsert ( @retval EFI_SUCCESS The label already exists or was inserted.
@retval EFI_INVALID_PARAMETER The Opcode is an invalid opcode value or the Position is not a valid position in the boot script table..
-
+
**/
EFI_STATUS
EFIAPI
@@ -135,27 +135,27 @@ BootScriptLabel ( );
/**
Compare two positions in the boot script table and return their relative position.
-
+
This function compares two positions in the boot script table and returns their relative positions. If
Position1 is before Position2, then -1 is returned. If Position1 is equal to Position2,
then 0 is returned. If Position1 is after Position2, then 1 is returned.
-
+
@param This A pointer to the EFI_S3_SAVE_STATE_PROTOCOL instance.
@param Position1 The positions in the boot script table to compare
@param Position2 The positions in the boot script table to compare
@param RelativePosition On return, points to the result of the comparison
- @retval EFI_SUCCESS The operation succeeded.
+ @retval EFI_SUCCESS The operation succeeded.
@retval EFI_INVALID_PARAMETER The Position1 or Position2 is not a valid position in the boot script table.
**/
EFI_STATUS
-EFIAPI
+EFIAPI
BootScriptCompare (
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
);
-
+
#endif //_INTERNAL_SMM_S3_SAVE_STATE_H_
diff --git a/MdeModulePkg/Universal/Acpi/SmmS3SaveState/SmmS3SaveState.c b/MdeModulePkg/Universal/Acpi/SmmS3SaveState/SmmS3SaveState.c index f397db3..c1d29b5 100644 --- a/MdeModulePkg/Universal/Acpi/SmmS3SaveState/SmmS3SaveState.c +++ b/MdeModulePkg/Universal/Acpi/SmmS3SaveState/SmmS3SaveState.c @@ -1,7 +1,7 @@ /** @file
Implementation for S3 SMM Boot Script Saver state driver.
- Copyright (c) 2010 - 2017, Intel Corporation. All rights reserved.<BR>
+ Copyright (c) 2010 - 2018, Intel Corporation. All rights reserved.<BR>
This program and the accompanying materials
are licensed and made available under the terms and conditions
@@ -45,7 +45,7 @@ BootScriptWriteIoWrite ( Address = VA_ARG (Marker, UINT64);
Count = VA_ARG (Marker, UINTN);
Buffer = VA_ARG (Marker, UINT8 *);
-
+
return S3BootScriptSaveIoWrite (Width, Address, Count, Buffer);
}
/**
@@ -67,12 +67,12 @@ BootScriptWriteIoReadWrite ( UINT64 Address;
UINT8 *Data;
UINT8 *DataMask;
-
+
Width = VA_ARG (Marker, S3_BOOT_SCRIPT_LIB_WIDTH);
Address = VA_ARG (Marker, UINT64);
Data = VA_ARG (Marker, UINT8 *);
DataMask = VA_ARG (Marker, UINT8 *);
-
+
return S3BootScriptSaveIoReadWrite (Width, Address, Data, DataMask);
}
@@ -95,7 +95,7 @@ BootScriptWriteMemWrite ( UINT64 Address;
UINTN Count;
UINT8 *Buffer;
-
+
Width = VA_ARG (Marker, S3_BOOT_SCRIPT_LIB_WIDTH);
Address = VA_ARG (Marker, UINT64);
Count = VA_ARG (Marker, UINTN);
@@ -123,7 +123,7 @@ BootScriptWriteMemReadWrite ( UINT64 Address;
UINT8 *Data;
UINT8 *DataMask;
-
+
Width = VA_ARG (Marker, S3_BOOT_SCRIPT_LIB_WIDTH);
Address = VA_ARG (Marker, UINT64);
Data = VA_ARG (Marker, UINT8 *);
@@ -237,13 +237,13 @@ BootScriptWritePciCfg2ReadWrite ( UINT64 Address;
UINT8 *Data;
UINT8 *DataMask;
-
+
Width = VA_ARG (Marker, S3_BOOT_SCRIPT_LIB_WIDTH);
Segment = VA_ARG (Marker, UINT16);
Address = VA_ARG (Marker, UINT64);
Data = VA_ARG (Marker, UINT8 *);
DataMask = VA_ARG (Marker, UINT8 *);
-
+
return S3BootScriptSavePciCfg2ReadWrite (Width, Segment, Address, Data, DataMask);
}
/**
@@ -268,15 +268,15 @@ BootScriptWriteSmbusExecute ( VOID *Buffer;
UINTN *DataSize;
UINTN SmBusAddress;
-
+
SlaveAddress.SmbusDeviceAddress = VA_ARG (Marker, UINTN);
Command = VA_ARG (Marker, EFI_SMBUS_DEVICE_COMMAND);
Operation = VA_ARG (Marker, EFI_SMBUS_OPERATION);
PecCheck = VA_ARG (Marker, BOOLEAN);
SmBusAddress = SMBUS_LIB_ADDRESS (SlaveAddress.SmbusDeviceAddress,Command,0,PecCheck);
- DataSize = VA_ARG (Marker, UINTN *);
+ DataSize = VA_ARG (Marker, UINTN *);
Buffer = VA_ARG (Marker, VOID *);
-
+
return S3BootScriptSaveSmbusExecute (SmBusAddress, Operation, DataSize, Buffer);
}
/**
@@ -302,7 +302,7 @@ BootScriptWriteStall ( }
/**
- Internal function to add Save jmp address according to DISPATCH_OPCODE.
+ Internal function to add Save jmp address according to DISPATCH_OPCODE.
We ignore "Context" parameter
@param Marker The variable argument list to get the opcode
@@ -324,8 +324,8 @@ BootScriptWriteDispatch ( }
/**
- Internal function to add memory pool operation to the table.
-
+ Internal function to add memory pool operation to the table.
+
@param Marker The variable argument list to get the opcode
and associated attributes.
@@ -338,18 +338,18 @@ BootScriptWriteMemPoll ( IN VA_LIST Marker
)
{
- S3_BOOT_SCRIPT_LIB_WIDTH Width;
- UINT64 Address;
- VOID *Data;
- VOID *DataMask;
+ S3_BOOT_SCRIPT_LIB_WIDTH Width;
+ UINT64 Address;
+ VOID *Data;
+ VOID *DataMask;
UINT64 Delay;
UINT64 LoopTimes;
UINT32 Remainder;
- Width = VA_ARG (Marker, S3_BOOT_SCRIPT_LIB_WIDTH);
- Address = VA_ARG (Marker, UINT64);
- Data = VA_ARG (Marker, VOID *);
- DataMask = VA_ARG (Marker, VOID *);
+ Width = VA_ARG (Marker, S3_BOOT_SCRIPT_LIB_WIDTH);
+ Address = VA_ARG (Marker, UINT64);
+ Data = VA_ARG (Marker, VOID *);
+ DataMask = VA_ARG (Marker, VOID *);
Delay = VA_ARG (Marker, UINT64);
//
// According to the spec, the interval between 2 polls is 100ns,
@@ -369,12 +369,12 @@ BootScriptWriteMemPoll ( //
LoopTimes +=1;
}
- return S3BootScriptSaveMemPoll (Width, Address, DataMask, Data, 1, LoopTimes);
+ return S3BootScriptSaveMemPoll (Width, Address, DataMask, Data, 1, LoopTimes);
}
/**
- Internal function to add Save jmp address according to DISPATCH_OPCODE2.
+ Internal function to add Save jmp address according to DISPATCH_OPCODE2.
The "Context" parameter is not ignored.
@param Marker The variable argument list to get the opcode
@@ -390,7 +390,7 @@ BootScriptWriteDispatch2 ( )
{
VOID *EntryPoint;
- VOID *Context;
+ VOID *Context;
EntryPoint = (VOID*)(UINTN)VA_ARG (Marker, EFI_PHYSICAL_ADDRESS);
Context = (VOID*)(UINTN)VA_ARG (Marker, EFI_PHYSICAL_ADDRESS);
@@ -413,7 +413,7 @@ BootScriptWriteInformation ( )
{
UINT32 InformationLength;
- EFI_PHYSICAL_ADDRESS Information;
+ EFI_PHYSICAL_ADDRESS Information;
InformationLength = VA_ARG (Marker, UINT32);
Information = VA_ARG (Marker, EFI_PHYSICAL_ADDRESS);
@@ -433,18 +433,18 @@ BootScriptWriteIoPoll ( IN VA_LIST Marker
)
{
- S3_BOOT_SCRIPT_LIB_WIDTH Width;
- UINT64 Address;
- VOID *Data;
- VOID *DataMask;
- UINT64 Delay;
-
- Width = VA_ARG (Marker, S3_BOOT_SCRIPT_LIB_WIDTH);
- Address = VA_ARG (Marker, UINT64);
- Data = VA_ARG (Marker, VOID *);
- DataMask = VA_ARG (Marker, VOID *);
- Delay = (UINT64)VA_ARG (Marker, UINT64);
-
+ S3_BOOT_SCRIPT_LIB_WIDTH Width;
+ UINT64 Address;
+ VOID *Data;
+ VOID *DataMask;
+ UINT64 Delay;
+
+ Width = VA_ARG (Marker, S3_BOOT_SCRIPT_LIB_WIDTH);
+ Address = VA_ARG (Marker, UINT64);
+ Data = VA_ARG (Marker, VOID *);
+ DataMask = VA_ARG (Marker, VOID *);
+ Delay = (UINT64)VA_ARG (Marker, UINT64);
+
return S3BootScriptSaveIoPoll (Width, Address, Data, DataMask, Delay);
}
/**
@@ -468,13 +468,13 @@ BootScriptWritePciConfigPoll ( VOID *DataMask;
UINT64 Delay;
-
- Width = VA_ARG (Marker, S3_BOOT_SCRIPT_LIB_WIDTH);
- Address = VA_ARG (Marker, UINT64);
- Data = VA_ARG (Marker, VOID *);
- DataMask = VA_ARG (Marker, VOID *);
- Delay = (UINT64)VA_ARG (Marker, UINT64);
-
+
+ Width = VA_ARG (Marker, S3_BOOT_SCRIPT_LIB_WIDTH);
+ Address = VA_ARG (Marker, UINT64);
+ Data = VA_ARG (Marker, VOID *);
+ DataMask = VA_ARG (Marker, VOID *);
+ Delay = (UINT64)VA_ARG (Marker, UINT64);
+
return S3BootScriptSavePciPoll (Width, Address, Data, DataMask, Delay);
}
/**
@@ -498,14 +498,14 @@ BootScriptWritePciConfig2Poll ( VOID *Data;
VOID *DataMask;
UINT64 Delay;
-
- Width = VA_ARG (Marker, S3_BOOT_SCRIPT_LIB_WIDTH);
- Segment = VA_ARG (Marker, UINT16);
- Address = VA_ARG (Marker, UINT64);
- Data = VA_ARG (Marker, VOID *);
- DataMask = VA_ARG (Marker, VOID *);
- Delay = (UINT64)VA_ARG (Marker, UINT64);
-
+
+ Width = VA_ARG (Marker, S3_BOOT_SCRIPT_LIB_WIDTH);
+ Segment = VA_ARG (Marker, UINT16);
+ Address = VA_ARG (Marker, UINT64);
+ Data = VA_ARG (Marker, VOID *);
+ DataMask = VA_ARG (Marker, VOID *);
+ Delay = (UINT64)VA_ARG (Marker, UINT64);
+
return S3BootScriptSavePci2Poll (Width, Segment, Address, Data, DataMask, Delay);
}
@@ -513,25 +513,25 @@ BootScriptWritePciConfig2Poll ( Adds a record into S3 boot script table.
This function is used to store a boot script record into a given boot
- script table. If the table specified by TableName is nonexistent in the
- system, a new table will automatically be created and then the script record
- will be added into the new table. This function is responsible for allocating
+ script table. If the table specified by TableName is nonexistent in the
+ system, a new table will automatically be created and then the script record
+ will be added into the new table. This function is responsible for allocating
necessary memory for the script.
- This function has a variable parameter list. The exact parameter list depends on
- the OpCode that is passed into the function. If an unsupported OpCode or illegal
+ This function has a variable parameter list. The exact parameter list depends on
+ the OpCode that is passed into the function. If an unsupported OpCode or illegal
parameter list is passed in, this function returns EFI_INVALID_PARAMETER.
If there are not enough resources available for storing more scripts, this function returns
EFI_OUT_OF_RESOURCES.
@param This A pointer to the EFI_S3_SAVE_STATE_PROTOCOL instance.
@param OpCode The operation code (opcode) number.
- @param ... Argument list that is specific to each opcode.
-
+ @param ... Argument list that is specific to each opcode.
+
@retval EFI_SUCCESS The operation succeeded. A record was added into the
specified script table.
@retval EFI_INVALID_PARAMETER The parameter is illegal or the given boot script is not supported.
- If the opcode is unknow or not supported because of the PCD
+ If the opcode is unknow or not supported because of the PCD
Feature Flags.
@retval EFI_OUT_OF_RESOURCES There is insufficient memory to store the boot script.
@@ -545,7 +545,7 @@ BootScriptWrite ( )
{
EFI_STATUS Status;
- VA_LIST Marker;
+ VA_LIST Marker;
//
// Build script according to opcode
//
@@ -566,7 +566,7 @@ BootScriptWrite ( case EFI_BOOT_SCRIPT_MEM_WRITE_OPCODE:
VA_START (Marker, OpCode);
Status = BootScriptWriteMemWrite (Marker);
- VA_END (Marker);
+ VA_END (Marker);
break;
case EFI_BOOT_SCRIPT_MEM_READ_WRITE_OPCODE:
@@ -597,7 +597,7 @@ BootScriptWrite ( VA_START (Marker, OpCode);
Status = BootScriptWriteStall (Marker);
VA_END (Marker);
-
+
break;
case EFI_BOOT_SCRIPT_DISPATCH_OPCODE:
@@ -636,23 +636,23 @@ BootScriptWrite ( VA_END (Marker);
break;
- case EFI_BOOT_SCRIPT_IO_POLL_OPCODE:
+ case EFI_BOOT_SCRIPT_IO_POLL_OPCODE:
VA_START (Marker, OpCode);
Status = BootScriptWriteIoPoll (Marker);
VA_END (Marker);
- break;
-
- case EFI_BOOT_SCRIPT_PCI_CONFIG_POLL_OPCODE:
+ break;
+
+ case EFI_BOOT_SCRIPT_PCI_CONFIG_POLL_OPCODE:
VA_START (Marker, OpCode);
Status = BootScriptWritePciConfigPoll (Marker);
VA_END (Marker);
- break;
-
+ break;
+
case EFI_BOOT_SCRIPT_PCI_CONFIG2_POLL_OPCODE:
VA_START (Marker, OpCode);
Status = BootScriptWritePciConfig2Poll (Marker);
VA_END (Marker);
- break;
+ break;
default:
Status = EFI_INVALID_PARAMETER;
@@ -681,7 +681,7 @@ BootScriptWrite ( inserted, either before or after, depending on BeforeOrAfter. On exit, specifies
the position of the inserted opcode in the boot script table.
@param OpCode The operation code (opcode) number.
- @param ... Argument list that is specific to each opcode.
+ @param ... Argument list that is specific to each opcode.
@retval EFI_SUCCESS The operation succeeded. A record was added into the
specified script table.
@@ -700,7 +700,7 @@ BootScriptInsert ( )
{
EFI_STATUS Status;
- VA_LIST Marker;
+ VA_LIST Marker;
//
// Build script according to opcode
//
@@ -721,7 +721,7 @@ BootScriptInsert ( case EFI_BOOT_SCRIPT_MEM_WRITE_OPCODE:
VA_START (Marker, OpCode);
Status = BootScriptWriteMemWrite (Marker);
- VA_END (Marker);
+ VA_END (Marker);
break;
case EFI_BOOT_SCRIPT_MEM_READ_WRITE_OPCODE:
@@ -752,7 +752,7 @@ BootScriptInsert ( VA_START (Marker, OpCode);
Status = BootScriptWriteStall (Marker);
VA_END (Marker);
-
+
break;
case EFI_BOOT_SCRIPT_DISPATCH_OPCODE:
@@ -790,30 +790,30 @@ BootScriptInsert ( Status = BootScriptWritePciCfg2ReadWrite (Marker);
VA_END (Marker);
break;
-
- case EFI_BOOT_SCRIPT_IO_POLL_OPCODE:
+
+ case EFI_BOOT_SCRIPT_IO_POLL_OPCODE:
VA_START (Marker, OpCode);
Status = BootScriptWriteIoPoll (Marker);
VA_END (Marker);
- break;
-
- case EFI_BOOT_SCRIPT_PCI_CONFIG_POLL_OPCODE:
+ break;
+
+ case EFI_BOOT_SCRIPT_PCI_CONFIG_POLL_OPCODE:
VA_START (Marker, OpCode);
Status = BootScriptWritePciConfigPoll (Marker);
VA_END (Marker);
- break;
-
+ break;
+
case EFI_BOOT_SCRIPT_PCI_CONFIG2_POLL_OPCODE:
VA_START (Marker, OpCode);
Status = BootScriptWritePciConfig2Poll (Marker);
VA_END (Marker);
- break;
+ break;
default:
Status = EFI_INVALID_PARAMETER;
break;
}
-
+
if (!EFI_ERROR (Status)) {
Status = S3BootScriptMoveLastOpcode (BeforeOrAfter, Position);
}
@@ -844,7 +844,7 @@ BootScriptInsert ( @retval EFI_SUCCESS The label already exists or was inserted.
@retval EFI_INVALID_PARAMETER The Label is NULL or points to an empty string.
@retval EFI_INVALID_PARAMETER The Position is not a valid position in the boot script table.
-
+
**/
EFI_STATUS
EFIAPI
@@ -856,27 +856,27 @@ BootScriptLabel ( IN CONST CHAR8 *Label
)
{
- return S3BootScriptLabel (BeforeOrAfter, CreateIfNotFound, Position, Label);
+ return S3BootScriptLabel (BeforeOrAfter, CreateIfNotFound, Position, Label);
}
/**
Compare two positions in the boot script table and return their relative position.
-
+
This function compares two positions in the boot script table and returns their relative positions. If
Position1 is before Position2, then -1 is returned. If Position1 is equal to Position2,
then 0 is returned. If Position1 is after Position2, then 1 is returned.
-
+
@param This A pointer to the EFI_S3_SAVE_STATE_PROTOCOL instance.
@param Position1 The positions in the boot script table to compare
@param Position2 The positions in the boot script table to compare
@param RelativePosition On return, points to the result of the comparison
- @retval EFI_SUCCESS The operation succeeded.
+ @retval EFI_SUCCESS The operation succeeded.
@retval EFI_INVALID_PARAMETER The Position1 or Position2 is not a valid position in the boot script table.
@retval EFI_INVALID_PARAMETER The RelativePosition is NULL.
**/
EFI_STATUS
-EFIAPI
+EFIAPI
BootScriptCompare (
IN CONST EFI_S3_SAVE_STATE_PROTOCOL *This,
IN EFI_S3_BOOT_SCRIPT_POSITION Position1,
@@ -884,7 +884,7 @@ BootScriptCompare ( OUT UINTN *RelativePosition
)
{
- return S3BootScriptCompare (Position1, Position2, RelativePosition);
+ return S3BootScriptCompare (Position1, Position2, RelativePosition);
}
/**
This routine is entry point of ScriptSave driver.
diff --git a/MdeModulePkg/Universal/Acpi/SmmS3SaveState/SmmS3SaveState.inf b/MdeModulePkg/Universal/Acpi/SmmS3SaveState/SmmS3SaveState.inf index f1f264e..0742da6 100644 --- a/MdeModulePkg/Universal/Acpi/SmmS3SaveState/SmmS3SaveState.inf +++ b/MdeModulePkg/Universal/Acpi/SmmS3SaveState/SmmS3SaveState.inf @@ -3,7 +3,7 @@ #
# It will install S3 SMM Save State protocol to store or record various IO operations to be replayed during an S3 resume.
#
-# Copyright (c) 2009 - 2016, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2009 - 2018, Intel Corporation. All rights reserved.<BR>
#
# This program and the accompanying materials are
# licensed and made available under the terms and conditions of the BSD License
@@ -23,7 +23,7 @@ MODULE_TYPE = DXE_SMM_DRIVER
VERSION_STRING = 1.0
PI_SPECIFICATION_VERSION = 0x0001000A
-
+
ENTRY_POINT = InitializeSmmS3SaveState
#
diff --git a/MdeModulePkg/Universal/Acpi/SmmS3SaveState/SmmS3SaveState.uni b/MdeModulePkg/Universal/Acpi/SmmS3SaveState/SmmS3SaveState.uni index 6fbf297..9d8431e 100644 --- a/MdeModulePkg/Universal/Acpi/SmmS3SaveState/SmmS3SaveState.uni +++ b/MdeModulePkg/Universal/Acpi/SmmS3SaveState/SmmS3SaveState.uni @@ -3,13 +3,13 @@ //
// It will install S3 SMM Save State protocol to store or record various IO operations to be replayed during an S3 resume.
//
-// Copyright (c) 2009 - 2014, Intel Corporation. All rights reserved.<BR>
+// Copyright (c) 2009 - 2018, Intel Corporation. All rights reserved.<BR>
//
// 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,
// WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
//
diff --git a/MdeModulePkg/Universal/Acpi/SmmS3SaveState/SmmS3SaveStateExtra.uni b/MdeModulePkg/Universal/Acpi/SmmS3SaveState/SmmS3SaveStateExtra.uni index 531138b..676241c 100644 --- a/MdeModulePkg/Universal/Acpi/SmmS3SaveState/SmmS3SaveStateExtra.uni +++ b/MdeModulePkg/Universal/Acpi/SmmS3SaveState/SmmS3SaveStateExtra.uni @@ -1,7 +1,7 @@ // /** @file
// SmmS3SaveState Localized Strings and Content
//
-// Copyright (c) 2013 - 2014, Intel Corporation. All rights reserved.<BR>
+// Copyright (c) 2013 - 2018, Intel Corporation. All rights reserved.<BR>
//
// This program and the accompanying materials are
// licensed and made available under the terms and conditions of the BSD License
@@ -13,8 +13,8 @@ //
// **/
-#string STR_PROPERTIES_MODULE_NAME
-#language en-US
+#string STR_PROPERTIES_MODULE_NAME
+#language en-US
"SMM S3 Save State Driver"
diff --git a/MdeModulePkg/Universal/BdsDxe/Bds.h b/MdeModulePkg/Universal/BdsDxe/Bds.h index 63d961f..6c250dd 100644 --- a/MdeModulePkg/Universal/BdsDxe/Bds.h +++ b/MdeModulePkg/Universal/BdsDxe/Bds.h @@ -78,14 +78,14 @@ BdsEntry ( then EFI_INVALID_PARAMETER is returned.
@param VendorGuid A unique identifier for the vendor.
@param Attributes Attributes bitmask to set for the variable.
- @param DataSize The size in bytes of the Data buffer. Unless the EFI_VARIABLE_APPEND_WRITE,
+ @param DataSize The size in bytes of the Data buffer. Unless the EFI_VARIABLE_APPEND_WRITE,
or EFI_VARIABLE_TIME_BASED_AUTHENTICATED_WRITE_ACCESS attribute is set, a size of zero
- causes the variable to be deleted. When the EFI_VARIABLE_APPEND_WRITE attribute is
- set, then a SetVariable() call with a DataSize of zero will not cause any change to
- the variable value (the timestamp associated with the variable may be updated however
- even if no new data value is provided,see the description of the
- EFI_VARIABLE_AUTHENTICATION_2 descriptor below. In this case the DataSize will not
- be zero since the EFI_VARIABLE_AUTHENTICATION_2 descriptor will be populated).
+ causes the variable to be deleted. When the EFI_VARIABLE_APPEND_WRITE attribute is
+ set, then a SetVariable() call with a DataSize of zero will not cause any change to
+ the variable value (the timestamp associated with the variable may be updated however
+ even if no new data value is provided,see the description of the
+ EFI_VARIABLE_AUTHENTICATION_2 descriptor below. In this case the DataSize will not
+ be zero since the EFI_VARIABLE_AUTHENTICATION_2 descriptor will be populated).
@param Data The contents for the variable.
@retval EFI_SUCCESS The firmware has successfully stored the variable and its data as
diff --git a/MdeModulePkg/Universal/BdsDxe/BdsDxe.inf b/MdeModulePkg/Universal/BdsDxe/BdsDxe.inf index eb78d06..7e644aa 100644 --- a/MdeModulePkg/Universal/BdsDxe/BdsDxe.inf +++ b/MdeModulePkg/Universal/BdsDxe/BdsDxe.inf @@ -1,10 +1,10 @@ ## @file
# BdsDxe module is core driver for BDS phase.
#
-# When DxeCore dispatching all DXE driver, this module will produce architecture protocol
+# When DxeCore dispatching all DXE driver, this module will produce architecture protocol
# gEfiBdsArchProtocolGuid. After DxeCore finish dispatching, DxeCore will invoke Entry
# interface of protocol gEfiBdsArchProtocolGuid, then BDS phase is entered.
-#
+#
# Copyright (c) 2008 - 2018, Intel Corporation. All rights reserved.<BR>
# This program and the accompanying materials
# are licensed and made available under the terms and conditions of the BSD License
@@ -22,7 +22,7 @@ MODULE_UNI_FILE = BdsDxe.uni
FILE_GUID = 6D33944A-EC75-4855-A54D-809C75241F6C
MODULE_TYPE = DXE_DRIVER
- VERSION_STRING = 1.0
+ VERSION_STRING = 1.0
ENTRY_POINT = BdsInitialize
#
diff --git a/MdeModulePkg/Universal/BdsDxe/BdsDxe.uni b/MdeModulePkg/Universal/BdsDxe/BdsDxe.uni index 6f2758b..69b48f8 100644 --- a/MdeModulePkg/Universal/BdsDxe/BdsDxe.uni +++ b/MdeModulePkg/Universal/BdsDxe/BdsDxe.uni @@ -5,12 +5,12 @@ // gEfiBdsArchProtocolGuid. After DxeCore finish dispatching, DxeCore will invoke Entry
// interface of protocol gEfiBdsArchProtocolGuid, then BDS phase is entered.
//
-// Copyright (c) 2015, Intel Corporation. All rights reserved.<BR>
+// Copyright (c) 2015 - 2018, Intel Corporation. All rights reserved.<BR>
// 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,
// WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
//
diff --git a/MdeModulePkg/Universal/BdsDxe/BdsDxeExtra.uni b/MdeModulePkg/Universal/BdsDxe/BdsDxeExtra.uni index e3f1fe8..4201f46 100644 --- a/MdeModulePkg/Universal/BdsDxe/BdsDxeExtra.uni +++ b/MdeModulePkg/Universal/BdsDxe/BdsDxeExtra.uni @@ -1,7 +1,7 @@ // /** @file
// BdsDxe Localized Strings and Content
//
-// Copyright (c) 2015, Intel Corporation. All rights reserved.<BR>
+// Copyright (c) 2015 - 2018, Intel Corporation. All rights reserved.<BR>
//
// This program and the accompanying materials
// are licensed and made available under the terms and conditions of the BSD License
@@ -13,8 +13,8 @@ //
// **/
-#string STR_PROPERTIES_MODULE_NAME
-#language en-US
+#string STR_PROPERTIES_MODULE_NAME
+#language en-US
"Boot Device Selection Core DXE Driver"
diff --git a/MdeModulePkg/Universal/BdsDxe/BdsEntry.c b/MdeModulePkg/Universal/BdsDxe/BdsEntry.c index acb25ab..49e403e 100644 --- a/MdeModulePkg/Universal/BdsDxe/BdsEntry.c +++ b/MdeModulePkg/Universal/BdsDxe/BdsEntry.c @@ -293,9 +293,9 @@ BdsReadKeys ( }
while (gST->ConIn != NULL) {
-
+
Status = gST->ConIn->ReadKeyStroke (gST->ConIn, &Key);
-
+
if (EFI_ERROR (Status)) {
//
// No more keys.
@@ -488,10 +488,10 @@ ProcessLoadOptions ( /**
- Validate input console variable data.
+ Validate input console variable data.
If found the device path is not a valid device path, remove the variable.
-
+
@param VariableName Input console variable name.
**/
@@ -505,7 +505,7 @@ BdsFormalizeConsoleVariable ( EFI_STATUS Status;
GetEfiGlobalVariable2 (VariableName, (VOID **) &DevicePath, &VariableSize);
- if ((DevicePath != NULL) && !IsDevicePathValid (DevicePath, VariableSize)) {
+ if ((DevicePath != NULL) && !IsDevicePathValid (DevicePath, VariableSize)) {
Status = gRT->SetVariable (
VariableName,
&gEfiGlobalVariableGuid,
@@ -525,17 +525,17 @@ BdsFormalizeConsoleVariable ( }
/**
- Formalize OsIndication related variables.
-
- For OsIndicationsSupported, Create a BS/RT/UINT64 variable to report caps
+ Formalize OsIndication related variables.
+
+ For OsIndicationsSupported, Create a BS/RT/UINT64 variable to report caps
Delete OsIndications variable if it is not NV/BS/RT UINT64.
-
+
Item 3 is used to solve case when OS corrupts OsIndications. Here simply delete this NV variable.
Create a boot option for BootManagerMenu if it hasn't been created yet
**/
-VOID
+VOID
BdsFormalizeOSIndicationVariable (
VOID
)
@@ -613,10 +613,10 @@ BdsFormalizeOSIndicationVariable ( /**
- Validate variables.
+ Validate variables.
**/
-VOID
+VOID
BdsFormalizeEfiGlobalVariable (
VOID
)
@@ -884,7 +884,7 @@ BdsEntry ( // Possible things that can be done in PlatformBootManagerBeforeConsole:
// > Update console variable: 1. include hot-plug devices; 2. Clear ConIn and add SOL for AMT
// > Register new Driver#### or Boot####
- // > Register new Key####: e.g.: F12
+ // > Register new Key####: e.g.: F12
// > Signal ReadyToLock event
// > Authentication action: 1. connect Auth devices; 2. Identify auto logon user.
//
@@ -929,7 +929,7 @@ BdsEntry ( // > Connect certain devices
// > Dispatch aditional option roms
// > Special boot: e.g.: USB boot, enter UI
- //
+ //
PERF_INMODULE_BEGIN("PlatformBootManagerAfterConsole");
PlatformBootManagerAfterConsole ();
PERF_INMODULE_END("PlatformBootManagerAfterConsole");
@@ -981,7 +981,7 @@ BdsEntry ( PlatformRecovery = (BOOLEAN) ((OsIndication & EFI_OS_INDICATIONS_START_PLATFORM_RECOVERY) != 0);
//
// Clear EFI_OS_INDICATIONS_BOOT_TO_FW_UI to acknowledge OS
- //
+ //
if (BootFwUi || PlatformRecovery) {
OsIndication &= ~((UINT64) (EFI_OS_INDICATIONS_BOOT_TO_FW_UI | EFI_OS_INDICATIONS_START_PLATFORM_RECOVERY));
Status = gRT->SetVariable (
@@ -1059,7 +1059,7 @@ BdsEntry ( if (!EFI_ERROR (Status)) {
EfiBootManagerBoot (&LoadOption);
EfiBootManagerFreeLoadOption (&LoadOption);
- if ((LoadOption.Status == EFI_SUCCESS) &&
+ if ((LoadOption.Status == EFI_SUCCESS) &&
(BootManagerMenuStatus != EFI_NOT_FOUND) &&
(LoadOption.OptionNumber != BootManagerMenu.OptionNumber)) {
//
@@ -1107,14 +1107,14 @@ BdsEntry ( then EFI_INVALID_PARAMETER is returned.
@param VendorGuid A unique identifier for the vendor.
@param Attributes Attributes bitmask to set for the variable.
- @param DataSize The size in bytes of the Data buffer. Unless the EFI_VARIABLE_APPEND_WRITE,
+ @param DataSize The size in bytes of the Data buffer. Unless the EFI_VARIABLE_APPEND_WRITE,
or EFI_VARIABLE_TIME_BASED_AUTHENTICATED_WRITE_ACCESS attribute is set, a size of zero
- causes the variable to be deleted. When the EFI_VARIABLE_APPEND_WRITE attribute is
- set, then a SetVariable() call with a DataSize of zero will not cause any change to
- the variable value (the timestamp associated with the variable may be updated however
- even if no new data value is provided,see the description of the
- EFI_VARIABLE_AUTHENTICATION_2 descriptor below. In this case the DataSize will not
- be zero since the EFI_VARIABLE_AUTHENTICATION_2 descriptor will be populated).
+ causes the variable to be deleted. When the EFI_VARIABLE_APPEND_WRITE attribute is
+ set, then a SetVariable() call with a DataSize of zero will not cause any change to
+ the variable value (the timestamp associated with the variable may be updated however
+ even if no new data value is provided,see the description of the
+ EFI_VARIABLE_AUTHENTICATION_2 descriptor below. In this case the DataSize will not
+ be zero since the EFI_VARIABLE_AUTHENTICATION_2 descriptor will be populated).
@param Data The contents for the variable.
@retval EFI_SUCCESS The firmware has successfully stored the variable and its data as
diff --git a/MdeModulePkg/Universal/BdsDxe/HwErrRecSupport.c b/MdeModulePkg/Universal/BdsDxe/HwErrRecSupport.c index 87e39c3..94c72cf 100644 --- a/MdeModulePkg/Universal/BdsDxe/HwErrRecSupport.c +++ b/MdeModulePkg/Universal/BdsDxe/HwErrRecSupport.c @@ -2,7 +2,7 @@ Set the level of support for Hardware Error Record Persistence that is
implemented by the platform.
-Copyright (c) 2007 - 2015, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2007 - 2018, Intel Corporation. All rights reserved.<BR>
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
@@ -28,9 +28,9 @@ InitializeHwErrRecSupport ( {
EFI_STATUS Status;
UINT16 HardwareErrorRecordLevel;
-
+
HardwareErrorRecordLevel = PcdGet16 (PcdHardwareErrorRecordLevel);
-
+
if (HardwareErrorRecordLevel != 0) {
//
// If level value equal 0, no need set to 0 to variable area because UEFI specification
diff --git a/MdeModulePkg/Universal/BdsDxe/Language.c b/MdeModulePkg/Universal/BdsDxe/Language.c index 0912731..3e6022f 100644 --- a/MdeModulePkg/Universal/BdsDxe/Language.c +++ b/MdeModulePkg/Universal/BdsDxe/Language.c @@ -1,7 +1,7 @@ /** @file
Language settings
-Copyright (c) 2004 - 2015, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2004 - 2018, Intel Corporation. All rights reserved.<BR>
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
@@ -47,7 +47,7 @@ IsLangInSupportedLangCodes( IN CHAR8 *SupportedLang,
IN CHAR8 *Lang,
IN BOOLEAN Iso639Language
- )
+ )
{
UINTN Index;
UINTN CompareLength;
@@ -79,8 +79,8 @@ IsLangInSupportedLangCodes( // Determine the length of the next language code in SupportedLang
//
for (CompareLength = 0; SupportedLang[CompareLength] != '\0' && SupportedLang[CompareLength] != ';'; CompareLength++);
-
- if ((CompareLength == LanguageLength) &&
+
+ if ((CompareLength == LanguageLength) &&
(AsciiStrnCmp (Lang, SupportedLang, CompareLength) == 0)) {
//
// Successfully find the Lang string in SupportedLang string.
@@ -108,7 +108,7 @@ VOID InitializeLangVariable (
IN CHAR16 *LangName,
IN CHAR8 *SupportedLang,
- IN CHAR8 *DefaultLang,
+ IN CHAR8 *DefaultLang,
IN BOOLEAN Iso639Language
)
{
diff --git a/MdeModulePkg/Universal/BootManagerPolicyDxe/BootManagerPolicyDxe.c b/MdeModulePkg/Universal/BootManagerPolicyDxe/BootManagerPolicyDxe.c index 412ecbd..a044eaf 100644 --- a/MdeModulePkg/Universal/BootManagerPolicyDxe/BootManagerPolicyDxe.c +++ b/MdeModulePkg/Universal/BootManagerPolicyDxe/BootManagerPolicyDxe.c @@ -1,7 +1,7 @@ /** @file
This module produces Boot Manager Policy protocol.
-Copyright (c) 2015, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2015 - 2018, Intel Corporation. All rights reserved.<BR>
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
@@ -139,7 +139,7 @@ ConnectNetwork ( system will be connected using the platforms EFI Boot
Manager policy.
@param[in] Recursive If TRUE, then ConnectController() is called recursively
- until the entire tree of controllers below the
+ until the entire tree of controllers below the
controller specified by DevicePath have been created.
If FALSE, then the tree of controllers is only expanded
one level. If DevicePath is NULL then Recursive is ignored.
@@ -147,7 +147,7 @@ ConnectNetwork ( @retval EFI_SUCCESS The DevicePath was connected.
@retval EFI_NOT_FOUND The DevicePath was not found.
@retval EFI_NOT_FOUND No driver was connected to DevicePath.
- @retval EFI_SECURITY_VIOLATION The user has no permission to start UEFI device
+ @retval EFI_SECURITY_VIOLATION The user has no permission to start UEFI device
drivers on the DevicePath.
@retval EFI_UNSUPPORTED The current TPL is not TPL_APPLICATION.
**/
@@ -188,7 +188,7 @@ BootManagerPolicyConnectDevicePath ( Manager connect a class of devices.
If Class is EFI_BOOT_MANAGER_POLICY_CONSOLE_GUID then the Boot Manager will
- use platform policy to connect consoles. Some platforms may restrict the
+ use platform policy to connect consoles. Some platforms may restrict the
number of consoles connected as they attempt to fast boot, and calling
ConnectDeviceClass() with a Class value of EFI_BOOT_MANAGER_POLICY_CONSOLE_GUID
must connect the set of consoles that follow the Boot Manager platform policy,
@@ -206,7 +206,7 @@ BootManagerPolicyConnectDevicePath ( application that called ConnectDeviceClass() may need to use the published
protocols to establish the network connection. The Boot Manager can optionally
have a policy to establish a network connection.
-
+
If Class is EFI_BOOT_MANAGER_POLICY_CONNECT_ALL_GUID then the Boot Manager
will connect all UEFI drivers using the UEFI Boot Service
EFI_BOOT_SERVICES.ConnectController(). If the Boot Manager has policy
@@ -223,7 +223,7 @@ BootManagerPolicyConnectDevicePath ( @retval EFI_DEVICE_ERROR Devices were not connected due to an error.
@retval EFI_NOT_FOUND The Class is not supported by the platform.
@retval EFI_UNSUPPORTED The current TPL is not TPL_APPLICATION.
-**/
+**/
EFI_STATUS
EFIAPI
BootManagerPolicyConnectDeviceClass (
diff --git a/MdeModulePkg/Universal/BootManagerPolicyDxe/BootManagerPolicyDxe.inf b/MdeModulePkg/Universal/BootManagerPolicyDxe/BootManagerPolicyDxe.inf index 488f421..3301472 100644 --- a/MdeModulePkg/Universal/BootManagerPolicyDxe/BootManagerPolicyDxe.inf +++ b/MdeModulePkg/Universal/BootManagerPolicyDxe/BootManagerPolicyDxe.inf @@ -1,7 +1,7 @@ ## @file
# This module produces Boot Manager Policy protocol.
-#
-# Copyright (c) 2015, Intel Corporation. All rights reserved.<BR>
+#
+# Copyright (c) 2015 - 2018, Intel Corporation. All rights reserved.<BR>
# 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
@@ -18,7 +18,7 @@ MODULE_UNI_FILE = BootManagerPolicyDxe.uni
FILE_GUID = E622443C-284E-4b47-A984-FD66B482DAC0
MODULE_TYPE = DXE_DRIVER
- VERSION_STRING = 1.0
+ VERSION_STRING = 1.0
ENTRY_POINT = BootManagerPolicyInitialize
#
diff --git a/MdeModulePkg/Universal/BootManagerPolicyDxe/BootManagerPolicyDxe.uni b/MdeModulePkg/Universal/BootManagerPolicyDxe/BootManagerPolicyDxe.uni index 487299c..c73fe30 100644 --- a/MdeModulePkg/Universal/BootManagerPolicyDxe/BootManagerPolicyDxe.uni +++ b/MdeModulePkg/Universal/BootManagerPolicyDxe/BootManagerPolicyDxe.uni @@ -1,12 +1,12 @@ // /** @file
// This module produces Boot Manager Policy protocol.
//
-// Copyright (c) 2015, Intel Corporation. All rights reserved.<BR>
+// Copyright (c) 2015 - 2018, Intel Corporation. All rights reserved.<BR>
// 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,
// WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
//
diff --git a/MdeModulePkg/Universal/BootManagerPolicyDxe/BootManagerPolicyDxeExtra.uni b/MdeModulePkg/Universal/BootManagerPolicyDxe/BootManagerPolicyDxeExtra.uni index a87e296..45b6bf1 100644 --- a/MdeModulePkg/Universal/BootManagerPolicyDxe/BootManagerPolicyDxeExtra.uni +++ b/MdeModulePkg/Universal/BootManagerPolicyDxe/BootManagerPolicyDxeExtra.uni @@ -1,7 +1,7 @@ // /** @file
// This module produces Boot Manager Policy protocol.
//
-// Copyright (c) 2015, Intel Corporation. All rights reserved.<BR>
+// Copyright (c) 2015 - 2018, Intel Corporation. All rights reserved.<BR>
//
// This program and the accompanying materials
// are licensed and made available under the terms and conditions of the BSD License
@@ -13,8 +13,8 @@ //
// **/
-#string STR_PROPERTIES_MODULE_NAME
-#language en-US
+#string STR_PROPERTIES_MODULE_NAME
+#language en-US
"Boot Manager Policy DXE Driver"
diff --git a/MdeModulePkg/Universal/CapsulePei/Capsule.h b/MdeModulePkg/Universal/CapsulePei/Capsule.h index 3614c21..3b8d8a9 100644 --- a/MdeModulePkg/Universal/CapsulePei/Capsule.h +++ b/MdeModulePkg/Universal/CapsulePei/Capsule.h @@ -1,6 +1,6 @@ /** @file
-Copyright (c) 2006 - 2016, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>
This program and the accompanying materials
are licensed and made available under the terms and conditions
@@ -40,7 +40,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. #include <IndustryStandard/PeImage.h>
#include "Common/CommonHeader.h"
-#ifdef MDE_CPU_IA32
+#ifdef MDE_CPU_IA32
#pragma pack(1)
@@ -79,7 +79,7 @@ typedef union { UINT64 CacheDisabled:1; // 0 = Cached, 1=Non-Cached
UINT64 Accessed:1; // 0 = Not accessed, 1 = Accessed (set by CPU)
UINT64 Dirty:1; // 0 = Not Dirty, 1 = written by processor on access to page
- UINT64 MustBe1:1; // Must be 1
+ UINT64 MustBe1:1; // Must be 1
UINT64 Global:1; // 0 = Not global page, 1 = global page TLB not cleared on CR3 write
UINT64 Available:3; // Available for use by system software
UINT64 PAT:1; //
@@ -103,7 +103,7 @@ typedef union { UINT64 CacheDisabled:1; // 0 = Cached, 1=Non-Cached
UINT64 Accessed:1; // 0 = Not accessed, 1 = Accessed (set by CPU)
UINT64 Dirty:1; // 0 = Not Dirty, 1 = written by processor on access to page
- UINT64 MustBe1:1; // Must be 1
+ UINT64 MustBe1:1; // Must be 1
UINT64 Global:1; // 0 = Not global page, 1 = global page TLB not cleared on CR3 write
UINT64 Available:3; // Available for use by system software
UINT64 PAT:1; //
diff --git a/MdeModulePkg/Universal/CapsulePei/CapsulePei.inf b/MdeModulePkg/Universal/CapsulePei/CapsulePei.inf index c54bc21..02cf90c 100644 --- a/MdeModulePkg/Universal/CapsulePei/CapsulePei.inf +++ b/MdeModulePkg/Universal/CapsulePei/CapsulePei.inf @@ -6,7 +6,7 @@ # This external input must be validated carefully to avoid security issue like
# buffer overflow, integer overflow.
#
-# Copyright (c) 2006 - 2016, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>
# Copyright (c) 2017, AMD Incorporated. All rights reserved.<BR>
#
# This program and the accompanying materials
@@ -39,7 +39,7 @@ [Sources]
UefiCapsule.c
Capsule.h
- Common/CapsuleCoalesce.c
+ Common/CapsuleCoalesce.c
[Packages]
MdePkg/MdePkg.dec
@@ -70,8 +70,8 @@ [Ppis]
gEfiPeiReadOnlyVariable2PpiGuid ## CONSUMES
gEfiPeiCapsulePpiGuid ## PRODUCES
-
-[Ppis.IA32]
+
+[Ppis.IA32]
gEfiPeiLoadFilePpiGuid ## SOMETIMES_CONSUMES
[Pcd.IA32]
diff --git a/MdeModulePkg/Universal/CapsulePei/CapsulePei.uni b/MdeModulePkg/Universal/CapsulePei/CapsulePei.uni index 227a965..8835dc3 100644 --- a/MdeModulePkg/Universal/CapsulePei/CapsulePei.uni +++ b/MdeModulePkg/Universal/CapsulePei/CapsulePei.uni @@ -6,14 +6,14 @@ // This external input must be validated carefully to avoid security issue like
// buffer overflow, integer overflow.
//
-// Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.<BR>
+// Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>
//
// 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,
// WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
//
diff --git a/MdeModulePkg/Universal/CapsulePei/CapsulePeiExtra.uni b/MdeModulePkg/Universal/CapsulePei/CapsulePeiExtra.uni index d6d3a67..4c6e101 100644 --- a/MdeModulePkg/Universal/CapsulePei/CapsulePeiExtra.uni +++ b/MdeModulePkg/Universal/CapsulePei/CapsulePeiExtra.uni @@ -1,7 +1,7 @@ // /** @file
// CapsulePei Localized Strings and Content
//
-// Copyright (c) 2013 - 2014, Intel Corporation. All rights reserved.<BR>
+// Copyright (c) 2013 - 2018, Intel Corporation. All rights reserved.<BR>
//
// This program and the accompanying materials
// are licensed and made available under the terms and conditions
@@ -14,8 +14,8 @@ //
// **/
-#string STR_PROPERTIES_MODULE_NAME
-#language en-US
+#string STR_PROPERTIES_MODULE_NAME
+#language en-US
"Firmware Update PEI Module"
diff --git a/MdeModulePkg/Universal/CapsulePei/CapsuleX64.uni b/MdeModulePkg/Universal/CapsulePei/CapsuleX64.uni index 731cf14..44e0772 100644 --- a/MdeModulePkg/Universal/CapsulePei/CapsuleX64.uni +++ b/MdeModulePkg/Universal/CapsulePei/CapsuleX64.uni @@ -3,20 +3,20 @@ //
// The X64 entrypoint to process capsule in long mode.
// This module is built as X64.
-//
+//
// Caution: This module requires additional review when modified.
// This driver will have external input - capsule image.
// This external input must be validated carefully to avoid security issue like
// buffer overflow, integer overflow.
//
-// Copyright (c) 2011 - 2014, Intel Corporation. All rights reserved.<BR>
+// Copyright (c) 2011 - 2018, Intel Corporation. All rights reserved.<BR>
//
// 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,
// WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
//
diff --git a/MdeModulePkg/Universal/CapsulePei/CapsuleX64Extra.uni b/MdeModulePkg/Universal/CapsulePei/CapsuleX64Extra.uni index 5395ec5..152a520 100644 --- a/MdeModulePkg/Universal/CapsulePei/CapsuleX64Extra.uni +++ b/MdeModulePkg/Universal/CapsulePei/CapsuleX64Extra.uni @@ -1,7 +1,7 @@ // /** @file
// CapsuleX64 Localized Strings and Content
//
-// Copyright (c) 2013 - 2014, Intel Corporation. All rights reserved.<BR>
+// Copyright (c) 2013 - 2018, Intel Corporation. All rights reserved.<BR>
//
// This program and the accompanying materials
// are licensed and made available under the terms and conditions
@@ -14,8 +14,8 @@ //
// **/
-#string STR_PROPERTIES_MODULE_NAME
-#language en-US
+#string STR_PROPERTIES_MODULE_NAME
+#language en-US
"Firmware Update PEI Module over 4GB"
diff --git a/MdeModulePkg/Universal/CapsulePei/Common/CapsuleCoalesce.c b/MdeModulePkg/Universal/CapsulePei/Common/CapsuleCoalesce.c index 3e7054c..3575a94 100644 --- a/MdeModulePkg/Universal/CapsulePei/Common/CapsuleCoalesce.c +++ b/MdeModulePkg/Universal/CapsulePei/Common/CapsuleCoalesce.c @@ -10,7 +10,7 @@ into memory.
(C) Copyright 2014 Hewlett-Packard Development Company, L.P.<BR>
-Copyright (c) 2011 - 2017, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2011 - 2018, Intel Corporation. All rights reserved.<BR>
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
@@ -45,7 +45,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. @param MemSize The size of the block of memory pointed to by MemBase
@param DataSize How big a free block we want to find
- @return A pointer to a memory block of at least DataSize that lies somewhere
+ @return A pointer to a memory block of at least DataSize that lies somewhere
between MemBase and (MemBase + MemSize). The memory pointed to does not
contain any of the capsule block descriptors or capsule blocks pointed to
by the BlockList.
@@ -75,7 +75,7 @@ FindFreeMem ( @param MemSize size of the system memory pointed to by MemBase
@retval NULL could not relocate the descriptors
- @retval Pointer to the base of the successfully-relocated block descriptors.
+ @retval Pointer to the base of the successfully-relocated block descriptors.
**/
EFI_CAPSULE_BLOCK_DESCRIPTOR *
@@ -93,7 +93,7 @@ RelocateBlockDescriptors ( @param CapsuleHeader The pointer to EFI_CAPSULE_HEADER
@retval FALSE Capsule is OK
- @retval TRUE Capsule is corrupted
+ @retval TRUE Capsule is corrupted
**/
BOOLEAN
@@ -153,7 +153,7 @@ GetCapsuleInfo ( @param MemSize The size of the block of memory pointed to by MemBase
@param DataSize How big a free block we want to find
- @return A pointer to a memory block of at least DataSize that lies somewhere
+ @return A pointer to a memory block of at least DataSize that lies somewhere
between MemBase and (MemBase + MemSize). The memory pointed to does not
contain any of the capsule block descriptors or capsule blocks pointed to
by the BlockList.
@@ -321,7 +321,7 @@ ValidateCapsuleIntegrity ( // * The first capsule header flag
// * The first capsule header HeaderSize
// * Below check will be done in ValidateCapsuleByMemoryResource()
- // Length > MAX_ADDRESS
+ // Length > MAX_ADDRESS
// Ptr + sizeof (EFI_CAPSULE_BLOCK_DESCRIPTOR) > MAX_ADDRESS
// DataBlock + Length > MAX_ADDRESS
//
@@ -450,7 +450,7 @@ ValidateCapsuleIntegrity ( @param MemSize size of the system memory pointed to by MemBase
@retval NULL could not relocate the descriptors
- @retval Pointer to the base of the successfully-relocated block descriptors.
+ @retval Pointer to the base of the successfully-relocated block descriptors.
**/
EFI_CAPSULE_BLOCK_DESCRIPTOR *
@@ -737,7 +737,7 @@ GetCapsuleInfo ( @param CapsuleHeader The pointer to EFI_CAPSULE_HEADER
@retval FALSE Capsule is OK
- @retval TRUE Capsule is corrupted
+ @retval TRUE Capsule is corrupted
**/
BOOLEAN
@@ -769,7 +769,7 @@ IsCapsuleCorrupted ( capsule gets coalesced. This can be useful in narrowing down
where capsule data corruption occurs.
- The test pattern mode fills in memory with a counting UINT32 value.
+ The test pattern mode fills in memory with a counting UINT32 value.
If the capsule is not divided up in a multiple of 4-byte blocks, then
things get messy doing the check. Therefore there are some cases
here where we just give up and skip the pre-coalesce check.
@@ -865,7 +865,7 @@ EFI_STATUS BuildCapsuleDescriptors (
IN EFI_PHYSICAL_ADDRESS *BlockListBuffer,
IN MEMORY_RESOURCE_DESCRIPTOR *MemoryResource,
- OUT EFI_CAPSULE_BLOCK_DESCRIPTOR **BlockDescriptorList
+ OUT EFI_CAPSULE_BLOCK_DESCRIPTOR **BlockDescriptorList
)
{
UINTN Index;
@@ -908,7 +908,7 @@ BuildCapsuleDescriptors ( }
Index ++;
}
-
+
if (HeadBlock != NULL) {
*BlockDescriptorList = HeadBlock;
return EFI_SUCCESS;
@@ -930,7 +930,7 @@ BuildCapsuleDescriptors ( | ------------------------- | |
| | Capsule [0] | | |
| ------------------------- | |
- | Capsule Image | |
+ | Capsule Image | |
CapsuleImageBase-->+---------------------------+
| ------------------------- | |
| | CapsuleOffset[Num-1] | | |
@@ -1004,9 +1004,9 @@ CapsuleDataCoalesce ( UINT8 *DestPtr;
UINTN DestLength;
UINT8 *RelocPtr;
- UINTN CapsuleTimes;
- UINT64 SizeLeft;
- UINT64 CapsuleImageSize;
+ UINTN CapsuleTimes;
+ UINT64 SizeLeft;
+ UINT64 CapsuleImageSize;
UINTN CapsuleSize;
UINTN CapsuleNumber;
UINTN DescriptorsSize;
@@ -1265,7 +1265,7 @@ CapsuleDataCoalesce ( //
//Here is the end of the current capsule image.
//
- CapsuleBeginFlag = TRUE;
+ CapsuleBeginFlag = TRUE;
}
} else {
//
diff --git a/MdeModulePkg/Universal/CapsulePei/UefiCapsule.c b/MdeModulePkg/Universal/CapsulePei/UefiCapsule.c index 043365f..1131094 100644 --- a/MdeModulePkg/Universal/CapsulePei/UefiCapsule.c +++ b/MdeModulePkg/Universal/CapsulePei/UefiCapsule.c @@ -1,7 +1,7 @@ /** @file
Capsule update PEIM for UEFI2.0
-Copyright (c) 2006 - 2017, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>
Copyright (c) 2017, AMD Incorporated. All rights reserved.<BR>
This program and the accompanying materials
@@ -133,7 +133,7 @@ Create4GPageTables ( IN EFI_PHYSICAL_ADDRESS PageTablesAddress,
IN BOOLEAN Page1GSupport
)
-{
+{
UINT8 PhysicalAddressBits;
EFI_PHYSICAL_ADDRESS PageAddress;
UINTN IndexOfPml4Entries;
@@ -172,7 +172,7 @@ Create4GPageTables ( }
//
- // Pre-allocate big pages to avoid later allocations.
+ // Pre-allocate big pages to avoid later allocations.
//
BigPageAddress = (UINTN) PageTablesAddress;
@@ -201,7 +201,7 @@ Create4GPageTables ( if (Page1GSupport) {
PageDirectory1GEntry = (VOID *) PageDirectoryPointerEntry;
-
+
for (IndexOfPageDirectoryEntries = 0; IndexOfPageDirectoryEntries < 512; IndexOfPageDirectoryEntries++, PageDirectory1GEntry++, PageAddress += SIZE_1GB) {
//
// Fill in the Page Directory entries
@@ -216,7 +216,7 @@ Create4GPageTables ( //
// Each Directory Pointer entries points to a page of Page Directory entires.
// So allocate space for them and fill them in in the IndexOfPageDirectoryEntries loop.
- //
+ //
PageDirectoryEntry = (VOID *) BigPageAddress;
BigPageAddress += SIZE_4KB;
@@ -360,7 +360,7 @@ Thunk32To64 ( if ((UINTN) ReturnContext->ReturnStatus != 0) {
Status = ENCODE_ERROR ((UINTN) ReturnContext->ReturnStatus);
}
-
+
return Status;
}
@@ -401,7 +401,7 @@ ModeSwitch ( ZeroMem (&Context, sizeof (SWITCH_32_TO_64_CONTEXT));
ZeroMem (&ReturnContext, sizeof (SWITCH_64_TO_32_CONTEXT));
-
+
MemoryBase64 = (UINT64) (UINTN) *MemoryBase;
MemorySize64 = (UINT64) (UINTN) *MemorySize;
MemoryEnd64 = MemoryBase64 + MemorySize64;
@@ -409,7 +409,7 @@ ModeSwitch ( Page1GSupport = IsPage1GSupport ();
//
- // Merge memory range reserved for stack and page table
+ // Merge memory range reserved for stack and page table
//
if (LongModeBuffer->StackBaseAddress < LongModeBuffer->PageTableAddress) {
ReservedRangeBase = LongModeBuffer->StackBaseAddress;
@@ -462,14 +462,14 @@ ModeSwitch ( // Will save the return status of processing capsule
//
ReturnContext.ReturnStatus = 0;
-
+
//
// Save original GDT
//
AsmReadGdtr ((IA32_DESCRIPTOR *)&ReturnContext.Gdtr);
-
+
Status = Thunk32To64 (LongModeBuffer->PageTableAddress, &Context, &ReturnContext);
-
+
if (!EFI_ERROR (Status)) {
*MemoryBase = (VOID *) (UINTN) MemoryBase64;
*MemorySize = (UINTN) MemorySize64;
@@ -685,7 +685,7 @@ MergeMemoryResourceDescriptor ( if (NewMemoryResourceEntry != MemoryResourceEntry) {
NewMemoryResourceEntry->ResourceLength += NextMemoryResourceEntry->ResourceLength;
}
-
+
NextMemoryResourceEntry = NextMemoryResourceEntry + 1;
}
@@ -743,7 +743,7 @@ BuildMemoryResourceDescriptor ( Status = PeiServicesAllocatePool ((1 + 1) * sizeof (MEMORY_RESOURCE_DESCRIPTOR), (VOID **) &MemoryResource);
ASSERT_EFI_ERROR (Status);
ZeroMem (MemoryResource, (1 + 1) * sizeof (MEMORY_RESOURCE_DESCRIPTOR));
-
+
MemoryResource[0].PhysicalStart = 0;
MemoryResource[0].ResourceLength = LShiftU64 (1, GetPhysicalAddressBits ());
DEBUG ((EFI_D_INFO, "MemoryResource[0x0] - Start(0x%0lx) Length(0x%0lx)\n",
@@ -828,7 +828,7 @@ GetCapsuleDescriptors ( CapsuleVarName[0] = 0;
ValidIndex = 0;
CapsuleDataPtr64 = 0;
-
+
Status = PeiServicesLocatePpi (
&gEfiPeiReadOnlyVariable2PpiGuid,
0,
@@ -885,7 +885,7 @@ GetCapsuleDescriptors ( if (EFI_ERROR (Status)) {
break;
}
-
+
//
// If this BlockList has been linked before, skip this variable
//
@@ -901,7 +901,7 @@ GetCapsuleDescriptors ( continue;
}
}
-
+
//
// Cache BlockList which has been processed
//
@@ -909,7 +909,7 @@ GetCapsuleDescriptors ( Index ++;
}
}
-
+
return EFI_SUCCESS;
}
@@ -949,7 +949,7 @@ CapsuleCoalesce ( UINTN VariableCount;
CHAR16 CapsuleVarName[30];
CHAR16 *TempVarName;
- EFI_PHYSICAL_ADDRESS CapsuleDataPtr64;
+ EFI_PHYSICAL_ADDRESS CapsuleDataPtr64;
EFI_STATUS Status;
EFI_BOOT_MODE BootMode;
EFI_PEI_READ_ONLY_VARIABLE2_PPI *PPIVariableServices;
@@ -973,11 +973,11 @@ CapsuleCoalesce ( //
Status = PeiServicesGetBootMode (&BootMode);
if (EFI_ERROR (Status) || (BootMode != BOOT_ON_FLASH_UPDATE)) {
- DEBUG ((EFI_D_ERROR, "Boot mode is not correct for capsule update path.\n"));
+ DEBUG ((EFI_D_ERROR, "Boot mode is not correct for capsule update path.\n"));
Status = EFI_NOT_FOUND;
goto Done;
}
-
+
//
// User may set the same ScatterGatherList with several different variables,
// so cache all ScatterGatherList for check later.
@@ -1022,9 +1022,9 @@ CapsuleCoalesce ( VariableCount++;
Index++;
}
-
+
DEBUG ((EFI_D_INFO,"Capsule variable count = %d\n", VariableCount));
-
+
//
// The last entry is the end flag.
//
@@ -1037,9 +1037,9 @@ CapsuleCoalesce ( DEBUG ((EFI_D_ERROR, "AllocatePages Failed!, Status = %x\n", Status));
goto Done;
}
-
+
ZeroMem (VariableArrayAddress, (VariableCount + 1) * sizeof (EFI_PHYSICAL_ADDRESS));
-
+
//
// Find out if we actually have a capsule.
// GetCapsuleDescriptors depends on variable PPI, so it should run in 32-bit environment.
@@ -1068,7 +1068,7 @@ CapsuleCoalesce ( Status = EFI_NOT_FOUND;
goto Done;
}
-
+
Status = FindCapsuleCoalesceImage (&CoalesceImageEntryPoint, &CoalesceImageMachineType);
if ((EFI_ERROR (Status)) || (CoalesceImageMachineType != EFI_IMAGE_MACHINE_X64)) {
DEBUG ((EFI_D_ERROR, "Fail to find CapsuleX64 module in FV!\n"));
@@ -1090,13 +1090,13 @@ CapsuleCoalesce ( //
Status = CapsuleDataCoalesce (PeiServices, (EFI_PHYSICAL_ADDRESS *)(UINTN)VariableArrayAddress, MemoryResource, MemoryBase, MemorySize);
#endif
-
+
DEBUG ((EFI_D_INFO, "Capsule Coalesce Status = %r!\n", Status));
if (Status == EFI_BUFFER_TOO_SMALL) {
DEBUG ((EFI_D_ERROR, "There is not enough memory to process capsule!\n"));
}
-
+
if (Status == EFI_NOT_FOUND) {
DEBUG ((EFI_D_ERROR, "Fail to parse capsule descriptor in memory!\n"));
REPORT_STATUS_CODE (
@@ -1129,9 +1129,9 @@ CheckCapsuleUpdate ( return Status;
}
/**
- This function will look at a capsule and determine if it's a test pattern.
+ This function will look at a capsule and determine if it's a test pattern.
If it is, then it will verify it and emit an error message if corruption is detected.
-
+
@param PeiServices Standard pei services pointer
@param CapsuleBase Base address of coalesced capsule, which is preceeded
by private data. Very implementation specific.
@@ -1220,7 +1220,7 @@ CreateState ( UINT32 Index;
EFI_PHYSICAL_ADDRESS BaseAddress;
UINT64 Length;
-
+
PrivateData = (EFI_CAPSULE_PEIM_PRIVATE_DATA *) CapsuleBase;
if (PrivateData->Signature != EFI_CAPSULE_PEIM_PRIVATE_DATA_SIGNATURE) {
return EFI_VOLUME_CORRUPTED;
@@ -1276,7 +1276,7 @@ CreateState ( BuildCvHob (BaseAddress, Length);
}
-
+
return EFI_SUCCESS;
}
diff --git a/MdeModulePkg/Universal/CapsulePei/X64/X64Entry.c b/MdeModulePkg/Universal/CapsulePei/X64/X64Entry.c index e1871c3..40b7095 100644 --- a/MdeModulePkg/Universal/CapsulePei/X64/X64Entry.c +++ b/MdeModulePkg/Universal/CapsulePei/X64/X64Entry.c @@ -1,7 +1,7 @@ /** @file
The X64 entrypoint is used to process capsule in long mode.
-Copyright (c) 2011 - 2016, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2011 - 2018, Intel Corporation. All rights reserved.<BR>
Copyright (c) 2017, AMD Incorporated. All rights reserved.<BR>
This program and the accompanying materials
@@ -165,7 +165,7 @@ PageFaultHandler ( //
// Get the IDT Descriptor.
//
- AsmReadIdtr ((IA32_DESCRIPTOR *) &Idtr);
+ AsmReadIdtr ((IA32_DESCRIPTOR *) &Idtr);
//
// Then get page fault context by IDT Descriptor.
//
@@ -233,7 +233,7 @@ _ModuleEntryPoint ( //
// Save the IA32 IDT Descriptor
//
- AsmReadIdtr ((IA32_DESCRIPTOR *) &Ia32Idtr);
+ AsmReadIdtr ((IA32_DESCRIPTOR *) &Ia32Idtr);
//
// Setup X64 IDT table
@@ -241,7 +241,7 @@ _ModuleEntryPoint ( ZeroMem (PageFaultIdtTable.IdtEntryTable, sizeof (IA32_IDT_GATE_DESCRIPTOR) * EXCEPTION_VECTOR_NUMBER);
X64Idtr.Base = (UINTN) PageFaultIdtTable.IdtEntryTable;
X64Idtr.Limit = (UINT16) (sizeof (IA32_IDT_GATE_DESCRIPTOR) * EXCEPTION_VECTOR_NUMBER - 1);
- AsmWriteIdtr ((IA32_DESCRIPTOR *) &X64Idtr);
+ AsmWriteIdtr ((IA32_DESCRIPTOR *) &X64Idtr);
//
// Setup the default CPU exception handlers
@@ -272,7 +272,7 @@ _ModuleEntryPoint ( (VOID **) (UINTN) EntrypointContext->MemoryBase64Ptr,
(UINTN *) (UINTN) EntrypointContext->MemorySize64Ptr
);
-
+
ReturnContext->ReturnStatus = Status;
DEBUG ((
@@ -290,8 +290,8 @@ _ModuleEntryPoint ( //
// Restore IA32 IDT table
//
- AsmWriteIdtr ((IA32_DESCRIPTOR *) &Ia32Idtr);
-
+ AsmWriteIdtr ((IA32_DESCRIPTOR *) &Ia32Idtr);
+
//
// Finish to coalesce capsule, and return to 32-bit mode.
//
@@ -301,8 +301,8 @@ _ModuleEntryPoint ( (UINT32) (UINTN) EntrypointContext,
(UINT32) (UINTN) ReturnContext,
(UINT32) (EntrypointContext->StackBufferBase + EntrypointContext->StackBufferLength)
- );
-
+ );
+
//
// Should never be here.
//
diff --git a/MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleRuntimeDxe.inf b/MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleRuntimeDxe.inf index 43a29ee..3849bc8 100644 --- a/MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleRuntimeDxe.inf +++ b/MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleRuntimeDxe.inf @@ -1,18 +1,18 @@ ## @file
# Capsule Runtime Driver produces two UEFI capsule runtime services: (UpdateCapsule, QueryCapsuleCapabilities).
#
-# It installs the Capsule Architectural Protocol defined in PI1.0a to signify
+# It installs the Capsule Architectural Protocol defined in PI1.0a to signify
# the capsule runtime services are ready.
-#
-# Copyright (c) 2006 - 2017, Intel Corporation. All rights reserved.<BR>
+#
+# Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>
# 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,
# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
-#
+#
##
[Defines]
diff --git a/MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleRuntimeDxe.uni b/MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleRuntimeDxe.uni index 8fdf709..cf93e22 100644 --- a/MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleRuntimeDxe.uni +++ b/MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleRuntimeDxe.uni @@ -4,13 +4,13 @@ // It installs the Capsule Architectural Protocol defined in PI1.0a to signify
// the capsule runtime services are ready.
//
-// Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.<BR>
+// Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>
//
// 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,
// WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
//
diff --git a/MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleRuntimeDxeExtra.uni b/MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleRuntimeDxeExtra.uni index 50acf08..00d75c3 100644 --- a/MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleRuntimeDxeExtra.uni +++ b/MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleRuntimeDxeExtra.uni @@ -1,7 +1,7 @@ // /** @file
// CapsuleRuntimeDxe Localized Strings and Content
//
-// Copyright (c) 2013 - 2014, Intel Corporation. All rights reserved.<BR>
+// Copyright (c) 2013 - 2018, Intel Corporation. All rights reserved.<BR>
//
// This program and the accompanying materials
// are licensed and made available under the terms and conditions of the BSD License
@@ -13,8 +13,8 @@ //
// **/
-#string STR_PROPERTIES_MODULE_NAME
-#language en-US
+#string STR_PROPERTIES_MODULE_NAME
+#language en-US
"Runtime Firmware Update DXE Driver"
diff --git a/MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleService.c b/MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleService.c index 23fd6d5..9e5fc9f 100644 --- a/MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleService.c +++ b/MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleService.c @@ -1,10 +1,10 @@ /** @file
Capsule Runtime Driver produces two UEFI capsule runtime services.
(UpdateCapsule, QueryCapsuleCapabilities)
- It installs the Capsule Architectural Protocol defined in PI1.0a to signify
+ It installs the Capsule Architectural Protocol defined in PI1.0a to signify
the capsule runtime services are ready.
-Copyright (c) 2006 - 2017, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>
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
@@ -54,10 +54,10 @@ UINT32 mMaxSizeNonPopulateCapsule = 0; @retval EFI_INVALID_PARAMETER CapsuleCount is Zero.
@retval EFI_INVALID_PARAMETER For across reset capsule image, ScatterGatherList is NULL.
@retval EFI_UNSUPPORTED CapsuleImage is not recognized by the firmware.
- @retval EFI_OUT_OF_RESOURCES When ExitBootServices() has been previously called this error indicates the capsule
- is compatible with this platform but is not capable of being submitted or processed
+ @retval EFI_OUT_OF_RESOURCES When ExitBootServices() has been previously called this error indicates the capsule
+ is compatible with this platform but is not capable of being submitted or processed
in runtime. The caller may resubmit the capsule prior to ExitBootServices().
- @retval EFI_OUT_OF_RESOURCES When ExitBootServices() has not been previously called then this error indicates
+ @retval EFI_OUT_OF_RESOURCES When ExitBootServices() has not been previously called then this error indicates
the capsule is compatible with this platform but there are insufficient resources to process.
**/
@@ -75,8 +75,8 @@ UpdateCapsule ( BOOLEAN NeedReset;
BOOLEAN InitiateReset;
CHAR16 CapsuleVarName[30];
- CHAR16 *TempVarName;
-
+ CHAR16 *TempVarName;
+
//
// Capsule Count can't be less than one.
//
@@ -107,7 +107,7 @@ UpdateCapsule ( }
//
- // Check FMP capsule flag
+ // Check FMP capsule flag
//
if (CompareGuid(&CapsuleHeader->CapsuleGuid, &gEfiFmpCapsuleGuid)
&& (CapsuleHeader->Flags & CAPSULE_FLAGS_POPULATE_SYSTEM_TABLE) != 0 ) {
@@ -115,7 +115,7 @@ UpdateCapsule ( }
//
- // Check Capsule image without populate flag by firmware support capsule function
+ // Check Capsule image without populate flag by firmware support capsule function
//
if ((CapsuleHeader->Flags & CAPSULE_FLAGS_POPULATE_SYSTEM_TABLE) == 0) {
Status = SupportCapsuleImage (CapsuleHeader);
@@ -136,7 +136,7 @@ UpdateCapsule ( // Platform specific update for the non-reset capsule image.
//
if ((CapsuleHeader->Flags & CAPSULE_FLAGS_PERSIST_ACROSS_RESET) == 0) {
- if (EfiAtRuntime ()) {
+ if (EfiAtRuntime ()) {
Status = EFI_OUT_OF_RESOURCES;
} else {
Status = ProcessCapsuleImage(CapsuleHeader);
@@ -151,7 +151,7 @@ UpdateCapsule ( }
}
}
-
+
//
// After launching all capsules who has no reset flag, if no more capsules claims
// for a system reset just return.
@@ -162,7 +162,7 @@ UpdateCapsule ( //
// ScatterGatherList is only referenced if the capsules are defined to persist across
- // system reset.
+ // system reset.
//
if (ScatterGatherList == (EFI_PHYSICAL_ADDRESS) (UINTN) NULL) {
return EFI_INVALID_PARAMETER;
@@ -195,7 +195,7 @@ UpdateCapsule ( //
// ScatterGatherList is only referenced if the capsules are defined to persist across
- // system reset. Set its value into NV storage to let pre-boot driver to pick it up
+ // system reset. Set its value into NV storage to let pre-boot driver to pick it up
// after coming through a system reset.
//
Status = EfiSetVariable (
@@ -213,7 +213,7 @@ UpdateCapsule ( if(InitiateReset) {
//
// Firmware that encounters a capsule which has the CAPSULE_FLAGS_INITIATE_RESET Flag set in its header
- // will initiate a reset of the platform which is compatible with the passed-in capsule request and will
+ // will initiate a reset of the platform which is compatible with the passed-in capsule request and will
// not return back to the caller.
//
EfiResetSystem (EfiResetWarm, EFI_SUCCESS, 0, NULL);
@@ -261,7 +261,7 @@ QueryCapsuleCapabilities ( if (CapsuleCount < 1) {
return EFI_INVALID_PARAMETER;
}
-
+
//
// Check whether input parameter is valid
//
@@ -290,7 +290,7 @@ QueryCapsuleCapabilities ( }
//
- // Check FMP capsule flag
+ // Check FMP capsule flag
//
if (CompareGuid(&CapsuleHeader->CapsuleGuid, &gEfiFmpCapsuleGuid)
&& (CapsuleHeader->Flags & CAPSULE_FLAGS_POPULATE_SYSTEM_TABLE) != 0 ) {
@@ -309,7 +309,7 @@ QueryCapsuleCapabilities ( }
//
- // Find out whether there is any capsule defined to persist across system reset.
+ // Find out whether there is any capsule defined to persist across system reset.
//
for (ArrayNumber = 0; ArrayNumber < CapsuleCount ; ArrayNumber++) {
CapsuleHeader = CapsuleHeaderArray[ArrayNumber];
@@ -344,10 +344,10 @@ QueryCapsuleCapabilities ( This code installs UEFI capsule runtime service.
- @param ImageHandle The firmware allocated handle for the EFI image.
+ @param ImageHandle The firmware allocated handle for the EFI image.
@param SystemTable A pointer to the EFI System Table.
- @retval EFI_SUCCESS UEFI Capsule Runtime Services are installed successfully.
+ @retval EFI_SUCCESS UEFI Capsule Runtime Services are installed successfully.
**/
EFI_STATUS
@@ -363,14 +363,14 @@ CapsuleServiceInitialize ( mMaxSizeNonPopulateCapsule = PcdGet32(PcdMaxSizeNonPopulateCapsule);
//
- // When PEI phase is IA32, DXE phase is X64, it is possible that capsule data are
+ // When PEI phase is IA32, DXE phase is X64, it is possible that capsule data are
// put above 4GB, so capsule PEI will transfer to long mode to get capsule data.
// The page table and stack is used to transfer processor mode from IA32 to long mode.
// Create the base address of page table and stack, and save them into variable.
// This is not needed when capsule with reset type is not supported.
//
SaveLongModeContext ();
-
+
//
// Install capsule runtime services into UEFI runtime service tables.
//
diff --git a/MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleService.h b/MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleService.h index 787c70c..b514b7f 100644 --- a/MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleService.h +++ b/MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleService.h @@ -1,10 +1,10 @@ /** @file
Capsule Runtime Driver produces two UEFI capsule runtime services.
(UpdateCapsule, QueryCapsuleCapabilities)
- It installs the Capsule Architectural Protocol defined in PI1.0a to signify
+ It installs the Capsule Architectural Protocol defined in PI1.0a to signify
the capsule runtime services are ready.
- Copyright (c) 2006 - 2017, Intel Corporation. All rights reserved.<BR>
+ Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>
Copyright (c) 2018, Linaro, Ltd. All rights reserved.<BR>
This program and the accompanying materials are licensed and made available
diff --git a/MdeModulePkg/Universal/CapsuleRuntimeDxe/X64/SaveLongModeContext.c b/MdeModulePkg/Universal/CapsuleRuntimeDxe/X64/SaveLongModeContext.c index b0512fd..b4d4844 100644 --- a/MdeModulePkg/Universal/CapsuleRuntimeDxe/X64/SaveLongModeContext.c +++ b/MdeModulePkg/Universal/CapsuleRuntimeDxe/X64/SaveLongModeContext.c @@ -2,7 +2,7 @@ Create the variable to save the base address of page table and stack
for transferring into long mode in IA32 capsule PEI.
-Copyright (c) 2011 - 2017, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2011 - 2018, Intel Corporation. All rights reserved.<BR>
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
@@ -42,7 +42,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. This function allocates EfiReservedMemoryType below 4G memory address.
@param Size Size of memory to allocate.
-
+
@return Allocated Address for output.
**/
@@ -164,14 +164,14 @@ PrepareContextForCapsulePei ( LongModeBuffer.PageTableAddress = (EFI_PHYSICAL_ADDRESS)(UINTN)AllocateReservedMemoryBelow4G (EFI_PAGES_TO_SIZE (TotalPagesNum));
ASSERT (LongModeBuffer.PageTableAddress != 0);
-
+
//
// Allocate stack
//
LongModeBuffer.StackSize = PcdGet32 (PcdCapsulePeiLongModeStackSize);
LongModeBuffer.StackBaseAddress = (EFI_PHYSICAL_ADDRESS)(UINTN)AllocateReservedMemoryBelow4G (PcdGet32 (PcdCapsulePeiLongModeStackSize));
- ASSERT (LongModeBuffer.StackBaseAddress != 0);
-
+ ASSERT (LongModeBuffer.StackBaseAddress != 0);
+
Status = gRT->SetVariable (
EFI_CAPSULE_LONG_MODE_BUFFER_NAME,
&gEfiCapsuleVendorGuid,
@@ -190,7 +190,7 @@ PrepareContextForCapsulePei ( VariableLockCapsuleLongModeBufferVariable,
NULL,
&Registration
- );
+ );
} else {
DEBUG ((EFI_D_ERROR, "FATAL ERROR: CapsuleLongModeBuffer cannot be saved: %r. Capsule in PEI may fail!\n", Status));
gBS->FreePages (LongModeBuffer.StackBaseAddress, EFI_SIZE_TO_PAGES (LongModeBuffer.StackSize));
diff --git a/MdeModulePkg/Universal/Console/ConPlatformDxe/ConPlatform.c b/MdeModulePkg/Universal/Console/ConPlatformDxe/ConPlatform.c index 6b53e8a..5fa7fac 100644 --- a/MdeModulePkg/Universal/Console/ConPlatformDxe/ConPlatform.c +++ b/MdeModulePkg/Universal/Console/ConPlatformDxe/ConPlatform.c @@ -2,7 +2,7 @@ Console Platform DXE Driver, install Console Device Guids and update Console
Environment Variables.
-Copyright (c) 2006 - 2017, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>
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
@@ -80,7 +80,7 @@ InitializeConPlatform( /**
- Test to see if EFI_SIMPLE_TEXT_INPUT_PROTOCOL is supported on ControllerHandle.
+ Test to see if EFI_SIMPLE_TEXT_INPUT_PROTOCOL is supported on ControllerHandle.
@param This Protocol instance pointer.
@param ControllerHandle Handle of device to test.
@@ -108,7 +108,7 @@ ConPlatformTextInDriverBindingSupported ( /**
- Test to see if EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL is supported on ControllerHandle.
+ Test to see if EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL is supported on ControllerHandle.
@param This Protocol instance pointer.
@param ControllerHandle Handle of device to test.
@@ -136,7 +136,7 @@ ConPlatformTextOutDriverBindingSupported ( /**
- Test to see if the specified protocol is supported on ControllerHandle.
+ Test to see if the specified protocol is supported on ControllerHandle.
@param This Protocol instance pointer.
@param ControllerHandle Handle of device to test.
@@ -202,9 +202,9 @@ ConPlatformDriverBindingSupported ( Start this driver on ControllerHandle by opening Simple Text Input Protocol,
reading Device Path, and installing Console In Devcice GUID on ControllerHandle.
- If this devcie is not one hot-plug devce, append its device path into the
+ If this devcie is not one hot-plug devce, append its device path into the
console environment variables ConInDev.
-
+
@param This Protocol instance pointer.
@param ControllerHandle Handle of device to bind driver to
@param RemainingDevicePath Optional parameter use to pick a specific child
@@ -334,9 +334,9 @@ ConPlatformTextInDriverBindingStart ( reading Device Path, and installing Console Out Devcic GUID, Standard Error
Device GUID on ControllerHandle.
- If this devcie is not one hot-plug devce, append its device path into the
+ If this devcie is not one hot-plug devce, append its device path into the
console environment variables ConOutDev, ErrOutDev.
-
+
@param This Protocol instance pointer.
@param ControllerHandle Handle of device to bind driver to
@param RemainingDevicePath Optional parameter use to pick a specific child
@@ -450,7 +450,7 @@ ConPlatformTextOutDriverBindingStart ( }
} else {
//
- // If it is not a hot-plug device, append the device path to
+ // If it is not a hot-plug device, append the device path to
// the ConOutDev and ErrOutDev environment variable.
// For GOP device path, append the sibling device path as well.
//
@@ -511,7 +511,7 @@ ConPlatformTextOutDriverBindingStart ( }
/**
- Stop this driver on ControllerHandle by removing Console In Devcice GUID
+ Stop this driver on ControllerHandle by removing Console In Devcice GUID
and closing the Simple Text Input protocol on ControllerHandle.
@param This Protocol instance pointer.
@@ -585,7 +585,7 @@ ConPlatformTextInDriverBindingStop ( /**
- Stop this driver on ControllerHandle by removing Console Out Devcice GUID
+ Stop this driver on ControllerHandle by removing Console Out Devcice GUID
and closing the Simple Text Output protocol on ControllerHandle.
@param This Protocol instance pointer.
@@ -714,7 +714,7 @@ ConPlatformUnInstallProtocol ( @param Name String part of EFI variable name
@return Dynamically allocated memory that contains a copy of the EFI variable.
- Caller is repsoncible freeing the buffer. Return NULL means Variable
+ Caller is repsoncible freeing the buffer. Return NULL means Variable
was not read.
**/
@@ -922,7 +922,7 @@ ConPlatformMatchDevicePaths ( }
/**
- Update console environment variables.
+ Update console environment variables.
@param VariableName Console environment variables, ConOutDev, ConInDev
ErrOutDev, ConIn ,ConOut or ErrOut.
@@ -958,7 +958,7 @@ ConPlatformUpdateDeviceVariable ( if (Operation != Delete) {
//
// Match specified DevicePath in Console Variable.
- //
+ //
Status = ConPlatformMatchDevicePaths (
VariableDevicePath,
DevicePath,
@@ -1052,7 +1052,7 @@ IsHotPlugDevice ( while (!IsDevicePathEnd (CheckDevicePath)) {
//
// Check device whether is hot plug device or not throught Device Path
- //
+ //
if ((DevicePathType (CheckDevicePath) == MESSAGING_DEVICE_PATH) &&
(DevicePathSubType (CheckDevicePath) == MSG_USB_DP ||
DevicePathSubType (CheckDevicePath) == MSG_USB_CLASS_DP ||
@@ -1069,7 +1069,7 @@ IsHotPlugDevice ( //
return TRUE;
}
-
+
CheckDevicePath = NextDevicePathNode (CheckDevicePath);
}
diff --git a/MdeModulePkg/Universal/Console/ConPlatformDxe/ConPlatform.h b/MdeModulePkg/Universal/Console/ConPlatformDxe/ConPlatform.h index 6d853c1..1d5f11e 100644 --- a/MdeModulePkg/Universal/Console/ConPlatformDxe/ConPlatform.h +++ b/MdeModulePkg/Universal/Console/ConPlatformDxe/ConPlatform.h @@ -1,7 +1,7 @@ /** @file
Header file for Console Platfrom DXE Driver.
-Copyright (c) 2006 - 2017, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>
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
@@ -56,7 +56,7 @@ typedef enum { } CONPLATFORM_VAR_OPERATION;
/**
- Test to see if specific protocol could be supported on the ControllerHandle.
+ Test to see if specific protocol could be supported on the ControllerHandle.
@param This Protocol instance pointer.
@param ControllerHandle Handle of device to test.
@@ -74,7 +74,7 @@ ConPlatformDriverBindingSupported ( );
/**
- Test to see if EFI_SIMPLE_TEXT_INPUT_PROTOCOL is supported on ControllerHandle.
+ Test to see if EFI_SIMPLE_TEXT_INPUT_PROTOCOL is supported on ControllerHandle.
@param This Protocol instance pointer.
@param ControllerHandle Handle of device to test.
@@ -94,7 +94,7 @@ ConPlatformTextInDriverBindingSupported ( );
/**
- Test to see if EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL is supported on ControllerHandle.
+ Test to see if EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL is supported on ControllerHandle.
@param This Protocol instance pointer.
@param ControllerHandle Handle of device to test.
@@ -119,9 +119,9 @@ ConPlatformTextOutDriverBindingSupported ( Start this driver on ControllerHandle by opening Simple Text Input Protocol,
reading Device Path, and installing Console In Devcice GUID on ControllerHandle.
- If this devcie is not one hot-plug devce, append its device path into the
+ If this devcie is not one hot-plug devce, append its device path into the
console environment variables ConInDev.
-
+
@param This Protocol instance pointer.
@param ControllerHandle Handle of device to bind driver to
@param RemainingDevicePath Optional parameter use to pick a specific child
@@ -147,9 +147,9 @@ ConPlatformTextInDriverBindingStart ( reading Device Path, and installing Console Out Devcic GUID, Standard Error
Device GUID on ControllerHandle.
- If this devcie is not one hot-plug devce, append its device path into the
+ If this devcie is not one hot-plug devce, append its device path into the
console environment variables ConOutDev, StdErrDev.
-
+
@param This Protocol instance pointer.
@param ControllerHandle Handle of device to bind driver to
@param RemainingDevicePath Optional parameter use to pick a specific child
@@ -169,7 +169,7 @@ ConPlatformTextOutDriverBindingStart ( );
/**
- Stop this driver on ControllerHandle by removing Console In Devcice GUID
+ Stop this driver on ControllerHandle by removing Console In Devcice GUID
and closing the Simple Text Input protocol on ControllerHandle.
@param This Protocol instance pointer.
@@ -192,7 +192,7 @@ ConPlatformTextInDriverBindingStop ( );
/**
- Stop this driver on ControllerHandle by removing Console Out Devcice GUID
+ Stop this driver on ControllerHandle by removing Console Out Devcice GUID
and closing the Simple Text Output protocol on ControllerHandle.
@param This Protocol instance pointer.
@@ -236,7 +236,7 @@ ConPlatformUnInstallProtocol ( @param Name String part of EFI variable name
@return Dynamically allocated memory that contains a copy of the EFI variable.
- Caller is repsoncible freeing the buffer. Return NULL means Variable
+ Caller is repsoncible freeing the buffer. Return NULL means Variable
was not read.
**/
diff --git a/MdeModulePkg/Universal/Console/ConPlatformDxe/ConPlatformDxe.inf b/MdeModulePkg/Universal/Console/ConPlatformDxe/ConPlatformDxe.inf index 1d404df..bc57e2c 100644 --- a/MdeModulePkg/Universal/Console/ConPlatformDxe/ConPlatformDxe.inf +++ b/MdeModulePkg/Universal/Console/ConPlatformDxe/ConPlatformDxe.inf @@ -4,7 +4,7 @@ # Console Platfrom DXE Driver that specifies whether device can be used as console
# input/output device or error output device and update global variables accordingly.
#
-# Copyright (c) 2006 - 2017, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>
#
# This program and the accompanying materials
# are licensed and made available under the terms and conditions of the BSD License
@@ -96,4 +96,4 @@ gEfiGraphicsOutputProtocolGuid ## SOMETIMES_CONSUMES
[UserExtensions.TianoCore."ExtraFiles"]
- ConPlatformDxeExtra.uni
\ No newline at end of file + ConPlatformDxeExtra.uni
diff --git a/MdeModulePkg/Universal/Console/ConPlatformDxe/ConPlatformDxeExtra.uni b/MdeModulePkg/Universal/Console/ConPlatformDxe/ConPlatformDxeExtra.uni index 8edad9e..ef9fc30 100644 --- a/MdeModulePkg/Universal/Console/ConPlatformDxe/ConPlatformDxeExtra.uni +++ b/MdeModulePkg/Universal/Console/ConPlatformDxe/ConPlatformDxeExtra.uni @@ -1,7 +1,7 @@ // /** @file
// ConPlatformDxe Localized Strings and Content
//
-// Copyright (c) 2013 - 2014, Intel Corporation. All rights reserved.<BR>
+// Copyright (c) 2013 - 2018, Intel Corporation. All rights reserved.<BR>
//
// This program and the accompanying materials
// are licensed and made available under the terms and conditions of the BSD License
@@ -12,8 +12,8 @@ //
// **/
-#string STR_PROPERTIES_MODULE_NAME
-#language en-US
+#string STR_PROPERTIES_MODULE_NAME
+#language en-US
"Console Platform DXE Driver"
diff --git a/MdeModulePkg/Universal/Console/ConSplitterDxe/ComponentName.c b/MdeModulePkg/Universal/Console/ConSplitterDxe/ComponentName.c index 9ad1726..e985657 100644 --- a/MdeModulePkg/Universal/Console/ConSplitterDxe/ComponentName.c +++ b/MdeModulePkg/Universal/Console/ConSplitterDxe/ComponentName.c @@ -1,7 +1,7 @@ /** @file
UEFI Component Name(2) protocol implementation for ConSplitter driver.
-Copyright (c) 2006 - 2011, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>
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
@@ -225,7 +225,7 @@ ConSplitterComponentNameGetDriverName ( This->SupportedLanguages,
mConSplitterDriverNameTable,
DriverName,
- (BOOLEAN)((This == &gConSplitterConInComponentName) ||
+ (BOOLEAN)((This == &gConSplitterConInComponentName) ||
(This == &gConSplitterSimplePointerComponentName) ||
(This == &gConSplitterAbsolutePointerComponentName) ||
(This == &gConSplitterConOutComponentName) ||
diff --git a/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitter.c b/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitter.c index 931630d..763f3fa 100644 --- a/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitter.c +++ b/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitter.c @@ -31,7 +31,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. #include "ConSplitter.h"
//
-// Identify if ConIn is connected in PcdConInConnectOnDemand enabled mode.
+// Identify if ConIn is connected in PcdConInConnectOnDemand enabled mode.
// default not connect
//
BOOLEAN mConInIsConnect = FALSE;
@@ -567,7 +567,7 @@ ConSplitterDriverEntry( &mStdErr.TextOut,
NULL
);
- if (!EFI_ERROR (Status)) {
+ if (!EFI_ERROR (Status)) {
//
// Update the EFI System Table with new virtual console
// and update the pointer to Text Output protocol.
@@ -576,7 +576,7 @@ ConSplitterDriverEntry( gST->StdErr = &mStdErr.TextOut;
}
}
-
+
//
// Update the CRC32 in the EFI System Table header
//
@@ -2298,7 +2298,7 @@ ConSplitterGrowMapTable ( Size = Private->CurrentNumberOfConsoles * sizeof (INT32);
Index = 0;
SrcAddress = OldTextOutModeMap;
- NewStepSize = NewSize / sizeof(INT32);
+ NewStepSize = NewSize / sizeof(INT32);
// If Private->CurrentNumberOfConsoles is not zero and OldTextOutModeMap
// is not NULL, it indicates that the original TextOutModeMap is not enough
// for the new console devices and has been enlarged by CONSOLE_SPLITTER_ALLOC_UNIT columns.
@@ -2972,7 +2972,7 @@ Done: //
// Force GraphicsOutput mode to be set,
//
-
+
Mode = &Private->GraphicsOutputModeBuffer[CurrentIndex];
if ((GraphicsOutput != NULL) &&
(Mode->HorizontalResolution == CurrentGraphicsOutputMode->Info->HorizontalResolution) &&
@@ -3051,7 +3051,7 @@ ConsplitterSetConsoleOutMode ( MaxMode = (UINTN) (TextOut->Mode->MaxMode);
MaxModeInfo.Column = 0;
- MaxModeInfo.Row = 0;
+ MaxModeInfo.Row = 0;
ModeInfo.Column = PcdGet32 (PcdConOutColumn);
ModeInfo.Row = PcdGet32 (PcdConOutRow);
@@ -3191,7 +3191,7 @@ ConSplitterTextOutAddDevice ( DeviceStatus = EFI_DEVICE_ERROR;
Status = EFI_DEVICE_ERROR;
-
+
//
// This device display mode will be added into Graphics Ouput modes.
//
@@ -3361,7 +3361,7 @@ ConSplitterTextOutDeleteDevice ( Private->VirtualHandle,
&gEfiUgaDrawProtocolGuid,
&Private->UgaDraw
- );
+ );
} else if (!FeaturePcdGet (PcdConOutUgaSupport)) {
Status = gBS->UninstallProtocolInterface (
Private->VirtualHandle,
@@ -3536,7 +3536,7 @@ ConSplitterTextInPrivateReadKeyStroke ( EFI_STATUS Status;
UINTN Index;
EFI_KEY_DATA KeyData;
-
+
//
// Return the first saved non-NULL key.
//
@@ -3616,7 +3616,7 @@ ConSplitterTextInReadKeyStroke ( // Signal ConnectConIn event on first call in Lazy ConIn mode
//
if (!mConInIsConnect && PcdGetBool (PcdConInConnectOnDemand)) {
- DEBUG ((EFI_D_INFO, "Connect ConIn in first ReadKeyStoke in Lazy ConIn mode.\n"));
+ DEBUG ((EFI_D_INFO, "Connect ConIn in first ReadKeyStoke in Lazy ConIn mode.\n"));
gBS->SignalEvent (Private->ConnectConInEvent);
mConInIsConnect = TRUE;
}
@@ -3810,7 +3810,7 @@ ConSplitterTextInReadKeyStrokeEx ( // Signal ConnectConIn event on first call in Lazy ConIn mode
//
if (!mConInIsConnect && PcdGetBool (PcdConInConnectOnDemand)) {
- DEBUG ((EFI_D_INFO, "Connect ConIn in first ReadKeyStoke in Lazy ConIn mode.\n"));
+ DEBUG ((EFI_D_INFO, "Connect ConIn in first ReadKeyStoke in Lazy ConIn mode.\n"));
gBS->SignalEvent (Private->ConnectConInEvent);
mConInIsConnect = TRUE;
}
@@ -3877,7 +3877,7 @@ ConSplitterTextInReadKeyStrokeEx ( for (Index = 0; Index < Private->CurrentNumberOfKeys; Index++) {
CopyMem (&Private->KeyQueue[Index].KeyState, &KeyState, sizeof (EFI_KEY_STATE));
}
-
+
//
// Return the first saved key.
//
@@ -4642,7 +4642,7 @@ ConSplitterTextOutOutputString ( Private->TextOutMode.CursorRow = Private->TextOutList[0].TextOut->Mode->CursorRow;
} else {
//
- // When there is no real console devices in system,
+ // When there is no real console devices in system,
// update cursor position for the virtual device in consplitter.
//
Private->TextOut.QueryMode (
@@ -4650,28 +4650,28 @@ ConSplitterTextOutOutputString ( Private->TextOutMode.Mode,
&MaxColumn,
&MaxRow
- );
+ );
for (; *WString != CHAR_NULL; WString++) {
switch (*WString) {
case CHAR_BACKSPACE:
if (Private->TextOutMode.CursorColumn == 0 && Private->TextOutMode.CursorRow > 0) {
Private->TextOutMode.CursorRow--;
- Private->TextOutMode.CursorColumn = (INT32) (MaxColumn - 1);
+ Private->TextOutMode.CursorColumn = (INT32) (MaxColumn - 1);
} else if (Private->TextOutMode.CursorColumn > 0) {
Private->TextOutMode.CursorColumn--;
}
break;
-
+
case CHAR_LINEFEED:
if (Private->TextOutMode.CursorRow < (INT32) (MaxRow - 1)) {
Private->TextOutMode.CursorRow++;
}
break;
-
+
case CHAR_CARRIAGE_RETURN:
Private->TextOutMode.CursorColumn = 0;
break;
-
+
default:
if (Private->TextOutMode.CursorColumn < (INT32) (MaxColumn - 1)) {
Private->TextOutMode.CursorColumn++;
diff --git a/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterDxe.inf b/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterDxe.inf index ff10a50..a191ebc 100644 --- a/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterDxe.inf +++ b/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterDxe.inf @@ -10,7 +10,7 @@ # Note: If only UGA Draw protocol is installed in system, PcdUgaConsumeSupport should be
# set to TRUE.
#
-# Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>
#
# This program and the accompanying materials
# are licensed and made available under the terms and conditions of the BSD License
@@ -92,7 +92,7 @@ ## TO_START
gEfiSimpleTextInputExProtocolGuid
## PRODUCES
- ## TO_START
+ ## TO_START
gEfiSimpleTextOutProtocolGuid
## SOMETIMES_PRODUCES
## SOMETIMES_CONSUMES
diff --git a/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterDxeExtra.uni b/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterDxeExtra.uni index c05a539..31f563c 100644 --- a/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterDxeExtra.uni +++ b/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterDxeExtra.uni @@ -1,7 +1,7 @@ // /** @file
// ConSplitterDxe Localized Strings and Content
//
-// Copyright (c) 2013 - 2014, Intel Corporation. All rights reserved.<BR>
+// Copyright (c) 2013 - 2018, Intel Corporation. All rights reserved.<BR>
//
// This program and the accompanying materials
// are licensed and made available under the terms and conditions of the BSD License
@@ -12,8 +12,8 @@ //
// **/
-#string STR_PROPERTIES_MODULE_NAME
-#language en-US
+#string STR_PROPERTIES_MODULE_NAME
+#language en-US
"Console Splitter DXE Driver"
diff --git a/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterGraphics.c b/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterGraphics.c index b7cdd7a..b40b5cb 100644 --- a/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterGraphics.c +++ b/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterGraphics.c @@ -1,7 +1,7 @@ /** @file
Support for Graphics output spliter.
-
-Copyright (c) 2006 - 2011, Intel Corporation. All rights reserved.<BR>
+
+Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>
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
@@ -58,7 +58,7 @@ ConSplitterGraphicsOutputQueryMode ( Private = GRAPHICS_OUTPUT_SPLITTER_PRIVATE_DATA_FROM_THIS (This);
GraphicsOutput = NULL;
-
+
if (Private->CurrentNumberOfGraphicsOutput == 1) {
//
// Find the only one GraphicsOutput.
@@ -70,7 +70,7 @@ ConSplitterGraphicsOutputQueryMode ( }
}
}
-
+
if (GraphicsOutput != NULL) {
//
// If only one physical GOP device exist, return its information.
@@ -79,7 +79,7 @@ ConSplitterGraphicsOutputQueryMode ( return Status;
} else {
//
- // If 2 more phyiscal GOP device exist or GOP protocol does not exist,
+ // If 2 more phyiscal GOP device exist or GOP protocol does not exist,
// return GOP information (PixelFormat is PixelBltOnly) created in ConSplitterAddGraphicsOutputMode ().
//
*Info = AllocatePool (sizeof (EFI_GRAPHICS_OUTPUT_MODE_INFORMATION));
@@ -191,7 +191,7 @@ ConSplitterGraphicsOutputSetMode ( This->Mode->FrameBufferSize = PhysicalGraphicsOutput->Mode->FrameBufferSize;
} else {
//
- // If 2 more phyiscal GOP device exist or GOP protocol does not exist,
+ // If 2 more phyiscal GOP device exist or GOP protocol does not exist,
// return GOP information (PixelFormat is PixelBltOnly) created in ConSplitterAddGraphicsOutputMode ().
//
CopyMem (This->Mode->Info, &Private->GraphicsOutputModeBuffer[ModeNumber], This->Mode->SizeOfInfo);
@@ -273,7 +273,7 @@ ConSplitterGraphicsOutputBlt ( if (This == NULL || ((UINTN) BltOperation) >= EfiGraphicsOutputBltOperationMax) {
return EFI_INVALID_PARAMETER;
}
-
+
Private = GRAPHICS_OUTPUT_SPLITTER_PRIVATE_DATA_FROM_THIS (This);
ReturnStatus = EFI_SUCCESS;
diff --git a/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsole.c b/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsole.c index 7b1c37b..444773d 100644 --- a/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsole.c +++ b/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsole.c @@ -1,7 +1,7 @@ /** @file
This is the main routine for initializing the Graphics Console support routines.
-Copyright (c) 2006 - 2016, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>
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
@@ -245,8 +245,8 @@ InitializeGraphicsConsoleTextMode ( UINTN ValidCount;
UINTN ValidIndex;
UINTN MaxColumns;
- UINTN MaxRows;
-
+ UINTN MaxRows;
+
if ((TextModeCount == NULL) || (TextModeData == NULL)) {
return EFI_INVALID_PARAMETER;
}
@@ -287,7 +287,7 @@ InitializeGraphicsConsoleTextMode ( //
// Mode 0 and mode 1 is for 80x25, 80x50 according to UEFI spec.
//
- ValidCount = 0;
+ ValidCount = 0;
NewModeBuffer[ValidCount].Columns = 80;
NewModeBuffer[ValidCount].Rows = 25;
@@ -295,20 +295,20 @@ InitializeGraphicsConsoleTextMode ( NewModeBuffer[ValidCount].GopHeight = VerticalResolution;
NewModeBuffer[ValidCount].GopModeNumber = GopModeNumber;
NewModeBuffer[ValidCount].DeltaX = (HorizontalResolution - (NewModeBuffer[ValidCount].Columns * EFI_GLYPH_WIDTH)) >> 1;
- NewModeBuffer[ValidCount].DeltaY = (VerticalResolution - (NewModeBuffer[ValidCount].Rows * EFI_GLYPH_HEIGHT)) >> 1;
+ NewModeBuffer[ValidCount].DeltaY = (VerticalResolution - (NewModeBuffer[ValidCount].Rows * EFI_GLYPH_HEIGHT)) >> 1;
ValidCount++;
if ((MaxColumns >= 80) && (MaxRows >= 50)) {
NewModeBuffer[ValidCount].Columns = 80;
NewModeBuffer[ValidCount].Rows = 50;
NewModeBuffer[ValidCount].DeltaX = (HorizontalResolution - (80 * EFI_GLYPH_WIDTH)) >> 1;
- NewModeBuffer[ValidCount].DeltaY = (VerticalResolution - (50 * EFI_GLYPH_HEIGHT)) >> 1;
+ NewModeBuffer[ValidCount].DeltaY = (VerticalResolution - (50 * EFI_GLYPH_HEIGHT)) >> 1;
}
NewModeBuffer[ValidCount].GopWidth = HorizontalResolution;
NewModeBuffer[ValidCount].GopHeight = VerticalResolution;
NewModeBuffer[ValidCount].GopModeNumber = GopModeNumber;
ValidCount++;
-
+
//
// Start from mode 2 to put the valid mode other than 80x25 and 80x50 in the output mode buffer.
//
@@ -340,14 +340,14 @@ InitializeGraphicsConsoleTextMode ( ValidCount++;
}
}
-
+
DEBUG_CODE (
for (Index = 0; Index < ValidCount; Index++) {
- DEBUG ((EFI_D_INFO, "Graphics - Mode %d, Column = %d, Row = %d\n",
- Index, NewModeBuffer[Index].Columns, NewModeBuffer[Index].Rows));
+ DEBUG ((EFI_D_INFO, "Graphics - Mode %d, Column = %d, Row = %d\n",
+ Index, NewModeBuffer[Index].Columns, NewModeBuffer[Index].Rows));
}
);
-
+
//
// Return valid mode count and mode information buffer.
//
@@ -388,9 +388,9 @@ GraphicsConsoleControllerDriverStart ( UINTN MaxMode;
UINT32 ModeNumber;
EFI_GRAPHICS_OUTPUT_PROTOCOL_MODE *Mode;
- UINTN SizeOfInfo;
+ UINTN SizeOfInfo;
EFI_GRAPHICS_OUTPUT_MODE_INFORMATION *Info;
-
+
ModeNumber = 0;
//
@@ -442,9 +442,9 @@ GraphicsConsoleControllerDriverStart ( if ((HorizontalResolution == 0x0) || (VerticalResolution == 0x0)) {
//
// Find the highest resolution which GOP supports.
- //
+ //
MaxMode = Private->GraphicsOutput->Mode->MaxMode;
-
+
for (ModeIndex = 0; ModeIndex < MaxMode; ModeIndex++) {
Status = Private->GraphicsOutput->QueryMode (
Private->GraphicsOutput,
@@ -581,7 +581,7 @@ GraphicsConsoleControllerDriverStart ( Status = GraphicsConsoleConOutOutputString (&Private->SimpleTextOutput, (CHAR16 *)L"Graphics Console Started\n\r");
if (EFI_ERROR (Status)) {
goto Error;
- }
+ }
DEBUG_CODE_END ();
//
@@ -915,7 +915,7 @@ GraphicsConsoleConOutOutputString ( }
Status = EFI_SUCCESS;
-
+
OldTpl = gBS->RaiseTPL (TPL_NOTIFY);
//
// Current mode
@@ -1305,7 +1305,7 @@ GraphicsConsoleConOutSetMode ( Status = EFI_UNSUPPORTED;
goto Done;
}
-
+
ModeData = &(Private->ModeData[ModeNumber]);
if (ModeData->Columns <= 0 && ModeData->Rows <= 0) {
@@ -1443,7 +1443,7 @@ GraphicsConsoleConOutSetMode ( This->Mode->CursorColumn = 0;
This->Mode->CursorRow = 0;
- FlushCursor (This);
+ FlushCursor (This);
Status = EFI_SUCCESS;
@@ -1527,7 +1527,7 @@ GraphicsConsoleConOutClearScreen ( EFI_GRAPHICS_OUTPUT_BLT_PIXEL Foreground;
EFI_GRAPHICS_OUTPUT_BLT_PIXEL Background;
EFI_TPL OldTpl;
-
+
if (This->Mode->Mode == -1) {
//
// If current mode is not valid, return error.
@@ -1876,11 +1876,11 @@ DrawUnicodeWeightAtCursorN ( /**
Flush the cursor on the screen.
-
+
If CursorVisible is FALSE, nothing to do and return directly.
- If CursorVisible is TRUE,
+ If CursorVisible is TRUE,
i) If the cursor shows on screen, it will be erased.
- ii) If the cursor does not show on screen, it will be shown.
+ ii) If the cursor does not show on screen, it will be shown.
@param This Protocol instance pointer.
diff --git a/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsole.h b/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsole.h index 0db6f04..be43f2a 100644 --- a/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsole.h +++ b/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsole.h @@ -1,7 +1,7 @@ /** @file
Header file for GraphicsConsole driver.
-Copyright (c) 2006 - 2011, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>
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
@@ -209,7 +209,7 @@ GraphicsConsoleComponentNameGetControllerName ( /**
Reset the text output device hardware and optionally run diagnostics.
-
+
Implements SIMPLE_TEXT_OUTPUT.Reset().
If ExtendeVerification is TRUE, then perform dependent Graphics Console
device reset, and set display mode to mode 0.
@@ -235,7 +235,7 @@ GraphicsConsoleConOutReset ( /**
Write a Unicode string to the output device.
- Implements SIMPLE_TEXT_OUTPUT.OutputString().
+ Implements SIMPLE_TEXT_OUTPUT.OutputString().
The Unicode string will be converted to Glyphs and will be
sent to the Graphics Console.
@@ -262,7 +262,7 @@ GraphicsConsoleConOutOutputString ( );
/**
- Verifies that all characters in a Unicode string can be output to the
+ Verifies that all characters in a Unicode string can be output to the
target device.
Implements SIMPLE_TEXT_OUTPUT.TestString().
@@ -316,7 +316,7 @@ GraphicsConsoleConOutQueryMode ( /**
Sets the output device(s) to a specified mode.
-
+
Implements SIMPLE_TEXT_OUTPUT.SetMode().
Set the Graphics Console to a specified mode. In this driver, we only support mode 0.
@@ -324,7 +324,7 @@ GraphicsConsoleConOutQueryMode ( @param ModeNumber The text mode to set.
@retval EFI_SUCCESS The requested text mode is set.
- @retval EFI_DEVICE_ERROR The requested text mode cannot be set because of
+ @retval EFI_DEVICE_ERROR The requested text mode cannot be set because of
Graphics Console device error.
@retval EFI_UNSUPPORTED The text mode number is not valid.
@@ -344,7 +344,7 @@ GraphicsConsoleConOutSetMode ( @param This Protocol instance pointer.
@param Attribute The attribute to set. Bits 0..3 are the foreground
- color, and bits 4..6 are the background color.
+ color, and bits 4..6 are the background color.
All other bits are undefined and must be zero.
@retval EFI_SUCCESS The requested attribute is set.
@@ -360,7 +360,7 @@ GraphicsConsoleConOutSetAttribute ( );
/**
- Clears the output device(s) display to the currently selected background
+ Clears the output device(s) display to the currently selected background
color.
Implements SIMPLE_TEXT_OUTPUT.ClearScreen().
@@ -451,10 +451,10 @@ GraphicsConsoleControllerDriverSupported ( /**
- Start this driver on Controller by opening Graphics Output protocol or
+ Start this driver on Controller by opening Graphics Output protocol or
UGA Draw protocol, and installing Simple Text Out protocol on Controller.
(UGA Draw protocol could be skipped if PcdUgaConsumeSupport is set to FALSE.)
-
+
@param This Protocol instance pointer.
@param Controller Handle of device to bind driver to
@param RemainingDevicePath Optional parameter use to pick a specific child
@@ -473,10 +473,10 @@ GraphicsConsoleControllerDriverStart ( );
/**
- Stop this driver on Controller by removing Simple Text Out protocol
+ Stop this driver on Controller by removing Simple Text Out protocol
and closing the Graphics Output Protocol or UGA Draw protocol on Controller.
(UGA Draw protocol could be skipped if PcdUgaConsumeSupport is set to FALSE.)
-
+
@param This Protocol instance pointer.
@param Controller Handle of device to stop driver on
@@ -485,7 +485,7 @@ GraphicsConsoleControllerDriverStart ( @param ChildHandleBuffer List of Child Handles to Stop.
@retval EFI_SUCCESS This driver is removed Controller.
- @retval EFI_NOT_STARTED Simple Text Out protocol could not be found the
+ @retval EFI_NOT_STARTED Simple Text Out protocol could not be found the
Controller.
@retval other This driver was not removed from this device.
@@ -503,9 +503,9 @@ GraphicsConsoleControllerDriverStop ( /**
Locate HII Database protocol and HII Font protocol.
- @retval EFI_SUCCESS HII Database protocol and HII Font protocol
+ @retval EFI_SUCCESS HII Database protocol and HII Font protocol
are located successfully.
- @return other Failed to locate HII Database protocol or
+ @return other Failed to locate HII Database protocol or
HII Font protocol.
**/
@@ -554,11 +554,11 @@ DrawUnicodeWeightAtCursorN ( /**
Flush the cursor on the screen.
-
+
If CursorVisible is FALSE, nothing to do and return directly.
- If CursorVisible is TRUE,
+ If CursorVisible is TRUE,
i) If the cursor shows on screen, it will be erased.
- ii) If the cursor does not show on screen, it will be shown.
+ ii) If the cursor does not show on screen, it will be shown.
@param This Protocol instance pointer.
@@ -575,17 +575,17 @@ FlushCursor ( for the Graphics Console device based on Graphics Output Protocol.
If yes, set the graphic device's current mode to this specific mode.
-
+
@param GraphicsOutput Graphics Output Protocol instance pointer.
@param HorizontalResolution User defined horizontal resolution
@param VerticalResolution User defined vertical resolution.
@param CurrentModeNumber Current specific mode to be check.
@retval EFI_SUCCESS The mode is supported.
- @retval EFI_UNSUPPORTED The specific mode is out of range of graphics
+ @retval EFI_UNSUPPORTED The specific mode is out of range of graphics
device supported.
- @retval other The specific mode does not support user defined
- resolution or failed to set the current mode to the
+ @retval other The specific mode does not support user defined
+ resolution or failed to set the current mode to the
specific mode on graphics device.
**/
diff --git a/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsoleDxe.inf b/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsoleDxe.inf index ccf4497..bf387cd 100644 --- a/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsoleDxe.inf +++ b/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsoleDxe.inf @@ -3,8 +3,8 @@ #
# This driver will install Simple Text Output protocol by consuming Graphices Output
# protocol or UGA Draw protocol on graphic devices.
-#
-# Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.<BR>
+#
+# Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>
# 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
diff --git a/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsoleDxeExtra.uni b/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsoleDxeExtra.uni index 9dc3e4e..ff2237c 100644 --- a/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsoleDxeExtra.uni +++ b/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsoleDxeExtra.uni @@ -1,7 +1,7 @@ // /** @file
// GraphicsConsoleDxe Localized Strings and Content
//
-// Copyright (c) 2013 - 2014, Intel Corporation. All rights reserved.<BR>
+// Copyright (c) 2013 - 2018, Intel Corporation. All rights reserved.<BR>
//
// This program and the accompanying materials
// are licensed and made available under the terms and conditions of the BSD License
@@ -12,8 +12,8 @@ //
// **/
-#string STR_PROPERTIES_MODULE_NAME
-#language en-US
+#string STR_PROPERTIES_MODULE_NAME
+#language en-US
"Graphics Console DXE Driver"
diff --git a/MdeModulePkg/Universal/Console/TerminalDxe/Ansi.c b/MdeModulePkg/Universal/Console/TerminalDxe/Ansi.c index 15147c1..63a5dff 100644 --- a/MdeModulePkg/Universal/Console/TerminalDxe/Ansi.c +++ b/MdeModulePkg/Universal/Console/TerminalDxe/Ansi.c @@ -1,7 +1,7 @@ /** @file
Implementation of translation upon PC ANSI.
-Copyright (c) 2006 - 2008, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>
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
@@ -47,8 +47,8 @@ AnsiRawDataToUnicode ( or valid text graphics.
@param TerminalDevice The terminal device.
- @param WString The input string.
-
+ @param WString The input string.
+
@retval EFI_UNSUPPORTED If not all input characters are valid.
@retval EFI_SUCCESS If all input characters are valid.
diff --git a/MdeModulePkg/Universal/Console/TerminalDxe/Terminal.h b/MdeModulePkg/Universal/Console/TerminalDxe/Terminal.h index 7dded00..a4543fc 100644 --- a/MdeModulePkg/Universal/Console/TerminalDxe/Terminal.h +++ b/MdeModulePkg/Universal/Console/TerminalDxe/Terminal.h @@ -1,7 +1,7 @@ /** @file
Header file for Terminal driver.
-Copyright (c) 2006 - 2017, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>
Copyright (C) 2016 Silicon Graphics, Inc. All rights reserved.<BR>
This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License
@@ -1090,7 +1090,7 @@ UnicodeFiFoInsertOneKey ( /**
Remove one pre-fetched key out of the Unicode FIFO buffer.
- The caller should guarantee that Unicode FIFO buffer is not empty
+ The caller should guarantee that Unicode FIFO buffer is not empty
by IsUnicodeFiFoEmpty ().
@param TerminalDevice Terminal driver private structure.
@@ -1292,10 +1292,10 @@ VTUTF8TestString ( Translate one Unicode character into VT-UTF8 characters.
UTF8 Encoding Table
- Bits per Character | Unicode Character Range | Unicode Binary Encoding | UTF8 Binary Encoding
- 0-7 | 0x0000 - 0x007F | 00000000 0xxxxxxx | 0xxxxxxx
- 8-11 | 0x0080 - 0x07FF | 00000xxx xxxxxxxx | 110xxxxx 10xxxxxx
- 12-16 | 0x0800 - 0xFFFF | xxxxxxxx xxxxxxxx | 1110xxxx 10xxxxxx 10xxxxxx
+ Bits per Character | Unicode Character Range | Unicode Binary Encoding | UTF8 Binary Encoding
+ 0-7 | 0x0000 - 0x007F | 00000000 0xxxxxxx | 0xxxxxxx
+ 8-11 | 0x0080 - 0x07FF | 00000xxx xxxxxxxx | 110xxxxx 10xxxxxx
+ 12-16 | 0x0800 - 0xFFFF | xxxxxxxx xxxxxxxx | 1110xxxx 10xxxxxx 10xxxxxx
@param Unicode Unicode character need translating.
@@ -1331,10 +1331,10 @@ GetOneValidUtf8Char ( Translate VT-UTF8 characters into one Unicode character.
UTF8 Encoding Table
- Bits per Character | Unicode Character Range | Unicode Binary Encoding | UTF8 Binary Encoding
- 0-7 | 0x0000 - 0x007F | 00000000 0xxxxxxx | 0xxxxxxx
- 8-11 | 0x0080 - 0x07FF | 00000xxx xxxxxxxx | 110xxxxx 10xxxxxx
- 12-16 | 0x0800 - 0xFFFF | xxxxxxxx xxxxxxxx | 1110xxxx 10xxxxxx 10xxxxxx
+ Bits per Character | Unicode Character Range | Unicode Binary Encoding | UTF8 Binary Encoding
+ 0-7 | 0x0000 - 0x007F | 00000000 0xxxxxxx | 0xxxxxxx
+ 8-11 | 0x0080 - 0x07FF | 00000xxx xxxxxxxx | 110xxxxx 10xxxxxx
+ 12-16 | 0x0800 - 0xFFFF | xxxxxxxx xxxxxxxx | 1110xxxx 10xxxxxx 10xxxxxx
@param Utf8Char VT-UTF8 character set needs translating.
diff --git a/MdeModulePkg/Universal/Console/TerminalDxe/TerminalConIn.c b/MdeModulePkg/Universal/Console/TerminalDxe/TerminalConIn.c index 9931637..80c4f6b 100644 --- a/MdeModulePkg/Universal/Console/TerminalDxe/TerminalConIn.c +++ b/MdeModulePkg/Universal/Console/TerminalDxe/TerminalConIn.c @@ -632,7 +632,7 @@ KeyNotifyProcessHandler ( while (TRUE) {
//
// Enter critical section
- //
+ //
OldTpl = gBS->RaiseTPL (TPL_NOTIFY);
HasKey = EfiKeyFiFoForNotifyRemoveOneKey (TerminalDevice->EfiKeyFiFoForNotify, &Key);
CopyMem (&KeyData.Key, &Key, sizeof (EFI_INPUT_KEY));
@@ -1128,7 +1128,7 @@ UnicodeFiFoInsertOneKey ( /**
Remove one pre-fetched key out of the Unicode FIFO buffer.
- The caller should guarantee that Unicode FIFO buffer is not empty
+ The caller should guarantee that Unicode FIFO buffer is not empty
by IsUnicodeFiFoEmpty ().
@param TerminalDevice Terminal driver private structure.
@@ -1304,10 +1304,10 @@ UnicodeToEfiKeyFlushState ( There is one special input sequence that will force the system to reset.
This is ESC R ESC r ESC R.
- Note: current implementation support terminal types include: PC ANSI, VT100+/VTUTF8, VT100.
+ Note: current implementation support terminal types include: PC ANSI, VT100+/VTUTF8, VT100.
The table below is not same with UEFI Spec 2.3 Appendix B Table 201(not support ANSI X3.64 /
DEC VT200-500 and extra support PC ANSI, VT100)since UEFI Table 201 is just an example.
-
+
Symbols used in table below
===========================
ESC = 0x1B
diff --git a/MdeModulePkg/Universal/Console/TerminalDxe/TerminalConOut.c b/MdeModulePkg/Universal/Console/TerminalDxe/TerminalConOut.c index 5a83431..4d7218e 100644 --- a/MdeModulePkg/Universal/Console/TerminalDxe/TerminalConOut.c +++ b/MdeModulePkg/Universal/Console/TerminalDxe/TerminalConOut.c @@ -1,7 +1,7 @@ /** @file
Implementation for EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL protocol.
-Copyright (c) 2006 - 2017, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>
Copyright (C) 2016 Silicon Graphics, Inc. All rights reserved.<BR>
This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License
@@ -451,7 +451,7 @@ TerminalConOutQueryMode ( //
// Get Terminal device data structure pointer.
//
- TerminalDevice = TERMINAL_CON_OUT_DEV_FROM_THIS (This);
+ TerminalDevice = TERMINAL_CON_OUT_DEV_FROM_THIS (This);
*Columns = TerminalDevice->TerminalConsoleModeData[ModeNumber].Columns;
*Rows = TerminalDevice->TerminalConsoleModeData[ModeNumber].Rows;
@@ -469,7 +469,7 @@ TerminalConOutQueryMode ( @param ModeNumber The text mode to set.
@retval EFI_SUCCESS The requested text mode is set.
- @retval EFI_DEVICE_ERROR The requested text mode cannot be set
+ @retval EFI_DEVICE_ERROR The requested text mode cannot be set
because of serial device error.
@retval EFI_UNSUPPORTED The text mode number is not valid.
@@ -911,7 +911,7 @@ TerminalIsValidTextGraphics ( Detects if a valid ASCII char.
@param Ascii An ASCII character.
-
+
@retval TRUE If it is a valid ASCII character.
@retval FALSE If it is not a valid ASCII character.
@@ -935,7 +935,7 @@ TerminalIsValidAscii ( Detects if a valid EFI control character.
@param CharC An input EFI Control character.
-
+
@retval TRUE If it is a valid EFI control character.
@retval FALSE If it is not a valid EFI control character.
diff --git a/MdeModulePkg/Universal/Console/TerminalDxe/TerminalDxeExtra.uni b/MdeModulePkg/Universal/Console/TerminalDxe/TerminalDxeExtra.uni index e2f4945..2679a8f 100644 --- a/MdeModulePkg/Universal/Console/TerminalDxe/TerminalDxeExtra.uni +++ b/MdeModulePkg/Universal/Console/TerminalDxe/TerminalDxeExtra.uni @@ -1,7 +1,7 @@ // /** @file
// TerminalDxe Localized Strings and Content
//
-// Copyright (c) 2013 - 2014, Intel Corporation. All rights reserved.<BR>
+// Copyright (c) 2013 - 2018, Intel Corporation. All rights reserved.<BR>
//
// This program and the accompanying materials
// are licensed and made available under the terms and conditions of the BSD License
@@ -12,8 +12,8 @@ //
// **/
-#string STR_PROPERTIES_MODULE_NAME
-#language en-US
+#string STR_PROPERTIES_MODULE_NAME
+#language en-US
"Terminal DXE Driver"
diff --git a/MdeModulePkg/Universal/Console/TerminalDxe/Vtutf8.c b/MdeModulePkg/Universal/Console/TerminalDxe/Vtutf8.c index 586e8ab..0768273 100644 --- a/MdeModulePkg/Universal/Console/TerminalDxe/Vtutf8.c +++ b/MdeModulePkg/Universal/Console/TerminalDxe/Vtutf8.c @@ -1,7 +1,7 @@ /** @file
Implementation of translation upon VT-UTF8.
-Copyright (c) 2006 - 2010, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>
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
@@ -177,10 +177,10 @@ GetOneValidUtf8Char ( Translate VT-UTF8 characters into one Unicode character.
UTF8 Encoding Table
- Bits per Character | Unicode Character Range | Unicode Binary Encoding | UTF8 Binary Encoding
- 0-7 | 0x0000 - 0x007F | 00000000 0xxxxxxx | 0xxxxxxx
- 8-11 | 0x0080 - 0x07FF | 00000xxx xxxxxxxx | 110xxxxx 10xxxxxx
- 12-16 | 0x0800 - 0xFFFF | xxxxxxxx xxxxxxxx | 1110xxxx 10xxxxxx 10xxxxxx
+ Bits per Character | Unicode Character Range | Unicode Binary Encoding | UTF8 Binary Encoding
+ 0-7 | 0x0000 - 0x007F | 00000000 0xxxxxxx | 0xxxxxxx
+ 8-11 | 0x0080 - 0x07FF | 00000xxx xxxxxxxx | 110xxxxx 10xxxxxx
+ 12-16 | 0x0800 - 0xFFFF | xxxxxxxx xxxxxxxx | 1110xxxx 10xxxxxx 10xxxxxx
@param Utf8Char VT-UTF8 character set needs translating.
@@ -250,10 +250,10 @@ Utf8ToUnicode ( Translate one Unicode character into VT-UTF8 characters.
UTF8 Encoding Table
- Bits per Character | Unicode Character Range | Unicode Binary Encoding | UTF8 Binary Encoding
- 0-7 | 0x0000 - 0x007F | 00000000 0xxxxxxx | 0xxxxxxx
- 8-11 | 0x0080 - 0x07FF | 00000xxx xxxxxxxx | 110xxxxx 10xxxxxx
- 12-16 | 0x0800 - 0xFFFF | xxxxxxxx xxxxxxxx | 1110xxxx 10xxxxxx 10xxxxxx
+ Bits per Character | Unicode Character Range | Unicode Binary Encoding | UTF8 Binary Encoding
+ 0-7 | 0x0000 - 0x007F | 00000000 0xxxxxxx | 0xxxxxxx
+ 8-11 | 0x0080 - 0x07FF | 00000xxx xxxxxxxx | 110xxxxx 10xxxxxx
+ 12-16 | 0x0800 - 0xFFFF | xxxxxxxx xxxxxxxx | 1110xxxx 10xxxxxx 10xxxxxx
@param Unicode Unicode character need translating.
diff --git a/MdeModulePkg/Universal/DebugPortDxe/DebugPort.h b/MdeModulePkg/Universal/DebugPortDxe/DebugPort.h index 3ce702d..0a64ec5 100644 --- a/MdeModulePkg/Universal/DebugPortDxe/DebugPort.h +++ b/MdeModulePkg/Universal/DebugPortDxe/DebugPort.h @@ -1,7 +1,7 @@ /** @file
Definitions and prototypes for DebugPort driver.
-Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>
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
@@ -83,15 +83,15 @@ typedef struct { #define IS_UART_DEVICEPATH(dp) (DevicePathType (dp) == MESSAGING_DEVICE_PATH && DevicePathSubType (dp) == MSG_UART_DP)
/**
- Debug Port Driver entry point.
+ Debug Port Driver entry point.
Reads DebugPort variable to determine what device and settings to use as the
debug port. Binds exclusively to SerialIo. Reverts to defaults if no variable
is found.
- @param[in] ImageHandle The firmware allocated handle for the EFI image.
+ @param[in] ImageHandle The firmware allocated handle for the EFI image.
@param[in] SystemTable A pointer to the EFI System Table.
-
+
@retval EFI_SUCCESS The entry point is executed successfully.
@retval EFI_OUT_OF_RESOURCES Fails to allocate memory for device.
@retval other Some error occurs when executing this entry point.
@@ -105,7 +105,7 @@ InitializeDebugPortDriver ( );
/**
- Checks to see if there's not already a DebugPort interface somewhere.
+ Checks to see if there's not already a DebugPort interface somewhere.
If there's a DEBUGPORT variable, the device path must match exactly. If there's
no DEBUGPORT variable, then device path is not checked and does not matter.
@@ -144,7 +144,7 @@ DebugPortSupported ( @retval EFI_SUCCESS This driver is added to ControllerHandle.
@retval EFI_OUT_OF_RESOURCES Fails to allocate memory for device.
- @retval others Some error occurs.
+ @retval others Some error occurs.
**/
EFI_STATUS
@@ -316,7 +316,7 @@ DebugPortComponentNameGetControllerName ( The port itself should be fine since it was set up during initialization.
- @param This Protocol instance pointer.
+ @param This Protocol instance pointer.
@return EFI_SUCCESS Always.
@@ -337,8 +337,8 @@ DebugPortReset ( On output, the amount of data actually written.
@param Buffer Pointer to buffer to read.
- @retval EFI_SUCCESS
- @retval others
+ @retval EFI_SUCCESS
+ @retval others
**/
EFI_STATUS
@@ -386,7 +386,7 @@ DebugPortWrite ( DebugPort interface
@retval EFI_DEVICE_ERROR A hardware failure occured... (from SerialIo)
-**/
+**/
EFI_STATUS
EFIAPI
DebugPortPoll (
diff --git a/MdeModulePkg/Universal/DebugPortDxe/DebugPortDxeExtra.uni b/MdeModulePkg/Universal/DebugPortDxe/DebugPortDxeExtra.uni index a1f5f32..1e23258 100644 --- a/MdeModulePkg/Universal/DebugPortDxe/DebugPortDxeExtra.uni +++ b/MdeModulePkg/Universal/DebugPortDxe/DebugPortDxeExtra.uni @@ -1,7 +1,7 @@ // /** @file
// DebugPortDxe Localized Strings and Content
//
-// Copyright (c) 2013 - 2014, Intel Corporation. All rights reserved.<BR>
+// Copyright (c) 2013 - 2018, Intel Corporation. All rights reserved.<BR>
//
// This program and the accompanying materials
// are licensed and made available under the terms and conditions of the BSD License
@@ -12,8 +12,8 @@ //
// **/
-#string STR_PROPERTIES_MODULE_NAME
-#language en-US
+#string STR_PROPERTIES_MODULE_NAME
+#language en-US
"Debug Port DXE Driver"
diff --git a/MdeModulePkg/Universal/DebugSupportDxe/DebugSupport.c b/MdeModulePkg/Universal/DebugSupportDxe/DebugSupport.c index 9a8f86d..b7c1c5c 100644 --- a/MdeModulePkg/Universal/DebugSupportDxe/DebugSupport.c +++ b/MdeModulePkg/Universal/DebugSupportDxe/DebugSupport.c @@ -1,7 +1,7 @@ /** @file
Top level C file for debug support driver. Contains initialization function.
-Copyright (c) 2006 - 2009, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>
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
@@ -24,14 +24,14 @@ EFI_DEBUG_SUPPORT_PROTOCOL mDebugSupportProtocolInterface = { /**
- Debug Support Driver entry point.
+ Debug Support Driver entry point.
- Checks to see if there's not already a Debug Support protocol installed for
+ Checks to see if there's not already a Debug Support protocol installed for
the selected processor before installing it.
- @param[in] ImageHandle The firmware allocated handle for the EFI image.
+ @param[in] ImageHandle The firmware allocated handle for the EFI image.
@param[in] SystemTable A pointer to the EFI System Table.
-
+
@retval EFI_SUCCESS The entry point is executed successfully.
@retval EFI_ALREADY_STARTED Debug Support protocol is installed already.
@retval other Some error occurs when executing this entry point.
@@ -105,7 +105,7 @@ InitializeDebugSupportDriver ( LoadedImageProtocolPtr->Unload = PlUnloadDebugSupportDriver;
//
- // Call hook for processor specific initialization
+ // Call hook for processor specific initialization
//
Status = PlInitializeDebugSupportDriver ();
ASSERT (!EFI_ERROR (Status));
diff --git a/MdeModulePkg/Universal/DebugSupportDxe/DebugSupportDxeExtra.uni b/MdeModulePkg/Universal/DebugSupportDxe/DebugSupportDxeExtra.uni index 9e92374..3beaa7a 100644 --- a/MdeModulePkg/Universal/DebugSupportDxe/DebugSupportDxeExtra.uni +++ b/MdeModulePkg/Universal/DebugSupportDxe/DebugSupportDxeExtra.uni @@ -1,7 +1,7 @@ // /** @file
// DebugSupportDxe Localized Strings and Content
//
-// Copyright (c) 2013 - 2014, Intel Corporation. All rights reserved.<BR>
+// Copyright (c) 2013 - 2018, Intel Corporation. All rights reserved.<BR>
//
// This program and the accompanying materials
// are licensed and made available under the terms and conditions of the BSD License
@@ -12,8 +12,8 @@ //
// **/
-#string STR_PROPERTIES_MODULE_NAME
-#language en-US
+#string STR_PROPERTIES_MODULE_NAME
+#language en-US
"Debug Support DXE Driver"
diff --git a/MdeModulePkg/Universal/DebugSupportDxe/Ia32/DebugSupport.h b/MdeModulePkg/Universal/DebugSupportDxe/Ia32/DebugSupport.h index 7f7d8e5..8e5c5b8 100644 --- a/MdeModulePkg/Universal/DebugSupportDxe/Ia32/DebugSupport.h +++ b/MdeModulePkg/Universal/DebugSupportDxe/Ia32/DebugSupport.h @@ -1,14 +1,14 @@ /** @file
Generic debug support macros, typedefs and prototypes for IA32/x64.
-Copyright (c) 2006 - 2010, Intel Corporation. All rights reserved.<BR>
-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,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>
+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,
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
**/
@@ -90,8 +90,8 @@ Vect2Desc ( );
/**
- Initializes driver's handler registration database.
-
+ Initializes driver's handler registration database.
+
This code executes in boot services context
Must be public because it's referenced from DebugSupport.c
@@ -124,14 +124,14 @@ PlUnloadDebugSupportDriver ( /**
Returns the maximum value that may be used for the ProcessorIndex parameter in
- RegisterPeriodicCallback() and RegisterExceptionCallback().
-
+ RegisterPeriodicCallback() and RegisterExceptionCallback().
+
Hard coded to support only 1 processor for now.
@param This A pointer to the EFI_DEBUG_SUPPORT_PROTOCOL instance.
@param MaxProcessorIndex Pointer to a caller-allocated UINTN in which the maximum supported
- processor index is returned. Always 0 returned.
-
+ processor index is returned. Always 0 returned.
+
@retval EFI_SUCCESS Always returned with **MaxProcessorIndex set to 0.
**/
@@ -144,17 +144,17 @@ GetMaximumProcessorIndex ( /**
Registers a function to be called back periodically in interrupt context.
-
+
@param This A pointer to the EFI_DEBUG_SUPPORT_PROTOCOL instance.
@param ProcessorIndex Specifies which processor the callback function applies to.
@param PeriodicCallback A pointer to a function of type PERIODIC_CALLBACK that is the main
periodic entry point of the debug agent.
-
- @retval EFI_SUCCESS The function completed successfully.
+
+ @retval EFI_SUCCESS The function completed successfully.
@retval EFI_ALREADY_STARTED Non-NULL PeriodicCallback parameter when a callback
- function was previously registered.
- @retval EFI_OUT_OF_RESOURCES System has insufficient memory resources to register new callback
- function.
+ function was previously registered.
+ @retval EFI_OUT_OF_RESOURCES System has insufficient memory resources to register new callback
+ function.
**/
EFI_STATUS
EFIAPI
@@ -168,17 +168,17 @@ RegisterPeriodicCallback ( Registers a function to be called when a given processor exception occurs.
This code executes in boot services context.
-
+
@param This A pointer to the EFI_DEBUG_SUPPORT_PROTOCOL instance.
@param ProcessorIndex Specifies which processor the callback function applies to.
@param ExceptionCallback A pointer to a function of type EXCEPTION_CALLBACK that is called
- when the processor exception specified by ExceptionType occurs.
- @param ExceptionType Specifies which processor exception to hook.
-
- @retval EFI_SUCCESS The function completed successfully.
+ when the processor exception specified by ExceptionType occurs.
+ @param ExceptionType Specifies which processor exception to hook.
+
+ @retval EFI_SUCCESS The function completed successfully.
@retval EFI_ALREADY_STARTED Non-NULL PeriodicCallback parameter when a callback
- function was previously registered.
- @retval EFI_OUT_OF_RESOURCES System has insufficient memory resources to register new callback
+ function was previously registered.
+ @retval EFI_OUT_OF_RESOURCES System has insufficient memory resources to register new callback
function.
**/
EFI_STATUS
@@ -192,14 +192,14 @@ RegisterExceptionCallback ( /**
Invalidates processor instruction cache for a memory range. Subsequent execution in this range
- causes a fresh memory fetch to retrieve code to be executed.
-
+ causes a fresh memory fetch to retrieve code to be executed.
+
@param This A pointer to the EFI_DEBUG_SUPPORT_PROTOCOL instance.
@param ProcessorIndex Specifies which processor's instruction cache is to be invalidated.
- @param Start Specifies the physical base of the memory range to be invalidated.
+ @param Start Specifies the physical base of the memory range to be invalidated.
@param Length Specifies the minimum number of bytes in the processor's instruction
- cache to invalidate.
-
+ cache to invalidate.
+
@retval EFI_SUCCESS Always returned.
**/
diff --git a/MdeModulePkg/Universal/DebugSupportDxe/Ia32/PlDebugSupport.c b/MdeModulePkg/Universal/DebugSupportDxe/Ia32/PlDebugSupport.c index f0c529a..782ce10 100644 --- a/MdeModulePkg/Universal/DebugSupportDxe/Ia32/PlDebugSupport.c +++ b/MdeModulePkg/Universal/DebugSupportDxe/Ia32/PlDebugSupport.c @@ -1,7 +1,7 @@ /** @file
IA32/x64 generic functions to support Debug Support protocol.
-Copyright (c) 2006 - 2010, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>
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
@@ -84,7 +84,7 @@ HookEntry ( BOOLEAN OldIntFlagState;
CreateEntryStub (ExceptionType, (VOID **) &IdtEntryTable[ExceptionType].StubEntry);
-
+
//
// Disables CPU interrupts and returns the previous interrupt state
//
@@ -95,12 +95,12 @@ HookEntry ( //
ReadIdtGateDescriptor (ExceptionType, &(IdtEntryTable[ExceptionType].OrigDesc));
//
- // stores orignal interrupt handle
+ // stores orignal interrupt handle
//
IdtEntryTable[ExceptionType].OrigVector = (DEBUG_PROC) GetInterruptHandleFromIdt (&(IdtEntryTable[ExceptionType].OrigDesc));
- //
- // encodes new IDT Gate descriptor by stub entry
+ //
+ // encodes new IDT Gate descriptor by stub entry
//
Vect2Desc (&IdtEntryTable[ExceptionType].NewDesc, IdtEntryTable[ExceptionType].StubEntry);
//
@@ -154,14 +154,14 @@ UnhookEntry ( /**
Returns the maximum value that may be used for the ProcessorIndex parameter in
- RegisterPeriodicCallback() and RegisterExceptionCallback().
-
+ RegisterPeriodicCallback() and RegisterExceptionCallback().
+
Hard coded to support only 1 processor for now.
@param This A pointer to the EFI_DEBUG_SUPPORT_PROTOCOL instance.
@param MaxProcessorIndex Pointer to a caller-allocated UINTN in which the maximum supported
- processor index is returned. Always 0 returned.
-
+ processor index is returned. Always 0 returned.
+
@retval EFI_SUCCESS Always returned with **MaxProcessorIndex set to 0.
**/
@@ -178,17 +178,17 @@ GetMaximumProcessorIndex ( /**
Registers a function to be called back periodically in interrupt context.
-
+
@param This A pointer to the EFI_DEBUG_SUPPORT_PROTOCOL instance.
@param ProcessorIndex Specifies which processor the callback function applies to.
@param PeriodicCallback A pointer to a function of type PERIODIC_CALLBACK that is the main
periodic entry point of the debug agent.
-
- @retval EFI_SUCCESS The function completed successfully.
+
+ @retval EFI_SUCCESS The function completed successfully.
@retval EFI_ALREADY_STARTED Non-NULL PeriodicCallback parameter when a callback
- function was previously registered.
- @retval EFI_OUT_OF_RESOURCES System has insufficient memory resources to register new callback
- function.
+ function was previously registered.
+ @retval EFI_OUT_OF_RESOURCES System has insufficient memory resources to register new callback
+ function.
**/
EFI_STATUS
EFIAPI
@@ -205,17 +205,17 @@ RegisterPeriodicCallback ( Registers a function to be called when a given processor exception occurs.
This code executes in boot services context.
-
+
@param This A pointer to the EFI_DEBUG_SUPPORT_PROTOCOL instance.
@param ProcessorIndex Specifies which processor the callback function applies to.
@param ExceptionCallback A pointer to a function of type EXCEPTION_CALLBACK that is called
- when the processor exception specified by ExceptionType occurs.
- @param ExceptionType Specifies which processor exception to hook.
-
- @retval EFI_SUCCESS The function completed successfully.
+ when the processor exception specified by ExceptionType occurs.
+ @param ExceptionType Specifies which processor exception to hook.
+
+ @retval EFI_SUCCESS The function completed successfully.
@retval EFI_ALREADY_STARTED Non-NULL PeriodicCallback parameter when a callback
- function was previously registered.
- @retval EFI_OUT_OF_RESOURCES System has insufficient memory resources to register new callback
+ function was previously registered.
+ @retval EFI_OUT_OF_RESOURCES System has insufficient memory resources to register new callback
function.
**/
EFI_STATUS
@@ -233,14 +233,14 @@ RegisterExceptionCallback ( /**
Invalidates processor instruction cache for a memory range. Subsequent execution in this range
- causes a fresh memory fetch to retrieve code to be executed.
-
+ causes a fresh memory fetch to retrieve code to be executed.
+
@param This A pointer to the EFI_DEBUG_SUPPORT_PROTOCOL instance.
@param ProcessorIndex Specifies which processor's instruction cache is to be invalidated.
- @param Start Specifies the physical base of the memory range to be invalidated.
+ @param Start Specifies the physical base of the memory range to be invalidated.
@param Length Specifies the minimum number of bytes in the processor's instruction
- cache to invalidate.
-
+ cache to invalidate.
+
@retval EFI_SUCCESS Always returned.
**/
@@ -317,8 +317,8 @@ PlUnloadDebugSupportDriver ( }
/**
- Initializes driver's handler registration database.
-
+ Initializes driver's handler registration database.
+
This code executes in boot services context.
Must be public because it's referenced from DebugSupport.c
@@ -352,7 +352,7 @@ PlInitializeDebugSupportDriver ( if (IdtEntryTable[ExceptionType].StubEntry == NULL) {
goto ErrorCleanup;
}
-
+
//
// Copy Interrupt stub code.
//
diff --git a/MdeModulePkg/Universal/DebugSupportDxe/Ia32/PlDebugSupport.h b/MdeModulePkg/Universal/DebugSupportDxe/Ia32/PlDebugSupport.h index 0a1577f..2137343 100644 --- a/MdeModulePkg/Universal/DebugSupportDxe/Ia32/PlDebugSupport.h +++ b/MdeModulePkg/Universal/DebugSupportDxe/Ia32/PlDebugSupport.h @@ -1,14 +1,14 @@ /** @file
IA32 specific debug support macros, typedefs and prototypes.
-Copyright (c) 2006 - 2008, Intel Corporation. All rights reserved.<BR>
-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,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>
+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,
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
**/
diff --git a/MdeModulePkg/Universal/DebugSupportDxe/Ipf/PlDebugSupport.h b/MdeModulePkg/Universal/DebugSupportDxe/Ipf/PlDebugSupport.h index 0cf29ca..1701fbf 100644 --- a/MdeModulePkg/Universal/DebugSupportDxe/Ipf/PlDebugSupport.h +++ b/MdeModulePkg/Universal/DebugSupportDxe/Ipf/PlDebugSupport.h @@ -1,7 +1,7 @@ /** @file
IPF specific types, macros, and definitions for Debug Support Driver.
-Copyright (c) 2004 - 2010, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2004 - 2018, Intel Corporation. All rights reserved.<BR>
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
@@ -185,7 +185,7 @@ RegisterPeriodicCallback ( @param This A pointer to the EFI_DEBUG_SUPPORT_PROTOCOL instance.
@param ProcessorIndex Specifies which processor the callback function applies to.
@param ExceptionCallback A pointer to a function of type EXCEPTION_CALLBACK that is called
- when the processor exception specified by ExceptionType occurs.
+ when the processor exception specified by ExceptionType occurs.
@param ExceptionType Specifies which processor exception to hook.
@retval EFI_SUCCESS The function completed successfully.
diff --git a/MdeModulePkg/Universal/DebugSupportDxe/X64/PlDebugSupport.h b/MdeModulePkg/Universal/DebugSupportDxe/X64/PlDebugSupport.h index 044e5d9..078c280 100644 --- a/MdeModulePkg/Universal/DebugSupportDxe/X64/PlDebugSupport.h +++ b/MdeModulePkg/Universal/DebugSupportDxe/X64/PlDebugSupport.h @@ -1,14 +1,14 @@ /** @file
X64 specific debug support macros.
-Copyright (c) 2006 - 2008, Intel Corporation. All rights reserved.<BR>
-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,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>
+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,
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
**/
diff --git a/MdeModulePkg/Universal/DevicePathDxe/DevicePathDxe.inf b/MdeModulePkg/Universal/DevicePathDxe/DevicePathDxe.inf index ba6ed6b..37bbe29 100644 --- a/MdeModulePkg/Universal/DevicePathDxe/DevicePathDxe.inf +++ b/MdeModulePkg/Universal/DevicePathDxe/DevicePathDxe.inf @@ -6,7 +6,7 @@ # PcdDevicePathSupportDevicePathToText & PcdDevicePathSupportDevicePathFromText
# respectively.
#
-# Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>
# 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
@@ -43,7 +43,7 @@ DevicePathLib
UefiBootServicesTableLib
UefiDriverEntryPoint
-
+
[Protocols]
gEfiDevicePathToTextProtocolGuid | gEfiMdeModulePkgTokenSpaceGuid.PcdDevicePathSupportDevicePathFromText ## SOMETIMES_PRODUCES
gEfiDevicePathFromTextProtocolGuid | gEfiMdeModulePkgTokenSpaceGuid.PcdDevicePathSupportDevicePathToText ## SOMETIMES_PRODUCES
diff --git a/MdeModulePkg/Universal/DevicePathDxe/DevicePathDxe.uni b/MdeModulePkg/Universal/DevicePathDxe/DevicePathDxe.uni index 0f48574..249f5df 100644 --- a/MdeModulePkg/Universal/DevicePathDxe/DevicePathDxe.uni +++ b/MdeModulePkg/Universal/DevicePathDxe/DevicePathDxe.uni @@ -6,13 +6,13 @@ // PcdDevicePathSupportDevicePathToText & PcdDevicePathSupportDevicePathFromText
// respectively.
//
-// Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.<BR>
+// Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>
//
// 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,
// WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
//
diff --git a/MdeModulePkg/Universal/DevicePathDxe/DevicePathDxeExtra.uni b/MdeModulePkg/Universal/DevicePathDxe/DevicePathDxeExtra.uni index 8ac8e34..04729f6 100644 --- a/MdeModulePkg/Universal/DevicePathDxe/DevicePathDxeExtra.uni +++ b/MdeModulePkg/Universal/DevicePathDxe/DevicePathDxeExtra.uni @@ -1,7 +1,7 @@ // /** @file
// DevicePathDxe Localized Strings and Content
//
-// Copyright (c) 2013 - 2014, Intel Corporation. All rights reserved.<BR>
+// Copyright (c) 2013 - 2018, Intel Corporation. All rights reserved.<BR>
//
// This program and the accompanying materials
// are licensed and made available under the terms and conditions of the BSD License
@@ -13,8 +13,8 @@ //
// **/
-#string STR_PROPERTIES_MODULE_NAME
-#language en-US
+#string STR_PROPERTIES_MODULE_NAME
+#language en-US
"UEFI Device Path DXE Driver"
diff --git a/MdeModulePkg/Universal/Disk/CdExpressPei/CdExpressPei.inf b/MdeModulePkg/Universal/Disk/CdExpressPei/CdExpressPei.inf index facad47..e9ddecf 100644 --- a/MdeModulePkg/Universal/Disk/CdExpressPei/CdExpressPei.inf +++ b/MdeModulePkg/Universal/Disk/CdExpressPei/CdExpressPei.inf @@ -1,11 +1,11 @@ ## @file
# PeiCdExpress recovery module.
#
-# This module reads data from CDROM device by all installed block IO ppi and
+# This module reads data from CDROM device by all installed block IO ppi and
# finds whether there is Recovery data in the device. If it finds recovery
# data, it will install Device Recovery Module PPI.
#
-# Copyright (c) 2006 - 2016, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>
#
# This program and the accompanying materials
# are licensed and made available under the terms and conditions
diff --git a/MdeModulePkg/Universal/Disk/CdExpressPei/CdExpressPei.uni b/MdeModulePkg/Universal/Disk/CdExpressPei/CdExpressPei.uni index 7b17af0..71f0acc 100644 --- a/MdeModulePkg/Universal/Disk/CdExpressPei/CdExpressPei.uni +++ b/MdeModulePkg/Universal/Disk/CdExpressPei/CdExpressPei.uni @@ -5,14 +5,14 @@ // finds whether there is Recovery data in the device. If it finds recovery
// data, it will install Device Recovery Module PPI.
//
-// Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.<BR>
+// Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>
//
// 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,
// WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
//
diff --git a/MdeModulePkg/Universal/Disk/CdExpressPei/CdExpressPeiExtra.uni b/MdeModulePkg/Universal/Disk/CdExpressPei/CdExpressPeiExtra.uni index 47244c8..528ed1e 100644 --- a/MdeModulePkg/Universal/Disk/CdExpressPei/CdExpressPeiExtra.uni +++ b/MdeModulePkg/Universal/Disk/CdExpressPei/CdExpressPeiExtra.uni @@ -1,7 +1,7 @@ // /** @file
// CdExpressPei Localized Strings and Content
//
-// Copyright (c) 2013 - 2014, Intel Corporation. All rights reserved.<BR>
+// Copyright (c) 2013 - 2018, Intel Corporation. All rights reserved.<BR>
//
// This program and the accompanying materials
// are licensed and made available under the terms and conditions
@@ -14,8 +14,8 @@ //
// **/
-#string STR_PROPERTIES_MODULE_NAME
-#language en-US
+#string STR_PROPERTIES_MODULE_NAME
+#language en-US
"CD PEI Module for Recovery"
diff --git a/MdeModulePkg/Universal/Disk/CdExpressPei/PeiCdExpress.c b/MdeModulePkg/Universal/Disk/CdExpressPei/PeiCdExpress.c index d3cbfaa..76e5e16 100644 --- a/MdeModulePkg/Universal/Disk/CdExpressPei/PeiCdExpress.c +++ b/MdeModulePkg/Universal/Disk/CdExpressPei/PeiCdExpress.c @@ -1,7 +1,7 @@ /** @file
Source file for CD recovery PEIM
-Copyright (c) 2006 - 2016, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>
This program and the accompanying materials
are licensed and made available under the terms and conditions
@@ -21,7 +21,7 @@ CHAR8 *mRecoveryFileName; UINTN mRecoveryFileNameSize;
/**
- Installs the Device Recovery Module PPI, Initialize BlockIo Ppi
+ Installs the Device Recovery Module PPI, Initialize BlockIo Ppi
installation notification
@param FileHandle The file handle of the image.
@@ -118,8 +118,8 @@ CdExpressPeimEntry ( }
/**
- BlockIo installation notification function.
-
+ BlockIo installation notification function.
+
This function finds out all the current Block IO PPIs in the system and add them
into private data.
@@ -275,7 +275,7 @@ UpdateBlocksAndVolumes ( if (EFI_ERROR (Status)) {
continue;
}
-
+
PrivateData->CapsuleCount++;
}
@@ -411,7 +411,7 @@ FindRecoveryCapsules ( @retval EFI_SUCCESS The recovery capsule is successfully found in the volume.
@retval EFI_NOT_FOUND The recovery capsule is not found in the volume.
- @retval Others
+ @retval Others
**/
EFI_STATUS
@@ -508,18 +508,18 @@ RetrieveCapsuleFileFromRoot ( Returns the number of DXE capsules residing on the device.
This function searches for DXE capsules from the associated device and returns
- the number and maximum size in bytes of the capsules discovered. Entry 1 is
- assumed to be the highest load priority and entry N is assumed to be the lowest
+ the number and maximum size in bytes of the capsules discovered. Entry 1 is
+ assumed to be the highest load priority and entry N is assumed to be the lowest
priority.
- @param[in] PeiServices General-purpose services that are available
+ @param[in] PeiServices General-purpose services that are available
to every PEIM
@param[in] This Indicates the EFI_PEI_DEVICE_RECOVERY_MODULE_PPI
instance.
- @param[out] NumberRecoveryCapsules Pointer to a caller-allocated UINTN. On
- output, *NumberRecoveryCapsules contains
- the number of recovery capsule images
- available for retrieval from this PEIM
+ @param[out] NumberRecoveryCapsules Pointer to a caller-allocated UINTN. On
+ output, *NumberRecoveryCapsules contains
+ the number of recovery capsule images
+ available for retrieval from this PEIM
instance.
@retval EFI_SUCCESS One or more capsules were discovered.
@@ -555,18 +555,18 @@ GetNumberRecoveryCapsules ( This function gets the size and type of the capsule specified by CapsuleInstance.
@param[in] PeiServices General-purpose services that are available to every PEIM
- @param[in] This Indicates the EFI_PEI_DEVICE_RECOVERY_MODULE_PPI
+ @param[in] This Indicates the EFI_PEI_DEVICE_RECOVERY_MODULE_PPI
instance.
- @param[in] CapsuleInstance Specifies for which capsule instance to retrieve
- the information. This parameter must be between
- one and the value returned by GetNumberRecoveryCapsules()
+ @param[in] CapsuleInstance Specifies for which capsule instance to retrieve
+ the information. This parameter must be between
+ one and the value returned by GetNumberRecoveryCapsules()
in NumberRecoveryCapsules.
- @param[out] Size A pointer to a caller-allocated UINTN in which
- the size of the requested recovery module is
+ @param[out] Size A pointer to a caller-allocated UINTN in which
+ the size of the requested recovery module is
returned.
- @param[out] CapsuleType A pointer to a caller-allocated EFI_GUID in which
- the type of the requested recovery capsule is
- returned. The semantic meaning of the value
+ @param[out] CapsuleType A pointer to a caller-allocated EFI_GUID in which
+ the type of the requested recovery capsule is
+ returned. The semantic meaning of the value
returned is defined by the implementation.
@retval EFI_SUCCESS One or more capsules were discovered.
@@ -620,12 +620,12 @@ GetRecoveryCapsuleInfo ( This function, by whatever mechanism, retrieves a DXE capsule from some device
and loads it into memory. Note that the published interface is device neutral.
- @param[in] PeiServices General-purpose services that are available
+ @param[in] PeiServices General-purpose services that are available
to every PEIM
@param[in] This Indicates the EFI_PEI_DEVICE_RECOVERY_MODULE_PPI
instance.
@param[in] CapsuleInstance Specifies which capsule instance to retrieve.
- @param[out] Buffer Specifies a caller-allocated buffer in which
+ @param[out] Buffer Specifies a caller-allocated buffer in which
the requested recovery capsule will be returned.
@retval EFI_SUCCESS The capsule was loaded correctly.
diff --git a/MdeModulePkg/Universal/Disk/CdExpressPei/PeiCdExpress.h b/MdeModulePkg/Universal/Disk/CdExpressPei/PeiCdExpress.h index 1c8843c..681c1ff 100644 --- a/MdeModulePkg/Universal/Disk/CdExpressPei/PeiCdExpress.h +++ b/MdeModulePkg/Universal/Disk/CdExpressPei/PeiCdExpress.h @@ -1,7 +1,7 @@ /** @file
Header file for CD recovery PEIM
-Copyright (c) 2006 - 2016, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>
This program and the accompanying materials
are licensed and made available under the terms and conditions
@@ -105,8 +105,8 @@ typedef struct { } PEI_CD_EXPRESS_DIR_FILE_RECORD;
/**
- BlockIo installation notification function.
-
+ BlockIo installation notification function.
+
This function finds out all the current Block IO PPIs in the system and add them
into private data.
@@ -144,18 +144,18 @@ UpdateBlocksAndVolumes ( Returns the number of DXE capsules residing on the device.
This function searches for DXE capsules from the associated device and returns
- the number and maximum size in bytes of the capsules discovered. Entry 1 is
- assumed to be the highest load priority and entry N is assumed to be the lowest
+ the number and maximum size in bytes of the capsules discovered. Entry 1 is
+ assumed to be the highest load priority and entry N is assumed to be the lowest
priority.
- @param[in] PeiServices General-purpose services that are available
+ @param[in] PeiServices General-purpose services that are available
to every PEIM
@param[in] This Indicates the EFI_PEI_DEVICE_RECOVERY_MODULE_PPI
instance.
- @param[out] NumberRecoveryCapsules Pointer to a caller-allocated UINTN. On
- output, *NumberRecoveryCapsules contains
- the number of recovery capsule images
- available for retrieval from this PEIM
+ @param[out] NumberRecoveryCapsules Pointer to a caller-allocated UINTN. On
+ output, *NumberRecoveryCapsules contains
+ the number of recovery capsule images
+ available for retrieval from this PEIM
instance.
@retval EFI_SUCCESS One or more capsules were discovered.
@@ -177,18 +177,18 @@ GetNumberRecoveryCapsules ( This function gets the size and type of the capsule specified by CapsuleInstance.
@param[in] PeiServices General-purpose services that are available to every PEIM
- @param[in] This Indicates the EFI_PEI_DEVICE_RECOVERY_MODULE_PPI
+ @param[in] This Indicates the EFI_PEI_DEVICE_RECOVERY_MODULE_PPI
instance.
- @param[in] CapsuleInstance Specifies for which capsule instance to retrieve
- the information. This parameter must be between
- one and the value returned by GetNumberRecoveryCapsules()
+ @param[in] CapsuleInstance Specifies for which capsule instance to retrieve
+ the information. This parameter must be between
+ one and the value returned by GetNumberRecoveryCapsules()
in NumberRecoveryCapsules.
- @param[out] Size A pointer to a caller-allocated UINTN in which
- the size of the requested recovery module is
+ @param[out] Size A pointer to a caller-allocated UINTN in which
+ the size of the requested recovery module is
returned.
- @param[out] CapsuleType A pointer to a caller-allocated EFI_GUID in which
- the type of the requested recovery capsule is
- returned. The semantic meaning of the value
+ @param[out] CapsuleType A pointer to a caller-allocated EFI_GUID in which
+ the type of the requested recovery capsule is
+ returned. The semantic meaning of the value
returned is defined by the implementation.
@retval EFI_SUCCESS One or more capsules were discovered.
@@ -212,12 +212,12 @@ GetRecoveryCapsuleInfo ( This function, by whatever mechanism, retrieves a DXE capsule from some device
and loads it into memory. Note that the published interface is device neutral.
- @param[in] PeiServices General-purpose services that are available
+ @param[in] PeiServices General-purpose services that are available
to every PEIM
@param[in] This Indicates the EFI_PEI_DEVICE_RECOVERY_MODULE_PPI
instance.
@param[in] CapsuleInstance Specifies which capsule instance to retrieve.
- @param[out] Buffer Specifies a caller-allocated buffer in which
+ @param[out] Buffer Specifies a caller-allocated buffer in which
the requested recovery capsule will be returned.
@retval EFI_SUCCESS The capsule was loaded correctly.
@@ -260,7 +260,7 @@ FindRecoveryCapsules ( @retval EFI_SUCCESS The recovery capsule is successfully found in the volume.
@retval EFI_NOT_FOUND The recovery capsule is not found in the volume.
- @retval Others
+ @retval Others
**/
EFI_STATUS
diff --git a/MdeModulePkg/Universal/Disk/DiskIoDxe/DiskIo.c b/MdeModulePkg/Universal/Disk/DiskIoDxe/DiskIo.c index b8bde2a..157e1b6 100644 --- a/MdeModulePkg/Universal/Disk/DiskIoDxe/DiskIo.c +++ b/MdeModulePkg/Universal/Disk/DiskIoDxe/DiskIo.c @@ -9,7 +9,7 @@ Aligned - A read of N contiguous sectors.
OverRun - The last byte is not on a sector boundary.
-Copyright (c) 2006 - 2016, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>
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
@@ -55,7 +55,7 @@ DISK_IO_PRIVATE_DATA gDiskIoPrivateDataTemplate = { };
/**
- Test to see if this driver supports ControllerHandle.
+ Test to see if this driver supports ControllerHandle.
@param This Protocol instance pointer.
@param ControllerHandle Handle of device to test
@@ -162,7 +162,7 @@ DiskIoDriverBindingStart ( if (EFI_ERROR (Status)) {
gDiskIoPrivateDataTemplate.BlockIo2 = NULL;
}
-
+
//
// Initialize the Disk IO device instance.
//
@@ -171,15 +171,15 @@ DiskIoDriverBindingStart ( Status = EFI_OUT_OF_RESOURCES;
goto ErrorExit;
}
-
+
//
// The BlockSize and IoAlign of BlockIo and BlockIo2 should equal.
//
ASSERT ((Instance->BlockIo2 == NULL) ||
- ((Instance->BlockIo->Media->IoAlign == Instance->BlockIo2->Media->IoAlign) &&
+ ((Instance->BlockIo->Media->IoAlign == Instance->BlockIo2->Media->IoAlign) &&
(Instance->BlockIo->Media->BlockSize == Instance->BlockIo2->Media->BlockSize)
));
-
+
InitializeListHead (&Instance->TaskQueue);
EfiInitializeLock (&Instance->TaskQueueLock, TPL_NOTIFY);
Instance->SharedWorkingBuffer = AllocateAlignedPages (
@@ -289,7 +289,7 @@ DiskIoDriverBindingStop ( if (EFI_ERROR (Status)) {
DiskIo2 = NULL;
}
-
+
Instance = DISK_IO_PRIVATE_DATA_FROM_DISK_IO (DiskIo);
if (DiskIo2 != NULL) {
@@ -315,7 +315,7 @@ DiskIoDriverBindingStop ( );
}
if (!EFI_ERROR (Status)) {
-
+
do {
EfiAcquireLock (&Instance->TaskQueueLock);
AllTaskDone = IsListEmpty (&Instance->TaskQueue);
@@ -343,7 +343,7 @@ DiskIoDriverBindingStop ( );
ASSERT_EFI_ERROR (Status);
}
-
+
FreePool (Instance);
}
@@ -378,7 +378,7 @@ DiskIoDestroySubtask ( if (!Subtask->Blocking) {
if (Subtask->WorkingBuffer != NULL) {
FreeAlignedPages (
- Subtask->WorkingBuffer,
+ Subtask->WorkingBuffer,
Subtask->Length < Instance->BlockIo->Media->BlockSize
? EFI_SIZE_TO_PAGES (Instance->BlockIo->Media->BlockSize)
: EFI_SIZE_TO_PAGES (Subtask->Length)
@@ -420,7 +420,7 @@ DiskIo2OnReadWriteComplete ( ASSERT (Instance->Signature == DISK_IO_PRIVATE_DATA_SIGNATURE);
ASSERT (Task->Signature == DISK_IO2_TASK_SIGNATURE);
- if ((Subtask->WorkingBuffer != NULL) && !EFI_ERROR (TransactionStatus) &&
+ if ((Subtask->WorkingBuffer != NULL) && !EFI_ERROR (TransactionStatus) &&
(Task->Token != NULL) && !Subtask->Write
) {
CopyMem (Subtask->Buffer, Subtask->WorkingBuffer + Subtask->Offset, Subtask->Length);
@@ -498,7 +498,7 @@ DiskIoCreateSubtask ( }
}
DEBUG ((
- EFI_D_BLKIO,
+ EFI_D_BLKIO,
" %c:Lba/Offset/Length/WorkingBuffer/Buffer = %016lx/%08x/%08x/%08x/%08x\n",
Write ? 'W': 'R', Lba, Offset, Length, WorkingBuffer, Buffer
));
@@ -553,7 +553,7 @@ DiskIoCreateSubtaskList ( if (IoAlign == 0) {
IoAlign = 1;
}
-
+
Lba = DivU64x32Remainder (Offset, BlockSize, &UnderRun);
BufferPtr = (UINT8 *) Buffer;
@@ -596,7 +596,7 @@ DiskIoCreateSubtaskList ( goto Done;
}
InsertTailList (Subtasks, &Subtask->Link);
-
+
BufferPtr += Length;
Offset += Length;
BufferSize -= Length;
@@ -633,7 +633,7 @@ DiskIoCreateSubtaskList ( }
InsertTailList (Subtasks, &Subtask->Link);
}
-
+
if (OverRunLba > Lba) {
//
// If the DiskIo maps directly to a BlockIo device do the read.
@@ -726,7 +726,7 @@ DiskIo2Cancel ( DISK_IO_PRIVATE_DATA *Instance;
DISK_IO2_TASK *Task;
LIST_ENTRY *Link;
-
+
Instance = DISK_IO_PRIVATE_DATA_FROM_DISK_IO2 (This);
EfiAcquireLock (&Instance->TaskQueueLock);
@@ -799,7 +799,7 @@ DiskIo2RemoveCompletedTask ( If this field is NULL, synchronous/blocking IO is performed.
@param BufferSize The size in bytes of Buffer. The number of bytes to read from the device.
@param Buffer A pointer to the destination buffer for the data.
- The caller is responsible either having implicit or explicit ownership of the buffer.
+ The caller is responsible either having implicit or explicit ownership of the buffer.
**/
EFI_STATUS
DiskIo2ReadWriteDisk (
@@ -948,7 +948,7 @@ DiskIo2ReadWriteDisk ( break;
}
}
-
+
gBS->RaiseTPL (TPL_NOTIFY);
//
@@ -1235,9 +1235,9 @@ DiskIoWriteDisk ( /**
The user Entry Point for module DiskIo. The user code starts with this function.
- @param[in] ImageHandle The firmware allocated handle for the EFI image.
+ @param[in] ImageHandle The firmware allocated handle for the EFI image.
@param[in] SystemTable A pointer to the EFI System Table.
-
+
@retval EFI_SUCCESS The entry point is executed successfully.
@retval other Some error occurs when executing this entry point.
diff --git a/MdeModulePkg/Universal/Disk/DiskIoDxe/DiskIo.h b/MdeModulePkg/Universal/Disk/DiskIoDxe/DiskIo.h index 7591e46..44940d9 100644 --- a/MdeModulePkg/Universal/Disk/DiskIoDxe/DiskIo.h +++ b/MdeModulePkg/Universal/Disk/DiskIoDxe/DiskIo.h @@ -1,7 +1,7 @@ /** @file
Master header file for DiskIo driver. It includes the module private defininitions.
-Copyright (c) 2006 - 2013, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>
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
@@ -100,7 +100,7 @@ extern EFI_COMPONENT_NAME2_PROTOCOL gDiskIoComponentName2; // Driver model protocol interface
//
/**
- Test to see if this driver supports ControllerHandle.
+ Test to see if this driver supports ControllerHandle.
@param This Protocol instance pointer.
@param ControllerHandle Handle of device to test
diff --git a/MdeModulePkg/Universal/Disk/DiskIoDxe/DiskIoDxe.inf b/MdeModulePkg/Universal/Disk/DiskIoDxe/DiskIoDxe.inf index cee27d5..6c00f55 100644 --- a/MdeModulePkg/Universal/Disk/DiskIoDxe/DiskIoDxe.inf +++ b/MdeModulePkg/Universal/Disk/DiskIoDxe/DiskIoDxe.inf @@ -7,16 +7,16 @@ # to any Block I/O interface that appears in the system that does not
# already have a Disk I/O protocol. File systems and other disk access
# code utilize the Disk I/O protocol.
-#
-# Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.<BR>
+#
+# Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>
# 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,
# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
-#
+#
##
[Defines]
diff --git a/MdeModulePkg/Universal/Disk/DiskIoDxe/DiskIoDxe.uni b/MdeModulePkg/Universal/Disk/DiskIoDxe/DiskIoDxe.uni index 88d7deb..5e82489 100644 --- a/MdeModulePkg/Universal/Disk/DiskIoDxe/DiskIoDxe.uni +++ b/MdeModulePkg/Universal/Disk/DiskIoDxe/DiskIoDxe.uni @@ -8,13 +8,13 @@ // already have a Disk I/O protocol. File systems and other disk access
// code utilize the Disk I/O protocol.
//
-// Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.<BR>
+// Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>
//
// 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,
// WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
//
diff --git a/MdeModulePkg/Universal/Disk/DiskIoDxe/DiskIoDxeExtra.uni b/MdeModulePkg/Universal/Disk/DiskIoDxe/DiskIoDxeExtra.uni index d970e76..e18cc0d 100644 --- a/MdeModulePkg/Universal/Disk/DiskIoDxe/DiskIoDxeExtra.uni +++ b/MdeModulePkg/Universal/Disk/DiskIoDxe/DiskIoDxeExtra.uni @@ -1,7 +1,7 @@ // /** @file
// DiskIoDxe Localized Strings and Content
//
-// Copyright (c) 2013 - 2014, Intel Corporation. All rights reserved.<BR>
+// Copyright (c) 2013 - 2018, Intel Corporation. All rights reserved.<BR>
//
// This program and the accompanying materials
// are licensed and made available under the terms and conditions of the BSD License
@@ -13,8 +13,8 @@ //
// **/
-#string STR_PROPERTIES_MODULE_NAME
-#language en-US
+#string STR_PROPERTIES_MODULE_NAME
+#language en-US
"Disk I/O DXE Driver"
diff --git a/MdeModulePkg/Universal/Disk/PartitionDxe/Gpt.c b/MdeModulePkg/Universal/Disk/PartitionDxe/Gpt.c index fe26a64..fe87761 100644 --- a/MdeModulePkg/Universal/Disk/PartitionDxe/Gpt.c +++ b/MdeModulePkg/Universal/Disk/PartitionDxe/Gpt.c @@ -14,7 +14,7 @@ partition content and validate the GPT table and GPT entry.
Copyright (c) 2018 Qualcomm Datacenter Technologies, Inc.
-Copyright (c) 2006 - 2017, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>
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 @@ PartitionRestoreGptTable ( @param[in] PartHeader Partition table header structure
@param[in] PartEntry The partition entry array
- @param[out] PEntryStatus the partition entry status array
+ @param[out] PEntryStatus the partition entry status array
recording the status of each partition
**/
@@ -698,7 +698,7 @@ Done: @param[in] PartHeader Partition table header structure
@param[in] PartEntry The partition entry array
- @param[out] PEntryStatus the partition entry status array
+ @param[out] PEntryStatus the partition entry status array
recording the status of each partition
**/
@@ -736,7 +736,7 @@ PartitionCheckGptEntry ( if ((Entry->Attributes & BIT1) != 0) {
//
- // If Bit 1 is set, this indicate that this is an OS specific GUID partition.
+ // If Bit 1 is set, this indicate that this is an OS specific GUID partition.
//
PEntryStatus[Index1].OsSpecific = TRUE;
}
diff --git a/MdeModulePkg/Universal/Disk/PartitionDxe/Mbr.c b/MdeModulePkg/Universal/Disk/PartitionDxe/Mbr.c index 479745b..b1a99ee 100644 --- a/MdeModulePkg/Universal/Disk/PartitionDxe/Mbr.c +++ b/MdeModulePkg/Universal/Disk/PartitionDxe/Mbr.c @@ -3,17 +3,17 @@ MBR - Master Boot Record is in the first sector of a partitioned hard disk.
The MBR supports four partitions per disk. The MBR also contains legacy
- code that is not run on an EFI system. The legacy code reads the
- first sector of the active partition into memory and
+ code that is not run on an EFI system. The legacy code reads the
+ first sector of the active partition into memory and
- BPB - BIOS Parameter Block is in the first sector of a FAT file system.
- The BPB contains information about the FAT file system. The BPB is
+ BPB - BIOS Parameter Block is in the first sector of a FAT file system.
+ The BPB contains information about the FAT file system. The BPB is
always on the first sector of a media. The first sector also contains
the legacy boot strap code.
Copyright (c) 2018 Qualcomm Datacenter Technologies, Inc.
Copyright (c) 2014, Hewlett-Packard Development Company, L.P.<BR>
-Copyright (c) 2006 - 2017, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>
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
@@ -31,7 +31,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. @param Mbr Parent Handle.
@param LastLba Last Lba address on the device.
-
+
@retval TRUE Mbr is a Valid MBR.
@retval FALSE Mbr is not a Valid MBR.
@@ -76,7 +76,7 @@ PartitionValidMbr ( // return FALSE since no block devices on a system are implemented
// with INT 13h
//
-
+
DEBUG((EFI_D_INFO, "PartitionValidMbr: Bad MBR partition size EndingLBA(%1x) > LastLBA(%1x)\n", EndingLBA, LastLba));
return FALSE;
@@ -113,7 +113,7 @@ PartitionValidMbr ( @param[in] BlockIo Parent BlockIo interface.
@param[in] BlockIo2 Parent BlockIo2 interface.
@param[in] DevicePath Parent Device Path.
-
+
@retval EFI_SUCCESS A child handle was added.
@retval EFI_MEDIA_CHANGED Media change was detected.
@retval Others MBR partition was not found.
@@ -215,9 +215,9 @@ PartitionInstallMbrChildHandles ( if (Mbr->Partition[Index].OSIndicator == PMBR_GPT_PARTITION) {
//
// This is the guard MBR for the GPT. If you ever see a GPT disk with zero partitions you can get here.
- // We can not produce an MBR BlockIo for this device as the MBR spans the GPT headers. So formating
+ // We can not produce an MBR BlockIo for this device as the MBR spans the GPT headers. So formating
// this BlockIo would corrupt the GPT structures and require a recovery that would corrupt the format
- // that corrupted the GPT partition.
+ // that corrupted the GPT partition.
//
continue;
}
diff --git a/MdeModulePkg/Universal/Disk/PartitionDxe/Partition.c b/MdeModulePkg/Universal/Disk/PartitionDxe/Partition.c index 71acdcc..bef6a48 100644 --- a/MdeModulePkg/Universal/Disk/PartitionDxe/Partition.c +++ b/MdeModulePkg/Universal/Disk/PartitionDxe/Partition.c @@ -27,8 +27,8 @@ EFI_DRIVER_BINDING_PROTOCOL gPartitionDriverBinding = { PartitionDriverBindingStart,
PartitionDriverBindingStop,
//
- // Grub4Dos copies the BPB of the first partition to the MBR. If the
- // DriverBindingStart() of the Fat driver gets run before that of Partition
+ // Grub4Dos copies the BPB of the first partition to the MBR. If the
+ // DriverBindingStart() of the Fat driver gets run before that of Partition
// driver only the first partition can be recognized.
// Let the driver binding version of Partition driver be higher than that of
// Fat driver to make sure the DriverBindingStart() of the Partition driver
@@ -40,7 +40,7 @@ EFI_DRIVER_BINDING_PROTOCOL gPartitionDriverBinding = { };
//
-// Prioritized function list to detect partition table.
+// Prioritized function list to detect partition table.
//
PARTITION_DETECT_ROUTINE mPartitionDetectRoutineTable[] = {
PartitionInstallGptChildHandles,
@@ -82,7 +82,7 @@ PartitionDriverBindingSupported ( //
if (RemainingDevicePath != NULL) {
//
- // Check if RemainingDevicePath is the End of Device Path Node,
+ // Check if RemainingDevicePath is the End of Device Path Node,
// if yes, go on checking other conditions
//
if (!IsDevicePathEnd (RemainingDevicePath)) {
@@ -205,13 +205,13 @@ PartitionDriverBindingStart ( EFI_TPL OldTpl;
BlockIo2 = NULL;
- OldTpl = gBS->RaiseTPL (TPL_CALLBACK);
+ OldTpl = gBS->RaiseTPL (TPL_CALLBACK);
//
// Check RemainingDevicePath validation
//
if (RemainingDevicePath != NULL) {
//
- // Check if RemainingDevicePath is the End of Device Path Node,
+ // Check if RemainingDevicePath is the End of Device Path Node,
// if yes, return EFI_SUCCESS
//
if (IsDevicePathEnd (RemainingDevicePath)) {
@@ -333,12 +333,12 @@ PartitionDriverBindingStart ( // driver. So don't try to close them. Otherwise, we will break the dependency
// between the controller and the driver set up before.
//
- // In the case that when the media changes on a device it will Reinstall the
+ // In the case that when the media changes on a device it will Reinstall the
// BlockIo interaface. This will cause a call to our Stop(), and a subsequent
// reentrant call to our Start() successfully. We should leave the device open
// when this happen. The "media change" case includes either the status is
- // EFI_MEDIA_CHANGED or it is a "media" to "no media" change.
- //
+ // EFI_MEDIA_CHANGED or it is a "media" to "no media" change.
+ //
if (EFI_ERROR (Status) &&
!EFI_ERROR (OpenStatus) &&
Status != EFI_MEDIA_CHANGED &&
@@ -351,7 +351,7 @@ PartitionDriverBindingStart ( );
//
// Close Parent DiskIo2 if has.
- //
+ //
gBS->CloseProtocol (
ControllerHandle,
&gEfiDiskIo2ProtocolGuid,
@@ -430,7 +430,7 @@ PartitionDriverBindingStop ( );
//
// Close Parent BlockIO2 if has.
- //
+ //
gBS->CloseProtocol (
ControllerHandle,
&gEfiDiskIo2ProtocolGuid,
@@ -467,7 +467,7 @@ PartitionDriverBindingStop ( This->DriverBindingHandle,
ControllerHandle,
EFI_OPEN_PROTOCOL_GET_PROTOCOL
- );
+ );
Private = PARTITION_DEVICE_FROM_BLOCK_IO_THIS (BlockIo);
@@ -893,7 +893,7 @@ PartitionCreateAccessTask ( /**
Read BufferSize bytes from Lba into Buffer.
-
+
This function reads the requested number of blocks from the device. All the
blocks are read, or an error is returned.
If EFI_DEVICE_ERROR, EFI_NO_MEDIA,_or EFI_MEDIA_CHANGED is returned and
@@ -901,13 +901,13 @@ PartitionCreateAccessTask ( not be signaled.
@param[in] This Indicates a pointer to the calling context.
- @param[in] MediaId Id of the media, changes every time the media is
+ @param[in] MediaId Id of the media, changes every time the media is
replaced.
@param[in] Lba The starting Logical Block Address to read from.
- @param[in, out] Token A pointer to the token associated with the transaction.
- @param[in] BufferSize Size of Buffer, must be a multiple of device block size.
- @param[out] Buffer A pointer to the destination buffer for the data. The
- caller is responsible for either having implicit or
+ @param[in, out] Token A pointer to the token associated with the transaction.
+ @param[in] BufferSize Size of Buffer, must be a multiple of device block size.
+ @param[out] Buffer A pointer to the destination buffer for the data. The
+ caller is responsible for either having implicit or
explicit ownership of the buffer.
@retval EFI_SUCCESS The read request was queued if Token->Event is
@@ -919,7 +919,7 @@ PartitionCreateAccessTask ( @retval EFI_MEDIA_CHANGED The MediaId is not for the current media.
@retval EFI_BAD_BUFFER_SIZE The BufferSize parameter is not a multiple of the
intrinsic block size of the device.
- @retval EFI_INVALID_PARAMETER The read request contains LBAs that are not valid,
+ @retval EFI_INVALID_PARAMETER The read request contains LBAs that are not valid,
or the buffer is not on proper alignment.
@retval EFI_OUT_OF_RESOURCES The request could not be completed due to a lack
of resources.
@@ -994,7 +994,7 @@ PartitionReadBlocksEx ( @retval EFI_MEDIA_CHNAGED The MediaId does not matched the current device.
@retval EFI_DEVICE_ERROR The device reported an error while performing the write.
@retval EFI_BAD_BUFFER_SIZE The Buffer was not a multiple of the block size of the device.
- @retval EFI_INVALID_PARAMETER The write request contains LBAs that are not valid,
+ @retval EFI_INVALID_PARAMETER The write request contains LBAs that are not valid,
or the buffer is not on proper alignment.
@retval EFI_OUT_OF_RESOURCES The request could not be completed due to a lack
of resources.
@@ -1026,7 +1026,7 @@ PartitionWriteBlocksEx ( if (Offset + BufferSize > Private->End) {
return ProbeMediaStatusEx (Private->DiskIo2, MediaId, EFI_INVALID_PARAMETER);
}
-
+
if ((Token != NULL) && (Token->Event != NULL)) {
Task = PartitionCreateAccessTask (Token);
if (Task == NULL) {
@@ -1046,10 +1046,10 @@ PartitionWriteBlocksEx ( /**
Flush the Block Device.
-
+
If EFI_DEVICE_ERROR, EFI_NO_MEDIA,_EFI_WRITE_PROTECTED or EFI_MEDIA_CHANGED
is returned and non-blocking I/O is being used, the Event associated with
- this request will not be signaled.
+ this request will not be signaled.
@param[in] This Indicates a pointer to the calling context.
@param[in, out] Token A pointer to the token associated with the transaction
@@ -1160,7 +1160,7 @@ PartitionInstallChildHandle ( // Set the BlockIO into Private Data.
//
Private->BlockIo.Revision = ParentBlockIo->Revision;
-
+
Private->BlockIo.Media = &Private->Media;
CopyMem (Private->BlockIo.Media, ParentBlockIo->Media, sizeof (EFI_BLOCK_IO_MEDIA));
@@ -1180,7 +1180,7 @@ PartitionInstallChildHandle ( Private->BlockIo2.Reset = PartitionResetEx;
Private->BlockIo2.ReadBlocksEx = PartitionReadBlocksEx;
Private->BlockIo2.WriteBlocksEx = PartitionWriteBlocksEx;
- Private->BlockIo2.FlushBlocksEx = PartitionFlushBlocksEx;
+ Private->BlockIo2.FlushBlocksEx = PartitionFlushBlocksEx;
}
Private->Media.IoAlign = 0;
@@ -1234,7 +1234,7 @@ PartitionInstallChildHandle ( }
//
- // Create the new handle.
+ // Create the new handle.
//
Private->Handle = NULL;
if (Private->DiskIo2 != NULL) {
@@ -1252,7 +1252,7 @@ PartitionInstallChildHandle ( NULL,
NULL
);
- } else {
+ } else {
Status = gBS->InstallMultipleProtocolInterfaces (
&Private->Handle,
&gEfiDevicePathProtocolGuid,
@@ -1291,9 +1291,9 @@ PartitionInstallChildHandle ( /**
The user Entry Point for module Partition. The user code starts with this function.
- @param[in] ImageHandle The firmware allocated handle for the EFI image.
+ @param[in] ImageHandle The firmware allocated handle for the EFI image.
@param[in] SystemTable A pointer to the EFI System Table.
-
+
@retval EFI_SUCCESS The entry point is executed successfully.
@retval other Some error occurs when executing this entry point.
diff --git a/MdeModulePkg/Universal/Disk/PartitionDxe/Partition.h b/MdeModulePkg/Universal/Disk/PartitionDxe/Partition.h index f1a0520..cd16f49 100644 --- a/MdeModulePkg/Universal/Disk/PartitionDxe/Partition.h +++ b/MdeModulePkg/Universal/Disk/PartitionDxe/Partition.h @@ -1,11 +1,11 @@ /** @file
- Partition driver that produces logical BlockIo devices from a physical
+ Partition driver that produces logical BlockIo devices from a physical
BlockIo device. The logical BlockIo devices are based on the format
of the raw block devices media. Currently "El Torito CD-ROM", UDF, Legacy
MBR, and GPT partition schemes are supported.
Copyright (c) 2018 Qualcomm Datacenter Technologies, Inc.
-Copyright (c) 2006 - 2017, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>
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
@@ -16,8 +16,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. **/
-#ifndef _PARTITION_H_
-#define _PARTITION_H_
+#ifndef _PARTITION_H_
+#define _PARTITION_H_
#include <Uefi.h>
#include <Protocol/BlockIo.h>
@@ -431,7 +431,7 @@ PartitionInstallElToritoChildHandles ( @param[in] BlockIo Parent BlockIo interface.
@param[in] BlockIo2 Parent BlockIo2 interface.
@param[in] DevicePath Parent Device Path.
-
+
@retval EFI_SUCCESS A child handle was added.
@retval EFI_MEDIA_CHANGED Media change was detected.
@retval Others MBR partition was not found.
diff --git a/MdeModulePkg/Universal/Disk/PartitionDxe/PartitionDxe.inf b/MdeModulePkg/Universal/Disk/PartitionDxe/PartitionDxe.inf index fb2ea87..46e3912 100644 --- a/MdeModulePkg/Universal/Disk/PartitionDxe/PartitionDxe.inf +++ b/MdeModulePkg/Universal/Disk/PartitionDxe/PartitionDxe.inf @@ -11,15 +11,15 @@ # This external input must be validated carefully to avoid security issue like
# buffer overflow, integer overflow.
#
-# Copyright (c) 2006 - 2017, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>
# 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,
# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
-#
+#
##
[Defines]
diff --git a/MdeModulePkg/Universal/Disk/PartitionDxe/PartitionDxe.uni b/MdeModulePkg/Universal/Disk/PartitionDxe/PartitionDxe.uni index ef0b6ef..d6e2c82 100644 --- a/MdeModulePkg/Universal/Disk/PartitionDxe/PartitionDxe.uni +++ b/MdeModulePkg/Universal/Disk/PartitionDxe/PartitionDxe.uni @@ -5,19 +5,19 @@ // the bytes from Start to End of the Parent Block I/O device.
// The partition of physical BlockIo device supported is one of legacy MBR, GPT,
// and "El Torito" partitions.
-//
+//
// Caution: This module requires additional review when modified.
// This driver will have external input - disk partition.
// This external input must be validated carefully to avoid security issue like
// buffer overflow, integer overflow.
//
-// Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.<BR>
+// Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>
//
// 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,
// WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
//
diff --git a/MdeModulePkg/Universal/Disk/PartitionDxe/PartitionDxeExtra.uni b/MdeModulePkg/Universal/Disk/PartitionDxe/PartitionDxeExtra.uni index 5530042..a37d497 100644 --- a/MdeModulePkg/Universal/Disk/PartitionDxe/PartitionDxeExtra.uni +++ b/MdeModulePkg/Universal/Disk/PartitionDxe/PartitionDxeExtra.uni @@ -1,7 +1,7 @@ // /** @file
// PartitionDxe Localized Strings and Content
//
-// Copyright (c) 2013 - 2014, Intel Corporation. All rights reserved.<BR>
+// Copyright (c) 2013 - 2018, Intel Corporation. All rights reserved.<BR>
//
// This program and the accompanying materials
// are licensed and made available under the terms and conditions of the BSD License
@@ -13,8 +13,8 @@ //
// **/
-#string STR_PROPERTIES_MODULE_NAME
-#language en-US
+#string STR_PROPERTIES_MODULE_NAME
+#language en-US
"Partition DXE Driver"
diff --git a/MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf b/MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf index 46c834c..ad763b1 100644 --- a/MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf +++ b/MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf @@ -1,21 +1,21 @@ ## @file
# English module that provides Unicode Collation supports.
-#
+#
# This driver installs Unicode ISO 639-2 Collation and
# RFC 4646 Unicode Collation 2 protocols based on feature flags
# PcdUnicodeCollationSupport & PcdUnicodeCollation2Support respectively.
# It allows code running in the boot services environment to perform lexical
# comparison functions on Unicode strings for English languages.
-#
-# Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.<BR>
+#
+# Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>
# 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,
# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
-#
+#
##
[Defines]
diff --git a/MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.uni b/MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.uni index de9a523..b3c1fe7 100644 --- a/MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.uni +++ b/MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.uni @@ -7,13 +7,13 @@ // It allows code running in the boot services environment to perform lexical
// comparison functions on Unicode strings for English languages.
//
-// Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.<BR>
+// Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>
//
// 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,
// WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
//
diff --git a/MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxeExtra.uni b/MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxeExtra.uni index 34e3208..59284ce 100644 --- a/MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxeExtra.uni +++ b/MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxeExtra.uni @@ -1,7 +1,7 @@ // /** @file
// EnglishDxe Localized Strings and Content
//
-// Copyright (c) 2013 - 2014, Intel Corporation. All rights reserved.<BR>
+// Copyright (c) 2013 - 2018, Intel Corporation. All rights reserved.<BR>
//
// This program and the accompanying materials
// are licensed and made available under the terms and conditions of the BSD License
@@ -13,8 +13,8 @@ //
// **/
-#string STR_PROPERTIES_MODULE_NAME
-#language en-US
+#string STR_PROPERTIES_MODULE_NAME
+#language en-US
"English Language Support"
diff --git a/MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/UnicodeCollationEng.c b/MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/UnicodeCollationEng.c index a37f5c9..4ca5fe3 100644 --- a/MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/UnicodeCollationEng.c +++ b/MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/UnicodeCollationEng.c @@ -1,7 +1,7 @@ /** @file
Driver to implement English version of Unicode Collation Protocol.
-Copyright (c) 2006 - 2011, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>
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
@@ -81,13 +81,13 @@ GLOBAL_REMOVE_IF_UNREFERENCED EFI_UNICODE_COLLATION_PROTOCOL Unicode2Eng = { /**
The user Entry Point for English module.
-
+
This function initializes unicode character mapping and then installs Unicode
- Collation & Unicode Collation 2 Protocols based on the feature flags.
+ Collation & Unicode Collation 2 Protocols based on the feature flags.
- @param ImageHandle The firmware allocated handle for the EFI image.
+ @param ImageHandle The firmware allocated handle for the EFI image.
@param SystemTable A pointer to the EFI System Table.
-
+
@retval EFI_SUCCESS The entry point is executed successfully.
@retval other Some error occurs when executing this entry point.
@@ -204,7 +204,7 @@ EngStriColl ( /**
- Converts all the characters in a Null-terminated string to
+ Converts all the characters in a Null-terminated string to
lower case characters.
@param This Protocol instance pointer.
@@ -418,8 +418,8 @@ EngFatToStr ( /**
- Converts a Null-terminated string to legal characters in a FAT
- filename using an OEM character set.
+ Converts a Null-terminated string to legal characters in a FAT
+ filename using an OEM character set.
@param This Protocol instance pointer.
@param String A pointer to a Null-terminated string. The string must
diff --git a/MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/UnicodeCollationEng.h b/MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/UnicodeCollationEng.h index ac6dfc4..ddce2f6 100644 --- a/MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/UnicodeCollationEng.h +++ b/MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/UnicodeCollationEng.h @@ -1,7 +1,7 @@ /** @file
Head file for Unicode Collation Protocol (English)
-Copyright (c) 2006 - 2011, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>
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
@@ -90,7 +90,7 @@ EngMetaiMatch ( );
/**
- Converts all the characters in a Null-terminated string to
+ Converts all the characters in a Null-terminated string to
lower case characters.
@param This Protocol instance pointer.
@@ -140,8 +140,8 @@ EngFatToStr ( );
/**
- Converts a Null-terminated string to legal characters in a FAT
- filename using an OEM character set.
+ Converts a Null-terminated string to legal characters in a FAT
+ filename using an OEM character set.
@param This Protocol instance pointer.
@param String A pointer to a Null-terminated string. The string must
@@ -165,13 +165,13 @@ EngStrToFat ( /**
The user Entry Point for English module.
-
+
This function initializes unicode character mapping and then installs Unicode
- Collation & Unicode Collation 2 Protocols based on the feature flags.
+ Collation & Unicode Collation 2 Protocols based on the feature flags.
- @param ImageHandle The firmware allocated handle for the EFI image.
+ @param ImageHandle The firmware allocated handle for the EFI image.
@param SystemTable A pointer to the EFI System Table.
-
+
@retval EFI_SUCCESS The entry point is executed successfully.
@retval other Some error occurs when executing this entry point.
diff --git a/MdeModulePkg/Universal/DisplayEngineDxe/DisplayEngine.uni b/MdeModulePkg/Universal/DisplayEngineDxe/DisplayEngine.uni index 79868ec..c25da88 100644 --- a/MdeModulePkg/Universal/DisplayEngineDxe/DisplayEngine.uni +++ b/MdeModulePkg/Universal/DisplayEngineDxe/DisplayEngine.uni @@ -3,13 +3,13 @@ //
// A generic Timestamp driver producing Timestamp Protocol using UEFI APIs.
//
-// Copyright (c) 2007 - 2014, Intel Corporation. All rights reserved.<BR>
+// Copyright (c) 2007 - 2018, Intel Corporation. All rights reserved.<BR>
//
// 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,
// WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
//
diff --git a/MdeModulePkg/Universal/DisplayEngineDxe/DisplayEngineDxe.inf b/MdeModulePkg/Universal/DisplayEngineDxe/DisplayEngineDxe.inf index fa7b2ca..c1c1974 100644 --- a/MdeModulePkg/Universal/DisplayEngineDxe/DisplayEngineDxe.inf +++ b/MdeModulePkg/Universal/DisplayEngineDxe/DisplayEngineDxe.inf @@ -1,7 +1,7 @@ ## @file
# The DXE driver produces FORM DISPLAY ENGIEN protocol.
#
-# Copyright (c) 2007 - 2017, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2007 - 2018, Intel Corporation. All rights reserved.<BR>
#
# This program and the accompanying materials
# are licensed and made available under the terms and conditions of the BSD License
@@ -36,11 +36,11 @@ ProcessOptions.c
InputHandler.c
Popup.c
-
+
[Packages]
MdePkg/MdePkg.dec
MdeModulePkg/MdeModulePkg.dec
-
+
[LibraryClasses]
UefiDriverEntryPoint
UefiBootServicesTableLib
@@ -59,7 +59,7 @@ [Depex]
gEfiHiiDatabaseProtocolGuid AND gEfiHiiConfigRoutingProtocolGuid AND gEdkiiFormBrowserEx2ProtocolGuid
-
+
[FeaturePcd]
gEfiMdeModulePkgTokenSpaceGuid.PcdBrowserGrayOutTextStatement ## CONSUMES
gEfiMdeModulePkgTokenSpaceGuid.PcdBrowerGrayOutReadOnlyMenu ## CONSUMES
diff --git a/MdeModulePkg/Universal/DisplayEngineDxe/DisplayEngineExtra.uni b/MdeModulePkg/Universal/DisplayEngineDxe/DisplayEngineExtra.uni index 7d97faf..b8019bf 100644 --- a/MdeModulePkg/Universal/DisplayEngineDxe/DisplayEngineExtra.uni +++ b/MdeModulePkg/Universal/DisplayEngineDxe/DisplayEngineExtra.uni @@ -1,7 +1,7 @@ // /** @file
// DisplayEngine Localized Strings and Content
//
-// Copyright (c) 2014, Intel Corporation. All rights reserved.<BR>
+// Copyright (c) 2014 - 2018, Intel Corporation. All rights reserved.<BR>
//
// This program and the accompanying materials
// are licensed and made available under the terms and conditions of the BSD License
@@ -12,8 +12,8 @@ //
// **/
-#string STR_PROPERTIES_MODULE_NAME
-#language en-US
+#string STR_PROPERTIES_MODULE_NAME
+#language en-US
"DisplayEngine DXE Driver"
diff --git a/MdeModulePkg/Universal/DisplayEngineDxe/FormDisplay.c b/MdeModulePkg/Universal/DisplayEngineDxe/FormDisplay.c index d2867d2..f2eac4d 100644 --- a/MdeModulePkg/Universal/DisplayEngineDxe/FormDisplay.c +++ b/MdeModulePkg/Universal/DisplayEngineDxe/FormDisplay.c @@ -1,7 +1,7 @@ /** @file
Entry and initialization module for the browser.
-Copyright (c) 2007 - 2017, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2007 - 2018, Intel Corporation. All rights reserved.<BR>
Copyright (c) 2014, Hewlett-Packard Development Company, L.P.<BR>
This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License
@@ -87,7 +87,7 @@ SCREEN_OPERATION_T0_CONTROL_FLAG gScreenOperationToControlFlag[] = { {
UiPageDown,
CfUiPageDown
- },
+ },
{
UiHotKey,
CfUiHotKey
@@ -418,10 +418,10 @@ GetWidth ( //
((Statement->OpCode->OpCode == EFI_IFR_TEXT_OP) && (Size == 0))
) {
-
+
//
// Return the space width.
- //
+ //
if (AdjustWidth != NULL) {
*AdjustWidth = 2;
}
@@ -462,7 +462,7 @@ GetWidth ( @param Index Where in InputString to start the copy process
@param OutputString Buffer to copy the string into
- @return Returns the number of CHAR16 characters that were copied into the OutputString
+ @return Returns the number of CHAR16 characters that were copied into the OutputString
buffer, include extra glyph info and '\0' info.
**/
@@ -541,7 +541,7 @@ GetLineByWidth ( if (ReturnFlag) {
break;
}
- }
+ }
//
// Rewind the string from the maximum size until we see a space to break the line
@@ -590,7 +590,7 @@ GetLineByWidth ( if (InputString[*Index + StrOffset] == CHAR_SPACE) {
//
// Skip the space info at the begin of next line.
- //
+ //
*Index = (UINT16) (*Index + StrOffset + 1);
} else if (InputString[*Index + StrOffset] == CHAR_LINEFEED) {
//
@@ -604,7 +604,7 @@ GetLineByWidth ( } else if (InputString[*Index + StrOffset] == CHAR_CARRIAGE_RETURN) {
//
// Skip the /r or /r/n info.
- //
+ //
if (InputString[*Index + StrOffset + 1] == CHAR_LINEFEED) {
*Index = (UINT16) (*Index + StrOffset + 2);
} else {
@@ -705,7 +705,7 @@ UiAddMenuOption ( case EFI_IFR_TEXT_OP:
if (FeaturePcdGet (PcdBrowserGrayOutTextStatement)) {
//
- // Initializing GrayOut option as TRUE for Text setup options
+ // Initializing GrayOut option as TRUE for Text setup options
// so that those options will be Gray in colour and un selectable.
//
MenuOption->GrayOut = TRUE;
@@ -723,8 +723,8 @@ UiAddMenuOption ( }
}
- if (Index == 0 &&
- (Statement->OpCode->OpCode != EFI_IFR_DATE_OP) &&
+ if (Index == 0 &&
+ (Statement->OpCode->OpCode != EFI_IFR_DATE_OP) &&
(Statement->OpCode->OpCode != EFI_IFR_TIME_OP)) {
Width = GetWidth (MenuOption, NULL);
for (; GetLineByWidth (MenuOption->Description, Width, &GlyphWidth,&ArrayEntry, &OutputString) != 0x0000;) {
@@ -741,7 +741,7 @@ UiAddMenuOption ( // Add three MenuOptions for Date/Time
// Data format : [01/02/2004] [11:22:33]
// Line number : 0 0 1 0 0 1
- //
+ //
NumberOfLines = 0;
}
@@ -920,8 +920,8 @@ UpdateSkipInfoForMenu ( FreePool (OutputString);
}
- if ((Row > MenuOption->Skip) &&
- (MenuOption->ThisTag->OpCode->OpCode != EFI_IFR_DATE_OP) &&
+ if ((Row > MenuOption->Skip) &&
+ (MenuOption->ThisTag->OpCode->OpCode != EFI_IFR_DATE_OP) &&
(MenuOption->ThisTag->OpCode->OpCode != EFI_IFR_TIME_OP)) {
MenuOption->Skip = Row;
}
@@ -1045,8 +1045,8 @@ IsSelectable ( @return The row distance from current MenuOption to next selectable MenuOption.
@retval -1 Reach the begin of the menu, still can't find the selectable menu.
- @retval Value Find the selectable menu, maybe the truly selectable, maybe the
- first menu showing beyond current form or last menu showing in
+ @retval Value Find the selectable menu, maybe the truly selectable, maybe the
+ first menu showing beyond current form or last menu showing in
current form.
The value is the line number between the new selected menu and the
current select menu, not include the new selected menu.
@@ -1126,10 +1126,10 @@ MoveToNextStatement ( @param MenuOption Menu option point to date/time.
@param OptionString Option string input for process.
- @param AddOptCol Whether need to update MenuOption->OptCol.
+ @param AddOptCol Whether need to update MenuOption->OptCol.
**/
-VOID
+VOID
ProcessStringForDateTime (
UI_MENU_OPTION *MenuOption,
CHAR16 *OptionString,
@@ -1143,7 +1143,7 @@ ProcessStringForDateTime ( EFI_IFR_TIME *Time;
ASSERT (MenuOption != NULL && OptionString != NULL);
-
+
Statement = MenuOption->ThisTag;
Date = NULL;
Time = NULL;
@@ -1152,7 +1152,7 @@ ProcessStringForDateTime ( } else if (Statement->OpCode->OpCode == EFI_IFR_TIME_OP) {
Time = (EFI_IFR_TIME *) Statement->OpCode;
}
-
+
//
// If leading spaces on OptionString - remove the spaces
//
@@ -1164,13 +1164,13 @@ ProcessStringForDateTime ( MenuOption->OptCol++;
}
}
-
+
for (Count = 0; OptionString[Index] != CHAR_NULL; Index++) {
OptionString[Count] = OptionString[Index];
Count++;
}
OptionString[Count] = CHAR_NULL;
-
+
//
// Enable to suppress field in the opcode base on the flag.
//
@@ -1182,21 +1182,21 @@ ProcessStringForDateTime ( //
if ((Date->Flags & EFI_QF_DATE_MONTH_SUPPRESS) && (MenuOption->Sequence == 0)) {
//
- // At this point, only "<**:" in the optionstring.
+ // At this point, only "<**:" in the optionstring.
// Clean the day's ** field, after clean, the format is "< :"
//
SetUnicodeMem (&OptionString[1], 2, L' ');
} else if ((Date->Flags & EFI_QF_DATE_DAY_SUPPRESS) && (MenuOption->Sequence == 1)) {
//
- // At this point, only "**:" in the optionstring.
+ // At this point, only "**:" in the optionstring.
// Clean the month's "**" field, after clean, the format is " :"
- //
+ //
SetUnicodeMem (&OptionString[0], 2, L' ');
} else if ((Date->Flags & EFI_QF_DATE_YEAR_SUPPRESS) && (MenuOption->Sequence == 2)) {
//
- // At this point, only "****>" in the optionstring.
+ // At this point, only "****>" in the optionstring.
// Clean the year's "****" field, after clean, the format is " >"
- //
+ //
SetUnicodeMem (&OptionString[0], 4, L' ');
}
} else if (Statement->OpCode->OpCode == EFI_IFR_TIME_OP) {
@@ -1207,21 +1207,21 @@ ProcessStringForDateTime ( //
if ((Time->Flags & QF_TIME_HOUR_SUPPRESS) && (MenuOption->Sequence == 0)) {
//
- // At this point, only "<**:" in the optionstring.
+ // At this point, only "<**:" in the optionstring.
// Clean the hour's ** field, after clean, the format is "< :"
//
SetUnicodeMem (&OptionString[1], 2, L' ');
} else if ((Time->Flags & QF_TIME_MINUTE_SUPPRESS) && (MenuOption->Sequence == 1)) {
//
- // At this point, only "**:" in the optionstring.
+ // At this point, only "**:" in the optionstring.
// Clean the minute's "**" field, after clean, the format is " :"
- //
+ //
SetUnicodeMem (&OptionString[0], 2, L' ');
} else if ((Time->Flags & QF_TIME_SECOND_SUPPRESS) && (MenuOption->Sequence == 2)) {
//
- // At this point, only "**>" in the optionstring.
+ // At this point, only "**>" in the optionstring.
// Clean the second's "**" field, after clean, the format is " >"
- //
+ //
SetUnicodeMem (&OptionString[0], 2, L' ');
}
}
@@ -1304,7 +1304,7 @@ AdjustDateAndTimePosition ( /**
Get step info from numeric opcode.
-
+
@param[in] OpCode The input numeric op code.
@return step info for this opcode.
@@ -1318,24 +1318,24 @@ GetFieldFromNum ( UINT64 Step;
NumericOp = (EFI_IFR_NUMERIC *) OpCode;
-
+
switch (NumericOp->Flags & EFI_IFR_NUMERIC_SIZE) {
case EFI_IFR_NUMERIC_SIZE_1:
Step = NumericOp->data.u8.Step;
break;
-
+
case EFI_IFR_NUMERIC_SIZE_2:
Step = NumericOp->data.u16.Step;
break;
-
+
case EFI_IFR_NUMERIC_SIZE_4:
Step = NumericOp->data.u32.Step;
break;
-
+
case EFI_IFR_NUMERIC_SIZE_8:
Step = NumericOp->data.u64.Step;
break;
-
+
default:
Step = 0;
break;
@@ -1346,7 +1346,7 @@ GetFieldFromNum ( /**
Find the registered HotKey based on KeyData.
-
+
@param[in] KeyData A pointer to a buffer that describes the keystroke
information for the hot key.
@@ -1363,14 +1363,14 @@ GetHotKeyFromRegisterList ( Link = GetFirstNode (&gFormData->HotKeyListHead);
while (!IsNull (&gFormData->HotKeyListHead, Link)) {
HotKey = BROWSER_HOT_KEY_FROM_LINK (Link);
-
+
if (HotKey->KeyData->ScanCode == KeyData->ScanCode) {
return HotKey;
}
Link = GetNextNode (&gFormData->HotKeyListHead, Link);
}
-
+
return NULL;
}
@@ -1440,13 +1440,13 @@ UiWaitForEvent ( Timeout
);
}
-
+
WaitList[0] = Event;
EventNum = 1;
if (gFormData->FormRefreshEvent != NULL) {
WaitList[EventNum] = gFormData->FormRefreshEvent;
EventNum ++;
- }
+ }
if (Timeout != 0) {
WaitList[EventNum] = TimerEvent;
@@ -1479,7 +1479,7 @@ UiWaitForEvent ( if (Timeout != 0) {
gBS->CloseEvent (TimerEvent);
}
-
+
return EventType;
}
@@ -1603,7 +1603,7 @@ GetIndexInfoForOpcode ( @retval FALSE This is not the highlight statement.
**/
-BOOLEAN
+BOOLEAN
IsSavedHighlightStatement (
IN FORM_DISPLAY_ENGINE_STATEMENT *HighLightedStatement
)
@@ -1735,7 +1735,7 @@ IsTopOfScreeMenuOption ( {
if (gHighligthMenuInfo.TOSQuestionId != 0) {
return (BOOLEAN) (GetQuestionIdInfo(MenuOption->ThisTag->OpCode) == gHighligthMenuInfo.TOSQuestionId);
- }
+ }
if(CompareMem (gHighligthMenuInfo.TOSOpCode, MenuOption->ThisTag->OpCode, gHighligthMenuInfo.TOSOpCode->Length) == 0) {
if (gHighligthMenuInfo.TOSIndex == 0 || gHighligthMenuInfo.TOSIndex == GetIndexInfoForOpcode(MenuOption->ThisTag->OpCode)) {
@@ -1863,7 +1863,7 @@ FindTopMenu ( //
if (gMisMatch && gFormData->HiiHandle == gHighligthMenuInfo.HiiHandle && gFormData->FormId == gHighligthMenuInfo.FormId) {
//
- // Reenter caused by option mismatch or auto exit caused by refresh form(refresh interval/guid),
+ // Reenter caused by option mismatch or auto exit caused by refresh form(refresh interval/guid),
// base on the record highlight info to find the highlight menu.
//
@@ -1930,7 +1930,7 @@ FindTopMenu ( //
MenuOption = MENU_OPTION_FROM_LINK (*HighlightMenu);
UpdateOptionSkipLines (MenuOption);
-
+
*TopOfScreen = FindTopOfScreenMenuOption(*HighlightMenu);
if (*TopOfScreen == NULL) {
//
@@ -2090,7 +2090,7 @@ SetDisplayAttribute ( )
{
FORM_DISPLAY_ENGINE_STATEMENT *Statement;
-
+
Statement = MenuOption->ThisTag;
if (Highlight) {
@@ -2140,11 +2140,11 @@ DisplayMenuString ( PrintStringAtWithWidth (Col, Row, String, Width);
return;
}
-
+
//
// Print the highlight menu string.
// First print the highlight string.
- //
+ //
SetDisplayAttribute(MenuOption, TRUE);
Length = PrintStringAt (Col, Row, String);
@@ -2164,7 +2164,7 @@ DisplayMenuString ( @retval FALSE This menu option can't have option string.
**/
-BOOLEAN
+BOOLEAN
HasOptionString (
IN UI_MENU_OPTION *MenuOption
)
@@ -2233,8 +2233,8 @@ FxConfirmPopup ( //
// Below action need extra popup dialog to confirm.
- //
- CheckFlags = BROWSER_ACTION_DISCARD |
+ //
+ CheckFlags = BROWSER_ACTION_DISCARD |
BROWSER_ACTION_DEFAULT |
BROWSER_ACTION_SUBMIT |
BROWSER_ACTION_RESET |
@@ -2249,12 +2249,12 @@ FxConfirmPopup ( if ((Action & BROWSER_ACTION_DISCARD) == BROWSER_ACTION_DISCARD) {
CfmStrLen += StrLen (gConfirmDiscardMsg);
- }
+ }
if ((Action & BROWSER_ACTION_DEFAULT) == BROWSER_ACTION_DEFAULT) {
if (CfmStrLen != 0) {
CfmStrLen += CatLen;
- }
+ }
CfmStrLen += StrLen (gConfirmDefaultMsg);
}
@@ -2262,7 +2262,7 @@ FxConfirmPopup ( if ((Action & BROWSER_ACTION_SUBMIT) == BROWSER_ACTION_SUBMIT) {
if (CfmStrLen != 0) {
CfmStrLen += CatLen;
- }
+ }
CfmStrLen += StrLen (gConfirmSubmitMsg);
}
@@ -2270,7 +2270,7 @@ FxConfirmPopup ( if ((Action & BROWSER_ACTION_RESET) == BROWSER_ACTION_RESET) {
if (CfmStrLen != 0) {
CfmStrLen += CatLen;
- }
+ }
CfmStrLen += StrLen (gConfirmResetMsg);
}
@@ -2278,7 +2278,7 @@ FxConfirmPopup ( if ((Action & BROWSER_ACTION_EXIT) == BROWSER_ACTION_EXIT) {
if (CfmStrLen != 0) {
CfmStrLen += CatLen;
- }
+ }
CfmStrLen += StrLen (gConfirmExitMsg);
}
@@ -2356,7 +2356,7 @@ FxConfirmPopup ( @param MenuOption The menu opton which this attribut used to.
@param SkipWidth The skip width between the left to the start of the prompt.
@param BeginCol The begin column for one menu.
- @param SkipLine The skip line for this menu.
+ @param SkipLine The skip line for this menu.
@param BottomRow The bottom row for this form.
@param Highlight Whether this menu will be highlight.
@param UpdateCol Whether need to update the column info for Date/Time.
@@ -2425,12 +2425,12 @@ DisplayOneMenu ( //
ProcessStringForDateTime(MenuOption, OptionString, UpdateCol);
}
-
+
Width = (UINT16) gOptionBlockWidth - 1;
Row = MenuOption->Row;
GlyphWidth = 1;
OptionLineNum = 0;
-
+
for (Index = 0; GetLineByWidth (OptionString, Width, &GlyphWidth, &Index, &OutputString) != 0x0000;) {
if (((Temp2 == 0)) && (Row <= BottomRow)) {
if (Statement->OpCode->OpCode == EFI_IFR_DATE_OP || Statement->OpCode->OpCode == EFI_IFR_TIME_OP) {
@@ -2448,7 +2448,7 @@ DisplayOneMenu ( } else {
//
// For date/ time, print the first and second past (year for date and second for time)
- // The OutputString has a NARROW_CHAR or WIDE_CHAR at the begin of the string,
+ // The OutputString has a NARROW_CHAR or WIDE_CHAR at the begin of the string,
// so need to - 1 to remove it, otherwise, it will clean 1 extr char follow it.
DisplayMenuString (MenuOption, MenuOption->OptCol, Row, OutputString, StrLen (OutputString) - 1, Highlight);
}
@@ -2457,7 +2457,7 @@ DisplayOneMenu ( }
OptionLineNum++;
}
-
+
//
// If there is more string to process print on the next row and increment the Skip value
//
@@ -2476,13 +2476,13 @@ DisplayOneMenu ( }
}
}
-
+
FreePool (OutputString);
if (Temp2 != 0) {
Temp2--;
}
}
-
+
Highlight = FALSE;
FreePool (OptionString);
@@ -2500,13 +2500,13 @@ DisplayOneMenu ( PrintStringAtWithWidth (BeginCol, Row, L"", PromptWidth + AdjustValue + SkipWidth);
PromptLineNum++;
} else {
- for (Index = 0; GetLineByWidth (MenuOption->Description, PromptWidth, &GlyphWidth, &Index, &OutputString) != 0x0000;) {
- if ((Temp == 0) && (Row <= BottomRow)) {
+ for (Index = 0; GetLineByWidth (MenuOption->Description, PromptWidth, &GlyphWidth, &Index, &OutputString) != 0x0000;) {
+ if ((Temp == 0) && (Row <= BottomRow)) {
//
- // 1.Clean the start LEFT_SKIPPED_COLUMNS
+ // 1.Clean the start LEFT_SKIPPED_COLUMNS
//
PrintStringAtWithWidth (BeginCol, Row, L"", SkipWidth);
-
+
if (Statement->OpCode->OpCode == EFI_IFR_REF_OP && MenuOption->Col >= 2 && IsProcessingFirstRow) {
//
// Print Arrow for Goto button.
@@ -2545,13 +2545,13 @@ DisplayOneMenu ( //
if ((Statement->OpCode->OpCode == EFI_IFR_TEXT_OP) && (((EFI_IFR_TEXT*)Statement->OpCode)->TextTwo != 0)) {
StringPtr = GetToken (((EFI_IFR_TEXT*)Statement->OpCode)->TextTwo, gFormData->HiiHandle);
-
+
Width = (UINT16) gOptionBlockWidth - 1;
Row = MenuOption->Row;
GlyphWidth = 1;
OptionLineNum = 0;
- for (Index = 0; GetLineByWidth (StringPtr, Width, &GlyphWidth, &Index, &OutputString) != 0x0000;) {
+ for (Index = 0; GetLineByWidth (StringPtr, Width, &GlyphWidth, &Index, &OutputString) != 0x0000;) {
if ((Temp3 == 0) && (Row <= BottomRow)) {
DisplayMenuString (MenuOption, MenuOption->OptCol, Row, OutputString, Width + 1, Highlight);
OptionLineNum++;
@@ -2570,7 +2570,7 @@ DisplayOneMenu ( }
}
}
-
+
FreePool (OutputString);
if (Temp3 != 0) {
Temp3--;
@@ -2589,7 +2589,7 @@ DisplayOneMenu ( Row = (OptionLineNum < PromptLineNum ? OptionLineNum : PromptLineNum) + MenuOption->Row;
Width = (UINT16) (OptionLineNum < PromptLineNum ? gOptionBlockWidth : PromptWidth + AdjustValue + SkipWidth);
MaxRow = (OptionLineNum < PromptLineNum ? PromptLineNum : OptionLineNum) + MenuOption->Row - 1;
-
+
while (Row <= MaxRow) {
DisplayMenuString (MenuOption, Col, Row++, L"", Width, FALSE);
}
@@ -2717,7 +2717,7 @@ UiDisplayMenu ( while (TRUE) {
switch (ControlFlag) {
case CfInitialization:
- if ((gOldFormEntry.HiiHandle != FormData->HiiHandle) ||
+ if ((gOldFormEntry.HiiHandle != FormData->HiiHandle) ||
(!CompareGuid (&gOldFormEntry.FormSetGuid, &FormData->FormSetGuid))) {
//
// Clear Statement range if different formset is painted.
@@ -2746,7 +2746,7 @@ UiDisplayMenu ( Row = TopRow;
gST->ConOut->SetAttribute (gST->ConOut, GetFieldTextColor ());
-
+
//
// 1. Check whether need to print the arrow up.
//
@@ -2795,19 +2795,19 @@ UiDisplayMenu ( }
if ((FormData->Attribute & HII_DISPLAY_MODAL) != 0) {
- Status = DisplayOneMenu (MenuOption,
+ Status = DisplayOneMenu (MenuOption,
MenuOption->Col - gStatementDimensions.LeftColumn,
- gStatementDimensions.LeftColumn + gModalSkipColumn,
- Link == TopOfScreen ? SkipValue : 0,
+ gStatementDimensions.LeftColumn + gModalSkipColumn,
+ Link == TopOfScreen ? SkipValue : 0,
BottomRow,
(BOOLEAN) ((Link == NewPos) && IsSelectable(MenuOption)),
TRUE
);
} else {
- Status = DisplayOneMenu (MenuOption,
+ Status = DisplayOneMenu (MenuOption,
MenuOption->Col - gStatementDimensions.LeftColumn,
- gStatementDimensions.LeftColumn,
- Link == TopOfScreen ? SkipValue : 0,
+ gStatementDimensions.LeftColumn,
+ Link == TopOfScreen ? SkipValue : 0,
BottomRow,
(BOOLEAN) ((Link == NewPos) && IsSelectable(MenuOption)),
TRUE
@@ -2915,10 +2915,10 @@ UiDisplayMenu ( //
// Remove the old highlight menu.
//
- Status = DisplayOneMenu (MenuOption,
+ Status = DisplayOneMenu (MenuOption,
MenuOption->Col - gStatementDimensions.LeftColumn,
- gStatementDimensions.LeftColumn,
- Temp,
+ gStatementDimensions.LeftColumn,
+ Temp,
BottomRow,
FALSE,
FALSE
@@ -2935,10 +2935,10 @@ UiDisplayMenu ( break;
}
- Status = DisplayOneMenu (MenuOption,
+ Status = DisplayOneMenu (MenuOption,
MenuOption->Col - gStatementDimensions.LeftColumn,
- gStatementDimensions.LeftColumn,
- Temp2,
+ gStatementDimensions.LeftColumn,
+ Temp2,
BottomRow,
TRUE,
FALSE
@@ -3038,7 +3038,7 @@ UiDisplayMenu ( //
// Check whether need to show the 'More(U/u)' at the begin.
// Base on current direct info, here shows aligned to the right side of the column.
- // If the direction is multi line and aligned to right side may have problem, so
+ // If the direction is multi line and aligned to right side may have problem, so
// add ASSERT code here.
//
if (HelpPageIndex > 0) {
@@ -3093,7 +3093,7 @@ UiDisplayMenu ( );
}
} else {
- for (Index = 0; (Index < RowCount - HelpBottomLine - HelpHeaderLine) &&
+ for (Index = 0; (Index < RowCount - HelpBottomLine - HelpHeaderLine) &&
(Index + HelpPageIndex * (RowCount - 2) + 1 < HelpLine); Index++) {
PrintStringAtWithWidth (
gStatementDimensions.RightColumn - gHelpBlockWidth,
@@ -3113,13 +3113,13 @@ UiDisplayMenu ( }
gST->ConOut->SetCursorPosition(gST->ConOut, gStatementDimensions.RightColumn-1, BottomRow);
}
- }
+ }
}
//
// Check whether need to print the 'More(D/d)' at the bottom.
// Base on current direct info, here shows aligned to the right side of the column.
- // If the direction is multi line and aligned to right side may have problem, so
+ // If the direction is multi line and aligned to right side may have problem, so
// add ASSERT code here.
//
if (HelpPageIndex < HelpPageCount - 1 && MultiHelpPage) {
@@ -3171,7 +3171,7 @@ UiDisplayMenu ( if (Status != EFI_NOT_READY) {
continue;
}
-
+
EventType = UiWaitForEvent(gST->ConIn->WaitForKey);
if (EventType == UIEventKey) {
gST->ConIn->ReadKeyStroke (gST->ConIn, &Key);
@@ -3185,7 +3185,7 @@ UiDisplayMenu ( ControlFlag = CfExit;
break;
}
-
+
if (EventType == UIEventTimeOut) {
gUserInput->Action = BROWSER_ACTION_FORM_EXIT;
ControlFlag = CfExit;
@@ -3229,7 +3229,7 @@ UiDisplayMenu ( } else {
gDirection = SCAN_LEFT;
}
-
+
Status = ProcessOptions (MenuOption, TRUE, &OptionString, TRUE);
if (OptionString != NULL) {
FreePool (OptionString);
@@ -3260,7 +3260,7 @@ UiDisplayMenu ( ControlFlag = CfReadKey;
break;
}
-
+
ASSERT(MenuOption != NULL);
if (MenuOption->ThisTag->OpCode->OpCode == EFI_IFR_CHECKBOX_OP && !MenuOption->GrayOut && !MenuOption->ReadOnly) {
ScreenOperation = UiSelect;
@@ -3294,7 +3294,7 @@ UiDisplayMenu ( break;
}
}
-
+
if (((FormData->Attribute & HII_DISPLAY_MODAL) != 0) && (Key.ScanCode == SCAN_ESC || Index == mScanCodeNumber)) {
//
// ModalForm has no ESC key and Hot Key.
@@ -3359,11 +3359,11 @@ UiDisplayMenu ( //
RefreshKeyHelp (gFormData, Statement, TRUE);
Status = ProcessOptions (MenuOption, TRUE, &OptionString, TRUE);
-
+
if (OptionString != NULL) {
FreePool (OptionString);
}
-
+
if (EFI_ERROR (Status)) {
Repaint = TRUE;
NewLine = TRUE;
@@ -3493,12 +3493,12 @@ UiDisplayMenu ( // Check whether new highlight menu is selectable, if not, keep highlight on the old one.
//
// BottomRow - TopRow + 1 means the total rows current forms supported.
- // Difference + NextMenuOption->Skip + 1 means the distance between last highlight menu
- // and new top menu. New top menu will all shows in next form, but last highlight menu
- // may only shows 1 line. + 1 at right part means at least need to keep 1 line for the
+ // Difference + NextMenuOption->Skip + 1 means the distance between last highlight menu
+ // and new top menu. New top menu will all shows in next form, but last highlight menu
+ // may only shows 1 line. + 1 at right part means at least need to keep 1 line for the
// last highlight menu.
- //
- if (!IsSelectable(NextMenuOption) && IsSelectable(MenuOption) &&
+ //
+ if (!IsSelectable(NextMenuOption) && IsSelectable(MenuOption) &&
(BottomRow - TopRow + 1 >= Difference + NextMenuOption->Skip + 1)) {
NewPos = SavedListEntry;
}
@@ -3539,11 +3539,11 @@ UiDisplayMenu ( } else {
Index = (BottomRow + 1) - SkipValue - TopRow;
}
-
+
TopOfScreen = FindTopOfScreenMenu(TopOfScreen, Index, &SkipValue);
NewPos = TopOfScreen;
MoveToNextStatement (FALSE, &NewPos, BottomRow - TopRow, FALSE);
-
+
UpdateStatusBar (INPUT_ERROR, FALSE);
//
@@ -3662,7 +3662,7 @@ UiDisplayMenu ( //
// Scroll to the first page.
//
- if (TopOfScreen != gMenuOption.ForwardLink || SkipValue != 0) {
+ if (TopOfScreen != gMenuOption.ForwardLink || SkipValue != 0) {
TopOfScreen = gMenuOption.ForwardLink;
Repaint = TRUE;
MenuOption = NULL;
@@ -3681,7 +3681,7 @@ UiDisplayMenu ( UpdateHighlightMenuInfo(NewPos, TopOfScreen, SkipValue);
break;
- }
+ }
//
// Get next selected menu info.
@@ -3760,12 +3760,12 @@ UiDisplayMenu ( // Check whether new highlight menu is selectable, if not, keep highlight on the old one.
//
// BottomRow - TopRow + 1 means the total rows current forms supported.
- // Difference + NextMenuOption->Skip + 1 means the distance between last highlight menu
- // and new top menu. New top menu will all shows in next form, but last highlight menu
- // may only shows 1 line. + 1 at right part means at least need to keep 1 line for the
+ // Difference + NextMenuOption->Skip + 1 means the distance between last highlight menu
+ // and new top menu. New top menu will all shows in next form, but last highlight menu
+ // may only shows 1 line. + 1 at right part means at least need to keep 1 line for the
// last highlight menu.
- //
- if (!IsSelectable (NextMenuOption) && IsSelectable (MenuOption) &&
+ //
+ if (!IsSelectable (NextMenuOption) && IsSelectable (MenuOption) &&
(BottomRow - TopRow + 1 >= Difference + NextMenuOption->Skip + 1)) {
NewPos = SavedListEntry;
}
@@ -3984,7 +3984,7 @@ BrowserStatusProcess ( // Show the dialog first to avoid long time not reaction.
//
gBS->SignalEvent (RefreshIntervalEvent);
-
+
Status = gBS->SetTimer (RefreshIntervalEvent, TimerPeriodic, ONE_SECOND);
ASSERT_EFI_ERROR (Status);
@@ -4025,17 +4025,17 @@ BrowserStatusProcess ( /**
Display one form, and return user input.
-
+
@param FormData Form Data to be shown.
@param UserInputData User input data.
-
+
@retval EFI_SUCCESS 1.Form Data is shown, and user input is got.
2.Error info has show and return.
@retval EFI_INVALID_PARAMETER The input screen dimension is not valid
@retval EFI_NOT_FOUND New form data has some error.
**/
EFI_STATUS
-EFIAPI
+EFIAPI
FormDisplay (
IN FORM_DISPLAY_ENGINE_FORM *FormData,
OUT USER_INPUT *UserInputData
@@ -4074,7 +4074,7 @@ FormDisplay ( //
// Left right
// |<-.->|<-.........->|<- .........->|<-...........->|
- // Skip Prompt Option Help
+ // Skip Prompt Option Help
//
gOptionBlockWidth = (CHAR16) ((gStatementDimensions.RightColumn - gStatementDimensions.LeftColumn) / 3) + 1;
gHelpBlockWidth = (CHAR16) (gOptionBlockWidth - 1 - LEFT_SKIPPED_COLUMNS);
@@ -4085,7 +4085,7 @@ FormDisplay ( //
// Check whether layout is changed.
//
- if (mIsFirstForm
+ if (mIsFirstForm
|| (gOldFormEntry.HiiHandle != FormData->HiiHandle)
|| (!CompareGuid (&gOldFormEntry.FormSetGuid, &FormData->FormSetGuid))
|| (gOldFormEntry.FormId != FormData->FormId)) {
@@ -4095,7 +4095,7 @@ FormDisplay ( }
Status = UiDisplayMenu(FormData);
-
+
//
// Backup last form info.
//
@@ -4116,7 +4116,7 @@ FormDisplay ( Clear Screen to the initial state.
**/
VOID
-EFIAPI
+EFIAPI
DriverClearDisplayPage (
VOID
)
@@ -4204,13 +4204,13 @@ InitializeDisplayEngine ( ASSERT_EFI_ERROR (Status);
InitializeDisplayStrings();
-
+
ZeroMem (&gHighligthMenuInfo, sizeof (gHighligthMenuInfo));
ZeroMem (&gOldFormEntry, sizeof (gOldFormEntry));
//
// Use BrowserEx2 protocol to register HotKey.
- //
+ //
Status = gBS->LocateProtocol (&gEdkiiFormBrowserEx2ProtocolGuid, NULL, (VOID **) &FormBrowserEx2);
if (!EFI_ERROR (Status)) {
//
diff --git a/MdeModulePkg/Universal/DisplayEngineDxe/FormDisplay.h b/MdeModulePkg/Universal/DisplayEngineDxe/FormDisplay.h index 7e2a1aa..fc28f95 100644 --- a/MdeModulePkg/Universal/DisplayEngineDxe/FormDisplay.h +++ b/MdeModulePkg/Universal/DisplayEngineDxe/FormDisplay.h @@ -1,13 +1,13 @@ /** @file
FormDiplay protocol to show Form
-Copyright (c) 2013 - 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
+Copyright (c) 2013 - 2018, Intel Corporation. All rights reserved.<BR>
+This program and the accompanying materials are licensed and made available under
+the terms and conditions of the BSD License that accompanies this distribution.
The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
+http://opensource.org/licenses/bsd-license.php.
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
**/
@@ -213,22 +213,22 @@ typedef struct { typedef struct {
EFI_HII_HANDLE HiiHandle;
UINT16 FormId;
-
+
//
// Info for the highlight question.
// HLT means highlight
//
// If one statement has questionid, save questionid info to find the question.
- // If one statement not has questionid info, save the opcode info to find the
+ // If one statement not has questionid info, save the opcode info to find the
// statement. If more than one statement has same opcode in one form(just like
- // empty subtitle info may has more than one info one form), also use Index
+ // empty subtitle info may has more than one info one form), also use Index
// info to find the statement.
//
EFI_QUESTION_ID HLTQuestionId;
EFI_IFR_OP_HEADER *HLTOpCode;
UINTN HLTIndex;
UINTN HLTSequence;
-
+
//
// Info for the top of screen question.
// TOS means Top Of Screen
@@ -390,7 +390,7 @@ GetArrayData ( IN UINT8 Type,
IN UINTN Index
);
-
+
/**
Search an Option of a Question by its value.
@@ -462,7 +462,7 @@ CreateMultiStringPopUp ( @param Index Where in InputString to start the copy process
@param OutputString Buffer to copy the string into
- @return Returns the number of CHAR16 characters that were copied into the OutputString
+ @return Returns the number of CHAR16 characters that were copied into the OutputString
buffer, include extra glyph info and '\0' info.
**/
@@ -490,7 +490,7 @@ GetToken ( IN EFI_STRING_ID Token,
IN EFI_HII_HANDLE HiiHandle
);
-
+
/**
Count the storage space of a Unicode string.
@@ -559,7 +559,7 @@ CreateSharedPopUp ( IN UINTN NumberOfLines,
IN VA_LIST Marker
);
-
+
/**
Wait for a key to be pressed by user.
@@ -642,14 +642,14 @@ SetUnicodeMem ( /**
Display one form, and return user input.
-
+
@param FormData Form Data to be shown.
@param UserInputData User input data.
-
+
@retval EFI_SUCCESS Form Data is shown, and user input is got.
**/
EFI_STATUS
-EFIAPI
+EFIAPI
FormDisplay (
IN FORM_DISPLAY_ENGINE_FORM *FormData,
OUT USER_INPUT *UserInputData
@@ -659,7 +659,7 @@ FormDisplay ( Clear Screen to the initial state.
**/
VOID
-EFIAPI
+EFIAPI
DriverClearDisplayPage (
VOID
);
@@ -669,7 +669,7 @@ DriverClearDisplayPage ( **/
VOID
-EFIAPI
+EFIAPI
ExitDisplay (
VOID
);
diff --git a/MdeModulePkg/Universal/DisplayEngineDxe/InputHandler.c b/MdeModulePkg/Universal/DisplayEngineDxe/InputHandler.c index d02c0bf..cf829a3 100644 --- a/MdeModulePkg/Universal/DisplayEngineDxe/InputHandler.c +++ b/MdeModulePkg/Universal/DisplayEngineDxe/InputHandler.c @@ -1,7 +1,7 @@ /** @file
Implementation for handling user input from the User Interfaces.
-Copyright (c) 2004 - 2017, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2004 - 2018, Intel Corporation. All rights reserved.<BR>
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
@@ -34,14 +34,14 @@ GetFieldFromOp ( if (OpCode->OpCode == EFI_IFR_STRING_OP) {
StringOp = (EFI_IFR_STRING *) OpCode;
*Minimum = StringOp->MinSize;
- *Maximum = StringOp->MaxSize;
+ *Maximum = StringOp->MaxSize;
} else if (OpCode->OpCode == EFI_IFR_PASSWORD_OP) {
PasswordOp = (EFI_IFR_PASSWORD *) OpCode;
*Minimum = PasswordOp->MinSize;
- *Maximum = PasswordOp->MaxSize;
+ *Maximum = PasswordOp->MaxSize;
} else {
*Minimum = 0;
- *Maximum = 0;
+ *Maximum = 0;
}
}
@@ -160,11 +160,11 @@ ReadString ( if (!IsPassword) {
PrintStringAt (Start + 1, Top + 3, BufferedString);
}
-
+
gST->ConOut->SetAttribute (gST->ConOut, EFI_TEXT_ATTR (EFI_LIGHTGRAY, EFI_BLACK));
gST->ConOut->SetCursorPosition (gST->ConOut, Start + GetStringWidth (StringPtr) / 2, Top + 3);
}
-
+
do {
Status = WaitForKeyStroke (&Key);
ASSERT_EFI_ERROR (Status);
@@ -264,7 +264,7 @@ ReadString ( for (Index = 0; Index < CurrentCursor; Index++) {
TempString[Index] = StringPtr[Index];
}
- TempString[Index] = CHAR_NULL;
+ TempString[Index] = CHAR_NULL;
StrCatS (TempString, MaxLen, KeyPad);
StrCatS (TempString, MaxLen, StringPtr + CurrentCursor);
StrCpyS (StringPtr, MaxLen, TempString);
@@ -361,7 +361,7 @@ AdjustQuestionValue ( QuestionValue->Value.date.Day = Maximum;
}
}
-
+
//
// Change the Year area.
//
@@ -400,7 +400,7 @@ GetValueFromNum ( EFI_IFR_NUMERIC *NumericOp;
NumericOp = (EFI_IFR_NUMERIC *) OpCode;
-
+
switch (NumericOp->Flags & EFI_IFR_NUMERIC_SIZE) {
case EFI_IFR_NUMERIC_SIZE_1:
if (IntInput) {
@@ -415,7 +415,7 @@ GetValueFromNum ( *Step = NumericOp->data.u8.Step;
*StorageWidth = (UINT16) sizeof (UINT8);
break;
-
+
case EFI_IFR_NUMERIC_SIZE_2:
if (IntInput) {
*Minimum = (INT64) (INT16) NumericOp->data.u16.MinValue;
@@ -429,7 +429,7 @@ GetValueFromNum ( *Step = NumericOp->data.u16.Step;
*StorageWidth = (UINT16) sizeof (UINT16);
break;
-
+
case EFI_IFR_NUMERIC_SIZE_4:
if (IntInput) {
*Minimum = (INT64) (INT32) NumericOp->data.u32.MinValue;
@@ -443,7 +443,7 @@ GetValueFromNum ( *Step = NumericOp->data.u32.Step;
*StorageWidth = (UINT16) sizeof (UINT32);
break;
-
+
case EFI_IFR_NUMERIC_SIZE_8:
if (IntInput) {
*Minimum = (INT64) NumericOp->data.u64.MinValue;
@@ -457,7 +457,7 @@ GetValueFromNum ( *Step = NumericOp->data.u64.Step;
*StorageWidth = (UINT16) sizeof (UINT64);
break;
-
+
default:
break;
}
@@ -557,8 +557,8 @@ GetNumericInput ( case 1:
switch (QuestionValue->Value.date.Month) {
case 2:
- if ((QuestionValue->Value.date.Year % 4) == 0 &&
- ((QuestionValue->Value.date.Year % 100) != 0 ||
+ if ((QuestionValue->Value.date.Year % 4) == 0 &&
+ ((QuestionValue->Value.date.Year % 100) != 0 ||
(QuestionValue->Value.date.Year % 400) == 0)) {
Maximum = 29;
} else {
@@ -574,7 +574,7 @@ GetNumericInput ( default:
Maximum = 31;
break;
- }
+ }
EraseLen = 3;
EditValue = QuestionValue->Value.date.Day;
@@ -907,7 +907,7 @@ EnterCarriageReturn: if (IntInput) {
//
// After user input Enter, need to check whether the input value.
- // If input a negative value, should compare with maximum value.
+ // If input a negative value, should compare with maximum value.
// else compare with the minimum value.
//
if (Negative) {
@@ -977,7 +977,7 @@ EnterCarriageReturn: // Sample like: 2012.02.29 -> 2013.02.29 -> 2013.02.01
// 2013.03.29 -> 2013.02.29 -> 2013.02.28
//
- if (Question->OpCode->OpCode == EFI_IFR_DATE_OP &&
+ if (Question->OpCode->OpCode == EFI_IFR_DATE_OP &&
(MenuOption->Sequence == 0 || MenuOption->Sequence == 2)) {
AdjustQuestionValue (QuestionValue, (UINT8)MenuOption->Sequence);
}
@@ -1136,12 +1136,12 @@ AdjustOptionOrder ( break;
}
}
-
+
*PopUpMenuLines = Index;
-
+
//
// Prepare HiiValue array
- //
+ //
HiiValueArray = AllocateZeroPool (*PopUpMenuLines * sizeof (EFI_HII_VALUE));
ASSERT (HiiValueArray != NULL);
@@ -1149,21 +1149,21 @@ AdjustOptionOrder ( HiiValueArray[Index].Type = ValueType;
HiiValueArray[Index].Value.u64 = GetArrayData (ValueArray, ValueType, Index);
}
-
+
for (Index = 0; Index < *PopUpMenuLines; Index++) {
OneOfOption = ValueToOption (Question, &HiiValueArray[*PopUpMenuLines - Index - 1]);
if (OneOfOption == NULL) {
return EFI_NOT_FOUND;
}
-
+
RemoveEntryList (&OneOfOption->Link);
-
+
//
// Insert to head.
//
InsertHeadList (&Question->OptionListHead, &OneOfOption->Link);
}
-
+
FreePool (HiiValueArray);
return EFI_SUCCESS;
@@ -1191,13 +1191,13 @@ IsValuesEqual ( case EFI_IFR_TYPE_BOOLEAN:
case EFI_IFR_TYPE_NUM_SIZE_8:
return (BOOLEAN) (Value1->u8 == Value2->u8);
-
+
case EFI_IFR_TYPE_NUM_SIZE_16:
return (BOOLEAN) (Value1->u16 == Value2->u16);
-
+
case EFI_IFR_TYPE_NUM_SIZE_32:
return (BOOLEAN) (Value1->u32 == Value2->u32);
-
+
case EFI_IFR_TYPE_NUM_SIZE_64:
return (BOOLEAN) (Value1->u64 == Value2->u64);
@@ -1660,7 +1660,7 @@ TheKey: gST->ConOut->SetAttribute (gST->ConOut, SavedAttribute);
return EFI_SUCCESS;
-
+
default:
break;
}
diff --git a/MdeModulePkg/Universal/DisplayEngineDxe/ProcessOptions.c b/MdeModulePkg/Universal/DisplayEngineDxe/ProcessOptions.c index 557e8ec..709dabc 100644 --- a/MdeModulePkg/Universal/DisplayEngineDxe/ProcessOptions.c +++ b/MdeModulePkg/Universal/DisplayEngineDxe/ProcessOptions.c @@ -2,7 +2,7 @@ Implementation for handling the User Interface option processing.
-Copyright (c) 2004 - 2016, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2004 - 2018, Intel Corporation. All rights reserved.<BR>
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
@@ -102,8 +102,8 @@ HiiValueToUINT64 ( /**
Check whether this value type can be transfer to EFI_IFR_TYPE_BUFFER type.
-
- EFI_IFR_TYPE_REF, EFI_IFR_TYPE_DATE and EFI_IFR_TYPE_TIME are converted to
+
+ EFI_IFR_TYPE_REF, EFI_IFR_TYPE_DATE and EFI_IFR_TYPE_TIME are converted to
EFI_IFR_TYPE_BUFFER when do the value compare.
@param Value Expression value to compare on.
@@ -158,8 +158,8 @@ IsTypeInUINT64 ( /**
Return the buffer length and buffer pointer for this value.
-
- EFI_IFR_TYPE_REF, EFI_IFR_TYPE_DATE and EFI_IFR_TYPE_TIME are converted to
+
+ EFI_IFR_TYPE_REF, EFI_IFR_TYPE_DATE and EFI_IFR_TYPE_TIME are converted to
EFI_IFR_TYPE_BUFFER when do the value compare.
@param Value Expression value to compare on.
@@ -285,7 +285,7 @@ CompareHiiValue ( *Result = Buf1Len > Buf2Len ? 1 : -1;
}
return EFI_SUCCESS;
- }
+ }
//
// Take remain types(integer, boolean, date/time) as integer
@@ -333,7 +333,7 @@ ValueToOption ( ZeroMem (&Value, sizeof (EFI_HII_VALUE));
Value.Type = Option->OptionOpCode->Type;
CopyMem (&Value.Value, &Option->OptionOpCode->Value, Option->OptionOpCode->Header.Length - OFFSET_OF (EFI_IFR_ONE_OF_OPTION, Value));
-
+
if ((CompareHiiValue (&Value, OptionValue, &Result, NULL) == EFI_SUCCESS) && (Result == 0)) {
return Option;
}
@@ -441,12 +441,12 @@ SetArrayData ( @param Type Type of the data in this array.
@param Value The value to be find.
@param Index The index in the array which has same value with Value.
-
+
@retval TRUE Found the value in the array.
@retval FALSE Not found the value.
**/
-BOOLEAN
+BOOLEAN
FindArrayData (
IN VOID *Array,
IN UINT8 Type,
@@ -457,7 +457,7 @@ FindArrayData ( UINTN Count;
UINT64 TmpValue;
UINT64 ValueComp;
-
+
ASSERT (Array != NULL);
Count = 0;
@@ -804,7 +804,7 @@ PasswordProcess ( StringPtr = AllocateZeroPool ((Maximum + 1) * sizeof (CHAR16));
ASSERT (StringPtr);
-
+
//
// Use a NULL password to test whether old password is required
//
@@ -812,7 +812,7 @@ PasswordProcess ( Status = Question->PasswordCheck (gFormData, Question, StringPtr);
if (Status == EFI_NOT_AVAILABLE_YET || Status == EFI_UNSUPPORTED) {
//
- // Password can't be set now.
+ // Password can't be set now.
//
if (Status == EFI_UNSUPPORTED) {
do {
@@ -851,7 +851,7 @@ PasswordProcess ( return Status;
}
}
-
+
//
// Ask for new password
//
@@ -865,7 +865,7 @@ PasswordProcess ( FreePool (StringPtr);
return Status;
}
-
+
//
// Confirm new password
//
@@ -881,11 +881,11 @@ PasswordProcess ( FreePool (TempString);
return Status;
}
-
+
//
// Compare two typed-in new passwords
//
- if (StrCmp (StringPtr, TempString) == 0) {
+ if (StrCmp (StringPtr, TempString) == 0) {
gUserInput->InputValue.Buffer = AllocateCopyPool (Question->CurrentValue.BufferLen, StringPtr);
gUserInput->InputValue.BufferLen = Question->CurrentValue.BufferLen;
gUserInput->InputValue.Type = Question->CurrentValue.Type;
@@ -897,7 +897,7 @@ PasswordProcess ( // Reset state machine for password
//
Question->PasswordCheck (gFormData, Question, NULL);
-
+
//
// Two password mismatch, prompt error message
//
@@ -1039,7 +1039,7 @@ ProcessOptions ( gUserInput->InputValue.Buffer = ValueArray;
gUserInput->InputValue.BufferLen = Question->CurrentValue.BufferLen;
gUserInput->InputValue.Type = Question->CurrentValue.Type;
-
+
Link = GetFirstNode (&Question->OptionListHead);
Index2 = 0;
while (!IsNull (&Question->OptionListHead, Link) && Index2 < OrderList->MaxContainers) {
@@ -1125,7 +1125,7 @@ ProcessOptions ( gUserInput->InputValue.BufferLen = Question->CurrentValue.BufferLen;
gUserInput->InputValue.Type = Question->CurrentValue.Type;
}
-
+
SetArrayData (ValueArray, ValueType, Index++, OneOfOption->OptionOpCode->Value.u64);
}
@@ -1159,7 +1159,7 @@ ProcessOptions ( if (SkipErrorValue) {
//
// Not report error, just get the correct option string info.
- //
+ //
Link = GetFirstNode (&Question->OptionListHead);
OneOfOption = DISPLAY_QUESTION_OPTION_FROM_LINK (Link);
} else {
@@ -1227,7 +1227,7 @@ ProcessOptions ( // Perform inconsistent check
//
return EFI_SUCCESS;
- } else {
+ } else {
*OptionString = AllocateZeroPool (BufferSize);
ASSERT (*OptionString);
@@ -1364,7 +1364,7 @@ ProcessOptions ( FreePool (StringPtr);
return Status;
}
-
+
gUserInput->InputValue.Buffer = AllocateCopyPool (Question->CurrentValue.BufferLen, StringPtr);
gUserInput->InputValue.BufferLen = Question->CurrentValue.BufferLen;
gUserInput->InputValue.Type = Question->CurrentValue.Type;
@@ -1466,5 +1466,5 @@ ProcessHelpString ( FreePool (OutputString);
}
- return TotalRowNum;
+ return TotalRowNum;
}
diff --git a/MdeModulePkg/Universal/DriverHealthManagerDxe/DriverHealthManagerDxe.c b/MdeModulePkg/Universal/DriverHealthManagerDxe/DriverHealthManagerDxe.c index 3f9c240..9784363 100644 --- a/MdeModulePkg/Universal/DriverHealthManagerDxe/DriverHealthManagerDxe.c +++ b/MdeModulePkg/Universal/DriverHealthManagerDxe/DriverHealthManagerDxe.c @@ -4,7 +4,7 @@ driver health instances, the other will be automatically included by
firmware setup (UI).
-Copyright (c) 2013 - 2015, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2013 - 2018, Intel Corporation. All rights reserved.<BR>
(C) Copyright 2018 Hewlett Packard Enterprise Development LP<BR>
This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License
@@ -588,7 +588,7 @@ DriverHealthManagerGetFormsetId ( //
// Search FormSet in this Form Package
//
-
+
for (Offset2 = sizeof (EFI_HII_PACKAGE_HEADER); Offset2 < PackageHeader.Length; Offset2 += ((EFI_IFR_OP_HEADER *) OpCodeData)->Length) {
OpCodeData = Package + Offset2;
diff --git a/MdeModulePkg/Universal/DriverHealthManagerDxe/DriverHealthManagerDxe.inf b/MdeModulePkg/Universal/DriverHealthManagerDxe/DriverHealthManagerDxe.inf index 482981c..d84c7ce 100644 --- a/MdeModulePkg/Universal/DriverHealthManagerDxe/DriverHealthManagerDxe.inf +++ b/MdeModulePkg/Universal/DriverHealthManagerDxe/DriverHealthManagerDxe.inf @@ -6,15 +6,15 @@ # driver health instances, the other will be automatically included by
# firmware setup (UI).
#
-# Copyright (c) 2013 - 2015, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2013 - 2018, Intel Corporation. All rights reserved.<BR>
# 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,
# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
-#
+#
##
################################################################################
#
diff --git a/MdeModulePkg/Universal/DriverHealthManagerDxe/DriverHealthManagerDxe.uni b/MdeModulePkg/Universal/DriverHealthManagerDxe/DriverHealthManagerDxe.uni index 3389ff5..dcb1750 100644 --- a/MdeModulePkg/Universal/DriverHealthManagerDxe/DriverHealthManagerDxe.uni +++ b/MdeModulePkg/Universal/DriverHealthManagerDxe/DriverHealthManagerDxe.uni @@ -6,12 +6,12 @@ // driver health instances, the other will be automatically included by
// firmware setup (UI).
//
-// Copyright (c) 2015, Intel Corporation. All rights reserved.<BR>
+// Copyright (c) 2015 - 2018, Intel Corporation. All rights reserved.<BR>
// 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,
// WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
//
diff --git a/MdeModulePkg/Universal/DriverHealthManagerDxe/DriverHealthManagerDxeExtra.uni b/MdeModulePkg/Universal/DriverHealthManagerDxe/DriverHealthManagerDxeExtra.uni index 740461b..597ddae 100644 --- a/MdeModulePkg/Universal/DriverHealthManagerDxe/DriverHealthManagerDxeExtra.uni +++ b/MdeModulePkg/Universal/DriverHealthManagerDxe/DriverHealthManagerDxeExtra.uni @@ -6,7 +6,7 @@ // driver health instances, the other will be automatically included by
// firmware setup (UI).
//
-// Copyright (c) 2015, Intel Corporation. All rights reserved.<BR>
+// Copyright (c) 2015 - 2018, Intel Corporation. All rights reserved.<BR>
//
// This program and the accompanying materials
// are licensed and made available under the terms and conditions of the BSD License
@@ -18,8 +18,8 @@ //
// **/
-#string STR_PROPERTIES_MODULE_NAME
-#language en-US
+#string STR_PROPERTIES_MODULE_NAME
+#language en-US
"Driver Health Manager DXE driver"
diff --git a/MdeModulePkg/Universal/DriverHealthManagerDxe/DriverHealthManagerStrings.uni b/MdeModulePkg/Universal/DriverHealthManagerDxe/DriverHealthManagerStrings.uni index 3c1a4f0..e675139 100644 --- a/MdeModulePkg/Universal/DriverHealthManagerDxe/DriverHealthManagerStrings.uni +++ b/MdeModulePkg/Universal/DriverHealthManagerDxe/DriverHealthManagerStrings.uni @@ -1,13 +1,13 @@ ///** @file
-//
+//
// String definitions for the DriverHealthManager.
-//
-// Copyright (c) 2013 - 2015, Intel Corporation. All rights reserved.<BR>
+//
+// Copyright (c) 2013 - 2018, Intel Corporation. All rights reserved.<BR>
// 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,
// WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
diff --git a/MdeModulePkg/Universal/DriverHealthManagerDxe/DriverHealthManagerVfr.h b/MdeModulePkg/Universal/DriverHealthManagerDxe/DriverHealthManagerVfr.h index 61ca04a..35b8a27 100644 --- a/MdeModulePkg/Universal/DriverHealthManagerDxe/DriverHealthManagerVfr.h +++ b/MdeModulePkg/Universal/DriverHealthManagerDxe/DriverHealthManagerVfr.h @@ -1,7 +1,7 @@ /** @file
Definition shared by VFR file and C file.
-Copyright (c) 2013 - 2015, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2013 - 2018, Intel Corporation. All rights reserved.<BR>
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
@@ -16,8 +16,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. #define _DRIVER_HEALTH_VFR_H_
#include <Guid/HiiPlatformSetupFormset.h>
-#define DRIVER_HEALTH_MANAGER_FORMSET_GUID { 0xcfb3b000, 0x0b63, 0x444b, { 0xb1, 0xd1, 0x12, 0xd5, 0xd9, 0x5d, 0xc4, 0xfc } }
-#define DRIVER_HEALTH_CONFIGURE_FORMSET_GUID { 0x4296d9f4, 0xf6fc, 0x4dde, { 0x86, 0x85, 0x8c, 0xe2, 0xd7, 0x9d, 0x90, 0xf0 } }
+#define DRIVER_HEALTH_MANAGER_FORMSET_GUID { 0xcfb3b000, 0x0b63, 0x444b, { 0xb1, 0xd1, 0x12, 0xd5, 0xd9, 0x5d, 0xc4, 0xfc } }
+#define DRIVER_HEALTH_CONFIGURE_FORMSET_GUID { 0x4296d9f4, 0xf6fc, 0x4dde, { 0x86, 0x85, 0x8c, 0xe2, 0xd7, 0x9d, 0x90, 0xf0 } }
#define LABEL_BEGIN 0x2000
#define LABEL_END 0x2001
diff --git a/MdeModulePkg/Universal/DriverSampleDxe/DriverSample.c b/MdeModulePkg/Universal/DriverSampleDxe/DriverSample.c index af31615..36ed734 100644 --- a/MdeModulePkg/Universal/DriverSampleDxe/DriverSample.c +++ b/MdeModulePkg/Universal/DriverSampleDxe/DriverSample.c @@ -2,7 +2,7 @@ This is an example of how a driver might export data to the HII protocol to be
later utilized by the Setup Protocol
-Copyright (c) 2004 - 2017, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2004 - 2018, Intel Corporation. All rights reserved.<BR>
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
@@ -127,12 +127,12 @@ NotificationFunction( )
{
gBS->SignalEvent (mEvent);
-
+
return EFI_SUCCESS;
}
/**
- Function to start monitoring for CTRL-C using SimpleTextInputEx.
+ Function to start monitoring for CTRL-C using SimpleTextInputEx.
@retval EFI_SUCCESS The feature is enabled.
@retval EFI_OUT_OF_RESOURCES There is not enough mnemory available.
@@ -175,7 +175,7 @@ InternalStartMonitor( if (EFI_ERROR (Status)) {
break;
}
-
+
KeyData.KeyState.KeyShiftState = EFI_SHIFT_STATE_VALID|EFI_RIGHT_CONTROL_PRESSED;
Status = SimpleEx->RegisterKeyNotify(
SimpleEx,
@@ -191,7 +191,7 @@ InternalStartMonitor( }
/**
- Function to stop monitoring for CTRL-C using SimpleTextInputEx.
+ Function to stop monitoring for CTRL-C using SimpleTextInputEx.
@retval EFI_SUCCESS The feature is enabled.
@retval EFI_OUT_OF_RESOURCES There is not enough mnemory available.
@@ -205,7 +205,7 @@ InternalStopMonitor( EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL *SimpleEx;
EFI_STATUS Status;
EFI_HANDLE *Handles;
- EFI_KEY_DATA KeyData;
+ EFI_KEY_DATA KeyData;
UINTN HandleCount;
UINTN HandleIndex;
EFI_HANDLE NotifyHandle;
@@ -344,7 +344,7 @@ GetValueOfNumber ( Status = EFI_OUT_OF_RESOURCES;
goto Exit;
}
-
+
Length = *Len;
ZeroMem (TemStr, sizeof (TemStr));
for (Index = 0; Index < Length; Index ++) {
@@ -369,7 +369,7 @@ Exit: }
/**
- Create altcfg string.
+ Create altcfg string.
@param Result The request result string.
@param ConfigHdr The request head info. <ConfigHdr> format.
@@ -379,7 +379,7 @@ Exit: @retval The string with altcfg info append at the end.
**/
-EFI_STRING
+EFI_STRING
CreateAltCfgString (
IN EFI_STRING Result,
IN EFI_STRING ConfigHdr,
@@ -404,60 +404,60 @@ CreateAltCfgString ( TmpStr = StringPtr;
if (Result != NULL) {
StrCpyS (StringPtr, NewLen / sizeof (CHAR16), Result);
- StringPtr += StrLen (Result);
+ StringPtr += StrLen (Result);
FreePool (Result);
}
-
+
UnicodeSPrint (
- StringPtr,
- (1 + StrLen (ConfigHdr) + 8 + 4 + 1) * sizeof (CHAR16),
- L"&%s&ALTCFG=%04x",
- ConfigHdr,
+ StringPtr,
+ (1 + StrLen (ConfigHdr) + 8 + 4 + 1) * sizeof (CHAR16),
+ L"&%s&ALTCFG=%04x",
+ ConfigHdr,
EFI_HII_DEFAULT_CLASS_STANDARD
);
StringPtr += StrLen (StringPtr);
UnicodeSPrint (
- StringPtr,
+ StringPtr,
(8 + 4 + 7 + 4 + 7 + 4 + 1) * sizeof (CHAR16),
- L"&OFFSET=%04x&WIDTH=%04x&VALUE=%04x",
- Offset,
+ L"&OFFSET=%04x&WIDTH=%04x&VALUE=%04x",
+ Offset,
Width,
DEFAULT_CLASS_STANDARD_VALUE
);
- StringPtr += StrLen (StringPtr);
+ StringPtr += StrLen (StringPtr);
UnicodeSPrint (
- StringPtr,
- (1 + StrLen (ConfigHdr) + 8 + 4 + 1) * sizeof (CHAR16),
- L"&%s&ALTCFG=%04x",
- ConfigHdr,
+ StringPtr,
+ (1 + StrLen (ConfigHdr) + 8 + 4 + 1) * sizeof (CHAR16),
+ L"&%s&ALTCFG=%04x",
+ ConfigHdr,
EFI_HII_DEFAULT_CLASS_MANUFACTURING
);
StringPtr += StrLen (StringPtr);
UnicodeSPrint (
- StringPtr,
+ StringPtr,
(8 + 4 + 7 + 4 + 7 + 4 + 1) * sizeof (CHAR16),
- L"&OFFSET=%04x&WIDTH=%04x&VALUE=%04x",
- Offset,
+ L"&OFFSET=%04x&WIDTH=%04x&VALUE=%04x",
+ Offset,
Width,
DEFAULT_CLASS_MANUFACTURING_VALUE
);
- StringPtr += StrLen (StringPtr);
+ StringPtr += StrLen (StringPtr);
return TmpStr;
}
/**
- Check whether need to add the altcfg string. if need to add, add the altcfg
+ Check whether need to add the altcfg string. if need to add, add the altcfg
string.
@param RequestResult The request result string.
@param ConfigRequestHdr The request head info. <ConfigHdr> format.
**/
-VOID
+VOID
AppendAltCfgString (
IN OUT EFI_STRING *RequestResult,
IN EFI_STRING ConfigRequestHdr
@@ -791,7 +791,7 @@ ExtractConfig ( Value += StrnLenS (Value, (BufferSize - ((UINTN)Value - (UINTN)*Results)) / sizeof (CHAR16));
}
}
-
+
Status = EFI_SUCCESS;
} else {
//
@@ -1209,7 +1209,7 @@ DriverCallback ( }
}
break;
-
+
case EFI_BROWSER_ACTION_RETRIEVE:
{
switch (QuestionId ) {
@@ -1255,7 +1255,7 @@ DriverCallback ( EFI_IFR_FLAG_CALLBACK, // Question flag
0 // Action String ID
);
-
+
HiiUpdateForm (
PrivateData->HiiHandle[0], // HII handle
&gDriverSampleFormSetGuid, // Formset GUID
@@ -1336,7 +1336,7 @@ DriverCallback ( break;
default:
- Status = EFI_UNSUPPORTED;
+ Status = EFI_UNSUPPORTED;
break;
}
}
@@ -1537,14 +1537,14 @@ DriverCallback ( //
*ActionRequest = EFI_BROWSER_ACTION_REQUEST_EXIT;
break;
-
+
case 0x1238:
//
// User press "Save now", request Browser to save the uncommitted data.
//
*ActionRequest = EFI_BROWSER_ACTION_REQUEST_SUBMIT;
break;
-
+
case 0x1241:
case 0x1246:
//
@@ -1552,21 +1552,21 @@ DriverCallback ( //
*ActionRequest = EFI_BROWSER_ACTION_REQUEST_FORM_SUBMIT_EXIT;
break;
-
+
case 0x1242:
//
// User press "Discard current form now", request Browser to discard the uncommitted data.
//
*ActionRequest = EFI_BROWSER_ACTION_REQUEST_FORM_DISCARD;
break;
-
+
case 0x1243:
//
// User press "Submit current form now", request Browser to save the uncommitted data.
//
*ActionRequest = EFI_BROWSER_ACTION_REQUEST_FORM_APPLY;
break;
-
+
case 0x1244:
case 0x1245:
//
@@ -1606,7 +1606,7 @@ DriverCallback ( //
// 2. If system support this keyword, just try to change value.
//
-
+
//
// Change value from '0' to '1' or from '1' to '0'
//
@@ -2114,7 +2114,7 @@ DriverSampleInit ( FreePool (ConfigRequestHdr);
Status = gBS->CreateEventEx (
- EVT_NOTIFY_SIGNAL,
+ EVT_NOTIFY_SIGNAL,
TPL_NOTIFY,
EfiEventEmptyFunction,
NULL,
@@ -2125,7 +2125,7 @@ DriverSampleInit ( //
// Example of how to use BrowserEx protocol to register HotKey.
- //
+ //
Status = gBS->LocateProtocol (&gEdkiiFormBrowserExProtocolGuid, NULL, (VOID **) &FormBrowserEx);
if (!EFI_ERROR (Status)) {
//
@@ -2136,7 +2136,7 @@ DriverSampleInit ( FormBrowserEx->RegisterHotKey (&HotKey, 0, 0, NULL);
HotKey.ScanCode = SCAN_F10;
FormBrowserEx->RegisterHotKey (&HotKey, 0, 0, NULL);
-
+
//
// Register the default HotKey F9 and F10 again.
//
diff --git a/MdeModulePkg/Universal/DriverSampleDxe/DriverSample.uni b/MdeModulePkg/Universal/DriverSampleDxe/DriverSample.uni index 91ee713..5f8d99b 100644 --- a/MdeModulePkg/Universal/DriverSampleDxe/DriverSample.uni +++ b/MdeModulePkg/Universal/DriverSampleDxe/DriverSample.uni @@ -4,13 +4,13 @@ // This driver shows how HII protocol, VFR and UNI files are used to create a HII
// driver which can be dipslayed and configured by a UEFI HII Form Browser.
//
-// Copyright (c) 2007 - 2014, Intel Corporation. All rights reserved.<BR>
+// Copyright (c) 2007 - 2018, Intel Corporation. All rights reserved.<BR>
//
// 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,
// WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
//
diff --git a/MdeModulePkg/Universal/DriverSampleDxe/DriverSampleDxe.inf b/MdeModulePkg/Universal/DriverSampleDxe/DriverSampleDxe.inf index bfd7484..f856efe 100644 --- a/MdeModulePkg/Universal/DriverSampleDxe/DriverSampleDxe.inf +++ b/MdeModulePkg/Universal/DriverSampleDxe/DriverSampleDxe.inf @@ -1,16 +1,16 @@ ## @file
-# This is a sample HII driver.
+# This is a sample HII driver.
#
-# This driver shows how HII protocol, VFR and UNI files are used to create a HII
+# This driver shows how HII protocol, VFR and UNI files are used to create a HII
# driver which can be dipslayed and configured by a UEFI HII Form Browser.
#
-# Copyright (c) 2007 - 2017, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2007 - 2018, Intel Corporation. All rights reserved.<BR>
#
# 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,
# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
#
diff --git a/MdeModulePkg/Universal/DriverSampleDxe/DriverSampleExtra.uni b/MdeModulePkg/Universal/DriverSampleDxe/DriverSampleExtra.uni index 1f34d2d..644c221 100644 --- a/MdeModulePkg/Universal/DriverSampleDxe/DriverSampleExtra.uni +++ b/MdeModulePkg/Universal/DriverSampleDxe/DriverSampleExtra.uni @@ -1,7 +1,7 @@ // /** @file
// DriverSample Localized Strings and Content
//
-// Copyright (c) 2013 - 2014, Intel Corporation. All rights reserved.<BR>
+// Copyright (c) 2013 - 2018, Intel Corporation. All rights reserved.<BR>
//
// This program and the accompanying materials
// are licensed and made available under the terms and conditions of the BSD License
@@ -13,8 +13,8 @@ //
// **/
-#string STR_PROPERTIES_MODULE_NAME
-#language en-US
+#string STR_PROPERTIES_MODULE_NAME
+#language en-US
"HII Sample DXE Driver"
diff --git a/MdeModulePkg/Universal/DriverSampleDxe/Inventory.vfr b/MdeModulePkg/Universal/DriverSampleDxe/Inventory.vfr index daa2577..bcdc8e8 100644 --- a/MdeModulePkg/Universal/DriverSampleDxe/Inventory.vfr +++ b/MdeModulePkg/Universal/DriverSampleDxe/Inventory.vfr @@ -2,7 +2,7 @@ //
// Sample Inventory Data
//
-// Copyright (c) 2004 - 2015, Intel Corporation. All rights reserved.<BR>
+// Copyright (c) 2004 - 2018, Intel Corporation. All rights reserved.<BR>
// 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
@@ -23,82 +23,82 @@ formset form formid = 1,
title = STRING_TOKEN(STR_INV_FORM1_TITLE); // note formid is a variable (for readability) (UINT16) - also added Form to the line to signify the Op-Code
- text
+ text
help = STRING_TOKEN(STR_INV_VERSION_HELP),
text = STRING_TOKEN(STR_INV_VERSION_TEXT),
- text = STRING_TOKEN(STR_INV_EMPTY_STRING),
+ text = STRING_TOKEN(STR_INV_EMPTY_STRING),
flags = 0,
key = 0;
- text
+ text
help = STRING_TOKEN(STR_INV_EMPTY_STRING),
text = STRING_TOKEN(STR_INV_VERSION_TEXT2),
- text = STRING_TOKEN(STR_INV_EMPTY_STRING),
+ text = STRING_TOKEN(STR_INV_EMPTY_STRING),
flags = 0,
key = 0;
- text
+ text
help = STRING_TOKEN(STR_INV_EMPTY_STRING),
text = STRING_TOKEN(STR_INV_VERSION_TEXT3),
- text = STRING_TOKEN(STR_INV_EMPTY_STRING),
+ text = STRING_TOKEN(STR_INV_EMPTY_STRING),
flags = 0,
key = 0;
- text
+ text
help = STRING_TOKEN(STR_INV_EMPTY_STRING),
text = STRING_TOKEN(STR_INV_VERSION_TEXT4),
- text = STRING_TOKEN(STR_INV_EMPTY_STRING),
+ text = STRING_TOKEN(STR_INV_EMPTY_STRING),
flags = 0,
key = 0;
subtitle text = STRING_TOKEN(STR_INV_EMPTY_STRING);
- text
+ text
help = STRING_TOKEN(STR_INV_EMPTY_STRING),
text = STRING_TOKEN(STR_INV_VERSION_TEXT5),
- text = STRING_TOKEN(STR_INV_EMPTY_STRING),
+ text = STRING_TOKEN(STR_INV_EMPTY_STRING),
flags = 0,
key = 0;
- text
+ text
help = STRING_TOKEN(STR_INV_EMPTY_STRING),
text = STRING_TOKEN(STR_INV_VERSION_TEXT6),
- text = STRING_TOKEN(STR_INV_EMPTY_STRING),
+ text = STRING_TOKEN(STR_INV_EMPTY_STRING),
flags = 0,
key = 0;
- text
+ text
help = STRING_TOKEN(STR_INV_EMPTY_STRING),
text = STRING_TOKEN(STR_INV_VERSION_TEXT7),
- text = STRING_TOKEN(STR_INV_EMPTY_STRING),
+ text = STRING_TOKEN(STR_INV_EMPTY_STRING),
flags = 0,
key = 0;
- text
+ text
help = STRING_TOKEN(STR_INV_EMPTY_STRING),
text = STRING_TOKEN(STR_INV_VERSION_TEXT8),
- text = STRING_TOKEN(STR_INV_EMPTY_STRING),
+ text = STRING_TOKEN(STR_INV_EMPTY_STRING),
flags = 0,
key = 0;
- text
+ text
help = STRING_TOKEN(STR_INV_EMPTY_STRING),
text = STRING_TOKEN(STR_INV_VERSION_TEXT9),
- text = STRING_TOKEN(STR_INV_EMPTY_STRING),
+ text = STRING_TOKEN(STR_INV_EMPTY_STRING),
flags = 0,
key = 0;
- text
+ text
help = STRING_TOKEN(STR_INV_EMPTY_STRING),
text = STRING_TOKEN(STR_INV_VERSION_TEXT10),
- text = STRING_TOKEN(STR_INV_EMPTY_STRING),
+ text = STRING_TOKEN(STR_INV_EMPTY_STRING),
flags = 0,
key = 0;
- text
+ text
help = STRING_TOKEN(STR_INV_EMPTY_STRING),
text = STRING_TOKEN(STR_INV_VERSION_TEXT11),
- text = STRING_TOKEN(STR_INV_EMPTY_STRING),
+ text = STRING_TOKEN(STR_INV_EMPTY_STRING),
flags = 0,
key = 0;
diff --git a/MdeModulePkg/Universal/DriverSampleDxe/InventoryStrings.uni b/MdeModulePkg/Universal/DriverSampleDxe/InventoryStrings.uni index 01afcd5..9336b4a 100644 --- a/MdeModulePkg/Universal/DriverSampleDxe/InventoryStrings.uni +++ b/MdeModulePkg/Universal/DriverSampleDxe/InventoryStrings.uni @@ -1,24 +1,24 @@ // *++
//
-// Copyright (c) 2007, Intel Corporation. All rights reserved.<BR>
-// 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,
-// WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
-//
+// Copyright (c) 2007 - 2018, Intel Corporation. All rights reserved.<BR>
+// 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,
+// WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+//
// Module Name:
//
// InventoryStrings.uni
-//
+//
// Abstract:
-//
+//
// String definitions for Inventory file.
-//
+//
// Revision History:
-//
+//
// --*/
diff --git a/MdeModulePkg/Universal/DriverSampleDxe/Vfr.vfr b/MdeModulePkg/Universal/DriverSampleDxe/Vfr.vfr index 9d99dcf..d005e7f 100644 --- a/MdeModulePkg/Universal/DriverSampleDxe/Vfr.vfr +++ b/MdeModulePkg/Universal/DriverSampleDxe/Vfr.vfr @@ -54,16 +54,16 @@ formset title = STRING_TOKEN(STR_FORM_SET_TITLE),
help = STRING_TOKEN(STR_FORM_SET_TITLE_HELP),
classguid = EFI_HII_PLATFORM_SETUP_FORMSET_GUID,
-
+
//
- // Notes: VfrCompiler will insert a Standard Default Storage declaration
+ // Notes: VfrCompiler will insert a Standard Default Storage declaration
// after the formset declaration. >00000040: 5C 06 00 00 00 00.
// So we don't need to declare the Standard Default.
// Please check the vfr.lst file for details.
// To enable list file for VFR, add "-l" to VfrCompile <Command> in [Build.Visual-Form-Representation-File] as follows:
// VfrCompile -l --no-pre-processing --output-directory ${d_path} $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.iii
//
-
+
//
// Define a Buffer Storage (EFI_IFR_VARSTORE)
//
@@ -76,7 +76,7 @@ formset // Define a EFI variable Storage (EFI_IFR_VARSTORE_EFI)
//
efivarstore MY_EFI_VARSTORE_DATA,
- attribute = EFI_VARIABLE_BOOTSERVICE_ACCESS | EFI_VARIABLE_NON_VOLATILE, // EFI variable attribures
+ attribute = EFI_VARIABLE_BOOTSERVICE_ACCESS | EFI_VARIABLE_NON_VOLATILE, // EFI variable attribures
name = MyEfiVar,
guid = DRIVER_SAMPLE_FORMSET_GUID;
@@ -415,7 +415,7 @@ formset step = 1,
default = 18, defaultstore = MyStandardDefault, // This is standard default value
default = 19, defaultstore = MyManufactureDefault, // This is manufacture default value
-
+
endnumeric;
endif;
@@ -423,7 +423,7 @@ formset questionid = 0x1239,
prompt = STRING_TOKEN(STR_DEFAULT_VALUE_FROM_ACCESS_PROMPT),
help = STRING_TOKEN(STR_DEFAULT_VALUE_FROM_ACCESS_HELP),
- flags = DISPLAY_UINT_HEX | INTERACTIVE,
+ flags = DISPLAY_UINT_HEX | INTERACTIVE,
minimum = 0,
maximum = 255,
step = 1,
@@ -434,7 +434,7 @@ formset questionid = 0x1240,
prompt = STRING_TOKEN(STR_DEFAULT_VALUE_FROM_CALLBACK_PROMPT),
help = STRING_TOKEN(STR_DEFAULT_VALUE_FROM_CALLBACK_HELP),
- flags = DISPLAY_UINT_HEX | INTERACTIVE,
+ flags = DISPLAY_UINT_HEX | INTERACTIVE,
minimum = 0,
maximum = 255,
step = 1,
@@ -451,13 +451,13 @@ formset option text = STRING_TOKEN(STR_ONE_OF_TEXT2), value = 2, flags = 0;
option text = STRING_TOKEN(STR_ONE_OF_TEXT3), value = 3, flags = 0;
endlist;
-
+
resetbutton
defaultstore = MyStandardDefault,
prompt = STRING_TOKEN(STR_STANDARD_DEFAULT_PROMPT),
help = STRING_TOKEN(STR_STANDARD_DEFAULT_HELP),
endresetbutton;
-
+
resetbutton
defaultstore = MyManufactureDefault,
prompt = STRING_TOKEN(STR_MANUFACTURE_DEFAULT_PROMPT),
@@ -504,24 +504,24 @@ formset goto 5,
prompt = STRING_TOKEN(STR_GOTO_FORM5), //FifthSetupPage // this too has no end-op and basically it's a jump to a form ONLY
help = STRING_TOKEN(STR_GOTO_FORM5_HELP);
-
+
goto 6,
prompt = STRING_TOKEN(STR_GOTO_FORM6), //SixthSetupPage // this too has no end-op and basically it's a jump to a form ONLY
help = STRING_TOKEN(STR_GOTO_HELP);
- goto
+ goto
formsetguid = DRIVER_SAMPLE_INVENTORY_GUID,
formid = 0x1,
question = 0x1,
prompt = STRING_TOKEN(STR_GOTO_ANOTHER_FORMSET),
help = STRING_TOKEN(STR_GOTO_ANOTHER_FORMSET_HELP);
- guidop
+ guidop
guid = DRIVER_SAMPLE_FORMSET_GUID,
datatype = MY_EFI_VARSTORE_DATA,
- data.Field8 = 0x21,
+ data.Field8 = 0x21,
data.Field16 = 0x2121,
- data.OrderedList[0] = 0x21,
+ data.OrderedList[0] = 0x21,
endguidop;
goto 7,
@@ -587,16 +587,16 @@ formset help = STRING_TOKEN(STR_TIME_HELP),
flags = STORAGE_TIME,
endtime;
-
- time
- name = MyTime,
- varid = MyIfrNVData.Time,
- prompt = STRING_TOKEN(STR_TIME_PROMPT),
- help = STRING_TOKEN(STR_TIME_PROMPT),
+
+ time
+ name = MyTime,
+ varid = MyIfrNVData.Time,
+ prompt = STRING_TOKEN(STR_TIME_PROMPT),
+ help = STRING_TOKEN(STR_TIME_PROMPT),
flags = STORAGE_NORMAL | SECOND_SUPPRESS,
- default = 15:33:33,
+ default = 15:33:33,
endtime;
-
+
checkbox varid = MyIfrNVData.ChooseToActivateNuclearWeaponry,
prompt = STRING_TOKEN(STR_CHECK_BOX_PROMPT),
help = STRING_TOKEN(STR_CHECK_BOX_HELP),
@@ -616,7 +616,7 @@ formset prompt = STRING_TOKEN(STR_GOTO_FORM1), //MainSetupPage // this too has no end-op and basically it's a jump to a form ONLY
help = STRING_TOKEN(STR_GOTO_HELP);
- goto
+ goto
varid = MyIfrNVData.RefData,
prompt = STRING_TOKEN(STR_GOTO_DYNAMIC3),
help = STRING_TOKEN(STR_GOTO_DYNAMIC3_HELP),
@@ -625,15 +625,15 @@ formset //
// Set the defult value, format is QuestionId; FormId; FormsetGuid; Device Path String Token
//
- default = 0;0;ZERO_GUID;STRING_TOKEN(STR_NULL_STRING),
+ default = 0;0;ZERO_GUID;STRING_TOKEN(STR_NULL_STRING),
; // goto opcode end flag.
- goto
+ goto
prompt = STRING_TOKEN(STR_GOTO_DYNAMIC4),
help = STRING_TOKEN(STR_GOTO_DYNAMIC4_HELP),
flags = INTERACTIVE,
key = 0x1249;
-
+
endform;
endif;
@@ -662,7 +662,7 @@ formset endnumeric;
grayoutif match2 (stringref(STRING_TOKEN(STR_PATTERN)), stringref(STRING_TOKEN(STR_STRING)), PERL_GUID);
- numeric
+ numeric
varid = MyIfrNVData.Match2,
prompt = STRING_TOKEN(STR_MATCH2_PROMPT),
help = STRING_TOKEN(STR_MATCH2_HELP),
@@ -676,19 +676,19 @@ formset endform;
- formmap formid = 4,
- maptitle = STRING_TOKEN(STR_SAMPL_MAP_METHOD);
+ formmap formid = 4,
+ maptitle = STRING_TOKEN(STR_SAMPL_MAP_METHOD);
mapguid = DRIVER_SAMPLE_FORMSET_GUID;
- maptitle = STRING_TOKEN(STR_STANDARD_MAP_METHOD);
+ maptitle = STRING_TOKEN(STR_STANDARD_MAP_METHOD);
mapguid = EFI_HII_STANDARD_FORM_GUID;
- oneof varid = MyIfrNVData.SerialPortNo,
+ oneof varid = MyIfrNVData.SerialPortNo,
prompt = STRING_TOKEN(STR_SERIAL_PORT),
help = STRING_TOKEN(STR_ONE_OF_HELP),
read cond (get(MyIfrNVData.SerialPortStatus) != 0 ? 0 : cond ((get(MyIfrNVData.SerialPortIo) & 0xF00) >> 0x8 == get(MyIfrNVData.SerialPortIrq) - 1 ? UNDEFINED : map (get(MyIfrNVData.SerialPortIo) : 0x3f8,1; 0x2F8,2; 0x3E8,3; 0x2E8,4;)));
write set(MyIfrNVData.SerialPortStatus, pushthis != 0) AND set(MyIfrNVData.SerialPortIo, map (pushthis : 1,0x3F8; 2,0x2F8; 3,0x3E8; 4,0x2E8;)) AND set (MyIfrNVData.SerialPortIrq, map (pushthis: 1,4; 2,3; 3,4; 4,3;));
-
+
option text = STRING_TOKEN(STR_SERIAL_PORT_DISABLE), value = 0x0, flags = DEFAULT;
option text = STRING_TOKEN(STR_SERIAL_PORT1), value = 0x1, flags = 0;
option text = STRING_TOKEN(STR_SERIAL_PORT2), value = 0x2, flags = 0;
@@ -705,10 +705,10 @@ formset grayoutif TRUE;
suppressif ideqval MyIfrNVData.SerialPortStatus == 0;
- oneof varid = MyIfrNVData.SerialPortIo,
+ oneof varid = MyIfrNVData.SerialPortIo,
prompt = STRING_TOKEN(STR_SERIAL_PORT_IO_ADDRESS),
help = STRING_TOKEN(STR_ONE_OF_HELP),
-
+
option text = STRING_TOKEN(STR_SERIAL_PORT1_IOADDR), value = 0x3F8, flags = DEFAULT;
option text = STRING_TOKEN(STR_SERIAL_PORT2_IOADDR), value = 0x2F8, flags = 0;
option text = STRING_TOKEN(STR_SERIAL_PORT3_IOADDR), value = 0x3E8, flags = 0;
@@ -719,10 +719,10 @@ formset grayoutif TRUE;
suppressif ideqval MyIfrNVData.SerialPortStatus == 0;
- oneof varid = MyIfrNVData.SerialPortIrq,
+ oneof varid = MyIfrNVData.SerialPortIrq,
prompt = STRING_TOKEN(STR_SERIAL_PORT_IRQ),
help = STRING_TOKEN(STR_ONE_OF_HELP),
-
+
option text = STRING_TOKEN(STR_SERIAL_PORT13_IRQ), value = 0x4, flags = DEFAULT;
option text = STRING_TOKEN(STR_SERIAL_PORT24_IRQ), value = 0x3, flags = 0;
endoneof;
@@ -755,7 +755,7 @@ formset endform;
form formid = 6, // Form to show the refresh guid group op-code
- title = STRING_TOKEN(STR_FORM6_TITLE);
+ title = STRING_TOKEN(STR_FORM6_TITLE);
text
help = STRING_TOKEN(STR_TEXT_REFRESH_GUID),
diff --git a/MdeModulePkg/Universal/DriverSampleDxe/VfrStrings.uni b/MdeModulePkg/Universal/DriverSampleDxe/VfrStrings.uni index 2215c08..e223bb6 100644 --- a/MdeModulePkg/Universal/DriverSampleDxe/VfrStrings.uni +++ b/MdeModulePkg/Universal/DriverSampleDxe/VfrStrings.uni @@ -1,24 +1,24 @@ // *++
- //
+ //
// Copyright (c) 2007 - 2018, Intel Corporation. All rights reserved.<BR>
-// 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,
-// WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
-//
+// 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,
+// WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+//
// Module Name:
//
// VfrStrings.vfr
-//
+//
// Abstract:
-//
+//
// String definitions for Sample Setup formset.
-//
+//
// Revision History:
-//
+//
// --*/
@@ -52,9 +52,9 @@ #string STR_CPU_STRING2 #language en-US " "
#language fr-FR " "
#string STR_NUMERIC_NUM_PROMPT #language en-US "Please select the number"
- #language fr-FR "Please select the number"
+ #language fr-FR "Please select the number"
#string STR_NUMERIC_NUM_HELP #language en-US "Check the input number, test the efi buffer varstore"
- #language fr-FR "Check the input number, test the efi buffer varstore"
+ #language fr-FR "Check the input number, test the efi buffer varstore"
#string STR_ONE_OF_PROMPT #language en-US "My one-of prompt #1"
#language fr-FR "Mi uno- de guÃa # 1"
#string STR_ONE_OF_PROMPT_KEYWORD #language en-US "My Keyword Namespace Test"
@@ -142,7 +142,7 @@ #string STR_GOTO_DYNAMIC3_HELP #language en-US "Update the destination through "retrieve" call back type before user select it."
#language fr-FR "Update the destination through "retrieve" call back type before user select it."
#string STR_GOTO_DYNAMIC4_HELP #language en-US "Update the destination through "changing" call back type when user select it."
- #language fr-FR "Update the destination through "changing" call back type when user select it."
+ #language fr-FR "Update the destination through "changing" call back type when user select it."
#string STR_ERROR_INCONSISTENT #language en-US "This is my inconsistent error message"
#language fr-FR "Éste es mi mensaje de error contrario."
#string STR_ERROR_POPUP #language en-US "You typed in something bad!"
@@ -240,7 +240,7 @@ #string STR_STRING_CHECK_ERROR_POPUP #language en-US "String you typed in is not correct!"
#language fr-FR "String you typed in is not correct!"
#string STR_TEXT_REFRESH_GUID #language en-US "Add new menu by press "Ctrl + C""
- #language fr-FR "Add new menu by press "Ctrl + C""
+ #language fr-FR "Add new menu by press "Ctrl + C""
#string STR_TEXT_REFRESH_GUID_COUNT #language en-US "Refresh guid event count"
#language fr-FR "Refresh guid event count"
#string STR_MODAL_FORM_TITLE #language en-US "First Modal Form"
@@ -262,7 +262,7 @@ #string STR_GOTO_ANOTHER_FORMSET_HELP #language en-US "When select this option, browser will go to another formset."
#language fr-FR "When select this option, browser will go to another formset."
#string STR_DEVICE_PATH #language en-US ""
- #language fr-FR ""
+ #language fr-FR ""
#string STR_SUBMITTED_CALLBACK_TEST_PROMPT #language en-US "Submitted callback test"
#language fr-FR "Submitted callback test"
#string STR_SUBMITTED_CALLBACK_TEST_HELP #language en-US "Change the value and press F10 to submmit will pop up a dialogue to show SUBMITTED Callback has been triggered"
@@ -346,7 +346,7 @@ #language fr-FR "Manufacture Default"
#string STR_DEFAULTSTORE_SAFE #language en-US "Safe Default"
- #language fr-FR "Safe Default"
+ #language fr-FR "Safe Default"
#string STR_STANDARD_DEFAULT_PROMPT #language en-US "Standard Default"
#language fr-FR "Standard Default"
@@ -370,7 +370,7 @@ #string STR_STANDARD_MAP_METHOD #language en-US "UEFI Standard Map Form"
#language fr-FR "UEFI Standard Map Form"
//
-// Serial Port
+// Serial Port
//
#string STR_SERIAL_PORT #language en-US "Serial port number"
#language fr-FR "Serial port number"
@@ -431,4 +431,4 @@ #string STR_STRING #language en-US "Match2 Test"
#language fr-FR "Match2 Test"
#string STR_PATTERN #language en-US "Match2"
- #language fr-FR "Match2"
\ No newline at end of file + #language fr-FR "Match2"
diff --git a/MdeModulePkg/Universal/EbcDxe/EbcDxe.inf b/MdeModulePkg/Universal/EbcDxe/EbcDxe.inf index 197a9a7..8f128b1 100644 --- a/MdeModulePkg/Universal/EbcDxe/EbcDxe.inf +++ b/MdeModulePkg/Universal/EbcDxe/EbcDxe.inf @@ -1,7 +1,7 @@ ## @file
# Module that produces EBC Interprete and EBC Debug Support protocols.
-#
-# This module implements EFI Byte Code (EBC) Virtual Machine that can provide
+#
+# This module implements EFI Byte Code (EBC) Virtual Machine that can provide
# platform and processor-independent mechanisms for loading and executing EFI
# device drivers.
#
@@ -11,10 +11,10 @@ # 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,
# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
-#
+#
##
[Defines]
diff --git a/MdeModulePkg/Universal/EbcDxe/EbcDxe.uni b/MdeModulePkg/Universal/EbcDxe/EbcDxe.uni index 9ee429f..fbdfe2f 100644 --- a/MdeModulePkg/Universal/EbcDxe/EbcDxe.uni +++ b/MdeModulePkg/Universal/EbcDxe/EbcDxe.uni @@ -5,13 +5,13 @@ // platform and processor-independent mechanisms for loading and executing EFI
// device drivers.
//
-// Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.<BR>
+// Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>
//
// 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,
// WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
//
diff --git a/MdeModulePkg/Universal/EbcDxe/EbcDxeExtra.uni b/MdeModulePkg/Universal/EbcDxe/EbcDxeExtra.uni index ef917c9..a421455 100644 --- a/MdeModulePkg/Universal/EbcDxe/EbcDxeExtra.uni +++ b/MdeModulePkg/Universal/EbcDxe/EbcDxeExtra.uni @@ -1,7 +1,7 @@ // /** @file
// EbcDxe Localized Strings and Content
//
-// Copyright (c) 2013 - 2014, Intel Corporation. All rights reserved.<BR>
+// Copyright (c) 2013 - 2018, Intel Corporation. All rights reserved.<BR>
//
// This program and the accompanying materials
// are licensed and made available under the terms and conditions of the BSD License
@@ -13,8 +13,8 @@ //
// **/
-#string STR_PROPERTIES_MODULE_NAME
-#language en-US
+#string STR_PROPERTIES_MODULE_NAME
+#language en-US
"EFI Byte Code DXE Interpreter"
diff --git a/MdeModulePkg/Universal/EbcDxe/EbcExecute.c b/MdeModulePkg/Universal/EbcDxe/EbcExecute.c index 2dfed8e..3418936 100644 --- a/MdeModulePkg/Universal/EbcDxe/EbcExecute.c +++ b/MdeModulePkg/Universal/EbcDxe/EbcExecute.c @@ -1,7 +1,7 @@ /** @file
Contains code that implements the virtual machine.
-Copyright (c) 2006 - 2017, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>
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
@@ -1333,11 +1333,11 @@ CONST VM_TABLE_ENTRY mVmOpcodeTable[] = { { ExecuteMOVIn }, // opcode 0x38 - mov immediate natural
{ ExecuteMOVREL }, // opcode 0x39 - move data relative to PC
{ NULL }, // opcode 0x3a
- { NULL }, // opcode 0x3b
- { NULL }, // opcode 0x3c
- { NULL }, // opcode 0x3d
- { NULL }, // opcode 0x3e
- { NULL } // opcode 0x3f
+ { NULL }, // opcode 0x3b
+ { NULL }, // opcode 0x3c
+ { NULL }, // opcode 0x3d
+ { NULL }, // opcode 0x3e
+ { NULL } // opcode 0x3f
};
//
diff --git a/MdeModulePkg/Universal/EbcDxe/Ia32/EbcSupport.c b/MdeModulePkg/Universal/EbcDxe/Ia32/EbcSupport.c index a825846..944179b 100644 --- a/MdeModulePkg/Universal/EbcDxe/Ia32/EbcSupport.c +++ b/MdeModulePkg/Universal/EbcDxe/Ia32/EbcSupport.c @@ -2,7 +2,7 @@ This module contains EBC support routines that are customized based on
the target ia32 processor.
-Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>
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
@@ -44,7 +44,7 @@ UINT8 mInstructionBufferTemplate[] = { // These 4 bytes of the thunk entry is the address of the EBC
// entry point.
//
- 0xB8,
+ 0xB8,
(UINT8)(EBC_ENTRYPOINT_SIGNATURE & 0xFF),
(UINT8)((EBC_ENTRYPOINT_SIGNATURE >> 8) & 0xFF),
(UINT8)((EBC_ENTRYPOINT_SIGNATURE >> 16) & 0xFF),
diff --git a/MdeModulePkg/Universal/EbcDxe/X64/EbcSupport.c b/MdeModulePkg/Universal/EbcDxe/X64/EbcSupport.c index 33a1749..1542920 100644 --- a/MdeModulePkg/Universal/EbcDxe/X64/EbcSupport.c +++ b/MdeModulePkg/Universal/EbcDxe/X64/EbcSupport.c @@ -2,7 +2,7 @@ This module contains EBC support routines that are customized based on
the target x64 processor.
-Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>
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
@@ -44,7 +44,7 @@ UINT8 mInstructionBufferTemplate[] = { // These 8 bytes of the thunk entry is the address of the EBC
// entry point.
//
- 0x49, 0xBA,
+ 0x49, 0xBA,
(UINT8)(EBC_ENTRYPOINT_SIGNATURE & 0xFF),
(UINT8)((EBC_ENTRYPOINT_SIGNATURE >> 8) & 0xFF),
(UINT8)((EBC_ENTRYPOINT_SIGNATURE >> 16) & 0xFF),
diff --git a/MdeModulePkg/Universal/EsrtDxe/EsrtDxe.c b/MdeModulePkg/Universal/EsrtDxe/EsrtDxe.c index 16b18e0..cab8d69 100644 --- a/MdeModulePkg/Universal/EsrtDxe/EsrtDxe.c +++ b/MdeModulePkg/Universal/EsrtDxe/EsrtDxe.c @@ -1,7 +1,7 @@ /** @file
Esrt management module.
-Copyright (c) 2015, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2015 - 2018, Intel Corporation. All rights reserved.<BR>
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
@@ -20,7 +20,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. ESRT_PRIVATE_DATA mPrivate;
-ESRT_MANAGEMENT_PROTOCOL mEsrtManagementProtocolTemplate = {
+ESRT_MANAGEMENT_PROTOCOL mEsrtManagementProtocolTemplate = {
EsrtDxeGetEsrtEntry,
EsrtDxeUpdateEsrtEntry,
EsrtDxeRegisterEsrtEntry,
@@ -30,11 +30,11 @@ ESRT_MANAGEMENT_PROTOCOL mEsrtManagementProtocolTemplate = { };
/**
- Get ESRT entry from ESRT Cache by FwClass Guid
+ Get ESRT entry from ESRT Cache by FwClass Guid
+
+ @param[in] FwClass FwClass of Esrt entry to get
+ @param[in, out] Entry Esrt entry returned
- @param[in] FwClass FwClass of Esrt entry to get
- @param[in, out] Entry Esrt entry returned
-
@retval EFI_SUCCESS The variable saving this Esrt Entry exists.
@retval EF_NOT_FOUND No correct variable found.
@retval EFI_WRITE_PROTECTED ESRT Cache repository is locked
@@ -94,7 +94,7 @@ EsrtDxeGetEsrtEntry( Update one ESRT entry in ESRT Cache.
@param[in] Entry Esrt entry to be updated
-
+
@retval EFI_SUCCESS Successfully update an ESRT entry in cache.
@retval EFI_INVALID_PARAMETER Entry does't exist in ESRT Cache
@retval EFI_WRITE_PROTECTED ESRT Cache repositoy is locked
@@ -107,7 +107,7 @@ EsrtDxeUpdateEsrtEntry( )
{
EFI_STATUS Status;
-
+
if (Entry == NULL) {
return EFI_INVALID_PARAMETER;
}
@@ -139,11 +139,11 @@ EsrtDxeUpdateEsrtEntry( }
/**
- Non-FMP instance to unregister Esrt Entry from ESRT Cache.
+ Non-FMP instance to unregister Esrt Entry from ESRT Cache.
- @param[in] FwClass FwClass of Esrt entry to Unregister
-
- @retval EFI_SUCCESS Insert all entries Successfully
+ @param[in] FwClass FwClass of Esrt entry to Unregister
+
+ @retval EFI_SUCCESS Insert all entries Successfully
@retval EFI_NOT_FOUND Entry of FwClass does not exsit
**/
@@ -153,7 +153,7 @@ EsrtDxeUnRegisterEsrtEntry( IN EFI_GUID *FwClass
)
{
- EFI_STATUS Status;
+ EFI_STATUS Status;
if (FwClass == NULL) {
return EFI_INVALID_PARAMETER;
@@ -228,7 +228,7 @@ EFI_STATUS EFIAPI
EsrtDxeSyncFmp(
VOID
- )
+ )
{
EFI_STATUS Status;
UINTN Index1;
@@ -238,8 +238,8 @@ EsrtDxeSyncFmp( EFI_FIRMWARE_MANAGEMENT_PROTOCOL **FmpBuf;
UINTN NumberOfHandles;
UINTN *DescriptorSizeBuf;
- EFI_FIRMWARE_IMAGE_DESCRIPTOR **FmpImageInfoBuf;
- EFI_FIRMWARE_IMAGE_DESCRIPTOR *TempFmpImageInfo;
+ EFI_FIRMWARE_IMAGE_DESCRIPTOR **FmpImageInfoBuf;
+ EFI_FIRMWARE_IMAGE_DESCRIPTOR *TempFmpImageInfo;
UINT8 *FmpImageInfoCountBuf;
UINT32 *FmpImageInfoDescriptorVerBuf;
UINTN ImageInfoSize;
@@ -270,11 +270,11 @@ EsrtDxeSyncFmp( &HandleBuffer
);
-
- if (Status == EFI_NOT_FOUND) {
+
+ if (Status == EFI_NOT_FOUND) {
EntryNumNew = 0;
goto UPDATE_REPOSITORY;
- } else if (EFI_ERROR(Status)){
+ } else if (EFI_ERROR(Status)){
goto END;
}
@@ -295,7 +295,7 @@ EsrtDxeSyncFmp( FmpImageInfoBuf = AllocateZeroPool(sizeof(EFI_FIRMWARE_IMAGE_DESCRIPTOR *) * NumberOfHandles);
if (FmpImageInfoBuf == NULL) {
- Status = EFI_OUT_OF_RESOURCES;
+ Status = EFI_OUT_OF_RESOURCES;
goto END;
}
@@ -380,14 +380,14 @@ EsrtDxeSyncFmp( //
// Create new FMP cache repository based on FmpImageInfoBuf
- //
+ //
for (Index2 = 0; Index2 < NumberOfHandles; Index2++){
TempFmpImageInfo = FmpImageInfoBuf[Index2];
for (Index3 = 0; Index3 < FmpImageInfoCountBuf[Index2]; Index3++){
- if ((TempFmpImageInfo->AttributesSupported & IMAGE_ATTRIBUTE_IN_USE) != 0
+ if ((TempFmpImageInfo->AttributesSupported & IMAGE_ATTRIBUTE_IN_USE) != 0
&& (TempFmpImageInfo->AttributesSetting & IMAGE_ATTRIBUTE_IN_USE) != 0){
//
- // Always put the first smallest version of Image info into ESRT cache
+ // Always put the first smallest version of Image info into ESRT cache
//
for(Index1 = 0; Index1 < EntryNumNew; Index1++) {
if (CompareGuid(&EsrtRepositoryNew[Index1].FwClass, &TempFmpImageInfo->ImageTypeId)) {
@@ -402,7 +402,7 @@ EsrtDxeSyncFmp( //
if (Index1 == EntryNumNew){
SetEsrtEntryFromFmpInfo(&EsrtRepositoryNew[EntryNumNew], TempFmpImageInfo, FmpImageInfoDescriptorVerBuf[Index2]);
- EntryNumNew++;
+ EntryNumNew++;
if (EntryNumNew >= PcdGet32(PcdMaxFmpEsrtCacheNum)) {
break;
}
@@ -471,10 +471,10 @@ END: }
/**
- This function locks up Esrt repository to be readonly. It should be called
+ This function locks up Esrt repository to be readonly. It should be called
before gEfiEndOfDxeEventGroupGuid event signaled
- @retval EFI_SUCCESS Locks up FMP Non-FMP repository successfully
+ @retval EFI_SUCCESS Locks up FMP Non-FMP repository successfully
**/
EFI_STATUS
@@ -514,14 +514,14 @@ EsrtReadyToBootEventNotify ( IN EFI_EVENT Event,
IN VOID *Context
)
-{
+{
EFI_STATUS Status;
EFI_SYSTEM_RESOURCE_TABLE *EsrtTable;
EFI_SYSTEM_RESOURCE_ENTRY *FmpEsrtRepository;
EFI_SYSTEM_RESOURCE_ENTRY *NonFmpEsrtRepository;
UINTN FmpRepositorySize;
UINTN NonFmpRepositorySize;
-
+
FmpEsrtRepository = NULL;
NonFmpEsrtRepository = NULL;
@@ -583,8 +583,8 @@ EsrtReadyToBootEventNotify ( goto EXIT;
}
- EsrtTable->FwResourceVersion = EFI_SYSTEM_RESOURCE_TABLE_FIRMWARE_RESOURCE_VERSION;
- EsrtTable->FwResourceCount = (UINT32)((NonFmpRepositorySize + FmpRepositorySize) / sizeof(EFI_SYSTEM_RESOURCE_ENTRY));
+ EsrtTable->FwResourceVersion = EFI_SYSTEM_RESOURCE_TABLE_FIRMWARE_RESOURCE_VERSION;
+ EsrtTable->FwResourceCount = (UINT32)((NonFmpRepositorySize + FmpRepositorySize) / sizeof(EFI_SYSTEM_RESOURCE_ENTRY));
EsrtTable->FwResourceCountMax = PcdGet32(PcdMaxNonFmpEsrtCacheNum) + PcdGet32(PcdMaxFmpEsrtCacheNum);
if (NonFmpRepositorySize != 0 && NonFmpEsrtRepository != NULL) {
@@ -617,7 +617,7 @@ EXIT: }
/**
- The module Entry Point of the Esrt DXE driver that manages cached ESRT repository
+ The module Entry Point of the Esrt DXE driver that manages cached ESRT repository
& publishes ESRT table
@param[in] ImageHandle The firmware allocated handle for the EFI image.
@@ -633,7 +633,7 @@ EsrtDxeEntryPoint ( IN EFI_HANDLE ImageHandle,
IN EFI_SYSTEM_TABLE *SystemTable
)
-{
+{
EFI_STATUS Status;
EfiInitializeLock (&mPrivate.FmpLock, TPL_CALLBACK);
diff --git a/MdeModulePkg/Universal/EsrtDxe/EsrtDxe.inf b/MdeModulePkg/Universal/EsrtDxe/EsrtDxe.inf index 06b3a08..5eb7ef9 100644 --- a/MdeModulePkg/Universal/EsrtDxe/EsrtDxe.inf +++ b/MdeModulePkg/Universal/EsrtDxe/EsrtDxe.inf @@ -4,15 +4,15 @@ # This driver produces EsrtManagement protocol to manage cache ESRT repository for FMP/Non-FMP instances.
# ESRT table based on repository is published on gEfiEventReadyToBootGuid.
#
-# Copyright (c) 2015 - 2016, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2015 - 2018, Intel Corporation. All rights reserved.<BR>
# 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,
# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
-#
+#
##
[Defines]
diff --git a/MdeModulePkg/Universal/EsrtDxe/EsrtDxe.uni b/MdeModulePkg/Universal/EsrtDxe/EsrtDxe.uni index d47caf3..c65f354 100644 --- a/MdeModulePkg/Universal/EsrtDxe/EsrtDxe.uni +++ b/MdeModulePkg/Universal/EsrtDxe/EsrtDxe.uni @@ -4,13 +4,13 @@ // This driver produces EsrtManagement protocol to manage cache ESRT repository for FMP/Non-FMP instances.
// ESRT table based on repository is published on gEfiEventReadyToBootGuid.
//
-// Copyright (c) 2015, Intel Corporation. All rights reserved.<BR>
+// Copyright (c) 2015 - 2018, Intel Corporation. All rights reserved.<BR>
//
// 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,
// WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
//
diff --git a/MdeModulePkg/Universal/EsrtDxe/EsrtDxeExtra.uni b/MdeModulePkg/Universal/EsrtDxe/EsrtDxeExtra.uni index ebd0c3b..e969952 100644 --- a/MdeModulePkg/Universal/EsrtDxe/EsrtDxeExtra.uni +++ b/MdeModulePkg/Universal/EsrtDxe/EsrtDxeExtra.uni @@ -1,7 +1,7 @@ // /** @file
// EsrtDxe Localized Strings and Content
//
-// Copyright (c) 2015, Intel Corporation. All rights reserved.<BR>
+// Copyright (c) 2015 - 2018, Intel Corporation. All rights reserved.<BR>
//
// This program and the accompanying materials
// are licensed and made available under the terms and conditions of the BSD License
@@ -13,8 +13,8 @@ //
// **/
-#string STR_PROPERTIES_MODULE_NAME
-#language en-US
+#string STR_PROPERTIES_MODULE_NAME
+#language en-US
"Esrt DXE Driver"
diff --git a/MdeModulePkg/Universal/EsrtDxe/EsrtImpl.c b/MdeModulePkg/Universal/EsrtDxe/EsrtImpl.c index 35a237e..1ed0250 100644 --- a/MdeModulePkg/Universal/EsrtDxe/EsrtImpl.c +++ b/MdeModulePkg/Universal/EsrtDxe/EsrtImpl.c @@ -1,7 +1,7 @@ /** @file
Esrt management implementation.
-Copyright (c) 2015 - 2016, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2015 - 2018, Intel Corporation. All rights reserved.<BR>
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
@@ -15,12 +15,12 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. #include "EsrtImpl.h"
/**
- Find Esrt Entry stored in ESRT repository.
+ Find Esrt Entry stored in ESRT repository.
@param[in] FwClass Firmware class guid in Esrt entry
@param[in] Attribute Esrt from Non FMP or FMP instance
@param[out] Entry Esrt entry returned
-
+
@retval EFI_SUCCESS Successfully find an Esrt entry
@retval EF_NOT_FOUND No Esrt entry found
@@ -49,7 +49,7 @@ GetEsrtEntry ( } else {
VariableName = EFI_ESRT_NONFMP_VARIABLE_NAME;
}
-
+
Status = GetVariable2 (
VariableName,
&gEfiCallerIdGuid,
@@ -90,7 +90,7 @@ EXIT: @param[in] Entry Esrt entry to be set
@param[in] Attribute Esrt from Esrt private protocol or FMP instance
-
+
@retval EFI_SUCCESS Successfully set a variable.
**/
@@ -201,21 +201,21 @@ EXIT: }
/**
- Delete ESRT Entry from ESRT repository.
+ Delete ESRT Entry from ESRT repository.
- @param[in] FwClass FwClass of Esrt entry to delete
+ @param[in] FwClass FwClass of Esrt entry to delete
@param[in] Attribute Esrt from Esrt private protocol or FMP instance
-
- @retval EFI_SUCCESS Insert all entries Successfully
+
+ @retval EFI_SUCCESS Insert all entries Successfully
@retval EFI_NOT_FOUND ESRT entry with FwClass doesn't exsit
-
+
**/
EFI_STATUS
DeleteEsrtEntry(
IN EFI_GUID *FwClass,
IN UINTN Attribute
)
-{
+{
EFI_STATUS Status;
CHAR16 *VariableName;
EFI_SYSTEM_RESOURCE_ENTRY *EsrtRepository;
@@ -224,7 +224,7 @@ DeleteEsrtEntry( UINTN EsrtNum;
EsrtRepository = NULL;
-
+
//
// Get Esrt index buffer
//
@@ -233,7 +233,7 @@ DeleteEsrtEntry( } else {
VariableName = EFI_ESRT_NONFMP_VARIABLE_NAME;
}
-
+
Status = GetVariable2 (
VariableName,
&gEfiCallerIdGuid,
@@ -302,7 +302,7 @@ EXIT: @param[in] Entry Esrt entry to be set
@param[in] Attribute Esrt from Non Esrt or FMP instance
-
+
@retval EFI_SUCCESS Successfully Update a variable.
@retval EFI_NOT_FOUND The Esrt enry doesn't exist
@@ -425,9 +425,9 @@ IsSystemFmp ( @param[in, out] EsrtEntry Esrt entry to be Init
@param[in] FmpImageInfo FMP image info descriptor
@param[in] DescriptorVersion FMP Image info descriptor version
-
+
**/
-VOID
+VOID
SetEsrtEntryFromFmpInfo (
IN OUT EFI_SYSTEM_RESOURCE_ENTRY *EsrtEntry,
IN EFI_FIRMWARE_IMAGE_DESCRIPTOR *FmpImageInfo,
@@ -451,7 +451,7 @@ SetEsrtEntryFromFmpInfo ( // LowestSupportedImageVersion only available in FMP V2 or higher
//
EsrtEntry->LowestSupportedFwVersion = FmpImageInfo->LowestSupportedImageVersion;
- }
+ }
if (DescriptorVersion >= 3) {
//
@@ -459,7 +459,7 @@ SetEsrtEntryFromFmpInfo ( //
EsrtEntry->LastAttemptVersion = FmpImageInfo->LastAttemptVersion;
EsrtEntry->LastAttemptStatus = FmpImageInfo->LastAttemptStatus;
- }
+ }
//
// Set capsule customized flag
diff --git a/MdeModulePkg/Universal/EsrtDxe/EsrtImpl.h b/MdeModulePkg/Universal/EsrtDxe/EsrtImpl.h index a238dfb..e0e9673 100644 --- a/MdeModulePkg/Universal/EsrtDxe/EsrtImpl.h +++ b/MdeModulePkg/Universal/EsrtDxe/EsrtImpl.h @@ -1,7 +1,7 @@ /** @file
Esrt management implementation head file.
-Copyright (c) 2015, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2015 - 2018, Intel Corporation. All rights reserved.<BR>
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
@@ -36,12 +36,12 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. //
// Name of Variable for Non-FMP ESRT Repository
-//
+//
#define EFI_ESRT_NONFMP_VARIABLE_NAME L"EsrtNonFmp"
//
// Name of Variable for FMP
-//
+//
#define EFI_ESRT_FMP_VARIABLE_NAME L"EsrtFmp"
//
@@ -56,7 +56,7 @@ typedef struct { // Ready to boot event
//
EFI_EVENT Event;
-
+
//
// Updates to Fmp storage must be locked.
//
@@ -70,12 +70,12 @@ typedef struct { /**
- Find Esrt Entry stored in ESRT repository.
+ Find Esrt Entry stored in ESRT repository.
@param[in] FwClass Firmware class guid in Esrt entry
@param[in] Attribute Esrt from Non FMP or FMP instance
@param[out] Entry Esrt entry returned
-
+
@retval EFI_SUCCESS Successfully find an Esrt entry
@retval EF_NOT_FOUND No Esrt entry found
@@ -92,7 +92,7 @@ GetEsrtEntry ( @param[in] Entry Esrt entry to be set
@param[in] Attribute Esrt from Esrt private protocol or FMP instance
-
+
@retval EFI_SUCCESS Successfully set a variable.
**/
@@ -103,14 +103,14 @@ InsertEsrtEntry( );
/**
- Delete ESRT Entry from ESRT repository.
+ Delete ESRT Entry from ESRT repository.
- @param[in] FwClass FwClass of Esrt entry to delete
+ @param[in] FwClass FwClass of Esrt entry to delete
@param[in] Attribute Esrt from Esrt private protocol or FMP instance
-
- @retval EFI_SUCCESS Insert all entries Successfully
+
+ @retval EFI_SUCCESS Insert all entries Successfully
@retval EFI_NOT_FOUND ESRT entry with FwClass doesn't exsit
-
+
**/
EFI_STATUS
DeleteEsrtEntry(
@@ -123,7 +123,7 @@ DeleteEsrtEntry( @param[in] Entry Esrt entry to be set
@param[in] Attribute Esrt from Non Esrt or FMP instance
-
+
@retval EFI_SUCCESS Successfully Update a variable.
@retval EFI_NOT_FOUND The Esrt enry doesn't exist
@@ -140,9 +140,9 @@ UpdateEsrtEntry( @param[in, out] EsrtEntry Esrt entry to be Init
@param[in] FmpImageInfo FMP image info descriptor
@param[in] DescriptorVersion FMP Image info descriptor version
-
+
**/
-VOID
+VOID
SetEsrtEntryFromFmpInfo (
IN OUT EFI_SYSTEM_RESOURCE_ENTRY *EsrtEntry,
IN EFI_FIRMWARE_IMAGE_DESCRIPTOR *FmpImageInfo,
@@ -150,11 +150,11 @@ SetEsrtEntryFromFmpInfo ( );
/**
- Get ESRT entry from ESRT Cache by FwClass Guid
+ Get ESRT entry from ESRT Cache by FwClass Guid
+
+ @param[in] FwClass FwClass of Esrt entry to get
+ @param[in, out] Entry Esrt entry returned
- @param[in] FwClass FwClass of Esrt entry to get
- @param[in, out] Entry Esrt entry returned
-
@retval EFI_SUCCESS The variable saving this Esrt Entry exists.
@retval EF_NOT_FOUND No correct variable found.
@retval EFI_WRITE_PROTECTED ESRT Cache repository is locked
@@ -171,7 +171,7 @@ EsrtDxeGetEsrtEntry( Update one ESRT entry in ESRT Cache.
@param[in] Entry Esrt entry to be updated
-
+
@retval EFI_SUCCESS Successfully update an ESRT entry in cache.
@retval EFI_INVALID_PARAMETER Entry does't exist in ESRT Cache
@retval EFI_WRITE_PROTECTED ESRT Cache is locked
@@ -184,11 +184,11 @@ EsrtDxeUpdateEsrtEntry( );
/**
- Non-FMP instance to unregister Esrt Entry from ESRT Cache.
+ Non-FMP instance to unregister Esrt Entry from ESRT Cache.
+
+ @param[in] FwClass FwClass of Esrt entry to Unregister
- @param[in] FwClass FwClass of Esrt entry to Unregister
-
- @retval EFI_SUCCESS Insert all entries Successfully
+ @retval EFI_SUCCESS Insert all entries Successfully
@retval EFI_NOT_FOUND Entry of FwClass does not exsit
**/
@@ -229,10 +229,10 @@ EsrtDxeSyncFmp( );
/**
- This function locks up Esrt repository to be readonly. It should be called
+ This function locks up Esrt repository to be readonly. It should be called
before gEfiEndOfDxeEventGroupGuid event signaled
- @retval EFI_SUCCESS Locks up FMP Non-FMP repository successfully
+ @retval EFI_SUCCESS Locks up FMP Non-FMP repository successfully
**/
EFI_STATUS
diff --git a/MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWrite.c b/MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWrite.c index 49e747b..65fdc07 100644 --- a/MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWrite.c +++ b/MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWrite.c @@ -1,16 +1,16 @@ /** @file
- These are the common Fault Tolerant Write (FTW) functions that are shared
+ These are the common Fault Tolerant Write (FTW) functions that are shared
by DXE FTW driver and SMM FTW driver.
-Copyright (c) 2006 - 2017, Intel Corporation. All rights reserved.<BR>
-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,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>
+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,
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
**/
@@ -23,7 +23,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. Query the largest block that may be updated in a fault tolerant manner.
- @param This The pointer to this protocol instance.
+ @param This The pointer to this protocol instance.
@param BlockSize A pointer to a caller allocated UINTN that is updated to
indicate the size of the largest block that can be updated.
@@ -59,7 +59,7 @@ FtwGetMaxBlockSize ( All writes must be completed or aborted before another fault tolerant write can occur.
- @param This The pointer to this protocol instance.
+ @param This The pointer to this protocol instance.
@param CallerId The GUID identifying the write.
@param PrivateDataSize The size of the caller's private data
that must be recorded for each write.
@@ -174,7 +174,7 @@ FtwAllocate ( Since the content has already backuped in spare block, the write is
guaranteed to be completed with fault tolerant manner.
- @param This The pointer to this protocol instance.
+ @param This The pointer to this protocol instance.
@param Fvb The FVB protocol that provides services for
reading, writing, and erasing the target block.
@param BlockSize The size of the block.
@@ -289,7 +289,7 @@ FtwWriteRecord ( manner, ensuring at all times that either the original contents or
the modified contents are available.
- @param This The pointer to this protocol instance.
+ @param This The pointer to this protocol instance.
@param Lba The logical block address of the target block.
@param Offset The offset within the target block to place the data.
@param Length The number of bytes to write to the target block.
@@ -299,11 +299,11 @@ FtwWriteRecord ( reading, writing, and erasing the target block.
@param Buffer The data to write.
- @retval EFI_SUCCESS The function completed successfully
- @retval EFI_ABORTED The function could not complete successfully.
- @retval EFI_BAD_BUFFER_SIZE The input data can't fit within the spare block.
+ @retval EFI_SUCCESS The function completed successfully
+ @retval EFI_ABORTED The function could not complete successfully.
+ @retval EFI_BAD_BUFFER_SIZE The input data can't fit within the spare block.
Offset + *NumBytes > SpareAreaLength.
- @retval EFI_ACCESS_DENIED No writes have been allocated.
+ @retval EFI_ACCESS_DENIED No writes have been allocated.
@retval EFI_OUT_OF_RESOURCES Cannot allocate enough memory resource.
@retval EFI_NOT_FOUND Cannot find FVB protocol by handle.
@@ -348,7 +348,7 @@ FtwWrite ( Header = FtwDevice->FtwLastWriteHeader;
Record = FtwDevice->FtwLastWriteRecord;
-
+
if (IsErasedFlashBuffer ((UINT8 *) Header, sizeof (EFI_FAULT_TOLERANT_WRITE_HEADER))) {
if (PrivateData == NULL) {
//
@@ -631,7 +631,7 @@ FtwWrite ( Restarts a previously interrupted write. The caller must provide the
block protocol needed to complete the interrupted write.
- @param This The pointer to this protocol instance.
+ @param This The pointer to this protocol instance.
@param FvBlockHandle The handle of FVB protocol that provides services for
reading, writing, and erasing the target block.
@@ -727,7 +727,7 @@ FtwRestart ( /**
Aborts all previous allocated writes.
- @param This The pointer to this protocol instance.
+ @param This The pointer to this protocol instance.
@retval EFI_SUCCESS The function completed successfully
@retval EFI_ABORTED The function could not complete successfully.
@@ -785,7 +785,7 @@ FtwAbort ( manner, ensuring at all times that either the original contents or
the modified contents are available.
- @param This The pointer to this protocol instance.
+ @param This The pointer to this protocol instance.
@param CallerId The GUID identifying the last write.
@param Lba The logical block address of the last write.
@param Offset The offset within the block of the last write.
diff --git a/MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWrite.h b/MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWrite.h index be6929c..844cf3b 100644 --- a/MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWrite.h +++ b/MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWrite.h @@ -3,14 +3,14 @@ The internal header file includes the common header files, defines
internal structure and functions used by Ftw module.
-Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.<BR>
-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,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>
+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,
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
**/
@@ -82,7 +82,7 @@ typedef struct { UINTN FtwWorkSpaceSize; // Size of working space range that stores write record.
EFI_LBA FtwWorkSpaceLbaInSpare; // Start LBA of working space in spare block.
UINTN FtwWorkSpaceBaseInSpare;// Offset into the FtwWorkSpaceLbaInSpare block.
- UINT8 *FtwWorkSpace; // Point to Work Space in memory buffer
+ UINT8 *FtwWorkSpace; // Point to Work Space in memory buffer
//
// Following a buffer of FtwWorkSpace[FTW_WORK_SPACE_SIZE],
// Allocated with EFI_FTW_DEVICE.
@@ -183,11 +183,11 @@ FtwAllocate ( reading, writing, and erasing the target block.
@param Buffer The data to write.
- @retval EFI_SUCCESS The function completed successfully
- @retval EFI_ABORTED The function could not complete successfully.
- @retval EFI_BAD_BUFFER_SIZE The input data can't fit within the spare block.
+ @retval EFI_SUCCESS The function completed successfully
+ @retval EFI_ABORTED The function could not complete successfully.
+ @retval EFI_BAD_BUFFER_SIZE The input data can't fit within the spare block.
Offset + *NumBytes > SpareAreaLength.
- @retval EFI_ACCESS_DENIED No writes have been allocated.
+ @retval EFI_ACCESS_DENIED No writes have been allocated.
@retval EFI_OUT_OF_RESOURCES Cannot allocate enough memory resource.
@retval EFI_NOT_FOUND Cannot find FVB protocol by handle.
@@ -290,7 +290,7 @@ FtwGetLastWrite ( partially erased.
@retval EFI_INVALID_PARAMETER One or more of the LBAs listed
in the variable argument list do
- not exist in the firmware volume.
+ not exist in the firmware volume.
**/
@@ -654,10 +654,10 @@ EFI_STATUS FtwGetSarProtocol (
OUT VOID **SarProtocol
);
-
+
/**
Function returns an array of handles that support the FVB protocol
- in a buffer allocated from pool.
+ in a buffer allocated from pool.
@param[out] NumberHandles The number of handles returned in Buffer.
@param[out] Buffer A pointer to the buffer to return the requested
@@ -689,7 +689,7 @@ GetFvbCountAndBuffer ( **/
EFI_STATUS
InitFtwDevice (
- OUT EFI_FTW_DEVICE **FtwData
+ OUT EFI_FTW_DEVICE **FtwData
);
@@ -700,7 +700,7 @@ InitFtwDevice ( @retval EFI_SUCCESS Initialize the FTW protocol successfully.
@retval EFI_NOT_FOUND No proper FVB protocol was found.
-
+
**/
EFI_STATUS
InitFtwProtocol (
diff --git a/MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteDxe.c b/MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteDxe.c index 3fa5431..094e40f 100644 --- a/MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteDxe.c +++ b/MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteDxe.c @@ -2,18 +2,18 @@ This is a simple fault tolerant write driver.
- This boot service protocol only provides fault tolerant write capability for
- block devices. The protocol has internal non-volatile intermediate storage
- of the data and private information. It should be able to recover
- automatically from a critical fault, such as power failure.
+ This boot service protocol only provides fault tolerant write capability for
+ block devices. The protocol has internal non-volatile intermediate storage
+ of the data and private information. It should be able to recover
+ automatically from a critical fault, such as power failure.
- The implementation uses an FTW (Fault Tolerant Write) Work Space.
+ The implementation uses an FTW (Fault Tolerant Write) Work Space.
This work space is a memory copy of the work space on the Working Block,
the size of the work space is the FTW_WORK_SPACE_SIZE bytes.
-
+
The work space stores each write record as EFI_FTW_RECORD structure.
The spare block stores the write buffer before write to the target block.
-
+
The write record has three states to specify the different phase of write operation.
1) WRITE_ALLOCATED is that the record is allocated in write space.
The information of write operation is stored in write record structure.
@@ -27,27 +27,27 @@ Final copy the data from the spare block to the target block.
To make this drive work well, the following conditions must be satisfied:
- 1. The write NumBytes data must be fit within Spare area.
+ 1. The write NumBytes data must be fit within Spare area.
Offset + NumBytes <= SpareAreaLength
2. The whole flash range has the same block size.
3. Working block is an area which contains working space in its last block and has the same size as spare block.
- 4. Working Block area must be in the single one Firmware Volume Block range which FVB protocol is produced on.
+ 4. Working Block area must be in the single one Firmware Volume Block range which FVB protocol is produced on.
5. Spare area must be in the single one Firmware Volume Block range which FVB protocol is produced on.
- 6. Any write data area (SpareAreaLength Area) which the data will be written into must be
+ 6. Any write data area (SpareAreaLength Area) which the data will be written into must be
in the single one Firmware Volume Block range which FVB protocol is produced on.
7. If write data area (such as Variable range) is enlarged, the spare area range must be enlarged.
The spare area must be enough large to store the write data before write them into the target range.
If one of them is not satisfied, FtwWrite may fail.
Usually, Spare area only takes one block. That's SpareAreaLength = BlockSize, NumberOfSpareBlock = 1.
-Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.<BR>
-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,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>
+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,
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
**/
@@ -65,7 +65,7 @@ EFI_EVENT mFvbRegistration = NULL; @retval EFI_SUCCESS The interface information for the specified protocol was returned.
@retval EFI_UNSUPPORTED The device does not support the FVB protocol.
@retval EFI_INVALID_PARAMETER FvBlockHandle is not a valid EFI_HANDLE or FvBlock is NULL.
-
+
**/
EFI_STATUS
FtwGetFvbByHandle (
@@ -104,8 +104,8 @@ FtwGetSarProtocol ( // Locate Swap Address Range protocol
//
Status = gBS->LocateProtocol (
- &gEfiSwapAddressRangeProtocolGuid,
- NULL,
+ &gEfiSwapAddressRangeProtocolGuid,
+ NULL,
SarProtocol
);
return Status;
@@ -113,7 +113,7 @@ FtwGetSarProtocol ( /**
Function returns an array of handles that support the FVB protocol
- in a buffer allocated from pool.
+ in a buffer allocated from pool.
@param[out] NumberHandles The number of handles returned in Buffer.
@param[out] Buffer A pointer to the buffer to return the requested
@@ -124,7 +124,7 @@ FtwGetSarProtocol ( @retval EFI_NOT_FOUND No FVB handle was found.
@retval EFI_OUT_OF_RESOURCES There is not enough pool memory to store the matching results.
@retval EFI_INVALID_PARAMETER NumberHandles is NULL or Buffer is NULL.
-
+
**/
EFI_STATUS
GetFvbCountAndBuffer (
@@ -169,10 +169,10 @@ FvbNotificationEvent ( //
// Just return to avoid installing FaultTolerantWriteProtocol again
// if Fault Tolerant Write protocol has been installed.
- //
+ //
Status = gBS->LocateProtocol (
- &gEfiFaultTolerantWriteProtocolGuid,
- NULL,
+ &gEfiFaultTolerantWriteProtocolGuid,
+ NULL,
(VOID **) &FtwProtocol
);
if (!EFI_ERROR (Status)) {
@@ -186,8 +186,8 @@ FvbNotificationEvent ( Status = InitFtwProtocol (FtwDevice);
if (EFI_ERROR(Status)) {
return ;
- }
-
+ }
+
//
// Install protocol interface
//
@@ -198,10 +198,10 @@ FvbNotificationEvent ( &FtwDevice->FtwInstance
);
ASSERT_EFI_ERROR (Status);
-
+
Status = gBS->CloseEvent (Event);
ASSERT_EFI_ERROR (Status);
-
+
return;
}
@@ -215,7 +215,7 @@ FvbNotificationEvent ( @retval EFI_SUCCESS The initialization finished successfully.
@retval EFI_OUT_OF_RESOURCES Allocate memory error
@retval EFI_INVALID_PARAMETER Workspace or Spare block does not exist
-
+
**/
EFI_STATUS
EFIAPI
@@ -239,7 +239,7 @@ FaultTolerantWriteInitialize ( //
// Register FvbNotificationEvent () notify function.
- //
+ //
EfiCreateProtocolNotifyEvent (
&gEfiFirmwareVolumeBlockProtocolGuid,
TPL_CALLBACK,
@@ -247,6 +247,6 @@ FaultTolerantWriteInitialize ( (VOID *)FtwDevice,
&mFvbRegistration
);
-
+
return EFI_SUCCESS;
}
diff --git a/MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteDxe.inf b/MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteDxe.inf index 5649241..30a765c 100644 --- a/MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteDxe.inf +++ b/MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteDxe.inf @@ -1,11 +1,11 @@ ## @file
# Fault Tolerant Write Dxe Driver.
#
-# This driver installs Fault Tolerant Write (FTW) protocol,
+# This driver installs Fault Tolerant Write (FTW) protocol,
# which provides fault tolerant write capability for block devices.
# Its implementation depends on the full functionality FVB protocol that support read, write/erase flash access.
#
-# Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>
#
# This program and the accompanying materials
# are licensed and made available under the terms and conditions of the BSD License
diff --git a/MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteDxeExtra.uni b/MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteDxeExtra.uni index 9852e42..f06f84e 100644 --- a/MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteDxeExtra.uni +++ b/MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteDxeExtra.uni @@ -1,7 +1,7 @@ // /** @file
// FaultTolerantWriteDxe Localized Strings and Content
//
-// Copyright (c) 2013 - 2014, Intel Corporation. All rights reserved.<BR>
+// Copyright (c) 2013 - 2018, Intel Corporation. All rights reserved.<BR>
//
// This program and the accompanying materials
// are licensed and made available under the terms and conditions of the BSD License
@@ -12,8 +12,8 @@ //
// **/
-#string STR_PROPERTIES_MODULE_NAME
-#language en-US
+#string STR_PROPERTIES_MODULE_NAME
+#language en-US
"Fault Tolerant Flash Write DXE Driver"
diff --git a/MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteSmm.c b/MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteSmm.c index 1e75328..632313f 100644 --- a/MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteSmm.c +++ b/MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteSmm.c @@ -2,18 +2,18 @@ This is a simple fault tolerant write driver that is intended to use in the SMM environment.
- This boot service protocol only provides fault tolerant write capability for
- block devices. The protocol has internal non-volatile intermediate storage
- of the data and private information. It should be able to recover
- automatically from a critical fault, such as power failure.
+ This boot service protocol only provides fault tolerant write capability for
+ block devices. The protocol has internal non-volatile intermediate storage
+ of the data and private information. It should be able to recover
+ automatically from a critical fault, such as power failure.
- The implementation uses an FTW (Fault Tolerant Write) Work Space.
+ The implementation uses an FTW (Fault Tolerant Write) Work Space.
This work space is a memory copy of the work space on the Working Block,
the size of the work space is the FTW_WORK_SPACE_SIZE bytes.
-
+
The work space stores each write record as EFI_FTW_RECORD structure.
The spare block stores the write buffer before write to the target block.
-
+
The write record has three states to specify the different phase of write operation.
1) WRITE_ALLOCATED is that the record is allocated in write space.
The information of write operation is stored in write record structure.
@@ -27,13 +27,13 @@ Final copy the data from the spare block to the target block.
To make this drive work well, the following conditions must be satisfied:
- 1. The write NumBytes data must be fit within Spare area.
+ 1. The write NumBytes data must be fit within Spare area.
Offset + NumBytes <= SpareAreaLength
2. The whole flash range has the same block size.
3. Working block is an area which contains working space in its last block and has the same size as spare block.
- 4. Working Block area must be in the single one Firmware Volume Block range which FVB protocol is produced on.
+ 4. Working Block area must be in the single one Firmware Volume Block range which FVB protocol is produced on.
5. Spare area must be in the single one Firmware Volume Block range which FVB protocol is produced on.
- 6. Any write data area (SpareAreaLength Area) which the data will be written into must be
+ 6. Any write data area (SpareAreaLength Area) which the data will be written into must be
in the single one Firmware Volume Block range which FVB protocol is produced on.
7. If write data area (such as Variable range) is enlarged, the spare area range must be enlarged.
The spare area must be enough large to store the write data before write them into the target range.
@@ -41,16 +41,16 @@ Usually, Spare area only takes one block. That's SpareAreaLength = BlockSize, NumberOfSpareBlock = 1.
Caution: This module requires additional review when modified.
- This driver need to make sure the CommBuffer is not in the SMRAM range.
+ This driver need to make sure the CommBuffer is not in the SMRAM range.
+
+Copyright (c) 2010 - 2018, Intel Corporation. All rights reserved.<BR>
+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
-Copyright (c) 2010 - 2015, Intel Corporation. All rights reserved.<BR>
-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,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
**/
@@ -119,8 +119,8 @@ FtwGetSarProtocol ( // Locate Smm Swap Address Range protocol
//
Status = gSmst->SmmLocateProtocol (
- &gEfiSmmSwapAddressRangeProtocolGuid,
- NULL,
+ &gEfiSmmSwapAddressRangeProtocolGuid,
+ NULL,
SarProtocol
);
return Status;
@@ -128,7 +128,7 @@ FtwGetSarProtocol ( /**
Function returns an array of handles that support the SMM FVB protocol
- in a buffer allocated from pool.
+ in a buffer allocated from pool.
@param[out] NumberHandles The number of handles returned in Buffer.
@param[out] Buffer A pointer to the buffer to return the requested
@@ -227,7 +227,7 @@ GetFvbByAddressAndAttribute ( if (EFI_ERROR (Status)) {
return EFI_ABORTED;
}
-
+
//
// Find the proper SMM Fvb handle by the address and attributes.
//
@@ -276,8 +276,8 @@ GetFvbByAddressAndAttribute ( This SMI handler provides services for the fault tolerant write wrapper driver.
Caution: This function requires additional review when modified.
- This driver need to make sure the CommBuffer is not in the SMRAM range.
- Also in FTW_FUNCTION_GET_LAST_WRITE case, check SmmFtwGetLastWriteHeader->Data +
+ This driver need to make sure the CommBuffer is not in the SMRAM range.
+ Also in FTW_FUNCTION_GET_LAST_WRITE case, check SmmFtwGetLastWriteHeader->Data +
SmmFtwGetLastWriteHeader->PrivateDataSize within communication buffer.
@param[in] DispatchHandle The unique handle assigned to this handler by SmiHandlerRegister().
@@ -287,14 +287,14 @@ GetFvbByAddressAndAttribute ( from a non-SMM environment into an SMM environment.
@param[in, out] CommBufferSize The size of the CommBuffer.
- @retval EFI_SUCCESS The interrupt was handled and quiesced. No other handlers
+ @retval EFI_SUCCESS The interrupt was handled and quiesced. No other handlers
should still be called.
- @retval EFI_WARN_INTERRUPT_SOURCE_QUIESCED The interrupt has been quiesced but other handlers should
+ @retval EFI_WARN_INTERRUPT_SOURCE_QUIESCED The interrupt has been quiesced but other handlers should
still be called.
- @retval EFI_WARN_INTERRUPT_SOURCE_PENDING The interrupt is still pending and other handlers should still
+ @retval EFI_WARN_INTERRUPT_SOURCE_PENDING The interrupt is still pending and other handlers should still
be called.
@retval EFI_INTERRUPT_PENDING The interrupt could not be quiesced.
-
+
**/
EFI_STATUS
EFIAPI
@@ -364,7 +364,7 @@ SmmFaultTolerantWriteHandler ( &SmmGetMaxBlockSizeHeader->BlockSize
);
break;
-
+
case FTW_FUNCTION_ALLOCATE:
if (CommBufferPayloadSize < sizeof (SMM_FTW_ALLOCATE_HEADER)) {
DEBUG ((EFI_D_ERROR, "Allocate: SMM communication buffer size invalid!\n"));
@@ -378,7 +378,7 @@ SmmFaultTolerantWriteHandler ( SmmFtwAllocateHeader->NumberOfWrites
);
break;
-
+
case FTW_FUNCTION_WRITE:
if (CommBufferPayloadSize < OFFSET_OF (SMM_FTW_WRITE_HEADER, Data)) {
DEBUG ((EFI_D_ERROR, "Write: SMM communication buffer size invalid!\n"));
@@ -412,7 +412,7 @@ SmmFaultTolerantWriteHandler ( PrivateData = (VOID *)&SmmFtwWriteHeader->Data[Length];
}
Status = GetFvbByAddressAndAttribute (
- SmmFtwWriteHeader->FvbBaseAddress,
+ SmmFtwWriteHeader->FvbBaseAddress,
SmmFtwWriteHeader->FvbAttributes,
&SmmFvbHandle
);
@@ -428,7 +428,7 @@ SmmFaultTolerantWriteHandler ( );
}
break;
-
+
case FTW_FUNCTION_RESTART:
if (CommBufferPayloadSize < sizeof (SMM_FTW_RESTART_HEADER)) {
DEBUG ((EFI_D_ERROR, "Restart: SMM communication buffer size invalid!\n"));
@@ -436,10 +436,10 @@ SmmFaultTolerantWriteHandler ( }
SmmFtwRestartHeader = (SMM_FTW_RESTART_HEADER *) SmmFtwFunctionHeader->Data;
Status = GetFvbByAddressAndAttribute (
- SmmFtwRestartHeader->FvbBaseAddress,
+ SmmFtwRestartHeader->FvbBaseAddress,
SmmFtwRestartHeader->FvbAttributes,
&SmmFvbHandle
- );
+ );
if (!EFI_ERROR (Status)) {
Status = FtwRestart (&mFtwDevice->FtwInstance, SmmFvbHandle);
}
@@ -448,7 +448,7 @@ SmmFaultTolerantWriteHandler ( case FTW_FUNCTION_ABORT:
Status = FtwAbort (&mFtwDevice->FtwInstance);
break;
-
+
case FTW_FUNCTION_GET_LAST_WRITE:
if (CommBufferPayloadSize < OFFSET_OF (SMM_FTW_GET_LAST_WRITE_HEADER, Data)) {
DEBUG ((EFI_D_ERROR, "GetLastWrite: SMM communication buffer size invalid!\n"));
@@ -499,13 +499,13 @@ SmmFaultTolerantWriteHandler ( /**
SMM Firmware Volume Block Protocol notification event handler.
-
+
@param[in] Protocol Points to the protocol's unique identifier
@param[in] Interface Points to the interface instance
@param[in] Handle The handle on which the interface was installed
@retval EFI_SUCCESS SmmEventCallback runs successfully
-
+
**/
EFI_STATUS
EFIAPI
@@ -519,14 +519,14 @@ FvbNotificationEvent ( EFI_SMM_FAULT_TOLERANT_WRITE_PROTOCOL *FtwProtocol;
EFI_HANDLE SmmFtwHandle;
EFI_HANDLE FtwHandle;
-
+
//
// Just return to avoid install SMM FaultTolerantWriteProtocol again
// if SMM Fault Tolerant Write protocol had been installed.
- //
+ //
Status = gSmst->SmmLocateProtocol (
- &gEfiSmmFaultTolerantWriteProtocolGuid,
- NULL,
+ &gEfiSmmFaultTolerantWriteProtocolGuid,
+ NULL,
(VOID **) &FtwProtocol
);
if (!EFI_ERROR (Status)) {
@@ -550,7 +550,7 @@ FvbNotificationEvent ( EFI_NATIVE_INTERFACE,
&mFtwDevice->FtwInstance
);
- ASSERT_EFI_ERROR (Status);
+ ASSERT_EFI_ERROR (Status);
///
/// Register SMM FTW SMI handler
@@ -569,13 +569,13 @@ FvbNotificationEvent ( NULL
);
ASSERT_EFI_ERROR (Status);
-
+
return EFI_SUCCESS;
}
/**
SMM END_OF_DXE protocol notification event handler.
-
+
@param Protocol Points to the protocol's unique identifier
@param Interface Points to the interface instance
@param Handle The handle on which the interface was installed
@@ -636,7 +636,7 @@ SmmFaultTolerantWriteInitialize ( //
// Register FvbNotificationEvent () notify function.
- //
+ //
Status = gSmst->SmmRegisterProtocolNotify (
&gEfiSmmFirmwareVolumeBlockProtocolGuid,
FvbNotificationEvent,
@@ -645,6 +645,6 @@ SmmFaultTolerantWriteInitialize ( ASSERT_EFI_ERROR (Status);
FvbNotificationEvent (NULL, NULL, NULL);
-
+
return EFI_SUCCESS;
}
diff --git a/MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteSmm.inf b/MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteSmm.inf index 3b57c3c..85d109e 100644 --- a/MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteSmm.inf +++ b/MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteSmm.inf @@ -1,12 +1,12 @@ ## @file
# Fault Tolerant Write Smm Driver.
#
-# This driver installs SMM Fault Tolerant Write (FTW) protocol, which provides fault
-# tolerant write capability in SMM environment for block devices. Its implementation
-# depends on the full functionality SMM FVB protocol that support read, write/erase
+# This driver installs SMM Fault Tolerant Write (FTW) protocol, which provides fault
+# tolerant write capability in SMM environment for block devices. Its implementation
+# depends on the full functionality SMM FVB protocol that support read, write/erase
# flash access.
#
-# Copyright (c) 2010 - 2015, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2010 - 2018, Intel Corporation. All rights reserved.<BR>
#
# This program and the accompanying materials
# are licensed and made available under the terms and conditions of the BSD License
diff --git a/MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteSmmCommon.h b/MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteSmmCommon.h index 061673b..8ad0015 100644 --- a/MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteSmmCommon.h +++ b/MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteSmmCommon.h @@ -1,15 +1,15 @@ /** @file
- The common header file for SMM FTW module and SMM FTW DXE Module.
-
-Copyright (c) 2011, Intel Corporation. All rights reserved. <BR>
-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,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ The common header file for SMM FTW module and SMM FTW DXE Module.
+
+Copyright (c) 2011 - 2018, Intel Corporation. All rights reserved. <BR>
+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,
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
**/
diff --git a/MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteSmmDxe.c b/MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteSmmDxe.c index 772d10d..259e936 100644 --- a/MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteSmmDxe.c +++ b/MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteSmmDxe.c @@ -1,16 +1,16 @@ /** @file
- Implement the Fault Tolerant Write (FTW) protocol based on SMM FTW
+ Implement the Fault Tolerant Write (FTW) protocol based on SMM FTW
module.
-Copyright (c) 2011 - 2013, Intel Corporation. All rights reserved. <BR>
-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,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+Copyright (c) 2011 - 2018, Intel Corporation. All rights reserved. <BR>
+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,
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
**/
@@ -46,28 +46,28 @@ InitCommunicateBuffer ( IN UINTN Function
)
{
- EFI_SMM_COMMUNICATE_HEADER *SmmCommunicateHeader;
- SMM_FTW_COMMUNICATE_FUNCTION_HEADER *SmmFtwFunctionHeader;
+ EFI_SMM_COMMUNICATE_HEADER *SmmCommunicateHeader;
+ SMM_FTW_COMMUNICATE_FUNCTION_HEADER *SmmFtwFunctionHeader;
//
// The whole buffer size: SMM_COMMUNICATE_HEADER_SIZE + SMM_FTW_COMMUNICATE_HEADER_SIZE + DataSize.
//
SmmCommunicateHeader = AllocateZeroPool (DataSize + SMM_COMMUNICATE_HEADER_SIZE + SMM_FTW_COMMUNICATE_HEADER_SIZE);
ASSERT (SmmCommunicateHeader != NULL);
-
+
//
// Prepare data buffer.
//
CopyGuid (&SmmCommunicateHeader->HeaderGuid, &gEfiSmmFaultTolerantWriteProtocolGuid);
SmmCommunicateHeader->MessageLength = DataSize + SMM_FTW_COMMUNICATE_HEADER_SIZE;
-
+
SmmFtwFunctionHeader = (SMM_FTW_COMMUNICATE_FUNCTION_HEADER *) SmmCommunicateHeader->Data;
SmmFtwFunctionHeader->Function = Function;
*CommunicateBuffer = SmmCommunicateHeader;
if (DataPtr != NULL) {
*DataPtr = SmmFtwFunctionHeader->Data;
- }
+ }
}
@@ -76,7 +76,7 @@ InitCommunicateBuffer ( @param[in, out] SmmCommunicateHeader The communicate buffer.
@param[in] DataSize The payload size.
-
+
**/
EFI_STATUS
SendCommunicateBuffer (
@@ -86,8 +86,8 @@ SendCommunicateBuffer ( {
EFI_STATUS Status;
UINTN CommSize;
- SMM_FTW_COMMUNICATE_FUNCTION_HEADER *SmmFtwFunctionHeader;
-
+ SMM_FTW_COMMUNICATE_FUNCTION_HEADER *SmmFtwFunctionHeader;
+
CommSize = DataSize + SMM_COMMUNICATE_HEADER_SIZE + SMM_FTW_COMMUNICATE_HEADER_SIZE;
Status = mSmmCommunication->Communicate (mSmmCommunication, SmmCommunicateHeader, &CommSize);
ASSERT_EFI_ERROR (Status);
@@ -103,7 +103,7 @@ SendCommunicateBuffer ( @param[in] FvbHandle The handle of FVB protocol that provides services.
@param[out] FvbBaseAddress The base address of the FVB attached with FvbHandle.
@param[out] FvbAttributes The attributes of the FVB attached with FvbHandle.
-
+
@retval EFI_SUCCESS The function completed successfully.
@retval Others The function could not complete successfully.
@@ -122,14 +122,14 @@ ConvertFvbHandle ( if (EFI_ERROR (Status)) {
return Status;
}
-
+
Status = Fvb->GetPhysicalAddress (Fvb, FvbBaseAddress);
if (EFI_ERROR (Status)) {
return Status;
}
Status = Fvb->GetAttributes (Fvb, FvbAttributes);
- return Status;
+ return Status;
}
@@ -154,7 +154,7 @@ FtwGetMaxBlockSize ( {
EFI_STATUS Status;
UINTN PayloadSize;
- EFI_SMM_COMMUNICATE_HEADER *SmmCommunicateHeader;
+ EFI_SMM_COMMUNICATE_HEADER *SmmCommunicateHeader;
SMM_FTW_GET_MAX_BLOCK_SIZE_HEADER *SmmFtwBlockSizeHeader;
//
@@ -162,7 +162,7 @@ FtwGetMaxBlockSize ( //
PayloadSize = sizeof (SMM_FTW_GET_MAX_BLOCK_SIZE_HEADER);
InitCommunicateBuffer ((VOID **)&SmmCommunicateHeader, (VOID **)&SmmFtwBlockSizeHeader, PayloadSize, FTW_FUNCTION_GET_MAX_BLOCK_SIZE);
-
+
//
// Send data to SMM.
//
@@ -171,9 +171,9 @@ FtwGetMaxBlockSize ( //
// Get data from SMM
//
- *BlockSize = SmmFtwBlockSizeHeader->BlockSize;
+ *BlockSize = SmmFtwBlockSizeHeader->BlockSize;
FreePool (SmmCommunicateHeader);
-
+
return Status;
}
@@ -210,7 +210,7 @@ FtwAllocate ( {
EFI_STATUS Status;
UINTN PayloadSize;
- EFI_SMM_COMMUNICATE_HEADER *SmmCommunicateHeader;
+ EFI_SMM_COMMUNICATE_HEADER *SmmCommunicateHeader;
SMM_FTW_ALLOCATE_HEADER *SmmFtwAllocateHeader;
//
@@ -220,8 +220,8 @@ FtwAllocate ( InitCommunicateBuffer ((VOID **)&SmmCommunicateHeader, (VOID **)&SmmFtwAllocateHeader, PayloadSize, FTW_FUNCTION_ALLOCATE);
CopyGuid (&SmmFtwAllocateHeader->CallerId, CallerId);
SmmFtwAllocateHeader->PrivateDataSize = PrivateDataSize;
- SmmFtwAllocateHeader->NumberOfWrites = NumberOfWrites;
-
+ SmmFtwAllocateHeader->NumberOfWrites = NumberOfWrites;
+
//
// Send data to SMM.
//
@@ -276,7 +276,7 @@ FtwWrite ( {
EFI_STATUS Status;
UINTN PayloadSize;
- EFI_SMM_COMMUNICATE_HEADER *SmmCommunicateHeader;
+ EFI_SMM_COMMUNICATE_HEADER *SmmCommunicateHeader;
SMM_FTW_WRITE_HEADER *SmmFtwWriteHeader;
//
@@ -292,7 +292,7 @@ FtwWrite ( InitCommunicateBuffer ((VOID **)&SmmCommunicateHeader, (VOID **)&SmmFtwWriteHeader, PayloadSize, FTW_FUNCTION_WRITE);
//
- // FvBlockHandle can not be used in SMM environment. Here we get the FVB protocol first, then get FVB base address
+ // FvBlockHandle can not be used in SMM environment. Here we get the FVB protocol first, then get FVB base address
// and its attribute. Send these information to SMM handler, the SMM handler will find the proper FVB to write data.
//
Status = ConvertFvbHandle (FvBlockHandle, &SmmFtwWriteHeader->FvbBaseAddress, &SmmFtwWriteHeader->FvbAttributes);
@@ -300,9 +300,9 @@ FtwWrite ( FreePool (SmmCommunicateHeader);
return EFI_ABORTED;
}
-
+
SmmFtwWriteHeader->Lba = Lba;
- SmmFtwWriteHeader->Offset = Offset;
+ SmmFtwWriteHeader->Offset = Offset;
SmmFtwWriteHeader->Length = Length;
CopyMem (SmmFtwWriteHeader->Data, Buffer, Length);
if (PrivateData == NULL) {
@@ -316,7 +316,7 @@ FtwWrite ( // Send data to SMM.
//
Status = SendCommunicateBuffer (SmmCommunicateHeader, PayloadSize);
- FreePool (SmmCommunicateHeader);
+ FreePool (SmmCommunicateHeader);
return Status;
}
@@ -342,22 +342,22 @@ FtwRestart ( {
EFI_STATUS Status;
UINTN PayloadSize;
- EFI_SMM_COMMUNICATE_HEADER *SmmCommunicateHeader;
+ EFI_SMM_COMMUNICATE_HEADER *SmmCommunicateHeader;
SMM_FTW_RESTART_HEADER *SmmFtwRestartHeader;
-
+
//
// Initialize the communicate buffer.
//
PayloadSize = sizeof (SMM_FTW_RESTART_HEADER);
- InitCommunicateBuffer ((VOID **)&SmmCommunicateHeader, (VOID **)&SmmFtwRestartHeader, PayloadSize, FTW_FUNCTION_RESTART);
+ InitCommunicateBuffer ((VOID **)&SmmCommunicateHeader, (VOID **)&SmmFtwRestartHeader, PayloadSize, FTW_FUNCTION_RESTART);
//
- // FvBlockHandle can not be used in SMM environment. Here we get the FVB protocol first, then get FVB base address
+ // FvBlockHandle can not be used in SMM environment. Here we get the FVB protocol first, then get FVB base address
// and its attribute. Send these information to SMM handler, the SMM handler will find the proper FVB to write data.
//
Status = ConvertFvbHandle (FvBlockHandle, &SmmFtwRestartHeader->FvbBaseAddress, &SmmFtwRestartHeader->FvbAttributes);
if (EFI_ERROR (Status)) {
- FreePool (SmmCommunicateHeader);
+ FreePool (SmmCommunicateHeader);
return EFI_ABORTED;
}
@@ -365,7 +365,7 @@ FtwRestart ( // Send data to SMM.
//
Status = SendCommunicateBuffer (SmmCommunicateHeader, PayloadSize);
- FreePool (SmmCommunicateHeader);
+ FreePool (SmmCommunicateHeader);
return Status;
}
@@ -387,19 +387,19 @@ FtwAbort ( )
{
EFI_STATUS Status;
- EFI_SMM_COMMUNICATE_HEADER *SmmCommunicateHeader;
-
+ EFI_SMM_COMMUNICATE_HEADER *SmmCommunicateHeader;
+
//
// Initialize the communicate buffer.
//
InitCommunicateBuffer ((VOID **)&SmmCommunicateHeader, NULL, 0, FTW_FUNCTION_ABORT);
-
+
//
// Send data to SMM.
//
Status = SendCommunicateBuffer (SmmCommunicateHeader, 0);
- FreePool (SmmCommunicateHeader);
+ FreePool (SmmCommunicateHeader);
return Status;
}
@@ -444,7 +444,7 @@ FtwGetLastWrite ( {
EFI_STATUS Status;
UINTN PayloadSize;
- EFI_SMM_COMMUNICATE_HEADER *SmmCommunicateHeader;
+ EFI_SMM_COMMUNICATE_HEADER *SmmCommunicateHeader;
SMM_FTW_GET_LAST_WRITE_HEADER *SmmFtwGetLastWriteHeader;
//
@@ -465,7 +465,7 @@ FtwGetLastWrite ( *PrivateDataSize = SmmFtwGetLastWriteHeader->PrivateDataSize;
if (Status == EFI_SUCCESS || Status == EFI_BUFFER_TOO_SMALL) {
*Lba = SmmFtwGetLastWriteHeader->Lba;
- *Offset = SmmFtwGetLastWriteHeader->Offset;
+ *Offset = SmmFtwGetLastWriteHeader->Offset;
*Length = SmmFtwGetLastWriteHeader->Length;
*Complete = SmmFtwGetLastWriteHeader->Complete;
CopyGuid (CallerId, &SmmFtwGetLastWriteHeader->CallerId);
@@ -476,7 +476,7 @@ FtwGetLastWrite ( *Complete = SmmFtwGetLastWriteHeader->Complete;
}
- FreePool (SmmCommunicateHeader);
+ FreePool (SmmCommunicateHeader);
return Status;
}
@@ -501,12 +501,12 @@ SmmFtwReady ( //
// Just return to avoid install SMM FaultTolerantWriteProtocol again
// if Fault Tolerant Write protocol had been installed.
- //
+ //
Status = gBS->LocateProtocol (&gEfiFaultTolerantWriteProtocolGuid, NULL, (VOID **)&FtwProtocol);
if (!EFI_ERROR (Status)) {
return;
}
-
+
Status = gBS->LocateProtocol (&gEfiSmmCommunicationProtocolGuid, NULL, (VOID **) &mSmmCommunication);
ASSERT_EFI_ERROR (Status);
@@ -520,9 +520,9 @@ SmmFtwReady ( &mFaultTolerantWriteDriver
);
ASSERT_EFI_ERROR (Status);
-
+
Status = gBS->CloseEvent (Event);
- ASSERT_EFI_ERROR (Status);
+ ASSERT_EFI_ERROR (Status);
}
@@ -551,12 +551,12 @@ FaultTolerantWriteSmmInitialize ( //
EfiCreateProtocolNotifyEvent (
&gEfiSmmFaultTolerantWriteProtocolGuid,
- TPL_CALLBACK,
- SmmFtwReady,
- NULL,
+ TPL_CALLBACK,
+ SmmFtwReady,
+ NULL,
&SmmFtwRegistration
);
-
+
return EFI_SUCCESS;
}
diff --git a/MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteSmmDxe.h b/MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteSmmDxe.h index b4c20ae..ab8375a 100644 --- a/MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteSmmDxe.h +++ b/MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteSmmDxe.h @@ -3,14 +3,14 @@ The internal header file includes the common header files, defines
internal structure and functions used by FTW module.
-Copyright (c) 2011, Intel Corporation. All rights reserved. <BR>
-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,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+Copyright (c) 2011 - 2018, Intel Corporation. All rights reserved. <BR>
+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,
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
**/
diff --git a/MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteSmmDxe.inf b/MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteSmmDxe.inf index 82dd36c..df1e8db 100644 --- a/MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteSmmDxe.inf +++ b/MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteSmmDxe.inf @@ -6,7 +6,7 @@ # the related operations in SMM handler in SMM FTW module. You can use the FTW protocol
# before End Of Dxe or use FaultTolerantWriteDxe module instead if you really want to.
#
-# Copyright (c) 2011 - 2014, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2011 - 2018, Intel Corporation. All rights reserved.<BR>
#
# This program and the accompanying materials
# are licensed and made available under the terms and conditions of the BSD License
@@ -36,13 +36,13 @@ FaultTolerantWriteSmmDxe.c
FaultTolerantWriteSmmDxe.h
FaultTolerantWriteSmmCommon.h
-
+
[Packages]
MdePkg/MdePkg.dec
MdeModulePkg/MdeModulePkg.dec
[LibraryClasses]
- BaseLib
+ BaseLib
UefiBootServicesTableLib
DebugLib
DxeServicesTableLib
@@ -56,7 +56,7 @@ ## CONSUMES
gEfiSmmFaultTolerantWriteProtocolGuid
gEfiFirmwareVolumeBlockProtocolGuid ## CONSUMES
-
+
[Depex]
gEfiSmmCommunicationProtocolGuid
diff --git a/MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteSmmDxeExtra.uni b/MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteSmmDxeExtra.uni index 8abf874..6cee145 100644 --- a/MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteSmmDxeExtra.uni +++ b/MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteSmmDxeExtra.uni @@ -1,7 +1,7 @@ // /** @file
// FaultTolerantWriteSmmDxe Localized Strings and Content
//
-// Copyright (c) 2013 - 2014, Intel Corporation. All rights reserved.<BR>
+// Copyright (c) 2013 - 2018, Intel Corporation. All rights reserved.<BR>
//
// This program and the accompanying materials
// are licensed and made available under the terms and conditions of the BSD License
@@ -12,8 +12,8 @@ //
// **/
-#string STR_PROPERTIES_MODULE_NAME
-#language en-US
+#string STR_PROPERTIES_MODULE_NAME
+#language en-US
"Fault Tolerant Flash Write SMM/DXE Bridge Driver"
diff --git a/MdeModulePkg/Universal/FaultTolerantWriteDxe/FtwMisc.c b/MdeModulePkg/Universal/FaultTolerantWriteDxe/FtwMisc.c index 9604469..27b6536 100644 --- a/MdeModulePkg/Universal/FaultTolerantWriteDxe/FtwMisc.c +++ b/MdeModulePkg/Universal/FaultTolerantWriteDxe/FtwMisc.c @@ -2,14 +2,14 @@ Internal generic functions to operate flash block.
-Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.<BR>
-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,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>
+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,
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
**/
@@ -89,7 +89,7 @@ FtwEraseBlock ( partially erased.
@retval EFI_INVALID_PARAMETER One or more of the LBAs listed
in the variable argument list do
- not exist in the firmware volume.
+ not exist in the firmware volume.
**/
@@ -970,11 +970,11 @@ GetPreviousRecordOfWrites ( **/
EFI_STATUS
InitFtwDevice (
- OUT EFI_FTW_DEVICE **FtwData
+ OUT EFI_FTW_DEVICE **FtwData
)
{
EFI_FTW_DEVICE *FtwDevice;
-
+
//
// Allocate private data of this driver,
// Including the FtwWorkSpace[FTW_WORK_SPACE_SIZE].
@@ -1005,11 +1005,11 @@ InitFtwDevice ( if (FtwDevice->WorkSpaceAddress == 0) {
FtwDevice->WorkSpaceAddress = (EFI_PHYSICAL_ADDRESS) PcdGet32 (PcdFlashNvStorageFtwWorkingBase);
}
-
+
FtwDevice->SpareAreaAddress = (EFI_PHYSICAL_ADDRESS) PcdGet64 (PcdFlashNvStorageFtwSpareBase64);
if (FtwDevice->SpareAreaAddress == 0) {
FtwDevice->SpareAreaAddress = (EFI_PHYSICAL_ADDRESS) PcdGet32 (PcdFlashNvStorageFtwSpareBase);
- }
+ }
*FtwData = FtwDevice;
return EFI_SUCCESS;
@@ -1024,7 +1024,7 @@ InitFtwDevice ( @retval EFI_SUCCESS Find the FVB protocol successfully.
@retval EFI_NOT_FOUND No proper FVB protocol was found.
@retval EFI_ABORTED Some data can not be got or be invalid.
-
+
**/
EFI_STATUS
FindFvbForFtw (
@@ -1068,7 +1068,7 @@ FindFvbForFtw ( //
Status = Fvb->GetAttributes (Fvb, &Attributes);
if (EFI_ERROR (Status) || ((Attributes & EFI_FVB2_WRITE_STATUS) == 0)) {
- continue;
+ continue;
}
//
// Compare the address and select the right one
@@ -1188,7 +1188,7 @@ FindFvbForFtw ( @retval EFI_SUCCESS Initialize the FTW protocol successfully.
@retval EFI_NOT_FOUND No proper FVB protocol was found.
-
+
**/
EFI_STATUS
InitFtwProtocol (
@@ -1208,7 +1208,7 @@ InitFtwProtocol ( Status = FindFvbForFtw (FtwDevice);
if (EFI_ERROR (Status)) {
return EFI_NOT_FOUND;
- }
+ }
//
// Calculate the start LBA of working block.
@@ -1338,7 +1338,7 @@ InitFtwProtocol ( if (FtwDevice->FtwWorkSpace[Offset] != FTW_ERASED_BYTE) {
Offset += FTW_WRITE_TOTAL_SIZE (FtwHeader->NumberOfWrites, FtwHeader->PrivateDataSize);
}
-
+
if (!IsErasedFlashBuffer (FtwDevice->FtwWorkSpace + Offset, FtwDevice->FtwWorkSpaceSize - Offset)) {
Status = FtwReclaimWorkSpace (FtwDevice, TRUE);
ASSERT_EFI_ERROR (Status);
@@ -1378,7 +1378,7 @@ InitFtwProtocol ( FtwDevice->FtwInstance.Restart = FtwRestart;
FtwDevice->FtwInstance.Abort = FtwAbort;
FtwDevice->FtwInstance.GetLastWrite = FtwGetLastWrite;
-
+
return EFI_SUCCESS;
}
diff --git a/MdeModulePkg/Universal/FaultTolerantWriteDxe/SmmFaultTolerantWriteDxeExtra.uni b/MdeModulePkg/Universal/FaultTolerantWriteDxe/SmmFaultTolerantWriteDxeExtra.uni index ad1fcc0..15a3c08 100644 --- a/MdeModulePkg/Universal/FaultTolerantWriteDxe/SmmFaultTolerantWriteDxeExtra.uni +++ b/MdeModulePkg/Universal/FaultTolerantWriteDxe/SmmFaultTolerantWriteDxeExtra.uni @@ -1,7 +1,7 @@ // /** @file
// SmmFaultTolerantWriteDxe Localized Strings and Content
//
-// Copyright (c) 2013 - 2014, Intel Corporation. All rights reserved.<BR>
+// Copyright (c) 2013 - 2018, Intel Corporation. All rights reserved.<BR>
//
// This program and the accompanying materials
// are licensed and made available under the terms and conditions of the BSD License
@@ -12,8 +12,8 @@ //
// **/
-#string STR_PROPERTIES_MODULE_NAME
-#language en-US
+#string STR_PROPERTIES_MODULE_NAME
+#language en-US
"SMM Fault Tolerant Flash Write Driver"
diff --git a/MdeModulePkg/Universal/FaultTolerantWriteDxe/UpdateWorkingBlock.c b/MdeModulePkg/Universal/FaultTolerantWriteDxe/UpdateWorkingBlock.c index b4327b5..50d3421 100644 --- a/MdeModulePkg/Universal/FaultTolerantWriteDxe/UpdateWorkingBlock.c +++ b/MdeModulePkg/Universal/FaultTolerantWriteDxe/UpdateWorkingBlock.c @@ -2,14 +2,14 @@ Internal functions to operate Working Block Space.
-Copyright (c) 2006 - 2017, Intel Corporation. All rights reserved.<BR>
-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,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>
+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,
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
**/
diff --git a/MdeModulePkg/Universal/FaultTolerantWritePei/FaultTolerantWritePei.c b/MdeModulePkg/Universal/FaultTolerantWritePei/FaultTolerantWritePei.c index 14e18e5..b22b124 100644 --- a/MdeModulePkg/Universal/FaultTolerantWritePei/FaultTolerantWritePei.c +++ b/MdeModulePkg/Universal/FaultTolerantWritePei/FaultTolerantWritePei.c @@ -2,14 +2,14 @@ This driver installs gEdkiiFaultTolerantWriteGuid PPI to inform
the check for FTW last write data has been done.
-Copyright (c) 2013, Intel Corporation. All rights reserved.<BR>
-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,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+Copyright (c) 2013 - 2018, Intel Corporation. All rights reserved.<BR>
+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,
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
**/
diff --git a/MdeModulePkg/Universal/FaultTolerantWritePei/FaultTolerantWritePeiExtra.uni b/MdeModulePkg/Universal/FaultTolerantWritePei/FaultTolerantWritePeiExtra.uni index b9fd942..fb36196 100644 --- a/MdeModulePkg/Universal/FaultTolerantWritePei/FaultTolerantWritePeiExtra.uni +++ b/MdeModulePkg/Universal/FaultTolerantWritePei/FaultTolerantWritePeiExtra.uni @@ -1,7 +1,7 @@ // /** @file
// FaultTolerantWritePei Localized Strings and Content
//
-// Copyright (c) 2014, Intel Corporation. All rights reserved.<BR>
+// Copyright (c) 2014 - 2018, Intel Corporation. All rights reserved.<BR>
//
// This program and the accompanying materials
// are licensed and made available under the terms and conditions of the BSD License
@@ -12,8 +12,8 @@ //
// **/
-#string STR_PROPERTIES_MODULE_NAME
-#language en-US
+#string STR_PROPERTIES_MODULE_NAME
+#language en-US
"FaultTolerantWrite PEI Module"
diff --git a/MdeModulePkg/Universal/FileExplorerDxe/FileExplorerDxe.inf b/MdeModulePkg/Universal/FileExplorerDxe/FileExplorerDxe.inf index 86d7533..8f8b8b4 100644 --- a/MdeModulePkg/Universal/FileExplorerDxe/FileExplorerDxe.inf +++ b/MdeModulePkg/Universal/FileExplorerDxe/FileExplorerDxe.inf @@ -1,10 +1,10 @@ ## @file
# File explorer DXE driver that produces File explorer Protocol.
#
-# This driver produces File explorerprotocol layered on top of the FileExplorerLib
+# This driver produces File explorerprotocol layered on top of the FileExplorerLib
# from the MdeModulePkg.
#
-# Copyright (c) 2009 - 2015, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2009 - 2018, Intel Corporation. All rights reserved.<BR>
# 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
diff --git a/MdeModulePkg/Universal/FileExplorerDxe/FileExplorerDxe.uni b/MdeModulePkg/Universal/FileExplorerDxe/FileExplorerDxe.uni index 583bdfe..a504264 100644 --- a/MdeModulePkg/Universal/FileExplorerDxe/FileExplorerDxe.uni +++ b/MdeModulePkg/Universal/FileExplorerDxe/FileExplorerDxe.uni @@ -4,13 +4,13 @@ // This driver produces File Explorer protocol layered on top of the File Explorer library
// from the MdeModulePkg.
//
-// Copyright (c) 2009 - 2015, Intel Corporation. All rights reserved.<BR>
+// Copyright (c) 2009 - 2018, Intel Corporation. All rights reserved.<BR>
//
// 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,
// WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
//
diff --git a/MdeModulePkg/Universal/FileExplorerDxe/FileExplorerDxeExtra.uni b/MdeModulePkg/Universal/FileExplorerDxe/FileExplorerDxeExtra.uni index 467dfb8..43a5657 100644 --- a/MdeModulePkg/Universal/FileExplorerDxe/FileExplorerDxeExtra.uni +++ b/MdeModulePkg/Universal/FileExplorerDxe/FileExplorerDxeExtra.uni @@ -1,7 +1,7 @@ // /** @file
// FileExplorerDxe Localized Strings and Content
//
-// Copyright (c) 2013 - 2015, Intel Corporation. All rights reserved.<BR>
+// Copyright (c) 2013 - 2018, Intel Corporation. All rights reserved.<BR>
//
// This program and the accompanying materials
// are licensed and made available under the terms and conditions of the BSD License
@@ -13,8 +13,8 @@ //
// **/
-#string STR_PROPERTIES_MODULE_NAME
-#language en-US
+#string STR_PROPERTIES_MODULE_NAME
+#language en-US
"File Explorer DXE Driver"
diff --git a/MdeModulePkg/Universal/FvSimpleFileSystemDxe/FvSimpleFileSystem.c b/MdeModulePkg/Universal/FvSimpleFileSystemDxe/FvSimpleFileSystem.c index e39036a..746f2ce 100644 --- a/MdeModulePkg/Universal/FvSimpleFileSystemDxe/FvSimpleFileSystem.c +++ b/MdeModulePkg/Universal/FvSimpleFileSystemDxe/FvSimpleFileSystem.c @@ -12,7 +12,7 @@ from the UEFI shell. It is entirely read-only.
Copyright (c) 2014, ARM Limited. All rights reserved.
-Copyright (c) 2014 - 2015, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2014 - 2018, Intel Corporation. All rights reserved.<BR>
This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License
@@ -826,7 +826,7 @@ FvSimpleFileSystemSetPosition ( // Reset directory position to first entry
//
if (File->DirReadNext) {
- File->DirReadNext = FVFS_GET_FIRST_FILE_INFO (Instance);
+ File->DirReadNext = FVFS_GET_FIRST_FILE_INFO (Instance);
}
} else if (Position == 0xFFFFFFFFFFFFFFFFull) {
File->Position = File->FvFileInfo->FileInfo.FileSize;
@@ -942,9 +942,9 @@ FvSimpleFileSystemGetInfo ( FsInfoOut = (EFI_FILE_SYSTEM_INFO *) Buffer;
CopyMem (FsInfoOut, &mFsInfoTemplate, sizeof (EFI_FILE_SYSTEM_INFO));
- Status = StrnCpyS ( FsInfoOut->VolumeLabel,
- (*BufferSize - OFFSET_OF (EFI_FILE_SYSTEM_INFO, VolumeLabel)) / sizeof (CHAR16),
- Instance->VolumeLabel,
+ Status = StrnCpyS ( FsInfoOut->VolumeLabel,
+ (*BufferSize - OFFSET_OF (EFI_FILE_SYSTEM_INFO, VolumeLabel)) / sizeof (CHAR16),
+ Instance->VolumeLabel,
StrLen (Instance->VolumeLabel)
);
ASSERT_EFI_ERROR (Status);
@@ -967,9 +967,9 @@ FvSimpleFileSystemGetInfo ( }
FsVolumeLabel = (EFI_FILE_SYSTEM_VOLUME_LABEL*) Buffer;
- Status = StrnCpyS (FsVolumeLabel->VolumeLabel,
+ Status = StrnCpyS (FsVolumeLabel->VolumeLabel,
(*BufferSize - OFFSET_OF (EFI_FILE_SYSTEM_VOLUME_LABEL, VolumeLabel)) / sizeof (CHAR16),
- Instance->VolumeLabel,
+ Instance->VolumeLabel,
StrLen (Instance->VolumeLabel)
);
ASSERT_EFI_ERROR (Status);
@@ -1022,7 +1022,7 @@ FvSimpleFileSystemSetInfo ( IN VOID *Buffer
)
{
- if (CompareGuid (InformationType, &gEfiFileSystemInfoGuid) ||
+ if (CompareGuid (InformationType, &gEfiFileSystemInfoGuid) ||
CompareGuid (InformationType, &gEfiFileInfoGuid) ||
CompareGuid (InformationType, &gEfiFileSystemVolumeLabelInfoIdGuid)) {
return EFI_WRITE_PROTECTED;
diff --git a/MdeModulePkg/Universal/FvSimpleFileSystemDxe/FvSimpleFileSystem.uni b/MdeModulePkg/Universal/FvSimpleFileSystemDxe/FvSimpleFileSystem.uni index 7549114..0e3067d 100644 --- a/MdeModulePkg/Universal/FvSimpleFileSystemDxe/FvSimpleFileSystem.uni +++ b/MdeModulePkg/Universal/FvSimpleFileSystemDxe/FvSimpleFileSystem.uni @@ -3,13 +3,13 @@ //
// This module produces Simple File System protocol to provide the accesses to the files in FVs.
//
-// Copyright (c) 2014, Intel Corporation. All rights reserved.<BR>
+// Copyright (c) 2014 - 2018, Intel Corporation. All rights reserved.<BR>
//
// 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,
// WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
//
diff --git a/MdeModulePkg/Universal/FvSimpleFileSystemDxe/FvSimpleFileSystemDxe.inf b/MdeModulePkg/Universal/FvSimpleFileSystemDxe/FvSimpleFileSystemDxe.inf index a648c2e..84d6184 100644 --- a/MdeModulePkg/Universal/FvSimpleFileSystemDxe/FvSimpleFileSystemDxe.inf +++ b/MdeModulePkg/Universal/FvSimpleFileSystemDxe/FvSimpleFileSystemDxe.inf @@ -14,7 +14,7 @@ # from the UEFI shell. It is entirely read-only.
#
# Copyright (c) 2014, ARM Ltd. All rights reserved.<BR>
-# Copyright (c) 2014, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2014 - 2018, Intel Corporation. All rights reserved.<BR>
#
# This program and the accompanying materials
# are licensed and made available under the terms and conditions of the BSD License
@@ -71,4 +71,4 @@ gEfiSimpleFileSystemProtocolGuid ## BY_START
[UserExtensions.TianoCore."ExtraFiles"]
- FvSimpleFileSystemExtra.uni
\ No newline at end of file + FvSimpleFileSystemExtra.uni
diff --git a/MdeModulePkg/Universal/FvSimpleFileSystemDxe/FvSimpleFileSystemExtra.uni b/MdeModulePkg/Universal/FvSimpleFileSystemDxe/FvSimpleFileSystemExtra.uni index eca54c4..f3d4308 100644 --- a/MdeModulePkg/Universal/FvSimpleFileSystemDxe/FvSimpleFileSystemExtra.uni +++ b/MdeModulePkg/Universal/FvSimpleFileSystemDxe/FvSimpleFileSystemExtra.uni @@ -1,7 +1,7 @@ // /** @file
// FvSimpleFileSystem Driver's Localized Strings and Content
//
-// Copyright (c) 2014, Intel Corporation. All rights reserved.<BR>
+// Copyright (c) 2014 - 2018, Intel Corporation. All rights reserved.<BR>
//
// This program and the accompanying materials
// are licensed and made available under the terms and conditions of the BSD License
@@ -13,8 +13,8 @@ //
// **/
-#string STR_PROPERTIES_MODULE_NAME
-#language en-US
+#string STR_PROPERTIES_MODULE_NAME
+#language en-US
"FvSimpleFileSystem UEFI Driver"
diff --git a/MdeModulePkg/Universal/FvSimpleFileSystemDxe/FvSimpleFileSystemInternal.h b/MdeModulePkg/Universal/FvSimpleFileSystemDxe/FvSimpleFileSystemInternal.h index 495ba97..0dbd7b6 100644 --- a/MdeModulePkg/Universal/FvSimpleFileSystemDxe/FvSimpleFileSystemInternal.h +++ b/MdeModulePkg/Universal/FvSimpleFileSystemDxe/FvSimpleFileSystemInternal.h @@ -2,7 +2,7 @@ The internal header file of FvSimpleFileSystem driver.
Copyright (c) 2014, ARM Limited. All rights reserved.
-Copyright (c) 2014, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2014 - 2018, Intel Corporation. All rights reserved.<BR>
This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License
@@ -58,7 +58,7 @@ struct _FV_FILESYSTEM_INSTANCE { };
//
-// Struct representing a opening file. Each opening operation on file will
+// Struct representing a opening file. Each opening operation on file will
// create such an instance except for the "root directory", which will only
// be created once for each FV.
//
diff --git a/MdeModulePkg/Universal/HiiDatabaseDxe/ConfigKeywordHandler.c b/MdeModulePkg/Universal/HiiDatabaseDxe/ConfigKeywordHandler.c index 5d5f17f..2504597 100644 --- a/MdeModulePkg/Universal/HiiDatabaseDxe/ConfigKeywordHandler.c +++ b/MdeModulePkg/Universal/HiiDatabaseDxe/ConfigKeywordHandler.c @@ -1,7 +1,7 @@ /** @file
Implementation of interfaces function for EFI_CONFIG_KEYWORD_HANDLER_PROTOCOL.
-Copyright (c) 2015 - 2017, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2015 - 2018, Intel Corporation. All rights reserved.<BR>
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
@@ -109,7 +109,7 @@ ExtractDevicePath ( if (((Length + 1) / 2) < sizeof (EFI_DEVICE_PATH_PROTOCOL)) {
return EFI_INVALID_PARAMETER;
}
-
+
//
// The data in <PathHdr> is encoded as hex UNICODE %02x bytes in the same order
// as the device path resides in RAM memory.
@@ -119,7 +119,7 @@ ExtractDevicePath ( if (DevicePathBuffer == NULL) {
return EFI_OUT_OF_RESOURCES;
}
-
+
//
// Convert DevicePath
//
@@ -133,7 +133,7 @@ ExtractDevicePath ( DevicePathBuffer [Index/2] = (UINT8) ((DevicePathBuffer [Index/2] << 4) + DigitUint8);
}
}
-
+
//
// Validate DevicePath
//
@@ -209,7 +209,7 @@ ExtractNameSpace ( TmpPtr = StrStr (String, L"&");
if (TmpPtr != NULL) {
- *TmpPtr = 0;
+ *TmpPtr = 0;
}
if (NextString != NULL) {
*NextString = String + StrLen (String);
@@ -227,7 +227,7 @@ ExtractNameSpace ( UnicodeStrToAsciiStrS (String, *NameSpace, NameSpaceSize);
if (TmpPtr != NULL) {
- *TmpPtr = L'&';
+ *TmpPtr = L'&';
}
return EFI_SUCCESS;
@@ -256,7 +256,7 @@ ExtractKeyword ( EFI_STRING TmpPtr;
ASSERT ((Keyword != NULL) && (NextString != NULL));
-
+
TmpPtr = NULL;
//
@@ -280,10 +280,10 @@ ExtractKeyword ( }
String += StrLen (L"KEYWORD=");
-
+
TmpPtr = StrStr (String, L"&");
if (TmpPtr != NULL) {
- *TmpPtr = 0;
+ *TmpPtr = 0;
}
*NextString = String + StrLen (String);
@@ -295,7 +295,7 @@ ExtractKeyword ( if (TmpPtr != NULL) {
*TmpPtr = L'&';
}
-
+
return EFI_SUCCESS;
}
@@ -335,10 +335,10 @@ ExtractValue ( }
String += StrLen (L"VALUE=");
-
+
TmpPtr = StrStr (String, L"&");
if (TmpPtr != NULL) {
- *TmpPtr = 0;
+ *TmpPtr = 0;
}
*NextString = String + StrLen (String);
@@ -350,7 +350,7 @@ ExtractValue ( if (TmpPtr != NULL) {
*TmpPtr = L'&';
}
-
+
return EFI_SUCCESS;
}
@@ -376,7 +376,7 @@ ExtractFilter ( {
CHAR16 *PathPtr;
CHAR16 *KeywordPtr;
- BOOLEAN RetVal;
+ BOOLEAN RetVal;
ASSERT ((FilterFlags != NULL) && (NextString != NULL));
@@ -387,7 +387,7 @@ ExtractFilter ( *NextString = NULL;
return FALSE;
}
-
+
*FilterFlags = 0;
RetVal = TRUE;
@@ -558,7 +558,7 @@ ValidateFilter ( //
// Get ReadOnly flag from Question.
- //
+ //
*ReadOnly = ExtractReadOnlyFromOpCode(OpCodeData);
while (ExtractFilter (StringPtr, &FilterFlags, &NextFilter)) {
@@ -653,7 +653,7 @@ ValidateFilter ( //
StringPtr = NextFilter;
}
-
+
Done:
//
// The current filter which is processing.
@@ -702,14 +702,14 @@ GetRecordFromDevicePath ( }
/**
- Calculate the size of StringSrc and output it. Also copy string text from src
+ Calculate the size of StringSrc and output it. Also copy string text from src
to dest.
This is a internal function.
@param StringSrc Points to current null-terminated string.
@param BufferSize Length of the buffer.
- @param StringDest Buffer to store the string text.
+ @param StringDest Buffer to store the string text.
@retval EFI_SUCCESS The string text was outputted successfully.
@retval EFI_OUT_OF_RESOURCES Out of resource.
@@ -738,7 +738,7 @@ GetUnicodeStringTextAndSize ( if (*StringDest == NULL) {
return EFI_OUT_OF_RESOURCES;
}
-
+
CopyMem (*StringDest, StringSrc, StringSize);
*BufferSize = StringSize;
@@ -1067,7 +1067,7 @@ GetNextStringId ( case EFI_HII_SIBT_STRING_SCSU:
Offset = sizeof (EFI_HII_STRING_BLOCK);
StringTextPtr = BlockHdr + Offset;
-
+
if (FindString) {
StringSize = AsciiStrSize ((CHAR8 *) StringTextPtr);
*KeywordValue = AllocatePool (StringSize * sizeof (CHAR16));
@@ -1087,7 +1087,7 @@ GetNextStringId ( case EFI_HII_SIBT_STRING_SCSU_FONT:
Offset = sizeof (EFI_HII_SIBT_STRING_SCSU_FONT_BLOCK) - sizeof (UINT8);
StringTextPtr = BlockHdr + Offset;
-
+
if (FindString) {
StringSize = AsciiStrSize ((CHAR8 *) StringTextPtr);
*KeywordValue = AllocatePool (StringSize * sizeof (CHAR16));
@@ -1205,7 +1205,7 @@ GetNextStringId ( BlockSize += Offset;
CopyMem (&StringCount, BlockHdr + sizeof (EFI_HII_STRING_BLOCK), sizeof (UINT16));
for (Index = 0; Index < StringCount; Index++) {
- GetUnicodeStringTextAndSize (StringTextPtr, &StringSize, &String);
+ GetUnicodeStringTextAndSize (StringTextPtr, &StringSize, &String);
if (FindString) {
*KeywordValue = String;
@@ -1346,7 +1346,7 @@ GetStringIdFromRecord ( StringPackage = CR (Link, HII_STRING_PACKAGE_INSTANCE, StringEntry, HII_STRING_PACKAGE_SIGNATURE);
if (AsciiStrnCmp(Name, StringPackage->StringPkgHdr->Language, AsciiStrLen (Name)) == 0) {
- Status = GetStringIdFromString (StringPackage, KeywordValue, StringId);
+ Status = GetStringIdFromString (StringPackage, KeywordValue, StringId);
if (EFI_ERROR (Status)) {
return KEYWORD_HANDLER_KEYWORD_NOT_FOUND;
} else {
@@ -1430,10 +1430,10 @@ IsStorageOpCode ( @retval the opcode for the question.
**/
-UINT8 *
+UINT8 *
FindQuestionFromStringId (
IN HII_IFR_PACKAGE_INSTANCE *FormPackage,
- IN EFI_STRING_ID KeywordStrId
+ IN EFI_STRING_ID KeywordStrId
)
{
UINT8 *OpCodeData;
@@ -1530,7 +1530,7 @@ FindStorageFromVarId ( @retval the width info for one question.
**/
-UINT16
+UINT16
GetWidth (
IN UINT8 *OpCodeData
)
@@ -1548,16 +1548,16 @@ GetWidth ( switch (((EFI_IFR_ONE_OF *) OpCodeData)->Flags & EFI_IFR_NUMERIC_SIZE) {
case EFI_IFR_NUMERIC_SIZE_1:
return (UINT16) sizeof (UINT8);
-
+
case EFI_IFR_NUMERIC_SIZE_2:
return (UINT16) sizeof (UINT16);
-
+
case EFI_IFR_NUMERIC_SIZE_4:
return (UINT16) sizeof (UINT32);
-
+
case EFI_IFR_NUMERIC_SIZE_8:
return (UINT16) sizeof (UINT64);
-
+
default:
ASSERT (FALSE);
return 0;
@@ -1572,16 +1572,16 @@ GetWidth ( switch (((EFI_IFR_ONE_OF_OPTION *) NextOpCodeData)->Type) {
case EFI_IFR_TYPE_NUM_SIZE_8:
return (UINT16) sizeof (UINT8) * ((EFI_IFR_ORDERED_LIST *) OpCodeData)->MaxContainers;
-
+
case EFI_IFR_TYPE_NUM_SIZE_16:
return (UINT16) sizeof (UINT16) * ((EFI_IFR_ORDERED_LIST *) OpCodeData)->MaxContainers ;
-
+
case EFI_IFR_TYPE_NUM_SIZE_32:
return (UINT16) sizeof (UINT32) * ((EFI_IFR_ORDERED_LIST *) OpCodeData)->MaxContainers;
-
+
case EFI_IFR_TYPE_NUM_SIZE_64:
return (UINT16) sizeof (UINT64) * ((EFI_IFR_ORDERED_LIST *) OpCodeData)->MaxContainers;
-
+
default:
ASSERT (FALSE);
return 0;
@@ -1589,7 +1589,7 @@ GetWidth ( case EFI_IFR_CHECKBOX_OP:
return (UINT16) sizeof (BOOLEAN);
-
+
case EFI_IFR_PASSWORD_OP:
return (UINT16)((UINTN) ((EFI_IFR_PASSWORD *) OpCodeData)->MaxSize * sizeof (CHAR16));
@@ -1648,12 +1648,12 @@ InternalLowerConfigString ( /**
Allocates and returns a Null-terminated Unicode <ConfigHdr> string.
-
+
The format of a <ConfigHdr> is as follows:
GUID=<HexCh>32&NAME=<Char>NameLength&PATH=<HexChar>DevicePathSize<Null>
- @param[in] OpCodeData The opcode for the storage.
+ @param[in] OpCodeData The opcode for the storage.
@param[in] DriverHandle The driver handle which supports a Device Path Protocol
that is the routing information PATH. Each byte of
the Device Path associated with DriverHandle is converted
@@ -1689,17 +1689,17 @@ ConstructConfigHdr ( Guid = (EFI_GUID *)(UINTN *)&((EFI_IFR_VARSTORE *) OpCodeData)->Guid;
AsciiName = (CHAR8 *) ((EFI_IFR_VARSTORE *) OpCodeData)->Name;
break;
-
+
case EFI_IFR_VARSTORE_NAME_VALUE_OP:
Guid = (EFI_GUID *)(UINTN *)&((EFI_IFR_VARSTORE_NAME_VALUE *) OpCodeData)->Guid;
AsciiName = NULL;
break;
-
+
case EFI_IFR_VARSTORE_EFI_OP:
Guid = (EFI_GUID *)(UINTN *)&((EFI_IFR_VARSTORE_EFI *) OpCodeData)->Guid;
AsciiName = (CHAR8 *) ((EFI_IFR_VARSTORE_EFI *) OpCodeData)->Name;
break;
-
+
default:
ASSERT (FALSE);
Guid = NULL;
@@ -1717,7 +1717,7 @@ ConstructConfigHdr ( }
//
- // Compute the length of Name in Unicode characters.
+ // Compute the length of Name in Unicode characters.
// If Name is NULL, then the length is 0.
//
NameLength = 0;
@@ -1773,7 +1773,7 @@ ConstructConfigHdr ( String += StrnLenS (String, MaxLen - ((UINTN)String - (UINTN)ReturnString) / sizeof (CHAR16));
}
}
-
+
//
// Append L"&NAME="
//
@@ -1841,12 +1841,12 @@ EFI_STRING ConstructRequestElement (
IN CHAR16 *Name,
IN UINT16 Offset,
- IN UINT16 Width
+ IN UINT16 Width
)
{
CHAR16 *StringPtr;
UINTN Length;
-
+
if (Name != NULL) {
//
// Add <BlockName> length for each Name
@@ -1886,10 +1886,10 @@ ConstructRequestElement ( // Append OFFSET=XXXX&WIDTH=YYYY\0
//
UnicodeSPrint (
- StringPtr,
- (7 + 4 + 7 + 4 + 1) * sizeof (CHAR16),
- L"OFFSET=%04X&WIDTH=%04X",
- Offset,
+ StringPtr,
+ (7 + 4 + 7 + 4 + 1) * sizeof (CHAR16),
+ L"OFFSET=%04X&WIDTH=%04X",
+ Offset,
Width
);
}
@@ -1922,7 +1922,7 @@ GetNameFromId ( Name = NULL;
BestLanguage = NULL;
- PlatformLanguage = NULL;
+ PlatformLanguage = NULL;
SupportedLanguages = NULL;
GetEfiGlobalVariable2 (L"PlatformLang", (VOID**)&PlatformLanguage, NULL);
@@ -1932,10 +1932,10 @@ GetNameFromId ( // Get the best matching language from SupportedLanguages
//
BestLanguage = GetBestLanguage (
- SupportedLanguages,
+ SupportedLanguages,
FALSE, // RFC 4646 mode
PlatformLanguage != NULL ? PlatformLanguage : "", // Highest priority
- SupportedLanguages, // Lowest priority
+ SupportedLanguages, // Lowest priority
NULL
);
if (BestLanguage == NULL) {
@@ -2013,7 +2013,7 @@ ExtractConfigRequest ( IN EFI_STRING_ID KeywordStrId,
OUT UINT8 **OpCodeData,
OUT EFI_STRING *ConfigRequest
- )
+ )
{
LIST_ENTRY *Link;
HII_DATABASE_PACKAGE_LIST_INSTANCE *PackageListNode;
@@ -2053,7 +2053,7 @@ ExtractConfigRequest ( //
ASSERT (Header->VarStoreId != 0);
DEBUG ((EFI_D_INFO, "Varstore Id: 0x%x\n", Header->VarStoreId));
-
+
Storage = FindStorageFromVarId (FormPackage, Header->VarStoreId);
ASSERT (Storage != NULL);
@@ -2116,7 +2116,7 @@ ExtractConfigResp ( IN EFI_STRING ValueElement,
OUT UINT8 **OpCodeData,
OUT EFI_STRING *ConfigResp
- )
+ )
{
LIST_ENTRY *Link;
HII_DATABASE_PACKAGE_LIST_INSTANCE *PackageListNode;
@@ -2156,7 +2156,7 @@ ExtractConfigResp ( //
ASSERT (Header->VarStoreId != 0);
DEBUG ((EFI_D_INFO, "Varstore Id: 0x%x\n", Header->VarStoreId));
-
+
Storage = FindStorageFromVarId (FormPackage, Header->VarStoreId);
ASSERT (Storage != NULL);
@@ -2341,7 +2341,7 @@ GetStringIdFromDatabase ( *ProgressErr = GetStringIdFromRecord (Record, NameSpace, KeywordData, KeywordStringId);
if (*ProgressErr == KEYWORD_HANDLER_NO_ERROR) {
*DataBaseRecord = Record;
-
+
if ((DevicePathPkg = Record->PackageList->DevicePathPkg) != NULL) {
DestDevicePath = (EFI_DEVICE_PATH_PROTOCOL *) (DevicePathPkg + sizeof (EFI_HII_PACKAGE_HEADER));
DevicePathSize = GetDevicePathSize ((EFI_DEVICE_PATH_PROTOCOL *) DestDevicePath);
@@ -2361,7 +2361,7 @@ GetStringIdFromDatabase ( return EFI_OUT_OF_RESOURCES;
} else if (*ProgressErr == KEYWORD_HANDLER_KEYWORD_NOT_FOUND) {
FindNameSpace = TRUE;
- }
+ }
}
//
@@ -2394,7 +2394,7 @@ GetStringIdFromDatabase ( **/
EFI_STATUS
GenerateKeywordResp (
- IN CHAR8 *NameSpace,
+ IN CHAR8 *NameSpace,
IN EFI_DEVICE_PATH_PROTOCOL *DevicePath,
IN EFI_STRING KeywordData,
IN EFI_STRING ValueStr,
@@ -2510,7 +2510,7 @@ GenerateKeywordResp ( if (PathHdr != NULL) {
FreePool (PathHdr);
}
-
+
return EFI_SUCCESS;
}
@@ -2562,9 +2562,9 @@ MergeToMultiKeywordResp ( }
/**
- Enumerate all keyword in the system.
-
- If error occur when parse one keyword, just skip it and parse the next one.
+ Enumerate all keyword in the system.
+
+ If error occur when parse one keyword, just skip it and parse the next one.
This is a internal function.
@@ -2649,7 +2649,7 @@ EnumerateAllKeywords ( // Any valid string start from 2. so here initial it to 1.
//
NextStringId = 1;
-
+
//
// Enumerate all valid stringid in the package.
//
@@ -2664,7 +2664,7 @@ EnumerateAllKeywords ( //
goto Error;
}
-
+
//
// 3.4 Extract Value for the input keyword.
//
@@ -2698,7 +2698,7 @@ EnumerateAllKeywords ( //
goto Done;
}
-
+
//
// 6. Merge to the MultiKeywordResp string.
//
@@ -2721,7 +2721,7 @@ Error: if (KeywordResp != NULL) {
FreePool (KeywordResp);
KeywordResp = NULL;
- }
+ }
}
if (LocalNameSpace != NULL) {
@@ -2729,7 +2729,7 @@ Error: LocalNameSpace = NULL;
}
}
- }
+ }
}
//
@@ -2746,7 +2746,7 @@ Error: Status = EFI_SUCCESS;
}
*MultiResp = MultiKeywordResp;
-
+
Done:
if (LocalNameSpace != NULL) {
FreePool (LocalNameSpace);
@@ -2766,18 +2766,18 @@ Done: This function accepts a <MultiKeywordResp> formatted string, finds the associated
keyword owners, creates a <MultiConfigResp> string from it and forwards it to the
EFI_HII_ROUTING_PROTOCOL.RouteConfig function.
-
- If there is an issue in resolving the contents of the KeywordString, then the
- function returns an error and also sets the Progress and ProgressErr with the
+
+ If there is an issue in resolving the contents of the KeywordString, then the
+ function returns an error and also sets the Progress and ProgressErr with the
appropriate information about where the issue occurred and additional data about
- the nature of the issue.
-
+ the nature of the issue.
+
In the case when KeywordString containing multiple keywords, when an EFI_NOT_FOUND
error is generated during processing the second or later keyword element, the system
- storage associated with earlier keywords is not modified. All elements of the
+ storage associated with earlier keywords is not modified. All elements of the
KeywordString must successfully pass all tests for format and access prior to making
any modifications to storage.
-
+
In the case when EFI_DEVICE_ERROR is returned from the processing of a KeywordString
containing multiple keywords, the state of storage associated with earlier keywords
is undefined.
@@ -2785,18 +2785,18 @@ Done: @param This Pointer to the EFI_KEYWORD_HANDLER _PROTOCOL instance.
- @param KeywordString A null-terminated string in <MultiKeywordResp> format.
+ @param KeywordString A null-terminated string in <MultiKeywordResp> format.
- @param Progress On return, points to a character in the KeywordString.
- Points to the string's NULL terminator if the request
- was successful. Points to the most recent '&' before
+ @param Progress On return, points to a character in the KeywordString.
+ Points to the string's NULL terminator if the request
+ was successful. Points to the most recent '&' before
the first failing name / value pair (or the beginning
of the string if the failure is in the first name / value
pair) if the request was not successful.
@param ProgressErr If during the processing of the KeywordString there was
- a failure, this parameter gives additional information
- about the possible source of the problem. The various
+ a failure, this parameter gives additional information
+ about the possible source of the problem. The various
errors are defined in "Related Definitions" below.
@@ -2804,16 +2804,16 @@ Done: @retval EFI_INVALID_PARAMETER One or more of the following are TRUE:
1. KeywordString is NULL.
- 2. Parsing of the KeywordString resulted in an
+ 2. Parsing of the KeywordString resulted in an
error. See Progress and ProgressErr for more data.
- @retval EFI_NOT_FOUND An element of the KeywordString was not found.
+ @retval EFI_NOT_FOUND An element of the KeywordString was not found.
See ProgressErr for more data.
- @retval EFI_OUT_OF_RESOURCES Required system resources could not be allocated.
+ @retval EFI_OUT_OF_RESOURCES Required system resources could not be allocated.
See ProgressErr for more data.
-
- @retval EFI_ACCESS_DENIED The action violated system policy. See ProgressErr
+
+ @retval EFI_ACCESS_DENIED The action violated system policy. See ProgressErr
for more data.
@retval EFI_DEVICE_ERROR An unexpected system error occurred. See ProgressErr
@@ -2821,7 +2821,7 @@ Done: **/
EFI_STATUS
-EFIAPI
+EFIAPI
EfiConfigKeywordHandlerSetData (
IN EFI_CONFIG_KEYWORD_HANDLER_PROTOCOL *This,
IN CONST EFI_STRING KeywordString,
@@ -2974,7 +2974,7 @@ EfiConfigKeywordHandlerSetData ( Status = EFI_ACCESS_DENIED;
goto Done;
}
-
+
//
// 9. Merge to the MultiKeywordResp string.
//
@@ -2991,7 +2991,7 @@ EfiConfigKeywordHandlerSetData ( FreePool (KeywordData);
FreePool (ValueElement);
NameSpace = NULL;
- DevicePath = NULL;
+ DevicePath = NULL;
KeywordData = NULL;
ValueElement = NULL;
if (ConfigResp != NULL) {
@@ -3013,7 +3013,7 @@ EfiConfigKeywordHandlerSetData ( Status = EFI_DEVICE_ERROR;
goto Done;
}
-
+
*ProgressErr = KEYWORD_HANDLER_NO_ERROR;
Done:
@@ -3049,56 +3049,56 @@ Done: /**
- This function accepts a <MultiKeywordRequest> formatted string, finds the underlying
+ This function accepts a <MultiKeywordRequest> formatted string, finds the underlying
keyword owners, creates a <MultiConfigRequest> string from it and forwards it to the
EFI_HII_ROUTING_PROTOCOL.ExtractConfig function.
-
+
If there is an issue in resolving the contents of the KeywordString, then the function
returns an EFI_INVALID_PARAMETER and also set the Progress and ProgressErr with the
appropriate information about where the issue occurred and additional data about the
nature of the issue.
-
+
In the case when KeywordString is NULL, or contains multiple keywords, or when
EFI_NOT_FOUND is generated while processing the keyword elements, the Results string
- contains values returned for all keywords processed prior to the keyword generating the
+ contains values returned for all keywords processed prior to the keyword generating the
error but no values for the keyword with error or any following keywords.
-
+
@param This Pointer to the EFI_KEYWORD_HANDLER _PROTOCOL instance.
-
+
@param NameSpaceId A null-terminated string containing the platform configuration
language to search through in the system. If a NULL is passed
in, then it is assumed that any platform configuration language
with the prefix of "x-UEFI-" are searched.
-
+
@param KeywordString A null-terminated string in <MultiKeywordRequest> format. If a
- NULL is passed in the KeywordString field, all of the known
- keywords in the system for the NameSpaceId specified are
+ NULL is passed in the KeywordString field, all of the known
+ keywords in the system for the NameSpaceId specified are
returned in the Results field.
-
+
@param Progress On return, points to a character in the KeywordString. Points
- to the string's NULL terminator if the request was successful.
+ to the string's NULL terminator if the request was successful.
Points to the most recent '&' before the first failing name / value
pair (or the beginning of the string if the failure is in the first
name / value pair) if the request was not successful.
-
+
@param ProgressErr If during the processing of the KeywordString there was a
- failure, this parameter gives additional information about the
+ failure, this parameter gives additional information about the
possible source of the problem. See the definitions in SetData()
for valid value definitions.
-
+
@param Results A null-terminated string in <MultiKeywordResp> format is returned
- which has all the values filled in for the keywords in the
+ which has all the values filled in for the keywords in the
KeywordString. This is a callee-allocated field, and must be freed
- by the caller after being used.
+ by the caller after being used.
@retval EFI_SUCCESS The specified action was completed successfully.
-
+
@retval EFI_INVALID_PARAMETER One or more of the following are TRUE:
1.Progress, ProgressErr, or Results is NULL.
2.Parsing of the KeywordString resulted in an error. See
Progress and ProgressErr for more data.
-
+
@retval EFI_NOT_FOUND An element of the KeywordString was not found. See
ProgressErr for more data.
@@ -3108,7 +3108,7 @@ Done: @retval EFI_OUT_OF_RESOURCES Required system resources could not be allocated. See
ProgressErr for more data.
-
+
@retval EFI_ACCESS_DENIED The action violated system policy. See ProgressErr for
more data.
@@ -3117,12 +3117,12 @@ Done: **/
EFI_STATUS
-EFIAPI
+EFIAPI
EfiConfigKeywordHandlerGetData (
IN EFI_CONFIG_KEYWORD_HANDLER_PROTOCOL *This,
IN CONST EFI_STRING NameSpaceId, OPTIONAL
IN CONST EFI_STRING KeywordString, OPTIONAL
- OUT EFI_STRING *Progress,
+ OUT EFI_STRING *Progress,
OUT UINT32 *ProgressErr,
OUT EFI_STRING *Results
)
@@ -3132,7 +3132,7 @@ EfiConfigKeywordHandlerGetData ( EFI_DEVICE_PATH_PROTOCOL *DevicePath;
HII_DATABASE_RECORD *DataBaseRecord;
CHAR16 *StringPtr;
- CHAR16 *NextStringPtr;
+ CHAR16 *NextStringPtr;
CHAR16 *KeywordData;
EFI_STRING_ID KeywordStringId;
UINT8 *OpCode;
@@ -3188,7 +3188,7 @@ EfiConfigKeywordHandlerGetData ( return EFI_INVALID_PARAMETER;
}
}
-
+
if (KeywordString != NULL) {
//
// Use temp string to avoid changing input string buffer.
@@ -3208,7 +3208,7 @@ EfiConfigKeywordHandlerGetData ( }
StringPtr = NextStringPtr;
-
+
//
// 3. Process Keyword section from the input keywordRequest string.
//
@@ -3240,7 +3240,7 @@ EfiConfigKeywordHandlerGetData ( if (EFI_ERROR (Status)) {
goto Done;
}
-
+
//
// 3.4 Extract Value for the input keyword.
//
@@ -3293,7 +3293,7 @@ EfiConfigKeywordHandlerGetData ( FreePool (KeywordData);
FreePool (ValueElement);
FreePool (ConfigRequest);
- DevicePath = NULL;
+ DevicePath = NULL;
KeywordData = NULL;
ValueElement = NULL;
ConfigRequest = NULL;
diff --git a/MdeModulePkg/Universal/HiiDatabaseDxe/ConfigRouting.c b/MdeModulePkg/Universal/HiiDatabaseDxe/ConfigRouting.c index 646864f..c778cd9 100644 --- a/MdeModulePkg/Universal/HiiDatabaseDxe/ConfigRouting.c +++ b/MdeModulePkg/Universal/HiiDatabaseDxe/ConfigRouting.c @@ -1,7 +1,7 @@ /** @file
Implementation of interfaces function for EFI_HII_CONFIG_ROUTING_PROTOCOL.
-Copyright (c) 2007 - 2017, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2007 - 2018, Intel Corporation. All rights reserved.<BR>
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
@@ -44,7 +44,7 @@ CalculateConfigStringLen ( //
// The beginning of next <ConfigRequest>/<ConfigResp> should be "&GUID=".
// Will meet '\0' if there is only one <ConfigRequest>/<ConfigResp>.
- //
+ //
TmpPtr = StrStr (String, L"&GUID=");
if (TmpPtr == NULL) {
return StrLen (String);
@@ -117,7 +117,7 @@ GetDevicePath ( if (((Length + 1) / 2) < sizeof (EFI_DEVICE_PATH_PROTOCOL)) {
return EFI_NOT_FOUND;
}
-
+
//
// The data in <PathHdr> is encoded as hex UNICODE %02x bytes in the same order
// as the device path resides in RAM memory.
@@ -127,7 +127,7 @@ GetDevicePath ( if (DevicePathBuffer == NULL) {
return EFI_OUT_OF_RESOURCES;
}
-
+
//
// Convert DevicePath
//
@@ -141,7 +141,7 @@ GetDevicePath ( DevicePathBuffer [Index/2] = (UINT8) ((DevicePathBuffer [Index/2] << 4) + DigitUint8);
}
}
-
+
//
// Validate DevicePath
//
@@ -208,10 +208,10 @@ HiiToLower ( @param BufferLen The length of the Buffer in bytes.
- @param Buffer Points to a buffer which will be converted to be the
+ @param Buffer Points to a buffer which will be converted to be the
content of the generated string.
- @param Flag If 1, the buffer contains data for the value of GUID or PATH stored in
+ @param Flag If 1, the buffer contains data for the value of GUID or PATH stored in
UINT8 *; if 2, the buffer contains unicode string for the value of NAME;
if 3, the buffer contains other data.
@@ -244,7 +244,7 @@ GenerateSubStr ( ASSERT (*SubStr != NULL);
return;
}
-
+
//
// Header + Data + '&' + '\0'
//
@@ -317,7 +317,7 @@ GenerateSubStr ( //
// Convert the uppercase to lowercase since <HexAf> is defined in lowercase format.
//
- StrCatS (Str, Length, L"&");
+ StrCatS (Str, Length, L"&");
HiiToLower (Str);
*SubStr = Str;
@@ -352,7 +352,7 @@ OutputConfigBody ( if (String == NULL || ConfigBody == NULL) {
return EFI_INVALID_PARAMETER;
}
-
+
//
// The setting information should start OFFSET, not ALTCFG.
//
@@ -506,7 +506,7 @@ GetValueOfNumber ( Status = EFI_OUT_OF_RESOURCES;
goto Exit;
}
-
+
Length = *Len;
ZeroMem (TemStr, sizeof (TemStr));
for (Index = 0; Index < Length; Index ++) {
@@ -1010,10 +1010,10 @@ Exit: the missing AltCfgId in AltCfgResq.
@param AltCfgResp Pointer to a null-terminated Unicode string in
- <ConfigAltResp> format. The default value string
- will be merged into it.
+ <ConfigAltResp> format. The default value string
+ will be merged into it.
@param DefaultAltCfgResp Pointer to a null-terminated Unicode string in
- <MultiConfigAltResp> format. The default value
+ <MultiConfigAltResp> format. The default value
string may contain more than one ConfigAltResp
string for the different varstore buffer.
@@ -1036,17 +1036,17 @@ MergeDefaultString ( UINTN SizeAltCfgResp;
UINTN MaxLen;
UINTN TotalSize;
-
+
if (*AltCfgResp == NULL) {
return EFI_INVALID_PARAMETER;
}
-
+
//
// Get the request ConfigHdr
//
SizeAltCfgResp = 0;
StringPtr = *AltCfgResp;
-
+
//
// Find <ConfigHdr> GUID=...&NAME=...&PATH=...
//
@@ -1081,18 +1081,18 @@ MergeDefaultString ( StrnCatS (AltConfigHdr, MaxLen, *AltCfgResp, HeaderLength);
StrCatS (AltConfigHdr, MaxLen, L"&ALTCFG=");
HeaderLength = StrLen (AltConfigHdr);
-
+
StringPtrDefault = StrStr (DefaultAltCfgResp, AltConfigHdr);
while (StringPtrDefault != NULL) {
//
// Get AltCfg Name
//
StrnCatS (AltConfigHdr, MaxLen, StringPtrDefault + HeaderLength, 4);
- StringPtr = StrStr (*AltCfgResp, AltConfigHdr);
-
+ StringPtr = StrStr (*AltCfgResp, AltConfigHdr);
+
//
// Append the found default value string to the input AltCfgResp
- //
+ //
if (StringPtr == NULL) {
StringPtrEnd = StrStr (StringPtrDefault + 1, L"&GUID");
SizeAltCfgResp = StrSize (*AltCfgResp);
@@ -1136,16 +1136,16 @@ MergeDefaultString ( //
CompareAndMergeDefaultString (AltCfgResp, DefaultAltCfgResp, AltConfigHdr);
}
-
+
//
// Find next AltCfg String
//
*(AltConfigHdr + HeaderLength) = L'\0';
StringPtrDefault = StrStr (StringPtrDefault + 1, AltConfigHdr);
}
-
+
FreePool (AltConfigHdr);
- return EFI_SUCCESS;
+ return EFI_SUCCESS;
}
/**
@@ -1162,9 +1162,9 @@ InsertDefaultValue ( )
{
LIST_ENTRY *Link;
- IFR_DEFAULT_DATA *DefaultValueArray;
+ IFR_DEFAULT_DATA *DefaultValueArray;
LIST_ENTRY *DefaultLink;
-
+
DefaultLink = &BlockData->DefaultValueEntry;
for (Link = DefaultLink->ForwardLink; Link != DefaultLink; Link = Link->ForwardLink) {
@@ -1183,7 +1183,7 @@ InsertDefaultValue ( DefaultValueArray->Cleaned = DefaultValueData->Cleaned;
}
return;
- }
+ }
}
//
@@ -1200,7 +1200,7 @@ InsertDefaultValue ( @param BlockLink The list entry points to block array.
@param BlockData The point to BlockData is added.
-
+
**/
VOID
InsertBlockData (
@@ -1245,26 +1245,26 @@ InsertBlockData ( }
} else if (BlockArray->Offset > BlockSingleData->Offset) {
//
- // Insert new block data in the front of block array
+ // Insert new block data in the front of block array
//
InsertTailList (Link, &BlockSingleData->Entry);
return;
}
}
-
+
//
// Add new block data into the tail.
//
- InsertTailList (Link, &BlockSingleData->Entry);
+ InsertTailList (Link, &BlockSingleData->Entry);
}
/**
- Retrieves a pointer to the a Null-terminated ASCII string containing the list
- of languages that an HII handle in the HII Database supports. The returned
+ Retrieves a pointer to the a Null-terminated ASCII string containing the list
+ of languages that an HII handle in the HII Database supports. The returned
string is allocated using AllocatePool(). The caller is responsible for freeing
the returned string using FreePool(). The format of the returned string follows
the language format assumed the HII Database.
-
+
If HiiHandle is NULL, then ASSERT().
@param[in] HiiHandle A handle that was previously registered in the HII Database.
@@ -1295,8 +1295,8 @@ GetSupportedLanguages ( Status = mPrivate.HiiString.GetLanguages (&mPrivate.HiiString, HiiHandle, &TempSupportedLanguages, &LanguageSize);
//
- // If GetLanguages() returns EFI_SUCCESS for a zero size,
- // then there are no supported languages registered for HiiHandle. If GetLanguages()
+ // If GetLanguages() returns EFI_SUCCESS for a zero size,
+ // then there are no supported languages registered for HiiHandle. If GetLanguages()
// returns an error other than EFI_BUFFER_TOO_SMALL, then HiiHandle is not present
// in the HII Database
//
@@ -1338,12 +1338,12 @@ GetSupportedLanguages ( /**
Retrieves a string from a string package.
-
+
If HiiHandle is NULL, then ASSERT().
If StringId is 0, then ASSET.
@param[in] HiiHandle A handle that was previously registered in the HII Database.
- @param[in] StringId The identifier of the string to retrieved from the string
+ @param[in] StringId The identifier of the string to retrieved from the string
package associated with HiiHandle.
@retval NULL The string specified by StringId is not present in the string package.
@@ -1370,7 +1370,7 @@ InternalGetString ( //
// Initialize all allocated buffers to NULL
- //
+ //
SupportedLanguages = NULL;
PlatformLanguage = NULL;
BestLanguage = NULL;
@@ -1394,11 +1394,11 @@ InternalGetString ( // Get the best matching language from SupportedLanguages
//
BestLanguage = GetBestLanguage (
- SupportedLanguages,
+ SupportedLanguages,
FALSE, // RFC 4646 mode
- Language, // Highest priority
+ Language, // Highest priority
PlatformLanguage != NULL ? PlatformLanguage : "", // Next highest priority
- SupportedLanguages, // Lowest priority
+ SupportedLanguages, // Lowest priority
NULL
);
if (BestLanguage == NULL) {
@@ -1419,8 +1419,8 @@ InternalGetString ( NULL
);
//
- // If GetString() returns EFI_SUCCESS for a zero size,
- // then there are no supported languages registered for HiiHandle. If GetString()
+ // If GetString() returns EFI_SUCCESS for a zero size,
+ // then there are no supported languages registered for HiiHandle. If GetString()
// returns an error other than EFI_BUFFER_TOO_SMALL, then HiiHandle is not present
// in the HII Database
//
@@ -1479,12 +1479,12 @@ Error: /**
This function checks VarOffset and VarWidth is in the block range.
- @param RequestBlockArray The block array is to be checked.
+ @param RequestBlockArray The block array is to be checked.
@param VarOffset Offset of var to the structure
@param VarWidth Width of var.
@param IsNameValueType Whether this varstore is name/value varstore or not.
@param HiiHandle Hii handle for this hii package.
-
+
@retval TRUE This Var is in the block range.
@retval FALSE This Var is not in the block range.
**/
@@ -1562,18 +1562,18 @@ GetFormPackageData ( // 0. Get Hii Form Package by HiiHandle
//
Status = ExportFormPackages (
- &mPrivate,
- DataBaseRecord->Handle,
- DataBaseRecord->PackageList,
- 0,
- Size,
+ &mPrivate,
+ DataBaseRecord->Handle,
+ DataBaseRecord->PackageList,
+ 0,
+ Size,
HiiFormPackage,
&ResultSize
);
if (EFI_ERROR (Status)) {
return Status;
}
-
+
(*HiiFormPackage) = AllocatePool (ResultSize);
if (*HiiFormPackage == NULL) {
Status = EFI_OUT_OF_RESOURCES;
@@ -1586,18 +1586,18 @@ GetFormPackageData ( Size = ResultSize;
ResultSize = 0;
Status = ExportFormPackages (
- &mPrivate,
- DataBaseRecord->Handle,
- DataBaseRecord->PackageList,
+ &mPrivate,
+ DataBaseRecord->Handle,
+ DataBaseRecord->PackageList,
0,
- Size,
+ Size,
*HiiFormPackage,
&ResultSize
);
if (EFI_ERROR (Status)) {
FreePool (*HiiFormPackage);
}
-
+
*PackageSize = Size;
return Status;
@@ -1612,7 +1612,7 @@ GetFormPackageData ( the first found varstore will be as ConfigHdr.
@param IsEfiVarstore Whether the request storage type is efi varstore type.
@param EfiVarStore The efi varstore info which will return.
-**/
+**/
EFI_STATUS
GetVarStoreType (
IN HII_DATABASE_RECORD *DataBaseRecord,
@@ -1630,12 +1630,12 @@ GetVarStoreType ( EFI_STRING GuidStr;
EFI_STRING NameStr;
EFI_STRING TempStr;
- UINTN LengthString;
+ UINTN LengthString;
UINT8 *HiiFormPackage;
UINTN PackageSize;
EFI_IFR_VARSTORE_EFI *IfrEfiVarStore;
EFI_HII_PACKAGE_HEADER *PackageHeader;
-
+
HiiFormPackage = NULL;
LengthString = 0;
Status = EFI_SUCCESS;
@@ -1673,8 +1673,8 @@ GetVarStoreType ( if (IfrOpHdr->OpCode == EFI_IFR_VARSTORE_EFI_OP ) {
IfrEfiVarStore = (EFI_IFR_VARSTORE_EFI *) IfrOpHdr;
//
- // If the length is small than the structure, this is from old efi
- // varstore definition. Old efi varstore get config directly from
+ // If the length is small than the structure, this is from old efi
+ // varstore definition. Old efi varstore get config directly from
// GetVariable function.
//
if (IfrOpHdr->Length < sizeof (EFI_IFR_VARSTORE_EFI)) {
@@ -1715,8 +1715,8 @@ GetVarStoreType ( }
*IsEfiVarstore = TRUE;
CopyMem (*EfiVarStore, IfrEfiVarStore, IfrOpHdr->Length);
- }
-
+ }
+
//
// Free allocated temp string.
//
@@ -1778,7 +1778,7 @@ GetElementsFromRequest ( @retval TRUE This varstore is the request one.
@retval FALSE This varstore is not the request one.
-
+
**/
BOOLEAN
IsThisVarstore (
@@ -1826,7 +1826,7 @@ IsThisVarstore ( Done:
if (GuidStr != NULL) {
- FreePool (GuidStr);
+ FreePool (GuidStr);
}
if (NameStr != NULL) {
@@ -1848,7 +1848,7 @@ Done: the first found varstore will be as ConfigHdr.
@retval TRUE This hii package is the request one.
@retval FALSE This hii package is not the request one.
-**/
+**/
BOOLEAN
IsThisPackageList (
IN HII_DATABASE_RECORD *DataBaseRecord,
@@ -1901,7 +1901,7 @@ IsThisPackageList ( PackageOffset += IfrOpHdr->Length;
switch (IfrOpHdr->OpCode) {
-
+
case EFI_IFR_VARSTORE_OP:
IfrVarStore = (EFI_IFR_VARSTORE *) IfrOpHdr;
@@ -1947,7 +1947,7 @@ IsThisPackageList ( goto Done;
}
break;
-
+
case EFI_IFR_FORM_OP:
case EFI_IFR_FORM_MAP_OP:
//
@@ -1985,7 +1985,7 @@ Done: @retval EFI_SUCCESS This opcode is required.
@retval EFI_NOT_FOUND This opcode is not required.
@retval Others Contain some error.
-
+
**/
EFI_STATUS
IsThisOpcodeRequired (
@@ -2042,7 +2042,7 @@ IsThisOpcodeRequired ( BitWidth = VarWidth;
BitOffset = VarOffset * 8;
}
-
+
//
// Check whether this question is in requested block array.
//
@@ -2054,7 +2054,7 @@ IsThisOpcodeRequired ( }
//
- // Check this var question is in the var storage
+ // Check this var question is in the var storage
//
if (((VarOffset + VarWidth) > VarStorageData->Size)) {
return EFI_INVALID_PARAMETER;
@@ -2104,7 +2104,7 @@ IsThisOpcodeRequired ( @retval EFI_SUCCESS The block array and the default value array are got.
@retval EFI_INVALID_PARAMETER The varstore definition in the different form packages
- are conflicted.
+ are conflicted.
@retval EFI_OUT_OF_RESOURCES No enough memory.
**/
EFI_STATUS
@@ -2239,10 +2239,10 @@ ParseIfrData ( IfrEfiVarStore = (EFI_IFR_VARSTORE_EFI *) IfrOpHdr;
//
- // If the length is small than the structure, this is from old efi
- // varstore definition. Old efi varstore get config directly from
+ // If the length is small than the structure, this is from old efi
+ // varstore definition. Old efi varstore get config directly from
// GetVariable function.
- //
+ //
if (IfrOpHdr->Length < sizeof (EFI_IFR_VARSTORE_EFI)) {
break;
}
@@ -2317,7 +2317,7 @@ ParseIfrData ( case EFI_IFR_REF_OP:
//
- // Ref question is not in IFR Form. This IFR form is not valid.
+ // Ref question is not in IFR Form. This IFR form is not valid.
//
if ( VarStoreId == 0) {
Status = EFI_INVALID_PARAMETER;
@@ -2358,7 +2358,7 @@ ParseIfrData ( //
//
- // Numeric and OneOf question is not in IFR Form. This IFR form is not valid.
+ // Numeric and OneOf question is not in IFR Form. This IFR form is not valid.
//
if (VarStoreId == 0) {
Status = EFI_INVALID_PARAMETER;
@@ -2408,7 +2408,7 @@ ParseIfrData ( FirstOneOfOption = TRUE;
} else if (IfrOpHdr->OpCode == EFI_IFR_NUMERIC_OP) {
//
- // Numeric minimum value will be used as default value when no default is specified.
+ // Numeric minimum value will be used as default value when no default is specified.
//
DefaultData.Type = DefaultValueFromDefault;
if (QuestionReferBitField) {
@@ -2441,7 +2441,7 @@ ParseIfrData ( }
//
// Set default value base on the DefaultId list get from IFR data.
- //
+ //
for (LinkData = DefaultIdArray->Entry.ForwardLink; LinkData != &DefaultIdArray->Entry; LinkData = LinkData->ForwardLink) {
DefaultDataPtr = BASE_CR (LinkData, IFR_DEFAULT_DATA, Entry);
DefaultData.DefaultId = DefaultDataPtr->DefaultId;
@@ -2458,7 +2458,7 @@ ParseIfrData ( FirstOrderedList = TRUE;
//
- // OrderedList question is not in IFR Form. This IFR form is not valid.
+ // OrderedList question is not in IFR Form. This IFR form is not valid.
//
if (VarStoreId == 0) {
Status = EFI_INVALID_PARAMETER;
@@ -2501,10 +2501,10 @@ ParseIfrData ( // default id by CheckBox Flags if CheckBox flags (Default or Mau) is set, the default value is 1 to be set.
// value by DefaultOption
// default id by DeaultOption DefaultId can override CheckBox Flags and Default value.
- //
+ //
//
- // CheckBox question is not in IFR Form. This IFR form is not valid.
+ // CheckBox question is not in IFR Form. This IFR form is not valid.
//
if (VarStoreId == 0) {
Status = EFI_INVALID_PARAMETER;
@@ -2651,7 +2651,7 @@ ParseIfrData ( //
//
- // Date question is not in IFR Form. This IFR form is not valid.
+ // Date question is not in IFR Form. This IFR form is not valid.
//
if (VarStoreId == 0) {
Status = EFI_INVALID_PARAMETER;
@@ -2693,7 +2693,7 @@ ParseIfrData ( //
//
- // Time question is not in IFR Form. This IFR form is not valid.
+ // Time question is not in IFR Form. This IFR form is not valid.
//
if (VarStoreId == 0) {
Status = EFI_INVALID_PARAMETER;
@@ -2735,7 +2735,7 @@ ParseIfrData ( //
//
- // String question is not in IFR Form. This IFR form is not valid.
+ // String question is not in IFR Form. This IFR form is not valid.
//
if (VarStoreId == 0) {
Status = EFI_INVALID_PARAMETER;
@@ -2777,7 +2777,7 @@ ParseIfrData ( //
//
- // Password question is not in IFR Form. This IFR form is not valid.
+ // Password question is not in IFR Form. This IFR form is not valid.
//
if (VarStoreId == 0) {
Status = EFI_INVALID_PARAMETER;
@@ -2872,7 +2872,7 @@ ParseIfrData ( break;
}
//
- // Check this var question is in the var storage
+ // Check this var question is in the var storage
//
if ((BlockData->Name == NULL) && ((BlockData->Offset + BlockData->Width) > VarStorageData->Size)) {
Status = EFI_INVALID_PARAMETER;
@@ -2899,13 +2899,13 @@ ParseIfrData ( if (((IfrOneOfOption->Flags & EFI_IFR_OPTION_DEFAULT) == EFI_IFR_OPTION_DEFAULT) ||
((IfrOneOfOption->Flags & EFI_IFR_OPTION_DEFAULT_MFG) == EFI_IFR_OPTION_DEFAULT_MFG)) {
//
- // This flag is used to specify whether this option is the first. Set it to FALSE for the following options.
- // The first oneof option value will be used as default value when no default value is specified.
+ // This flag is used to specify whether this option is the first. Set it to FALSE for the following options.
+ // The first oneof option value will be used as default value when no default value is specified.
//
FirstOneOfOption = FALSE;
SmallestIdFromFlag = FALSE;
-
+
// Prepare new DefaultValue
//
DefaultData.Type = DefaultValueFromFlag;
@@ -2951,19 +2951,19 @@ ParseIfrData ( //
// 2. Set as the default value when this is the first option.
- // The first oneof option value will be used as default value when no default value is specified.
+ // The first oneof option value will be used as default value when no default value is specified.
//
if (FirstOneOfOption) {
- // This flag is used to specify whether this option is the first. Set it to FALSE for the following options.
+ // This flag is used to specify whether this option is the first. Set it to FALSE for the following options.
FirstOneOfOption = FALSE;
-
+
//
// Prepare new DefaultValue
- //
+ //
DefaultData.Type = DefaultValueFromDefault;
CopyMem (&DefaultData.Value, &IfrOneOfOption->Value, IfrOneOfOption->Header.Length - OFFSET_OF (EFI_IFR_ONE_OF_OPTION, Value));
for (LinkData = DefaultIdArray->Entry.ForwardLink; LinkData != &DefaultIdArray->Entry; LinkData = LinkData->ForwardLink) {
- DefaultDataPtr = BASE_CR (LinkData, IFR_DEFAULT_DATA, Entry);
+ DefaultDataPtr = BASE_CR (LinkData, IFR_DEFAULT_DATA, Entry);
DefaultData.DefaultId = DefaultDataPtr->DefaultId;
InsertDefaultValue (BlockData, &DefaultData);
}
@@ -3194,7 +3194,7 @@ GetBlockElement ( if (*StringPtr != 0 && *StringPtr != L'&') {
goto Done;
}
-
+
//
// Set Block Data
//
@@ -3226,7 +3226,7 @@ GetBlockElement ( }
}
//
- // If '\0', parsing is finished.
+ // If '\0', parsing is finished.
//
if (*StringPtr == 0) {
break;
@@ -3343,7 +3343,7 @@ GetNameElement ( if (HasValue) {
//
// If has value, skip the value.
- //
+ //
StringPtr = NextTag + 1;
*NextTag = L'=';
StringPtr = StrStr (StringPtr, L"&");
@@ -3408,14 +3408,14 @@ GenerateConfigRequest ( // Append VarStorageData BlockEntry into *Request string
// Now support only one varstore in a form package.
//
-
+
//
// Go through all VarStorageData Entry and get BlockEntry for each one for the multiple varstore in a single form package
// Then construct them all to return MultiRequest string : ConfigHdr BlockConfig
//
-
+
//
- // Compute the length of the entire request starting with <ConfigHdr> and a
+ // Compute the length of the entire request starting with <ConfigHdr> and a
// Null-terminator
//
DataExist = FALSE;
@@ -3428,7 +3428,7 @@ GenerateConfigRequest ( //
// Add <BlockName> length for each Name
//
- // <BlockName> ::= &Name1&Name2&...
+ // <BlockName> ::= &Name1&Name2&...
// |1| StrLen(Name1)
//
Length = Length + (1 + StrLen (BlockData->Name));
@@ -3486,10 +3486,10 @@ GenerateConfigRequest ( // Append &OFFSET=XXXX&WIDTH=YYYY\0
//
UnicodeSPrint (
- StringPtr,
- (8 + 4 + 7 + 4 + 1) * sizeof (CHAR16),
- L"&OFFSET=%04X&WIDTH=%04X",
- BlockData->Offset,
+ StringPtr,
+ (8 + 4 + 7 + 4 + 1) * sizeof (CHAR16),
+ L"&OFFSET=%04X&WIDTH=%04X",
+ BlockData->Offset,
BlockData->Width
);
}
@@ -3897,7 +3897,7 @@ GenerateAltConfigResp ( // |1| StrLen (ConfigHdr) | 8 | 4 |
//
Length += (1 + StrLen (ConfigHdr) + 8 + 4);
-
+
for (LinkData = VarStorageData->BlockEntry.ForwardLink; LinkData != &VarStorageData->BlockEntry; LinkData = LinkData->ForwardLink) {
BlockData = BASE_CR (LinkData, IFR_BLOCK_DATA, Entry);
ListEntry = &BlockData->DefaultValueEntry;
@@ -3923,7 +3923,7 @@ GenerateAltConfigResp ( }
}
}
-
+
//
// No default value is found. The default string doesn't exist.
//
@@ -3953,10 +3953,10 @@ GenerateAltConfigResp ( // |1| StrLen (ConfigHdr) | 8 | 4 |
//
UnicodeSPrint (
- StringPtr,
- (1 + StrLen (ConfigHdr) + 8 + 4 + 1) * sizeof (CHAR16),
- L"&%s&ALTCFG=%04X",
- ConfigHdr,
+ StringPtr,
+ (1 + StrLen (ConfigHdr) + 8 + 4 + 1) * sizeof (CHAR16),
+ L"&%s&ALTCFG=%04X",
+ ConfigHdr,
DefaultId->DefaultId
);
StringPtr += StrLen (StringPtr);
@@ -3971,9 +3971,9 @@ GenerateAltConfigResp ( }
if (VarStorageData->Type == EFI_HII_VARSTORE_NAME_VALUE) {
UnicodeSPrint (
- StringPtr,
- (1 + StrLen (ConfigHdr) + 1) * sizeof (CHAR16),
- L"&%s=",
+ StringPtr,
+ (1 + StrLen (ConfigHdr) + 1) * sizeof (CHAR16),
+ L"&%s=",
BlockData->Name
);
StringPtr += StrLen (StringPtr);
@@ -3983,10 +3983,10 @@ GenerateAltConfigResp ( // <BlockConfig> ::= 'OFFSET='<Number>&'WIDTH='<Number>&'VALUE'=<Number>
//
UnicodeSPrint (
- StringPtr,
+ StringPtr,
(8 + 4 + 7 + 4 + 7 + 1) * sizeof (CHAR16),
- L"&OFFSET=%04X&WIDTH=%04X&VALUE=",
- BlockData->Offset,
+ L"&OFFSET=%04X&WIDTH=%04X&VALUE=",
+ BlockData->Offset,
BlockData->Width
);
StringPtr += StrLen (StringPtr);
@@ -4038,32 +4038,32 @@ GenerateAltConfigResp ( }
/**
- This function gets the full request string and full default value string by
- parsing IFR data in HII form packages.
-
- When Request points to NULL string, the request string and default value string
- for each varstore in form package will return.
+ This function gets the full request string and full default value string by
+ parsing IFR data in HII form packages.
+
+ When Request points to NULL string, the request string and default value string
+ for each varstore in form package will return.
@param DataBaseRecord The DataBaseRecord instance contains the found Hii handle and package.
@param DevicePath Device Path which Hii Config Access Protocol is registered.
@param Request Pointer to a null-terminated Unicode string in
<ConfigRequest> format. When it doesn't contain
- any RequestElement, it will be updated to return
+ any RequestElement, it will be updated to return
the full RequestElement retrieved from IFR data.
If it points to NULL, the request string for the first
varstore in form package will be merged into a
- <MultiConfigRequest> format string and return.
+ <MultiConfigRequest> format string and return.
@param AltCfgResp Pointer to a null-terminated Unicode string in
<ConfigAltResp> format. When the pointer is to NULL,
the full default value string retrieved from IFR data
will return. When the pinter is to a string, the
full default value string retrieved from IFR data
will be merged into the input string and return.
- When Request points to NULL, the default value string
- for each varstore in form package will be merged into
+ When Request points to NULL, the default value string
+ for each varstore in form package will be merged into
a <MultiConfigAltResp> format string and return.
@param PointerProgress Optional parameter, it can be NULL.
- When it is not NULL, if Request is NULL, it returns NULL.
+ When it is not NULL, if Request is NULL, it returns NULL.
On return, points to a character in the Request
string. Points to the string's null terminator if
request was successful. Points to the most recent
@@ -4074,7 +4074,7 @@ GenerateAltConfigResp ( @retval EFI_SUCCESS The Results string is set to the full request string.
And AltCfgResp contains all default value string.
@retval EFI_OUT_OF_RESOURCES Not enough memory for the return string.
- @retval EFI_NOT_FOUND The varstore (Guid and Name) in Request string
+ @retval EFI_NOT_FOUND The varstore (Guid and Name) in Request string
can't be found in Form package.
@retval EFI_NOT_FOUND HiiPackage can't be got on the input HiiHandle.
@retval EFI_INVALID_PARAMETER Request points to NULL.
@@ -4321,7 +4321,7 @@ Done: }
//
- // Free the allocated string
+ // Free the allocated string
//
if (ConfigHdr != NULL) {
FreePool (ConfigHdr);
@@ -4348,13 +4348,13 @@ Done: }
/**
- This function gets the full request resp string by
+ This function gets the full request resp string by
parsing IFR data in HII form packages.
@param This A pointer to the EFI_HII_CONFIG_ROUTING_PROTOCOL
instance.
- @param EfiVarStoreInfo The efi varstore info which is save in the EFI
- varstore data structure.
+ @param EfiVarStoreInfo The efi varstore info which is save in the EFI
+ varstore data structure.
@param Request Pointer to a null-terminated Unicode string in
<ConfigRequest> format.
@param RequestResp Pointer to a null-terminated Unicode string in
@@ -4376,7 +4376,7 @@ Done: EFI_STATUS
GetConfigRespFromEfiVarStore (
IN CONST EFI_HII_CONFIG_ROUTING_PROTOCOL *This,
- IN EFI_IFR_VARSTORE_EFI *EfiVarStoreInfo,
+ IN EFI_IFR_VARSTORE_EFI *EfiVarStoreInfo,
IN EFI_STRING Request,
OUT EFI_STRING *RequestResp,
OUT EFI_STRING *AccessProgress
@@ -4401,8 +4401,8 @@ GetConfigRespFromEfiVarStore ( goto Done;
}
AsciiStrToUnicodeStrS ((CHAR8 *) EfiVarStoreInfo->Name, VarStoreName, NameSize);
-
-
+
+
Status = gRT->GetVariable (VarStoreName, &EfiVarStoreInfo->Guid, NULL, &BufferSize, NULL);
if (Status != EFI_BUFFER_TOO_SMALL) {
goto Done;
@@ -4434,17 +4434,17 @@ Done: /**
- This function route the full request resp string for efi varstore.
+ This function route the full request resp string for efi varstore.
@param This A pointer to the EFI_HII_CONFIG_ROUTING_PROTOCOL
instance.
- @param EfiVarStoreInfo The efi varstore info which is save in the EFI
- varstore data structure.
+ @param EfiVarStoreInfo The efi varstore info which is save in the EFI
+ varstore data structure.
@param RequestResp Pointer to a null-terminated Unicode string in
<ConfigResp> format.
@param Result Pointer to a null-terminated Unicode string in
<ConfigResp> format.
-
+
@retval EFI_SUCCESS The Results string is set to the full request string.
And AltCfgResp contains all default value string.
@retval EFI_OUT_OF_RESOURCES Not enough memory for the return string.
@@ -4454,7 +4454,7 @@ Done: EFI_STATUS
RouteConfigRespForEfiVarStore (
IN CONST EFI_HII_CONFIG_ROUTING_PROTOCOL *This,
- IN EFI_IFR_VARSTORE_EFI *EfiVarStoreInfo,
+ IN EFI_IFR_VARSTORE_EFI *EfiVarStoreInfo,
IN EFI_STRING RequestResp,
OUT EFI_STRING *Result
)
@@ -4479,7 +4479,7 @@ RouteConfigRespForEfiVarStore ( goto Done;
}
AsciiStrToUnicodeStrS ((CHAR8 *) EfiVarStoreInfo->Name, VarStoreName, NameSize);
-
+
Status = gRT->GetVariable (VarStoreName, &EfiVarStoreInfo->Guid, NULL, &BufferSize, NULL);
if (Status != EFI_BUFFER_TOO_SMALL) {
DEBUG ((DEBUG_ERROR, "The variable does not exist!"));
@@ -4520,7 +4520,7 @@ Done: /**
Validate the config request elements.
- @param ConfigElements A null-terminated Unicode string in <ConfigRequest> format,
+ @param ConfigElements A null-terminated Unicode string in <ConfigRequest> format,
without configHdr field.
@retval CHAR16 * THE first Name/value pair not correct.
@@ -4563,7 +4563,7 @@ OffsetWidthValidate ( /**
Validate the config request elements.
- @param ConfigElements A null-terminated Unicode string in <ConfigRequest> format,
+ @param ConfigElements A null-terminated Unicode string in <ConfigRequest> format,
without configHdr field.
@retval CHAR16 * THE first Name/value pair not correct.
@@ -4588,7 +4588,7 @@ NameValueValidate ( StringPtr += 1;
StringPtr = StrStr (StringPtr, L"&");
-
+
if (StringPtr == NULL) {
return NULL;
}
@@ -4696,7 +4696,7 @@ ConfigRequestValidate ( @retval EFI_INVALID_PARAMETER Illegal syntax. Progress set to most recent &
before the error or the beginning of the string.
@retval EFI_INVALID_PARAMETER The ExtractConfig function of the underlying HII
- Configuration Access Protocol returned
+ Configuration Access Protocol returned
EFI_INVALID_PARAMETER. Progress set to most recent
& before the error or the beginning of the string.
@@ -4833,7 +4833,7 @@ HiiConfigRoutingExtractConfig ( }
}
}
-
+
//
// Try to find driver handle by device path.
//
@@ -4871,7 +4871,7 @@ HiiConfigRoutingExtractConfig ( IfrDataParsedFlag = FALSE;
if ((HiiHandle != NULL) && !GetElementsFromRequest(ConfigRequest)) {
//
- // Get the full request string from IFR when HiiPackage is registered to HiiHandle
+ // Get the full request string from IFR when HiiPackage is registered to HiiHandle
//
IfrDataParsedFlag = TRUE;
Status = GetFullStringFromHiiFormPackages (Database, DevicePath, &ConfigRequest, &DefaultResults, &AccessProgress);
@@ -4900,7 +4900,7 @@ HiiConfigRoutingExtractConfig ( if (EFI_ERROR (Status)) {
goto Done;
}
-
+
if (IsEfiVarStore) {
//
// Call the GetVariable function to extract settings.
@@ -4999,7 +4999,7 @@ HiiConfigRoutingExtractConfig ( ASSERT (*AccessProgress == 0);
//
- // Update AccessResults by getting default setting from IFR when HiiPackage is registered to HiiHandle
+ // Update AccessResults by getting default setting from IFR when HiiPackage is registered to HiiHandle
//
if (!IfrDataParsedFlag && HiiHandle != NULL) {
Status = GetFullStringFromHiiFormPackages (Database, DevicePath, &ConfigRequest, &DefaultResults, NULL);
@@ -5015,13 +5015,13 @@ HiiConfigRoutingExtractConfig ( FreePool (DefaultResults);
DefaultResults = NULL;
}
-
+
NextConfigString:
if (!FirstElement) {
Status = AppendToMultiString (Results, L"&");
ASSERT_EFI_ERROR (Status);
}
-
+
Status = AppendToMultiString (Results, AccessResults);
ASSERT_EFI_ERROR (Status);
@@ -5049,22 +5049,22 @@ Done: FreePool (*Results);
*Results = NULL;
}
-
+
if (ConfigRequest != NULL) {
FreePool (ConfigRequest);
}
-
+
if (AccessResults != NULL) {
FreePool (AccessResults);
}
-
+
if (DefaultResults != NULL) {
FreePool (DefaultResults);
}
-
+
if (DevicePath != NULL) {
FreePool (DevicePath);
- }
+ }
return Status;
}
@@ -5079,8 +5079,8 @@ Done: instance.
@param Results Null-terminated Unicode string in
<MultiConfigAltResp> format which has all values
- filled in for the entirety of the current HII
- database. String to be allocated by the called
+ filled in for the entirety of the current HII
+ database. String to be allocated by the called
function. De-allocation is up to the caller.
@retval EFI_SUCCESS The Results string is filled with the values
@@ -5196,7 +5196,7 @@ HiiConfigRoutingExportConfig ( );
if (EFI_ERROR (Status)) {
//
- // Update AccessResults by getting default setting from IFR when HiiPackage is registered to HiiHandle
+ // Update AccessResults by getting default setting from IFR when HiiPackage is registered to HiiHandle
//
if (HiiHandle != NULL && DevicePath != NULL) {
IfrDataParsedFlag = TRUE;
@@ -5220,7 +5220,7 @@ HiiConfigRoutingExportConfig ( if (!EFI_ERROR (Status)) {
//
- // Update AccessResults by getting default setting from IFR when HiiPackage is registered to HiiHandle
+ // Update AccessResults by getting default setting from IFR when HiiPackage is registered to HiiHandle
//
if (!IfrDataParsedFlag && HiiHandle != NULL && DevicePath != NULL) {
StringPtr = StrStr (AccessResults, L"&GUID=");
@@ -5244,7 +5244,7 @@ HiiConfigRoutingExportConfig ( FreePool (DefaultResults);
DefaultResults = NULL;
}
-
+
//
// Attach this <ConfigAltResp> to a <MultiConfigAltResp>. There is a '&'
// which separates the first <ConfigAltResp> and the following ones.
@@ -5253,19 +5253,19 @@ HiiConfigRoutingExportConfig ( Status = AppendToMultiString (Results, L"&");
ASSERT_EFI_ERROR (Status);
}
-
+
Status = AppendToMultiString (Results, AccessResults);
ASSERT_EFI_ERROR (Status);
FirstElement = FALSE;
-
+
FreePool (AccessResults);
AccessResults = NULL;
}
}
FreePool (ConfigAccessHandles);
- return EFI_SUCCESS;
+ return EFI_SUCCESS;
}
@@ -5433,7 +5433,7 @@ HiiConfigRoutingRouteConfig ( if (IsEfiVarstore) {
//
// Call the SetVariable function to route settings.
- //
+ //
Status = RouteConfigRespForEfiVarStore(This, EfiVarStoreInfo, ConfigResp, &AccessProgress);
FreePool (EfiVarStoreInfo);
} else {
@@ -5705,7 +5705,7 @@ HiiBlockToConfig ( Status = EFI_OUT_OF_RESOURCES;
goto Exit;
}
-
+
TemString = ValueStr;
TemBuffer = Value + Width - 1;
for (Index = 0; Index < Width; Index ++, TemBuffer --) {
@@ -5762,7 +5762,7 @@ HiiBlockToConfig ( Status = EFI_INVALID_PARAMETER;
goto Exit;
}
-
+
HiiToLower (*Config);
*Progress = StringPtr;
return EFI_SUCCESS;
@@ -5827,7 +5827,7 @@ Exit: value pair. Block is left updated and
Progress points at the '&' preceding the first
non-<BlockName>.
- @retval EFI_BUFFER_TOO_SMALL Block not large enough. Progress undefined.
+ @retval EFI_BUFFER_TOO_SMALL Block not large enough. Progress undefined.
BlockSize is updated with the required buffer size.
@retval EFI_NOT_FOUND Target for the specified routing data was not found.
Progress points to the "G" in "GUID" of the errant
@@ -5993,7 +5993,7 @@ HiiConfigToBlock ( break;
}
}
-
+
//
// The input string is not ConfigResp format, return error.
//
@@ -6128,10 +6128,10 @@ HiiGetAltCfg ( &PathStr
);
if (AltCfgId != NULL) {
- GenerateSubStr (L"ALTCFG=", sizeof (UINT16), (VOID *) AltCfgId, 3, &AltIdStr);
+ GenerateSubStr (L"ALTCFG=", sizeof (UINT16), (VOID *) AltCfgId, 3, &AltIdStr);
}
if (Name != NULL) {
- GenerateSubStr (L"NAME=", StrLen (Name) * sizeof (CHAR16), (VOID *) Name, 2, &NameStr);
+ GenerateSubStr (L"NAME=", StrLen (Name) * sizeof (CHAR16), (VOID *) Name, 2, &NameStr);
} else {
GenerateSubStr (L"NAME=", 0, NULL, 2, &NameStr);
}
diff --git a/MdeModulePkg/Universal/HiiDatabaseDxe/Database.c b/MdeModulePkg/Universal/HiiDatabaseDxe/Database.c index e8f4564..45448c5 100644 --- a/MdeModulePkg/Universal/HiiDatabaseDxe/Database.c +++ b/MdeModulePkg/Universal/HiiDatabaseDxe/Database.c @@ -1,7 +1,7 @@ /** @file
Implementation for EFI_HII_DATABASE_PROTOCOL.
-Copyright (c) 2007 - 2017, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2007 - 2018, Intel Corporation. All rights reserved.<BR>
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
@@ -1431,7 +1431,7 @@ Error: /**
Adjust all string packages in a single package list to have the same max string ID.
-
+
@param PackageList Pointer to a package list which will be adjusted.
@retval EFI_SUCCESS Adjust all string packages successfully.
@@ -3154,7 +3154,7 @@ AddPackages ( PackageHdrPtr = (EFI_HII_PACKAGE_HEADER *) ((UINT8 *) PackageHdrPtr + PackageHeader.Length);
CopyMem (&PackageHeader, PackageHdrPtr, sizeof (EFI_HII_PACKAGE_HEADER));
}
-
+
//
// Adjust String Package to make sure all string packages have the same max string ID.
//
@@ -3520,7 +3520,7 @@ HiiNewPackageList ( DatabaseRecord = CR (Link, HII_DATABASE_RECORD, DatabaseEntry, HII_DATABASE_RECORD_SIGNATURE);
if (CompareGuid (
&(DatabaseRecord->PackageList->PackageListHdr.PackageListGuid),
- &PackageListGuid) &&
+ &PackageListGuid) &&
DatabaseRecord->DriverHandle == DriverHandle) {
return EFI_INVALID_PARAMETER;
}
@@ -3992,7 +3992,7 @@ HiiListPackageLists ( @retval EFI_NOT_FOUND The specified Handle could not be found in the
current database.
@retval EFI_INVALID_PARAMETER BufferSize was NULL.
- @retval EFI_INVALID_PARAMETER The value referenced by BufferSize was not zero
+ @retval EFI_INVALID_PARAMETER The value referenced by BufferSize was not zero
and Buffer was NULL.
**/
diff --git a/MdeModulePkg/Universal/HiiDatabaseDxe/Font.c b/MdeModulePkg/Universal/HiiDatabaseDxe/Font.c index b85cf88..4840933 100644 --- a/MdeModulePkg/Universal/HiiDatabaseDxe/Font.c +++ b/MdeModulePkg/Universal/HiiDatabaseDxe/Font.c @@ -2,7 +2,7 @@ Implementation for EFI_HII_FONT_PROTOCOL.
-Copyright (c) 2007 - 2017, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2007 - 2018, Intel Corporation. All rights reserved.<BR>
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
@@ -304,14 +304,14 @@ NarrowGlyphToBlt ( Height = EFI_GLYPH_HEIGHT;
Width = EFI_GLYPH_WIDTH;
-
+
//
// Move position to the left-top corner of char.
//
Buffer = *Origin - EFI_GLYPH_HEIGHT * ImageWidth;
//
- // Char may be partially displayed when CLIP_X or CLIP_Y is not set.
+ // Char may be partially displayed when CLIP_X or CLIP_Y is not set.
//
if (RowHeight < Height) {
Height = (UINT8) RowHeight;
@@ -685,7 +685,7 @@ FindGlyphBlock ( ASSERT (FontPackage->Signature == HII_FONT_PACKAGE_SIGNATURE);
BaseLine = 0;
MinOffsetY = 0;
-
+
if (CharValue == (CHAR16) (-1)) {
//
// Collect the cell information specified in font package fixed header.
@@ -1099,8 +1099,8 @@ IsSystemFontInfo ( }
if ((StringInfo->FontInfoMask & EFI_FONT_INFO_SYS_FORE_COLOR) == 0) {
if (CompareMem (
- &StringInfo->ForegroundColor,
- &SystemDefault->ForegroundColor,
+ &StringInfo->ForegroundColor,
+ &SystemDefault->ForegroundColor,
sizeof (EFI_GRAPHICS_OUTPUT_BLT_PIXEL)
) != 0) {
goto Exit;
@@ -1108,8 +1108,8 @@ IsSystemFontInfo ( }
if ((StringInfo->FontInfoMask & EFI_FONT_INFO_SYS_BACK_COLOR) == 0) {
if (CompareMem (
- &StringInfo->BackgroundColor,
- &SystemDefault->BackgroundColor,
+ &StringInfo->BackgroundColor,
+ &SystemDefault->BackgroundColor,
sizeof (EFI_GRAPHICS_OUTPUT_BLT_PIXEL)
) != 0) {
goto Exit;
@@ -1745,7 +1745,7 @@ HiiStringToImage ( goto Exit;
}
}
-
+
//
// Use the maximum height of font as the base line.
// And, use the maximum height as line height.
@@ -1753,7 +1753,7 @@ HiiStringToImage ( LineHeight = Height;
LastLineHeight = Height;
BaseLineOffset = Height - BaseLine;
-
+
//
// Parse the string to be displayed to drop some ignored characters.
//
@@ -1799,7 +1799,7 @@ HiiStringToImage ( Index++;
continue;
}
-
+
Status = GetGlyphBuffer (Private, *StringPtr, FontInfo, &GlyphBuf[Index], &Cell[Index], &Attributes[Index]);
if (Status == EFI_NOT_FOUND) {
if ((Flags & EFI_HII_IGNORE_IF_NO_GLYPH) == EFI_HII_IGNORE_IF_NO_GLYPH) {
@@ -1971,8 +1971,8 @@ HiiStringToImage ( // opportunity prior to a character whose right-most extent would exceed Width.
// Search the right-most line-break opportunity here.
//
- if ((Flags & EFI_HII_OUT_FLAG_WRAP) == EFI_HII_OUT_FLAG_WRAP &&
- (RowInfo[RowIndex].LineWidth + BltX > Image->Width || StringPtr[NextIndex] != 0) &&
+ if ((Flags & EFI_HII_OUT_FLAG_WRAP) == EFI_HII_OUT_FLAG_WRAP &&
+ (RowInfo[RowIndex].LineWidth + BltX > Image->Width || StringPtr[NextIndex] != 0) &&
!LineBreak) {
if ((Flags & EFI_HII_IGNORE_LINE_BREAK) == 0) {
LineWidth = RowInfo[RowIndex].LineWidth;
@@ -2040,7 +2040,7 @@ HiiStringToImage ( }
}
}
-
+
//
// LineWidth can't exceed Image width.
//
@@ -2091,7 +2091,7 @@ HiiStringToImage ( );
}
if (ColumnInfoArray != NULL) {
- if ((GlyphBuf[Index1] == NULL && Cell[Index1].AdvanceX == 0)
+ if ((GlyphBuf[Index1] == NULL && Cell[Index1].AdvanceX == 0)
|| RowInfo[RowIndex].LineWidth == 0) {
*ColumnInfoArray = (UINTN) ~0;
} else {
@@ -2119,7 +2119,7 @@ HiiStringToImage ( FreePool (BltBuffer);
goto Exit;
}
-
+
FreePool (BltBuffer);
}
} else {
@@ -2151,7 +2151,7 @@ HiiStringToImage ( );
}
if (ColumnInfoArray != NULL) {
- if ((GlyphBuf[Index1] == NULL && Cell[Index1].AdvanceX == 0)
+ if ((GlyphBuf[Index1] == NULL && Cell[Index1].AdvanceX == 0)
|| RowInfo[RowIndex].LineWidth == 0) {
*ColumnInfoArray = (UINTN) ~0;
} else {
@@ -2392,7 +2392,7 @@ HiiStringIdToImage ( if (EFI_ERROR (Status)) {
goto Exit;
}
-
+
if (Language == NULL) {
Language = "";
}
@@ -2409,7 +2409,7 @@ HiiStringIdToImage ( Status = EFI_NOT_FOUND;
goto Exit;
}
-
+
StringSize = MAX_STRING_LENGTH;
String = (EFI_STRING) AllocateZeroPool (StringSize);
if (String == NULL) {
@@ -2447,33 +2447,33 @@ HiiStringIdToImage ( if (EFI_ERROR (Status)) {
goto Exit;
}
-
+
//
// When StringInfo specifies that string will be output in the system default font and color,
- // use particular stringfontinfo described in string package instead if exists.
+ // use particular stringfontinfo described in string package instead if exists.
// StringFontInfo equals NULL means system default font attaches with the string block.
//
if (StringFontInfo != NULL && IsSystemFontInfo (Private, (EFI_FONT_DISPLAY_INFO *) StringInfo, NULL, NULL)) {
NameSize = StrSize (StringFontInfo->FontName);
FontLen = sizeof (EFI_FONT_DISPLAY_INFO) - sizeof (CHAR16) + NameSize;
NewStringInfo = AllocateZeroPool (FontLen);
- if (NewStringInfo == NULL) {
+ if (NewStringInfo == NULL) {
Status = EFI_OUT_OF_RESOURCES;
goto Exit;
}
NewStringInfo->FontInfoMask = EFI_FONT_INFO_SYS_FORE_COLOR | EFI_FONT_INFO_SYS_BACK_COLOR;
NewStringInfo->FontInfo.FontStyle = StringFontInfo->FontStyle;
- NewStringInfo->FontInfo.FontSize = StringFontInfo->FontSize;
+ NewStringInfo->FontInfo.FontSize = StringFontInfo->FontSize;
StrCpyS (NewStringInfo->FontInfo.FontName, NameSize / sizeof (CHAR16), StringFontInfo->FontName);
-
+
Status = HiiStringToImage (
- This,
- Flags,
- String,
- NewStringInfo,
- Blt,
- BltX,
- BltY,
+ This,
+ Flags,
+ String,
+ NewStringInfo,
+ Blt,
+ BltX,
+ BltY,
RowInfoArray,
RowInfoArraySize,
ColumnInfoArray
@@ -2640,7 +2640,7 @@ HiiGetGlyph ( //
BaseLine = (UINT16) (Cell.Height + Cell.OffsetY);
//
- // Set BltBuffer to the position of Origin.
+ // Set BltBuffer to the position of Origin.
//
BltBuffer = Image->Image.Bitmap + (Cell.Height + Cell.OffsetY) * Image->Width - Cell.OffsetX;
GlyphToImage (
@@ -2715,7 +2715,7 @@ Exit: @param StringInfoOut Upon return, contains the matching font's information.
If NULL, then no information is returned. This buffer
is allocated with a call to the Boot Service AllocatePool().
- It is the caller's responsibility to call the Boot
+ It is the caller's responsibility to call the Boot
Service FreePool() when the caller no longer requires
the contents of StringInfoOut.
@param String Points to the string which will be tested to
@@ -2800,7 +2800,7 @@ HiiGetFontInfo ( goto Exit;
}
}
-
+
//
// StringInfoIn must not be NULL if it is not system default font info.
//
@@ -2808,15 +2808,15 @@ HiiGetFontInfo ( //
// Check the font information mask to make sure it is valid.
//
- if (((StringInfoIn->FontInfoMask & (EFI_FONT_INFO_SYS_FONT | EFI_FONT_INFO_ANY_FONT)) ==
+ if (((StringInfoIn->FontInfoMask & (EFI_FONT_INFO_SYS_FONT | EFI_FONT_INFO_ANY_FONT)) ==
(EFI_FONT_INFO_SYS_FONT | EFI_FONT_INFO_ANY_FONT)) ||
- ((StringInfoIn->FontInfoMask & (EFI_FONT_INFO_SYS_SIZE | EFI_FONT_INFO_ANY_SIZE)) ==
+ ((StringInfoIn->FontInfoMask & (EFI_FONT_INFO_SYS_SIZE | EFI_FONT_INFO_ANY_SIZE)) ==
(EFI_FONT_INFO_SYS_SIZE | EFI_FONT_INFO_ANY_SIZE)) ||
- ((StringInfoIn->FontInfoMask & (EFI_FONT_INFO_SYS_STYLE | EFI_FONT_INFO_ANY_STYLE)) ==
+ ((StringInfoIn->FontInfoMask & (EFI_FONT_INFO_SYS_STYLE | EFI_FONT_INFO_ANY_STYLE)) ==
(EFI_FONT_INFO_SYS_STYLE | EFI_FONT_INFO_ANY_STYLE)) ||
- ((StringInfoIn->FontInfoMask & (EFI_FONT_INFO_RESIZE | EFI_FONT_INFO_ANY_SIZE)) ==
- (EFI_FONT_INFO_RESIZE | EFI_FONT_INFO_ANY_SIZE)) ||
- ((StringInfoIn->FontInfoMask & (EFI_FONT_INFO_RESTYLE | EFI_FONT_INFO_ANY_STYLE)) ==
+ ((StringInfoIn->FontInfoMask & (EFI_FONT_INFO_RESIZE | EFI_FONT_INFO_ANY_SIZE)) ==
+ (EFI_FONT_INFO_RESIZE | EFI_FONT_INFO_ANY_SIZE)) ||
+ ((StringInfoIn->FontInfoMask & (EFI_FONT_INFO_RESTYLE | EFI_FONT_INFO_ANY_STYLE)) ==
(EFI_FONT_INFO_RESTYLE | EFI_FONT_INFO_ANY_STYLE))) {
return EFI_INVALID_PARAMETER;
}
@@ -2838,7 +2838,7 @@ HiiGetFontInfo ( if ((StringInfoIn->FontInfoMask & EFI_FONT_INFO_SYS_SIZE) == EFI_FONT_INFO_SYS_SIZE) {
InfoOut.FontInfo.FontSize = SystemDefault->FontInfo.FontSize;
- }
+ }
if ((StringInfoIn->FontInfoMask & EFI_FONT_INFO_SYS_STYLE) == EFI_FONT_INFO_SYS_STYLE) {
InfoOut.FontInfo.FontStyle = SystemDefault->FontInfo.FontStyle;
}
@@ -2848,7 +2848,7 @@ HiiGetFontInfo ( if ((StringInfoIn->FontInfoMask & EFI_FONT_INFO_SYS_BACK_COLOR) == EFI_FONT_INFO_SYS_BACK_COLOR) {
InfoOut.BackgroundColor = SystemDefault->BackgroundColor;
}
-
+
ASSERT (FontInfo != NULL);
FontInfo->FontSize = InfoOut.FontInfo.FontSize;
FontInfo->FontStyle = InfoOut.FontInfo.FontStyle;
@@ -2856,7 +2856,7 @@ HiiGetFontInfo ( if (IsFontInfoExisted (Private, FontInfo, &InfoOut.FontInfoMask, LocalFontHandle, &GlobalFont)) {
//
// Test to guarantee all characters are available in the found font.
- //
+ //
if (String != NULL) {
StringIn = String;
while (*StringIn != 0) {
@@ -2873,21 +2873,21 @@ HiiGetFontInfo ( //
if (StringInfoOut != NULL) {
StringInfoOutLen = sizeof (EFI_FONT_DISPLAY_INFO) - sizeof (EFI_FONT_INFO) + GlobalFont->FontInfoSize;
- *StringInfoOut = (EFI_FONT_DISPLAY_INFO *) AllocateZeroPool (StringInfoOutLen);
+ *StringInfoOut = (EFI_FONT_DISPLAY_INFO *) AllocateZeroPool (StringInfoOutLen);
if (*StringInfoOut == NULL) {
Status = EFI_OUT_OF_RESOURCES;
LocalFontHandle = NULL;
goto Exit;
}
-
+
CopyMem (*StringInfoOut, &InfoOut, sizeof (EFI_FONT_DISPLAY_INFO));
CopyMem (&(*StringInfoOut)->FontInfo, GlobalFont->FontInfo, GlobalFont->FontInfoSize);
}
-
- LocalFontHandle = GlobalFont->Entry.ForwardLink;
+
+ LocalFontHandle = GlobalFont->Entry.ForwardLink;
Status = EFI_SUCCESS;
goto Exit;
- }
+ }
Status = EFI_NOT_FOUND;
diff --git a/MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabase.h b/MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabase.h index 8336dd0..4391625 100644 --- a/MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabase.h +++ b/MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabase.h @@ -1,7 +1,7 @@ /** @file
Private structures definitions in HiiDatabase.
-Copyright (c) 2007 - 2017, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2007 - 2018, Intel Corporation. All rights reserved.<BR>
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
@@ -390,10 +390,10 @@ typedef struct _HII_DATABASE_PRIVATE_DATA { @param BufferLen The length of the Buffer in bytes.
- @param Buffer Points to a buffer which will be converted to be the
+ @param Buffer Points to a buffer which will be converted to be the
content of the generated string.
- @param Flag If 1, the buffer contains data for the value of GUID or PATH stored in
+ @param Flag If 1, the buffer contains data for the value of GUID or PATH stored in
UINT8 *; if 2, the buffer contains unicode string for the value of NAME;
if 3, the buffer contains other data.
@@ -460,21 +460,21 @@ IsFontInfoExisted ( /**
This function invokes the matching registered function.
-
+
@param Private HII Database driver private structure.
@param NotifyType The type of change concerning the database.
@param PackageInstance Points to the package referred to by the notification.
@param PackageType Package type
@param Handle The handle of the package list which contains the specified package.
-
- @retval EFI_SUCCESS Already checked all registered function and invoked
+
+ @retval EFI_SUCCESS Already checked all registered function and invoked
if matched.
@retval EFI_INVALID_PARAMETER Any input parameter is not valid.
-
+
**/
EFI_STATUS
InvokeRegisteredFunction (
- IN HII_DATABASE_PRIVATE_DATA *Private,
+ IN HII_DATABASE_PRIVATE_DATA *Private,
IN EFI_HII_DATABASE_NOTIFY_TYPE NotifyType,
IN VOID *PackageInstance,
IN UINT8 PackageType,
@@ -508,7 +508,7 @@ GetSystemFont ( /**
Parse all string blocks to find a String block specified by StringId.
If StringId = (EFI_STRING_ID) (-1), find out all EFI_HII_SIBT_FONT blocks
- within this string package and backup its information. If LastStringId is
+ within this string package and backup its information. If LastStringId is
specified, the string id of last string block will also be output.
If StringId = 0, output the string id of last string block (EFI_HII_SIBT_STRING).
@@ -734,8 +734,8 @@ HiiStringToImage ( RowInfoArray or Blt.
@retval EFI_INVALID_PARAMETER The Blt or PackageList was NULL.
@retval EFI_INVALID_PARAMETER Flags were invalid combination.
- @retval EFI_NOT_FOUND The specified PackageList is not in the Database or the stringid is not
- in the specified PackageList.
+ @retval EFI_NOT_FOUND The specified PackageList is not in the Database or the stringid is not
+ in the specified PackageList.
**/
EFI_STATUS
@@ -806,7 +806,7 @@ HiiGetGlyph ( @param StringInfoOut Upon return, contains the matching font's information.
If NULL, then no information is returned. This buffer
is allocated with a call to the Boot Service AllocatePool().
- It is the caller's responsibility to call the Boot
+ It is the caller's responsibility to call the Boot
Service FreePool() when the caller no longer requires
the contents of StringInfoOut.
@param String Points to the string which will be tested to
@@ -1067,7 +1067,7 @@ HiiDrawImage ( @retval EFI_SUCCESS The image was successfully drawn.
@retval EFI_OUT_OF_RESOURCES Unable to allocate an output buffer for Blt.
@retval EFI_INVALID_PARAMETER The Blt was NULL.
- @retval EFI_NOT_FOUND The image specified by ImageId is not in the database.
+ @retval EFI_NOT_FOUND The image specified by ImageId is not in the database.
The specified PackageList is not in the database.
**/
@@ -1654,7 +1654,7 @@ HiiListPackageLists ( @retval EFI_NOT_FOUND The specified Handle could not be found in the
current database.
@retval EFI_INVALID_PARAMETER BufferSize was NULL.
- @retval EFI_INVALID_PARAMETER The value referenced by BufferSize was not zero
+ @retval EFI_INVALID_PARAMETER The value referenced by BufferSize was not zero
and Buffer was NULL.
**/
@@ -1725,7 +1725,7 @@ HiiRegisterPackageNotify ( unregistered.
@retval EFI_SUCCESS Notification is unregistered successfully.
- @retval EFI_NOT_FOUND The incoming notification handle does not exist
+ @retval EFI_NOT_FOUND The incoming notification handle does not exist
in current hii database.
**/
@@ -1912,8 +1912,8 @@ HiiConfigRoutingExtractConfig ( instance.
@param Results Null-terminated Unicode string in
<MultiConfigAltResp> format which has all values
- filled in for the entirety of the current HII
- database. String to be allocated by the called
+ filled in for the entirety of the current HII
+ database. String to be allocated by the called
function. De-allocation is up to the caller.
@retval EFI_SUCCESS The Results string is filled with the values
@@ -2064,7 +2064,7 @@ HiiBlockToConfig ( value pair. Block is left updated and
Progress points at the '&' preceding the first
non-<BlockName>.
- @retval EFI_BUFFER_TOO_SMALL Block not large enough. Progress undefined.
+ @retval EFI_BUFFER_TOO_SMALL Block not large enough. Progress undefined.
BlockSize is updated with the required buffer size.
**/
@@ -2136,18 +2136,18 @@ HiiGetAltCfg ( This function accepts a <MultiKeywordResp> formatted string, finds the associated
keyword owners, creates a <MultiConfigResp> string from it and forwards it to the
EFI_HII_ROUTING_PROTOCOL.RouteConfig function.
-
- If there is an issue in resolving the contents of the KeywordString, then the
- function returns an error and also sets the Progress and ProgressErr with the
+
+ If there is an issue in resolving the contents of the KeywordString, then the
+ function returns an error and also sets the Progress and ProgressErr with the
appropriate information about where the issue occurred and additional data about
- the nature of the issue.
-
+ the nature of the issue.
+
In the case when KeywordString containing multiple keywords, when an EFI_NOT_FOUND
error is generated during processing the second or later keyword element, the system
- storage associated with earlier keywords is not modified. All elements of the
+ storage associated with earlier keywords is not modified. All elements of the
KeywordString must successfully pass all tests for format and access prior to making
any modifications to storage.
-
+
In the case when EFI_DEVICE_ERROR is returned from the processing of a KeywordString
containing multiple keywords, the state of storage associated with earlier keywords
is undefined.
@@ -2155,18 +2155,18 @@ HiiGetAltCfg ( @param This Pointer to the EFI_KEYWORD_HANDLER _PROTOCOL instance.
- @param KeywordString A null-terminated string in <MultiKeywordResp> format.
+ @param KeywordString A null-terminated string in <MultiKeywordResp> format.
- @param Progress On return, points to a character in the KeywordString.
- Points to the string's NULL terminator if the request
- was successful. Points to the most recent '&' before
+ @param Progress On return, points to a character in the KeywordString.
+ Points to the string's NULL terminator if the request
+ was successful. Points to the most recent '&' before
the first failing name / value pair (or the beginning
of the string if the failure is in the first name / value
pair) if the request was not successful.
@param ProgressErr If during the processing of the KeywordString there was
- a failure, this parameter gives additional information
- about the possible source of the problem. The various
+ a failure, this parameter gives additional information
+ about the possible source of the problem. The various
errors are defined in "Related Definitions" below.
@@ -2174,16 +2174,16 @@ HiiGetAltCfg ( @retval EFI_INVALID_PARAMETER One or more of the following are TRUE:
1. KeywordString is NULL.
- 2. Parsing of the KeywordString resulted in an
+ 2. Parsing of the KeywordString resulted in an
error. See Progress and ProgressErr for more data.
- @retval EFI_NOT_FOUND An element of the KeywordString was not found.
+ @retval EFI_NOT_FOUND An element of the KeywordString was not found.
See ProgressErr for more data.
- @retval EFI_OUT_OF_RESOURCES Required system resources could not be allocated.
+ @retval EFI_OUT_OF_RESOURCES Required system resources could not be allocated.
See ProgressErr for more data.
-
- @retval EFI_ACCESS_DENIED The action violated system policy. See ProgressErr
+
+ @retval EFI_ACCESS_DENIED The action violated system policy. See ProgressErr
for more data.
@retval EFI_DEVICE_ERROR An unexpected system error occurred. See ProgressErr
@@ -2191,7 +2191,7 @@ HiiGetAltCfg ( **/
EFI_STATUS
-EFIAPI
+EFIAPI
EfiConfigKeywordHandlerSetData (
IN EFI_CONFIG_KEYWORD_HANDLER_PROTOCOL *This,
IN CONST EFI_STRING KeywordString,
@@ -2201,56 +2201,56 @@ EfiConfigKeywordHandlerSetData ( /**
- This function accepts a <MultiKeywordRequest> formatted string, finds the underlying
+ This function accepts a <MultiKeywordRequest> formatted string, finds the underlying
keyword owners, creates a <MultiConfigRequest> string from it and forwards it to the
EFI_HII_ROUTING_PROTOCOL.ExtractConfig function.
-
+
If there is an issue in resolving the contents of the KeywordString, then the function
returns an EFI_INVALID_PARAMETER and also set the Progress and ProgressErr with the
appropriate information about where the issue occurred and additional data about the
nature of the issue.
-
+
In the case when KeywordString is NULL, or contains multiple keywords, or when
EFI_NOT_FOUND is generated while processing the keyword elements, the Results string
- contains values returned for all keywords processed prior to the keyword generating the
+ contains values returned for all keywords processed prior to the keyword generating the
error but no values for the keyword with error or any following keywords.
-
+
@param This Pointer to the EFI_KEYWORD_HANDLER _PROTOCOL instance.
-
+
@param NameSpaceId A null-terminated string containing the platform configuration
language to search through in the system. If a NULL is passed
in, then it is assumed that any platform configuration language
with the prefix of "x-UEFI-" are searched.
-
+
@param KeywordString A null-terminated string in <MultiKeywordRequest> format. If a
- NULL is passed in the KeywordString field, all of the known
- keywords in the system for the NameSpaceId specified are
+ NULL is passed in the KeywordString field, all of the known
+ keywords in the system for the NameSpaceId specified are
returned in the Results field.
-
+
@param Progress On return, points to a character in the KeywordString. Points
- to the string's NULL terminator if the request was successful.
+ to the string's NULL terminator if the request was successful.
Points to the most recent '&' before the first failing name / value
pair (or the beginning of the string if the failure is in the first
name / value pair) if the request was not successful.
-
+
@param ProgressErr If during the processing of the KeywordString there was a
- failure, this parameter gives additional information about the
+ failure, this parameter gives additional information about the
possible source of the problem. See the definitions in SetData()
for valid value definitions.
-
+
@param Results A null-terminated string in <MultiKeywordResp> format is returned
- which has all the values filled in for the keywords in the
+ which has all the values filled in for the keywords in the
KeywordString. This is a callee-allocated field, and must be freed
- by the caller after being used.
+ by the caller after being used.
@retval EFI_SUCCESS The specified action was completed successfully.
-
+
@retval EFI_INVALID_PARAMETER One or more of the following are TRUE:
1.Progress, ProgressErr, or Results is NULL.
2.Parsing of the KeywordString resulted in an error. See
Progress and ProgressErr for more data.
-
+
@retval EFI_NOT_FOUND An element of the KeywordString was not found. See
ProgressErr for more data.
@@ -2260,7 +2260,7 @@ EfiConfigKeywordHandlerSetData ( @retval EFI_OUT_OF_RESOURCES Required system resources could not be allocated. See
ProgressErr for more data.
-
+
@retval EFI_ACCESS_DENIED The action violated system policy. See ProgressErr for
more data.
@@ -2269,12 +2269,12 @@ EfiConfigKeywordHandlerSetData ( **/
EFI_STATUS
-EFIAPI
+EFIAPI
EfiConfigKeywordHandlerGetData (
IN EFI_CONFIG_KEYWORD_HANDLER_PROTOCOL *This,
IN CONST EFI_STRING NameSpaceId, OPTIONAL
IN CONST EFI_STRING KeywordString, OPTIONAL
- OUT EFI_STRING *Progress,
+ OUT EFI_STRING *Progress,
OUT UINT32 *ProgressErr,
OUT EFI_STRING *Results
);
@@ -2298,11 +2298,11 @@ HiiCompareLanguage ( /**
Retrieves a pointer to a Null-terminated ASCII string containing the list
- of languages that an HII handle in the HII Database supports. The returned
+ of languages that an HII handle in the HII Database supports. The returned
string is allocated using AllocatePool(). The caller is responsible for freeing
the returned string using FreePool(). The format of the returned string follows
the language format assumed the HII Database.
-
+
If HiiHandle is NULL, then ASSERT().
@param[in] HiiHandle A handle that was previously registered in the HII Database.
diff --git a/MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabase.uni b/MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabase.uni index 58f2208..43c6805 100644 --- a/MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabase.uni +++ b/MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabase.uni @@ -4,13 +4,13 @@ // This driver produces all required HII serivces that includes HiiDataBase, HiiString,
// HiiFont, HiiConfigRouting. To support UEFI HII, this driver is required.
//
-// Copyright (c) 2007 - 2014, Intel Corporation. All rights reserved.<BR>
+// Copyright (c) 2007 - 2018, Intel Corporation. All rights reserved.<BR>
//
// 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,
// WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
//
diff --git a/MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseDxe.inf b/MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseDxe.inf index adb3603..0593ff8 100644 --- a/MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseDxe.inf +++ b/MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseDxe.inf @@ -4,14 +4,14 @@ # This driver produces all required HII serivces that includes HiiDataBase, HiiString,
# HiiFont, HiiConfigRouting. To support UEFI HII, this driver is required.
#
-# Copyright (c) 2007 - 2017, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2007 - 2018, Intel Corporation. All rights reserved.<BR>
#
-# 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,
+# 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,
# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
#
#
@@ -81,7 +81,7 @@ gEfiMdePkgTokenSpaceGuid.PcdUefiVariableDefaultPlatformLang ## CONSUMES
gEfiMdeModulePkgTokenSpaceGuid.PcdNvStoreDefaultValueBuffer ## CONSUMES
-[Guids]
+[Guids]
#
# Event registered to EFI_HII_SET_KEYBOARD_LAYOUT_EVENT_GUID group,
# which will be triggered by EFI_HII_DATABASE_PROTOCOL.SetKeyboardLayout().
diff --git a/MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseEntry.c b/MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseEntry.c index 9d09c60..5951b5e 100644 --- a/MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseEntry.c +++ b/MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseEntry.c @@ -2,7 +2,7 @@ This file contains the entry code to the HII database, which is defined by
UEFI 2.1 specification.
-Copyright (c) 2007 - 2016, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2007 - 2018, Intel Corporation. All rights reserved.<BR>
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
@@ -188,7 +188,7 @@ InitializeHiiDatabase ( ASSERT_PROTOCOL_ALREADY_INSTALLED (NULL, &gEfiHiiStringProtocolGuid);
ASSERT_PROTOCOL_ALREADY_INSTALLED (NULL, &gEfiHiiConfigRoutingProtocolGuid);
ASSERT_PROTOCOL_ALREADY_INSTALLED (NULL, &gEfiConfigKeywordHandlerProtocolGuid);
-
+
InitializeListHead (&mPrivate.DatabaseList);
InitializeListHead (&mPrivate.DatabaseNotifyList);
InitializeListHead (&mPrivate.HiiHandleList);
diff --git a/MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseExtra.uni b/MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseExtra.uni index d85eef1..6fbd75a 100644 --- a/MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseExtra.uni +++ b/MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseExtra.uni @@ -1,7 +1,7 @@ // /** @file
// HiiDatabase Localized Strings and Content
//
-// Copyright (c) 2013 - 2014, Intel Corporation. All rights reserved.<BR>
+// Copyright (c) 2013 - 2018, Intel Corporation. All rights reserved.<BR>
//
// This program and the accompanying materials
// are licensed and made available under the terms and conditions of the BSD License
@@ -13,8 +13,8 @@ //
// **/
-#string STR_PROPERTIES_MODULE_NAME
-#language en-US
+#string STR_PROPERTIES_MODULE_NAME
+#language en-US
"HII Database DXE Driver"
diff --git a/MdeModulePkg/Universal/HiiDatabaseDxe/Image.c b/MdeModulePkg/Universal/HiiDatabaseDxe/Image.c index 431a5b8..d101082 100644 --- a/MdeModulePkg/Universal/HiiDatabaseDxe/Image.c +++ b/MdeModulePkg/Universal/HiiDatabaseDxe/Image.c @@ -2,7 +2,7 @@ Implementation for EFI_HII_IMAGE_PROTOCOL.
-Copyright (c) 2007 - 2017, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2007 - 2018, Intel Corporation. All rights reserved.<BR>
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
@@ -1018,7 +1018,7 @@ HiiGetImage ( @retval EFI_SUCCESS The new image was updated successfully.
@retval EFI_NOT_FOUND The image specified by ImageId is not in the
- database. The specified PackageList is not in the database.
+ database. The specified PackageList is not in the database.
@retval EFI_INVALID_PARAMETER The Image was NULL.
**/
@@ -1426,8 +1426,8 @@ HiiDrawImage ( @retval EFI_SUCCESS The image was successfully drawn.
@retval EFI_OUT_OF_RESOURCES Unable to allocate an output buffer for Blt.
@retval EFI_INVALID_PARAMETER The Blt was NULL.
- @retval EFI_NOT_FOUND The image specified by ImageId is not in the database.
- The specified PackageList is not in the database.
+ @retval EFI_NOT_FOUND The image specified by ImageId is not in the database.
+ The specified PackageList is not in the database.
**/
EFI_STATUS
diff --git a/MdeModulePkg/Universal/HiiDatabaseDxe/String.c b/MdeModulePkg/Universal/HiiDatabaseDxe/String.c index d5a7488..aeda474 100644 --- a/MdeModulePkg/Universal/HiiDatabaseDxe/String.c +++ b/MdeModulePkg/Universal/HiiDatabaseDxe/String.c @@ -2,7 +2,7 @@ Implementation for EFI_HII_STRING_PROTOCOL.
-Copyright (c) 2007 - 2016, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2007 - 2018, Intel Corporation. All rights reserved.<BR>
(C) Copyright 2016 Hewlett Packard Enterprise Development LP<BR>
This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License
@@ -236,7 +236,7 @@ GetStringFontInfo ( /**
Parse all string blocks to find a String block specified by StringId.
If StringId = (EFI_STRING_ID) (-1), find out all EFI_HII_SIBT_FONT blocks
- within this string package and backup its information. If LastStringId is
+ within this string package and backup its information. If LastStringId is
specified, the string id of last string block will also be output.
If StringId = 0, output the string id of last string block (EFI_HII_SIBT_STRING).
@@ -524,7 +524,7 @@ FindStringBlock ( // Since string package tool set FontId initially to 0 and increases it
// progressively by one, StringPackage->FondId always represents an unique
// and available FontId.
- //
+ //
StringPackage->FontId++;
FreePool (FontInfo);
@@ -574,7 +574,7 @@ FindStringBlock ( *StartStringId = CurrentStringId;
}
}
-
+
//
// Get last string ID
//
@@ -681,7 +681,7 @@ GetStringWorker ( }
//
- // Get the string font. The FontId 0 is the default font for those string blocks which
+ // Get the string font. The FontId 0 is the default font for those string blocks which
// do not specify a font identifier. If default font is not specified, return NULL.
//
if (StringFontInfo != NULL) {
@@ -706,17 +706,17 @@ GetStringWorker ( /**
If GetStringBlock find the StringId's string is not saved in the exist string block,
- this function will create the UCS2 string block to save the string; also split the
+ this function will create the UCS2 string block to save the string; also split the
skip block into two or one skip block.
This is a internal function.
-
+
@param StringPackage Hii string package instance.
@param StartStringId The first id in the skip block which StringId in the block.
@param StringId The string's id, which is unique within
- PackageList.
- @param BlockType Output the block type of found string block.
- @param StringBlockAddr Output the block address of found string block.
+ PackageList.
+ @param BlockType Output the block type of found string block.
+ @param StringBlockAddr Output the block address of found string block.
@param FontBlock whether this string block has font info.
@retval EFI_SUCCESS The string font is outputted successfully.
@@ -735,7 +735,7 @@ InsertLackStringBlock ( {
UINT8 *BlockPtr;
UINT8 *StringBlock;
- UINT32 SkipLen;
+ UINT32 SkipLen;
UINT32 OldBlockSize;
UINT32 NewBlockSize;
UINT32 FrontSkipNum;
@@ -746,7 +746,7 @@ InsertLackStringBlock ( FrontSkipNum = 0;
SkipLen = 0;
OldStringAddr = *StringBlockAddr;
-
+
ASSERT (*BlockType == EFI_HII_SIBT_SKIP1 || *BlockType == EFI_HII_SIBT_SKIP2);
//
// Old skip block size.
@@ -757,7 +757,7 @@ InsertLackStringBlock ( } else {
SkipLen = sizeof (EFI_HII_SIBT_SKIP2_BLOCK);
IdCount = *(UINT16*)(OldStringAddr + sizeof (EFI_HII_STRING_BLOCK));
- }
+ }
//
// New create UCS or UCS2 block size.
@@ -801,7 +801,7 @@ InsertLackStringBlock ( //
// Copy old block in front of skip block.
//
- CopyMem (StringBlock, StringPackage->StringBlock, OldStringAddr - StringPackage->StringBlock);
+ CopyMem (StringBlock, StringPackage->StringBlock, OldStringAddr - StringPackage->StringBlock);
BlockPtr = StringBlock + (OldStringAddr - StringPackage->StringBlock);
if (FrontSkipNum > 0) {
@@ -838,7 +838,7 @@ InsertLackStringBlock ( //
// Append a EFI_HII_SIBT_END block to the end.
//
- CopyMem (BlockPtr, OldStringAddr + SkipLen, OldBlockSize - (OldStringAddr - StringPackage->StringBlock) - SkipLen);
+ CopyMem (BlockPtr, OldStringAddr + SkipLen, OldBlockSize - (OldStringAddr - StringPackage->StringBlock) - SkipLen);
if (FontBlock) {
*BlockType = EFI_HII_SIBT_STRING_UCS2_FONT;
@@ -918,9 +918,9 @@ SetStringWorker ( &StartStringId
);
if (EFI_ERROR (Status) && (BlockType == EFI_HII_SIBT_SKIP1 || BlockType == EFI_HII_SIBT_SKIP2)) {
- Status = InsertLackStringBlock(StringPackage,
- StartStringId,
- StringId,
+ Status = InsertLackStringBlock(StringPackage,
+ StartStringId,
+ StringId,
&BlockType,
&StringBlockAddr,
(BOOLEAN)(StringFontInfo != NULL)
@@ -947,11 +947,11 @@ SetStringWorker ( return EFI_INVALID_PARAMETER;
} else {
Referred = ReferFontInfoLocally (
- Private,
- StringPackage,
- StringPackage->FontId,
- FALSE,
- GlobalFont,
+ Private,
+ StringPackage,
+ StringPackage->FontId,
+ FALSE,
+ GlobalFont,
&LocalFont
);
if (!Referred) {
@@ -962,7 +962,7 @@ SetStringWorker ( // Update the FontId of the specified string block to input font info.
//
switch (BlockType) {
- case EFI_HII_SIBT_STRING_SCSU_FONT:
+ case EFI_HII_SIBT_STRING_SCSU_FONT:
case EFI_HII_SIBT_STRINGS_SCSU_FONT:
case EFI_HII_SIBT_STRING_UCS2_FONT:
case EFI_HII_SIBT_STRINGS_UCS2_FONT:
@@ -973,7 +973,7 @@ SetStringWorker ( // When modify the font info of these blocks, the block type should be updated
// to contain font info thus the whole structure should be revised.
// It is recommended to use tool to modify the block type not in the code.
- //
+ //
return EFI_UNSUPPORTED;
}
}
@@ -1004,7 +1004,7 @@ SetStringWorker ( }
*BlockPtr++ = 0;
-
+
TmpSize = OldBlockSize - (StringTextPtr - StringPackage->StringBlock) - AsciiStrSize ((CHAR8 *) StringTextPtr);
CopyMem (
BlockPtr,
@@ -1107,9 +1107,9 @@ SetStringWorker ( /**
This function adds the string String to the group of strings owned by PackageList, with the
- specified font information StringFontInfo and returns a new string id.
- The new string identifier is guaranteed to be unique within the package list.
- That new string identifier is reserved for all languages in the package list.
+ specified font information StringFontInfo and returns a new string id.
+ The new string identifier is guaranteed to be unique within the package list.
+ That new string identifier is reserved for all languages in the package list.
@param This A pointer to the EFI_HII_STRING_PROTOCOL instance.
@@ -1341,7 +1341,7 @@ HiiNewString ( // Calculate the length of the string blocks, including string block to record
// printable language full name and EFI_HII_SIBT_END_BLOCK.
//
- Ucs2BlockSize = (UINT32) (StrSize ((CHAR16 *) LanguageName) +
+ Ucs2BlockSize = (UINT32) (StrSize ((CHAR16 *) LanguageName) +
(*StringId - 1) * sizeof (EFI_HII_SIBT_STRING_UCS2_BLOCK) - sizeof (CHAR16));
BlockSize = Ucs2BlockSize + sizeof (EFI_HII_SIBT_END_BLOCK);
@@ -1519,7 +1519,7 @@ HiiNewString ( PackageListNode->PackageListHdr.PackageLength += FontBlockSize + Ucs2FontBlockSize;
//
- // Increase the FontId to make it unique since we already add
+ // Increase the FontId to make it unique since we already add
// a EFI_HII_SIBT_FONT block to this string package.
//
StringPackage->FontId++;
@@ -1671,16 +1671,16 @@ HiiGetString ( //
// Second search: to match the StringId in other available languages if exist.
//
- for (Link = PackageListNode->StringPkgHdr.ForwardLink;
+ for (Link = PackageListNode->StringPkgHdr.ForwardLink;
Link != &PackageListNode->StringPkgHdr;
Link = Link->ForwardLink
) {
- StringPackage = CR (Link, HII_STRING_PACKAGE_INSTANCE, StringEntry, HII_STRING_PACKAGE_SIGNATURE);
+ StringPackage = CR (Link, HII_STRING_PACKAGE_INSTANCE, StringEntry, HII_STRING_PACKAGE_SIGNATURE);
Status = GetStringWorker (Private, StringPackage, StringId, NULL, NULL, NULL);
if (!EFI_ERROR (Status)) {
return EFI_INVALID_LANGUAGE;
}
- }
+ }
}
return EFI_NOT_FOUND;
@@ -1940,7 +1940,7 @@ HiiGetSecondaryLanguages ( Private = HII_STRING_DATABASE_PRIVATE_DATA_FROM_THIS (This);
- PackageListNode = NULL;
+ PackageListNode = NULL;
for (Link = Private->DatabaseList.ForwardLink; Link != &Private->DatabaseList; Link = Link->ForwardLink) {
DatabaseRecord = CR (Link, HII_DATABASE_RECORD, DatabaseEntry, HII_DATABASE_RECORD_SIGNATURE);
if (DatabaseRecord->Handle == PackageList) {
@@ -1951,7 +1951,7 @@ HiiGetSecondaryLanguages ( if (PackageListNode == NULL) {
return EFI_NOT_FOUND;
}
-
+
Languages = NULL;
ResultSize = 0;
for (Link1 = PackageListNode->StringPkgHdr.ForwardLink;
diff --git a/MdeModulePkg/Universal/HiiResourcesSampleDxe/HiiResourcesSample.c b/MdeModulePkg/Universal/HiiResourcesSampleDxe/HiiResourcesSample.c index adce780..6f87716 100644 --- a/MdeModulePkg/Universal/HiiResourcesSampleDxe/HiiResourcesSample.c +++ b/MdeModulePkg/Universal/HiiResourcesSampleDxe/HiiResourcesSample.c @@ -2,7 +2,7 @@ This is an example of how a driver retrieve HII data using HII Package List
Protocol, and how to publish the HII data.
-Copyright (c) 2009 - 2011, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2009 - 2018, Intel Corporation. All rights reserved.<BR>
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,7 +51,7 @@ HII_VENDOR_DEVICE_PATH mHiiVendorDevicePath = { {
END_DEVICE_PATH_TYPE,
END_ENTIRE_DEVICE_PATH_SUBTYPE,
- {
+ {
(UINT8) (END_DEVICE_PATH_LENGTH),
(UINT8) ((END_DEVICE_PATH_LENGTH) >> 8)
}
@@ -60,7 +60,7 @@ HII_VENDOR_DEVICE_PATH mHiiVendorDevicePath = { /**
Main entry for this driver.
-
+
@param[in] ImageHandle Image handle this driver.
@param[in] SystemTable Pointer to SystemTable.
diff --git a/MdeModulePkg/Universal/HiiResourcesSampleDxe/HiiResourcesSample.uni b/MdeModulePkg/Universal/HiiResourcesSampleDxe/HiiResourcesSample.uni index acef41e..0de7ad7 100644 --- a/MdeModulePkg/Universal/HiiResourcesSampleDxe/HiiResourcesSample.uni +++ b/MdeModulePkg/Universal/HiiResourcesSampleDxe/HiiResourcesSample.uni @@ -4,13 +4,13 @@ // This driver show how a HII driver retrieve HII data using HII Package List protocol
// and publish the HII data.
//
-// Copyright (c) 2009 - 2014, Intel Corporation. All rights reserved.<BR>
+// Copyright (c) 2009 - 2018, Intel Corporation. All rights reserved.<BR>
//
// 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,
// WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
//
diff --git a/MdeModulePkg/Universal/HiiResourcesSampleDxe/HiiResourcesSampleDxe.inf b/MdeModulePkg/Universal/HiiResourcesSampleDxe/HiiResourcesSampleDxe.inf index 51a598c..7287ba5 100644 --- a/MdeModulePkg/Universal/HiiResourcesSampleDxe/HiiResourcesSampleDxe.inf +++ b/MdeModulePkg/Universal/HiiResourcesSampleDxe/HiiResourcesSampleDxe.inf @@ -4,13 +4,13 @@ # This driver show how a HII driver retrieve HII data using HII Package List protocol
# and publish the HII data.
#
-# Copyright (c) 2009 - 2014, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2009 - 2018, Intel Corporation. All rights reserved.<BR>
#
# 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,
# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
#
diff --git a/MdeModulePkg/Universal/HiiResourcesSampleDxe/HiiResourcesSampleExtra.uni b/MdeModulePkg/Universal/HiiResourcesSampleDxe/HiiResourcesSampleExtra.uni index b7c85c1..2705e70 100644 --- a/MdeModulePkg/Universal/HiiResourcesSampleDxe/HiiResourcesSampleExtra.uni +++ b/MdeModulePkg/Universal/HiiResourcesSampleDxe/HiiResourcesSampleExtra.uni @@ -1,7 +1,7 @@ // /** @file
// HiiResourcesSample Localized Strings and Content
//
-// Copyright (c) 2013 - 2014, Intel Corporation. All rights reserved.<BR>
+// Copyright (c) 2013 - 2018, Intel Corporation. All rights reserved.<BR>
//
// This program and the accompanying materials
// are licensed and made available under the terms and conditions of the BSD License
@@ -13,8 +13,8 @@ //
// **/
-#string STR_PROPERTIES_MODULE_NAME
-#language en-US
+#string STR_PROPERTIES_MODULE_NAME
+#language en-US
"HII Resources Sample DXE Driver"
diff --git a/MdeModulePkg/Universal/HiiResourcesSampleDxe/Sample.vfr b/MdeModulePkg/Universal/HiiResourcesSampleDxe/Sample.vfr index 3ca2098..e53c1f2 100644 --- a/MdeModulePkg/Universal/HiiResourcesSampleDxe/Sample.vfr +++ b/MdeModulePkg/Universal/HiiResourcesSampleDxe/Sample.vfr @@ -1,6 +1,6 @@ // *++
//
-// Copyright (c) 2009 - 2011, Intel Corporation. All rights reserved.<BR>
+// Copyright (c) 2009 - 2018, Intel Corporation. All rights reserved.<BR>
// 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
@@ -31,10 +31,10 @@ formset form formid = 1,
title = STRING_TOKEN(STR_SAMPLE_FORM1_TITLE);
- text
+ text
help = STRING_TOKEN(STR_SAMPLE_VERSION_HELP),
text = STRING_TOKEN(STR_SAMPLE_VERSION_TEXT),
- text = STRING_TOKEN(STR_SAMPLE_EMPTY);
+ text = STRING_TOKEN(STR_SAMPLE_EMPTY);
subtitle text = STRING_TOKEN(STR_SAMPLE_EMPTY);
diff --git a/MdeModulePkg/Universal/HiiResourcesSampleDxe/SampleStrings.uni b/MdeModulePkg/Universal/HiiResourcesSampleDxe/SampleStrings.uni index f3464b3..85948e2 100644 --- a/MdeModulePkg/Universal/HiiResourcesSampleDxe/SampleStrings.uni +++ b/MdeModulePkg/Universal/HiiResourcesSampleDxe/SampleStrings.uni @@ -1,24 +1,24 @@ // *++
//
-// Copyright (c) 2009, Intel Corporation. All rights reserved.<BR>
-// 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,
-// WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
-//
+// Copyright (c) 2009 - 2018, Intel Corporation. All rights reserved.<BR>
+// 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,
+// WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+//
// Module Name:
//
// SampleStrings.uni
-//
+//
// Abstract:
-//
+//
// String definitions for Sample.vfr
-//
+//
// Revision History:
-//
+//
// --*/
diff --git a/MdeModulePkg/Universal/LegacyRegion2Dxe/LegacyRegion2.c b/MdeModulePkg/Universal/LegacyRegion2Dxe/LegacyRegion2.c index a956ea9..db4a2e8 100644 --- a/MdeModulePkg/Universal/LegacyRegion2Dxe/LegacyRegion2.c +++ b/MdeModulePkg/Universal/LegacyRegion2Dxe/LegacyRegion2.c @@ -1,13 +1,13 @@ /** @file
Dummy implementation of Legacy Region 2 Protocol.
- This generic implementation of the Legacy Region 2 Protocol does not actually
- perform any lock/unlock operations. This module may be used on platforms
- that do not provide HW locking of the legacy memory regions. It can also
+ This generic implementation of the Legacy Region 2 Protocol does not actually
+ perform any lock/unlock operations. This module may be used on platforms
+ that do not provide HW locking of the legacy memory regions. It can also
be used as a template driver for implementing the Legacy Region 2 Protocol on
a platform that does support HW locking of the legacy memory regions.
-Copyright (c) 2009 - 2010, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2009 - 2018, Intel Corporation. All rights reserved.<BR>
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
@@ -33,9 +33,9 @@ EFI_LEGACY_REGION2_PROTOCOL mLegacyRegion2 = { /**
Modify the hardware to allow (decode) or disallow (not decode) memory reads in a region.
- If the On parameter evaluates to TRUE, this function enables memory reads in the address range
+ If the On parameter evaluates to TRUE, this function enables memory reads in the address range
Start to (Start + Length - 1).
- If the On parameter evaluates to FALSE, this function disables memory reads in the address range
+ If the On parameter evaluates to FALSE, this function disables memory reads in the address range
Start to (Start + Length - 1).
@param This[in] Indicates the EFI_LEGACY_REGION_PROTOCOL instance.
@@ -114,7 +114,7 @@ LegacyRegion2Lock ( /**
Modify the hardware to disallow memory attribute changes in a region.
- This function makes the attributes of a region read only. Once a region is boot-locked with this
+ This function makes the attributes of a region read only. Once a region is boot-locked with this
function, the read and write attributes of that region cannot be changed until a power cycle has
reset the boot-lock attribute. Calls to Decode(), Lock() and Unlock() will have no effect.
@@ -155,7 +155,7 @@ LegacyRegion2BootLock ( /**
Modify the hardware to allow memory writes in a region.
- This function changes the attributes of a memory range to allow writes.
+ This function changes the attributes of a memory range to allow writes.
@param This[in] Indicates the EFI_LEGACY_REGION_PROTOCOL instance.
@param Start[in] The beginning of the physical address of the region whose
@@ -193,9 +193,9 @@ LegacyRegion2Unlock ( /**
Get region information for the attributes of the Legacy Region.
- This function is used to discover the granularity of the attributes for the memory in the legacy
+ This function is used to discover the granularity of the attributes for the memory in the legacy
region. Each attribute may have a different granularity and the granularity may not be the same
- for all memory ranges in the legacy region.
+ for all memory ranges in the legacy region.
@param This[in] Indicates the EFI_LEGACY_REGION2_PROTOCOL instance.
@param DescriptorCount[out] The number of region descriptor entries returned in the Descriptor
@@ -223,9 +223,9 @@ LegacyRegionGetInfo ( /**
The user Entry Point for module LegacyRegionDxe. The user code starts with this function.
- @param[in] ImageHandle The firmware allocated handle for the EFI image.
+ @param[in] ImageHandle The firmware allocated handle for the EFI image.
@param[in] SystemTable A pointer to the EFI System Table.
-
+
@retval EFI_SUCCESS The entry point is executed successfully.
**/
@@ -237,12 +237,12 @@ LegacyRegion2Install ( )
{
EFI_STATUS Status;
-
+
//
// Make sure the Legacy Region 2 Protocol is not already installed in the system
//
ASSERT_PROTOCOL_ALREADY_INSTALLED (NULL, &gEfiLegacyRegion2ProtocolGuid);
-
+
//
// Install the protocol on a new handle.
//
diff --git a/MdeModulePkg/Universal/LegacyRegion2Dxe/LegacyRegion2.h b/MdeModulePkg/Universal/LegacyRegion2Dxe/LegacyRegion2.h index be4f854..0329dc5 100644 --- a/MdeModulePkg/Universal/LegacyRegion2Dxe/LegacyRegion2.h +++ b/MdeModulePkg/Universal/LegacyRegion2Dxe/LegacyRegion2.h @@ -1,7 +1,7 @@ /** @file
Internal include file for the dummy Legacy Region 2 Protocol implementation.
-Copyright (c) 2009, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2009 - 2018, Intel Corporation. All rights reserved.<BR>
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
@@ -22,9 +22,9 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. /**
Modify the hardware to allow (decode) or disallow (not decode) memory reads in a region.
- If the On parameter evaluates to TRUE, this function enables memory reads in the address range
+ If the On parameter evaluates to TRUE, this function enables memory reads in the address range
Start to (Start + Length - 1).
- If the On parameter evaluates to FALSE, this function disables memory reads in the address range
+ If the On parameter evaluates to FALSE, this function disables memory reads in the address range
Start to (Start + Length - 1).
@param This[in] Indicates the EFI_LEGACY_REGION_PROTOCOL instance.
@@ -85,7 +85,7 @@ LegacyRegion2Lock ( /**
Modify the hardware to disallow memory attribute changes in a region.
- This function makes the attributes of a region read only. Once a region is boot-locked with this
+ This function makes the attributes of a region read only. Once a region is boot-locked with this
function, the read and write attributes of that region cannot be changed until a power cycle has
reset the boot-lock attribute. Calls to Decode(), Lock() and Unlock() will have no effect.
@@ -119,7 +119,7 @@ LegacyRegion2BootLock ( /**
Modify the hardware to allow memory writes in a region.
- This function changes the attributes of a memory range to allow writes.
+ This function changes the attributes of a memory range to allow writes.
@param This[in] Indicates the EFI_LEGACY_REGION_PROTOCOL instance.
@param Start[in] The beginning of the physical address of the region whose
@@ -148,9 +148,9 @@ LegacyRegion2Unlock ( /**
Get region information for the attributes of the Legacy Region.
- This function is used to discover the granularity of the attributes for the memory in the legacy
+ This function is used to discover the granularity of the attributes for the memory in the legacy
region. Each attribute may have a different granularity and the granularity may not be the same
- for all memory ranges in the legacy region.
+ for all memory ranges in the legacy region.
@param This[in] Indicates the EFI_LEGACY_REGION_PROTOCOL instance.
@param DescriptorCount[out] The number of region descriptor entries returned in the Descriptor
diff --git a/MdeModulePkg/Universal/LegacyRegion2Dxe/LegacyRegion2Dxe.inf b/MdeModulePkg/Universal/LegacyRegion2Dxe/LegacyRegion2Dxe.inf index 46cd490..3a34cf2 100644 --- a/MdeModulePkg/Universal/LegacyRegion2Dxe/LegacyRegion2Dxe.inf +++ b/MdeModulePkg/Universal/LegacyRegion2Dxe/LegacyRegion2Dxe.inf @@ -1,9 +1,9 @@ ## @file
# Produces the Legacy Region 2 Protocol.
#
-# This generic implementation of the Legacy Region 2 Protocol does not actually
-# perform any lock/unlock operations. This module may be used on platforms
-# that do not provide HW locking of the legacy memory regions. It can also
+# This generic implementation of the Legacy Region 2 Protocol does not actually
+# perform any lock/unlock operations. This module may be used on platforms
+# that do not provide HW locking of the legacy memory regions. It can also
# be used as a template driver for implementing the Legacy Region 2 Protocol on
# a platform that does support HW locking of the legacy memory regions.
#
@@ -11,12 +11,12 @@ # Protocol. For Lock/UnLock/Decode, EFI_SUCCESS is returned although the region's
# attributes were not actually modified.
#
-# Copyright (c) 2009 - 2014, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2009 - 2018, Intel Corporation. All rights reserved.<BR>
# 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,
# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
#
@@ -28,7 +28,7 @@ MODULE_UNI_FILE = LegacyRegion2Dxe.uni
FILE_GUID = EC2BEECA-E84A-445B-869B-F7A73C96F58A
MODULE_TYPE = DXE_DRIVER
- VERSION_STRING = 1.0
+ VERSION_STRING = 1.0
ENTRY_POINT = LegacyRegion2Install
#
diff --git a/MdeModulePkg/Universal/LegacyRegion2Dxe/LegacyRegion2Dxe.uni b/MdeModulePkg/Universal/LegacyRegion2Dxe/LegacyRegion2Dxe.uni index b665bbf..bfe8862 100644 --- a/MdeModulePkg/Universal/LegacyRegion2Dxe/LegacyRegion2Dxe.uni +++ b/MdeModulePkg/Universal/LegacyRegion2Dxe/LegacyRegion2Dxe.uni @@ -6,18 +6,18 @@ // that do not provide HW locking of the legacy memory regions. It can also
// be used as a template driver for implementing the Legacy Region 2 Protocol on
// a platform that does support HW locking of the legacy memory regions.
-//
+//
// Note: This module does not fully comply with PI Specification of Legacy Region 2
// Protocol. For Lock/UnLock/Decode, EFI_SUCCESS is returned although the region's
// attributes were not actually modified.
//
-// Copyright (c) 2009 - 2014, Intel Corporation. All rights reserved.<BR>
+// Copyright (c) 2009 - 2018, Intel Corporation. All rights reserved.<BR>
//
// 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,
// WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
//
diff --git a/MdeModulePkg/Universal/LegacyRegion2Dxe/LegacyRegion2DxeExtra.uni b/MdeModulePkg/Universal/LegacyRegion2Dxe/LegacyRegion2DxeExtra.uni index 2233505..5c4336b 100644 --- a/MdeModulePkg/Universal/LegacyRegion2Dxe/LegacyRegion2DxeExtra.uni +++ b/MdeModulePkg/Universal/LegacyRegion2Dxe/LegacyRegion2DxeExtra.uni @@ -1,7 +1,7 @@ // /** @file
// LegacyRegion2Dxe Localized Strings and Content
//
-// Copyright (c) 2013 - 2014, Intel Corporation. All rights reserved.<BR>
+// Copyright (c) 2013 - 2018, Intel Corporation. All rights reserved.<BR>
//
// This program and the accompanying materials
// are licensed and made available under the terms and conditions of the BSD License
@@ -13,8 +13,8 @@ //
// **/
-#string STR_PROPERTIES_MODULE_NAME
-#language en-US
+#string STR_PROPERTIES_MODULE_NAME
+#language en-US
"Legacy Region DXE Driver v2"
diff --git a/MdeModulePkg/Universal/LockBox/SmmLockBox/SmmLockBox.c b/MdeModulePkg/Universal/LockBox/SmmLockBox/SmmLockBox.c index d4183ca..28d5180 100644 --- a/MdeModulePkg/Universal/LockBox/SmmLockBox/SmmLockBox.c +++ b/MdeModulePkg/Universal/LockBox/SmmLockBox/SmmLockBox.c @@ -1,11 +1,11 @@ /** @file
LockBox SMM driver.
-
+
Caution: This module requires additional review when modified.
This driver will have external input - communicate buffer in SMM mode.
This external input must be validated carefully to avoid security issue like
buffer overflow, integer overflow.
-
+
SmmLockBoxHandler(), SmmLockBoxRestore(), SmmLockBoxUpdate(), SmmLockBoxSave()
will receive untrusted input and do basic validation.
@@ -47,7 +47,7 @@ BOOLEAN mLocked = FALSE; Restore buffer and length are external input, so this function will validate
it is in SMRAM.
- @param LockBoxParameterSave parameter of lock box save
+ @param LockBoxParameterSave parameter of lock box save
**/
VOID
SmmLockBoxSave (
@@ -131,7 +131,7 @@ SmmLockBoxSetAttributes ( Restore buffer and length are external input, so this function will validate
it is in SMRAM.
- @param LockBoxParameterUpdate parameter of lock box update
+ @param LockBoxParameterUpdate parameter of lock box update
**/
VOID
SmmLockBoxUpdate (
@@ -181,7 +181,7 @@ SmmLockBoxUpdate ( Restore buffer and length are external input, so this function will validate
it is in SMRAM.
- @param LockBoxParameterRestore parameter of lock box restore
+ @param LockBoxParameterRestore parameter of lock box restore
**/
VOID
SmmLockBoxRestore (
@@ -353,7 +353,7 @@ SmmLockBoxHandler ( Smm Ready To Lock event notification handler.
It sets a flag indicating that SMRAM has been locked.
-
+
@param[in] Protocol Points to the protocol's unique identifier.
@param[in] Interface Points to the interface instance.
@param[in] Handle The handle on which the interface was installed.
@@ -378,7 +378,7 @@ SmmReadyToLockEventNotify ( @param[in] ImageHandle Image handle of this driver.
@param[in] SystemTable A Pointer to the EFI System Table.
- @retval EFI_SUCEESS
+ @retval EFI_SUCEESS
@return Others Some error occurs.
**/
EFI_STATUS
diff --git a/MdeModulePkg/Universal/LockBox/SmmLockBox/SmmLockBox.inf b/MdeModulePkg/Universal/LockBox/SmmLockBox/SmmLockBox.inf index 772cad9..f07ab20 100644 --- a/MdeModulePkg/Universal/LockBox/SmmLockBox/SmmLockBox.inf +++ b/MdeModulePkg/Universal/LockBox/SmmLockBox/SmmLockBox.inf @@ -6,7 +6,7 @@ # This external input must be validated carefully to avoid security issue like
# buffer overflow, integer overflow.
#
-# Copyright (c) 2010 - 2015, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2010 - 2018, Intel Corporation. All rights reserved.<BR>
#
# This program and the accompanying materials
# are licensed and made available under the terms and conditions
@@ -32,7 +32,7 @@ #
# The following information is for reference only and not required by the build tools.
#
-# VALID_ARCHITECTURES = IA32 X64
+# VALID_ARCHITECTURES = IA32 X64
#
[Sources]
diff --git a/MdeModulePkg/Universal/LockBox/SmmLockBox/SmmLockBox.uni b/MdeModulePkg/Universal/LockBox/SmmLockBox/SmmLockBox.uni index 4e5cce8..ead8588 100644 --- a/MdeModulePkg/Universal/LockBox/SmmLockBox/SmmLockBox.uni +++ b/MdeModulePkg/Universal/LockBox/SmmLockBox/SmmLockBox.uni @@ -6,14 +6,14 @@ // This external input must be validated carefully to avoid security issue like
// buffer overflow, integer overflow.
//
-// Copyright (c) 2010 - 2014, Intel Corporation. All rights reserved.<BR>
+// Copyright (c) 2010 - 2018, Intel Corporation. All rights reserved.<BR>
//
// 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,
// WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
//
diff --git a/MdeModulePkg/Universal/LockBox/SmmLockBox/SmmLockBoxExtra.uni b/MdeModulePkg/Universal/LockBox/SmmLockBox/SmmLockBoxExtra.uni index 9c07cb5..539e162 100644 --- a/MdeModulePkg/Universal/LockBox/SmmLockBox/SmmLockBoxExtra.uni +++ b/MdeModulePkg/Universal/LockBox/SmmLockBox/SmmLockBoxExtra.uni @@ -1,7 +1,7 @@ // /** @file
// SmmLockBox Localized Strings and Content
//
-// Copyright (c) 2013 - 2014, Intel Corporation. All rights reserved.<BR>
+// Copyright (c) 2013 - 2018, Intel Corporation. All rights reserved.<BR>
//
// This program and the accompanying materials
// are licensed and made available under the terms and conditions
@@ -14,8 +14,8 @@ //
// **/
-#string STR_PROPERTIES_MODULE_NAME
-#language en-US
+#string STR_PROPERTIES_MODULE_NAME
+#language en-US
"SMM Lock Box Driver"
diff --git a/MdeModulePkg/Universal/MemoryTest/GenericMemoryTestDxe/GenericMemoryTestDxe.uni b/MdeModulePkg/Universal/MemoryTest/GenericMemoryTestDxe/GenericMemoryTestDxe.uni index 1e380c2..1cd4bb0 100644 --- a/MdeModulePkg/Universal/MemoryTest/GenericMemoryTestDxe/GenericMemoryTestDxe.uni +++ b/MdeModulePkg/Universal/MemoryTest/GenericMemoryTestDxe/GenericMemoryTestDxe.uni @@ -3,13 +3,13 @@ //
// This driver first constructs the non-tested memory range, then performs the R/W/V memory test.
//
-// Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.<BR>
+// Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>
//
// 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,
// WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
//
diff --git a/MdeModulePkg/Universal/MemoryTest/GenericMemoryTestDxe/GenericMemoryTestDxeExtra.uni b/MdeModulePkg/Universal/MemoryTest/GenericMemoryTestDxe/GenericMemoryTestDxeExtra.uni index 2ae0328..f57ee9c 100644 --- a/MdeModulePkg/Universal/MemoryTest/GenericMemoryTestDxe/GenericMemoryTestDxeExtra.uni +++ b/MdeModulePkg/Universal/MemoryTest/GenericMemoryTestDxe/GenericMemoryTestDxeExtra.uni @@ -1,7 +1,7 @@ // /** @file
// GenericMemoryTestDxe Localized Strings and Content
//
-// Copyright (c) 2013 - 2014, Intel Corporation. All rights reserved.<BR>
+// Copyright (c) 2013 - 2018, Intel Corporation. All rights reserved.<BR>
//
// This program and the accompanying materials are
// licensed and made available under the terms and conditions of the BSD License
@@ -13,8 +13,8 @@ //
// **/
-#string STR_PROPERTIES_MODULE_NAME
-#language en-US
+#string STR_PROPERTIES_MODULE_NAME
+#language en-US
"Generic Memory Test DXE Driver"
diff --git a/MdeModulePkg/Universal/MemoryTest/GenericMemoryTestDxe/LightMemoryTest.c b/MdeModulePkg/Universal/MemoryTest/GenericMemoryTestDxe/LightMemoryTest.c index a7ade95..86c2be1 100644 --- a/MdeModulePkg/Universal/MemoryTest/GenericMemoryTestDxe/LightMemoryTest.c +++ b/MdeModulePkg/Universal/MemoryTest/GenericMemoryTestDxe/LightMemoryTest.c @@ -52,7 +52,7 @@ UINT32 GenericMemoryTestMonoPattern[GENERIC_CACHELINE_SIZE / 4] If all Length bytes of the two buffers are identical, then 0 is returned. Otherwise, the
value returned is the first mismatched byte in SourceBuffer subtracted from the first
mismatched byte in DestinationBuffer.
-
+
If Length = 0, then ASSERT().
@param[in] DestinationBuffer The pointer to the destination buffer to compare.
@@ -62,7 +62,7 @@ UINT32 GenericMemoryTestMonoPattern[GENERIC_CACHELINE_SIZE / 4] @return 0 All Length bytes of the two buffers are identical.
@retval Non-zero The first mismatched byte in SourceBuffer subtracted from the first
mismatched byte in DestinationBuffer.
-
+
**/
INTN
EFIAPI
@@ -89,7 +89,7 @@ CompareMemWithoutCheckArgument ( @retval EFI_SUCCESS Successful construct the base memory range through GCD service.
@retval EFI_OUT_OF_RESOURCE Could not allocate needed resource from base memory.
@retval Others Failed to construct base memory range through GCD service.
-
+
**/
EFI_STATUS
ConstructBaseMemoryRange (
@@ -119,7 +119,7 @@ ConstructBaseMemoryRange ( Destroy the link list base on the correspond link list type.
@param[in] Private Point to generic memory test driver's private data.
-
+
**/
VOID
DestroyLinkList (
@@ -181,7 +181,7 @@ ConvertToTestedMemory ( @retval EFI_SUCCESS Successful add all the extended memory to system memory map.
@retval Others Failed to add the tested extended memory.
-
+
**/
EFI_STATUS
UpdateMemoryMap (
@@ -218,7 +218,7 @@ UpdateMemoryMap ( @retval EFI_SUCCESS Successful test the range of memory.
@retval Others Failed to test the range of memory.
-
+
**/
EFI_STATUS
DirectRangeTest (
@@ -263,7 +263,7 @@ DirectRangeTest ( @retval EFI_SUCCESS Successful construct the non-tested memory range through GCD service.
@retval EFI_OUT_OF_RESOURCE Could not allocate needed resource from base memory.
@retval Others Failed to construct non-tested memory range through GCD service.
-
+
**/
EFI_STATUS
ConstructNonTestedMemoryRange (
@@ -324,7 +324,7 @@ ConstructNonTestedMemoryRange ( @retval EFI_SUCCESS Successful write the test pattern into the non-tested memory.
@retval Others The test pattern may not really write into the physical memory.
-
+
**/
EFI_STATUS
WriteMemory (
@@ -372,7 +372,7 @@ WriteMemory ( @retval EFI_SUCCESS Successful verify the range of memory, no errors' location found.
@retval Others The range of memory have errors contained.
-
+
**/
EFI_STATUS
VerifyMemory (
@@ -432,7 +432,7 @@ VerifyMemory ( NULL,
(UINT8 *) ExtendedErrorData + sizeof (EFI_STATUS_CODE_DATA),
ExtendedErrorData->DataHeader.Size
- );
+ );
return EFI_DEVICE_ERROR;
}
@@ -446,12 +446,12 @@ VerifyMemory ( /**
Initialize the generic memory test.
- @param[in] This The protocol instance pointer.
- @param[in] Level The coverage level of the memory test.
- @param[out] RequireSoftECCInit Indicate if the memory need software ECC init.
+ @param[in] This The protocol instance pointer.
+ @param[in] Level The coverage level of the memory test.
+ @param[out] RequireSoftECCInit Indicate if the memory need software ECC init.
- @retval EFI_SUCCESS The generic memory test is initialized correctly.
- @retval EFI_NO_MEDIA The system had no memory to be tested.
+ @retval EFI_SUCCESS The generic memory test is initialized correctly.
+ @retval EFI_NO_MEDIA The system had no memory to be tested.
**/
EFI_STATUS
@@ -542,12 +542,12 @@ InitializeMemoryTest ( /**
Perform the memory test.
- @param[in] This The protocol instance pointer.
- @param[out] TestedMemorySize Return the tested extended memory size.
- @param[out] TotalMemorySize Return the whole system physical memory size.
- The total memory size does not include memory in a slot with a disabled DIMM.
+ @param[in] This The protocol instance pointer.
+ @param[out] TestedMemorySize Return the tested extended memory size.
+ @param[out] TotalMemorySize Return the whole system physical memory size.
+ The total memory size does not include memory in a slot with a disabled DIMM.
@param[out] ErrorOut TRUE if the memory error occured.
- @param[in] IfTestAbort Indicates that the user pressed "ESC" to skip the memory test.
+ @param[in] IfTestAbort Indicates that the user pressed "ESC" to skip the memory test.
@retval EFI_SUCCESS One block of memory passed the test.
@retval EFI_NOT_FOUND All memory blocks have already been tested.
@@ -667,7 +667,7 @@ GenPerformMemoryTest ( /**
Finish the memory test.
- @param[in] This The protocol instance pointer.
+ @param[in] This The protocol instance pointer.
@retval EFI_SUCCESS Success. All resources used in the memory test are freed.
@@ -705,12 +705,12 @@ GenMemoryTestFinished ( /**
Provides the capability to test the compatible range used by some special drivers.
- @param[in] This The protocol instance pointer.
+ @param[in] This The protocol instance pointer.
@param[in] StartAddress The start address of the compatible memory range that
must be below 16M.
- @param[in] Length The compatible memory range's length.
-
- @retval EFI_SUCCESS The compatible memory range pass the memory test.
+ @param[in] Length The compatible memory range's length.
+
+ @retval EFI_SUCCESS The compatible memory range pass the memory test.
@retval EFI_INVALID_PARAMETER The compatible memory range are not below Low 16M.
**/
@@ -780,9 +780,9 @@ GenCompatibleRangeTest ( Perform the address line walking ones test.
@param[in] Private Point to generic memory test driver's private data.
-
- @retval EFI_SUCCESS Successful finished walking ones test.
- @retval EFI_OUT_OF_RESOURCE Could not get resource in base memory.
+
+ @retval EFI_SUCCESS Successful finished walking ones test.
+ @retval EFI_OUT_OF_RESOURCE Could not get resource in base memory.
@retval EFI_ACCESS_DENIED Code may can not run here because if walking one test
failed, system may be already halt.
@@ -861,9 +861,9 @@ GENERIC_MEMORY_TEST_PRIVATE mGenericMemoryTestPrivate = { It initializes private data to default value.
- @param[in] ImageHandle The firmware allocated handle for the EFI image.
+ @param[in] ImageHandle The firmware allocated handle for the EFI image.
@param[in] SystemTable A pointer to the EFI System Table.
-
+
@retval EFI_SUCCESS The entry point is executed successfully.
@retval EFI_NOT_FOUND Can't find HandOff Hob in HobList.
@retval other Some error occurs when executing this entry point.
diff --git a/MdeModulePkg/Universal/MemoryTest/GenericMemoryTestDxe/LightMemoryTest.h b/MdeModulePkg/Universal/MemoryTest/GenericMemoryTestDxe/LightMemoryTest.h index 391c8a4..defe9f2 100644 --- a/MdeModulePkg/Universal/MemoryTest/GenericMemoryTestDxe/LightMemoryTest.h +++ b/MdeModulePkg/Universal/MemoryTest/GenericMemoryTestDxe/LightMemoryTest.h @@ -1,7 +1,7 @@ /** @file
The generic memory test driver definition
- Copyright (c) 2006 - 2010, Intel Corporation. All rights reserved.<BR>
+ Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>
This program and the accompanying materials
are licensed and made available under the terms and conditions
@@ -139,7 +139,7 @@ typedef struct { @retval EFI_SUCCESS Successful construct the base memory range through GCD service.
@retval EFI_OUT_OF_RESOURCE Could not allocate needed resource from base memory.
@retval Others Failed to construct base memory range through GCD service.
-
+
**/
EFI_STATUS
ConstructBaseMemoryRange (
@@ -154,7 +154,7 @@ ConstructBaseMemoryRange ( @retval EFI_SUCCESS Successful construct the non-tested memory range through GCD service.
@retval EFI_OUT_OF_RESOURCE Could not allocate needed resource from base memory.
@retval Others Failed to construct non-tested memory range through GCD service.
-
+
**/
EFI_STATUS
ConstructNonTestedMemoryRange (
@@ -165,9 +165,9 @@ ConstructNonTestedMemoryRange ( Perform the address line walking ones test.
@param[in] Private Point to generic memory test driver's private data.
-
- @retval EFI_SUCCESS Successful finished walking ones test.
- @retval EFI_OUT_OF_RESOURCE Could not get resource in base memory.
+
+ @retval EFI_SUCCESS Successful finished walking ones test.
+ @retval EFI_OUT_OF_RESOURCE Could not get resource in base memory.
@retval EFI_ACCESS_DENIED Code may can not run here because if walking one test
failed, system may be already halt.
@@ -181,7 +181,7 @@ PerformAddressDataLineTest ( Destroy the link list base on the correspond link list type.
@param[in] Private Point to generic memory test driver's private data.
-
+
**/
VOID
DestroyLinkList (
@@ -195,7 +195,7 @@ DestroyLinkList ( @retval EFI_SUCCESS Successful add all the extended memory to system memory map.
@retval Others Failed to add the tested extended memory.
-
+
**/
EFI_STATUS
UpdateMemoryMap (
@@ -211,7 +211,7 @@ UpdateMemoryMap ( @retval EFI_SUCCESS Successful write the test pattern into the non-tested memory.
@retval Others The test pattern may not really write into the physical memory.
-
+
**/
EFI_STATUS
WriteMemory (
@@ -232,7 +232,7 @@ WriteMemory ( @retval EFI_SUCCESS Successful verify the range of memory, no errors' location found.
@retval Others The range of memory have errors contained.
-
+
**/
EFI_STATUS
VerifyMemory (
@@ -251,7 +251,7 @@ VerifyMemory ( @retval EFI_SUCCESS Successful test the range of memory.
@retval Others Failed to test the range of memory.
-
+
**/
EFI_STATUS
DirectRangeTest (
@@ -264,12 +264,12 @@ DirectRangeTest ( /**
Initialize the generic memory test.
- @param[in] This The protocol instance pointer.
- @param[in] Level The coverage level of the memory test.
- @param[out] RequireSoftECCInit Indicate if the memory need software ECC init.
+ @param[in] This The protocol instance pointer.
+ @param[in] Level The coverage level of the memory test.
+ @param[out] RequireSoftECCInit Indicate if the memory need software ECC init.
- @retval EFI_SUCCESS The generic memory test is initialized correctly.
- @retval EFI_NO_MEDIA The system had no memory to be tested.
+ @retval EFI_SUCCESS The generic memory test is initialized correctly.
+ @retval EFI_NO_MEDIA The system had no memory to be tested.
**/
EFI_STATUS
@@ -283,12 +283,12 @@ InitializeMemoryTest ( /**
Perform the memory test.
- @param[in] This The protocol instance pointer.
- @param[out] TestedMemorySize Return the tested extended memory size.
- @param[out] TotalMemorySize Return the whole system physical memory size.
- The total memory size does not include memory in a slot with a disabled DIMM.
+ @param[in] This The protocol instance pointer.
+ @param[out] TestedMemorySize Return the tested extended memory size.
+ @param[out] TotalMemorySize Return the whole system physical memory size.
+ The total memory size does not include memory in a slot with a disabled DIMM.
@param[out] ErrorOut TRUE if the memory error occured.
- @param[in] IfTestAbort Indicates that the user pressed "ESC" to skip the memory test.
+ @param[in] IfTestAbort Indicates that the user pressed "ESC" to skip the memory test.
@retval EFI_SUCCESS One block of memory passed the test.
@retval EFI_NOT_FOUND All memory blocks have already been tested.
@@ -308,7 +308,7 @@ GenPerformMemoryTest ( /**
Finish the memory test.
- @param[in] This The protocol instance pointer.
+ @param[in] This The protocol instance pointer.
@retval EFI_SUCCESS Success. All resources used in the memory test are freed.
@@ -322,12 +322,12 @@ GenMemoryTestFinished ( /**
Provides the capability to test the compatible range used by some special drivers.
- @param[in] This The protocol instance pointer.
+ @param[in] This The protocol instance pointer.
@param[in] StartAddress The start address of the compatible memory range that
must be below 16M.
- @param[in] Length The compatible memory range's length.
-
- @retval EFI_SUCCESS The compatible memory range pass the memory test.
+ @param[in] Length The compatible memory range's length.
+
+ @retval EFI_SUCCESS The compatible memory range pass the memory test.
@retval EFI_INVALID_PARAMETER The compatible memory range are not below Low 16M.
**/
diff --git a/MdeModulePkg/Universal/MemoryTest/NullMemoryTestDxe/NullMemoryTest.c b/MdeModulePkg/Universal/MemoryTest/NullMemoryTestDxe/NullMemoryTest.c index a9bd101..51111b8 100644 --- a/MdeModulePkg/Universal/MemoryTest/NullMemoryTestDxe/NullMemoryTest.c +++ b/MdeModulePkg/Universal/MemoryTest/NullMemoryTestDxe/NullMemoryTest.c @@ -28,7 +28,7 @@ EFI_GENERIC_MEMORY_TEST_PROTOCOL mGenericMemoryTest = { /**
Entry point of the NULL memory test driver.
-
+
This function is the entry point of the NULL memory test driver.
It simply installs the Generic Memory Test Protocol.
@@ -99,15 +99,15 @@ ConvertToTestedMemory ( This function implements EFI_GENERIC_MEMORY_TEST_PROTOCOL.MemoryTestInit.
It simply promotes untested reserved memory to system memory without real test.
- @param This Protocol instance pointer.
- @param Level The coverage level of the memory test.
- @param RequireSoftECCInit Indicate if the memory need software ECC init.
+ @param This Protocol instance pointer.
+ @param Level The coverage level of the memory test.
+ @param RequireSoftECCInit Indicate if the memory need software ECC init.
- @retval EFI_SUCCESS The generic memory test initialized correctly.
- @retval EFI_NO_MEDIA There is not any non-tested memory found, in this
- function if not any non-tesed memory found means
- that the memory test driver have not detect any
- non-tested extended memory of current system.
+ @retval EFI_SUCCESS The generic memory test initialized correctly.
+ @retval EFI_NO_MEDIA There is not any non-tested memory found, in this
+ function if not any non-tesed memory found means
+ that the memory test driver have not detect any
+ non-tested extended memory of current system.
**/
EFI_STATUS
@@ -158,20 +158,20 @@ InitializeMemoryTest ( This function implements EFI_GENERIC_MEMORY_TEST_PROTOCOL.PerformMemoryTest.
It simply returns EFI_NOT_FOUND.
- @param This Protocol instance pointer.
- @param TestedMemorySize Return the tested extended memory size.
- @param TotalMemorySize Return the whole system physical memory size, this
- value may be changed if in some case some error
- DIMMs be disabled.
- @param ErrorOut Any time the memory error occurs, this will be
- TRUE.
- @param IfTestAbort Indicate if the user press "ESC" to skip the memory
- test.
-
- @retval EFI_SUCCESS One block of memory test ok, the block size is hide
- internally.
- @retval EFI_NOT_FOUND Indicate all the non-tested memory blocks have
- already go through.
+ @param This Protocol instance pointer.
+ @param TestedMemorySize Return the tested extended memory size.
+ @param TotalMemorySize Return the whole system physical memory size, this
+ value may be changed if in some case some error
+ DIMMs be disabled.
+ @param ErrorOut Any time the memory error occurs, this will be
+ TRUE.
+ @param IfTestAbort Indicate if the user press "ESC" to skip the memory
+ test.
+
+ @retval EFI_SUCCESS One block of memory test ok, the block size is hide
+ internally.
+ @retval EFI_NOT_FOUND Indicate all the non-tested memory blocks have
+ already go through.
@retval EFI_DEVICE_ERROR Mis-compare error, and no agent can handle it
**/
@@ -199,11 +199,11 @@ GenPerformMemoryTest ( This function implements EFI_GENERIC_MEMORY_TEST_PROTOCOL.Finished.
It simply returns EFI_SUCCESS.
- @param This Protocol instance pointer.
+ @param This Protocol instance pointer.
- @retval EFI_SUCCESS Successful free all the generic memory test driver
- allocated resource and notify to platform memory
- test driver that memory test finished.
+ @retval EFI_SUCCESS Successful free all the generic memory test driver
+ allocated resource and notify to platform memory
+ test driver that memory test finished.
**/
EFI_STATUS
@@ -222,11 +222,11 @@ GenMemoryTestFinished ( This function implements EFI_GENERIC_MEMORY_TEST_PROTOCOL.CompatibleRangeTest.
It simply sets the memory range to system memory.
- @param This Protocol instance pointer.
- @param StartAddress The start address of the memory range.
- @param Length The memory range's length.
-
- @retval EFI_SUCCESS The compatible memory range pass the memory test.
+ @param This Protocol instance pointer.
+ @param StartAddress The start address of the memory range.
+ @param Length The memory range's length.
+
+ @retval EFI_SUCCESS The compatible memory range pass the memory test.
@retval EFI_INVALID_PARAMETER The compatible memory range must be below 16M.
**/
diff --git a/MdeModulePkg/Universal/MemoryTest/NullMemoryTestDxe/NullMemoryTest.h b/MdeModulePkg/Universal/MemoryTest/NullMemoryTestDxe/NullMemoryTest.h index 77c18eb..d09c843 100644 --- a/MdeModulePkg/Universal/MemoryTest/NullMemoryTestDxe/NullMemoryTest.h +++ b/MdeModulePkg/Universal/MemoryTest/NullMemoryTestDxe/NullMemoryTest.h @@ -1,7 +1,7 @@ /** @file
Include file of the NULL memory test driver.
-Copyright (c) 2006 - 2008, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>
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
@@ -40,15 +40,15 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. This function implements EFI_GENERIC_MEMORY_TEST_PROTOCOL.MemoryTestInit.
It simply promotes untested reserved memory to system memory without real test.
- @param This Protocol instance pointer.
- @param Level The coverage level of the memory test.
- @param RequireSoftECCInit Indicate if the memory need software ECC init.
+ @param This Protocol instance pointer.
+ @param Level The coverage level of the memory test.
+ @param RequireSoftECCInit Indicate if the memory need software ECC init.
- @retval EFI_SUCCESS The generic memory test initialized correctly.
- @retval EFI_NO_MEDIA There is not any non-tested memory found, in this
- function if not any non-tesed memory found means
- that the memory test driver have not detect any
- non-tested extended memory of current system.
+ @retval EFI_SUCCESS The generic memory test initialized correctly.
+ @retval EFI_NO_MEDIA There is not any non-tested memory found, in this
+ function if not any non-tesed memory found means
+ that the memory test driver have not detect any
+ non-tested extended memory of current system.
**/
EFI_STATUS
@@ -65,20 +65,20 @@ InitializeMemoryTest ( This function implements EFI_GENERIC_MEMORY_TEST_PROTOCOL.PerformMemoryTest.
It simply returns EFI_NOT_FOUND.
- @param This Protocol instance pointer.
- @param TestedMemorySize Return the tested extended memory size.
- @param TotalMemorySize Return the whole system physical memory size, this
- value may be changed if in some case some error
- DIMMs be disabled.
- @param ErrorOut Any time the memory error occurs, this will be
- TRUE.
- @param IfTestAbort Indicate if the user press "ESC" to skip the memory
- test.
-
- @retval EFI_SUCCESS One block of memory test ok, the block size is hide
- internally.
- @retval EFI_NOT_FOUND Indicate all the non-tested memory blocks have
- already go through.
+ @param This Protocol instance pointer.
+ @param TestedMemorySize Return the tested extended memory size.
+ @param TotalMemorySize Return the whole system physical memory size, this
+ value may be changed if in some case some error
+ DIMMs be disabled.
+ @param ErrorOut Any time the memory error occurs, this will be
+ TRUE.
+ @param IfTestAbort Indicate if the user press "ESC" to skip the memory
+ test.
+
+ @retval EFI_SUCCESS One block of memory test ok, the block size is hide
+ internally.
+ @retval EFI_NOT_FOUND Indicate all the non-tested memory blocks have
+ already go through.
@retval EFI_DEVICE_ERROR Mis-compare error, and no agent can handle it
**/
@@ -98,11 +98,11 @@ GenPerformMemoryTest ( This function implements EFI_GENERIC_MEMORY_TEST_PROTOCOL.Finished.
It simply returns EFI_SUCCESS.
- @param This Protocol instance pointer.
+ @param This Protocol instance pointer.
- @retval EFI_SUCCESS Successful free all the generic memory test driver
- allocated resource and notify to platform memory
- test driver that memory test finished.
+ @retval EFI_SUCCESS Successful free all the generic memory test driver
+ allocated resource and notify to platform memory
+ test driver that memory test finished.
**/
EFI_STATUS
@@ -118,11 +118,11 @@ GenMemoryTestFinished ( This function implements EFI_GENERIC_MEMORY_TEST_PROTOCOL.CompatibleRangeTest.
It simply set the memory range to system memory.
- @param This Protocol instance pointer.
- @param StartAddress The start address of the memory range.
- @param Length The memory range's length.
-
- @retval EFI_SUCCESS The compatible memory range pass the memory test.
+ @param This Protocol instance pointer.
+ @param StartAddress The start address of the memory range.
+ @param Length The memory range's length.
+
+ @retval EFI_SUCCESS The compatible memory range pass the memory test.
@retval EFI_INVALID_PARAMETER The compatible memory range must be below 16M.
**/
diff --git a/MdeModulePkg/Universal/MemoryTest/NullMemoryTestDxe/NullMemoryTestDxe.inf b/MdeModulePkg/Universal/MemoryTest/NullMemoryTestDxe/NullMemoryTestDxe.inf index 96770e5..a0d2ce7 100644 --- a/MdeModulePkg/Universal/MemoryTest/NullMemoryTestDxe/NullMemoryTestDxe.inf +++ b/MdeModulePkg/Universal/MemoryTest/NullMemoryTestDxe/NullMemoryTestDxe.inf @@ -1,15 +1,15 @@ ## @file
# This driver installs Generic Memory Test Protocol which does not perform real memory test.
-#
-# Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.<BR>
+#
+# Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>
# 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,
# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
-#
+#
##
[Defines]
diff --git a/MdeModulePkg/Universal/MemoryTest/NullMemoryTestDxe/NullMemoryTestDxe.uni b/MdeModulePkg/Universal/MemoryTest/NullMemoryTestDxe/NullMemoryTestDxe.uni index e8f6fa6..b758f70 100644 --- a/MdeModulePkg/Universal/MemoryTest/NullMemoryTestDxe/NullMemoryTestDxe.uni +++ b/MdeModulePkg/Universal/MemoryTest/NullMemoryTestDxe/NullMemoryTestDxe.uni @@ -3,13 +3,13 @@ //
// This driver installs Generic Memory Test Protocol, which does not perform a real memory test.
//
-// Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.<BR>
+// Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>
//
// 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,
// WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
//
diff --git a/MdeModulePkg/Universal/MemoryTest/NullMemoryTestDxe/NullMemoryTestDxeExtra.uni b/MdeModulePkg/Universal/MemoryTest/NullMemoryTestDxe/NullMemoryTestDxeExtra.uni index f0b5372..2cd88bf 100644 --- a/MdeModulePkg/Universal/MemoryTest/NullMemoryTestDxe/NullMemoryTestDxeExtra.uni +++ b/MdeModulePkg/Universal/MemoryTest/NullMemoryTestDxe/NullMemoryTestDxeExtra.uni @@ -1,7 +1,7 @@ // /** @file
// NullMemoryTestDxe Localized Strings and Content
//
-// Copyright (c) 2013 - 2014, Intel Corporation. All rights reserved.<BR>
+// Copyright (c) 2013 - 2018, Intel Corporation. All rights reserved.<BR>
//
// This program and the accompanying materials
// are licensed and made available under the terms and conditions of the BSD License
@@ -13,8 +13,8 @@ //
// **/
-#string STR_PROPERTIES_MODULE_NAME
-#language en-US
+#string STR_PROPERTIES_MODULE_NAME
+#language en-US
"NULL Memory Test DXE Driver"
diff --git a/MdeModulePkg/Universal/Metronome/Metronome.c b/MdeModulePkg/Universal/Metronome/Metronome.c index c3dc0b8..936beae 100644 --- a/MdeModulePkg/Universal/Metronome/Metronome.c +++ b/MdeModulePkg/Universal/Metronome/Metronome.c @@ -9,16 +9,16 @@ microsecond units. If the number of ticks is small, then nanoseconds are used.
If the number of ticks is large, then microseconds are used. This prevents
overflows that could occur for long delays if only nanoseconds were used and also
- provides the greatest accuracy for small delays.
+ provides the greatest accuracy for small delays.
-Copyright (c) 2008, Intel Corporation. All rights reserved.<BR>
-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,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+Copyright (c) 2008 - 2018, Intel Corporation. All rights reserved.<BR>
+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,
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
**/
@@ -39,19 +39,19 @@ EFI_METRONOME_ARCH_PROTOCOL mMetronome = { /**
Waits for the specified number of ticks.
-
+
This function implements EFI_METRONOME_ARCH_PROTOCOL.WaitForTick().
- The WaitForTick() function waits for the number of ticks specified by
- TickNumber from a known time source in the platform. If TickNumber of
- ticks are detected, then EFI_SUCCESS is returned. The actual time passed
- between entry of this function and the first tick is between 0 and
- TickPeriod 100 nS units. If you want to guarantee that at least TickPeriod
- time has elapsed, wait for two ticks. This function waits for a hardware
- event to determine when a tick occurs. It is possible for interrupt
- processing, or exception processing to interrupt the execution of the
- WaitForTick() function. Depending on the hardware source for the ticks, it
- is possible for a tick to be missed. This function cannot guarantee that
- ticks will not be missed. If a timeout occurs waiting for the specified
+ The WaitForTick() function waits for the number of ticks specified by
+ TickNumber from a known time source in the platform. If TickNumber of
+ ticks are detected, then EFI_SUCCESS is returned. The actual time passed
+ between entry of this function and the first tick is between 0 and
+ TickPeriod 100 nS units. If you want to guarantee that at least TickPeriod
+ time has elapsed, wait for two ticks. This function waits for a hardware
+ event to determine when a tick occurs. It is possible for interrupt
+ processing, or exception processing to interrupt the execution of the
+ WaitForTick() function. Depending on the hardware source for the ticks, it
+ is possible for a tick to be missed. This function cannot guarantee that
+ ticks will not be missed. If a timeout occurs waiting for the specified
number of ticks, then EFI_TIMEOUT is returned.
@param This The EFI_METRONOME_ARCH_PROTOCOL instance.
@@ -90,9 +90,9 @@ WaitForTick ( /**
The user Entry Point for module Metronome. The user code starts with this function.
- @param[in] ImageHandle The firmware allocated handle for the EFI image.
+ @param[in] ImageHandle The firmware allocated handle for the EFI image.
@param[in] SystemTable A pointer to the EFI System Table.
-
+
@retval EFI_SUCCESS The entry point is executed successfully.
@retval other Some error occurs when executing this entry point.
diff --git a/MdeModulePkg/Universal/Metronome/Metronome.h b/MdeModulePkg/Universal/Metronome/Metronome.h index 3556e6b..d77cb0d 100644 --- a/MdeModulePkg/Universal/Metronome/Metronome.h +++ b/MdeModulePkg/Universal/Metronome/Metronome.h @@ -1,7 +1,7 @@ /** @file
Include file of Metronome driver.
-Copyright (c) 2008, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2008 - 2018, Intel Corporation. All rights reserved.<BR>
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
@@ -24,19 +24,19 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. /**
Waits for the specified number of ticks.
-
+
This function implements EFI_METRONOME_ARCH_PROTOCOL.WaitForTick().
- The WaitForTick() function waits for the number of ticks specified by
- TickNumber from a known time source in the platform. If TickNumber of
- ticks are detected, then EFI_SUCCESS is returned. The actual time passed
- between entry of this function and the first tick is between 0 and
- TickPeriod 100 nS units. If you want to guarantee that at least TickPeriod
- time has elapsed, wait for two ticks. This function waits for a hardware
- event to determine when a tick occurs. It is possible for interrupt
- processing, or exception processing to interrupt the execution of the
- WaitForTick() function. Depending on the hardware source for the ticks, it
- is possible for a tick to be missed. This function cannot guarantee that
- ticks will not be missed. If a timeout occurs waiting for the specified
+ The WaitForTick() function waits for the number of ticks specified by
+ TickNumber from a known time source in the platform. If TickNumber of
+ ticks are detected, then EFI_SUCCESS is returned. The actual time passed
+ between entry of this function and the first tick is between 0 and
+ TickPeriod 100 nS units. If you want to guarantee that at least TickPeriod
+ time has elapsed, wait for two ticks. This function waits for a hardware
+ event to determine when a tick occurs. It is possible for interrupt
+ processing, or exception processing to interrupt the execution of the
+ WaitForTick() function. Depending on the hardware source for the ticks, it
+ is possible for a tick to be missed. This function cannot guarantee that
+ ticks will not be missed. If a timeout occurs waiting for the specified
number of ticks, then EFI_TIMEOUT is returned.
@param This The EFI_METRONOME_ARCH_PROTOCOL instance.
diff --git a/MdeModulePkg/Universal/Metronome/Metronome.inf b/MdeModulePkg/Universal/Metronome/Metronome.inf index a688f3c..3a633ed 100644 --- a/MdeModulePkg/Universal/Metronome/Metronome.inf +++ b/MdeModulePkg/Universal/Metronome/Metronome.inf @@ -9,16 +9,16 @@ # microsecond units. If the number of ticks is small, then nanoseconds are used.
# If the number of ticks is large, then microseconds are used. This prevents
# overflows that could occur for long delays if only nanoseconds were used and also
-# provides the greatest accuracy for small delays.
+# provides the greatest accuracy for small delays.
#
-# Copyright (c) 2008 - 2014, Intel Corporation. All rights reserved.<BR>
-# 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,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# Copyright (c) 2008 - 2018, Intel Corporation. All rights reserved.<BR>
+# 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,
+# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
#
##
diff --git a/MdeModulePkg/Universal/Metronome/Metronome.uni b/MdeModulePkg/Universal/Metronome/Metronome.uni index 693026d..af906ef 100644 --- a/MdeModulePkg/Universal/Metronome/Metronome.uni +++ b/MdeModulePkg/Universal/Metronome/Metronome.uni @@ -11,13 +11,13 @@ // overflows that could occur for long delays if only nanoseconds were used and also
// provides the greatest accuracy for small delays.
//
-// Copyright (c) 2008 - 2014, Intel Corporation. All rights reserved.<BR>
+// Copyright (c) 2008 - 2018, Intel Corporation. All rights reserved.<BR>
//
// 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,
// WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
//
diff --git a/MdeModulePkg/Universal/Metronome/MetronomeExtra.uni b/MdeModulePkg/Universal/Metronome/MetronomeExtra.uni index 51b6220..6d24946 100644 --- a/MdeModulePkg/Universal/Metronome/MetronomeExtra.uni +++ b/MdeModulePkg/Universal/Metronome/MetronomeExtra.uni @@ -1,7 +1,7 @@ // /** @file
// Metronome Localized Strings and Content
//
-// Copyright (c) 2013 - 2014, Intel Corporation. All rights reserved.<BR>
+// Copyright (c) 2013 - 2018, Intel Corporation. All rights reserved.<BR>
//
// This program and the accompanying materials
// are licensed and made available under the terms and conditions of the BSD License
@@ -13,8 +13,8 @@ //
// **/
-#string STR_PROPERTIES_MODULE_NAME
-#language en-US
+#string STR_PROPERTIES_MODULE_NAME
+#language en-US
"Metronome/Timer DXE Driver"
diff --git a/MdeModulePkg/Universal/MonotonicCounterRuntimeDxe/MonotonicCounter.c b/MdeModulePkg/Universal/MonotonicCounterRuntimeDxe/MonotonicCounter.c index 2bfede6..2f9d2df 100644 --- a/MdeModulePkg/Universal/MonotonicCounterRuntimeDxe/MonotonicCounter.c +++ b/MdeModulePkg/Universal/MonotonicCounterRuntimeDxe/MonotonicCounter.c @@ -2,7 +2,7 @@ Produce the UEFI boot service GetNextMonotonicCount() and runtime service
GetNextHighMonotonicCount().
-Copyright (c) 2006 - 2016, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>
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,7 +51,7 @@ EFI_EVENT mEfiMtcEvent; The high 32-bit value is nonvolatile and is increased by one on whenever the
system resets or the low 32-bit counter overflows.
- @param Count Pointer to returned value.
+ @param Count Pointer to returned value.
@retval EFI_SUCCESS The next monotonic count was returned.
@retval EFI_DEVICE_ERROR The device is not functioning properly.
@@ -123,7 +123,7 @@ MonotonicCounterDriverGetNextMonotonicCount ( This function may only be called at Runtime.
- @param HighCount Pointer to returned value.
+ @param HighCount Pointer to returned value.
@retval EFI_SUCCESS The next high monotonic count was returned.
@retval EFI_INVALID_PARAMETER HighCount is NULL.
diff --git a/MdeModulePkg/Universal/MonotonicCounterRuntimeDxe/MonotonicCounterRuntimeDxeExtra.uni b/MdeModulePkg/Universal/MonotonicCounterRuntimeDxe/MonotonicCounterRuntimeDxeExtra.uni index 4865903..c219c81 100644 --- a/MdeModulePkg/Universal/MonotonicCounterRuntimeDxe/MonotonicCounterRuntimeDxeExtra.uni +++ b/MdeModulePkg/Universal/MonotonicCounterRuntimeDxe/MonotonicCounterRuntimeDxeExtra.uni @@ -1,7 +1,7 @@ // /** @file
// MonotonicCounterRuntimeDxe Localized Strings and Content
//
-// Copyright (c) 2013 - 2014, Intel Corporation. All rights reserved.<BR>
+// Copyright (c) 2013 - 2018, Intel Corporation. All rights reserved.<BR>
//
// This program and the accompanying materials
// are licensed and made available under the terms and conditions of the BSD License
@@ -12,8 +12,8 @@ //
// **/
-#string STR_PROPERTIES_MODULE_NAME
-#language en-US
+#string STR_PROPERTIES_MODULE_NAME
+#language en-US
"Monotonic Counter DXE Driver"
diff --git a/MdeModulePkg/Universal/Network/ArpDxe/ArpDriver.c b/MdeModulePkg/Universal/Network/ArpDxe/ArpDriver.c index 91edccc..cd4e259 100644 --- a/MdeModulePkg/Universal/Network/ArpDxe/ArpDriver.c +++ b/MdeModulePkg/Universal/Network/ArpDxe/ArpDriver.c @@ -1,7 +1,7 @@ /** @file
ARP driver functions.
-
-Copyright (c) 2006 - 2016, Intel Corporation. All rights reserved.<BR>
+
+Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>
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>
@@ -35,7 +35,7 @@ EFI_DRIVER_BINDING_PROTOCOL gArpDriverBinding = { context data.
@retval EFI_SUCCESS The arp service context is initialized.
-
+
@retval EFI_UNSUPPORTED The underlayer Snp mode type is not ethernet.
Failed to initialize the service context.
@retval other Failed to initialize the arp service context.
@@ -243,7 +243,7 @@ ArpCleanService ( /**
Callback function which provided by user to remove one node in NetDestroyLinkList process.
-
+
@param[in] Entry The entry to be removed.
@param[in] Context Pointer to the callback context corresponds to the Context in NetDestroyLinkList.
@@ -260,7 +260,7 @@ ArpDestroyChildEntryInHandleBuffer ( {
ARP_INSTANCE_DATA *Instance;
EFI_SERVICE_BINDING_PROTOCOL *ServiceBinding;
-
+
if (Entry == NULL || Context == NULL) {
return EFI_INVALID_PARAMETER;
}
@@ -272,31 +272,31 @@ ArpDestroyChildEntryInHandleBuffer ( }
/**
- Tests to see if this driver supports a given controller.
-
- If a child device is provided, it further tests to see if this driver supports
+ Tests to see if this driver supports a given controller.
+
+ If a child device is provided, it further tests to see if this driver supports
creating a handle for the specified child device.
@param[in] This A pointer to the EFI_DRIVER_BINDING_PROTOCOL instance.
- @param[in] ControllerHandle The handle of the controller to test. This handle
- must support a protocol interface that supplies
+ @param[in] ControllerHandle The handle of the controller to test. This handle
+ must support a protocol interface that supplies
an I/O abstraction to the driver.
- @param[in] RemainingDevicePath A pointer to the remaining portion of a device path.
- This parameter is ignored by device drivers,
+ @param[in] RemainingDevicePath A pointer to the remaining portion of a device path.
+ This parameter is ignored by device drivers,
and is optional for bus drivers.
@retval EFI_SUCCESS The device specified by ControllerHandle and
- RemainingDevicePath is supported by the driver
+ RemainingDevicePath is supported by the driver
specified by This.
@retval EFI_ALREADY_STARTED The device specified by ControllerHandle and
- RemainingDevicePath is already being managed
+ RemainingDevicePath is already being managed
by the driver specified by This.
@retval EFI_ACCESS_DENIED The device specified by ControllerHandle and
- RemainingDevicePath is already being managed by
- a different driver or an application that
+ RemainingDevicePath is already being managed by
+ a different driver or an application that
requires exclusive acces. Currently not implemented.
@retval EFI_UNSUPPORTED The device specified by ControllerHandle and
- RemainingDevicePath is not supported by the
+ RemainingDevicePath is not supported by the
driver specified by This.
**/
@@ -342,32 +342,32 @@ ArpDriverBindingSupported ( /**
- Start this driver on ControllerHandle.
-
- The Start() function is designed to be invoked from the EFI boot service ConnectController().
- As a result, much of the error checking on the parameters to Start() has been
- moved into this common boot service. It is legal to call Start() from other locations,
- but the following calling restrictions must be followed or the system behavior
+ Start this driver on ControllerHandle.
+
+ The Start() function is designed to be invoked from the EFI boot service ConnectController().
+ As a result, much of the error checking on the parameters to Start() has been
+ moved into this common boot service. It is legal to call Start() from other locations,
+ but the following calling restrictions must be followed or the system behavior
will not be deterministic.
1. ControllerHandle must be a valid EFI_HANDLE.
- 2. If RemainingDevicePath is not NULL, then it must be a pointer to a naturally
+ 2. If RemainingDevicePath is not NULL, then it must be a pointer to a naturally
aligned EFI_DEVICE_PATH_PROTOCOL.
- 3. Prior to calling Start(), the Supported() function for the driver specified
- by This must have been called with the same calling parameters, and Supported()
- must have returned EFI_SUCCESS.
+ 3. Prior to calling Start(), the Supported() function for the driver specified
+ by This must have been called with the same calling parameters, and Supported()
+ must have returned EFI_SUCCESS.
@param[in] This A pointer to the EFI_DRIVER_BINDING_PROTOCOL instance.
- @param[in] ControllerHandle The handle of the controller to start. This handle
- must support a protocol interface that supplies
+ @param[in] ControllerHandle The handle of the controller to start. This handle
+ must support a protocol interface that supplies
an I/O abstraction to the driver.
- @param[in] RemainingDevicePath A pointer to the remaining portion of a device path.
- This parameter is ignored by device drivers,
+ @param[in] RemainingDevicePath A pointer to the remaining portion of a device path.
+ This parameter is ignored by device drivers,
and is optional for bus drivers.
@retval EFI_SUCCESS The device was started.
@retval EFI_DEVICE_ERROR The device could not be started due to a device error.
Currently not implemented.
- @retval EFI_OUT_OF_RESOURCES The request could not be completed due to a lack of
+ @retval EFI_OUT_OF_RESOURCES The request could not be completed due to a lack of
resources.
@retval Others The driver failded to start the device.
@@ -435,13 +435,13 @@ ERROR: /**
- Stop this driver on ControllerHandle.
-
+ Stop this driver on ControllerHandle.
+
Release the control of this controller and remove the IScsi functions. The Stop()
- function is designed to be invoked from the EFI boot service DisconnectController().
- As a result, much of the error checking on the parameters to Stop() has been moved
- into this common boot service. It is legal to call Stop() from other locations,
- but the following calling restrictions must be followed or the system behavior
+ function is designed to be invoked from the EFI boot service DisconnectController().
+ As a result, much of the error checking on the parameters to Stop() has been moved
+ into this common boot service. It is legal to call Stop() from other locations,
+ but the following calling restrictions must be followed or the system behavior
will not be deterministic.
1. ControllerHandle must be a valid EFI_HANDLE that was used on a previous call to this
same driver's Start() function.
@@ -449,14 +449,14 @@ ERROR: EFI_HANDLE. In addition, all of these handles must have been created in this driver's
Start() function, and the Start() function must have called OpenProtocol() on
ControllerHandle with an Attribute of EFI_OPEN_PROTOCOL_BY_CHILD_CONTROLLER.
-
+
@param[in] This A pointer to the EFI_DRIVER_BINDING_PROTOCOL instance.
- @param[in] ControllerHandle A handle to the device being stopped. The handle must
- support a bus specific I/O protocol for the driver
+ @param[in] ControllerHandle A handle to the device being stopped. The handle must
+ support a bus specific I/O protocol for the driver
to use to stop the device.
@param[in] NumberOfChildren The number of child device handles in ChildHandleBuffer.
Not used.
- @param[in] ChildHandleBuffer An array of child handles to be freed. May be NULL
+ @param[in] ChildHandleBuffer An array of child handles to be freed. May be NULL
if NumberOfChildren is 0.Not used.
@retval EFI_SUCCESS The device was stopped.
@@ -542,15 +542,15 @@ ArpDriverBindingStop ( /**
Creates a child handle and installs a protocol.
-
- The CreateChild() function installs a protocol on ChildHandle.
- If ChildHandle is a pointer to NULL, then a new handle is created and returned
- in ChildHandle. If ChildHandle is not a pointer to NULL, then the protocol
+
+ The CreateChild() function installs a protocol on ChildHandle.
+ If ChildHandle is a pointer to NULL, then a new handle is created and returned
+ in ChildHandle. If ChildHandle is not a pointer to NULL, then the protocol
installs on the existing ChildHandle.
@param This Pointer to the EFI_SERVICE_BINDING_PROTOCOL instance.
@param ChildHandle Pointer to the handle of the child to create. If it is NULL,
- then a new handle is created. If it is a pointer to an existing
+ then a new handle is created. If it is a pointer to an existing
UEFI handle, then the protocol is added to the existing UEFI handle.
@retval EFI_SUCCES The protocol was added to ChildHandle.
@@ -670,16 +670,16 @@ ERROR: /**
Destroys a child handle with a protocol installed on it.
-
- The DestroyChild() function does the opposite of CreateChild(). It removes a protocol
- that was installed by CreateChild() from ChildHandle. If the removed protocol is the
+
+ The DestroyChild() function does the opposite of CreateChild(). It removes a protocol
+ that was installed by CreateChild() from ChildHandle. If the removed protocol is the
last protocol on ChildHandle, then ChildHandle is destroyed.
@param This Pointer to the EFI_SERVICE_BINDING_PROTOCOL instance.
@param ChildHandle Handle of the child to destroy
@retval EFI_SUCCES The protocol was removed from ChildHandle.
- @retval EFI_UNSUPPORTED ChildHandle does not support the protocol that is
+ @retval EFI_UNSUPPORTED ChildHandle does not support the protocol that is
being removed.
@retval EFI_INVALID_PARAMETER Child handle is NULL.
@retval EFI_ACCESS_DENIED The protocol could not be removed from the ChildHandle
@@ -793,7 +793,7 @@ ArpServiceBindingDestroyChild ( @param[in] ImageHandle The image handle of the driver.
@param[in] SystemTable The system table.
- @retval EFI_SUCCESS if the driver binding and component name protocols
+ @retval EFI_SUCCESS if the driver binding and component name protocols
are successfully
@retval Others Failed to install the protocols.
diff --git a/MdeModulePkg/Universal/Network/ArpDxe/ArpDriver.h b/MdeModulePkg/Universal/Network/ArpDxe/ArpDriver.h index d5fd3ea..2390de6 100644 --- a/MdeModulePkg/Universal/Network/ArpDxe/ArpDriver.h +++ b/MdeModulePkg/Universal/Network/ArpDxe/ArpDriver.h @@ -1,7 +1,7 @@ /** @file
ARP driver header file.
-
-Copyright (c) 2006 - 2016, Intel Corporation. All rights reserved.<BR>
+
+Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>
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>
@@ -39,31 +39,31 @@ extern EFI_COMPONENT_NAME2_PROTOCOL gArpComponentName2; // Function prototypes for the Drivr Binding Protocol
//
/**
- Tests to see if this driver supports a given controller.
-
- If a child device is provided, it further tests to see if this driver supports
+ Tests to see if this driver supports a given controller.
+
+ If a child device is provided, it further tests to see if this driver supports
creating a handle for the specified child device.
@param[in] This A pointer to the EFI_DRIVER_BINDING_PROTOCOL instance.
- @param[in] ControllerHandle The handle of the controller to test. This handle
- must support a protocol interface that supplies
+ @param[in] ControllerHandle The handle of the controller to test. This handle
+ must support a protocol interface that supplies
an I/O abstraction to the driver.
- @param[in] RemainingDevicePath A pointer to the remaining portion of a device path.
- This parameter is ignored by device drivers,
+ @param[in] RemainingDevicePath A pointer to the remaining portion of a device path.
+ This parameter is ignored by device drivers,
and is optional for bus drivers.
@retval EFI_SUCCESS The device specified by ControllerHandle and
- RemainingDevicePath is supported by the driver
+ RemainingDevicePath is supported by the driver
specified by This.
@retval EFI_ALREADY_STARTED The device specified by ControllerHandle and
- RemainingDevicePath is already being managed
+ RemainingDevicePath is already being managed
by the driver specified by This.
@retval EFI_ACCESS_DENIED The device specified by ControllerHandle and
- RemainingDevicePath is already being managed by
- a different driver or an application that
+ RemainingDevicePath is already being managed by
+ a different driver or an application that
requires exclusive acces. Currently not implemented.
@retval EFI_UNSUPPORTED The device specified by ControllerHandle and
- RemainingDevicePath is not supported by the
+ RemainingDevicePath is not supported by the
driver specified by This.
**/
@@ -76,32 +76,32 @@ ArpDriverBindingSupported ( );
/**
- Start this driver on ControllerHandle.
-
- The Start() function is designed to be invoked from the EFI boot service ConnectController().
- As a result, much of the error checking on the parameters to Start() has been
- moved into this common boot service. It is legal to call Start() from other locations,
- but the following calling restrictions must be followed or the system behavior
+ Start this driver on ControllerHandle.
+
+ The Start() function is designed to be invoked from the EFI boot service ConnectController().
+ As a result, much of the error checking on the parameters to Start() has been
+ moved into this common boot service. It is legal to call Start() from other locations,
+ but the following calling restrictions must be followed or the system behavior
will not be deterministic.
1. ControllerHandle must be a valid EFI_HANDLE.
- 2. If RemainingDevicePath is not NULL, then it must be a pointer to a naturally
+ 2. If RemainingDevicePath is not NULL, then it must be a pointer to a naturally
aligned EFI_DEVICE_PATH_PROTOCOL.
- 3. Prior to calling Start(), the Supported() function for the driver specified
- by This must have been called with the same calling parameters, and Supported()
- must have returned EFI_SUCCESS.
+ 3. Prior to calling Start(), the Supported() function for the driver specified
+ by This must have been called with the same calling parameters, and Supported()
+ must have returned EFI_SUCCESS.
@param[in] This A pointer to the EFI_DRIVER_BINDING_PROTOCOL instance.
- @param[in] ControllerHandle The handle of the controller to start. This handle
- must support a protocol interface that supplies
+ @param[in] ControllerHandle The handle of the controller to start. This handle
+ must support a protocol interface that supplies
an I/O abstraction to the driver.
- @param[in] RemainingDevicePath A pointer to the remaining portion of a device path.
- This parameter is ignored by device drivers,
+ @param[in] RemainingDevicePath A pointer to the remaining portion of a device path.
+ This parameter is ignored by device drivers,
and is optional for bus drivers.
@retval EFI_SUCCESS The device was started.
@retval EFI_DEVICE_ERROR The device could not be started due to a device error.
Currently not implemented.
- @retval EFI_OUT_OF_RESOURCES The request could not be completed due to a lack of
+ @retval EFI_OUT_OF_RESOURCES The request could not be completed due to a lack of
resources.
@retval Others The driver failded to start the device.
@@ -115,13 +115,13 @@ ArpDriverBindingStart ( );
/**
- Stop this driver on ControllerHandle.
-
+ Stop this driver on ControllerHandle.
+
Release the control of this controller and remove the IScsi functions. The Stop()
- function is designed to be invoked from the EFI boot service DisconnectController().
- As a result, much of the error checking on the parameters to Stop() has been moved
- into this common boot service. It is legal to call Stop() from other locations,
- but the following calling restrictions must be followed or the system behavior
+ function is designed to be invoked from the EFI boot service DisconnectController().
+ As a result, much of the error checking on the parameters to Stop() has been moved
+ into this common boot service. It is legal to call Stop() from other locations,
+ but the following calling restrictions must be followed or the system behavior
will not be deterministic.
1. ControllerHandle must be a valid EFI_HANDLE that was used on a previous call to this
same driver's Start() function.
@@ -129,14 +129,14 @@ ArpDriverBindingStart ( EFI_HANDLE. In addition, all of these handles must have been created in this driver's
Start() function, and the Start() function must have called OpenProtocol() on
ControllerHandle with an Attribute of EFI_OPEN_PROTOCOL_BY_CHILD_CONTROLLER.
-
+
@param[in] This A pointer to the EFI_DRIVER_BINDING_PROTOCOL instance.
- @param[in] ControllerHandle A handle to the device being stopped. The handle must
- support a bus specific I/O protocol for the driver
+ @param[in] ControllerHandle A handle to the device being stopped. The handle must
+ support a bus specific I/O protocol for the driver
to use to stop the device.
@param[in] NumberOfChildren The number of child device handles in ChildHandleBuffer.
Not used.
- @param[in] ChildHandleBuffer An array of child handles to be freed. May be NULL
+ @param[in] ChildHandleBuffer An array of child handles to be freed. May be NULL
if NumberOfChildren is 0.Not used.
@retval EFI_SUCCESS The device was stopped.
@@ -154,15 +154,15 @@ ArpDriverBindingStop ( /**
Creates a child handle and installs a protocol.
-
- The CreateChild() function installs a protocol on ChildHandle.
- If ChildHandle is a pointer to NULL, then a new handle is created and returned
- in ChildHandle. If ChildHandle is not a pointer to NULL, then the protocol
+
+ The CreateChild() function installs a protocol on ChildHandle.
+ If ChildHandle is a pointer to NULL, then a new handle is created and returned
+ in ChildHandle. If ChildHandle is not a pointer to NULL, then the protocol
installs on the existing ChildHandle.
@param This Pointer to the EFI_SERVICE_BINDING_PROTOCOL instance.
@param ChildHandle Pointer to the handle of the child to create. If it is NULL,
- then a new handle is created. If it is a pointer to an existing
+ then a new handle is created. If it is a pointer to an existing
UEFI handle, then the protocol is added to the existing UEFI handle.
@retval EFI_SUCCES The protocol was added to ChildHandle.
@@ -181,16 +181,16 @@ ArpServiceBindingCreateChild ( /**
Destroys a child handle with a protocol installed on it.
-
- The DestroyChild() function does the opposite of CreateChild(). It removes a protocol
- that was installed by CreateChild() from ChildHandle. If the removed protocol is the
+
+ The DestroyChild() function does the opposite of CreateChild(). It removes a protocol
+ that was installed by CreateChild() from ChildHandle. If the removed protocol is the
last protocol on ChildHandle, then ChildHandle is destroyed.
@param This Pointer to the EFI_SERVICE_BINDING_PROTOCOL instance.
@param ChildHandle Handle of the child to destroy
@retval EFI_SUCCES The protocol was removed from ChildHandle.
- @retval EFI_UNSUPPORTED ChildHandle does not support the protocol that is
+ @retval EFI_UNSUPPORTED ChildHandle does not support the protocol that is
being removed.
@retval EFI_INVALID_PARAMETER Child handle is NULL.
@retval EFI_ACCESS_DENIED The protocol could not be removed from the ChildHandle
diff --git a/MdeModulePkg/Universal/Network/ArpDxe/ArpDxe.inf b/MdeModulePkg/Universal/Network/ArpDxe/ArpDxe.inf index 9dff604..85f7982 100644 --- a/MdeModulePkg/Universal/Network/ArpDxe/ArpDxe.inf +++ b/MdeModulePkg/Universal/Network/ArpDxe/ArpDxe.inf @@ -5,7 +5,7 @@ # implementation of the Address Resolution Protocol that is described in RFCs 826
# and 1122.
#
-# Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>
# 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
@@ -31,7 +31,7 @@ #
# VALID_ARCHITECTURES = IA32 X64 IPF EBC
#
-# DRIVER_BINDING = gArpDriverBinding
+# DRIVER_BINDING = gArpDriverBinding
# COMPONENT_NAME = gArpComponentName
# COMPONENT_NAME2 = gArpComponentName2
#
diff --git a/MdeModulePkg/Universal/Network/ArpDxe/ArpDxe.uni b/MdeModulePkg/Universal/Network/ArpDxe/ArpDxe.uni index 4f02ae1..15f73b3 100644 --- a/MdeModulePkg/Universal/Network/ArpDxe/ArpDxe.uni +++ b/MdeModulePkg/Universal/Network/ArpDxe/ArpDxe.uni @@ -5,13 +5,13 @@ // implementation of the Address Resolution Protocol that is described in RFCs 826
// and 1122.
//
-// Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.<BR>
+// Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>
//
// 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,
// WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
//
diff --git a/MdeModulePkg/Universal/Network/ArpDxe/ArpDxeExtra.uni b/MdeModulePkg/Universal/Network/ArpDxe/ArpDxeExtra.uni index 9af9fb1..6870da1 100644 --- a/MdeModulePkg/Universal/Network/ArpDxe/ArpDxeExtra.uni +++ b/MdeModulePkg/Universal/Network/ArpDxe/ArpDxeExtra.uni @@ -1,7 +1,7 @@ // /** @file
// ArpDxe Localized Strings and Content
//
-// Copyright (c) 2013 - 2014, Intel Corporation. All rights reserved.<BR>
+// Copyright (c) 2013 - 2018, Intel Corporation. All rights reserved.<BR>
//
// This program and the accompanying materials
// are licensed and made available under the terms and conditions of the BSD License
@@ -13,8 +13,8 @@ //
// **/
-#string STR_PROPERTIES_MODULE_NAME
-#language en-US
+#string STR_PROPERTIES_MODULE_NAME
+#language en-US
"ARP DXE Driver"
diff --git a/MdeModulePkg/Universal/Network/ArpDxe/ArpImpl.c b/MdeModulePkg/Universal/Network/ArpDxe/ArpImpl.c index a02de20..af23538 100644 --- a/MdeModulePkg/Universal/Network/ArpDxe/ArpImpl.c +++ b/MdeModulePkg/Universal/Network/ArpDxe/ArpImpl.c @@ -1,7 +1,7 @@ /** @file
The implementation of the ARP protocol.
-
-Copyright (c) 2006 - 2016, Intel Corporation. All rights reserved.<BR>
+
+Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>
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>
@@ -343,7 +343,7 @@ ArpOnFrameRcvd ( /**
Process the already sent arp packets.
-
+
@param[in] Context Pointer to the context data registerd to the
Event.
diff --git a/MdeModulePkg/Universal/Network/ArpDxe/ArpImpl.h b/MdeModulePkg/Universal/Network/ArpDxe/ArpImpl.h index a5dce7d..248c166 100644 --- a/MdeModulePkg/Universal/Network/ArpDxe/ArpImpl.h +++ b/MdeModulePkg/Universal/Network/ArpDxe/ArpImpl.h @@ -1,7 +1,7 @@ /** @file
EFI Address Resolution Protocol (ARP) Protocol interface header file.
-Copyright (c) 2006 - 2012, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>
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>
@@ -94,13 +94,13 @@ typedef enum { /**
Returns a pointer to the ARP_INSTANCE_DATA structure from the input a.
-
- If the signatures matches, then a pointer to the data structure that contains
+
+ If the signatures matches, then a pointer to the data structure that contains
a specified field of that data structure is returned.
-
- @param a Pointer to the field specified by ArpProto within a data
+
+ @param a Pointer to the field specified by ArpProto within a data
structure of type ARP_INSTANCE_DATA.
-
+
**/
#define ARP_INSTANCE_DATA_FROM_THIS(a) \
CR ( \
@@ -130,13 +130,13 @@ typedef struct { /**
Returns a pointer to the ARP_SERVICE_DATA structure from the input a.
-
- If the signatures matches, then a pointer to the data structure that contains
+
+ If the signatures matches, then a pointer to the data structure that contains
a specified field of that data structure is returned.
-
- @param a Pointer to the field specified by ServiceBinding within
+
+ @param a Pointer to the field specified by ServiceBinding within
a data structure of type ARP_SERVICE_DATA.
-
+
**/
#define ARP_SERVICE_DATA_FROM_THIS(a) \
CR ( \
@@ -228,13 +228,13 @@ typedef struct { /**
This function is used to assign a station address to the ARP cache for this instance
of the ARP driver.
-
- Each ARP instance has one station address. The EFI_ARP_PROTOCOL driver will
- respond to ARP requests that match this registered station address. A call to
+
+ Each ARP instance has one station address. The EFI_ARP_PROTOCOL driver will
+ respond to ARP requests that match this registered station address. A call to
this function with the ConfigData field set to NULL will reset this ARP instance.
-
- Once a protocol type and station address have been assigned to this ARP instance,
- all the following ARP functions will use this information. Attempting to change
+
+ Once a protocol type and station address have been assigned to this ARP instance,
+ all the following ARP functions will use this information. Attempting to change
the protocol type or station address to a configured ARP instance will result in errors.
@param This Pointer to the EFI_ARP_PROTOCOL instance.
@@ -263,17 +263,17 @@ ArpConfigure ( /**
This function is used to insert entries into the ARP cache.
- ARP cache entries are typically inserted and updated by network protocol drivers
- as network traffic is processed. Most ARP cache entries will time out and be
- deleted if the network traffic stops. ARP cache entries that were inserted
+ ARP cache entries are typically inserted and updated by network protocol drivers
+ as network traffic is processed. Most ARP cache entries will time out and be
+ deleted if the network traffic stops. ARP cache entries that were inserted
by the Add() function may be static (will not time out) or dynamic (will time out).
- Default ARP cache timeout values are not covered in most network protocol
- specifications (although RFC 1122 comes pretty close) and will only be
- discussed in general in this specification. The timeout values that are
- used in the EFI Sample Implementation should be used only as a guideline.
- Final product implementations of the EFI network stack should be tuned for
+ Default ARP cache timeout values are not covered in most network protocol
+ specifications (although RFC 1122 comes pretty close) and will only be
+ discussed in general in this specification. The timeout values that are
+ used in the EFI Sample Implementation should be used only as a guideline.
+ Final product implementations of the EFI network stack should be tuned for
their expected network environments.
-
+
@param This Pointer to the EFI_ARP_PROTOCOL instance.
@param DenyFlag Set to TRUE if this entry is a deny entry. Set to
FALSE if this entry is a normal entry.
@@ -319,14 +319,14 @@ ArpAdd ( /**
This function searches the ARP cache for matching entries and allocates a buffer into
which those entries are copied.
-
- The first part of the allocated buffer is EFI_ARP_FIND_DATA, following which
+
+ The first part of the allocated buffer is EFI_ARP_FIND_DATA, following which
are protocol address pairs and hardware address pairs.
- When finding a specific protocol address (BySwAddress is TRUE and AddressBuffer
- is not NULL), the ARP cache timeout for the found entry is reset if Refresh is
- set to TRUE. If the found ARP cache entry is a permanent entry, it is not
+ When finding a specific protocol address (BySwAddress is TRUE and AddressBuffer
+ is not NULL), the ARP cache timeout for the found entry is reset if Refresh is
+ set to TRUE. If the found ARP cache entry is a permanent entry, it is not
affected by Refresh.
-
+
@param This Pointer to the EFI_ARP_PROTOCOL instance.
@param BySwAddress Set to TRUE to look for matching software protocol
addresses. Set to FALSE to look for matching
@@ -439,13 +439,13 @@ ArpRequest ( /**
This function aborts the previous ARP request (identified by This, TargetSwAddress
and ResolvedEvent) that is issued by EFI_ARP_PROTOCOL.Request().
-
- If the request is in the internal ARP request queue, the request is aborted
- immediately and its ResolvedEvent is signaled. Only an asynchronous address
- request needs to be canceled. If TargeSwAddress and ResolveEvent are both
- NULL, all the pending asynchronous requests that have been issued by This
+
+ If the request is in the internal ARP request queue, the request is aborted
+ immediately and its ResolvedEvent is signaled. Only an asynchronous address
+ request needs to be canceled. If TargeSwAddress and ResolveEvent are both
+ NULL, all the pending asynchronous requests that have been issued by This
instance will be cancelled and their corresponding events will be signaled.
-
+
@param This Pointer to the EFI_ARP_PROTOCOL instance.
@param TargetSwAddress Pointer to the protocol address in previous
request session.
@@ -673,7 +673,7 @@ ArpOnFrameRcvd ( /**
Process the already sent arp packets.
-
+
@param[in] Context Pointer to the context data registerd to the
Event.
diff --git a/MdeModulePkg/Universal/Network/ArpDxe/ArpMain.c b/MdeModulePkg/Universal/Network/ArpDxe/ArpMain.c index abe02c1..6922621 100644 --- a/MdeModulePkg/Universal/Network/ArpDxe/ArpMain.c +++ b/MdeModulePkg/Universal/Network/ArpDxe/ArpMain.c @@ -1,7 +1,7 @@ /** @file
Implementation of EFI Address Resolution Protocol (ARP) Protocol interface functions.
-
-Copyright (c) 2006 - 2009, Intel Corporation. All rights reserved.<BR>
+
+Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>
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>
@@ -18,13 +18,13 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. /**
This function is used to assign a station address to the ARP cache for this instance
of the ARP driver.
-
- Each ARP instance has one station address. The EFI_ARP_PROTOCOL driver will
- respond to ARP requests that match this registered station address. A call to
+
+ Each ARP instance has one station address. The EFI_ARP_PROTOCOL driver will
+ respond to ARP requests that match this registered station address. A call to
this function with the ConfigData field set to NULL will reset this ARP instance.
-
- Once a protocol type and station address have been assigned to this ARP instance,
- all the following ARP functions will use this information. Attempting to change
+
+ Once a protocol type and station address have been assigned to this ARP instance,
+ all the following ARP functions will use this information. Attempting to change
the protocol type or station address to a configured ARP instance will result in errors.
@param This Pointer to the EFI_ARP_PROTOCOL instance.
@@ -83,17 +83,17 @@ ArpConfigure ( /**
This function is used to insert entries into the ARP cache.
- ARP cache entries are typically inserted and updated by network protocol drivers
- as network traffic is processed. Most ARP cache entries will time out and be
- deleted if the network traffic stops. ARP cache entries that were inserted
+ ARP cache entries are typically inserted and updated by network protocol drivers
+ as network traffic is processed. Most ARP cache entries will time out and be
+ deleted if the network traffic stops. ARP cache entries that were inserted
by the Add() function may be static (will not time out) or dynamic (will time out).
- Default ARP cache timeout values are not covered in most network protocol
- specifications (although RFC 1122 comes pretty close) and will only be
- discussed in general in this specification. The timeout values that are
- used in the EFI Sample Implementation should be used only as a guideline.
- Final product implementations of the EFI network stack should be tuned for
+ Default ARP cache timeout values are not covered in most network protocol
+ specifications (although RFC 1122 comes pretty close) and will only be
+ discussed in general in this specification. The timeout values that are
+ used in the EFI Sample Implementation should be used only as a guideline.
+ Final product implementations of the EFI network stack should be tuned for
their expected network environments.
-
+
@param This Pointer to the EFI_ARP_PROTOCOL instance.
@param DenyFlag Set to TRUE if this entry is a deny entry. Set to
FALSE if this entry is a normal entry.
@@ -281,14 +281,14 @@ UNLOCK_EXIT: /**
This function searches the ARP cache for matching entries and allocates a buffer into
which those entries are copied.
-
- The first part of the allocated buffer is EFI_ARP_FIND_DATA, following which
+
+ The first part of the allocated buffer is EFI_ARP_FIND_DATA, following which
are protocol address pairs and hardware address pairs.
- When finding a specific protocol address (BySwAddress is TRUE and AddressBuffer
- is not NULL), the ARP cache timeout for the found entry is reset if Refresh is
- set to TRUE. If the found ARP cache entry is a permanent entry, it is not
+ When finding a specific protocol address (BySwAddress is TRUE and AddressBuffer
+ is not NULL), the ARP cache timeout for the found entry is reset if Refresh is
+ set to TRUE. If the found ARP cache entry is a permanent entry, it is not
affected by Refresh.
-
+
@param This Pointer to the EFI_ARP_PROTOCOL instance.
@param BySwAddress Set to TRUE to look for matching software protocol
addresses. Set to FALSE to look for matching
@@ -678,13 +678,13 @@ SIGNAL_USER: /**
This function aborts the previous ARP request (identified by This, TargetSwAddress
and ResolvedEvent) that is issued by EFI_ARP_PROTOCOL.Request().
-
- If the request is in the internal ARP request queue, the request is aborted
- immediately and its ResolvedEvent is signaled. Only an asynchronous address
- request needs to be canceled. If TargeSwAddress and ResolveEvent are both
- NULL, all the pending asynchronous requests that have been issued by This
+
+ If the request is in the internal ARP request queue, the request is aborted
+ immediately and its ResolvedEvent is signaled. Only an asynchronous address
+ request needs to be canceled. If TargeSwAddress and ResolveEvent are both
+ NULL, all the pending asynchronous requests that have been issued by This
instance will be cancelled and their corresponding events will be signaled.
-
+
@param This Pointer to the EFI_ARP_PROTOCOL instance.
@param TargetSwAddress Pointer to the protocol address in previous
request session.
diff --git a/MdeModulePkg/Universal/Network/ArpDxe/ComponentName.c b/MdeModulePkg/Universal/Network/ArpDxe/ComponentName.c index ee47fb1..240c1e7 100644 --- a/MdeModulePkg/Universal/Network/ArpDxe/ComponentName.c +++ b/MdeModulePkg/Universal/Network/ArpDxe/ComponentName.c @@ -1,7 +1,7 @@ /** @file
UEFI Component Name(2) protocol implementation for ArpDxe driver.
-Copyright (c) 2006 - 2012, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>
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>
@@ -187,10 +187,10 @@ ArpComponentNameGetControllerName ( if (ChildHandle == NULL) {
return EFI_UNSUPPORTED;
}
-
- //
- // Make sure this driver produced ChildHandle
- //
+
+ //
+ // Make sure this driver produced ChildHandle
+ //
Status = EfiTestChildHandle (
ControllerHandle,
ChildHandle,
@@ -200,9 +200,9 @@ ArpComponentNameGetControllerName ( return Status;
}
- //
- // Retrieve an instance of a produced protocol from ChildHandle
- //
+ //
+ // Retrieve an instance of a produced protocol from ChildHandle
+ //
Status = gBS->OpenProtocol (
ChildHandle,
&gEfiArpProtocolGuid,
diff --git a/MdeModulePkg/Universal/Network/Dhcp4Dxe/ComponentName.c b/MdeModulePkg/Universal/Network/Dhcp4Dxe/ComponentName.c index 2ea0760..0b42906 100644 --- a/MdeModulePkg/Universal/Network/Dhcp4Dxe/ComponentName.c +++ b/MdeModulePkg/Universal/Network/Dhcp4Dxe/ComponentName.c @@ -1,6 +1,6 @@ /** @file
-Copyright (c) 2006 - 2012, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>
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
@@ -249,11 +249,11 @@ DhcpComponentNameGetDriverName ( @param Dhcp4[in] A pointer to the EFI_DHCP4_PROTOCOL.
-
+
@retval EFI_SUCCESS Update the ControllerNameTable of this instance successfully.
@retval EFI_INVALID_PARAMETER The input parameter is invalid.
@retval EFI_DEVICE_ERROR DHCP is in unknown state.
-
+
**/
EFI_STATUS
UpdateName (
@@ -274,16 +274,16 @@ UpdateName ( if (EFI_ERROR (Status)) {
return Status;
}
-
+
if (gDhcpControllerNameTable != NULL) {
FreeUnicodeStringTable (gDhcpControllerNameTable);
gDhcpControllerNameTable = NULL;
}
-
+
if (Dhcp4ModeData.State > Dhcp4Rebooting) {
return EFI_DEVICE_ERROR;
}
-
+
Status = AddUnicodeString2 (
"eng",
gDhcp4ComponentName.SupportedLanguages,
@@ -294,7 +294,7 @@ UpdateName ( if (EFI_ERROR (Status)) {
return Status;
}
-
+
return AddUnicodeString2 (
"en",
gDhcp4ComponentName2.SupportedLanguages,
@@ -391,10 +391,10 @@ DhcpComponentNameGetControllerName ( if (ChildHandle == NULL) {
return EFI_UNSUPPORTED;
}
-
- //
- // Make sure this driver produced ChildHandle
- //
+
+ //
+ // Make sure this driver produced ChildHandle
+ //
Status = EfiTestChildHandle (
ControllerHandle,
ChildHandle,
@@ -404,9 +404,9 @@ DhcpComponentNameGetControllerName ( return Status;
}
- //
- // Retrieve an instance of a produced protocol from ChildHandle
- //
+ //
+ // Retrieve an instance of a produced protocol from ChildHandle
+ //
Status = gBS->OpenProtocol (
ChildHandle,
&gEfiDhcp4ProtocolGuid,
diff --git a/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Driver.c b/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Driver.c index 1f1e21c..733af5e 100644 --- a/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Driver.c +++ b/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Driver.c @@ -1,6 +1,6 @@ /** @file
-Copyright (c) 2006 - 2016, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>
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
@@ -355,7 +355,7 @@ ON_ERROR: /**
Callback function which provided by user to remove one node in NetDestroyLinkList process.
-
+
@param[in] Entry The entry to be removed.
@param[in] Context Pointer to the callback context corresponds to the Context in NetDestroyLinkList.
@@ -445,7 +445,7 @@ Dhcp4DriverBindingStop ( if (!IsListEmpty (&DhcpSb->Children)) {
//
// Destroy all the children instances before destory the service.
- //
+ //
List = &DhcpSb->Children;
Status = NetDestroyLinkList (
List,
@@ -481,7 +481,7 @@ Dhcp4DriverBindingStop ( gDhcpControllerNameTable = NULL;
}
FreePool (DhcpSb);
-
+
Status = EFI_SUCCESS;
}
diff --git a/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Driver.h b/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Driver.h index a74cb64..ef45d74 100644 --- a/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Driver.h +++ b/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Driver.h @@ -1,7 +1,7 @@ /** @file
Header for the DHCP4 driver.
-
-Copyright (c) 2006 - 2016, Intel Corporation. All rights reserved.<BR>
+
+Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>
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
@@ -78,7 +78,7 @@ Dhcp4DriverBindingStart ( restrictions for this service. DisconnectController()
must follow these calling restrictions. If any other agent wishes
to call Stop() it must also follow these calling restrictions.
-
+
@param[in] This Protocol instance pointer.
@param[in] ControllerHandle Handle of device to stop driver on
@param[in] NumberOfChildren Number of Handles in ChildHandleBuffer. If number of
@@ -100,14 +100,14 @@ Dhcp4DriverBindingStop ( /**
Creates a child handle and installs a protocol.
-
- The CreateChild() function installs a protocol on ChildHandle.
- If ChildHandle is a pointer to NULL, then a new handle is created and returned in ChildHandle.
+
+ The CreateChild() function installs a protocol on ChildHandle.
+ If ChildHandle is a pointer to NULL, then a new handle is created and returned in ChildHandle.
If ChildHandle is not a pointer to NULL, then the protocol installs on the existing ChildHandle.
@param This Pointer to the EFI_SERVICE_BINDING_PROTOCOL instance.
@param ChildHandle Pointer to the handle of the child to create. If it is NULL,
- then a new handle is created. If it is a pointer to an existing UEFI handle,
+ then a new handle is created. If it is a pointer to an existing UEFI handle,
then the protocol is added to the existing UEFI handle.
@retval EFI_SUCCES The protocol was added to ChildHandle.
@@ -126,9 +126,9 @@ Dhcp4ServiceBindingCreateChild ( /**
Destroys a child handle with a protocol installed on it.
-
- The DestroyChild() function does the opposite of CreateChild(). It removes a protocol
- that was installed by CreateChild() from ChildHandle. If the removed protocol is the
+
+ The DestroyChild() function does the opposite of CreateChild(). It removes a protocol
+ that was installed by CreateChild() from ChildHandle. If the removed protocol is the
last protocol on ChildHandle, then ChildHandle is destroyed.
@param This Pointer to the EFI_SERVICE_BINDING_PROTOCOL instance.
diff --git a/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Dxe.inf b/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Dxe.inf index 9b6c9c1..e41bddb 100644 --- a/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Dxe.inf +++ b/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Dxe.inf @@ -5,7 +5,7 @@ # capability to collect configuration information for the EFI IPv4 Protocol drivers
# and to provide DHCPv4 server and PXE boot server discovery services.
#
-# Copyright (c) 2007 - 2014, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2007 - 2018, Intel Corporation. All rights reserved.<BR>
# 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
@@ -31,7 +31,7 @@ #
# VALID_ARCHITECTURES = IA32 X64 IPF EBC
#
-# DRIVER_BINDING = gDhcp4DriverBinding
+# DRIVER_BINDING = gDhcp4DriverBinding
# COMPONENT_NAME = gDhcp4ComponentName
# COMPONENT_NAME2 = gDhcp4ComponentName2
#
diff --git a/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Dxe.uni b/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Dxe.uni index 1684cc5..7330aae 100644 --- a/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Dxe.uni +++ b/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Dxe.uni @@ -5,13 +5,13 @@ // capability to collect configuration information for the EFI IPv4 Protocol drivers
// and to provide DHCPv4 server and PXE boot server discovery services.
//
-// Copyright (c) 2007 - 2014, Intel Corporation. All rights reserved.<BR>
+// Copyright (c) 2007 - 2018, Intel Corporation. All rights reserved.<BR>
//
// 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,
// WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
//
diff --git a/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4DxeExtra.uni b/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4DxeExtra.uni index dca59ae..d9aaf47 100644 --- a/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4DxeExtra.uni +++ b/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4DxeExtra.uni @@ -1,7 +1,7 @@ // /** @file
// Dhcp4Dxe Localized Strings and Content
//
-// Copyright (c) 2013 - 2014, Intel Corporation. All rights reserved.<BR>
+// Copyright (c) 2013 - 2018, Intel Corporation. All rights reserved.<BR>
//
// This program and the accompanying materials
// are licensed and made available under the terms and conditions of the BSD License
@@ -13,8 +13,8 @@ //
// **/
-#string STR_PROPERTIES_MODULE_NAME
-#language en-US
+#string STR_PROPERTIES_MODULE_NAME
+#language en-US
"DHCP v4 DXE Driver"
diff --git a/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Impl.c b/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Impl.c index 9e496ef..4cdebe6 100644 --- a/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Impl.c +++ b/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Impl.c @@ -1203,9 +1203,9 @@ Dhcp4InstanceConfigUdpIo ( EFI_DHCP4_TRANSMIT_RECEIVE_TOKEN *Token;
EFI_UDP4_CONFIG_DATA UdpConfigData;
IP4_ADDR ClientAddr;
- IP4_ADDR Ip;
- INTN Class;
- IP4_ADDR SubnetMask;
+ IP4_ADDR Ip;
+ INTN Class;
+ IP4_ADDR SubnetMask;
Instance = (DHCP_PROTOCOL *) Context;
DhcpSb = Instance->Service;
@@ -1238,7 +1238,7 @@ Dhcp4InstanceConfigUdpIo ( if (Class >= IP4_ADDR_CLASSE) {
return EFI_INVALID_PARAMETER;
}
-
+
SubnetMask = gIp4AllMasks[Class << 3];
} else {
SubnetMask = DhcpSb->Netmask;
@@ -1548,7 +1548,7 @@ EfiDhcp4TransmitReceive ( }
ClientAddr = EFI_NTOHL (Token->Packet->Dhcp4.Header.ClientAddr);
-
+
if (ClientAddr == 0) {
return EFI_NO_MAPPING;
}
diff --git a/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Impl.h b/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Impl.h index ccca4a2..0ae03ee 100644 --- a/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Impl.h +++ b/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Impl.h @@ -5,7 +5,7 @@ RFC 2132: DHCP Options and BOOTP Vendor Extensions
RFC 1534: Interoperation Between DHCP and BOOTP
RFC 3396: Encoding Long Options in DHCP.
-
+
Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>
This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License
diff --git a/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Io.c b/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Io.c index 9532ca8..98a22a7 100644 --- a/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Io.c +++ b/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Io.c @@ -1,6 +1,6 @@ /** @file
EFI DHCP protocol implementation.
-
+
Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>
This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License
@@ -41,7 +41,7 @@ DhcpInitRequest ( // Clear initial time to make sure that elapsed-time is set to 0 for first Discover or REQUEST message.
//
DhcpSb->ActiveChild->ElaspedTime= 0;
-
+
if (DhcpSb->DhcpState == Dhcp4Init) {
DhcpSetState (DhcpSb, Dhcp4Selecting, FALSE);
Status = DhcpSendMessage (DhcpSb, NULL, NULL, DHCP_MSG_DISCOVER, NULL);
@@ -1381,13 +1381,13 @@ DhcpSendMessage ( }
ASSERT (UdpIo != NULL);
-
+
Status = UdpIoSendDatagram (
- UdpIo,
- Wrap,
- &EndPoint,
- NULL,
- DhcpOnPacketSent,
+ UdpIo,
+ Wrap,
+ &EndPoint,
+ NULL,
+ DhcpOnPacketSent,
DhcpSb
);
@@ -1509,7 +1509,7 @@ DhcpOnTimerTick ( if (Instance != NULL && Instance->ElaspedTime < 0xffff) {
Instance->ElaspedTime++;
}
-
+
//
// Check the retransmit timer
//
@@ -1531,7 +1531,7 @@ DhcpOnTimerTick ( goto ON_EXIT;
}
}
-
+
if (++DhcpSb->CurRetry < DhcpSb->MaxRetries) {
//
// Still has another try
@@ -1570,7 +1570,7 @@ DhcpOnTimerTick ( goto END_SESSION;
}
}
-
+
//
// If an address has been acquired, check whether need to
// refresh or whether it has expired.
@@ -1602,8 +1602,8 @@ DhcpOnTimerTick ( if (Instance != NULL) {
Instance->ElaspedTime= 0;
- }
-
+ }
+
Status = DhcpSendMessage (
DhcpSb,
DhcpSb->Selected,
@@ -1626,7 +1626,7 @@ DhcpOnTimerTick ( if (Instance != NULL) {
Instance->ElaspedTime= 0;
- }
+ }
Status = DhcpSendMessage (
DhcpSb,
@@ -1648,7 +1648,7 @@ ON_EXIT: //
NET_LIST_FOR_EACH_SAFE (Entry, Next, &DhcpSb->Children) {
Instance = NET_LIST_USER_STRUCT (Entry, DHCP_PROTOCOL, Link);
-
+
if ((Instance != NULL) && (Instance->Token != NULL)) {
Instance->Timeout--;
if (Instance->Timeout == 0) {
diff --git a/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Io.h b/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Io.h index 1e85651..f515752 100644 --- a/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Io.h +++ b/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Io.h @@ -1,7 +1,7 @@ /** @file
The DHCP4 protocol implementation.
-
-Copyright (c) 2006 - 2009, Intel Corporation. All rights reserved.<BR>
+
+Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>
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
diff --git a/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Option.c b/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Option.c index 485c9c9..dd89bea 100644 --- a/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Option.c +++ b/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Option.c @@ -1,7 +1,7 @@ /** @file
Function to validate, parse, process the DHCP options.
-
-Copyright (c) 2006 - 2016, Intel Corporation. All rights reserved.<BR>
+
+Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>
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
diff --git a/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Option.h b/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Option.h index 02ffa25..a22de64 100644 --- a/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Option.h +++ b/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Option.h @@ -1,7 +1,7 @@ /** @file
To validate, parse and process the DHCP options.
-
-Copyright (c) 2006 - 2016, Intel Corporation. All rights reserved.<BR>
+
+Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>
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
@@ -22,7 +22,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. #define DHCP_OPTION_MAGIC 0x63538263 // Network byte order
#define DHCP_MAX_OPTIONS 256
-
+
//
// DHCP option types, this is used to validate the DHCP options.
//
diff --git a/MdeModulePkg/Universal/Network/DpcDxe/Dpc.c b/MdeModulePkg/Universal/Network/DpcDxe/Dpc.c index c605f72..dd88ab7 100644 --- a/MdeModulePkg/Universal/Network/DpcDxe/Dpc.c +++ b/MdeModulePkg/Universal/Network/DpcDxe/Dpc.c @@ -1,6 +1,6 @@ /** @file
-Copyright (c) 2007 - 2008, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2007 - 2018, Intel Corporation. All rights reserved.<BR>
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
@@ -337,7 +337,7 @@ DpcDriverEntryPoint ( //
Status = gBS->InstallMultipleProtocolInterfaces (
&mDpcHandle,
- &gEfiDpcProtocolGuid,
+ &gEfiDpcProtocolGuid,
&mDpc,
NULL
);
diff --git a/MdeModulePkg/Universal/Network/DpcDxe/DpcDxe.uni b/MdeModulePkg/Universal/Network/DpcDxe/DpcDxe.uni index db33b33..9c0c96b 100644 --- a/MdeModulePkg/Universal/Network/DpcDxe/DpcDxe.uni +++ b/MdeModulePkg/Universal/Network/DpcDxe/DpcDxe.uni @@ -3,13 +3,13 @@ //
// This module produces Deferred Procedure Call Protocol.
//
-// Copyright (c) 2007 - 2014, Intel Corporation. All rights reserved.<BR>
+// Copyright (c) 2007 - 2018, Intel Corporation. All rights reserved.<BR>
//
// 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,
// WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
//
diff --git a/MdeModulePkg/Universal/Network/DpcDxe/DpcDxeExtra.uni b/MdeModulePkg/Universal/Network/DpcDxe/DpcDxeExtra.uni index 7c57022..0a53917 100644 --- a/MdeModulePkg/Universal/Network/DpcDxe/DpcDxeExtra.uni +++ b/MdeModulePkg/Universal/Network/DpcDxe/DpcDxeExtra.uni @@ -1,7 +1,7 @@ // /** @file
// DpcDxe Localized Strings and Content
//
-// Copyright (c) 2013 - 2014, Intel Corporation. All rights reserved.<BR>
+// Copyright (c) 2013 - 2018, Intel Corporation. All rights reserved.<BR>
//
// This program and the accompanying materials
// are licensed and made available under the terms and conditions of the BSD License
@@ -13,8 +13,8 @@ //
// **/
-#string STR_PROPERTIES_MODULE_NAME
-#language en-US
+#string STR_PROPERTIES_MODULE_NAME
+#language en-US
"Deferred Procedure Call DXE Driver"
diff --git a/MdeModulePkg/Universal/Network/IScsiDxe/ComponentName.c b/MdeModulePkg/Universal/Network/IScsiDxe/ComponentName.c index 063b372..3f561e9 100644 --- a/MdeModulePkg/Universal/Network/IScsiDxe/ComponentName.c +++ b/MdeModulePkg/Universal/Network/IScsiDxe/ComponentName.c @@ -1,7 +1,7 @@ /** @file
UEFI Component Name(2) protocol implementation for iSCSI.
-Copyright (c) 2004 - 2015, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2004 - 2018, Intel Corporation. All rights reserved.<BR>
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
@@ -33,7 +33,7 @@ GLOBAL_REMOVE_IF_UNREFERENCED EFI_COMPONENT_NAME2_PROTOCOL gIScsiComponentNam };
GLOBAL_REMOVE_IF_UNREFERENCED EFI_UNICODE_STRING_TABLE mIScsiDriverNameTable[] = {
- {"eng;en", L"iSCSI Driver"},
+ {"eng;en", L"iSCSI Driver"},
{NULL, NULL}
};
@@ -48,7 +48,7 @@ GLOBAL_REMOVE_IF_UNREFERENCED EFI_UNICODE_STRING_TABLE *mIScsiControllerNameTab returned in DriverName, and EFI_SUCCESS is returned. If the driver specified
by This does not support the language specified by Language,
then EFI_UNSUPPORTED is returned.
-
+
@param[in] This A pointer to the EFI_COMPONENT_NAME_PROTOCOL instance.
@param[in] Language A pointer to a three character ISO 639-2 language identifier.
This is the language of the driver name that that the caller
@@ -88,11 +88,11 @@ IScsiComponentNameGetDriverName ( Update the component name for the iSCSI instance.
@param[in] IScsiExtScsiPassThru A pointer to the EFI_EXT_SCSI_PASS_THRU_PROTOCOL instance.
-
+
@retval EFI_SUCCESS Update the ControllerNameTable of this instance successfully.
@retval EFI_INVALID_PARAMETER The input parameter is invalid.
@retval EFI_UNSUPPORTED Can't get the corresponding NIC info from the Controller handle.
-
+
**/
EFI_STATUS
UpdateName (
@@ -110,7 +110,7 @@ UpdateName ( if (IScsiExtScsiPassThru == NULL) {
return EFI_INVALID_PARAMETER;
}
-
+
Private = ISCSI_DRIVER_DATA_FROM_EXT_SCSI_PASS_THRU (IScsiExtScsiPassThru);
//
@@ -122,7 +122,7 @@ UpdateName ( }
VlanId = NetLibGetVlanId (Private->Controller);
IScsiMacAddrToStr (&MacAddress, (UINT32) HwAddressSize, VlanId, MacString);
-
+
UnicodeSPrint (
HandleName,
sizeof (HandleName),
@@ -183,7 +183,7 @@ UpdateName ( @retval EFI_SUCCESS The Unicode string for the user readable name in the
language specified by Language for the driver
- specified by This was returned in DriverName.
+ specified by This was returned in DriverName.
@retval EFI_INVALID_PARAMETER ControllerHandle is NULL.
@retval EFI_INVALID_PARAMETER ChildHandle is not NULL and it is not a valid EFI_HANDLE.
@retval EFI_INVALID_PARAMETER Language is NULL.
@@ -271,7 +271,7 @@ IScsiComponentNameGetControllerName ( return Status;
}
}
-
+
return LookupUnicodeString2 (
Language,
This->SupportedLanguages,
diff --git a/MdeModulePkg/Universal/Network/IScsiDxe/ComponentName.h b/MdeModulePkg/Universal/Network/IScsiDxe/ComponentName.h index b400aba..ee371d2 100644 --- a/MdeModulePkg/Universal/Network/IScsiDxe/ComponentName.h +++ b/MdeModulePkg/Universal/Network/IScsiDxe/ComponentName.h @@ -1,7 +1,7 @@ /** @file
The header file of UEFI Component Name(2) protocol.
-Copyright (c) 2004 - 2011, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2004 - 2018, Intel Corporation. All rights reserved.<BR>
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
@@ -34,7 +34,7 @@ extern EFI_COMPONENT_NAME_PROTOCOL gIScsiComponentName; returned in DriverName, and EFI_SUCCESS is returned. If the driver specified
by This does not support the language specified by Language,
then EFI_UNSUPPORTED is returned.
-
+
@param[in] This A pointer to the EFI_COMPONENT_NAME_PROTOCOL instance.
@param[in] Language A pointer to a three characters ISO 639-2 language identifier.
This is the language of the driver name that that the caller
@@ -89,7 +89,7 @@ IScsiComponentNameGetDriverName ( @retval EFI_SUCCESS The Unicode string for the user readable name in the
language specified by Language for the driver
- specified by This was returned in DriverName.
+ specified by This was returned in DriverName.
@retval EFI_INVALID_PARAMETER ControllerHandle is NULL.
@retval EFI_INVALID_PARAMETER ChildHandle is not NULL and it is not a valid EFI_HANDLE.
@retval EFI_INVALID_PARAMETER Language is NULL.
@@ -109,7 +109,7 @@ IScsiComponentNameGetControllerName ( IN CHAR8 *Language,
OUT CHAR16 **ControllerName
);
-
+
//
// EFI iSCSI Initiator Name Protocol for IScsi driver.
//
diff --git a/MdeModulePkg/Universal/Network/IScsiDxe/IScsi4Dxe.uni b/MdeModulePkg/Universal/Network/IScsiDxe/IScsi4Dxe.uni index 80bdc2c..d3c020e 100644 --- a/MdeModulePkg/Universal/Network/IScsiDxe/IScsi4Dxe.uni +++ b/MdeModulePkg/Universal/Network/IScsiDxe/IScsi4Dxe.uni @@ -6,13 +6,13 @@ // data over TCP/IP. It installs EFI HII Configuration Access Protocol to provide
// one way to configurate the iSCSI setting.
//
-// Copyright (c) 2004 - 2014, Intel Corporation. All rights reserved.<BR>
+// Copyright (c) 2004 - 2018, Intel Corporation. All rights reserved.<BR>
//
// 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,
// WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
//
diff --git a/MdeModulePkg/Universal/Network/IScsiDxe/IScsi4DxeExtra.uni b/MdeModulePkg/Universal/Network/IScsiDxe/IScsi4DxeExtra.uni index 9b717d4..5ec7582 100644 --- a/MdeModulePkg/Universal/Network/IScsiDxe/IScsi4DxeExtra.uni +++ b/MdeModulePkg/Universal/Network/IScsiDxe/IScsi4DxeExtra.uni @@ -1,7 +1,7 @@ // /** @file
// IScsi4Dxe Localized Strings and Content
//
-// Copyright (c) 2013 - 2014, Intel Corporation. All rights reserved.<BR>
+// Copyright (c) 2013 - 2018, Intel Corporation. All rights reserved.<BR>
//
// This program and the accompanying materials
// are licensed and made available under the terms and conditions of the BSD License
@@ -13,8 +13,8 @@ //
// **/
-#string STR_PROPERTIES_MODULE_NAME
-#language en-US
+#string STR_PROPERTIES_MODULE_NAME
+#language en-US
"iSCSI DXE Driver"
diff --git a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiCHAP.h b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiCHAP.h index f6a64e5..14a5658 100644 --- a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiCHAP.h +++ b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiCHAP.h @@ -1,7 +1,7 @@ /** @file
The header file of CHAP configuration.
-Copyright (c) 2004 - 2011, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2004 - 2018, Intel Corporation. All rights reserved.<BR>
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
@@ -29,9 +29,9 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. ///
/// MD5_HASHSIZE
///
-#define ISCSI_CHAP_RSP_LEN 16
+#define ISCSI_CHAP_RSP_LEN 16
-#define ISCSI_CHAP_INITIAL 0
+#define ISCSI_CHAP_INITIAL 0
#define ISCSI_CHAP_STEP_ONE 1
#define ISCSI_CHAP_STEP_TWO 2
#define ISCSI_CHAP_STEP_THREE 3
@@ -73,7 +73,7 @@ typedef struct _ISCSI_CHAP_AUTH_DATA { /**
This function checks the received iSCSI Login Response during the security
negotiation stage.
-
+
@param[in] Conn The iSCSI connection.
@retval EFI_SUCCESS The Login Response passed the CHAP validation.
diff --git a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiConfig.c b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiConfig.c index ea727af..cb1eff1 100644 --- a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiConfig.c +++ b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiConfig.c @@ -1,7 +1,7 @@ /** @file
Helper functions for configuring or getting the parameters relating to iSCSI.
-Copyright (c) 2004 - 2016, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2004 - 2018, Intel Corporation. All rights reserved.<BR>
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
@@ -39,7 +39,7 @@ HII_VENDOR_DEVICE_PATH mIScsiHiiVendorDevicePath = { {
END_DEVICE_PATH_TYPE,
END_ENTIRE_DEVICE_PATH_SUBTYPE,
- {
+ {
(UINT8) (END_DEVICE_PATH_LENGTH),
(UINT8) ((END_DEVICE_PATH_LENGTH) >> 8)
}
@@ -180,7 +180,7 @@ IScsiConvertIsIdToString ( Update the list of iSCSI devices the iSCSI driver is controlling.
@retval EFI_SUCCESS The callback successfully handled the action.
- @retval Others Other errors as indicated.
+ @retval Others Other errors as indicated.
**/
EFI_STATUS
IScsiUpdateDeviceList (
@@ -445,7 +445,7 @@ IScsiConvertDeviceConfigDataToIfrNvData ( would result in this type of
error. In this case, the
Progress parameter would be
- set to NULL.
+ set to NULL.
@retval EFI_NOT_FOUND Routing data doesn't match any
known driver. Progress set to the
first character in the routing header.
@@ -579,7 +579,7 @@ IScsiFormExtractConfig ( @param[in] This Points to the EFI_HII_CONFIG_ACCESS_PROTOCOL.
@param[in] Configuration A null-terminated Unicode string in
- <ConfigString> format.
+ <ConfigString> format.
@param[out] Progress A pointer to a string filled in with the
offset of the most recent '&' before the
first failing name / value pair (or the
@@ -589,7 +589,7 @@ IScsiFormExtractConfig ( successful.
@retval EFI_SUCCESS The results have been distributed or are
- awaiting distribution.
+ awaiting distribution.
@retval EFI_OUT_OF_RESOURCES Not enough memory to store the
parts of the results that must be
stored awaiting possible future
@@ -634,7 +634,7 @@ IScsiFormRouteConfig ( @param[in] Action Specifies the type of action taken by the browser.
@param[in] QuestionId A unique value which is sent to the original
exporting driver so that it can identify the type
- of data to expect. The format of the data tends to
+ of data to expect. The format of the data tends to
vary based on the opcode that enerated the callback.
@param[in] Type The type of value for the question.
@param[in] Value A pointer to the data being sent to the original
@@ -648,8 +648,8 @@ IScsiFormRouteConfig ( @retval EFI_DEVICE_ERROR The variable could not be saved.
@retval EFI_UNSUPPORTED The specified Action is not supported by the
callback.Currently not implemented.
- @retval EFI_INVALID_PARAMETERS Passing in wrong parameter.
- @retval Others Other errors as indicated.
+ @retval EFI_INVALID_PARAMETERS Passing in wrong parameter.
+ @retval Others Other errors as indicated.
**/
EFI_STATUS
EFIAPI
@@ -711,7 +711,7 @@ IScsiFormCallback ( Private->Current = ConfigFormEntry;
}
} else if (Action == EFI_BROWSER_ACTION_CHANGED) {
- switch (QuestionId) {
+ switch (QuestionId) {
case KEY_INITIATOR_NAME:
IScsiUnicodeStrToAsciiStr (IfrNvData->InitiatorName, IScsiName);
BufferSize = AsciiStrSize (IScsiName);
@@ -727,8 +727,8 @@ IScsiFormCallback ( case KEY_LOCAL_IP:
IScsiUnicodeStrToAsciiStr (IfrNvData->LocalIp, Ip4String);
Status = IScsiAsciiStrToIp (Ip4String, &HostIp.v4);
- if (EFI_ERROR (Status) ||
- ((Private->Current->SessionConfigData.SubnetMask.Addr[0] != 0) &&
+ if (EFI_ERROR (Status) ||
+ ((Private->Current->SessionConfigData.SubnetMask.Addr[0] != 0) &&
!NetIp4IsUnicast (NTOHL (HostIp.Addr[0]), NTOHL(*(UINT32*)Private->Current->SessionConfigData.SubnetMask.Addr)))) {
CreatePopUp (EFI_LIGHTGRAY | EFI_BACKGROUND_BLUE, &Key, L"Invalid IP address!", NULL);
Status = EFI_INVALID_PARAMETER;
@@ -753,9 +753,9 @@ IScsiFormCallback ( case KEY_GATE_WAY:
IScsiUnicodeStrToAsciiStr (IfrNvData->Gateway, Ip4String);
Status = IScsiAsciiStrToIp (Ip4String, &Gateway.v4);
- if (EFI_ERROR (Status) ||
- ((Gateway.Addr[0] != 0) &&
- (Private->Current->SessionConfigData.SubnetMask.Addr[0] != 0) &&
+ if (EFI_ERROR (Status) ||
+ ((Gateway.Addr[0] != 0) &&
+ (Private->Current->SessionConfigData.SubnetMask.Addr[0] != 0) &&
!NetIp4IsUnicast (NTOHL (Gateway.Addr[0]), NTOHL(*(UINT32*)Private->Current->SessionConfigData.SubnetMask.Addr)))) {
CreatePopUp (EFI_LIGHTGRAY | EFI_BACKGROUND_BLUE, &Key, L"Invalid Gateway!", NULL);
Status = EFI_INVALID_PARAMETER;
@@ -944,9 +944,9 @@ IScsiFormCallback ( //
HiiSetBrowserData (&gIp4IScsiConfigGuid, mVendorStorageName, sizeof (ISCSI_CONFIG_IFR_NVDATA), (UINT8 *) IfrNvData, NULL);
}
-
+
FreePool (IfrNvData);
-
+
return Status;
}
@@ -1033,12 +1033,12 @@ IScsiConfigUpdateForm ( );
if (EFI_ERROR (Status)) {
ZeroMem (&ConfigFormEntry->SessionConfigData, sizeof (ConfigFormEntry->SessionConfigData));
-
+
//
// Generate OUI-format ISID based on MAC address.
//
CopyMem (ConfigFormEntry->SessionConfigData.IsId, &MacAddress, 6);
- ConfigFormEntry->SessionConfigData.IsId[0] =
+ ConfigFormEntry->SessionConfigData.IsId[0] =
(UINT8) (ConfigFormEntry->SessionConfigData.IsId[0] & 0x3F);
}
//
@@ -1189,7 +1189,7 @@ IScsiConfigFormInit ( NULL
);
ASSERT_EFI_ERROR (Status);
-
+
//
// Publish our HII data
//
@@ -1216,7 +1216,7 @@ IScsiConfigFormInit ( free the resources used.
@param[in] DriverBindingHandle The iSCSI driverbinding handle.
-
+
@retval EFI_SUCCESS The iSCSI configuration form is unloaded.
@retval EFI_OUT_OF_RESOURCES Failed to allocate memory.
**/
diff --git a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiConfig.h b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiConfig.h index ef881d8..c3d07f6 100644 --- a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiConfig.h +++ b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiConfig.h @@ -1,7 +1,7 @@ /** @file
The header file of IScsiConfig.c.
-Copyright (c) 2004 - 2014, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2004 - 2018, Intel Corporation. All rights reserved.<BR>
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
@@ -35,23 +35,23 @@ extern UINT8 IScsi4DxeStrings[]; /**
- If the DEBUG_PROPERTY_DEBUG_ASSERT_ENABLED bit of PcdDebugProperyMask is clear,
+ If the DEBUG_PROPERTY_DEBUG_ASSERT_ENABLED bit of PcdDebugProperyMask is clear,
then this macro return a pointer to a data structure ISCSI_FORM_CALLBACK_INFO.
- If the DEBUG_PROPERTY_DEBUG_ASSERT_ENABLED bit of PcdDebugProperyMask is set,
- The Signature field of the data structure ISCSI_FORM_CALLBACK_INFO
- is compared to TestSignature. If the signatures match, then a pointer
- to the pointer to a data structure ISCSI_FORM_CALLBACK_INFO is returned.
- If the signatures do not match, then DebugAssert() is called with a description
- of "CR has a bad signature" and Callback is returned.
+ If the DEBUG_PROPERTY_DEBUG_ASSERT_ENABLED bit of PcdDebugProperyMask is set,
+ The Signature field of the data structure ISCSI_FORM_CALLBACK_INFO
+ is compared to TestSignature. If the signatures match, then a pointer
+ to the pointer to a data structure ISCSI_FORM_CALLBACK_INFO is returned.
+ If the signatures do not match, then DebugAssert() is called with a description
+ of "CR has a bad signature" and Callback is returned.
If the data type ISCSI_FORM_CALLBACK_INFO_SIGNATURE does not contain the field
specified by Callback, then the module will not compile.
- If ISCSI_FORM_CALLBACK_INFO_SIGNATURE does not contain a field called Signature,
+ If ISCSI_FORM_CALLBACK_INFO_SIGNATURE does not contain a field called Signature,
then the module will not compile.
- @param Callback Pointer to the specified field within the data
+ @param Callback Pointer to the specified field within the data
structure ISCSI_FORM_CALLBACK_INFO.
@return A pointer to the pointer to a data structure ISCSI_FORM_CALLBACK_INFO.
@retval Others Some unexpected error happened.
@@ -154,7 +154,7 @@ IScsiConfigFormInit ( free the resources used.
@param[in] DriverBindingHandle The iSCSI driverbinding handle.
-
+
@retval EFI_SUCCESS The iSCSI configuration form is unloaded.
@retval EFI_OUT_OF_RESOURCES Failed to allocate memory.
**/
diff --git a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiConfigDxe.vfr b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiConfigDxe.vfr index 2456c51..9e28d81 100644 --- a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiConfigDxe.vfr +++ b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiConfigDxe.vfr @@ -1,7 +1,7 @@ /** @file
Vfr file for iSCSI config.
-
-Copyright (c) 2004 - 2011, Intel Corporation. All rights reserved.<BR>
+
+Copyright (c) 2004 - 2018, Intel Corporation. All rights reserved.<BR>
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
@@ -16,7 +16,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. #include "IScsiConfigNVDataStruc.h"
#define EFI_NETWORK_DEVICE_CLASS 0x04
-formset
+formset
guid = IP4_ISCSI_CONFIG_GUID,
title = STRING_TOKEN(STR_ISCSI_CONFIG_FORM_TITLE),
help = STRING_TOKEN(STR_ISCSI_CONFIG_FORM_HELP),
@@ -27,7 +27,7 @@ formset form formid = FORMID_MAIN_FORM,
title = STRING_TOKEN(STR_ISCSI_MAIN_FORM_TITLE);
- string varid = ISCSI_CONFIG_IFR_NVDATA.InitiatorName,
+ string varid = ISCSI_CONFIG_IFR_NVDATA.InitiatorName,
prompt = STRING_TOKEN(STR_ISCSI_CONFIG_INIT_NAME),
help = STRING_TOKEN(STR_ISCSI_CONFIG_INIT_NAME_HELP),
flags = INTERACTIVE,
@@ -57,8 +57,8 @@ formset key = KEY_DHCP_ENABLE,
endcheckbox;
- suppressif ideqval ISCSI_CONFIG_IFR_NVDATA.InitiatorInfoFromDhcp == 0x01;
- string varid = ISCSI_CONFIG_IFR_NVDATA.LocalIp,
+ suppressif ideqval ISCSI_CONFIG_IFR_NVDATA.InitiatorInfoFromDhcp == 0x01;
+ string varid = ISCSI_CONFIG_IFR_NVDATA.LocalIp,
prompt = STRING_TOKEN(STR_ISCSI_LOCAL_IP_ADDRESS),
help = STRING_TOKEN(STR_ISCSI_IP_ADDRESS_HELP),
flags = INTERACTIVE,
@@ -67,7 +67,7 @@ formset maxsize = IP_MAX_SIZE,
endstring;
- string varid = ISCSI_CONFIG_IFR_NVDATA.SubnetMask,
+ string varid = ISCSI_CONFIG_IFR_NVDATA.SubnetMask,
prompt = STRING_TOKEN(STR_ISCSI_LOCAL_MASK),
help = STRING_TOKEN(STR_ISCSI_IP_ADDRESS_HELP),
flags = INTERACTIVE,
@@ -76,7 +76,7 @@ formset maxsize = IP_MAX_SIZE,
endstring;
- string varid = ISCSI_CONFIG_IFR_NVDATA.Gateway,
+ string varid = ISCSI_CONFIG_IFR_NVDATA.Gateway,
prompt = STRING_TOKEN(STR_ISCSI_LOCAL_GATEWAY),
help = STRING_TOKEN(STR_ISCSI_IP_ADDRESS_HELP),
flags = INTERACTIVE,
@@ -86,19 +86,19 @@ formset endstring;
endif;
- subtitle text = STRING_TOKEN(STR_NULL);
+ subtitle text = STRING_TOKEN(STR_NULL);
- suppressif ideqval ISCSI_CONFIG_IFR_NVDATA.InitiatorInfoFromDhcp == 0x00;
+ suppressif ideqval ISCSI_CONFIG_IFR_NVDATA.InitiatorInfoFromDhcp == 0x00;
checkbox varid = ISCSI_CONFIG_IFR_NVDATA.TargetInfoFromDhcp,
prompt = STRING_TOKEN(STR_ISCSI_ENABLE_DHCP_ON_TARGET),
help = STRING_TOKEN(STR_ISCSI_ENABLE_DHCP_ON_TARGET),
flags = 0,
endcheckbox;
endif;
-
- suppressif ideqval ISCSI_CONFIG_IFR_NVDATA.TargetInfoFromDhcp == 0x01;
- string varid = ISCSI_CONFIG_IFR_NVDATA.TargetName,
+ suppressif ideqval ISCSI_CONFIG_IFR_NVDATA.TargetInfoFromDhcp == 0x01;
+
+ string varid = ISCSI_CONFIG_IFR_NVDATA.TargetName,
prompt = STRING_TOKEN(STR_ISCSI_TARGET_NAME),
help = STRING_TOKEN(STR_ISCSI_TARGET_NAME),
flags = INTERACTIVE,
@@ -107,7 +107,7 @@ formset maxsize = ISCSI_NAME_IFR_MAX_SIZE,
endstring;
- string varid = ISCSI_CONFIG_IFR_NVDATA.TargetIp,
+ string varid = ISCSI_CONFIG_IFR_NVDATA.TargetIp,
prompt = STRING_TOKEN(STR_ISCSI_TARGET_IP_ADDRESS),
help = STRING_TOKEN(STR_ISCSI_IP_ADDRESS_HELP),
flags = INTERACTIVE,
@@ -115,17 +115,17 @@ formset minsize = IP_MIN_SIZE,
maxsize = IP_MAX_SIZE,
endstring;
-
- numeric varid = ISCSI_CONFIG_IFR_NVDATA.TargetPort,
+
+ numeric varid = ISCSI_CONFIG_IFR_NVDATA.TargetPort,
prompt = STRING_TOKEN(STR_ISCSI_TARGET_PORT),
help = STRING_TOKEN(STR_ISCSI_TARGET_PORT),
flags = 0,
minimum = TARGET_PORT_MIN_NUM,
- maximum = TARGET_PORT_MAX_NUM,
+ maximum = TARGET_PORT_MAX_NUM,
step = 0,
endnumeric;
-
- string varid = ISCSI_CONFIG_IFR_NVDATA.BootLun,
+
+ string varid = ISCSI_CONFIG_IFR_NVDATA.BootLun,
prompt = STRING_TOKEN(STR_ISCSI_BOOT_LUN),
help = STRING_TOKEN(STR_ISCSI_BOOT_LUN_HELP),
flags = INTERACTIVE,
@@ -135,19 +135,19 @@ formset endstring;
endif;
- subtitle text = STRING_TOKEN(STR_NULL);
+ subtitle text = STRING_TOKEN(STR_NULL);
oneof varid = ISCSI_CONFIG_IFR_NVDATA.CHAPType,
prompt = STRING_TOKEN(STR_CHAP_TYPE_PROMPT),
- help = STRING_TOKEN(STR_CHAP_TYPE_HELP),
+ help = STRING_TOKEN(STR_CHAP_TYPE_HELP),
option text = STRING_TOKEN(STR_CHAP_TYPE_NONE), value = ISCSI_CHAP_NONE, flags = DEFAULT;
option text = STRING_TOKEN(STR_CHAP_TYPE_UNI), value = ISCSI_CHAP_UNI, flags = 0;
option text = STRING_TOKEN(STR_CHAP_TYPE_MUTUAL), value = ISCSI_CHAP_MUTUAL, flags = 0;
endoneof;
- suppressif ideqval ISCSI_CONFIG_IFR_NVDATA.CHAPType == ISCSI_CHAP_NONE;
+ suppressif ideqval ISCSI_CONFIG_IFR_NVDATA.CHAPType == ISCSI_CHAP_NONE;
- string varid = ISCSI_CONFIG_IFR_NVDATA.CHAPName,
+ string varid = ISCSI_CONFIG_IFR_NVDATA.CHAPName,
prompt = STRING_TOKEN(STR_ISCSI_CHAP_NAME),
help = STRING_TOKEN(STR_ISCSI_CHAP_NAME),
flags = INTERACTIVE,
@@ -156,7 +156,7 @@ formset maxsize = ISCSI_CHAP_NAME_MAX_LEN,
endstring;
- string varid = ISCSI_CONFIG_IFR_NVDATA.CHAPSecret,
+ string varid = ISCSI_CONFIG_IFR_NVDATA.CHAPSecret,
prompt = STRING_TOKEN(STR_ISCSI_CHAP_SECRET),
help = STRING_TOKEN(STR_ISCSI_CHAP_SECRET_HELP),
flags = INTERACTIVE,
@@ -169,7 +169,7 @@ formset suppressif NOT ideqval ISCSI_CONFIG_IFR_NVDATA.CHAPType == ISCSI_CHAP_MUTUAL;
- string varid = ISCSI_CONFIG_IFR_NVDATA.ReverseCHAPName,
+ string varid = ISCSI_CONFIG_IFR_NVDATA.ReverseCHAPName,
prompt = STRING_TOKEN(STR_ISCSI_REVERSE_CHAP_NAME),
help = STRING_TOKEN(STR_ISCSI_REVERSE_CHAP_NAME),
flags = INTERACTIVE,
@@ -178,7 +178,7 @@ formset maxsize = ISCSI_CHAP_NAME_MAX_LEN,
endstring;
- string varid = ISCSI_CONFIG_IFR_NVDATA.ReverseCHAPSecret,
+ string varid = ISCSI_CONFIG_IFR_NVDATA.ReverseCHAPSecret,
prompt = STRING_TOKEN(STR_ISCSI_REVERSE_CHAP_SECRET),
help = STRING_TOKEN(STR_ISCSI_CHAP_SECRET_HELP),
flags = INTERACTIVE,
@@ -189,9 +189,9 @@ formset endif;
- subtitle text = STRING_TOKEN(STR_NULL);
+ subtitle text = STRING_TOKEN(STR_NULL);
- string varid = ISCSI_CONFIG_IFR_NVDATA.IsId,
+ string varid = ISCSI_CONFIG_IFR_NVDATA.IsId,
prompt = STRING_TOKEN(STR_ISCSI_CONFIG_ISID),
help = STRING_TOKEN(STR_ISCSI_CONFIG_ISID_HELP),
flags = INTERACTIVE,
@@ -200,16 +200,16 @@ formset maxsize = ISID_CONFIGURABLE_MAX_LEN,
endstring;
- subtitle text = STRING_TOKEN(STR_NULL);
+ subtitle text = STRING_TOKEN(STR_NULL);
text
help = STRING_TOKEN (STR_SAVE_CHANGES),
text = STRING_TOKEN (STR_SAVE_CHANGES),
flags = INTERACTIVE,
key = KEY_SAVE_CHANGES;
-
- goto FORMID_MAIN_FORM,
- prompt = STRING_TOKEN (STR_RETURN_MAIN_FORM),
+
+ goto FORMID_MAIN_FORM,
+ prompt = STRING_TOKEN (STR_RETURN_MAIN_FORM),
help = STRING_TOKEN (STR_RETURN_MAIN_FORM),
flags = 0;
diff --git a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiConfigDxeStrings.uni b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiConfigDxeStrings.uni index 6acf139..729c74e 100644 --- a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiConfigDxeStrings.uni +++ b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiConfigDxeStrings.uni @@ -1,6 +1,6 @@ // *++
//
-// Copyright (c) 2004 - 2011, Intel Corporation. All rights reserved.<BR>
+// Copyright (c) 2004 - 2018, Intel Corporation. All rights reserved.<BR>
// 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
@@ -12,13 +12,13 @@ // Module Name:
//
// IScsiConfigStrings.uni
-//
+//
// Abstract:
-//
+//
// String definitions for iSCSI configuration.
-//
+//
// Revision History:
-//
+//
// --*/
@@ -26,23 +26,23 @@ #langdef en-US "English"
-#string STR_ISCSI_CONFIG_FORM_TITLE #language en-US "iSCSI Configuration"
-#string STR_ISCSI_CONFIG_FORM_HELP #language en-US "Configure the iSCSI parameters."
+#string STR_ISCSI_CONFIG_FORM_TITLE #language en-US "iSCSI Configuration"
+#string STR_ISCSI_CONFIG_FORM_HELP #language en-US "Configure the iSCSI parameters."
#string STR_ISCSI_MAIN_FORM_TITLE #language en-US "iSCSI Configuration"
#string STR_ISCSI_CONFIG_INIT_NAME #language en-US "iSCSI Initiator Name"
#string STR_ISCSI_CONFIG_INIT_NAME_HELP #language en-US "The worldwide unique name of the initiator. Only iqn. format is accepted."
#string STR_ISCSI_DEVICE_FORM_TITLE #language en-US ""
#string STR_ISCSI_DEVICE_ENABLE #language en-US "Enable iSCSI"
#string STR_ISCSI_LOCAL_IP_ADDRESS #language en-US " Initiator IP Address"
-#string STR_ISCSI_LOCAL_MASK #language en-US " Initiator Subnet Mask"
+#string STR_ISCSI_LOCAL_MASK #language en-US " Initiator Subnet Mask"
#string STR_ISCSI_LOCAL_GATEWAY #language en-US " Gateway"
-#string STR_ISCSI_IP_ADDRESS_HELP #language en-US "Enter IP address in dotted-decimal notation."
-#string STR_ISCSI_TARGET_NAME #language en-US " Target Name"
-#string STR_ISCSI_TARGET_IP_ADDRESS #language en-US " Target IP Address"
-#string STR_ISCSI_TARGET_PORT #language en-US " Target Port"
+#string STR_ISCSI_IP_ADDRESS_HELP #language en-US "Enter IP address in dotted-decimal notation."
+#string STR_ISCSI_TARGET_NAME #language en-US " Target Name"
+#string STR_ISCSI_TARGET_IP_ADDRESS #language en-US " Target IP Address"
+#string STR_ISCSI_TARGET_PORT #language en-US " Target Port"
#string STR_ISCSI_BOOT_LUN #language en-US " Boot LUN"
#string STR_ISCSI_BOOT_LUN_HELP #language en-US "Hexadecimal representation of the LU number. Examples are: 4752-3A4F-6b7e-2F99, 6734-9-156f-127, 4186-9"
-#string STR_ISCSI_ENABLE_DHCP #language en-US "Enable DHCP"
+#string STR_ISCSI_ENABLE_DHCP #language en-US "Enable DHCP"
#string STR_ISCSI_ENABLE_DHCP_ON_TARGET #language en-US "Get target info via DHCP"
#string STR_CHAP_TYPE_PROMPT #language en-US "CHAP Type"
#string STR_CHAP_TYPE_HELP #language en-US "None, One way CHAP or mutual CHAP"
@@ -57,6 +57,6 @@ #string STR_ISCSI_CONFIG_ISID #language en-US "ISID"
#string STR_ISCSI_CONFIG_ISID_HELP #language en-US "OUI-format ISID in 6 bytes, default value are derived from MAC address. Only last 3 bytes are configurable. Example: update 0ABBCCDDEEFF to 0ABBCCF07901 by input F07901."
#string STR_RETURN_MAIN_FORM #language en-US "Back to Previous Page"
-#string STR_SAVE_CHANGES #language en-US "Save Changes"
+#string STR_SAVE_CHANGES #language en-US "Save Changes"
#string STR_NULL #language en-US ""
-
\ No newline at end of file +
diff --git a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiDhcp.c b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiDhcp.c index 976fe5d..6a876c8 100644 --- a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiDhcp.c +++ b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiDhcp.c @@ -1,7 +1,7 @@ /** @file
iSCSI DHCP related configuration routines.
-Copyright (c) 2004 - 2016, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2004 - 2018, Intel Corporation. All rights reserved.<BR>
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
@@ -95,7 +95,7 @@ IScsiDhcpExtractRootPath ( Status = EFI_INVALID_PARAMETER;
goto ON_EXIT;
}
-
+
if ((Fields[RP_FIELD_IDX_SERVERNAME].Str == NULL) ||
(Fields[RP_FIELD_IDX_TARGETNAME].Str == NULL) ||
(Fields[RP_FIELD_IDX_PROTOCOL].Len > 1)
@@ -170,14 +170,14 @@ ON_EXIT: /**
The callback function registerd to the DHCP4 instance which is used to select
the qualified DHCP OFFER.
-
+
@param[in] This The DHCP4 protocol.
@param[in] Context The context set when configuring the DHCP4 protocol.
@param[in] CurrentState The current state of the DHCP4 protocol.
@param[in] Dhcp4Event The event occurs in the current state.
- @param[in] Packet The DHCP packet that is to be sent or already received.
+ @param[in] Packet The DHCP packet that is to be sent or already received.
@param[out] NewPacket The packet used to replace the above Packet.
-
+
@retval EFI_SUCCESS Either the DHCP OFFER is qualified or we're not intereseted
in the Dhcp4Event.
@retval EFI_NOT_READY The DHCP OFFER packet doesn't match our requirements.
@@ -337,7 +337,7 @@ IScsiParseDhcpAck ( /**
Parse the DHCP ACK to get the address configuration and DNS information.
-
+
@param[in] Image The handle of the driver image.
@param[in] Controller The handle of the controller;
@param[in, out] ConfigData The session configuration data.
diff --git a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiDhcp.h b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiDhcp.h index 59f8672..4c4dcaa 100644 --- a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiDhcp.h +++ b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiDhcp.h @@ -1,7 +1,7 @@ /** @file
The header file of IScsiDhcp.
-Copyright (c) 2004 - 2016, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2004 - 2018, Intel Corporation. All rights reserved.<BR>
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
@@ -34,7 +34,7 @@ typedef struct _ISCSI_ROOT_PATH_FIELD { /**
Parse the DHCP ACK to get the address configuration and DNS information.
-
+
@param[in] Image The handle of the driver image.
@param[in] Controller The handle of the controller;
@param[in, out] ConfigData The session configuration data.
diff --git a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiDriver.c b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiDriver.c index 5295d34..730f3e5 100644 --- a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiDriver.c +++ b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiDriver.c @@ -1,7 +1,7 @@ /** @file
The entry point of IScsi driver.
-Copyright (c) 2004 - 2016, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2004 - 2018, Intel Corporation. All rights reserved.<BR>
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
@@ -24,14 +24,14 @@ EFI_DRIVER_BINDING_PROTOCOL gIScsiDriverBinding = { };
/**
- Tests to see if this driver supports the RemainingDevicePath.
-
- @param[in] RemainingDevicePath A pointer to the remaining portion of a device path. This
- parameter is ignored by device drivers, and is optional for bus
- drivers. For bus drivers, if this parameter is not NULL, then
- the bus driver must determine if the bus controller specified
- by ControllerHandle and the child controller specified
- by RemainingDevicePath are both supported by this
+ Tests to see if this driver supports the RemainingDevicePath.
+
+ @param[in] RemainingDevicePath A pointer to the remaining portion of a device path. This
+ parameter is ignored by device drivers, and is optional for bus
+ drivers. For bus drivers, if this parameter is not NULL, then
+ the bus driver must determine if the bus controller specified
+ by ControllerHandle and the child controller specified
+ by RemainingDevicePath are both supported by this
bus driver.
@retval EFI_SUCCESS The RemainingDevicePath is supported or NULL.
@@ -62,14 +62,14 @@ IScsiIsDevicePathSupported ( }
/**
- Tests to see if this driver supports a given controller. If a child device is provided,
+ Tests to see if this driver supports a given controller. If a child device is provided,
it further tests to see if this driver supports creating a handle for the specified child device.
@param[in] This A pointer to the EFI_DRIVER_BINDING_PROTOCOL instance.
- @param[in] ControllerHandle The handle of the controller to test. This handle
- must support a protocol interface that supplies
+ @param[in] ControllerHandle The handle of the controller to test. This handle
+ must support a protocol interface that supplies
an I/O abstraction to the driver.
- @param[in] RemainingDevicePath A pointer to the remaining portion of a device path.
+ @param[in] RemainingDevicePath A pointer to the remaining portion of a device path.
This parameter is ignored by device drivers, and is optional for bus drivers.
@@ -142,23 +142,23 @@ IScsiDriverBindingSupported ( }
/**
- Start this driver on ControllerHandle.
-
- The Start() function is designed to be invoked from the EFI boot service ConnectController().
- As a result, much of the error checking on the parameters to Start() has been moved into this
- common boot service. It is legal to call Start() from other locations, but the following calling
+ Start this driver on ControllerHandle.
+
+ The Start() function is designed to be invoked from the EFI boot service ConnectController().
+ As a result, much of the error checking on the parameters to Start() has been moved into this
+ common boot service. It is legal to call Start() from other locations, but the following calling
restrictions must be followed or the system behavior will not be deterministic.
1. ControllerHandle must be a valid EFI_HANDLE.
2. If RemainingDevicePath is not NULL, then it must be a pointer to a naturally aligned
EFI_DEVICE_PATH_PROTOCOL.
3. Prior to calling Start(), the Supported() function for the driver specified by This must
- have been called with the same calling parameters, and Supported() must have returned EFI_SUCCESS.
+ have been called with the same calling parameters, and Supported() must have returned EFI_SUCCESS.
@param[in] This A pointer to the EFI_DRIVER_BINDING_PROTOCOL instance.
- @param[in] ControllerHandle The handle of the controller to start. This handle
- must support a protocol interface that supplies
+ @param[in] ControllerHandle The handle of the controller to start. This handle
+ must support a protocol interface that supplies
an I/O abstraction to the driver.
- @param[in] RemainingDevicePath A pointer to the remaining portion of a device path.
+ @param[in] RemainingDevicePath A pointer to the remaining portion of a device path.
This parameter is ignored by device drivers, and is optional for bus drivers.
@retval EFI_SUCCESS The device was started.
@@ -214,7 +214,7 @@ IScsiDriverBindingStart ( }
//
- // Always install private protocol no matter what happens later. We need to
+ // Always install private protocol no matter what happens later. We need to
// keep the relationship between ControllerHandle and ChildHandle.
//
Status = gBS->InstallProtocolInterface (
@@ -286,7 +286,7 @@ IScsiDriverBindingStart ( This->DriverBindingHandle,
Private->ExtScsiPassThruHandle,
EFI_OPEN_PROTOCOL_BY_CHILD_CONTROLLER
- );
+ );
if (EFI_ERROR (Status)) {
gBS->UninstallMultipleProtocolInterfaces (
Private->ExtScsiPassThruHandle,
@@ -296,7 +296,7 @@ IScsiDriverBindingStart ( Private->DevicePath,
NULL
);
-
+
goto ON_ERROR;
}
@@ -315,12 +315,12 @@ ON_ERROR: }
/**
- Stop this driver on ControllerHandle.
-
+ Stop this driver on ControllerHandle.
+
Release the control of this controller and remove the IScsi functions. The Stop()
- function is designed to be invoked from the EFI boot service DisconnectController().
- As a result, much of the error checking on the parameters to Stop() has been moved
- into this common boot service. It is legal to call Stop() from other locations,
+ function is designed to be invoked from the EFI boot service DisconnectController().
+ As a result, much of the error checking on the parameters to Stop() has been moved
+ into this common boot service. It is legal to call Stop() from other locations,
but the following calling restrictions must be followed or the system behavior will not be deterministic.
1. ControllerHandle must be a valid EFI_HANDLE that was used on a previous call to this
same driver's Start() function.
@@ -328,13 +328,13 @@ ON_ERROR: EFI_HANDLE. In addition, all of these handles must have been created in this driver's
Start() function, and the Start() function must have called OpenProtocol() on
ControllerHandle with an Attribute of EFI_OPEN_PROTOCOL_BY_CHILD_CONTROLLER.
-
+
@param[in] This A pointer to the EFI_DRIVER_BINDING_PROTOCOL instance.
- @param[in] ControllerHandle A handle to the device being stopped. The handle must
- support a bus specific I/O protocol for the driver
+ @param[in] ControllerHandle A handle to the device being stopped. The handle must
+ support a bus specific I/O protocol for the driver
to use to stop the device.
@param[in] NumberOfChildren The number of child device handles in ChildHandleBuffer.Not used.
- @param[in] ChildHandleBuffer An array of child handles to be freed. May be NULL
+ @param[in] ChildHandleBuffer An array of child handles to be freed. May be NULL
if NumberOfChildren is 0.Not used.
@retval EFI_SUCCESS The device was stopped.
@@ -390,7 +390,7 @@ IScsiDriverBindingStop ( Private->Image,
Private->ExtScsiPassThruHandle
);
-
+
gBS->CloseProtocol (
Conn->Tcp4Io.Handle,
&gEfiTcp4ProtocolGuid,
@@ -515,7 +515,7 @@ EfiIScsiUnload ( if (EFI_ERROR (Status)) {
goto ON_EXIT;
}
- }
+ }
//
// Unload the iSCSI configuration form.
@@ -545,7 +545,7 @@ EfiIScsiUnload ( goto ON_EXIT;
}
}
-
+
Status = gBS->HandleProtocol (
gIScsiDriverBinding.DriverBindingHandle,
&gEfiComponentName2ProtocolGuid,
@@ -576,14 +576,14 @@ ON_EXIT: if (DeviceHandleBuffer != NULL) {
FreePool (DeviceHandleBuffer);
}
-
+
return Status;
}
/**
This is the declaration of an EFI image entry point. This entry point is
the same for UEFI Applications, UEFI OS Loaders, and UEFI Drivers including
- both device drivers and bus drivers. It initialize the global variables and
+ both device drivers and bus drivers. It initialize the global variables and
publish the driver binding protocol.
@param[in] ImageHandle The firmware allocated handle for the UEFI image.
@@ -651,7 +651,7 @@ IScsiDriverEntryPoint ( );
return Status;
}
-
+
//
// Initialize the configuration form of iSCSI.
//
diff --git a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiDriver.h b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiDriver.h index 14f6404..d6a619f 100644 --- a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiDriver.h +++ b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiDriver.h @@ -1,7 +1,7 @@ /** @file
The header file of IScsiDriver.c.
-Copyright (c) 2004 - 2011, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2004 - 2018, Intel Corporation. All rights reserved.<BR>
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
@@ -38,14 +38,14 @@ typedef struct _ISCSI_PRIVATE_PROTOCOL { //
/**
- Tests to see if this driver supports a given controller. If a child device is provided,
+ Tests to see if this driver supports a given controller. If a child device is provided,
it further tests to see if this driver supports creating a handle for the specified child device.
@param[in] This A pointer to the EFI_DRIVER_BINDING_PROTOCOL instance.
- @param[in] ControllerHandle The handle of the controller to test. This handle
- must support a protocol interface that supplies
+ @param[in] ControllerHandle The handle of the controller to test. This handle
+ must support a protocol interface that supplies
an I/O abstraction to the driver.
- @param[in] RemainingDevicePath A pointer to the remaining portion of a device path.
+ @param[in] RemainingDevicePath A pointer to the remaining portion of a device path.
This parameter is ignored by device drivers, and is optional for bus drivers.
@@ -70,22 +70,22 @@ IScsiDriverBindingSupported ( );
/**
- Start this driver on ControllerHandle. The Start() function is designed to be
- invoked from the EFI boot service ConnectController(). As a result, much of
- the error checking on the parameters to Start() has been moved into this
- common boot service. It is legal to call Start() from other locations,
+ Start this driver on ControllerHandle. The Start() function is designed to be
+ invoked from the EFI boot service ConnectController(). As a result, much of
+ the error checking on the parameters to Start() has been moved into this
+ common boot service. It is legal to call Start() from other locations,
but the following calling restrictions must be followed or the system behavior will not be deterministic.
1. ControllerHandle must be a valid EFI_HANDLE.
2. If RemainingDevicePath is not NULL, then it must be a pointer to a naturally aligned
EFI_DEVICE_PATH_PROTOCOL.
3. Prior to calling Start(), the Supported() function for the driver specified by This must
- have been called with the same calling parameters, and Supported() must have returned EFI_SUCCESS.
+ have been called with the same calling parameters, and Supported() must have returned EFI_SUCCESS.
@param[in] This A pointer to the EFI_DRIVER_BINDING_PROTOCOL instance.
- @param[in] ControllerHandle The handle of the controller to start. This handle
- must support a protocol interface that supplies
+ @param[in] ControllerHandle The handle of the controller to start. This handle
+ must support a protocol interface that supplies
an I/O abstraction to the driver.
- @param[in] RemainingDevicePath A pointer to the remaining portion of a device path.
+ @param[in] RemainingDevicePath A pointer to the remaining portion of a device path.
This parameter is ignored by device drivers, and is optional for bus drivers.
@retval EFI_SUCCESS The device was started.
@@ -103,12 +103,12 @@ IScsiDriverBindingStart ( );
/**
- Stop this driver on ControllerHandle.
-
+ Stop this driver on ControllerHandle.
+
Release the control of this controller and remove the IScsi functions. The Stop()
- function is designed to be invoked from the EFI boot service DisconnectController().
- As a result, much of the error checking on the parameters to Stop() has been moved
- into this common boot service. It is legal to call Stop() from other locations,
+ function is designed to be invoked from the EFI boot service DisconnectController().
+ As a result, much of the error checking on the parameters to Stop() has been moved
+ into this common boot service. It is legal to call Stop() from other locations,
but the following calling restrictions must be followed or the system behavior will not be deterministic.
1. ControllerHandle must be a valid EFI_HANDLE that was used on a previous call to this
same driver's Start() function.
@@ -116,13 +116,13 @@ IScsiDriverBindingStart ( EFI_HANDLE. In addition, all of these handles must have been created in this driver's
Start() function, and the Start() function must have called OpenProtocol() on
ControllerHandle with an Attribute of EFI_OPEN_PROTOCOL_BY_CHILD_CONTROLLER.
-
+
@param[in] This A pointer to the EFI_DRIVER_BINDING_PROTOCOL instance.
- @param[in] ControllerHandle A handle to the device being stopped. The handle must
- support a bus specific I/O protocol for the driver
+ @param[in] ControllerHandle A handle to the device being stopped. The handle must
+ support a bus specific I/O protocol for the driver
to use to stop the device.
@param[in] NumberOfChildren The number of child device handles in ChildHandleBuffer.Not used.
- @param[in] ChildHandleBuffer An array of child handles to be freed. May be NULL
+ @param[in] ChildHandleBuffer An array of child handles to be freed. May be NULL
if NumberOfChildren is 0.Not used.
@retval EFI_SUCCESS The device was stopped.
diff --git a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiDxe.inf b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiDxe.inf index 4fd2a62..dce3968 100644 --- a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiDxe.inf +++ b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiDxe.inf @@ -6,7 +6,7 @@ # data over TCP/IP. It installs EFI HII Configuration Access Protocol to provide
# one way to configurate the iSCSI setting.
#
-# Copyright (c) 2004 - 2014, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2004 - 2018, Intel Corporation. All rights reserved.<BR>
# 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
@@ -122,4 +122,4 @@ gIScsiCHAPAuthInfoGuid
[UserExtensions.TianoCore."ExtraFiles"]
- IScsi4DxeExtra.uni
\ No newline at end of file + IScsi4DxeExtra.uni
diff --git a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiExtScsiPassThru.c b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiExtScsiPassThru.c index e9e37b7..db2d6d1 100644 --- a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiExtScsiPassThru.c +++ b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiExtScsiPassThru.c @@ -1,7 +1,7 @@ /** @file
The IScsi's EFI_EXT_SCSI_PASS_THRU_PROTOCOL driver.
-Copyright (c) 2004 - 2015, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2004 - 2018, Intel Corporation. All rights reserved.<BR>
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
@@ -15,9 +15,9 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. #include "IScsiImpl.h"
/**
- Sends a SCSI Request Packet to a SCSI device that is attached to the SCSI channel. This function
+ Sends a SCSI Request Packet to a SCSI device that is attached to the SCSI channel. This function
supports both blocking I/O and nonblocking I/O. The blocking I/O functionality is required, and the
- nonblocking I/O functionality is optional.
+ nonblocking I/O functionality is optional.
@param[in] This A pointer to the EFI_EXT_SCSI_PASS_THRU_PROTOCOL instance.
@param[in] Target The Target is an array of size TARGET_MAX_BYTES and it represents
@@ -42,18 +42,18 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. @retval EFI_BAD_BUFFER_SIZE The SCSI Request Packet was not executed. The number of bytes that
could be transferred is returned in InTransferLength. For write
and bi-directional commands, OutTransferLength bytes were
- transferred by OutDataBuffer. Currently not implemeted.
+ transferred by OutDataBuffer. Currently not implemeted.
@retval EFI_NOT_READY The SCSI Request Packet could not be sent because there are too many
- SCSI Request Packets already queued. The caller may retry again later.
+ SCSI Request Packets already queued. The caller may retry again later.
@retval EFI_DEVICE_ERROR A device error occurred while attempting to send the SCSI Request
- Packet.
+ Packet.
@retval EFI_INVALID_PARAMETER Target, Lun, or the contents of ScsiRequestPacket are invalid.
@retval EFI_UNSUPPORTED The command described by the SCSI Request Packet is not supported
by the host adapter. This includes the case of Bi-directional SCSI
commands not supported by the implementation. The SCSI Request
Packet was not sent, so no additional status information is available.
Currently not implemeted.
- @retval EFI_TIMEOUT A timeout occurred while waiting for the SCSI Request Packet to execute.
+ @retval EFI_TIMEOUT A timeout occurred while waiting for the SCSI Request Packet to execute.
**/
EFI_STATUS
EFIAPI
@@ -67,7 +67,7 @@ IScsiExtScsiPassThruFunction ( {
ISCSI_DRIVER_DATA *Private;
ISCSI_SESSION_CONFIG_NVDATA *ConfigNvData;
- EFI_STATUS Status;
+ EFI_STATUS Status;
Private = ISCSI_DRIVER_DATA_FROM_EXT_SCSI_PASS_THRU (This);
ConfigNvData = &Private->Session.ConfigData.NvData;
@@ -96,11 +96,11 @@ IScsiExtScsiPassThruFunction ( }
/**
- Used to retrieve the list of legal Target IDs and LUNs for SCSI devices on a SCSI channel. These
+ Used to retrieve the list of legal Target IDs and LUNs for SCSI devices on a SCSI channel. These
can either be the list SCSI devices that are actually present on the SCSI channel, or the list of legal
- Target Ids and LUNs for the SCSI channel. Regardless, the caller of this function must probe the
- Target ID and LUN returned to see if a SCSI device is actually present at that location on the SCSI
- channel.
+ Target Ids and LUNs for the SCSI channel. Regardless, the caller of this function must probe the
+ Target ID and LUN returned to see if a SCSI device is actually present at that location on the SCSI
+ channel.
@param[in] This A pointer to the EFI_EXT_SCSI_PASS_THRU_PROTOCOL instance.
@param[in, out] Target On input, a pointer to the Target ID (an array of size
@@ -310,7 +310,7 @@ IScsiExtScsiPassThruGetTargetLun ( /**
Resets a SCSI channel. This operation resets all the SCSI devices connected to the SCSI channel.
Currently not implemented.
-
+
@param[in] This A pointer to the EFI_EXT_SCSI_PASS_THRU_PROTOCOL instance.
@retval EFI_SUCCESS The SCSI channel was reset.
@@ -358,10 +358,10 @@ IScsiExtScsiPassThruResetTargetLun ( }
/**
- Used to retrieve the list of legal Target IDs for SCSI devices on a SCSI channel. These can either
+ Used to retrieve the list of legal Target IDs for SCSI devices on a SCSI channel. These can either
be the list SCSI devices that are actually present on the SCSI channel, or the list of legal Target IDs
- for the SCSI channel. Regardless, the caller of this function must probe the Target ID returned to
- see if a SCSI device is actually present at that location on the SCSI channel.
+ for the SCSI channel. Regardless, the caller of this function must probe the Target ID returned to
+ see if a SCSI device is actually present at that location on the SCSI channel.
@param[in] This A pointer to the EFI_EXT_SCSI_PASS_THRU_PROTOCOL instance.
@param[in, out] Target (TARGET_MAX_BYTES) of a SCSI device present on the SCSI channel.
diff --git a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiIbft.c b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiIbft.c index 45d89a6..58c5447 100644 --- a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiIbft.c +++ b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiIbft.c @@ -1,7 +1,7 @@ /** @file
Implementation for iSCSI Boot Firmware Table publication.
-Copyright (c) 2004 - 2013, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2004 - 2018, Intel Corporation. All rights reserved.<BR>
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
@@ -19,7 +19,7 @@ UINTN mTableKey; /**
Initialize the header of the iSCSI Boot Firmware Table.
-
+
@param[out] Header The header of the iSCSI Boot Firmware Table.
@param[in] OemId The OEM ID.
@param[in] OemTableId The OEM table ID for the iBFT.
@@ -37,14 +37,14 @@ IScsiInitIbfTableHeader ( Header->Length = IBFT_HEAP_OFFSET;
Header->Revision = EFI_ACPI_ISCSI_BOOT_FIRMWARE_TABLE_REVISION;
Header->Checksum = 0;
-
+
CopyMem (Header->OemId, OemId, sizeof (Header->OemId));
CopyMem (&Header->OemTableId, OemTableId, sizeof (UINT64));
}
/**
Initialize the control section of the iSCSI Boot Firmware Table.
-
+
@param[in] Table The ACPI table.
@param[in] HandleCount The number of the handles associated with iSCSI sessions, it's
equal to the number of iSCSI sessions.
diff --git a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiMisc.c b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiMisc.c index 19577ff..d924a8b 100644 --- a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiMisc.c +++ b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiMisc.c @@ -19,8 +19,8 @@ GLOBAL_REMOVE_IF_UNREFERENCED CONST CHAR8 IScsiHexString[] = "0123456789ABCDEFa /**
Removes (trims) specified leading and trailing characters from a string.
- @param[in, out] Str Pointer to the null-terminated string to be trimmed. On return,
- Str will hold the trimmed string.
+ @param[in, out] Str Pointer to the null-terminated string to be trimmed. On return,
+ Str will hold the trimmed string.
@param[in] CharC Character will be trimmed from str.
**/
@@ -32,18 +32,18 @@ StrTrim ( {
CHAR16 *Pointer1;
CHAR16 *Pointer2;
-
+
if (*Str == 0) {
return;
}
-
+
//
// Trim off the leading and trailing characters c
//
for (Pointer1 = Str; (*Pointer1 != 0) && (*Pointer1 == CharC); Pointer1++) {
;
}
-
+
Pointer2 = Str;
if (Pointer2 == Pointer1) {
while (*Pointer1 != 0) {
@@ -51,19 +51,19 @@ StrTrim ( Pointer1++;
}
} else {
- while (*Pointer1 != 0) {
- *Pointer2 = *Pointer1;
+ while (*Pointer1 != 0) {
+ *Pointer2 = *Pointer1;
Pointer1++;
Pointer2++;
}
*Pointer2 = 0;
}
-
-
+
+
for (Pointer1 = Str + StrLen(Str) - 1; Pointer1 >= Str && *Pointer1 == CharC; Pointer1--) {
;
}
- if (Pointer1 != Str + StrLen(Str) - 1) {
+ if (Pointer1 != Str + StrLen(Str) - 1) {
*(Pointer1 + 1) = 0;
}
}
@@ -109,7 +109,7 @@ IScsiGetSubnetMaskPrefixLength ( }
/**
- Convert the hexadecimal encoded LUN string into the 64-bit LUN.
+ Convert the hexadecimal encoded LUN string into the 64-bit LUN.
@param[in] Str The hexadecimal encoded LUN string.
@param[out] Lun Storage to return the 64-bit LUN.
@@ -127,11 +127,11 @@ IScsiAsciiStrToLun ( CHAR8 TemStr[2];
UINT8 TemValue;
UINT16 Value[4];
-
+
ZeroMem (Lun, 8);
ZeroMem (TemStr, 2);
ZeroMem ((UINT8 *) Value, sizeof (Value));
- SizeStr = AsciiStrLen (Str);
+ SizeStr = AsciiStrLen (Str);
IndexValue = 0;
IndexNum = 0;
@@ -146,7 +146,7 @@ IScsiAsciiStrToLun ( return EFI_INVALID_PARAMETER;
}
}
-
+
if ((TemValue == 0) && (TemStr[0] == '-')) {
//
// Next Lun value
@@ -163,24 +163,24 @@ IScsiAsciiStrToLun ( IndexNum = 0;
continue;
}
-
+
if (++IndexNum > 4) {
- //
+ //
// Each Lun Str can't exceed size 4, because it will be as UINT16 value
//
return EFI_INVALID_PARAMETER;
}
-
+
//
// Combine UINT16 value
//
Value[IndexValue] = (UINT16) ((Value[IndexValue] << 4) + TemValue);
}
-
+
for (Index = 0; Index <= IndexValue; Index ++) {
*((UINT16 *) &Lun[Index * 2]) = HTONS (Value[Index]);
}
-
+
return EFI_SUCCESS;
}
@@ -392,7 +392,7 @@ IScsiMacAddrToStr ( @param[in, out] HexStr Pointer to the string.
@param[in, out] HexLength The length of the string.
- @retval EFI_SUCCESS The binary data is converted to the hexadecimal string
+ @retval EFI_SUCCESS The binary data is converted to the hexadecimal string
and the length of the string is updated.
@retval EFI_BUFFER_TOO_SMALL The string is too small.
@retval EFI_INVALID_PARAMETER The IP string is malformatted.
@@ -455,7 +455,7 @@ IScsiHexToBin ( UINTN Length;
UINT8 Digit;
CHAR8 TemStr[2];
-
+
ZeroMem (TemStr, sizeof (TemStr));
//
@@ -464,7 +464,7 @@ IScsiHexToBin ( if ((HexStr[0] == '0') && ((HexStr[1] == 'x') || (HexStr[1] == 'X'))) {
HexStr += 2;
}
-
+
Length = AsciiStrLen (HexStr);
for (Index = 0; Index < Length; Index ++) {
@@ -482,7 +482,7 @@ IScsiHexToBin ( BinBuffer [Index/2] = (UINT8) ((BinBuffer [Index/2] << 4) + Digit);
}
}
-
+
*BinLength = (UINT32) ((Index + 1)/2);
return EFI_SUCCESS;
@@ -601,7 +601,7 @@ IScsiCleanDriverData ( EFI_STATUS Status;
Status = EFI_SUCCESS;
-
+
if (Private->DevicePath != NULL) {
Status = gBS->UninstallProtocolInterface (
Private->ExtScsiPassThruHandle,
@@ -627,7 +627,7 @@ EXIT: if (Private->ExitBootServiceEvent != NULL) {
gBS->CloseEvent (Private->ExitBootServiceEvent);
}
-
+
FreePool (Private);
return Status;
}
@@ -636,10 +636,10 @@ EXIT: Check wheather the Controller is configured to use DHCP protocol.
@param[in] Controller The handle of the controller.
-
+
@retval TRUE The handle of the controller need the Dhcp protocol.
@retval FALSE The handle of the controller does not need the Dhcp protocol.
-
+
**/
BOOLEAN
IScsiDhcpIsConfigured (
@@ -826,7 +826,7 @@ IScsiGetTcpConnDevicePath ( ) {
DPathNode->Ipv4.LocalPort = 0;
- DPathNode->Ipv4.StaticIpAddress =
+ DPathNode->Ipv4.StaticIpAddress =
(BOOLEAN) (!Session->ConfigData.NvData.InitiatorInfoFromDhcp);
//
@@ -835,7 +835,7 @@ IScsiGetTcpConnDevicePath ( // do not exist.
// In new version of IPv4_DEVICE_PATH, structcure length is 27.
//
- if (DevicePathNodeLength (&DPathNode->Ipv4) == IP4_NODE_LEN_NEW_VERSIONS) {
+ if (DevicePathNodeLength (&DPathNode->Ipv4) == IP4_NODE_LEN_NEW_VERSIONS) {
IP4_COPY_ADDRESS (
&DPathNode->Ipv4.GatewayIpAddress,
@@ -873,7 +873,7 @@ IScsiOnExitBootService ( ISCSI_DRIVER_DATA *Private;
Private = (ISCSI_DRIVER_DATA *) Context;
-
+
gBS->CloseEvent (Private->ExitBootServiceEvent);
Private->ExitBootServiceEvent = NULL;
@@ -887,7 +887,7 @@ IScsiOnExitBootService ( currently managing the controller specified by ControllerHandle. This test
is performed by evaluating if the the protocol specified by ProtocolGuid is
present on ControllerHandle and is was opened by DriverBindingHandle and Nic
- Device handle with an attribute of EFI_OPEN_PROTOCOL_BY_DRIVER.
+ Device handle with an attribute of EFI_OPEN_PROTOCOL_BY_DRIVER.
If ProtocolGuid is NULL, then ASSERT().
@param ControllerHandle A handle for a controller to test.
diff --git a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiMisc.h b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiMisc.h index 0ab44d0..500e003 100644 --- a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiMisc.h +++ b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiMisc.h @@ -1,7 +1,7 @@ /** @file
Miscellaneous definitions for iSCSI driver.
-Copyright (c) 2004 - 2016, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2004 - 2018, Intel Corporation. All rights reserved.<BR>
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
@@ -65,7 +65,7 @@ IScsiGetSubnetMaskPrefixLength ( );
/**
- Convert the hexadecimal encoded LUN string into the 64-bit LUN.
+ Convert the hexadecimal encoded LUN string into the 64-bit LUN.
@param[in] Str The hexadecimal encoded LUN string.
@param[out] Lun Storage to return the 64-bit LUN.
@@ -158,7 +158,7 @@ IScsiAsciiStrToIp ( @param[in, out] HexStr Pointer to the string.
@param[in, out] HexLength The length of the string.
- @retval EFI_SUCCESS The binary data is converted to the hexadecimal string
+ @retval EFI_SUCCESS The binary data is converted to the hexadecimal string
and the length of the string is updated.
@retval EFI_BUFFER_TOO_SMALL The string is too small.
@retval EFI_INVALID_PARAMETER The IP string is malformatted.
@@ -233,10 +233,10 @@ IScsiCleanDriverData ( Check wheather the Controller is configured to use DHCP protocol.
@param[in] Controller The handle of the controller.
-
+
@retval TRUE The handle of the controller need the Dhcp protocol.
@retval FALSE The handle of the controller does not need the Dhcp protocol.
-
+
**/
BOOLEAN
IScsiDhcpIsConfigured (
@@ -290,7 +290,7 @@ IScsiOnExitBootService ( currently managing the controller specified by ControllerHandle. This test
is performed by evaluating if the the protocol specified by ProtocolGuid is
present on ControllerHandle and is was opened by DriverBindingHandle and Nic
- Device handle with an attribute of EFI_OPEN_PROTOCOL_BY_DRIVER.
+ Device handle with an attribute of EFI_OPEN_PROTOCOL_BY_DRIVER.
If ProtocolGuid is NULL, then ASSERT().
@param ControllerHandle A handle for a controller to test.
diff --git a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiProto.c b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiProto.c index 4317de2..9fb8480 100644 --- a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiProto.c +++ b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiProto.c @@ -1,7 +1,7 @@ /** @file
The implementation of iSCSI protocol based on RFC3720.
-Copyright (c) 2004 - 2015, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2004 - 2018, Intel Corporation. All rights reserved.<BR>
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
@@ -17,7 +17,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. UINT32 mDataSegPad = 0;
/**
- Attach the iSCSI connection to the iSCSI session.
+ Attach the iSCSI connection to the iSCSI session.
@param[in, out] Session The iSCSI session.
@param[in, out] Conn The iSCSI connection.
@@ -34,7 +34,7 @@ IScsiAttatchConnection ( }
/**
- Detach the iSCSI connection from the session it belongs to.
+ Detach the iSCSI connection from the session it belongs to.
@param[in, out] Conn The iSCSI connection.
**/
@@ -49,7 +49,7 @@ IScsiDetatchConnection ( }
/**
- Check the sequence number according to RFC3720.
+ Check the sequence number according to RFC3720.
@param[in, out] ExpSN The currently expected sequence number.
@param[in] NewSN The sequence number to check.
@@ -116,7 +116,7 @@ IScsiUpdateCmdSN ( @retval EFI_SUCCESS The iSCSI connection is logged into the iSCSI target.
@retval EFI_TIMEOUT Timeout happened during the login procedure.
- @retval Others Other errors as indicated.
+ @retval Others Other errors as indicated.
**/
EFI_STATUS
IScsiConnLogin (
@@ -381,7 +381,7 @@ IScsiSendLoginReq ( Receive and process the iSCSI login response.
@param[in] Conn The connection in the iSCSI login phase.
-
+
@retval EFI_SUCCESS The iSCSI login response PDU is received and processed.
@retval Others Other errors as indicated.
**/
@@ -807,7 +807,7 @@ IScsiProcessLoginRsp ( @param[in] Data The data segment which should contain the
TargetAddress key-value list.
@param[in] Len Length of the data.
-
+
@retval EFI_SUCCESS The target address is updated.
@retval EFI_OUT_OF_RESOURCES Failed to allocate memory.
@retval EFI_NOT_FOUND The TargetAddress key is not found.
@@ -1866,7 +1866,7 @@ IScsiNewScsiCmdPdu ( if (ScsiCmd == NULL) {
NetbufFree (PduHeader);
return NULL;
- }
+ }
Header = (ISCSI_ADDITIONAL_HEADER *) (ScsiCmd + 1);
ZeroMem (ScsiCmd, Length);
@@ -2522,8 +2522,8 @@ IScsiOnNopInRcvd ( @param[in] Lun The LUN.
@param[in, out] Packet The request packet containing IO request, SCSI command
buffer and buffers to read/write.
-
- @retval EFI_SUCCES The SCSI command is executed and the result is updated to
+
+ @retval EFI_SUCCES The SCSI command is executed and the result is updated to
the Packet.
@retval EFI_DEVICE_ERROR Session state was not as required.
@retval EFI_OUT_OF_RESOURCES Failed to allocate memory.
@@ -2640,7 +2640,7 @@ IScsiExecuteScsiCommand ( if (EFI_ERROR (Status)) {
goto ON_EXIT;
}
- TimeoutEvent = Conn->TimeoutEvent;
+ TimeoutEvent = Conn->TimeoutEvent;
}
//
// try to receive PDU from target.
diff --git a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiProto.h b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiProto.h index 2f95323..6469df0 100644 --- a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiProto.h +++ b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiProto.h @@ -1,7 +1,7 @@ /** @file
The header file of iSCSI Protocol that defines many specific data structures.
-Copyright (c) 2004 - 2014, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2004 - 2018, Intel Corporation. All rights reserved.<BR>
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
@@ -624,7 +624,7 @@ typedef struct _ISCSI_KEY_VALUE_PAIR { } ISCSI_KEY_VALUE_PAIR;
/**
- Attach the iSCSI connection to the iSCSI session.
+ Attach the iSCSI connection to the iSCSI session.
@param[in, out] Session The iSCSI session.
@param[in, out] Conn The iSCSI connection.
@@ -636,7 +636,7 @@ IScsiAttatchConnection ( );
/**
- Detach the iSCSI connection from the session it belongs to.
+ Detach the iSCSI connection from the session it belongs to.
@param[in, out] Conn The iSCSI connection.
**/
@@ -652,7 +652,7 @@ IScsiDetatchConnection ( @retval EFI_SUCCESS The iSCSI connection is logged into the iSCSI target.
@retval EFI_TIMEOUT Timeout happened during the login procedure.
- @retval Others Other errors as indicated.
+ @retval Others Other errors as indicated.
**/
EFI_STATUS
IScsiConnLogin (
@@ -719,7 +719,7 @@ IScsiSendLoginReq ( Receive and process the iSCSI login response.
@param[in] Conn The connection in the iSCSI login phase.
-
+
@retval EFI_SUCCESS The iSCSI login response PDU is received and processed.
@retval Others Other errors as indicated.
**/
@@ -788,7 +788,7 @@ IScsiProcessLoginRsp ( @param[in] Data The data segment which should contain the
TargetAddress key-value list.
@param[in] Len Length of the data.
-
+
@retval EFI_SUCCESS The target address is updated.
@retval EFI_OUT_OF_RESOURCES Failed to allocate memory.
@retval EFI_NOT_FOUND The TargetAddress key is not found.
@@ -948,8 +948,8 @@ IScsiNormalizeName ( @param[in] Lun The LUN.
@param[in, out] Packet The request packet containing IO request, SCSI command
buffer and buffers to read/write.
-
- @retval EFI_SUCCES The SCSI command is executed and the result is updated to
+
+ @retval EFI_SUCCES The SCSI command is executed and the result is updated to
the Packet.
@retval EFI_DEVICE_ERROR Session state was not as required.
@retval EFI_OUT_OF_RESOURCES Failed to allocate memory.
@@ -988,7 +988,7 @@ IScsiSessionInit ( IN OUT ISCSI_SESSION *Session,
IN BOOLEAN Recovery
);
-
+
/**
Abort the iSCSI session, that is, reset all the connection and free the
resources.
diff --git a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiTcp4Io.c b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiTcp4Io.c index e73a6dd..901b38e 100644 --- a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiTcp4Io.c +++ b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiTcp4Io.c @@ -1,7 +1,7 @@ /** @file
The wrap of TCP/IP Socket interface.
-Copyright (c) 2004 - 2009, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2004 - 2018, Intel Corporation. All rights reserved.<BR>
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
@@ -15,7 +15,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. #include "IScsiImpl.h"
/**
- The common notify function associated with various Tcp4Io events.
+ The common notify function associated with various Tcp4Io events.
@param[in] Event The event signaled.
@param[in] Context The context.
@@ -31,13 +31,13 @@ Tcp4IoCommonNotify ( }
/**
- Create a TCP socket with the specified configuration data.
+ Create a TCP socket with the specified configuration data.
@param[in] Image The handle of the driver image.
@param[in] Controller The handle of the controller.
@param[in] ConfigData The Tcp4 configuration data.
@param[in] Tcp4Io The Tcp4Io.
-
+
@retval EFI_SUCCESS The TCP socket is created and configured.
@retval Others Failed to create the TCP socket or configure it.
**/
@@ -230,7 +230,7 @@ ON_ERROR: }
/**
- Destroy the socket.
+ Destroy the socket.
@param[in] Tcp4Io The Tcp4Io which wraps the socket to be destroyeds.
**/
@@ -269,7 +269,7 @@ Tcp4IoDestroySocket ( @param[in, out] Tcp4Io The Tcp4Io wrapping the TCP socket.
@param[in] Timeout The time to wait for connection done.
-
+
@retval EFI_SUCCESS Connect to the other endpoint of the TCP socket successfully.
@retval EFI_TIMEOUT Failed to connect to the other endpoint of the TCP socket in the specified time period.
@retval Others Other errors as indicated.
@@ -335,7 +335,7 @@ Tcp4IoReset ( @param[in] Tcp4Io The Tcp4Io wrapping the TCP socket.
@param[in] Packet The packet to transmit.
-
+
@retval EFI_SUCCESS The packet is trasmitted.
@retval EFI_OUT_OF_RESOURCES Failed to allocate memory.
@retval Others Other errors as indicated.
diff --git a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiTcp4Io.h b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiTcp4Io.h index 2b3c0b7..9e0f1e0 100644 --- a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiTcp4Io.h +++ b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiTcp4Io.h @@ -1,7 +1,7 @@ /** @file
iSCSI Tcp4 IO related definitions.
-Copyright (c) 2004 - 2008, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2004 - 2018, Intel Corporation. All rights reserved.<BR>
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
@@ -46,13 +46,13 @@ typedef struct _TCP4_IO { } TCP4_IO;
/**
- Create a TCP socket with the specified configuration data.
+ Create a TCP socket with the specified configuration data.
@param[in] Image The handle of the driver image.
@param[in] Controller The handle of the controller.
@param[in] ConfigData The Tcp4 configuration data.
@param[in] Tcp4Io The Tcp4Io.
-
+
@retval EFI_SUCCESS The TCP socket is created and configured.
@retval Others Failed to create the TCP socket or configure it.
**/
@@ -65,7 +65,7 @@ Tcp4IoCreateSocket ( );
/**
- Destroy the socket.
+ Destroy the socket.
@param[in] Tcp4Io The Tcp4Io which wraps the socket to be destroyeds.
**/
@@ -79,7 +79,7 @@ Tcp4IoDestroySocket ( @param[in, out] Tcp4Io The Tcp4Io wrapping the TCP socket.
@param[in] Timeout The time to wait for connection done.
-
+
@retval EFI_SUCCESS Connect to the other endpoint of the TCP socket successfully.
@retval EFI_TIMEOUT Failed to connect to the other endpoint of the TCP socket in the specified time period.
@retval Others Other errors as indicated.
@@ -105,7 +105,7 @@ Tcp4IoReset ( @param[in] Tcp4Io The Tcp4Io wrapping the TCP socket.
@param[in] Packet The packet to transmit.
-
+
@retval EFI_SUCCESS The packet is trasmitted.
@retval EFI_OUT_OF_RESOURCES Failed to allocate memory.
@retval Others Other errors as indicated.
diff --git a/MdeModulePkg/Universal/Network/IScsiDxe/Md5.c b/MdeModulePkg/Universal/Network/IScsiDxe/Md5.c index 5dc7d99..3555f1a 100644 --- a/MdeModulePkg/Universal/Network/IScsiDxe/Md5.c +++ b/MdeModulePkg/Universal/Network/IScsiDxe/Md5.c @@ -1,7 +1,7 @@ /** @file
Implementation of MD5 algorithm.
-Copyright (c) 2004 - 2008, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2004 - 2018, Intel Corporation. All rights reserved.<BR>
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
@@ -57,14 +57,14 @@ CONST UINT8 Md5HashPadding[] = 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
};
//
@@ -79,18 +79,18 @@ CONST UINT8 Md5HashPadding[] = /**
Tf1 is one basic MD5 transform function.
-
+
@param[in] A A 32-bit quantity.
- @param[in] B A 32-bit quantity.
+ @param[in] B A 32-bit quantity.
@param[in] C A 32-bit quantity.
@return Output was produced as a 32-bit quantity based on the
- three 32-bit input quantity.
+ three 32-bit input quantity.
**/
-UINT32
+UINT32
Tf1 (
- IN UINT32 A,
- IN UINT32 B,
+ IN UINT32 A,
+ IN UINT32 B,
IN UINT32 C
)
{
@@ -99,18 +99,18 @@ Tf1 ( /**
Tf2 is one basic MD5 transform function.
-
+
@param[in] A A 32-bit quantity.
- @param[in] B A 32-bit quantity.
+ @param[in] B A 32-bit quantity.
@param[in] C A 32-bit quantity.
@return Output was produced as a 32-bit quantity based on the
- three 32-bit input quantity.
+ three 32-bit input quantity.
**/
-UINT32
+UINT32
Tf2 (
- IN UINT32 A,
- IN UINT32 B,
+ IN UINT32 A,
+ IN UINT32 B,
IN UINT32 C
)
{
@@ -119,18 +119,18 @@ Tf2 ( /**
Tf3 is one basic MD5 transform function.
-
+
@param[in] A A 32-bit quantity.
- @param[in] B A 32-bit quantity.
+ @param[in] B A 32-bit quantity.
@param[in] C A 32-bit quantity.
@return Output was produced as a 32-bit quantity based on the
- three 32-bit input quantity.
+ three 32-bit input quantity.
**/
-UINT32
+UINT32
Tf3 (
- IN UINT32 A,
- IN UINT32 B,
+ IN UINT32 A,
+ IN UINT32 B,
IN UINT32 C
)
{
@@ -139,18 +139,18 @@ Tf3 ( /**
Tf4 is one basic MD5 transform function.
-
+
@param[in] A A 32-bit quantity.
- @param[in] B A 32-bit quantity.
+ @param[in] B A 32-bit quantity.
@param[in] C A 32-bit quantity.
@return Output was produced as a 32-bit quantity based on the
- three 32-bit input quantity.
+ three 32-bit input quantity.
**/
-UINT32
+UINT32
Tf4 (
- IN UINT32 A,
- IN UINT32 B,
+ IN UINT32 A,
+ IN UINT32 B,
IN UINT32 C
)
{
@@ -220,7 +220,7 @@ MD5Transform ( Copy data segment into the M field of MD5_CTX structure for later transform.
If the length of data segment is larger than 64 bytes, then does the transform
immediately and the generated Md5 code is stored in the States field of MD5_CTX
- data struct for later accumulation.
+ data struct for later accumulation.
All of Md5 code generated for the sequential 64-bytes data segaments are be
accumulated in MD5Final() function.
@@ -241,7 +241,7 @@ MD5UpdateBlock ( for (Limit = 64 - Md5Ctx->Count; DataLen >= 64 - Md5Ctx->Count; Limit = 64) {
CopyMem (Md5Ctx->M + Md5Ctx->Count, (VOID *)Data, Limit);
MD5Transform (Md5Ctx);
-
+
Md5Ctx->Count = 0;
Data += Limit;
DataLen -= Limit;
@@ -271,7 +271,7 @@ MD5Init ( Md5Ctx->States[0] = 0x67452301;
Md5Ctx->States[1] = 0xefcdab89;
Md5Ctx->States[2] = 0x98badcfe;
- Md5Ctx->States[3] = 0x10325476;
+ Md5Ctx->States[3] = 0x10325476;
return EFI_SUCCESS;
}
@@ -328,7 +328,7 @@ MD5Final ( //
CopyMem (HashVal, (UINT8 *) Md5Ctx->States, MD5_HASHSIZE);
ZeroMem ((UINT8 *)Md5Ctx, sizeof (*Md5Ctx));
-
+
return EFI_SUCCESS;
}
diff --git a/MdeModulePkg/Universal/Network/IScsiDxe/Md5.h b/MdeModulePkg/Universal/Network/IScsiDxe/Md5.h index 8de4e86..1541b2d 100644 --- a/MdeModulePkg/Universal/Network/IScsiDxe/Md5.h +++ b/MdeModulePkg/Universal/Network/IScsiDxe/Md5.h @@ -1,7 +1,7 @@ /** @file
Header file for Md5.
-Copyright (c) 2004 - 2008, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2004 - 2018, Intel Corporation. All rights reserved.<BR>
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
@@ -19,7 +19,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. #include <Library/BaseLib.h>
#include <Library/BaseMemoryLib.h>
#include <Library/NetLib.h>
-
+
#define MD5_HASHSIZE 16
typedef struct _MD5_CTX {
@@ -77,4 +77,4 @@ MD5Final ( OUT UINT8 *HashVal
);
-#endif
+#endif
diff --git a/MdeModulePkg/Universal/Network/Ip4Dxe/ComponentName.c b/MdeModulePkg/Universal/Network/Ip4Dxe/ComponentName.c index 2ccfb3c..5ea1ae1 100644 --- a/MdeModulePkg/Universal/Network/Ip4Dxe/ComponentName.c +++ b/MdeModulePkg/Universal/Network/Ip4Dxe/ComponentName.c @@ -1,6 +1,6 @@ /** @file
-
-Copyright (c) 2005 - 2012, Intel Corporation. All rights reserved.<BR>
+
+Copyright (c) 2005 - 2018, Intel Corporation. All rights reserved.<BR>
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>
@@ -237,10 +237,10 @@ Ip4ComponentNameGetDriverName ( @param Ip4[in] A pointer to the EFI_IP4_PROTOCOL.
-
+
@retval EFI_SUCCESS Update the ControllerNameTable of this instance successfully.
@retval EFI_INVALID_PARAMETER The input parameter is invalid.
-
+
**/
EFI_STATUS
UpdateName (
@@ -290,7 +290,7 @@ UpdateName ( if (EFI_ERROR (Status)) {
return Status;
}
-
+
return AddUnicodeString2 (
"en",
gIp4ComponentName2.SupportedLanguages,
@@ -378,9 +378,9 @@ Ip4ComponentNameGetControllerName ( OUT CHAR16 **ControllerName
)
{
- EFI_STATUS Status;
+ EFI_STATUS Status;
EFI_IP4_PROTOCOL *Ip4;
-
+
//
// Only provide names for child handles.
//
@@ -388,9 +388,9 @@ Ip4ComponentNameGetControllerName ( return EFI_UNSUPPORTED;
}
- //
- // Make sure this driver produced ChildHandle
- //
+ //
+ // Make sure this driver produced ChildHandle
+ //
Status = EfiTestChildHandle (
ControllerHandle,
ChildHandle,
@@ -400,9 +400,9 @@ Ip4ComponentNameGetControllerName ( return Status;
}
- //
- // Retrieve an instance of a produced protocol from ChildHandle
- //
+ //
+ // Retrieve an instance of a produced protocol from ChildHandle
+ //
Status = gBS->OpenProtocol (
ChildHandle,
&gEfiIp4ProtocolGuid,
diff --git a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Common.h b/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Common.h index 9689f37..e0fffc9 100644 --- a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Common.h +++ b/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Common.h @@ -1,7 +1,7 @@ /** @file
Common definition for IP4.
-
-Copyright (c) 2005 - 2017, Intel Corporation. All rights reserved.<BR>
+
+Copyright (c) 2005 - 2018, Intel Corporation. All rights reserved.<BR>
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
diff --git a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Config2.vfr b/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Config2.vfr index 1f45e9f..35bb75d 100644 --- a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Config2.vfr +++ b/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Config2.vfr @@ -1,7 +1,7 @@ /** @file
Vfr file for IP4Dxe.
-Copyright (c) 2015 - 2017, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2015 - 2018, Intel Corporation. All rights reserved.<BR>
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
@@ -87,13 +87,13 @@ formset endif;
subtitle text = STRING_TOKEN(STR_NULL);
-
+
text
help = STRING_TOKEN(STR_SAVE_CHANGES),
text = STRING_TOKEN(STR_SAVE_CHANGES),
flags = INTERACTIVE,
key = KEY_SAVE_CHANGES;
-
+
endform;
endformset;
diff --git a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Config2Impl.c b/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Config2Impl.c index 488b3f5..043341d 100644 --- a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Config2Impl.c +++ b/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Config2Impl.c @@ -1,7 +1,7 @@ /** @file
The implementation of EFI IPv4 Configuration II Protocol.
- Copyright (c) 2015 - 2017, Intel Corporation. All rights reserved.<BR>
+ Copyright (c) 2015 - 2018, Intel Corporation. All rights reserved.<BR>
(C) Copyright 2015-2016 Hewlett Packard Enterprise Development LP<BR>
This program and the accompanying materials
@@ -82,7 +82,7 @@ Ip4Config2DestroyDhcp4 ( Instance->Dhcp4Handle = NULL;
- return Status;
+ return Status;
}
/**
@@ -112,7 +112,7 @@ Ip4Config2OnPolicyChanged ( if (IpSb->DefaultInterface != NULL) {
if (IpSb->DefaultRouteTable != NULL) {
Ip4FreeRouteTable (IpSb->DefaultRouteTable);
- IpSb->DefaultRouteTable = NULL;
+ IpSb->DefaultRouteTable = NULL;
}
Ip4CancelReceive (IpSb->DefaultInterface);
@@ -125,7 +125,7 @@ Ip4Config2OnPolicyChanged ( //
// Create new default interface and route table.
- //
+ //
IpIf = Ip4CreateInterface (IpSb->Mnp, IpSb->Controller, IpSb->Image);
if (IpIf == NULL) {
return ;
@@ -136,7 +136,7 @@ Ip4Config2OnPolicyChanged ( Ip4FreeInterface (IpIf, NULL);
return ;
}
-
+
IpSb->DefaultInterface = IpIf;
InsertHeadList (&IpSb->Interfaces, &IpIf->Link);
IpSb->DefaultRouteTable = RouteTable;
@@ -255,7 +255,7 @@ Ip4Config2ReadConfigData ( return EFI_NOT_FOUND;
}
-
+
for (Index = 0; Index < Variable->DataRecordCount; Index++) {
CopyMem (&DataRecord, &Variable->DataRecord[Index], sizeof (DataRecord));
@@ -375,8 +375,8 @@ Ip4Config2WriteConfigData ( /**
- Build a EFI_IP4_ROUTE_TABLE to be returned to the caller of GetModeData.
- The EFI_IP4_ROUTE_TABLE is clumsy to use in the internal operation of the
+ Build a EFI_IP4_ROUTE_TABLE to be returned to the caller of GetModeData.
+ The EFI_IP4_ROUTE_TABLE is clumsy to use in the internal operation of the
IP4 driver.
@param[in] IpSb The IP4 service binding instance.
@@ -392,7 +392,7 @@ Ip4Config2BuildDefaultRouteTable ( OUT EFI_IP4_ROUTE_TABLE *Table
)
{
- LIST_ENTRY *Entry;
+ LIST_ENTRY *Entry;
IP4_ROUTE_ENTRY *RtEntry;
UINT32 Count;
INT32 Index;
@@ -468,8 +468,8 @@ Ip4Config2OnDhcp4SbInstalled ( @param[in] StationAddress Ip address to be set.
@param[in] SubnetMask Subnet to be set.
- @retval EFI_SUCCESS Set default address successful.
- @retval Others Some errors occur in setting.
+ @retval EFI_SUCCESS Set default address successful.
+ @retval Others Some errors occur in setting.
**/
EFI_STATUS
@@ -501,7 +501,7 @@ Ip4Config2SetDefaultAddr ( //
if (IpSb->DefaultRouteTable != NULL) {
Ip4FreeRouteTable (IpSb->DefaultRouteTable);
- IpSb->DefaultRouteTable = NULL;
+ IpSb->DefaultRouteTable = NULL;
}
Ip4CancelReceive (IpSb->DefaultInterface);
@@ -509,7 +509,7 @@ Ip4Config2SetDefaultAddr ( IpSb->DefaultInterface = NULL;
//
// Create new default interface and route table.
- //
+ //
IpIf = Ip4CreateInterface (IpSb->Mnp, IpSb->Controller, IpSb->Image);
if (IpIf == NULL) {
return EFI_OUT_OF_RESOURCES;
@@ -520,7 +520,7 @@ Ip4Config2SetDefaultAddr ( Ip4FreeInterface (IpIf, NULL);
return EFI_OUT_OF_RESOURCES;
}
-
+
IpSb->DefaultInterface = IpIf;
InsertHeadList (&IpSb->Interfaces, &IpIf->Link);
IpSb->DefaultRouteTable = RouteTable;
@@ -537,8 +537,8 @@ Ip4Config2SetDefaultAddr ( }
if (IpIf->Arp != NULL) {
- //
- // A non-NULL IpIf->Arp here means a new ARP child is created when setting default address,
+ //
+ // A non-NULL IpIf->Arp here means a new ARP child is created when setting default address,
// but some IP children may have referenced the default interface before it is configured,
// these IP instances also consume this ARP protocol so they need to open it BY_CHILD_CONTROLLER.
//
@@ -580,20 +580,20 @@ Ip4Config2SetDefaultAddr ( IpSb->State = IP4_SERVICE_CONFIGED;
IpSb->Reconfig = FALSE;
-
+
return EFI_SUCCESS;
}
/**
Set the station address, subnetmask and gateway address for the default interface.
- @param[in] Instance The pointer to the IP4 config2 instance data.
+ @param[in] Instance The pointer to the IP4 config2 instance data.
@param[in] StationAddress Ip address to be set.
@param[in] SubnetMask Subnet to be set.
@param[in] GatewayAddress Gateway to be set.
- @retval EFI_SUCCESS Set default If successful.
- @retval Others Errors occur as indicated.
+ @retval EFI_SUCCESS Set default If successful.
+ @retval Others Errors occur as indicated.
**/
EFI_STATUS
@@ -630,7 +630,7 @@ Ip4Config2SetDefaultIf ( IP4_ALLZERO_ADDRESS,
IP4_ALLZERO_ADDRESS,
GatewayAddress
- );
+ );
}
return EFI_SUCCESS;
@@ -687,7 +687,7 @@ Ip4Config2CleanDhcp4 ( /**
This worker function sets the DNS server list for the EFI IPv4 network
stack running on the communication device that this EFI_IP4_CONFIG2_PROTOCOL
- manages. The DNS server addresses must be unicast IPv4 addresses.
+ manages. The DNS server addresses must be unicast IPv4 addresses.
@param[in] Instance The pointer to the IP4 config2 instance data.
@param[in] DataSize The size of the buffer pointed to by Data in bytes.
@@ -728,7 +728,7 @@ Ip4Config2SetDnsServerWorker ( Item = &Instance->DataItem[Ip4Config2DataTypeDnsServer];
NewDns = (EFI_IPv4_ADDRESS *) Data;
OldDns = Item->Data.DnsServers;
- NewDnsCount = DataSize / sizeof (EFI_IPv4_ADDRESS);
+ NewDnsCount = DataSize / sizeof (EFI_IPv4_ADDRESS);
OldDnsCount = Item->DataSize / sizeof (EFI_IPv4_ADDRESS);
OneAdded = FALSE;
@@ -785,7 +785,7 @@ Ip4Config2SetDnsServerWorker ( if (Tmp != NULL) {
if (Item->Data.Ptr != NULL) {
FreePool (Item->Data.Ptr);
- }
+ }
Item->Data.Ptr = Tmp;
}
@@ -846,7 +846,7 @@ Ip4Config2OnDhcp4Complete ( if (EFI_ERROR (Status)) {
goto Exit;
}
-
+
//
// Parse the ACK to get required DNS server information.
//
@@ -916,7 +916,7 @@ Ip4StartAutoConfig ( EFI_DHCP4_PACKET_OPTION *OptionList[1];
IP4_CONFIG2_DHCP4_OPTION ParaList;
EFI_STATUS Status;
-
+
IpSb = IP4_SERVICE_FROM_IP4_CONFIG2_INSTANCE (Instance);
if (IpSb->State > IP4_SERVICE_UNSTARTED) {
@@ -978,7 +978,7 @@ Ip4StartAutoConfig ( );
Instance->Dhcp4Handle = NULL;
-
+
return Status;
}
@@ -990,7 +990,7 @@ Ip4StartAutoConfig ( Status = Dhcp4->GetModeData (Dhcp4, &Dhcp4Mode);
if (Dhcp4Mode.State == Dhcp4Bound) {
Ip4Config2OnDhcp4Complete (NULL, Instance);
-
+
return EFI_SUCCESS;
}
@@ -1023,14 +1023,14 @@ Ip4StartAutoConfig ( &gEfiDhcp4ServiceBindingProtocolGuid,
Instance->Dhcp4Handle
);
-
+
Instance->Dhcp4 = NULL;
-
+
Instance->Dhcp4Handle = NULL;
-
+
return Status;
}
-
+
//
// Start the DHCP process
//
@@ -1051,20 +1051,20 @@ Ip4StartAutoConfig ( Ip4Config2DestroyDhcp4 (Instance);
gBS->CloseEvent (Instance->Dhcp4Event);
Instance->Dhcp4Event = NULL;
-
+
return Status;
}
-
+
IpSb->State = IP4_SERVICE_STARTED;
DispatchDpc ();
-
+
return EFI_SUCCESS;
}
/**
- The work function is to get the interface information of the communication
+ The work function is to get the interface information of the communication
device this IP4_CONFIG2_INSTANCE manages.
@param[in] Instance Pointer to the IP4 config2 instance data.
@@ -1099,7 +1099,7 @@ Ip4Config2GetIfInfo ( if (IpSb->DefaultRouteTable != NULL) {
Length += IpSb->DefaultRouteTable->TotalNum * sizeof (EFI_IP4_ROUTE_TABLE);
}
-
+
if (*DataSize < Length) {
*DataSize = Length;
return EFI_BUFFER_TOO_SMALL;
@@ -1126,14 +1126,14 @@ Ip4Config2GetIfInfo ( IfInfo->RouteTableSize = IpSb->DefaultRouteTable->TotalNum;
IfInfo->RouteTable = (EFI_IP4_ROUTE_TABLE *) ((UINT8 *) Data + sizeof (EFI_IP4_CONFIG2_INTERFACE_INFO));
- Ip4Config2BuildDefaultRouteTable (IpSb, IfInfo->RouteTable);
+ Ip4Config2BuildDefaultRouteTable (IpSb, IfInfo->RouteTable);
}
-
+
return EFI_SUCCESS;
}
/**
- The work function is to set the general configuration policy for the EFI IPv4 network
+ The work function is to set the general configuration policy for the EFI IPv4 network
stack that is running on the communication device managed by this IP4_CONFIG2_INSTANCE.
The policy will affect other configuration settings.
@@ -1175,7 +1175,7 @@ Ip4Config2SetPolicy ( }
} else {
//
- // The policy is changed. Clean the ManualAddress, Gateway and DnsServers,
+ // The policy is changed. Clean the ManualAddress, Gateway and DnsServers,
// shrink the variable data size, and fire up all the related events.
//
DataItem = &Instance->DataItem[Ip4Config2DataTypeManualAddress];
@@ -1204,7 +1204,7 @@ Ip4Config2SetPolicy ( DataItem->DataSize = 0;
DataItem->Status = EFI_NOT_FOUND;
NetMapIterate (&DataItem->EventMap, Ip4Config2SignalEvent, NULL);
-
+
if (NewPolicy == Ip4Config2PolicyDhcp) {
SET_DATA_ATTRIB (DataItem->Attribute, DATA_ATTRIB_VOLATILE);
} else {
@@ -1215,7 +1215,7 @@ Ip4Config2SetPolicy ( if (Instance->Dhcp4Handle != NULL) {
Ip4Config2DestroyDhcp4 (Instance);
}
-
+
//
// Close the event.
//
@@ -1235,7 +1235,7 @@ Ip4Config2SetPolicy ( }
/**
- The work function is to set the station addresses manually for the EFI IPv4
+ The work function is to set the station addresses manually for the EFI IPv4
network stack. It is only configurable when the policy is Ip4Config2PolicyStatic.
@param[in] Instance Pointer to the IP4 config2 instance data.
@@ -1317,7 +1317,7 @@ Ip4Config2SetManualAddress ( if (DataItem->Data.Ptr != NULL) {
FreePool (DataItem->Data.Ptr);
}
-
+
DataItem->Data.Ptr = Ptr;
DataItem->DataSize = DataSize;
DataItem->Status = EFI_NOT_READY;
@@ -1331,7 +1331,7 @@ Ip4Config2SetManualAddress ( if (Ptr != NULL) {
FreePool (Ptr);
}
- DataItem->Data.Ptr = NULL;
+ DataItem->Data.Ptr = NULL;
}
} else {
//
@@ -1350,7 +1350,7 @@ Ip4Config2SetManualAddress ( if (IpSb->DefaultInterface != NULL) {
if (IpSb->DefaultRouteTable != NULL) {
Ip4FreeRouteTable (IpSb->DefaultRouteTable);
- IpSb->DefaultRouteTable = NULL;
+ IpSb->DefaultRouteTable = NULL;
}
Ip4CancelReceive (IpSb->DefaultInterface);
@@ -1363,7 +1363,7 @@ Ip4Config2SetManualAddress ( //
// Create new default interface and route table.
- //
+ //
IpIf = Ip4CreateInterface (IpSb->Mnp, IpSb->Controller, IpSb->Image);
if (IpIf == NULL) {
return EFI_OUT_OF_RESOURCES;
@@ -1374,14 +1374,14 @@ Ip4Config2SetManualAddress ( Ip4FreeInterface (IpIf, NULL);
return EFI_OUT_OF_RESOURCES;
}
-
+
IpSb->DefaultInterface = IpIf;
InsertHeadList (&IpSb->Interfaces, &IpIf->Link);
IpSb->DefaultRouteTable = RouteTable;
Ip4ReceiveFrame (IpIf, NULL, Ip4AccpetFrame, IpSb);
//
- // Reset the State to unstarted.
+ // Reset the State to unstarted.
//
if (IpSb->State == IP4_SERVICE_CONFIGED || IpSb->State == IP4_SERVICE_STARTED) {
IpSb->State = IP4_SERVICE_UNSTARTED;
@@ -1392,8 +1392,8 @@ Ip4Config2SetManualAddress ( }
/**
- The work function is to set the gateway addresses manually for the EFI IPv4
- network stack that is running on the communication device that this EFI IPv4
+ The work function is to set the gateway addresses manually for the EFI IPv4
+ network stack that is running on the communication device that this EFI IPv4
Configuration Protocol manages. It is not configurable when the policy is
Ip4Config2PolicyDhcp. The gateway addresses must be unicast IPv4 addresses.
@@ -1474,7 +1474,7 @@ Ip4Config2SetGateway ( for (Index1 = 0; Index1 < NewGatewayCount; Index1++) {
CopyMem (&Gateway, NewGateway + Index1, sizeof (IP4_ADDR));
- if ((IpSb->DefaultInterface->SubnetMask != 0) &&
+ if ((IpSb->DefaultInterface->SubnetMask != 0) &&
!NetIp4IsUnicast (NTOHL (Gateway), IpSb->DefaultInterface->SubnetMask)) {
return EFI_INVALID_PARAMETER;
}
@@ -1505,7 +1505,7 @@ Ip4Config2SetGateway ( IP4_ALLZERO_ADDRESS,
IP4_ALLZERO_ADDRESS,
NTOHL (Gateway)
- );
+ );
OneAdded = TRUE;
}
@@ -1541,9 +1541,9 @@ Ip4Config2SetGateway ( }
/**
- The work function is to set the DNS server list for the EFI IPv4 network
- stack running on the communication device that this EFI_IP4_CONFIG2_PROTOCOL
- manages. It is not configurable when the policy is Ip4Config2PolicyDhcp.
+ The work function is to set the DNS server list for the EFI IPv4 network
+ stack running on the communication device that this EFI_IP4_CONFIG2_PROTOCOL
+ manages. It is not configurable when the policy is Ip4Config2PolicyDhcp.
The DNS server addresses must be unicast IPv4 addresses.
@param[in] Instance The pointer to the IP4 config2 instance data.
@@ -1589,7 +1589,7 @@ Ip4Config2SetDnsServer ( Status = Ip4Config2SetDnsServerWorker (Instance, DataSize, Data);
} else {
//
- // DataSize is 0 and Data is NULL, clean up the DnsServer address.
+ // DataSize is 0 and Data is NULL, clean up the DnsServer address.
//
if (Item->Data.Ptr != NULL) {
FreePool (Item->Data.Ptr);
@@ -1598,7 +1598,7 @@ Ip4Config2SetDnsServer ( Item->DataSize = 0;
Item->Status = EFI_NOT_FOUND;
}
-
+
return Status;
}
@@ -1678,7 +1678,7 @@ Ip4Config2OnDhcp4Event ( network stack was set successfully.
@retval EFI_INVALID_PARAMETER One or more of the following are TRUE:
- This is NULL.
- - One or more fields in Data and DataSize do not match the
+ - One or more fields in Data and DataSize do not match the
requirement of the data type indicated by DataType.
@retval EFI_WRITE_PROTECTED The specified configuration data is read-only or the specified
configuration data cannot be set under the current policy.
@@ -2031,7 +2031,7 @@ Ip4Config2InitInstance ( NetMapInit (&Instance->DataItem[Index].EventMap);
}
-
+
//
// Initialize each data type: associate storage and set data size for the
// fixed size data types, hook the SetData function, set the data attribute.
@@ -2066,7 +2066,7 @@ Ip4Config2InitInstance ( //
// Try to read the config data from NV variable.
- // If not found, write initialized config data into NV variable
+ // If not found, write initialized config data into NV variable
// as a default config data.
//
Status = Ip4Config2ReadConfigData (IpSb->MacString, Instance);
@@ -2077,7 +2077,7 @@ Ip4Config2InitInstance ( if (EFI_ERROR (Status)) {
return Status;
}
-
+
Instance->Ip4Config2.SetData = EfiIp4Config2SetData;
Instance->Ip4Config2.GetData = EfiIp4Config2GetData;
Instance->Ip4Config2.RegisterDataNotify = EfiIp4Config2RegisterDataNotify;
@@ -2166,7 +2166,7 @@ Ip4AutoReconfigCallBackDpc ( if (IpSb->State > IP4_SERVICE_UNSTARTED) {
IpSb->State = IP4_SERVICE_UNSTARTED;
}
-
+
IpSb->Reconfig = TRUE;
Ip4StartAutoConfig (&IpSb->Ip4Config2Instance);
diff --git a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Config2Impl.h b/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Config2Impl.h index a431f6f..127588e 100644 --- a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Config2Impl.h +++ b/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Config2Impl.h @@ -1,7 +1,7 @@ /** @file
Definitions for EFI IPv4 Configuration II Protocol implementation.
- Copyright (c) 2015 - 2016, Intel Corporation. All rights reserved.<BR>
+ Copyright (c) 2015 - 2018, Intel Corporation. All rights reserved.<BR>
(C) Copyright 2015 Hewlett Packard Enterprise Development LP<BR>
This program and the accompanying materials
@@ -70,7 +70,7 @@ typedef struct _IP4_CONFIG2_INSTANCE IP4_CONFIG2_INSTANCE; 8 bytes.
@retval EFI_SUCCESS The specified configuration data for the EFI IPv4
network stack was set successfully.
-
+
**/
typedef
EFI_STATUS
@@ -87,14 +87,14 @@ EFI_STATUS @param[in, out] DataSize On input, in bytes, the size of Data. On output, in
bytes, the size of buffer required to store the specified
configuration data.
- @param[in] Data The data buffer in which the configuration data is returned.
+ @param[in] Data The data buffer in which the configuration data is returned.
Ignored if DataSize is ZERO.
@retval EFI_BUFFER_TOO_SMALL The size of Data is too small for the specified
- configuration data, and the required size is
+ configuration data, and the required size is
returned in DataSize.
- @retval EFI_SUCCESS The specified configuration data was obtained successfully.
-
+ @retval EFI_SUCCESS The specified configuration data was obtained successfully.
+
**/
typedef
EFI_STATUS
@@ -151,7 +151,7 @@ typedef struct { #pragma pack()
typedef struct {
- EFI_IP4_CONFIG2_POLICY Policy; ///< manual or automatic
+ EFI_IP4_CONFIG2_POLICY Policy; ///< manual or automatic
EFI_IP4_CONFIG2_MANUAL_ADDRESS *ManualAddress; ///< IP addresses
UINT32 ManualAddressCount; ///< IP addresses count
EFI_IPv4_ADDRESS *GatewayAddress; ///< Gateway address
@@ -177,7 +177,7 @@ struct _IP4_CONFIG2_INSTANCE { EFI_IP4_CONFIG2_PROTOCOL Ip4Config2;
EFI_IP4_CONFIG2_INTERFACE_INFO InterfaceInfo;
- EFI_IP4_CONFIG2_POLICY Policy;
+ EFI_IP4_CONFIG2_POLICY Policy;
IP4_CONFIG2_DATA_ITEM DataItem[Ip4Config2DataTypeMaximum];
EFI_EVENT Dhcp4SbNotifyEvent;
@@ -190,7 +190,7 @@ struct _IP4_CONFIG2_INSTANCE { UINT32 FailedIaAddressCount;
EFI_IPv4_ADDRESS *DeclineAddress;
UINT32 DeclineAddressCount;
-
+
IP4_FORM_CALLBACK_INFO CallbackInfo;
IP4_CONFIG2_NVDATA Ip4NvData;
diff --git a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Config2Nv.c b/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Config2Nv.c index 694a2d0..8dbb6a9 100644 --- a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Config2Nv.c +++ b/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Config2Nv.c @@ -1,7 +1,7 @@ /** @file
Helper functions for configuring or getting the parameters relating to Ip4.
-Copyright (c) 2015 - 2017, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2015 - 2018, Intel Corporation. All rights reserved.<BR>
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
@@ -23,7 +23,7 @@ CHAR16 mIp4Config2StorageName[] = L"IP4_CONFIG2_IFR_NVDATA"; @return The prefix length of the subnet mask.
@retval 0 Other errors as indicated.
-
+
**/
UINT8
GetSubnetMaskPrefixLength (
@@ -65,7 +65,7 @@ GetSubnetMaskPrefixLength ( @retval EFI_SUCCESS The binary IP address is returned in Ip.
@retval EFI_INVALID_PARAMETER The IP string is malformatted.
-
+
**/
EFI_STATUS
Ip4Config2StrToIp (
@@ -131,7 +131,7 @@ Ip4Config2StrToIp ( @retval EFI_SUCCESS The binary IP address list is returned in PtrIpList.
@retval EFI_OUT_OF_RESOURCES Error occurs in allocating memory.
@retval EFI_INVALID_PARAMETER The IP string is malformatted.
-
+
**/
EFI_STATUS
Ip4Config2StrToIpList (
@@ -141,19 +141,19 @@ Ip4Config2StrToIpList ( )
{
UINTN BeginIndex;
- UINTN EndIndex;
+ UINTN EndIndex;
UINTN Index;
UINTN IpIndex;
CHAR16 *StrTemp;
BOOLEAN SpaceTag;
-
+
BeginIndex = 0;
EndIndex = BeginIndex;
Index = 0;
IpIndex = 0;
StrTemp = NULL;
SpaceTag = TRUE;
-
+
*PtrIpList = NULL;
*IpCount = 0;
@@ -173,14 +173,14 @@ Ip4Config2StrToIpList ( SpaceTag = FALSE;
}
}
-
+
Index++;
}
if (*IpCount == 0) {
return EFI_SUCCESS;
}
-
+
//
// Allocate buffer for IpList.
//
@@ -203,10 +203,10 @@ Ip4Config2StrToIpList ( *IpCount = 0;
return EFI_OUT_OF_RESOURCES;
}
-
+
CopyMem (StrTemp, Str + BeginIndex, (EndIndex - BeginIndex) * sizeof(CHAR16));
*(StrTemp + (EndIndex - BeginIndex)) = L'\0';
-
+
if (Ip4Config2StrToIp (StrTemp, &((*PtrIpList)[IpIndex])) != EFI_SUCCESS) {
FreePool(StrTemp);
FreePool(*PtrIpList);
@@ -214,7 +214,7 @@ Ip4Config2StrToIpList ( *IpCount = 0;
return EFI_INVALID_PARAMETER;
}
-
+
BeginIndex = EndIndex;
IpIndex++;
@@ -228,9 +228,9 @@ Ip4Config2StrToIpList ( EndIndex++;
SpaceTag = FALSE;
}
-
+
Index++;
-
+
if (*(Str + Index) == L'\0') {
if (!SpaceTag) {
StrTemp = AllocateZeroPool((EndIndex - BeginIndex + 1) * sizeof(CHAR16));
@@ -240,10 +240,10 @@ Ip4Config2StrToIpList ( *IpCount = 0;
return EFI_OUT_OF_RESOURCES;
}
-
+
CopyMem (StrTemp, Str + BeginIndex, (EndIndex - BeginIndex) * sizeof(CHAR16));
*(StrTemp + (EndIndex - BeginIndex)) = L'\0';
-
+
if (Ip4Config2StrToIp (StrTemp, &((*PtrIpList)[IpIndex])) != EFI_SUCCESS) {
FreePool(StrTemp);
FreePool(*PtrIpList);
@@ -255,7 +255,7 @@ Ip4Config2StrToIpList ( FreePool(StrTemp);
}
}
- }
+ }
return EFI_SUCCESS;
}
@@ -265,7 +265,7 @@ Ip4Config2StrToIpList ( @param[in] Ip The IPv4 address.
@param[out] Str The dotted IP string.
-
+
**/
VOID
Ip4Config2IpToStr (
@@ -275,8 +275,8 @@ Ip4Config2IpToStr ( {
UnicodeSPrint (
Str,
- 2 * IP4_STR_MAX_SIZE,
- L"%d.%d.%d.%d",
+ 2 * IP4_STR_MAX_SIZE,
+ L"%d.%d.%d.%d",
Ip->Addr[0],
Ip->Addr[1],
Ip->Addr[2],
@@ -286,13 +286,13 @@ Ip4Config2IpToStr ( /**
- Convert the IPv4 address list into string consists of several decimal
+ Convert the IPv4 address list into string consists of several decimal
dotted IPv4 addresses separated by space.
@param[in] Ip The IPv4 address list.
@param[in] IpCount The size of IPv4 address list.
@param[out] Str The string contains several decimal dotted
- IPv4 addresses separated by space.
+ IPv4 addresses separated by space.
@retval EFI_SUCCESS Operation is success.
@retval EFI_OUT_OF_RESOURCES Error occurs in allocating memory.
@@ -310,7 +310,7 @@ Ip4Config2IpListToStr ( UINTN StrIndex;
CHAR16 *TempStr;
EFI_IPv4_ADDRESS *TempIp;
-
+
Index = 0;
TemIndex = 0;
StrIndex = 0;
@@ -327,9 +327,9 @@ Ip4Config2IpListToStr ( }
UnicodeSPrint (
- TempStr,
- 2 * IP4_STR_MAX_SIZE,
- L"%d.%d.%d.%d",
+ TempStr,
+ 2 * IP4_STR_MAX_SIZE,
+ L"%d.%d.%d.%d",
TempIp->Addr[0],
TempIp->Addr[1],
TempIp->Addr[2],
@@ -342,7 +342,7 @@ Ip4Config2IpListToStr ( Str[StrIndex++] = L'\0';
} else {
Str[StrIndex++] = L' ';
- }
+ }
break;
} else {
Str[StrIndex++] = *(TempStr + TemIndex);
@@ -362,7 +362,7 @@ Ip4Config2IpListToStr ( @param[in] Event The pointer of Event.
@param[in] Context The pointer of Context.
-
+
**/
VOID
EFIAPI
@@ -384,7 +384,7 @@ Ip4Config2ManualAddressNotify ( set successfully.
@retval EFI_INVALID_PARAMETER Source instance or target IFR data is not available.
@retval Others Other errors as indicated.
-
+
**/
EFI_STATUS
Ip4Config2ConvertConfigNvDataToIfrNvData (
@@ -409,11 +409,11 @@ Ip4Config2ConvertConfigNvDataToIfrNvData ( Ip4Info = NULL;
DnsAddress = NULL;
GatewaySize = sizeof (EFI_IPv4_ADDRESS);
-
+
if ((IfrNvData == NULL) || (Instance == NULL)) {
return EFI_INVALID_PARAMETER;
}
-
+
NET_CHECK_SIGNATURE (Instance, IP4_CONFIG2_INSTANCE_SIGNATURE);
IpSb = IP4_SERVICE_FROM_IP4_CONFIG2_INSTANCE (Instance);
@@ -427,7 +427,7 @@ Ip4Config2ConvertConfigNvDataToIfrNvData ( //
// Get the Policy info.
- //
+ //
DataSize = sizeof (EFI_IP4_CONFIG2_POLICY);
Status = Ip4Config2->GetData (
Ip4Config2,
@@ -438,14 +438,14 @@ Ip4Config2ConvertConfigNvDataToIfrNvData ( if (EFI_ERROR (Status)) {
goto Exit;
}
-
+
if (Policy == Ip4Config2PolicyStatic) {
IfrNvData->DhcpEnable = FALSE;
} else if (Policy == Ip4Config2PolicyDhcp) {
IfrNvData->DhcpEnable = TRUE;
goto Exit;
}
-
+
//
// Get the interface info.
//
@@ -459,7 +459,7 @@ Ip4Config2ConvertConfigNvDataToIfrNvData ( if (Status != EFI_BUFFER_TOO_SMALL) {
return Status;
}
-
+
Ip4Info = AllocateZeroPool (DataSize);
if (Ip4Info == NULL) {
Status = EFI_OUT_OF_RESOURCES;
@@ -475,7 +475,7 @@ Ip4Config2ConvertConfigNvDataToIfrNvData ( if (EFI_ERROR (Status)) {
goto Exit;
}
-
+
//
// Get the Gateway info.
//
@@ -502,7 +502,7 @@ Ip4Config2ConvertConfigNvDataToIfrNvData ( if ((Status != EFI_BUFFER_TOO_SMALL) && (Status != EFI_NOT_FOUND)) {
goto Exit;
}
-
+
DnsCount = (UINT32) (DnsSize / sizeof (EFI_IPv4_ADDRESS));
if (DnsSize > 0) {
@@ -511,7 +511,7 @@ Ip4Config2ConvertConfigNvDataToIfrNvData ( Status = EFI_OUT_OF_RESOURCES;
goto Exit;
}
-
+
Status = Ip4Config2->GetData (
Ip4Config2,
Ip4Config2DataTypeDnsServer,
@@ -537,7 +537,7 @@ Exit: if (Ip4Info != NULL) {
FreePool(Ip4Info);
}
-
+
return Status;
}
@@ -552,7 +552,7 @@ Exit: set successfully.
@retval EFI_INVALID_PARAMETER The address information for setting is invalid.
@retval Others Other errors as indicated.
-
+
**/
EFI_STATUS
Ip4Config2ConvertIfrNvDataToConfigNvData (
@@ -560,9 +560,9 @@ Ip4Config2ConvertIfrNvDataToConfigNvData ( IN OUT IP4_CONFIG2_INSTANCE *Instance
)
{
- EFI_STATUS Status;
+ EFI_STATUS Status;
EFI_IP4_CONFIG2_PROTOCOL *Ip4Cfg2;
- IP4_CONFIG2_NVDATA *Ip4NvData;
+ IP4_CONFIG2_NVDATA *Ip4NvData;
EFI_IP_ADDRESS StationAddress;
EFI_IP_ADDRESS SubnetMask;
@@ -581,15 +581,15 @@ Ip4Config2ConvertIfrNvDataToConfigNvData ( Status = EFI_SUCCESS;
Ip4Cfg2 = &Instance->Ip4Config2;
Ip4NvData = &Instance->Ip4NvData;
-
+
DnsCount = 0;
- DnsAddress = NULL;
-
+ DnsAddress = NULL;
+
TimeoutEvent = NULL;
SetAddressEvent = NULL;
-
+
if (Instance == NULL || IfrFormNvData == NULL) {
return EFI_INVALID_PARAMETER;
}
@@ -597,10 +597,10 @@ Ip4Config2ConvertIfrNvDataToConfigNvData ( if (IfrFormNvData->Configure != TRUE) {
return EFI_SUCCESS;
}
-
+
if (IfrFormNvData->DhcpEnable == TRUE) {
Ip4NvData->Policy = Ip4Config2PolicyDhcp;
-
+
Status = Ip4Cfg2->SetData (
Ip4Cfg2,
Ip4Config2DataTypePolicy,
@@ -623,15 +623,15 @@ Ip4Config2ConvertIfrNvDataToConfigNvData ( }
Status = Ip4Config2StrToIp (IfrFormNvData->StationAddress, &StationAddress.v4);
- if (EFI_ERROR (Status) ||
- (SubnetMask.Addr[0] != 0 && !NetIp4IsUnicast (NTOHL (StationAddress.Addr[0]), NTOHL (SubnetMask.Addr[0]))) ||
+ if (EFI_ERROR (Status) ||
+ (SubnetMask.Addr[0] != 0 && !NetIp4IsUnicast (NTOHL (StationAddress.Addr[0]), NTOHL (SubnetMask.Addr[0]))) ||
!Ip4StationAddressValid (NTOHL (StationAddress.Addr[0]), NTOHL (SubnetMask.Addr[0]))) {
CreatePopUp (EFI_LIGHTGRAY | EFI_BACKGROUND_BLUE, &Key, L"Invalid IP address!", NULL);
return EFI_INVALID_PARAMETER;
}
-
+
Status = Ip4Config2StrToIp (IfrFormNvData->GatewayAddress, &Gateway.v4);
- if (EFI_ERROR (Status) ||
+ if (EFI_ERROR (Status) ||
(Gateway.Addr[0] != 0 && SubnetMask.Addr[0] != 0 && !NetIp4IsUnicast (NTOHL (Gateway.Addr[0]), NTOHL (SubnetMask.Addr[0])))) {
CreatePopUp (EFI_LIGHTGRAY | EFI_BACKGROUND_BLUE, &Key, L"Invalid Gateway!", NULL);
return EFI_INVALID_PARAMETER;
@@ -645,16 +645,16 @@ Ip4Config2ConvertIfrNvDataToConfigNvData ( CreatePopUp (EFI_LIGHTGRAY | EFI_BACKGROUND_BLUE, &Key, L"Invalid Dns Server!", NULL);
FreePool(DnsAddress);
return EFI_INVALID_PARAMETER;
- }
- }
+ }
+ }
} else {
if (EFI_ERROR (Status)) {
CreatePopUp (EFI_LIGHTGRAY | EFI_BACKGROUND_BLUE, &Key, L"Invalid Dns Server!", NULL);
}
}
-
+
if (Ip4NvData->ManualAddress != NULL) {
- FreePool(Ip4NvData->ManualAddress);
+ FreePool(Ip4NvData->ManualAddress);
}
Ip4NvData->ManualAddressCount = 1;
Ip4NvData->ManualAddress = AllocateZeroPool(sizeof(EFI_IP4_CONFIG2_MANUAL_ADDRESS));
@@ -662,14 +662,14 @@ Ip4Config2ConvertIfrNvDataToConfigNvData ( if (DnsAddress != NULL) {
FreePool(DnsAddress);
}
-
+
return EFI_OUT_OF_RESOURCES;
}
CopyMem(&Ip4NvData->ManualAddress->Address, &StationAddress.v4, sizeof(EFI_IPv4_ADDRESS));
CopyMem(&Ip4NvData->ManualAddress->SubnetMask, &SubnetMask.v4, sizeof(EFI_IPv4_ADDRESS));
-
+
if (Ip4NvData->GatewayAddress != NULL) {
- FreePool(Ip4NvData->GatewayAddress);
+ FreePool(Ip4NvData->GatewayAddress);
}
Ip4NvData->GatewayAddressCount = 1;
Ip4NvData->GatewayAddress = AllocateZeroPool(sizeof(EFI_IPv4_ADDRESS));
@@ -680,9 +680,9 @@ Ip4Config2ConvertIfrNvDataToConfigNvData ( return EFI_OUT_OF_RESOURCES;
}
CopyMem(Ip4NvData->GatewayAddress, &Gateway.v4, sizeof(EFI_IPv4_ADDRESS));
-
+
if (Ip4NvData->DnsAddress != NULL) {
- FreePool(Ip4NvData->DnsAddress);
+ FreePool(Ip4NvData->DnsAddress);
}
Ip4NvData->DnsAddressCount = (UINT32) DnsCount;
Ip4NvData->DnsAddress = DnsAddress;
@@ -726,7 +726,7 @@ Ip4Config2ConvertIfrNvDataToConfigNvData ( }
IsAddressOk = FALSE;
-
+
Status = Ip4Cfg2->RegisterDataNotify (
Ip4Cfg2,
Ip4Config2DataTypeManualAddress,
@@ -791,12 +791,12 @@ Ip4Config2ConvertIfrNvDataToConfigNvData ( DataSize,
Ip4NvData->DnsAddress
);
-
+
if (EFI_ERROR (Status)) {
goto Exit;
- }
- }
- }
+ }
+ }
+ }
Exit:
if (SetAddressEvent != NULL) {
@@ -875,12 +875,12 @@ Ip4FormExtractConfig ( OUT EFI_STRING *Results
)
{
- EFI_STATUS Status;
+ EFI_STATUS Status;
IP4_CONFIG2_INSTANCE *Ip4Config2Instance;
- IP4_FORM_CALLBACK_INFO *Private;
+ IP4_FORM_CALLBACK_INFO *Private;
IP4_CONFIG2_IFR_NVDATA *IfrFormNvData;
EFI_STRING ConfigRequestHdr;
- EFI_STRING ConfigRequest;
+ EFI_STRING ConfigRequest;
BOOLEAN AllocatedRequest;
EFI_STRING FormResult;
UINTN Size;
@@ -889,19 +889,19 @@ Ip4FormExtractConfig ( if (Progress == NULL || Results == NULL) {
return EFI_INVALID_PARAMETER;
}
-
- Status = EFI_SUCCESS;
+
+ Status = EFI_SUCCESS;
IfrFormNvData = NULL;
ConfigRequest = NULL;
- FormResult = NULL;
+ FormResult = NULL;
Size = 0;
- AllocatedRequest = FALSE;
- ConfigRequest = Request;
+ AllocatedRequest = FALSE;
+ ConfigRequest = Request;
Private = IP4_FORM_CALLBACK_INFO_FROM_CONFIG_ACCESS(This);
Ip4Config2Instance = IP4_CONFIG2_INSTANCE_FROM_FORM_CALLBACK(Private);
BufferSize = sizeof (IP4_CONFIG2_IFR_NVDATA);
*Progress = Request;
-
+
//
// Check Request data in <ConfigHdr>.
//
@@ -910,9 +910,9 @@ Ip4FormExtractConfig ( if (IfrFormNvData == NULL) {
return EFI_OUT_OF_RESOURCES;
}
-
+
Ip4Config2ConvertConfigNvDataToIfrNvData (Ip4Config2Instance, IfrFormNvData);
-
+
if ((Request == NULL) || (StrStr (Request, L"OFFSET") == NULL)) {
//
// Request has no request element, construct full request string.
@@ -927,7 +927,7 @@ Ip4FormExtractConfig ( goto Failure;
}
AllocatedRequest = TRUE;
-
+
UnicodeSPrint (ConfigRequest, Size, L"%s&OFFSET=0&WIDTH=%016LX", ConfigRequestHdr, (UINT64)BufferSize);
FreePool (ConfigRequestHdr);
}
@@ -945,7 +945,7 @@ Ip4FormExtractConfig ( );
FreePool (IfrFormNvData);
-
+
//
// Free the allocated config request string.
//
@@ -958,7 +958,7 @@ Ip4FormExtractConfig ( goto Failure;
}
}
-
+
if (Request == NULL || HiiIsConfigHdrMatch (Request, &gIp4Config2NvDataGuid, mIp4Config2StorageName)) {
*Results = FormResult;
} else {
@@ -1107,7 +1107,7 @@ Ip4FormRouteConfig ( callback.Currently not implemented.
@retval EFI_INVALID_PARAMETERS Passing in wrong parameter.
@retval Others Other errors as indicated.
-
+
**/
EFI_STATUS
EFIAPI
@@ -1124,7 +1124,7 @@ Ip4FormCallback ( IP4_CONFIG2_INSTANCE *Instance;
IP4_CONFIG2_IFR_NVDATA *IfrFormNvData;
IP4_FORM_CALLBACK_INFO *Private;
-
+
EFI_IP_ADDRESS StationAddress;
EFI_IP_ADDRESS SubnetMask;
EFI_IP_ADDRESS Gateway;
@@ -1133,15 +1133,15 @@ Ip4FormCallback ( UINTN DnsCount;
UINTN Index;
EFI_INPUT_KEY Key;
-
+
IfrFormNvData = NULL;
DnsCount = 0;
- DnsAddress = NULL;
+ DnsAddress = NULL;
if (Action == EFI_BROWSER_ACTION_CHANGED) {
Private = IP4_FORM_CALLBACK_INFO_FROM_CONFIG_ACCESS(This);
Instance = IP4_CONFIG2_INSTANCE_FROM_FORM_CALLBACK(Private);
-
+
IfrFormNvData = AllocateZeroPool (sizeof (IP4_CONFIG2_IFR_NVDATA));
if (IfrFormNvData == NULL) {
return EFI_OUT_OF_RESOURCES;
@@ -1181,7 +1181,7 @@ Ip4FormCallback ( Status = EFI_INVALID_PARAMETER;
}
break;
-
+
case KEY_DNS:
Status = Ip4Config2StrToIpList (IfrFormNvData->DnsAddress, &DnsAddress, &DnsCount);
if (!EFI_ERROR (Status) && DnsCount > 0) {
@@ -1191,19 +1191,19 @@ Ip4FormCallback ( CreatePopUp (EFI_LIGHTGRAY | EFI_BACKGROUND_BLUE, &Key, L"Invalid Dns Server!", NULL);
Status = EFI_INVALID_PARAMETER;
break;
- }
+ }
}
} else {
if (EFI_ERROR (Status)) {
CreatePopUp (EFI_LIGHTGRAY | EFI_BACKGROUND_BLUE, &Key, L"Invalid Dns Server!", NULL);
}
}
-
- if(DnsAddress != NULL) {
+
+ if(DnsAddress != NULL) {
FreePool(DnsAddress);
}
break;
-
+
case KEY_SAVE_CHANGES:
Status = Ip4Config2ConvertIfrNvDataToConfigNvData (IfrFormNvData, Instance);
*ActionRequest = EFI_BROWSER_ACTION_REQUEST_SUBMIT;
@@ -1232,7 +1232,7 @@ Ip4FormCallback ( @retval EFI_SUCCESS The HII Config Access protocol is installed.
@retval EFI_OUT_OF_RESOURCES Failed to allocate memory.
@retval Others Other errors as indicated.
-
+
**/
EFI_STATUS
Ip4Config2FormInit (
@@ -1253,9 +1253,9 @@ Ip4Config2FormInit ( IpSb = IP4_SERVICE_FROM_IP4_CONFIG2_INSTANCE (Instance);
ASSERT (IpSb != NULL);
-
+
CallbackInfo = &Instance->CallbackInfo;
-
+
CallbackInfo->Signature = IP4_FORM_CALLBACK_INFO_SIGNATURE;
Status = gBS->HandleProtocol (
@@ -1344,26 +1344,26 @@ Ip4Config2FormInit ( Status = NetLibGetMacString (IpSb->Controller, IpSb->Image, &MacString);
if (!EFI_ERROR (Status)) {
OldMenuString = HiiGetString (
- CallbackInfo->RegisteredHandle,
- STRING_TOKEN (STR_IP4_CONFIG2_FORM_HELP),
+ CallbackInfo->RegisteredHandle,
+ STRING_TOKEN (STR_IP4_CONFIG2_FORM_HELP),
NULL
);
UnicodeSPrint (MenuString, 128, L"%s (MAC:%s)", OldMenuString, MacString);
HiiSetString (
- CallbackInfo->RegisteredHandle,
- STRING_TOKEN (STR_IP4_CONFIG2_FORM_HELP),
- MenuString,
+ CallbackInfo->RegisteredHandle,
+ STRING_TOKEN (STR_IP4_CONFIG2_FORM_HELP),
+ MenuString,
NULL
);
UnicodeSPrint (PortString, 128, L"MAC:%s", MacString);
HiiSetString (
- CallbackInfo->RegisteredHandle,
- STRING_TOKEN (STR_IP4_DEVICE_FORM_HELP),
- PortString,
+ CallbackInfo->RegisteredHandle,
+ STRING_TOKEN (STR_IP4_DEVICE_FORM_HELP),
+ PortString,
NULL
);
-
+
FreePool (MacString);
FreePool (OldMenuString);
@@ -1405,7 +1405,7 @@ Ip4Config2FormUnload ( IpSb->Image,
CallbackInfo->ChildHandle
);
-
+
//
// Uninstall EFI_HII_CONFIG_ACCESS_PROTOCOL
//
diff --git a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Config2Nv.h b/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Config2Nv.h index 5a82e6d..884d01a 100644 --- a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Config2Nv.h +++ b/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Config2Nv.h @@ -1,7 +1,7 @@ /** @file
The header file of IP4Config2Nv.c
-Copyright (c) 2015, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2015 - 2018, Intel Corporation. All rights reserved.<BR>
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
@@ -30,7 +30,7 @@ extern UINT8 Ip4DxeStrings[]; @retval EFI_SUCCESS The HII Config Access protocol is installed.
@retval EFI_OUT_OF_RESOURCES Failed to allocate memory.
@retval Others Other errors as indicated.
-
+
**/
EFI_STATUS
Ip4Config2FormInit (
diff --git a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Driver.c b/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Driver.c index 552c4e1..0f25581 100644 --- a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Driver.c +++ b/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Driver.c @@ -258,7 +258,7 @@ Ip4CreateService ( IpSb->ReconfigEvent = NULL;
IpSb->Reconfig = FALSE;
-
+
IpSb->MediaPresent = TRUE;
//
@@ -352,7 +352,7 @@ Ip4CreateService ( IpSb->MacString = NULL;
Status = NetLibGetMacString (IpSb->Controller, IpSb->Image, &IpSb->MacString);
-
+
if (EFI_ERROR (Status)) {
goto ON_ERROR;
}
@@ -367,7 +367,7 @@ Ip4CreateService ( InsertHeadList (&IpSb->Interfaces, &IpSb->DefaultInterface->Link);
ZeroMem (&IpSb->Ip4Config2Instance, sizeof (IP4_CONFIG2_INSTANCE));
-
+
Status = Ip4Config2InitInstance (&IpSb->Ip4Config2Instance);
if (EFI_ERROR (Status)) {
@@ -488,7 +488,7 @@ Ip4CleanService ( /**
Callback function which provided by user to remove one node in NetDestroyLinkList process.
-
+
@param[in] Entry The entry to be removed.
@param[in] Context Pointer to the callback context corresponds to the Context in NetDestroyLinkList.
@@ -549,7 +549,7 @@ Ip4DriverBindingStart ( IN EFI_HANDLE ControllerHandle,
IN EFI_DEVICE_PATH_PROTOCOL *RemainingDevicePath OPTIONAL
)
-{
+{
EFI_STATUS Status;
IP4_SERVICE *IpSb;
EFI_IP4_CONFIG2_PROTOCOL *Ip4Cfg2;
@@ -575,13 +575,13 @@ Ip4DriverBindingStart ( if (Status == EFI_SUCCESS) {
return EFI_ALREADY_STARTED;
}
-
+
Status = Ip4CreateService (ControllerHandle, This->DriverBindingHandle, &IpSb);
-
+
if (EFI_ERROR (Status)) {
return Status;
}
-
+
ASSERT (IpSb != NULL);
Ip4Cfg2 = &IpSb->Ip4Config2Instance.Ip4Config2;
@@ -603,16 +603,16 @@ Ip4DriverBindingStart ( }
//
- // Read the config data from NV variable again.
+ // Read the config data from NV variable again.
// The default data can be changed by other drivers.
//
Status = Ip4Config2ReadConfigData (IpSb->MacString, &IpSb->Ip4Config2Instance);
if (EFI_ERROR (Status)) {
goto UNINSTALL_PROTOCOL;
}
-
+
//
- // Consume the installed EFI_IP4_CONFIG2_PROTOCOL to set the default data items.
+ // Consume the installed EFI_IP4_CONFIG2_PROTOCOL to set the default data items.
//
for (Index = Ip4Config2DataTypePolicy; Index < Ip4Config2DataTypeMaximum; Index++) {
DataItem = &IpSb->Ip4Config2Instance.DataItem[Index];
@@ -626,13 +626,13 @@ Ip4DriverBindingStart ( if (EFI_ERROR(Status)) {
goto UNINSTALL_PROTOCOL;
}
-
+
if (Index == Ip4Config2DataTypePolicy && (*(DataItem->Data.Policy) == Ip4Config2PolicyDhcp)) {
break;
- }
+ }
}
}
-
+
//
// Ready to go: start the receiving and timer.
// Ip4Config2SetPolicy maybe call Ip4ReceiveFrame() to set the default interface's RecvRequest first after
@@ -705,9 +705,9 @@ Ip4DriverBindingStop ( )
{
EFI_SERVICE_BINDING_PROTOCOL *ServiceBinding;
- IP4_SERVICE *IpSb;
+ IP4_SERVICE *IpSb;
EFI_HANDLE NicHandle;
- EFI_STATUS Status;
+ EFI_STATUS Status;
INTN State;
LIST_ENTRY *List;
IP4_DESTROY_CHILD_IN_HANDLE_BUF_CONTEXT Context;
@@ -717,20 +717,20 @@ Ip4DriverBindingStop ( BOOLEAN IsDhcp4;
IsDhcp4 = FALSE;
-
+
NicHandle = NetLibGetNicHandle (ControllerHandle, &gEfiManagedNetworkProtocolGuid);
if (NicHandle == NULL) {
NicHandle = NetLibGetNicHandle (ControllerHandle, &gEfiArpProtocolGuid);
if (NicHandle == NULL) {
NicHandle = NetLibGetNicHandle (ControllerHandle, &gEfiDhcp4ProtocolGuid);
if (NicHandle != NULL) {
- IsDhcp4 = TRUE;
+ IsDhcp4 = TRUE;
} else {
return EFI_SUCCESS;
}
}
}
-
+
Status = gBS->OpenProtocol (
NicHandle,
&gEfiIp4ServiceBindingProtocolGuid,
@@ -742,7 +742,7 @@ Ip4DriverBindingStop ( if (EFI_ERROR (Status)) {
return EFI_DEVICE_ERROR;
}
-
+
IpSb = IP4_SERVICE_FROM_PROTOCOL (ServiceBinding);
if (IsDhcp4) {
@@ -761,7 +761,7 @@ Ip4DriverBindingStop ( NULL
);
} else if (IpSb->DefaultInterface->ArpHandle == ControllerHandle) {
-
+
//
// The ARP protocol for the default interface is being uninstalled and all
// its IP child handles should have been destroyed before. So, release the
@@ -770,7 +770,7 @@ Ip4DriverBindingStop ( Ip4CancelReceive (IpSb->DefaultInterface);
Ip4FreeInterface (IpSb->DefaultInterface, NULL);
Ip4FreeRouteTable (IpSb->DefaultRouteTable);
-
+
IpIf = Ip4CreateInterface (IpSb->Mnp, IpSb->Controller, IpSb->Image);
if (IpIf == NULL) {
goto ON_ERROR;
@@ -780,7 +780,7 @@ Ip4DriverBindingStop ( Ip4FreeInterface (IpIf, NULL);
goto ON_ERROR;;
}
-
+
IpSb->DefaultInterface = IpIf;
InsertHeadList (&IpSb->Interfaces, &IpIf->Link);
IpSb->DefaultRouteTable = RouteTable;
@@ -807,7 +807,7 @@ Ip4DriverBindingStop ( &IpSb->Ip4Config2Instance.Ip4Config2,
NULL
);
-
+
if (gIp4ControllerNameTable != NULL) {
FreeUnicodeStringTable (gIp4ControllerNameTable);
gIp4ControllerNameTable = NULL;
diff --git a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Driver.h b/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Driver.h index 8c5298b..0a278cd 100644 --- a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Driver.h +++ b/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Driver.h @@ -1,6 +1,6 @@ /** @file
-Copyright (c) 2005 - 2016, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2005 - 2018, Intel Corporation. All rights reserved.<BR>
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
@@ -34,7 +34,7 @@ typedef struct { This is the declaration of an EFI image entry point. This entry point is
the same for UEFI Applications, UEFI OS Loaders, and UEFI Drivers including
both device drivers and bus drivers.
-
+
The entry point for IP4 driver which install the driver
binding and component name protocol on its image.
@@ -114,7 +114,7 @@ Ip4DriverBindingStart ( restrictions for this service. DisconnectController()
must follow these calling restrictions. If any other agent wishes
to call Stop() it must also follow these calling restrictions.
-
+
@param[in] This Protocol instance pointer.
@param[in] ControllerHandle Handle of device to stop driver on
@param[in] NumberOfChildren Number of Handles in ChildHandleBuffer. If number
@@ -139,14 +139,14 @@ Ip4DriverBindingStop ( //
/**
Creates a child handle and installs a protocol.
-
- The CreateChild() function installs a protocol on ChildHandle.
- If ChildHandle is a pointer to NULL, then a new handle is created and returned in ChildHandle.
+
+ The CreateChild() function installs a protocol on ChildHandle.
+ If ChildHandle is a pointer to NULL, then a new handle is created and returned in ChildHandle.
If ChildHandle is not a pointer to NULL, then the protocol installs on the existing ChildHandle.
@param This Pointer to the EFI_SERVICE_BINDING_PROTOCOL instance.
@param ChildHandle Pointer to the handle of the child to create. If it is NULL,
- then a new handle is created. If it is a pointer to an existing UEFI handle,
+ then a new handle is created. If it is a pointer to an existing UEFI handle,
then the protocol is added to the existing UEFI handle.
@retval EFI_SUCCES The protocol was added to ChildHandle.
@@ -165,9 +165,9 @@ Ip4ServiceBindingCreateChild ( /**
Destroys a child handle with a protocol installed on it.
-
- The DestroyChild() function does the opposite of CreateChild(). It removes a protocol
- that was installed by CreateChild() from ChildHandle. If the removed protocol is the
+
+ The DestroyChild() function does the opposite of CreateChild(). It removes a protocol
+ that was installed by CreateChild() from ChildHandle. If the removed protocol is the
last protocol on ChildHandle, then ChildHandle is destroyed.
@param This Pointer to the EFI_SERVICE_BINDING_PROTOCOL instance.
diff --git a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.inf b/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.inf index 3135287..b2b934a 100644 --- a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.inf +++ b/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.inf @@ -6,7 +6,7 @@ # subset of the Internet Control Message Protocol (ICMP) and may include support for
# the Internet Group Management Protocol (IGMP).
#
-# Copyright (c) 2007 - 2016, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2007 - 2018, Intel Corporation. All rights reserved.<BR>
# 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
@@ -24,7 +24,7 @@ MODULE_UNI_FILE = Ip4Dxe.uni
FILE_GUID = 9FB1A1F3-3B71-4324-B39A-745CBB015FFF
MODULE_TYPE = UEFI_DRIVER
- VERSION_STRING = 1.0
+ VERSION_STRING = 1.0
ENTRY_POINT = Ip4DriverEntryPoint
UNLOAD_IMAGE = NetLibDefaultUnload
@@ -33,7 +33,7 @@ #
# VALID_ARCHITECTURES = IA32 X64 IPF EBC
#
-# DRIVER_BINDING = gIp4DriverBinding
+# DRIVER_BINDING = gIp4DriverBinding
# COMPONENT_NAME = gIp4ComponentName
# COMPONENT_NAME2 = gIp4ComponentName2
#
@@ -102,7 +102,7 @@ gEfiIpSec2ProtocolGuid ## SOMETIMES_CONSUMES
gEfiHiiConfigAccessProtocolGuid ## BY_START
gEfiDevicePathProtocolGuid ## TO_START
-
+
[Guids]
## SOMETIMES_CONSUMES ## GUID # HiiIsConfigHdrMatch EFI_NIC_IP4_CONFIG_VARIABLE
## SOMETIMES_PRODUCES ## GUID # HiiConstructConfigHdr EFI_NIC_IP4_CONFIG_VARIABLE
diff --git a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.uni b/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.uni index e25b024..a0779b9 100644 --- a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.uni +++ b/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.uni @@ -6,13 +6,13 @@ // subset of the Internet Control Message Protocol (ICMP) and may include support for
// the Internet Group Management Protocol (IGMP).
//
-// Copyright (c) 2007 - 2014, Intel Corporation. All rights reserved.<BR>
+// Copyright (c) 2007 - 2018, Intel Corporation. All rights reserved.<BR>
//
// 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,
// WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
//
diff --git a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4DxeExtra.uni b/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4DxeExtra.uni index 9335e9c..15b0c90 100644 --- a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4DxeExtra.uni +++ b/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4DxeExtra.uni @@ -1,7 +1,7 @@ // /** @file
// Ip4Dxe Localized Strings and Content
//
-// Copyright (c) 2013 - 2014, Intel Corporation. All rights reserved.<BR>
+// Copyright (c) 2013 - 2018, Intel Corporation. All rights reserved.<BR>
//
// This program and the accompanying materials
// are licensed and made available under the terms and conditions of the BSD License
@@ -13,8 +13,8 @@ //
// **/
-#string STR_PROPERTIES_MODULE_NAME
-#language en-US
+#string STR_PROPERTIES_MODULE_NAME
+#language en-US
"IP v4 DXE Driver"
diff --git a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4DxeStrings.uni b/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4DxeStrings.uni index 0546cea..0b68c2f 100644 --- a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4DxeStrings.uni +++ b/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4DxeStrings.uni @@ -1,7 +1,7 @@ // /** @file
// String definitions for Ip4Config2 formset
-// Copyright (c) 2015 - 2017, Intel Corporation. All rights reserved.<BR>
+// Copyright (c) 2015 - 2018, Intel Corporation. All rights reserved.<BR>
// 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
@@ -30,7 +30,7 @@ #string STR_IP4_MASK_HELP #language en-US "Enter NetMask in dotted-decimal notation. Example: 255.255.255.0\r\n"
#string STR_IP4_LOCAL_GATEWAY #language en-US "Local Gateway"
#string STR_IP4_GATEWAY_HELP #language en-US "Enter Gateway in dotted-decimal notation. Example: 192.168.10.1\r\n"
-#string STR_IP4_LOCAL_DNS #language en-US "Local DNS Servers"
+#string STR_IP4_LOCAL_DNS #language en-US "Local DNS Servers"
#string STR_IP4_DNS_HELP #language en-US "Enter DNS Servers in dotted-decimal notation. Example: 192.168.10.8 192.168.10.9\r\n"
#string STR_SAVE_CHANGES #language en-US "Save Changes and Exit"
#string STR_NULL #language en-US ""
diff --git a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Icmp.c b/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Icmp.c index ed6bdbe..511342e 100644 --- a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Icmp.c +++ b/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Icmp.c @@ -1,6 +1,6 @@ /** @file
-Copyright (c) 2005 - 2015, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2005 - 2018, Intel Corporation. All rights reserved.<BR>
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
@@ -72,7 +72,7 @@ mIp4SupportedIcmp[23] = { /**
Process the ICMP redirect. Find the instance then update
its route cache.
-
+
All kinds of redirect is treated as host redirect as
specified by RFC1122 3.3.1.2:
"Since the subnet mask appropriate to the destination
@@ -80,7 +80,7 @@ mIp4SupportedIcmp[23] = { message SHOULD be treated identically to a Host Redirect
message;"
- @param[in] IpSb The IP4 service binding instance that received
+ @param[in] IpSb The IP4 service binding instance that received
the packet.
@param[in] Head The IP head of the received ICMPpacket.
@param[in] Packet The content of the ICMP redirect packet with IP
@@ -166,7 +166,7 @@ Ip4ProcessIcmpRedirect ( @retval EFI_SUCCESS The ICMP error is processed successfully.
@retval EFI_INVALID_PARAMETER The packet is invalid
@retval Others Failed to process the packet.
-
+
**/
EFI_STATUS
Ip4ProcessIcmpError (
diff --git a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Icmp.h b/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Icmp.h index 30199dc..a5183ef 100644 --- a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Icmp.h +++ b/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Icmp.h @@ -1,7 +1,7 @@ /** @file
Header file for ICMP protocol.
-
-Copyright (c) 2005 - 2015, Intel Corporation. All rights reserved.<BR>
+
+Copyright (c) 2005 - 2018, Intel Corporation. All rights reserved.<BR>
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
diff --git a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4If.c b/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4If.c index d29d873..6e0e329 100644 --- a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4If.c +++ b/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4If.c @@ -1,7 +1,7 @@ /** @file
Implement IP4 pesudo interface.
-
-Copyright (c) 2005 - 2017, Intel Corporation. All rights reserved.<BR>
+
+Copyright (c) 2005 - 2018, Intel Corporation. All rights reserved.<BR>
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
@@ -68,7 +68,7 @@ Ip4OnArpResolvedDpc ( @param Event The Arp request event.
@param Context The context of the callback, a point to the ARP
queue.
-
+
**/
VOID
EFIAPI
@@ -139,7 +139,7 @@ Ip4CancelFrameArp ( finished.
@param[in] Context Opaque parameter to the call back.
- @retval Token The wrapped token if succeed
+ @retval Token The wrapped token if succeed
@retval NULL The wrapped token if NULL
**/
@@ -587,10 +587,10 @@ Ip4SetAddress ( Interface->Image,
Interface->Controller
);
-
+
Interface->Arp = NULL;
}
-
+
NetLibDestroyServiceChild (
Interface->Controller,
Interface->Image,
@@ -872,7 +872,7 @@ Ip4OnArpResolvedDpc ( @param Event The Arp request event.
@param Context The context of the callback, a point to the ARP
queue.
-
+
**/
VOID
EFIAPI
diff --git a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4If.h b/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4If.h index 5772863..9098371 100644 --- a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4If.h +++ b/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4If.h @@ -1,7 +1,7 @@ /** @file
Definition for IP4 pesudo interface structure.
-
-Copyright (c) 2005 - 2016, Intel Corporation. All rights reserved.<BR>
+
+Copyright (c) 2005 - 2018, Intel Corporation. All rights reserved.<BR>
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
diff --git a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Igmp.c b/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Igmp.c index e0edc93..ee768bb 100644 --- a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Igmp.c +++ b/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Igmp.c @@ -1,7 +1,7 @@ /** @file
This file implements the RFC2236: IGMP v2.
-
-Copyright (c) 2005 - 2015, Intel Corporation. All rights reserved.<BR>
+
+Copyright (c) 2005 - 2018, Intel Corporation. All rights reserved.<BR>
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
diff --git a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Impl.c b/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Impl.c index 5a9d828..fa84a9b 100644 --- a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Impl.c +++ b/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Impl.c @@ -682,7 +682,7 @@ Ip4ConfigProtocol ( //
if (IpSb->State == IP4_SERVICE_UNSTARTED) {
//
- // Trigger the EFI_IP4_CONFIG2_PROTOCOL to retrieve the
+ // Trigger the EFI_IP4_CONFIG2_PROTOCOL to retrieve the
// default IPv4 address if it is not available yet.
//
Policy = IpSb->Ip4Config2Instance.Policy;
@@ -1048,11 +1048,11 @@ Ip4Groups ( // is decreamented each time an address is removed..
//
for (Index = IpInstance->GroupCount; Index > 0 ; Index--) {
- Group = 0;
+ Group = 0;
if(IpInstance->Groups != NULL) {
- Group = IpInstance->Groups[Index - 1];
- }
-
+ Group = IpInstance->Groups[Index - 1];
+ }
+
if ((GroupAddress == NULL) || EFI_IP4_EQUAL (&Group, GroupAddress)) {
if (EFI_ERROR (Ip4LeaveGroup (IpInstance, NTOHL (Group)))) {
return EFI_DEVICE_ERROR;
@@ -1663,7 +1663,7 @@ EfiIp4Transmit ( }
RawHdrLen = (UINT8) (RawHdrLen << 2);
-
+
CopyMem (&Head, FirstFragment, IP4_MIN_HEADLEN);
Ip4NtohHead (&Head);
@@ -2253,8 +2253,8 @@ Ip4SentPacketTicking ( }
/**
- This heart beat timer of IP4 service instance times out all of its IP4 children's
- received-but-not-delivered and transmitted-but-not-recycle packets, and provides
+ This heart beat timer of IP4 service instance times out all of its IP4 children's
+ received-but-not-delivered and transmitted-but-not-recycle packets, and provides
time input for its IGMP protocol.
@param[in] Event The IP4 service instance's heart beat timer.
@@ -2272,17 +2272,17 @@ Ip4TimerTicking ( IpSb = (IP4_SERVICE *) Context;
NET_CHECK_SIGNATURE (IpSb, IP4_SERVICE_SIGNATURE);
-
+
Ip4PacketTimerTicking (IpSb);
Ip4IgmpTicking (IpSb);
}
/**
- This dedicated timer is used to poll underlying network media status. In case
- of cable swap or wireless network switch, a new round auto configuration will
- be initiated. The timer will signal the IP4 to run DHCP configuration again.
- IP4 driver will free old IP address related resource, such as route table and
- Interface, then initiate a DHCP process to acquire new IP, eventually create
+ This dedicated timer is used to poll underlying network media status. In case
+ of cable swap or wireless network switch, a new round auto configuration will
+ be initiated. The timer will signal the IP4 to run DHCP configuration again.
+ IP4 driver will free old IP address related resource, such as route table and
+ Interface, then initiate a DHCP process to acquire new IP, eventually create
route table for new IP address.
@param[in] Event The IP4 service instance's heart beat timer.
@@ -2303,12 +2303,12 @@ Ip4TimerReconfigChecking ( IpSb = (IP4_SERVICE *) Context;
NET_CHECK_SIGNATURE (IpSb, IP4_SERVICE_SIGNATURE);
-
+
OldMediaPresent = IpSb->MediaPresent;
//
- // Get fresh mode data from MNP, since underlying media status may change.
- // Here, it needs to mention that the MediaPresent can also be checked even if
+ // Get fresh mode data from MNP, since underlying media status may change.
+ // Here, it needs to mention that the MediaPresent can also be checked even if
// EFI_NOT_STARTED returned while this MNP child driver instance isn't configured.
//
Status = IpSb->Mnp->GetModeData (IpSb->Mnp, NULL, &SnpModeData);
@@ -2323,8 +2323,8 @@ Ip4TimerReconfigChecking ( if (!OldMediaPresent && IpSb->MediaPresent && (IpSb->Ip4Config2Instance.Policy == Ip4Config2PolicyDhcp)) {
//
// Signal the IP4 to run the dhcp configuration again. IP4 driver will free
- // old IP address related resource, such as route table and Interface, then
- // initiate a DHCP round to acquire new IP, eventually
+ // old IP address related resource, such as route table and Interface, then
+ // initiate a DHCP round to acquire new IP, eventually
// create route table for new IP address.
//
if (IpSb->ReconfigEvent != NULL) {
diff --git a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Impl.h b/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Impl.h index 8bdc39a..ddca6ce 100644 --- a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Impl.h +++ b/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Impl.h @@ -1,6 +1,6 @@ /** @file
Ip4 internal functions and type defintions.
-
+
Copyright (c) 2005 - 2018, Intel Corporation. All rights reserved.<BR>
(C) Copyright 2015 Hewlett-Packard Development Company, L.P.<BR>
@@ -134,7 +134,7 @@ struct _IP4_PROTOCOL { EFI_HANDLE Handle;
INTN State;
- BOOLEAN InDestroy;
+ BOOLEAN InDestroy;
IP4_SERVICE *Service;
LIST_ENTRY Link; // Link to all the IP protocol from the service
@@ -212,7 +212,7 @@ struct _IP4_SERVICE { BOOLEAN Reconfig;
//
- // Underlying media present status.
+ // Underlying media present status.
//
BOOLEAN MediaPresent;
@@ -334,8 +334,8 @@ Ip4Groups ( );
/**
- This heart beat timer of IP4 service instance times out all of its IP4 children's
- received-but-not-delivered and transmitted-but-not-recycle packets, and provides
+ This heart beat timer of IP4 service instance times out all of its IP4 children's
+ received-but-not-delivered and transmitted-but-not-recycle packets, and provides
time input for its IGMP protocol.
@param[in] Event The IP4 service instance's heart beat timer.
@@ -350,11 +350,11 @@ Ip4TimerTicking ( );
/**
- This dedicated timer is used to poll underlying network media status. In case
- of cable swap or wireless network switch, a new round auto configuration will
- be initiated. The timer will signal the IP4 to run DHCP configuration again.
- IP4 driver will free old IP address related resource, such as route table and
- Interface, then initiate a DHCP process to acquire new IP, eventually create
+ This dedicated timer is used to poll underlying network media status. In case
+ of cable swap or wireless network switch, a new round auto configuration will
+ be initiated. The timer will signal the IP4 to run DHCP configuration again.
+ IP4 driver will free old IP address related resource, such as route table and
+ Interface, then initiate a DHCP process to acquire new IP, eventually create
route table for new IP address.
@param[in] Event The IP4 service instance's heart beat timer.
diff --git a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Input.c b/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Input.c index e694323..f22a3c3 100644 --- a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Input.c +++ b/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Input.c @@ -1,7 +1,7 @@ /** @file
IP4 input process.
-
-Copyright (c) 2005 - 2017, Intel Corporation. All rights reserved.<BR>
+
+Copyright (c) 2005 - 2018, Intel Corporation. All rights reserved.<BR>
(C) Copyright 2015 Hewlett-Packard Development Company, L.P.<BR>
This program and the accompanying materials
@@ -441,8 +441,8 @@ DROP: }
/**
- The callback function for the net buffer which wraps the packet processed by
- IPsec. It releases the wrap packet and also signals IPsec to free the resources.
+ The callback function for the net buffer which wraps the packet processed by
+ IPsec. It releases the wrap packet and also signals IPsec to free the resources.
@param[in] Arg The wrap context
@@ -469,25 +469,25 @@ Ip4IpSecFree ( }
/**
- The work function to locate IPsec protocol to process the inbound or
+ The work function to locate IPsec protocol to process the inbound or
outbound IP packets. The process routine handls the packet with following
- actions: bypass the packet, discard the packet, or protect the packet.
+ actions: bypass the packet, discard the packet, or protect the packet.
@param[in] IpSb The IP4 service instance.
@param[in, out] Head The The caller supplied IP4 header.
@param[in, out] Netbuf The IP4 packet to be processed by IPsec.
@param[in, out] Options The caller supplied options.
@param[in, out] OptionsLen The length of the option.
- @param[in] Direction The directionality in an SPD entry,
+ @param[in] Direction The directionality in an SPD entry,
EfiIPsecInBound or EfiIPsecOutBound.
@param[in] Context The token's wrap.
@retval EFI_SUCCESS The IPsec protocol is not available or disabled.
@retval EFI_SUCCESS The packet was bypassed and all buffers remain the same.
@retval EFI_SUCCESS The packet was protected.
- @retval EFI_ACCESS_DENIED The packet was discarded.
+ @retval EFI_ACCESS_DENIED The packet was discarded.
@retval EFI_OUT_OF_RESOURCES There is no suffcient resource to complete the operation.
- @retval EFI_BUFFER_TOO_SMALL The number of non-empty block is bigger than the
+ @retval EFI_BUFFER_TOO_SMALL The number of non-empty block is bigger than the
number of input data blocks when build a fragment table.
**/
@@ -519,12 +519,12 @@ Ip4IpSecProcessPacket ( goto ON_EXIT;
}
ASSERT (mIpSec != NULL);
-
+
Packet = *Netbuf;
RecycleEvent = NULL;
IpSecWrap = NULL;
FragmentTable = NULL;
- TxWrap = (IP4_TXTOKEN_WRAP *) Context;
+ TxWrap = (IP4_TXTOKEN_WRAP *) Context;
FragmentCount = Packet->BlockOpNum;
ZeroMem (&ZeroHead, sizeof (IP4_HEAD));
@@ -535,14 +535,14 @@ Ip4IpSecProcessPacket ( if (mIpSec->DisabledFlag) {
//
// If IPsec is disabled, restore the original MTU
- //
+ //
IpSb->MaxPacketSize = IpSb->OldMaxPacketSize;
goto ON_EXIT;
} else {
//
- // If IPsec is enabled, use the MTU which reduce the IPsec header length.
+ // If IPsec is enabled, use the MTU which reduce the IPsec header length.
//
- IpSb->MaxPacketSize = IpSb->OldMaxPacketSize - IP4_MAX_IPSEC_HEADLEN;
+ IpSb->MaxPacketSize = IpSb->OldMaxPacketSize - IP4_MAX_IPSEC_HEADLEN;
}
//
@@ -554,9 +554,9 @@ Ip4IpSecProcessPacket ( Status = EFI_OUT_OF_RESOURCES;
goto ON_EXIT;
}
-
+
Status = NetbufBuildExt (Packet, FragmentTable, &FragmentCount);
-
+
//
// Record the original FragmentTable and count.
//
@@ -572,7 +572,7 @@ Ip4IpSecProcessPacket ( // Convert host byte order to network byte order
//
Ip4NtohHead (*Head);
-
+
Status = mIpSec->ProcessExt (
mIpSec,
IpSb->Controller,
@@ -590,7 +590,7 @@ Ip4IpSecProcessPacket ( // Convert back to host byte order
//
Ip4NtohHead (*Head);
-
+
if (EFI_ERROR (Status)) {
FreePool (OriginalFragmentTable);
goto ON_EXIT;
@@ -610,7 +610,7 @@ Ip4IpSecProcessPacket ( }
if (Direction == EfiIPsecOutBound && TxWrap != NULL) {
-
+
TxWrap->IpSecRecycleSignal = RecycleEvent;
TxWrap->Packet = NetbufFromExt (
FragmentTable,
@@ -635,28 +635,28 @@ Ip4IpSecProcessPacket ( //
NetIpSecNetbufFree (*Netbuf);
*Netbuf = TxWrap->Packet;
-
+
} else {
-
+
IpSecWrap = AllocateZeroPool (sizeof (IP4_IPSEC_WRAP));
-
+
if (IpSecWrap == NULL) {
Status = EFI_OUT_OF_RESOURCES;
gBS->SignalEvent (RecycleEvent);
goto ON_EXIT;
}
-
+
IpSecWrap->IpSecRecycleSignal = RecycleEvent;
IpSecWrap->Packet = Packet;
Packet = NetbufFromExt (
- FragmentTable,
- FragmentCount,
- IP4_MAX_HEADLEN,
- 0,
- Ip4IpSecFree,
+ FragmentTable,
+ FragmentCount,
+ IP4_MAX_HEADLEN,
+ 0,
+ Ip4IpSecFree,
IpSecWrap
);
-
+
if (Packet == NULL) {
Packet = IpSecWrap->Packet;
gBS->SignalEvent (RecycleEvent);
@@ -686,7 +686,7 @@ ON_EXIT: /**
Pre-process the IPv4 packet. First validates the IPv4 packet, and
then reassembles packet if it is necessary.
-
+
@param[in] IpSb Pointer to IP4_SERVICE.
@param[in, out] Packet Pointer to the Packet to be processed.
@param[in] Head Pointer to the IP4_HEAD.
@@ -696,7 +696,7 @@ ON_EXIT: as multicast.
@retval EFI_SEUCCESS The recieved packet is in well form.
- @retval EFI_INVAILD_PARAMETER The recieved packet is malformed.
+ @retval EFI_INVAILD_PARAMETER The recieved packet is malformed.
**/
EFI_STATUS
@@ -705,9 +705,9 @@ Ip4PreProcessPacket ( IN OUT NET_BUF **Packet,
IN IP4_HEAD *Head,
IN UINT8 *Option,
- IN UINT32 OptionLen,
+ IN UINT32 OptionLen,
IN UINT32 Flag
- )
+ )
{
IP4_CLIP_INFO *Info;
UINT32 HeadLen;
@@ -720,7 +720,7 @@ Ip4PreProcessPacket ( if ((*Packet)->TotalSize < IP4_MIN_HEADLEN) {
return EFI_INVALID_PARAMETER;
}
-
+
HeadLen = (Head->HeadLen << 2);
TotalLen = NTOHS (Head->TotalLen);
@@ -769,7 +769,7 @@ Ip4PreProcessPacket ( // Validate the options. Don't call the Ip4OptionIsValid if
// there is no option to save some CPU process.
//
-
+
if ((OptionLen > 0) && !Ip4OptionIsValid (Option, OptionLen, TRUE)) {
return EFI_INVALID_PARAMETER;
}
@@ -810,7 +810,7 @@ Ip4PreProcessPacket ( return EFI_INVALID_PARAMETER;
}
}
-
+
return EFI_SUCCESS;
}
@@ -842,7 +842,7 @@ Ip4AccpetFrame ( IP4_HEAD ZeroHead;
UINT8 *Option;
UINT32 OptionLen;
-
+
IpSb = (IP4_SERVICE *) Context;
Option = NULL;
@@ -861,11 +861,11 @@ Ip4AccpetFrame ( // Validate packet format and reassemble packet if it is necessary.
//
Status = Ip4PreProcessPacket (
- IpSb,
- &Packet,
- Head,
+ IpSb,
+ &Packet,
+ Head,
Option,
- OptionLen,
+ OptionLen,
Flag
);
@@ -890,7 +890,7 @@ Ip4AccpetFrame ( if (EFI_ERROR (Status)) {
goto RESTART;
}
-
+
//
// If the packet is protected by tunnel mode, parse the inner Ip Packet.
//
@@ -914,7 +914,7 @@ Ip4AccpetFrame ( goto RESTART;
}
}
-
+
ASSERT (Packet != NULL);
Head = Packet->Ip.Ip4;
IP4_GET_CLIP_INFO (Packet)->Status = EFI_SUCCESS;
@@ -1298,7 +1298,7 @@ Ip4InstanceDeliverPacket ( //
Head = NetbufAllocSpace (Dup, IP4_MAX_HEADLEN, NET_BUF_HEAD);
ASSERT (Head != NULL);
-
+
Dup->Ip.Ip4 = (IP4_HEAD *) Head;
CopyMem (Head, Packet->Ip.Ip4, Packet->Ip.Ip4->HeadLen << 2);
@@ -1345,7 +1345,7 @@ Ip4InstanceDeliverPacket ( @param[in] Head The header of the received packet.
@param[in] Packet The data of the received packet.
@param[in] Option Point to the IP4 packet header options.
- @param[in] OptionLen Length of the IP4 packet header options.
+ @param[in] OptionLen Length of the IP4 packet header options.
@param[in] IpIf The interface to enqueue the packet to.
@return The number of the IP4 children that accepts the packet
diff --git a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Input.h b/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Input.h index 1c8e8b2..b24ca5a 100644 --- a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Input.h +++ b/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Input.h @@ -1,6 +1,6 @@ /** @file
-Copyright (c) 2005 - 2012, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2005 - 2018, Intel Corporation. All rights reserved.<BR>
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
@@ -17,7 +17,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. #define IP4_MIN_HEADLEN 20
#define IP4_MAX_HEADLEN 60
///
-/// 8(ESP header) + 16(max IV) + 16(max padding) + 2(ESP tail) + 12(max ICV) = 54
+/// 8(ESP header) + 16(max IV) + 16(max padding) + 2(ESP tail) + 12(max ICV) = 54
///
#define IP4_MAX_IPSEC_HEADLEN 54
@@ -169,7 +169,7 @@ Ip4Demultiplex ( @param[in] Head The header of the received packet.
@param[in] Packet The data of the received packet.
@param[in] Option Point to the IP4 packet header options.
- @param[in] OptionLen Length of the IP4 packet header options.
+ @param[in] OptionLen Length of the IP4 packet header options.
@param[in] IpIf The interface to enqueue the packet to.
@return The number of the IP4 children that accepts the packet
@@ -216,25 +216,25 @@ Ip4PacketTimerTicking ( );
/**
- The work function to locate IPsec protocol to process the inbound or
+ The work function to locate IPsec protocol to process the inbound or
outbound IP packets. The process routine handls the packet with following
- actions: bypass the packet, discard the packet, or protect the packet.
+ actions: bypass the packet, discard the packet, or protect the packet.
@param[in] IpSb The IP4 service instance.
@param[in, out] Head The The caller supplied IP4 header.
@param[in, out] Netbuf The IP4 packet to be processed by IPsec.
@param[in, out] Options The caller supplied options.
@param[in, out] OptionsLen The length of the option.
- @param[in] Direction The directionality in an SPD entry,
+ @param[in] Direction The directionality in an SPD entry,
EfiIPsecInBound or EfiIPsecOutBound.
@param[in] Context The token's wrap.
@retval EFI_SUCCESS The IPsec protocol is not available or disabled.
@retval EFI_SUCCESS The packet was bypassed and all buffers remain the same.
@retval EFI_SUCCESS The packet was protected.
- @retval EFI_ACCESS_DENIED The packet was discarded.
+ @retval EFI_ACCESS_DENIED The packet was discarded.
@retval EFI_OUT_OF_RESOURCES There is no suffcient resource to complete the operation.
- @retval EFI_BUFFER_TOO_SMALL The number of non-empty block is bigger than the
+ @retval EFI_BUFFER_TOO_SMALL The number of non-empty block is bigger than the
number of input data blocks when build a fragment table.
**/
diff --git a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Option.c b/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Option.c index 6a92573..611887b 100644 --- a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Option.c +++ b/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Option.c @@ -1,7 +1,7 @@ /** @file
IP4 option support functions.
-
-Copyright (c) 2005 - 2011, Intel Corporation. All rights reserved.<BR>
+
+Copyright (c) 2005 - 2018, Intel Corporation. All rights reserved.<BR>
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
@@ -109,7 +109,7 @@ Ip4OptionIsValid ( @param[in] Option The original option to copy from
@param[in] OptionLen The length of the original option
@param[in] FirstFragment Whether it is the first fragment
- @param[in, out] Buf The buffer to copy options to. NULL
+ @param[in, out] Buf The buffer to copy options to. NULL
@param[in, out] BufLen The length of the buffer
@retval EFI_SUCCESS The options are copied over
diff --git a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Option.h b/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Option.h index f9c65d0..e1c2097 100644 --- a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Option.h +++ b/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Option.h @@ -1,7 +1,7 @@ /** @file
IP4 option support routines.
-
-Copyright (c) 2005 - 2009, Intel Corporation. All rights reserved.<BR>
+
+Copyright (c) 2005 - 2018, Intel Corporation. All rights reserved.<BR>
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
@@ -54,7 +54,7 @@ Ip4OptionIsValid ( @param[in] Option The original option to copy from
@param[in] OptionLen The length of the original option
@param[in] FirstFragment Whether it is the first fragment
- @param[in, out] Buf The buffer to copy options to. NULL
+ @param[in, out] Buf The buffer to copy options to. NULL
@param[in, out] BufLen The length of the buffer
@retval EFI_SUCCESS The options are copied over
diff --git a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Output.c b/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Output.c index 68d1f09..1716f43 100644 --- a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Output.c +++ b/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Output.c @@ -1,7 +1,7 @@ /** @file
Transmit the IP4 packet.
-
-Copyright (c) 2005 - 2015, Intel Corporation. All rights reserved.<BR>
+
+Copyright (c) 2005 - 2018, Intel Corporation. All rights reserved.<BR>
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
@@ -269,16 +269,16 @@ Ip4Output ( Head->Ver = 4;
RawData = FALSE;
}
-
+
//
// Call IPsec process.
//
Status = Ip4IpSecProcessPacket (
- IpSb,
- &Head,
- &Packet,
- &Option,
- &OptLen,
+ IpSb,
+ &Head,
+ &Packet,
+ &Option,
+ &OptLen,
EfiIPsecOutBound,
Context
);
@@ -286,7 +286,7 @@ Ip4Output ( if (EFI_ERROR(Status)) {
return Status;
}
-
+
Dest = Head->Dst;
if (IP4_IS_BROADCAST (Ip4GetNetCast (Dest, IpIf)) || (Dest == IP4_ALLONE_ADDRESS)) {
//
@@ -333,7 +333,7 @@ Ip4Output ( // OK, selected the source and route, fragment the packet then send
// them. Tag each fragment other than the first one as spawn from it.
//
- Mtu = IpSb->MaxPacketSize + sizeof (IP4_HEAD);
+ Mtu = IpSb->MaxPacketSize + sizeof (IP4_HEAD);
if (Packet->TotalSize + HeadLen > Mtu) {
//
@@ -342,7 +342,7 @@ Ip4Output ( if (RawData) {
return EFI_BAD_BUFFER_SIZE;
}
-
+
//
// Packet is fragmented from the tail to the head, that is, the
// first frame sent is the last fragment of the packet. The first
diff --git a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Route.h b/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Route.h index 778c97d..6269f4c 100644 --- a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Route.h +++ b/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Route.h @@ -1,7 +1,7 @@ /** @file
EFI IP4 route table and route cache table defintions.
-
-Copyright (c) 2005 - 2009, Intel Corporation. All rights reserved.<BR>
+
+Copyright (c) 2005 - 2018, Intel Corporation. All rights reserved.<BR>
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
diff --git a/MdeModulePkg/Universal/Network/MnpDxe/ComponentName.c b/MdeModulePkg/Universal/Network/MnpDxe/ComponentName.c index b6f9608..e92be98 100644 --- a/MdeModulePkg/Universal/Network/MnpDxe/ComponentName.c +++ b/MdeModulePkg/Universal/Network/MnpDxe/ComponentName.c @@ -1,7 +1,7 @@ /** @file
UEFI Component Name(2) protocol implementation for MnpDxe driver.
-Copyright (c) 2005 - 2014, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2005 - 2018, Intel Corporation. All rights reserved.<BR>
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
@@ -107,10 +107,10 @@ MnpComponentNameGetDriverName ( @param Mnp[in] A pointer to the EFI_MANAGED_NETWORK_PROTOCOL.
-
+
@retval EFI_SUCCESS Update the ControllerNameTable of this instance successfully.
@retval EFI_INVALID_PARAMETER The input parameter is invalid.
-
+
**/
EFI_STATUS
UpdateName (
@@ -157,7 +157,7 @@ UpdateName ( //
// Remove the last '-'
//
- OffSet--;
+ OffSet--;
//
// Print the ProtocolType and VLAN ID for this instance.
//
@@ -177,12 +177,12 @@ UpdateName ( } else {
return Status;
}
-
+
if (gMnpControllerNameTable != NULL) {
FreeUnicodeStringTable (gMnpControllerNameTable);
gMnpControllerNameTable = NULL;
}
-
+
Status = AddUnicodeString2 (
"eng",
gMnpComponentName.SupportedLanguages,
@@ -193,7 +193,7 @@ UpdateName ( if (EFI_ERROR (Status)) {
return Status;
}
-
+
return AddUnicodeString2 (
"en",
gMnpComponentName2.SupportedLanguages,
@@ -290,22 +290,22 @@ MnpComponentNameGetControllerName ( if (ChildHandle == NULL) {
return EFI_UNSUPPORTED;
}
-
- //
- // Make sure this driver is currently managing ControllerHandle
- //
+
+ //
+ // Make sure this driver is currently managing ControllerHandle
+ //
Status = EfiTestManagedDevice (
ControllerHandle,
gMnpDriverBinding.DriverBindingHandle,
&gEfiSimpleNetworkProtocolGuid
);
- if (EFI_ERROR (Status)) {
+ if (EFI_ERROR (Status)) {
return Status;
}
-
- //
- // Make sure this driver produced ChildHandle
- //
+
+ //
+ // Make sure this driver produced ChildHandle
+ //
Status = EfiTestChildHandle (
ControllerHandle,
ChildHandle,
@@ -315,9 +315,9 @@ MnpComponentNameGetControllerName ( return Status;
}
- //
- // Retrieve an instance of a produced protocol from ChildHandle
- //
+ //
+ // Retrieve an instance of a produced protocol from ChildHandle
+ //
Status = gBS->OpenProtocol (
ChildHandle,
&gEfiManagedNetworkProtocolGuid,
diff --git a/MdeModulePkg/Universal/Network/MnpDxe/MnpConfig.c b/MdeModulePkg/Universal/Network/MnpDxe/MnpConfig.c index e24cb75..a801eed 100644 --- a/MdeModulePkg/Universal/Network/MnpDxe/MnpConfig.c +++ b/MdeModulePkg/Universal/Network/MnpDxe/MnpConfig.c @@ -1,7 +1,7 @@ /** @file
Implementation of Managed Network Protocol private services.
-Copyright (c) 2005 - 2017, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2005 - 2018, Intel Corporation. All rights reserved.<BR>
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
@@ -255,7 +255,7 @@ MnpAddFreeTxBuf ( /**
Allocate a free TX buffer from MnpDeviceData->FreeTxBufList. If there is none
- in the queue, first try to recycle some from SNP, then try to allocate some and add
+ in the queue, first try to recycle some from SNP, then try to allocate some and add
them into the queue, then fetch the NET_BUF from the updated FreeTxBufList.
@param[in, out] MnpDeviceData Pointer to the MNP_DEVICE_DATA.
@@ -274,7 +274,7 @@ MnpAllocTxBuf ( EFI_STATUS Status;
LIST_ENTRY *Entry;
MNP_TX_BUF_WRAP *TxBufWrap;
-
+
NET_CHECK_SIGNATURE (MnpDeviceData, MNP_DEVICE_DATA_SIGNATURE);
OldTpl = gBS->RaiseTPL (TPL_CALLBACK);
@@ -369,7 +369,7 @@ MnpFreeTxBuf ( );
return;
}
-
+
OldTpl = gBS->RaiseTPL (TPL_CALLBACK);
InsertTailList (&MnpDeviceData->FreeTxBufList, &TxBufWrap->WrapEntry);
TxBufWrap->InUse = FALSE;
@@ -877,7 +877,7 @@ MnpDestroyServiceData ( /**
Callback function which provided by user to remove one node in NetDestroyLinkList process.
-
+
@param[in] Entry The entry to be removed.
@param[in] Context Pointer to the callback context corresponds to the Context in NetDestroyLinkList.
@@ -917,9 +917,9 @@ MnpDestroyServiceChild ( LIST_ENTRY *List;
EFI_STATUS Status;
UINTN ListLength;
-
+
List = &MnpServiceData->ChildrenList;
-
+
Status = NetDestroyLinkList (
List,
MnpDestoryChildEntry,
@@ -1160,7 +1160,7 @@ MnpStopSnp ( {
EFI_STATUS Status;
EFI_SIMPLE_NETWORK_PROTOCOL *Snp;
-
+
Snp = MnpDeviceData->Snp;
ASSERT (Snp != NULL);
diff --git a/MdeModulePkg/Universal/Network/MnpDxe/MnpDriver.c b/MdeModulePkg/Universal/Network/MnpDxe/MnpDriver.c index 5718e4d..3b19ce8 100644 --- a/MdeModulePkg/Universal/Network/MnpDxe/MnpDriver.c +++ b/MdeModulePkg/Universal/Network/MnpDxe/MnpDriver.c @@ -1,7 +1,7 @@ /** @file
Implementation of driver entry point and driver binding protocol.
-Copyright (c) 2005 - 2016, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2005 - 2018, Intel Corporation. All rights reserved.<BR>
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
@@ -28,7 +28,7 @@ EFI_DRIVER_BINDING_PROTOCOL gMnpDriverBinding = { /**
Callback function which provided by user to remove one node in NetDestroyLinkList process.
-
+
@param[in] Entry The entry to be removed.
@param[in] Context Pointer to the callback context corresponds to the Context in NetDestroyLinkList.
@@ -44,14 +44,14 @@ MnpDestroyServiceDataEntry ( )
{
MNP_SERVICE_DATA *MnpServiceData;
-
+
MnpServiceData = MNP_SERVICE_DATA_FROM_LINK (Entry);
return MnpDestroyServiceData (MnpServiceData);
}
/**
Callback function which provided by user to remove one node in NetDestroyLinkList process.
-
+
@param[in] Entry The entry to be removed.
@param[in] Context Pointer to the callback context corresponds to the Context in NetDestroyLinkList.
diff --git a/MdeModulePkg/Universal/Network/MnpDxe/MnpDxe.inf b/MdeModulePkg/Universal/Network/MnpDxe/MnpDxe.inf index 07e62f5..090ab73 100644 --- a/MdeModulePkg/Universal/Network/MnpDxe/MnpDxe.inf +++ b/MdeModulePkg/Universal/Network/MnpDxe/MnpDxe.inf @@ -3,9 +3,9 @@ #
# This module produces EFI Managed Network Protocol upon EFI Simple Network Protocol,
# to provide raw asynchronous network I/O services. It also produces EFI VLAN Protocol
-# to provide manageability interface for VLAN configuration.
+# to provide manageability interface for VLAN configuration.
#
-# Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>
# 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
diff --git a/MdeModulePkg/Universal/Network/MnpDxe/MnpDxe.uni b/MdeModulePkg/Universal/Network/MnpDxe/MnpDxe.uni index 645cc1b..6ca8ac1 100644 --- a/MdeModulePkg/Universal/Network/MnpDxe/MnpDxe.uni +++ b/MdeModulePkg/Universal/Network/MnpDxe/MnpDxe.uni @@ -5,13 +5,13 @@ // to provide raw asynchronous network I/O services. It also produces EFI VLAN Protocol
// to provide manageability interface for VLAN configuration.
//
-// Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.<BR>
+// Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>
//
// 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,
// WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
//
diff --git a/MdeModulePkg/Universal/Network/MnpDxe/MnpDxeExtra.uni b/MdeModulePkg/Universal/Network/MnpDxe/MnpDxeExtra.uni index 4cecf1f..3d6363b 100644 --- a/MdeModulePkg/Universal/Network/MnpDxe/MnpDxeExtra.uni +++ b/MdeModulePkg/Universal/Network/MnpDxe/MnpDxeExtra.uni @@ -1,7 +1,7 @@ // /** @file
// MnpDxe Localized Strings and Content
//
-// Copyright (c) 2013 - 2014, Intel Corporation. All rights reserved.<BR>
+// Copyright (c) 2013 - 2018, Intel Corporation. All rights reserved.<BR>
//
// This program and the accompanying materials
// are licensed and made available under the terms and conditions of the BSD License
@@ -14,7 +14,7 @@ // **/
#string STR_PROPERTIES_MODULE_NAME
-#language en-US
+#language en-US
"MNP DXE Driver"
diff --git a/MdeModulePkg/Universal/Network/MnpDxe/MnpImpl.h b/MdeModulePkg/Universal/Network/MnpDxe/MnpImpl.h index 51391af..4ee54c1 100644 --- a/MdeModulePkg/Universal/Network/MnpDxe/MnpImpl.h +++ b/MdeModulePkg/Universal/Network/MnpDxe/MnpImpl.h @@ -1,7 +1,7 @@ /** @file
Declaration of structures and functions of MnpDxe driver.
-Copyright (c) 2005 - 2016, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2005 - 2018, Intel Corporation. All rights reserved.<BR>
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
@@ -366,7 +366,7 @@ MnpBuildTxPacket ( );
/**
- Synchronously send out the packet.
+ Synchronously send out the packet.
This functon places the packet buffer to SNP driver's tansmit queue. The packet
can be considered successfully sent out once SNP acccetp the packet, while the
@@ -468,7 +468,7 @@ MnpFreeNbuf ( /**
Allocate a free TX buffer from MnpDeviceData->FreeTxBufList. If there is none
- in the queue, first try to recycle some from SNP, then try to allocate some and add
+ in the queue, first try to recycle some from SNP, then try to allocate some and add
them into the queue, then fetch the NET_BUF from the updated FreeTxBufList.
@param[in, out] MnpDeviceData Pointer to the MNP_DEVICE_DATA.
diff --git a/MdeModulePkg/Universal/Network/MnpDxe/MnpIo.c b/MdeModulePkg/Universal/Network/MnpDxe/MnpIo.c index ba0f36e..5c9eaf1 100644 --- a/MdeModulePkg/Universal/Network/MnpDxe/MnpIo.c +++ b/MdeModulePkg/Universal/Network/MnpDxe/MnpIo.c @@ -1,7 +1,7 @@ /** @file
Implementation of Managed Network Protocol I/O functions.
-Copyright (c) 2005 - 2016, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2005 - 2018, Intel Corporation. All rights reserved.<BR>
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
@@ -129,14 +129,14 @@ MnpBuildTxPacket ( UINT16 Index;
MNP_DEVICE_DATA *MnpDeviceData;
UINT8 *TxBuf;
-
+
MnpDeviceData = MnpServiceData->MnpDeviceData;
-
+
TxBuf = MnpAllocTxBuf (MnpDeviceData);
if (TxBuf == NULL) {
return EFI_OUT_OF_RESOURCES;
}
-
+
//
// Reserve space for vlan tag if needed.
//
@@ -145,14 +145,14 @@ MnpBuildTxPacket ( } else {
*PktBuf = TxBuf;
}
-
+
if ((TxData->DestinationAddress == NULL) && (TxData->FragmentCount == 1)) {
CopyMem (
*PktBuf,
TxData->FragmentTable[0].FragmentBuffer,
TxData->FragmentTable[0].FragmentLength
);
-
+
*PktLen = TxData->FragmentTable[0].FragmentLength;
} else {
//
@@ -160,7 +160,7 @@ MnpBuildTxPacket ( // one fragment, copy the data into the packet buffer. Reserve the
// media header space if necessary.
//
- SnpMode = MnpDeviceData->Snp->Mode;
+ SnpMode = MnpDeviceData->Snp->Mode;
DstPos = *PktBuf;
*PktLen = 0;
if (TxData->DestinationAddress != NULL) {
@@ -195,7 +195,7 @@ MnpBuildTxPacket ( /**
- Synchronously send out the packet.
+ Synchronously send out the packet.
This functon places the packet buffer to SNP driver's tansmit queue. The packet
can be considered successfully sent out once SNP acccetp the packet, while the
@@ -245,7 +245,7 @@ MnpSyncSendPacket ( goto SIGNAL_TOKEN;
}
-
+
if (MnpServiceData->VlanId != 0) {
//
// Insert VLAN tag
@@ -282,9 +282,9 @@ MnpSyncSendPacket ( TxData->SourceAddress,
TxData->DestinationAddress,
&ProtocolType
- );
+ );
}
-
+
if (EFI_ERROR (Status)) {
Token->Status = EFI_DEVICE_ERROR;
}
diff --git a/MdeModulePkg/Universal/Network/MnpDxe/MnpVlan.c b/MdeModulePkg/Universal/Network/MnpDxe/MnpVlan.c index 98cbc2e..c81bd07 100644 --- a/MdeModulePkg/Universal/Network/MnpDxe/MnpVlan.c +++ b/MdeModulePkg/Universal/Network/MnpDxe/MnpVlan.c @@ -1,7 +1,7 @@ /** @file
VLAN Config Protocol implementation and VLAN packet process routine.
-Copyright (c) 2009 - 2016, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2009 - 2018, Intel Corporation. All rights reserved.<BR>
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
@@ -237,7 +237,7 @@ MnpInsertVlanTag ( @param[in] Buffer Pointer to the buffer contains the array of VLAN_TCI.
@param[in] NumberOfVlan Pointer to number of VLAN.
@param[out] NewNumberOfVlan Pointer to number of unique VLAN.
-
+
@retval EFI_SUCCESS The VLAN variable is successfully checked.
@retval EFI_OUT_OF_RESOURCES There is not enough resource to set the configuration.
@@ -259,7 +259,7 @@ MnpCheckVlanVariable ( Count = 0;
FoundDuplicateItem = FALSE;
Status = EFI_SUCCESS;
-
+
for (Index = 0; Index < NumberOfVlan; Index++) {
for (Index2 = Index + 1; Index2 < NumberOfVlan; Index2++) {
if (Buffer[Index].Bits.Vid == Buffer[Index2].Bits.Vid) {
@@ -280,7 +280,7 @@ MnpCheckVlanVariable ( if (Count != 0) {
Status = MnpSetVlanVariable (MnpDeviceData, *NewNumberOfVlan, Buffer);
}
-
+
return Status;
}
diff --git a/MdeModulePkg/Universal/Network/Mtftp4Dxe/ComponentName.c b/MdeModulePkg/Universal/Network/Mtftp4Dxe/ComponentName.c index 901c2df..111c54e 100644 --- a/MdeModulePkg/Universal/Network/Mtftp4Dxe/ComponentName.c +++ b/MdeModulePkg/Universal/Network/Mtftp4Dxe/ComponentName.c @@ -1,7 +1,7 @@ /** @file
UEFI Component Name(2) protocol implementation for Mtftp4Dxe driver.
-
-Copyright (c) 2006 - 2012, Intel Corporation. All rights reserved.<BR>
+
+Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>
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
@@ -237,10 +237,10 @@ Mtftp4ComponentNameGetDriverName ( @param Mtftp4[in] A pointer to the EFI_MTFTP4_PROTOCOL.
-
+
@retval EFI_SUCCESS Update the ControllerNameTable of this instance successfully.
@retval EFI_INVALID_PARAMETER The input parameter is invalid.
-
+
**/
EFI_STATUS
UpdateName (
@@ -277,7 +277,7 @@ UpdateName ( FreeUnicodeStringTable (gMtftp4ControllerNameTable);
gMtftp4ControllerNameTable = NULL;
}
-
+
Status = AddUnicodeString2 (
"eng",
gMtftp4ComponentName.SupportedLanguages,
@@ -288,7 +288,7 @@ UpdateName ( if (EFI_ERROR (Status)) {
return Status;
}
-
+
return AddUnicodeString2 (
"en",
gMtftp4ComponentName2.SupportedLanguages,
@@ -385,10 +385,10 @@ Mtftp4ComponentNameGetControllerName ( if (ChildHandle == NULL) {
return EFI_UNSUPPORTED;
}
-
- //
- // Make sure this driver produced ChildHandle
- //
+
+ //
+ // Make sure this driver produced ChildHandle
+ //
Status = EfiTestChildHandle (
ControllerHandle,
ChildHandle,
@@ -398,9 +398,9 @@ Mtftp4ComponentNameGetControllerName ( return Status;
}
- //
+ //
// Retrieve an instance of a produced protocol from ChildHandle
- //
+ //
Status = gBS->OpenProtocol (
ChildHandle,
&gEfiMtftp4ProtocolGuid,
diff --git a/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Driver.c b/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Driver.c index 713cc66..e6f101d 100644 --- a/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Driver.c +++ b/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Driver.c @@ -315,7 +315,7 @@ Mtftp4DriverBindingStart ( if (EFI_ERROR (Status)) {
goto ON_ERROR;
}
-
+
//
// Install the Mtftp4ServiceBinding Protocol onto Controller
//
@@ -341,7 +341,7 @@ ON_ERROR: /**
Callback function which provided by user to remove one node in NetDestroyLinkList process.
-
+
@param[in] Entry The entry to be removed.
@param[in] Context Pointer to the callback context corresponds to the Context in NetDestroyLinkList.
@@ -713,7 +713,7 @@ Mtftp4ServiceBindingDestroyChild ( &gEfiUdp4ProtocolGuid,
gMtftp4DriverBinding.DriverBindingHandle,
ChildHandle
- );
+ );
}
//
diff --git a/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Driver.h b/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Driver.h index 936eab1..cd7675e 100644 --- a/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Driver.h +++ b/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Driver.h @@ -1,7 +1,7 @@ /** @file
Mtftp drivers function header.
-
-Copyright (c) 2006 - 2012, Intel Corporation. All rights reserved.<BR>
+
+Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>
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
@@ -49,8 +49,8 @@ Mtftp4DriverBindingSupported ( );
/**
- Start the MTFTP driver on this controller.
-
+ Start the MTFTP driver on this controller.
+
MTFTP driver will install a MTFTP SERVICE BINDING protocol on the supported
controller, which can be used to create/destroy MTFTP children.
diff --git a/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.inf b/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.inf index 3d7c8c0..ad9e7ab 100644 --- a/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.inf +++ b/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.inf @@ -4,7 +4,7 @@ # This module produces EFI MTFTPv4 Protocol upon EFI UDPv4 Protocol, to provide
# basic services for client-side unicast and/or multicase TFTP operations.
#
-# Copyright (c) 2007 - 2014, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2007 - 2018, Intel Corporation. All rights reserved.<BR>
# 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
@@ -30,7 +30,7 @@ #
# VALID_ARCHITECTURES = IA32 X64 IPF EBC
#
-# DRIVER_BINDING = gMtftp4DriverBinding
+# DRIVER_BINDING = gMtftp4DriverBinding
# COMPONENT_NAME = gMtftp4ComponentName
# COMPONENT_NAME2 = gMtftp4ComponentName2
#
diff --git a/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.uni b/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.uni index 74f7ff7..5d67d22 100644 --- a/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.uni +++ b/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.uni @@ -4,13 +4,13 @@ // This module produces EFI MTFTPv4 Protocol upon EFI UDPv4 Protocol, to provide
// basic services for client-side unicast and/or multicase TFTP operations.
//
-// Copyright (c) 2007 - 2014, Intel Corporation. All rights reserved.<BR>
+// Copyright (c) 2007 - 2018, Intel Corporation. All rights reserved.<BR>
//
// 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,
// WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
//
diff --git a/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4DxeExtra.uni b/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4DxeExtra.uni index 6d69022..fe83f15 100644 --- a/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4DxeExtra.uni +++ b/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4DxeExtra.uni @@ -1,7 +1,7 @@ // /** @file
// Mtftp4Dxe Localized Strings and Content
//
-// Copyright (c) 2013 - 2014, Intel Corporation. All rights reserved.<BR>
+// Copyright (c) 2013 - 2018, Intel Corporation. All rights reserved.<BR>
//
// This program and the accompanying materials
// are licensed and made available under the terms and conditions of the BSD License
@@ -13,8 +13,8 @@ //
// **/
-#string STR_PROPERTIES_MODULE_NAME
-#language en-US
+#string STR_PROPERTIES_MODULE_NAME
+#language en-US
"MTFTP v4 DXE Driver"
diff --git a/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Impl.c b/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Impl.c index 065528c..d5a1a8c 100644 --- a/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Impl.c +++ b/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Impl.c @@ -1,6 +1,6 @@ /** @file
Interface routine for Mtftp4.
-
+
(C) Copyright 2014 Hewlett-Packard Development Company, L.P.<BR>
Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>
This program and the accompanying materials
@@ -96,9 +96,9 @@ Mtftp4CleanOperation ( /**
- Check packet for GetInfo.
-
- GetInfo is implemented with EfiMtftp4ReadFile. It use Mtftp4GetInfoCheckPacket
+ Check packet for GetInfo.
+
+ GetInfo is implemented with EfiMtftp4ReadFile. It use Mtftp4GetInfoCheckPacket
to inspect the first packet from server, then abort the session.
@param This The MTFTP4 protocol instance
@@ -167,10 +167,10 @@ Mtftp4GetInfoCheckPacket ( /**
- Check whether the override data is valid.
-
+ Check whether the override data is valid.
+
It will first validate whether the server is a valid unicast. If a gateway
- is provided in the Override, it also check that it is a unicast on the
+ is provided in the Override, it also check that it is a unicast on the
connected network.
@param Instance The MTFTP instance
@@ -178,7 +178,7 @@ Mtftp4GetInfoCheckPacket ( @retval TRUE The override data is valid
@retval FALSE The override data is invalid
-
+
**/
BOOLEAN
Mtftp4OverrideValid (
@@ -219,9 +219,9 @@ Mtftp4OverrideValid ( /**
Poll the UDP to get the IP4 default address, which may be retrieved
- by DHCP.
-
- The default time out value is 5 seconds. If IP has retrieved the default address,
+ by DHCP.
+
+ The default time out value is 5 seconds. If IP has retrieved the default address,
the UDP is reconfigured.
@param Instance The Mtftp instance
@@ -396,7 +396,7 @@ Mtftp4Start ( Status = EFI_SUCCESS;
TokenStatus = EFI_SUCCESS;
-
+
OldTpl = gBS->RaiseTPL (TPL_CALLBACK);
if (Instance->State != MTFTP4_STATE_CONFIGED) {
@@ -536,17 +536,17 @@ ON_ERROR: /**
Reads the current operational settings.
- The GetModeData()function reads the current operational settings of this
+ The GetModeData()function reads the current operational settings of this
EFI MTFTPv4 Protocol driver instance.
@param This Pointer to the EFI_MTFTP4_PROTOCOL instance.
@param ModeData Pointer to storage for the EFI MTFTPv4 Protocol
- driver mode data.
+ driver mode data.
@retval EFI_SUCCESS The configuration data was successfully returned.
@retval EFI_OUT_OF_RESOURCES The required mode data could not be allocated.
@retval EFI_INVALID_PARAMETER This is NULL or ModeData is NULL.
-
+
**/
EFI_STATUS
EFIAPI
@@ -579,49 +579,49 @@ EfiMtftp4GetModeData ( /**
- Initializes, changes, or resets the default operational setting for this
+ Initializes, changes, or resets the default operational setting for this
EFI MTFTPv4 Protocol driver instance.
-
- The Configure() function is used to set and change the configuration data for
- this EFI MTFTPv4 Protocol driver instance. The configuration data can be reset
- to startup defaults by calling Configure() with MtftpConfigData set to NULL.
- Whenever the instance is reset, any pending operation is aborted. By changing
- the EFI MTFTPv4 Protocol driver instance configuration data, the client can
- connect to different MTFTPv4 servers. The configuration parameters in
- MtftpConfigData are used as the default parameters in later MTFTPv4 operations
+
+ The Configure() function is used to set and change the configuration data for
+ this EFI MTFTPv4 Protocol driver instance. The configuration data can be reset
+ to startup defaults by calling Configure() with MtftpConfigData set to NULL.
+ Whenever the instance is reset, any pending operation is aborted. By changing
+ the EFI MTFTPv4 Protocol driver instance configuration data, the client can
+ connect to different MTFTPv4 servers. The configuration parameters in
+ MtftpConfigData are used as the default parameters in later MTFTPv4 operations
and can be overridden in later operations.
-
+
@param This Pointer to the EFI_MTFTP4_PROTOCOL instance
- @param ConfigData MtftpConfigDataPointer to the configuration data
+ @param ConfigData MtftpConfigDataPointer to the configuration data
structure
- @retval EFI_SUCCESS The EFI MTFTPv4 Protocol driver was configured
+ @retval EFI_SUCCESS The EFI MTFTPv4 Protocol driver was configured
successfully.
@retval EFI_INVALID_PARAMETER One or more following conditions are TRUE:
1.This is NULL.
- 2.MtftpConfigData.UseDefaultSetting is FALSE and
- MtftpConfigData.StationIp is not a valid IPv4
+ 2.MtftpConfigData.UseDefaultSetting is FALSE and
+ MtftpConfigData.StationIp is not a valid IPv4
unicast address.
- 3.MtftpCofigData.UseDefaultSetting is FALSE and
+ 3.MtftpCofigData.UseDefaultSetting is FALSE and
MtftpConfigData.SubnetMask is invalid.
- 4.MtftpCofigData.ServerIp is not a valid IPv4
+ 4.MtftpCofigData.ServerIp is not a valid IPv4
unicast address.
- 5.MtftpConfigData.UseDefaultSetting is FALSE and
- MtftpConfigData.GatewayIp is not a valid IPv4
- unicast address or is not in the same subnet
+ 5.MtftpConfigData.UseDefaultSetting is FALSE and
+ MtftpConfigData.GatewayIp is not a valid IPv4
+ unicast address or is not in the same subnet
with station address.
- @retval EFI_ACCESS_DENIED The EFI configuration could not be changed at this
- time because there is one MTFTP background operation
+ @retval EFI_ACCESS_DENIED The EFI configuration could not be changed at this
+ time because there is one MTFTP background operation
in progress.
- @retval EFI_NO_MAPPING When using a default address, configuration
+ @retval EFI_NO_MAPPING When using a default address, configuration
(DHCP, BOOTP, RARP, etc.) has not finished yet.
- @retval EFI_UNSUPPORTED A configuration protocol (DHCP, BOOTP, RARP, etc.)
- could not be located when clients choose to use
+ @retval EFI_UNSUPPORTED A configuration protocol (DHCP, BOOTP, RARP, etc.)
+ could not be located when clients choose to use
the default address settings.
- @retval EFI_OUT_OF_RESOURCES The EFI MTFTPv4 Protocol driver instance data could
+ @retval EFI_OUT_OF_RESOURCES The EFI MTFTPv4 Protocol driver instance data could
not be allocated.
- @retval EFI_DEVICE_ERROR An unexpected system or network error occurred.
- The EFI MTFTPv4 Protocol driver instance is not
+ @retval EFI_DEVICE_ERROR An unexpected system or network error occurred.
+ The EFI MTFTPv4 Protocol driver instance is not
configured.
**/
@@ -681,7 +681,7 @@ EfiMtftp4Configure ( return EFI_INVALID_PARAMETER;
}
- if ((Gateway != 0) &&
+ if ((Gateway != 0) &&
(!IP4_NET_EQUAL (Gateway, Ip, Netmask) || (Netmask != 0 && !NetIp4IsUnicast (Gateway, Netmask)))) {
return EFI_INVALID_PARAMETER;
@@ -707,21 +707,21 @@ EfiMtftp4Configure ( /**
Parses the options in an MTFTPv4 OACK packet.
-
- The ParseOptions() function parses the option fields in an MTFTPv4 OACK packet
- and returns the number of options that were found and optionally a list of
+
+ The ParseOptions() function parses the option fields in an MTFTPv4 OACK packet
+ and returns the number of options that were found and optionally a list of
pointers to the options in the packet.
- If one or more of the option fields are not valid, then EFI_PROTOCOL_ERROR is
+ If one or more of the option fields are not valid, then EFI_PROTOCOL_ERROR is
returned and *OptionCount and *OptionList stop at the last valid option.
The OptionList is allocated by this function, and caller should free it when used.
@param This Pointer to the EFI_MTFTP4_PROTOCOL instance.
@param PacketLen Length of the OACK packet to be parsed.
- @param Packet Pointer to the OACK packet to be parsed.
+ @param Packet Pointer to the OACK packet to be parsed.
@param OptionCount Pointer to the number of options in following OptionList.
- @param OptionList Pointer to EFI_MTFTP4_OPTION storage. Call the
+ @param OptionList Pointer to EFI_MTFTP4_OPTION storage. Call the
EFI Boot Service FreePool() to release theOptionList
- if the options in this OptionList are not needed
+ if the options in this OptionList are not needed
any more
@retval EFI_SUCCESS The OACK packet was valid and the OptionCount and
@@ -769,25 +769,25 @@ EfiMtftp4ParseOptions ( /**
Downloads a file from an MTFTPv4 server.
-
- The ReadFile() function is used to initialize and start an MTFTPv4 download
- process and optionally wait for completion. When the download operation completes,
- whether successfully or not, the Token.Status field is updated by the EFI MTFTPv4
+
+ The ReadFile() function is used to initialize and start an MTFTPv4 download
+ process and optionally wait for completion. When the download operation completes,
+ whether successfully or not, the Token.Status field is updated by the EFI MTFTPv4
Protocol driver and then Token.Event is signaled (if it is not NULL).
Data can be downloaded from the MTFTPv4 server into either of the following locations:
1.A fixed buffer that is pointed to by Token.Buffer
2.A download service function that is pointed to by Token.CheckPacket
- If both Token.Buffer and Token.CheckPacket are used, then Token.CheckPacket
- will be called first. If the call is successful, the packet will be stored in
+ If both Token.Buffer and Token.CheckPacket are used, then Token.CheckPacket
+ will be called first. If the call is successful, the packet will be stored in
Token.Buffer.
@param This Pointer to the EFI_MTFTP4_PROTOCOL instance
- @param Token Pointer to the token structure to provide the
+ @param Token Pointer to the token structure to provide the
parameters that are used in this operation.
@retval EFI_SUCCESS The data file has been transferred successfully.
@retval EFI_OUT_OF_RESOURCES Required system resources could not be allocated.
- @retval EFI_BUFFER_TOO_SMALL BufferSize is not large enough to hold the downloaded
+ @retval EFI_BUFFER_TOO_SMALL BufferSize is not large enough to hold the downloaded
data in downloading process.
@retval EFI_ABORTED Current operation is aborted by user.
@retval EFI_ICMP_ERROR An ICMP ERROR packet was received.
@@ -811,24 +811,24 @@ EfiMtftp4ReadFile ( /**
Sends a data file to an MTFTPv4 server. May be unsupported in some EFI implementations
- The WriteFile() function is used to initialize an uploading operation with the
- given option list and optionally wait for completion. If one or more of the
- options is not supported by the server, the unsupported options are ignored and
- a standard TFTP process starts instead. When the upload process completes,
- whether successfully or not, Token.Event is signaled, and the EFI MTFTPv4 Protocol
+ The WriteFile() function is used to initialize an uploading operation with the
+ given option list and optionally wait for completion. If one or more of the
+ options is not supported by the server, the unsupported options are ignored and
+ a standard TFTP process starts instead. When the upload process completes,
+ whether successfully or not, Token.Event is signaled, and the EFI MTFTPv4 Protocol
driver updates Token.Status.
The caller can supply the data to be uploaded in the following two modes:
1.Through the user-provided buffer
2.Through a callback function
With the user-provided buffer, the Token.BufferSize field indicates the length
- of the buffer, and the driver will upload the data in the buffer. With an
- EFI_MTFTP4_PACKET_NEEDED callback function, the driver will call this callback
- function to get more data from the user to upload. See the definition of
- EFI_MTFTP4_PACKET_NEEDED for more information. These two modes cannot be used at
+ of the buffer, and the driver will upload the data in the buffer. With an
+ EFI_MTFTP4_PACKET_NEEDED callback function, the driver will call this callback
+ function to get more data from the user to upload. See the definition of
+ EFI_MTFTP4_PACKET_NEEDED for more information. These two modes cannot be used at
the same time. The callback function will be ignored if the user provides the buffer.
@param This Pointer to the EFI_MTFTP4_PROTOCOL instance.
- @param Token Pointer to the token structure to provide the
+ @param Token Pointer to the token structure to provide the
parameters that are used in this function
@retval EFI_SUCCESS The upload session has started.
@@ -843,15 +843,15 @@ EfiMtftp4ReadFile ( format.
6. Token.Buffer and Token.PacketNeeded are both
NULL.
- 7. One or more IPv4 addresses in Token.OverrideData
- are not valid unicast IPv4 addresses if
+ 7. One or more IPv4 addresses in Token.OverrideData
+ are not valid unicast IPv4 addresses if
Token.OverrideData is not NULL.
@retval EFI_UNSUPPORTED One or more options in the Token.OptionList are in the
unsupported list of structure EFI_MTFTP4_MODE_DATA.
@retval EFI_NOT_STARTED The EFI MTFTPv4 Protocol driver has not been started.
- @retval EFI_NO_MAPPING When using a default address, configuration (DHCP,
+ @retval EFI_NO_MAPPING When using a default address, configuration (DHCP,
BOOTP, RARP, etc.) is not finished yet.
- @retval EFI_ALREADY_STARTED This Token is already being used in another MTFTPv4
+ @retval EFI_ALREADY_STARTED This Token is already being used in another MTFTPv4
session.
@retval EFI_OUT_OF_RESOURCES Required system resources could not be allocated.
@retval EFI_ACCESS_DENIED The previous operation has not completed yet.
@@ -870,35 +870,35 @@ EfiMtftp4WriteFile ( /**
- Downloads a data file "directory" from an MTFTPv4 server.
+ Downloads a data file "directory" from an MTFTPv4 server.
May be unsupported in some EFI implementations
-
- The ReadDirectory() function is used to return a list of files on the MTFTPv4
- server that are logically (or operationally) related to Token.Filename. The
- directory request packet that is sent to the server is built with the option
+
+ The ReadDirectory() function is used to return a list of files on the MTFTPv4
+ server that are logically (or operationally) related to Token.Filename. The
+ directory request packet that is sent to the server is built with the option
list that was provided by caller, if present.
- The file information that the server returns is put into either of the following
+ The file information that the server returns is put into either of the following
locations:
1.A fixed buffer that is pointed to by Token.Buffer
2.A download service function that is pointed to by Token.CheckPacket
- If both Token.Buffer and Token.CheckPacket are used, then Token.CheckPacket will
+ If both Token.Buffer and Token.CheckPacket are used, then Token.CheckPacket will
be called first. If the call is successful, the packet will be stored in Token.Buffer.
- The returned directory listing in the Token.Buffer or EFI_MTFTP4_PACKET consists
- of a list of two or three variable-length ASCII strings, each terminated by a
- null character, for each file in the directory. If the multicast option is involved,
- the first field of each directory entry is the static multicast IP address and
- UDP port number that is associated with the file name. The format of the field
- is ip:ip:ip:ip:port. If the multicast option is not involved, this field and its
+ The returned directory listing in the Token.Buffer or EFI_MTFTP4_PACKET consists
+ of a list of two or three variable-length ASCII strings, each terminated by a
+ null character, for each file in the directory. If the multicast option is involved,
+ the first field of each directory entry is the static multicast IP address and
+ UDP port number that is associated with the file name. The format of the field
+ is ip:ip:ip:ip:port. If the multicast option is not involved, this field and its
terminating null character are not present.
- The next field of each directory entry is the file name and the last field is
- the file information string. The information string contains the file size and
- the create/modify timestamp. The format of the information string is filesize
- yyyy-mm-dd hh:mm:ss:ffff. The timestamp is Coordinated Universal Time
+ The next field of each directory entry is the file name and the last field is
+ the file information string. The information string contains the file size and
+ the create/modify timestamp. The format of the information string is filesize
+ yyyy-mm-dd hh:mm:ss:ffff. The timestamp is Coordinated Universal Time
(UTC; also known as Greenwich Mean Time [GMT]).
The only difference between ReadFile and ReadDirectory is the opcode used.
@param This Pointer to the EFI_MTFTP4_PROTOCOL instance
- @param Token Pointer to the token structure to provide the
+ @param Token Pointer to the token structure to provide the
parameters that are used in this function
@retval EFI_SUCCESS The MTFTPv4 related file "directory" has been downloaded.
@@ -913,15 +913,15 @@ EfiMtftp4WriteFile ( format.
6. Token.Buffer and Token.PacketNeeded are both
NULL.
- 7. One or more IPv4 addresses in Token.OverrideData
- are not valid unicast IPv4 addresses if
+ 7. One or more IPv4 addresses in Token.OverrideData
+ are not valid unicast IPv4 addresses if
Token.OverrideData is not NULL.
@retval EFI_UNSUPPORTED One or more options in the Token.OptionList are in the
unsupported list of structure EFI_MTFTP4_MODE_DATA.
@retval EFI_NOT_STARTED The EFI MTFTPv4 Protocol driver has not been started.
- @retval EFI_NO_MAPPING When using a default address, configuration (DHCP,
+ @retval EFI_NO_MAPPING When using a default address, configuration (DHCP,
BOOTP, RARP, etc.) is not finished yet.
- @retval EFI_ALREADY_STARTED This Token is already being used in another MTFTPv4
+ @retval EFI_ALREADY_STARTED This Token is already being used in another MTFTPv4
session.
@retval EFI_OUT_OF_RESOURCES Required system resources could not be allocated.
@retval EFI_ACCESS_DENIED The previous operation has not completed yet.
@@ -940,31 +940,31 @@ EfiMtftp4ReadDirectory ( /**
- Gets information about a file from an MTFTPv4 server.
-
- The GetInfo() function assembles an MTFTPv4 request packet with options;
- sends it to the MTFTPv4 server; and may return an MTFTPv4 OACK, MTFTPv4 ERROR,
- or ICMP ERROR packet. Retries occur only if no response packets are received
+ Gets information about a file from an MTFTPv4 server.
+
+ The GetInfo() function assembles an MTFTPv4 request packet with options;
+ sends it to the MTFTPv4 server; and may return an MTFTPv4 OACK, MTFTPv4 ERROR,
+ or ICMP ERROR packet. Retries occur only if no response packets are received
from the MTFTPv4 server before the timeout expires.
- It is implemented with EfiMtftp4ReadFile: build a token, then pass it to
+ It is implemented with EfiMtftp4ReadFile: build a token, then pass it to
EfiMtftp4ReadFile. In its check packet callback abort the opertions.
@param This Pointer to the EFI_MTFTP4_PROTOCOL instance
- @param OverrideData Data that is used to override the existing
- parameters. If NULL, the default parameters that
- were set in the EFI_MTFTP4_PROTOCOL.Configure()
+ @param OverrideData Data that is used to override the existing
+ parameters. If NULL, the default parameters that
+ were set in the EFI_MTFTP4_PROTOCOL.Configure()
function are used
@param Filename Pointer to null-terminated ASCII file name string
- @param ModeStr Pointer to null-terminated ASCII mode string. If NULL, "octet"
+ @param ModeStr Pointer to null-terminated ASCII mode string. If NULL, "octet"
will be used
@param OptionCount Number of option/value string pairs in OptionList
- @param OptionList Pointer to array of option/value string pairs.
+ @param OptionList Pointer to array of option/value string pairs.
Ignored if OptionCount is zero
@param PacketLength The number of bytes in the returned packet
- @param Packet PacketThe pointer to the received packet. This
+ @param Packet PacketThe pointer to the received packet. This
buffer must be freed by the caller.
- @retval EFI_SUCCESS An MTFTPv4 OACK packet was received and is in
+ @retval EFI_SUCCESS An MTFTPv4 OACK packet was received and is in
the Buffer.
@retval EFI_INVALID_PARAMETER One or more of the following conditions is TRUE:
1.This is NULL.
@@ -972,21 +972,21 @@ EfiMtftp4ReadDirectory ( 3.OptionCount is not zero and OptionList is NULL.
4.One or more options in OptionList have wrong format.
5.PacketLength is NULL.
- 6.One or more IPv4 addresses in OverrideData are
- not valid unicast IPv4 addresses if OverrideData
+ 6.One or more IPv4 addresses in OverrideData are
+ not valid unicast IPv4 addresses if OverrideData
is not NULL.
@retval EFI_UNSUPPORTED One or more options in the OptionList are in the
unsupported list of structure EFI_MTFTP4_MODE_DATA
@retval EFI_NOT_STARTED The EFI MTFTPv4 Protocol driver has not been started.
- @retval EFI_NO_MAPPING When using a default address, configuration (DHCP,
+ @retval EFI_NO_MAPPING When using a default address, configuration (DHCP,
BOOTP, RARP, etc.) has not finished yet.
@retval EFI_ACCESS_DENIED The previous operation has not completed yet.
@retval EFI_OUT_OF_RESOURCES Required system resources could not be allocated.
- @retval EFI_TFTP_ERROR An MTFTPv4 ERROR packet was received and is in
+ @retval EFI_TFTP_ERROR An MTFTPv4 ERROR packet was received and is in
the Buffer.
- @retval EFI_ICMP_ERROR An ICMP ERROR packet was received and the Packet
+ @retval EFI_ICMP_ERROR An ICMP ERROR packet was received and the Packet
is set to NULL.
- @retval EFI_PROTOCOL_ERROR An unexpected MTFTPv4 packet was received and is
+ @retval EFI_PROTOCOL_ERROR An unexpected MTFTPv4 packet was received and is
in the Buffer.
@retval EFI_TIMEOUT No responses were received from the MTFTPv4 server.
@retval EFI_DEVICE_ERROR An unexpected network error or system error occurred.
@@ -1053,15 +1053,15 @@ EfiMtftp4GetInfo ( /**
Polls for incoming data packets and processes outgoing data packets.
- The Poll() function can be used by network drivers and applications to increase
- the rate that data packets are moved between the communications device and the
+ The Poll() function can be used by network drivers and applications to increase
+ the rate that data packets are moved between the communications device and the
transmit and receive queues.
- In some systems, the periodic timer event in the managed network driver may not
- poll the underlying communications device fast enough to transmit and/or receive
- all data packets without missing incoming packets or dropping outgoing packets.
- Drivers and applications that are experiencing packet loss should try calling
+ In some systems, the periodic timer event in the managed network driver may not
+ poll the underlying communications device fast enough to transmit and/or receive
+ all data packets without missing incoming packets or dropping outgoing packets.
+ Drivers and applications that are experiencing packet loss should try calling
the Poll() function more often.
-
+
@param This Pointer to the EFI_MTFTP4_PROTOCOL instance
@retval EFI_SUCCESS Incoming or outgoing data was processed.
@@ -1070,7 +1070,7 @@ EfiMtftp4GetInfo ( BOOTP, RARP, etc.) is not finished yet.
@retval EFI_INVALID_PARAMETER This is NULL.
@retval EFI_DEVICE_ERROR An unexpected system or network error occurred.
- @retval EFI_TIMEOUT Data was dropped out of the transmit and/or receive
+ @retval EFI_TIMEOUT Data was dropped out of the transmit and/or receive
queue. Consider increasing the polling rate.
**/
diff --git a/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Impl.h b/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Impl.h index 851b595..e24890c 100644 --- a/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Impl.h +++ b/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Impl.h @@ -1,14 +1,14 @@ /** @file
-
+
Mtftp4 Implementation.
-
+
Mtftp4 Implementation, it supports the following RFCs:
RFC1350 - THE TFTP PROTOCOL (REVISION 2)
RFC2090 - TFTP Multicast Option
RFC2347 - TFTP Option Extension
RFC2348 - TFTP Blocksize Option
RFC2349 - TFTP Timeout Interval and Transfer Size Options
-
+
Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>
This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License
@@ -171,8 +171,8 @@ Mtftp4CleanOperation ( /**
Start the MTFTP session for upload.
-
- It will first init some states, then send the WRQ request packet,
+
+ It will first init some states, then send the WRQ request packet,
and start receiving the packet.
@param Instance The MTFTP session
@@ -190,9 +190,9 @@ Mtftp4WrqStart ( );
/**
- Start the MTFTP session to download.
-
- It will first initialize some of the internal states then build and send a RRQ
+ Start the MTFTP session to download.
+
+ It will first initialize some of the internal states then build and send a RRQ
reqeuest packet, at last, it will start receive for the downloading.
@param Instance The Mtftp session
diff --git a/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Option.h b/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Option.h index b7fdbf2..a3fdc4d 100644 --- a/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Option.h +++ b/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Option.h @@ -1,7 +1,7 @@ /** @file
Routines to process MTFTP4 options.
-
-Copyright (c) 2006 - 2009, Intel Corporation. All rights reserved.<BR>
+
+Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>
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
@@ -38,8 +38,8 @@ typedef struct { } MTFTP4_OPTION;
/**
- Allocate and fill in a array of Mtftp options from the Packet.
-
+ Allocate and fill in a array of Mtftp options from the Packet.
+
It first calls Mtftp4FillOption to get the option number, then allocate
the array, at last, call Mtftp4FillOption again to save the options.
diff --git a/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Rrq.c b/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Rrq.c index e983d79..63115ba 100644 --- a/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Rrq.c +++ b/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Rrq.c @@ -1,8 +1,8 @@ /** @file
Routines to process Rrq (download).
-
+
(C) Copyright 2014 Hewlett-Packard Development Company, L.P.<BR>
-Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>
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
@@ -37,9 +37,9 @@ Mtftp4RrqInput ( /**
- Start the MTFTP session to download.
-
- It will first initialize some of the internal states then build and send a RRQ
+ Start the MTFTP session to download.
+
+ It will first initialize some of the internal states then build and send a RRQ
reqeuest packet, at last, it will start receive for the downloading.
@param Instance The Mtftp session
@@ -158,7 +158,7 @@ Mtftp4RrqSaveBlock ( // This is the last block, save the block no
//
if (DataLen < Instance->BlkSize) {
- Completed = TRUE;
+ Completed = TRUE;
Instance->LastBlock = Block;
Mtftp4SetLastBlockNum (&Instance->Blocks, Block);
}
@@ -167,7 +167,7 @@ Mtftp4RrqSaveBlock ( // Remove this block number from the file hole. If Mtftp4RemoveBlockNum
// returns EFI_NOT_FOUND, the block has been saved, don't save it again.
// Note that : For bigger files, allowing the block counter to roll over
- // to accept transfers of unlimited size. So TotalBlock is memorised as
+ // to accept transfers of unlimited size. So TotalBlock is memorised as
// continuous block counter.
//
Status = Mtftp4RemoveBlockNum (&Instance->Blocks, Block, Completed, &TotalBlock);
@@ -228,8 +228,8 @@ Mtftp4RrqSaveBlock ( /**
- Function to process the received data packets.
-
+ Function to process the received data packets.
+
It will save the block then send back an ACK if it is active.
@param Instance The downloading MTFTP session
@@ -318,7 +318,7 @@ Mtftp4RrqHandleData ( /**
Validate whether the options received in the server's OACK packet is valid.
-
+
The options are valid only if:
1. The server doesn't include options not requested by us
2. The server can only use smaller blksize than that is requested
@@ -428,20 +428,20 @@ Mtftp4RrqConfigMcastPort ( return Status;
}
- if (!Config->UseDefaultSetting &&
+ if (!Config->UseDefaultSetting &&
!EFI_IP4_EQUAL (&mZeroIp4Addr, &Config->GatewayIp)) {
//
// The station IP address is manually configured and the Gateway IP is not 0.
// Add the default route for this UDP instance.
//
Status = McastIo->Protocol.Udp4->Routes (
- McastIo->Protocol.Udp4,
+ McastIo->Protocol.Udp4,
FALSE,
&mZeroIp4Addr,
&mZeroIp4Addr,
&Config->GatewayIp
);
-
+
if (EFI_ERROR (Status)) {
McastIo->Protocol.Udp4->Configure (McastIo->Protocol.Udp4, NULL);
return Status;
@@ -459,8 +459,8 @@ Mtftp4RrqConfigMcastPort ( /**
- Function to process the OACK.
-
+ Function to process the OACK.
+
It will first validate the OACK packet, then update the various negotiated parameters.
@param Instance The download MTFTP session
@@ -591,22 +591,22 @@ Mtftp4RrqHandleOack ( return Status;
}
-
+
//
// Update the parameters used.
//
if (Reply.BlkSize != 0) {
Instance->BlkSize = Reply.BlkSize;
}
-
+
if (Reply.Timeout != 0) {
Instance->Timeout = Reply.Timeout;
- }
- }
-
+ }
+ }
+
} else {
Instance->Master = TRUE;
-
+
if (Reply.BlkSize != 0) {
Instance->BlkSize = Reply.BlkSize;
}
@@ -615,7 +615,7 @@ Mtftp4RrqHandleOack ( Instance->Timeout = Reply.Timeout;
}
}
-
+
//
// Send an ACK to (Expected - 1) which is 0 for unicast download,
// or tell the server we want to receive the Expected block.
@@ -762,7 +762,7 @@ Mtftp4RrqInput ( case EFI_MTFTP4_OPCODE_ERROR:
Status = EFI_TFTP_ERROR;
break;
-
+
default:
break;
}
diff --git a/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Support.c b/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Support.c index e4366b6..71c679e 100644 --- a/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Support.c +++ b/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Support.c @@ -1,6 +1,6 @@ /** @file
Support routines for Mtftp.
-
+
Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>
This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License
@@ -48,16 +48,16 @@ Mtftp4AllocateRange ( /**
- Initialize the block range for either RRQ or WRQ.
-
- RRQ and WRQ have different requirements for Start and End.
- For example, during start up, WRQ initializes its whole valid block range
- to [0, 0xffff]. This is bacause the server will send us a ACK0 to inform us
- to start the upload. When the client received ACK0, it will remove 0 from the
+ Initialize the block range for either RRQ or WRQ.
+
+ RRQ and WRQ have different requirements for Start and End.
+ For example, during start up, WRQ initializes its whole valid block range
+ to [0, 0xffff]. This is bacause the server will send us a ACK0 to inform us
+ to start the upload. When the client received ACK0, it will remove 0 from the
range, get the next block number, which is 1, then upload the BLOCK1. For RRQ
- without option negotiation, the server will directly send us the BLOCK1 in
- response to the client's RRQ. When received BLOCK1, the client will remove
- it from the block range and send an ACK. It also works if there is option
+ without option negotiation, the server will directly send us the BLOCK1 in
+ response to the client's RRQ. When received BLOCK1, the client will remove
+ it from the block range and send an ACK. It also works if there is option
negotiation.
@param Head The block range head to initialize
@@ -93,7 +93,7 @@ Mtftp4InitBlockRange ( @param Head The block range head
- @return The first valid block number, -1 if the block range is empty.
+ @return The first valid block number, -1 if the block range is empty.
**/
INTN
@@ -113,10 +113,10 @@ Mtftp4GetNextBlockNum ( /**
- Set the last block number of the block range list.
-
+ Set the last block number of the block range list.
+
It will remove all the blocks after the Last. MTFTP initialize the block range
- to the maximum possible range, such as [0, 0xffff] for WRQ. When it gets the
+ to the maximum possible range, such as [0, 0xffff] for WRQ. When it gets the
last block number, it will call this function to set the last block number.
@param Head The block range list
@@ -159,7 +159,7 @@ Mtftp4SetLastBlockNum ( @param Head The block range list to remove from
@param Num The block number to remove
@param Completed Whether Num is the last block number
- @param TotalBlock The continuous block number in all
+ @param TotalBlock The continuous block number in all
@retval EFI_NOT_FOUND The block number isn't in the block range list
@retval EFI_SUCCESS The block number has been removed from the list
@@ -213,22 +213,22 @@ Mtftp4RemoveBlockNum ( Range->Start++;
//
- // Note that: RFC 1350 does not mention block counter roll-over,
- // but several TFTP hosts implement the roll-over be able to accept
- // transfers of unlimited size. There is no consensus, however, whether
- // the counter should wrap around to zero or to one. Many implementations
- // wrap to zero, because this is the simplest to implement. Here we choose
+ // Note that: RFC 1350 does not mention block counter roll-over,
+ // but several TFTP hosts implement the roll-over be able to accept
+ // transfers of unlimited size. There is no consensus, however, whether
+ // the counter should wrap around to zero or to one. Many implementations
+ // wrap to zero, because this is the simplest to implement. Here we choose
// this solution.
//
- *TotalBlock = Num;
-
+ *TotalBlock = Num;
+
if (Range->Round > 0) {
- *TotalBlock += Range->Bound + MultU64x32 ((UINTN) (Range->Round -1), (UINT32) (Range->Bound + 1)) + 1;
- }
+ *TotalBlock += Range->Bound + MultU64x32 ((UINTN) (Range->Round -1), (UINT32) (Range->Bound + 1)) + 1;
+ }
if (Range->Start > Range->Bound) {
- Range->Start = 0;
- Range->Round ++;
+ Range->Start = 0;
+ Range->Round ++;
}
if ((Range->Start > Range->End) || Completed) {
@@ -321,7 +321,7 @@ Mtftp4SendRequest ( Packet->OpCode = HTONS (Instance->Operation);
BufferLength -= sizeof (Packet->OpCode);
-
+
Cur = Packet->Rrq.Filename;
Status = AsciiStrCpyS ((CHAR8 *) Cur, BufferLength, (CHAR8 *) Token->Filename);
ASSERT_EFI_ERROR (Status);
@@ -335,17 +335,17 @@ Mtftp4SendRequest ( for (Index = 0; Index < Token->OptionCount; ++Index) {
OptionStrLength = AsciiStrLen ((CHAR8 *) Options[Index].OptionStr);
ValueStrLength = AsciiStrLen ((CHAR8 *) Options[Index].ValueStr);
-
+
Status = AsciiStrCpyS ((CHAR8 *) Cur, BufferLength, (CHAR8 *) Options[Index].OptionStr);
ASSERT_EFI_ERROR (Status);
BufferLength -= (UINT32) (OptionStrLength + 1);
Cur += OptionStrLength + 1;
-
+
Status = AsciiStrCpyS ((CHAR8 *) Cur, BufferLength, (CHAR8 *) Options[Index].ValueStr);
ASSERT_EFI_ERROR (Status);
BufferLength -= (UINT32) (ValueStrLength + 1);
Cur += ValueStrLength + 1;
-
+
}
return Mtftp4SendPacket (Instance, Nbuf);
@@ -356,7 +356,7 @@ Mtftp4SendRequest ( Build then send an error message.
@param Instance The MTFTP session
- @param ErrCode The error code
+ @param ErrCode The error code
@param ErrInfo The error message
@retval EFI_OUT_OF_RESOURCES Failed to allocate memory for the error packet
@@ -395,7 +395,7 @@ Mtftp4SendError ( /**
The callback function called when the packet is transmitted.
-
+
It simply frees the packet.
@param Packet The transmitted (or failed to) packet
@@ -437,10 +437,10 @@ Mtftp4SetTimeout ( /**
- Send the packet for the instance.
-
- It will first save a reference to the packet for later retransmission.
- Then determine the destination port, listen port for requests, and connected
+ Send the packet for the instance.
+
+ It will first save a reference to the packet for later retransmission.
+ Then determine the destination port, listen port for requests, and connected
port for others. At last, send the packet out.
@param Instance The Mtftp instance
@@ -484,7 +484,7 @@ Mtftp4SendPacket ( ASSERT (Buffer != NULL);
OpCode = NTOHS (*(UINT16 *)Buffer);
- if ((OpCode == EFI_MTFTP4_OPCODE_RRQ) ||
+ if ((OpCode == EFI_MTFTP4_OPCODE_RRQ) ||
(OpCode == EFI_MTFTP4_OPCODE_DIR) ||
(OpCode == EFI_MTFTP4_OPCODE_WRQ)) {
UdpPoint.RemotePort = Instance->ListeningPort;
@@ -634,7 +634,7 @@ Mtftp4OnTimerTick ( if (!Instance->HasTimeout) {
continue;
}
-
+
Instance->HasTimeout = FALSE;
//
diff --git a/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Support.h b/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Support.h index fd8703a..df18440 100644 --- a/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Support.h +++ b/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Support.h @@ -1,6 +1,6 @@ /** @file
Support routines for MTFTP.
-
+
Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>
This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License
@@ -30,16 +30,16 @@ typedef struct { /**
- Initialize the block range for either RRQ or WRQ.
-
- RRQ and WRQ have different requirements for Start and End.
- For example, during start up, WRQ initializes its whole valid block range
- to [0, 0xffff]. This is bacause the server will send us a ACK0 to inform us
- to start the upload. When the client received ACK0, it will remove 0 from the
+ Initialize the block range for either RRQ or WRQ.
+
+ RRQ and WRQ have different requirements for Start and End.
+ For example, during start up, WRQ initializes its whole valid block range
+ to [0, 0xffff]. This is bacause the server will send us a ACK0 to inform us
+ to start the upload. When the client received ACK0, it will remove 0 from the
range, get the next block number, which is 1, then upload the BLOCK1. For RRQ
- without option negotiation, the server will directly send us the BLOCK1 in
- response to the client's RRQ. When received BLOCK1, the client will remove
- it from the block range and send an ACK. It also works if there is option
+ without option negotiation, the server will directly send us the BLOCK1 in
+ response to the client's RRQ. When received BLOCK1, the client will remove
+ it from the block range and send an ACK. It also works if there is option
negotiation.
@param Head The block range head to initialize
@@ -62,7 +62,7 @@ Mtftp4InitBlockRange ( @param Head The block range head
- @return The first valid block number, -1 if the block range is empty.
+ @return The first valid block number, -1 if the block range is empty.
**/
INTN
@@ -71,10 +71,10 @@ Mtftp4GetNextBlockNum ( );
/**
- Set the last block number of the block range list.
-
+ Set the last block number of the block range list.
+
It will remove all the blocks after the Last. MTFTP initialize the block range
- to the maximum possible range, such as [0, 0xffff] for WRQ. When it gets the
+ to the maximum possible range, such as [0, 0xffff] for WRQ. When it gets the
last block number, it will call this function to set the last block number.
@param Head The block range list
@@ -93,7 +93,7 @@ Mtftp4SetLastBlockNum ( @param Head The block range list to remove from
@param Num The block number to remove
@param Completed Wether Num is the last block number
- @param TotalBlock The continuous block number in all
+ @param TotalBlock The continuous block number in all
@retval EFI_NOT_FOUND The block number isn't in the block range list
@retval EFI_SUCCESS The block number has been removed from the list
@@ -120,10 +120,10 @@ Mtftp4SetTimeout ( );
/**
- Send the packet for the instance.
-
- It will first save a reference to the packet for later retransmission.
- Then determine the destination port, listen port for requests, and connected
+ Send the packet for the instance.
+
+ It will first save a reference to the packet for later retransmission.
+ Then determine the destination port, listen port for requests, and connected
port for others. At last, send the packet out.
@param Instance The Mtftp instance
@@ -158,7 +158,7 @@ Mtftp4SendRequest ( Build then send an error message.
@param Instance The MTFTP session
- @param ErrCode The error code
+ @param ErrCode The error code
@param ErrInfo The error message
@retval EFI_OUT_OF_RESOURCES Failed to allocate memory for the error packet
diff --git a/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Wrq.c b/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Wrq.c index 438659a..cf1d50f 100644 --- a/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Wrq.c +++ b/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Wrq.c @@ -1,6 +1,6 @@ /** @file
Routines to process Wrq (upload).
-
+
Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>
This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License
@@ -124,9 +124,9 @@ Mtftp4WrqSendBlock ( /**
- Function to handle received ACK packet.
-
- If the ACK number matches the expected block number, and there are more
+ Function to handle received ACK packet.
+
+ If the ACK number matches the expected block number, and there are more
data pending, send the next block. Otherwise tell the caller that we are done.
@param Instance The MTFTP upload session
@@ -150,7 +150,7 @@ Mtftp4WrqHandleAck ( UINT16 AckNum;
INTN Expected;
UINT64 TotalBlock;
-
+
*Completed = FALSE;
AckNum = NTOHS (Packet->Ack.Block[0]);
Expected = Mtftp4GetNextBlockNum (&Instance->Blocks);
@@ -175,7 +175,7 @@ Mtftp4WrqHandleAck ( Expected = Mtftp4GetNextBlockNum (&Instance->Blocks);
if (Expected < 0) {
-
+
//
// The block range is empty. It may either because the the last
// block has been ACKed, or the sequence number just looped back,
@@ -202,8 +202,8 @@ Mtftp4WrqHandleAck ( /**
- Check whether the received OACK is valid.
-
+ Check whether the received OACK is valid.
+
The OACK is valid only if:
1. It only include options requested by us
2. It can only include a smaller block size
@@ -244,8 +244,8 @@ Mtftp4WrqOackValid ( /**
- Function to handle the MTFTP OACK packet.
-
+ Function to handle the MTFTP OACK packet.
+
It parses the packet's options, and update the internal states of the session.
@param Instance The MTFTP session
@@ -458,7 +458,7 @@ Mtftp4WrqInput ( case EFI_MTFTP4_OPCODE_ERROR:
Status = EFI_TFTP_ERROR;
break;
-
+
default:
break;
}
@@ -492,8 +492,8 @@ ON_EXIT: /**
Start the MTFTP session for upload.
-
- It will first init some states, then send the WRQ request packet,
+
+ It will first init some states, then send the WRQ request packet,
and start receiving the packet.
@param Instance The MTFTP session
diff --git a/MdeModulePkg/Universal/Network/SnpDxe/ComponentName.c b/MdeModulePkg/Universal/Network/SnpDxe/ComponentName.c index d8b8184..a366574 100644 --- a/MdeModulePkg/Universal/Network/SnpDxe/ComponentName.c +++ b/MdeModulePkg/Universal/Network/SnpDxe/ComponentName.c @@ -1,11 +1,11 @@ /** @file
UEFI Component Name(2) protocol implementation for SnpDxe driver.
-Copyright (c) 2004 - 2014, Intel Corporation. All rights reserved.<BR>
-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
+Copyright (c) 2004 - 2018, Intel Corporation. All rights reserved.<BR>
+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,
WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
@@ -238,10 +238,10 @@ SimpleNetworkComponentNameGetDriverName ( @param Snp[in] A pointer to the EFI_SIMPLE_NETWORK_PROTOCOL.
-
+
@retval EFI_SUCCESS Update the ControllerNameTable of this instance successfully.
@retval EFI_INVALID_PARAMETER The input parameter is invalid.
-
+
**/
EFI_STATUS
UpdateName (
@@ -285,7 +285,7 @@ UpdateName ( FreeUnicodeStringTable (gSimpleNetworkControllerNameTable);
gSimpleNetworkControllerNameTable = NULL;
}
-
+
Status = AddUnicodeString2 (
"eng",
gSimpleNetworkComponentName.SupportedLanguages,
@@ -296,7 +296,7 @@ UpdateName ( if (EFI_ERROR (Status)) {
return Status;
}
-
+
return AddUnicodeString2 (
"en",
gSimpleNetworkComponentName2.SupportedLanguages,
@@ -317,8 +317,8 @@ UpdateName ( and EFI_SUCCESS is returned. If the driver specified by This is not currently
managing the controller specified by ControllerHandle and ChildHandle,
then EFI_UNSUPPORTED is returned. If the driver specified by This does not
- support the language specified by Language, then EFI_UNSUPPORTED is returned.
- Currently not implemented.
+ support the language specified by Language, then EFI_UNSUPPORTED is returned.
+ Currently not implemented.
@param This[in] A pointer to the EFI_COMPONENT_NAME2_PROTOCOL or
EFI_COMPONENT_NAME_PROTOCOL instance.
@@ -387,7 +387,7 @@ SimpleNetworkComponentNameGetControllerName ( {
EFI_STATUS Status;
EFI_SIMPLE_NETWORK_PROTOCOL *Snp;
-
+
if (ChildHandle != NULL) {
return EFI_UNSUPPORTED;
}
@@ -404,9 +404,9 @@ SimpleNetworkComponentNameGetControllerName ( return Status;
}
- //
+ //
// Retrieve an instance of a produced protocol from ControllerHandle
- //
+ //
Status = gBS->OpenProtocol (
ControllerHandle,
&gEfiSimpleNetworkProtocolGuid,
diff --git a/MdeModulePkg/Universal/Network/SnpDxe/Initialize.c b/MdeModulePkg/Universal/Network/SnpDxe/Initialize.c index 63bdf92..a978913 100644 --- a/MdeModulePkg/Universal/Network/SnpDxe/Initialize.c +++ b/MdeModulePkg/Universal/Network/SnpDxe/Initialize.c @@ -1,11 +1,11 @@ /** @file
- Implementation of initializing a network adapter.
+ Implementation of initializing a network adapter.
-Copyright (c) 2004 - 2016, Intel Corporation. All rights reserved.<BR>
-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
+Copyright (c) 2004 - 2018, Intel Corporation. All rights reserved.<BR>
+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,
WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
@@ -19,9 +19,9 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. Call UNDI to initialize the interface.
@param Snp Pointer to snp driver structure.
- @param CableDetectFlag Do/don't detect the cable (depending on what
+ @param CableDetectFlag Do/don't detect the cable (depending on what
undi supports).
-
+
@retval EFI_SUCCESS UNDI is initialized successfully.
@retval EFI_DEVICE_ERROR UNDI could not be initialized.
@retval Other Other errors as indicated.
@@ -103,17 +103,17 @@ PxeInit ( //
// There are two fields need to be checked here:
- // First is the upper two bits (14 & 15) in the CDB.StatFlags field. Until these bits change to report
+ // First is the upper two bits (14 & 15) in the CDB.StatFlags field. Until these bits change to report
// PXE_STATFLAGS_COMMAND_COMPLETE or PXE_STATFLAGS_COMMAND_FAILED, the command has not been executed by the UNDI.
- // Second is the CDB.StatCode field. After command execution completes, either successfully or not,
+ // Second is the CDB.StatCode field. After command execution completes, either successfully or not,
// the CDB.StatCode field contains the result of the command execution.
//
if ((((Snp->Cdb.StatFlags) & PXE_STATFLAGS_STATUS_MASK) == PXE_STATFLAGS_COMMAND_COMPLETE) &&
(Snp->Cdb.StatCode == PXE_STATCODE_SUCCESS)) {
//
- // If cable detect feature is enabled in CDB.OpFlags, check the CDB.StatFlags to see if there is an
- // active connection to this network device. If the no media StatFlag is set, the UNDI and network
- // device are still initialized.
+ // If cable detect feature is enabled in CDB.OpFlags, check the CDB.StatFlags to see if there is an
+ // active connection to this network device. If the no media StatFlag is set, the UNDI and network
+ // device are still initialized.
//
if (CableDetectFlag == PXE_OPFLAGS_INITIALIZE_DETECT_CABLE) {
if(((Snp->Cdb.StatFlags) & PXE_STATFLAGS_INITIALIZED_NO_MEDIA) != PXE_STATFLAGS_INITIALIZED_NO_MEDIA) {
@@ -122,7 +122,7 @@ PxeInit ( Snp->Mode.MediaPresent = FALSE;
}
}
-
+
Snp->Mode.State = EfiSimpleNetworkInitialized;
Status = EFI_SUCCESS;
} else {
@@ -151,8 +151,8 @@ PxeInit ( /**
- Resets a network adapter and allocates the transmit and receive buffers
- required by the network interface; optionally, also requests allocation of
+ Resets a network adapter and allocates the transmit and receive buffers
+ required by the network interface; optionally, also requests allocation of
additional transmit and receive buffers.
This function allocates the transmit and receive buffers required by the network
@@ -164,8 +164,8 @@ PxeInit ( @param ExtraRxBufferSize The size, in bytes, of the extra receive buffer space
that the driver should allocate for the network interface.
- Some network interfaces will not be able to use the
- extra buffer, and the caller will not know if it is
+ Some network interfaces will not be able to use the
+ extra buffer, and the caller will not know if it is
actually being used.
@param ExtraTxBufferSize The size, in bytes, of the extra transmit buffer space
that the driver should allocate for the network interface.
diff --git a/MdeModulePkg/Universal/Network/SnpDxe/Mcast_ip_to_mac.c b/MdeModulePkg/Universal/Network/SnpDxe/Mcast_ip_to_mac.c index 23dba90..8b2ede2 100644 --- a/MdeModulePkg/Universal/Network/SnpDxe/Mcast_ip_to_mac.c +++ b/MdeModulePkg/Universal/Network/SnpDxe/Mcast_ip_to_mac.c @@ -1,12 +1,12 @@ /** @file
- Implementation of converting an multicast IP address to multicast HW MAC
- address.
-
-Copyright (c) 2004 - 2007, Intel Corporation. All rights reserved.<BR>
-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
+ Implementation of converting an multicast IP address to multicast HW MAC
+ address.
+
+Copyright (c) 2004 - 2018, Intel Corporation. All rights reserved.<BR>
+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,
WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
@@ -23,11 +23,11 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. @param IP Multicast IP address.
@param MAC Pointer to hold the return MAC address.
- @retval EFI_SUCCESS The multicast IP address was mapped to the
+ @retval EFI_SUCCESS The multicast IP address was mapped to the
multicast HW MAC address.
- @retval EFI_INVALID_PARAMETER Invalid UNDI command.
- @retval EFI_UNSUPPORTED Command is not supported by UNDI.
- @retval EFI_DEVICE_ERROR Fail to execute UNDI command.
+ @retval EFI_INVALID_PARAMETER Invalid UNDI command.
+ @retval EFI_UNSUPPORTED Command is not supported by UNDI.
+ @retval EFI_DEVICE_ERROR Fail to execute UNDI command.
**/
EFI_STATUS
@@ -103,29 +103,29 @@ PxeIp2Mac ( /**
Converts a multicast IP address to a multicast HW MAC address.
-
- This function converts a multicast IP address to a multicast HW MAC address
+
+ This function converts a multicast IP address to a multicast HW MAC address
for all packet transactions. If the mapping is accepted, then EFI_SUCCESS will
be returned.
@param This A pointer to the EFI_SIMPLE_NETWORK_PROTOCOL instance.
@param IPv6 Set to TRUE if the multicast IP address is IPv6 [RFC 2460].
- Set to FALSE if the multicast IP address is IPv4 [RFC 791].
- @param IP The multicast IP address that is to be converted to a multicast
+ Set to FALSE if the multicast IP address is IPv4 [RFC 791].
+ @param IP The multicast IP address that is to be converted to a multicast
HW MAC address.
@param MAC The multicast HW MAC address that is to be generated from IP.
@retval EFI_SUCCESS The multicast IP address was mapped to the
multicast HW MAC address.
- @retval EFI_NOT_STARTED The Simple Network Protocol interface has not
+ @retval EFI_NOT_STARTED The Simple Network Protocol interface has not
been started by calling Start().
@retval EFI_INVALID_PARAMETER IP is NULL.
@retval EFI_INVALID_PARAMETER MAC is NULL.
- @retval EFI_INVALID_PARAMETER IP does not point to a valid IPv4 or IPv6
+ @retval EFI_INVALID_PARAMETER IP does not point to a valid IPv4 or IPv6
multicast address.
- @retval EFI_DEVICE_ERROR The Simple Network Protocol interface has not
+ @retval EFI_DEVICE_ERROR The Simple Network Protocol interface has not
been initialized by calling Initialize().
- @retval EFI_UNSUPPORTED IPv6 is TRUE and the implementation does not
+ @retval EFI_UNSUPPORTED IPv6 is TRUE and the implementation does not
support IPv6 multicast to MAC address conversion.
**/
diff --git a/MdeModulePkg/Universal/Network/SnpDxe/Nvdata.c b/MdeModulePkg/Universal/Network/SnpDxe/Nvdata.c index 4439790..721b34a 100644 --- a/MdeModulePkg/Universal/Network/SnpDxe/Nvdata.c +++ b/MdeModulePkg/Universal/Network/SnpDxe/Nvdata.c @@ -1,12 +1,12 @@ /** @file
- Implementation of reading and writing operations on the NVRAM device
- attached to a network interface.
-
-Copyright (c) 2004 - 2009, Intel Corporation. All rights reserved.<BR>
-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
+ Implementation of reading and writing operations on the NVRAM device
+ attached to a network interface.
+
+Copyright (c) 2004 - 2018, Intel Corporation. All rights reserved.<BR>
+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,
WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
@@ -97,51 +97,51 @@ PxeNvDataRead ( /**
- Performs read and write operations on the NVRAM device attached to a network
+ Performs read and write operations on the NVRAM device attached to a network
interface.
-
- This function performs read and write operations on the NVRAM device attached
+
+ This function performs read and write operations on the NVRAM device attached
to a network interface. If ReadWrite is TRUE, a read operation is performed.
- If ReadWrite is FALSE, a write operation is performed. Offset specifies the
- byte offset at which to start either operation. Offset must be a multiple of
- NvRamAccessSize , and it must have a value between zero and NvRamSize.
+ If ReadWrite is FALSE, a write operation is performed. Offset specifies the
+ byte offset at which to start either operation. Offset must be a multiple of
+ NvRamAccessSize , and it must have a value between zero and NvRamSize.
BufferSize specifies the length of the read or write operation. BufferSize must
also be a multiple of NvRamAccessSize, and Offset + BufferSize must not exceed
- NvRamSize.
- If any of the above conditions is not met, then EFI_INVALID_PARAMETER will be
- returned.
- If all the conditions are met and the operation is "read," the NVRAM device
- attached to the network interface will be read into Buffer and EFI_SUCCESS
+ NvRamSize.
+ If any of the above conditions is not met, then EFI_INVALID_PARAMETER will be
+ returned.
+ If all the conditions are met and the operation is "read," the NVRAM device
+ attached to the network interface will be read into Buffer and EFI_SUCCESS
will be returned. If this is a write operation, the contents of Buffer will be
- used to update the contents of the NVRAM device attached to the network
+ used to update the contents of the NVRAM device attached to the network
interface and EFI_SUCCESS will be returned.
-
+
It does the basic checking on the input parameters and retrieves snp structure
and then calls the read_nvdata() call which does the actual reading
@param This A pointer to the EFI_SIMPLE_NETWORK_PROTOCOL instance.
@param ReadWrite TRUE for read operations, FALSE for write operations.
- @param Offset Byte offset in the NVRAM device at which to start the read or
- write operation. This must be a multiple of NvRamAccessSize
- and less than NvRamSize. (See EFI_SIMPLE_NETWORK_MODE)
- @param BufferSize The number of bytes to read or write from the NVRAM device.
+ @param Offset Byte offset in the NVRAM device at which to start the read or
+ write operation. This must be a multiple of NvRamAccessSize
+ and less than NvRamSize. (See EFI_SIMPLE_NETWORK_MODE)
+ @param BufferSize The number of bytes to read or write from the NVRAM device.
This must also be a multiple of NvramAccessSize.
@param Buffer A pointer to the data buffer.
@retval EFI_SUCCESS The NVRAM access was performed.
@retval EFI_NOT_STARTED The network interface has not been started.
@retval EFI_INVALID_PARAMETER One or more of the following conditions is TRUE:
- * The This parameter is NULL
- * The This parameter does not point to a valid
+ * The This parameter is NULL
+ * The This parameter does not point to a valid
EFI_SIMPLE_NETWORK_PROTOCOL structure
- * The Offset parameter is not a multiple of
+ * The Offset parameter is not a multiple of
EFI_SIMPLE_NETWORK_MODE.NvRamAccessSize
- * The Offset parameter is not less than
+ * The Offset parameter is not less than
EFI_SIMPLE_NETWORK_MODE.NvRamSize
- * The BufferSize parameter is not a multiple of
+ * The BufferSize parameter is not a multiple of
EFI_SIMPLE_NETWORK_MODE.NvRamAccessSize
* The Buffer parameter is NULL
- @retval EFI_DEVICE_ERROR The command could not be sent to the network
+ @retval EFI_DEVICE_ERROR The command could not be sent to the network
interface.
@retval EFI_UNSUPPORTED This function is not supported by the network
interface.
diff --git a/MdeModulePkg/Universal/Network/SnpDxe/Receive_filters.c b/MdeModulePkg/Universal/Network/SnpDxe/Receive_filters.c index c37018c..3b2c27d 100644 --- a/MdeModulePkg/Universal/Network/SnpDxe/Receive_filters.c +++ b/MdeModulePkg/Universal/Network/SnpDxe/Receive_filters.c @@ -2,11 +2,11 @@ Implementation of managing the multicast receive filters of a network
interface.
-Copyright (c) 2004 - 2016, Intel Corporation. All rights reserved.<BR>
-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
+Copyright (c) 2004 - 2018, Intel Corporation. All rights reserved.<BR>
+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,
WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
@@ -24,8 +24,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. @param EnableFlags Bit mask for enabling the receive filters.
@param MCastAddressCount Multicast address count for a new multicast address
list.
- @param MCastAddressList List of new multicast addresses.
-
+ @param MCastAddressList List of new multicast addresses.
+
@retval EFI_SUCCESS The multicast receive filter list was updated.
@retval EFI_INVALID_PARAMETER Invalid UNDI command.
@retval EFI_UNSUPPORTED Command is not supported by UNDI.
@@ -115,13 +115,13 @@ PxeRecvFilterEnable ( @param Snp Pointer to snp driver structure
@param DisableFlags Bit mask for disabling the receive filters
- @param ResetMCastList Boolean flag to reset/delete the multicast filter
+ @param ResetMCastList Boolean flag to reset/delete the multicast filter
list.
@retval EFI_SUCCESS The multicast receive filter list was updated.
@retval EFI_DEVICE_ERROR Fail to execute UNDI command.
-
-**/
+
+**/
EFI_STATUS
PxeRecvFilterDisable (
SNP_DRIVER *Snp,
@@ -194,8 +194,8 @@ PxeRecvFilterDisable ( @param Snp Pointer to snp driver structure.
@retval EFI_SUCCESS The receive filter was read.
- @retval EFI_DEVICE_ERROR Fail to execute UNDI command.
-
+ @retval EFI_DEVICE_ERROR Fail to execute UNDI command.
+
**/
EFI_STATUS
PxeRecvFilterRead (
@@ -291,70 +291,70 @@ PxeRecvFilterRead ( /**
Manages the multicast receive filters of a network interface.
-
- This function is used enable and disable the hardware and software receive
+
+ This function is used enable and disable the hardware and software receive
filters for the underlying network device.
- The receive filter change is broken down into three steps:
- * The filter mask bits that are set (ON) in the Enable parameter are added to
- the current receive filter settings.
+ The receive filter change is broken down into three steps:
+ * The filter mask bits that are set (ON) in the Enable parameter are added to
+ the current receive filter settings.
* The filter mask bits that are set (ON) in the Disable parameter are subtracted
from the updated receive filter settings.
* If the resulting receive filter setting is not supported by the hardware a
more liberal setting is selected.
- If the same bits are set in the Enable and Disable parameters, then the bits
+ If the same bits are set in the Enable and Disable parameters, then the bits
in the Disable parameter takes precedence.
- If the ResetMCastFilter parameter is TRUE, then the multicast address list
- filter is disabled (irregardless of what other multicast bits are set in the
- Enable and Disable parameters). The SNP->Mode->MCastFilterCount field is set
+ If the ResetMCastFilter parameter is TRUE, then the multicast address list
+ filter is disabled (irregardless of what other multicast bits are set in the
+ Enable and Disable parameters). The SNP->Mode->MCastFilterCount field is set
to zero. The Snp->Mode->MCastFilter contents are undefined.
- After enabling or disabling receive filter settings, software should verify
- the new settings by checking the Snp->Mode->ReceiveFilterSettings,
+ After enabling or disabling receive filter settings, software should verify
+ the new settings by checking the Snp->Mode->ReceiveFilterSettings,
Snp->Mode->MCastFilterCount and Snp->Mode->MCastFilter fields.
- Note: Some network drivers and/or devices will automatically promote receive
+ Note: Some network drivers and/or devices will automatically promote receive
filter settings if the requested setting can not be honored. For example, if
- a request for four multicast addresses is made and the underlying hardware
- only supports two multicast addresses the driver might set the promiscuous
+ a request for four multicast addresses is made and the underlying hardware
+ only supports two multicast addresses the driver might set the promiscuous
or promiscuous multicast receive filters instead. The receiving software is
- responsible for discarding any extra packets that get through the hardware
+ responsible for discarding any extra packets that get through the hardware
receive filters.
- Note: Note: To disable all receive filter hardware, the network driver must
+ Note: Note: To disable all receive filter hardware, the network driver must
be Shutdown() and Stopped(). Calling ReceiveFilters() with Disable set to
- Snp->Mode->ReceiveFilterSettings will make it so no more packets are
- returned by the Receive() function, but the receive hardware may still be
+ Snp->Mode->ReceiveFilterSettings will make it so no more packets are
+ returned by the Receive() function, but the receive hardware may still be
moving packets into system memory before inspecting and discarding them.
- Unexpected system errors, reboots and hangs can occur if an OS is loaded
+ Unexpected system errors, reboots and hangs can occur if an OS is loaded
and the network devices are not Shutdown() and Stopped().
- If ResetMCastFilter is TRUE, then the multicast receive filter list on the
+ If ResetMCastFilter is TRUE, then the multicast receive filter list on the
network interface will be reset to the default multicast receive filter list.
- If ResetMCastFilter is FALSE, and this network interface allows the multicast
- receive filter list to be modified, then the MCastFilterCnt and MCastFilter
- are used to update the current multicast receive filter list. The modified
- receive filter list settings can be found in the MCastFilter field of
+ If ResetMCastFilter is FALSE, and this network interface allows the multicast
+ receive filter list to be modified, then the MCastFilterCnt and MCastFilter
+ are used to update the current multicast receive filter list. The modified
+ receive filter list settings can be found in the MCastFilter field of
EFI_SIMPLE_NETWORK_MODE. If the network interface does not allow the multicast
receive filter list to be modified, then EFI_INVALID_PARAMETER will be returned.
If the driver has not been initialized, EFI_DEVICE_ERROR will be returned.
- If the receive filter mask and multicast receive filter list have been
+ If the receive filter mask and multicast receive filter list have been
successfully updated on the network interface, EFI_SUCCESS will be returned.
@param This A pointer to the EFI_SIMPLE_NETWORK_PROTOCOL instance.
@param Enable A bit mask of receive filters to enable on the network
interface.
@param Disable A bit mask of receive filters to disable on the network
- interface. For backward compatibility with EFI 1.1
+ interface. For backward compatibility with EFI 1.1
platforms, the EFI_SIMPLE_NETWORK_RECEIVE_MULTICAST bit
must be set when the ResetMCastFilter parameter is TRUE.
- @param ResetMCastFilter Set to TRUE to reset the contents of the multicast
- receive filters on the network interface to their
- default values.
+ @param ResetMCastFilter Set to TRUE to reset the contents of the multicast
+ receive filters on the network interface to their
+ default values.
@param MCastFilterCnt Number of multicast HW MAC addresses in the new MCastFilter
- list. This value must be less than or equal to the
- MCastFilterCnt field of EFI_SIMPLE_NETWORK_MODE.
+ list. This value must be less than or equal to the
+ MCastFilterCnt field of EFI_SIMPLE_NETWORK_MODE.
This field is optional if ResetMCastFilter is TRUE.
@param MCastFilter A pointer to a list of new multicast receive filter HW
- MAC addresses. This list will replace any existing
- multicast HW MAC address list. This field is optional
+ MAC addresses. This list will replace any existing
+ multicast HW MAC address list. This field is optional
if ResetMCastFilter is TRUE.
-
+
@retval EFI_SUCCESS The multicast receive filter list was updated.
@retval EFI_NOT_STARTED The network interface has not been started.
@retval EFI_INVALID_PARAMETER One or more of the following conditions is TRUE:
@@ -363,9 +363,9 @@ PxeRecvFilterRead ( in Snp->Mode->ReceiveFilterMask
* There are bits set in Disable that are not set
in Snp->Mode->ReceiveFilterMask
- * Multicast is being enabled (the
- EFI_SIMPLE_NETWORK_RECEIVE_MULTICAST bit is
- set in Enable, it is not set in Disable, and
+ * Multicast is being enabled (the
+ EFI_SIMPLE_NETWORK_RECEIVE_MULTICAST bit is
+ set in Enable, it is not set in Disable, and
ResetMCastFilter is FALSE) and MCastFilterCount
is zero
* Multicast is being enabled and MCastFilterCount
@@ -377,7 +377,7 @@ PxeRecvFilterRead ( @retval EFI_DEVICE_ERROR One or more of the following conditions is TRUE:
* The network interface has been started but has
not been initialized
- * An unexpected error was returned by the
+ * An unexpected error was returned by the
underlying network driver or device
@retval EFI_UNSUPPORTED This function is not supported by the network
interface.
diff --git a/MdeModulePkg/Universal/Network/SnpDxe/Reset.c b/MdeModulePkg/Universal/Network/SnpDxe/Reset.c index 2381264..498d706 100644 --- a/MdeModulePkg/Universal/Network/SnpDxe/Reset.c +++ b/MdeModulePkg/Universal/Network/SnpDxe/Reset.c @@ -1,11 +1,11 @@ /** @file
Implementation of resetting a network adapter.
-
-Copyright (c) 2004 - 2007, Intel Corporation. All rights reserved.<BR>
-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
+
+Copyright (c) 2004 - 2018, Intel Corporation. All rights reserved.<BR>
+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,
WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
@@ -70,16 +70,16 @@ PxeReset ( provided in the previous call to Initialize().
This function resets a network adapter and reinitializes it with the parameters
- that were provided in the previous call to Initialize(). The transmit and
+ that were provided in the previous call to Initialize(). The transmit and
receive queues are emptied and all pending interrupts are cleared.
- Receive filters, the station address, the statistics, and the multicast-IP-to-HW
- MAC addresses are not reset by this call. If the network interface was
- successfully reset, then EFI_SUCCESS will be returned. If the driver has not
+ Receive filters, the station address, the statistics, and the multicast-IP-to-HW
+ MAC addresses are not reset by this call. If the network interface was
+ successfully reset, then EFI_SUCCESS will be returned. If the driver has not
been initialized, EFI_DEVICE_ERROR will be returned.
@param This A pointer to the EFI_SIMPLE_NETWORK_PROTOCOL instance.
- @param ExtendedVerification Indicates that the driver may perform a more
- exhaustive verification operation of the device
+ @param ExtendedVerification Indicates that the driver may perform a more
+ exhaustive verification operation of the device
during reset.
@retval EFI_SUCCESS The network interface was reset.
diff --git a/MdeModulePkg/Universal/Network/SnpDxe/Shutdown.c b/MdeModulePkg/Universal/Network/SnpDxe/Shutdown.c index 1f51992..670e93b 100644 --- a/MdeModulePkg/Universal/Network/SnpDxe/Shutdown.c +++ b/MdeModulePkg/Universal/Network/SnpDxe/Shutdown.c @@ -1,11 +1,11 @@ /** @file
Implementation of shuting down a network adapter.
-
-Copyright (c) 2004 - 2007, Intel Corporation. All rights reserved.<BR>
-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
+
+Copyright (c) 2004 - 2018, Intel Corporation. All rights reserved.<BR>
+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,
WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
@@ -74,12 +74,12 @@ PxeShutdown ( /**
- Resets a network adapter and leaves it in a state that is safe for another
- driver to initialize.
-
+ Resets a network adapter and leaves it in a state that is safe for another
+ driver to initialize.
+
This function releases the memory buffers assigned in the Initialize() call.
Pending transmits and receives are lost, and interrupts are cleared and disabled.
- After this call, only the Initialize() and Stop() calls may be used. If the
+ After this call, only the Initialize() and Stop() calls may be used. If the
network interface was successfully shutdown, then EFI_SUCCESS will be returned.
If the driver has not been initialized, EFI_DEVICE_ERROR will be returned.
@@ -87,7 +87,7 @@ PxeShutdown ( @retval EFI_SUCCESS The network interface was shutdown.
@retval EFI_NOT_STARTED The network interface has not been started.
- @retval EFI_INVALID_PARAMETER This parameter was NULL or did not point to a valid
+ @retval EFI_INVALID_PARAMETER This parameter was NULL or did not point to a valid
EFI_SIMPLE_NETWORK_PROTOCOL structure.
@retval EFI_DEVICE_ERROR The command could not be sent to the network interface.
@@ -128,7 +128,7 @@ SnpUndi32Shutdown ( Status = EFI_DEVICE_ERROR;
goto ON_EXIT;
}
-
+
Status = PxeShutdown (Snp);
Snp->Mode.State = EfiSimpleNetworkStarted;
diff --git a/MdeModulePkg/Universal/Network/SnpDxe/Snp.c b/MdeModulePkg/Universal/Network/SnpDxe/Snp.c index 9f61aee..43cb21b 100644 --- a/MdeModulePkg/Universal/Network/SnpDxe/Snp.c +++ b/MdeModulePkg/Universal/Network/SnpDxe/Snp.c @@ -1,7 +1,7 @@ /** @file
Implementation of driver entry point and driver binding protocol.
-Copyright (c) 2004 - 2016, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2004 - 2018, Intel Corporation. All rights reserved.<BR>
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
@@ -275,7 +275,7 @@ SimpleNetworkDriverStart ( EFI_ACPI_ADDRESS_SPACE_DESCRIPTOR *BarDesc;
BOOLEAN FoundIoBar;
BOOLEAN FoundMemoryBar;
-
+
DEBUG ((EFI_D_NET, "\nSnpNotifyNetworkInterfaceIdentifier() "));
Status = gBS->OpenProtocol (
@@ -411,7 +411,7 @@ SimpleNetworkDriverStart ( }
Snp->MaxRecycledTxBuf = SNP_TX_BUFFER_INCREASEMENT;
Snp->RecycledTxBufCount = 0;
-
+
if (Nii->Revision >= EFI_NETWORK_INTERFACE_IDENTIFIER_PROTOCOL_REVISION) {
Snp->IfNum = Nii->IfNum;
diff --git a/MdeModulePkg/Universal/Network/SnpDxe/SnpDxe.inf b/MdeModulePkg/Universal/Network/SnpDxe/SnpDxe.inf index 90fd8d5..021d45d 100644 --- a/MdeModulePkg/Universal/Network/SnpDxe/SnpDxe.inf +++ b/MdeModulePkg/Universal/Network/SnpDxe/SnpDxe.inf @@ -1,14 +1,14 @@ ## @file
# This module produces EFI SNP Protocol.
#
-# This module produces Simple Network Protocol upon EFI Network Interface
+# This module produces Simple Network Protocol upon EFI Network Interface
# Identifier Protocol, to provide a packet level interface to a network adapter.
#
-# Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.<BR>
-# 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
+# Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>
+# 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,
# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
@@ -30,7 +30,7 @@ #
# VALID_ARCHITECTURES = IA32 X64 IPF EBC
#
-# DRIVER_BINDING = mSimpleNetworkDriverBinding
+# DRIVER_BINDING = mSimpleNetworkDriverBinding
# COMPONENT_NAME = gSimpleNetworkComponentName
# COMPONENT_NAME2 = gSimpleNetworkComponentName2
#
diff --git a/MdeModulePkg/Universal/Network/SnpDxe/SnpDxe.uni b/MdeModulePkg/Universal/Network/SnpDxe/SnpDxe.uni index cd1e9ba..55e8adf 100644 --- a/MdeModulePkg/Universal/Network/SnpDxe/SnpDxe.uni +++ b/MdeModulePkg/Universal/Network/SnpDxe/SnpDxe.uni @@ -4,13 +4,13 @@ // This module produces Simple Network Protocol upon EFI Network Interface
// Identifier Protocol, to provide a packet level interface to a network adapter.
//
-// Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.<BR>
+// Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>
//
// 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,
// WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
//
diff --git a/MdeModulePkg/Universal/Network/SnpDxe/SnpDxeExtra.uni b/MdeModulePkg/Universal/Network/SnpDxe/SnpDxeExtra.uni index 5476a45..7c22065 100644 --- a/MdeModulePkg/Universal/Network/SnpDxe/SnpDxeExtra.uni +++ b/MdeModulePkg/Universal/Network/SnpDxe/SnpDxeExtra.uni @@ -1,7 +1,7 @@ // /** @file
// SnpDxe Localized Strings and Content
//
-// Copyright (c) 2013 - 2014, Intel Corporation. All rights reserved.<BR>
+// Copyright (c) 2013 - 2018, Intel Corporation. All rights reserved.<BR>
//
// This program and the accompanying materials are licensed
// and made available under the terms and conditions of the BSD License which
@@ -13,8 +13,8 @@ //
// **/
-#string STR_PROPERTIES_MODULE_NAME
-#language en-US
+#string STR_PROPERTIES_MODULE_NAME
+#language en-US
"SNP DXE Driver"
diff --git a/MdeModulePkg/Universal/Network/SnpDxe/Start.c b/MdeModulePkg/Universal/Network/SnpDxe/Start.c index 210f081..82d49c8 100644 --- a/MdeModulePkg/Universal/Network/SnpDxe/Start.c +++ b/MdeModulePkg/Universal/Network/SnpDxe/Start.c @@ -1,11 +1,11 @@ /** @file
Implementation of starting a network adapter.
-
-Copyright (c) 2004 - 2007, Intel Corporation. All rights reserved.<BR>
-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
+
+Copyright (c) 2004 - 2018, Intel Corporation. All rights reserved.<BR>
+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,
WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
@@ -22,7 +22,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. @retval EFI_SUCCESS UNDI is started successfully.
@retval EFI_DEVICE_ERROR UNDI could not be started.
-
+
**/
EFI_STATUS
PxeStart (
@@ -100,7 +100,7 @@ PxeStart ( /**
Change the state of a network interface from "stopped" to "started."
-
+
This function starts a network interface. If the network interface successfully
starts, then EFI_SUCCESS will be returned.
@@ -108,7 +108,7 @@ PxeStart ( @retval EFI_SUCCESS The network interface was started.
@retval EFI_ALREADY_STARTED The network interface is already in the started state.
- @retval EFI_INVALID_PARAMETER This parameter was NULL or did not point to a valid
+ @retval EFI_INVALID_PARAMETER This parameter was NULL or did not point to a valid
EFI_SIMPLE_NETWORK_PROTOCOL structure.
@retval EFI_DEVICE_ERROR The command could not be sent to the network interface.
@retval EFI_UNSUPPORTED This function is not supported by the network interface.
diff --git a/MdeModulePkg/Universal/Network/SnpDxe/Station_address.c b/MdeModulePkg/Universal/Network/SnpDxe/Station_address.c index 0917baf..ce70fcd 100644 --- a/MdeModulePkg/Universal/Network/SnpDxe/Station_address.c +++ b/MdeModulePkg/Universal/Network/SnpDxe/Station_address.c @@ -1,11 +1,11 @@ /** @file
Implementation of reading the MAC address of a network adapter.
-
-Copyright (c) 2004 - 2014, Intel Corporation. All rights reserved.<BR>
-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
+
+Copyright (c) 2004 - 2018, Intel Corporation. All rights reserved.<BR>
+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,
WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
@@ -16,11 +16,11 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. /**
- Call UNDI to read the MAC address of the NIC and update the mode structure
- with the address.
+ Call UNDI to read the MAC address of the NIC and update the mode structure
+ with the address.
@param Snp Pointer to snp driver structure.
-
+
@retval EFI_SUCCESS The MAC address of the NIC is read successfully.
@retval EFI_DEVICE_ERROR Failed to read the MAC address of the NIC.
@@ -166,33 +166,33 @@ PxeSetStnAddr ( /**
Modifies or resets the current station address, if supported.
-
- This function modifies or resets the current station address of a network
+
+ This function modifies or resets the current station address of a network
interface, if supported. If Reset is TRUE, then the current station address is
- set to the network interface's permanent address. If Reset is FALSE, and the
- network interface allows its station address to be modified, then the current
- station address is changed to the address specified by New. If the network
- interface does not allow its station address to be modified, then
+ set to the network interface's permanent address. If Reset is FALSE, and the
+ network interface allows its station address to be modified, then the current
+ station address is changed to the address specified by New. If the network
+ interface does not allow its station address to be modified, then
EFI_INVALID_PARAMETER will be returned. If the station address is successfully
updated on the network interface, EFI_SUCCESS will be returned. If the driver
has not been initialized, EFI_DEVICE_ERROR will be returned.
@param This A pointer to the EFI_SIMPLE_NETWORK_PROTOCOL instance.
- @param Reset Flag used to reset the station address to the network interface's
+ @param Reset Flag used to reset the station address to the network interface's
permanent address.
@param New New station address to be used for the network interface.
@retval EFI_SUCCESS The network interface's station address was updated.
- @retval EFI_NOT_STARTED The Simple Network Protocol interface has not been
+ @retval EFI_NOT_STARTED The Simple Network Protocol interface has not been
started by calling Start().
@retval EFI_INVALID_PARAMETER The New station address was not accepted by the NIC.
@retval EFI_INVALID_PARAMETER Reset is FALSE and New is NULL.
- @retval EFI_DEVICE_ERROR The Simple Network Protocol interface has not
+ @retval EFI_DEVICE_ERROR The Simple Network Protocol interface has not
been initialized by calling Initialize().
- @retval EFI_DEVICE_ERROR An error occurred attempting to set the new
+ @retval EFI_DEVICE_ERROR An error occurred attempting to set the new
station address.
- @retval EFI_UNSUPPORTED The NIC does not support changing the network
+ @retval EFI_UNSUPPORTED The NIC does not support changing the network
interface's station address.
**/
diff --git a/MdeModulePkg/Universal/Network/SnpDxe/Stop.c b/MdeModulePkg/Universal/Network/SnpDxe/Stop.c index a52d3b1..46032f3 100644 --- a/MdeModulePkg/Universal/Network/SnpDxe/Stop.c +++ b/MdeModulePkg/Universal/Network/SnpDxe/Stop.c @@ -1,11 +1,11 @@ /** @file
Implementation of stopping a network interface.
-
-Copyright (c) 2004 - 2016, Intel Corporation. All rights reserved.<BR>
-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
+
+Copyright (c) 2004 - 2018, Intel Corporation. All rights reserved.<BR>
+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,
WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
@@ -19,7 +19,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. Call UNDI to stop the interface and changes the snp state.
@param Snp Pointer to snp driver structure
-
+
@retval EFI_SUCCESS The network interface was stopped.
@retval EFI_DEVICE_ERROR SNP is not initialized.
@@ -67,22 +67,22 @@ PxeStop ( /**
Changes the state of a network interface from "started" to "stopped."
-
+
This function stops a network interface. This call is only valid if the network
interface is in the started state. If the network interface was successfully
stopped, then EFI_SUCCESS will be returned.
-
- @param This A pointer to the EFI_SIMPLE_NETWORK_PROTOCOL
+
+ @param This A pointer to the EFI_SIMPLE_NETWORK_PROTOCOL
instance.
-
-
+
+
@retval EFI_SUCCESS The network interface was stopped.
@retval EFI_NOT_STARTED The network interface has not been started.
- @retval EFI_INVALID_PARAMETER This parameter was NULL or did not point to a
+ @retval EFI_INVALID_PARAMETER This parameter was NULL or did not point to a
valid EFI_SIMPLE_NETWORK_PROTOCOL structure.
- @retval EFI_DEVICE_ERROR The command could not be sent to the network
+ @retval EFI_DEVICE_ERROR The command could not be sent to the network
interface.
- @retval EFI_UNSUPPORTED This function is not supported by the network
+ @retval EFI_UNSUPPORTED This function is not supported by the network
interface.
**/
diff --git a/MdeModulePkg/Universal/Network/SnpDxe/Transmit.c b/MdeModulePkg/Universal/Network/SnpDxe/Transmit.c index 2c7083e..aff4e84 100644 --- a/MdeModulePkg/Universal/Network/SnpDxe/Transmit.c +++ b/MdeModulePkg/Universal/Network/SnpDxe/Transmit.c @@ -1,11 +1,11 @@ /** @file
Implementation of transmitting a packet.
-
-Copyright (c) 2004 - 2017, Intel Corporation. All rights reserved.<BR>
-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
+
+Copyright (c) 2004 - 2018, Intel Corporation. All rights reserved.<BR>
+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,
WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
@@ -221,45 +221,45 @@ PxeTransmit ( /**
Places a packet in the transmit queue of a network interface.
-
+
This function places the packet specified by Header and Buffer on the transmit
- queue. If HeaderSize is nonzero and HeaderSize is not equal to
- This->Mode->MediaHeaderSize, then EFI_INVALID_PARAMETER will be returned. If
+ queue. If HeaderSize is nonzero and HeaderSize is not equal to
+ This->Mode->MediaHeaderSize, then EFI_INVALID_PARAMETER will be returned. If
BufferSize is less than This->Mode->MediaHeaderSize, then EFI_BUFFER_TOO_SMALL
- will be returned. If Buffer is NULL, then EFI_INVALID_PARAMETER will be
+ will be returned. If Buffer is NULL, then EFI_INVALID_PARAMETER will be
returned. If HeaderSize is nonzero and DestAddr or Protocol is NULL, then
EFI_INVALID_PARAMETER will be returned. If the transmit engine of the network
- interface is busy, then EFI_NOT_READY will be returned. If this packet can be
- accepted by the transmit engine of the network interface, the packet contents
- specified by Buffer will be placed on the transmit queue of the network
- interface, and EFI_SUCCESS will be returned. GetStatus() can be used to
- determine when the packet has actually been transmitted. The contents of the
- Buffer must not be modified until the packet has actually been transmitted.
+ interface is busy, then EFI_NOT_READY will be returned. If this packet can be
+ accepted by the transmit engine of the network interface, the packet contents
+ specified by Buffer will be placed on the transmit queue of the network
+ interface, and EFI_SUCCESS will be returned. GetStatus() can be used to
+ determine when the packet has actually been transmitted. The contents of the
+ Buffer must not be modified until the packet has actually been transmitted.
The Transmit() function performs nonblocking I/O. A caller who wants to perform
- blocking I/O, should call Transmit(), and then GetStatus() until the
+ blocking I/O, should call Transmit(), and then GetStatus() until the
transmitted buffer shows up in the recycled transmit buffer.
If the driver has not been initialized, EFI_DEVICE_ERROR will be returned.
@param This A pointer to the EFI_SIMPLE_NETWORK_PROTOCOL instance.
- @param HeaderSize The size, in bytes, of the media header to be filled in by the
+ @param HeaderSize The size, in bytes, of the media header to be filled in by the
Transmit() function. If HeaderSize is nonzero, then it must
be equal to This->Mode->MediaHeaderSize and the DestAddr and
Protocol parameters must not be NULL.
@param BufferSize The size, in bytes, of the entire packet (media header and
data) to be transmitted through the network interface.
- @param Buffer A pointer to the packet (media header followed by data) to be
- transmitted. This parameter cannot be NULL. If HeaderSize is
+ @param Buffer A pointer to the packet (media header followed by data) to be
+ transmitted. This parameter cannot be NULL. If HeaderSize is
zero, then the media header in Buffer must already be filled
- in by the caller. If HeaderSize is nonzero, then the media
+ in by the caller. If HeaderSize is nonzero, then the media
header will be filled in by the Transmit() function.
- @param SrcAddr The source HW MAC address. If HeaderSize is zero, then this
- parameter is ignored. If HeaderSize is nonzero and SrcAddr
- is NULL, then This->Mode->CurrentAddress is used for the
+ @param SrcAddr The source HW MAC address. If HeaderSize is zero, then this
+ parameter is ignored. If HeaderSize is nonzero and SrcAddr
+ is NULL, then This->Mode->CurrentAddress is used for the
source HW MAC address.
- @param DestAddr The destination HW MAC address. If HeaderSize is zero, then
+ @param DestAddr The destination HW MAC address. If HeaderSize is zero, then
this parameter is ignored.
- @param Protocol The type of header to build. If HeaderSize is zero, then this
- parameter is ignored. See RFC 1700, section "Ether Types,"
+ @param Protocol The type of header to build. If HeaderSize is zero, then this
+ parameter is ignored. See RFC 1700, section "Ether Types,"
for examples.
@retval EFI_SUCCESS The packet was placed on the transmit queue.
diff --git a/MdeModulePkg/Universal/Network/SnpDxe/WaitForPacket.c b/MdeModulePkg/Universal/Network/SnpDxe/WaitForPacket.c index 23d7455..137f9ed 100644 --- a/MdeModulePkg/Universal/Network/SnpDxe/WaitForPacket.c +++ b/MdeModulePkg/Universal/Network/SnpDxe/WaitForPacket.c @@ -1,11 +1,11 @@ /** @file
Event handler to check for available packet.
-Copyright (c) 2004 - 2008, Intel Corporation. All rights reserved.<BR>
-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
+Copyright (c) 2004 - 2018, Intel Corporation. All rights reserved.<BR>
+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,
WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
diff --git a/MdeModulePkg/Universal/Network/Tcp4Dxe/ComponentName.c b/MdeModulePkg/Universal/Network/Tcp4Dxe/ComponentName.c index bb3a39c..f122769 100644 --- a/MdeModulePkg/Universal/Network/Tcp4Dxe/ComponentName.c +++ b/MdeModulePkg/Universal/Network/Tcp4Dxe/ComponentName.c @@ -1,7 +1,7 @@ /** @file
UEFI Component Name(2) protocol implementation for Tcp4Dxe driver.
-Copyright (c) 2005 - 2015, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2005 - 2018, Intel Corporation. All rights reserved.<BR>
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
@@ -234,10 +234,10 @@ TcpComponentNameGetDriverName ( @param Tcp4[in] A pointer to the EFI_TCP4_PROTOCOL.
-
+
@retval EFI_SUCCESS Update the ControllerNameTable of this instance successfully.
@retval EFI_INVALID_PARAMETER The input parameter is invalid.
-
+
**/
EFI_STATUS
UpdateName (
@@ -279,7 +279,7 @@ UpdateName ( FreeUnicodeStringTable (gTcpControllerNameTable);
gTcpControllerNameTable = NULL;
}
-
+
Status = AddUnicodeString2 (
"eng",
gTcp4ComponentName.SupportedLanguages,
@@ -290,7 +290,7 @@ UpdateName ( if (EFI_ERROR (Status)) {
return Status;
}
-
+
return AddUnicodeString2 (
"en",
gTcp4ComponentName2.SupportedLanguages,
@@ -387,10 +387,10 @@ TcpComponentNameGetControllerName ( if (ChildHandle == NULL) {
return EFI_UNSUPPORTED;
}
-
- //
- // Make sure this driver produced ChildHandle
- //
+
+ //
+ // Make sure this driver produced ChildHandle
+ //
Status = EfiTestChildHandle (
ControllerHandle,
ChildHandle,
@@ -400,9 +400,9 @@ TcpComponentNameGetControllerName ( return Status;
}
- //
+ //
// Retrieve an instance of a produced protocol from ChildHandle
- //
+ //
Status = gBS->OpenProtocol (
ChildHandle,
&gEfiTcp4ProtocolGuid,
diff --git a/MdeModulePkg/Universal/Network/Tcp4Dxe/SockImpl.h b/MdeModulePkg/Universal/Network/Tcp4Dxe/SockImpl.h index bfd750a..bea7479 100644 --- a/MdeModulePkg/Universal/Network/Tcp4Dxe/SockImpl.h +++ b/MdeModulePkg/Universal/Network/Tcp4Dxe/SockImpl.h @@ -1,7 +1,7 @@ /** @file
Socket implementation header file.
-Copyright (c) 2005 - 2017, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2005 - 2018, Intel Corporation. All rights reserved.<BR>
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
@@ -20,10 +20,10 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. /**
Signal a event with the given status.
-
+
@param Token The token's event is to be signaled.
@param TokenStatus The status to be sent with the event.
-
+
**/
#define SIGNAL_TOKEN(Token, TokenStatus) \
do { \
@@ -36,7 +36,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. Supporting function for both SockImpl and SockInterface.
@param Event The Event this notify function registered to, ignored.
-
+
**/
VOID
EFIAPI
diff --git a/MdeModulePkg/Universal/Network/Tcp4Dxe/SockInterface.c b/MdeModulePkg/Universal/Network/Tcp4Dxe/SockInterface.c index bca4b02..6dbabc4 100644 --- a/MdeModulePkg/Universal/Network/Tcp4Dxe/SockInterface.c +++ b/MdeModulePkg/Universal/Network/Tcp4Dxe/SockInterface.c @@ -1,7 +1,7 @@ /** @file
Interface function of the Socket.
-Copyright (c) 2005 - 2017, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2005 - 2018, Intel Corporation. All rights reserved.<BR>
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
@@ -22,7 +22,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. @param List Pointer to the token list to be searched.
@param Event The event to be checked.
- @retval TRUE The specific Event exists in the List.
+ @retval TRUE The specific Event exists in the List.
@retval FALSE The specific Event is not in the List.
**/
@@ -58,7 +58,7 @@ SockTokenExistedInList ( @param Sock Pointer to the instance's socket.
@param Event The event to be checked.
- @retval TRUE The Event exists in related socket's lists.
+ @retval TRUE The Event exists in related socket's lists.
@retval FALSE The Event is not in related socket's lists.
**/
@@ -250,7 +250,7 @@ SockDestroyChild ( data ProtoData.
@param SockInitData Inital data to setting the socket.
-
+
@return Pointer to the newly created socket. If NULL, error condition occured.
**/
diff --git a/MdeModulePkg/Universal/Network/Tcp4Dxe/Socket.h b/MdeModulePkg/Universal/Network/Tcp4Dxe/Socket.h index 9c2e6d0..7ff2fc5 100644 --- a/MdeModulePkg/Universal/Network/Tcp4Dxe/Socket.h +++ b/MdeModulePkg/Universal/Network/Tcp4Dxe/Socket.h @@ -1,7 +1,7 @@ /** @file
Socket header file.
-Copyright (c) 2005 - 2012, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2005 - 2018, Intel Corporation. All rights reserved.<BR>
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
@@ -85,31 +85,31 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. /**
Set socket SO_NO_MORE_DATA flag.
-
+
@param Sock Pointer to the socket
-
+
**/
#define SOCK_NO_MORE_DATA(Sock) ((Sock)->Flag |= SO_NO_MORE_DATA)
/**
Check whether the socket is unconfigured.
-
+
@param Sock Pointer to the socket
-
+
@retval True The socket is unconfigued
@retval False The socket is not unconfigued
-
+
**/
#define SOCK_IS_UNCONFIGURED(Sock) ((Sock)->ConfigureState == SO_UNCONFIGURED)
/**
Check whether the socket is configured.
-
+
@param Sock Pointer to the socket
-
+
@retval True The socket is configued
@retval False The socket is not configued
-
+
**/
#define SOCK_IS_CONFIGURED(Sock) \
(((Sock)->ConfigureState == SO_CONFIGURED_ACTIVE) || \
@@ -117,109 +117,109 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. /**
Check whether the socket is configured to active mode.
-
+
@param Sock Pointer to the socket
-
+
@retval True The socket is configued to active mode
@retval False The socket is not configued to active mode
-
+
**/
#define SOCK_IS_CONFIGURED_ACTIVE(Sock) \
((Sock)->ConfigureState == SO_CONFIGURED_ACTIVE)
/**
Check whether the socket is configured to passive mode.
-
+
@param Sock Pointer to the socket
-
+
@retval True The socket is configued to passive mode
@retval False The socket is not configued to passive mode
-
+
**/
#define SOCK_IS_CONNECTED_PASSIVE(Sock) \
((Sock)->ConfigureState == SO_CONFIGURED_PASSIVE)
/**
Check whether the socket is mapped.
-
+
@param Sock Pointer to the socket
-
+
@retval True The socket is no mapping
@retval False The socket is mapped
-
+
**/
#define SOCK_IS_NO_MAPPING(Sock) \
((Sock)->ConfigureState == SO_NO_MAPPING)
/**
Check whether the socket is closed.
-
+
@param Sock Pointer to the socket
-
+
@retval True The socket is closed
@retval False The socket is not closed
-
+
**/
#define SOCK_IS_CLOSED(Sock) ((Sock)->State == SO_CLOSED)
/**
Check whether the socket is listening.
-
+
@param Sock Pointer to the socket
-
+
@retval True The socket is listening
@retval False The socket is not listening
-
+
**/
#define SOCK_IS_LISTENING(Sock) ((Sock)->State == SO_LISTENING)
/**
Check whether the socket is connecting.
-
+
@param Sock Pointer to the socket
-
+
@retval True The socket is connecting
@retval False The socket is not connecting
-
+
**/
#define SOCK_IS_CONNECTING(Sock) ((Sock)->State == SO_CONNECTING)
/**
Check whether the socket has connected.
-
+
@param Sock Pointer to the socket
-
+
@retval True The socket has connected
@retval False The socket has not connected
-
+
**/
#define SOCK_IS_CONNECTED(Sock) ((Sock)->State == SO_CONNECTED)
/**
Check whether the socket is disconnecting.
-
+
@param Sock Pointer to the socket
-
+
@retval True The socket is disconnecting
@retval False The socket is not disconnecting
-
+
**/
#define SOCK_IS_DISCONNECTING(Sock) ((Sock)->State == SO_DISCONNECTING)
/**
Check whether the socket is no more data.
-
+
@param Sock Pointer to the socket
-
+
@retval True The socket is no more data
@retval False The socket still has data
-
+
**/
#define SOCK_IS_NO_MORE_DATA(Sock) (0 != ((Sock)->Flag & SO_NO_MORE_DATA))
/**
Set the size of the receive buffer.
-
+
@param Sock Pointer to the socket
@param Size The size to set
@@ -228,9 +228,9 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. /**
Get the size of the receive buffer.
-
+
@param Sock Pointer to the socket
-
+
@return The receive buffer size
**/
@@ -238,9 +238,9 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. /**
Get the size of the receive data.
-
+
@param Sock Pointer to the socket
-
+
@return The received data size
**/
@@ -248,7 +248,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. /**
Set the size of the send buffer.
-
+
@param Sock Pointer to the socket
@param Size The size to set
@@ -257,9 +257,9 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. /**
Get the size of the send buffer.
-
+
@param Sock Pointer to the socket
-
+
@return The send buffer size
**/
@@ -267,9 +267,9 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. /**
Get the size of the send data.
-
+
@param Sock Pointer to the socket
-
+
@return The send data size
**/
@@ -277,7 +277,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. /**
Set the backlog value of the socket.
-
+
@param Sock Pointer to the socket
@param Value The value to set
@@ -286,9 +286,9 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. /**
Get the backlog value of the socket.
-
+
@param Sock Pointer to the socket
-
+
@return The backlog value
**/
@@ -296,7 +296,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. /**
Set the socket with error state.
-
+
@param Sock Pointer to the socket
@param Error The error state
@@ -342,7 +342,7 @@ typedef struct _SOCK_IO_TOKEN { } SOCK_IO_TOKEN;
///
-/// The request issued from socket layer to protocol layer.
+/// The request issued from socket layer to protocol layer.
///
#define SOCK_ATTACH 0 ///< Attach current socket to a new PCB
#define SOCK_DETACH 1 ///< Detach current socket from the PCB
@@ -379,15 +379,15 @@ typedef struct _SOCK_BUFFER { /**
The handler of protocol for request from socket.
-
+
@param Socket The socket issuing the request to protocol
@param Request The request issued by socket
@param RequestData The request related data
-
+
@retval EFI_SUCCESS The socket request is completed successfully.
@retval other The error status returned by the corresponding TCP
layer function.
-
+
**/
typedef
EFI_STATUS
@@ -396,8 +396,8 @@ EFI_STATUS IN UINT8 Request,
IN VOID *RequestData
);
-
-
+
+
//
// Socket provided oprerations for low layer protocol
//
@@ -420,15 +420,15 @@ SockSetState ( );
/**
- Called by the low layer protocol to indicate the socket a connection is
- established.
-
- This function just changes the socket's state to SO_CONNECTED
+ Called by the low layer protocol to indicate the socket a connection is
+ established.
+
+ This function just changes the socket's state to SO_CONNECTED
and signals the token used for connection establishment.
@param Sock Pointer to the socket associated with the
established connection.
-
+
**/
VOID
SockConnEstablished (
@@ -437,13 +437,13 @@ SockConnEstablished ( /**
Called by the low layer protocol to indicate the connection is closed.
-
- This function flushes the socket, sets the state to SO_CLOSED and signals
+
+ This function flushes the socket, sets the state to SO_CLOSED and signals
the close token.
@param Sock Pointer to the socket associated with the closed
connection.
-
+
**/
VOID
SockConnClosed (
@@ -452,8 +452,8 @@ SockConnClosed ( /**
Called by low layer protocol to indicate that some data is sent or processed.
-
- This function trims the sent data in the socket send buffer, signals the data
+
+ This function trims the sent data in the socket send buffer, signals the data
token if proper.
@param Sock Pointer to the socket.
@@ -490,7 +490,7 @@ SockGetDataToSend ( /**
Called by the low layer protocol to indicate that there
will be no more data from the communication peer.
-
+
This function set the socket's state to SO_NO_MORE_DATA and
signal all queued IO tokens with the error status EFI_CONNECTION_FIN.
@@ -504,8 +504,8 @@ SockNoMoreData ( /**
Called by the low layer protocol to deliver received data to socket layer.
-
- This function will append the data to the socket receive buffer, set ther
+
+ This function will append the data to the socket receive buffer, set ther
urgent data length and then check if any receive token can be signaled.
@param Sock Pointer to the socket.
@@ -573,9 +573,9 @@ EFI_STATUS IN SOCKET *This,
IN VOID *Context
);
-
+
///
-/// Proto type of the destroy callback
+/// Proto type of the destroy callback
///
typedef
VOID
@@ -618,7 +618,7 @@ typedef struct _SOCK_INIT_DATA { ///
/// The union type of TCP and UDP protocol.
-///
+///
typedef union _NET_PROTOCOL {
EFI_TCP4_PROTOCOL TcpProtocol; ///< Tcp protocol
EFI_UDP4_PROTOCOL UdpProtocol; ///< Udp protocol
@@ -637,7 +637,7 @@ struct _SOCKET { EFI_HANDLE DriverBinding; ///< Socket's driver binding protocol
EFI_DEVICE_PATH_PROTOCOL *ParentDevicePath;
EFI_DEVICE_PATH_PROTOCOL *DevicePath;
- LIST_ENTRY Link;
+ LIST_ENTRY Link;
UINT8 ConfigureState;
SOCK_TYPE Type;
UINT8 State;
@@ -655,7 +655,7 @@ struct _SOCKET { UINT32 ConnCnt; ///< the current count of connections to it
SOCKET *Parent; ///< listening parent that accept the connection
LIST_ENTRY ConnectionList; ///< the connections maintained by this socket
-
+
//
// The queue to buffer application's asynchronous token
//
@@ -714,7 +714,7 @@ typedef struct _TCP_RSV_DATA { data ProtoData.
@param SockInitData Inital data to setting the socket.
-
+
@return Pointer to the newly created socket. If NULL, error condition occured.
**/
@@ -973,7 +973,7 @@ SockBufFirst ( @param SockEntry Pointer to the buffer block prior to the required
one.
- @return Pointer to the buffer block next to SockEntry. NULL if SockEntry is
+ @return Pointer to the buffer block next to SockEntry. NULL if SockEntry is
the tail or head entry.
**/
diff --git a/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dispatcher.c b/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dispatcher.c index 702cae8..a0f97d6 100644 --- a/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dispatcher.c +++ b/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dispatcher.c @@ -2,7 +2,7 @@ Tcp request dispatcher implementation.
(C) Copyright 2014 Hewlett-Packard Development Company, L.P.<BR>
-Copyright (c) 2005 - 2017, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2005 - 2018, Intel Corporation. All rights reserved.<BR>
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
@@ -332,7 +332,7 @@ Tcp4DetachPcb ( ASSERT (Tcb != NULL);
Tcp4FlushPcb (Tcb);
-
+
IpIoRemoveIp (ProtoData->TcpService->IpIo, Tcb->IpInfo);
FreePool (Tcb);
diff --git a/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Driver.c b/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Driver.c index 7d84767..2ff8eee 100644 --- a/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Driver.c +++ b/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Driver.c @@ -1,7 +1,7 @@ /** @file
Tcp driver function.
-Copyright (c) 2005 - 2016, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2005 - 2018, Intel Corporation. All rights reserved.<BR>
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
@@ -116,7 +116,7 @@ Tcp4CreateTimer ( /**
Stop and destroy the heartbeat timer for TCP driver.
-
+
**/
VOID
Tcp4DestroyTimer (
@@ -138,7 +138,7 @@ Tcp4DestroyTimer ( /**
Callback function which provided by user to remove one node in NetDestroyLinkList process.
-
+
@param[in] Entry The entry to be removed.
@param[in] Context Pointer to the callback context corresponds to the Context in NetDestroyLinkList.
@@ -221,32 +221,32 @@ Tcp4DriverEntryPoint ( /**
Tests to see if this driver supports a given controller.
-
- If a child device is provided, it further tests to see if this driver supports
+
+ If a child device is provided, it further tests to see if this driver supports
creating a handle for the specified child device.
@param This A pointer to the EFI_DRIVER_BINDING_PROTOCOL instance.
- @param ControllerHandle The handle of the controller to test. This handle
- must support a protocol interface that supplies
+ @param ControllerHandle The handle of the controller to test. This handle
+ must support a protocol interface that supplies
an I/O abstraction to the driver.
- @param RemainingDevicePath A pointer to the remaining portion of a device path.
+ @param RemainingDevicePath A pointer to the remaining portion of a device path.
This parameter is ignored by device drivers, and is optional for bus drivers.
@retval EFI_SUCCESS The device specified by ControllerHandle and
- RemainingDevicePath is supported by the driver
+ RemainingDevicePath is supported by the driver
specified by This.
@retval EFI_ALREADY_STARTED The device specified by ControllerHandle and
- RemainingDevicePath is already being managed by
+ RemainingDevicePath is already being managed by
the driver specified by This.
@retval EFI_ACCESS_DENIED The device specified by ControllerHandle and
- RemainingDevicePath is already being managed by a
- different driver or an application that requires
+ RemainingDevicePath is already being managed by a
+ different driver or an application that requires
exclusive access.
@retval EFI_UNSUPPORTED The device specified by ControllerHandle and
- RemainingDevicePath is not supported by the driver
+ RemainingDevicePath is not supported by the driver
specified by This.
-
+
**/
EFI_STATUS
EFIAPI
@@ -290,31 +290,31 @@ Tcp4DriverBindingSupported ( /**
- Start this driver on ControllerHandle.
-
- The Start() function is designed to be invoked from the EFI boot service
- ConnectController(). As a result, much of the error checking on the parameters
- to Start() has been moved into this common boot service. It is legal to call
- Start() from other locations, but the following calling restrictions must be
+ Start this driver on ControllerHandle.
+
+ The Start() function is designed to be invoked from the EFI boot service
+ ConnectController(). As a result, much of the error checking on the parameters
+ to Start() has been moved into this common boot service. It is legal to call
+ Start() from other locations, but the following calling restrictions must be
followed or the system behavior will not be deterministic.
1. ControllerHandle must be a valid EFI_HANDLE.
- 2. If RemainingDevicePath is not NULL, then it must be a pointer to a naturally
+ 2. If RemainingDevicePath is not NULL, then it must be a pointer to a naturally
aligned EFI_DEVICE_PATH_PROTOCOL.
- 3. Prior to calling Start(), the Supported() function for the driver specified
- by This must have been called with the same calling parameters, and Supported()
+ 3. Prior to calling Start(), the Supported() function for the driver specified
+ by This must have been called with the same calling parameters, and Supported()
must have returned EFI_SUCCESS.
@param This A pointer to the EFI_DRIVER_BINDING_PROTOCOL instance.
- @param ControllerHandle The handle of the controller to start. This handle
- must support a protocol interface that supplies
+ @param ControllerHandle The handle of the controller to start. This handle
+ must support a protocol interface that supplies
an I/O abstraction to the driver.
- @param RemainingDevicePath A pointer to the remaining portion of a device path.
- This parameter is ignored by device drivers, and is
+ @param RemainingDevicePath A pointer to the remaining portion of a device path.
+ This parameter is ignored by device drivers, and is
optional for bus drivers.
@retval EFI_SUCCESS The device was started.
@retval EFI_ALREADY_STARTED The device could not be started due to a device error.
- @retval EFI_OUT_OF_RESOURCES The request could not be completed due to a lack
+ @retval EFI_OUT_OF_RESOURCES The request could not be completed due to a lack
of resources.
**/
@@ -435,25 +435,25 @@ ON_ERROR: /**
Stop this driver on ControllerHandle.
-
- The Stop() function is designed to be invoked from the EFI boot service
- DisconnectController(). As a result, much of the error checking on the parameters
- to Stop() has been moved into this common boot service. It is legal to call Stop()
- from other locations, but the following calling restrictions must be followed
+
+ The Stop() function is designed to be invoked from the EFI boot service
+ DisconnectController(). As a result, much of the error checking on the parameters
+ to Stop() has been moved into this common boot service. It is legal to call Stop()
+ from other locations, but the following calling restrictions must be followed
or the system behavior will not be deterministic.
- 1. ControllerHandle must be a valid EFI_HANDLE that was used on a previous call
+ 1. ControllerHandle must be a valid EFI_HANDLE that was used on a previous call
to this same driver's Start() function.
2. The first NumberOfChildren handles of ChildHandleBuffer must all be a valid
- EFI_HANDLE. In addition, all of these handles must have been created in this
- driver's Start() function, and the Start() function must have called OpenProtocol()
+ EFI_HANDLE. In addition, all of these handles must have been created in this
+ driver's Start() function, and the Start() function must have called OpenProtocol()
on ControllerHandle with an Attribute of EFI_OPEN_PROTOCOL_BY_CHILD_CONTROLLER.
-
+
@param This A pointer to the EFI_DRIVER_BINDING_PROTOCOL instance.
- @param ControllerHandle A handle to the device being stopped. The handle must
- support a bus specific I/O protocol for the driver
+ @param ControllerHandle A handle to the device being stopped. The handle must
+ support a bus specific I/O protocol for the driver
to use to stop the device.
@param NumberOfChildren The number of child device handles in ChildHandleBuffer.
- @param ChildHandleBuffer An array of child handles to be freed. May be NULL if
+ @param ChildHandleBuffer An array of child handles to be freed. May be NULL if
NumberOfChildren is 0.
@retval EFI_SUCCESS The device was stopped.
@@ -505,7 +505,7 @@ Tcp4DriverBindingStop ( TcpServiceData = TCP4_FROM_THIS (ServiceBinding);
if (NumberOfChildren != 0) {
- List = &TcpServiceData->SocketList;
+ List = &TcpServiceData->SocketList;
Context.ServiceBinding = ServiceBinding;
Context.NumberOfChildren = NumberOfChildren;
Context.ChildHandleBuffer = ChildHandleBuffer;
@@ -541,7 +541,7 @@ Tcp4DriverBindingStop ( FreeUnicodeStringTable (gTcpControllerNameTable);
gTcpControllerNameTable = NULL;
}
-
+
//
// Release the TCP service data
//
@@ -554,15 +554,15 @@ Tcp4DriverBindingStop ( }
/**
- Open Ip4 and device path protocols for a created socket, and insert it in
+ Open Ip4 and device path protocols for a created socket, and insert it in
socket list.
-
+
@param This Pointer to the socket just created
@param Context Context of the socket
-
+
@retval EFI_SUCCESS This protocol is installed successfully.
@retval other Some error occured.
-
+
**/
EFI_STATUS
Tcp4CreateSocketCallback (
@@ -620,11 +620,11 @@ Tcp4CreateSocketCallback ( }
/**
- Close Ip4 and device path protocols for a socket, and remove it from socket list.
-
+ Close Ip4 and device path protocols for a socket, and remove it from socket list.
+
@param This Pointer to the socket to be removed
@param Context Context of the socket
-
+
**/
VOID
Tcp4DestroySocketCallback (
@@ -654,15 +654,15 @@ Tcp4DestroySocketCallback ( /**
Creates a child handle and installs a protocol.
-
- The CreateChild() function installs a protocol on ChildHandle. If ChildHandle
- is a pointer to NULL, then a new handle is created and returned in ChildHandle.
- If ChildHandle is not a pointer to NULL, then the protocol installs on the existing
+
+ The CreateChild() function installs a protocol on ChildHandle. If ChildHandle
+ is a pointer to NULL, then a new handle is created and returned in ChildHandle.
+ If ChildHandle is not a pointer to NULL, then the protocol installs on the existing
ChildHandle.
@param This Pointer to the EFI_SERVICE_BINDING_PROTOCOL instance.
- @param ChildHandle Pointer to the handle of the child to create. If it is NULL, then
- a new handle is created. If it is a pointer to an existing UEFI
+ @param ChildHandle Pointer to the handle of the child to create. If it is NULL, then
+ a new handle is created. If it is a pointer to an existing UEFI
handle, then the protocol is added to the existing UEFI handle.
@retval EFI_SUCCES The protocol was added to ChildHandle.
@@ -722,22 +722,22 @@ Tcp4ServiceBindingCreateChild ( /**
Destroys a child handle with a protocol installed on it.
-
- The DestroyChild() function does the opposite of CreateChild(). It removes a protocol
- that was installed by CreateChild() from ChildHandle. If the removed protocol is the
+
+ The DestroyChild() function does the opposite of CreateChild(). It removes a protocol
+ that was installed by CreateChild() from ChildHandle. If the removed protocol is the
last protocol on ChildHandle, then ChildHandle is destroyed.
@param This Pointer to the EFI_SERVICE_BINDING_PROTOCOL instance.
@param ChildHandle Handle of the child to destroy
@retval EFI_SUCCES The protocol was removed from ChildHandle.
- @retval EFI_UNSUPPORTED ChildHandle does not support the protocol that is
+ @retval EFI_UNSUPPORTED ChildHandle does not support the protocol that is
being removed.
@retval EFI_INVALID_PARAMETER Child handle is NULL.
@retval EFI_ACCESS_DENIED The protocol could not be removed from the ChildHandle
because its services are being used.
@retval other The child handle was not destroyed.
-
+
**/
EFI_STATUS
EFIAPI
diff --git a/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Driver.h b/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Driver.h index edaa1a4..368f49c 100644 --- a/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Driver.h +++ b/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Driver.h @@ -1,7 +1,7 @@ /** @file
Tcp driver function header.
-Copyright (c) 2005 - 2016, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2005 - 2018, Intel Corporation. All rights reserved.<BR>
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
@@ -30,7 +30,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. Tcp4ServiceBinding, \
TCP4_DRIVER_SIGNATURE \
)
-
+
///
/// TCP heartbeat tick timer.
///
@@ -148,32 +148,32 @@ Tcp4DriverEntryPoint ( /**
Tests to see if this driver supports a given controller.
-
- If a child device is provided, it further tests to see if this driver supports
+
+ If a child device is provided, it further tests to see if this driver supports
creating a handle for the specified child device.
@param This A pointer to the EFI_DRIVER_BINDING_PROTOCOL instance.
- @param ControllerHandle The handle of the controller to test. This handle
- must support a protocol interface that supplies
+ @param ControllerHandle The handle of the controller to test. This handle
+ must support a protocol interface that supplies
an I/O abstraction to the driver.
- @param RemainingDevicePath A pointer to the remaining portion of a device path.
+ @param RemainingDevicePath A pointer to the remaining portion of a device path.
This parameter is ignored by device drivers, and is optional for bus drivers.
@retval EFI_SUCCESS The device specified by ControllerHandle and
- RemainingDevicePath is supported by the driver
+ RemainingDevicePath is supported by the driver
specified by This.
@retval EFI_ALREADY_STARTED The device specified by ControllerHandle and
- RemainingDevicePath is already being managed by
+ RemainingDevicePath is already being managed by
the driver specified by This.
@retval EFI_ACCESS_DENIED The device specified by ControllerHandle and
- RemainingDevicePath is already being managed by a
- different driver or an application that requires
+ RemainingDevicePath is already being managed by a
+ different driver or an application that requires
exclusive access.
@retval EFI_UNSUPPORTED The device specified by ControllerHandle and
- RemainingDevicePath is not supported by the driver
+ RemainingDevicePath is not supported by the driver
specified by This.
-
+
**/
EFI_STATUS
EFIAPI
@@ -184,31 +184,31 @@ Tcp4DriverBindingSupported ( );
/**
- Start this driver on ControllerHandle.
-
- The Start() function is designed to be invoked from the EFI boot service
- ConnectController(). As a result, much of the error checking on the parameters
- to Start() has been moved into this common boot service. It is legal to call
- Start() from other locations, but the following calling restrictions must be
+ Start this driver on ControllerHandle.
+
+ The Start() function is designed to be invoked from the EFI boot service
+ ConnectController(). As a result, much of the error checking on the parameters
+ to Start() has been moved into this common boot service. It is legal to call
+ Start() from other locations, but the following calling restrictions must be
followed or the system behavior will not be deterministic.
1. ControllerHandle must be a valid EFI_HANDLE.
- 2. If RemainingDevicePath is not NULL, then it must be a pointer to a naturally
+ 2. If RemainingDevicePath is not NULL, then it must be a pointer to a naturally
aligned EFI_DEVICE_PATH_PROTOCOL.
- 3. Prior to calling Start(), the Supported() function for the driver specified
- by This must have been called with the same calling parameters, and Supported()
+ 3. Prior to calling Start(), the Supported() function for the driver specified
+ by This must have been called with the same calling parameters, and Supported()
must have returned EFI_SUCCESS.
@param This A pointer to the EFI_DRIVER_BINDING_PROTOCOL instance.
- @param ControllerHandle The handle of the controller to start. This handle
- must support a protocol interface that supplies
+ @param ControllerHandle The handle of the controller to start. This handle
+ must support a protocol interface that supplies
an I/O abstraction to the driver.
- @param RemainingDevicePath A pointer to the remaining portion of a device path.
- This parameter is ignored by device drivers, and is
+ @param RemainingDevicePath A pointer to the remaining portion of a device path.
+ This parameter is ignored by device drivers, and is
optional for bus drivers.
@retval EFI_SUCCESS The device was started.
@retval EFI_ALREADY_STARTED The device could not be started due to a device error.
- @retval EFI_OUT_OF_RESOURCES The request could not be completed due to a lack
+ @retval EFI_OUT_OF_RESOURCES The request could not be completed due to a lack
of resources.
**/
@@ -222,25 +222,25 @@ Tcp4DriverBindingStart ( /**
Stop this driver on ControllerHandle.
-
- The Stop() function is designed to be invoked from the EFI boot service
- DisconnectController(). As a result, much of the error checking on the parameters
- to Stop() has been moved into this common boot service. It is legal to call Stop()
- from other locations, but the following calling restrictions must be followed
+
+ The Stop() function is designed to be invoked from the EFI boot service
+ DisconnectController(). As a result, much of the error checking on the parameters
+ to Stop() has been moved into this common boot service. It is legal to call Stop()
+ from other locations, but the following calling restrictions must be followed
or the system behavior will not be deterministic.
- 1. ControllerHandle must be a valid EFI_HANDLE that was used on a previous call
+ 1. ControllerHandle must be a valid EFI_HANDLE that was used on a previous call
to this same driver's Start() function.
2. The first NumberOfChildren handles of ChildHandleBuffer must all be a valid
- EFI_HANDLE. In addition, all of these handles must have been created in this
- driver's Start() function, and the Start() function must have called OpenProtocol()
+ EFI_HANDLE. In addition, all of these handles must have been created in this
+ driver's Start() function, and the Start() function must have called OpenProtocol()
on ControllerHandle with an Attribute of EFI_OPEN_PROTOCOL_BY_CHILD_CONTROLLER.
-
+
@param This A pointer to the EFI_DRIVER_BINDING_PROTOCOL instance.
- @param ControllerHandle A handle to the device being stopped. The handle must
- support a bus specific I/O protocol for the driver
+ @param ControllerHandle A handle to the device being stopped. The handle must
+ support a bus specific I/O protocol for the driver
to use to stop the device.
@param NumberOfChildren The number of child device handles in ChildHandleBuffer.
- @param ChildHandleBuffer An array of child handles to be freed. May be NULL if
+ @param ChildHandleBuffer An array of child handles to be freed. May be NULL if
NumberOfChildren is 0.
@retval EFI_SUCCESS The device was stopped.
@@ -257,15 +257,15 @@ Tcp4DriverBindingStop ( );
/**
- Open Ip4 and device path protocols for a created socket, and insert it in
+ Open Ip4 and device path protocols for a created socket, and insert it in
socket list.
-
+
@param This Pointer to the socket just created
@param Context Context of the socket
-
+
@retval EFI_SUCCESS This protocol is installed successfully.
@retval other Some error occured.
-
+
**/
EFI_STATUS
Tcp4CreateSocketCallback (
@@ -274,11 +274,11 @@ Tcp4CreateSocketCallback ( );
/**
- Close Ip4 and device path protocols for a socket, and remove it from socket list.
-
+ Close Ip4 and device path protocols for a socket, and remove it from socket list.
+
@param This Pointer to the socket to be removed
@param Context Context of the socket
-
+
**/
VOID
Tcp4DestroySocketCallback (
@@ -288,15 +288,15 @@ Tcp4DestroySocketCallback ( /**
Creates a child handle and installs a protocol.
-
- The CreateChild() function installs a protocol on ChildHandle. If ChildHandle
- is a pointer to NULL, then a new handle is created and returned in ChildHandle.
- If ChildHandle is not a pointer to NULL, then the protocol installs on the existing
+
+ The CreateChild() function installs a protocol on ChildHandle. If ChildHandle
+ is a pointer to NULL, then a new handle is created and returned in ChildHandle.
+ If ChildHandle is not a pointer to NULL, then the protocol installs on the existing
ChildHandle.
@param This Pointer to the EFI_SERVICE_BINDING_PROTOCOL instance.
- @param ChildHandle Pointer to the handle of the child to create. If it is NULL, then
- a new handle is created. If it is a pointer to an existing UEFI
+ @param ChildHandle Pointer to the handle of the child to create. If it is NULL, then
+ a new handle is created. If it is a pointer to an existing UEFI
handle, then the protocol is added to the existing UEFI handle.
@retval EFI_SUCCES The protocol was added to ChildHandle.
@@ -315,22 +315,22 @@ Tcp4ServiceBindingCreateChild ( /**
Destroys a child handle with a protocol installed on it.
-
- The DestroyChild() function does the opposite of CreateChild(). It removes a protocol
- that was installed by CreateChild() from ChildHandle. If the removed protocol is the
+
+ The DestroyChild() function does the opposite of CreateChild(). It removes a protocol
+ that was installed by CreateChild() from ChildHandle. If the removed protocol is the
last protocol on ChildHandle, then ChildHandle is destroyed.
@param This Pointer to the EFI_SERVICE_BINDING_PROTOCOL instance.
@param ChildHandle Handle of the child to destroy
@retval EFI_SUCCES The protocol was removed from ChildHandle.
- @retval EFI_UNSUPPORTED ChildHandle does not support the protocol that is
+ @retval EFI_UNSUPPORTED ChildHandle does not support the protocol that is
being removed.
@retval EFI_INVALID_PARAMETER Child handle is NULL.
@retval EFI_ACCESS_DENIED The protocol could not be removed from the ChildHandle
because its services are being used.
@retval other The child handle was not destroyed.
-
+
**/
EFI_STATUS
EFIAPI
diff --git a/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dxe.inf b/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dxe.inf index ba3c377..5021cbc 100644 --- a/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dxe.inf +++ b/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dxe.inf @@ -4,7 +4,7 @@ # This module produces EFI TCPv4(Transmission Control Protocol version 4) Protocol
# upon EFI IPv4 Protocol, to provide basic TCPv4 I/O services.
#
-# Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>
# 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
@@ -30,7 +30,7 @@ #
# VALID_ARCHITECTURES = IA32 X64 IPF EBC
#
-# DRIVER_BINDING = mTcp4DriverBinding
+# DRIVER_BINDING = mTcp4DriverBinding
# COMPONENT_NAME = gTcp4ComponentName
# COMPONENT_NAME2 = gTcp4ComponentName2
#
diff --git a/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dxe.uni b/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dxe.uni index b6d30d9..1514a39 100644 --- a/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dxe.uni +++ b/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dxe.uni @@ -4,13 +4,13 @@ // This module produces EFI TCPv4(Transmission Control Protocol version 4) Protocol
// upon EFI IPv4 Protocol, to provide basic TCPv4 I/O services.
//
-// Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.<BR>
+// Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>
//
// 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,
// WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
//
diff --git a/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4DxeExtra.uni b/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4DxeExtra.uni index a3e36b3..0e6d2f2 100644 --- a/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4DxeExtra.uni +++ b/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4DxeExtra.uni @@ -1,7 +1,7 @@ // /** @file
// Tcp4Dxe Localized Strings and Content
//
-// Copyright (c) 2013 - 2014, Intel Corporation. All rights reserved.<BR>
+// Copyright (c) 2013 - 2018, Intel Corporation. All rights reserved.<BR>
//
// This program and the accompanying materials
// are licensed and made available under the terms and conditions of the BSD License
@@ -13,8 +13,8 @@ //
// **/
-#string STR_PROPERTIES_MODULE_NAME
-#language en-US
+#string STR_PROPERTIES_MODULE_NAME
+#language en-US
"TCP v4 DXE Driver"
diff --git a/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Input.c b/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Input.c index 72955c6..f48efda 100644 --- a/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Input.c +++ b/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Input.c @@ -1,7 +1,7 @@ /** @file
TCP input process routines.
-Copyright (c) 2005 - 2017, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2005 - 2018, Intel Corporation. All rights reserved.<BR>
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
@@ -704,7 +704,7 @@ TcpInput ( TCP_SEQNO Right;
TCP_SEQNO Urg;
INT32 Usable;
-
+
NET_CHECK_SIGNATURE (Nbuf, NET_BUF_SIGNATURE);
Parent = NULL;
@@ -717,7 +717,7 @@ TcpInput ( DEBUG ((EFI_D_NET, "TcpInput: received a malformed packet\n"));
goto DISCARD;
}
-
+
Len = Nbuf->TotalSize - (Head->HeadLen << 2);
if ((Head->HeadLen < 5) || (Len < 0) ||
@@ -1315,7 +1315,7 @@ StepSix: TcpSetKeepaliveTimer (Tcb);
if (TCP_FLG_ON (Seg->Flag, TCP_FLG_URG) &&
- !TCP_FIN_RCVD (Tcb->State))
+ !TCP_FIN_RCVD (Tcb->State))
{
DEBUG ((EFI_D_NET, "TcpInput: received urgent data "
diff --git a/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Main.c b/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Main.c index 2679f1b..d8fc68c 100644 --- a/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Main.c +++ b/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Main.c @@ -1,7 +1,7 @@ /** @file
Implementation of TCP4 protocol services.
-Copyright (c) 2005 - 2017, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2005 - 2018, Intel Corporation. All rights reserved.<BR>
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
@@ -53,10 +53,10 @@ Tcp4ChkDataBuf ( /**
Get the current operational status.
-
- The GetModeData() function copies the current operational settings of this
- EFI TCPv4 Protocol instance into user-supplied buffers. This function can
- also be used to retrieve the operational setting of underlying drivers
+
+ The GetModeData() function copies the current operational settings of this
+ EFI TCPv4 Protocol instance into user-supplied buffers. This function can
+ also be used to retrieve the operational setting of underlying drivers
such as IPv4, MNP, or SNP.
@param This Pointer to the EFI_TCP4_PROTOCOL instance.
@@ -64,7 +64,7 @@ Tcp4ChkDataBuf ( state.
@param Tcp4ConfigData Pointer to the buffer to receive the current TCP
configuration.
- @param Ip4ModeData Pointer to the buffer to receive the current IPv4
+ @param Ip4ModeData Pointer to the buffer to receive the current IPv4
configuration data used by the TCPv4 instance.
@param MnpConfigData Pointer to the buffer to receive the current MNP
configuration data indirectly used by the TCPv4
@@ -112,21 +112,21 @@ Tcp4GetModeData ( /**
Initialize or brutally reset the operational parameters for
this EFI TCPv4 instance.
-
+
The Configure() function does the following:
- * Initialize this EFI TCPv4 instance, i.e., initialize the communication end
+ * Initialize this EFI TCPv4 instance, i.e., initialize the communication end
setting, specify active open or passive open for an instance.
- * Reset this TCPv4 instance brutally, i.e., cancel all pending asynchronous
- tokens, flush transmission and receiving buffer directly without informing
+ * Reset this TCPv4 instance brutally, i.e., cancel all pending asynchronous
+ tokens, flush transmission and receiving buffer directly without informing
the communication peer.
- No other TCPv4 Protocol operation can be executed by this instance
- until it is configured properly. For an active TCP4 instance, after a proper
- configuration it may call Connect() to initiates the three-way handshake.
- For a passive TCP4 instance, its state will transit to Tcp4StateListen after
- configuration, and Accept() may be called to listen the incoming TCP connection
- request. If TcpConfigData is set to NULL, the instance is reset. Resetting
- process will be done brutally, the state machine will be set to Tcp4StateClosed
- directly, the receive queue and transmit queue will be flushed, and no traffic is
+ No other TCPv4 Protocol operation can be executed by this instance
+ until it is configured properly. For an active TCP4 instance, after a proper
+ configuration it may call Connect() to initiates the three-way handshake.
+ For a passive TCP4 instance, its state will transit to Tcp4StateListen after
+ configuration, and Accept() may be called to listen the incoming TCP connection
+ request. If TcpConfigData is set to NULL, the instance is reset. Resetting
+ process will be done brutally, the state machine will be set to Tcp4StateClosed
+ directly, the receive queue and transmit queue will be flushed, and no traffic is
allowed through this instance.
@param This Pointer to the EFI_TCP4_PROTOCOL instance.
@@ -183,7 +183,7 @@ Tcp4Configure ( CopyMem (&Ip, &TcpConfigData->AccessPoint.StationAddress, sizeof (IP4_ADDR));
CopyMem (&SubnetMask, &TcpConfigData->AccessPoint.SubnetMask, sizeof (IP4_ADDR));
- if (!IP4_IS_VALID_NETMASK (NTOHL (SubnetMask)) ||
+ if (!IP4_IS_VALID_NETMASK (NTOHL (SubnetMask)) ||
(SubnetMask != 0 && !NetIp4IsUnicast (NTOHL (Ip), NTOHL (SubnetMask)))) {
return EFI_INVALID_PARAMETER;
}
@@ -214,35 +214,35 @@ Tcp4Configure ( /**
Add or delete routing entries.
-
+
The Routes() function adds or deletes a route from the instance's routing table.
- The most specific route is selected by comparing the SubnetAddress with the
+ The most specific route is selected by comparing the SubnetAddress with the
destination IP address's arithmetical AND to the SubnetMask.
- The default route is added with both SubnetAddress and SubnetMask set to 0.0.0.0.
+ The default route is added with both SubnetAddress and SubnetMask set to 0.0.0.0.
The default route matches all destination IP addresses if there is no more specific route.
- Direct route is added with GatewayAddress set to 0.0.0.0. Packets are sent to
- the destination host if its address can be found in the Address Resolution Protocol (ARP)
- cache or it is on the local subnet. If the instance is configured to use default
+ Direct route is added with GatewayAddress set to 0.0.0.0. Packets are sent to
+ the destination host if its address can be found in the Address Resolution Protocol (ARP)
+ cache or it is on the local subnet. If the instance is configured to use default
address, a direct route to the local network will be added automatically.
- Each TCP instance has its own independent routing table. Instance that uses the
- default IP address will have a copy of the EFI_IP4_CONFIG_PROTOCOL's routing table.
- The copy will be updated automatically whenever the IP driver reconfigures its
- instance. As a result, the previous modification to the instance's local copy
- will be lost. The priority of checking the route table is specific with IP
+ Each TCP instance has its own independent routing table. Instance that uses the
+ default IP address will have a copy of the EFI_IP4_CONFIG_PROTOCOL's routing table.
+ The copy will be updated automatically whenever the IP driver reconfigures its
+ instance. As a result, the previous modification to the instance's local copy
+ will be lost. The priority of checking the route table is specific with IP
implementation and every IP implementation must comply with RFC 1122.
@param This Pointer to the EFI_TCP4_PROTOCOL instance.
@param DeleteRoute If TRUE, delete the specified route from routing
table; if FALSE, add the specified route to
routing table.
- DestinationAddress and SubnetMask are used as
+ DestinationAddress and SubnetMask are used as
the keywords to search route entry.
@param SubnetAddress The destination network.
@param SubnetMask The subnet mask for the destination network.
- @param GatewayAddress The gateway address for this route.
- It must be on the same subnet with the station
+ @param GatewayAddress The gateway address for this route.
+ It must be on the same subnet with the station
address unless a direct route is specified.
-
+
@retval EFI_SUCCESS The operation completed successfully.
@retval EFI_NOT_STARTED The EFI_TCP4_PROTOCOL instance has not been
configured.
@@ -288,21 +288,21 @@ Tcp4Routes ( /**
Initiate a nonblocking TCP connection request for an active TCP instance.
- The Connect() function will initiate an active open to the remote peer configured
- in current TCP instance if it is configured active. If the connection succeeds
- or fails due to any error, the ConnectionToken->CompletionToken.Event will be
- signaled and ConnectionToken->CompletionToken.Status will be updated accordingly.
- This function can only be called for the TCP instance in Tcp4StateClosed state.
- The instance will transfer into Tcp4StateSynSent if the function returns EFI_SUCCESS.
- If TCP three way handshake succeeds, its state will become Tcp4StateEstablished,
+ The Connect() function will initiate an active open to the remote peer configured
+ in current TCP instance if it is configured active. If the connection succeeds
+ or fails due to any error, the ConnectionToken->CompletionToken.Event will be
+ signaled and ConnectionToken->CompletionToken.Status will be updated accordingly.
+ This function can only be called for the TCP instance in Tcp4StateClosed state.
+ The instance will transfer into Tcp4StateSynSent if the function returns EFI_SUCCESS.
+ If TCP three way handshake succeeds, its state will become Tcp4StateEstablished,
otherwise, the state will return to Tcp4StateClosed.
-
+
@param This Pointer to the EFI_TCP4_PROTOCOL instance
@param ConnectionToken Pointer to the connection token to return when
the TCP three way handshake finishes.
- @retval EFI_SUCCESS The connection request is successfully initiated
- and the state of this TCPv4 instance has
+ @retval EFI_SUCCESS The connection request is successfully initiated
+ and the state of this TCPv4 instance has
been changed to Tcp4StateSynSent.
@retval EFI_NOT_STARTED This EFI_TCP4_PROTOCOL instance hasn't been
configured.
@@ -338,14 +338,14 @@ Tcp4Connect ( /**
Listen on the passive instance to accept an incoming connection request.
- The Accept() function initiates an asynchronous accept request to wait for an
- incoming connection on the passive TCP instance. If a remote peer successfully
- establishes a connection with this instance, a new TCP instance will be created
- and its handle will be returned in ListenToken->NewChildHandle. The newly created
- instance is configured by inheriting the passive instance's configuration and is
+ The Accept() function initiates an asynchronous accept request to wait for an
+ incoming connection on the passive TCP instance. If a remote peer successfully
+ establishes a connection with this instance, a new TCP instance will be created
+ and its handle will be returned in ListenToken->NewChildHandle. The newly created
+ instance is configured by inheriting the passive instance's configuration and is
ready for use upon return. The instance is in the Tcp4StateEstablished state.
- The ListenToken->CompletionToken.Event will be signaled when a new connection
- is accepted, user aborts the listen or connection is reset. This function only
+ The ListenToken->CompletionToken.Event will be signaled when a new connection
+ is accepted, user aborts the listen or connection is reset. This function only
can be called when current TCP instance is in Tcp4StateListen state.
@param This Pointer to the EFI_TCP4_PROTOCOL instance
@@ -389,8 +389,8 @@ Tcp4Accept ( /**
Queues outgoing data into the transmit queue.
- The Transmit() function queues a sending request to this TCPv4 instance along
- with the user data. The status of the token is updated and the event in the token
+ The Transmit() function queues a sending request to this TCPv4 instance along
+ with the user data. The status of the token is updated and the event in the token
will be signaled once the data is sent out or some error occurs.
@param This Pointer to the EFI_TCP4_PROTOCOL instance
@@ -406,11 +406,11 @@ Tcp4Accept ( @retval EFI_ACCESS_DENIED One or more of the following conditions is TRUE:
* A transmit completion token with the same
Token-> CompletionToken.Event was already in the
- transmission queue.
- * The current instance is in Tcp4StateClosed state
- * The current instance is a passive one and
- it is in Tcp4StateListen state.
- * User has called Close() to disconnect this
+ transmission queue.
+ * The current instance is in Tcp4StateClosed state
+ * The current instance is a passive one and
+ it is in Tcp4StateListen state.
+ * User has called Close() to disconnect this
connection.
@retval EFI_NOT_READY The completion token could not be queued because
the transmit queue is full.
@@ -459,16 +459,16 @@ Tcp4Transmit ( /**
Place an asynchronous receive request into the receiving queue.
- The Receive() function places a completion token into the receive packet queue.
- This function is always asynchronous. The caller must allocate the
- Token->CompletionToken.Event and the FragmentBuffer used to receive data. He also
- must fill the DataLength which represents the whole length of all FragmentBuffer.
- When the receive operation completes, the EFI TCPv4 Protocol driver updates the
- Token->CompletionToken.Status and Token->Packet.RxData fields and the
- Token->CompletionToken.Event is signaled. If got data the data and its length
- will be copy into the FragmentTable, in the same time the full length of received
- data will be recorded in the DataLength fields. Providing a proper notification
- function and context for the event will enable the user to receive the notification
+ The Receive() function places a completion token into the receive packet queue.
+ This function is always asynchronous. The caller must allocate the
+ Token->CompletionToken.Event and the FragmentBuffer used to receive data. He also
+ must fill the DataLength which represents the whole length of all FragmentBuffer.
+ When the receive operation completes, the EFI TCPv4 Protocol driver updates the
+ Token->CompletionToken.Status and Token->Packet.RxData fields and the
+ Token->CompletionToken.Event is signaled. If got data the data and its length
+ will be copy into the FragmentTable, in the same time the full length of received
+ data will be recorded in the DataLength fields. Providing a proper notification
+ function and context for the event will enable the user to receive the notification
and receiving status. That notification function is guaranteed to not be re-entered.
@param This Pointer to the EFI_TCP4_PROTOCOL instance.
@@ -484,16 +484,16 @@ Tcp4Transmit ( @retval EFI_OUT_OF_RESOURCES The receive completion token could not be queued
due to a lack of system resources.
@retval EFI_DEVICE_ERROR An unexpected system or network error occurred.
- The EFI TCPv4 Protocol instance has been reset
+ The EFI TCPv4 Protocol instance has been reset
to startup defaults.
@retval EFI_ACCESS_DENIED One or more of the following conditions is TRUE:
* A receive completion token with the same
- Token->CompletionToken.Event was already in
- the receive queue.
- * The current instance is in Tcp4StateClosed state.
- * The current instance is a passive one and it
- is in Tcp4StateListen state.
- * User has called Close() to disconnect this
+ Token->CompletionToken.Event was already in
+ the receive queue.
+ * The current instance is in Tcp4StateClosed state.
+ * The current instance is a passive one and it
+ is in Tcp4StateListen state.
+ * User has called Close() to disconnect this
connection.
@retval EFI_CONNECTION_FIN The communication peer has closed the connection
and there is no any buffered data in the receive
@@ -541,13 +541,13 @@ Tcp4Receive ( /**
Disconnecting a TCP connection gracefully or reset a TCP connection.
- Initiate an asynchronous close token to TCP driver. After Close() is called,
- any buffered transmission data will be sent by TCP driver and the current
- instance will have a graceful close working flow described as RFC 793 if
- AbortOnClose is set to FALSE, otherwise, a rest packet will be sent by TCP
- driver to fast disconnect this connection. When the close operation completes
- successfully the TCP instance is in Tcp4StateClosed state, all pending
- asynchronous operation is signaled and any buffers used for TCP network traffic
+ Initiate an asynchronous close token to TCP driver. After Close() is called,
+ any buffered transmission data will be sent by TCP driver and the current
+ instance will have a graceful close working flow described as RFC 793 if
+ AbortOnClose is set to FALSE, otherwise, a rest packet will be sent by TCP
+ driver to fast disconnect this connection. When the close operation completes
+ successfully the TCP instance is in Tcp4StateClosed state, all pending
+ asynchronous operation is signaled and any buffers used for TCP network traffic
is flushed.
@param This Pointer to the EFI_TCP4_PROTOCOL instance.
@@ -557,7 +557,7 @@ Tcp4Receive ( @retval EFI_SUCCESS The operation completed successfully.
@retval EFI_NOT_STARTED The EFI_TCP4_PROTOCOL instance hasn't been
configured.
- @retval EFI_ACCESS_DENIED One or more of the following are TRUE:
+ @retval EFI_ACCESS_DENIED One or more of the following are TRUE:
* Configure() has been called with TcpConfigData
set to NULL and this function has not returned.
* Previous Close() call on this instance has not
@@ -593,33 +593,33 @@ Tcp4Close ( /**
Abort an asynchronous connection, listen, transmission or receive request.
- The Cancel() function aborts a pending connection, listen, transmit or receive
- request. If Token is not NULL and the token is in the connection, listen,
- transmission or receive queue when it is being cancelled, its Token->Status
- will be set to EFI_ABORTED and then Token->Event will be signaled. If the token
- is not in one of the queues, which usually means that the asynchronous operation
- has completed, EFI_NOT_FOUND is returned. If Token is NULL all asynchronous token
+ The Cancel() function aborts a pending connection, listen, transmit or receive
+ request. If Token is not NULL and the token is in the connection, listen,
+ transmission or receive queue when it is being cancelled, its Token->Status
+ will be set to EFI_ABORTED and then Token->Event will be signaled. If the token
+ is not in one of the queues, which usually means that the asynchronous operation
+ has completed, EFI_NOT_FOUND is returned. If Token is NULL all asynchronous token
issued by Connect(), Accept(), Transmit() and Receive()will be aborted.
NOTE: It has not been implemented currently.
-
+
@param This Pointer to the EFI_TCP4_PROTOCOL instance.
@param Token Pointer to a token that has been issued by
Connect(), Accept(), Transmit() or Receive(). If
NULL, all pending tokens issued by above four
functions will be aborted.
-
+
@retval EFI_SUCCESS The asynchronous I/O request is aborted and Token->Event
is signaled.
@retval EFI_INVALID_PARAMETER This is NULL.
@retval EFI_NOT_STARTED This instance hasn's been configured.
@retval EFI_NO_MAPPING When using the default address, configuration
(DHCP, BOOTP,RARP, etc.) hasn's finished yet.
- @retval EFI_NOT_FOUND The asynchronous I/O request isn's found in the
- transmission or receive queue. It has either
+ @retval EFI_NOT_FOUND The asynchronous I/O request isn's found in the
+ transmission or receive queue. It has either
completed or wasn's issued by Transmit() and Receive().
@retval EFI_UNSUPPORTED The operation is not supported in current
implementation.
-
+
**/
EFI_STATUS
EFIAPI
@@ -635,11 +635,11 @@ Tcp4Cancel ( /**
Poll to receive incoming data and transmit outgoing segments.
- The Poll() function increases the rate that data is moved between the network
- and application and can be called when the TCP instance is created successfully.
- Its use is optional. In some implementations, the periodical timer in the MNP
- driver may not poll the underlying communications device fast enough to avoid
- drop packets. Drivers and applications that are experiencing packet loss should
+ The Poll() function increases the rate that data is moved between the network
+ and application and can be called when the TCP instance is created successfully.
+ Its use is optional. In some implementations, the periodical timer in the MNP
+ driver may not poll the underlying communications device fast enough to avoid
+ drop packets. Drivers and applications that are experiencing packet loss should
try calling the Poll() function in a high frequency.
@param This Pointer to the EFI_TCP4_PROTOCOL instance.
diff --git a/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Main.h b/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Main.h index cd90458..c898a7e 100644 --- a/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Main.h +++ b/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Main.h @@ -1,7 +1,7 @@ /** @file
TCP4 protocol services header file.
-Copyright (c) 2005 - 2012, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2005 - 2018, Intel Corporation. All rights reserved.<BR>
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
@@ -53,7 +53,7 @@ Tcp4Dispatcher ( IN UINT8 Request,
IN VOID *Data OPTIONAL
);
-
+
///
/// TCP mode data
///
@@ -83,10 +83,10 @@ typedef struct { /**
Get the current operational status of a TCP instance.
-
- The GetModeData() function copies the current operational settings of this
- EFI TCPv4 Protocol instance into user-supplied buffers. This function can
- also be used to retrieve the operational setting of underlying drivers
+
+ The GetModeData() function copies the current operational settings of this
+ EFI TCPv4 Protocol instance into user-supplied buffers. This function can
+ also be used to retrieve the operational setting of underlying drivers
such as IPv4, MNP, or SNP.
@param This Pointer to the EFI_TCP4_PROTOCOL instance.
@@ -94,7 +94,7 @@ typedef struct { state.
@param Tcp4ConfigData Pointer to the buffer to receive the current TCP
configuration.
- @param Ip4ModeData Pointer to the buffer to receive the current IPv4
+ @param Ip4ModeData Pointer to the buffer to receive the current IPv4
configuration data used by the TCPv4 instance.
@param MnpConfigData Pointer to the buffer to receive the current MNP
configuration data indirectly used by the TCPv4
@@ -124,21 +124,21 @@ Tcp4GetModeData ( /**
Initialize or brutally reset the operational parameters for
this EFI TCPv4 instance.
-
+
The Configure() function does the following:
- * Initialize this EFI TCPv4 instance, i.e., initialize the communication end
+ * Initialize this EFI TCPv4 instance, i.e., initialize the communication end
setting, specify active open or passive open for an instance.
- * Reset this TCPv4 instance brutally, i.e., cancel all pending asynchronous
- tokens, flush transmission and receiving buffer directly without informing
+ * Reset this TCPv4 instance brutally, i.e., cancel all pending asynchronous
+ tokens, flush transmission and receiving buffer directly without informing
the communication peer.
- No other TCPv4 Protocol operation can be executed by this instance
- until it is configured properly. For an active TCP4 instance, after a proper
- configuration it may call Connect() to initiates the three-way handshake.
- For a passive TCP4 instance, its state will transit to Tcp4StateListen after
- configuration, and Accept() may be called to listen the incoming TCP connection
- request. If TcpConfigData is set to NULL, the instance is reset. Resetting
- process will be done brutally, the state machine will be set to Tcp4StateClosed
- directly, the receive queue and transmit queue will be flushed, and no traffic is
+ No other TCPv4 Protocol operation can be executed by this instance
+ until it is configured properly. For an active TCP4 instance, after a proper
+ configuration it may call Connect() to initiates the three-way handshake.
+ For a passive TCP4 instance, its state will transit to Tcp4StateListen after
+ configuration, and Accept() may be called to listen the incoming TCP connection
+ request. If TcpConfigData is set to NULL, the instance is reset. Resetting
+ process will be done brutally, the state machine will be set to Tcp4StateClosed
+ directly, the receive queue and transmit queue will be flushed, and no traffic is
allowed through this instance.
@param This Pointer to the EFI_TCP4_PROTOCOL instance.
@@ -168,35 +168,35 @@ Tcp4Configure ( /**
Add or delete routing entries.
-
+
The Routes() function adds or deletes a route from the instance's routing table.
- The most specific route is selected by comparing the SubnetAddress with the
+ The most specific route is selected by comparing the SubnetAddress with the
destination IP address's arithmetical AND to the SubnetMask.
- The default route is added with both SubnetAddress and SubnetMask set to 0.0.0.0.
+ The default route is added with both SubnetAddress and SubnetMask set to 0.0.0.0.
The default route matches all destination IP addresses if there is no more specific route.
- Direct route is added with GatewayAddress set to 0.0.0.0. Packets are sent to
- the destination host if its address can be found in the Address Resolution Protocol (ARP)
- cache or it is on the local subnet. If the instance is configured to use default
+ Direct route is added with GatewayAddress set to 0.0.0.0. Packets are sent to
+ the destination host if its address can be found in the Address Resolution Protocol (ARP)
+ cache or it is on the local subnet. If the instance is configured to use default
address, a direct route to the local network will be added automatically.
- Each TCP instance has its own independent routing table. Instance that uses the
- default IP address will have a copy of the EFI_IP4_CONFIG_PROTOCOL's routing table.
- The copy will be updated automatically whenever the IP driver reconfigures its
- instance. As a result, the previous modification to the instance's local copy
- will be lost. The priority of checking the route table is specific with IP
+ Each TCP instance has its own independent routing table. Instance that uses the
+ default IP address will have a copy of the EFI_IP4_CONFIG_PROTOCOL's routing table.
+ The copy will be updated automatically whenever the IP driver reconfigures its
+ instance. As a result, the previous modification to the instance's local copy
+ will be lost. The priority of checking the route table is specific with IP
implementation and every IP implementation must comply with RFC 1122.
@param This Pointer to the EFI_TCP4_PROTOCOL instance.
@param DeleteRoute If TRUE, delete the specified route from routing
table; if FALSE, add the specified route to
routing table.
- DestinationAddress and SubnetMask are used as
+ DestinationAddress and SubnetMask are used as
the keywords to search route entry.
@param SubnetAddress The destination network.
@param SubnetMask The subnet mask for the destination network.
- @param GatewayAddress The gateway address for this route.
- It must be on the same subnet with the station
+ @param GatewayAddress The gateway address for this route.
+ It must be on the same subnet with the station
address unless a direct route is specified.
-
+
@retval EFI_SUCCESS The operation completed successfully.
@retval EFI_NOT_STARTED The EFI_TCP4_PROTOCOL instance has not been
configured.
@@ -224,21 +224,21 @@ Tcp4Routes ( /**
Initiate a nonblocking TCP connection request for an active TCP instance.
- The Connect() function will initiate an active open to the remote peer configured
- in current TCP instance if it is configured active. If the connection succeeds
- or fails due to any error, the ConnectionToken->CompletionToken.Event will be
- signaled and ConnectionToken->CompletionToken.Status will be updated accordingly.
- This function can only be called for the TCP instance in Tcp4StateClosed state.
- The instance will transfer into Tcp4StateSynSent if the function returns EFI_SUCCESS.
- If TCP three way handshake succeeds, its state will become Tcp4StateEstablished,
+ The Connect() function will initiate an active open to the remote peer configured
+ in current TCP instance if it is configured active. If the connection succeeds
+ or fails due to any error, the ConnectionToken->CompletionToken.Event will be
+ signaled and ConnectionToken->CompletionToken.Status will be updated accordingly.
+ This function can only be called for the TCP instance in Tcp4StateClosed state.
+ The instance will transfer into Tcp4StateSynSent if the function returns EFI_SUCCESS.
+ If TCP three way handshake succeeds, its state will become Tcp4StateEstablished,
otherwise, the state will return to Tcp4StateClosed.
-
+
@param This Pointer to the EFI_TCP4_PROTOCOL instance
@param ConnectionToken Pointer to the connection token to return when
the TCP three way handshake finishes.
- @retval EFI_SUCCESS The connection request is successfully initiated
- and the state of this TCPv4 instance has
+ @retval EFI_SUCCESS The connection request is successfully initiated
+ and the state of this TCPv4 instance has
been changed to Tcp4StateSynSent.
@retval EFI_NOT_STARTED This EFI_TCP4_PROTOCOL instance hasn't been
configured.
@@ -260,14 +260,14 @@ Tcp4Connect ( /**
Listen on the passive instance to accept an incoming connection request.
- The Accept() function initiates an asynchronous accept request to wait for an
- incoming connection on the passive TCP instance. If a remote peer successfully
- establishes a connection with this instance, a new TCP instance will be created
- and its handle will be returned in ListenToken->NewChildHandle. The newly created
- instance is configured by inheriting the passive instance's configuration and is
+ The Accept() function initiates an asynchronous accept request to wait for an
+ incoming connection on the passive TCP instance. If a remote peer successfully
+ establishes a connection with this instance, a new TCP instance will be created
+ and its handle will be returned in ListenToken->NewChildHandle. The newly created
+ instance is configured by inheriting the passive instance's configuration and is
ready for use upon return. The instance is in the Tcp4StateEstablished state.
- The ListenToken->CompletionToken.Event will be signaled when a new connection
- is accepted, user aborts the listen or connection is reset. This function only
+ The ListenToken->CompletionToken.Event will be signaled when a new connection
+ is accepted, user aborts the listen or connection is reset. This function only
can be called when current TCP instance is in Tcp4StateListen state.
@param This Pointer to the EFI_TCP4_PROTOCOL instance
@@ -297,8 +297,8 @@ Tcp4Accept ( /**
Queues outgoing data into the transmit queue.
- The Transmit() function queues a sending request to this TCPv4 instance along
- with the user data. The status of the token is updated and the event in the token
+ The Transmit() function queues a sending request to this TCPv4 instance along
+ with the user data. The status of the token is updated and the event in the token
will be signaled once the data is sent out or some error occurs.
@param This Pointer to the EFI_TCP4_PROTOCOL instance
@@ -314,11 +314,11 @@ Tcp4Accept ( @retval EFI_ACCESS_DENIED One or more of the following conditions is TRUE:
* A transmit completion token with the same
Token-> CompletionToken.Event was already in the
- transmission queue.
- * The current instance is in Tcp4StateClosed state
- * The current instance is a passive one and
- it is in Tcp4StateListen state.
- * User has called Close() to disconnect this
+ transmission queue.
+ * The current instance is in Tcp4StateClosed state
+ * The current instance is a passive one and
+ it is in Tcp4StateListen state.
+ * User has called Close() to disconnect this
connection.
@retval EFI_NOT_READY The completion token could not be queued because
the transmit queue is full.
@@ -338,16 +338,16 @@ Tcp4Transmit ( /**
Place an asynchronous receive request into the receiving queue.
- The Receive() function places a completion token into the receive packet queue.
- This function is always asynchronous. The caller must allocate the
- Token->CompletionToken.Event and the FragmentBuffer used to receive data. He also
- must fill the DataLength which represents the whole length of all FragmentBuffer.
- When the receive operation completes, the EFI TCPv4 Protocol driver updates the
- Token->CompletionToken.Status and Token->Packet.RxData fields and the
- Token->CompletionToken.Event is signaled. If got data the data and its length
- will be copy into the FragmentTable, in the same time the full length of received
- data will be recorded in the DataLength fields. Providing a proper notification
- function and context for the event will enable the user to receive the notification
+ The Receive() function places a completion token into the receive packet queue.
+ This function is always asynchronous. The caller must allocate the
+ Token->CompletionToken.Event and the FragmentBuffer used to receive data. He also
+ must fill the DataLength which represents the whole length of all FragmentBuffer.
+ When the receive operation completes, the EFI TCPv4 Protocol driver updates the
+ Token->CompletionToken.Status and Token->Packet.RxData fields and the
+ Token->CompletionToken.Event is signaled. If got data the data and its length
+ will be copy into the FragmentTable, in the same time the full length of received
+ data will be recorded in the DataLength fields. Providing a proper notification
+ function and context for the event will enable the user to receive the notification
and receiving status. That notification function is guaranteed to not be re-entered.
@param This Pointer to the EFI_TCP4_PROTOCOL instance.
@@ -363,16 +363,16 @@ Tcp4Transmit ( @retval EFI_OUT_OF_RESOURCES The receive completion token could not be queued
due to a lack of system resources.
@retval EFI_DEVICE_ERROR An unexpected system or network error occurred.
- The EFI TCPv4 Protocol instance has been reset
+ The EFI TCPv4 Protocol instance has been reset
to startup defaults.
@retval EFI_ACCESS_DENIED One or more of the following conditions is TRUE:
* A receive completion token with the same
- Token->CompletionToken.Event was already in
- the receive queue.
- * The current instance is in Tcp4StateClosed state.
- * The current instance is a passive one and it
- is in Tcp4StateListen state.
- * User has called Close() to disconnect this
+ Token->CompletionToken.Event was already in
+ the receive queue.
+ * The current instance is in Tcp4StateClosed state.
+ * The current instance is a passive one and it
+ is in Tcp4StateListen state.
+ * User has called Close() to disconnect this
connection.
@retval EFI_CONNECTION_FIN The communication peer has closed the connection
and there is no any buffered data in the receive
@@ -391,13 +391,13 @@ Tcp4Receive ( /**
Disconnecting a TCP connection gracefully or reset a TCP connection.
- Initiate an asynchronous close token to TCP driver. After Close() is called,
- any buffered transmission data will be sent by TCP driver and the current
- instance will have a graceful close working flow described as RFC 793 if
- AbortOnClose is set to FALSE, otherwise, a rest packet will be sent by TCP
- driver to fast disconnect this connection. When the close operation completes
- successfully the TCP instance is in Tcp4StateClosed state, all pending
- asynchronous operation is signaled and any buffers used for TCP network traffic
+ Initiate an asynchronous close token to TCP driver. After Close() is called,
+ any buffered transmission data will be sent by TCP driver and the current
+ instance will have a graceful close working flow described as RFC 793 if
+ AbortOnClose is set to FALSE, otherwise, a rest packet will be sent by TCP
+ driver to fast disconnect this connection. When the close operation completes
+ successfully the TCP instance is in Tcp4StateClosed state, all pending
+ asynchronous operation is signaled and any buffers used for TCP network traffic
is flushed.
@param This Pointer to the EFI_TCP4_PROTOCOL instance.
@@ -407,7 +407,7 @@ Tcp4Receive ( @retval EFI_SUCCESS The operation completed successfully.
@retval EFI_NOT_STARTED The EFI_TCP4_PROTOCOL instance hasn't been
configured.
- @retval EFI_ACCESS_DENIED One or more of the following are TRUE:
+ @retval EFI_ACCESS_DENIED One or more of the following are TRUE:
* Configure() has been called with TcpConfigData
set to NULL and this function has not returned.
* Previous Close() call on this instance has not
@@ -429,33 +429,33 @@ Tcp4Close ( /**
Abort an asynchronous connection, listen, transmission or receive request.
- The Cancel() function aborts a pending connection, listen, transmit or receive
- request. If Token is not NULL and the token is in the connection, listen,
- transmission or receive queue when it is being cancelled, its Token->Status
- will be set to EFI_ABORTED and then Token->Event will be signaled. If the token
- is not in one of the queues, which usually means that the asynchronous operation
- has completed, EFI_NOT_FOUND is returned. If Token is NULL all asynchronous token
+ The Cancel() function aborts a pending connection, listen, transmit or receive
+ request. If Token is not NULL and the token is in the connection, listen,
+ transmission or receive queue when it is being cancelled, its Token->Status
+ will be set to EFI_ABORTED and then Token->Event will be signaled. If the token
+ is not in one of the queues, which usually means that the asynchronous operation
+ has completed, EFI_NOT_FOUND is returned. If Token is NULL all asynchronous token
issued by Connect(), Accept(), Transmit() and Receive()will be aborted.
NOTE: It has not been implemented currently.
-
+
@param This Pointer to the EFI_TCP4_PROTOCOL instance.
@param Token Pointer to a token that has been issued by
Connect(), Accept(), Transmit() or Receive(). If
NULL, all pending tokens issued by above four
functions will be aborted.
-
+
@retval EFI_SUCCESS The asynchronous I/O request is aborted and Token->Event
is signaled.
@retval EFI_INVALID_PARAMETER This is NULL.
@retval EFI_NOT_STARTED This instance hasn's been configured.
@retval EFI_NO_MAPPING When using the default address, configuration
(DHCP, BOOTP,RARP, etc.) hasn's finished yet.
- @retval EFI_NOT_FOUND The asynchronous I/O request isn's found in the
- transmission or receive queue. It has either
+ @retval EFI_NOT_FOUND The asynchronous I/O request isn's found in the
+ transmission or receive queue. It has either
completed or wasn's issued by Transmit() and Receive().
@retval EFI_UNSUPPORTED The operation is not supported in current
implementation.
-
+
**/
EFI_STATUS
EFIAPI
@@ -467,11 +467,11 @@ Tcp4Cancel ( /**
Poll to receive incoming data and transmit outgoing segments.
- The Poll() function increases the rate that data is moved between the network
- and application and can be called when the TCP instance is created successfully.
- Its use is optional. In some implementations, the periodical timer in the MNP
- driver may not poll the underlying communications device fast enough to avoid
- drop packets. Drivers and applications that are experiencing packet loss should
+ The Poll() function increases the rate that data is moved between the network
+ and application and can be called when the TCP instance is created successfully.
+ Its use is optional. In some implementations, the periodical timer in the MNP
+ driver may not poll the underlying communications device fast enough to avoid
+ drop packets. Drivers and applications that are experiencing packet loss should
try calling the Poll() function in a high frequency.
@param This Pointer to the EFI_TCP4_PROTOCOL instance.
diff --git a/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Misc.c b/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Misc.c index 892d19b..7fd8bb1 100644 --- a/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Misc.c +++ b/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Misc.c @@ -1,7 +1,7 @@ /** @file
Misc support routines for tcp.
-Copyright (c) 2005 - 2017, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2005 - 2018, Intel Corporation. All rights reserved.<BR>
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
@@ -79,7 +79,7 @@ TcpInitTcbLocal ( //
Tcb->RcvWndScale = 0;
Tcb->RetxmitSeqMax = 0;
-
+
Tcb->ProbeTimerOn = FALSE;
}
diff --git a/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Option.c b/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Option.c index 0da249c..2817b80 100644 --- a/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Option.c +++ b/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Option.c @@ -1,7 +1,7 @@ /** @file
Routines to process TCP option.
-
-Copyright (c) 2005 - 2006, Intel Corporation. All rights reserved.<BR>
+
+Copyright (c) 2005 - 2018, Intel Corporation. All rights reserved.<BR>
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
@@ -16,9 +16,9 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. /**
Get a UINT16 value from buffer.
-
+
@param Buf Pointer to input buffer.
-
+
@return The UINT16 value get from buffer.
**/
@@ -34,9 +34,9 @@ TcpGetUint16 ( /**
Get a UINT32 value from buffer.
-
+
@param Buf Pointer to input buffer.
-
+
@return The UINT32 value get from buffer.
**/
@@ -52,9 +52,9 @@ TcpGetUint32 ( /**
Put a UINT32 value in buffer.
-
+
@param Buf Pointer to the buffer.
- @param Data The UINT32 Date to put in buffer
+ @param Data The UINT32 Date to put in buffer
**/
VOID
diff --git a/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Option.h b/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Option.h index 9676df0..5185aec 100644 --- a/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Option.h +++ b/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Option.h @@ -1,7 +1,7 @@ /** @file
Tcp option's routine header file.
-
-Copyright (c) 2005 - 2009, Intel Corporation. All rights reserved.<BR>
+
+Copyright (c) 2005 - 2018, Intel Corporation. All rights reserved.<BR>
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
diff --git a/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Output.c b/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Output.c index 5a3d837..760b09a 100644 --- a/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Output.c +++ b/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Output.c @@ -1,7 +1,7 @@ /** @file
TCP output process routines.
-
-Copyright (c) 2005 - 2017, Intel Corporation. All rights reserved.<BR>
+
+Copyright (c) 2005 - 2018, Intel Corporation. All rights reserved.<BR>
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
@@ -687,10 +687,10 @@ TcpRetransmit ( "TcpRetransmit: retransmission without regard to the receiver window for TCB %p\n",
Tcb)
);
-
+
} else if (TCP_SEQ_GEQ (Tcb->SndWl2 + Tcb->SndWnd, Seq)) {
Len = TCP_SUB_SEQ (Tcb->SndWl2 + Tcb->SndWnd, Seq);
-
+
} else {
DEBUG (
(EFI_D_WARN,
@@ -700,7 +700,7 @@ TcpRetransmit ( return 0;
}
-
+
Len = MIN (Len, Tcb->SndMss);
Nbuf = TcpGetSegmentSndQue (Tcb, Seq, Len);
@@ -713,7 +713,7 @@ TcpRetransmit ( if (TcpTransmitSegment (Tcb, Nbuf) != 0) {
goto OnError;
}
-
+
if (TCP_SEQ_GT (Seq, Tcb->RetxmitSeqMax)) {
Tcb->RetxmitSeqMax = Seq;
}
@@ -793,7 +793,7 @@ SEND_AGAIN: // only send a segment without data if SYN or
// FIN is set.
//
- if ((Len == 0) &&
+ if ((Len == 0) &&
((Flag & (TCP_FLG_SYN | TCP_FLG_FIN)) == 0)) {
return Sent;
}
@@ -831,10 +831,10 @@ SEND_AGAIN: TCP_SEQ_LT (End + 1, Tcb->SndWnd + Tcb->SndWl2)) {
DEBUG (
- (EFI_D_NET,
- "TcpToSendData: send FIN "
- "to peer for TCB %p in state %s\n",
- Tcb,
+ (EFI_D_NET,
+ "TcpToSendData: send FIN "
+ "to peer for TCB %p in state %s\n",
+ Tcb,
mTcpStateName[Tcb->State])
);
diff --git a/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Proto.h b/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Proto.h index 49d8a1d..37191fe 100644 --- a/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Proto.h +++ b/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Proto.h @@ -1,7 +1,7 @@ /** @file
Tcp Protocol header file.
-Copyright (c) 2005 - 2017, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2005 - 2018, Intel Corporation. All rights reserved.<BR>
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
@@ -49,11 +49,11 @@ typedef struct _TCP_CB TCP_CB; #define TCP_FLG_PSH 0x08
#define TCP_FLG_ACK 0x10
#define TCP_FLG_URG 0x20
-
+
//
// mask for all the flags
//
-#define TCP_FLG_FLAG 0x3F
+#define TCP_FLG_FLAG 0x3F
#define TCP_CONNECT_REFUSED (-1) ///< TCP error status
diff --git a/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Timer.c b/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Timer.c index a8e4a93..4cb0ee7 100644 --- a/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Timer.c +++ b/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Timer.c @@ -1,7 +1,7 @@ /** @file
TCP timer related functions.
-
-Copyright (c) 2005 - 2010, Intel Corporation. All rights reserved.<BR>
+
+Copyright (c) 2005 - 2018, Intel Corporation. All rights reserved.<BR>
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
@@ -37,7 +37,7 @@ VOID TcpRexmitTimeout (
IN OUT TCP_CB *Tcb
);
-
+
/**
Timeout handler for window probe timer.
@@ -289,7 +289,7 @@ Tcp2MSLTimeout ( /**
- Update the timer status and the next expire time according to the timers
+ Update the timer status and the next expire time according to the timers
to expire in a specific future time slot.
@param Tcb Pointer to the TCP_CB of this TCP instance.
@@ -555,7 +555,7 @@ TcpTickingDpc ( }
}
}
-
+
//
// If the Tcb still exist or some timer is set, update the timer
//
diff --git a/MdeModulePkg/Universal/Network/Udp4Dxe/ComponentName.c b/MdeModulePkg/Universal/Network/Udp4Dxe/ComponentName.c index cf31105..8baf395 100644 --- a/MdeModulePkg/Universal/Network/Udp4Dxe/ComponentName.c +++ b/MdeModulePkg/Universal/Network/Udp4Dxe/ComponentName.c @@ -1,6 +1,6 @@ /** @file
-Copyright (c) 2006 - 2012, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>
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
@@ -175,7 +175,7 @@ GLOBAL_REMOVE_IF_UNREFERENCED EFI_UNICODE_STRING_TABLE mUdpDriverNameTable[] = { };
GLOBAL_REMOVE_IF_UNREFERENCED EFI_UNICODE_STRING_TABLE *gUdpControllerNameTable = NULL;
-
+
/**
Retrieves a Unicode string that is the user readable name of the driver.
@@ -237,10 +237,10 @@ UdpComponentNameGetDriverName ( @param Udp4[in] A pointer to the EFI_UDP4_PROTOCOL.
-
+
@retval EFI_SUCCESS Update the ControllerNameTable of this instance successfully.
@retval EFI_INVALID_PARAMETER The input parameter is invalid.
-
+
**/
EFI_STATUS
UpdateName (
@@ -280,7 +280,7 @@ UpdateName ( FreeUnicodeStringTable (gUdpControllerNameTable);
gUdpControllerNameTable = NULL;
}
-
+
Status = AddUnicodeString2 (
"eng",
gUdp4ComponentName.SupportedLanguages,
@@ -291,7 +291,7 @@ UpdateName ( if (EFI_ERROR (Status)) {
return Status;
}
-
+
return AddUnicodeString2 (
"en",
gUdp4ComponentName2.SupportedLanguages,
@@ -388,7 +388,7 @@ UdpComponentNameGetControllerName ( if (ChildHandle == NULL) {
return EFI_UNSUPPORTED;
}
-
+
//
// Make sure this driver produced ChildHandle
//
diff --git a/MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Driver.c b/MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Driver.c index 4d179d1..8731995 100644 --- a/MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Driver.c +++ b/MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Driver.c @@ -1,6 +1,6 @@ /** @file
-Copyright (c) 2006 - 2016, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>
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
@@ -30,7 +30,7 @@ EFI_SERVICE_BINDING_PROTOCOL mUdp4ServiceBinding = { /**
Callback function which provided by user to remove one node in NetDestroyLinkList process.
-
+
@param[in] Entry The entry to be removed.
@param[in] Context Pointer to the callback context corresponds to the Context in NetDestroyLinkList.
@@ -194,7 +194,7 @@ Udp4DriverBindingStart ( restrictions for this service. DisconnectController()
must follow these calling restrictions. If any other agent wishes
to call Stop() it must also follow these calling restrictions.
-
+
@param[in] This Protocol instance pointer.
@param[in] ControllerHandle Handle of device to stop driver on
@param[in] NumberOfChildren Number of Handles in ChildHandleBuffer. If number of
@@ -266,7 +266,7 @@ Udp4DriverBindingStop ( &Udp4Service->ServiceBinding,
NULL
);
-
+
Udp4CleanService (Udp4Service);
if (gUdpControllerNameTable != NULL) {
@@ -282,14 +282,14 @@ Udp4DriverBindingStop ( /**
Creates a child handle and installs a protocol.
-
- The CreateChild() function installs a protocol on ChildHandle.
- If ChildHandle is a pointer to NULL, then a new handle is created and returned in ChildHandle.
+
+ The CreateChild() function installs a protocol on ChildHandle.
+ If ChildHandle is a pointer to NULL, then a new handle is created and returned in ChildHandle.
If ChildHandle is not a pointer to NULL, then the protocol installs on the existing ChildHandle.
@param[in] This Pointer to the EFI_SERVICE_BINDING_PROTOCOL instance.
@param[in] ChildHandle Pointer to the handle of the child to create. If it is NULL,
- then a new handle is created. If it is a pointer to an existing UEFI handle,
+ then a new handle is created. If it is a pointer to an existing UEFI handle,
then the protocol is added to the existing UEFI handle.
@retval EFI_SUCCES The protocol was added to ChildHandle.
@@ -419,9 +419,9 @@ ON_ERROR: /**
Destroys a child handle with a protocol installed on it.
-
- The DestroyChild() function does the opposite of CreateChild(). It removes a protocol
- that was installed by CreateChild() from ChildHandle. If the removed protocol is the
+
+ The DestroyChild() function does the opposite of CreateChild(). It removes a protocol
+ that was installed by CreateChild() from ChildHandle. If the removed protocol is the
last protocol on ChildHandle, then ChildHandle is destroyed.
@param[in] This Pointer to the EFI_SERVICE_BINDING_PROTOCOL instance.
@@ -497,7 +497,7 @@ Udp4ServiceBindingDestroyChild ( &gEfiIp4ProtocolGuid,
gUdp4DriverBinding.DriverBindingHandle,
Instance->ChildHandle
- );
+ );
//
// Uninstall the Udp4Protocol previously installed on the ChildHandle.
@@ -547,7 +547,7 @@ Udp4ServiceBindingDestroyChild ( This is the declaration of an EFI image entry point. This entry point is
the same for UEFI Applications, UEFI OS Loaders, and UEFI Drivers including
both device drivers and bus drivers.
-
+
The entry point for Udp4 driver which installs the driver binding
and component name protocol on its ImageHandle.
diff --git a/MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Driver.h b/MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Driver.h index 88421aa..0f96cd5 100644 --- a/MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Driver.h +++ b/MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Driver.h @@ -1,6 +1,6 @@ /** @file
-Copyright (c) 2006 - 2016, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>
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
@@ -79,7 +79,7 @@ Udp4DriverBindingStart ( restrictions for this service. DisconnectController()
must follow these calling restrictions. If any other agent wishes
to call Stop() it must also follow these calling restrictions.
-
+
@param[in] This Protocol instance pointer.
@param[in] ControllerHandle Handle of device to stop driver on
@param[in] NumberOfChildren Number of Handles in ChildHandleBuffer. If number of
@@ -101,14 +101,14 @@ Udp4DriverBindingStop ( /**
Creates a child handle and installs a protocol.
-
- The CreateChild() function installs a protocol on ChildHandle.
- If ChildHandle is a pointer to NULL, then a new handle is created and returned in ChildHandle.
+
+ The CreateChild() function installs a protocol on ChildHandle.
+ If ChildHandle is a pointer to NULL, then a new handle is created and returned in ChildHandle.
If ChildHandle is not a pointer to NULL, then the protocol installs on the existing ChildHandle.
@param[in] This Pointer to the EFI_SERVICE_BINDING_PROTOCOL instance.
@param[in] ChildHandle Pointer to the handle of the child to create. If it is NULL,
- then a new handle is created. If it is a pointer to an existing UEFI handle,
+ then a new handle is created. If it is a pointer to an existing UEFI handle,
then the protocol is added to the existing UEFI handle.
@retval EFI_SUCCES The protocol was added to ChildHandle.
@@ -127,9 +127,9 @@ Udp4ServiceBindingCreateChild ( /**
Destroys a child handle with a protocol installed on it.
-
- The DestroyChild() function does the opposite of CreateChild(). It removes a protocol
- that was installed by CreateChild() from ChildHandle. If the removed protocol is the
+
+ The DestroyChild() function does the opposite of CreateChild(). It removes a protocol
+ that was installed by CreateChild() from ChildHandle. If the removed protocol is the
last protocol on ChildHandle, then ChildHandle is destroyed.
@param[in] This Pointer to the EFI_SERVICE_BINDING_PROTOCOL instance.
diff --git a/MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf b/MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf index e1b4898..69b6d5d 100644 --- a/MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf +++ b/MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf @@ -4,7 +4,7 @@ # This module produces EFI UDP(User Datagram Protocol) Protocol upon EFI IPv4
# Protocol, to provide basic UDPv4 I/O services.
#
-# Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>
# 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
@@ -30,7 +30,7 @@ #
# VALID_ARCHITECTURES = IA32 X64 IPF EBC
#
-# DRIVER_BINDING = gUdp4DriverBinding
+# DRIVER_BINDING = gUdp4DriverBinding
# COMPONENT_NAME = gUdp4ComponentName
# COMPONENT_NAME2 = gUdp4ComponentName2
#
diff --git a/MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.uni b/MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.uni index 87c235d..891850b 100644 --- a/MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.uni +++ b/MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.uni @@ -4,13 +4,13 @@ // This module produces EFI UDP(User Datagram Protocol) Protocol upon EFI IPv4
// Protocol, to provide basic UDPv4 I/O services.
//
-// Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.<BR>
+// Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>
//
// 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,
// WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
//
diff --git a/MdeModulePkg/Universal/Network/Udp4Dxe/Udp4DxeExtra.uni b/MdeModulePkg/Universal/Network/Udp4Dxe/Udp4DxeExtra.uni index 249c440..33a78d6 100644 --- a/MdeModulePkg/Universal/Network/Udp4Dxe/Udp4DxeExtra.uni +++ b/MdeModulePkg/Universal/Network/Udp4Dxe/Udp4DxeExtra.uni @@ -1,7 +1,7 @@ // /** @file
// Udp4Dxe Localized Strings and Content
//
-// Copyright (c) 2013 - 2014, Intel Corporation. All rights reserved.<BR>
+// Copyright (c) 2013 - 2018, Intel Corporation. All rights reserved.<BR>
//
// This program and the accompanying materials
// are licensed and made available under the terms and conditions of the BSD License
@@ -13,8 +13,8 @@ //
// **/
-#string STR_PROPERTIES_MODULE_NAME
-#language en-US
+#string STR_PROPERTIES_MODULE_NAME
+#language en-US
"UDP v4 DXE Driver"
diff --git a/MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Impl.c b/MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Impl.c index df41433..7a09c7f 100644 --- a/MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Impl.c +++ b/MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Impl.c @@ -1,7 +1,7 @@ /** @file
The implementation of the Udp4 protocol.
-
-Copyright (c) 2006 - 2016, Intel Corporation. All rights reserved.<BR>
+
+Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>
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
@@ -844,7 +844,7 @@ Udp4ValidateTxToken ( CopyMem (&SourceAddress, &UdpSessionData->SourceAddress, sizeof (IP4_ADDR));
- if ((SourceAddress != 0) &&
+ if ((SourceAddress != 0) &&
!Instance->ConfigData.UseDefaultAddress &&
(EFI_NTOHL(Instance->ConfigData.SubnetMask) != 0) &&
!NetIp4IsUnicast (HTONL (SourceAddress), EFI_NTOHL(Instance->ConfigData.SubnetMask))) {
@@ -1812,7 +1812,7 @@ Udp4IcmpHandler ( NetbufFree (Packet);
return;
}
-
+
Udp4Header = (EFI_UDP_HEADER *) NetbufGetByte (Packet, 0, NULL);
ASSERT (Udp4Header != NULL);
diff --git a/MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Impl.h b/MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Impl.h index 31edfbd..dd4909e 100644 --- a/MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Impl.h +++ b/MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Impl.h @@ -1,7 +1,7 @@ /** @file
EFI UDPv4 protocol implementation.
-
-Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.<BR>
+
+Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>
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
@@ -158,7 +158,7 @@ Udp4GetModeData ( /**
Initializes, changes, or resets the operational parameters for this instance of the EFI UDPv4
Protocol.
-
+
The Configure() function is used to do the following:
* Initialize and start this instance of the EFI UDPv4 Protocol.
* Change the filtering rules and operational parameters.
@@ -185,7 +185,7 @@ Udp4GetModeData ( @retval EFI_OUT_OF_RESOURCES The EFI UDPv4 Protocol driver cannot allocate memory for this
EFI UDPv4 Protocol instance.
@retval EFI_DEVICE_ERROR An unexpected network or system error occurred and this instance
- was not opened.
+ was not opened.
**/
EFI_STATUS
@@ -197,7 +197,7 @@ Udp4Configure ( /**
Joins and leaves multicast groups.
-
+
The Groups() function is used to enable and disable the multicast group
filtering. If the JoinFlag is FALSE and the MulticastAddress is NULL, then all
currently joined groups are left.
@@ -234,7 +234,7 @@ Udp4Groups ( /**
Adds and deletes routing table entries.
-
+
The Routes() function adds a route to or deletes a route from the routing table.
Routes are determined by comparing the SubnetAddress with the destination IP
address and arithmetically AND-ing it with the SubnetMask. The gateway address
@@ -282,7 +282,7 @@ Udp4Routes ( /**
Queues outgoing data packets into the transmit queue.
-
+
The Transmit() function places a sending request to this instance of the EFI
UDPv4 Protocol, alongside the transmit data that was filled by the user. Whenever
the packet in the token is sent out or some errors occur, the Token.Event will
@@ -319,7 +319,7 @@ Udp4Transmit ( /**
Places an asynchronous receive request into the receiving queue.
-
+
The Receive() function places a completion token into the receive packet queue.
This function is always asynchronous.
The caller must fill in the Token.Event field in the completion token, and this
@@ -355,7 +355,7 @@ Udp4Receive ( /**
Aborts an asynchronous transmit or receive request.
-
+
The Cancel() function is used to abort a pending transmit or receive request.
If the token is in the transmit or receive request queues, after calling this
function, Token.Status will be set to EFI_ABORTED and then Token.Event will be
@@ -390,7 +390,7 @@ Udp4Cancel ( /**
Polls for incoming data packets and processes outgoing data packets.
-
+
The Poll() function can be used by network drivers and applications to increase
the rate that data packets are moved between the communications device and the
transmit and receive queues.
@@ -691,5 +691,5 @@ EFIAPI Udp4NetVectorExtFree (
VOID *Context
);
-
+
#endif
diff --git a/MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Main.c b/MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Main.c index d719883..6950c69 100644 --- a/MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Main.c +++ b/MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Main.c @@ -1,7 +1,7 @@ /** @file
(C) Copyright 2014 Hewlett-Packard Development Company, L.P.<BR>
-Copyright (c) 2006 - 2017, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>
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
@@ -96,7 +96,7 @@ Udp4GetModeData ( /**
Initializes, changes, or resets the operational parameters for this instance of the EFI UDPv4
Protocol.
-
+
The Configure() function is used to do the following:
* Initialize and start this instance of the EFI UDPv4 Protocol.
* Change the filtering rules and operational parameters.
@@ -123,7 +123,7 @@ Udp4GetModeData ( @retval EFI_OUT_OF_RESOURCES The EFI UDPv4 Protocol driver cannot allocate memory for this
EFI UDPv4 Protocol instance.
@retval EFI_DEVICE_ERROR An unexpected network or system error occurred and this instance
- was not opened.
+ was not opened.
**/
EFI_STATUS
@@ -281,7 +281,7 @@ Udp4Configure ( ASSERT (IsListEmpty (&Instance->DeliveredDgramQue));
}
-
+
ON_EXIT:
gBS->RestoreTPL (OldTpl);
@@ -292,7 +292,7 @@ ON_EXIT: /**
Joins and leaves multicast groups.
-
+
The Groups() function is used to enable and disable the multicast group
filtering. If the JoinFlag is FALSE and the MulticastAddress is NULL, then all
currently joined groups are left.
@@ -393,7 +393,7 @@ ON_EXIT: /**
Adds and deletes routing table entries.
-
+
The Routes() function adds a route to or deletes a route from the routing table.
Routes are determined by comparing the SubnetAddress with the destination IP
address and arithmetically AND-ing it with the SubnetMask. The gateway address
@@ -467,7 +467,7 @@ Udp4Routes ( /**
Queues outgoing data packets into the transmit queue.
-
+
The Transmit() function places a sending request to this instance of the EFI
UDPv4 Protocol, alongside the transmit data that was filled by the user. Whenever
the packet in the token is sent out or some errors occur, the Token.Event will
@@ -696,7 +696,7 @@ ON_EXIT: /**
Places an asynchronous receive request into the receiving queue.
-
+
The Receive() function places a completion token into the receive packet queue.
This function is always asynchronous.
The caller must fill in the Token.Event field in the completion token, and this
@@ -796,7 +796,7 @@ ON_EXIT: /**
Aborts an asynchronous transmit or receive request.
-
+
The Cancel() function is used to abort a pending transmit or receive request.
If the token is in the transmit or receive request queues, after calling this
function, Token.Status will be set to EFI_ABORTED and then Token.Event will be
@@ -867,7 +867,7 @@ Udp4Cancel ( /**
Polls for incoming data packets and processes outgoing data packets.
-
+
The Poll() function can be used by network drivers and applications to increase
the rate that data packets are moved between the communications device and the
transmit and receive queues.
diff --git a/MdeModulePkg/Universal/Network/UefiPxeBcDxe/ComponentName.c b/MdeModulePkg/Universal/Network/UefiPxeBcDxe/ComponentName.c index f4ef59c..a085ef6 100644 --- a/MdeModulePkg/Universal/Network/UefiPxeBcDxe/ComponentName.c +++ b/MdeModulePkg/Universal/Network/UefiPxeBcDxe/ComponentName.c @@ -1,6 +1,6 @@ /** @file
-Copyright (c) 2007 - 2012, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2007 - 2018, Intel Corporation. All rights reserved.<BR>
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
@@ -316,7 +316,7 @@ PxeBcComponentNameGetControllerName ( EFI_PXE_BASE_CODE_PROTOCOL *PxeBc;
EFI_HANDLE NicHandle;
EFI_STATUS Status;
-
+
if (ControllerHandle == NULL || ChildHandle != NULL) {
return EFI_UNSUPPORTED;
}
diff --git a/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcDhcp.c b/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcDhcp.c index e48b54c..f7b975f 100644 --- a/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcDhcp.c +++ b/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcDhcp.c @@ -171,7 +171,7 @@ PxeBcParseCachedDhcpPacket ( );
}
//
- // Second, Check if bootfilename and serverhostname is overloaded to carry DHCP options refers to rfc-2132.
+ // Second, Check if bootfilename and serverhostname is overloaded to carry DHCP options refers to rfc-2132.
// If yes, try to parse options from the BootFileName field, then ServerName field.
//
Option = Options[PXEBC_DHCP4_TAG_INDEX_OVERLOAD];
@@ -229,7 +229,7 @@ PxeBcParseCachedDhcpPacket ( //
if (Options[PXEBC_DHCP4_TAG_INDEX_BOOTFILE] != NULL) {
//
- // RFC 2132, Section 9.5 does not strictly state Bootfile name (option 67) is null
+ // RFC 2132, Section 9.5 does not strictly state Bootfile name (option 67) is null
// terminated string. So force to append null terminated character at the end of string.
//
Ptr8 = (UINT8*)&Options[PXEBC_DHCP4_TAG_INDEX_BOOTFILE]->Data[0];
@@ -685,7 +685,7 @@ PxeBcCacheDhcpOffer ( **/
EFI_STATUS
-PxeBcSetIp4Policy (
+PxeBcSetIp4Policy (
IN PXEBC_PRIVATE_DATA *Private
)
{
@@ -705,7 +705,7 @@ PxeBcSetIp4Policy ( if (EFI_ERROR (Status)) {
return Status;
}
-
+
if (Policy != Ip4Config2PolicyStatic) {
Policy = Ip4Config2PolicyStatic;
Status= Ip4Config2->SetData (
@@ -716,7 +716,7 @@ PxeBcSetIp4Policy ( );
if (EFI_ERROR (Status)) {
return Status;
- }
+ }
}
return EFI_SUCCESS;
@@ -943,7 +943,7 @@ PxeBcDhcpCallBack ( Status = EFI_ABORTED;
break;
}
-
+
if (Mode->SendGUID) {
//
// send the system GUID instead of the MAC address as the hardware address
@@ -981,7 +981,7 @@ PxeBcDhcpCallBack ( //
break;
}
-
+
if (Private->NumOffers < PXEBC_MAX_OFFER_NUM) {
//
// Cache the dhcp offers in Private->Dhcp4Offers[]
@@ -1669,12 +1669,12 @@ PxeBcSelectBootPrompt ( VendorOpt = &Packet->PxeVendorOption;
//
- // According to the PXE specification 2.1, Table 2-1 PXE DHCP Options (Full
- // List), we must not consider a boot prompt or boot menu if all of the
+ // According to the PXE specification 2.1, Table 2-1 PXE DHCP Options (Full
+ // List), we must not consider a boot prompt or boot menu if all of the
// following hold:
// - the PXE_DISCOVERY_CONTROL PXE tag is present inside the Vendor Options
// (=43) DHCP tag, and
- // - the PXE_DISCOVERY_CONTROL PXE tag has bit 3 set, and
+ // - the PXE_DISCOVERY_CONTROL PXE tag has bit 3 set, and
// - a boot file name has been presented with DHCP option 67.
//
if (IS_DISABLE_PROMPT_MENU (VendorOpt->DiscoverCtrl) &&
diff --git a/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcDhcp.h b/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcDhcp.h index d19d2a3..d8336c5 100644 --- a/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcDhcp.h +++ b/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcDhcp.h @@ -2,7 +2,7 @@ Dhcp and Discover routines for PxeBc.
Copyright (c) 2013, Red Hat, Inc.
-Copyright (c) 2007 - 2016, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2007 - 2018, Intel Corporation. All rights reserved.<BR>
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
@@ -258,7 +258,7 @@ typedef struct { This function initialize the DHCP4 message instance.
This function will pad each item of dhcp4 message packet.
-
+
@param Seed Pointer to the message instance of the DHCP4 packet.
@param Udp4 Pointer to the EFI_UDP4_PROTOCOL instance.
@@ -304,7 +304,7 @@ PxeBcCheckSelectedOffer ( /**
Callback routine.
-
+
EFI_DHCP4_CALLBACK is provided by the consumer of the EFI DHCPv4 Protocol driver
to intercept events that occurred in the configuration process. This structure
provides advanced control of each state transition of the DHCP process. The
@@ -352,7 +352,7 @@ PxeBcDhcpCallBack ( **/
EFI_STATUS
-PxeBcSetIp4Policy (
+PxeBcSetIp4Policy (
IN PXEBC_PRIVATE_DATA *Private
);
@@ -363,8 +363,8 @@ PxeBcSetIp4Policy ( @param Type PxeBc option boot item type
@param Layer PxeBc option boot item layer
@param UseBis Use BIS or not
- @param DestIp Ip address for server
- @param IpCount The total count of the server ip address
+ @param DestIp Ip address for server
+ @param IpCount The total count of the server ip address
@param SrvList Server list
@param IsDiscv Discover the vendor or not
@param Reply The dhcp4 packet of Pxe reply
@@ -372,8 +372,8 @@ PxeBcSetIp4Policy ( @retval EFI_SUCCESS Operation succeeds.
@retval EFI_OUT_OF_RESOURCES Allocate memory pool failed.
@retval EFI_NOT_FOUND There is no vendor option exists.
- @retval EFI_TIMEOUT Send Pxe Discover time out.
-
+ @retval EFI_TIMEOUT Send Pxe Discover time out.
+
**/
EFI_STATUS
PxeBcDiscvBootService (
@@ -394,8 +394,8 @@ PxeBcDiscvBootService ( @param Private Pointer to PxeBc private data.
@param OptList Pointer to a DHCP option list.
-
- @param IsDhcpDiscover Discover dhcp option or not.
+
+ @param IsDhcpDiscover Discover dhcp option or not.
@return The index item number of the option list.
@@ -413,7 +413,7 @@ PxeBcBuildDhcpOptions ( @param OptList Pointer to the list of the options
@param Type the type of option
- @param Layer the layer of the boot options
+ @param Layer the layer of the boot options
@param OptLen length of opotion
**/
@@ -433,7 +433,7 @@ PxeBcCreateBootOptions ( @param Length The length of the dhcp options.
@param OptTag The option OpCode.
- @return NULL if the buffer length is 0 and OpCode is not
+ @return NULL if the buffer length is 0 and OpCode is not
DHCP4_TAG_EOP, or the pointer to the buffer.
**/
@@ -467,11 +467,11 @@ PxeBcParseVendorOptions ( @param Private Pointer to PxeBc private data.
@retval EFI_SUCCESS Select boot prompt done.
- @retval EFI_TIMEOUT Select boot prompt time out.
+ @retval EFI_TIMEOUT Select boot prompt time out.
@retval EFI_NOT_FOUND The proxy offer is not Pxe10.
@retval EFI_ABORTED User cancel the operation.
@retval EFI_NOT_READY Read the input key from the keybroad has not finish.
-
+
**/
EFI_STATUS
PxeBcSelectBootPrompt (
@@ -485,10 +485,10 @@ PxeBcSelectBootPrompt ( @param Private Pointer to PxeBc private data.
@param Type The type of the menu.
@param UseDefaultItem Use default item or not.
-
+
@retval EFI_ABORTED User cancel operation.
@retval EFI_SUCCESS Select the boot menu success.
- @retval EFI_NOT_READY Read the input key from the keybroad has not finish.
+ @retval EFI_NOT_READY Read the input key from the keybroad has not finish.
**/
EFI_STATUS
diff --git a/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcDriver.h b/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcDriver.h index f436c89..b7bf069 100644 --- a/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcDriver.h +++ b/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcDriver.h @@ -1,6 +1,6 @@ /** @file
-Copyright (c) 2007, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2007 - 2018, Intel Corporation. All rights reserved.<BR>
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
@@ -20,7 +20,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. order to make drivers as small as possible, there are a few calling
restrictions for this service. ConnectController() must
follow these calling restrictions. If any other agent wishes to call
- Supported() it must also follow these calling restrictions.
+ Supported() it must also follow these calling restrictions.
PxeBc requires DHCP4 and MTFTP4 protocols.
@param This Protocol instance pointer.
@@ -40,7 +40,7 @@ PxeBcDriverBindingSupported ( IN EFI_HANDLE ControllerHandle,
IN EFI_DEVICE_PATH_PROTOCOL * RemainingDevicePath OPTIONAL
);
-
+
/**
Start this driver on ControllerHandle. This service is called by the
EFI boot service ConnectController(). In order to make
@@ -66,7 +66,7 @@ PxeBcDriverBindingStart ( IN EFI_HANDLE ControllerHandle,
IN EFI_DEVICE_PATH_PROTOCOL * RemainingDevicePath OPTIONAL
);
-
+
/**
Stop this driver on ControllerHandle. This service is called by the
EFI boot service DisconnectController(). In order to
@@ -74,7 +74,7 @@ PxeBcDriverBindingStart ( restrictions for this service. DisconnectController()
must follow these calling restrictions. If any other agent wishes
to call Stop() it must also follow these calling restrictions.
-
+
@param This Protocol instance pointer.
@param ControllerHandle Handle of device to stop driver on
@param NumberOfChildren Number of Handles in ChildHandleBuffer. If number of
@@ -93,7 +93,7 @@ PxeBcDriverBindingStop ( IN UINTN NumberOfChildren,
IN EFI_HANDLE *ChildHandleBuffer
);
-
+
extern EFI_COMPONENT_NAME2_PROTOCOL gPxeBcComponentName2;
extern EFI_COMPONENT_NAME_PROTOCOL gPxeBcComponentName;
extern EFI_DRIVER_BINDING_PROTOCOL gPxeBcDriverBinding;
diff --git a/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcImpl.c b/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcImpl.c index 825a22c..3fa3be9 100644 --- a/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcImpl.c +++ b/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcImpl.c @@ -1,7 +1,7 @@ /** @file
Interface routines for PxeBc.
-Copyright (c) 2007 - 2017, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2007 - 2018, Intel Corporation. All rights reserved.<BR>
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
@@ -354,7 +354,7 @@ EfiPxeBcStart ( //
// Configure block size for TFTP as a default value to handle all link layers.
- //
+ //
Private->BlockSize = MIN (Private->Ip4MaxPacketSize, PXEBC_DEFAULT_PACKET_SIZE) -
PXEBC_DEFAULT_UDP_OVERHEAD_SIZE - PXEBC_DEFAULT_TFTP_OVERHEAD_SIZE;
//
@@ -363,7 +363,7 @@ EfiPxeBcStart ( if (PcdGet64 (PcdTftpBlockSize) != 0) {
Private->BlockSize = (UINTN) PcdGet64 (PcdTftpBlockSize);
}
-
+
Private->AddressIsOk = FALSE;
ZeroMem (Mode, sizeof (EFI_PXE_BASE_CODE_MODE));
@@ -415,17 +415,17 @@ EfiPxeBcStart ( }
//
- //DHCP4 service allows only one of its children to be configured in
- //the active state, If the DHCP4 D.O.R.A started by IP4 auto
- //configuration and has not been completed, the Dhcp4 state machine
- //will not be in the right state for the PXE to start a new round D.O.R.A.
+ //DHCP4 service allows only one of its children to be configured in
+ //the active state, If the DHCP4 D.O.R.A started by IP4 auto
+ //configuration and has not been completed, the Dhcp4 state machine
+ //will not be in the right state for the PXE to start a new round D.O.R.A.
//so we need to switch it's policy to static.
//
Status = PxeBcSetIp4Policy (Private);
if (EFI_ERROR (Status)) {
goto ON_EXIT;
}
-
+
Status = Private->Ip4->Configure (Private->Ip4, &Private->Ip4ConfigData);
if (EFI_ERROR (Status)) {
goto ON_EXIT;
@@ -726,35 +726,35 @@ ON_EXIT: CopyMem (&Private->Udp4CfgData.SubnetMask, &Private->SubnetMask, sizeof (EFI_IPv4_ADDRESS));
CopyMem (&Private->Ip4ConfigData.StationAddress, &Private->StationIp, sizeof (EFI_IPv4_ADDRESS));
CopyMem (&Private->Ip4ConfigData.SubnetMask, &Private->SubnetMask, sizeof (EFI_IPv4_ADDRESS));
-
+
//
// Reconfigure the Ip4 instance to capture background ICMP packets with new station Ip address.
//
Private->Ip4->Cancel (Private->Ip4, &Private->IcmpErrorRcvToken);
Private->Ip4->Configure (Private->Ip4, NULL);
-
+
Status = Private->Ip4->Configure (Private->Ip4, &Private->Ip4ConfigData);
if (EFI_ERROR (Status)) {
goto ON_EXIT;
}
-
+
Status = Private->Ip4->Receive (Private->Ip4, &Private->IcmpErrorRcvToken);
if (EFI_ERROR (Status)) {
goto ON_EXIT;
- }
+ }
}
}
Private->Udp4Read->Configure (Private->Udp4Read, &Private->Udp4CfgData);
//
- // Dhcp(), Discover(), and Mtftp() set the IP filter, and return with the IP
+ // Dhcp(), Discover(), and Mtftp() set the IP filter, and return with the IP
// receive filter list emptied and the filter set to EFI_PXE_BASE_CODE_IP_FILTER_STATION_IP.
//
ZeroMem(&IpFilter, sizeof (EFI_PXE_BASE_CODE_IP_FILTER));
IpFilter.Filters = EFI_PXE_BASE_CODE_IP_FILTER_STATION_IP;
This->SetIpFilter (This, &IpFilter);
-
+
return Status;
}
@@ -864,7 +864,7 @@ EfiPxeBcDiscover ( if (!Mode->PxeDiscoverValid || !Mode->PxeReplyReceived || (!Mode->PxeBisReplyReceived && UseBis)) {
Status = EFI_INVALID_PARAMETER;
- goto ON_EXIT;
+ goto ON_EXIT;
}
DefaultInfo.IpCnt = 1;
@@ -888,7 +888,7 @@ EfiPxeBcDiscover ( // Address is not acquired or no discovery options.
//
Status = EFI_INVALID_PARAMETER;
- goto ON_EXIT;
+ goto ON_EXIT;
}
DefaultInfo.UseMCast = (BOOLEAN)!IS_DISABLE_MCAST_DISCOVER (VendorOpt->DiscoverCtrl);
@@ -936,9 +936,9 @@ EfiPxeBcDiscover ( if (CreatedInfo == NULL) {
Status = EFI_OUT_OF_RESOURCES;
goto ON_EXIT;
-
- }
-
+
+ }
+
CopyMem (CreatedInfo, &DefaultInfo, sizeof (DefaultInfo));
Info = CreatedInfo;
SrvList = Info->SrvList;
@@ -965,7 +965,7 @@ EfiPxeBcDiscover ( if (Index != Info->IpCnt) {
Status = EFI_INVALID_PARAMETER;
- goto ON_EXIT;
+ goto ON_EXIT;
}
}
}
@@ -1005,7 +1005,7 @@ EfiPxeBcDiscover ( );
if (!EFI_ERROR (Status)) {
break;
- }
+ }
}
} else if (Info->UseMCast) {
@@ -1063,15 +1063,15 @@ EfiPxeBcDiscover ( ON_EXIT:
Private->Udp4Read->Configure (Private->Udp4Read, &Private->Udp4CfgData);
-
+
//
- // Dhcp(), Discover(), and Mtftp() set the IP filter, and return with the IP
+ // Dhcp(), Discover(), and Mtftp() set the IP filter, and return with the IP
// receive filter list emptied and the filter set to EFI_PXE_BASE_CODE_IP_FILTER_STATION_IP.
//
ZeroMem(&IpFilter, sizeof (EFI_PXE_BASE_CODE_IP_FILTER));
IpFilter.Filters = EFI_PXE_BASE_CODE_IP_FILTER_STATION_IP;
This->SetIpFilter (This, &IpFilter);
-
+
return Status;
}
@@ -1172,8 +1172,8 @@ EfiPxeBcMtftp ( if ((This == NULL) ||
(Filename == NULL) ||
(BufferSize == NULL) ||
- ((ServerIp == NULL) ||
- (IP4_IS_UNSPECIFIED (NTOHL (ServerIp->Addr[0])) ||
+ ((ServerIp == NULL) ||
+ (IP4_IS_UNSPECIFIED (NTOHL (ServerIp->Addr[0])) ||
IP4_IS_LOCAL_BROADCAST (NTOHL (ServerIp->Addr[0])))) ||
((BufferPtr == NULL) && DontUseBuffer) ||
((BlockSize != NULL) && (*BlockSize < 512))) {
@@ -1307,7 +1307,7 @@ EfiPxeBcMtftp ( ON_EXIT:
Private->Udp4Read->Configure (Private->Udp4Read, &Private->Udp4CfgData);
//
- // Dhcp(), Discover(), and Mtftp() set the IP filter, and return with the IP
+ // Dhcp(), Discover(), and Mtftp() set the IP filter, and return with the IP
// receive filter list emptied and the filter set to EFI_PXE_BASE_CODE_IP_FILTER_STATION_IP.
//
ZeroMem(&IpFilter, sizeof (EFI_PXE_BASE_CODE_IP_FILTER));
@@ -1454,7 +1454,7 @@ EfiPxeBcUdpWrite ( Private->CurrentUdpSrcPort = 0;
return EFI_INVALID_PARAMETER;
}
-
+
ZeroMem (&Token, sizeof (EFI_UDP4_COMPLETION_TOKEN));
ZeroMem (&Udp4Session, sizeof (EFI_UDP4_SESSION_DATA));
@@ -2022,13 +2022,13 @@ EfiPxeBcSetIpFilter ( }
}
}
-
+
//
// Check whether we need reconfigure the UDP instance.
//
Udp4Cfg = &Private->Udp4CfgData;
if ((AcceptPromiscuous != Udp4Cfg->AcceptPromiscuous) ||
- (AcceptBroadcast != Udp4Cfg->AcceptBroadcast) || MultiCastUpdate) {
+ (AcceptBroadcast != Udp4Cfg->AcceptBroadcast) || MultiCastUpdate) {
//
// Clear the UDP instance configuration, all joined groups will be left
// during the operation.
@@ -2326,13 +2326,13 @@ EfiPxeBcSetStationIP ( }
if (NewStationIp != NULL) {
- if (IP4_IS_UNSPECIFIED(NTOHL (NewStationIp->Addr[0])) ||
+ if (IP4_IS_UNSPECIFIED(NTOHL (NewStationIp->Addr[0])) ||
IP4_IS_LOCAL_BROADCAST(NTOHL (NewStationIp->Addr[0])) ||
(NewSubnetMask != NULL && NewSubnetMask->Addr[0] != 0 && !NetIp4IsUnicast (NTOHL (NewStationIp->Addr[0]), NTOHL (NewSubnetMask->Addr[0])))) {
return EFI_INVALID_PARAMETER;
}
}
-
+
Private = PXEBC_PRIVATE_DATA_FROM_PXEBC (This);
Mode = Private->PxeBc.Mode;
@@ -2806,7 +2806,7 @@ EfiPxeLoadFile ( if (FilePath == NULL || !IsDevicePathEnd (FilePath)) {
return EFI_INVALID_PARAMETER;
}
-
+
Private = PXEBC_PRIVATE_DATA_FROM_LOADFILE (This);
PxeBc = &Private->PxeBc;
NewMakeCallback = FALSE;
@@ -2933,7 +2933,7 @@ EfiPxeLoadFile ( AsciiPrint ("\n NBP file downloaded successfully.\n");
//
// The DHCP4 can have only one configured child instance so we need to stop
- // reset the DHCP4 child before we return. Otherwise the other programs which
+ // reset the DHCP4 child before we return. Otherwise the other programs which
// also need to use DHCP4 will be impacted.
// The functionality of PXE Base Code protocol will not be stopped,
// when downloading is successfully.
diff --git a/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcMtftp.c b/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcMtftp.c index 8017b73..88767c8 100644 --- a/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcMtftp.c +++ b/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcMtftp.c @@ -1,7 +1,7 @@ /** @file
PxeBc MTFTP functions.
-
-Copyright (c) 2007 - 2015, Intel Corporation. All rights reserved.<BR>
+
+Copyright (c) 2007 - 2018, Intel Corporation. All rights reserved.<BR>
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
@@ -25,19 +25,19 @@ CHAR8 *mMtftpOptions[PXE_MTFTP_OPTION_MAXIMUM_INDEX] = { /**
This is a callback function when packets received/transmitted in Mtftp driver.
- A callback function that is provided by the caller to intercept
+ A callback function that is provided by the caller to intercept
the EFI_MTFTP4_OPCODE_DATA or EFI_MTFTP4_OPCODE_DATA8 packets processed in the
- EFI_MTFTP4_PROTOCOL.ReadFile() function, and alternatively to intercept
- EFI_MTFTP4_OPCODE_OACK or EFI_MTFTP4_OPCODE_ERROR packets during a call to
+ EFI_MTFTP4_PROTOCOL.ReadFile() function, and alternatively to intercept
+ EFI_MTFTP4_OPCODE_OACK or EFI_MTFTP4_OPCODE_ERROR packets during a call to
EFI_MTFTP4_PROTOCOL.ReadFile(), WriteFile() or ReadDirectory().
-
+
@param This Pointer to Mtftp protocol instance
@param Token Pointer to Mtftp token
@param PacketLen Length of Mtftp packet
@param Packet Pointer to Mtftp packet
@retval EFI_SUCCESS Operation sucess
- @retval EFI_ABORTED Abort transfer process
+ @retval EFI_ABORTED Abort transfer process
**/
EFI_STATUS
@@ -88,7 +88,7 @@ PxeBcCheckPacket ( /**
This function is to get size of a file by Tftp.
-
+
@param Private Pointer to PxeBc private data
@param Config Pointer to Mtftp configuration data
@param Filename Pointer to file name
@@ -99,7 +99,7 @@ PxeBcCheckPacket ( @retval EFI_NOT_FOUND Parse the tftp ptions failed.
@retval EFI_DEVICE_ERROR The network device encountered an error during this operation.
@retval Other Has not get the size of the file.
-
+
**/
EFI_STATUS
PxeBcTftpGetFileSize (
@@ -227,7 +227,7 @@ ON_ERROR: @retval EFI_SUCCESS Read the data success from the special file.
@retval EFI_DEVICE_ERROR The network device encountered an error during this operation.
@retval other Read data from file failed.
-
+
**/
EFI_STATUS
PxeBcTftpReadFile (
@@ -310,7 +310,7 @@ PxeBcTftpReadFile ( @retval EFI_SUCCESS Write the data success into the special file.
@retval EFI_DEVICE_ERROR The network device encountered an error during this operation.
@retval other Write data into file failed.
-
+
**/
EFI_STATUS
PxeBcTftpWriteFile (
@@ -381,10 +381,10 @@ PxeBcTftpWriteFile ( @param BufferSize Pointer to buffer size.
@param DontUseBuffer Indicate whether with a receive buffer.
- @retval EFI_SUCCES Get the data from the file included in directory success.
+ @retval EFI_SUCCES Get the data from the file included in directory success.
@retval EFI_DEVICE_ERROR The network device encountered an error during this operation.
@retval other Operation failed.
-
+
**/
EFI_STATUS
PxeBcTftpReadDirectory (
diff --git a/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcMtftp.h b/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcMtftp.h index 241b079..903dd4f 100644 --- a/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcMtftp.h +++ b/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcMtftp.h @@ -1,7 +1,7 @@ /** @file
Mtftp routines for PxeBc.
-
-Copyright (c) 2007 - 2015, Intel Corporation. All rights reserved.<BR>
+
+Copyright (c) 2007 - 2018, Intel Corporation. All rights reserved.<BR>
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
@@ -27,7 +27,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. /**
This function is to get size of a file by Tftp.
-
+
@param Private Pointer to PxeBc private data
@param Config Pointer to Mtftp configuration data
@param Filename Pointer to file name
@@ -38,7 +38,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. @retval EFI_NOT_FOUND Parse the tftp ptions failed.
@retval EFI_DEVICE_ERROR The network device encountered an error during this operation.
@retval Other Has not get the size of the file.
-
+
**/
EFI_STATUS
PxeBcTftpGetFileSize (
@@ -64,7 +64,7 @@ PxeBcTftpGetFileSize ( @retval EFI_SUCCESS Read the data success from the special file.
@retval EFI_DEVICE_ERROR The network device encountered an error during this operation.
@retval other Read data from file failed.
-
+
**/
EFI_STATUS
PxeBcTftpReadFile (
@@ -92,7 +92,7 @@ PxeBcTftpReadFile ( @retval EFI_SUCCESS Write the data success into the special file.
@retval EFI_DEVICE_ERROR The network device encountered an error during this operation.
@retval other Write data into file failed.
-
+
**/
EFI_STATUS
PxeBcTftpWriteFile (
@@ -117,10 +117,10 @@ PxeBcTftpWriteFile ( @param BufferSize Pointer to buffer size.
@param DontUseBuffer Indicate whether with a receive buffer.
- @retval EFI_SUCCES Get the data from the file included in directory success.
+ @retval EFI_SUCCES Get the data from the file included in directory success.
@retval EFI_DEVICE_ERROR The network device encountered an error during this operation.
@retval other Operation failed.
-
+
**/
EFI_STATUS
PxeBcTftpReadDirectory (
diff --git a/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcSupport.c b/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcSupport.c index c1cabca..1401ca5 100644 --- a/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcSupport.c +++ b/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcSupport.c @@ -1,7 +1,7 @@ /** @file
Support routines for PxeBc.
-Copyright (c) 2007 - 2017, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2007 - 2018, Intel Corporation. All rights reserved.<BR>
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
@@ -42,7 +42,7 @@ PxeBcCommonNotify ( @param SubnetMask Pointer to the subnetmask of the station ip address.
@param Gateway Pointer to the gateway ip address.
@param SrcPort Pointer to the srouce port of the station.
- @param Ttl The time to live field of the IP header.
+ @param Ttl The time to live field of the IP header.
@param ToS The type of service field of the IP header.
@retval EFI_SUCCESS The configuration settings were set, changed, or reset successfully.
@@ -166,7 +166,7 @@ CvtNum ( @param Number The unsigned int number will be converted.
@param Buffer Pointer to the buffer to store the decimal number after transform.
@param[in] BufferSize The maxsize of the buffer.
-
+
@return the length of the number after transform.
**/
diff --git a/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcSupport.h b/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcSupport.h index 59e9b32..a28c974 100644 --- a/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcSupport.h +++ b/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcSupport.h @@ -1,6 +1,6 @@ /** @file
Support routines for PxeBc.
-Copyright (c) 2007 - 2017, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2007 - 2018, Intel Corporation. All rights reserved.<BR>
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
@@ -16,7 +16,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. /**
- The common notify function associated with various PxeBc events.
+ The common notify function associated with various PxeBc events.
@param Event The event signaled.
@param Context The context.
@@ -38,7 +38,7 @@ PxeBcCommonNotify ( @param SubnetMask Pointer to the subnetmask of the station ip address.
@param Gateway Pointer to the gateway ip address.
@param SrcPort Pointer to the srouce port of the station.
- @param Ttl The time to live field of the IP header.
+ @param Ttl The time to live field of the IP header.
@param ToS The type of service field of the IP header.
@retval EFI_SUCCESS The configuration settings were set, changed, or reset successfully.
@@ -79,7 +79,7 @@ VOID PxeBcShowIp4Addr (
IN EFI_IPv4_ADDRESS *Ip
);
-
+
/**
Convert number to ASCII value.
@@ -103,7 +103,7 @@ CvtNum ( @param Number The unsigned int number will be converted.
@param Buffer Pointer to the buffer to store the decimal number after transform.
@param[in] BufferSize The maxsize of the buffer.
-
+
@return the length of the number after transform.
**/
@@ -112,7 +112,7 @@ UtoA10 ( IN UINTN Number,
IN CHAR8 *Buffer,
IN UINTN BufferSize
-
+
);
diff --git a/MdeModulePkg/Universal/Network/UefiPxeBcDxe/UefiPxe4BcDxe.uni b/MdeModulePkg/Universal/Network/UefiPxeBcDxe/UefiPxe4BcDxe.uni index 1770b15..e97c3ca 100644 --- a/MdeModulePkg/Universal/Network/UefiPxeBcDxe/UefiPxe4BcDxe.uni +++ b/MdeModulePkg/Universal/Network/UefiPxeBcDxe/UefiPxe4BcDxe.uni @@ -6,13 +6,13 @@ // Protocol to provide one clean way to otain control from the boot manager if the
// boot patch is from the remote device.
//
-// Copyright (c) 2007 - 2014, Intel Corporation. All rights reserved.<BR>
+// Copyright (c) 2007 - 2018, Intel Corporation. All rights reserved.<BR>
//
// 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,
// WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
//
diff --git a/MdeModulePkg/Universal/Network/UefiPxeBcDxe/UefiPxe4BcDxeExtra.uni b/MdeModulePkg/Universal/Network/UefiPxeBcDxe/UefiPxe4BcDxeExtra.uni index eb59002..2c1bda1 100644 --- a/MdeModulePkg/Universal/Network/UefiPxeBcDxe/UefiPxe4BcDxeExtra.uni +++ b/MdeModulePkg/Universal/Network/UefiPxeBcDxe/UefiPxe4BcDxeExtra.uni @@ -1,7 +1,7 @@ // /** @file
// UefiPxe4BcDxe Localized Strings and Content
//
-// Copyright (c) 2013 - 2014, Intel Corporation. All rights reserved.<BR>
+// Copyright (c) 2013 - 2018, Intel Corporation. All rights reserved.<BR>
//
// This program and the accompanying materials
// are licensed and made available under the terms and conditions of the BSD License
@@ -13,8 +13,8 @@ //
// **/
-#string STR_PROPERTIES_MODULE_NAME
-#language en-US
+#string STR_PROPERTIES_MODULE_NAME
+#language en-US
"UEFI PXE Base Code DXE Driver"
diff --git a/MdeModulePkg/Universal/Network/UefiPxeBcDxe/UefiPxeBcDxe.inf b/MdeModulePkg/Universal/Network/UefiPxeBcDxe/UefiPxeBcDxe.inf index fe8f210..121d68e 100644 --- a/MdeModulePkg/Universal/Network/UefiPxeBcDxe/UefiPxeBcDxe.inf +++ b/MdeModulePkg/Universal/Network/UefiPxeBcDxe/UefiPxeBcDxe.inf @@ -6,7 +6,7 @@ # Protocol to provide one clean way to otain control from the boot manager if the
# boot patch is from the remote device.
#
-# Copyright (c) 2007 - 2015, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2007 - 2018, Intel Corporation. All rights reserved.<BR>
# 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
@@ -34,7 +34,7 @@ #
# VALID_ARCHITECTURES = IA32 X64 IPF
#
-# DRIVER_BINDING = gPxeBcDriverBinding
+# DRIVER_BINDING = gPxeBcDriverBinding
# COMPONENT_NAME = gPxeBcComponentName
# COMPONENT_NAME2 = gPxeBcComponentName2
#
@@ -51,7 +51,7 @@ PxeBcDhcp.c
PxeBcMtftp.h
PxeBcDriver.h
-
+
[Packages]
MdePkg/MdePkg.dec
@@ -86,8 +86,8 @@ gEfiIp4ProtocolGuid ## TO_START
gEfiIp4Config2ProtocolGuid ## TO_START
-[Pcd]
- gEfiMdeModulePkgTokenSpaceGuid.PcdTftpBlockSize ## SOMETIMES_CONSUMES
+[Pcd]
+ gEfiMdeModulePkgTokenSpaceGuid.PcdTftpBlockSize ## SOMETIMES_CONSUMES
[UserExtensions.TianoCore."ExtraFiles"]
UefiPxe4BcDxeExtra.uni
diff --git a/MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigDriver.c b/MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigDriver.c index 7dfea2e..91d0ed2 100644 --- a/MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigDriver.c +++ b/MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigDriver.c @@ -1,7 +1,7 @@ /** @file
The driver binding for VLAN configuration module.
-Copyright (c) 2009 - 2014, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2009 - 2018, Intel Corporation. All rights reserved.<BR>
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
@@ -279,7 +279,7 @@ VlanConfigDriverBindingStop ( if (NumberOfChildren != 1 || ChildHandleBuffer[0] != PrivateData->DriverHandle) {
return EFI_DEVICE_ERROR;
}
-
+
return UninstallVlanConfigForm (PrivateData);
}
diff --git a/MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigDxe.uni b/MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigDxe.uni index dabec1f..715bf8c 100644 --- a/MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigDxe.uni +++ b/MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigDxe.uni @@ -4,13 +4,13 @@ // This module produces EFI HII Configuration Access Protocol to provide one way to
// configurate VALN setting
//
-// Copyright (c) 2009 - 2014, Intel Corporation. All rights reserved.<BR>
+// Copyright (c) 2009 - 2018, Intel Corporation. All rights reserved.<BR>
//
// 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,
// WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
//
diff --git a/MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigDxeExtra.uni b/MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigDxeExtra.uni index 1c15b7c..d338520 100644 --- a/MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigDxeExtra.uni +++ b/MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigDxeExtra.uni @@ -1,7 +1,7 @@ // /** @file
// VlanConfigDxe Localized Strings and Content
//
-// Copyright (c) 2013 - 2014, Intel Corporation. All rights reserved.<BR>
+// Copyright (c) 2013 - 2018, Intel Corporation. All rights reserved.<BR>
//
// This program and the accompanying materials
// are licensed and made available under the terms and conditions of the BSD License
@@ -13,8 +13,8 @@ //
// **/
-#string STR_PROPERTIES_MODULE_NAME
-#language en-US
+#string STR_PROPERTIES_MODULE_NAME
+#language en-US
"VLAN Configuration DXE Driver"
diff --git a/MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigImpl.c b/MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigImpl.c index f035706..0bdffa2 100644 --- a/MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigImpl.c +++ b/MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigImpl.c @@ -1,7 +1,7 @@ /** @file
HII Config Access protocol implementation of VLAN configuration module.
-Copyright (c) 2009 - 2017, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2009 - 2018, Intel Corporation. All rights reserved.<BR>
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
@@ -327,7 +327,7 @@ VlanCallback ( break;
}
}
-
+
HiiSetBrowserData (&gVlanConfigFormSetGuid, mVlanStorageName, sizeof (VLAN_CONFIGURATION), (UINT8 *) Configuration, NULL);
FreePool (Configuration);
return EFI_SUCCESS;
@@ -607,7 +607,7 @@ UninstallVlanConfigForm ( {
EFI_STATUS Status;
EFI_VLAN_CONFIG_PROTOCOL *VlanConfig;
-
+
//
// End the parent-child relationship.
//
diff --git a/MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigStrings.uni b/MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigStrings.uni index d7a1769..0e65837 100644 --- a/MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigStrings.uni +++ b/MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigStrings.uni @@ -1,7 +1,7 @@ ///** @file
// String definitions for VLAN Configuration Form.
//
-// Copyright (c) 2010 - 2011, Intel Corporation. All rights reserved.<BR>
+// Copyright (c) 2010 - 2018, Intel Corporation. All rights reserved.<BR>
// 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
@@ -35,4 +35,4 @@ #string STR_VLAN_REMOVE_VLAN_HELP #language en-US "Remove selected VLANs"
#string STR_VLAN_NULL_STRING #language en-US ""
#string STR_GET_CURRENT_SETTING #language en-US "Enter Configuration Menu"
-#string STR_GET_CURRENT_SETTING_HELP #language en-US "Press ENTER to enter configuration menu for VLAN configuration."
\ No newline at end of file +#string STR_GET_CURRENT_SETTING_HELP #language en-US "Press ENTER to enter configuration menu for VLAN configuration."
diff --git a/MdeModulePkg/Universal/PCD/Dxe/Pcd.c b/MdeModulePkg/Universal/PCD/Dxe/Pcd.c index c30e9d3..bc308af 100644 --- a/MdeModulePkg/Universal/PCD/Dxe/Pcd.c +++ b/MdeModulePkg/Universal/PCD/Dxe/Pcd.c @@ -3,7 +3,7 @@ produce the implementation of native PCD protocol and EFI_PCD_PROTOCOL defined in
PI 1.4a Vol3.
-Copyright (c) 2006 - 2017, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>
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
@@ -22,7 +22,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. EFI_LOCK mPcdDatabaseLock = EFI_INITIALIZE_LOCK_VARIABLE(TPL_NOTIFY);
///
-/// PCD_PROTOCOL the EDKII native implementation which support dynamic
+/// PCD_PROTOCOL the EDKII native implementation which support dynamic
/// type and dynamicEx type PCDs.
///
PCD_PROTOCOL mPcdInstance = {
@@ -112,9 +112,9 @@ EFI_HANDLE mPcdHandle = NULL; /**
Main entry for PCD DXE driver.
-
+
This routine initialize the PCD database and install PCD_PROTOCOL.
-
+
@param ImageHandle Image handle for PCD DXE driver.
@param SystemTable Pointer to SystemTable.
@@ -245,21 +245,21 @@ DxeGetPcdInfoGetSku ( /**
Sets the SKU value for subsequent calls to set or get PCD token values.
- SetSku() sets the SKU Id to be used for subsequent calls to set or get PCD values.
+ SetSku() sets the SKU Id to be used for subsequent calls to set or get PCD values.
SetSku() is normally called only once by the system.
- For each item (token), the database can hold a single value that applies to all SKUs,
- or multiple values, where each value is associated with a specific SKU Id. Items with multiple,
- SKU-specific values are called SKU enabled.
-
+ For each item (token), the database can hold a single value that applies to all SKUs,
+ or multiple values, where each value is associated with a specific SKU Id. Items with multiple,
+ SKU-specific values are called SKU enabled.
+
The SKU Id of zero is reserved as a default.
- For tokens that are not SKU enabled, the system ignores any set SKU Id and works with the
- single value for that token. For SKU-enabled tokens, the system will use the SKU Id set by the
- last call to SetSku(). If no SKU Id is set or the currently set SKU Id isn't valid for the specified token,
- the system uses the default SKU Id. If the system attempts to use the default SKU Id and no value has been
+ For tokens that are not SKU enabled, the system ignores any set SKU Id and works with the
+ single value for that token. For SKU-enabled tokens, the system will use the SKU Id set by the
+ last call to SetSku(). If no SKU Id is set or the currently set SKU Id isn't valid for the specified token,
+ the system uses the default SKU Id. If the system attempts to use the default SKU Id and no value has been
set for that Id, the results are unpredictable.
- @param[in] SkuId The SKU value that will be used when the PCD service will retrieve and
+ @param[in] SkuId The SKU value that will be used when the PCD service will retrieve and
set values associated with a PCD token.
**/
@@ -318,13 +318,13 @@ DxePcdSetSku ( /**
Retrieves an 8-bit value for a given PCD token.
- Retrieves the current byte-sized value for a PCD token number.
+ Retrieves the current byte-sized value for a PCD token number.
If the TokenNumber is invalid, the results are unpredictable.
-
- @param[in] TokenNumber The PCD token number.
+
+ @param[in] TokenNumber The PCD token number.
@return The UINT8 value.
-
+
**/
UINT8
EFIAPI
@@ -338,13 +338,13 @@ DxePcdGet8 ( /**
Retrieves an 16-bit value for a given PCD token.
- Retrieves the current 16-bits value for a PCD token number.
+ Retrieves the current 16-bits value for a PCD token number.
If the TokenNumber is invalid, the results are unpredictable.
-
- @param[in] TokenNumber The PCD token number.
+
+ @param[in] TokenNumber The PCD token number.
@return The UINT16 value.
-
+
**/
UINT16
EFIAPI
@@ -358,13 +358,13 @@ DxePcdGet16 ( /**
Retrieves an 32-bit value for a given PCD token.
- Retrieves the current 32-bits value for a PCD token number.
+ Retrieves the current 32-bits value for a PCD token number.
If the TokenNumber is invalid, the results are unpredictable.
-
- @param[in] TokenNumber The PCD token number.
+
+ @param[in] TokenNumber The PCD token number.
@return The UINT32 value.
-
+
**/
UINT32
EFIAPI
@@ -378,13 +378,13 @@ DxePcdGet32 ( /**
Retrieves an 64-bit value for a given PCD token.
- Retrieves the current 64-bits value for a PCD token number.
+ Retrieves the current 64-bits value for a PCD token number.
If the TokenNumber is invalid, the results are unpredictable.
-
- @param[in] TokenNumber The PCD token number.
+
+ @param[in] TokenNumber The PCD token number.
@return The UINT64 value.
-
+
**/
UINT64
EFIAPI
@@ -398,15 +398,15 @@ DxePcdGet64 ( /**
Retrieves a pointer to a value for a given PCD token.
- Retrieves the current pointer to the buffer for a PCD token number.
- Do not make any assumptions about the alignment of the pointer that
- is returned by this function call. If the TokenNumber is invalid,
+ Retrieves the current pointer to the buffer for a PCD token number.
+ Do not make any assumptions about the alignment of the pointer that
+ is returned by this function call. If the TokenNumber is invalid,
the results are unpredictable.
- @param[in] TokenNumber The PCD token number.
+ @param[in] TokenNumber The PCD token number.
@return The pointer to the buffer to be retrived.
-
+
**/
VOID *
EFIAPI
@@ -420,15 +420,15 @@ DxePcdGetPtr ( /**
Retrieves a Boolean value for a given PCD token.
- Retrieves the current boolean value for a PCD token number.
- Do not make any assumptions about the alignment of the pointer that
- is returned by this function call. If the TokenNumber is invalid,
+ Retrieves the current boolean value for a PCD token number.
+ Do not make any assumptions about the alignment of the pointer that
+ is returned by this function call. If the TokenNumber is invalid,
the results are unpredictable.
- @param[in] TokenNumber The PCD token number.
+ @param[in] TokenNumber The PCD token number.
@return The Boolean value.
-
+
**/
BOOLEAN
EFIAPI
@@ -442,13 +442,13 @@ DxePcdGetBool ( /**
Retrieves the size of the value for a given PCD token.
- Retrieves the current size of a particular PCD token.
+ Retrieves the current size of a particular PCD token.
If the TokenNumber is invalid, the results are unpredictable.
- @param[in] TokenNumber The PCD token number.
+ @param[in] TokenNumber The PCD token number.
@return The size of the value for the PCD token.
-
+
**/
UINTN
EFIAPI
@@ -470,23 +470,23 @@ DxePcdGetSize ( //
// Backup the TokenNumber passed in as GetPtrTypeSize need the original TokenNumber
- //
+ //
TmpTokenNumber = TokenNumber;
// EBC compiler is very choosy. It may report warning about comparison
- // between UINTN and 0 . So we add 1 in each size of the
+ // between UINTN and 0 . So we add 1 in each size of the
// comparison.
ASSERT (TokenNumber + 1 < mPcdTotalTokenCount + 1);
// EBC compiler is very choosy. It may report warning about comparison
- // between UINTN and 0 . So we add 1 in each size of the
+ // between UINTN and 0 . So we add 1 in each size of the
// comparison.
IsPeiDb = (BOOLEAN) (TokenNumber + 1 < mPeiLocalTokenCount + 1);
-
- TokenNumber = IsPeiDb ? TokenNumber :
+
+ TokenNumber = IsPeiDb ? TokenNumber :
(TokenNumber - mPeiLocalTokenCount);
- LocalTokenNumberTable = IsPeiDb ? (UINT32 *)((UINT8 *)mPcdDatabase.PeiDb + mPcdDatabase.PeiDb->LocalTokenNumberTableOffset)
+ LocalTokenNumberTable = IsPeiDb ? (UINT32 *)((UINT8 *)mPcdDatabase.PeiDb + mPcdDatabase.PeiDb->LocalTokenNumberTableOffset)
: (UINT32 *)((UINT8 *)mPcdDatabase.DxeDb + mPcdDatabase.DxeDb->LocalTokenNumberTableOffset);
Size = (LocalTokenNumberTable[TokenNumber] & PCD_DATUM_TYPE_ALL_SET) >> PCD_DATUM_TYPE_SHIFT;
@@ -505,16 +505,16 @@ DxePcdGetSize ( /**
Retrieves an 8-bit value for a given PCD token.
- Retrieves the 8-bit value of a particular PCD token.
+ Retrieves the 8-bit value of a particular PCD token.
If the TokenNumber is invalid or the token space
- specified by Guid does not exist, the results are
+ specified by Guid does not exist, the results are
unpredictable.
@param[in] Guid The token space for the token number.
- @param[in] ExTokenNumber The PCD token number.
+ @param[in] ExTokenNumber The PCD token number.
@return The size 8-bit value for the PCD token.
-
+
**/
UINT8
EFIAPI
@@ -529,16 +529,16 @@ DxePcdGet8Ex ( /**
Retrieves an 16-bit value for a given PCD token.
- Retrieves the 16-bit value of a particular PCD token.
+ Retrieves the 16-bit value of a particular PCD token.
If the TokenNumber is invalid or the token space
- specified by Guid does not exist, the results are
+ specified by Guid does not exist, the results are
unpredictable.
@param[in] Guid The token space for the token number.
- @param[in] ExTokenNumber The PCD token number.
+ @param[in] ExTokenNumber The PCD token number.
@return The size 16-bit value for the PCD token.
-
+
**/
UINT16
EFIAPI
@@ -553,16 +553,16 @@ DxePcdGet16Ex ( /**
Retrieves an 32-bit value for a given PCD token.
- Retrieves the 32-bit value of a particular PCD token.
+ Retrieves the 32-bit value of a particular PCD token.
If the TokenNumber is invalid or the token space
- specified by Guid does not exist, the results are
+ specified by Guid does not exist, the results are
unpredictable.
@param[in] Guid The token space for the token number.
- @param[in] ExTokenNumber The PCD token number.
+ @param[in] ExTokenNumber The PCD token number.
@return The size 32-bit value for the PCD token.
-
+
**/
UINT32
EFIAPI
@@ -577,16 +577,16 @@ DxePcdGet32Ex ( /**
Retrieves an 64-bit value for a given PCD token.
- Retrieves the 64-bit value of a particular PCD token.
+ Retrieves the 64-bit value of a particular PCD token.
If the TokenNumber is invalid or the token space
- specified by Guid does not exist, the results are
+ specified by Guid does not exist, the results are
unpredictable.
@param[in] Guid The token space for the token number.
- @param[in] ExTokenNumber The PCD token number.
+ @param[in] ExTokenNumber The PCD token number.
@return The size 64-bit value for the PCD token.
-
+
**/
UINT64
EFIAPI
@@ -601,16 +601,16 @@ DxePcdGet64Ex ( /**
Retrieves a pointer to a value for a given PCD token.
- Retrieves the current pointer to the buffer for a PCD token number.
- Do not make any assumptions about the alignment of the pointer that
- is returned by this function call. If the TokenNumber is invalid,
+ Retrieves the current pointer to the buffer for a PCD token number.
+ Do not make any assumptions about the alignment of the pointer that
+ is returned by this function call. If the TokenNumber is invalid,
the results are unpredictable.
@param[in] Guid The token space for the token number.
- @param[in] ExTokenNumber The PCD token number.
+ @param[in] ExTokenNumber The PCD token number.
@return The pointer to the buffer to be retrived.
-
+
**/
VOID *
EFIAPI
@@ -625,16 +625,16 @@ DxePcdGetPtrEx ( /**
Retrieves an Boolean value for a given PCD token.
- Retrieves the Boolean value of a particular PCD token.
+ Retrieves the Boolean value of a particular PCD token.
If the TokenNumber is invalid or the token space
- specified by Guid does not exist, the results are
+ specified by Guid does not exist, the results are
unpredictable.
@param[in] Guid The token space for the token number.
- @param[in] ExTokenNumber The PCD token number.
+ @param[in] ExTokenNumber The PCD token number.
@return The size Boolean value for the PCD token.
-
+
**/
BOOLEAN
EFIAPI
@@ -649,14 +649,14 @@ DxePcdGetBoolEx ( /**
Retrieves the size of the value for a given PCD token.
- Retrieves the current size of a particular PCD token.
+ Retrieves the current size of a particular PCD token.
If the TokenNumber is invalid, the results are unpredictable.
@param[in] Guid The token space for the token number.
- @param[in] ExTokenNumber The PCD token number.
+ @param[in] ExTokenNumber The PCD token number.
@return The size of the value for the PCD token.
-
+
**/
UINTN
EFIAPI
@@ -671,19 +671,19 @@ DxePcdGetSizeEx ( /**
Sets an 8-bit value for a given PCD token.
- When the PCD service sets a value, it will check to ensure that the
- size of the value being set is compatible with the Token's existing definition.
+ When the PCD service sets a value, it will check to ensure that the
+ size of the value being set is compatible with the Token's existing definition.
If it is not, an error will be returned.
- @param[in] TokenNumber The PCD token number.
+ @param[in] TokenNumber The PCD token number.
@param[in] Value The value to set for the PCD token.
@retval EFI_SUCCESS Procedure returned successfully.
- @retval EFI_INVALID_PARAMETER The PCD service determined that the size of the data
- being set was incompatible with a call to this function.
+ @retval EFI_INVALID_PARAMETER The PCD service determined that the size of the data
+ being set was incompatible with a call to this function.
Use GetSize() to retrieve the size of the target data.
@retval EFI_NOT_FOUND The PCD service could not find the requested token number.
-
+
**/
EFI_STATUS
EFIAPI
@@ -698,19 +698,19 @@ DxePcdSet8 ( /**
Sets an 16-bit value for a given PCD token.
- When the PCD service sets a value, it will check to ensure that the
- size of the value being set is compatible with the Token's existing definition.
+ When the PCD service sets a value, it will check to ensure that the
+ size of the value being set is compatible with the Token's existing definition.
If it is not, an error will be returned.
- @param[in] TokenNumber The PCD token number.
+ @param[in] TokenNumber The PCD token number.
@param[in] Value The value to set for the PCD token.
@retval EFI_SUCCESS Procedure returned successfully.
- @retval EFI_INVALID_PARAMETER The PCD service determined that the size of the data
- being set was incompatible with a call to this function.
+ @retval EFI_INVALID_PARAMETER The PCD service determined that the size of the data
+ being set was incompatible with a call to this function.
Use GetSize() to retrieve the size of the target data.
@retval EFI_NOT_FOUND The PCD service could not find the requested token number.
-
+
**/
EFI_STATUS
EFIAPI
@@ -725,19 +725,19 @@ DxePcdSet16 ( /**
Sets an 32-bit value for a given PCD token.
- When the PCD service sets a value, it will check to ensure that the
- size of the value being set is compatible with the Token's existing definition.
+ When the PCD service sets a value, it will check to ensure that the
+ size of the value being set is compatible with the Token's existing definition.
If it is not, an error will be returned.
- @param[in] TokenNumber The PCD token number.
+ @param[in] TokenNumber The PCD token number.
@param[in] Value The value to set for the PCD token.
@retval EFI_SUCCESS Procedure returned successfully.
- @retval EFI_INVALID_PARAMETER The PCD service determined that the size of the data
- being set was incompatible with a call to this function.
+ @retval EFI_INVALID_PARAMETER The PCD service determined that the size of the data
+ being set was incompatible with a call to this function.
Use GetSize() to retrieve the size of the target data.
@retval EFI_NOT_FOUND The PCD service could not find the requested token number.
-
+
**/
EFI_STATUS
EFIAPI
@@ -752,19 +752,19 @@ DxePcdSet32 ( /**
Sets an 64-bit value for a given PCD token.
- When the PCD service sets a value, it will check to ensure that the
- size of the value being set is compatible with the Token's existing definition.
+ When the PCD service sets a value, it will check to ensure that the
+ size of the value being set is compatible with the Token's existing definition.
If it is not, an error will be returned.
- @param[in] TokenNumber The PCD token number.
+ @param[in] TokenNumber The PCD token number.
@param[in] Value The value to set for the PCD token.
@retval EFI_SUCCESS Procedure returned successfully.
- @retval EFI_INVALID_PARAMETER The PCD service determined that the size of the data
- being set was incompatible with a call to this function.
+ @retval EFI_INVALID_PARAMETER The PCD service determined that the size of the data
+ being set was incompatible with a call to this function.
Use GetSize() to retrieve the size of the target data.
@retval EFI_NOT_FOUND The PCD service could not find the requested token number.
-
+
**/
EFI_STATUS
EFIAPI
@@ -779,23 +779,23 @@ DxePcdSet64 ( /**
Sets a value of a specified size for a given PCD token.
- When the PCD service sets a value, it will check to ensure that the
- size of the value being set is compatible with the Token's existing definition.
+ When the PCD service sets a value, it will check to ensure that the
+ size of the value being set is compatible with the Token's existing definition.
If it is not, an error will be returned.
- @param[in] TokenNumber The PCD token number.
- @param[in, out] SizeOfBuffer A pointer to the length of the value being set for the PCD token.
- On input, if the SizeOfValue is greater than the maximum size supported
- for this TokenNumber then the output value of SizeOfValue will reflect
+ @param[in] TokenNumber The PCD token number.
+ @param[in, out] SizeOfBuffer A pointer to the length of the value being set for the PCD token.
+ On input, if the SizeOfValue is greater than the maximum size supported
+ for this TokenNumber then the output value of SizeOfValue will reflect
the maximum size supported for this TokenNumber.
@param[in] Buffer The buffer to set for the PCD token.
@retval EFI_SUCCESS Procedure returned successfully.
- @retval EFI_INVALID_PARAMETER The PCD service determined that the size of the data
- being set was incompatible with a call to this function.
+ @retval EFI_INVALID_PARAMETER The PCD service determined that the size of the data
+ being set was incompatible with a call to this function.
Use GetSize() to retrieve the size of the target data.
@retval EFI_NOT_FOUND The PCD service could not find the requested token number.
-
+
**/
EFI_STATUS
EFIAPI
@@ -811,19 +811,19 @@ DxePcdSetPtr ( /**
Sets an Boolean value for a given PCD token.
- When the PCD service sets a value, it will check to ensure that the
- size of the value being set is compatible with the Token's existing definition.
+ When the PCD service sets a value, it will check to ensure that the
+ size of the value being set is compatible with the Token's existing definition.
If it is not, an error will be returned.
- @param[in] TokenNumber The PCD token number.
+ @param[in] TokenNumber The PCD token number.
@param[in] Value The value to set for the PCD token.
@retval EFI_SUCCESS Procedure returned successfully.
- @retval EFI_INVALID_PARAMETER The PCD service determined that the size of the data
- being set was incompatible with a call to this function.
+ @retval EFI_INVALID_PARAMETER The PCD service determined that the size of the data
+ being set was incompatible with a call to this function.
Use GetSize() to retrieve the size of the target data.
@retval EFI_NOT_FOUND The PCD service could not find the requested token number.
-
+
**/
EFI_STATUS
EFIAPI
@@ -838,20 +838,20 @@ DxePcdSetBool ( /**
Sets an 8-bit value for a given PCD token.
- When the PCD service sets a value, it will check to ensure that the
- size of the value being set is compatible with the Token's existing definition.
+ When the PCD service sets a value, it will check to ensure that the
+ size of the value being set is compatible with the Token's existing definition.
If it is not, an error will be returned.
@param[in] Guid The 128-bit unique value that designates the namespace from which to extract the value.
- @param[in] ExTokenNumber The PCD token number.
+ @param[in] ExTokenNumber The PCD token number.
@param[in] Value The value to set for the PCD token.
@retval EFI_SUCCESS Procedure returned successfully.
- @retval EFI_INVALID_PARAMETER The PCD service determined that the size of the data
- being set was incompatible with a call to this function.
+ @retval EFI_INVALID_PARAMETER The PCD service determined that the size of the data
+ being set was incompatible with a call to this function.
Use GetSize() to retrieve the size of the target data.
@retval EFI_NOT_FOUND The PCD service could not find the requested token number.
-
+
**/
EFI_STATUS
EFIAPI
@@ -867,20 +867,20 @@ DxePcdSet8Ex ( /**
Sets an 16-bit value for a given PCD token.
- When the PCD service sets a value, it will check to ensure that the
- size of the value being set is compatible with the Token's existing definition.
+ When the PCD service sets a value, it will check to ensure that the
+ size of the value being set is compatible with the Token's existing definition.
If it is not, an error will be returned.
@param[in] Guid The 128-bit unique value that designates the namespace from which to extract the value.
- @param[in] ExTokenNumber The PCD token number.
+ @param[in] ExTokenNumber The PCD token number.
@param[in] Value The value to set for the PCD token.
@retval EFI_SUCCESS Procedure returned successfully.
- @retval EFI_INVALID_PARAMETER The PCD service determined that the size of the data
- being set was incompatible with a call to this function.
+ @retval EFI_INVALID_PARAMETER The PCD service determined that the size of the data
+ being set was incompatible with a call to this function.
Use GetSize() to retrieve the size of the target data.
@retval EFI_NOT_FOUND The PCD service could not find the requested token number.
-
+
**/
EFI_STATUS
EFIAPI
@@ -896,20 +896,20 @@ DxePcdSet16Ex ( /**
Sets an 32-bit value for a given PCD token.
- When the PCD service sets a value, it will check to ensure that the
- size of the value being set is compatible with the Token's existing definition.
+ When the PCD service sets a value, it will check to ensure that the
+ size of the value being set is compatible with the Token's existing definition.
If it is not, an error will be returned.
@param[in] Guid The 128-bit unique value that designates the namespace from which to extract the value.
- @param[in] ExTokenNumber The PCD token number.
+ @param[in] ExTokenNumber The PCD token number.
@param[in] Value The value to set for the PCD token.
@retval EFI_SUCCESS Procedure returned successfully.
- @retval EFI_INVALID_PARAMETER The PCD service determined that the size of the data
- being set was incompatible with a call to this function.
+ @retval EFI_INVALID_PARAMETER The PCD service determined that the size of the data
+ being set was incompatible with a call to this function.
Use GetSize() to retrieve the size of the target data.
@retval EFI_NOT_FOUND The PCD service could not find the requested token number.
-
+
**/
EFI_STATUS
EFIAPI
@@ -925,20 +925,20 @@ DxePcdSet32Ex ( /**
Sets an 64-bit value for a given PCD token.
- When the PCD service sets a value, it will check to ensure that the
- size of the value being set is compatible with the Token's existing definition.
+ When the PCD service sets a value, it will check to ensure that the
+ size of the value being set is compatible with the Token's existing definition.
If it is not, an error will be returned.
@param[in] Guid The 128-bit unique value that designates the namespace from which to extract the value.
- @param[in] ExTokenNumber The PCD token number.
+ @param[in] ExTokenNumber The PCD token number.
@param[in] Value The value to set for the PCD token.
@retval EFI_SUCCESS Procedure returned successfully.
- @retval EFI_INVALID_PARAMETER The PCD service determined that the size of the data
- being set was incompatible with a call to this function.
+ @retval EFI_INVALID_PARAMETER The PCD service determined that the size of the data
+ being set was incompatible with a call to this function.
Use GetSize() to retrieve the size of the target data.
@retval EFI_NOT_FOUND The PCD service could not find the requested token number.
-
+
**/
EFI_STATUS
EFIAPI
@@ -954,24 +954,24 @@ DxePcdSet64Ex ( /**
Sets a value of a specified size for a given PCD token.
- When the PCD service sets a value, it will check to ensure that the
- size of the value being set is compatible with the Token's existing definition.
+ When the PCD service sets a value, it will check to ensure that the
+ size of the value being set is compatible with the Token's existing definition.
If it is not, an error will be returned.
@param[in] Guid The 128-bit unique value that designates the namespace from which to extract the value.
- @param[in] ExTokenNumber The PCD token number.
- @param[in, out] SizeOfBuffer A pointer to the length of the value being set for the PCD token.
- On input, if the SizeOfValue is greater than the maximum size supported
- for this TokenNumber then the output value of SizeOfValue will reflect
+ @param[in] ExTokenNumber The PCD token number.
+ @param[in, out] SizeOfBuffer A pointer to the length of the value being set for the PCD token.
+ On input, if the SizeOfValue is greater than the maximum size supported
+ for this TokenNumber then the output value of SizeOfValue will reflect
the maximum size supported for this TokenNumber.
@param[in] Buffer The buffer to set for the PCD token.
@retval EFI_SUCCESS Procedure returned successfully.
- @retval EFI_INVALID_PARAMETER The PCD service determined that the size of the data
- being set was incompatible with a call to this function.
+ @retval EFI_INVALID_PARAMETER The PCD service determined that the size of the data
+ being set was incompatible with a call to this function.
Use GetSize() to retrieve the size of the target data.
@retval EFI_NOT_FOUND The PCD service could not find the requested token number.
-
+
**/
EFI_STATUS
EFIAPI
@@ -988,20 +988,20 @@ DxePcdSetPtrEx ( /**
Sets an Boolean value for a given PCD token.
- When the PCD service sets a value, it will check to ensure that the
- size of the value being set is compatible with the Token's existing definition.
+ When the PCD service sets a value, it will check to ensure that the
+ size of the value being set is compatible with the Token's existing definition.
If it is not, an error will be returned.
@param[in] Guid The 128-bit unique value that designates the namespace from which to extract the value.
- @param[in] ExTokenNumber The PCD token number.
+ @param[in] ExTokenNumber The PCD token number.
@param[in] Value The value to set for the PCD token.
@retval EFI_SUCCESS Procedure returned successfully.
- @retval EFI_INVALID_PARAMETER The PCD service determined that the size of the data
- being set was incompatible with a call to this function.
+ @retval EFI_INVALID_PARAMETER The PCD service determined that the size of the data
+ being set was incompatible with a call to this function.
Use GetSize() to retrieve the size of the target data.
@retval EFI_NOT_FOUND The PCD service could not find the requested token number.
-
+
**/
EFI_STATUS
EFIAPI
@@ -1018,10 +1018,10 @@ DxePcdSetBoolEx ( Specifies a function to be called anytime the value of a designated token is changed.
@param[in] Guid The 128-bit unique value that designates the namespace from which to extract the value.
- @param[in] TokenNumber The PCD token number.
- @param[in] CallBackFunction The function prototype called when the value associated with the CallBackToken is set.
+ @param[in] TokenNumber The PCD token number.
+ @param[in] CallBackFunction The function prototype called when the value associated with the CallBackToken is set.
- @retval EFI_SUCCESS The PCD service has successfully established a call event
+ @retval EFI_SUCCESS The PCD service has successfully established a call event
for the CallBackToken requested.
@retval EFI_NOT_FOUND The PCD service could not find the referenced token number.
@@ -1035,7 +1035,7 @@ DxeRegisterCallBackOnSet ( )
{
EFI_STATUS Status;
-
+
if (CallBackFunction == NULL) {
return EFI_INVALID_PARAMETER;
}
@@ -1047,7 +1047,7 @@ DxeRegisterCallBackOnSet ( Status = DxeRegisterCallBackWorker (TokenNumber, Guid, CallBackFunction);
EfiReleaseLock (&mPcdDatabaseLock);
-
+
return Status;
}
@@ -1055,10 +1055,10 @@ DxeRegisterCallBackOnSet ( Cancels a previously set callback function for a particular PCD token number.
@param[in] Guid The 128-bit unique value that designates the namespace from which to extract the value.
- @param[in] TokenNumber The PCD token number.
- @param[in] CallBackFunction The function prototype called when the value associated with the CallBackToken is set.
+ @param[in] TokenNumber The PCD token number.
+ @param[in] CallBackFunction The function prototype called when the value associated with the CallBackToken is set.
- @retval EFI_SUCCESS The PCD service has successfully established a call event
+ @retval EFI_SUCCESS The PCD service has successfully established a call event
for the CallBackToken requested.
@retval EFI_NOT_FOUND The PCD service could not find the referenced token number.
@@ -1072,7 +1072,7 @@ DxeUnRegisterCallBackOnSet ( )
{
EFI_STATUS Status;
-
+
if (CallBackFunction == NULL) {
return EFI_INVALID_PARAMETER;
}
@@ -1081,35 +1081,35 @@ DxeUnRegisterCallBackOnSet ( // Aquire lock to prevent reentrance from TPL_CALLBACK level
//
EfiAcquireLock (&mPcdDatabaseLock);
-
+
Status = DxeUnRegisterCallBackWorker (TokenNumber, Guid, CallBackFunction);
EfiReleaseLock (&mPcdDatabaseLock);
-
+
return Status;
}
/**
- Retrieves the next valid token number in a given namespace.
-
- This is useful since the PCD infrastructure contains a sparse list of token numbers,
- and one cannot a priori know what token numbers are valid in the database.
-
- If TokenNumber is 0 and Guid is not NULL, then the first token from the token space specified by Guid is returned.
- If TokenNumber is not 0 and Guid is not NULL, then the next token in the token space specified by Guid is returned.
- If TokenNumber is 0 and Guid is NULL, then the first token in the default token space is returned.
- If TokenNumber is not 0 and Guid is NULL, then the next token in the default token space is returned.
- The token numbers in the default token space may not be related to token numbers in token spaces that are named by Guid.
- If the next token number can be retrieved, then it is returned in TokenNumber, and EFI_SUCCESS is returned.
- If TokenNumber represents the last token number in the token space specified by Guid, then EFI_NOT_FOUND is returned.
+ Retrieves the next valid token number in a given namespace.
+
+ This is useful since the PCD infrastructure contains a sparse list of token numbers,
+ and one cannot a priori know what token numbers are valid in the database.
+
+ If TokenNumber is 0 and Guid is not NULL, then the first token from the token space specified by Guid is returned.
+ If TokenNumber is not 0 and Guid is not NULL, then the next token in the token space specified by Guid is returned.
+ If TokenNumber is 0 and Guid is NULL, then the first token in the default token space is returned.
+ If TokenNumber is not 0 and Guid is NULL, then the next token in the default token space is returned.
+ The token numbers in the default token space may not be related to token numbers in token spaces that are named by Guid.
+ If the next token number can be retrieved, then it is returned in TokenNumber, and EFI_SUCCESS is returned.
+ If TokenNumber represents the last token number in the token space specified by Guid, then EFI_NOT_FOUND is returned.
If TokenNumber is not present in the token space specified by Guid, then EFI_NOT_FOUND is returned.
- @param[in] Guid The 128-bit unique value that designates the namespace from which to retrieve the next token.
- This is an optional parameter that may be NULL. If this parameter is NULL, then a request is
+ @param[in] Guid The 128-bit unique value that designates the namespace from which to retrieve the next token.
+ This is an optional parameter that may be NULL. If this parameter is NULL, then a request is
being made to retrieve tokens from the default token space.
- @param[in, out] TokenNumber
- A pointer to the PCD token number to use to find the subsequent token number.
+ @param[in, out] TokenNumber
+ A pointer to the PCD token number to use to find the subsequent token number.
@retval EFI_SUCCESS The PCD service has retrieved the next valid token number.
@retval EFI_NOT_FOUND The PCD service could not find data from the requested token number.
@@ -1135,18 +1135,18 @@ DxePcdGetNextToken ( //
if (Guid == NULL) {
// EBC compiler is very choosy. It may report warning about comparison
- // between UINTN and 0 . So we add 1 in each size of the
+ // between UINTN and 0 . So we add 1 in each size of the
// comparison.
if (((*TokenNumber + 1 > mPeiNexTokenCount + 1) && (*TokenNumber + 1 <= mPeiLocalTokenCount + 1)) ||
((*TokenNumber + 1 > (mPeiLocalTokenCount + mDxeNexTokenCount + 1)))) {
return EFI_NOT_FOUND;
}
-
+
(*TokenNumber)++;
if ((*TokenNumber + 1 > mPeiNexTokenCount + 1) &&
(*TokenNumber + 1 <= mPeiLocalTokenCount + 1)) {
//
- // The first Non-Ex type Token Number for DXE PCD
+ // The first Non-Ex type Token Number for DXE PCD
// database is mPeiLocalTokenCount + 1
//
if (mDxeNexTokenCount > 0) {
@@ -1249,9 +1249,9 @@ GetDistinctTokenSpace ( //
*ExMapTableSize = TsIdx + 1;
return DistinctTokenSpace;
-
+
}
-
+
/**
Retrieves the next valid PCD token namespace for a given namespace.
@@ -1263,7 +1263,7 @@ GetDistinctTokenSpace ( token namespace on the platform. If *Guid is NULL, then the GUID of the first token
space of the current platform is returned. If the search cannot locate the next valid
token namespace, an error is returned and the value of *Guid is undefined.
-
+
@retval EFI_SUCCESS The PCD service retrieved the value requested.
@retval EFI_NOT_FOUND The PCD service could not find the next valid token namespace.
@@ -1286,14 +1286,14 @@ DxePcdGetNextTokenSpace ( BOOLEAN DxeExMapTableEmpty;
ASSERT (Guid != NULL);
-
+
PeiExMapTableEmpty = mPeiExMapTableEmpty;
DxeExMapTableEmpty = mDxeExMapTableEmpty;
if (PeiExMapTableEmpty && DxeExMapTableEmpty) {
return EFI_NOT_FOUND;
}
-
+
if (TmpTokenSpaceBuffer[0] == NULL) {
PeiTokenSpaceTableSize = 0;
@@ -1340,7 +1340,7 @@ DxePcdGetNextTokenSpace ( *Guid = TmpTokenSpaceBuffer[0];
return EFI_SUCCESS;
}
-
+
for (Idx = 0; Idx < TmpTokenSpaceBufferCount; Idx++) {
if (CompareGuid (*Guid, TmpTokenSpaceBuffer[Idx])) {
if (Idx == TmpTokenSpaceBufferCount - 1) {
diff --git a/MdeModulePkg/Universal/PCD/Dxe/Pcd.inf b/MdeModulePkg/Universal/PCD/Dxe/Pcd.inf index a20b645..e6b3e0d 100644 --- a/MdeModulePkg/Universal/PCD/Dxe/Pcd.inf +++ b/MdeModulePkg/Universal/PCD/Dxe/Pcd.inf @@ -1,19 +1,19 @@ ## @file
# PCD DXE driver manage database contains all dynamic PCD entries and produce the implementation of PCD protocol.
#
-# This version PCD DXE depends on the external PCD database binary file, not built in PCD data base.
+# This version PCD DXE depends on the external PCD database binary file, not built in PCD data base.
# There are two PCD Protocols as follows:
-# 1) PCD_PROTOCOL
+# 1) PCD_PROTOCOL
# It is EDKII implementation which support Dynamic/DynamicEx type Pcds.
# 2) EFI_PCD_PROTOCOL
-# It is defined by PI specification 1.2, Vol 3 which only support dynamicEx
+# It is defined by PI specification 1.2, Vol 3 which only support dynamicEx
# type Pcd.
#
-# For dynamicEx type PCD, it is compatible between PCD_PROTOCOL and EFI_PCD_PROTOCOL.
+# For dynamicEx type PCD, it is compatible between PCD_PROTOCOL and EFI_PCD_PROTOCOL.
# PCD DXE driver will produce above two protocols at same time.
#
-# PCD database is generated as the separate binary image at build time. The binary image
-# will be intergrated into Firmware volume together with PCD driver.
+# PCD database is generated as the separate binary image at build time. The binary image
+# will be intergrated into Firmware volume together with PCD driver.
#
# ////////////////////////////////////////////////////////////////////////////////
# // //
@@ -22,94 +22,94 @@ # ////////////////////////////////////////////////////////////////////////////////
#
# 1, Introduction
-# PCD database hold all dynamic type PCD information. The structure of PEI PCD
-# database is generated by build tools according to dynamic PCD usage for
+# PCD database hold all dynamic type PCD information. The structure of PEI PCD
+# database is generated by build tools according to dynamic PCD usage for
# specified platform.
-#
+#
# 2, Dynamic Type PCD
# Dynamic type PCD is used for the configuration/setting which value is determined
-# dynamic. In contrast, the value of static type PCD (FeatureFlag, FixedPcd,
-# PatchablePcd) is fixed in final generated FD image in build time.
-#
+# dynamic. In contrast, the value of static type PCD (FeatureFlag, FixedPcd,
+# PatchablePcd) is fixed in final generated FD image in build time.
+#
# 2.1 The "dynamic" determination means one of below cases:
-# a) The PCD setting value is produced by someone driver and consumed by
+# a) The PCD setting value is produced by someone driver and consumed by
# other driver in execution time.
# b) The PCD setting value is set/get by user from FrontPage.
# c) The PCD setting value is produced by platform OEM vendor in specified area.
-#
+#
# 2.2 According to module distribution way, dynamic PCD could be classfied as:
# a) Dynamic:
-# If module is released in source code and will be built with platform
+# If module is released in source code and will be built with platform
# DSC, the dynamic PCD used by this module can be accessed as:
-# PcdGetxx(PcdSampleDynamicPcd);
+# PcdGetxx(PcdSampleDynamicPcd);
# In building platform, build tools will translate PcdSampleDynamicPcd to
-# pair of {Token Space Guid: Token Number} for this PCD.
+# pair of {Token Space Guid: Token Number} for this PCD.
# b) DynamicEx:
# If module is release as binary and will not pariticpate platform building,
# the dynamic PCD used by this module need be accessed as:
# PcdGetxxEx(gEfiMyTokenspaceGuid, PcdSampleDynamicPcd)
# Developer need explicity gives {Token Space Guid:Token Number} as parameter
# in writting source code.
-#
+#
# 2.3 According to PCD value's storage method, dynamic PCD could be classfied as:
-# a) Default Storage:
-# - The PCD value is stored in PCD database maintained by PCD driver in boot
+# a) Default Storage:
+# - The PCD value is stored in PCD database maintained by PCD driver in boot
# time memory.
-# - This type is used for communication between PEIM/DXE driver, DXE/DXE
-# driver. But all set/get value will be losted after boot-time memory
+# - This type is used for communication between PEIM/DXE driver, DXE/DXE
+# driver. But all set/get value will be losted after boot-time memory
# is turn off.
-# - [PcdsDynamicDefault] is used as section name for this type PCD in
+# - [PcdsDynamicDefault] is used as section name for this type PCD in
# platform DSC file. [PcdsDynamicExDefault] is used for dynamicEx type PCD.
-#
-# b) Variable Storage:
-# - The PCD value is stored in variable area.
+#
+# b) Variable Storage:
+# - The PCD value is stored in variable area.
# - As default storage type, this type PCD could be used for PEI/DXE driver
-# communication. But beside it, this type PCD could also be used to store
+# communication. But beside it, this type PCD could also be used to store
# the value associate with a HII setting via variable interface.
-# - In PEI phase, the PCD value could only be got but can not be set due
+# - In PEI phase, the PCD value could only be got but can not be set due
# to variable area is readonly.
-# - [PcdsDynamicHii] is used as section name for this type PCD in platform
+# - [PcdsDynamicHii] is used as section name for this type PCD in platform
# DSC file. [PcdsDynamicExHii] is for dynamicEx type PCD.
-#
+#
# c) OEM specificed storage area:
-# - The PCD value is stored in OEM specified area which base address is
+# - The PCD value is stored in OEM specified area which base address is
# specified by a FixedAtBuild PCD setting - PcdVpdBaseAddress.
# - The area is read only for PEI and DXE phase.
-# - [PcdsDynamicVpd] is used as section name for this type PCD in platform
+# - [PcdsDynamicVpd] is used as section name for this type PCD in platform
# DSC file. [PcdsDynamicExVpd] is for dynamicex type PCD.
-#
+#
# 2.4 When and how to use dynamic PCD
# Module developer do not care the used PCD is dynamic or static when writting
-# source code/INF. Dynamic PCD and dynamic type is pointed by platform integrator
+# source code/INF. Dynamic PCD and dynamic type is pointed by platform integrator
# in platform DSC file. Please ref section 2.3 to get matching between dynamic
# PCD type and section name in DSC file.
-#
+#
# 3, PCD database:
-# Although dynamic PCD could be in different storage type as above description,
+# Although dynamic PCD could be in different storage type as above description,
# but the basic information and default value for all dynamic PCD is hold
# by PCD database maintained by PEI/DXE driver.
-#
+#
# As the whole EFI BIOS boot path is divided into PEI/DXE phase, the PCD database
# also is divided into Pei/Dxe database maintaied by PcdPeim/PcdDxe driver separatly.
# To make PcdPeim's driver image smaller, PEI PCD database only hold all dynamic
# PCD information used in PEI phase or use in both PEI/DXE phase. And DXE PCD
# database contains all PCDs used in PEI/DXE phase in memory.
-#
-# Build tool will generate PCD database into the separate binary file for
-# PEI/DXE PCD driver according to dynamic PCD section in platform DSC file.
-#
+#
+# Build tool will generate PCD database into the separate binary file for
+# PEI/DXE PCD driver according to dynamic PCD section in platform DSC file.
+#
# 3.1 PcdPeim and PcdDxe
# PEI PCD database is maintained by PcdPeim driver run from flash. PcdPeim driver
-# build guid hob in temporary memory and copy the binary data base from flash
-# to temporary memory for PEI PCD database.
+# build guid hob in temporary memory and copy the binary data base from flash
+# to temporary memory for PEI PCD database.
# DXE PCD database is maintained by PcdDxe driver.At entry point of PcdDxe driver,
# a new PCD database is allocated in boot-time memory which including all
# PEI PCD and DXE PCD entry.
-#
+#
# Pcd driver should run as early as possible before any other driver access
# dynamic PCD's value. PEI/DXE "Apriori File" mechanism make it possible by
# making PcdPeim/PcdDxe as first dispatching driver in PEI/DXE phase.
-#
+#
# 3.2 Token space Guid/Token number, Platform token, Local token number
# Dynamic PCD
# +-----------+ +---------+
@@ -129,42 +129,42 @@ # | Token |
# | Number |
# +-----------+
-#
-#
+#
+#
# 3.2.1 Pair of Token space guid + Token number
# Any type PCD is identified by pair of "TokenSpaceGuid + TokeNumber". But it
-# is not easy maintained by PCD driver, and hashed token number will make
-# searching slowly.
+# is not easy maintained by PCD driver, and hashed token number will make
+# searching slowly.
#
# 3.2.2 Platform Token Number
-# "Platform token number" concept is introduced for mapping to a pair of
-# "TokenSpaceGuid + TokenNumber". The platform token number is generated by
-# build tool in autogen.h and all of them are continual in a platform scope
+# "Platform token number" concept is introduced for mapping to a pair of
+# "TokenSpaceGuid + TokenNumber". The platform token number is generated by
+# build tool in autogen.h and all of them are continual in a platform scope
# started from 1.(0 meaning invalid internal token number)
# With auto-generated "platform token number", PcdGet(PcdSampleDynamicPcd)
-# in source code is translated to LibPcdGet(_PCD_TOKEN_PcdSampleDynamicPcd)
+# in source code is translated to LibPcdGet(_PCD_TOKEN_PcdSampleDynamicPcd)
# in autogen.h.
# Notes: The mapping between pair of "tokenspace guid + token number" and
# "internal token number" need build tool establish, so "platform token number"
# mechanism is not suitable for binary module which use DynamicEx type PCD.
# To access a dynamicEx type PCD, pair of "token space guid/token number" all need
# to be specificed for PcdSet/PcdGet accessing macro.
-#
-# Platform Token Number is started from 1, and inceased continuous. From whole
+#
+# Platform Token Number is started from 1, and inceased continuous. From whole
# platform scope, there are two zones: PEI Zone and DXE Zone
# | Platform Token Number
# ----------|----------------------------------------------------------------
# PEI Zone: | 1 ~ PEI_LOCAL_TOKEN_NUMBER
# DXE Zone: | (PEI_LOCAL_TOKEN_NUMBER + 1) ~ (PEI_LOCAL_TOKEN_NUMBER + DXE_LOCAL_TOKEN_NUMBER)
-#
+#
# 3.2.3 Local Token Number
-# To fast searching a PCD entry in PCD database, PCD driver translate
+# To fast searching a PCD entry in PCD database, PCD driver translate
# platform token number to local token number via a mapping table.
# For binary DynamicEx type PCD, there is a another mapping table to translate
# "token space guid + token number" to local token number directly.
# Local token number is identifier for all internal interface in PCD PEI/DXE
# driver.
-#
+#
# A local token number is a 32-bit value in following meaning:
# 32 ------------- 28 ---------- 24 -------- 0
# | PCD type mask | Datum Type | Offset |
@@ -184,13 +184,13 @@ # Offset : indicate the related offset of PCD value in PCD database array.
# Based on local token number, PCD driver could fast determine PCD type, value
# type and get PCD entry from PCD database.
-#
+#
# 3.3 PCD Database binary file
-# PCD Database binary file will be created at build time as the standalone binary image.
-# To understand the binary image layout, PCD Database C structure is still generated
+# PCD Database binary file will be created at build time as the standalone binary image.
+# To understand the binary image layout, PCD Database C structure is still generated
# as comments by build tools in PCD driver's autogen.h/
# autogen.c file. In generated C structure, following information is stored:
-# - ExMapTable: This table is used translate a binary dynamicex type PCD's
+# - ExMapTable: This table is used translate a binary dynamicex type PCD's
# "tokenguid + token" to local token number.
# - LocalTokenNumberTable:
# This table stores all local token number in array, use "Internal
@@ -200,19 +200,19 @@ # HII type PCD's variable GUID.
# - SkuIdTable: TBD
# - SystemSkuId: TBD
-# - PCD value structure:
+# - PCD value structure:
# Every PCD has a value record in PCD database. For different
-# datum type PCD has different record structure which will be
+# datum type PCD has different record structure which will be
# introduced in 3.3.1
-#
-# In a PCD database structure, there are two major area: Init and UnInit.
-# Init area is use stored above PCD internal structure such as ExMapTable,
-# LocalTokenNumberTable etc and the (default) value of PCD which has default
+#
+# In a PCD database structure, there are two major area: Init and UnInit.
+# Init area is use stored above PCD internal structure such as ExMapTable,
+# LocalTokenNumberTable etc and the (default) value of PCD which has default
# value specified in platform DSC file.
# Unint area is used stored the value of PCD which has no default value in
# platform DSC file, the value of NULL, 0 specified in platform DSC file can
# be seemed as "no default value".
-#
+#
# 3.3.1 Simple Sample PCD Database C Structure
# A general sample of PCD database structue is as follows:
# typedef struct _PCD_DATABASE {
@@ -224,7 +224,7 @@ # SIZE_INFO SizeTable[PEI_SIZE_TABLE_SIZE];
# UINT8 SkuIdTable[PEI_SKUID_TABLE_SIZE];
# SKU_ID SystemSkuId;
-#
+#
# //===== Following is value structure for PCD with default value
# ....
# ....
@@ -236,11 +236,11 @@ # ....
# } UnInit;
# }
-#
+#
# 3.3.2 PCD value structure in PCD database C structure
# The value's structure is generated by build tool in PCD database C structure.
# The PCDs in different datum type has different value structure.
-#
+#
# 3.3.2.1 UINT8/UINT16/UINT32/UINT64 datum type PCD
# The C structure for these datum type PCD is just a UINT8/UINT16/UINT32/UINT64
# data member in PCD database, For example:
@@ -248,36 +248,36 @@ # Above structure is generated by build tool, the member name is "PcdCName_Guidvalue"
# Member type is UINT16 according to PcdHardwareErrorRecordLevel declaration
# in DEC file.
-#
+#
# 3.3.2.2 VOID* datum type PCD
# The value of VOID* datum type PCD is a UINT8/UINT16 array in PCD database.
-#
+#
# 3.3.2.2.1 VOID* - string type
-# If the default value for VOID* datum type PCD like L"xxx", the PCD is
-# used for unicode string, and C structure of this datum type PCD is
+# If the default value for VOID* datum type PCD like L"xxx", the PCD is
+# used for unicode string, and C structure of this datum type PCD is
# UINT16 string array in PCD database, for example:
# UINT16 StringTable[29];
# The number of 29 in above sample is max size of a unicode string.
-#
+#
# If the default value for VOID* datum type PCD like "xxx", the PCD is
-# used for ascii string, and C structure of this datum type PCD is
+# used for ascii string, and C structure of this datum type PCD is
# UINT8 string array in PCD database, for example:
# UINT8 StringTable[20];
# The number of 20 in above sample is max size of a ascii string.
-#
+#
# 3.3.2.2.2 VOID* - byte array
# If the default value of VOID* datum type PCD like {'0x29', '0x01', '0xf2'}
-# the PCD is used for byte array. The generated structrue is same as
+# the PCD is used for byte array. The generated structrue is same as
# above ascii string table,
# UINT8 StringTable[13];
# The number of 13 in above sample is max size of byte array.
-#
+#
# 3.3.3 Some utility structures in PCD Database
# 3.3.3.1 GuidTable
# GuidTable array is used to store all related GUID value in PCD database:
# - Variable GUID for HII type PCD
-# - Token space GUID for dynamicex type PCD
-#
+# - Token space GUID for dynamicex type PCD
+#
# Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>
#
# This program and the accompanying materials
diff --git a/MdeModulePkg/Universal/PCD/Dxe/PcdDxe.uni b/MdeModulePkg/Universal/PCD/Dxe/PcdDxe.uni index 0883ad8..90b37e0 100644 --- a/MdeModulePkg/Universal/PCD/Dxe/PcdDxe.uni +++ b/MdeModulePkg/Universal/PCD/Dxe/PcdDxe.uni @@ -8,35 +8,35 @@ // 2) EFI_PCD_PROTOCOL
// It is defined by PI specification 1.2, Vol 3 which only support dynamicEx
// type Pcd.
-//
+//
// For dynamicEx type PCD, it is compatible between PCD_PROTOCOL and EFI_PCD_PROTOCOL.
// PCD DXE driver will produce above two protocols at same time.
-//
+//
// PCD database is generated as the separate binary image at build time. The binary image
// will be intergrated into Firmware volume together with PCD driver.
-//
+//
// ////////////////////////////////////////////////////////////////////////////////
// // //
// // Introduction of PCD database //
// // //
// ////////////////////////////////////////////////////////////////////////////////
-//
+//
// 1, Introduction
// PCD database hold all dynamic type PCD information. The structure of PEI PCD
// database is generated by build tools according to dynamic PCD usage for
// specified platform.
-//
+//
// 2, Dynamic Type PCD
// Dynamic type PCD is used for the configuration/setting which value is determined
// dynamic. In contrast, the value of static type PCD (FeatureFlag, FixedPcd,
// PatchablePcd) is fixed in final generated FD image in build time.
-//
+//
// 2.1 The "dynamic" determination means one of below cases:
// a) The PCD setting value is produced by someone driver and consumed by
// other driver in execution time.
// b) The PCD setting value is set/get by user from FrontPage.
// c) The PCD setting value is produced by platform OEM vendor in specified area.
-//
+//
// 2.2 According to module distribution way, dynamic PCD could be classfied as:
// a) Dynamic:
// If module is released in source code and will be built with platform
@@ -50,7 +50,7 @@ // PcdGetxxEx(gEfiMyTokenspaceGuid, PcdSampleDynamicPcd)
// Developer need explicity gives {Token Space Guid:Token Number} as parameter
// in writting source code.
-//
+//
// 2.3 According to PCD value's storage method, dynamic PCD could be classfied as:
// a) Default Storage:
// - The PCD value is stored in PCD database maintained by PCD driver in boot
@@ -60,7 +60,7 @@ // is turn off.
// - [PcdsDynamicDefault] is used as section name for this type PCD in
// platform DSC file. [PcdsDynamicExDefault] is used for dynamicEx type PCD.
-//
+//
// b) Variable Storage:
// - The PCD value is stored in variable area.
// - As default storage type, this type PCD could be used for PEI/DXE driver
@@ -70,34 +70,34 @@ // to variable area is readonly.
// - [PcdsDynamicHii] is used as section name for this type PCD in platform
// DSC file. [PcdsDynamicExHii] is for dynamicEx type PCD.
-//
+//
// c) OEM specificed storage area:
// - The PCD value is stored in OEM specified area which base address is
// specified by a FixedAtBuild PCD setting - PcdVpdBaseAddress.
// - The area is read only for PEI and DXE phase.
// - [PcdsDynamicVpd] is used as section name for this type PCD in platform
// DSC file. [PcdsDynamicExVpd] is for dynamicex type PCD.
-//
+//
// 2.4 When and how to use dynamic PCD
// Module developer do not care the used PCD is dynamic or static when writting
// source code/INF. Dynamic PCD and dynamic type is pointed by platform integrator
// in platform DSC file. Please ref section 2.3 to get matching between dynamic
// PCD type and section name in DSC file.
-//
+//
// 3, PCD database:
// Although dynamic PCD could be in different storage type as above description,
// but the basic information and default value for all dynamic PCD is hold
// by PCD database maintained by PEI/DXE driver.
-//
+//
// As the whole EFI BIOS boot path is divided into PEI/DXE phase, the PCD database
// also is divided into Pei/Dxe database maintaied by PcdPeim/PcdDxe driver separatly.
// To make PcdPeim's driver image smaller, PEI PCD database only hold all dynamic
// PCD information used in PEI phase or use in both PEI/DXE phase. And DXE PCD
// database contains all PCDs used in PEI/DXE phase in memory.
-//
+//
// Build tool will generate PCD database into the separate binary file for
// PEI/DXE PCD driver according to dynamic PCD section in platform DSC file.
-//
+//
// 3.1 PcdPeim and PcdDxe
// PEI PCD database is maintained by PcdPeim driver run from flash. PcdPeim driver
// build guid hob in temporary memory and copy the binary data base from flash
@@ -105,11 +105,11 @@ // DXE PCD database is maintained by PcdDxe driver.At entry point of PcdDxe driver,
// a new PCD database is allocated in boot-time memory which including all
// PEI PCD and DXE PCD entry.
-//
+//
// Pcd driver should run as early as possible before any other driver access
// dynamic PCD's value. PEI/DXE "Apriori File" mechanism make it possible by
// making PcdPeim/PcdDxe as first dispatching driver in PEI/DXE phase.
-//
+//
// 3.2 Token space Guid/Token number, Platform token, Local token number
// Dynamic PCD
// +-----------+ +---------+
@@ -129,13 +129,13 @@ // | Token |
// | Number |
// +-----------+
-//
-//
+//
+//
// 3.2.1 Pair of Token space guid + Token number
// Any type PCD is identified by pair of "TokenSpaceGuid + TokeNumber". But it
// is not easy maintained by PCD driver, and hashed token number will make
// searching slowly.
-//
+//
// 3.2.2 Platform Token Number
// "Platform token number" concept is introduced for mapping to a pair of
// "TokenSpaceGuid + TokenNumber". The platform token number is generated by
@@ -149,14 +149,14 @@ // mechanism is not suitable for binary module which use DynamicEx type PCD.
// To access a dynamicEx type PCD, pair of "token space guid/token number" all need
// to be specificed for PcdSet/PcdGet accessing macro.
-//
+//
// Platform Token Number is started from 1, and inceased continuous. From whole
// platform scope, there are two zones: PEI Zone and DXE Zone
// | Platform Token Number
// ----------|----------------------------------------------------------------
// PEI Zone: | 1 ~ PEI_LOCAL_TOKEN_NUMBER
// DXE Zone: | (PEI_LOCAL_TOKEN_NUMBER + 1) ~ (PEI_LOCAL_TOKEN_NUMBER + DXE_LOCAL_TOKEN_NUMBER)
-//
+//
// 3.2.3 Local Token Number
// To fast searching a PCD entry in PCD database, PCD driver translate
// platform token number to local token number via a mapping table.
@@ -164,7 +164,7 @@ // "token space guid + token number" to local token number directly.
// Local token number is identifier for all internal interface in PCD PEI/DXE
// driver.
-//
+//
// A local token number is a 32-bit value in following meaning:
// 32 ------------- 28 ---------- 24 -------- 0
// | PCD type mask | Datum Type | Offset |
@@ -184,7 +184,7 @@ // Offset : indicate the related offset of PCD value in PCD database array.
// Based on local token number, PCD driver could fast determine PCD type, value
// type and get PCD entry from PCD database.
-//
+//
// 3.3 PCD Database binary file
// PCD Database binary file will be created at build time as the standalone binary image.
// To understand the binary image layout, PCD Database C structure is still generated
@@ -204,7 +204,7 @@ // Every PCD has a value record in PCD database. For different
// datum type PCD has different record structure which will be
// introduced in 3.3.1
-//
+//
// In a PCD database structure, there are two major area: Init and UnInit.
// Init area is use stored above PCD internal structure such as ExMapTable,
// LocalTokenNumberTable etc and the (default) value of PCD which has default
@@ -212,7 +212,7 @@ // Unint area is used stored the value of PCD which has no default value in
// platform DSC file, the value of NULL, 0 specified in platform DSC file can
// be seemed as "no default value".
-//
+//
// 3.3.1 Simple Sample PCD Database C Structure
// A general sample of PCD database structue is as follows:
// typedef struct _PCD_DATABASE {
@@ -224,7 +224,7 @@ // SIZE_INFO SizeTable[PEI_SIZE_TABLE_SIZE];
// UINT8 SkuIdTable[PEI_SKUID_TABLE_SIZE];
// SKU_ID SystemSkuId;
-//
+//
// //===== Following is value structure for PCD with default value
// ....
// ....
@@ -236,11 +236,11 @@ // ....
// } UnInit;
// }
-//
+//
// 3.3.2 PCD value structure in PCD database C structure
// The value's structure is generated by build tool in PCD database C structure.
// The PCDs in different datum type has different value structure.
-//
+//
// 3.3.2.1 UINT8/UINT16/UINT32/UINT64 datum type PCD
// The C structure for these datum type PCD is just a UINT8/UINT16/UINT32/UINT64
// data member in PCD database, For example:
@@ -248,30 +248,30 @@ // Above structure is generated by build tool, the member name is "PcdCName_Guidvalue"
// Member type is UINT16 according to PcdHardwareErrorRecordLevel declaration
// in DEC file.
-//
+//
// 3.3.2.2 VOID* datum type PCD
// The value of VOID* datum type PCD is a UINT8/UINT16 array in PCD database.
-//
+//
// 3.3.2.2.1 VOID* - string type
// If the default value for VOID* datum type PCD like L"xxx", the PCD is
// used for unicode string, and C structure of this datum type PCD is
// UINT16 string array in PCD database, for example:
// UINT16 StringTable[29];
// The number of 29 in above sample is max size of a unicode string.
-//
+//
// If the default value for VOID* datum type PCD like "xxx", the PCD is
// used for ascii string, and C structure of this datum type PCD is
// UINT8 string array in PCD database, for example:
// UINT8 StringTable[20];
// The number of 20 in above sample is max size of a ascii string.
-//
+//
// 3.3.2.2.2 VOID* - byte array
// If the default value of VOID* datum type PCD like {'0x29', '0x01', '0xf2'}
// the PCD is used for byte array. The generated structrue is same as
// above ascii string table,
// UINT8 StringTable[13];
// The number of 13 in above sample is max size of byte array.
-//
+//
// 3.3.3 Some utility structures in PCD Database
// 3.3.3.1 GuidTable
// GuidTable array is used to store all related GUID value in PCD database:
diff --git a/MdeModulePkg/Universal/PCD/Dxe/PcdDxeExtra.uni b/MdeModulePkg/Universal/PCD/Dxe/PcdDxeExtra.uni index 729312a..436cd7c 100644 --- a/MdeModulePkg/Universal/PCD/Dxe/PcdDxeExtra.uni +++ b/MdeModulePkg/Universal/PCD/Dxe/PcdDxeExtra.uni @@ -1,7 +1,7 @@ // /** @file
// PcdDxe Localized Strings and Content
//
-// Copyright (c) 2013 - 2014, Intel Corporation. All rights reserved.<BR>
+// Copyright (c) 2013 - 2018, Intel Corporation. All rights reserved.<BR>
//
// This program and the accompanying materials
// are licensed and made available under the terms and conditions of the BSD License
@@ -12,8 +12,8 @@ //
// **/
-#string STR_PROPERTIES_MODULE_NAME
-#language en-US
+#string STR_PROPERTIES_MODULE_NAME
+#language en-US
"Platform Configuration Database DXE Driver"
diff --git a/MdeModulePkg/Universal/PCD/Dxe/Service.c b/MdeModulePkg/Universal/PCD/Dxe/Service.c index 1e487f0..0517152 100644 --- a/MdeModulePkg/Universal/PCD/Dxe/Service.c +++ b/MdeModulePkg/Universal/PCD/Dxe/Service.c @@ -2,7 +2,7 @@ Help functions used by PCD DXE driver.
Copyright (c) 2014, Hewlett-Packard Development Company, L.P.<BR>
-Copyright (c) 2006 - 2017, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>
(C) Copyright 2016 Hewlett Packard Enterprise Development LP<BR>
This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License
@@ -19,23 +19,23 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. PCD_DATABASE mPcdDatabase;
-UINT32 mPcdTotalTokenCount;
-UINT32 mPeiLocalTokenCount;
-UINT32 mDxeLocalTokenCount;
-UINT32 mPeiNexTokenCount;
-UINT32 mDxeNexTokenCount;
+UINT32 mPcdTotalTokenCount;
+UINT32 mPeiLocalTokenCount;
+UINT32 mDxeLocalTokenCount;
+UINT32 mPeiNexTokenCount;
+UINT32 mDxeNexTokenCount;
UINT32 mPeiExMapppingTableSize;
UINT32 mDxeExMapppingTableSize;
UINT32 mPeiGuidTableSize;
UINT32 mDxeGuidTableSize;
-BOOLEAN mPeiExMapTableEmpty;
-BOOLEAN mDxeExMapTableEmpty;
+BOOLEAN mPeiExMapTableEmpty;
+BOOLEAN mDxeExMapTableEmpty;
BOOLEAN mPeiDatabaseEmpty;
LIST_ENTRY *mCallbackFnTable;
EFI_GUID **TmpTokenSpaceBuffer;
-UINTN TmpTokenSpaceBufferCount;
+UINTN TmpTokenSpaceBufferCount;
UINTN mPeiPcdDbSize = 0;
PEI_PCD_DATABASE *mPeiPcdDbBinary = NULL;
@@ -66,7 +66,7 @@ GetLocalTokenNumber ( //
TokenNumber--;
- LocalTokenNumberTable = IsPeiDb ? (UINT32 *)((UINT8 *)mPcdDatabase.PeiDb + mPcdDatabase.PeiDb->LocalTokenNumberTableOffset) :
+ LocalTokenNumberTable = IsPeiDb ? (UINT32 *)((UINT8 *)mPcdDatabase.PeiDb + mPcdDatabase.PeiDb->LocalTokenNumberTableOffset) :
(UINT32 *)((UINT8 *)mPcdDatabase.DxeDb + mPcdDatabase.DxeDb->LocalTokenNumberTableOffset);
TokenNumber = IsPeiDb ? TokenNumber : TokenNumber - mPeiLocalTokenCount;
@@ -133,7 +133,7 @@ GetPcdName ( CHAR8 *Name;
//
- // Return NULL when PCD name table is absent.
+ // Return NULL when PCD name table is absent.
//
if (IsPeiDb) {
if (mPcdDatabase.PeiDb->PcdNameTableOffset == 0) {
@@ -181,7 +181,7 @@ GetPcdName ( //
AsciiStrCatS (Name, NameSize, TokenSpaceName);
Name[AsciiStrSize (TokenSpaceName) - sizeof (CHAR8)] = '.';
- AsciiStrCatS (Name, NameSize, PcdName);
+ AsciiStrCatS (Name, NameSize, PcdName);
}
return Name;
@@ -198,7 +198,7 @@ GetPcdName ( @param[in] Guid The 128-bit unique value that designates the namespace from which to extract the value.
@param[in] TokenNumber The PCD token number.
@param[out] PcdInfo The returned information associated with the requested TokenNumber.
- The caller is responsible for freeing the buffer that is allocated by callee for PcdInfo->PcdName.
+ The caller is responsible for freeing the buffer that is allocated by callee for PcdInfo->PcdName.
@retval EFI_SUCCESS The PCD information was returned successfully
@retval EFI_NOT_FOUND The PCD service could not find the requested token number.
@@ -247,7 +247,7 @@ ExGetPcdInfo ( PcdInfo->PcdSize = 0;
//
// Here use one representative in the token space to get the TokenSpaceCName.
- //
+ //
PcdInfo->PcdName = GetPcdName (TRUE, IsPeiDb, ExMapTable[Index].TokenNumber);
return EFI_SUCCESS;
} else if (ExMapTable[Index].ExTokenNumber == TokenNumber) {
@@ -352,10 +352,10 @@ DxeGetPcdInfo ( /**
Get the PCD entry pointer in PCD database.
-
+
This routine will visit PCD database to find the PCD entry according to given
- token number. The given token number is autogened by build tools and it will be
- translated to local token number. Local token number contains PCD's type and
+ token number. The given token number is autogened by build tools and it will be
+ translated to local token number. Local token number contains PCD's type and
offset of PCD entry in PCD database.
@param TokenNumber Token's number, it is autogened by build tools
@@ -385,7 +385,7 @@ GetWorker ( EFI_STATUS Status;
UINT32 LocalTokenNumber;
UINT32 Offset;
- STRING_HEAD StringTableIdx;
+ STRING_HEAD StringTableIdx;
BOOLEAN IsPeiDb;
//
@@ -407,7 +407,7 @@ GetWorker ( //
// EBC compiler is very choosy. It may report warning about comparison
- // between UINTN and 0 . So we add 1 in each size of the
+ // between UINTN and 0 . So we add 1 in each size of the
// comparison.
//
ASSERT (TokenNumber + 1 < mPcdTotalTokenCount + 1);
@@ -415,14 +415,14 @@ GetWorker ( ASSERT ((GetSize == DxePcdGetSize (TokenNumber + 1)) || (GetSize == 0));
// EBC compiler is very choosy. It may report warning about comparison
- // between UINTN and 0 . So we add 1 in each size of the
+ // between UINTN and 0 . So we add 1 in each size of the
// comparison.
IsPeiDb = (BOOLEAN) ((TokenNumber + 1 < mPeiLocalTokenCount + 1) ? TRUE : FALSE);
LocalTokenNumber = GetLocalTokenNumber (IsPeiDb, TokenNumber + 1);
PcdDb = IsPeiDb ? ((UINT8 *) mPcdDatabase.PeiDb) : ((UINT8 *) mPcdDatabase.DxeDb);
-
+
if (IsPeiDb) {
StringTable = (UINT8 *) ((UINT8 *)mPcdDatabase.PeiDb + mPcdDatabase.PeiDb->StringTableOffset);
} else {
@@ -453,11 +453,11 @@ GetWorker ( if ((LocalTokenNumber & PCD_TYPE_ALL_SET) == (PCD_TYPE_HII|PCD_TYPE_STRING)) {
//
- // If a HII type PCD's datum type is VOID*, the DefaultValueOffset is the index of
+ // If a HII type PCD's datum type is VOID*, the DefaultValueOffset is the index of
// string array in string table.
//
- StringTableIdx = *(STRING_HEAD*)((UINT8 *) PcdDb + VariableHead->DefaultValueOffset);
- VaraiableDefaultBuffer = (UINT8 *) (StringTable + StringTableIdx);
+ StringTableIdx = *(STRING_HEAD*)((UINT8 *) PcdDb + VariableHead->DefaultValueOffset);
+ VaraiableDefaultBuffer = (UINT8 *) (StringTable + StringTableIdx);
} else {
VaraiableDefaultBuffer = (UINT8 *) PcdDb + VariableHead->DefaultValueOffset;
}
@@ -501,7 +501,7 @@ GetWorker ( default:
ASSERT (FALSE);
break;
-
+
}
EfiReleaseLock (&mPcdDatabaseLock);
@@ -515,9 +515,9 @@ GetWorker ( This routine will register a callback function to a PCD entry by given token number
and token space guid.
-
+
@param TokenNumber PCD token's number, it is autogened by build tools.
- @param Guid PCD token space's guid,
+ @param Guid PCD token space's guid,
if not NULL, this PCD is dynamicEx type PCD.
@param CallBackFunction Callback function pointer
@@ -565,7 +565,7 @@ DxeRegisterCallBackWorker ( FnTableEntry->CallbackFn = CallBackFunction;
InsertTailList (ListHead, &FnTableEntry->Node);
-
+
return EFI_SUCCESS;
}
@@ -617,7 +617,7 @@ DxeUnRegisterCallBackWorker ( //
RemoveEntryList (ListNode);
FreePool (FnTableEntry);
-
+
return EFI_SUCCESS;
}
ListNode = GetNextNode (ListHead, ListNode);
@@ -628,16 +628,16 @@ DxeUnRegisterCallBackWorker ( /**
Get next token number in given token space.
-
+
This routine is used for dynamicEx type PCD. It will firstly scan token space
- table to get token space according to given token space guid. Then scan given
- token number in found token space, if found, then return next token number in
+ table to get token space according to given token space guid. Then scan given
+ token number in found token space, if found, then return next token number in
this token space.
- @param Guid Token space guid. Next token number will be scaned in
+ @param Guid Token space guid. Next token number will be scaned in
this token space.
- @param TokenNumber Token number.
- If PCD_INVALID_TOKEN_NUMBER, return first token number in
+ @param TokenNumber Token number.
+ If PCD_INVALID_TOKEN_NUMBER, return first token number in
token space table.
If not PCD_INVALID_TOKEN_NUMBER, return next token number
in token space table.
@@ -668,8 +668,8 @@ ExGetNextTokeNumber ( UINTN ExMapTableCount;
//
- // Scan token space guid
- //
+ // Scan token space guid
+ //
MatchGuid = ScanGuid (GuidTable, SizeOfGuidTable, Guid);
if (MatchGuid == NULL) {
return EFI_NOT_FOUND;
@@ -734,12 +734,12 @@ ExGetNextTokeNumber ( DXE_PCD_DATABASE *
LocateExPcdBinary (
VOID
-)
+)
{
EFI_STATUS Status;
-
+
//
- // Search the External Pcd database from one section of current FFS,
+ // Search the External Pcd database from one section of current FFS,
// and read it to memory
//
Status = GetSectionFromFfs (
@@ -838,7 +838,7 @@ UpdatePcdDatabase ( /**
Initialize the PCD database in DXE phase.
-
+
PCD database in DXE phase also contains PCD database in PEI phase which is copied
from GUID Hob.
@@ -869,7 +869,7 @@ BuildPcdDxeDataBase ( GuidHob = GetFirstGuidHob (&gPcdDataBaseHobGuid);
if (GuidHob != NULL) {
- //
+ //
// If no PEIMs use dynamic Pcd Entry, the Pcd Service PEIM
// should not be included at all. So the GuidHob could
// be NULL. If it is NULL, we just copy over the DXE Default
@@ -916,7 +916,7 @@ BuildPcdDxeDataBase ( mPcdTotalTokenCount = mPeiLocalTokenCount + mDxeLocalTokenCount;
mPeiNexTokenCount = mPeiLocalTokenCount - mPcdDatabase.PeiDb->ExTokenCount;
- mDxeNexTokenCount = mDxeLocalTokenCount - mPcdDatabase.DxeDb->ExTokenCount;
+ mDxeNexTokenCount = mDxeLocalTokenCount - mPcdDatabase.DxeDb->ExTokenCount;
mPeiExMapTableEmpty = (mPcdDatabase.PeiDb->ExTokenCount == 0) ? TRUE : FALSE;
mDxeExMapTableEmpty = (mPcdDatabase.DxeDb->ExTokenCount == 0) ? TRUE : FALSE;
@@ -933,7 +933,7 @@ BuildPcdDxeDataBase ( //
// EBC compiler is very choosy. It may report warning about comparison
- // between UINTN and 0 . So we add 1 in each size of the
+ // between UINTN and 0 . So we add 1 in each size of the
// comparison.
//
for (Index = 0; Index + 1 < mPcdTotalTokenCount + 1; Index++) {
@@ -946,7 +946,7 @@ BuildPcdDxeDataBase ( @param VariableGuid Variable's guid
@param VariableName Variable's unicode name string
- @param VariableData Variable's data pointer,
+ @param VariableData Variable's data pointer,
@param VariableSize Variable's size.
@return the status of gRT->GetVariable
@@ -965,7 +965,7 @@ GetHiiVariable ( Size = 0;
Buffer = NULL;
-
+
//
// Firstly get the real size of HII variable
//
@@ -976,7 +976,7 @@ GetHiiVariable ( &Size,
Buffer
);
-
+
//
// Allocate buffer to hold whole variable data according to variable size.
//
@@ -998,7 +998,7 @@ GetHiiVariable ( *VariableSize = Size;
} else {
//
- // Use Default Data only when variable is not found.
+ // Use Default Data only when variable is not found.
// For other error status, correct data can't be got, and trig ASSERT().
//
ASSERT (Status == EFI_NOT_FOUND);
@@ -1008,7 +1008,7 @@ GetHiiVariable ( }
/**
- Invoke the callback function when dynamic PCD entry was set, if this PCD entry
+ Invoke the callback function when dynamic PCD entry was set, if this PCD entry
has registered callback function.
@param ExTokenNumber DynamicEx PCD's token number, if this PCD entry is dyanmicEx
@@ -1044,14 +1044,14 @@ InvokeCallbackOnSet ( while (ListNode != ListHead) {
FnTableEntry = CR_FNENTRY_FROM_LISTNODE (ListNode, CALLBACK_FN_ENTRY, Node);
- FnTableEntry->CallbackFn(Guid,
+ FnTableEntry->CallbackFn(Guid,
(Guid == NULL) ? TokenNumber : ExTokenNumber,
Data,
Size);
-
+
ListNode = GetNextNode (ListHead, ListNode);
}
-
+
return;
}
@@ -1088,10 +1088,10 @@ SetValueWorker ( @retval EFI_INVALID_PARAMETER If this PCD type is VPD, VPD PCD can not be set.
@retval EFI_INVALID_PARAMETER If Size can not be set to size table.
- @retval EFI_INVALID_PARAMETER If Size of non-Ptr type PCD does not match the size information in PCD database.
+ @retval EFI_INVALID_PARAMETER If Size of non-Ptr type PCD does not match the size information in PCD database.
@retval EFI_NOT_FOUND If value type of PCD entry is intergrate, but not in
range of UINT8, UINT16, UINT32, UINT64
- @retval EFI_NOT_FOUND Can not find the PCD type according to token number.
+ @retval EFI_NOT_FOUND Can not find the PCD type according to token number.
**/
EFI_STATUS
SetWorker (
@@ -1125,10 +1125,10 @@ SetWorker ( TokenNumber--;
TmpTokenNumber = TokenNumber;
-
+
//
// EBC compiler is very choosy. It may report warning about comparison
- // between UINTN and 0 . So we add 1 in each size of the
+ // between UINTN and 0 . So we add 1 in each size of the
// comparison.
//
ASSERT (TokenNumber + 1 < mPcdTotalTokenCount + 1);
@@ -1150,7 +1150,7 @@ SetWorker ( //
// EBC compiler is very choosy. It may report warning about comparison
- // between UINTN and 0 . So we add 1 in each size of the
+ // between UINTN and 0 . So we add 1 in each size of the
// comparison.
//
if ((TokenNumber + 1 < mPeiNexTokenCount + 1) ||
@@ -1165,7 +1165,7 @@ SetWorker ( //
// EBC compiler is very choosy. It may report warning about comparison
- // between UINTN and 0 . So we add 1 in each size of the
+ // between UINTN and 0 . So we add 1 in each size of the
// comparison.
//
IsPeiDb = (BOOLEAN) ((TokenNumber + 1 < mPeiLocalTokenCount + 1) ? TRUE : FALSE);
@@ -1182,7 +1182,7 @@ SetWorker ( StringTable = (UINT8 *) ((UINT8 *)mPcdDatabase.DxeDb + mPcdDatabase.DxeDb->StringTableOffset);
}
-
+
InternalData = PcdDb + Offset;
switch (LocalTokenNumber & PCD_TYPE_ALL_SET) {
@@ -1190,7 +1190,7 @@ SetWorker ( ASSERT (FALSE);
Status = EFI_INVALID_PARAMETER;
break;
-
+
case PCD_TYPE_STRING:
if (SetPtrTypeSize (TmpTokenNumber, Size)) {
CopyMem (StringTable + *((STRING_HEAD *)InternalData), Data, *Size);
@@ -1223,7 +1223,7 @@ SetWorker ( Attributes = VariableHead->Attributes;
Status = SetHiiVariable (Guid, Name, Attributes, Data, *Size, VariableOffset);
break;
-
+
case PCD_TYPE_DATA:
if (PtrType) {
if (SetPtrTypeSize (TmpTokenNumber, Size)) {
@@ -1267,7 +1267,7 @@ SetWorker ( }
EfiReleaseLock (&mPcdDatabaseLock);
-
+
return Status;
}
@@ -1286,7 +1286,7 @@ ExGetWorker ( IN CONST EFI_GUID *Guid,
IN UINTN ExTokenNumber,
IN UINTN GetSize
- )
+ )
{
return GetWorker(GetExPcdTokenNumber (Guid, (UINT32) ExTokenNumber), GetSize);
}
@@ -1315,12 +1315,12 @@ ExSetValueWorker ( /**
Set value for a dynamic-ex PCD entry.
-
- This routine find the local token number according to dynamic-ex PCD's token
+
+ This routine find the local token number according to dynamic-ex PCD's token
space guid and token number firstly, and invoke callback function if this PCD
entry registered callback function. Finally, invoken general SetWorker to set
PCD value.
-
+
@param ExTokenNumber Dynamic-ex PCD token number.
@param Guid Token space guid for dynamic-ex PCD.
@param Data PCD value want to be set
@@ -1341,7 +1341,7 @@ ExSetWorker ( )
{
UINTN TokenNumber;
-
+
TokenNumber = GetExPcdTokenNumber (Guid, (UINT32) ExTokenNumber);
InvokeCallbackOnSet ((UINT32) ExTokenNumber, Guid, TokenNumber, Data, *SetSize);
@@ -1431,9 +1431,9 @@ GetVariableSizeAndDataFromHiiPcd ( /**
Set value for HII-type PCD.
- A HII-type PCD's value is stored in a variable. Setting/Getting the value of
+ A HII-type PCD's value is stored in a variable. Setting/Getting the value of
HII-type PCD is to visit this variable.
-
+
@param VariableGuid Guid of variable which stored value of a HII-type PCD.
@param VariableName Unicode name of variable which stored value of a HII-type PCD.
@param SetAttributes Attributes bitmask to set for the variable.
@@ -1473,7 +1473,7 @@ SetHiiVariable ( &Size,
NULL
);
-
+
if (Status == EFI_BUFFER_TOO_SMALL) {
//
// Patch new PCD's value to offset in given HII variable.
@@ -1493,7 +1493,7 @@ SetHiiVariable ( &Size,
Buffer
);
-
+
ASSERT_EFI_ERROR (Status);
CopyMem ((UINT8 *)Buffer + Offset, Data, DataSize);
@@ -1543,9 +1543,9 @@ SetHiiVariable ( );
FreePool (Buffer);
- return Status;
+ return Status;
}
-
+
//
// If we drop to here, the value is failed to be written in to variable area.
//
@@ -1558,14 +1558,14 @@ SetHiiVariable ( A dynamic-ex type PCD, developer must provide pair of token space guid: token number
in DEC file. PCD database maintain a mapping table that translate pair of {token
space guid: token number} to Token Number.
-
+
@param Guid Token space guid for dynamic-ex PCD entry.
@param ExTokenNumber Dynamic-ex PCD token number.
@return Token Number for dynamic-ex PCD.
**/
-UINTN
+UINTN
GetExPcdTokenNumber (
IN CONST EFI_GUID *Guid,
IN UINT32 ExTokenNumber
@@ -1622,7 +1622,7 @@ GetExPcdTokenNumber ( /**
Wrapper function of getting index of PCD entry in size table.
-
+
@param LocalTokenNumberTableIdx Index of this PCD in local token number table.
@param IsPeiDb If TRUE, the pcd entry is initialized in PEI phase,
If FALSE, the pcd entry is initialized in DXE phase.
@@ -1639,7 +1639,7 @@ GetSizeTableIndex ( UINTN LocalTokenNumber;
UINTN Index;
UINTN SizeTableIdx;
-
+
if (IsPeiDb) {
LocalTokenNumberTable = (UINT32 *)((UINT8 *)mPcdDatabase.PeiDb + mPcdDatabase.PeiDb->LocalTokenNumberTableOffset);
} else {
@@ -1653,7 +1653,7 @@ GetSizeTableIndex ( if ((LocalTokenNumber & PCD_DATUM_TYPE_ALL_SET) == PCD_DATUM_TYPE_POINTER) {
//
- // SizeTable only contain record for PCD_DATUM_TYPE_POINTER type
+ // SizeTable only contain record for PCD_DATUM_TYPE_POINTER type
// PCD entry.
//
if ((LocalTokenNumber & PCD_TYPE_VPD) != 0) {
@@ -1676,7 +1676,7 @@ GetSizeTableIndex ( }
- return SizeTableIdx;
+ return SizeTableIdx;
}
/**
@@ -1701,7 +1701,7 @@ GetPtrTypeSize ( UINT32 *LocalTokenNumberTable;
// EBC compiler is very choosy. It may report warning about comparison
- // between UINTN and 0 . So we add 1 in each size of the
+ // between UINTN and 0 . So we add 1 in each size of the
// comparison.
IsPeiDb = (BOOLEAN) (LocalTokenNumberTableIdx + 1 < mPeiLocalTokenCount + 1);
@@ -1718,12 +1718,12 @@ GetPtrTypeSize ( LocalTokenNumber = LocalTokenNumberTable[LocalTokenNumberTableIdx];
ASSERT ((LocalTokenNumber & PCD_DATUM_TYPE_ALL_SET) == PCD_DATUM_TYPE_POINTER);
-
+
SizeTableIdx = GetSizeTableIndex (LocalTokenNumberTableIdx, IsPeiDb);
*MaxSize = SizeTable[SizeTableIdx];
//
- // SizeTable only contain record for PCD_DATUM_TYPE_POINTER type
+ // SizeTable only contain record for PCD_DATUM_TYPE_POINTER type
// PCD entry.
//
if ((LocalTokenNumber & PCD_TYPE_VPD) != 0) {
@@ -1769,7 +1769,7 @@ SetPtrTypeSize ( //
// EBC compiler is very choosy. It may report warning about comparison
- // between UINTN and 0 . So we add 1 in each size of the
+ // between UINTN and 0 . So we add 1 in each size of the
// comparison.
//
IsPeiDb = (BOOLEAN) (LocalTokenNumberTableIdx + 1 < mPeiLocalTokenCount + 1);
@@ -1786,12 +1786,12 @@ SetPtrTypeSize ( LocalTokenNumber = LocalTokenNumberTable[LocalTokenNumberTableIdx];
ASSERT ((LocalTokenNumber & PCD_DATUM_TYPE_ALL_SET) == PCD_DATUM_TYPE_POINTER);
-
+
SizeTableIdx = GetSizeTableIndex (LocalTokenNumberTableIdx, IsPeiDb);
MaxSize = SizeTable[SizeTableIdx];
//
- // SizeTable only contain record for PCD_DATUM_TYPE_POINTER type
+ // SizeTable only contain record for PCD_DATUM_TYPE_POINTER type
// PCD entry.
//
if ((LocalTokenNumber & PCD_TYPE_VPD) != 0) {
@@ -1805,8 +1805,8 @@ SetPtrTypeSize ( (*CurrentSize == MAX_ADDRESS)) {
*CurrentSize = MaxSize;
return FALSE;
- }
-
+ }
+
//
// We have only two entry for Non-Sku enabled PCD entry:
// 1) MAX SIZE
@@ -1833,7 +1833,7 @@ VariableLockDynamicHiiPcd ( {
EFI_STATUS Status;
PCD_DATABASE_INIT *Database;
- UINT32 LocalTokenCount;
+ UINT32 LocalTokenCount;
UINTN TokenNumber;
UINT32 LocalTokenNumber;
UINTN Offset;
diff --git a/MdeModulePkg/Universal/PCD/Dxe/Service.h b/MdeModulePkg/Universal/PCD/Dxe/Service.h index cd0e227..ddd5fa4 100644 --- a/MdeModulePkg/Universal/PCD/Dxe/Service.h +++ b/MdeModulePkg/Universal/PCD/Dxe/Service.h @@ -1,7 +1,7 @@ /** @file
Private functions used by PCD DXE driver.
-Copyright (c) 2006 - 2016, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>
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
@@ -109,21 +109,21 @@ DxeGetPcdInfoGetSku ( /**
Sets the SKU value for subsequent calls to set or get PCD token values.
- SetSku() sets the SKU Id to be used for subsequent calls to set or get PCD values.
+ SetSku() sets the SKU Id to be used for subsequent calls to set or get PCD values.
SetSku() is normally called only once by the system.
- For each item (token), the database can hold a single value that applies to all SKUs,
- or multiple values, where each value is associated with a specific SKU Id. Items with multiple,
- SKU-specific values are called SKU enabled.
-
- The SKU Id of zero is reserved as a default. The valid SkuId range is 1 to 255.
- For tokens that are not SKU enabled, the system ignores any set SKU Id and works with the
- single value for that token. For SKU-enabled tokens, the system will use the SKU Id set by the
- last call to SetSku(). If no SKU Id is set or the currently set SKU Id isn't valid for the specified token,
- the system uses the default SKU Id. If the system attempts to use the default SKU Id and no value has been
+ For each item (token), the database can hold a single value that applies to all SKUs,
+ or multiple values, where each value is associated with a specific SKU Id. Items with multiple,
+ SKU-specific values are called SKU enabled.
+
+ The SKU Id of zero is reserved as a default. The valid SkuId range is 1 to 255.
+ For tokens that are not SKU enabled, the system ignores any set SKU Id and works with the
+ single value for that token. For SKU-enabled tokens, the system will use the SKU Id set by the
+ last call to SetSku(). If no SKU Id is set or the currently set SKU Id isn't valid for the specified token,
+ the system uses the default SKU Id. If the system attempts to use the default SKU Id and no value has been
set for that Id, the results are unpredictable.
- @param[in] SkuId The SKU value that will be used when the PCD service will retrieve and
+ @param[in] SkuId The SKU value that will be used when the PCD service will retrieve and
set values associated with a PCD token.
**/
@@ -136,13 +136,13 @@ DxePcdSetSku ( /**
Retrieves an 8-bit value for a given PCD token.
- Retrieves the current byte-sized value for a PCD token number.
+ Retrieves the current byte-sized value for a PCD token number.
If the TokenNumber is invalid, the results are unpredictable.
-
- @param[in] TokenNumber The PCD token number.
+
+ @param[in] TokenNumber The PCD token number.
@return The UINT8 value.
-
+
**/
UINT8
EFIAPI
@@ -153,13 +153,13 @@ DxePcdGet8 ( /**
Retrieves an 16-bit value for a given PCD token.
- Retrieves the current 16-bits value for a PCD token number.
+ Retrieves the current 16-bits value for a PCD token number.
If the TokenNumber is invalid, the results are unpredictable.
-
- @param[in] TokenNumber The PCD token number.
+
+ @param[in] TokenNumber The PCD token number.
@return The UINT16 value.
-
+
**/
UINT16
EFIAPI
@@ -170,13 +170,13 @@ DxePcdGet16 ( /**
Retrieves an 32-bit value for a given PCD token.
- Retrieves the current 32-bits value for a PCD token number.
+ Retrieves the current 32-bits value for a PCD token number.
If the TokenNumber is invalid, the results are unpredictable.
-
- @param[in] TokenNumber The PCD token number.
+
+ @param[in] TokenNumber The PCD token number.
@return The UINT32 value.
-
+
**/
UINT32
EFIAPI
@@ -187,13 +187,13 @@ DxePcdGet32 ( /**
Retrieves an 64-bit value for a given PCD token.
- Retrieves the current 64-bits value for a PCD token number.
+ Retrieves the current 64-bits value for a PCD token number.
If the TokenNumber is invalid, the results are unpredictable.
-
- @param[in] TokenNumber The PCD token number.
+
+ @param[in] TokenNumber The PCD token number.
@return The UINT64 value.
-
+
**/
UINT64
EFIAPI
@@ -204,15 +204,15 @@ DxePcdGet64 ( /**
Retrieves a pointer to a value for a given PCD token.
- Retrieves the current pointer to the buffer for a PCD token number.
- Do not make any assumptions about the alignment of the pointer that
- is returned by this function call. If the TokenNumber is invalid,
+ Retrieves the current pointer to the buffer for a PCD token number.
+ Do not make any assumptions about the alignment of the pointer that
+ is returned by this function call. If the TokenNumber is invalid,
the results are unpredictable.
- @param[in] TokenNumber The PCD token number.
+ @param[in] TokenNumber The PCD token number.
@return The pointer to the buffer to be retrieved.
-
+
**/
VOID *
EFIAPI
@@ -223,15 +223,15 @@ DxePcdGetPtr ( /**
Retrieves a Boolean value for a given PCD token.
- Retrieves the current boolean value for a PCD token number.
- Do not make any assumptions about the alignment of the pointer that
- is returned by this function call. If the TokenNumber is invalid,
+ Retrieves the current boolean value for a PCD token number.
+ Do not make any assumptions about the alignment of the pointer that
+ is returned by this function call. If the TokenNumber is invalid,
the results are unpredictable.
- @param[in] TokenNumber The PCD token number.
+ @param[in] TokenNumber The PCD token number.
@return The Boolean value.
-
+
**/
BOOLEAN
EFIAPI
@@ -242,13 +242,13 @@ DxePcdGetBool ( /**
Retrieves the size of the value for a given PCD token.
- Retrieves the current size of a particular PCD token.
+ Retrieves the current size of a particular PCD token.
If the TokenNumber is invalid, the results are unpredictable.
- @param[in] TokenNumber The PCD token number.
+ @param[in] TokenNumber The PCD token number.
@return The size of the value for the PCD token.
-
+
**/
UINTN
EFIAPI
@@ -259,16 +259,16 @@ DxePcdGetSize ( /**
Retrieves an 8-bit value for a given PCD token.
- Retrieves the 8-bit value of a particular PCD token.
+ Retrieves the 8-bit value of a particular PCD token.
If the TokenNumber is invalid or the token space
- specified by Guid does not exist, the results are
+ specified by Guid does not exist, the results are
unpredictable.
@param[in] Guid The token space for the token number.
- @param[in] TokenNumber The PCD token number.
+ @param[in] TokenNumber The PCD token number.
@return The size 8-bit value for the PCD token.
-
+
**/
UINT8
EFIAPI
@@ -280,16 +280,16 @@ DxePcdGet8Ex ( /**
Retrieves an 16-bit value for a given PCD token.
- Retrieves the 16-bit value of a particular PCD token.
+ Retrieves the 16-bit value of a particular PCD token.
If the TokenNumber is invalid or the token space
- specified by Guid does not exist, the results are
+ specified by Guid does not exist, the results are
unpredictable.
@param[in] Guid The token space for the token number.
- @param[in] TokenNumber The PCD token number.
+ @param[in] TokenNumber The PCD token number.
@return The size 16-bit value for the PCD token.
-
+
**/
UINT16
EFIAPI
@@ -301,16 +301,16 @@ DxePcdGet16Ex ( /**
Retrieves an 32-bit value for a given PCD token.
- Retrieves the 32-bit value of a particular PCD token.
+ Retrieves the 32-bit value of a particular PCD token.
If the TokenNumber is invalid or the token space
- specified by Guid does not exist, the results are
+ specified by Guid does not exist, the results are
unpredictable.
@param[in] Guid The token space for the token number.
- @param[in] TokenNumber The PCD token number.
+ @param[in] TokenNumber The PCD token number.
@return The size 32-bit value for the PCD token.
-
+
**/
UINT32
EFIAPI
@@ -322,16 +322,16 @@ DxePcdGet32Ex ( /**
Retrieves an 64-bit value for a given PCD token.
- Retrieves the 64-bit value of a particular PCD token.
+ Retrieves the 64-bit value of a particular PCD token.
If the TokenNumber is invalid or the token space
- specified by Guid does not exist, the results are
+ specified by Guid does not exist, the results are
unpredictable.
@param[in] Guid The token space for the token number.
- @param[in] TokenNumber The PCD token number.
+ @param[in] TokenNumber The PCD token number.
@return The size 64-bit value for the PCD token.
-
+
**/
UINT64
EFIAPI
@@ -343,16 +343,16 @@ DxePcdGet64Ex ( /**
Retrieves a pointer to a value for a given PCD token.
- Retrieves the current pointer to the buffer for a PCD token number.
- Do not make any assumptions about the alignment of the pointer that
- is returned by this function call. If the TokenNumber is invalid,
+ Retrieves the current pointer to the buffer for a PCD token number.
+ Do not make any assumptions about the alignment of the pointer that
+ is returned by this function call. If the TokenNumber is invalid,
the results are unpredictable.
@param[in] Guid The token space for the token number.
- @param[in] TokenNumber The PCD token number.
+ @param[in] TokenNumber The PCD token number.
@return The pointer to the buffer to be retrieved.
-
+
**/
VOID *
EFIAPI
@@ -364,16 +364,16 @@ DxePcdGetPtrEx ( /**
Retrieves an Boolean value for a given PCD token.
- Retrieves the Boolean value of a particular PCD token.
+ Retrieves the Boolean value of a particular PCD token.
If the TokenNumber is invalid or the token space
- specified by Guid does not exist, the results are
+ specified by Guid does not exist, the results are
unpredictable.
@param[in] Guid The token space for the token number.
- @param[in] TokenNumber The PCD token number.
+ @param[in] TokenNumber The PCD token number.
@return The size Boolean value for the PCD token.
-
+
**/
BOOLEAN
EFIAPI
@@ -385,14 +385,14 @@ DxePcdGetBoolEx ( /**
Retrieves the size of the value for a given PCD token.
- Retrieves the current size of a particular PCD token.
+ Retrieves the current size of a particular PCD token.
If the TokenNumber is invalid, the results are unpredictable.
@param[in] Guid The token space for the token number.
- @param[in] TokenNumber The PCD token number.
+ @param[in] TokenNumber The PCD token number.
@return The size of the value for the PCD token.
-
+
**/
UINTN
EFIAPI
@@ -404,19 +404,19 @@ DxePcdGetSizeEx ( /**
Sets an 8-bit value for a given PCD token.
- When the PCD service sets a value, it will check to ensure that the
- size of the value being set is compatible with the Token's existing definition.
+ When the PCD service sets a value, it will check to ensure that the
+ size of the value being set is compatible with the Token's existing definition.
If it is not, an error will be returned.
- @param[in] TokenNumber The PCD token number.
+ @param[in] TokenNumber The PCD token number.
@param[in] Value The value to set for the PCD token.
@retval EFI_SUCCESS Procedure returned successfully.
- @retval EFI_INVALID_PARAMETER The PCD service determined that the size of the data
- being set was incompatible with a call to this function.
+ @retval EFI_INVALID_PARAMETER The PCD service determined that the size of the data
+ being set was incompatible with a call to this function.
Use GetSize() to retrieve the size of the target data.
@retval EFI_NOT_FOUND The PCD service could not find the requested token number.
-
+
**/
EFI_STATUS
EFIAPI
@@ -428,19 +428,19 @@ DxePcdSet8 ( /**
Sets an 16-bit value for a given PCD token.
- When the PCD service sets a value, it will check to ensure that the
- size of the value being set is compatible with the Token's existing definition.
+ When the PCD service sets a value, it will check to ensure that the
+ size of the value being set is compatible with the Token's existing definition.
If it is not, an error will be returned.
- @param[in] TokenNumber The PCD token number.
+ @param[in] TokenNumber The PCD token number.
@param[in] Value The value to set for the PCD token.
@retval EFI_SUCCESS Procedure returned successfully.
- @retval EFI_INVALID_PARAMETER The PCD service determined that the size of the data
- being set was incompatible with a call to this function.
+ @retval EFI_INVALID_PARAMETER The PCD service determined that the size of the data
+ being set was incompatible with a call to this function.
Use GetSize() to retrieve the size of the target data.
@retval EFI_NOT_FOUND The PCD service could not find the requested token number.
-
+
**/
EFI_STATUS
EFIAPI
@@ -452,19 +452,19 @@ DxePcdSet16 ( /**
Sets an 32-bit value for a given PCD token.
- When the PCD service sets a value, it will check to ensure that the
- size of the value being set is compatible with the Token's existing definition.
+ When the PCD service sets a value, it will check to ensure that the
+ size of the value being set is compatible with the Token's existing definition.
If it is not, an error will be returned.
- @param[in] TokenNumber The PCD token number.
+ @param[in] TokenNumber The PCD token number.
@param[in] Value The value to set for the PCD token.
@retval EFI_SUCCESS Procedure returned successfully.
- @retval EFI_INVALID_PARAMETER The PCD service determined that the size of the data
- being set was incompatible with a call to this function.
+ @retval EFI_INVALID_PARAMETER The PCD service determined that the size of the data
+ being set was incompatible with a call to this function.
Use GetSize() to retrieve the size of the target data.
@retval EFI_NOT_FOUND The PCD service could not find the requested token number.
-
+
**/
EFI_STATUS
EFIAPI
@@ -476,19 +476,19 @@ DxePcdSet32 ( /**
Sets an 64-bit value for a given PCD token.
- When the PCD service sets a value, it will check to ensure that the
- size of the value being set is compatible with the Token's existing definition.
+ When the PCD service sets a value, it will check to ensure that the
+ size of the value being set is compatible with the Token's existing definition.
If it is not, an error will be returned.
- @param[in] TokenNumber The PCD token number.
+ @param[in] TokenNumber The PCD token number.
@param[in] Value The value to set for the PCD token.
@retval EFI_SUCCESS Procedure returned successfully.
- @retval EFI_INVALID_PARAMETER The PCD service determined that the size of the data
- being set was incompatible with a call to this function.
+ @retval EFI_INVALID_PARAMETER The PCD service determined that the size of the data
+ being set was incompatible with a call to this function.
Use GetSize() to retrieve the size of the target data.
@retval EFI_NOT_FOUND The PCD service could not find the requested token number.
-
+
**/
EFI_STATUS
EFIAPI
@@ -501,23 +501,23 @@ DxePcdSet64 ( /**
Sets a value of a specified size for a given PCD token.
- When the PCD service sets a value, it will check to ensure that the
- size of the value being set is compatible with the Token's existing definition.
+ When the PCD service sets a value, it will check to ensure that the
+ size of the value being set is compatible with the Token's existing definition.
If it is not, an error will be returned.
- @param[in] TokenNumber The PCD token number.
- @param[in, out] SizeOfBuffer A pointer to the length of the value being set for the PCD token.
- On input, if the SizeOfValue is greater than the maximum size supported
- for this TokenNumber then the output value of SizeOfValue will reflect
+ @param[in] TokenNumber The PCD token number.
+ @param[in, out] SizeOfBuffer A pointer to the length of the value being set for the PCD token.
+ On input, if the SizeOfValue is greater than the maximum size supported
+ for this TokenNumber then the output value of SizeOfValue will reflect
the maximum size supported for this TokenNumber.
@param[in] Buffer The buffer to set for the PCD token.
@retval EFI_SUCCESS Procedure returned successfully.
- @retval EFI_INVALID_PARAMETER The PCD service determined that the size of the data
- being set was incompatible with a call to this function.
+ @retval EFI_INVALID_PARAMETER The PCD service determined that the size of the data
+ being set was incompatible with a call to this function.
Use GetSize() to retrieve the size of the target data.
@retval EFI_NOT_FOUND The PCD service could not find the requested token number.
-
+
**/
EFI_STATUS
EFIAPI
@@ -530,19 +530,19 @@ DxePcdSetPtr ( /**
Sets an Boolean value for a given PCD token.
- When the PCD service sets a value, it will check to ensure that the
- size of the value being set is compatible with the Token's existing definition.
+ When the PCD service sets a value, it will check to ensure that the
+ size of the value being set is compatible with the Token's existing definition.
If it is not, an error will be returned.
- @param[in] TokenNumber The PCD token number.
+ @param[in] TokenNumber The PCD token number.
@param[in] Value The value to set for the PCD token.
@retval EFI_SUCCESS Procedure returned successfully.
- @retval EFI_INVALID_PARAMETER The PCD service determined that the size of the data
- being set was incompatible with a call to this function.
+ @retval EFI_INVALID_PARAMETER The PCD service determined that the size of the data
+ being set was incompatible with a call to this function.
Use GetSize() to retrieve the size of the target data.
@retval EFI_NOT_FOUND The PCD service could not find the requested token number.
-
+
**/
EFI_STATUS
EFIAPI
@@ -555,20 +555,20 @@ DxePcdSetBool ( /**
Sets an 8-bit value for a given PCD token.
- When the PCD service sets a value, it will check to ensure that the
- size of the value being set is compatible with the Token's existing definition.
+ When the PCD service sets a value, it will check to ensure that the
+ size of the value being set is compatible with the Token's existing definition.
If it is not, an error will be returned.
@param[in] Guid The 128-bit unique value that designates the namespace from which to extract the value.
- @param[in] TokenNumber The PCD token number.
+ @param[in] TokenNumber The PCD token number.
@param[in] Value The value to set for the PCD token.
@retval EFI_SUCCESS Procedure returned successfully.
- @retval EFI_INVALID_PARAMETER The PCD service determined that the size of the data
- being set was incompatible with a call to this function.
+ @retval EFI_INVALID_PARAMETER The PCD service determined that the size of the data
+ being set was incompatible with a call to this function.
Use GetSize() to retrieve the size of the target data.
@retval EFI_NOT_FOUND The PCD service could not find the requested token number.
-
+
**/
EFI_STATUS
EFIAPI
@@ -581,20 +581,20 @@ DxePcdSet8Ex ( /**
Sets an 16-bit value for a given PCD token.
- When the PCD service sets a value, it will check to ensure that the
- size of the value being set is compatible with the Token's existing definition.
+ When the PCD service sets a value, it will check to ensure that the
+ size of the value being set is compatible with the Token's existing definition.
If it is not, an error will be returned.
@param[in] Guid The 128-bit unique value that designates the namespace from which to extract the value.
- @param[in] TokenNumber The PCD token number.
+ @param[in] TokenNumber The PCD token number.
@param[in] Value The value to set for the PCD token.
@retval EFI_SUCCESS Procedure returned successfully.
- @retval EFI_INVALID_PARAMETER The PCD service determined that the size of the data
- being set was incompatible with a call to this function.
+ @retval EFI_INVALID_PARAMETER The PCD service determined that the size of the data
+ being set was incompatible with a call to this function.
Use GetSize() to retrieve the size of the target data.
@retval EFI_NOT_FOUND The PCD service could not find the requested token number.
-
+
**/
EFI_STATUS
EFIAPI
@@ -607,20 +607,20 @@ DxePcdSet16Ex ( /**
Sets an 32-bit value for a given PCD token.
- When the PCD service sets a value, it will check to ensure that the
- size of the value being set is compatible with the Token's existing definition.
+ When the PCD service sets a value, it will check to ensure that the
+ size of the value being set is compatible with the Token's existing definition.
If it is not, an error will be returned.
@param[in] Guid The 128-bit unique value that designates the namespace from which to extract the value.
- @param[in] TokenNumber The PCD token number.
+ @param[in] TokenNumber The PCD token number.
@param[in] Value The value to set for the PCD token.
@retval EFI_SUCCESS Procedure returned successfully.
- @retval EFI_INVALID_PARAMETER The PCD service determined that the size of the data
- being set was incompatible with a call to this function.
+ @retval EFI_INVALID_PARAMETER The PCD service determined that the size of the data
+ being set was incompatible with a call to this function.
Use GetSize() to retrieve the size of the target data.
@retval EFI_NOT_FOUND The PCD service could not find the requested token number.
-
+
**/
EFI_STATUS
EFIAPI
@@ -633,20 +633,20 @@ DxePcdSet32Ex ( /**
Sets an 64-bit value for a given PCD token.
- When the PCD service sets a value, it will check to ensure that the
- size of the value being set is compatible with the Token's existing definition.
+ When the PCD service sets a value, it will check to ensure that the
+ size of the value being set is compatible with the Token's existing definition.
If it is not, an error will be returned.
@param[in] Guid The 128-bit unique value that designates the namespace from which to extract the value.
- @param[in] TokenNumber The PCD token number.
+ @param[in] TokenNumber The PCD token number.
@param[in] Value The value to set for the PCD token.
@retval EFI_SUCCESS Procedure returned successfully.
- @retval EFI_INVALID_PARAMETER The PCD service determined that the size of the data
- being set was incompatible with a call to this function.
+ @retval EFI_INVALID_PARAMETER The PCD service determined that the size of the data
+ being set was incompatible with a call to this function.
Use GetSize() to retrieve the size of the target data.
@retval EFI_NOT_FOUND The PCD service could not find the requested token number.
-
+
**/
EFI_STATUS
EFIAPI
@@ -659,24 +659,24 @@ DxePcdSet64Ex ( /**
Sets a value of a specified size for a given PCD token.
- When the PCD service sets a value, it will check to ensure that the
- size of the value being set is compatible with the Token's existing definition.
+ When the PCD service sets a value, it will check to ensure that the
+ size of the value being set is compatible with the Token's existing definition.
If it is not, an error will be returned.
@param[in] Guid The 128-bit unique value that designates the namespace from which to extract the value.
- @param[in] TokenNumber The PCD token number.
- @param[in, out] SizeOfBuffer A pointer to the length of the value being set for the PCD token.
- On input, if the SizeOfValue is greater than the maximum size supported
- for this TokenNumber then the output value of SizeOfValue will reflect
+ @param[in] TokenNumber The PCD token number.
+ @param[in, out] SizeOfBuffer A pointer to the length of the value being set for the PCD token.
+ On input, if the SizeOfValue is greater than the maximum size supported
+ for this TokenNumber then the output value of SizeOfValue will reflect
the maximum size supported for this TokenNumber.
@param[in] Buffer The buffer to set for the PCD token.
@retval EFI_SUCCESS Procedure returned successfully.
- @retval EFI_INVALID_PARAMETER The PCD service determined that the size of the data
- being set was incompatible with a call to this function.
+ @retval EFI_INVALID_PARAMETER The PCD service determined that the size of the data
+ being set was incompatible with a call to this function.
Use GetSize() to retrieve the size of the target data.
@retval EFI_NOT_FOUND The PCD service could not find the requested token number.
-
+
**/
EFI_STATUS
EFIAPI
@@ -690,20 +690,20 @@ DxePcdSetPtrEx ( /**
Sets an Boolean value for a given PCD token.
- When the PCD service sets a value, it will check to ensure that the
- size of the value being set is compatible with the Token's existing definition.
+ When the PCD service sets a value, it will check to ensure that the
+ size of the value being set is compatible with the Token's existing definition.
If it is not, an error will be returned.
@param[in] Guid The 128-bit unique value that designates the namespace from which to extract the value.
- @param[in] TokenNumber The PCD token number.
+ @param[in] TokenNumber The PCD token number.
@param[in] Value The value to set for the PCD token.
@retval EFI_SUCCESS Procedure returned successfully.
- @retval EFI_INVALID_PARAMETER The PCD service determined that the size of the data
- being set was incompatible with a call to this function.
+ @retval EFI_INVALID_PARAMETER The PCD service determined that the size of the data
+ being set was incompatible with a call to this function.
Use GetSize() to retrieve the size of the target data.
@retval EFI_NOT_FOUND The PCD service could not find the requested token number.
-
+
**/
EFI_STATUS
EFIAPI
@@ -717,10 +717,10 @@ DxePcdSetBoolEx ( Specifies a function to be called anytime the value of a designated token is changed.
@param[in] Guid The 128-bit unique value that designates the namespace from which to extract the value.
- @param[in] TokenNumber The PCD token number.
- @param[in] CallBackFunction The function prototype called when the value associated with the CallBackToken is set.
+ @param[in] TokenNumber The PCD token number.
+ @param[in] CallBackFunction The function prototype called when the value associated with the CallBackToken is set.
- @retval EFI_SUCCESS The PCD service has successfully established a call event
+ @retval EFI_SUCCESS The PCD service has successfully established a call event
for the CallBackToken requested.
@retval EFI_NOT_FOUND The PCD service could not find the referenced token number.
@@ -737,10 +737,10 @@ DxeRegisterCallBackOnSet ( Cancels a previously set callback function for a particular PCD token number.
@param[in] Guid The 128-bit unique value that designates the namespace from which to extract the value.
- @param[in] TokenNumber The PCD token number.
- @param[in] CallBackFunction The function prototype called when the value associated with the CallBackToken is set.
+ @param[in] TokenNumber The PCD token number.
+ @param[in] CallBackFunction The function prototype called when the value associated with the CallBackToken is set.
- @retval EFI_SUCCESS The PCD service has successfully established a call event
+ @retval EFI_SUCCESS The PCD service has successfully established a call event
for the CallBackToken requested.
@retval EFI_NOT_FOUND The PCD service could not find the referenced token number.
@@ -754,29 +754,29 @@ DxeUnRegisterCallBackOnSet ( );
/**
- Retrieves the next valid token number in a given namespace.
-
- This is useful since the PCD infrastructure contains a sparse list of token numbers,
- and one cannot a priori know what token numbers are valid in the database.
-
- If TokenNumber is 0 and Guid is not NULL, then the first token from the token space specified by Guid is returned.
- If TokenNumber is not 0 and Guid is not NULL, then the next token in the token space specified by Guid is returned.
- If TokenNumber is 0 and Guid is NULL, then the first token in the default token space is returned.
- If TokenNumber is not 0 and Guid is NULL, then the next token in the default token space is returned.
- The token numbers in the default token space may not be related to token numbers in token spaces that are named by Guid.
- If the next token number can be retrieved, then it is returned in TokenNumber, and EFI_SUCCESS is returned.
- If TokenNumber represents the last token number in the token space specified by Guid, then EFI_NOT_FOUND is returned.
+ Retrieves the next valid token number in a given namespace.
+
+ This is useful since the PCD infrastructure contains a sparse list of token numbers,
+ and one cannot a priori know what token numbers are valid in the database.
+
+ If TokenNumber is 0 and Guid is not NULL, then the first token from the token space specified by Guid is returned.
+ If TokenNumber is not 0 and Guid is not NULL, then the next token in the token space specified by Guid is returned.
+ If TokenNumber is 0 and Guid is NULL, then the first token in the default token space is returned.
+ If TokenNumber is not 0 and Guid is NULL, then the next token in the default token space is returned.
+ The token numbers in the default token space may not be related to token numbers in token spaces that are named by Guid.
+ If the next token number can be retrieved, then it is returned in TokenNumber, and EFI_SUCCESS is returned.
+ If TokenNumber represents the last token number in the token space specified by Guid, then EFI_NOT_FOUND is returned.
If TokenNumber is not present in the token space specified by Guid, then EFI_NOT_FOUND is returned.
- @param[in] Guid The 128-bit unique value that designates the namespace from which to retrieve the next token.
- This is an optional parameter that may be NULL. If this parameter is NULL, then a request is
+ @param[in] Guid The 128-bit unique value that designates the namespace from which to retrieve the next token.
+ This is an optional parameter that may be NULL. If this parameter is NULL, then a request is
being made to retrieve tokens from the default token space.
- @param[in, out] TokenNumber
- A pointer to the PCD token number to use to find the subsequent token number.
+ @param[in, out] TokenNumber
+ A pointer to the PCD token number to use to find the subsequent token number.
- @retval EFI_SUCCESS The PCD service retrieved the next valid token number. Or the input token number
- is already the last valid token number in the PCD database.
+ @retval EFI_SUCCESS The PCD service retrieved the next valid token number. Or the input token number
+ is already the last valid token number in the PCD database.
In the later case, *TokenNumber is updated with the value of 0.
@retval EFI_NOT_FOUND If this input token number and token namespace does not exist on the platform.
@@ -790,8 +790,8 @@ DxePcdGetNextToken ( /**
Get next token space in PCD database according to given token space guid.
-
- @param Guid Given token space guid. If NULL, then Guid will be set to
+
+ @param Guid Given token space guid. If NULL, then Guid will be set to
the first PCD token space in PCD database, If not NULL, then
Guid will be set to next PCD token space.
@@ -825,7 +825,7 @@ typedef struct { @param[in] Guid The 128-bit unique value that designates the namespace from which to extract the value.
@param[in] TokenNumber The PCD token number.
@param[out] PcdInfo The returned information associated with the requested TokenNumber.
- The caller is responsible for freeing the buffer that is allocated by callee for PcdInfo->PcdName.
+ The caller is responsible for freeing the buffer that is allocated by callee for PcdInfo->PcdName.
@retval EFI_SUCCESS The PCD information was returned successfully
@retval EFI_NOT_FOUND The PCD service could not find the requested token number.
@@ -865,10 +865,10 @@ SetValueWorker ( @retval EFI_INVALID_PARAMETER If this PCD type is VPD, VPD PCD can not be set.
@retval EFI_INVALID_PARAMETER If Size can not be set to size table.
- @retval EFI_INVALID_PARAMETER If Size of non-Ptr type PCD does not match the size information in PCD database.
+ @retval EFI_INVALID_PARAMETER If Size of non-Ptr type PCD does not match the size information in PCD database.
@retval EFI_NOT_FOUND If value type of PCD entry is intergrate, but not in
range of UINT8, UINT16, UINT32, UINT64
- @retval EFI_NOT_FOUND Can not find the PCD type according to token number.
+ @retval EFI_NOT_FOUND Can not find the PCD type according to token number.
**/
EFI_STATUS
SetWorker (
@@ -899,12 +899,12 @@ ExSetValueWorker ( /**
Set value for a dynamic PCD entry.
-
- This routine find the local token number according to dynamic-ex PCD's token
+
+ This routine find the local token number according to dynamic-ex PCD's token
space guid and token number firstly, and invoke callback function if this PCD
entry registered callback function. Finally, invoken general SetWorker to set
PCD value.
-
+
@param ExTokenNumber Dynamic-ex PCD token number.
@param Guid Token space guid for dynamic-ex PCD.
@param Data PCD value want to be set
@@ -926,10 +926,10 @@ ExSetWorker ( /**
Get the PCD entry pointer in PCD database.
-
+
This routine will visit PCD database to find the PCD entry according to given
- token number. The given token number is autogened by build tools and it will be
- translated to local token number. Local token number contains PCD's type and
+ token number. The given token number is autogened by build tools and it will be
+ translated to local token number. Local token number contains PCD's type and
offset of PCD entry in PCD database.
@param TokenNumber Token's number, it is autogened by build tools
@@ -966,7 +966,7 @@ ExGetWorker ( @param VariableGuid Variable's guid
@param VariableName Variable's unicode name string
- @param VariableData Variable's data pointer,
+ @param VariableData Variable's data pointer,
@param VariableSize Variable's size.
@return the status of gRT->GetVariable
@@ -982,9 +982,9 @@ GetHiiVariable ( /**
Set value for HII-type PCD.
- A HII-type PCD's value is stored in a variable. Setting/Getting the value of
+ A HII-type PCD's value is stored in a variable. Setting/Getting the value of
HII-type PCD is to visit this variable.
-
+
@param VariableGuid Guid of variable which stored value of a HII-type PCD.
@param VariableName Unicode name of variable which stored value of a HII-type PCD.
@param SetAttributes Attributes bitmask to set for the variable.
@@ -1010,9 +1010,9 @@ SetHiiVariable ( This routine will register a callback function to a PCD entry by given token number
and token space guid.
-
+
@param TokenNumber PCD token's number, it is autogened by build tools.
- @param Guid PCD token space's guid,
+ @param Guid PCD token space's guid,
if not NULL, this PCD is dynamicEx type PCD.
@param CallBackFunction Callback function pointer
@@ -1049,7 +1049,7 @@ DxeUnRegisterCallBackWorker ( /**
Initialize the PCD database in DXE phase.
-
+
PCD database in DXE phase also contains PCD database in PEI phase which is copied
from GUID Hob.
@@ -1065,7 +1065,7 @@ BuildPcdDxeDataBase ( A dynamic-ex type PCD, developer must provide pair of token space guid: token number
in DEC file. PCD database maintain a mapping table that translate pair of {token
space guid: token number} to Token Number.
-
+
@param Guid Token space guid for dynamic-ex PCD entry.
@param ExTokenNumber Dynamic-ex PCD token number.
@@ -1080,16 +1080,16 @@ GetExPcdTokenNumber ( /**
Get next token number in given token space.
-
+
This routine is used for dynamicEx type PCD. It will firstly scan token space
- table to get token space according to given token space guid. Then scan given
- token number in found token space, if found, then return next token number in
+ table to get token space according to given token space guid. Then scan given
+ token number in found token space, if found, then return next token number in
this token space.
- @param Guid Token space guid. Next token number will be scaned in
+ @param Guid Token space guid. Next token number will be scaned in
this token space.
- @param TokenNumber Token number.
- If PCD_INVALID_TOKEN_NUMBER, return first token number in
+ @param TokenNumber Token number.
+ If PCD_INVALID_TOKEN_NUMBER, return first token number in
token space table.
If not PCD_INVALID_TOKEN_NUMBER, return next token number
in token space table.
@@ -1176,18 +1176,18 @@ UpdatePcdDatabase ( extern PCD_DATABASE mPcdDatabase;
-extern UINT32 mPcdTotalTokenCount;
-extern UINT32 mPeiLocalTokenCount;
-extern UINT32 mDxeLocalTokenCount;
-extern UINT32 mPeiNexTokenCount;
-extern UINT32 mDxeNexTokenCount;
+extern UINT32 mPcdTotalTokenCount;
+extern UINT32 mPeiLocalTokenCount;
+extern UINT32 mDxeLocalTokenCount;
+extern UINT32 mPeiNexTokenCount;
+extern UINT32 mDxeNexTokenCount;
extern UINT32 mPeiExMapppingTableSize;
extern UINT32 mDxeExMapppingTableSize;
extern UINT32 mPeiGuidTableSize;
extern UINT32 mDxeGuidTableSize;
-extern BOOLEAN mPeiExMapTableEmpty;
-extern BOOLEAN mDxeExMapTableEmpty;
+extern BOOLEAN mPeiExMapTableEmpty;
+extern BOOLEAN mDxeExMapTableEmpty;
extern BOOLEAN mPeiDatabaseEmpty;
extern EFI_GUID **TmpTokenSpaceBuffer;
diff --git a/MdeModulePkg/Universal/PCD/Pei/Pcd.c b/MdeModulePkg/Universal/PCD/Pei/Pcd.c index 8d9328b..e552e15 100644 --- a/MdeModulePkg/Universal/PCD/Pei/Pcd.c +++ b/MdeModulePkg/Universal/PCD/Pei/Pcd.c @@ -1,7 +1,7 @@ -/** @file
+/** @file
All Pcd Ppi services are implemented here.
-
-Copyright (c) 2006 - 2017, Intel Corporation. All rights reserved.<BR>
+
+Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>
(C) Copyright 2016 Hewlett Packard Enterprise Development LP<BR>
This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License
@@ -23,33 +23,33 @@ PCD_PPI mPcdPpiInstance = { PeiPcdSetSku,
PeiPcdGet8,
- PeiPcdGet16,
- PeiPcdGet32,
- PeiPcdGet64,
- PeiPcdGetPtr,
- PeiPcdGetBool,
+ PeiPcdGet16,
+ PeiPcdGet32,
+ PeiPcdGet64,
+ PeiPcdGetPtr,
+ PeiPcdGetBool,
PeiPcdGetSize,
PeiPcdGet8Ex,
- PeiPcdGet16Ex,
- PeiPcdGet32Ex,
- PeiPcdGet64Ex,
- PeiPcdGetPtrEx,
- PeiPcdGetBoolEx,
+ PeiPcdGet16Ex,
+ PeiPcdGet32Ex,
+ PeiPcdGet64Ex,
+ PeiPcdGetPtrEx,
+ PeiPcdGetBoolEx,
PeiPcdGetSizeEx,
-
+
PeiPcdSet8,
- PeiPcdSet16,
- PeiPcdSet32,
- PeiPcdSet64,
- PeiPcdSetPtr,
- PeiPcdSetBool,
+ PeiPcdSet16,
+ PeiPcdSet32,
+ PeiPcdSet64,
+ PeiPcdSetPtr,
+ PeiPcdSetBool,
PeiPcdSet8Ex,
- PeiPcdSet16Ex,
- PeiPcdSet32Ex,
- PeiPcdSet64Ex,
- PeiPcdSetPtrEx,
+ PeiPcdSet16Ex,
+ PeiPcdSet32Ex,
+ PeiPcdSet64Ex,
+ PeiPcdSetPtrEx,
PeiPcdSetBoolEx,
PeiRegisterCallBackOnSet,
@@ -64,7 +64,7 @@ PCD_PPI mPcdPpiInstance = { ///
EFI_PEI_PCD_PPI mEfiPcdPpiInstance = {
PeiPcdSetSku,
-
+
PeiPcdGet8Ex,
PeiPcdGet16Ex,
PeiPcdGet32Ex,
@@ -327,7 +327,7 @@ EFI_PEI_NOTIFY_DESCRIPTOR mEndOfPeiSignalPpiNotifyList[] = { /**
Main entry for PCD PEIM driver.
-
+
This routine initialize the PCD database for PEI phase and install PCD_PPI/EFI_PEI_PCD_PPI.
@param FileHandle Handle of the file being invoked.
@@ -439,21 +439,21 @@ PeiGetPcdInfoGetSku ( /**
Sets the SKU value for subsequent calls to set or get PCD token values.
- SetSku() sets the SKU Id to be used for subsequent calls to set or get PCD values.
+ SetSku() sets the SKU Id to be used for subsequent calls to set or get PCD values.
SetSku() is normally called only once by the system.
- For each item (token), the database can hold a single value that applies to all SKUs,
- or multiple values, where each value is associated with a specific SKU Id. Items with multiple,
- SKU-specific values are called SKU enabled.
-
+ For each item (token), the database can hold a single value that applies to all SKUs,
+ or multiple values, where each value is associated with a specific SKU Id. Items with multiple,
+ SKU-specific values are called SKU enabled.
+
The SKU Id of zero is reserved as a default.
- For tokens that are not SKU enabled, the system ignores any set SKU Id and works with the
- single value for that token. For SKU-enabled tokens, the system will use the SKU Id set by the
- last call to SetSku(). If no SKU Id is set or the currently set SKU Id isn't valid for the specified token,
- the system uses the default SKU Id. If the system attempts to use the default SKU Id and no value has been
+ For tokens that are not SKU enabled, the system ignores any set SKU Id and works with the
+ single value for that token. For SKU-enabled tokens, the system will use the SKU Id set by the
+ last call to SetSku(). If no SKU Id is set or the currently set SKU Id isn't valid for the specified token,
+ the system uses the default SKU Id. If the system attempts to use the default SKU Id and no value has been
set for that Id, the results are unpredictable.
- @param[in] SkuId The SKU value that will be used when the PCD service will retrieve and
+ @param[in] SkuId The SKU value that will be used when the PCD service will retrieve and
set values associated with a PCD token.
**/
@@ -582,13 +582,13 @@ PeiPcdSetSku ( /**
Retrieves an 8-bit value for a given PCD token.
- Retrieves the current byte-sized value for a PCD token number.
+ Retrieves the current byte-sized value for a PCD token number.
If the TokenNumber is invalid, the results are unpredictable.
-
- @param[in] TokenNumber The PCD token number.
+
+ @param[in] TokenNumber The PCD token number.
@return The UINT8 value.
-
+
**/
UINT8
EFIAPI
@@ -602,13 +602,13 @@ PeiPcdGet8 ( /**
Retrieves an 16-bit value for a given PCD token.
- Retrieves the current 16-bits value for a PCD token number.
+ Retrieves the current 16-bits value for a PCD token number.
If the TokenNumber is invalid, the results are unpredictable.
-
- @param[in] TokenNumber The PCD token number.
+
+ @param[in] TokenNumber The PCD token number.
@return The UINT16 value.
-
+
**/
UINT16
EFIAPI
@@ -622,13 +622,13 @@ PeiPcdGet16 ( /**
Retrieves an 32-bit value for a given PCD token.
- Retrieves the current 32-bits value for a PCD token number.
+ Retrieves the current 32-bits value for a PCD token number.
If the TokenNumber is invalid, the results are unpredictable.
-
- @param[in] TokenNumber The PCD token number.
+
+ @param[in] TokenNumber The PCD token number.
@return The UINT32 value.
-
+
**/
UINT32
EFIAPI
@@ -642,13 +642,13 @@ PeiPcdGet32 ( /**
Retrieves an 64-bit value for a given PCD token.
- Retrieves the current 64-bits value for a PCD token number.
+ Retrieves the current 64-bits value for a PCD token number.
If the TokenNumber is invalid, the results are unpredictable.
-
- @param[in] TokenNumber The PCD token number.
+
+ @param[in] TokenNumber The PCD token number.
@return The UINT64 value.
-
+
**/
UINT64
EFIAPI
@@ -662,15 +662,15 @@ PeiPcdGet64 ( /**
Retrieves a pointer to a value for a given PCD token.
- Retrieves the current pointer to the buffer for a PCD token number.
- Do not make any assumptions about the alignment of the pointer that
- is returned by this function call. If the TokenNumber is invalid,
+ Retrieves the current pointer to the buffer for a PCD token number.
+ Do not make any assumptions about the alignment of the pointer that
+ is returned by this function call. If the TokenNumber is invalid,
the results are unpredictable.
- @param[in] TokenNumber The PCD token number.
+ @param[in] TokenNumber The PCD token number.
@return The pointer to the buffer to be retrieved.
-
+
**/
VOID *
EFIAPI
@@ -684,15 +684,15 @@ PeiPcdGetPtr ( /**
Retrieves a Boolean value for a given PCD token.
- Retrieves the current boolean value for a PCD token number.
- Do not make any assumptions about the alignment of the pointer that
- is returned by this function call. If the TokenNumber is invalid,
+ Retrieves the current boolean value for a PCD token number.
+ Do not make any assumptions about the alignment of the pointer that
+ is returned by this function call. If the TokenNumber is invalid,
the results are unpredictable.
- @param[in] TokenNumber The PCD token number.
+ @param[in] TokenNumber The PCD token number.
@return The Boolean value.
-
+
**/
BOOLEAN
EFIAPI
@@ -706,13 +706,13 @@ PeiPcdGetBool ( /**
Retrieves the size of the value for a given PCD token.
- Retrieves the current size of a particular PCD token.
+ Retrieves the current size of a particular PCD token.
If the TokenNumber is invalid, the results are unpredictable.
- @param[in] TokenNumber The PCD token number.
+ @param[in] TokenNumber The PCD token number.
@return The size of the value for the PCD token.
-
+
**/
UINTN
EFIAPI
@@ -735,7 +735,7 @@ PeiPcdGetSize ( TokenNumber--;
// EBC compiler is very choosy. It may report warning about comparison
- // between UINTN and 0 . So we add 1 in each size of the
+ // between UINTN and 0 . So we add 1 in each size of the
// comparison.
ASSERT (TokenNumber + 1 < (LocalTokenCount + 1));
@@ -755,16 +755,16 @@ PeiPcdGetSize ( /**
Retrieves an 8-bit value for a given PCD token.
- Retrieves the 8-bit value of a particular PCD token.
+ Retrieves the 8-bit value of a particular PCD token.
If the TokenNumber is invalid or the token space
- specified by Guid does not exist, the results are
+ specified by Guid does not exist, the results are
unpredictable.
@param[in] Guid The token space for the token number.
- @param[in] ExTokenNumber The PCD token number.
+ @param[in] ExTokenNumber The PCD token number.
@return The size 8-bit value for the PCD token.
-
+
**/
UINT8
EFIAPI
@@ -779,16 +779,16 @@ PeiPcdGet8Ex ( /**
Retrieves an 16-bit value for a given PCD token.
- Retrieves the 16-bit value of a particular PCD token.
+ Retrieves the 16-bit value of a particular PCD token.
If the TokenNumber is invalid or the token space
- specified by Guid does not exist, the results are
+ specified by Guid does not exist, the results are
unpredictable.
@param[in] Guid The token space for the token number.
- @param[in] ExTokenNumber The PCD token number.
+ @param[in] ExTokenNumber The PCD token number.
@return The size 16-bit value for the PCD token.
-
+
**/
UINT16
EFIAPI
@@ -803,16 +803,16 @@ PeiPcdGet16Ex ( /**
Retrieves an 32-bit value for a given PCD token.
- Retrieves the 32-bit value of a particular PCD token.
+ Retrieves the 32-bit value of a particular PCD token.
If the TokenNumber is invalid or the token space
- specified by Guid does not exist, the results are
+ specified by Guid does not exist, the results are
unpredictable.
@param[in] Guid The token space for the token number.
- @param[in] ExTokenNumber The PCD token number.
+ @param[in] ExTokenNumber The PCD token number.
@return The size 32-bit value for the PCD token.
-
+
**/
UINT32
EFIAPI
@@ -827,16 +827,16 @@ PeiPcdGet32Ex ( /**
Retrieves an 64-bit value for a given PCD token.
- Retrieves the 64-bit value of a particular PCD token.
+ Retrieves the 64-bit value of a particular PCD token.
If the TokenNumber is invalid or the token space
- specified by Guid does not exist, the results are
+ specified by Guid does not exist, the results are
unpredictable.
@param[in] Guid The token space for the token number.
- @param[in] ExTokenNumber The PCD token number.
+ @param[in] ExTokenNumber The PCD token number.
@return The size 64-bit value for the PCD token.
-
+
**/
UINT64
EFIAPI
@@ -851,16 +851,16 @@ PeiPcdGet64Ex ( /**
Retrieves a pointer to a value for a given PCD token.
- Retrieves the current pointer to the buffer for a PCD token number.
- Do not make any assumptions about the alignment of the pointer that
- is returned by this function call. If the TokenNumber is invalid,
+ Retrieves the current pointer to the buffer for a PCD token number.
+ Do not make any assumptions about the alignment of the pointer that
+ is returned by this function call. If the TokenNumber is invalid,
the results are unpredictable.
@param[in] Guid The token space for the token number.
- @param[in] ExTokenNumber The PCD token number.
+ @param[in] ExTokenNumber The PCD token number.
@return The pointer to the buffer to be retrieved.
-
+
**/
VOID *
EFIAPI
@@ -875,16 +875,16 @@ PeiPcdGetPtrEx ( /**
Retrieves an Boolean value for a given PCD token.
- Retrieves the Boolean value of a particular PCD token.
+ Retrieves the Boolean value of a particular PCD token.
If the TokenNumber is invalid or the token space
- specified by Guid does not exist, the results are
+ specified by Guid does not exist, the results are
unpredictable.
@param[in] Guid The token space for the token number.
- @param[in] ExTokenNumber The PCD token number.
+ @param[in] ExTokenNumber The PCD token number.
@return The size Boolean value for the PCD token.
-
+
**/
BOOLEAN
EFIAPI
@@ -899,14 +899,14 @@ PeiPcdGetBoolEx ( /**
Retrieves the size of the value for a given PCD token.
- Retrieves the current size of a particular PCD token.
+ Retrieves the current size of a particular PCD token.
If the TokenNumber is invalid, the results are unpredictable.
@param[in] Guid The token space for the token number.
- @param[in] ExTokenNumber The PCD token number.
+ @param[in] ExTokenNumber The PCD token number.
@return The size of the value for the PCD token.
-
+
**/
UINTN
EFIAPI
@@ -921,19 +921,19 @@ PeiPcdGetSizeEx ( /**
Sets an 8-bit value for a given PCD token.
- When the PCD service sets a value, it will check to ensure that the
- size of the value being set is compatible with the Token's existing definition.
+ When the PCD service sets a value, it will check to ensure that the
+ size of the value being set is compatible with the Token's existing definition.
If it is not, an error will be returned.
- @param[in] TokenNumber The PCD token number.
+ @param[in] TokenNumber The PCD token number.
@param[in] Value The value to set for the PCD token.
@retval EFI_SUCCESS Procedure returned successfully.
- @retval EFI_INVALID_PARAMETER The PCD service determined that the size of the data
- being set was incompatible with a call to this function.
+ @retval EFI_INVALID_PARAMETER The PCD service determined that the size of the data
+ being set was incompatible with a call to this function.
Use GetSize() to retrieve the size of the target data.
@retval EFI_NOT_FOUND The PCD service could not find the requested token number.
-
+
**/
EFI_STATUS
EFIAPI
@@ -948,19 +948,19 @@ PeiPcdSet8 ( /**
Sets an 16-bit value for a given PCD token.
- When the PCD service sets a value, it will check to ensure that the
- size of the value being set is compatible with the Token's existing definition.
+ When the PCD service sets a value, it will check to ensure that the
+ size of the value being set is compatible with the Token's existing definition.
If it is not, an error will be returned.
- @param[in] TokenNumber The PCD token number.
+ @param[in] TokenNumber The PCD token number.
@param[in] Value The value to set for the PCD token.
@retval EFI_SUCCESS Procedure returned successfully.
- @retval EFI_INVALID_PARAMETER The PCD service determined that the size of the data
- being set was incompatible with a call to this function.
+ @retval EFI_INVALID_PARAMETER The PCD service determined that the size of the data
+ being set was incompatible with a call to this function.
Use GetSize() to retrieve the size of the target data.
@retval EFI_NOT_FOUND The PCD service could not find the requested token number.
-
+
**/
EFI_STATUS
EFIAPI
@@ -975,19 +975,19 @@ PeiPcdSet16 ( /**
Sets an 32-bit value for a given PCD token.
- When the PCD service sets a value, it will check to ensure that the
- size of the value being set is compatible with the Token's existing definition.
+ When the PCD service sets a value, it will check to ensure that the
+ size of the value being set is compatible with the Token's existing definition.
If it is not, an error will be returned.
- @param[in] TokenNumber The PCD token number.
+ @param[in] TokenNumber The PCD token number.
@param[in] Value The value to set for the PCD token.
@retval EFI_SUCCESS Procedure returned successfully.
- @retval EFI_INVALID_PARAMETER The PCD service determined that the size of the data
- being set was incompatible with a call to this function.
+ @retval EFI_INVALID_PARAMETER The PCD service determined that the size of the data
+ being set was incompatible with a call to this function.
Use GetSize() to retrieve the size of the target data.
@retval EFI_NOT_FOUND The PCD service could not find the requested token number.
-
+
**/
EFI_STATUS
EFIAPI
@@ -1002,19 +1002,19 @@ PeiPcdSet32 ( /**
Sets an 64-bit value for a given PCD token.
- When the PCD service sets a value, it will check to ensure that the
- size of the value being set is compatible with the Token's existing definition.
+ When the PCD service sets a value, it will check to ensure that the
+ size of the value being set is compatible with the Token's existing definition.
If it is not, an error will be returned.
- @param[in] TokenNumber The PCD token number.
+ @param[in] TokenNumber The PCD token number.
@param[in] Value The value to set for the PCD token.
@retval EFI_SUCCESS Procedure returned successfully.
- @retval EFI_INVALID_PARAMETER The PCD service determined that the size of the data
- being set was incompatible with a call to this function.
+ @retval EFI_INVALID_PARAMETER The PCD service determined that the size of the data
+ being set was incompatible with a call to this function.
Use GetSize() to retrieve the size of the target data.
@retval EFI_NOT_FOUND The PCD service could not find the requested token number.
-
+
**/
EFI_STATUS
EFIAPI
@@ -1029,23 +1029,23 @@ PeiPcdSet64 ( /**
Sets a value of a specified size for a given PCD token.
- When the PCD service sets a value, it will check to ensure that the
- size of the value being set is compatible with the Token's existing definition.
+ When the PCD service sets a value, it will check to ensure that the
+ size of the value being set is compatible with the Token's existing definition.
If it is not, an error will be returned.
- @param[in] TokenNumber The PCD token number.
- @param[in, out] SizeOfBuffer A pointer to the length of the value being set for the PCD token.
- On input, if the SizeOfValue is greater than the maximum size supported
- for this TokenNumber then the output value of SizeOfValue will reflect
+ @param[in] TokenNumber The PCD token number.
+ @param[in, out] SizeOfBuffer A pointer to the length of the value being set for the PCD token.
+ On input, if the SizeOfValue is greater than the maximum size supported
+ for this TokenNumber then the output value of SizeOfValue will reflect
the maximum size supported for this TokenNumber.
@param[in] Buffer The buffer to set for the PCD token.
@retval EFI_SUCCESS Procedure returned successfully.
- @retval EFI_INVALID_PARAMETER The PCD service determined that the size of the data
- being set was incompatible with a call to this function.
+ @retval EFI_INVALID_PARAMETER The PCD service determined that the size of the data
+ being set was incompatible with a call to this function.
Use GetSize() to retrieve the size of the target data.
@retval EFI_NOT_FOUND The PCD service could not find the requested token number.
-
+
**/
EFI_STATUS
EFIAPI
@@ -1061,19 +1061,19 @@ PeiPcdSetPtr ( /**
Sets an Boolean value for a given PCD token.
- When the PCD service sets a value, it will check to ensure that the
- size of the value being set is compatible with the Token's existing definition.
+ When the PCD service sets a value, it will check to ensure that the
+ size of the value being set is compatible with the Token's existing definition.
If it is not, an error will be returned.
- @param[in] TokenNumber The PCD token number.
+ @param[in] TokenNumber The PCD token number.
@param[in] Value The value to set for the PCD token.
@retval EFI_SUCCESS Procedure returned successfully.
- @retval EFI_INVALID_PARAMETER The PCD service determined that the size of the data
- being set was incompatible with a call to this function.
+ @retval EFI_INVALID_PARAMETER The PCD service determined that the size of the data
+ being set was incompatible with a call to this function.
Use GetSize() to retrieve the size of the target data.
@retval EFI_NOT_FOUND The PCD service could not find the requested token number.
-
+
**/
EFI_STATUS
EFIAPI
@@ -1088,20 +1088,20 @@ PeiPcdSetBool ( /**
Sets an 8-bit value for a given PCD token.
- When the PCD service sets a value, it will check to ensure that the
- size of the value being set is compatible with the Token's existing definition.
+ When the PCD service sets a value, it will check to ensure that the
+ size of the value being set is compatible with the Token's existing definition.
If it is not, an error will be returned.
@param[in] Guid The 128-bit unique value that designates the namespace from which to extract the value.
- @param[in] ExTokenNumber The PCD token number.
+ @param[in] ExTokenNumber The PCD token number.
@param[in] Value The value to set for the PCD token.
@retval EFI_SUCCESS Procedure returned successfully.
- @retval EFI_INVALID_PARAMETER The PCD service determined that the size of the data
- being set was incompatible with a call to this function.
+ @retval EFI_INVALID_PARAMETER The PCD service determined that the size of the data
+ being set was incompatible with a call to this function.
Use GetSize() to retrieve the size of the target data.
@retval EFI_NOT_FOUND The PCD service could not find the requested token number.
-
+
**/
EFI_STATUS
EFIAPI
@@ -1117,20 +1117,20 @@ PeiPcdSet8Ex ( /**
Sets an 16-bit value for a given PCD token.
- When the PCD service sets a value, it will check to ensure that the
- size of the value being set is compatible with the Token's existing definition.
+ When the PCD service sets a value, it will check to ensure that the
+ size of the value being set is compatible with the Token's existing definition.
If it is not, an error will be returned.
@param[in] Guid The 128-bit unique value that designates the namespace from which to extract the value.
- @param[in] ExTokenNumber The PCD token number.
+ @param[in] ExTokenNumber The PCD token number.
@param[in] Value The value to set for the PCD token.
@retval EFI_SUCCESS Procedure returned successfully.
- @retval EFI_INVALID_PARAMETER The PCD service determined that the size of the data
- being set was incompatible with a call to this function.
+ @retval EFI_INVALID_PARAMETER The PCD service determined that the size of the data
+ being set was incompatible with a call to this function.
Use GetSize() to retrieve the size of the target data.
@retval EFI_NOT_FOUND The PCD service could not find the requested token number.
-
+
**/
EFI_STATUS
EFIAPI
@@ -1146,20 +1146,20 @@ PeiPcdSet16Ex ( /**
Sets an 32-bit value for a given PCD token.
- When the PCD service sets a value, it will check to ensure that the
- size of the value being set is compatible with the Token's existing definition.
+ When the PCD service sets a value, it will check to ensure that the
+ size of the value being set is compatible with the Token's existing definition.
If it is not, an error will be returned.
@param[in] Guid The 128-bit unique value that designates the namespace from which to extract the value.
- @param[in] ExTokenNumber The PCD token number.
+ @param[in] ExTokenNumber The PCD token number.
@param[in] Value The value to set for the PCD token.
@retval EFI_SUCCESS Procedure returned successfully.
- @retval EFI_INVALID_PARAMETER The PCD service determined that the size of the data
- being set was incompatible with a call to this function.
+ @retval EFI_INVALID_PARAMETER The PCD service determined that the size of the data
+ being set was incompatible with a call to this function.
Use GetSize() to retrieve the size of the target data.
@retval EFI_NOT_FOUND The PCD service could not find the requested token number.
-
+
**/
EFI_STATUS
EFIAPI
@@ -1175,20 +1175,20 @@ PeiPcdSet32Ex ( /**
Sets an 64-bit value for a given PCD token.
- When the PCD service sets a value, it will check to ensure that the
- size of the value being set is compatible with the Token's existing definition.
+ When the PCD service sets a value, it will check to ensure that the
+ size of the value being set is compatible with the Token's existing definition.
If it is not, an error will be returned.
@param[in] Guid The 128-bit unique value that designates the namespace from which to extract the value.
- @param[in] ExTokenNumber The PCD token number.
+ @param[in] ExTokenNumber The PCD token number.
@param[in] Value The value to set for the PCD token.
@retval EFI_SUCCESS Procedure returned successfully.
- @retval EFI_INVALID_PARAMETER The PCD service determined that the size of the data
- being set was incompatible with a call to this function.
+ @retval EFI_INVALID_PARAMETER The PCD service determined that the size of the data
+ being set was incompatible with a call to this function.
Use GetSize() to retrieve the size of the target data.
@retval EFI_NOT_FOUND The PCD service could not find the requested token number.
-
+
**/
EFI_STATUS
EFIAPI
@@ -1204,24 +1204,24 @@ PeiPcdSet64Ex ( /**
Sets a value of a specified size for a given PCD token.
- When the PCD service sets a value, it will check to ensure that the
- size of the value being set is compatible with the Token's existing definition.
+ When the PCD service sets a value, it will check to ensure that the
+ size of the value being set is compatible with the Token's existing definition.
If it is not, an error will be returned.
@param[in] Guid The 128-bit unique value that designates the namespace from which to extract the value.
- @param[in] ExTokenNumber The PCD token number.
- @param[in, out] SizeOfBuffer A pointer to the length of the value being set for the PCD token.
- On input, if the SizeOfValue is greater than the maximum size supported
- for this TokenNumber then the output value of SizeOfValue will reflect
+ @param[in] ExTokenNumber The PCD token number.
+ @param[in, out] SizeOfBuffer A pointer to the length of the value being set for the PCD token.
+ On input, if the SizeOfValue is greater than the maximum size supported
+ for this TokenNumber then the output value of SizeOfValue will reflect
the maximum size supported for this TokenNumber.
@param[in] Value The buffer to set for the PCD token.
@retval EFI_SUCCESS Procedure returned successfully.
- @retval EFI_INVALID_PARAMETER The PCD service determined that the size of the data
- being set was incompatible with a call to this function.
+ @retval EFI_INVALID_PARAMETER The PCD service determined that the size of the data
+ being set was incompatible with a call to this function.
Use GetSize() to retrieve the size of the target data.
@retval EFI_NOT_FOUND The PCD service could not find the requested token number.
-
+
**/
EFI_STATUS
EFIAPI
@@ -1238,20 +1238,20 @@ PeiPcdSetPtrEx ( /**
Sets an Boolean value for a given PCD token.
- When the PCD service sets a value, it will check to ensure that the
- size of the value being set is compatible with the Token's existing definition.
+ When the PCD service sets a value, it will check to ensure that the
+ size of the value being set is compatible with the Token's existing definition.
If it is not, an error will be returned.
@param [in] Guid The 128-bit unique value that designates the namespace from which to extract the value.
- @param [in] ExTokenNumber The PCD token number.
+ @param [in] ExTokenNumber The PCD token number.
@param [in] Value The value to set for the PCD token.
@retval EFI_SUCCESS Procedure returned successfully.
- @retval EFI_INVALID_PARAMETER The PCD service determined that the size of the data
- being set was incompatible with a call to this function.
+ @retval EFI_INVALID_PARAMETER The PCD service determined that the size of the data
+ being set was incompatible with a call to this function.
Use GetSize() to retrieve the size of the target data.
@retval EFI_NOT_FOUND The PCD service could not find the requested token number.
-
+
**/
EFI_STATUS
EFIAPI
@@ -1268,10 +1268,10 @@ PeiPcdSetBoolEx ( Specifies a function to be called anytime the value of a designated token is changed.
@param[in] Guid The 128-bit unique value that designates the namespace from which to extract the value.
- @param[in] ExTokenNumber The PCD token number.
- @param[in] CallBackFunction The function prototype called when the value associated with the CallBackToken is set.
+ @param[in] ExTokenNumber The PCD token number.
+ @param[in] CallBackFunction The function prototype called when the value associated with the CallBackToken is set.
- @retval EFI_SUCCESS The PCD service has successfully established a call event
+ @retval EFI_SUCCESS The PCD service has successfully established a call event
for the CallBackToken requested.
@retval EFI_NOT_FOUND The PCD service could not find the referenced token number.
@@ -1299,10 +1299,10 @@ PeiRegisterCallBackOnSet ( Cancels a previously set callback function for a particular PCD token number.
@param[in] Guid The 128-bit unique value that designates the namespace from which to extract the value.
- @param[in] ExTokenNumber The PCD token number.
- @param[in] CallBackFunction The function prototype called when the value associated with the CallBackToken is set.
+ @param[in] ExTokenNumber The PCD token number.
+ @param[in] CallBackFunction The function prototype called when the value associated with the CallBackToken is set.
- @retval EFI_SUCCESS The PCD service has successfully established a call event
+ @retval EFI_SUCCESS The PCD service has successfully established a call event
for the CallBackToken requested.
@retval EFI_NOT_FOUND The PCD service could not find the referenced token number.
@@ -1327,26 +1327,26 @@ PcdUnRegisterCallBackOnSet ( }
/**
- Retrieves the next valid token number in a given namespace.
-
- This is useful since the PCD infrastructure contains a sparse list of token numbers,
- and one cannot a priori know what token numbers are valid in the database.
-
- If TokenNumber is 0 and Guid is not NULL, then the first token from the token space specified by Guid is returned.
- If TokenNumber is not 0 and Guid is not NULL, then the next token in the token space specified by Guid is returned.
- If TokenNumber is 0 and Guid is NULL, then the first token in the default token space is returned.
- If TokenNumber is not 0 and Guid is NULL, then the next token in the default token space is returned.
- The token numbers in the default token space may not be related to token numbers in token spaces that are named by Guid.
- If the next token number can be retrieved, then it is returned in TokenNumber, and EFI_SUCCESS is returned.
- If TokenNumber represents the last token number in the token space specified by Guid, then EFI_NOT_FOUND is returned.
+ Retrieves the next valid token number in a given namespace.
+
+ This is useful since the PCD infrastructure contains a sparse list of token numbers,
+ and one cannot a priori know what token numbers are valid in the database.
+
+ If TokenNumber is 0 and Guid is not NULL, then the first token from the token space specified by Guid is returned.
+ If TokenNumber is not 0 and Guid is not NULL, then the next token in the token space specified by Guid is returned.
+ If TokenNumber is 0 and Guid is NULL, then the first token in the default token space is returned.
+ If TokenNumber is not 0 and Guid is NULL, then the next token in the default token space is returned.
+ The token numbers in the default token space may not be related to token numbers in token spaces that are named by Guid.
+ If the next token number can be retrieved, then it is returned in TokenNumber, and EFI_SUCCESS is returned.
+ If TokenNumber represents the last token number in the token space specified by Guid, then EFI_NOT_FOUND is returned.
If TokenNumber is not present in the token space specified by Guid, then EFI_NOT_FOUND is returned.
- @param[in] Guid The 128-bit unique value that designates the namespace from which to extract the value.
- This is an optional parameter that may be NULL. If this parameter is NULL, then a request
+ @param[in] Guid The 128-bit unique value that designates the namespace from which to extract the value.
+ This is an optional parameter that may be NULL. If this parameter is NULL, then a request
is being made to retrieve tokens from the default token space.
@param[in, out] TokenNumber A pointer to the PCD token number to use to find the subsequent token number.
-
+
@retval EFI_SUCCESS The PCD service has retrieved the next valid token number.
@retval EFI_NOT_FOUND The PCD service could not find data from the requested token number.
@@ -1366,7 +1366,7 @@ PeiPcdGetNextToken ( UINTN Index;
BOOLEAN Found;
BOOLEAN PeiExMapTableEmpty;
- UINTN PeiNexTokenNumber;
+ UINTN PeiNexTokenNumber;
if (!FeaturePcdGet (PcdPeiFullPcdDatabaseEnable)) {
return EFI_UNSUPPORTED;
@@ -1466,7 +1466,7 @@ PeiPcdGetNextToken ( token namespace on the platform. If *Guid is NULL, then the GUID of the first token
space of the current platform is returned. If the search cannot locate the next valid
token namespace, an error is returned and the value of *Guid is undefined.
-
+
@retval EFI_SUCCESS The PCD service retrieved the value requested.
@retval EFI_NOT_FOUND The PCD service could not find the next valid token namespace.
@@ -1500,14 +1500,14 @@ PeiPcdGetNextTokenSpace ( } else {
PeiExMapTableEmpty = FALSE;
}
-
+
if (PeiExMapTableEmpty) {
return EFI_NOT_FOUND;
}
ExMapTable = (DYNAMICEX_MAPPING *)((UINT8 *)PeiPcdDb + PeiPcdDb->ExMapTableOffset);
GuidTable = (EFI_GUID *)((UINT8 *)PeiPcdDb + PeiPcdDb->GuidTableOffset);
-
+
if (*Guid == NULL) {
//
// return the first Token Space Guid.
@@ -1521,7 +1521,7 @@ PeiPcdGetNextTokenSpace ( if (MatchGuid == NULL) {
return EFI_NOT_FOUND;
}
-
+
GuidTableIdx = MatchGuid - GuidTable;
Found = FALSE;
@@ -1561,7 +1561,7 @@ PeiPcdGetNextTokenSpace ( /**
Get PCD value's size for POINTER type PCD.
-
+
The POINTER type PCD's value will be stored into a buffer in specified size.
The max size of this PCD's value is described in PCD's definition in DEC file.
@@ -1588,12 +1588,12 @@ GetPtrTypeSize ( LocalTokenNumber = *((UINT32 *)((UINT8 *)Database + Database->LocalTokenNumberTableOffset) + LocalTokenNumberTableIdx);
ASSERT ((LocalTokenNumber & PCD_DATUM_TYPE_ALL_SET) == PCD_DATUM_TYPE_POINTER);
-
+
SizeTable = (SIZE_INFO *)((UINT8 *)Database + Database->SizeTableOffset);
*MaxSize = SizeTable[SizeTableIdx];
//
- // SizeTable only contain record for PCD_DATUM_TYPE_POINTER type
+ // SizeTable only contain record for PCD_DATUM_TYPE_POINTER type
// PCD entry.
//
if ((LocalTokenNumber & PCD_TYPE_VPD) != 0) {
@@ -1616,7 +1616,7 @@ GetPtrTypeSize ( /**
Set PCD value's size for POINTER type PCD.
-
+
The POINTER type PCD's value will be stored into a buffer in specified size.
The max size of this PCD's value is described in PCD's definition in DEC file.
@@ -1639,7 +1639,7 @@ SetPtrTypeSize ( UINTN LocalTokenNumber;
SIZE_INFO *SizeTable;
UINTN MaxSize;
-
+
SizeTableIdx = GetSizeTableIndex (LocalTokenNumberTableIdx, Database);
LocalTokenNumber = *((UINT32 *)((UINT8 *)Database + Database->LocalTokenNumberTableOffset) + LocalTokenNumberTableIdx);
@@ -1650,7 +1650,7 @@ SetPtrTypeSize ( MaxSize = SizeTable[SizeTableIdx];
//
- // SizeTable only contain record for PCD_DATUM_TYPE_POINTER type
+ // SizeTable only contain record for PCD_DATUM_TYPE_POINTER type
// PCD entry.
//
if ((LocalTokenNumber & PCD_TYPE_VPD) != 0) {
@@ -1665,7 +1665,7 @@ SetPtrTypeSize ( *CurrentSize = MaxSize;
return FALSE;
}
-
+
//
// We have only two entry for Non-Sku enabled PCD entry:
// 1) MAX SIZE
diff --git a/MdeModulePkg/Universal/PCD/Pei/Pcd.inf b/MdeModulePkg/Universal/PCD/Pei/Pcd.inf index 3cba289..c2a3ccb 100644 --- a/MdeModulePkg/Universal/PCD/Pei/Pcd.inf +++ b/MdeModulePkg/Universal/PCD/Pei/Pcd.inf @@ -1,18 +1,18 @@ ## @file
# PCD PEIM produces PCD database to manage all dynamic PCD in PEI phase and install Pcd Ppi service.
#
-# This version PCD PEIM depends on the external PCD database binary file, not built in PCD data base.
+# This version PCD PEIM depends on the external PCD database binary file, not built in PCD data base.
# There are two PCD PPIs as follows:
-# 1) PCD_PPI
+# 1) PCD_PPI
# It is EDKII implementation which support Dynamic/DynamicEx Pcds.
# 2) EFI_PEI_PCD_PPI
-# It is defined by PI specification 1.2, Vol 3 which only support dynamicEx
+# It is defined by PI specification 1.2, Vol 3 which only support dynamicEx
# type Pcd.
# For dynamicEx type PCD, it is compatible between PCD_PPI and EFI_PEI_PCD_PPI.
# PCD PEIM driver will produce above two PPIs at same time.
#
-# PCD database is generated as the separate binary image at build time. The binary image
-# will be intergrated into Firmware volume together with PCD driver.
+# PCD database is generated as the separate binary image at build time. The binary image
+# will be intergrated into Firmware volume together with PCD driver.
#
# ////////////////////////////////////////////////////////////////////////////////
# // //
@@ -21,94 +21,94 @@ # ////////////////////////////////////////////////////////////////////////////////
#
# 1, Introduction
-# PCD database hold all dynamic type PCD information. The structure of PEI PCD
-# database is generated by build tools according to dynamic PCD usage for
+# PCD database hold all dynamic type PCD information. The structure of PEI PCD
+# database is generated by build tools according to dynamic PCD usage for
# specified platform.
-#
+#
# 2, Dynamic Type PCD
# Dynamic type PCD is used for the configuration/setting which value is determined
-# dynamic. In contrast, the value of static type PCD (FeatureFlag, FixedPcd,
-# PatchablePcd) is fixed in final generated FD image in build time.
-#
+# dynamic. In contrast, the value of static type PCD (FeatureFlag, FixedPcd,
+# PatchablePcd) is fixed in final generated FD image in build time.
+#
# 2.1 The "dynamic" determination means one of below cases:
-# a) The PCD setting value is produced by someone driver and consumed by
+# a) The PCD setting value is produced by someone driver and consumed by
# other driver in execution time.
# b) The PCD setting value is set/get by user from FrontPage.
# c) The PCD setting value is produced by platform OEM vendor in specified area.
-#
+#
# 2.2 According to module distribution way, dynamic PCD could be classfied as:
# a) Dynamic:
-# If module is released in source code and will be built with platform
+# If module is released in source code and will be built with platform
# DSC, the dynamic PCD used by this module can be accessed as:
-# PcdGetxx(PcdSampleDynamicPcd);
+# PcdGetxx(PcdSampleDynamicPcd);
# In building platform, build tools will translate PcdSampleDynamicPcd to
-# pair of {Token Space Guid: Token Number} for this PCD.
+# pair of {Token Space Guid: Token Number} for this PCD.
# b) DynamicEx:
# If module is release as binary and will not pariticpate platform building,
# the dynamic PCD used by this module need be accessed as:
# PcdGetxxEx(gEfiMyTokenspaceGuid, PcdSampleDynamicPcd)
# Developer need explicity gives {Token Space Guid:Token Number} as parameter
# in writting source code.
-#
+#
# 2.3 According to PCD value's storage method, dynamic PCD could be classfied as:
-# a) Default Storage:
-# - The PCD value is stored in PCD database maintained by PCD driver in boot
+# a) Default Storage:
+# - The PCD value is stored in PCD database maintained by PCD driver in boot
# time memory.
-# - This type is used for communication between PEIM/DXE driver, DXE/DXE
-# driver. But all set/get value will be losted after boot-time memory
+# - This type is used for communication between PEIM/DXE driver, DXE/DXE
+# driver. But all set/get value will be losted after boot-time memory
# is turn off.
-# - [PcdsDynamicDefault] is used as section name for this type PCD in
+# - [PcdsDynamicDefault] is used as section name for this type PCD in
# platform DSC file. [PcdsDynamicExDefault] is used for dynamicEx type PCD.
-#
-# b) Variable Storage:
-# - The PCD value is stored in variable area.
+#
+# b) Variable Storage:
+# - The PCD value is stored in variable area.
# - As default storage type, this type PCD could be used for PEI/DXE driver
-# communication. But beside it, this type PCD could also be used to store
+# communication. But beside it, this type PCD could also be used to store
# the value associate with a HII setting via variable interface.
-# - In PEI phase, the PCD value could only be got but can not be set due
+# - In PEI phase, the PCD value could only be got but can not be set due
# to variable area is readonly.
-# - [PcdsDynamicHii] is used as section name for this type PCD in platform
+# - [PcdsDynamicHii] is used as section name for this type PCD in platform
# DSC file. [PcdsDynamicExHii] is for dynamicEx type PCD.
-#
+#
# c) OEM specificed storage area:
-# - The PCD value is stored in OEM specified area which base address is
+# - The PCD value is stored in OEM specified area which base address is
# specified by a FixedAtBuild PCD setting - PcdVpdBaseAddress.
# - The area is read only for PEI and DXE phase.
-# - [PcdsDynamicVpd] is used as section name for this type PCD in platform
+# - [PcdsDynamicVpd] is used as section name for this type PCD in platform
# DSC file. [PcdsDynamicExVpd] is for dynamicex type PCD.
-#
+#
# 2.4 When and how to use dynamic PCD
# Module developer do not care the used PCD is dynamic or static when writting
-# source code/INF. Dynamic PCD and dynamic type is pointed by platform integrator
+# source code/INF. Dynamic PCD and dynamic type is pointed by platform integrator
# in platform DSC file. Please ref section 2.3 to get matching between dynamic
# PCD type and section name in DSC file.
-#
+#
# 3, PCD database:
-# Although dynamic PCD could be in different storage type as above description,
+# Although dynamic PCD could be in different storage type as above description,
# but the basic information and default value for all dynamic PCD is hold
# by PCD database maintained by PEI/DXE driver.
-#
+#
# As the whole EFI BIOS boot path is divided into PEI/DXE phase, the PCD database
# also is divided into Pei/Dxe database maintaied by PcdPeim/PcdDxe driver separatly.
# To make PcdPeim's driver image smaller, PEI PCD database only hold all dynamic
# PCD information used in PEI phase or use in both PEI/DXE phase. And DXE PCD
# database contains all PCDs used in PEI/DXE phase in memory.
-#
-# Build tool will generate PCD database into the separate binary file for
-# PEI/DXE PCD driver according to dynamic PCD section in platform DSC file.
-#
+#
+# Build tool will generate PCD database into the separate binary file for
+# PEI/DXE PCD driver according to dynamic PCD section in platform DSC file.
+#
# 3.1 PcdPeim and PcdDxe
# PEI PCD database is maintained by PcdPeim driver run from flash. PcdPeim driver
-# build guid hob in temporary memory and copy the binary data base from flash
-# to temporary memory for PEI PCD database.
+# build guid hob in temporary memory and copy the binary data base from flash
+# to temporary memory for PEI PCD database.
# DXE PCD database is maintained by PcdDxe driver.At entry point of PcdDxe driver,
# a new PCD database is allocated in boot-time memory which including all
# PEI PCD and DXE PCD entry.
-#
+#
# Pcd driver should run as early as possible before any other driver access
# dynamic PCD's value. PEI/DXE "Apriori File" mechanism make it possible by
# making PcdPeim/PcdDxe as first dispatching driver in PEI/DXE phase.
-#
+#
# 3.2 Token space Guid/Token number, Platform token, Local token number
# Dynamic PCD
# +-----------+ +---------+
@@ -128,42 +128,42 @@ # | Token |
# | Number |
# +-----------+
-#
-#
+#
+#
# 3.2.1 Pair of Token space guid + Token number
# Any type PCD is identified by pair of "TokenSpaceGuid + TokeNumber". But it
-# is not easy maintained by PCD driver, and hashed token number will make
-# searching slowly.
+# is not easy maintained by PCD driver, and hashed token number will make
+# searching slowly.
#
# 3.2.2 Platform Token Number
-# "Platform token number" concept is introduced for mapping to a pair of
-# "TokenSpaceGuid + TokenNumber". The platform token number is generated by
-# build tool in autogen.h and all of them are continual in a platform scope
+# "Platform token number" concept is introduced for mapping to a pair of
+# "TokenSpaceGuid + TokenNumber". The platform token number is generated by
+# build tool in autogen.h and all of them are continual in a platform scope
# started from 1.(0 meaning invalid internal token number)
# With auto-generated "platform token number", PcdGet(PcdSampleDynamicPcd)
-# in source code is translated to LibPcdGet(_PCD_TOKEN_PcdSampleDynamicPcd)
+# in source code is translated to LibPcdGet(_PCD_TOKEN_PcdSampleDynamicPcd)
# in autogen.h.
# Notes: The mapping between pair of "tokenspace guid + token number" and
# "internal token number" need build tool establish, so "platform token number"
# mechanism is not suitable for binary module which use DynamicEx type PCD.
# To access a dynamicEx type PCD, pair of "token space guid/token number" all need
# to be specificed for PcdSet/PcdGet accessing macro.
-#
-# Platform Token Number is started from 1, and inceased continuous. From whole
+#
+# Platform Token Number is started from 1, and inceased continuous. From whole
# platform scope, there are two zones: PEI Zone and DXE Zone
# | Platform Token Number
# ----------|----------------------------------------------------------------
# PEI Zone: | 1 ~ PEI_LOCAL_TOKEN_NUMBER
# DXE Zone: | (PEI_LOCAL_TOKEN_NUMBER + 1) ~ (PEI_LOCAL_TOKEN_NUMBER + DXE_LOCAL_TOKEN_NUMBER)
-#
+#
# 3.2.3 Local Token Number
-# To fast searching a PCD entry in PCD database, PCD driver translate
+# To fast searching a PCD entry in PCD database, PCD driver translate
# platform token number to local token number via a mapping table.
# For binary DynamicEx type PCD, there is a another mapping table to translate
# "token space guid + token number" to local token number directly.
# Local token number is identifier for all internal interface in PCD PEI/DXE
# driver.
-#
+#
# A local token number is a 32-bit value in following meaning:
# 32 ------------- 28 ---------- 24 -------- 0
# | PCD type mask | Datum Type | Offset |
@@ -183,13 +183,13 @@ # Offset : indicate the related offset of PCD value in PCD database array.
# Based on local token number, PCD driver could fast determine PCD type, value
# type and get PCD entry from PCD database.
-#
+#
# 3.3 PCD Database binary file
-# PCD Database binary file will be created at build time as the standalone binary image.
-# To understand the binary image layout, PCD Database C structure is still generated
+# PCD Database binary file will be created at build time as the standalone binary image.
+# To understand the binary image layout, PCD Database C structure is still generated
# as comments by build tools in PCD driver's autogen.h/
# autogen.c file. In generated C structure, following information is stored:
-# - ExMapTable: This table is used translate a binary dynamicex type PCD's
+# - ExMapTable: This table is used translate a binary dynamicex type PCD's
# "tokenguid + token" to local token number.
# - LocalTokenNumberTable:
# This table stores all local token number in array, use "Internal
@@ -199,19 +199,19 @@ # HII type PCD's variable GUID.
# - SkuIdTable: TBD
# - SystemSkuId: TBD
-# - PCD value structure:
+# - PCD value structure:
# Every PCD has a value record in PCD database. For different
-# datum type PCD has different record structure which will be
+# datum type PCD has different record structure which will be
# introduced in 3.3.1
-#
-# In a PCD database structure, there are two major area: Init and UnInit.
-# Init area is use stored above PCD internal structure such as ExMapTable,
-# LocalTokenNumberTable etc and the (default) value of PCD which has default
+#
+# In a PCD database structure, there are two major area: Init and UnInit.
+# Init area is use stored above PCD internal structure such as ExMapTable,
+# LocalTokenNumberTable etc and the (default) value of PCD which has default
# value specified in platform DSC file.
# Unint area is used stored the value of PCD which has no default value in
# platform DSC file, the value of NULL, 0 specified in platform DSC file can
# be seemed as "no default value".
-#
+#
# 3.3.1 Simple Sample PCD Database C Structure
# A general sample of PCD database structue is as follows:
# typedef struct _PCD_DATABASE {
@@ -223,7 +223,7 @@ # SIZE_INFO SizeTable[PEI_SIZE_TABLE_SIZE];
# UINT8 SkuIdTable[PEI_SKUID_TABLE_SIZE];
# SKU_ID SystemSkuId;
-#
+#
# //===== Following is value structure for PCD with default value
# ....
# ....
@@ -235,11 +235,11 @@ # ....
# } UnInit;
# }
-#
+#
# 3.3.2 PCD value structure in PCD database C structure
# The value's structure is generated by build tool in PCD database C structure.
# The PCDs in different datum type has different value structure.
-#
+#
# 3.3.2.1 UINT8/UINT16/UINT32/UINT64 datum type PCD
# The C structure for these datum type PCD is just a UINT8/UINT16/UINT32/UINT64
# data member in PCD database, For example:
@@ -247,36 +247,36 @@ # Above structure is generated by build tool, the member name is "PcdCName_Guidvalue"
# Member type is UINT16 according to PcdHardwareErrorRecordLevel declaration
# in DEC file.
-#
+#
# 3.3.2.2 VOID* datum type PCD
# The value of VOID* datum type PCD is a UINT8/UINT16 array in PCD database.
-#
+#
# 3.3.2.2.1 VOID* - string type
-# If the default value for VOID* datum type PCD like L"xxx", the PCD is
-# used for unicode string, and C structure of this datum type PCD is
+# If the default value for VOID* datum type PCD like L"xxx", the PCD is
+# used for unicode string, and C structure of this datum type PCD is
# UINT16 string array in PCD database, for example:
# UINT16 StringTable[29];
# The number of 29 in above sample is max size of a unicode string.
-#
+#
# If the default value for VOID* datum type PCD like "xxx", the PCD is
-# used for ascii string, and C structure of this datum type PCD is
+# used for ascii string, and C structure of this datum type PCD is
# UINT8 string array in PCD database, for example:
# UINT8 StringTable[20];
# The number of 20 in above sample is max size of a ascii string.
-#
+#
# 3.3.2.2.2 VOID* - byte array
# If the default value of VOID* datum type PCD like {'0x29', '0x01', '0xf2'}
-# the PCD is used for byte array. The generated structrue is same as
+# the PCD is used for byte array. The generated structrue is same as
# above ascii string table,
# UINT8 StringTable[13];
# The number of 13 in above sample is max size of byte array.
-#
+#
# 3.3.3 Some utility structures in PCD Database
# 3.3.3.1 GuidTable
# GuidTable array is used to store all related GUID value in PCD database:
# - Variable GUID for HII type PCD
-# - Token space GUID for dynamicex type PCD
-#
+# - Token space GUID for dynamicex type PCD
+#
# Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>
#
# This program and the accompanying materials
@@ -327,7 +327,7 @@ [Guids]
## PRODUCES ## HOB
## SOMETIMES_CONSUMES ## HOB
- gPcdDataBaseHobGuid
+ gPcdDataBaseHobGuid
gPcdDataBaseSignatureGuid ## CONSUMES ## GUID # PCD database signature GUID.
gEfiMdeModulePkgTokenSpaceGuid ## SOMETIMES_CONSUMES ## GUID
diff --git a/MdeModulePkg/Universal/PCD/Pei/PcdPeim.uni b/MdeModulePkg/Universal/PCD/Pei/PcdPeim.uni index 3e7c556..88cfe01 100644 --- a/MdeModulePkg/Universal/PCD/Pei/PcdPeim.uni +++ b/MdeModulePkg/Universal/PCD/Pei/PcdPeim.uni @@ -10,32 +10,32 @@ // type Pcd.
// For dynamicEx type PCD, it is compatible between PCD_PPI and EFI_PEI_PCD_PPI.
// PCD PEIM driver will produce above two PPIs at same time.
-//
+//
// PCD database is generated as the separate binary image at build time. The binary image
// will be intergrated into Firmware volume together with PCD driver.
-//
+//
// ////////////////////////////////////////////////////////////////////////////////
// // //
// // Introduction of PCD database //
// // //
// ////////////////////////////////////////////////////////////////////////////////
-//
+//
// 1, Introduction
// PCD database hold all dynamic type PCD information. The structure of PEI PCD
// database is generated by build tools according to dynamic PCD usage for
// specified platform.
-//
+//
// 2, Dynamic Type PCD
// Dynamic type PCD is used for the configuration/setting which value is determined
// dynamic. In contrast, the value of static type PCD (FeatureFlag, FixedPcd,
// PatchablePcd) is fixed in final generated FD image in build time.
-//
+//
// 2.1 The "dynamic" determination means one of below cases:
// a) The PCD setting value is produced by someone driver and consumed by
// other driver in execution time.
// b) The PCD setting value is set/get by user from FrontPage.
// c) The PCD setting value is produced by platform OEM vendor in specified area.
-//
+//
// 2.2 According to module distribution way, dynamic PCD could be classfied as:
// a) Dynamic:
// If module is released in source code and will be built with platform
@@ -49,7 +49,7 @@ // PcdGetxxEx(gEfiMyTokenspaceGuid, PcdSampleDynamicPcd)
// Developer need explicity gives {Token Space Guid:Token Number} as parameter
// in writting source code.
-//
+//
// 2.3 According to PCD value's storage method, dynamic PCD could be classfied as:
// a) Default Storage:
// - The PCD value is stored in PCD database maintained by PCD driver in boot
@@ -59,7 +59,7 @@ // is turn off.
// - [PcdsDynamicDefault] is used as section name for this type PCD in
// platform DSC file. [PcdsDynamicExDefault] is used for dynamicEx type PCD.
-//
+//
// b) Variable Storage:
// - The PCD value is stored in variable area.
// - As default storage type, this type PCD could be used for PEI/DXE driver
@@ -69,34 +69,34 @@ // to variable area is readonly.
// - [PcdsDynamicHii] is used as section name for this type PCD in platform
// DSC file. [PcdsDynamicExHii] is for dynamicEx type PCD.
-//
+//
// c) OEM specificed storage area:
// - The PCD value is stored in OEM specified area which base address is
// specified by a FixedAtBuild PCD setting - PcdVpdBaseAddress.
// - The area is read only for PEI and DXE phase.
// - [PcdsDynamicVpd] is used as section name for this type PCD in platform
// DSC file. [PcdsDynamicExVpd] is for dynamicex type PCD.
-//
+//
// 2.4 When and how to use dynamic PCD
// Module developer do not care the used PCD is dynamic or static when writting
// source code/INF. Dynamic PCD and dynamic type is pointed by platform integrator
// in platform DSC file. Please ref section 2.3 to get matching between dynamic
// PCD type and section name in DSC file.
-//
+//
// 3, PCD database:
// Although dynamic PCD could be in different storage type as above description,
// but the basic information and default value for all dynamic PCD is hold
// by PCD database maintained by PEI/DXE driver.
-//
+//
// As the whole EFI BIOS boot path is divided into PEI/DXE phase, the PCD database
// also is divided into Pei/Dxe database maintaied by PcdPeim/PcdDxe driver separatly.
// To make PcdPeim's driver image smaller, PEI PCD database only hold all dynamic
// PCD information used in PEI phase or use in both PEI/DXE phase. And DXE PCD
// database contains all PCDs used in PEI/DXE phase in memory.
-//
+//
// Build tool will generate PCD database into the separate binary file for
// PEI/DXE PCD driver according to dynamic PCD section in platform DSC file.
-//
+//
// 3.1 PcdPeim and PcdDxe
// PEI PCD database is maintained by PcdPeim driver run from flash. PcdPeim driver
// build guid hob in temporary memory and copy the binary data base from flash
@@ -104,11 +104,11 @@ // DXE PCD database is maintained by PcdDxe driver.At entry point of PcdDxe driver,
// a new PCD database is allocated in boot-time memory which including all
// PEI PCD and DXE PCD entry.
-//
+//
// Pcd driver should run as early as possible before any other driver access
// dynamic PCD's value. PEI/DXE "Apriori File" mechanism make it possible by
// making PcdPeim/PcdDxe as first dispatching driver in PEI/DXE phase.
-//
+//
// 3.2 Token space Guid/Token number, Platform token, Local token number
// Dynamic PCD
// +-----------+ +---------+
@@ -128,13 +128,13 @@ // | Token |
// | Number |
// +-----------+
-//
-//
+//
+//
// 3.2.1 Pair of Token space guid + Token number
// Any type PCD is identified by pair of "TokenSpaceGuid + TokeNumber". But it
// is not easy maintained by PCD driver, and hashed token number will make
// searching slowly.
-//
+//
// 3.2.2 Platform Token Number
// "Platform token number" concept is introduced for mapping to a pair of
// "TokenSpaceGuid + TokenNumber". The platform token number is generated by
@@ -148,14 +148,14 @@ // mechanism is not suitable for binary module which use DynamicEx type PCD.
// To access a dynamicEx type PCD, pair of "token space guid/token number" all need
// to be specificed for PcdSet/PcdGet accessing macro.
-//
+//
// Platform Token Number is started from 1, and inceased continuous. From whole
// platform scope, there are two zones: PEI Zone and DXE Zone
// | Platform Token Number
// ----------|----------------------------------------------------------------
// PEI Zone: | 1 ~ PEI_LOCAL_TOKEN_NUMBER
// DXE Zone: | (PEI_LOCAL_TOKEN_NUMBER + 1) ~ (PEI_LOCAL_TOKEN_NUMBER + DXE_LOCAL_TOKEN_NUMBER)
-//
+//
// 3.2.3 Local Token Number
// To fast searching a PCD entry in PCD database, PCD driver translate
// platform token number to local token number via a mapping table.
@@ -163,7 +163,7 @@ // "token space guid + token number" to local token number directly.
// Local token number is identifier for all internal interface in PCD PEI/DXE
// driver.
-//
+//
// A local token number is a 32-bit value in following meaning:
// 32 ------------- 28 ---------- 24 -------- 0
// | PCD type mask | Datum Type | Offset |
@@ -183,7 +183,7 @@ // Offset : indicate the related offset of PCD value in PCD database array.
// Based on local token number, PCD driver could fast determine PCD type, value
// type and get PCD entry from PCD database.
-//
+//
// 3.3 PCD Database binary file
// PCD Database binary file will be created at build time as the standalone binary image.
// To understand the binary image layout, PCD Database C structure is still generated
@@ -203,7 +203,7 @@ // Every PCD has a value record in PCD database. For different
// datum type PCD has different record structure which will be
// introduced in 3.3.1
-//
+//
// In a PCD database structure, there are two major area: Init and UnInit.
// Init area is use stored above PCD internal structure such as ExMapTable,
// LocalTokenNumberTable etc and the (default) value of PCD which has default
@@ -211,7 +211,7 @@ // Unint area is used stored the value of PCD which has no default value in
// platform DSC file, the value of NULL, 0 specified in platform DSC file can
// be seemed as "no default value".
-//
+//
// 3.3.1 Simple Sample PCD Database C Structure
// A general sample of PCD database structue is as follows:
// typedef struct _PCD_DATABASE {
@@ -223,7 +223,7 @@ // SIZE_INFO SizeTable[PEI_SIZE_TABLE_SIZE];
// UINT8 SkuIdTable[PEI_SKUID_TABLE_SIZE];
// SKU_ID SystemSkuId;
-//
+//
// //===== Following is value structure for PCD with default value
// ....
// ....
@@ -235,11 +235,11 @@ // ....
// } UnInit;
// }
-//
+//
// 3.3.2 PCD value structure in PCD database C structure
// The value's structure is generated by build tool in PCD database C structure.
// The PCDs in different datum type has different value structure.
-//
+//
// 3.3.2.1 UINT8/UINT16/UINT32/UINT64 datum type PCD
// The C structure for these datum type PCD is just a UINT8/UINT16/UINT32/UINT64
// data member in PCD database, For example:
@@ -247,30 +247,30 @@ // Above structure is generated by build tool, the member name is "PcdCName_Guidvalue"
// Member type is UINT16 according to PcdHardwareErrorRecordLevel declaration
// in DEC file.
-//
+//
// 3.3.2.2 VOID* datum type PCD
// The value of VOID* datum type PCD is a UINT8/UINT16 array in PCD database.
-//
+//
// 3.3.2.2.1 VOID* - string type
// If the default value for VOID* datum type PCD like L"xxx", the PCD is
// used for unicode string, and C structure of this datum type PCD is
// UINT16 string array in PCD database, for example:
// UINT16 StringTable[29];
// The number of 29 in above sample is max size of a unicode string.
-//
+//
// If the default value for VOID* datum type PCD like "xxx", the PCD is
// used for ascii string, and C structure of this datum type PCD is
// UINT8 string array in PCD database, for example:
// UINT8 StringTable[20];
// The number of 20 in above sample is max size of a ascii string.
-//
+//
// 3.3.2.2.2 VOID* - byte array
// If the default value of VOID* datum type PCD like {'0x29', '0x01', '0xf2'}
// the PCD is used for byte array. The generated structrue is same as
// above ascii string table,
// UINT8 StringTable[13];
// The number of 13 in above sample is max size of byte array.
-//
+//
// 3.3.3 Some utility structures in PCD Database
// 3.3.3.1 GuidTable
// GuidTable array is used to store all related GUID value in PCD database:
diff --git a/MdeModulePkg/Universal/PCD/Pei/PcdPeimExtra.uni b/MdeModulePkg/Universal/PCD/Pei/PcdPeimExtra.uni index a618943..9cbf7c3 100644 --- a/MdeModulePkg/Universal/PCD/Pei/PcdPeimExtra.uni +++ b/MdeModulePkg/Universal/PCD/Pei/PcdPeimExtra.uni @@ -1,7 +1,7 @@ // /** @file
// PcdPeim Localized Strings and Content
//
-// Copyright (c) 2013 - 2014, Intel Corporation. All rights reserved.<BR>
+// Copyright (c) 2013 - 2018, Intel Corporation. All rights reserved.<BR>
//
// This program and the accompanying materials
// are licensed and made available under the terms and conditions of the BSD License
@@ -12,8 +12,8 @@ //
// **/
-#string STR_PROPERTIES_MODULE_NAME
-#language en-US
+#string STR_PROPERTIES_MODULE_NAME
+#language en-US
"Platform Configuration Database PEI Module"
diff --git a/MdeModulePkg/Universal/PCD/Pei/Service.c b/MdeModulePkg/Universal/PCD/Pei/Service.c index e8a0b6c..bb4b52b 100644 --- a/MdeModulePkg/Universal/PCD/Pei/Service.c +++ b/MdeModulePkg/Universal/PCD/Pei/Service.c @@ -2,7 +2,7 @@ The driver internal functions are implmented here.
They build Pei PCD database, and provide access service to PCD database.
-Copyright (c) 2006 - 2017, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>
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 @@ GetPcdName ( CHAR8 *Name;
//
- // Return NULL when PCD name table is absent.
+ // Return NULL when PCD name table is absent.
//
if (Database->PcdNameTableOffset == 0) {
return NULL;
@@ -140,7 +140,7 @@ GetPcdName ( //
AsciiStrCatS (Name, NameSize, TokenSpaceName);
Name[AsciiStrSize (TokenSpaceName) - sizeof (CHAR8)] = '.';
- AsciiStrCatS (Name, NameSize, PcdName);
+ AsciiStrCatS (Name, NameSize, PcdName);
}
return Name;
@@ -156,7 +156,7 @@ GetPcdName ( @param[in] Guid The 128-bit unique value that designates the namespace from which to extract the value.
@param[in] TokenNumber The PCD token number.
@param[out] PcdInfo The returned information associated with the requested TokenNumber.
- The caller is responsible for freeing the buffer that is allocated by callee for PcdInfo->PcdName.
+ The caller is responsible for freeing the buffer that is allocated by callee for PcdInfo->PcdName.
@retval EFI_SUCCESS The PCD information was returned successfully
@retval EFI_NOT_FOUND The PCD service could not find the requested token number.
@@ -202,7 +202,7 @@ ExGetPcdInfo ( PcdInfo->PcdSize = 0;
//
// Here use one representative in the token space to get the TokenSpaceCName.
- //
+ //
PcdInfo->PcdName = GetPcdName (TRUE, Database, ExMapTable[Index].TokenNumber);
return EFI_SUCCESS;
} else if (ExMapTable[Index].ExTokenNumber == TokenNumber) {
@@ -345,7 +345,7 @@ PeiRegisterCallBackWorker ( //
TokenNumber--;
// EBC compiler is very choosy. It may report warning about comparison
- // between UINTN and 0 . So we add 1 in each size of the
+ // between UINTN and 0 . So we add 1 in each size of the
// comparison.
ASSERT ((TokenNumber + 1) < (LocalTokenCount + 1));
}
@@ -362,7 +362,7 @@ PeiRegisterCallBackWorker ( GuidHob = GetFirstGuidHob (&gEfiCallerIdGuid);
ASSERT (GuidHob != NULL);
-
+
CallbackTable = GET_GUID_HOB_DATA (GuidHob);
CallbackTable = CallbackTable + (TokenNumber * PcdGet32 (PcdMaxPeiPcdCallBackNumberPerPcdEntry));
@@ -383,7 +383,7 @@ PeiRegisterCallBackWorker ( /**
- Find the Pcd database.
+ Find the Pcd database.
@param FileHandle Handle of the file the external PCD database binary located.
@@ -452,7 +452,7 @@ BuildPcdDatabase ( SizeOfCallbackFnTable = Database->LocalTokenCount * sizeof (PCD_PPI_CALLBACK) * PcdGet32 (PcdMaxPeiPcdCallBackNumberPerPcdEntry);
CallbackFnTable = BuildGuidHob (&gEfiCallerIdGuid, SizeOfCallbackFnTable);
-
+
ZeroMem (CallbackFnTable, SizeOfCallbackFnTable);
return Database;
@@ -520,7 +520,7 @@ GetHiiVariable ( }
/**
- Invoke the callback function when dynamic PCD entry was set, if this PCD entry
+ Invoke the callback function when dynamic PCD entry was set, if this PCD entry
has registered callback function.
@param ExTokenNumber DynamicEx PCD's token number, if this PCD entry is dyanmicEx
@@ -559,14 +559,14 @@ InvokeCallbackOnSet ( if (Guid == NULL) {
// EBC compiler is very choosy. It may report warning about comparison
- // between UINTN and 0 . So we add 1 in each size of the
+ // between UINTN and 0 . So we add 1 in each size of the
// comparison.
ASSERT (TokenNumber + 1 < (LocalTokenCount + 1));
}
GuidHob = GetFirstGuidHob (&gEfiCallerIdGuid);
ASSERT (GuidHob != NULL);
-
+
CallbackTable = GET_GUID_HOB_DATA (GuidHob);
CallbackTable += (TokenNumber * PcdGet32 (PcdMaxPeiPcdCallBackNumberPerPcdEntry));
@@ -616,7 +616,7 @@ SetValueWorker ( @retval EFI_INVALID_PARAMETER If Size of non-Ptr type PCD does not match the size information in PCD database.
@retval EFI_NOT_FOUND If value type of PCD entry is intergrate, but not in
range of UINT8, UINT16, UINT32, UINT64
- @retval EFI_NOT_FOUND Can not find the PCD type according to token number.
+ @retval EFI_NOT_FOUND Can not find the PCD type according to token number.
**/
EFI_STATUS
SetWorker (
@@ -638,7 +638,7 @@ SetWorker ( if (!FeaturePcdGet(PcdPeiFullPcdDatabaseEnable)) {
return EFI_UNSUPPORTED;
}
-
+
//
// TokenNumber Zero is reserved as PCD_INVALID_TOKEN_NUMBER.
// We have to decrement TokenNumber by 1 to make it usable
@@ -649,7 +649,7 @@ SetWorker ( LocalTokenCount = PeiPcdDb->LocalTokenCount;
// EBC compiler is very choosy. It may report warning about comparison
- // between UINTN and 0 . So we add 1 in each size of the
+ // between UINTN and 0 . So we add 1 in each size of the
// comparison.
ASSERT (TokenNumber + 1 < (LocalTokenCount + 1));
@@ -682,7 +682,7 @@ SetWorker ( Offset = LocalTokenNumber & PCD_DATABASE_OFFSET_MASK;
InternalData = (VOID *) ((UINT8 *) PeiPcdDb + Offset);
-
+
switch (LocalTokenNumber & PCD_TYPE_ALL_SET) {
case PCD_TYPE_VPD:
case PCD_TYPE_HII:
@@ -734,7 +734,7 @@ SetWorker ( return EFI_NOT_FOUND;
}
}
-
+
}
ASSERT (FALSE);
@@ -766,12 +766,12 @@ ExSetValueWorker ( /**
Set value for a dynamic-ex PCD entry.
-
- This routine find the local token number according to dynamic-ex PCD's token
+
+ This routine find the local token number according to dynamic-ex PCD's token
space guid and token number firstly, and invoke callback function if this PCD
entry registered callback function. Finally, invoken general SetWorker to set
PCD value.
-
+
@param ExTokenNumber Dynamic-ex PCD token number.
@param Guid Token space guid for dynamic-ex PCD.
@param Data PCD value want to be set
@@ -801,7 +801,7 @@ ExSetWorker ( if (TokenNumber == PCD_INVALID_TOKEN_NUMBER) {
return EFI_NOT_FOUND;
}
-
+
InvokeCallbackOnSet (ExTokenNumber, Guid, TokenNumber, Data, *Size);
return SetWorker (TokenNumber, Data, Size, PtrType);
@@ -824,16 +824,16 @@ ExGetWorker ( IN UINTN ExTokenNumber,
IN UINTN GetSize
)
-{
+{
return GetWorker (GetExPcdTokenNumber (Guid, ExTokenNumber), GetSize);
}
/**
Get the PCD entry pointer in PCD database.
-
+
This routine will visit PCD database to find the PCD entry according to given
- token number. The given token number is autogened by build tools and it will be
- translated to local token number. Local token number contains PCD's type and
+ token number. The given token number is autogened by build tools and it will be
+ translated to local token number. Local token number contains PCD's type and
offset of PCD entry in PCD database.
@param TokenNumber Token's number, it is autogened by build tools
@@ -873,7 +873,7 @@ GetWorker ( LocalTokenCount = PeiPcdDb->LocalTokenCount;
// EBC compiler is very choosy. It may report warning about comparison
- // between UINTN and 0 . So we add 1 in each size of the
+ // between UINTN and 0 . So we add 1 in each size of the
// comparison.
ASSERT (TokenNumber + 1 < (LocalTokenCount + 1));
@@ -891,21 +891,21 @@ GetWorker ( VpdHead = (VPD_HEAD *) ((UINT8 *)PeiPcdDb + Offset);
return (VOID *) ((UINTN) PcdGet32 (PcdVpdBaseAddress) + VpdHead->Offset);
}
-
+
case PCD_TYPE_HII|PCD_TYPE_STRING:
case PCD_TYPE_HII:
{
VariableHead = (VARIABLE_HEAD *) ((UINT8 *)PeiPcdDb + Offset);
-
+
Guid = (EFI_GUID *) ((UINT8 *)PeiPcdDb + PeiPcdDb->GuidTableOffset) + VariableHead->GuidTableIndex;
Name = (UINT16*)&StringTable[VariableHead->StringIndex];
if ((LocalTokenNumber & PCD_TYPE_ALL_SET) == (PCD_TYPE_HII|PCD_TYPE_STRING)) {
//
- // If a HII type PCD's datum type is VOID*, the DefaultValueOffset is the index of
+ // If a HII type PCD's datum type is VOID*, the DefaultValueOffset is the index of
// string array in string table.
//
- VaraiableDefaultBuffer = (UINT8 *) &StringTable[*(STRING_HEAD*)((UINT8*) PeiPcdDb + VariableHead->DefaultValueOffset)];
+ VaraiableDefaultBuffer = (UINT8 *) &StringTable[*(STRING_HEAD*)((UINT8*) PeiPcdDb + VariableHead->DefaultValueOffset)];
} else {
VaraiableDefaultBuffer = (UINT8 *) PeiPcdDb + VariableHead->DefaultValueOffset;
}
@@ -943,13 +943,13 @@ GetWorker ( default:
ASSERT (FALSE);
break;
-
+
}
ASSERT (FALSE);
-
+
return NULL;
-
+
}
/**
@@ -958,14 +958,14 @@ GetWorker ( A dynamic-ex type PCD, developer must provide pair of token space guid: token number
in DEC file. PCD database maintain a mapping table that translate pair of {token
space guid: token number} to Token Number.
-
+
@param Guid Token space guid for dynamic-ex PCD entry.
@param ExTokenNumber Dynamic-ex PCD token number.
@return Token Number for dynamic-ex PCD.
**/
-UINTN
+UINTN
GetExPcdTokenNumber (
IN CONST EFI_GUID *Guid,
IN UINTN ExTokenNumber
@@ -989,16 +989,16 @@ GetExPcdTokenNumber ( // error in the BUILD system.
//
ASSERT (MatchGuid != NULL);
-
+
MatchGuidIdx = MatchGuid - GuidTable;
-
+
for (Index = 0; Index < PeiPcdDb->ExTokenCount; Index++) {
- if ((ExTokenNumber == ExMap[Index].ExTokenNumber) &&
+ if ((ExTokenNumber == ExMap[Index].ExTokenNumber) &&
(MatchGuidIdx == ExMap[Index].ExGuidIndex)) {
return ExMap[Index].TokenNumber;
}
}
-
+
return PCD_INVALID_TOKEN_NUMBER;
}
@@ -1017,7 +1017,7 @@ GetPcdDatabase ( GuidHob = GetFirstGuidHob (&gPcdDataBaseHobGuid);
ASSERT (GuidHob != NULL);
-
+
return (PEI_PCD_DATABASE *) GET_GUID_HOB_DATA (GuidHob);
}
@@ -1047,7 +1047,7 @@ GetSizeTableIndex ( if ((LocalTokenNumber & PCD_DATUM_TYPE_ALL_SET) == PCD_DATUM_TYPE_POINTER) {
//
- // SizeTable only contain record for PCD_DATUM_TYPE_POINTER type
+ // SizeTable only contain record for PCD_DATUM_TYPE_POINTER type
// PCD entry.
//
if ((LocalTokenNumber & PCD_TYPE_VPD) != 0) {
diff --git a/MdeModulePkg/Universal/PCD/Pei/Service.h b/MdeModulePkg/Universal/PCD/Pei/Service.h index 3a7910a..a8299cc 100644 --- a/MdeModulePkg/Universal/PCD/Pei/Service.h +++ b/MdeModulePkg/Universal/PCD/Pei/Service.h @@ -1,7 +1,7 @@ /** @file
The internal header file declares the private functions used by PeiPcd driver.
-Copyright (c) 2006 - 2016, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>
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
@@ -108,21 +108,21 @@ PeiGetPcdInfoGetSku ( /**
Sets the SKU value for subsequent calls to set or get PCD token values.
- SetSku() sets the SKU Id to be used for subsequent calls to set or get PCD values.
+ SetSku() sets the SKU Id to be used for subsequent calls to set or get PCD values.
SetSku() is normally called only once by the system.
- For each item (token), the database can hold a single value that applies to all SKUs,
- or multiple values, where each value is associated with a specific SKU Id. Items with multiple,
- SKU-specific values are called SKU enabled.
-
- The SKU Id of zero is reserved as a default. The valid SkuId range is 1 to 255.
- For tokens that are not SKU enabled, the system ignores any set SKU Id and works with the
- single value for that token. For SKU-enabled tokens, the system will use the SKU Id set by the
- last call to SetSku(). If no SKU Id is set or the currently set SKU Id isn't valid for the specified token,
- the system uses the default SKU Id. If the system attempts to use the default SKU Id and no value has been
+ For each item (token), the database can hold a single value that applies to all SKUs,
+ or multiple values, where each value is associated with a specific SKU Id. Items with multiple,
+ SKU-specific values are called SKU enabled.
+
+ The SKU Id of zero is reserved as a default. The valid SkuId range is 1 to 255.
+ For tokens that are not SKU enabled, the system ignores any set SKU Id and works with the
+ single value for that token. For SKU-enabled tokens, the system will use the SKU Id set by the
+ last call to SetSku(). If no SKU Id is set or the currently set SKU Id isn't valid for the specified token,
+ the system uses the default SKU Id. If the system attempts to use the default SKU Id and no value has been
set for that Id, the results are unpredictable.
- @param[in] SkuId The SKU value that will be used when the PCD service will retrieve and
+ @param[in] SkuId The SKU value that will be used when the PCD service will retrieve and
set values associated with a PCD token.
**/
@@ -135,13 +135,13 @@ PeiPcdSetSku ( /**
Retrieves an 8-bit value for a given PCD token.
- Retrieves the current byte-sized value for a PCD token number.
+ Retrieves the current byte-sized value for a PCD token number.
If the TokenNumber is invalid, the results are unpredictable.
-
- @param[in] TokenNumber The PCD token number.
+
+ @param[in] TokenNumber The PCD token number.
@return The UINT8 value.
-
+
**/
UINT8
EFIAPI
@@ -152,13 +152,13 @@ PeiPcdGet8 ( /**
Retrieves an 16-bit value for a given PCD token.
- Retrieves the current 16-bits value for a PCD token number.
+ Retrieves the current 16-bits value for a PCD token number.
If the TokenNumber is invalid, the results are unpredictable.
-
- @param[in] TokenNumber The PCD token number.
+
+ @param[in] TokenNumber The PCD token number.
@return The UINT16 value.
-
+
**/
UINT16
EFIAPI
@@ -169,13 +169,13 @@ PeiPcdGet16 ( /**
Retrieves an 32-bit value for a given PCD token.
- Retrieves the current 32-bits value for a PCD token number.
+ Retrieves the current 32-bits value for a PCD token number.
If the TokenNumber is invalid, the results are unpredictable.
-
- @param[in] TokenNumber The PCD token number.
+
+ @param[in] TokenNumber The PCD token number.
@return The UINT32 value.
-
+
**/
UINT32
EFIAPI
@@ -186,13 +186,13 @@ PeiPcdGet32 ( /**
Retrieves an 64-bit value for a given PCD token.
- Retrieves the current 64-bits value for a PCD token number.
+ Retrieves the current 64-bits value for a PCD token number.
If the TokenNumber is invalid, the results are unpredictable.
-
- @param[in] TokenNumber The PCD token number.
+
+ @param[in] TokenNumber The PCD token number.
@return The UINT64 value.
-
+
**/
UINT64
EFIAPI
@@ -203,15 +203,15 @@ PeiPcdGet64 ( /**
Retrieves a pointer to a value for a given PCD token.
- Retrieves the current pointer to the buffer for a PCD token number.
- Do not make any assumptions about the alignment of the pointer that
- is returned by this function call. If the TokenNumber is invalid,
+ Retrieves the current pointer to the buffer for a PCD token number.
+ Do not make any assumptions about the alignment of the pointer that
+ is returned by this function call. If the TokenNumber is invalid,
the results are unpredictable.
- @param[in] TokenNumber The PCD token number.
+ @param[in] TokenNumber The PCD token number.
@return The pointer to the buffer to be retrived.
-
+
**/
VOID *
EFIAPI
@@ -222,15 +222,15 @@ PeiPcdGetPtr ( /**
Retrieves a Boolean value for a given PCD token.
- Retrieves the current boolean value for a PCD token number.
- Do not make any assumptions about the alignment of the pointer that
- is returned by this function call. If the TokenNumber is invalid,
+ Retrieves the current boolean value for a PCD token number.
+ Do not make any assumptions about the alignment of the pointer that
+ is returned by this function call. If the TokenNumber is invalid,
the results are unpredictable.
- @param[in] TokenNumber The PCD token number.
+ @param[in] TokenNumber The PCD token number.
@return The Boolean value.
-
+
**/
BOOLEAN
EFIAPI
@@ -241,13 +241,13 @@ PeiPcdGetBool ( /**
Retrieves the size of the value for a given PCD token.
- Retrieves the current size of a particular PCD token.
+ Retrieves the current size of a particular PCD token.
If the TokenNumber is invalid, the results are unpredictable.
- @param[in] TokenNumber The PCD token number.
+ @param[in] TokenNumber The PCD token number.
@return The size of the value for the PCD token.
-
+
**/
UINTN
EFIAPI
@@ -258,16 +258,16 @@ PeiPcdGetSize ( /**
Retrieves an 8-bit value for a given PCD token.
- Retrieves the 8-bit value of a particular PCD token.
+ Retrieves the 8-bit value of a particular PCD token.
If the TokenNumber is invalid or the token space
- specified by Guid does not exist, the results are
+ specified by Guid does not exist, the results are
unpredictable.
@param[in] Guid The token space for the token number.
- @param[in] TokenNumber The PCD token number.
+ @param[in] TokenNumber The PCD token number.
@return The size 8-bit value for the PCD token.
-
+
**/
UINT8
EFIAPI
@@ -279,16 +279,16 @@ PeiPcdGet8Ex ( /**
Retrieves an 16-bit value for a given PCD token.
- Retrieves the 16-bit value of a particular PCD token.
+ Retrieves the 16-bit value of a particular PCD token.
If the TokenNumber is invalid or the token space
- specified by Guid does not exist, the results are
+ specified by Guid does not exist, the results are
unpredictable.
@param[in] Guid The token space for the token number.
- @param[in] TokenNumber The PCD token number.
+ @param[in] TokenNumber The PCD token number.
@return The size 16-bit value for the PCD token.
-
+
**/
UINT16
EFIAPI
@@ -300,16 +300,16 @@ PeiPcdGet16Ex ( /**
Retrieves an 32-bit value for a given PCD token.
- Retrieves the 32-bit value of a particular PCD token.
+ Retrieves the 32-bit value of a particular PCD token.
If the TokenNumber is invalid or the token space
- specified by Guid does not exist, the results are
+ specified by Guid does not exist, the results are
unpredictable.
@param[in] Guid The token space for the token number.
- @param[in] TokenNumber The PCD token number.
+ @param[in] TokenNumber The PCD token number.
@return The size 32-bit value for the PCD token.
-
+
**/
UINT32
EFIAPI
@@ -321,16 +321,16 @@ PeiPcdGet32Ex ( /**
Retrieves an 64-bit value for a given PCD token.
- Retrieves the 64-bit value of a particular PCD token.
+ Retrieves the 64-bit value of a particular PCD token.
If the TokenNumber is invalid or the token space
- specified by Guid does not exist, the results are
+ specified by Guid does not exist, the results are
unpredictable.
@param[in] Guid The token space for the token number.
- @param[in] TokenNumber The PCD token number.
+ @param[in] TokenNumber The PCD token number.
@return The size 64-bit value for the PCD token.
-
+
**/
UINT64
EFIAPI
@@ -342,16 +342,16 @@ PeiPcdGet64Ex ( /**
Retrieves a pointer to a value for a given PCD token.
- Retrieves the current pointer to the buffer for a PCD token number.
- Do not make any assumptions about the alignment of the pointer that
- is returned by this function call. If the TokenNumber is invalid,
+ Retrieves the current pointer to the buffer for a PCD token number.
+ Do not make any assumptions about the alignment of the pointer that
+ is returned by this function call. If the TokenNumber is invalid,
the results are unpredictable.
@param[in] Guid The token space for the token number.
- @param[in] TokenNumber The PCD token number.
+ @param[in] TokenNumber The PCD token number.
@return The pointer to the buffer to be retrived.
-
+
**/
VOID *
EFIAPI
@@ -363,16 +363,16 @@ PeiPcdGetPtrEx ( /**
Retrieves an Boolean value for a given PCD token.
- Retrieves the Boolean value of a particular PCD token.
+ Retrieves the Boolean value of a particular PCD token.
If the TokenNumber is invalid or the token space
- specified by Guid does not exist, the results are
+ specified by Guid does not exist, the results are
unpredictable.
@param[in] Guid The token space for the token number.
- @param[in] TokenNumber The PCD token number.
+ @param[in] TokenNumber The PCD token number.
@return The size Boolean value for the PCD token.
-
+
**/
BOOLEAN
EFIAPI
@@ -384,14 +384,14 @@ PeiPcdGetBoolEx ( /**
Retrieves the size of the value for a given PCD token.
- Retrieves the current size of a particular PCD token.
+ Retrieves the current size of a particular PCD token.
If the TokenNumber is invalid, the results are unpredictable.
@param[in] Guid The token space for the token number.
- @param[in] TokenNumber The PCD token number.
+ @param[in] TokenNumber The PCD token number.
@return The size of the value for the PCD token.
-
+
**/
UINTN
EFIAPI
@@ -403,19 +403,19 @@ PeiPcdGetSizeEx ( /**
Sets an 8-bit value for a given PCD token.
- When the PCD service sets a value, it will check to ensure that the
- size of the value being set is compatible with the Token's existing definition.
+ When the PCD service sets a value, it will check to ensure that the
+ size of the value being set is compatible with the Token's existing definition.
If it is not, an error will be returned.
- @param[in] TokenNumber The PCD token number.
+ @param[in] TokenNumber The PCD token number.
@param[in] Value The value to set for the PCD token.
@retval EFI_SUCCESS Procedure returned successfully.
- @retval EFI_INVALID_PARAMETER The PCD service determined that the size of the data
- being set was incompatible with a call to this function.
+ @retval EFI_INVALID_PARAMETER The PCD service determined that the size of the data
+ being set was incompatible with a call to this function.
Use GetSize() to retrieve the size of the target data.
@retval EFI_NOT_FOUND The PCD service could not find the requested token number.
-
+
**/
EFI_STATUS
EFIAPI
@@ -427,19 +427,19 @@ PeiPcdSet8 ( /**
Sets an 16-bit value for a given PCD token.
- When the PCD service sets a value, it will check to ensure that the
- size of the value being set is compatible with the Token's existing definition.
+ When the PCD service sets a value, it will check to ensure that the
+ size of the value being set is compatible with the Token's existing definition.
If it is not, an error will be returned.
- @param[in] TokenNumber The PCD token number.
+ @param[in] TokenNumber The PCD token number.
@param[in] Value The value to set for the PCD token.
@retval EFI_SUCCESS Procedure returned successfully.
- @retval EFI_INVALID_PARAMETER The PCD service determined that the size of the data
- being set was incompatible with a call to this function.
+ @retval EFI_INVALID_PARAMETER The PCD service determined that the size of the data
+ being set was incompatible with a call to this function.
Use GetSize() to retrieve the size of the target data.
@retval EFI_NOT_FOUND The PCD service could not find the requested token number.
-
+
**/
EFI_STATUS
EFIAPI
@@ -451,19 +451,19 @@ PeiPcdSet16 ( /**
Sets an 32-bit value for a given PCD token.
- When the PCD service sets a value, it will check to ensure that the
- size of the value being set is compatible with the Token's existing definition.
+ When the PCD service sets a value, it will check to ensure that the
+ size of the value being set is compatible with the Token's existing definition.
If it is not, an error will be returned.
- @param[in] TokenNumber The PCD token number.
+ @param[in] TokenNumber The PCD token number.
@param[in] Value The value to set for the PCD token.
@retval EFI_SUCCESS Procedure returned successfully.
- @retval EFI_INVALID_PARAMETER The PCD service determined that the size of the data
- being set was incompatible with a call to this function.
+ @retval EFI_INVALID_PARAMETER The PCD service determined that the size of the data
+ being set was incompatible with a call to this function.
Use GetSize() to retrieve the size of the target data.
@retval EFI_NOT_FOUND The PCD service could not find the requested token number.
-
+
**/
EFI_STATUS
EFIAPI
@@ -475,19 +475,19 @@ PeiPcdSet32 ( /**
Sets an 64-bit value for a given PCD token.
- When the PCD service sets a value, it will check to ensure that the
- size of the value being set is compatible with the Token's existing definition.
+ When the PCD service sets a value, it will check to ensure that the
+ size of the value being set is compatible with the Token's existing definition.
If it is not, an error will be returned.
- @param[in] TokenNumber The PCD token number.
+ @param[in] TokenNumber The PCD token number.
@param[in] Value The value to set for the PCD token.
@retval EFI_SUCCESS Procedure returned successfully.
- @retval EFI_INVALID_PARAMETER The PCD service determined that the size of the data
- being set was incompatible with a call to this function.
+ @retval EFI_INVALID_PARAMETER The PCD service determined that the size of the data
+ being set was incompatible with a call to this function.
Use GetSize() to retrieve the size of the target data.
@retval EFI_NOT_FOUND The PCD service could not find the requested token number.
-
+
**/
EFI_STATUS
EFIAPI
@@ -499,23 +499,23 @@ PeiPcdSet64 ( /**
Sets a value of a specified size for a given PCD token.
- When the PCD service sets a value, it will check to ensure that the
- size of the value being set is compatible with the Token's existing definition.
+ When the PCD service sets a value, it will check to ensure that the
+ size of the value being set is compatible with the Token's existing definition.
If it is not, an error will be returned.
- @param[in] TokenNumber The PCD token number.
- @param[in, out] SizeOfBuffer A pointer to the length of the value being set for the PCD token.
- On input, if the SizeOfValue is greater than the maximum size supported
- for this TokenNumber then the output value of SizeOfValue will reflect
+ @param[in] TokenNumber The PCD token number.
+ @param[in, out] SizeOfBuffer A pointer to the length of the value being set for the PCD token.
+ On input, if the SizeOfValue is greater than the maximum size supported
+ for this TokenNumber then the output value of SizeOfValue will reflect
the maximum size supported for this TokenNumber.
@param[in] Buffer The buffer to set for the PCD token.
@retval EFI_SUCCESS Procedure returned successfully.
- @retval EFI_INVALID_PARAMETER The PCD service determined that the size of the data
- being set was incompatible with a call to this function.
+ @retval EFI_INVALID_PARAMETER The PCD service determined that the size of the data
+ being set was incompatible with a call to this function.
Use GetSize() to retrieve the size of the target data.
@retval EFI_NOT_FOUND The PCD service could not find the requested token number.
-
+
**/
EFI_STATUS
EFIAPI
@@ -528,19 +528,19 @@ PeiPcdSetPtr ( /**
Sets an Boolean value for a given PCD token.
- When the PCD service sets a value, it will check to ensure that the
- size of the value being set is compatible with the Token's existing definition.
+ When the PCD service sets a value, it will check to ensure that the
+ size of the value being set is compatible with the Token's existing definition.
If it is not, an error will be returned.
- @param[in] TokenNumber The PCD token number.
+ @param[in] TokenNumber The PCD token number.
@param[in] Value The value to set for the PCD token.
@retval EFI_SUCCESS Procedure returned successfully.
- @retval EFI_INVALID_PARAMETER The PCD service determined that the size of the data
- being set was incompatible with a call to this function.
+ @retval EFI_INVALID_PARAMETER The PCD service determined that the size of the data
+ being set was incompatible with a call to this function.
Use GetSize() to retrieve the size of the target data.
@retval EFI_NOT_FOUND The PCD service could not find the requested token number.
-
+
**/
EFI_STATUS
EFIAPI
@@ -552,20 +552,20 @@ PeiPcdSetBool ( /**
Sets an 8-bit value for a given PCD token.
- When the PCD service sets a value, it will check to ensure that the
- size of the value being set is compatible with the Token's existing definition.
+ When the PCD service sets a value, it will check to ensure that the
+ size of the value being set is compatible with the Token's existing definition.
If it is not, an error will be returned.
@param[in] Guid The 128-bit unique value that designates the namespace from which to extract the value.
- @param[in] TokenNumber The PCD token number.
+ @param[in] TokenNumber The PCD token number.
@param[in] Value The value to set for the PCD token.
@retval EFI_SUCCESS Procedure returned successfully.
- @retval EFI_INVALID_PARAMETER The PCD service determined that the size of the data
- being set was incompatible with a call to this function.
+ @retval EFI_INVALID_PARAMETER The PCD service determined that the size of the data
+ being set was incompatible with a call to this function.
Use GetSize() to retrieve the size of the target data.
@retval EFI_NOT_FOUND The PCD service could not find the requested token number.
-
+
**/
EFI_STATUS
EFIAPI
@@ -578,20 +578,20 @@ PeiPcdSet8Ex ( /**
Sets an 16-bit value for a given PCD token.
- When the PCD service sets a value, it will check to ensure that the
- size of the value being set is compatible with the Token's existing definition.
+ When the PCD service sets a value, it will check to ensure that the
+ size of the value being set is compatible with the Token's existing definition.
If it is not, an error will be returned.
@param[in] Guid The 128-bit unique value that designates the namespace from which to extract the value.
- @param[in] TokenNumber The PCD token number.
+ @param[in] TokenNumber The PCD token number.
@param[in] Value The value to set for the PCD token.
@retval EFI_SUCCESS Procedure returned successfully.
- @retval EFI_INVALID_PARAMETER The PCD service determined that the size of the data
- being set was incompatible with a call to this function.
+ @retval EFI_INVALID_PARAMETER The PCD service determined that the size of the data
+ being set was incompatible with a call to this function.
Use GetSize() to retrieve the size of the target data.
@retval EFI_NOT_FOUND The PCD service could not find the requested token number.
-
+
**/
EFI_STATUS
EFIAPI
@@ -604,20 +604,20 @@ PeiPcdSet16Ex ( /**
Sets an 32-bit value for a given PCD token.
- When the PCD service sets a value, it will check to ensure that the
- size of the value being set is compatible with the Token's existing definition.
+ When the PCD service sets a value, it will check to ensure that the
+ size of the value being set is compatible with the Token's existing definition.
If it is not, an error will be returned.
@param[in] Guid The 128-bit unique value that designates the namespace from which to extract the value.
- @param[in] TokenNumber The PCD token number.
+ @param[in] TokenNumber The PCD token number.
@param[in] Value The value to set for the PCD token.
@retval EFI_SUCCESS Procedure returned successfully.
- @retval EFI_INVALID_PARAMETER The PCD service determined that the size of the data
- being set was incompatible with a call to this function.
+ @retval EFI_INVALID_PARAMETER The PCD service determined that the size of the data
+ being set was incompatible with a call to this function.
Use GetSize() to retrieve the size of the target data.
@retval EFI_NOT_FOUND The PCD service could not find the requested token number.
-
+
**/
EFI_STATUS
EFIAPI
@@ -630,20 +630,20 @@ PeiPcdSet32Ex ( /**
Sets an 64-bit value for a given PCD token.
- When the PCD service sets a value, it will check to ensure that the
- size of the value being set is compatible with the Token's existing definition.
+ When the PCD service sets a value, it will check to ensure that the
+ size of the value being set is compatible with the Token's existing definition.
If it is not, an error will be returned.
@param[in] Guid The 128-bit unique value that designates the namespace from which to extract the value.
- @param[in] TokenNumber The PCD token number.
+ @param[in] TokenNumber The PCD token number.
@param[in] Value The value to set for the PCD token.
@retval EFI_SUCCESS Procedure returned successfully.
- @retval EFI_INVALID_PARAMETER The PCD service determined that the size of the data
- being set was incompatible with a call to this function.
+ @retval EFI_INVALID_PARAMETER The PCD service determined that the size of the data
+ being set was incompatible with a call to this function.
Use GetSize() to retrieve the size of the target data.
@retval EFI_NOT_FOUND The PCD service could not find the requested token number.
-
+
**/
EFI_STATUS
EFIAPI
@@ -656,24 +656,24 @@ PeiPcdSet64Ex ( /**
Sets a value of a specified size for a given PCD token.
- When the PCD service sets a value, it will check to ensure that the
- size of the value being set is compatible with the Token's existing definition.
+ When the PCD service sets a value, it will check to ensure that the
+ size of the value being set is compatible with the Token's existing definition.
If it is not, an error will be returned.
@param[in] Guid The 128-bit unique value that designates the namespace from which to extract the value.
- @param[in] TokenNumber The PCD token number.
- @param[in, out] SizeOfBuffer A pointer to the length of the value being set for the PCD token.
- On input, if the SizeOfValue is greater than the maximum size supported
- for this TokenNumber then the output value of SizeOfValue will reflect
+ @param[in] TokenNumber The PCD token number.
+ @param[in, out] SizeOfBuffer A pointer to the length of the value being set for the PCD token.
+ On input, if the SizeOfValue is greater than the maximum size supported
+ for this TokenNumber then the output value of SizeOfValue will reflect
the maximum size supported for this TokenNumber.
@param[in] Buffer The buffer to set for the PCD token.
@retval EFI_SUCCESS Procedure returned successfully.
- @retval EFI_INVALID_PARAMETER The PCD service determined that the size of the data
- being set was incompatible with a call to this function.
+ @retval EFI_INVALID_PARAMETER The PCD service determined that the size of the data
+ being set was incompatible with a call to this function.
Use GetSize() to retrieve the size of the target data.
@retval EFI_NOT_FOUND The PCD service could not find the requested token number.
-
+
**/
EFI_STATUS
EFIAPI
@@ -687,20 +687,20 @@ PeiPcdSetPtrEx ( /**
Sets an Boolean value for a given PCD token.
- When the PCD service sets a value, it will check to ensure that the
- size of the value being set is compatible with the Token's existing definition.
+ When the PCD service sets a value, it will check to ensure that the
+ size of the value being set is compatible with the Token's existing definition.
If it is not, an error will be returned.
@param[in] Guid The 128-bit unique value that designates the namespace from which to extract the value.
- @param[in] TokenNumber The PCD token number.
+ @param[in] TokenNumber The PCD token number.
@param[in] Value The value to set for the PCD token.
@retval EFI_SUCCESS Procedure returned successfully.
- @retval EFI_INVALID_PARAMETER The PCD service determined that the size of the data
- being set was incompatible with a call to this function.
+ @retval EFI_INVALID_PARAMETER The PCD service determined that the size of the data
+ being set was incompatible with a call to this function.
Use GetSize() to retrieve the size of the target data.
@retval EFI_NOT_FOUND The PCD service could not find the requested token number.
-
+
**/
EFI_STATUS
EFIAPI
@@ -714,10 +714,10 @@ PeiPcdSetBoolEx ( Specifies a function to be called anytime the value of a designated token is changed.
@param[in] Guid The 128-bit unique value that designates the namespace from which to extract the value.
- @param[in] TokenNumber The PCD token number.
- @param[in] CallBackFunction The function prototype called when the value associated with the CallBackToken is set.
+ @param[in] TokenNumber The PCD token number.
+ @param[in] CallBackFunction The function prototype called when the value associated with the CallBackToken is set.
- @retval EFI_SUCCESS The PCD service has successfully established a call event
+ @retval EFI_SUCCESS The PCD service has successfully established a call event
for the CallBackToken requested.
@retval EFI_NOT_FOUND The PCD service could not find the referenced token number.
@@ -734,10 +734,10 @@ PeiRegisterCallBackOnSet ( Cancels a previously set callback function for a particular PCD token number.
@param [in] Guid The 128-bit unique value that designates the namespace from which to extract the value.
- @param [in] TokenNumber The PCD token number.
- @param [in] CallBackFunction The function prototype called when the value associated with the CallBackToken is set.
+ @param [in] TokenNumber The PCD token number.
+ @param [in] CallBackFunction The function prototype called when the value associated with the CallBackToken is set.
- @retval EFI_SUCCESS The PCD service has successfully established a call event
+ @retval EFI_SUCCESS The PCD service has successfully established a call event
for the CallBackToken requested.
@retval EFI_NOT_FOUND The PCD service could not find the referenced token number.
@@ -751,28 +751,28 @@ PcdUnRegisterCallBackOnSet ( );
/**
- Retrieves the next valid token number in a given namespace.
-
- This is useful since the PCD infrastructure contains a sparse list of token numbers,
- and one cannot a priori know what token numbers are valid in the database.
-
- If TokenNumber is 0 and Guid is not NULL, then the first token from the token space specified by Guid is returned.
- If TokenNumber is not 0 and Guid is not NULL, then the next token in the token space specified by Guid is returned.
- If TokenNumber is 0 and Guid is NULL, then the first token in the default token space is returned.
- If TokenNumber is not 0 and Guid is NULL, then the next token in the default token space is returned.
- The token numbers in the default token space may not be related to token numbers in token spaces that are named by Guid.
- If the next token number can be retrieved, then it is returned in TokenNumber, and EFI_SUCCESS is returned.
- If TokenNumber represents the last token number in the token space specified by Guid, then EFI_NOT_FOUND is returned.
+ Retrieves the next valid token number in a given namespace.
+
+ This is useful since the PCD infrastructure contains a sparse list of token numbers,
+ and one cannot a priori know what token numbers are valid in the database.
+
+ If TokenNumber is 0 and Guid is not NULL, then the first token from the token space specified by Guid is returned.
+ If TokenNumber is not 0 and Guid is not NULL, then the next token in the token space specified by Guid is returned.
+ If TokenNumber is 0 and Guid is NULL, then the first token in the default token space is returned.
+ If TokenNumber is not 0 and Guid is NULL, then the next token in the default token space is returned.
+ The token numbers in the default token space may not be related to token numbers in token spaces that are named by Guid.
+ If the next token number can be retrieved, then it is returned in TokenNumber, and EFI_SUCCESS is returned.
+ If TokenNumber represents the last token number in the token space specified by Guid, then EFI_NOT_FOUND is returned.
If TokenNumber is not present in the token space specified by Guid, then EFI_NOT_FOUND is returned.
- @param[in] Guid The 128-bit unique value that designates the namespace from which to extract the value.
- This is an optional parameter that may be NULL. If this parameter is NULL, then a request
+ @param[in] Guid The 128-bit unique value that designates the namespace from which to extract the value.
+ This is an optional parameter that may be NULL. If this parameter is NULL, then a request
is being made to retrieve tokens from the default token space.
@param[in, out] TokenNumber A pointer to the PCD token number to use to find the subsequent token number.
-
- @retval EFI_SUCCESS The PCD service has retrieved the next valid token number.
- Or the input token number is already the last valid token number in the PCD database.
+
+ @retval EFI_SUCCESS The PCD service has retrieved the next valid token number.
+ Or the input token number is already the last valid token number in the PCD database.
In the later case, *TokenNumber is updated with the value of 0.
@retval EFI_NOT_FOUND If this input token number and token namespace does not exist on the platform.
@@ -787,20 +787,20 @@ PeiPcdGetNextToken ( /**
Retrieves the next valid PCD token namespace for a given namespace.
- @param[in, out] Guid An indirect pointer to EFI_GUID. On input it designates
- a known token namespace from which the search will start. On output,
- it designates the next valid token namespace on the platform. If the input
- token namespace does not exist on the platform, an error is returned and
- the value of *Guid is undefined. If *Guid is NULL, then the GUID of the
- first token space of the current platform is assigned to *Guid the function
- return EFI_SUCCESS. If *Guid is NULL and there is no namespace exist in
- the platform other than the default (NULL) tokennamespace, *Guid is unchanged
- and the function return EFI_SUCCESS. If this input token namespace is the last
- namespace on the platform, *Guid will be assigned to NULL and the function return
- EFI_SUCCESS.
-
- @retval EFI_SUCCESS The PCD service retrieved the next valid token space Guid.
- Or the input token space Guid is already the last valid token space Guid
+ @param[in, out] Guid An indirect pointer to EFI_GUID. On input it designates
+ a known token namespace from which the search will start. On output,
+ it designates the next valid token namespace on the platform. If the input
+ token namespace does not exist on the platform, an error is returned and
+ the value of *Guid is undefined. If *Guid is NULL, then the GUID of the
+ first token space of the current platform is assigned to *Guid the function
+ return EFI_SUCCESS. If *Guid is NULL and there is no namespace exist in
+ the platform other than the default (NULL) tokennamespace, *Guid is unchanged
+ and the function return EFI_SUCCESS. If this input token namespace is the last
+ namespace on the platform, *Guid will be assigned to NULL and the function return
+ EFI_SUCCESS.
+
+ @retval EFI_SUCCESS The PCD service retrieved the next valid token space Guid.
+ Or the input token space Guid is already the last valid token space Guid
in the PCD database. In the later case, *Guid is updated with the value of NULL.
@retval EFI_NOT_FOUND If the input token namespace does not exist on the platform.
@@ -820,7 +820,7 @@ PeiPcdGetNextTokenSpace ( @param[in] Guid The 128-bit unique value that designates the namespace from which to extract the value.
@param[in] TokenNumber The PCD token number.
@param[out] PcdInfo The returned information associated with the requested TokenNumber.
- The caller is responsible for freeing the buffer that is allocated by callee for PcdInfo->PcdName.
+ The caller is responsible for freeing the buffer that is allocated by callee for PcdInfo->PcdName.
@retval EFI_SUCCESS The PCD information was returned successfully
@retval EFI_NOT_FOUND The PCD service could not find the requested token number.
@@ -875,7 +875,7 @@ SetValueWorker ( @retval EFI_INVALID_PARAMETER If Size of non-Ptr type PCD does not match the size information in PCD database.
@retval EFI_NOT_FOUND If value type of PCD entry is intergrate, but not in
range of UINT8, UINT16, UINT32, UINT64
- @retval EFI_NOT_FOUND Can not find the PCD type according to token number.
+ @retval EFI_NOT_FOUND Can not find the PCD type according to token number.
**/
EFI_STATUS
SetWorker (
@@ -906,12 +906,12 @@ ExSetValueWorker ( /**
Set value for a dynamic PCD entry.
-
- This routine find the local token number according to dynamic-ex PCD's token
+
+ This routine find the local token number according to dynamic-ex PCD's token
space guid and token number firstly, and invoke callback function if this PCD
entry registered callback function. Finally, invoken general SetWorker to set
PCD value.
-
+
@param ExTokenNumber Dynamic-ex PCD token number.
@param Guid Token space guid for dynamic-ex PCD.
@param Data PCD value want to be set
@@ -933,10 +933,10 @@ ExSetWorker ( /**
Get the PCD entry pointer in PCD database.
-
+
This routine will visit PCD database to find the PCD entry according to given
- token number. The given token number is autogened by build tools and it will be
- translated to local token number. Local token number contains PCD's type and
+ token number. The given token number is autogened by build tools and it will be
+ translated to local token number. Local token number contains PCD's type and
offset of PCD entry in PCD database.
@param TokenNumber Token's number, it is autogened by build tools
@@ -980,7 +980,7 @@ typedef struct { A dynamic-ex type PCD, developer must provide pair of token space guid: token number
in DEC file. PCD database maintain a mapping table that translate pair of {token
space guid: token number} to Token Number.
-
+
@param Guid Token space guid for dynamic-ex PCD entry.
@param ExTokenNumber Token number for dynamic-ex PCD.
@@ -1045,7 +1045,7 @@ GetSizeTableIndex ( /**
Get PCD value's size for POINTER type PCD.
-
+
The POINTER type PCD's value will be stored into a buffer in specificed size.
The max size of this PCD's value is described in PCD's definition in DEC file.
@@ -1065,7 +1065,7 @@ GetPtrTypeSize ( /**
Set PCD value's size for POINTER type PCD.
-
+
The POINTER type PCD's value will be stored into a buffer in specificed size.
The max size of this PCD's value is described in PCD's definition in DEC file.
diff --git a/MdeModulePkg/Universal/PcatSingleSegmentPciCfg2Pei/PcatSingleSegmentPciCfg2PeiExtra.uni b/MdeModulePkg/Universal/PcatSingleSegmentPciCfg2Pei/PcatSingleSegmentPciCfg2PeiExtra.uni index d19af92..855ec0e 100644 --- a/MdeModulePkg/Universal/PcatSingleSegmentPciCfg2Pei/PcatSingleSegmentPciCfg2PeiExtra.uni +++ b/MdeModulePkg/Universal/PcatSingleSegmentPciCfg2Pei/PcatSingleSegmentPciCfg2PeiExtra.uni @@ -1,7 +1,7 @@ // /** @file
// PcatSingleSegmentPciCfg2Pei Localized Strings and Content
//
-// Copyright (c) 2013 - 2014, Intel Corporation. All rights reserved.<BR>
+// Copyright (c) 2013 - 2018, Intel Corporation. All rights reserved.<BR>
//
// This program and the accompanying materials
// are licensed and made available under the terms and conditions of the BSD License
@@ -12,8 +12,8 @@ //
// **/
-#string STR_PROPERTIES_MODULE_NAME
-#language en-US
+#string STR_PROPERTIES_MODULE_NAME
+#language en-US
"Single Segment PCI Configuration PEI Module"
diff --git a/MdeModulePkg/Universal/PcatSingleSegmentPciCfg2Pei/PciCfg2.c b/MdeModulePkg/Universal/PcatSingleSegmentPciCfg2Pei/PciCfg2.c index ed53e12..4b9efe2 100644 --- a/MdeModulePkg/Universal/PcatSingleSegmentPciCfg2Pei/PciCfg2.c +++ b/MdeModulePkg/Universal/PcatSingleSegmentPciCfg2Pei/PciCfg2.c @@ -1,9 +1,9 @@ /** @file
- This driver installs Single Segment Pci Configuration 2 PPI
- to provide read, write and modify access to Pci configuration space in PEI phase.
+ This driver installs Single Segment Pci Configuration 2 PPI
+ to provide read, write and modify access to Pci configuration space in PEI phase.
To follow PI specification, these services also support access to the unaligned Pci address.
- Copyright (c) 2006 - 2010, Intel Corporation. All rights reserved.<BR>
+ Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>
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
@@ -56,7 +56,7 @@ PciCfgAddressConvert ( @retval EFI_SUCCESS The function completed successfully.
@retval EFI_INVALID_PARAMETER The invalid access width.
-
+
**/
EFI_STATUS
EFIAPI
@@ -157,7 +157,7 @@ PciCfg2Write ( // Unaligned Pci address access, break up the request into byte by byte.
//
PciWrite8 (PciLibAddress, *((UINT8 *) Buffer));
- PciWrite8 (PciLibAddress + 1, *((UINT8 *) Buffer + 1));
+ PciWrite8 (PciLibAddress + 1, *((UINT8 *) Buffer + 1));
}
} else if (Width == EfiPeiPciCfgWidthUint32) {
if ((PciLibAddress & 0x03) == 0) {
@@ -176,9 +176,9 @@ PciCfg2Write ( // Unaligned Pci address access, break up the request into byte by byte.
//
PciWrite8 (PciLibAddress, *((UINT8 *) Buffer));
- PciWrite8 (PciLibAddress + 1, *((UINT8 *) Buffer + 1));
- PciWrite8 (PciLibAddress + 2, *((UINT8 *) Buffer + 2));
- PciWrite8 (PciLibAddress + 3, *((UINT8 *) Buffer + 3));
+ PciWrite8 (PciLibAddress + 1, *((UINT8 *) Buffer + 1));
+ PciWrite8 (PciLibAddress + 2, *((UINT8 *) Buffer + 2));
+ PciWrite8 (PciLibAddress + 3, *((UINT8 *) Buffer + 3));
}
} else {
return EFI_INVALID_PARAMETER;
@@ -292,9 +292,9 @@ EFI_PEI_PPI_DESCRIPTOR gPciCfg2PpiList = { };
/**
- Module's entry function.
+ Module's entry function.
This routine will install EFI_PEI_PCI_CFG2_PPI.
-
+
@param FileHandle Handle of the file being invoked.
@param PeiServices Describes the list of possible PEI Services.
diff --git a/MdeModulePkg/Universal/PlatformDriOverrideDxe/InternalPlatDriOverrideDxe.h b/MdeModulePkg/Universal/PlatformDriOverrideDxe/InternalPlatDriOverrideDxe.h index 75af763..a9354c6 100644 --- a/MdeModulePkg/Universal/PlatformDriOverrideDxe/InternalPlatDriOverrideDxe.h +++ b/MdeModulePkg/Universal/PlatformDriOverrideDxe/InternalPlatDriOverrideDxe.h @@ -2,7 +2,7 @@ Ihe internal heder file includes the required Protocol/Guid/Library
and the shared function APIs.
-Copyright (c) 2007 - 2013, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2007 - 2018, Intel Corporation. All rights reserved.<BR>
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
@@ -146,8 +146,8 @@ GetDriverFromMapping ( @retval EFI_INVALID_PARAMETER ControllerDevicePath or MappingDataBase is NULL.
@retval EFI_NOT_FOUND ControllerDevicePath is not found in MappingDataBase or
- DriverImageDevicePath is not found in the found DriverImage Info list.
- @retval EFI_SUCCESS The controller's total override driver number and
+ DriverImageDevicePath is not found in the found DriverImage Info list.
+ @retval EFI_SUCCESS The controller's total override driver number and
input DriverImage's order number is correctly return.
**/
EFI_STATUS
@@ -169,14 +169,14 @@ CheckMapping ( override driver image item
@param DriverImageDevicePath The driver image device path need to be insert
@param MappingDataBase Mapping database list entry pointer
- @param DriverImageNO The inserted order number. If this number is taken,
+ @param DriverImageNO The inserted order number. If this number is taken,
the larger available number will be used.
@retval EFI_INVALID_PARAMETER ControllerDevicePath is NULL, or DriverImageDevicePath is NULL
or MappingDataBase is NULL
- @retval EFI_ALREADY_STARTED The input Controller to input DriverImage has been
+ @retval EFI_ALREADY_STARTED The input Controller to input DriverImage has been
recorded into the mapping database.
- @retval EFI_SUCCESS The Controller and DriverImage are inserted into
+ @retval EFI_SUCCESS The Controller and DriverImage are inserted into
the mapping database successfully.
**/
@@ -193,7 +193,7 @@ InsertDriverImage ( /**
Delete a controller's override driver from the mapping database.
- @param ControllerDevicePath The controller device path will be deleted
+ @param ControllerDevicePath The controller device path will be deleted
when all drivers images on it are removed.
@param DriverImageDevicePath The driver image device path will be delete.
If NULL, all driver image will be delete.
@@ -201,7 +201,7 @@ InsertDriverImage ( @retval EFI_INVALID_PARAMETER ControllerDevicePath is NULL, or MappingDataBase is NULL
@retval EFI_NOT_FOUND ControllerDevicePath is not found in MappingDataBase or
- DriverImageDevicePath is not found in the found DriverImage Info list.
+ DriverImageDevicePath is not found in the found DriverImage Info list.
@retval EFI_SUCCESS Delete the specified driver successfully.
**/
diff --git a/MdeModulePkg/Universal/PlatformDriOverrideDxe/PlatDriOverrideDxe.c b/MdeModulePkg/Universal/PlatformDriOverrideDxe/PlatDriOverrideDxe.c index 76c240b..b2ddf10 100644 --- a/MdeModulePkg/Universal/PlatformDriOverrideDxe/PlatDriOverrideDxe.c +++ b/MdeModulePkg/Universal/PlatformDriOverrideDxe/PlatDriOverrideDxe.c @@ -1,6 +1,6 @@ /** @file
This file also installs UEFI PLATFORM_DRIVER_OVERRIDE_PROTOCOL.
-
+
The main code offers a UI interface in device manager to let user configure
platform override protocol to override the default algorithm for matching
drivers to controllers.
@@ -13,7 +13,7 @@ 4. It save all the mapping info in NV variables which will be consumed
by platform override protocol driver to publish the platform override protocol.
-Copyright (c) 2007 - 2017, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2007 - 2018, Intel Corporation. All rights reserved.<BR>
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
@@ -96,7 +96,7 @@ HII_VENDOR_DEVICE_PATH mHiiVendorDevicePath = { {
END_DEVICE_PATH_TYPE,
END_ENTIRE_DEVICE_PATH_SUBTYPE,
- {
+ {
(UINT8) (END_DEVICE_PATH_LENGTH),
(UINT8) ((END_DEVICE_PATH_LENGTH) >> 8)
}
@@ -107,7 +107,7 @@ HII_VENDOR_DEVICE_PATH mHiiVendorDevicePath = { Converting a given device to an unicode string.
@param DevPath Given device path instance
-
+
@return Converted string from given device path.
@retval L"?" Converting failed.
**/
@@ -131,7 +131,7 @@ DevicePathToStr ( }
/**
- Worker function to get the driver name by ComponentName or ComponentName2 protocol
+ Worker function to get the driver name by ComponentName or ComponentName2 protocol
according to the driver binding handle.
@param DriverBindingHandle The Handle of DriverBinding.
@@ -197,7 +197,7 @@ GetComponentNameWorker ( /**
- Get the driver name by ComponentName or ComponentName2 protocol
+ Get the driver name by ComponentName or ComponentName2 protocol
according to the driver binding handle
@param DriverBindingHandle The Handle of DriverBinding.
@@ -219,7 +219,7 @@ GetComponentName ( DriverName = GetComponentNameWorker (DriverBindingHandle, &gEfiComponentName2ProtocolGuid, L"PlatformLang");
if (DriverName == NULL) {
//
- // If we can not get driver name from Component Name 2 protocol, we can try ISO 639-2 Component Name protocol.
+ // If we can not get driver name from Component Name 2 protocol, we can try ISO 639-2 Component Name protocol.
//
DriverName = GetComponentNameWorker (DriverBindingHandle, &gEfiComponentNameProtocolGuid, L"Lang");
}
@@ -266,7 +266,7 @@ GetImageName ( // Make sure device path node is aligned when accessing it's FV Name Guid field.
//
AlignedDevPathNode = AllocateCopyPool (DevicePathNodeLength(DevPathNode), DevPathNode);
-
+
//
// Find the Fv File path
//
@@ -298,9 +298,9 @@ GetImageName ( Buffer = NULL;
}
}
-
+
FreePool (AlignedDevPathNode);
-
+
//
// Next device path node
//
@@ -344,13 +344,13 @@ UpdateDeviceSelectPage ( VOID *StartOpCodeHandle;
VOID *EndOpCodeHandle;
EFI_IFR_GUID_LABEL *StartLabel;
- EFI_IFR_GUID_LABEL *EndLabel;
+ EFI_IFR_GUID_LABEL *EndLabel;
//
// Set current page form ID.
//
- mCurrentPage = FORM_ID_DEVICE;
-
+ mCurrentPage = FORM_ID_DEVICE;
+
//
// Initial the mapping database in memory
//
@@ -507,7 +507,7 @@ UpdateDeviceSelectPage ( // Save the device path string toke for next access use
//
mControllerToken[Index] = NewStringToken;
-
+
HiiCreateGotoOpCode (
StartOpCodeHandle,
FORM_ID_DRIVER,
@@ -575,7 +575,7 @@ GetDriverBindingHandleFromImageHandle ( if (EFI_ERROR (Status) || (DriverBindingHandleCount == 0)) {
return NULL;
}
-
+
//
// Get the first Driver Binding handle which has the specific image handle.
//
@@ -819,7 +819,7 @@ UpdateBindingDriverSelectPage ( //
NewStrSize = StrSize (DriverName);
NewString = AllocateZeroPool (NewStrSize);
- ASSERT (NewString != NULL);
+ ASSERT (NewString != NULL);
if (EFI_ERROR (CheckMapping (mControllerDevicePathProtocol[mSelectedCtrIndex], LoadedImageDevicePath, &mMappingDataBase, NULL, NULL))) {
mDriSelection[Index] = FALSE;
} else {
@@ -842,7 +842,7 @@ UpdateBindingDriverSelectPage ( NewStrSize = StrSize (DriverName);
NewString = AllocateZeroPool (NewStrSize);
- ASSERT (NewString != NULL);
+ ASSERT (NewString != NULL);
StrCatS (NewString, NewStrSize/sizeof(CHAR16), DriverName);
NewStringHelpToken = HiiSetString (Private->RegisteredHandle, DriverImageFilePathToken[Index], NewString, NULL);
ASSERT (NewStringHelpToken != 0);
@@ -1058,7 +1058,7 @@ UpdatePrioritySelectPage ( FakeNvData->DriOrder[Index] = (UINT8) OrderNO[MinNO];
TempNO[MinNO] = MAX_CHOICE_NUM + 1;
}
-
+
//
// Create Order List OpCode
//
@@ -1289,7 +1289,7 @@ PlatOverMngrRouteConfig ( if (!HiiIsConfigHdrMatch (Configuration, &gPlatformOverridesManagerGuid, mVariableName)) {
return EFI_NOT_FOUND;
}
-
+
*Progress = Configuration + StrLen (Configuration);
Private = EFI_CALLBACK_INFO_FROM_THIS (This);
FakeNvData = &Private->FakeNvData;
@@ -1365,7 +1365,7 @@ PlatOverMngrCallback ( if (Value == NULL) {
return EFI_INVALID_PARAMETER;
}
-
+
if (KeyValue == KEY_VALUE_DRIVER_GOTO_PREVIOUS) {
UpdateDeviceSelectPage (Private, KeyValue, FakeNvData);
//
@@ -1426,7 +1426,7 @@ PlatOverMngrCallback ( ASSERT (FALSE);
}
break;
-
+
case KEY_VALUE_ORDER_SAVE_AND_EXIT:
Status = CommitChanges (Private, KeyValue, FakeNvData);
*ActionRequest = EFI_BROWSER_ACTION_REQUEST_SUBMIT;
@@ -1526,14 +1526,14 @@ GetDriver ( This driver doesn't support this API.
@param This A pointer to the EFI_PLATFORM_DRIVER_OVERRIDE_
- PROTOCOL instance.
+ PROTOCOL instance.
@param ControllerHandle The device handle of the controller to check if a driver override
- exists.
+ exists.
@param DriverImagePath On input, a pointer to the previous driver device path returned by
GetDriverPath(). On output, a pointer to the next driver
device path. Passing in a pointer to NULL, will return the first
driver device path for ControllerHandle.
-
+
@retval EFI_UNSUPPORTED
**/
EFI_STATUS
@@ -1550,18 +1550,18 @@ GetDriverPath ( /**
Used to associate a driver image handle with a device path that was returned on a prior call to the
- GetDriverPath() service. This driver image handle will then be available through the
+ GetDriverPath() service. This driver image handle will then be available through the
GetDriver() service. This driver doesn't support this API.
@param This A pointer to the EFI_PLATFORM_DRIVER_OVERRIDE_
- PROTOCOL instance.
- @param ControllerHandle The device handle of the controller.
+ PROTOCOL instance.
+ @param ControllerHandle The device handle of the controller.
@param DriverImagePath A pointer to the driver device path that was returned in a prior
- call to GetDriverPath().
+ call to GetDriverPath().
@param DriverImageHandle The driver image handle that was returned by LoadImage()
- when the driver specified by DriverImagePath was loaded
- into memory.
-
+ when the driver specified by DriverImagePath was loaded
+ into memory.
+
@retval EFI_UNSUPPORTED
**/
EFI_STATUS
@@ -1597,7 +1597,7 @@ PlatDriOverrideDxeInit ( EFI_STATUS Status;
EFI_FORM_BROWSER2_PROTOCOL *FormBrowser2;
VOID *Instance;
-
+
//
// There should only be one Form Configuration protocol
//
@@ -1626,7 +1626,7 @@ PlatDriOverrideDxeInit ( if (!EFI_ERROR (Status)) {
return EFI_ALREADY_STARTED;
}
-
+
mCallerImageHandle = ImageHandle;
mCallbackInfo = AllocateZeroPool (sizeof (EFI_CALLBACK_INFO));
if (mCallbackInfo == NULL) {
@@ -1691,7 +1691,7 @@ PlatDriOverrideDxeInit ( //
mDriverImageHandleCount = 0;
mCurrentPage = 0;
-
+
return EFI_SUCCESS;
Finish:
diff --git a/MdeModulePkg/Universal/PlatformDriOverrideDxe/PlatDriOverrideDxe.uni b/MdeModulePkg/Universal/PlatformDriOverrideDxe/PlatDriOverrideDxe.uni index 22d33d3..ef9e890 100644 --- a/MdeModulePkg/Universal/PlatformDriOverrideDxe/PlatDriOverrideDxe.uni +++ b/MdeModulePkg/Universal/PlatformDriOverrideDxe/PlatDriOverrideDxe.uni @@ -4,11 +4,11 @@ // It doesn't install again if this protocol exists.
// It only implements one interface GetDriver of PLATFORM_DRIVER_OVERRIDE_PROTOCOL protocol
// and doesn't support other two interfaces GetDriverPath, DriverLoaded.
-//
+//
// This driver also offers an UI interface in device manager to let user configure
// platform override protocol to override the default algorithm for matching
// drivers to controllers.
-//
+//
// The main flow:
// 1. It dynamicly locate all controller device path.
// 2. It dynamicly locate all drivers which support binding protocol.
@@ -16,16 +16,16 @@ // mapping between drivers to controllers.
// 4. It save all the mapping info in NV variables for the following boot,
// which will be consumed by GetDriver API of the produced the platform override protocol.
-//
+//
// Caution: This module is a sample implementation for the test purpose.
//
-// Copyright (c) 2007 - 2014, Intel Corporation. All rights reserved.<BR>
+// Copyright (c) 2007 - 2018, Intel Corporation. All rights reserved.<BR>
//
// 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,
// WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
//
diff --git a/MdeModulePkg/Universal/PlatformDriOverrideDxe/PlatDriOverrideDxeExtra.uni b/MdeModulePkg/Universal/PlatformDriOverrideDxe/PlatDriOverrideDxeExtra.uni index 0648a02..5226fd6 100644 --- a/MdeModulePkg/Universal/PlatformDriOverrideDxe/PlatDriOverrideDxeExtra.uni +++ b/MdeModulePkg/Universal/PlatformDriOverrideDxe/PlatDriOverrideDxeExtra.uni @@ -1,7 +1,7 @@ // /** @file
// PlatDriOverrideDxe Localized Strings and Content
//
-// Copyright (c) 2013 - 2014, Intel Corporation. All rights reserved.<BR>
+// Copyright (c) 2013 - 2018, Intel Corporation. All rights reserved.<BR>
//
// This program and the accompanying materials
// are licensed and made available under the terms and conditions of the BSD License
@@ -13,8 +13,8 @@ //
// **/
-#string STR_PROPERTIES_MODULE_NAME
-#language en-US
+#string STR_PROPERTIES_MODULE_NAME
+#language en-US
"Platform Driver Override DXE Driver"
diff --git a/MdeModulePkg/Universal/PlatformDriOverrideDxe/PlatDriOverrideLib.c b/MdeModulePkg/Universal/PlatformDriOverrideDxe/PlatDriOverrideLib.c index 86c34be..d49f6c9 100644 --- a/MdeModulePkg/Universal/PlatformDriOverrideDxe/PlatDriOverrideLib.c +++ b/MdeModulePkg/Universal/PlatformDriOverrideDxe/PlatDriOverrideLib.c @@ -1,7 +1,7 @@ /** @file
Implementation of the shared functions to do the platform driver vverride mapping.
- Copyright (c) 2007 - 2015, Intel Corporation. All rights reserved.<BR>
+ Copyright (c) 2007 - 2018, Intel Corporation. All rights reserved.<BR>
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
@@ -751,7 +751,7 @@ InitOverridesMapping ( //
// Check buffer overflow.
//
- if ((OverrideItem->ControllerDevicePath == NULL) || (VariableIndex < (UINT8 *) ControllerDevicePath) ||
+ if ((OverrideItem->ControllerDevicePath == NULL) || (VariableIndex < (UINT8 *) ControllerDevicePath) ||
(VariableIndex > (UINT8 *) VariableBuffer + BufferSize)) {
Corrupted = TRUE;
break;
@@ -781,7 +781,7 @@ InitOverridesMapping ( //
// Check buffer overflow
//
- if ((DriverImageInfo->DriverImagePath == NULL) || (VariableIndex < (UINT8 *) DriverDevicePath) ||
+ if ((DriverImageInfo->DriverImagePath == NULL) || (VariableIndex < (UINT8 *) DriverDevicePath) ||
(VariableIndex < (UINT8 *) VariableBuffer + BufferSize)) {
Corrupted = TRUE;
break;
@@ -1094,7 +1094,7 @@ SaveOverridesMapping ( if (EFI_ERROR (Status)) {
if (NumIndex > 0) {
//
- // Delete all PlatDriOver variables when full mapping can't be set.
+ // Delete all PlatDriOver variables when full mapping can't be set.
//
DeleteOverridesVariables ();
}
@@ -1112,7 +1112,7 @@ SaveOverridesMapping ( @param ImageHandle The Image handle
@param BindingHandle The BindingHandle of the found Driver Binding protocol.
- If Binding protocol is not found, it is set to NULL.
+ If Binding protocol is not found, it is set to NULL.
@return Pointer into the Binding Protocol interface
@retval NULL The parameter is not valid or the binding protocol is not found.
@@ -1551,8 +1551,8 @@ GetDriverFromMapping ( @retval EFI_INVALID_PARAMETER ControllerDevicePath or MappingDataBase is NULL.
@retval EFI_NOT_FOUND ControllerDevicePath is not found in MappingDataBase or
- DriverImageDevicePath is not found in the found DriverImage Info list.
- @retval EFI_SUCCESS The controller's total override driver number and
+ DriverImageDevicePath is not found in the found DriverImage Info list.
+ @retval EFI_SUCCESS The controller's total override driver number and
input DriverImage's order number is correctly return.
**/
EFI_STATUS
@@ -1668,14 +1668,14 @@ CheckMapping ( override driver image item
@param DriverImageDevicePath The driver image device path need to be insert
@param MappingDataBase Mapping database list entry pointer
- @param DriverImageNO The inserted order number. If this number is taken,
+ @param DriverImageNO The inserted order number. If this number is taken,
the larger available number will be used.
@retval EFI_INVALID_PARAMETER ControllerDevicePath is NULL, or DriverImageDevicePath is NULL
or MappingDataBase is NULL
- @retval EFI_ALREADY_STARTED The input Controller to input DriverImage has been
+ @retval EFI_ALREADY_STARTED The input Controller to input DriverImage has been
recorded into the mapping database.
- @retval EFI_SUCCESS The Controller and DriverImage are inserted into
+ @retval EFI_SUCCESS The Controller and DriverImage are inserted into
the mapping database successfully.
**/
@@ -1799,7 +1799,7 @@ InsertDriverImage ( /**
Delete a controller's override driver from the mapping database.
- @param ControllerDevicePath The controller device path will be deleted
+ @param ControllerDevicePath The controller device path will be deleted
when all drivers images on it are removed.
@param DriverImageDevicePath The driver image device path will be delete.
If NULL, all driver image will be delete.
@@ -1807,7 +1807,7 @@ InsertDriverImage ( @retval EFI_INVALID_PARAMETER ControllerDevicePath is NULL, or MappingDataBase is NULL
@retval EFI_NOT_FOUND ControllerDevicePath is not found in MappingDataBase or
- DriverImageDevicePath is not found in the found DriverImage Info list.
+ DriverImageDevicePath is not found in the found DriverImage Info list.
@retval EFI_SUCCESS Delete the specified driver successfully.
**/
diff --git a/MdeModulePkg/Universal/PlatformDriOverrideDxe/PlatOverMngr.h b/MdeModulePkg/Universal/PlatformDriOverrideDxe/PlatOverMngr.h index ca20945..86d9a2b 100644 --- a/MdeModulePkg/Universal/PlatformDriOverrideDxe/PlatOverMngr.h +++ b/MdeModulePkg/Universal/PlatformDriOverrideDxe/PlatOverMngr.h @@ -1,9 +1,9 @@ /** @file
-
+
The defintions are required both by Source code and Vfr file.
- The PLAT_OVER_MNGR_DATA structure, form guid and Ifr question ID are defined.
+ The PLAT_OVER_MNGR_DATA structure, form guid and Ifr question ID are defined.
-Copyright (c) 2007 - 2014, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2007 - 2018, Intel Corporation. All rights reserved.<BR>
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
diff --git a/MdeModulePkg/Universal/PlatformDriOverrideDxe/PlatformDriOverrideDxe.inf b/MdeModulePkg/Universal/PlatformDriOverrideDxe/PlatformDriOverrideDxe.inf index 4225fb9..5bd9e44 100644 --- a/MdeModulePkg/Universal/PlatformDriOverrideDxe/PlatformDriOverrideDxe.inf +++ b/MdeModulePkg/Universal/PlatformDriOverrideDxe/PlatformDriOverrideDxe.inf @@ -1,9 +1,9 @@ ## @file
# This driver produces UEFI PLATFORM_DRIVER_OVERRIDE_PROTOCOL if this protocol doesn't exist.
# It doesn't install again if this protocol exists.
-# It only implements one interface GetDriver of PLATFORM_DRIVER_OVERRIDE_PROTOCOL protocol
-# and doesn't support other two interfaces GetDriverPath, DriverLoaded.
-#
+# It only implements one interface GetDriver of PLATFORM_DRIVER_OVERRIDE_PROTOCOL protocol
+# and doesn't support other two interfaces GetDriverPath, DriverLoaded.
+#
# This driver also offers an UI interface in device manager to let user configure
# platform override protocol to override the default algorithm for matching
# drivers to controllers.
@@ -13,12 +13,12 @@ # 2. It dynamicly locate all drivers which support binding protocol.
# 3. It export and dynamicly update two menu to let user select the
# mapping between drivers to controllers.
-# 4. It save all the mapping info in NV variables for the following boot,
+# 4. It save all the mapping info in NV variables for the following boot,
# which will be consumed by GetDriver API of the produced the platform override protocol.
#
# Caution: This module is a sample implementation for the test purpose.
#
-# Copyright (c) 2007 - 2014, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2007 - 2018, Intel Corporation. All rights reserved.<BR>
#
# This program and the accompanying materials
# are licensed and made available under the terms and conditions of the BSD License
@@ -70,8 +70,8 @@ DevicePathLib
DxeServicesTableLib
UefiRuntimeServicesTableLib
- PrintLib
-
+ PrintLib
+
[Guids]
#
# This GUID C Name is not required for build since it is from UefiLib and not directly used by this module source.
diff --git a/MdeModulePkg/Universal/PrintDxe/PrintDxe.uni b/MdeModulePkg/Universal/PrintDxe/PrintDxe.uni index 10f0ff8..e0a3317 100644 --- a/MdeModulePkg/Universal/PrintDxe/PrintDxe.uni +++ b/MdeModulePkg/Universal/PrintDxe/PrintDxe.uni @@ -3,13 +3,13 @@ //
// This driver produces Print2 protocols layered on top of the PrintLib from the MdePkg.
//
-// Copyright (c) 2009 - 2017, Intel Corporation. All rights reserved.<BR>
+// Copyright (c) 2009 - 2018, Intel Corporation. All rights reserved.<BR>
//
// 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,
// WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
//
diff --git a/MdeModulePkg/Universal/PrintDxe/PrintDxeExtra.uni b/MdeModulePkg/Universal/PrintDxe/PrintDxeExtra.uni index 339fac2..3e0402b 100644 --- a/MdeModulePkg/Universal/PrintDxe/PrintDxeExtra.uni +++ b/MdeModulePkg/Universal/PrintDxe/PrintDxeExtra.uni @@ -1,7 +1,7 @@ // /** @file
// PrintDxe Localized Strings and Content
//
-// Copyright (c) 2013 - 2014, Intel Corporation. All rights reserved.<BR>
+// Copyright (c) 2013 - 2018, Intel Corporation. All rights reserved.<BR>
//
// This program and the accompanying materials
// are licensed and made available under the terms and conditions of the BSD License
@@ -13,8 +13,8 @@ //
// **/
-#string STR_PROPERTIES_MODULE_NAME
-#language en-US
+#string STR_PROPERTIES_MODULE_NAME
+#language en-US
"Formatted String DXE Driver"
diff --git a/MdeModulePkg/Universal/PropertiesTableAttributesDxe/PropertiesTableAttributesDxe.c b/MdeModulePkg/Universal/PropertiesTableAttributesDxe/PropertiesTableAttributesDxe.c index 718c567..4d1a46f 100644 --- a/MdeModulePkg/Universal/PropertiesTableAttributesDxe/PropertiesTableAttributesDxe.c +++ b/MdeModulePkg/Universal/PropertiesTableAttributesDxe/PropertiesTableAttributesDxe.c @@ -4,7 +4,7 @@ This module sets EFI_MEMORY_XP for attributes of EfiACPIMemoryNVS and EfiReservedMemoryType
in UEFI memory map, if and only of PropertiesTable is published and has BIT0 set.
-Copyright (c) 2015, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2015 - 2018, Intel Corporation. All rights reserved.<BR>
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
@@ -130,7 +130,7 @@ UpdateMemoryAttributesDefault ( if (EFI_ERROR (Status)) {
goto Done;
}
-
+
ASSERT (PropertiesTable != NULL);
DEBUG ((EFI_D_INFO, "MemoryProtectionAttribute - 0x%016lx\n", PropertiesTable->MemoryProtectionAttribute));
diff --git a/MdeModulePkg/Universal/RegularExpressionDxe/RegularExpressionDxe.h b/MdeModulePkg/Universal/RegularExpressionDxe/RegularExpressionDxe.h index 0defa56..6e699ff 100644 --- a/MdeModulePkg/Universal/RegularExpressionDxe/RegularExpressionDxe.h +++ b/MdeModulePkg/Universal/RegularExpressionDxe/RegularExpressionDxe.h @@ -2,7 +2,7 @@ EFI_REGULAR_EXPRESSION_PROTOCOL Header File.
(C) Copyright 2015 Hewlett Packard Enterprise Development LP<BR>
-
+
This program and the accompanying materials are licensed and made available
under the terms and conditions of the BSD License that accompanies this
distribution. The full text of the license may be found at
diff --git a/MdeModulePkg/Universal/RegularExpressionDxe/RegularExpressionDxe.inf b/MdeModulePkg/Universal/RegularExpressionDxe/RegularExpressionDxe.inf index d4d9a83..d8a1490 100644 --- a/MdeModulePkg/Universal/RegularExpressionDxe/RegularExpressionDxe.inf +++ b/MdeModulePkg/Universal/RegularExpressionDxe/RegularExpressionDxe.inf @@ -70,16 +70,16 @@ gEfiRegexSyntaxTypePerlGuid ## CONSUMES ## GUID
[Protocols]
- gEfiRegularExpressionProtocolGuid ## PRODUCES
+ gEfiRegularExpressionProtocolGuid ## PRODUCES
[BuildOptions]
# Override MSFT build option to remove /Oi and /GL
- MSFT:DEBUG_*_IA32_CC_FLAGS == /nologo /c /WX /GS- /W4 /Gs32768 /D UNICODE /O1b2 /FIAutoGen.h /EHs-c- /GR- /GF /Gy /Zi /Gm
- MSFT:RELEASE_*_IA32_CC_FLAGS == /nologo /c /WX /GS- /W4 /Gs32768 /D UNICODE /O1b2 /FIAutoGen.h /EHs-c- /GR- /GF
- MSFT:DEBUG_*_X64_CC_FLAGS == /nologo /c /WX /GS- /W4 /Gs32768 /D UNICODE /O1b2s /FIAutoGen.h /EHs-c- /GR- /GF /Gy /Zi /Gm /X
- MSFT:RELEASE_*_X64_CC_FLAGS == /nologo /c /WX /GS- /W4 /Gs32768 /D UNICODE /O1b2s /FIAutoGen.h /EHs-c- /GR- /GF /Gy /X
- MSFT:DEBUG_*_IPF_CC_FLAGS == /nologo /c /WX /GS- /W4 /EHs-c- /GR- /Gy /Os /FIAutoGen.h /QIPF_fr32 /Zi /X
- MSFT:RELEASE_*_IPF_CC_FLAGS == /nologo /c /WX /GS- /W4 /EHs-c- /GR- /Gy /Os /FIAutoGen.h /QIPF_fr32 /X
+ MSFT:DEBUG_*_IA32_CC_FLAGS == /nologo /c /WX /GS- /W4 /Gs32768 /D UNICODE /O1b2 /FIAutoGen.h /EHs-c- /GR- /GF /Gy /Zi /Gm
+ MSFT:RELEASE_*_IA32_CC_FLAGS == /nologo /c /WX /GS- /W4 /Gs32768 /D UNICODE /O1b2 /FIAutoGen.h /EHs-c- /GR- /GF
+ MSFT:DEBUG_*_X64_CC_FLAGS == /nologo /c /WX /GS- /W4 /Gs32768 /D UNICODE /O1b2s /FIAutoGen.h /EHs-c- /GR- /GF /Gy /Zi /Gm /X
+ MSFT:RELEASE_*_X64_CC_FLAGS == /nologo /c /WX /GS- /W4 /Gs32768 /D UNICODE /O1b2s /FIAutoGen.h /EHs-c- /GR- /GF /Gy /X
+ MSFT:DEBUG_*_IPF_CC_FLAGS == /nologo /c /WX /GS- /W4 /EHs-c- /GR- /Gy /Os /FIAutoGen.h /QIPF_fr32 /Zi /X
+ MSFT:RELEASE_*_IPF_CC_FLAGS == /nologo /c /WX /GS- /W4 /EHs-c- /GR- /Gy /Os /FIAutoGen.h /QIPF_fr32 /X
INTEL:*_*_*_CC_FLAGS = /Oi-
# Oniguruma: potentially uninitialized local variable used
@@ -91,6 +91,6 @@ # Oniguruma: old style declaration in st.c
MSFT:*_*_*_CC_FLAGS = /wd4131
- # Oniguruma: 'type cast' : truncation from 'OnigUChar *' to 'unsigned int'
+ # Oniguruma: 'type cast' : truncation from 'OnigUChar *' to 'unsigned int'
MSFT:*_*_*_CC_FLAGS = /wd4305 /wd4306
diff --git a/MdeModulePkg/Universal/ReportStatusCodeRouter/Pei/ReportStatusCodeRouterPei.c b/MdeModulePkg/Universal/ReportStatusCodeRouter/Pei/ReportStatusCodeRouterPei.c index 8a2dc8a..3871418 100644 --- a/MdeModulePkg/Universal/ReportStatusCodeRouter/Pei/ReportStatusCodeRouterPei.c +++ b/MdeModulePkg/Universal/ReportStatusCodeRouter/Pei/ReportStatusCodeRouterPei.c @@ -1,7 +1,7 @@ /** @file
Report Status Code Router PEIM which produces Report Stataus Code Handler PPI and Status Code PPI.
- Copyright (c) 2009 - 2011, Intel Corporation. All rights reserved.<BR>
+ Copyright (c) 2009 - 2018, Intel Corporation. All rights reserved.<BR>
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
@@ -71,19 +71,19 @@ CreateRscHandlerCallbackPacket ( /**
Register the callback function for ReportStatusCode() notification.
-
+
When this function is called the function pointer is added to an internal list and any future calls to
ReportStatusCode() will be forwarded to the Callback function.
@param[in] Callback A pointer to a function of type EFI_PEI_RSC_HANDLER_CALLBACK that is called
when a call to ReportStatusCode() occurs.
-
+
@retval EFI_SUCCESS Function was successfully registered.
@retval EFI_INVALID_PARAMETER The callback function was NULL.
@retval EFI_OUT_OF_RESOURCES The internal buffer ran out of space. No more functions can be
registered.
@retval EFI_ALREADY_STARTED The function was already registered. It can't be registered again.
-
+
**/
EFI_STATUS
EFIAPI
@@ -127,7 +127,7 @@ Register ( //
// If the total number of handlers in current packet is max value 64,
// search an entry with NULL pointer and fill new handler into this entry.
- //
+ //
FreePacket = NumberOfEntries;
FreeEntryIndex = Index;
}
@@ -142,7 +142,7 @@ Register ( CallbackEntry = (EFI_PEI_RSC_HANDLER_CALLBACK *) (FreePacket + 1);
CallbackEntry[FreeEntryIndex] = Callback;
-
+
if (*FreePacket == FreeEntryIndex) {
//
// If new registered callback is added as a new entry in the packet,
@@ -156,16 +156,16 @@ Register ( /**
Remove a previously registered callback function from the notification list.
-
+
ReportStatusCode() messages will no longer be forwarded to the Callback function.
-
+
@param[in] Callback A pointer to a function of type EFI_PEI_RSC_HANDLER_CALLBACK that is to be
unregistered.
@retval EFI_SUCCESS The function was successfully unregistered.
@retval EFI_INVALID_PARAMETER The callback function was NULL.
@retval EFI_NOT_FOUND The callback function was not found to be unregistered.
-
+
**/
EFI_STATUS
EFIAPI
@@ -269,7 +269,7 @@ ReportDispatcher ( /**
Entry point of Status Code PEIM.
-
+
This function is the entry point of this Status Code Router PEIM.
It produces Report Stataus Code Handler PPI and Status Code PPI.
diff --git a/MdeModulePkg/Universal/ReportStatusCodeRouter/Pei/ReportStatusCodeRouterPei.h b/MdeModulePkg/Universal/ReportStatusCodeRouter/Pei/ReportStatusCodeRouterPei.h index 318a3f5..c660f37 100644 --- a/MdeModulePkg/Universal/ReportStatusCodeRouter/Pei/ReportStatusCodeRouterPei.h +++ b/MdeModulePkg/Universal/ReportStatusCodeRouter/Pei/ReportStatusCodeRouterPei.h @@ -1,7 +1,7 @@ /** @file
Internal include file for Report Status Code Router PEIM.
- Copyright (c) 2009, Intel Corporation. All rights reserved.<BR>
+ Copyright (c) 2009 - 2018, Intel Corporation. All rights reserved.<BR>
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
@@ -28,13 +28,13 @@ /**
Register the callback function for ReportStatusCode() notification.
-
+
When this function is called the function pointer is added to an internal list and any future calls to
ReportStatusCode() will be forwarded to the Callback function.
@param[in] Callback A pointer to a function of type EFI_PEI_RSC_HANDLER_CALLBACK that is called
when a call to ReportStatusCode() occurs.
-
+
@retval EFI_SUCCESS Function was successfully registered.
@retval EFI_INVALID_PARAMETER The callback function was NULL.
@retval EFI_OUT_OF_RESOURCES The internal buffer ran out of space. No more functions can be
@@ -50,16 +50,16 @@ Register ( /**
Remove a previously registered callback function from the notification list.
-
+
ReportStatusCode() messages will no longer be forwarded to the Callback function.
-
+
@param[in] Callback A pointer to a function of type EFI_PEI_RSC_HANDLER_CALLBACK that is to be
unregistered.
@retval EFI_SUCCESS The function was successfully unregistered.
@retval EFI_INVALID_PARAMETER The callback function was NULL.
@retval EFI_NOT_FOUND The callback function was not found to be unregistered.
-
+
**/
EFI_STATUS
EFIAPI
diff --git a/MdeModulePkg/Universal/ReportStatusCodeRouter/Pei/ReportStatusCodeRouterPeiExtra.uni b/MdeModulePkg/Universal/ReportStatusCodeRouter/Pei/ReportStatusCodeRouterPeiExtra.uni index f4cca9a..44bbfb7 100644 --- a/MdeModulePkg/Universal/ReportStatusCodeRouter/Pei/ReportStatusCodeRouterPeiExtra.uni +++ b/MdeModulePkg/Universal/ReportStatusCodeRouter/Pei/ReportStatusCodeRouterPeiExtra.uni @@ -1,7 +1,7 @@ // /** @file
// ReportStatusCodeRouterPei Localized Strings and Content
//
-// Copyright (c) 2013 - 2014, Intel Corporation. All rights reserved.<BR>
+// Copyright (c) 2013 - 2018, Intel Corporation. All rights reserved.<BR>
//
// This program and the accompanying materials
// are licensed and made available under the terms and conditions of the BSD License
@@ -12,8 +12,8 @@ //
// **/
-#string STR_PROPERTIES_MODULE_NAME
-#language en-US
+#string STR_PROPERTIES_MODULE_NAME
+#language en-US
"Status Code Routing PEI Module"
diff --git a/MdeModulePkg/Universal/ReportStatusCodeRouter/RuntimeDxe/ReportStatusCodeRouterRuntimeDxe.c b/MdeModulePkg/Universal/ReportStatusCodeRouter/RuntimeDxe/ReportStatusCodeRouterRuntimeDxe.c index f859075..1aa1204 100644 --- a/MdeModulePkg/Universal/ReportStatusCodeRouter/RuntimeDxe/ReportStatusCodeRouterRuntimeDxe.c +++ b/MdeModulePkg/Universal/ReportStatusCodeRouter/RuntimeDxe/ReportStatusCodeRouterRuntimeDxe.c @@ -2,7 +2,7 @@ Report Status Code Router Driver which produces Report Stataus Code Handler Protocol
and Status Code Runtime Protocol.
- Copyright (c) 2009 - 2011, Intel Corporation. All rights reserved.<BR>
+ Copyright (c) 2009 - 2018, Intel Corporation. All rights reserved.<BR>
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
@@ -79,7 +79,7 @@ RscHandlerNotification ( /**
Register the callback function for ReportStatusCode() notification.
-
+
When this function is called the function pointer is added to an internal list and any future calls to
ReportStatusCode() will be forwarded to the Callback function. During the bootservices,
this is the callback for which this service can be invoked. The report status code router
@@ -93,11 +93,11 @@ RscHandlerNotification ( 2. not unregister at exit boot services so that the router will still have its callback address
3. the caller must be self-contained (eg. Not call out into any boot-service interfaces) and be
runtime safe, in general.
-
+
@param[in] Callback A pointer to a function of type EFI_RSC_HANDLER_CALLBACK that is called when
a call to ReportStatusCode() occurs.
- @param[in] Tpl TPL at which callback can be safely invoked.
-
+ @param[in] Tpl TPL at which callback can be safely invoked.
+
@retval EFI_SUCCESS Function was successfully registered.
@retval EFI_INVALID_PARAMETER The callback function was NULL.
@retval EFI_OUT_OF_RESOURCES The internal buffer ran out of space. No more functions can be
@@ -166,13 +166,13 @@ Register ( /**
Remove a previously registered callback function from the notification list.
-
+
A callback function must be unregistered before it is deallocated. It is important that any registered
callbacks that are not runtime complaint be unregistered when ExitBootServices() is called.
-
+
@param[in] Callback A pointer to a function of type EFI_RSC_HANDLER_CALLBACK that is to be
unregistered.
-
+
@retval EFI_SUCCESS The function was successfully unregistered.
@retval EFI_INVALID_PARAMETER The callback function was NULL.
@retval EFI_NOT_FOUND The callback function was not found to be unregistered.
@@ -343,7 +343,7 @@ VirtualAddressChangeCallBack ( IN VOID *Context
)
{
- EFI_STATUS Status;
+ EFI_STATUS Status;
LIST_ENTRY *Link;
RSC_HANDLER_CALLBACK_ENTRY *CallbackEntry;
@@ -369,7 +369,7 @@ VirtualAddressChangeCallBack ( @param ImageHandle The firmware allocated handle for the EFI image.
@param SystemTable A pointer to the EFI System Table.
-
+
@retval EFI_SUCCESS The entry point is executed successfully.
**/
diff --git a/MdeModulePkg/Universal/ReportStatusCodeRouter/RuntimeDxe/ReportStatusCodeRouterRuntimeDxe.h b/MdeModulePkg/Universal/ReportStatusCodeRouter/RuntimeDxe/ReportStatusCodeRouterRuntimeDxe.h index c82f296..8d6f8d0 100644 --- a/MdeModulePkg/Universal/ReportStatusCodeRouter/RuntimeDxe/ReportStatusCodeRouterRuntimeDxe.h +++ b/MdeModulePkg/Universal/ReportStatusCodeRouter/RuntimeDxe/ReportStatusCodeRouterRuntimeDxe.h @@ -1,7 +1,7 @@ /** @file
Internal include file for Report Status Code Router Driver.
- Copyright (c) 2009, Intel Corporation. All rights reserved.<BR>
+ Copyright (c) 2009 - 2018, Intel Corporation. All rights reserved.<BR>
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
@@ -56,7 +56,7 @@ typedef struct { /**
Register the callback function for ReportStatusCode() notification.
-
+
When this function is called the function pointer is added to an internal list and any future calls to
ReportStatusCode() will be forwarded to the Callback function. During the bootservices,
this is the callback for which this service can be invoked. The report status code router
@@ -70,11 +70,11 @@ typedef struct { 2. not unregister at exit boot services so that the router will still have its callback address
3. the caller must be self-contained (eg. Not call out into any boot-service interfaces) and be
runtime safe, in general.
-
+
@param[in] Callback A pointer to a function of type EFI_RSC_HANDLER_CALLBACK that is called when
a call to ReportStatusCode() occurs.
- @param[in] Tpl TPL at which callback can be safely invoked.
-
+ @param[in] Tpl TPL at which callback can be safely invoked.
+
@retval EFI_SUCCESS Function was successfully registered.
@retval EFI_INVALID_PARAMETER The callback function was NULL.
@retval EFI_OUT_OF_RESOURCES The internal buffer ran out of space. No more functions can be
@@ -91,13 +91,13 @@ Register ( /**
Remove a previously registered callback function from the notification list.
-
+
A callback function must be unregistered before it is deallocated. It is important that any registered
callbacks that are not runtime complaint be unregistered when ExitBootServices() is called.
-
+
@param[in] Callback A pointer to a function of type EFI_RSC_HANDLER_CALLBACK that is to be
unregistered.
-
+
@retval EFI_SUCCESS The function was successfully unregistered.
@retval EFI_INVALID_PARAMETER The callback function was NULL.
@retval EFI_NOT_FOUND The callback function was not found to be unregistered.
diff --git a/MdeModulePkg/Universal/ReportStatusCodeRouter/RuntimeDxe/ReportStatusCodeRouterRuntimeDxe.inf b/MdeModulePkg/Universal/ReportStatusCodeRouter/RuntimeDxe/ReportStatusCodeRouterRuntimeDxe.inf index 0445d94..9556260 100644 --- a/MdeModulePkg/Universal/ReportStatusCodeRouter/RuntimeDxe/ReportStatusCodeRouterRuntimeDxe.inf +++ b/MdeModulePkg/Universal/ReportStatusCodeRouter/RuntimeDxe/ReportStatusCodeRouterRuntimeDxe.inf @@ -1,7 +1,7 @@ ## @file
# Report Status Code Router Driver which produces Report Stataus Code Handler Protocol and Status Code Runtime Protocol.
#
-# Copyright (c) 2009 - 2014, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2009 - 2018, Intel Corporation. All rights reserved.<BR>
#
# This program and the accompanying materials
# are licensed and made available under the terms and conditions of the BSD License
@@ -19,7 +19,7 @@ MODULE_UNI_FILE = ReportStatusCodeRouterRuntimeDxe.uni
FILE_GUID = D93CE3D8-A7EB-4730-8C8E-CC466A9ECC3C
MODULE_TYPE = DXE_RUNTIME_DRIVER
- VERSION_STRING = 1.0
+ VERSION_STRING = 1.0
ENTRY_POINT = GenericStatusCodeRuntimeDxeEntry
#
diff --git a/MdeModulePkg/Universal/ReportStatusCodeRouter/RuntimeDxe/ReportStatusCodeRouterRuntimeDxeExtra.uni b/MdeModulePkg/Universal/ReportStatusCodeRouter/RuntimeDxe/ReportStatusCodeRouterRuntimeDxeExtra.uni index d16c249..679dae2 100644 --- a/MdeModulePkg/Universal/ReportStatusCodeRouter/RuntimeDxe/ReportStatusCodeRouterRuntimeDxeExtra.uni +++ b/MdeModulePkg/Universal/ReportStatusCodeRouter/RuntimeDxe/ReportStatusCodeRouterRuntimeDxeExtra.uni @@ -1,7 +1,7 @@ // /** @file
// ReportStatusCodeRouterRuntimeDxe Localized Strings and Content
//
-// Copyright (c) 2013 - 2014, Intel Corporation. All rights reserved.<BR>
+// Copyright (c) 2013 - 2018, Intel Corporation. All rights reserved.<BR>
//
// This program and the accompanying materials
// are licensed and made available under the terms and conditions of the BSD License
@@ -12,8 +12,8 @@ //
// **/
-#string STR_PROPERTIES_MODULE_NAME
-#language en-US
+#string STR_PROPERTIES_MODULE_NAME
+#language en-US
"Status Code Routing DXE Driver"
diff --git a/MdeModulePkg/Universal/ReportStatusCodeRouter/Smm/ReportStatusCodeRouterSmm.c b/MdeModulePkg/Universal/ReportStatusCodeRouter/Smm/ReportStatusCodeRouterSmm.c index 79c8d1e..f8fef59 100644 --- a/MdeModulePkg/Universal/ReportStatusCodeRouter/Smm/ReportStatusCodeRouterSmm.c +++ b/MdeModulePkg/Universal/ReportStatusCodeRouter/Smm/ReportStatusCodeRouterSmm.c @@ -2,7 +2,7 @@ Report Status Code Router Driver which produces SMM Report Stataus Code Handler Protocol
and SMM Status Code Protocol.
- Copyright (c) 2009 - 2011, Intel Corporation. All rights reserved.<BR>
+ Copyright (c) 2009 - 2018, Intel Corporation. All rights reserved.<BR>
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
@@ -34,19 +34,19 @@ EFI_SMM_RSC_HANDLER_PROTOCOL mSmmRscHandlerProtocol = { /**
Register the callback function for ReportStatusCode() notification.
-
+
When this function is called the function pointer is added to an internal list and any future calls to
ReportStatusCode() will be forwarded to the Callback function.
@param[in] Callback A pointer to a function of type EFI_PEI_RSC_HANDLER_CALLBACK that is called
when a call to ReportStatusCode() occurs.
-
+
@retval EFI_SUCCESS Function was successfully registered.
@retval EFI_INVALID_PARAMETER The callback function was NULL.
@retval EFI_OUT_OF_RESOURCES The internal buffer ran out of space. No more functions can be
registered.
@retval EFI_ALREADY_STARTED The function was already registered. It can't be registered again.
-
+
**/
EFI_STATUS
EFIAPI
@@ -84,16 +84,16 @@ Register ( /**
Remove a previously registered callback function from the notification list.
-
+
ReportStatusCode() messages will no longer be forwarded to the Callback function.
-
+
@param[in] Callback A pointer to a function of type EFI_PEI_RSC_HANDLER_CALLBACK that is to be
unregistered.
@retval EFI_SUCCESS The function was successfully unregistered.
@retval EFI_INVALID_PARAMETER The callback function was NULL.
@retval EFI_NOT_FOUND The callback function was not found to be unregistered.
-
+
**/
EFI_STATUS
EFIAPI
@@ -197,7 +197,7 @@ ReportDispatcher ( @param ImageHandle The firmware allocated handle for the EFI image.
@param SystemTable A pointer to the EFI System Table.
-
+
@retval EFI_SUCCESS The entry point is executed successfully.
**/
@@ -212,7 +212,7 @@ GenericStatusCodeSmmEntry ( EFI_HANDLE Handle;
Handle = NULL;
-
+
//
// Install SmmRscHandler Protocol
//
diff --git a/MdeModulePkg/Universal/ReportStatusCodeRouter/Smm/ReportStatusCodeRouterSmm.h b/MdeModulePkg/Universal/ReportStatusCodeRouter/Smm/ReportStatusCodeRouterSmm.h index 83f1bed..cdf4d08 100644 --- a/MdeModulePkg/Universal/ReportStatusCodeRouter/Smm/ReportStatusCodeRouterSmm.h +++ b/MdeModulePkg/Universal/ReportStatusCodeRouter/Smm/ReportStatusCodeRouterSmm.h @@ -1,7 +1,7 @@ /** @file
Internal include file for Report Status Code Router Driver.
- Copyright (c) 2009 - 2010, Intel Corporation. All rights reserved.<BR>
+ Copyright (c) 2009 - 2018, Intel Corporation. All rights reserved.<BR>
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
@@ -37,19 +37,19 @@ typedef struct { /**
Register the callback function for ReportStatusCode() notification.
-
+
When this function is called the function pointer is added to an internal list and any future calls to
ReportStatusCode() will be forwarded to the Callback function.
@param[in] Callback A pointer to a function of type EFI_PEI_RSC_HANDLER_CALLBACK that is called
when a call to ReportStatusCode() occurs.
-
+
@retval EFI_SUCCESS Function was successfully registered.
@retval EFI_INVALID_PARAMETER The callback function was NULL.
@retval EFI_OUT_OF_RESOURCES The internal buffer ran out of space. No more functions can be
registered.
@retval EFI_ALREADY_STARTED The function was already registered. It can't be registered again.
-
+
**/
EFI_STATUS
EFIAPI
@@ -59,16 +59,16 @@ Register ( /**
Remove a previously registered callback function from the notification list.
-
+
ReportStatusCode() messages will no longer be forwarded to the Callback function.
-
+
@param[in] Callback A pointer to a function of type EFI_PEI_RSC_HANDLER_CALLBACK that is to be
unregistered.
@retval EFI_SUCCESS The function was successfully unregistered.
@retval EFI_INVALID_PARAMETER The callback function was NULL.
@retval EFI_NOT_FOUND The callback function was not found to be unregistered.
-
+
**/
EFI_STATUS
EFIAPI
diff --git a/MdeModulePkg/Universal/ReportStatusCodeRouter/Smm/ReportStatusCodeRouterSmm.inf b/MdeModulePkg/Universal/ReportStatusCodeRouter/Smm/ReportStatusCodeRouterSmm.inf index 36c97ef..3e845ca 100644 --- a/MdeModulePkg/Universal/ReportStatusCodeRouter/Smm/ReportStatusCodeRouterSmm.inf +++ b/MdeModulePkg/Universal/ReportStatusCodeRouter/Smm/ReportStatusCodeRouterSmm.inf @@ -1,7 +1,7 @@ ## @file
# Report Status Code Router Driver which produces SMM Report Stataus Code Handler Protocol and SMM Status Code Protocol.
#
-# Copyright (c) 2009 - 2014, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2009 - 2018, Intel Corporation. All rights reserved.<BR>
#
# This program and the accompanying materials
# are licensed and made available under the terms and conditions of the BSD License
@@ -20,7 +20,7 @@ FILE_GUID = A6885402-D022-4b0e-A509-4711B90F2A39
MODULE_TYPE = DXE_SMM_DRIVER
PI_SPECIFICATION_VERSION = 0x0001000A
- VERSION_STRING = 1.0
+ VERSION_STRING = 1.0
ENTRY_POINT = GenericStatusCodeSmmEntry
#
diff --git a/MdeModulePkg/Universal/ReportStatusCodeRouter/Smm/ReportStatusCodeRouterSmmExtra.uni b/MdeModulePkg/Universal/ReportStatusCodeRouter/Smm/ReportStatusCodeRouterSmmExtra.uni index af3dc75..afe4ff5 100644 --- a/MdeModulePkg/Universal/ReportStatusCodeRouter/Smm/ReportStatusCodeRouterSmmExtra.uni +++ b/MdeModulePkg/Universal/ReportStatusCodeRouter/Smm/ReportStatusCodeRouterSmmExtra.uni @@ -1,7 +1,7 @@ // /** @file
// ReportStatusCodeRouterSmm Localized Strings and Content
//
-// Copyright (c) 2013 - 2014, Intel Corporation. All rights reserved.<BR>
+// Copyright (c) 2013 - 2018, Intel Corporation. All rights reserved.<BR>
//
// This program and the accompanying materials
// are licensed and made available under the terms and conditions of the BSD License
@@ -12,8 +12,8 @@ //
// **/
-#string STR_PROPERTIES_MODULE_NAME
-#language en-US
+#string STR_PROPERTIES_MODULE_NAME
+#language en-US
"Status Code Routing SMM Driver"
diff --git a/MdeModulePkg/Universal/ResetSystemPei/ResetSystem.c b/MdeModulePkg/Universal/ResetSystemPei/ResetSystem.c index 2c9b8a1..6236184 100644 --- a/MdeModulePkg/Universal/ResetSystemPei/ResetSystem.c +++ b/MdeModulePkg/Universal/ResetSystemPei/ResetSystem.c @@ -235,7 +235,7 @@ UnregisterResetNotify ( @param[in] FileHandle Handle of the file being invoked.
@param[in] PeiServices Describes the list of possible PEI Services.
-
+
@retval EFI_SUCCESS The entry point is executed successfully.
@retval EFI_ALREADY_STARTED The Reset2 PPI was already installed.
@retval others Status code returned from PeiServicesInstallPpi().
diff --git a/MdeModulePkg/Universal/ResetSystemPei/ResetSystemPei.uni b/MdeModulePkg/Universal/ResetSystemPei/ResetSystemPei.uni index 6d2d650..46c6901 100644 --- a/MdeModulePkg/Universal/ResetSystemPei/ResetSystemPei.uni +++ b/MdeModulePkg/Universal/ResetSystemPei/ResetSystemPei.uni @@ -1,13 +1,13 @@ // /** @file
// This driver implements Reset2, ResetFilter and ResetHandler PPIs.
//
-// Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
+// Copyright (c) 2017 - 2018, Intel Corporation. All rights reserved.<BR>
//
// 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,
// WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
//
diff --git a/MdeModulePkg/Universal/ResetSystemPei/ResetSystemPeiExtra.uni b/MdeModulePkg/Universal/ResetSystemPei/ResetSystemPeiExtra.uni index 2681afc..c43860a 100644 --- a/MdeModulePkg/Universal/ResetSystemPei/ResetSystemPeiExtra.uni +++ b/MdeModulePkg/Universal/ResetSystemPei/ResetSystemPeiExtra.uni @@ -1,7 +1,7 @@ // /** @file
// ResetSystemPei Localized Strings and Content
//
-// Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
+// Copyright (c) 2017 - 2018, Intel Corporation. All rights reserved.<BR>
//
// This program and the accompanying materials are
// licensed and made available under the terms and conditions of the BSD License
@@ -13,8 +13,8 @@ //
// **/
-#string STR_PROPERTIES_MODULE_NAME
-#language en-US
+#string STR_PROPERTIES_MODULE_NAME
+#language en-US
"Reset System PEIM"
diff --git a/MdeModulePkg/Universal/ResetSystemRuntimeDxe/ResetSystem.c b/MdeModulePkg/Universal/ResetSystemRuntimeDxe/ResetSystem.c index 2c79542..f23b5e8 100644 --- a/MdeModulePkg/Universal/ResetSystemRuntimeDxe/ResetSystem.c +++ b/MdeModulePkg/Universal/ResetSystemRuntimeDxe/ResetSystem.c @@ -1,7 +1,7 @@ /** @file
Reset Architectural and Reset Notification protocols implementation.
- Copyright (c) 2006 - 2017, Intel Corporation. All rights reserved.<BR>
+ Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>
This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License
@@ -162,9 +162,9 @@ RESET_NOTIFICATION_INSTANCE mPlatformSpecificResetHandler = { It initializes the Reset Architectural Protocol.
- @param[in] ImageHandle The firmware allocated handle for the EFI image.
+ @param[in] ImageHandle The firmware allocated handle for the EFI image.
@param[in] SystemTable A pointer to the EFI System Table.
-
+
@retval EFI_SUCCESS The entry point is executed successfully.
@retval other Cannot install ResetArch protocol.
@@ -207,7 +207,7 @@ InitializeResetSystem ( }
/**
- Put the system into S3 power state.
+ Put the system into S3 power state.
**/
VOID
DoS3 (
@@ -293,7 +293,7 @@ ResetSystem ( Entry->ResetNotify (ResetType, ResetStatus, DataSize, ResetData);
}
//
- // call reset notification functions registered through the
+ // call reset notification functions registered through the
// EDKII_PLATFORM_SPECIFIC_RESET_HANDLER_PROTOCOL.
//
for ( Link = GetFirstNode (&mPlatformSpecificResetHandler.ResetNotifies)
diff --git a/MdeModulePkg/Universal/ResetSystemRuntimeDxe/ResetSystem.h b/MdeModulePkg/Universal/ResetSystemRuntimeDxe/ResetSystem.h index ea56602..1848a92 100644 --- a/MdeModulePkg/Universal/ResetSystemRuntimeDxe/ResetSystem.h +++ b/MdeModulePkg/Universal/ResetSystemRuntimeDxe/ResetSystem.h @@ -1,6 +1,6 @@ /** @file
- Copyright (c) 2006 - 2017, Intel Corporation. All rights reserved.<BR>
+ Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>
This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License
@@ -63,9 +63,9 @@ typedef struct { It initializes the Reset Architectural Protocol.
- @param[in] ImageHandle The firmware allocated handle for the EFI image.
+ @param[in] ImageHandle The firmware allocated handle for the EFI image.
@param[in] SystemTable A pointer to the EFI System Table.
-
+
@retval EFI_SUCCESS The entry point is executed successfully.
@retval other Cannot install ResetArch protocol.
diff --git a/MdeModulePkg/Universal/ResetSystemRuntimeDxe/ResetSystemRuntimeDxe.uni b/MdeModulePkg/Universal/ResetSystemRuntimeDxe/ResetSystemRuntimeDxe.uni index 3e1e12d..d10c86d 100644 --- a/MdeModulePkg/Universal/ResetSystemRuntimeDxe/ResetSystemRuntimeDxe.uni +++ b/MdeModulePkg/Universal/ResetSystemRuntimeDxe/ResetSystemRuntimeDxe.uni @@ -1,13 +1,13 @@ // /** @file
// This driver implements Reset Architectural and Reset Notification protocols.
//
-// Copyright (c) 2006 - 2017, Intel Corporation. All rights reserved.<BR>
+// Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>
//
// 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,
// WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
//
diff --git a/MdeModulePkg/Universal/ResetSystemRuntimeDxe/ResetSystemRuntimeDxeExtra.uni b/MdeModulePkg/Universal/ResetSystemRuntimeDxe/ResetSystemRuntimeDxeExtra.uni index 32448f2..a437a61 100644 --- a/MdeModulePkg/Universal/ResetSystemRuntimeDxe/ResetSystemRuntimeDxeExtra.uni +++ b/MdeModulePkg/Universal/ResetSystemRuntimeDxe/ResetSystemRuntimeDxeExtra.uni @@ -1,7 +1,7 @@ // /** @file
// ResetSystemRuntimeDxe Localized Strings and Content
//
-// Copyright (c) 2013 - 2014, Intel Corporation. All rights reserved.<BR>
+// Copyright (c) 2013 - 2018, Intel Corporation. All rights reserved.<BR>
//
// This program and the accompanying materials are
// licensed and made available under the terms and conditions of the BSD License
@@ -13,8 +13,8 @@ //
// **/
-#string STR_PROPERTIES_MODULE_NAME
-#language en-US
+#string STR_PROPERTIES_MODULE_NAME
+#language en-US
"Reset System DXE Driver"
diff --git a/MdeModulePkg/Universal/SectionExtractionDxe/SectionExtractionDxe.c b/MdeModulePkg/Universal/SectionExtractionDxe/SectionExtractionDxe.c index b100883..096a497 100644 --- a/MdeModulePkg/Universal/SectionExtractionDxe/SectionExtractionDxe.c +++ b/MdeModulePkg/Universal/SectionExtractionDxe/SectionExtractionDxe.c @@ -1,14 +1,14 @@ /** @file
Section Extraction DXE Driver
-Copyright (c) 2013 - 2014, Intel Corporation. All rights reserved.<BR>
-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,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+Copyright (c) 2013 - 2018, Intel Corporation. All rights reserved.<BR>
+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,
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
**/
@@ -318,12 +318,12 @@ CustomGuidedSectionExtract ( /**
Main entry for the Section Extraction DXE module.
- This routine registers the Section Extraction Protocols that have been registered
+ This routine registers the Section Extraction Protocols that have been registered
with the Section Extraction Library.
-
+
@param[in] ImageHandle The firmware allocated handle for the EFI image.
@param[in] SystemTable A pointer to the EFI System Table.
-
+
@retval EFI_SUCCESS The entry point is executed successfully.
@retval other Some error occurs when executing this entry point.
diff --git a/MdeModulePkg/Universal/SectionExtractionDxe/SectionExtractionDxeExtra.uni b/MdeModulePkg/Universal/SectionExtractionDxe/SectionExtractionDxeExtra.uni index 21aa52a..33c9a89 100644 --- a/MdeModulePkg/Universal/SectionExtractionDxe/SectionExtractionDxeExtra.uni +++ b/MdeModulePkg/Universal/SectionExtractionDxe/SectionExtractionDxeExtra.uni @@ -1,7 +1,7 @@ // /** @file
// Section Extraction DXE Module Localized Strings and Content
//
-// Copyright (c) 2013 - 2014, Intel Corporation. All rights reserved.<BR>
+// Copyright (c) 2013 - 2018, Intel Corporation. All rights reserved.<BR>
//
// This program and the accompanying materials
// are licensed and made available under the terms and conditions of the BSD License
@@ -12,6 +12,6 @@ //
// **/
-#string STR_PROPERTIES_MODULE_NAME
-#language en-US
+#string STR_PROPERTIES_MODULE_NAME
+#language en-US
"Section Extraction DXE"
diff --git a/MdeModulePkg/Universal/SectionExtractionPei/SectionExtractionPei.c b/MdeModulePkg/Universal/SectionExtractionPei/SectionExtractionPei.c index 63fc94c..97e321d 100644 --- a/MdeModulePkg/Universal/SectionExtractionPei/SectionExtractionPei.c +++ b/MdeModulePkg/Universal/SectionExtractionPei/SectionExtractionPei.c @@ -2,13 +2,13 @@ Section Extraction PEIM
Copyright (c) 2013 - 2018, Intel Corporation. All rights reserved.<BR>
-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,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+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,
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
**/
@@ -50,7 +50,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. output buffer. If the input
section's GuidedSectionHeader.
Attributes field has the
- EFI_GUIDED_SECTION_AUTH_STATUS_VALID
+ EFI_GUIDED_SECTION_AUTH_STATUS_VALID
bit as clear,
AuthenticationStatus must return
zero. These bits reflect the
@@ -60,14 +60,14 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. EFI_SUCCESS, the value of
AuthenticationStatus is
undefined.
-
+
@retval EFI_SUCCESS The InputSection was
successfully processed and the
section contents were returned.
-
+
@retval EFI_OUT_OF_RESOURCES The system has insufficient
resources to process the request.
-
+
@retval EFI_INVALID_PARAMETER The GUID in InputSection does
not match this instance of the
GUIDed Section Extraction PPI.
@@ -121,7 +121,7 @@ CONST EFI_PEI_GUIDED_SECTION_EXTRACTION_PPI mCustomGuidedSectionExtractionPpi = output buffer. If the input
section's GuidedSectionHeader.
Attributes field has the
- EFI_GUIDED_SECTION_AUTH_STATUS_VALID
+ EFI_GUIDED_SECTION_AUTH_STATUS_VALID
bit as clear,
AuthenticationStatus must return
zero. These bits reflect the
@@ -131,14 +131,14 @@ CONST EFI_PEI_GUIDED_SECTION_EXTRACTION_PPI mCustomGuidedSectionExtractionPpi = EFI_SUCCESS, the value of
AuthenticationStatus is
undefined.
-
+
@retval EFI_SUCCESS The InputSection was
successfully processed and the
section contents were returned.
-
+
@retval EFI_OUT_OF_RESOURCES The system has insufficient
resources to process the request.
-
+
@retval EFI_INVALID_PARAMETER The GUID in InputSection does
not match this instance of the
GUIDed Section Extraction PPI.
@@ -159,7 +159,7 @@ CustomGuidedSectionExtract ( UINT32 ScratchBufferSize;
UINT32 OutputBufferSize;
UINT16 SectionAttribute;
-
+
//
// Init local variable
//
@@ -174,12 +174,12 @@ CustomGuidedSectionExtract ( &ScratchBufferSize,
&SectionAttribute
);
-
+
if (EFI_ERROR (Status)) {
DEBUG ((DEBUG_ERROR, "GetInfo from guided section Failed - %r\n", Status));
return Status;
}
-
+
if (ScratchBufferSize != 0) {
//
// Allocate scratch buffer
@@ -190,7 +190,7 @@ CustomGuidedSectionExtract ( }
}
- if (((SectionAttribute & EFI_GUIDED_SECTION_PROCESSING_REQUIRED) != 0) && OutputBufferSize > 0) {
+ if (((SectionAttribute & EFI_GUIDED_SECTION_PROCESSING_REQUIRED) != 0) && OutputBufferSize > 0) {
//
// Allocate output buffer
//
@@ -200,9 +200,9 @@ CustomGuidedSectionExtract ( }
DEBUG ((DEBUG_INFO, "Customized Guided section Memory Size required is 0x%x and address is 0x%p\n", OutputBufferSize, *OutputBuffer));
}
-
+
Status = ExtractGuidedSectionDecode (
- InputSection,
+ InputSection,
OutputBuffer,
ScratchBuffer,
AuthenticationStatus
@@ -214,16 +214,16 @@ CustomGuidedSectionExtract ( DEBUG ((DEBUG_ERROR, "Extract guided section Failed - %r\n", Status));
return Status;
}
-
+
*OutputSize = (UINTN) OutputBufferSize;
-
+
return EFI_SUCCESS;
}
/**
Main entry for Section Extraction PEIM driver.
-
- This routine registers the Section Extraction PPIs that have been registered
+
+ This routine registers the Section Extraction PPIs that have been registered
with the Section Extraction Library.
@param FileHandle Handle of the file being invoked.
@@ -238,7 +238,7 @@ EFIAPI SectionExtractionPeiEntry (
IN EFI_PEI_FILE_HANDLE FileHandle,
IN CONST EFI_PEI_SERVICES **PeiServices
- )
+ )
{
EFI_STATUS Status;
EFI_GUID *ExtractHandlerGuidTable;
@@ -246,10 +246,10 @@ SectionExtractionPeiEntry ( EFI_PEI_PPI_DESCRIPTOR *GuidPpi;
//
- // Get custom extract guided section method guid list
+ // Get custom extract guided section method guid list
//
ExtractHandlerNumber = ExtractGuidedSectionGetGuidList (&ExtractHandlerGuidTable);
-
+
//
// Install custom extraction guid PPI
//
@@ -264,6 +264,6 @@ SectionExtractionPeiEntry ( ASSERT_EFI_ERROR (Status);
}
}
-
+
return EFI_SUCCESS;
}
diff --git a/MdeModulePkg/Universal/SectionExtractionPei/SectionExtractionPei.inf b/MdeModulePkg/Universal/SectionExtractionPei/SectionExtractionPei.inf index 912031a..91800ce 100644 --- a/MdeModulePkg/Universal/SectionExtractionPei/SectionExtractionPei.inf +++ b/MdeModulePkg/Universal/SectionExtractionPei/SectionExtractionPei.inf @@ -3,7 +3,7 @@ #
# Produce one or more Section Extraction PPIs.
#
-# Copyright (c) 2013 - 2014, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2013 - 2018, Intel Corporation. All rights reserved.<BR>
#
# This program and the accompanying materials
# are licensed and made available under the terms and conditions of the BSD License
@@ -41,7 +41,7 @@ DebugLib
MemoryAllocationLib
PeiServicesLib
-
+
[Depex]
gEfiPeiMemoryDiscoveredPpiGuid
diff --git a/MdeModulePkg/Universal/SectionExtractionPei/SectionExtractionPeiExtra.uni b/MdeModulePkg/Universal/SectionExtractionPei/SectionExtractionPeiExtra.uni index 0c0a944..cb58f93 100644 --- a/MdeModulePkg/Universal/SectionExtractionPei/SectionExtractionPeiExtra.uni +++ b/MdeModulePkg/Universal/SectionExtractionPei/SectionExtractionPeiExtra.uni @@ -1,7 +1,7 @@ // /** @file
// Section Extraction PEIM Localized Strings and Content
//
-// Copyright (c) 2013 - 2014, Intel Corporation. All rights reserved.<BR>
+// Copyright (c) 2013 - 2018, Intel Corporation. All rights reserved.<BR>
//
// This program and the accompanying materials
// are licensed and made available under the terms and conditions of the BSD License
@@ -12,6 +12,6 @@ //
// **/
-#string STR_PROPERTIES_MODULE_NAME
-#language en-US
+#string STR_PROPERTIES_MODULE_NAME
+#language en-US
"Section Extraction PEI"
diff --git a/MdeModulePkg/Universal/SecurityStubDxe/SecurityStub.c b/MdeModulePkg/Universal/SecurityStubDxe/SecurityStub.c index a75d8dc..86dfeb5 100644 --- a/MdeModulePkg/Universal/SecurityStubDxe/SecurityStub.c +++ b/MdeModulePkg/Universal/SecurityStubDxe/SecurityStub.c @@ -1,14 +1,14 @@ /** @file
This driver produces Security2 and Security architectural protocol based on SecurityManagementLib.
-
- Copyright (c) 2006 - 2016, Intel Corporation. All rights reserved.<BR>
- 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,
- WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>
+ 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,
+ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
**/
@@ -28,31 +28,31 @@ EFI_HANDLE mSecurityArchProtocolHandle = NULL;
/**
- The EFI_SECURITY_ARCH_PROTOCOL (SAP) is used to abstract platform-specific
- policy from the DXE core response to an attempt to use a file that returns a
- given status for the authentication check from the section extraction protocol.
+ The EFI_SECURITY_ARCH_PROTOCOL (SAP) is used to abstract platform-specific
+ policy from the DXE core response to an attempt to use a file that returns a
+ given status for the authentication check from the section extraction protocol.
- The possible responses in a given SAP implementation may include locking
- flash upon failure to authenticate, attestation logging for all signed drivers,
- and other exception operations. The File parameter allows for possible logging
+ The possible responses in a given SAP implementation may include locking
+ flash upon failure to authenticate, attestation logging for all signed drivers,
+ and other exception operations. The File parameter allows for possible logging
within the SAP of the driver.
If File is NULL, then EFI_INVALID_PARAMETER is returned.
- If the file specified by File with an authentication status specified by
+ If the file specified by File with an authentication status specified by
AuthenticationStatus is safe for the DXE Core to use, then EFI_SUCCESS is returned.
- If the file specified by File with an authentication status specified by
- AuthenticationStatus is not safe for the DXE Core to use under any circumstances,
+ If the file specified by File with an authentication status specified by
+ AuthenticationStatus is not safe for the DXE Core to use under any circumstances,
then EFI_ACCESS_DENIED is returned.
- If the file specified by File with an authentication status specified by
- AuthenticationStatus is not safe for the DXE Core to use right now, but it
- might be possible to use it at a future time, then EFI_SECURITY_VIOLATION is
+ If the file specified by File with an authentication status specified by
+ AuthenticationStatus is not safe for the DXE Core to use right now, but it
+ might be possible to use it at a future time, then EFI_SECURITY_VIOLATION is
returned.
@param This The EFI_SECURITY_ARCH_PROTOCOL instance.
- @param AuthenticationStatus
+ @param AuthenticationStatus
This is the authentication type returned from the Section
Extraction protocol. See the Section Extraction Protocol
Specification for details on this type.
@@ -71,18 +71,18 @@ SecurityStubAuthenticateState ( )
{
EFI_STATUS Status;
-
- Status = ExecuteSecurity2Handlers (EFI_AUTH_OPERATION_AUTHENTICATION_STATE,
- AuthenticationStatus,
+
+ Status = ExecuteSecurity2Handlers (EFI_AUTH_OPERATION_AUTHENTICATION_STATE,
+ AuthenticationStatus,
File,
- NULL,
- 0,
+ NULL,
+ 0,
FALSE
);
if (Status == EFI_SUCCESS) {
Status = ExecuteSecurityHandlers (AuthenticationStatus, File);
}
-
+
return Status;
}
@@ -98,7 +98,7 @@ SecurityStubAuthenticateState ( these cases.
If the FileBuffer is NULL, the interface will determine if the DevicePath can be connected
in order to support the User Identification policy.
-
+
@param This The EFI_SECURITY2_ARCH_PROTOCOL instance.
@param File A pointer to the device path of the file that is
being dispatched. This will optionally be used for logging.
@@ -107,7 +107,7 @@ SecurityStubAuthenticateState ( @param BootPolicy A boot policy that was used to call LoadImage() UEFI service. If
FileAuthentication() is invoked not from the LoadImage(),
BootPolicy must be set to FALSE.
-
+
@retval EFI_SUCCESS The file specified by DevicePath and non-NULL
FileBuffer did authenticate, and the platform policy dictates
that the DXE Foundation may use the file.
@@ -150,14 +150,14 @@ Security2StubAuthenticate ( }
}
- return ExecuteSecurity2Handlers (EFI_AUTH_OPERATION_VERIFY_IMAGE |
- EFI_AUTH_OPERATION_DEFER_IMAGE_LOAD |
+ return ExecuteSecurity2Handlers (EFI_AUTH_OPERATION_VERIFY_IMAGE |
+ EFI_AUTH_OPERATION_DEFER_IMAGE_LOAD |
EFI_AUTH_OPERATION_MEASURE_IMAGE |
- EFI_AUTH_OPERATION_CONNECT_POLICY,
- 0,
+ EFI_AUTH_OPERATION_CONNECT_POLICY,
+ 0,
File,
- FileBuffer,
- FileSize,
+ FileBuffer,
+ FileSize,
BootPolicy
);
}
@@ -165,12 +165,12 @@ Security2StubAuthenticate ( //
// Security2 and Security Architectural Protocol instance produced by this driver
//
-EFI_SECURITY_ARCH_PROTOCOL mSecurityStub = {
- SecurityStubAuthenticateState
+EFI_SECURITY_ARCH_PROTOCOL mSecurityStub = {
+ SecurityStubAuthenticateState
};
-EFI_SECURITY2_ARCH_PROTOCOL mSecurity2Stub = {
- Security2StubAuthenticate
+EFI_SECURITY2_ARCH_PROTOCOL mSecurity2Stub = {
+ Security2StubAuthenticate
};
/**
@@ -178,7 +178,7 @@ EFI_SECURITY2_ARCH_PROTOCOL mSecurity2Stub = { @param ImageHandle The image handle of this driver.
@param SystemTable A pointer to the EFI System Table.
-
+
@retval EFI_SUCCESS Install the sample Security Architectural Protocol successfully.
**/
diff --git a/MdeModulePkg/Universal/SecurityStubDxe/SecurityStubDxe.uni b/MdeModulePkg/Universal/SecurityStubDxe/SecurityStubDxe.uni index 2050dd6..5264da1 100644 --- a/MdeModulePkg/Universal/SecurityStubDxe/SecurityStubDxe.uni +++ b/MdeModulePkg/Universal/SecurityStubDxe/SecurityStubDxe.uni @@ -3,13 +3,13 @@ //
// This driver produces security2 and security architectural protocol based on SecurityManagementLib.
//
-// Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.<BR>
+// Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>
//
// 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,
// WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
//
diff --git a/MdeModulePkg/Universal/SecurityStubDxe/SecurityStubDxeExtra.uni b/MdeModulePkg/Universal/SecurityStubDxe/SecurityStubDxeExtra.uni index dfc807b..f6b665e 100644 --- a/MdeModulePkg/Universal/SecurityStubDxe/SecurityStubDxeExtra.uni +++ b/MdeModulePkg/Universal/SecurityStubDxe/SecurityStubDxeExtra.uni @@ -1,7 +1,7 @@ // /** @file
// SecurityStubDxe Localized Strings and Content
//
-// Copyright (c) 2013 - 2014, Intel Corporation. All rights reserved.<BR>
+// Copyright (c) 2013 - 2018, Intel Corporation. All rights reserved.<BR>
//
// This program and the accompanying materials
// are licensed and made available under the terms and conditions of the BSD License
@@ -13,8 +13,8 @@ //
// **/
-#string STR_PROPERTIES_MODULE_NAME
-#language en-US
+#string STR_PROPERTIES_MODULE_NAME
+#language en-US
"Security Stub DXE Driver"
diff --git a/MdeModulePkg/Universal/SerialDxe/SerialDxeExtra.uni b/MdeModulePkg/Universal/SerialDxe/SerialDxeExtra.uni index 3790487..e10da15 100644 --- a/MdeModulePkg/Universal/SerialDxe/SerialDxeExtra.uni +++ b/MdeModulePkg/Universal/SerialDxe/SerialDxeExtra.uni @@ -1,7 +1,7 @@ // /** @file
// SerialDxe Localized Strings and Content
//
-// Copyright (c) 2008 - 2015, Intel Corporation. All rights reserved.<BR>
+// Copyright (c) 2008 - 2018, Intel Corporation. All rights reserved.<BR>
//
// This program and the accompanying materials
// are licensed and made available under the terms and conditions of the BSD License
@@ -12,8 +12,8 @@ //
// **/
-#string STR_PROPERTIES_MODULE_NAME
-#language en-US
+#string STR_PROPERTIES_MODULE_NAME
+#language en-US
"SerialDxe Driver"
diff --git a/MdeModulePkg/Universal/SetupBrowserDxe/Expression.c b/MdeModulePkg/Universal/SetupBrowserDxe/Expression.c index 297741c..17a13c9 100644 --- a/MdeModulePkg/Universal/SetupBrowserDxe/Expression.c +++ b/MdeModulePkg/Universal/SetupBrowserDxe/Expression.c @@ -1,7 +1,7 @@ /** @file
Utility functions for expression evaluation.
-Copyright (c) 2007 - 2017, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2007 - 2018, Intel Corporation. All rights reserved.<BR>
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
@@ -157,7 +157,7 @@ PushStack ( (*StackPtr)->Buffer = AllocateCopyPool(Data->BufferLen, Data->Buffer);
ASSERT ((*StackPtr)->Buffer != NULL);
}
-
+
*StackPtr = *StackPtr + 1;
return EFI_SUCCESS;
@@ -210,7 +210,7 @@ ResetCurrentExpressionStack ( mCurrentExpressionPointer = mCurrentExpressionStack;
mFormExpressionPointer = mFormExpressionStack;
mStatementExpressionPointer = mStatementExpressionStack;
- mOptionExpressionPointer = mOptionExpressionStack;
+ mOptionExpressionPointer = mOptionExpressionStack;
}
@@ -293,7 +293,7 @@ ResetMapExpressionListStack ( pointer
@param StackEnd On input: old stack end; On output: new stack end
@param MemberSize The stack member size.
-
+
@retval EFI_SUCCESS Grow stack success.
@retval EFI_OUT_OF_RESOURCES No enough memory for stack space.
@@ -383,7 +383,7 @@ PushConditionalStack ( //
// Push the item onto the stack
//
- CopyMem (*StackPtr, Data, sizeof (FORM_EXPRESSION *));
+ CopyMem (*StackPtr, Data, sizeof (FORM_EXPRESSION *));
*StackPtr = *StackPtr + 1;
return EFI_SUCCESS;
@@ -426,15 +426,15 @@ PopConditionalStack ( /**
Get the expression list count.
-
- @param Level Which type this expression belong to. Form,
+
+ @param Level Which type this expression belong to. Form,
statement or option?
@retval >=0 The expression count
@retval -1 Input parameter error.
**/
-INTN
+INTN
GetConditionalExpressionCount (
IN EXPRESS_LEVEL Level
)
@@ -449,13 +449,13 @@ GetConditionalExpressionCount ( default:
ASSERT (FALSE);
return -1;
- }
+ }
}
/**
Get the expression Buffer pointer.
-
- @param Level Which type this expression belong to. Form,
+
+ @param Level Which type this expression belong to. Form,
statement or option?
@retval The start pointer of the expression buffer or NULL.
@@ -476,7 +476,7 @@ GetConditionalExpressionList ( default:
ASSERT (FALSE);
return NULL;
- }
+ }
}
@@ -484,7 +484,7 @@ GetConditionalExpressionList ( Push the expression options onto the Stack.
@param Pointer Pointer to the current expression.
- @param Level Which type this expression belong to. Form,
+ @param Level Which type this expression belong to. Form,
statement or option?
@retval EFI_SUCCESS The value was pushed onto the stack.
@@ -528,7 +528,7 @@ PushConditionalExpression ( /**
Pop the expression options from the Stack
- @param Level Which type this expression belong to. Form,
+ @param Level Which type this expression belong to. Form,
statement or option?
@retval EFI_SUCCESS The value was pushed onto the stack.
@@ -992,7 +992,7 @@ IfrStrToUpper ( /**
Check whether this value type can be transfer to EFI_IFR_TYPE_BUFFER type.
- EFI_IFR_TYPE_REF, EFI_IFR_TYPE_DATE and EFI_IFR_TYPE_TIME are converted to
+ EFI_IFR_TYPE_REF, EFI_IFR_TYPE_DATE and EFI_IFR_TYPE_TIME are converted to
EFI_IFR_TYPE_BUFFER when do the value compare.
@param Value Expression value to compare on.
@@ -1048,11 +1048,11 @@ IsTypeInUINT64 ( /**
Return the buffer length for this value.
- EFI_IFR_TYPE_REF, EFI_IFR_TYPE_DATE and EFI_IFR_TYPE_TIME are converted to
+ EFI_IFR_TYPE_REF, EFI_IFR_TYPE_DATE and EFI_IFR_TYPE_TIME are converted to
EFI_IFR_TYPE_BUFFER when do the value compare.
@param Value Expression value to compare on.
-
+
@retval BufLen Return the buffer length.
**/
@@ -1082,7 +1082,7 @@ GetLengthForValue ( /**
Return the buffer pointer for this value.
- EFI_IFR_TYPE_REF, EFI_IFR_TYPE_DATE and EFI_IFR_TYPE_TIME are converted to
+ EFI_IFR_TYPE_REF, EFI_IFR_TYPE_DATE and EFI_IFR_TYPE_TIME are converted to
EFI_IFR_TYPE_BUFFER when do the value compare.
@param Value Expression value to compare on.
@@ -1181,13 +1181,13 @@ IfrToString ( case EFI_IFR_TYPE_BOOLEAN:
String = (Value.Value.b) ? L"True" : L"False";
break;
-
+
case EFI_IFR_TYPE_BUFFER:
case EFI_IFR_TYPE_DATE:
case EFI_IFR_TYPE_TIME:
case EFI_IFR_TYPE_REF:
//
- // + 3 is base on the unicode format, the length may be odd number,
+ // + 3 is base on the unicode format, the length may be odd number,
// so need 1 byte to align, also need 2 bytes for L'\0'.
//
if (Value.Type == EFI_IFR_TYPE_BUFFER) {
@@ -1202,20 +1202,20 @@ IfrToString ( ASSERT (TmpBuf != NULL);
if (Format == EFI_IFR_STRING_ASCII) {
CopyMem (TmpBuf, SrcBuf, SrcLen);
- PrintFormat = L"%a";
+ PrintFormat = L"%a";
} else {
// Format == EFI_IFR_STRING_UNICODE
CopyMem (TmpBuf, SrcBuf, SrcLen * sizeof (CHAR16));
- PrintFormat = L"%s";
+ PrintFormat = L"%s";
}
UnicodeSPrint (Buffer, sizeof (Buffer), PrintFormat, TmpBuf);
- String = Buffer;
+ String = Buffer;
FreePool (TmpBuf);
if (Value.Type == EFI_IFR_TYPE_BUFFER) {
FreePool (Value.Buffer);
}
break;
-
+
default:
Result->Type = EFI_IFR_TYPE_UNDEFINED;
return EFI_SUCCESS;
@@ -1587,8 +1587,8 @@ IfrMatch2 ( RegExSyntaxTypeList = NULL;
Status = RegularExpressionProtocol->GetInfo (
- RegularExpressionProtocol,
- &RegExSyntaxTypeListSize,
+ RegularExpressionProtocol,
+ &RegExSyntaxTypeListSize,
RegExSyntaxTypeList
);
if (Status == EFI_BUFFER_TOO_SMALL) {
@@ -1598,8 +1598,8 @@ IfrMatch2 ( goto Done;
}
Status = RegularExpressionProtocol->GetInfo (
- RegularExpressionProtocol,
- &RegExSyntaxTypeListSize,
+ RegularExpressionProtocol,
+ &RegExSyntaxTypeListSize,
RegExSyntaxTypeList
);
} else if (EFI_ERROR (Status)) {
@@ -1613,7 +1613,7 @@ IfrMatch2 ( //
Result->Type = EFI_IFR_TYPE_BOOLEAN;
Status = RegularExpressionProtocol->MatchString (
- RegularExpressionProtocol,
+ RegularExpressionProtocol,
String[0],
String[1],
SyntaxType,
@@ -1631,7 +1631,7 @@ IfrMatch2 ( }
//
- // Type specified by SyntaxType is not supported
+ // Type specified by SyntaxType is not supported
// in any of the EFI_REGULAR_EXPRESSION_PROTOCOL instances.
//
Result->Type = EFI_IFR_TYPE_UNDEFINED;
@@ -1697,7 +1697,7 @@ IfrFind ( Status = PopExpression (&Value[2]);
if (EFI_ERROR (Status)) {
return Status;
- }
+ }
if (Value[0].Type > EFI_IFR_TYPE_NUM_SIZE_64) {
Result->Type = EFI_IFR_TYPE_UNDEFINED;
@@ -1792,7 +1792,7 @@ IfrMid ( Status = PopExpression (&Value[2]);
if (EFI_ERROR (Status)) {
return Status;
- }
+ }
if (Value[0].Type > EFI_IFR_TYPE_NUM_SIZE_64) {
Result->Type = EFI_IFR_TYPE_UNDEFINED;
@@ -1838,7 +1838,7 @@ IfrMid ( Result->BufferLen = 0;
Result->Buffer = NULL;
} else {
- Result->BufferLen = (UINT16)((BufferLen - Base) < Length ? (BufferLen - Base) : Length);
+ Result->BufferLen = (UINT16)((BufferLen - Base) < Length ? (BufferLen - Base) : Length);
Result->Buffer = AllocateZeroPool (Result->BufferLen);
ASSERT (Result->Buffer != NULL);
CopyMem (Result->Buffer, &Buffer[Base], Result->BufferLen);
@@ -1848,7 +1848,7 @@ IfrMid ( FreePool (Value[2].Buffer);
}
}
-
+
return Status;
}
@@ -1893,9 +1893,9 @@ IfrToken ( Status = PopExpression (&Value[2]);
if (EFI_ERROR (Status)) {
return Status;
- }
+ }
- if (Value[0].Type > EFI_IFR_TYPE_NUM_SIZE_64) {
+ if (Value[0].Type > EFI_IFR_TYPE_NUM_SIZE_64) {
Result->Type = EFI_IFR_TYPE_UNDEFINED;
return EFI_SUCCESS;
}
@@ -1910,7 +1910,7 @@ IfrToken ( for (Index = 0; Index < 2; Index++) {
if (Value[Index + 1].Type != EFI_IFR_TYPE_STRING) {
Result->Type = EFI_IFR_TYPE_UNDEFINED;
- Status = EFI_SUCCESS;
+ Status = EFI_SUCCESS;
goto Done;
}
@@ -2008,7 +2008,7 @@ IfrSpan ( Status = PopExpression (&Value[2]);
if (EFI_ERROR (Status)) {
return Status;
- }
+ }
if (Value[0].Type > EFI_IFR_TYPE_NUM_SIZE_64) {
Result->Type = EFI_IFR_TYPE_UNDEFINED;
@@ -2256,7 +2256,7 @@ CompareHiiValue ( Buf1Len = GetLengthForValue(Value1);
Buf2 = GetBufferForValue(Value2);
Buf2Len = GetLengthForValue(Value2);
-
+
Len = Buf1Len > Buf2Len ? Buf2Len : Buf1Len;
*Result = CompareMem (Buf1, Buf2, Len);
if ((*Result == 0) && (Buf1Len != Buf2Len)) {
@@ -2267,7 +2267,7 @@ CompareHiiValue ( *Result = Buf1Len > Buf2Len ? 1 : -1;
}
return EFI_SUCCESS;
- }
+ }
//
// Take types(integer, boolean) as integer
@@ -2334,7 +2334,7 @@ CheckUserPrivilege ( /// Enumerate all user information of the current user profile
/// to look for any EFI_USER_INFO_ACCESS_SETUP record.
///
-
+
for (UserInfoHandle = NULL;;) {
Status = mUserManager->GetNextInfo (mUserManager, UserProfileHandle, &UserInfoHandle);
if (EFI_ERROR (Status)) {
@@ -2399,11 +2399,11 @@ CheckUserPrivilege ( @param FormSetGuid The formset guid which include the question.
@param QuestionId The question id which need to get value from.
@param Value The return data about question's value.
-
+
@retval TRUE Get the question value success.
@retval FALSE Get the question value failed.
**/
-BOOLEAN
+BOOLEAN
GetQuestionValueFromForm (
IN EFI_DEVICE_PATH_PROTOCOL *DevicePath,
IN EFI_HII_HANDLE InputHiiHandle,
@@ -2420,10 +2420,10 @@ GetQuestionValueFromForm ( BOOLEAN GetTheVal;
LIST_ENTRY *Link;
- //
- // The input parameter DevicePath or InputHiiHandle must have one valid input.
//
- ASSERT ((DevicePath != NULL && InputHiiHandle == NULL) ||
+ // The input parameter DevicePath or InputHiiHandle must have one valid input.
+ //
+ ASSERT ((DevicePath != NULL && InputHiiHandle == NULL) ||
(DevicePath == NULL && InputHiiHandle != NULL) );
GetTheVal = TRUE;
@@ -2441,7 +2441,7 @@ GetQuestionValueFromForm ( }
} else {
HiiHandle = InputHiiHandle;
- }
+ }
ASSERT (HiiHandle != NULL);
//
@@ -2457,7 +2457,7 @@ GetQuestionValueFromForm ( //
// Base on the Question Id to get the question info.
- //
+ //
Question = IdToQuestion(FormSet, NULL, QuestionId);
if (Question == NULL) {
GetTheVal = FALSE;
@@ -2480,7 +2480,7 @@ GetQuestionValueFromForm ( Form = NULL;
}
ASSERT (Form != NULL);
-
+
//
// Get the question value.
//
@@ -2491,7 +2491,7 @@ GetQuestionValueFromForm ( }
CopyMem (Value, &Question->HiiValue, sizeof (EFI_HII_VALUE));
-
+
Done:
//
// Clean the formset structure and restore the global parameter.
@@ -2499,7 +2499,7 @@ Done: if (FormSet != NULL) {
DestroyFormSet (FormSet);
}
-
+
return GetTheVal;
}
@@ -2705,7 +2705,7 @@ EvaluateExpression ( TempBuffer [Index/2] = (UINT8) ((DigitUint8 << 4) + TempBuffer [Index/2]);
}
}
- }
+ }
}
}
break;
@@ -2804,7 +2804,7 @@ EvaluateExpression ( if (EFI_ERROR (Status)) {
goto Done;
}
-
+
//
// Validate the expression value
//
@@ -3017,14 +3017,14 @@ EvaluateExpression ( //
// When converting from a string, if case-insensitive compare
// with "true" is True, then push True. If a case-insensitive compare
- // with "false" is True, then push False. Otherwise, push Undefined.
+ // with "false" is True, then push False. Otherwise, push Undefined.
//
StrPtr = GetToken (Value->Value.string, FormSet->HiiHandle);
if (StrPtr == NULL) {
Status = EFI_INVALID_PARAMETER;
goto Done;
}
-
+
IfrStrToUpper (StrPtr);
if (StrCmp (StrPtr, L"TRUE") == 0){
Value->Value.b = TRUE;
@@ -3038,11 +3038,11 @@ EvaluateExpression ( FreePool (StrPtr);
} else if (Value->Type == EFI_IFR_TYPE_BUFFER) {
//
- // When converting from a buffer, if the buffer is all zeroes,
- // then push False. Otherwise push True.
+ // When converting from a buffer, if the buffer is all zeroes,
+ // then push False. Otherwise push True.
//
for (Index =0; Index < Value->BufferLen; Index ++) {
- if (Value->Buffer[Index] != 0) {
+ if (Value->Buffer[Index] != 0) {
break;
}
}
@@ -3379,15 +3379,15 @@ EvaluateExpression ( goto Done;
}
- if (Data2.Type > EFI_IFR_TYPE_BOOLEAN &&
- Data2.Type != EFI_IFR_TYPE_STRING &&
+ if (Data2.Type > EFI_IFR_TYPE_BOOLEAN &&
+ Data2.Type != EFI_IFR_TYPE_STRING &&
!IsTypeInBuffer(&Data2)) {
Value->Type = EFI_IFR_TYPE_UNDEFINED;
break;
}
- if (Data1.Type > EFI_IFR_TYPE_BOOLEAN &&
- Data1.Type != EFI_IFR_TYPE_STRING &&
+ if (Data1.Type > EFI_IFR_TYPE_BOOLEAN &&
+ Data1.Type != EFI_IFR_TYPE_STRING &&
!IsTypeInBuffer(&Data1)) {
Value->Type = EFI_IFR_TYPE_UNDEFINED;
break;
@@ -3400,7 +3400,7 @@ EvaluateExpression ( if (Data2.Type == EFI_IFR_TYPE_BUFFER) {
FreePool (Data2.Buffer);
}
-
+
if (Status == EFI_UNSUPPORTED) {
Value->Type = EFI_IFR_TYPE_UNDEFINED;
Status = EFI_SUCCESS;
@@ -3446,7 +3446,7 @@ EvaluateExpression ( if (EFI_ERROR (Status)) {
goto Done;
}
-
+
Status = IfrMatch (FormSet, Value);
break;
@@ -3624,7 +3624,7 @@ Done: /**
Check whether the result is TRUE or FALSE.
-
+
For the EFI_HII_VALUE value type is numeric, return TRUE if the
value is not 0.
@@ -3661,20 +3661,20 @@ IsTrue ( }
/**
- Return the result of the expression list. Check the expression list and
- return the highest priority express result.
+ Return the result of the expression list. Check the expression list and
+ return the highest priority express result.
Priority: DisableIf > SuppressIf > GrayOutIf > FALSE
@param ExpList The input expression list.
@param Evaluate Whether need to evaluate the expression first.
@param FormSet FormSet associated with this expression.
- @param Form Form associated with this expression.
+ @param Form Form associated with this expression.
- @retval EXPRESS_RESULT Return the higher priority express result.
+ @retval EXPRESS_RESULT Return the higher priority express result.
DisableIf > SuppressIf > GrayOutIf > FALSE
**/
-EXPRESS_RESULT
+EXPRESS_RESULT
EvaluateExpressionList (
IN FORM_EXPRESSION_LIST *ExpList,
IN BOOLEAN Evaluate,
@@ -3697,7 +3697,7 @@ EvaluateExpressionList ( //
// Check whether need to evaluate the expression first.
//
- if (Evaluate) {
+ if (Evaluate) {
while (ExpList->Count > Index) {
Status = EvaluateExpression (FormSet, Form, ExpList->Expression[Index++]);
if (EFI_ERROR (Status)) {
@@ -3726,12 +3726,12 @@ EvaluateExpressionList ( break;
default:
- return ExpressFalse;
+ return ExpressFalse;
}
ReturnVal = ReturnVal < CompareOne ? CompareOne : ReturnVal;
}
}
-
+
return ReturnVal;
}
diff --git a/MdeModulePkg/Universal/SetupBrowserDxe/Expression.h b/MdeModulePkg/Universal/SetupBrowserDxe/Expression.h index 5660a99..6968a5b 100644 --- a/MdeModulePkg/Universal/SetupBrowserDxe/Expression.h +++ b/MdeModulePkg/Universal/SetupBrowserDxe/Expression.h @@ -1,7 +1,7 @@ /** @file
Private structure, MACRO and function definitions for User Interface related functionalities.
-Copyright (c) 2004 - 2013, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2004 - 2018, Intel Corporation. All rights reserved.<BR>
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
@@ -17,15 +17,15 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. /**
Get the expression list count.
-
- @param Level Which type this expression belong to. Form,
+
+ @param Level Which type this expression belong to. Form,
statement or option?
@retval >=0 The expression count
@retval -1 Input parameter error.
**/
-INTN
+INTN
GetConditionalExpressionCount (
IN EXPRESS_LEVEL Level
);
@@ -74,8 +74,8 @@ PushScope ( /**
Get the expression Buffer pointer.
-
- @param Level Which type this expression belong to. Form,
+
+ @param Level Which type this expression belong to. Form,
statement or option?
@retval The start pointer of the expression buffer or NULL.
@@ -144,7 +144,7 @@ ExtendValueToU64 ( Push the expression options onto the Stack.
@param Pointer Pointer to the current expression.
- @param Level Which type this expression belong to. Form,
+ @param Level Which type this expression belong to. Form,
statement or option?
@retval EFI_SUCCESS The value was pushed onto the stack.
@@ -160,7 +160,7 @@ PushConditionalExpression ( /**
Pop the expression options from the Stack
- @param Level Which type this expression belong to. Form,
+ @param Level Which type this expression belong to. Form,
statement or option?
@retval EFI_SUCCESS The value was pushed onto the stack.
@@ -225,20 +225,20 @@ EvaluateExpression ( IN OUT FORM_EXPRESSION *Expression
);
/**
- Return the result of the expression list. Check the expression list and
- return the highest priority express result.
+ Return the result of the expression list. Check the expression list and
+ return the highest priority express result.
Priority: DisableIf > SuppressIf > GrayOutIf > FALSE
@param ExpList The input expression list.
@param Evaluate Whether need to evaluate the expression first.
@param FormSet FormSet associated with this expression.
- @param Form Form associated with this expression.
+ @param Form Form associated with this expression.
- @retval EXPRESS_RESULT Return the higher priority express result.
+ @retval EXPRESS_RESULT Return the higher priority express result.
DisableIf > SuppressIf > GrayOutIf > FALSE
**/
-EXPRESS_RESULT
+EXPRESS_RESULT
EvaluateExpressionList (
IN FORM_EXPRESSION_LIST *ExpList,
IN BOOLEAN Evaluate,
diff --git a/MdeModulePkg/Universal/SetupBrowserDxe/IfrParse.c b/MdeModulePkg/Universal/SetupBrowserDxe/IfrParse.c index 9bda482..3d28e7a 100644 --- a/MdeModulePkg/Universal/SetupBrowserDxe/IfrParse.c +++ b/MdeModulePkg/Universal/SetupBrowserDxe/IfrParse.c @@ -1,7 +1,7 @@ /** @file
Parser for IFR binary encoding.
-Copyright (c) 2007 - 2017, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2007 - 2018, Intel Corporation. All rights reserved.<BR>
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
@@ -37,7 +37,7 @@ CreateStatement ( {
FORM_BROWSER_STATEMENT *Statement;
EFI_IFR_STATEMENT_HEADER *StatementHdr;
- INTN ConditionalExprCount;
+ INTN ConditionalExprCount;
if (Form == NULL) {
//
@@ -70,8 +70,8 @@ CreateStatement ( //
// Form is inside of suppressif
//
-
- Statement->Expression = (FORM_EXPRESSION_LIST *) AllocatePool(
+
+ Statement->Expression = (FORM_EXPRESSION_LIST *) AllocatePool(
(UINTN) (sizeof(FORM_EXPRESSION_LIST) + ((ConditionalExprCount -1) * sizeof(FORM_EXPRESSION *))));
ASSERT (Statement->Expression != NULL);
Statement->Expression->Count = (UINTN) ConditionalExprCount;
@@ -246,7 +246,7 @@ CreateQuestion ( // Check whether old string node already exist.
//
Find = FALSE;
- if (!IsListEmpty(&Statement->Storage->NameValueListHead)) {
+ if (!IsListEmpty(&Statement->Storage->NameValueListHead)) {
Link = GetFirstNode (&Statement->Storage->NameValueListHead);
while (!IsNull (&Statement->Storage->NameValueListHead, Link)) {
NameValueNode = NAME_VALUE_NODE_FROM_LINK (Link);
@@ -326,7 +326,7 @@ InitializeConfigHdr ( {
CHAR16 *Name;
- if (Storage->BrowserStorage->Type == EFI_HII_VARSTORE_BUFFER ||
+ if (Storage->BrowserStorage->Type == EFI_HII_VARSTORE_BUFFER ||
Storage->BrowserStorage->Type == EFI_HII_VARSTORE_EFI_VARIABLE_BUFFER) {
Name = Storage->BrowserStorage->Name;
} else {
@@ -621,7 +621,7 @@ GetFstStgFromVarId ( @param Storage browser storage info.
@return Pointer to a FORMSET_STORAGE data structure.
-
+
**/
FORMSET_STORAGE *
@@ -707,7 +707,7 @@ InitializeRequestElement ( //
// Prepare <RequestElement>
//
- if (Storage->Type == EFI_HII_VARSTORE_BUFFER ||
+ if (Storage->Type == EFI_HII_VARSTORE_BUFFER ||
Storage->Type == EFI_HII_VARSTORE_EFI_VARIABLE_BUFFER) {
StrLen = UnicodeSPrint (
RequestElement,
@@ -1522,7 +1522,7 @@ ParseOpCodes ( ExpressionOpCode->ValueType = ((EFI_IFR_GET *) OpCodeData)->VarStoreType;
switch (ExpressionOpCode->ValueType) {
case EFI_IFR_TYPE_BOOLEAN:
- case EFI_IFR_TYPE_NUM_SIZE_8:
+ case EFI_IFR_TYPE_NUM_SIZE_8:
ExpressionOpCode->ValueWidth = 1;
break;
@@ -1563,8 +1563,8 @@ ParseOpCodes ( }
CopyMem (&ExpressionOpCode->VarStoreInfo.VarName, &((EFI_IFR_GET *) OpCodeData)->VarStoreInfo.VarName, sizeof (EFI_STRING_ID));
CopyMem (&ExpressionOpCode->VarStoreInfo.VarOffset, &((EFI_IFR_GET *) OpCodeData)->VarStoreInfo.VarOffset, sizeof (UINT16));
- if ((ExpressionOpCode->VarStorage != NULL) &&
- (ExpressionOpCode->VarStorage->Type == EFI_HII_VARSTORE_NAME_VALUE ||
+ if ((ExpressionOpCode->VarStorage != NULL) &&
+ (ExpressionOpCode->VarStorage->Type == EFI_HII_VARSTORE_NAME_VALUE ||
ExpressionOpCode->VarStorage->Type == EFI_HII_VARSTORE_EFI_VARIABLE)) {
ExpressionOpCode->ValueName = GetToken (ExpressionOpCode->VarStoreInfo.VarName, FormSet->HiiHandle);
if (ExpressionOpCode->ValueName == NULL) {
@@ -1754,7 +1754,7 @@ ParseOpCodes ( //
// Form is inside of suppressif
//
- CurrentForm->SuppressExpression = (FORM_EXPRESSION_LIST *) AllocatePool(
+ CurrentForm->SuppressExpression = (FORM_EXPRESSION_LIST *) AllocatePool(
(UINTN) (sizeof(FORM_EXPRESSION_LIST) + ((ConditionalExprCount -1) * sizeof(FORM_EXPRESSION *))));
ASSERT (CurrentForm->SuppressExpression != NULL);
CurrentForm->SuppressExpression->Count = (UINTN) ConditionalExprCount;
@@ -1820,7 +1820,7 @@ ParseOpCodes ( //
// Form is inside of suppressif
//
- CurrentForm->SuppressExpression = (FORM_EXPRESSION_LIST *) AllocatePool(
+ CurrentForm->SuppressExpression = (FORM_EXPRESSION_LIST *) AllocatePool(
(UINTN) (sizeof(FORM_EXPRESSION_LIST) + ((ConditionalExprCount -1) * sizeof(FORM_EXPRESSION *))));
ASSERT (CurrentForm->SuppressExpression != NULL);
CurrentForm->SuppressExpression->Count = (UINTN) ConditionalExprCount;
@@ -1972,7 +1972,7 @@ ParseOpCodes ( }
}
}
- CurrentStatement->StorageWidth = (UINT16) sizeof (EFI_HII_REF);
+ CurrentStatement->StorageWidth = (UINT16) sizeof (EFI_HII_REF);
InitializeRequestElement (FormSet, CurrentStatement, CurrentForm);
break;
@@ -2282,7 +2282,7 @@ ParseOpCodes ( //
// Form is inside of suppressif
//
- CurrentOption->SuppressExpression = (FORM_EXPRESSION_LIST *) AllocatePool(
+ CurrentOption->SuppressExpression = (FORM_EXPRESSION_LIST *) AllocatePool(
(UINTN) (sizeof(FORM_EXPRESSION_LIST) + ((ConditionalExprCount -1) * sizeof(FORM_EXPRESSION *))));
ASSERT (CurrentOption->SuppressExpression != NULL);
CurrentOption->SuppressExpression->Count = (UINTN) ConditionalExprCount;
@@ -2396,11 +2396,11 @@ ParseOpCodes ( }
if (SuppressForOption) {
- PushConditionalExpression(CurrentExpression, ExpressOption);
+ PushConditionalExpression(CurrentExpression, ExpressOption);
} else if (SuppressForQuestion) {
- PushConditionalExpression(CurrentExpression, ExpressStatement);
+ PushConditionalExpression(CurrentExpression, ExpressStatement);
} else {
- PushConditionalExpression(CurrentExpression, ExpressForm);
+ PushConditionalExpression(CurrentExpression, ExpressForm);
}
//
@@ -2655,7 +2655,7 @@ ParseOpCodes ( default:
ASSERT (ParentStatement != NULL);
ParentStatement->Locked = TRUE;
- }
+ }
break;
//
@@ -2679,7 +2679,7 @@ ParseOpCodes ( ResetScopeStack ();
return Status;
}
-
+
//
// Parent statement end tag found, update ParentStatement info.
//
@@ -2722,7 +2722,7 @@ ParseOpCodes ( case EFI_IFR_SUPPRESS_IF_OP:
if (SuppressForOption) {
- PopConditionalExpression(ExpressOption);
+ PopConditionalExpression(ExpressOption);
} else if (SuppressForQuestion) {
PopConditionalExpression(ExpressStatement);
} else {
diff --git a/MdeModulePkg/Universal/SetupBrowserDxe/Presentation.c b/MdeModulePkg/Universal/SetupBrowserDxe/Presentation.c index 97713eb..ded1c7a 100644 --- a/MdeModulePkg/Universal/SetupBrowserDxe/Presentation.c +++ b/MdeModulePkg/Universal/SetupBrowserDxe/Presentation.c @@ -1,7 +1,7 @@ /** @file
Utility functions for UI presentation.
-Copyright (c) 2004 - 2017, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2004 - 2018, Intel Corporation. All rights reserved.<BR>
(C) Copyright 2015 Hewlett Packard Enterprise Development LP<BR>
This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License
@@ -74,7 +74,7 @@ EvaluateFormExpressions ( Base on the opcode buffer info to get the display statement.
@param OpCode The input opcode buffer for this statement.
-
+
@retval Statement The statement use this opcode buffer.
**/
@@ -103,7 +103,7 @@ GetDisplayStatement ( Free the refresh event list.
**/
-VOID
+VOID
FreeRefreshEvent (
VOID
)
@@ -123,7 +123,7 @@ FreeRefreshEvent ( }
/**
- Check whether this statement value is changed. If yes, update the statement value and return TRUE;
+ Check whether this statement value is changed. If yes, update the statement value and return TRUE;
else return FALSE.
@param Statement The statement need to check.
@@ -145,7 +145,7 @@ UpdateStatement ( // Question value may be changed, need invoke its Callback()
//
ProcessCallBackFunction (gCurrentSelection, gCurrentSelection->FormSet, gCurrentSelection->Form, Statement, EFI_BROWSER_ACTION_RETRIEVE, FALSE);
-
+
if (mHiiPackageListUpdated) {
//
// Package list is updated, force to reparse IFR binary of target Formset
@@ -157,8 +157,8 @@ UpdateStatement ( /**
Refresh the question which has refresh guid event attribute.
-
- @param Event The event which has this function related.
+
+ @param Event The event which has this function related.
@param Context The input context info related to this event or the status code return to the caller.
**/
VOID
@@ -177,7 +177,7 @@ RefreshEventNotifyForStatement( /**
Refresh the questions within this form.
-
+
@param Event The event which has this function related.
@param Context The input context info related to this event or the status code return to the caller.
**/
@@ -450,11 +450,11 @@ UpdateHotkeyList ( @param QuestionId The question id for this request question.
- @retval The attribute for this question or NULL if not found this
+ @retval The attribute for this question or NULL if not found this
question in the list.
**/
-UINT32
+UINT32
ProcessQuestionExtraAttr (
IN EFI_QUESTION_ID QuestionId
)
@@ -588,7 +588,7 @@ AddStatementToDisplayForm ( //
// Get the minimal refresh interval value for later use.
//
- if ((Statement->RefreshInterval != 0) &&
+ if ((Statement->RefreshInterval != 0) &&
(MinRefreshInterval == 0 || Statement->RefreshInterval < MinRefreshInterval)) {
MinRefreshInterval = Statement->RefreshInterval;
}
@@ -649,7 +649,7 @@ UpdateDataChangedFlag ( //
// Base on the system level to check whether need to show the NV flag.
- //
+ //
switch (gBrowserSettingScope) {
case SystemLevel:
//
@@ -700,13 +700,13 @@ InitializeDisplayFormData ( InitializeListHead (&gDisplayFormData.HotKeyListHead);
Status = gBS->CreateEvent (
- EVT_NOTIFY_WAIT,
+ EVT_NOTIFY_WAIT,
TPL_CALLBACK,
EfiEventEmptyFunction,
NULL,
&mValueChangedEvent
);
- ASSERT_EFI_ERROR (Status);
+ ASSERT_EFI_ERROR (Status);
}
/**
@@ -863,7 +863,7 @@ GetBrowserStatement ( @param Form Form data structure.
**/
-VOID
+VOID
UpdateStatementStatusForForm (
IN FORM_BROWSER_FORMSET *FormSet,
IN FORM_BROWSER_FORM *Form
@@ -894,7 +894,7 @@ UpdateStatementStatusForForm ( @param FormSet FormSet data structure.
**/
-VOID
+VOID
UpdateStatementStatusForFormSet (
IN FORM_BROWSER_FORMSET *FormSet
)
@@ -919,10 +919,10 @@ UpdateStatementStatusForFormSet ( @param SettingScope Setting Scope for Default action.
**/
-VOID
+VOID
UpdateStatementStatus (
IN FORM_BROWSER_FORMSET *FormSet,
- IN FORM_BROWSER_FORM *Form,
+ IN FORM_BROWSER_FORM *Form,
IN BROWSER_SETTING_SCOPE SettingScope
)
{
@@ -966,7 +966,7 @@ UpdateStatementStatus ( @retval EFI_SUCESSS This function always return successfully for now.
**/
-EFI_STATUS
+EFI_STATUS
ProcessAction (
IN UINT32 Action,
IN UINT16 DefaultId
@@ -1051,7 +1051,7 @@ GetFormsetGuidFromHiiHandle ( BufferSize = 0;
HiiPackageList = NULL;
FindGuid = FALSE;
-
+
Status = mHiiDatabase->ExportPackageLists (mHiiDatabase, HiiHandle, &BufferSize, HiiPackageList);
if (Status == EFI_BUFFER_TOO_SMALL) {
HiiPackageList = AllocatePool (BufferSize);
@@ -1068,7 +1068,7 @@ GetFormsetGuidFromHiiHandle ( //
Offset = sizeof (EFI_HII_PACKAGE_LIST_HEADER);
Offset2 = 0;
- CopyMem (&PackageListLength, &HiiPackageList->PackageLength, sizeof (UINT32));
+ CopyMem (&PackageListLength, &HiiPackageList->PackageLength, sizeof (UINT32));
while (Offset < PackageListLength) {
Package = ((UINT8 *) HiiPackageList) + Offset;
@@ -1257,7 +1257,7 @@ ProcessChangedData ( case BROWSER_ACTION_DISCARD:
DiscardForm (Selection->FormSet, Selection->Form, Scope);
break;
-
+
case BROWSER_ACTION_SUBMIT:
Status = SubmitForm (Selection->FormSet, Selection->Form, Scope);
if (EFI_ERROR (Status)) {
@@ -1331,7 +1331,7 @@ ProcessGotoOpCode ( FORM_BROWSER_FORM *RefForm;
EFI_STATUS Status;
EFI_HII_HANDLE HiiHandle;
-
+
Status = EFI_SUCCESS;
StringPtr = NULL;
HiiHandle = NULL;
@@ -1440,7 +1440,7 @@ ProcessGotoOpCode ( if ((RefForm != NULL) && (RefForm->SuppressExpression != NULL)) {
if (EvaluateExpressionList(RefForm->SuppressExpression, TRUE, Selection->FormSet, RefForm) != ExpressFalse) {
//
- // Form is suppressed.
+ // Form is suppressed.
//
PopupErrorMessage(BROWSER_FORM_SUPPRESS, NULL, NULL, NULL);
return EFI_SUCCESS;
@@ -1565,14 +1565,14 @@ ProcessUserInput ( case EFI_IFR_REF_OP:
Status = ProcessGotoOpCode(Statement, gCurrentSelection);
break;
-
+
case EFI_IFR_ACTION_OP:
//
// Process the Config string <ConfigResp>
//
Status = ProcessQuestionConfig (gCurrentSelection, Statement);
break;
-
+
case EFI_IFR_RESET_BUTTON_OP:
//
// Reset Question to default value specified by DefaultId
@@ -1812,9 +1812,9 @@ IsNvUpdateRequiredForForm ( about the Selection, form and formset to be displayed.
On output, Selection return the screen item that is selected
by user.
- @param SettingLevel Input Settting level, if it is FormLevel, just exit current form.
+ @param SettingLevel Input Settting level, if it is FormLevel, just exit current form.
else, we need to exit current formset.
-
+
@retval TRUE Exit current form.
@retval FALSE User press ESC and keep in current form.
**/
@@ -1827,7 +1827,7 @@ FindNextMenu ( FORM_ENTRY_INFO *CurrentMenu;
FORM_ENTRY_INFO *ParentMenu;
BROWSER_SETTING_SCOPE Scope;
-
+
CurrentMenu = Selection->CurrentMenu;
Scope = FormSetLevel;
@@ -1893,7 +1893,7 @@ FindNextMenu ( @retval TRUE do the reconnect behavior success.
@retval FALSE do the reconnect behavior failed.
-
+
**/
BOOLEAN
ReconnectController (
@@ -1926,7 +1926,7 @@ ReconnectController ( @retval EFI_SUCCESS The call back function executes successfully.
@return Other value if the call back function failed to execute.
**/
-EFI_STATUS
+EFI_STATUS
ProcessCallBackFunction (
IN OUT UI_MENU_SELECTION *Selection,
IN FORM_BROWSER_FORMSET *FormSet,
@@ -1976,7 +1976,7 @@ ProcessCallBackFunction ( if ((Question != NULL) && (Statement != Question)) {
continue;
}
-
+
if ((Statement->QuestionFlags & EFI_IFR_FLAG_CALLBACK) != EFI_IFR_FLAG_CALLBACK) {
continue;
}
@@ -2104,7 +2104,7 @@ ProcessCallBackFunction ( //
IsQuestionValueChanged(gCurrentSelection->FormSet, gCurrentSelection->Form, Statement, GetSetValueWithEditBuffer);
//
- // According the spec, return value from call back of "changing" and
+ // According the spec, return value from call back of "changing" and
// "retrieve" should update to the question's temp buffer.
//
SetQuestionValue(FormSet, Form, Statement, GetSetValueWithEditBuffer);
@@ -2113,7 +2113,7 @@ ProcessCallBackFunction ( case EFI_BROWSER_ACTION_RETRIEVE:
//
- // According the spec, return value from call back of "changing" and
+ // According the spec, return value from call back of "changing" and
// "retrieve" should update to the question's temp buffer.
//
SetQuestionValue(FormSet, Form, Statement, GetSetValueWithEditBuffer);
@@ -2124,9 +2124,9 @@ ProcessCallBackFunction ( }
} else {
//
- // If the callback returns EFI_UNSUPPORTED for EFI_BROWSER_ACTION_CHANGING,
- // then the browser will use the value passed to Callback() and ignore the
- // value returned by Callback().
+ // If the callback returns EFI_UNSUPPORTED for EFI_BROWSER_ACTION_CHANGING,
+ // then the browser will use the value passed to Callback() and ignore the
+ // value returned by Callback().
//
if (Action == EFI_BROWSER_ACTION_CHANGING && Status == EFI_UNSUPPORTED) {
if (HiiValue->Type == EFI_IFR_TYPE_BUFFER) {
@@ -2134,7 +2134,7 @@ ProcessCallBackFunction ( } else {
CopyMem (&HiiValue->Value, &BackUpValue, sizeof (EFI_IFR_TYPE_VALUE));
}
-
+
//
// Do the question validation.
//
@@ -2150,7 +2150,7 @@ ProcessCallBackFunction ( }
//
- // According the spec, return fail from call back of "changing" and
+ // According the spec, return fail from call back of "changing" and
// "retrieve", should restore the question's value.
//
if (Action == EFI_BROWSER_ACTION_CHANGING && Status != EFI_UNSUPPORTED) {
@@ -2226,8 +2226,8 @@ ProcessCallBackFunction ( /**
Call the retrieve type call back function for one question to get the initialize data.
-
- This function only used when in the initialize stage, because in this stage, the
+
+ This function only used when in the initialize stage, because in this stage, the
Selection->Form is not ready. For other case, use the ProcessCallBackFunction instead.
@param ConfigAccess The config access protocol produced by the hii driver.
@@ -2237,7 +2237,7 @@ ProcessCallBackFunction ( @retval EFI_SUCCESS The call back function executes successfully.
@return Other value if the call back function failed to execute.
**/
-EFI_STATUS
+EFI_STATUS
ProcessRetrieveForQuestion (
IN EFI_HII_CONFIG_ACCESS_PROTOCOL *ConfigAccess,
IN FORM_BROWSER_STATEMENT *Statement,
@@ -2265,7 +2265,7 @@ ProcessRetrieveForQuestion ( //
TypeValue = (EFI_IFR_TYPE_VALUE *) Statement->BufferValue;
}
-
+
ActionRequest = EFI_BROWSER_ACTION_REQUEST_NONE;
Status = ConfigAccess->Callback (
ConfigAccess,
@@ -2357,7 +2357,7 @@ SetupBrowser ( //
// IFR is updated, force to reparse the IFR binary
- // This check is shared by EFI_BROWSER_ACTION_FORM_CLOSE and
+ // This check is shared by EFI_BROWSER_ACTION_FORM_CLOSE and
// EFI_BROWSER_ACTION_RETRIEVE, so code place here.
//
if (mHiiPackageListUpdated) {
@@ -2395,7 +2395,7 @@ SetupBrowser ( if (Selection->Form->SuppressExpression != NULL) {
if (EvaluateExpressionList(Selection->Form->SuppressExpression, TRUE, Selection->FormSet, Selection->Form) == ExpressSuppress) {
//
- // Form is suppressed.
+ // Form is suppressed.
//
PopupErrorMessage(BROWSER_FORM_SUPPRESS, NULL, NULL, NULL);
Status = EFI_NOT_FOUND;
@@ -2484,8 +2484,8 @@ SetupBrowser ( //
Statement = Selection->Statement;
if (Statement != NULL) {
- if ((ConfigAccess != NULL) &&
- ((Statement->QuestionFlags & EFI_IFR_FLAG_CALLBACK) == EFI_IFR_FLAG_CALLBACK) &&
+ if ((ConfigAccess != NULL) &&
+ ((Statement->QuestionFlags & EFI_IFR_FLAG_CALLBACK) == EFI_IFR_FLAG_CALLBACK) &&
(Statement->Operand != EFI_IFR_PASSWORD_OP)) {
Status = ProcessCallBackFunction(Selection, Selection->FormSet, Selection->Form, Statement, EFI_BROWSER_ACTION_CHANGING, FALSE);
if (Statement->Operand == EFI_IFR_REF_OP) {
@@ -2495,7 +2495,7 @@ SetupBrowser ( if (!EFI_ERROR (Status)) {
Status = ProcessGotoOpCode(Statement, Selection);
}
-
+
//
// Callback return error status or status return from process goto opcode.
//
@@ -2512,8 +2512,8 @@ SetupBrowser ( }
- if (!EFI_ERROR (Status) &&
- (Statement->Operand != EFI_IFR_REF_OP) &&
+ if (!EFI_ERROR (Status) &&
+ (Statement->Operand != EFI_IFR_REF_OP) &&
((Statement->Storage == NULL) || (Statement->Storage != NULL && Statement->ValueChanged))) {
//
// Only question value has been changed, browser will trig CHANGED callback.
@@ -2540,11 +2540,11 @@ SetupBrowser ( }
//
- // If question has EFI_IFR_FLAG_RESET_REQUIRED/EFI_IFR_FLAG_RECONNECT_REQUIRED flag and without storage
+ // If question has EFI_IFR_FLAG_RESET_REQUIRED/EFI_IFR_FLAG_RECONNECT_REQUIRED flag and without storage
// and process question success till here, trig the gResetFlag/gFlagReconnect.
//
- if ((Status == EFI_SUCCESS) &&
- (Statement->Storage == NULL)) {
+ if ((Status == EFI_SUCCESS) &&
+ (Statement->Storage == NULL)) {
if ((Statement->QuestionFlags & EFI_IFR_FLAG_RESET_REQUIRED) != 0) {
gResetRequiredFormLevel = TRUE;
gResetRequiredSystemLevel = TRUE;
@@ -2581,8 +2581,8 @@ SetupBrowser ( // Before exit the form, invoke ConfigAccess.Callback() with EFI_BROWSER_ACTION_FORM_CLOSE
// for each question with callback flag.
//
- if ((ConfigAccess != NULL) &&
- ((Selection->Action == UI_ACTION_EXIT) ||
+ if ((ConfigAccess != NULL) &&
+ ((Selection->Action == UI_ACTION_EXIT) ||
(Selection->Handle != mCurrentHiiHandle) ||
(!CompareGuid (&Selection->FormSetGuid, &mCurrentFormSetGuid)) ||
(Selection->FormId != mCurrentFormId))) {
diff --git a/MdeModulePkg/Universal/SetupBrowserDxe/Setup.c b/MdeModulePkg/Universal/SetupBrowserDxe/Setup.c index c2cfa5c..922219a 100644 --- a/MdeModulePkg/Universal/SetupBrowserDxe/Setup.c +++ b/MdeModulePkg/Universal/SetupBrowserDxe/Setup.c @@ -1,7 +1,7 @@ /** @file
Entry and initialization module for the browser.
-Copyright (c) 2007 - 2017, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2007 - 2018, Intel Corporation. All rights reserved.<BR>
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
@@ -152,7 +152,7 @@ GetFirstFormId ( **/
FORM_ENTRY_INFO *
UiFindMenuList (
- IN EFI_HII_HANDLE HiiHandle,
+ IN EFI_HII_HANDLE HiiHandle,
IN EFI_GUID *FormSetGuid,
IN UINT16 FormId
)
@@ -168,7 +168,7 @@ UiFindMenuList ( while (!IsNull (&mPrivateData.FormBrowserEx2.FormViewHistoryHead, Link)) {
MenuList = FORM_ENTRY_INFO_FROM_LINK (Link);
Link = GetNextNode (&mPrivateData.FormBrowserEx2.FormViewHistoryHead, Link);
-
+
//
// If already find the menu, free the menus behind it.
//
@@ -208,7 +208,7 @@ UiFindMenuList ( @param CurrentMenu Current Menu
@param SettingLevel Whether find parent menu in Form Level or Formset level.
- In form level, just find the parent menu;
+ In form level, just find the parent menu;
In formset level, find the parent menu which has different
formset guid value.
@@ -228,7 +228,7 @@ UiFindParentMenu ( if (CurrentMenu == NULL) {
return NULL;
}
-
+
ParentMenu = NULL;
Link = &CurrentMenu->Link;
@@ -285,7 +285,7 @@ UiFreeMenuList ( /**
Copy current Menu list to the new menu list.
-
+
@param NewMenuListHead New create Menu list.
@param CurrentMenuListHead Current Menu list.
@@ -622,7 +622,7 @@ SendForm ( distribution.
**/
-EFI_STATUS
+EFI_STATUS
ProcessStorage (
IN OUT UINTN *ResultsDataSize,
IN OUT EFI_STRING *ResultsData,
@@ -696,8 +696,8 @@ ProcessStorage ( }
/**
- This routine called this service in the browser to retrieve or set certain uncommitted
- state information that resides in the open formsets.
+ This routine called this service in the browser to retrieve or set certain uncommitted
+ state information that resides in the open formsets.
@param This A pointer to the EFI_FORM_BROWSER2_PROTOCOL
instance.
@@ -801,7 +801,7 @@ BrowserCallback ( //
// Different formsets may have same varstore, so here just set the flag
// not exit the circle.
- //
+ //
Found = TRUE;
break;
}
@@ -826,7 +826,7 @@ BrowserCallback ( }
FormsetStorage = FORMSET_STORAGE_FROM_LINK (Link);
-
+
Status = ProcessStorage (&TotalSize, &ResultsData, RetrieveData, FormsetStorage->BrowserStorage);
if (EFI_ERROR (Status)) {
return Status;
@@ -837,7 +837,7 @@ BrowserCallback ( Status = TotalSize <= *ResultsDataSize ? EFI_SUCCESS : EFI_BUFFER_TOO_SMALL;
*ResultsDataSize = TotalSize;
}
-
+
return Status;
}
@@ -936,7 +936,7 @@ InitializeSetup ( &mPrivateData.FormBrowserEx2
);
ASSERT_EFI_ERROR (Status);
-
+
Status = gBS->InstallProtocolInterface (
&mPrivateData.Handle,
&gEdkiiFormBrowserExProtocolGuid,
@@ -962,7 +962,7 @@ InitializeSetup ( &Registration
);
}
-
+
return EFI_SUCCESS;
}
@@ -1465,7 +1465,7 @@ BufferToValue ( Buffer = NULL;
IsString = (BOOLEAN) ((Question->HiiValue.Type == EFI_IFR_TYPE_STRING) ? TRUE : FALSE);
- if (Question->Storage->Type == EFI_HII_VARSTORE_BUFFER ||
+ if (Question->Storage->Type == EFI_HII_VARSTORE_BUFFER ||
Question->Storage->Type == EFI_HII_VARSTORE_EFI_VARIABLE_BUFFER) {
IsBufferStorage = TRUE;
} else {
@@ -1620,17 +1620,17 @@ GetQuestionValue ( FreePool (Question->ValueExpression->Result.Buffer);
}
Question->HiiValue.Type = Question->ValueExpression->Result.Type;
- CopyMem (&Question->HiiValue.Value, &Question->ValueExpression->Result.Value, sizeof (EFI_IFR_TYPE_VALUE));
+ CopyMem (&Question->HiiValue.Value, &Question->ValueExpression->Result.Value, sizeof (EFI_IFR_TYPE_VALUE));
}
return Status;
}
-
+
//
// Get question value by read expression.
//
if (Question->ReadExpression != NULL && Form->FormType == STANDARD_MAP_FORM_TYPE) {
Status = EvaluateExpression (FormSet, Form, Question->ReadExpression);
- if (!EFI_ERROR (Status) &&
+ if (!EFI_ERROR (Status) &&
((Question->ReadExpression->Result.Type < EFI_IFR_TYPE_OTHER) || (Question->ReadExpression->Result.Type == EFI_IFR_TYPE_BUFFER))) {
//
// Only update question value to the valid result.
@@ -1647,7 +1647,7 @@ GetQuestionValue ( FreePool (Question->ReadExpression->Result.Buffer);
}
Question->HiiValue.Type = Question->ReadExpression->Result.Type;
- CopyMem (&Question->HiiValue.Value, &Question->ReadExpression->Result.Value, sizeof (EFI_IFR_TYPE_VALUE));
+ CopyMem (&Question->HiiValue.Value, &Question->ReadExpression->Result.Value, sizeof (EFI_IFR_TYPE_VALUE));
return EFI_SUCCESS;
}
}
@@ -1748,7 +1748,7 @@ GetQuestionValue ( Dst = (UINT8 *) &Question->HiiValue.Value;
}
- if (Storage->Type == EFI_HII_VARSTORE_BUFFER ||
+ if (Storage->Type == EFI_HII_VARSTORE_BUFFER ||
Storage->Type == EFI_HII_VARSTORE_EFI_VARIABLE_BUFFER) {
IsBufferStorage = TRUE;
} else {
@@ -1933,7 +1933,7 @@ SetQuestionValue ( if (Question->ValueExpression != NULL) {
return Status;
}
-
+
//
// Before set question value, evaluate its write expression.
//
@@ -2028,7 +2028,7 @@ SetQuestionValue ( Src = (UINT8 *) &Question->HiiValue.Value;
}
- if (Storage->Type == EFI_HII_VARSTORE_BUFFER ||
+ if (Storage->Type == EFI_HII_VARSTORE_BUFFER ||
Storage->Type == EFI_HII_VARSTORE_EFI_VARIABLE_BUFFER) {
IsBufferStorage = TRUE;
} else {
@@ -2199,7 +2199,7 @@ SetQuestionValue ( return Status;
}
FreePool (ConfigResp);
-
+
//
// Sync storage, from editbuffer to buffer.
//
@@ -2322,9 +2322,9 @@ ValidateQuestion ( }
/**
- Perform question check.
-
- If one question has more than one check, process form high priority to low.
+ Perform question check.
+
+ If one question has more than one check, process form high priority to low.
Only one error info will be popup.
@param FormSet FormSet data structure.
@@ -2425,7 +2425,7 @@ NoSubmitCheck ( @param Storage The storage which need to sync.
@param ConfigRequest The config request string which used to sync storage.
- @param SyncOrRestore Sync the buffer to editbuffer or Restore the
+ @param SyncOrRestore Sync the buffer to editbuffer or Restore the
editbuffer to buffer
if TRUE, copy the editbuffer to the buffer.
if FALSE, copy the buffer to the editbuffer.
@@ -2452,7 +2452,7 @@ SynchronizeStorage ( Status = EFI_SUCCESS;
Result = NULL;
- if (Storage->Type == EFI_HII_VARSTORE_BUFFER ||
+ if (Storage->Type == EFI_HII_VARSTORE_BUFFER ||
(Storage->Type == EFI_HII_VARSTORE_EFI_VARIABLE_BUFFER)) {
BufferSize = Storage->Size;
@@ -2787,7 +2787,7 @@ UpdateFlagForForm ( if ((Question->QuestionFlags & EFI_IFR_FLAG_RECONNECT_REQUIRED) != 0) {
gFlagReconnect = TRUE;
}
- }
+ }
}
}
@@ -2796,7 +2796,7 @@ UpdateFlagForForm ( Also clean ValueChanged flag for all statements.
Form level or formset level, only one.
-
+
@param SetFlag Whether need to set the Reset Flag.
@param FormSet FormSet data structure.
@param Form Form data structure.
@@ -2806,7 +2806,7 @@ VOID ValueChangeResetFlagUpdate (
IN BOOLEAN SetFlag,
IN FORM_BROWSER_FORMSET *FormSet,
- IN FORM_BROWSER_FORM *Form
+ IN FORM_BROWSER_FORM *Form
)
{
FORM_BROWSER_FORM *CurrentForm;
@@ -2827,8 +2827,8 @@ ValueChangeResetFlagUpdate ( }
/**
- Base on the return Progress string to find the form.
-
+ Base on the return Progress string to find the form.
+
Base on the first return Offset/Width (Name) string to find the form
which keep this string.
@@ -3109,9 +3109,9 @@ ConfirmSaveFail ( ASSERT (StringBuffer != NULL);
UnicodeSPrint (
- StringBuffer,
- 24 * sizeof (CHAR16) + StrSize (FormTitle),
- L"Submit Fail For Form: %s.",
+ StringBuffer,
+ 24 * sizeof (CHAR16) + StrSize (FormTitle),
+ L"Submit Fail For Form: %s.",
FormTitle
);
@@ -3148,9 +3148,9 @@ ConfirmNoSubmitFail ( ASSERT (StringBuffer != NULL);
UnicodeSPrint (
- StringBuffer,
- 24 * sizeof (CHAR16) + StrSize (FormTitle),
- L"NO_SUBMIT_IF error For Form: %s.",
+ StringBuffer,
+ 24 * sizeof (CHAR16) + StrSize (FormTitle),
+ L"NO_SUBMIT_IF error For Form: %s.",
FormTitle
);
@@ -3251,7 +3251,7 @@ DiscardForm ( while (!IsNull (&FormSet->FormListHead, Link)) {
Form = FORM_BROWSER_FORM_FROM_LINK (Link);
Link = GetNextNode (&FormSet->FormListHead, Link);
-
+
//
// Call callback with Changed type to inform the driver.
//
@@ -3292,7 +3292,7 @@ DiscardForm ( mSystemLevelFormSet = OldFormSet;
}
- return EFI_SUCCESS;
+ return EFI_SUCCESS;
}
/**
@@ -3441,9 +3441,9 @@ SubmitForForm ( @param FormSet FormSet data structure.
@param SkipProcessFail Whether skip to process the save failed storage.
- If submit formset is called when do system level save,
- set this value to true and process the failed formset
- together.
+ If submit formset is called when do system level save,
+ set this value to true and process the failed formset
+ together.
if submit formset is called when do formset level save,
set the value to false and process the failed storage
right after process all storages for this formset.
@@ -3478,7 +3478,7 @@ SubmitForFormSet ( return EFI_SUCCESS;
}
- Form = NULL;
+ Form = NULL;
Status = NoSubmitCheck (FormSet, &Form, &Question);
if (EFI_ERROR (Status)) {
if (SkipProcessFail) {
@@ -3639,7 +3639,7 @@ SubmitForFormSet ( //
// 5. Update the NV flag.
- //
+ //
ValueChangeResetFlagUpdate(TRUE, FormSet, NULL);
//
@@ -3690,7 +3690,7 @@ SubmitForSystem ( //
// Remove maintain backup list after save except for the current using FormSet.
- //
+ //
if (!IsHiiHandleInBrowserContext (LocalFormSet->HiiHandle)) {
CleanBrowserStorage(LocalFormSet);
RemoveEntryList (&LocalFormSet->Link);
@@ -3937,7 +3937,7 @@ GetOffsetFromConfigResp ( RequestElement += StrLen (Question->BlockName) + StrLen (L"&VALUE=");
return RequestElement;
}
-
+
//
// 2. Change all hex digits in Question->BlockName to lower and compare again.
//
@@ -3973,7 +3973,7 @@ GetDefaultValueFromAltCfg ( IN FORM_BROWSER_FORM *Form,
IN OUT FORM_BROWSER_STATEMENT *Question
)
-{
+{
BROWSER_STORAGE *Storage;
FORMSET_STORAGE *FormSetStorage;
CHAR16 *ConfigResp;
@@ -4039,7 +4039,7 @@ INTN GetDefaultIdForCallBack (
UINTN DefaultId
)
-{
+{
if (DefaultId == EFI_HII_DEFAULT_CLASS_STANDARD) {
return EFI_BROWSER_ACTION_DEFAULT_STANDARD;
} else if (DefaultId == EFI_HII_DEFAULT_CLASS_MANUFACTURING) {
@@ -4240,7 +4240,7 @@ GetQuestionDefault ( // There are Five ways to specify default value for a Question:
// 1, use call back function (highest priority)
// 2, use ExtractConfig function
- // 3, use nested EFI_IFR_DEFAULT
+ // 3, use nested EFI_IFR_DEFAULT
// 4, set flags of EFI_ONE_OF_OPTION (provide Standard and Manufacturing default)
// 5, set flags of EFI_IFR_CHECKBOX (provide Standard and Manufacturing default) (lowest priority)
//
@@ -4291,7 +4291,7 @@ ReGetDefault: //
// Get default value from altcfg string.
//
- if (ConfigAccess != NULL) {
+ if (ConfigAccess != NULL) {
Status = GetDefaultValueFromAltCfg(FormSet, Form, Question);
if (!EFI_ERROR (Status)) {
return Status;
@@ -4328,7 +4328,7 @@ ReGetDefault: FreePool (Default->ValueExpression->Result.Buffer);
}
HiiValue->Type = Default->ValueExpression->Result.Type;
- CopyMem (&HiiValue->Value, &Default->ValueExpression->Result.Value, sizeof (EFI_IFR_TYPE_VALUE));
+ CopyMem (&HiiValue->Value, &Default->ValueExpression->Result.Value, sizeof (EFI_IFR_TYPE_VALUE));
} else {
//
// Default value is embedded in EFI_IFR_DEFAULT
@@ -4467,7 +4467,7 @@ ReGetDefault: }
break;
default:
- break;
+ break;
}
} else {
if ((HiiValue->Value.u64 < Question->Minimum) || (HiiValue->Value.u64 > Question->Maximum)) {
@@ -4776,7 +4776,7 @@ CleanAltCfgForFormSet ( /**
Reset Questions to their initial value or default value in a Form, Formset or System.
- GetDefaultValueScope parameter decides which questions will reset
+ GetDefaultValueScope parameter decides which questions will reset
to its default value.
@param FormSet FormSet data structure.
@@ -5067,7 +5067,7 @@ IsQuestionValueChanged ( /**
Initialize Question's Edit copy from Storage.
- @param Selection Selection contains the information about
+ @param Selection Selection contains the information about
the Selection, form and formset to be displayed.
Selection action may be updated in retrieve callback.
If Selection is NULL, only initialize Question value.
@@ -5087,7 +5087,7 @@ LoadFormConfig ( EFI_STATUS Status;
LIST_ENTRY *Link;
FORM_BROWSER_STATEMENT *Question;
-
+
Link = GetFirstNode (&Form->StatementListHead);
while (!IsNull (&Form->StatementListHead, Link)) {
Question = FORM_BROWSER_STATEMENT_FROM_LINK (Link);
@@ -5117,7 +5117,7 @@ LoadFormConfig ( /**
Initialize Question's Edit copy from Storage for the whole Formset.
- @param Selection Selection contains the information about
+ @param Selection Selection contains the information about
the Selection, form and formset to be displayed.
Selection action may be updated in retrieve callback.
If Selection is NULL, only initialize Question value.
@@ -5153,7 +5153,7 @@ LoadFormSetConfig ( //
// Finished question initialization.
- //
+ //
FormSet->QuestionInited = TRUE;
return EFI_SUCCESS;
@@ -5189,8 +5189,8 @@ RemoveElement ( DestStr = NewStr;
NewStr += StrLen (RequestElement);
CopyMem (DestStr, NewStr, StrSize (NewStr));
-
- Storage->SpareStrLen += StrLen (RequestElement);
+
+ Storage->SpareStrLen += StrLen (RequestElement);
}
/**
@@ -5235,7 +5235,7 @@ RemoveConfigRequest ( if (Storage->BrowserStorage->Type == EFI_HII_VARSTORE_NAME_VALUE) {
RequestElement = StrStr (ConfigRequest, L"PATH");
ASSERT (RequestElement != NULL);
- RequestElement = StrStr (RequestElement, SearchKey);
+ RequestElement = StrStr (RequestElement, SearchKey);
} else {
RequestElement = StrStr (ConfigRequest, SearchKey);
}
@@ -5305,7 +5305,7 @@ CleanBrowserStorage ( RemoveConfigRequest (Storage, Storage->ConfigRequest);
} else if (Storage->BrowserStorage->Type == EFI_HII_VARSTORE_BUFFER ||
Storage->BrowserStorage->Type == EFI_HII_VARSTORE_NAME_VALUE) {
- if (Storage->BrowserStorage->ConfigRequest != NULL) {
+ if (Storage->BrowserStorage->ConfigRequest != NULL) {
FreePool (Storage->BrowserStorage->ConfigRequest);
Storage->BrowserStorage->ConfigRequest = NULL;
}
@@ -5324,7 +5324,7 @@ CleanBrowserStorage ( @retval FALSE The Element not in the configReqeust String.
**/
-BOOLEAN
+BOOLEAN
ElementValidation (
BROWSER_STORAGE *BrowserStorage,
CHAR16 *RequestElement
@@ -5391,7 +5391,7 @@ AppendConfigRequest ( @retval FALSE All elements covered by current used elements.
**/
-BOOLEAN
+BOOLEAN
ConfigRequestAdjust (
IN BROWSER_STORAGE *Storage,
IN CHAR16 *Request,
@@ -5440,7 +5440,7 @@ ConfigRequestAdjust ( if (Storage->Type == EFI_HII_VARSTORE_NAME_VALUE) {
RequestElement = StrStr (ConfigRequest, L"PATH");
ASSERT (RequestElement != NULL);
- RequestElement = StrStr (RequestElement, SearchKey);
+ RequestElement = StrStr (RequestElement, SearchKey);
} else {
RequestElement = StrStr (ConfigRequest, SearchKey);
}
@@ -5476,7 +5476,7 @@ ConfigRequestAdjust ( *NextRequestElement = L'\0';
}
}
-
+
if (!ElementValidation (Storage, RequestElement)) {
//
// Add this element to the Storage->BrowserStorage->AllRequestElement.
@@ -5545,7 +5545,7 @@ LoadStorage ( }
//
- // Just update the ConfigRequest, if storage already initialized.
+ // Just update the ConfigRequest, if storage already initialized.
//
if (Storage->BrowserStorage->Initialized) {
ConfigRequestAdjust(Storage->BrowserStorage, Storage->ConfigRequest, FALSE);
@@ -5569,9 +5569,9 @@ LoadStorage ( ConfigRequest = AllocateZeroPool (StrLen);
ASSERT (ConfigRequest != NULL);
UnicodeSPrint (
- ConfigRequest,
- StrLen,
- L"%s&OFFSET=0&WIDTH=%04x",
+ ConfigRequest,
+ StrLen,
+ L"%s&OFFSET=0&WIDTH=%04x",
Storage->ConfigHdr,
Storage->BrowserStorage->Size);
} else {
@@ -5601,7 +5601,7 @@ LoadStorage ( if (StrPtr != NULL) {
*StrPtr = L'\0';
}
-
+
Status = ConfigRespToStorage (Storage->BrowserStorage, Result);
FreePool (Result);
}
@@ -5609,7 +5609,7 @@ LoadStorage ( Storage->BrowserStorage->ConfigRequest = AllocateCopyPool (StrSize (Storage->ConfigRequest), Storage->ConfigRequest);
//
- // Input NULL for ConfigRequest field means sync all fields from editbuffer to buffer.
+ // Input NULL for ConfigRequest field means sync all fields from editbuffer to buffer.
//
SynchronizeStorage(Storage->BrowserStorage, NULL, TRUE);
@@ -5737,7 +5737,7 @@ InitializeCurrentSetting ( //
// Extract default from IFR binary for no storage questions.
- //
+ //
ExtractDefault (FormSet, NULL, EFI_HII_DEFAULT_CLASS_STANDARD, FormSetLevel, GetDefaultForNoStorage, NULL, TRUE, FALSE);
//
@@ -5989,7 +5989,7 @@ InitializeFormSet ( /**
- Save globals used by previous call to SendForm(). SendForm() may be called from
+ Save globals used by previous call to SendForm(). SendForm() may be called from
HiiConfigAccess.Callback(), this will cause SendForm() be reentried.
So, save globals of previous call to SendForm() and restore them upon exit.
@@ -6134,13 +6134,13 @@ RestoreBrowserContext ( /**
Find the matched FormSet context in the backup maintain list based on HiiHandle.
-
+
@param Handle The Hii Handle.
-
+
@return the found FormSet context. If no found, NULL will return.
**/
-FORM_BROWSER_FORMSET *
+FORM_BROWSER_FORMSET *
GetFormSetFromHiiHandle (
EFI_HII_HANDLE Handle
)
@@ -6159,15 +6159,15 @@ GetFormSetFromHiiHandle ( return FormSet;
}
}
-
+
return NULL;
}
/**
Check whether the input HII handle is the FormSet that is being used.
-
+
@param Handle The Hii Handle.
-
+
@retval TRUE HII handle is being used.
@retval FALSE HII handle is not being used.
@@ -6201,20 +6201,20 @@ IsHiiHandleInBrowserContext ( }
Link = GetNextNode (&gBrowserContextList, Link);
}
-
+
return FALSE;
}
/**
- Perform Password check.
+ Perform Password check.
Passwork may be encrypted by driver that requires the specific check.
-
+
@param Form Form where Password Statement is in.
@param Statement Password statement
@param PasswordString Password string to be checked. It may be NULL.
NULL means to restore password.
"" string can be used to checked whether old password does exist.
-
+
@return Status Status of Password check.
**/
EFI_STATUS
@@ -6245,7 +6245,7 @@ PasswordCheck ( //
return EFI_UNSUPPORTED;
}
-
+
//
// Prepare password string in HII database
//
@@ -6279,7 +6279,7 @@ PasswordCheck ( /**
Find the registered HotKey based on KeyData.
-
+
@param[in] KeyData A pointer to a buffer that describes the keystroke
information for the hot key.
@@ -6301,7 +6301,7 @@ GetHotKeyFromRegisterList ( }
Link = GetNextNode (&gBrowserHotKeyList, Link);
}
-
+
return NULL;
}
@@ -6310,11 +6310,11 @@ GetHotKeyFromRegisterList ( All hot keys have the same scope. The mixed hot keys with the different level are not supported.
If no scope is set, the default scope will be FormSet level.
After all registered hot keys are removed, previous Scope can reset to another level.
-
- @param[in] Scope Scope level to be set.
-
+
+ @param[in] Scope Scope level to be set.
+
@retval EFI_SUCCESS Scope is set correctly.
- @retval EFI_INVALID_PARAMETER Scope is not the valid value specified in BROWSER_SETTING_SCOPE.
+ @retval EFI_INVALID_PARAMETER Scope is not the valid value specified in BROWSER_SETTING_SCOPE.
@retval EFI_UNSPPORTED Scope level is different from current one that the registered hot keys have.
**/
@@ -6347,15 +6347,15 @@ SetScope ( Only support hot key that is not printable character (control key, function key, etc.).
If the action value is zero, the hot key will be unregistered if it has been registered.
If the same hot key has been registered, the new action and help string will override the previous ones.
-
+
@param[in] KeyData A pointer to a buffer that describes the keystroke
- information for the hot key. Its type is EFI_INPUT_KEY to
+ information for the hot key. Its type is EFI_INPUT_KEY to
be supported by all ConsoleIn devices.
- @param[in] Action Action value that describes what action will be trigged when the hot key is pressed.
+ @param[in] Action Action value that describes what action will be trigged when the hot key is pressed.
@param[in] DefaultId Specifies the type of defaults to retrieve, which is only for DEFAULT action.
@param[in] HelpString Help string that describes the hot key information.
Its value may be NULL for the unregistered hot key.
-
+
@retval EFI_SUCCESS Hot key is registered or unregistered.
@retval EFI_INVALID_PARAMETER KeyData is NULL or HelpString is NULL on register.
@retval EFI_NOT_FOUND KeyData is not found to be unregistered.
@@ -6376,7 +6376,7 @@ RegisterHotKey ( //
// Check input parameters.
//
- if (KeyData == NULL || KeyData->UnicodeChar != CHAR_NULL ||
+ if (KeyData == NULL || KeyData->UnicodeChar != CHAR_NULL ||
(Action != BROWSER_ACTION_UNREGISTER && HelpString == NULL)) {
return EFI_INVALID_PARAMETER;
}
@@ -6385,14 +6385,14 @@ RegisterHotKey ( // Check whether the input KeyData is in BrowserHotKeyList.
//
HotKey = GetHotKeyFromRegisterList (KeyData);
-
+
//
// Unregister HotKey
//
if (Action == BROWSER_ACTION_UNREGISTER) {
if (HotKey != NULL) {
//
- // The registered HotKey is found.
+ // The registered HotKey is found.
// Remove it from List, and free its resource.
//
RemoveEntryList (&HotKey->Link);
@@ -6401,7 +6401,7 @@ RegisterHotKey ( return EFI_SUCCESS;
} else {
//
- // The registered HotKey is not found.
+ // The registered HotKey is not found.
//
return EFI_NOT_FOUND;
}
@@ -6434,11 +6434,11 @@ RegisterHotKey ( }
/**
- Register Exit handler function.
- When more than one handler function is registered, the latter one will override the previous one.
- When NULL handler is specified, the previous Exit handler will be unregistered.
-
- @param[in] Handler Pointer to handler function.
+ Register Exit handler function.
+ When more than one handler function is registered, the latter one will override the previous one.
+ When NULL handler is specified, the previous Exit handler will be unregistered.
+
+ @param[in] Handler Pointer to handler function.
**/
VOID
@@ -6510,7 +6510,7 @@ IsBrowserDataModified ( @retval EFI_INVALID_PARAMETER The input action value is invalid.
**/
-EFI_STATUS
+EFI_STATUS
EFIAPI
ExecuteAction (
IN UINT32 Action,
@@ -6530,7 +6530,7 @@ ExecuteAction ( Form = NULL;
if (gBrowserSettingScope < SystemLevel) {
FormSet = gCurrentSelection->FormSet;
- Form = gCurrentSelection->Form;
+ Form = gCurrentSelection->Form;
}
//
@@ -6625,16 +6625,16 @@ SaveReminder ( break;
}
}
-
+
//
- // No data is changed. No save is required.
+ // No data is changed. No save is required.
//
if (!IsDataChanged) {
return DataSavedAction;
}
-
+
//
- // If data is changed, prompt user to save or discard it.
+ // If data is changed, prompt user to save or discard it.
//
do {
ConfirmRet = (UINT32) mFormDisplay->ConfirmDataChange();
diff --git a/MdeModulePkg/Universal/SetupBrowserDxe/Setup.h b/MdeModulePkg/Universal/SetupBrowserDxe/Setup.h index 09e0be7..4dd7176 100644 --- a/MdeModulePkg/Universal/SetupBrowserDxe/Setup.h +++ b/MdeModulePkg/Universal/SetupBrowserDxe/Setup.h @@ -1,7 +1,7 @@ /** @file
Private MACRO, structure and function definitions for Setup Browser module.
-Copyright (c) 2007 - 2017, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2007 - 2018, Intel Corporation. All rights reserved.<BR>
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
@@ -271,7 +271,7 @@ typedef struct { typedef struct {
UINTN Signature;
LIST_ENTRY Link;
-
+
EFI_IFR_ONE_OF_OPTION *OpCode; // OneOfOption Data
EFI_STRING_ID Text;
@@ -286,14 +286,14 @@ typedef struct { typedef enum {
ExpressFalse = 0,
- ExpressGrayOut,
+ ExpressGrayOut,
ExpressSuppress,
ExpressDisable
} EXPRESS_RESULT;
typedef enum {
ExpressNone = 0,
- ExpressForm,
+ ExpressForm,
ExpressStatement,
ExpressOption
} EXPRESS_LEVEL;
@@ -390,7 +390,7 @@ typedef struct { CHAR16 *ConfigRequest; // <ConfigRequest> = <ConfigHdr> + <RequestElement>
CHAR16 *ConfigAltResp; // Alt config response string for this ConfigRequest.
- UINTN ElementCount; // Number of <RequestElement> in the <ConfigRequest>
+ UINTN ElementCount; // Number of <RequestElement> in the <ConfigRequest>
UINTN SpareStrLen;
CHAR16 *RestoreConfigRequest; // When submit form fail, the element need to be restored
CHAR16 *SyncConfigRequest; // When submit form fail, the element need to be synced
@@ -773,10 +773,10 @@ ValidateFormSet ( @param SettingScope Setting Scope for Default action.
**/
-VOID
+VOID
UpdateStatementStatus (
IN FORM_BROWSER_FORMSET *FormSet,
- IN FORM_BROWSER_FORM *Form,
+ IN FORM_BROWSER_FORM *Form,
IN BROWSER_SETTING_SCOPE SettingScope
);
@@ -922,13 +922,13 @@ EFI_STATUS InitializeFormSet (
IN EFI_HII_HANDLE Handle,
IN OUT EFI_GUID *FormSetGuid,
- OUT FORM_BROWSER_FORMSET *FormSet
+ OUT FORM_BROWSER_FORMSET *FormSet
);
/**
Reset Questions to their initial value or default value in a Form, Formset or System.
- GetDefaultValueScope parameter decides which questions will reset
+ GetDefaultValueScope parameter decides which questions will reset
to its default value.
@param FormSet FormSet data structure.
@@ -961,7 +961,7 @@ ExtractDefault ( /**
Initialize Question's Edit copy from Storage.
- @param Selection Selection contains the information about
+ @param Selection Selection contains the information about
the Selection, form and formset to be displayed.
Selection action may be updated in retrieve callback.
If Selection is NULL, only initialize Question value.
@@ -981,7 +981,7 @@ LoadFormConfig ( /**
Initialize Question's Edit copy from Storage for the whole Formset.
- @param Selection Selection contains the information about
+ @param Selection Selection contains the information about
the Selection, form and formset to be displayed.
Selection action may be updated in retrieve callback.
If Selection is NULL, only initialize Question value.
@@ -1071,7 +1071,7 @@ GetIfrBinaryData ( );
/**
- Save globals used by previous call to SendForm(). SendForm() may be called from
+ Save globals used by previous call to SendForm(). SendForm() may be called from
HiiConfigAccess.Callback(), this will cause SendForm() be reentried.
So, save globals of previous call to SendForm() and restore them upon exit.
@@ -1175,9 +1175,9 @@ BrowserCallback ( about the Selection, form and formset to be displayed.
On output, Selection return the screen item that is selected
by user.
- @param SettingLevel Input Settting level, if it is FormLevel, just exit current form.
+ @param SettingLevel Input Settting level, if it is FormLevel, just exit current form.
else, we need to exit current formset.
-
+
@retval TRUE Exit current form.
@retval FALSE User press ESC and keep in current form.
**/
@@ -1229,7 +1229,7 @@ IsNvUpdateRequiredForFormSet ( @retval EFI_SUCCESS The call back function executes successfully.
@return Other value if the call back function failed to execute.
**/
-EFI_STATUS
+EFI_STATUS
ProcessCallBackFunction (
IN OUT UI_MENU_SELECTION *Selection,
IN FORM_BROWSER_FORMSET *FormSet,
@@ -1238,11 +1238,11 @@ ProcessCallBackFunction ( IN EFI_BROWSER_ACTION Action,
IN BOOLEAN SkipSaveOrDiscard
);
-
+
/**
Call the retrieve type call back function for one question to get the initialize data.
-
- This function only used when in the initialize stage, because in this stage, the
+
+ This function only used when in the initialize stage, because in this stage, the
Selection->Form is not ready. For other case, use the ProcessCallBackFunction instead.
@param ConfigAccess The config access protocol produced by the hii driver.
@@ -1252,7 +1252,7 @@ ProcessCallBackFunction ( @retval EFI_SUCCESS The call back function executes successfully.
@return Other value if the call back function failed to execute.
**/
-EFI_STATUS
+EFI_STATUS
ProcessRetrieveForQuestion (
IN EFI_HII_CONFIG_ACCESS_PROTOCOL *ConfigAccess,
IN FORM_BROWSER_STATEMENT *Statement,
@@ -1261,22 +1261,22 @@ ProcessRetrieveForQuestion ( /**
Find the matched FormSet context in the backup maintain list based on HiiHandle.
-
+
@param Handle The Hii Handle.
-
+
@return the found FormSet context. If no found, NULL will return.
**/
-FORM_BROWSER_FORMSET *
+FORM_BROWSER_FORMSET *
GetFormSetFromHiiHandle (
EFI_HII_HANDLE Handle
);
/**
Check whether the input HII handle is the FormSet that is being used.
-
+
@param Handle The Hii Handle.
-
+
@retval TRUE HII handle is being used.
@retval FALSE HII handle is not being used.
@@ -1291,11 +1291,11 @@ IsHiiHandleInBrowserContext ( All hot keys have the same scope. The mixed hot keys with the different level are not supported.
If no scope is set, the default scope will be FormSet level.
After all registered hot keys are removed, previous Scope can reset to another level.
-
- @param[in] Scope Scope level to be set.
-
+
+ @param[in] Scope Scope level to be set.
+
@retval EFI_SUCCESS Scope is set correctly.
- @retval EFI_INVALID_PARAMETER Scope is not the valid value specified in BROWSER_SETTING_SCOPE.
+ @retval EFI_INVALID_PARAMETER Scope is not the valid value specified in BROWSER_SETTING_SCOPE.
@retval EFI_UNSPPORTED Scope level is different from current one that the registered hot keys have.
**/
@@ -1310,15 +1310,15 @@ SetScope ( Only support hot key that is not printable character (control key, function key, etc.).
If the action value is zero, the hot key will be unregistered if it has been registered.
If the same hot key has been registered, the new action and help string will override the previous ones.
-
+
@param[in] KeyData A pointer to a buffer that describes the keystroke
- information for the hot key. Its type is EFI_INPUT_KEY to
+ information for the hot key. Its type is EFI_INPUT_KEY to
be supported by all ConsoleIn devices.
- @param[in] Action Action value that describes what action will be trigged when the hot key is pressed.
+ @param[in] Action Action value that describes what action will be trigged when the hot key is pressed.
@param[in] DefaultId Specifies the type of defaults to retrieve, which is only for DEFAULT action.
@param[in] HelpString Help string that describes the hot key information.
Its value may be NULL for the unregistered hot key.
-
+
@retval EFI_SUCCESS Hot key is registered or unregistered.
@retval EFI_INVALID_PARAMETER KeyData is NULL.
@retval EFI_NOT_FOUND KeyData is not found to be unregistered.
@@ -1335,11 +1335,11 @@ RegisterHotKey ( );
/**
- Register Exit handler function.
- When more than one handler function is registered, the latter one will override the previous one.
- When NULL handler is specified, the previous Exit handler will be unregistered.
-
- @param[in] Handler Pointer to handler function.
+ Register Exit handler function.
+ When more than one handler function is registered, the latter one will override the previous one.
+ When NULL handler is specified, the previous Exit handler will be unregistered.
+
+ @param[in] Handler Pointer to handler function.
**/
VOID
@@ -1349,22 +1349,22 @@ RegiserExitHandler ( );
/**
-
- Check whether the browser data has been modified.
+
+ Check whether the browser data has been modified.
@retval TRUE Browser data is changed.
@retval FALSE No browser data is changed.
**/
-BOOLEAN
+BOOLEAN
EFIAPI
IsBrowserDataModified (
VOID
);
/**
-
- Execute the action requested by the Action parameter.
+
+ Execute the action requested by the Action parameter.
@param[in] Action Execute the request action.
@param[in] DefaultId The default Id info when need to load default value.
@@ -1373,7 +1373,7 @@ IsBrowserDataModified ( @retval EFI_INVALID_PARAMETER The input action value is invalid.
**/
-EFI_STATUS
+EFI_STATUS
EFIAPI
ExecuteAction (
IN UINT32 Action,
@@ -1411,7 +1411,7 @@ IsResetRequired ( /**
Find the registered HotKey based on KeyData.
-
+
@param[in] KeyData A pointer to a buffer that describes the keystroke
information for the hot key.
@@ -1435,7 +1435,7 @@ FORM_BROWSER_STATEMENT * GetBrowserStatement (
IN FORM_DISPLAY_ENGINE_STATEMENT *DisplayStatement
);
-
+
/**
Password may be stored as encrypted by Configuration Driver. When change a
password, user will be challenged with old password. To validate user input old
@@ -1495,7 +1495,7 @@ EFI_STATUS SetupBrowser (
IN OUT UI_MENU_SELECTION *Selection
);
-
+
/**
Free up the resource allocated for all strings required
by Setup Browser.
@@ -1538,7 +1538,7 @@ UiAddMenuList ( **/
FORM_ENTRY_INFO *
UiFindMenuList (
- IN EFI_HII_HANDLE HiiHandle,
+ IN EFI_HII_HANDLE HiiHandle,
IN EFI_GUID *FormSetGuid,
IN UINT16 FormId
);
@@ -1559,7 +1559,7 @@ UiFreeMenuList ( @param CurrentMenu Current Menu
@param SettingLevel Whether find parent menu in Form Level or Formset level.
- In form level, just find the parent menu;
+ In form level, just find the parent menu;
In formset level, find the parent menu which has different
formset guid value.
@@ -1570,7 +1570,7 @@ UiFindParentMenu ( IN FORM_ENTRY_INFO *CurrentMenu,
IN BROWSER_SETTING_SCOPE SettingLevel
);
-
+
/**
Validate the HiiHandle.
@@ -1587,7 +1587,7 @@ ValidateHiiHandle ( /**
Copy current Menu list to the new menu list.
-
+
@param NewMenuListHead New create Menu list.
@param CurrentMenuListHead Current Menu list.
@@ -1649,7 +1649,7 @@ SetArrayData ( /**
Compare two Hii value.
-
+
@param Value1 Expression value to compare on left-hand.
@param Value2 Expression value to compare on right-hand.
@param Result Return value after compare.
@@ -1657,10 +1657,10 @@ SetArrayData ( return Positive value if Value1 is greater than Value2.
retval Negative value if Value1 is less than Value2.
@param HiiHandle Only required for string compare.
-
+
@retval other Could not perform compare on two values.
@retval EFI_SUCCESS Compare the value success.
-
+
**/
EFI_STATUS
CompareHiiValue (
@@ -1671,15 +1671,15 @@ CompareHiiValue ( );
/**
- Perform Password check.
+ Perform Password check.
Passwork may be encrypted by driver that requires the specific check.
-
+
@param Form Form where Password Statement is in.
@param Statement Password statement
@param PasswordString Password string to be checked. It may be NULL.
NULL means to restore password.
"" string can be used to checked whether old password does exist.
-
+
@return Status Status of Password check.
**/
EFI_STATUS
@@ -1703,7 +1703,7 @@ FORM_BROWSER_STATEMENT * GetBrowserStatement (
IN FORM_DISPLAY_ENGINE_STATEMENT *DisplayStatement
);
-
+
/**
Initialize the Display form structure data.
@@ -1757,7 +1757,7 @@ DevicePathToHiiHandle ( @retval FALSE All elements covered by current used elements.
**/
-BOOLEAN
+BOOLEAN
ConfigRequestAdjust (
IN BROWSER_STORAGE *Storage,
IN CHAR16 *Request,
@@ -1765,8 +1765,8 @@ ConfigRequestAdjust ( );
/**
- Perform question check.
-
+ Perform question check.
+
If one question has more than one check, process form high priority to low.
@param FormSet FormSet data structure.
@@ -1843,7 +1843,7 @@ GetFstStgFromVarId ( @param Storage browser storage info.
@return Pointer to a FORMSET_STORAGE data structure.
-
+
**/
FORMSET_STORAGE *
@@ -1858,7 +1858,7 @@ GetFstStgFromBrsStg ( @retval TRUE do the reconnect behavior success.
@retval FALSE do the reconnect behavior failed.
-
+
**/
BOOLEAN
ReconnectController (
diff --git a/MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowser.uni b/MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowser.uni index 4d15836..c81126e 100644 --- a/MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowser.uni +++ b/MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowser.uni @@ -3,13 +3,13 @@ //
// It also produces FormBrowserEx(2) protocol to let user register the different Hot key service.
//
-// Copyright (c) 2007 - 2014, Intel Corporation. All rights reserved.<BR>
+// Copyright (c) 2007 - 2018, Intel Corporation. All rights reserved.<BR>
//
// 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,
// WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
//
diff --git a/MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf b/MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf index f7b53ea..4f847d4 100644 --- a/MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf +++ b/MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf @@ -1,9 +1,9 @@ ## @file
# The DXE driver produces FORM BROWSER2 protocol defined in UEFI specification.
#
-# It also produces FormBrowserEx(2) protocol to let user register the different Hot key service.
+# It also produces FormBrowserEx(2) protocol to let user register the different Hot key service.
#
-# Copyright (c) 2007 - 2017, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2007 - 2018, Intel Corporation. All rights reserved.<BR>
#
# This program and the accompanying materials
# are licensed and made available under the terms and conditions of the BSD License
diff --git a/MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserExtra.uni b/MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserExtra.uni index b456e2a..73c924a 100644 --- a/MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserExtra.uni +++ b/MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserExtra.uni @@ -1,7 +1,7 @@ // /** @file
// SetupBrowser Localized Strings and Content
//
-// Copyright (c) 2013 - 2014, Intel Corporation. All rights reserved.<BR>
+// Copyright (c) 2013 - 2018, Intel Corporation. All rights reserved.<BR>
//
// This program and the accompanying materials
// are licensed and made available under the terms and conditions of the BSD License
@@ -13,8 +13,8 @@ //
// **/
-#string STR_PROPERTIES_MODULE_NAME
-#language en-US
+#string STR_PROPERTIES_MODULE_NAME
+#language en-US
"Setup Browser DXE Driver"
diff --git a/MdeModulePkg/Universal/SmbiosDxe/SmbiosDxe.c b/MdeModulePkg/Universal/SmbiosDxe/SmbiosDxe.c index 4e757e1..78955f3 100644 --- a/MdeModulePkg/Universal/SmbiosDxe/SmbiosDxe.c +++ b/MdeModulePkg/Universal/SmbiosDxe/SmbiosDxe.c @@ -1,15 +1,15 @@ /** @file
- This code produces the Smbios protocol. It also responsible for constructing
+ This code produces the Smbios protocol. It also responsible for constructing
SMBIOS table into system table.
-
-Copyright (c) 2009 - 2017, Intel Corporation. All rights reserved.<BR>
-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,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+
+Copyright (c) 2009 - 2018, Intel Corporation. All rights reserved.<BR>
+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,
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
**/
@@ -165,7 +165,7 @@ SMBIOS_TABLE_3_0_ENTRY_POINT Smbios30EntryPointStructureData = { @retval EFI_SUCCESS Size retured in Size.
@retval EFI_INVALID_PARAMETER Input SMBIOS structure mal-formed or Size is NULL.
-
+
**/
EFI_STATUS
EFIAPI
@@ -180,7 +180,7 @@ GetSmbiosStructureSize ( UINTN StrLen;
UINTN MaxLen;
INT8* CharInStr;
-
+
if (Size == NULL || NumberOfStrings == NULL) {
return EFI_INVALID_PARAMETER;
}
@@ -193,7 +193,7 @@ GetSmbiosStructureSize ( //
// look for the two consecutive zeros, check the string limit by the way.
//
- while (*CharInStr != 0 || *(CharInStr+1) != 0) {
+ while (*CharInStr != 0 || *(CharInStr+1) != 0) {
if (*CharInStr == 0) {
*Size += 1;
CharInStr++;
@@ -251,7 +251,7 @@ GetSmbiosStructureSize ( @retval TRUE Smbios handle already in use.
@retval FALSE Smbios handle is NOT used.
-
+
**/
BOOLEAN
EFIAPI
@@ -262,7 +262,7 @@ CheckSmbiosHandleExistance ( {
LIST_ENTRY *Link;
SMBIOS_HANDLE_ENTRY *HandleEntry;
-
+
for (Link = Head->ForwardLink; Link != Head; Link = Link->ForwardLink) {
HandleEntry = SMBIOS_HANDLE_ENTRY_FROM_LINK(Link);
if (HandleEntry->SmbiosHandle == Handle) {
@@ -286,7 +286,7 @@ EFIAPI GetMaxSmbiosHandle (
IN CONST EFI_SMBIOS_PROTOCOL *This,
IN OUT EFI_SMBIOS_HANDLE *MaxHandle
- )
+ )
{
if (This->MajorVersion == 2 && This->MinorVersion == 0) {
*MaxHandle = 0xFFFE;
@@ -304,7 +304,7 @@ GetMaxSmbiosHandle ( @retval EFI_SUCCESS Smbios handle got.
@retval EFI_OUT_OF_RESOURCES Smbios handle is NOT available.
-
+
**/
EFI_STATUS
EFIAPI
@@ -343,8 +343,8 @@ GetAvailableSmbiosHandle ( will be assigned to the SMBIOS record. If the SMBIOS handle is already in use,
EFI_ALREADY_STARTED is returned and the SMBIOS record is not updated.
@param Record The data for the fixed portion of the SMBIOS record. The format of the record is
- determined by EFI_SMBIOS_TABLE_HEADER.Type. The size of the formatted area is defined
- by EFI_SMBIOS_TABLE_HEADER.Length and either followed by a double-null (0x0000) or
+ determined by EFI_SMBIOS_TABLE_HEADER.Type. The size of the formatted area is defined
+ by EFI_SMBIOS_TABLE_HEADER.Length and either followed by a double-null (0x0000) or
a set of null terminated strings and a null.
@retval EFI_SUCCESS Record was added.
@@ -375,11 +375,11 @@ SmbiosAdd ( EFI_SMBIOS_RECORD_HEADER *InternalRecord;
BOOLEAN Smbios32BitTable;
BOOLEAN Smbios64BitTable;
-
+
if (SmbiosHandle == NULL) {
return EFI_INVALID_PARAMETER;
}
-
+
Private = SMBIOS_INSTANCE_FROM_THIS (This);
//
// Check whether SmbiosHandle is already in use
@@ -417,14 +417,14 @@ SmbiosAdd ( Smbios32BitTable = FALSE;
Smbios64BitTable = FALSE;
- if ((This->MajorVersion < 0x3) ||
+ if ((This->MajorVersion < 0x3) ||
((This->MajorVersion >= 0x3) && ((PcdGet32 (PcdSmbiosEntryPointProvideMethod) & BIT0) == BIT0))) {
//
// For SMBIOS 32-bit table, the length of the entire structure table (including all strings) must be reported
// in the Structure Table Length field of the SMBIOS Structure Table Entry Point,
// which is a WORD field limited to 65,535 bytes. So the max size of 32-bit table should not exceed 65,535 bytes.
//
- if ((EntryPointStructure != NULL) &&
+ if ((EntryPointStructure != NULL) &&
(EntryPointStructure->TableLength + StructureSize > SMBIOS_TABLE_MAX_LENGTH)) {
DEBUG ((EFI_D_INFO, "SmbiosAdd: Total length exceeds max 32-bit table length with type = %d size = 0x%x\n", Record->Type, StructureSize));
} else {
@@ -432,7 +432,7 @@ SmbiosAdd ( DEBUG ((EFI_D_INFO, "SmbiosAdd: Smbios type %d with size 0x%x is added to 32-bit table\n", Record->Type, StructureSize));
}
}
-
+
//
// For SMBIOS 3.0, Structure table maximum size in Entry Point structure is DWORD field limited to 0xFFFFFFFF bytes.
//
@@ -441,7 +441,7 @@ SmbiosAdd ( // For SMBIOS 64-bit table, Structure table maximum size in SMBIOS 3.0 (64-bit) Entry Point
// is a DWORD field limited to 0xFFFFFFFF bytes. So the max size of 64-bit table should not exceed 0xFFFFFFFF bytes.
//
- if ((Smbios30EntryPointStructure != NULL) &&
+ if ((Smbios30EntryPointStructure != NULL) &&
(Smbios30EntryPointStructure->TableMaximumSize + StructureSize > SMBIOS_3_0_TABLE_MAX_LENGTH)) {
DEBUG ((EFI_D_INFO, "SmbiosAdd: Total length exceeds max 64-bit table length with type = %d size = 0x%x\n", Record->Type, StructureSize));
} else {
@@ -459,12 +459,12 @@ SmbiosAdd ( //
// Enter into critical section
- //
+ //
Status = EfiAcquireLockOrFail (&Private->DataLock);
if (EFI_ERROR (Status)) {
return Status;
}
-
+
RecordSize = sizeof (EFI_SMBIOS_RECORD_HEADER) + StructureSize;
TotalSize = sizeof (EFI_SMBIOS_ENTRY) + RecordSize;
@@ -520,7 +520,7 @@ SmbiosAdd ( // configuration table without depending on PI SMBIOS protocol.
//
SmbiosTableConstruction (Smbios32BitTable, Smbios64BitTable);
-
+
//
// Leave critical section
//
@@ -567,7 +567,7 @@ SmbiosUpdateString ( EFI_SMBIOS_HANDLE MaxSmbiosHandle;
EFI_SMBIOS_TABLE_HEADER *Record;
EFI_SMBIOS_RECORD_HEADER *InternalRecord;
-
+
//
// Check args validity
//
@@ -594,7 +594,7 @@ SmbiosUpdateString ( } else if (This->MajorVersion < 3) {
//
// Reference SMBIOS 2.7, chapter 6.1.3, it will have no limit on the length of each individual text string.
- // However, the length of the entire structure table (including all strings) must be reported
+ // However, the length of the entire structure table (including all strings) must be reported
// in the Structure Table Length field of the SMBIOS Structure Table Entry Point,
// which is a WORD field limited to 65,535 bytes.
//
@@ -606,7 +606,7 @@ SmbiosUpdateString ( //
// SMBIOS 3.0 defines the Structure table maximum size as DWORD field limited to 0xFFFFFFFF bytes.
// The input string length should not exceed 0xFFFFFFFF bytes.
- //
+ //
return EFI_UNSUPPORTED;
}
}
@@ -614,7 +614,7 @@ SmbiosUpdateString ( Private = SMBIOS_INSTANCE_FROM_THIS (This);
//
// Enter into critical section
- //
+ //
Status = EfiAcquireLockOrFail (&Private->DataLock);
if (EFI_ERROR (Status)) {
return Status;
@@ -637,7 +637,7 @@ SmbiosUpdateString ( // Point to unformed string section
//
StrStart = (CHAR8 *) Record + Record->Length;
-
+
for (StrIndex = 1, TargetStrOffset = 0; StrIndex < *StringNumber; StrStart++, TargetStrOffset++) {
//
// A string ends in 00h
@@ -645,21 +645,21 @@ SmbiosUpdateString ( if (*StrStart == 0) {
StrIndex++;
}
-
+
//
// String section ends in double-null (0000h)
//
if (*StrStart == 0 && *(StrStart + 1) == 0) {
EfiReleaseLock (&Private->DataLock);
return EFI_NOT_FOUND;
- }
+ }
}
if (*StrStart == 0) {
StrStart++;
TargetStrOffset++;
}
-
+
//
// Now we get the string target
//
@@ -676,15 +676,15 @@ SmbiosUpdateString ( EfiReleaseLock (&Private->DataLock);
return EFI_SUCCESS;
}
-
+
SmbiosEntry->Smbios32BitTable = FALSE;
SmbiosEntry->Smbios64BitTable = FALSE;
- if ((This->MajorVersion < 0x3) ||
+ if ((This->MajorVersion < 0x3) ||
((This->MajorVersion >= 0x3) && ((PcdGet32 (PcdSmbiosEntryPointProvideMethod) & BIT0) == BIT0))) {
//
// 32-bit table is produced, check the valid length.
//
- if ((EntryPointStructure != NULL) &&
+ if ((EntryPointStructure != NULL) &&
(EntryPointStructure->TableLength + InputStrLen - TargetStrLen > SMBIOS_TABLE_MAX_LENGTH)) {
//
// The length of the entire structure table (including all strings) must be reported
@@ -696,13 +696,13 @@ SmbiosUpdateString ( DEBUG ((EFI_D_INFO, "SmbiosUpdateString: New smbios record add to 32-bit table\n"));
SmbiosEntry->Smbios32BitTable = TRUE;
}
- }
+ }
if ((This->MajorVersion >= 0x3) && ((PcdGet32 (PcdSmbiosEntryPointProvideMethod) & BIT1) == BIT1)) {
//
// 64-bit table is produced, check the valid length.
//
- if ((Smbios30EntryPointStructure != NULL) &&
+ if ((Smbios30EntryPointStructure != NULL) &&
(Smbios30EntryPointStructure->TableMaximumSize + InputStrLen - TargetStrLen > SMBIOS_3_0_TABLE_MAX_LENGTH)) {
DEBUG ((EFI_D_INFO, "SmbiosUpdateString: Total length exceeds max 64-bit table length\n"));
} else {
@@ -818,7 +818,7 @@ SmbiosRemove ( Private = SMBIOS_INSTANCE_FROM_THIS (This);
//
// Enter into critical section
- //
+ //
Status = EfiAcquireLockOrFail (&Private->DataLock);
if (EFI_ERROR (Status)) {
return Status;
@@ -833,7 +833,7 @@ SmbiosRemove ( // Remove specified smobios record from DataList
//
RemoveEntryList(Link);
- //
+ //
// Remove this handle from AllocatedHandleList
//
Head = &Private->AllocatedHandleListHead;
@@ -872,7 +872,7 @@ SmbiosRemove ( //
EfiReleaseLock (&Private->DataLock);
return EFI_INVALID_PARAMETER;
-
+
}
/**
@@ -882,13 +882,13 @@ SmbiosRemove ( @param SmbiosHandle On entry, points to the previous handle of the SMBIOS record. On exit, points to the
next SMBIOS record handle. If it is FFFEh on entry, then the first SMBIOS record
handle will be returned. If it returns FFFEh on exit, then there are no more SMBIOS records.
- @param Type On entry it means return the next SMBIOS record of type Type. If a NULL is passed in
+ @param Type On entry it means return the next SMBIOS record of type Type. If a NULL is passed in
this functionally it ignored. Type is not modified by the GetNext() function.
@param Record On exit, points to the SMBIOS Record consisting of the formatted area followed by
the unformatted area. The unformatted area optionally contains text strings.
- @param ProducerHandle On exit, points to the ProducerHandle registered by Add(). If no ProducerHandle was passed into Add() NULL is returned.
- If a NULL pointer is passed in no data will be returned
-
+ @param ProducerHandle On exit, points to the ProducerHandle registered by Add(). If no ProducerHandle was passed into Add() NULL is returned.
+ If a NULL pointer is passed in no data will be returned
+
@retval EFI_SUCCESS SMBIOS record information was successfully returned in Record.
@retval EFI_NOT_FOUND The SMBIOS record with SmbiosHandle was the last available record.
@@ -919,14 +919,14 @@ SmbiosGetNext ( Head = &Private->DataListHead;
for (Link = Head->ForwardLink; Link != Head; Link = Link->ForwardLink) {
SmbiosEntry = SMBIOS_ENTRY_FROM_LINK(Link);
- SmbiosTableHeader = (EFI_SMBIOS_TABLE_HEADER*)(SmbiosEntry->RecordHeader + 1);
+ SmbiosTableHeader = (EFI_SMBIOS_TABLE_HEADER*)(SmbiosEntry->RecordHeader + 1);
//
// If SmbiosHandle is 0xFFFE, the first matched SMBIOS record handle will be returned
//
if (*SmbiosHandle == SMBIOS_HANDLE_PI_RESERVED) {
if ((Type != NULL) && (*Type != SmbiosTableHeader->Type)) {
- continue;
+ continue;
}
*SmbiosHandle = SmbiosTableHeader->Handle;
@@ -947,33 +947,33 @@ SmbiosGetNext ( if (StartPointFound) {
if ((Type != NULL) && (*Type != SmbiosTableHeader->Type)) {
- continue;
+ continue;
}
-
+
*SmbiosHandle = SmbiosTableHeader->Handle;
- *Record = SmbiosTableHeader;
+ *Record = SmbiosTableHeader;
if (ProducerHandle != NULL) {
*ProducerHandle = SmbiosEntry->RecordHeader->ProducerHandle;
}
- return EFI_SUCCESS;
+ return EFI_SUCCESS;
}
}
*SmbiosHandle = SMBIOS_HANDLE_PI_RESERVED;
return EFI_NOT_FOUND;
-
+
}
/**
Allow the caller to discover all of the SMBIOS records.
@param This The EFI_SMBIOS_PROTOCOL instance.
- @param CurrentSmbiosEntry On exit, points to the SMBIOS entry on the list which includes the returned SMBIOS record information.
- If *CurrentSmbiosEntry is NULL on entry, then the first SMBIOS entry on the list will be returned.
+ @param CurrentSmbiosEntry On exit, points to the SMBIOS entry on the list which includes the returned SMBIOS record information.
+ If *CurrentSmbiosEntry is NULL on entry, then the first SMBIOS entry on the list will be returned.
@param Record On exit, points to the SMBIOS Record consisting of the formatted area followed by
the unformatted area. The unformatted area optionally contains text strings.
-
+
@retval EFI_SUCCESS SMBIOS record information was successfully returned in Record.
*CurrentSmbiosEntry points to the SMBIOS entry which includes the returned SMBIOS record information.
@retval EFI_NOT_FOUND There is no more SMBIOS entry.
@@ -1005,32 +1005,32 @@ GetNextSmbiosRecord ( //
Head = &(*CurrentSmbiosEntry)->Link;
}
-
+
Link = Head->ForwardLink;
-
+
if (Link == &Private->DataListHead) {
//
// If no more SMBIOS entry in the list, return not found.
//
return EFI_NOT_FOUND;
}
-
+
SmbiosEntry = SMBIOS_ENTRY_FROM_LINK(Link);
SmbiosTableHeader = (EFI_SMBIOS_TABLE_HEADER*)(SmbiosEntry->RecordHeader + 1);
- *Record = SmbiosTableHeader;
+ *Record = SmbiosTableHeader;
*CurrentSmbiosEntry = SmbiosEntry;
- return EFI_SUCCESS;
+ return EFI_SUCCESS;
}
/**
Assembles SMBIOS table from the SMBIOS protocol. Produce Table
Entry Point and return the pointer to it.
-
+
@param TableEntryPointStructure On exit, points to the SMBIOS entrypoint structure.
-
+
@retval EFI_SUCCESS Structure created sucessfully.
@retval EFI_OUT_OF_RESOURCES No enough memory.
-
+
**/
EFI_STATUS
EFIAPI
@@ -1048,7 +1048,7 @@ SmbiosCreateTable ( EFI_SMBIOS_TABLE_HEADER *SmbiosRecord;
EFI_SMBIOS_TABLE_END_STRUCTURE EndStructure;
EFI_SMBIOS_ENTRY *CurrentSmbiosEntry;
-
+
Status = EFI_SUCCESS;
BufferPointer = NULL;
@@ -1081,9 +1081,9 @@ SmbiosCreateTable ( return EFI_OUT_OF_RESOURCES;
}
}
-
+
EntryPointStructure = (SMBIOS_TABLE_ENTRY_POINT *) (UINTN) PhysicalAddress;
-
+
CopyMem (
EntryPointStructure,
&EntryPointStructureData,
@@ -1109,7 +1109,7 @@ SmbiosCreateTable ( CurrentSmbiosEntry = NULL;
do {
Status = GetNextSmbiosRecord (SmbiosProtocol, &CurrentSmbiosEntry, &SmbiosRecord);
-
+
if ((Status == EFI_SUCCESS) && (CurrentSmbiosEntry->Smbios32BitTable)) {
GetSmbiosStructureSize(SmbiosProtocol, SmbiosRecord, &RecordSize, &NumOfStr);
//
@@ -1122,7 +1122,7 @@ SmbiosCreateTable ( }
}
} while (!EFI_ERROR(Status));
-
+
//
// Create End-Of-Table structure
//
@@ -1140,15 +1140,15 @@ SmbiosCreateTable ( if (EFI_SIZE_TO_PAGES ((UINT32) EntryPointStructure->TableLength) > mPreAllocatedPages) {
//
- // If new SMBIOS table size exceeds the previous allocated page,
+ // If new SMBIOS table size exceeds the previous allocated page,
// it is time to re-allocate memory (below 4GB).
- //
+ //
DEBUG ((EFI_D_INFO, "%a() re-allocate SMBIOS 32-bit table\n",
__FUNCTION__));
if (EntryPointStructure->TableAddress != 0) {
//
// Free the previous allocated page
- //
+ //
FreePages (
(VOID*)(UINTN)EntryPointStructure->TableAddress,
mPreAllocatedPages
@@ -1156,7 +1156,7 @@ SmbiosCreateTable ( EntryPointStructure->TableAddress = 0;
mPreAllocatedPages = 0;
}
-
+
PhysicalAddress = 0xffffffff;
Status = gBS->AllocatePages (
AllocateMaxAddress,
@@ -1173,7 +1173,7 @@ SmbiosCreateTable ( mPreAllocatedPages = EFI_SIZE_TO_PAGES (EntryPointStructure->TableLength);
}
}
-
+
//
// Assemble the tables
//
@@ -1189,7 +1189,7 @@ SmbiosCreateTable ( BufferPointer = BufferPointer + RecordSize;
}
} while (!EFI_ERROR(Status));
-
+
//
// Assemble End-Of-Table structure
//
@@ -1240,7 +1240,7 @@ SmbiosCreate64BitTable ( EFI_SMBIOS_TABLE_HEADER *SmbiosRecord;
EFI_SMBIOS_TABLE_END_STRUCTURE EndStructure;
EFI_SMBIOS_ENTRY *CurrentSmbiosEntry;
-
+
Status = EFI_SUCCESS;
BufferPointer = NULL;
@@ -1264,9 +1264,9 @@ SmbiosCreate64BitTable ( DEBUG ((EFI_D_ERROR, "SmbiosCreate64BitTable() could not allocate Smbios30EntryPointStructure\n"));
return EFI_OUT_OF_RESOURCES;
}
-
+
Smbios30EntryPointStructure = (SMBIOS_TABLE_3_0_ENTRY_POINT *) (UINTN) PhysicalAddress;
-
+
CopyMem (
Smbios30EntryPointStructure,
&Smbios30EntryPointStructureData,
@@ -1286,7 +1286,7 @@ SmbiosCreate64BitTable ( CurrentSmbiosEntry = NULL;
do {
Status = GetNextSmbiosRecord (SmbiosProtocol, &CurrentSmbiosEntry, &SmbiosRecord);
-
+
if ((Status == EFI_SUCCESS) && (CurrentSmbiosEntry->Smbios64BitTable)) {
GetSmbiosStructureSize(SmbiosProtocol, SmbiosRecord, &RecordSize, &NumOfStr);
//
@@ -1309,7 +1309,7 @@ SmbiosCreate64BitTable ( if (EFI_SIZE_TO_PAGES (Smbios30EntryPointStructure->TableMaximumSize) > mPre64BitAllocatedPages) {
//
- // If new SMBIOS table size exceeds the previous allocated page,
+ // If new SMBIOS table size exceeds the previous allocated page,
// it is time to re-allocate memory at anywhere.
//
DEBUG ((EFI_D_INFO, "%a() re-allocate SMBIOS 64-bit table\n",
@@ -1317,7 +1317,7 @@ SmbiosCreate64BitTable ( if (Smbios30EntryPointStructure->TableAddress != 0) {
//
// Free the previous allocated page
- //
+ //
FreePages (
(VOID*)(UINTN)Smbios30EntryPointStructure->TableAddress,
mPre64BitAllocatedPages
@@ -1383,7 +1383,7 @@ SmbiosCreate64BitTable ( /**
Create Smbios Table and installs the Smbios Table to the System Table.
-
+
@param Smbios32BitTable The flag to update 32-bit table.
@param Smbios64BitTable The flag to update 64-bit table.
@@ -1416,7 +1416,7 @@ SmbiosTableConstruction ( /**
- Driver to produce Smbios protocol and pre-allocate 1 page for the final SMBIOS table.
+ Driver to produce Smbios protocol and pre-allocate 1 page for the final SMBIOS table.
@param ImageHandle Module's image handle
@param SystemTable Pointer of EFI_SYSTEM_TABLE
@@ -1445,7 +1445,7 @@ SmbiosDriverEntryPoint ( InitializeListHead (&mPrivateData.DataListHead);
InitializeListHead (&mPrivateData.AllocatedHandleListHead);
EfiInitializeLock (&mPrivateData.DataLock, TPL_NOTIFY);
-
+
//
// Make a new handle and install the protocol
//
diff --git a/MdeModulePkg/Universal/SmbiosDxe/SmbiosDxe.h b/MdeModulePkg/Universal/SmbiosDxe/SmbiosDxe.h index 10cff8d..0f5aa73 100644 --- a/MdeModulePkg/Universal/SmbiosDxe/SmbiosDxe.h +++ b/MdeModulePkg/Universal/SmbiosDxe/SmbiosDxe.h @@ -1,14 +1,14 @@ /** @file
This code supports the implementation of the Smbios protocol
-
-Copyright (c) 2009 - 2015, Intel Corporation. All rights reserved.<BR>
-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,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+
+Copyright (c) 2009 - 2018, Intel Corporation. All rights reserved.<BR>
+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,
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
**/
@@ -115,10 +115,10 @@ typedef struct { /**
Create Smbios Table and installs the Smbios Table to the System Table.
-
+
@param Smbios32BitTable The flag to update 32-bit table.
@param Smbios64BitTable The flag to update 64-bit table.
-
+
**/
VOID
EFIAPI
diff --git a/MdeModulePkg/Universal/SmbiosDxe/SmbiosDxe.inf b/MdeModulePkg/Universal/SmbiosDxe/SmbiosDxe.inf index 4fd6b97..0e623ae 100644 --- a/MdeModulePkg/Universal/SmbiosDxe/SmbiosDxe.inf +++ b/MdeModulePkg/Universal/SmbiosDxe/SmbiosDxe.inf @@ -1,7 +1,7 @@ ## @file
# This driver initializes and installs the SMBIOS protocol, constructs SMBIOS table into system configuration table.
#
-# Copyright (c) 2009 - 2015, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2009 - 2018, Intel Corporation. All rights reserved.<BR>
#
# This program and the accompanying materials
# are licensed and made available under the terms and conditions of the BSD License
@@ -49,7 +49,7 @@ [Protocols]
gEfiSmbiosProtocolGuid ## PRODUCES
-
+
[Guids]
gEfiSmbiosTableGuid ## SOMETIMES_PRODUCES ## SystemTable
gEfiSmbios3TableGuid ## SOMETIMES_PRODUCES ## SystemTable
diff --git a/MdeModulePkg/Universal/SmbiosDxe/SmbiosDxeExtra.uni b/MdeModulePkg/Universal/SmbiosDxe/SmbiosDxeExtra.uni index 94f5ec5..05c7bce 100644 --- a/MdeModulePkg/Universal/SmbiosDxe/SmbiosDxeExtra.uni +++ b/MdeModulePkg/Universal/SmbiosDxe/SmbiosDxeExtra.uni @@ -1,7 +1,7 @@ // /** @file
// SmbiosDxe Localized Strings and Content
//
-// Copyright (c) 2013 - 2014, Intel Corporation. All rights reserved.<BR>
+// Copyright (c) 2013 - 2018, Intel Corporation. All rights reserved.<BR>
//
// This program and the accompanying materials
// are licensed and made available under the terms and conditions of the BSD License
@@ -12,8 +12,8 @@ //
// **/
-#string STR_PROPERTIES_MODULE_NAME
-#language en-US
+#string STR_PROPERTIES_MODULE_NAME
+#language en-US
"SMBIOS DXE Driver"
diff --git a/MdeModulePkg/Universal/SmbiosMeasurementDxe/SmbiosMeasurementDxe.inf b/MdeModulePkg/Universal/SmbiosMeasurementDxe/SmbiosMeasurementDxe.inf index 5d3aa67..879bc21 100644 --- a/MdeModulePkg/Universal/SmbiosMeasurementDxe/SmbiosMeasurementDxe.inf +++ b/MdeModulePkg/Universal/SmbiosMeasurementDxe/SmbiosMeasurementDxe.inf @@ -8,10 +8,10 @@ # asset numbers or serial numbers, MUST NOT be measured into PCR [1],
# or any other PCR.
# The OEM types are skipped and platform code can measure them by self if required.
-#
+#
# A platform may use its own policy to filter some fields in SMBIOS table.
#
-# Copyright (c) 2015 - 2017, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2015 - 2018, Intel Corporation. All rights reserved.<BR>
#
# This program and the accompanying materials
# are licensed and made available under the terms and conditions of the BSD License
diff --git a/MdeModulePkg/Universal/SmbiosMeasurementDxe/SmbiosMeasurementDxeExtra.uni b/MdeModulePkg/Universal/SmbiosMeasurementDxe/SmbiosMeasurementDxeExtra.uni index ed298ad..d9a8d4c 100644 --- a/MdeModulePkg/Universal/SmbiosMeasurementDxe/SmbiosMeasurementDxeExtra.uni +++ b/MdeModulePkg/Universal/SmbiosMeasurementDxe/SmbiosMeasurementDxeExtra.uni @@ -1,7 +1,7 @@ // /** @file
// SmbiosMeasurementDxe Localized Strings and Content
//
-// Copyright (c) 2015, Intel Corporation. All rights reserved.<BR>
+// Copyright (c) 2015 - 2018, Intel Corporation. All rights reserved.<BR>
//
// This program and the accompanying materials
// are licensed and made available under the terms and conditions of the BSD License
@@ -12,8 +12,8 @@ //
// **/
-#string STR_PROPERTIES_MODULE_NAME
-#language en-US
+#string STR_PROPERTIES_MODULE_NAME
+#language en-US
"SMBIOS Measurement DXE Driver"
diff --git a/MdeModulePkg/Universal/StatusCodeHandler/Pei/MemoryStausCodeWorker.c b/MdeModulePkg/Universal/StatusCodeHandler/Pei/MemoryStausCodeWorker.c index bdf1d27..b298112 100644 --- a/MdeModulePkg/Universal/StatusCodeHandler/Pei/MemoryStausCodeWorker.c +++ b/MdeModulePkg/Universal/StatusCodeHandler/Pei/MemoryStausCodeWorker.c @@ -1,7 +1,7 @@ /** @file
PEI memory status code worker.
- Copyright (c) 2006 - 2010, Intel Corporation. All rights reserved.<BR>
+ Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>
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
@@ -90,7 +90,7 @@ MemoryStatusCodeReportWorker ( MEMORY_STATUSCODE_RECORD *Record;
//
- // Find GUID'ed HOBs to locate current record buffer.
+ // Find GUID'ed HOBs to locate current record buffer.
//
Hob.Raw = GetFirstGuidHob (&gMemoryStatusCodeRecordGuid);
ASSERT (Hob.Raw != NULL);
diff --git a/MdeModulePkg/Universal/StatusCodeHandler/Pei/SerialStatusCodeWorker.c b/MdeModulePkg/Universal/StatusCodeHandler/Pei/SerialStatusCodeWorker.c index 1b891b3..96d5896 100644 --- a/MdeModulePkg/Universal/StatusCodeHandler/Pei/SerialStatusCodeWorker.c +++ b/MdeModulePkg/Universal/StatusCodeHandler/Pei/SerialStatusCodeWorker.c @@ -1,7 +1,7 @@ /** @file
Serial I/O status code reporting worker.
- Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.<BR>
+ Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>
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
@@ -94,9 +94,9 @@ SerialStatusCodeReportWorker ( Value,
Instance
);
-
+
ASSERT(CharCount > 0);
-
+
if (CallerId != NULL) {
CharCount += AsciiSPrint (
&Buffer[CharCount],
diff --git a/MdeModulePkg/Universal/StatusCodeHandler/Pei/StatusCodeHandlerPei.c b/MdeModulePkg/Universal/StatusCodeHandler/Pei/StatusCodeHandlerPei.c index 368f205..f9d9f15 100644 --- a/MdeModulePkg/Universal/StatusCodeHandler/Pei/StatusCodeHandlerPei.c +++ b/MdeModulePkg/Universal/StatusCodeHandler/Pei/StatusCodeHandlerPei.c @@ -2,7 +2,7 @@ Report Status Code Handler PEIM which produces general handlers and hook them
onto the PEI status code router.
- Copyright (c) 2009, Intel Corporation. All rights reserved.<BR>
+ Copyright (c) 2009 - 2018, Intel Corporation. All rights reserved.<BR>
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
@@ -17,7 +17,7 @@ /**
Entry point of Status Code PEIM.
-
+
This function is the entry point of this Status Code PEIM.
It initializes supported status code devices according to PCD settings,
and installs Status Code PPI.
@@ -54,13 +54,13 @@ StatusCodeHandlerPeiEntry ( if (FeaturePcdGet (PcdStatusCodeUseSerial)) {
Status = SerialPortInitialize();
ASSERT_EFI_ERROR (Status);
- Status = RscHandlerPpi->Register (SerialStatusCodeReportWorker);
+ Status = RscHandlerPpi->Register (SerialStatusCodeReportWorker);
ASSERT_EFI_ERROR (Status);
}
if (FeaturePcdGet (PcdStatusCodeUseMemory)) {
Status = MemoryStatusCodeInitializeWorker ();
ASSERT_EFI_ERROR (Status);
- Status = RscHandlerPpi->Register (MemoryStatusCodeReportWorker);
+ Status = RscHandlerPpi->Register (MemoryStatusCodeReportWorker);
ASSERT_EFI_ERROR (Status);
}
diff --git a/MdeModulePkg/Universal/StatusCodeHandler/Pei/StatusCodeHandlerPei.inf b/MdeModulePkg/Universal/StatusCodeHandler/Pei/StatusCodeHandlerPei.inf index 7c4faa3..5d96fe3 100644 --- a/MdeModulePkg/Universal/StatusCodeHandler/Pei/StatusCodeHandlerPei.inf +++ b/MdeModulePkg/Universal/StatusCodeHandler/Pei/StatusCodeHandlerPei.inf @@ -1,7 +1,7 @@ ## @file
# Report Status Code Handler PEIM which produces general handlers and hook them onto the PEI status code router.
#
-# Copyright (c) 2009 - 2014, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2009 - 2018, Intel Corporation. All rights reserved.<BR>
#
# This program and the accompanying materials
# are licensed and made available under the terms and conditions of the BSD License
@@ -19,7 +19,7 @@ MODULE_UNI_FILE = StatusCodeHandlerPei.uni
FILE_GUID = 9D225237-FA01-464C-A949-BAABC02D31D0
MODULE_TYPE = PEIM
- VERSION_STRING = 1.0
+ VERSION_STRING = 1.0
ENTRY_POINT = StatusCodeHandlerPeiEntry
#
@@ -48,13 +48,13 @@ PrintLib
DebugLib
BaseMemoryLib
-
+
[Guids]
## SOMETIMES_PRODUCES ## HOB
## SOMETIMES_CONSUMES ## HOB
gMemoryStatusCodeRecordGuid
gEfiStatusCodeDataTypeStringGuid ## SOMETIMES_CONSUMES ## UNDEFINED
-
+
[Ppis]
gEfiPeiRscHandlerPpiGuid ## CONSUMES
diff --git a/MdeModulePkg/Universal/StatusCodeHandler/Pei/StatusCodeHandlerPeiExtra.uni b/MdeModulePkg/Universal/StatusCodeHandler/Pei/StatusCodeHandlerPeiExtra.uni index 273f09a..520ec5e 100644 --- a/MdeModulePkg/Universal/StatusCodeHandler/Pei/StatusCodeHandlerPeiExtra.uni +++ b/MdeModulePkg/Universal/StatusCodeHandler/Pei/StatusCodeHandlerPeiExtra.uni @@ -1,7 +1,7 @@ // /** @file
// StatusCodeHandlerPei Localized Strings and Content
//
-// Copyright (c) 2013 - 2014, Intel Corporation. All rights reserved.<BR>
+// Copyright (c) 2013 - 2018, Intel Corporation. All rights reserved.<BR>
//
// This program and the accompanying materials
// are licensed and made available under the terms and conditions of the BSD License
@@ -12,8 +12,8 @@ //
// **/
-#string STR_PROPERTIES_MODULE_NAME
-#language en-US
+#string STR_PROPERTIES_MODULE_NAME
+#language en-US
"Status Code Handler PEI Module"
diff --git a/MdeModulePkg/Universal/StatusCodeHandler/RuntimeDxe/MemoryStatusCodeWorker.c b/MdeModulePkg/Universal/StatusCodeHandler/RuntimeDxe/MemoryStatusCodeWorker.c index a306d75..bf0cf2d 100644 --- a/MdeModulePkg/Universal/StatusCodeHandler/RuntimeDxe/MemoryStatusCodeWorker.c +++ b/MdeModulePkg/Universal/StatusCodeHandler/RuntimeDxe/MemoryStatusCodeWorker.c @@ -1,7 +1,7 @@ /** @file
Runtime memory status code worker.
- Copyright (c) 2006 - 2009, Intel Corporation. All rights reserved.<BR>
+ Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>
(C) Copyright 2016 Hewlett Packard Enterprise Development LP<BR>
This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License
@@ -42,7 +42,7 @@ RtMemoryStatusCodeInitializeWorker ( mRtMemoryStatusCodeTable->RecordIndex = 0;
mRtMemoryStatusCodeTable->NumberOfRecords = 0;
- mRtMemoryStatusCodeTable->MaxRecordsNumber =
+ mRtMemoryStatusCodeTable->MaxRecordsNumber =
(PcdGet16 (PcdStatusCodeMemorySize) * 1024) / sizeof (MEMORY_STATUSCODE_RECORD);
Status = gBS->InstallConfigurationTable (&gMemoryStatusCodeRecordGuid, mRtMemoryStatusCodeTable);
@@ -51,7 +51,7 @@ RtMemoryStatusCodeInitializeWorker ( /**
- Report status code into runtime memory. If the runtime pool is full, roll back to the
+ Report status code into runtime memory. If the runtime pool is full, roll back to the
first record and overwrite it.
@param CodeType Indicates the type of status code being reported.
diff --git a/MdeModulePkg/Universal/StatusCodeHandler/RuntimeDxe/SerialStatusCodeWorker.c b/MdeModulePkg/Universal/StatusCodeHandler/RuntimeDxe/SerialStatusCodeWorker.c index 45986fc..66fb9e7 100644 --- a/MdeModulePkg/Universal/StatusCodeHandler/RuntimeDxe/SerialStatusCodeWorker.c +++ b/MdeModulePkg/Universal/StatusCodeHandler/RuntimeDxe/SerialStatusCodeWorker.c @@ -1,14 +1,14 @@ /** @file
Serial I/O status code reporting worker.
- Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.<BR>
- 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,
- WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>
+ 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,
+ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
**/
@@ -16,7 +16,7 @@ /**
Convert status code value and extended data to readable ASCII string, send string to serial I/O device.
-
+
@param CodeType Indicates the type of status code being reported.
@param Value Describes the current status of a hardware or software entity.
This included information about the class and subclass that is used to
@@ -73,9 +73,9 @@ SerialStatusCodeReportWorker ( // Print DEBUG() information into output buffer.
//
CharCount = AsciiBSPrint (
- Buffer,
- sizeof (Buffer),
- Format,
+ Buffer,
+ sizeof (Buffer),
+ Format,
Marker
);
} else if ((CodeType & EFI_STATUS_CODE_TYPE_MASK) == EFI_ERROR_CODE) {
@@ -83,15 +83,15 @@ SerialStatusCodeReportWorker ( // Print ERROR information into output buffer.
//
CharCount = AsciiSPrint (
- Buffer,
- sizeof (Buffer),
- "ERROR: C%08x:V%08x I%x",
- CodeType,
- Value,
+ Buffer,
+ sizeof (Buffer),
+ "ERROR: C%08x:V%08x I%x",
+ CodeType,
+ Value,
Instance
);
ASSERT (CharCount > 0);
-
+
if (CallerId != NULL) {
CharCount += AsciiSPrint (
&Buffer[CharCount],
@@ -120,10 +120,10 @@ SerialStatusCodeReportWorker ( // Print PROGRESS information into output buffer.
//
CharCount = AsciiSPrint (
- Buffer,
- sizeof (Buffer),
- "PROGRESS CODE: V%08x I%x\n\r",
- Value,
+ Buffer,
+ sizeof (Buffer),
+ "PROGRESS CODE: V%08x I%x\n\r",
+ Value,
Instance
);
} else if (Data != NULL &&
@@ -143,11 +143,11 @@ SerialStatusCodeReportWorker ( // Code type is not defined.
//
CharCount = AsciiSPrint (
- Buffer,
- sizeof (Buffer),
- "Undefined: C%08x:V%08x I%x\n\r",
- CodeType,
- Value,
+ Buffer,
+ sizeof (Buffer),
+ "Undefined: C%08x:V%08x I%x\n\r",
+ CodeType,
+ Value,
Instance
);
}
diff --git a/MdeModulePkg/Universal/StatusCodeHandler/RuntimeDxe/StatusCodeHandlerRuntimeDxe.c b/MdeModulePkg/Universal/StatusCodeHandler/RuntimeDxe/StatusCodeHandlerRuntimeDxe.c index 9149ca4..e47e083 100644 --- a/MdeModulePkg/Universal/StatusCodeHandler/RuntimeDxe/StatusCodeHandlerRuntimeDxe.c +++ b/MdeModulePkg/Universal/StatusCodeHandler/RuntimeDxe/StatusCodeHandlerRuntimeDxe.c @@ -2,7 +2,7 @@ Status Code Handler Driver which produces general handlers and hook them
onto the DXE status code router.
- Copyright (c) 2006 - 2009, Intel Corporation. All rights reserved.<BR>
+ Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>
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
@@ -66,9 +66,9 @@ VirtualAddressChangeCallBack ( }
/**
- Dispatch initialization request to sub status code devices based on
+ Dispatch initialization request to sub status code devices based on
customized feature flags.
-
+
**/
VOID
InitializationDispatcherWorker (
@@ -99,11 +99,11 @@ InitializationDispatcherWorker ( }
//
- // Replay Status code which saved in GUID'ed HOB to all supported devices.
+ // Replay Status code which saved in GUID'ed HOB to all supported devices.
//
if (FeaturePcdGet (PcdStatusCodeReplayIn)) {
- //
- // Journal GUID'ed HOBs to find all record entry, if found,
+ //
+ // Journal GUID'ed HOBs to find all record entry, if found,
// then output record to support replay device.
//
Hob.Raw = GetFirstGuidHob (&gMemoryStatusCodeRecordGuid);
@@ -152,7 +152,7 @@ InitializationDispatcherWorker ( @param ImageHandle The firmware allocated handle for the EFI image.
@param SystemTable A pointer to the EFI System Table.
-
+
@retval EFI_SUCCESS The entry point is executed successfully.
**/
diff --git a/MdeModulePkg/Universal/StatusCodeHandler/RuntimeDxe/StatusCodeHandlerRuntimeDxe.h b/MdeModulePkg/Universal/StatusCodeHandler/RuntimeDxe/StatusCodeHandlerRuntimeDxe.h index a3185f5..5c1239d 100644 --- a/MdeModulePkg/Universal/StatusCodeHandler/RuntimeDxe/StatusCodeHandlerRuntimeDxe.h +++ b/MdeModulePkg/Universal/StatusCodeHandler/RuntimeDxe/StatusCodeHandlerRuntimeDxe.h @@ -1,7 +1,7 @@ /** @file
Internal include file for Status Code Handler Driver.
- Copyright (c) 2006 - 2012, Intel Corporation. All rights reserved.<BR>
+ Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>
(C) Copyright 2016 Hewlett Packard Enterprise Development LP<BR>
This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License
@@ -45,7 +45,7 @@ extern RUNTIME_MEMORY_STATUSCODE_HEADER *mRtMemoryStatusCodeTable; /**
Locates Serial I/O Protocol as initialization for serial status code worker.
-
+
@retval EFI_SUCCESS Serial I/O Protocol is successfully located.
**/
@@ -86,7 +86,7 @@ SerialStatusCodeReportWorker ( /**
Initialize runtime memory status code table as initialization for runtime memory status code worker
-
+
@retval EFI_SUCCESS Runtime memory status code table successfully initialized.
@retval others Errors from gBS->InstallConfigurationTable().
@@ -97,7 +97,7 @@ RtMemoryStatusCodeInitializeWorker ( );
/**
- Report status code into runtime memory. If the runtime pool is full, roll back to the
+ Report status code into runtime memory. If the runtime pool is full, roll back to the
first record and overwrite it.
@param CodeType Indicates the type of status code being reported.
diff --git a/MdeModulePkg/Universal/StatusCodeHandler/RuntimeDxe/StatusCodeHandlerRuntimeDxe.inf b/MdeModulePkg/Universal/StatusCodeHandler/RuntimeDxe/StatusCodeHandlerRuntimeDxe.inf index 637804f..928ae15 100644 --- a/MdeModulePkg/Universal/StatusCodeHandler/RuntimeDxe/StatusCodeHandlerRuntimeDxe.inf +++ b/MdeModulePkg/Universal/StatusCodeHandler/RuntimeDxe/StatusCodeHandlerRuntimeDxe.inf @@ -1,7 +1,7 @@ ## @file
# Status Code Handler Driver which produces general handlers and hook them onto the DXE status code router.
#
-# Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>
# (C) Copyright 2016 Hewlett Packard Enterprise Development LP<BR>
#
# This program and the accompanying materials
@@ -51,7 +51,7 @@ ReportStatusCodeLib
DebugLib
BaseMemoryLib
-
+
[Guids]
## SOMETIMES_CONSUMES ## HOB
## SOMETIMES_PRODUCES ## SystemTable
diff --git a/MdeModulePkg/Universal/StatusCodeHandler/RuntimeDxe/StatusCodeHandlerRuntimeDxeExtra.uni b/MdeModulePkg/Universal/StatusCodeHandler/RuntimeDxe/StatusCodeHandlerRuntimeDxeExtra.uni index 2093444..4c19b6b 100644 --- a/MdeModulePkg/Universal/StatusCodeHandler/RuntimeDxe/StatusCodeHandlerRuntimeDxeExtra.uni +++ b/MdeModulePkg/Universal/StatusCodeHandler/RuntimeDxe/StatusCodeHandlerRuntimeDxeExtra.uni @@ -1,7 +1,7 @@ // /** @file
// StatusCodeHandlerRuntimeDxe Localized Strings and Content
//
-// Copyright (c) 2013 - 2014, Intel Corporation. All rights reserved.<BR>
+// Copyright (c) 2013 - 2018, Intel Corporation. All rights reserved.<BR>
//
// This program and the accompanying materials
// are licensed and made available under the terms and conditions of the BSD License
@@ -12,8 +12,8 @@ //
// **/
-#string STR_PROPERTIES_MODULE_NAME
-#language en-US
+#string STR_PROPERTIES_MODULE_NAME
+#language en-US
"Status Code Handler DXE Driver"
diff --git a/MdeModulePkg/Universal/StatusCodeHandler/Smm/MemoryStatusCodeWorker.c b/MdeModulePkg/Universal/StatusCodeHandler/Smm/MemoryStatusCodeWorker.c index 6baf2dd..8d3b61c 100644 --- a/MdeModulePkg/Universal/StatusCodeHandler/Smm/MemoryStatusCodeWorker.c +++ b/MdeModulePkg/Universal/StatusCodeHandler/Smm/MemoryStatusCodeWorker.c @@ -1,15 +1,15 @@ /** @file
Runtime memory status code worker.
- Copyright (c) 2006 - 2010, Intel Corporation. All rights reserved.<BR>
+ Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>
(C) Copyright 2016 Hewlett Packard Enterprise Development LP<BR>
- 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
+ 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,
- WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
**/
@@ -48,7 +48,7 @@ MemoryStatusCodeInitializeWorker ( /**
- Report status code into runtime memory. If the runtime pool is full, roll back to the
+ Report status code into runtime memory. If the runtime pool is full, roll back to the
first record and overwrite it.
@param CodeType Indicates the type of status code being reported.
diff --git a/MdeModulePkg/Universal/StatusCodeHandler/Smm/SerialStatusCodeWorker.c b/MdeModulePkg/Universal/StatusCodeHandler/Smm/SerialStatusCodeWorker.c index 8f2fbf4..0f1e12f 100644 --- a/MdeModulePkg/Universal/StatusCodeHandler/Smm/SerialStatusCodeWorker.c +++ b/MdeModulePkg/Universal/StatusCodeHandler/Smm/SerialStatusCodeWorker.c @@ -1,14 +1,14 @@ /** @file
Serial I/O status code reporting worker.
- Copyright (c) 2009 - 2014, Intel Corporation. All rights reserved.<BR>
- 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,
- WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ Copyright (c) 2009 - 2018, Intel Corporation. All rights reserved.<BR>
+ 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,
+ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
**/
@@ -16,7 +16,7 @@ /**
Convert status code value and extended data to readable ASCII string, send string to serial I/O device.
-
+
@param CodeType Indicates the type of status code being reported.
@param Value Describes the current status of a hardware or software entity.
This included information about the class and subclass that is used to
@@ -73,9 +73,9 @@ SerialStatusCodeReportWorker ( // Print DEBUG() information into output buffer.
//
CharCount = AsciiBSPrint (
- Buffer,
- sizeof (Buffer),
- Format,
+ Buffer,
+ sizeof (Buffer),
+ Format,
Marker
);
} else if ((CodeType & EFI_STATUS_CODE_TYPE_MASK) == EFI_ERROR_CODE) {
@@ -83,15 +83,15 @@ SerialStatusCodeReportWorker ( // Print ERROR information into output buffer.
//
CharCount = AsciiSPrint (
- Buffer,
- sizeof (Buffer),
- "ERROR: C%08x:V%08x I%x",
- CodeType,
- Value,
+ Buffer,
+ sizeof (Buffer),
+ "ERROR: C%08x:V%08x I%x",
+ CodeType,
+ Value,
Instance
);
ASSERT (CharCount > 0);
-
+
if (CallerId != NULL) {
CharCount += AsciiSPrint (
&Buffer[CharCount],
@@ -120,10 +120,10 @@ SerialStatusCodeReportWorker ( // Print PROGRESS information into output buffer.
//
CharCount = AsciiSPrint (
- Buffer,
- sizeof (Buffer),
- "PROGRESS CODE: V%08x I%x\n\r",
- Value,
+ Buffer,
+ sizeof (Buffer),
+ "PROGRESS CODE: V%08x I%x\n\r",
+ Value,
Instance
);
} else if (Data != NULL &&
@@ -143,11 +143,11 @@ SerialStatusCodeReportWorker ( // Code type is not defined.
//
CharCount = AsciiSPrint (
- Buffer,
- sizeof (Buffer),
- "Undefined: C%08x:V%08x I%x\n\r",
- CodeType,
- Value,
+ Buffer,
+ sizeof (Buffer),
+ "Undefined: C%08x:V%08x I%x\n\r",
+ CodeType,
+ Value,
Instance
);
}
diff --git a/MdeModulePkg/Universal/StatusCodeHandler/Smm/StatusCodeHandlerSmm.c b/MdeModulePkg/Universal/StatusCodeHandler/Smm/StatusCodeHandlerSmm.c index 5e84ea4..846685b 100644 --- a/MdeModulePkg/Universal/StatusCodeHandler/Smm/StatusCodeHandlerSmm.c +++ b/MdeModulePkg/Universal/StatusCodeHandler/Smm/StatusCodeHandlerSmm.c @@ -2,7 +2,7 @@ Status Code Handler Driver which produces general handlers and hook them
onto the SMM status code router.
- Copyright (c) 2009, Intel Corporation. All rights reserved.<BR>
+ Copyright (c) 2009 - 2018, Intel Corporation. All rights reserved.<BR>
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
@@ -19,9 +19,9 @@ EFI_SMM_RSC_HANDLER_PROTOCOL *mRscHandlerProtocol = NULL; /**
- Dispatch initialization request to sub status code devices based on
+ Dispatch initialization request to sub status code devices based on
customized feature flags.
-
+
**/
VOID
InitializationDispatcherWorker (
@@ -54,7 +54,7 @@ InitializationDispatcherWorker ( @param ImageHandle The firmware allocated handle for the EFI image.
@param SystemTable A pointer to the EFI System Table.
-
+
@retval EFI_SUCCESS The entry point is executed successfully.
**/
diff --git a/MdeModulePkg/Universal/StatusCodeHandler/Smm/StatusCodeHandlerSmm.h b/MdeModulePkg/Universal/StatusCodeHandler/Smm/StatusCodeHandlerSmm.h index 1a374c2..6b80b0a 100644 --- a/MdeModulePkg/Universal/StatusCodeHandler/Smm/StatusCodeHandlerSmm.h +++ b/MdeModulePkg/Universal/StatusCodeHandler/Smm/StatusCodeHandlerSmm.h @@ -1,7 +1,7 @@ /** @file
Internal include file for Status Code Handler Driver.
- Copyright (c) 2009 - 2012, Intel Corporation. All rights reserved.<BR>
+ Copyright (c) 2009 - 2018, Intel Corporation. All rights reserved.<BR>
(C) Copyright 2016 Hewlett Packard Enterprise Development LP<BR>
This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License
@@ -83,7 +83,7 @@ SerialStatusCodeReportWorker ( /**
Initialize runtime memory status code table as initialization for runtime memory status code worker
-
+
@retval EFI_SUCCESS Runtime memory status code table successfully initialized.
**/
@@ -93,7 +93,7 @@ MemoryStatusCodeInitializeWorker ( );
/**
- Report status code into runtime memory. If the runtime pool is full, roll back to the
+ Report status code into runtime memory. If the runtime pool is full, roll back to the
first record and overwrite it.
@param CodeType Indicates the type of status code being reported.
diff --git a/MdeModulePkg/Universal/StatusCodeHandler/Smm/StatusCodeHandlerSmm.inf b/MdeModulePkg/Universal/StatusCodeHandler/Smm/StatusCodeHandlerSmm.inf index 7b50735..fbc62f5 100644 --- a/MdeModulePkg/Universal/StatusCodeHandler/Smm/StatusCodeHandlerSmm.inf +++ b/MdeModulePkg/Universal/StatusCodeHandler/Smm/StatusCodeHandlerSmm.inf @@ -1,7 +1,7 @@ ## @file
# Status Code Handler Driver which produces general handlers and hook them onto the SMM status code router.
#
-# Copyright (c) 2009 - 2014, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2009 - 2018, Intel Corporation. All rights reserved.<BR>
# (C) Copyright 2016 Hewlett Packard Enterprise Development LP<BR>
#
# This program and the accompanying materials
@@ -21,7 +21,7 @@ FILE_GUID = 79CD78D8-6EDC-4978-BD02-3299C387AB17
MODULE_TYPE = DXE_SMM_DRIVER
PI_SPECIFICATION_VERSION = 0x0001000A
- VERSION_STRING = 1.0
+ VERSION_STRING = 1.0
ENTRY_POINT = StatusCodeHandlerSmmEntry
#
diff --git a/MdeModulePkg/Universal/StatusCodeHandler/Smm/StatusCodeHandlerSmmExtra.uni b/MdeModulePkg/Universal/StatusCodeHandler/Smm/StatusCodeHandlerSmmExtra.uni index 05422d5..03225ac 100644 --- a/MdeModulePkg/Universal/StatusCodeHandler/Smm/StatusCodeHandlerSmmExtra.uni +++ b/MdeModulePkg/Universal/StatusCodeHandler/Smm/StatusCodeHandlerSmmExtra.uni @@ -1,7 +1,7 @@ // /** @file
// StatusCodeHandlerSmm Localized Strings and Content
//
-// Copyright (c) 2013 - 2014, Intel Corporation. All rights reserved.<BR>
+// Copyright (c) 2013 - 2018, Intel Corporation. All rights reserved.<BR>
//
// This program and the accompanying materials
// are licensed and made available under the terms and conditions of the BSD License
@@ -12,8 +12,8 @@ //
// **/
-#string STR_PROPERTIES_MODULE_NAME
-#language en-US
+#string STR_PROPERTIES_MODULE_NAME
+#language en-US
"Status Code Handler SMM Driver"
diff --git a/MdeModulePkg/Universal/TimestampDxe/TimestampDxe.c b/MdeModulePkg/Universal/TimestampDxe/TimestampDxe.c index 30349b5..bce2d8c 100644 --- a/MdeModulePkg/Universal/TimestampDxe/TimestampDxe.c +++ b/MdeModulePkg/Universal/TimestampDxe/TimestampDxe.c @@ -1,7 +1,7 @@ /** @file
Implementation of Timestamp Protocol using UEFI APIs.
-
-Copyright (c) 2013, Intel Corporation. All rights reserved.<BR>
+
+Copyright (c) 2013 - 2018, Intel Corporation. All rights reserved.<BR>
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
@@ -45,9 +45,9 @@ EFI_TIMESTAMP_PROPERTIES mTimestampProperties = { will always roll over to zero. The properties of the counter can be retrieved from GetProperties().
The caller should be prepared for the function to return the same value twice across successive calls.
The counter value will not go backwards other than when wrapping, as defined by EndValue in GetProperties().
- The frequency of the returned timestamp counter value must remain constant. Power management operations that
- affect clocking must not change the returned counter frequency. The quantization of counter value updates may
- vary as long as the value reflecting time passed remains consistent.
+ The frequency of the returned timestamp counter value must remain constant. Power management operations that
+ affect clocking must not change the returned counter frequency. The quantization of counter value updates may
+ vary as long as the value reflecting time passed remains consistent.
@retval The current value of the free running timestamp counter.
@@ -63,7 +63,7 @@ TimestampDriverGetTimestamp ( //
UINT64 TimestampValue;
TimestampValue = 0;
-
+
//
// Get the timestamp
//
@@ -72,7 +72,7 @@ TimestampDriverGetTimestamp ( } else {
TimestampValue = GetPerformanceCounter() - mTimerLibStartValue;
}
-
+
return TimestampValue;
}
@@ -81,9 +81,9 @@ TimestampDriverGetTimestamp ( @param[out] Properties The properties of the timestamp counter.
- @retval EFI_SUCCESS The properties were successfully retrieved.
- @retval EFI_DEVICE_ERROR An error occurred trying to retrieve the properties of the timestamp
- counter subsystem. Properties is not pedated.
+ @retval EFI_SUCCESS The properties were successfully retrieved.
+ @retval EFI_DEVICE_ERROR An error occurred trying to retrieve the properties of the timestamp
+ counter subsystem. Properties is not pedated.
@retval EFI_INVALID_PARAMETER Properties is NULL.
**/
@@ -96,12 +96,12 @@ TimestampDriverGetProperties( if (Properties == NULL) {
return EFI_INVALID_PARAMETER;
}
-
+
//
// Get timestamp properties
//
CopyMem((VOID *) Properties, (VOID *) &mTimestampProperties, sizeof (mTimestampProperties));
-
+
return EFI_SUCCESS;
}
@@ -130,26 +130,26 @@ TimestampDriverInitialize ( )
{
EFI_STATUS Status;
-
+
EFI_HANDLE TimestampHandle;
TimestampHandle = NULL;
-
+
//
// Get the start value, end value and frequency in Timerlib
//
mTimestampProperties.Frequency = GetPerformanceCounterProperties(&mTimerLibStartValue, &mTimerLibEndValue);
-
+
//
- // Set the EndValue
+ // Set the EndValue
//
if (mTimerLibEndValue > mTimerLibStartValue) {
mTimestampProperties.EndValue = mTimerLibEndValue - mTimerLibStartValue;
} else {
mTimestampProperties.EndValue = mTimerLibStartValue - mTimerLibEndValue;
}
-
+
DEBUG ((EFI_D_INFO, "TimerFrequency:0x%lx, TimerLibStartTime:0x%lx, TimerLibEndtime:0x%lx\n", mTimestampProperties.Frequency, mTimerLibStartValue, mTimerLibEndValue));
-
+
//
// Install the Timestamp Protocol onto a new handle
//
@@ -159,7 +159,7 @@ TimestampDriverInitialize ( &mTimestamp,
NULL
);
-
+
ASSERT_EFI_ERROR (Status);
return EFI_SUCCESS;
diff --git a/MdeModulePkg/Universal/TimestampDxe/TimestampDxe.inf b/MdeModulePkg/Universal/TimestampDxe/TimestampDxe.inf index f71d526..0785885 100644 --- a/MdeModulePkg/Universal/TimestampDxe/TimestampDxe.inf +++ b/MdeModulePkg/Universal/TimestampDxe/TimestampDxe.inf @@ -1,7 +1,7 @@ ## @file
# Generic Timestamp driver producing Timestamp Protocol using UEFI APIs.
#
-# Copyright (c) 2013 - 2014, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2013 - 2018, Intel Corporation. All rights reserved.<BR>
#
# This program and the accompanying materials
# are licensed and made available under the terms and conditions of the BSD License
@@ -32,7 +32,7 @@ MdePkg/MdePkg.dec
[Sources]
- TimestampDxe.c
+ TimestampDxe.c
[LibraryClasses]
UefiBootServicesTableLib
diff --git a/MdeModulePkg/Universal/TimestampDxe/TimestampDxeExtra.uni b/MdeModulePkg/Universal/TimestampDxe/TimestampDxeExtra.uni index aba52de..f99138f 100644 --- a/MdeModulePkg/Universal/TimestampDxe/TimestampDxeExtra.uni +++ b/MdeModulePkg/Universal/TimestampDxe/TimestampDxeExtra.uni @@ -1,7 +1,7 @@ // /** @file
// TimestampDxe Localized Strings and Content
//
-// Copyright (c) 2014, Intel Corporation. All rights reserved.<BR>
+// Copyright (c) 2014 - 2018, Intel Corporation. All rights reserved.<BR>
//
// This program and the accompanying materials
// are licensed and made available under the terms and conditions of the BSD License
@@ -12,8 +12,8 @@ //
// **/
-#string STR_PROPERTIES_MODULE_NAME
-#language en-US
+#string STR_PROPERTIES_MODULE_NAME
+#language en-US
"Timestamp DXE Driver"
diff --git a/MdeModulePkg/Universal/Variable/EmuRuntimeDxe/EmuVariable.c b/MdeModulePkg/Universal/Variable/EmuRuntimeDxe/EmuVariable.c index 8202d37..1bcf931 100644 --- a/MdeModulePkg/Universal/Variable/EmuRuntimeDxe/EmuVariable.c +++ b/MdeModulePkg/Universal/Variable/EmuRuntimeDxe/EmuVariable.c @@ -29,7 +29,7 @@ VARIABLE_INFO_ENTRY *gVariableInfo = NULL; #define ISO_639_2_ENTRY_SIZE 3
/**
- Update the variable region with Variable information. These are the same
+ Update the variable region with Variable information. These are the same
arguments as the EFI Variable services.
@param[in] VariableName Name of variable
@@ -40,7 +40,7 @@ VARIABLE_INFO_ENTRY *gVariableInfo = NULL; @param[in] DataSize Size of data. 0 means delete
- @param[in] Attributes Attribues of the variable
+ @param[in] Attributes Attribues of the variable
@param[in] Variable The variable information which is used to keep track of variable usage.
@@ -272,13 +272,13 @@ GetEndPointer ( }
/**
- Routine used to track statistical information about variable usage.
+ Routine used to track statistical information about variable usage.
The data is stored in the EFI system table so it can be accessed later.
- VariableInfo.efi can dump out the table. Only Boot Services variable
+ VariableInfo.efi can dump out the table. Only Boot Services variable
accesses are tracked by this code. The PcdVariableCollectStatistics
- build flag controls if this feature is enabled.
+ build flag controls if this feature is enabled.
- A read that hits in the cache will have Read and Cache true for
+ A read that hits in the cache will have Read and Cache true for
the transaction. Data is allocated by this routine, but never
freed.
@@ -328,7 +328,7 @@ UpdateVariableInfo ( gBS->InstallConfigurationTable (&gEfiVariableGuid, gVariableInfo);
}
-
+
for (Entry = gVariableInfo; Entry != NULL; Entry = Entry->Next) {
if (CompareGuid (VendorGuid, &Entry->VendorGuid)) {
if (StrCmp (VariableName, Entry->Name) == 0) {
@@ -399,7 +399,7 @@ GetIndexFromSupportedLangCodes( IN CHAR8 *SupportedLang,
IN CHAR8 *Lang,
IN BOOLEAN Iso639Language
- )
+ )
{
UINTN Index;
UINTN CompareLength;
@@ -434,8 +434,8 @@ GetIndexFromSupportedLangCodes( // Determine the length of the next language code in SupportedLang
//
for (CompareLength = 0; SupportedLang[CompareLength] != '\0' && SupportedLang[CompareLength] != ';'; CompareLength++);
-
- if ((CompareLength == LanguageLength) &&
+
+ if ((CompareLength == LanguageLength) &&
(AsciiStrnCmp (Lang, SupportedLang, CompareLength) == 0)) {
//
// Successfully find the index of Lang string in SupportedLang string.
@@ -523,7 +523,7 @@ GetLangFromSupportedLangCodes ( return CopyMem (mVariableModuleGlobal->PlatformLang, Supported - CompareLength, CompareLength);
}
SubIndex++;
-
+
//
// Skip ';' characters in Supported
//
@@ -533,10 +533,10 @@ GetLangFromSupportedLangCodes ( }
/**
- Returns a pointer to an allocated buffer that contains the best matching language
- from a set of supported languages.
-
- This function supports both ISO 639-2 and RFC 4646 language codes, but language
+ Returns a pointer to an allocated buffer that contains the best matching language
+ from a set of supported languages.
+
+ This function supports both ISO 639-2 and RFC 4646 language codes, but language
code types may not be mixed in a single call to this function. This function
supports a variable argument list that allows the caller to pass in a prioritized
list of language codes to test against all the language codes in SupportedLanguages.
@@ -544,37 +544,37 @@ GetLangFromSupportedLangCodes ( If SupportedLanguages is NULL, then ASSERT().
@param[in] SupportedLanguages A pointer to a Null-terminated ASCII string that
- contains a set of language codes in the format
+ contains a set of language codes in the format
specified by Iso639Language.
@param[in] Iso639Language If not zero, then all language codes are assumed to be
in ISO 639-2 format. If zero, then all language
codes are assumed to be in RFC 4646 language format
- @param[in] ... A variable argument list that contains pointers to
+ @param[in] ... A variable argument list that contains pointers to
Null-terminated ASCII strings that contain one or more
language codes in the format specified by Iso639Language.
The first language code from each of these language
code lists is used to determine if it is an exact or
- close match to any of the language codes in
+ close match to any of the language codes in
SupportedLanguages. Close matches only apply to RFC 4646
language codes, and the matching algorithm from RFC 4647
- is used to determine if a close match is present. If
+ is used to determine if a close match is present. If
an exact or close match is found, then the matching
language code from SupportedLanguages is returned. If
no matches are found, then the next variable argument
- parameter is evaluated. The variable argument list
+ parameter is evaluated. The variable argument list
is terminated by a NULL.
@retval NULL The best matching language could not be found in SupportedLanguages.
- @retval NULL There are not enough resources available to return the best matching
+ @retval NULL There are not enough resources available to return the best matching
language.
- @retval Other A pointer to a Null-terminated ASCII string that is the best matching
+ @retval Other A pointer to a Null-terminated ASCII string that is the best matching
language in SupportedLanguages.
**/
CHAR8 *
EFIAPI
VariableGetBestLanguage (
- IN CONST CHAR8 *SupportedLanguages,
+ IN CONST CHAR8 *SupportedLanguages,
IN UINTN Iso639Language,
...
)
@@ -649,7 +649,7 @@ VariableGetBestLanguage ( LanguageLength = 0;
} else {
//
- // If RFC 4646 mode, then trim Language from the right to the next '-' character
+ // If RFC 4646 mode, then trim Language from the right to the next '-' character
//
for (LanguageLength--; LanguageLength > 0 && Language[LanguageLength] != '-'; LanguageLength--);
}
@@ -658,7 +658,7 @@ VariableGetBestLanguage ( VA_END (Args);
//
- // No matches were found
+ // No matches were found
//
return NULL;
}
@@ -723,7 +723,7 @@ AutoUpdateLangVariable( ASSERT (mVariableModuleGlobal->PlatformLangCodes != NULL);
//
- // PlatformLang holds a single language from PlatformLangCodes,
+ // PlatformLang holds a single language from PlatformLangCodes,
// so the size of PlatformLangCodes is enough for the PlatformLang.
//
if (mVariableModuleGlobal->PlatformLang != NULL) {
@@ -753,7 +753,7 @@ AutoUpdateLangVariable( ASSERT (mVariableModuleGlobal->LangCodes != NULL);
}
- if (SetLanguageCodes
+ if (SetLanguageCodes
&& (mVariableModuleGlobal->PlatformLangCodes != NULL)
&& (mVariableModuleGlobal->LangCodes != NULL)) {
//
@@ -785,7 +785,7 @@ AutoUpdateLangVariable( }
}
}
-
+
//
// According to UEFI spec, "Lang" and "PlatformLang" is NV|BS|RT attributions.
//
@@ -849,7 +849,7 @@ AutoUpdateLangVariable( //
FindVariable (L"PlatformLang", &gEfiGlobalVariableGuid, &Variable, (VARIABLE_GLOBAL *)mVariableModuleGlobal);
- Status = UpdateVariable (L"PlatformLang", &gEfiGlobalVariableGuid, BestPlatformLang,
+ Status = UpdateVariable (L"PlatformLang", &gEfiGlobalVariableGuid, BestPlatformLang,
AsciiStrSize (BestPlatformLang), Attributes, &Variable);
DEBUG ((EFI_D_INFO, "Variable Driver Auto Update Lang, Lang:%a, PlatformLang:%a\n", BestLang, BestPlatformLang));
@@ -860,7 +860,7 @@ AutoUpdateLangVariable( }
/**
- Update the variable region with Variable information. These are the same
+ Update the variable region with Variable information. These are the same
arguments as the EFI Variable services.
@param[in] VariableName Name of variable
@@ -907,10 +907,10 @@ UpdateVariable ( // Update/Delete existing variable
//
- if (EfiAtRuntime ()) {
+ if (EfiAtRuntime ()) {
//
- // If EfiAtRuntime and the variable is Volatile and Runtime Access,
- // the volatile is ReadOnly, and SetVariable should be aborted and
+ // If EfiAtRuntime and the variable is Volatile and Runtime Access,
+ // the volatile is ReadOnly, and SetVariable should be aborted and
// return EFI_WRITE_PROTECTED.
//
if (Variable->Volatile) {
@@ -952,21 +952,21 @@ UpdateVariable ( //
Variable->CurrPtr->State &= VAR_IN_DELETED_TRANSITION;
}
-
+
} else {
//
// No found existing variable, Create a new variable
- //
-
+ //
+
//
// Make sure we are trying to create a new variable.
- // Setting a data variable with no access, or zero DataSize attributes means to delete it.
+ // Setting a data variable with no access, or zero DataSize attributes means to delete it.
//
if (DataSize == 0 || (Attributes & (EFI_VARIABLE_RUNTIME_ACCESS | EFI_VARIABLE_BOOTSERVICE_ACCESS)) == 0) {
Status = EFI_NOT_FOUND;
goto Done;
}
-
+
//
// Only variable have NV|RT attribute can be created in Runtime
//
@@ -974,14 +974,14 @@ UpdateVariable ( (((Attributes & EFI_VARIABLE_RUNTIME_ACCESS) == 0) || ((Attributes & EFI_VARIABLE_NON_VOLATILE) == 0))) {
Status = EFI_INVALID_PARAMETER;
goto Done;
- }
+ }
}
-
+
//
// Function part - create a new variable and copy the data.
// Both update a variable and create a variable will come here.
//
-
+
VarNameOffset = sizeof (VARIABLE_HEADER);
VarNameSize = StrSize (VariableName);
VarDataOffset = VarNameOffset + VarNameSize + GET_PAD_SIZE (VarNameSize);
@@ -989,9 +989,9 @@ UpdateVariable ( if ((Attributes & EFI_VARIABLE_NON_VOLATILE) != 0) {
NonVolatileVarableStoreSize = ((VARIABLE_STORE_HEADER *)(UINTN)(Global->NonVolatileVariableBase))->Size;
- if ((((Attributes & EFI_VARIABLE_HARDWARE_ERROR_RECORD) != 0)
+ if ((((Attributes & EFI_VARIABLE_HARDWARE_ERROR_RECORD) != 0)
&& ((HEADER_ALIGN (VarSize) + mVariableModuleGlobal->HwErrVariableTotalSize) > PcdGet32 (PcdHwErrStorageSize)))
- || (((Attributes & EFI_VARIABLE_HARDWARE_ERROR_RECORD) == 0)
+ || (((Attributes & EFI_VARIABLE_HARDWARE_ERROR_RECORD) == 0)
&& ((HEADER_ALIGN (VarSize) + mVariableModuleGlobal->CommonVariableTotalSize) > NonVolatileVarableStoreSize - sizeof (VARIABLE_STORE_HEADER) - PcdGet32 (PcdHwErrStorageSize)))) {
Status = EFI_OUT_OF_RESOURCES;
goto Done;
@@ -1144,21 +1144,21 @@ FindVariable ( /**
This code finds variable in storage blocks (Volatile or Non-Volatile).
-
+
@param VariableName A Null-terminated Unicode string that is the name of
the vendor's variable.
@param VendorGuid A unique identifier for the vendor.
- @param Attributes If not NULL, a pointer to the memory location to return the
+ @param Attributes If not NULL, a pointer to the memory location to return the
attributes bitmask for the variable.
@param DataSize Size of Data found. If size is less than the
data, this value contains the required size.
- @param Data On input, the size in bytes of the return Data buffer.
+ @param Data On input, the size in bytes of the return Data buffer.
On output, the size of data returned in Data.
@param Global Pointer to VARIABLE_GLOBAL structure
- @retval EFI_SUCCESS The function completed successfully.
+ @retval EFI_SUCCESS The function completed successfully.
@retval EFI_NOT_FOUND The variable was not found.
- @retval EFI_BUFFER_TOO_SMALL DataSize is too small for the result. DataSize has
+ @retval EFI_BUFFER_TOO_SMALL DataSize is too small for the result. DataSize has
been updated with the size needed to complete the request.
@retval EFI_INVALID_PARAMETER VariableName or VendorGuid or DataSize is NULL.
@@ -1208,7 +1208,7 @@ EmuGetVariable ( }
VariableDataPtr = GetVariableDataPtr (Variable.CurrPtr);
ASSERT (VariableDataPtr != NULL);
-
+
CopyMem (Data, VariableDataPtr, VarDataSize);
if (Attributes != NULL) {
*Attributes = Variable.CurrPtr->Attributes;
@@ -1368,9 +1368,9 @@ Done: This code sets variable in storage blocks (Volatile or Non-Volatile).
@param VariableName A Null-terminated Unicode string that is the name of the vendor's
- variable. Each VariableName is unique for each
- VendorGuid. VariableName must contain 1 or more
- Unicode characters. If VariableName is an empty Unicode
+ variable. Each VariableName is unique for each
+ VendorGuid. VariableName must contain 1 or more
+ Unicode characters. If VariableName is an empty Unicode
string, then EFI_INVALID_PARAMETER is returned.
@param VendorGuid A unique identifier for the vendor
@param Attributes Attributes bitmask to set for the variable
@@ -1381,10 +1381,10 @@ Done: @param VolatileOffset The offset of last volatile variable
@param NonVolatileOffset The offset of last non-volatile variable
- @retval EFI_SUCCESS The firmware has successfully stored the variable and its data as
+ @retval EFI_SUCCESS The firmware has successfully stored the variable and its data as
defined by the Attributes.
- @retval EFI_INVALID_PARAMETER An invalid combination of attribute bits was supplied, or the
- DataSize exceeds the maximum allowed, or VariableName is an empty
+ @retval EFI_INVALID_PARAMETER An invalid combination of attribute bits was supplied, or the
+ DataSize exceeds the maximum allowed, or VariableName is an empty
Unicode string, or VendorGuid is NULL.
@retval EFI_OUT_OF_RESOURCES Not enough storage is available to hold the variable and its data.
@retval EFI_DEVICE_ERROR The variable could not be saved due to a hardware failure.
@@ -1413,7 +1413,7 @@ EmuSetVariable ( //
if (VariableName == NULL || VariableName[0] == 0 || VendorGuid == NULL) {
return EFI_INVALID_PARAMETER;
- }
+ }
if (DataSize != 0 && Data == NULL) {
return EFI_INVALID_PARAMETER;
@@ -1433,11 +1433,11 @@ EmuSetVariable ( return EFI_INVALID_PARAMETER;
}
-
+
if ((UINTN)(~0) - DataSize < StrSize(VariableName)){
//
- // Prevent whole variable size overflow
- //
+ // Prevent whole variable size overflow
+ //
return EFI_INVALID_PARAMETER;
}
@@ -1463,7 +1463,7 @@ EmuSetVariable ( //
if (StrSize (VariableName) + DataSize > PcdGet32 (PcdMaxVariableSize) - sizeof (VARIABLE_HEADER)) {
return EFI_INVALID_PARAMETER;
- }
+ }
}
AcquireLockOnlyAtBootTime(&Global->VariableServicesLock);
@@ -1471,7 +1471,7 @@ EmuSetVariable ( //
// Check whether the input variable is already existed
//
-
+
Status = FindVariable (VariableName, VendorGuid, &Variable, Global);
//
@@ -1491,18 +1491,18 @@ EmuSetVariable ( @param Attributes Attributes bitmask to specify the type of variables
on which to return information.
- @param MaximumVariableStorageSize On output the maximum size of the storage space available for
- the EFI variables associated with the attributes specified.
- @param RemainingVariableStorageSize Returns the remaining size of the storage space available for EFI
+ @param MaximumVariableStorageSize On output the maximum size of the storage space available for
+ the EFI variables associated with the attributes specified.
+ @param RemainingVariableStorageSize Returns the remaining size of the storage space available for EFI
variables associated with the attributes specified.
- @param MaximumVariableSize Returns the maximum size of an individual EFI variable
+ @param MaximumVariableSize Returns the maximum size of an individual EFI variable
associated with the attributes specified.
@param Global Pointer to VARIABLE_GLOBAL structure.
@retval EFI_SUCCESS Valid answer returned.
@retval EFI_INVALID_PARAMETER An invalid combination of attribute bits was supplied
- @retval EFI_UNSUPPORTED The attribute is not supported on this platform, and the
- MaximumVariableStorageSize, RemainingVariableStorageSize,
+ @retval EFI_UNSUPPORTED The attribute is not supported on this platform, and the
+ MaximumVariableStorageSize, RemainingVariableStorageSize,
MaximumVariableSize are undefined.
**/
@@ -1529,12 +1529,12 @@ EmuQueryVariableInfo ( if(MaximumVariableStorageSize == NULL || RemainingVariableStorageSize == NULL || MaximumVariableSize == NULL || Attributes == 0) {
return EFI_INVALID_PARAMETER;
}
-
+
if((Attributes & (EFI_VARIABLE_NON_VOLATILE | EFI_VARIABLE_BOOTSERVICE_ACCESS | EFI_VARIABLE_RUNTIME_ACCESS | EFI_VARIABLE_HARDWARE_ERROR_RECORD)) == 0) {
//
// Make sure the Attributes combination is supported by the platform.
//
- return EFI_UNSUPPORTED;
+ return EFI_UNSUPPORTED;
} else if ((Attributes & (EFI_VARIABLE_RUNTIME_ACCESS | EFI_VARIABLE_BOOTSERVICE_ACCESS)) == EFI_VARIABLE_RUNTIME_ACCESS) {
//
// Make sure if runtime bit is set, boot service bit is set also.
@@ -1633,7 +1633,7 @@ EmuQueryVariableInfo ( } else if ((*RemainingVariableStorageSize - sizeof (VARIABLE_HEADER)) < *MaximumVariableSize) {
*MaximumVariableSize = *RemainingVariableStorageSize - sizeof (VARIABLE_HEADER);
}
-
+
ReleaseLockOnlyAtBootTime (&Global->VariableServicesLock);
return EFI_SUCCESS;
}
@@ -1674,7 +1674,7 @@ InitializeVariableStore ( //
// Note that in EdkII variable driver implementation, Hardware Error Record type variable
// is stored with common variable in the same NV region. So the platform integrator should
- // ensure that the value of PcdHwErrStorageSize is less than or equal to the value of
+ // ensure that the value of PcdHwErrStorageSize is less than or equal to the value of
// PcdVariableStoreSize.
//
ASSERT (PcdGet32 (PcdHwErrStorageSize) <= PcdGet32 (PcdVariableStoreSize));
diff --git a/MdeModulePkg/Universal/Variable/EmuRuntimeDxe/EmuVariableRuntimeDxe.inf b/MdeModulePkg/Universal/Variable/EmuRuntimeDxe/EmuVariableRuntimeDxe.inf index 0dafdde..12d52dd 100644 --- a/MdeModulePkg/Universal/Variable/EmuRuntimeDxe/EmuVariableRuntimeDxe.inf +++ b/MdeModulePkg/Universal/Variable/EmuRuntimeDxe/EmuVariableRuntimeDxe.inf @@ -4,7 +4,7 @@ # This module installs variable arch protocol and variable write arch protocol to provide
# four EFI_RUNTIME_SERVICES: SetVariable, GetVariable, GetNextVariableName and QueryVariableInfo.
#
-# Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>
#
# This program and the accompanying materials
# are licensed and made available under the terms and conditions of the BSD License
@@ -85,4 +85,4 @@ TRUE
[UserExtensions.TianoCore."ExtraFiles"]
- EmuVariableRuntimeDxeExtra.uni
\ No newline at end of file + EmuVariableRuntimeDxeExtra.uni
diff --git a/MdeModulePkg/Universal/Variable/EmuRuntimeDxe/EmuVariableRuntimeDxeExtra.uni b/MdeModulePkg/Universal/Variable/EmuRuntimeDxe/EmuVariableRuntimeDxeExtra.uni index c3bbd2b..a500037 100644 --- a/MdeModulePkg/Universal/Variable/EmuRuntimeDxe/EmuVariableRuntimeDxeExtra.uni +++ b/MdeModulePkg/Universal/Variable/EmuRuntimeDxe/EmuVariableRuntimeDxeExtra.uni @@ -1,7 +1,7 @@ // /** @file
// EmuVariableRuntimeDxe Localized Strings and Content
//
-// Copyright (c) 2013 - 2014, Intel Corporation. All rights reserved.<BR>
+// Copyright (c) 2013 - 2018, Intel Corporation. All rights reserved.<BR>
//
// This program and the accompanying materials
// are licensed and made available under the terms and conditions of the BSD License
@@ -12,8 +12,8 @@ //
// **/
-#string STR_PROPERTIES_MODULE_NAME
-#language en-US
+#string STR_PROPERTIES_MODULE_NAME
+#language en-US
"Emulation Variable DXE Driver"
diff --git a/MdeModulePkg/Universal/Variable/EmuRuntimeDxe/InitVariable.c b/MdeModulePkg/Universal/Variable/EmuRuntimeDxe/InitVariable.c index 309a4b8..dac0464 100644 --- a/MdeModulePkg/Universal/Variable/EmuRuntimeDxe/InitVariable.c +++ b/MdeModulePkg/Universal/Variable/EmuRuntimeDxe/InitVariable.c @@ -1,9 +1,9 @@ /** @file
- Implment all four UEFI runtime variable services and
+ Implment all four UEFI runtime variable services and
install variable architeture protocol.
-
-Copyright (c) 2006 - 2016, Intel Corporation. All rights reserved.<BR>
+
+Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>
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
@@ -29,7 +29,7 @@ EFI_EVENT mVirtualAddressChangeEvent = NULL; data, this value contains the required size.
@param Data The buffer to return the contents of the variable. May be NULL
with a zero DataSize in order to determine the size buffer needed.
-
+
@return EFI_INVALID_PARAMETER Invalid parameter
@return EFI_SUCCESS Find the specified variable
@return EFI_NOT_FOUND Not found
@@ -203,13 +203,13 @@ VariableClassAddressChangeEvent ( /**
EmuVariable Driver main entry point. The Variable driver places the 4 EFI
- runtime services in the EFI System Table and installs arch protocols
+ runtime services in the EFI System Table and installs arch protocols
for variable read and write services being available. It also registers
notification function for EVT_SIGNAL_VIRTUAL_ADDRESS_CHANGE event.
- @param[in] ImageHandle The firmware allocated handle for the EFI image.
+ @param[in] ImageHandle The firmware allocated handle for the EFI image.
@param[in] SystemTable A pointer to the EFI System Table.
-
+
@retval EFI_SUCCESS Variable service successfully initialized.
**/
diff --git a/MdeModulePkg/Universal/Variable/EmuRuntimeDxe/Variable.h b/MdeModulePkg/Universal/Variable/EmuRuntimeDxe/Variable.h index 985f567..2851582 100644 --- a/MdeModulePkg/Universal/Variable/EmuRuntimeDxe/Variable.h +++ b/MdeModulePkg/Universal/Variable/EmuRuntimeDxe/Variable.h @@ -3,7 +3,7 @@ The internal header file includes the common header files, defines
internal structure and functions used by EmuVariable module.
-Copyright (c) 2006 - 2017, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>
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
@@ -139,21 +139,21 @@ VariableClassAddressChangeEvent ( /**
This code finds variable in storage blocks (Volatile or Non-Volatile).
-
+
@param VariableName A Null-terminated Unicode string that is the name of
the vendor's variable.
@param VendorGuid A unique identifier for the vendor.
- @param Attributes If not NULL, a pointer to the memory location to return the
+ @param Attributes If not NULL, a pointer to the memory location to return the
attributes bitmask for the variable.
@param DataSize Size of Data found. If size is less than the
data, this value contains the required size.
- @param Data On input, the size in bytes of the return Data buffer.
+ @param Data On input, the size in bytes of the return Data buffer.
On output, the size of data returned in Data.
@param Global Pointer to VARIABLE_GLOBAL structure
- @retval EFI_SUCCESS The function completed successfully.
+ @retval EFI_SUCCESS The function completed successfully.
@retval EFI_NOT_FOUND The variable was not found.
- @retval EFI_BUFFER_TOO_SMALL DataSize is too small for the result. DataSize has
+ @retval EFI_BUFFER_TOO_SMALL DataSize is too small for the result. DataSize has
been updated with the size needed to complete the request.
@retval EFI_INVALID_PARAMETER VariableName or VendorGuid or DataSize is NULL.
@@ -206,9 +206,9 @@ EmuGetNextVariableName ( This code sets variable in storage blocks (Volatile or Non-Volatile).
@param VariableName A Null-terminated Unicode string that is the name of the vendor's
- variable. Each VariableName is unique for each
- VendorGuid. VariableName must contain 1 or more
- Unicode characters. If VariableName is an empty Unicode
+ variable. Each VariableName is unique for each
+ VendorGuid. VariableName must contain 1 or more
+ Unicode characters. If VariableName is an empty Unicode
string, then EFI_INVALID_PARAMETER is returned.
@param VendorGuid A unique identifier for the vendor
@param Attributes Attributes bitmask to set for the variable
@@ -219,10 +219,10 @@ EmuGetNextVariableName ( @param VolatileOffset The offset of last volatile variable
@param NonVolatileOffset The offset of last non-volatile variable
- @retval EFI_SUCCESS The firmware has successfully stored the variable and its data as
+ @retval EFI_SUCCESS The firmware has successfully stored the variable and its data as
defined by the Attributes.
- @retval EFI_INVALID_PARAMETER An invalid combination of attribute bits was supplied, or the
- DataSize exceeds the maximum allowed, or VariableName is an empty
+ @retval EFI_INVALID_PARAMETER An invalid combination of attribute bits was supplied, or the
+ DataSize exceeds the maximum allowed, or VariableName is an empty
Unicode string, or VendorGuid is NULL.
@retval EFI_OUT_OF_RESOURCES Not enough storage is available to hold the variable and its data.
@retval EFI_DEVICE_ERROR The variable could not be saved due to a hardware failure.
@@ -249,18 +249,18 @@ EmuSetVariable ( @param Attributes Attributes bitmask to specify the type of variables
on which to return information.
- @param MaximumVariableStorageSize On output the maximum size of the storage space available for
- the EFI variables associated with the attributes specified.
- @param RemainingVariableStorageSize Returns the remaining size of the storage space available for EFI
+ @param MaximumVariableStorageSize On output the maximum size of the storage space available for
+ the EFI variables associated with the attributes specified.
+ @param RemainingVariableStorageSize Returns the remaining size of the storage space available for EFI
variables associated with the attributes specified.
- @param MaximumVariableSize Returns the maximum size of an individual EFI variable
+ @param MaximumVariableSize Returns the maximum size of an individual EFI variable
associated with the attributes specified.
@param Global Pointer to VARIABLE_GLOBAL structure.
@retval EFI_SUCCESS Valid answer returned.
@retval EFI_INVALID_PARAMETER An invalid combination of attribute bits was supplied
- @retval EFI_UNSUPPORTED The attribute is not supported on this platform, and the
- MaximumVariableStorageSize, RemainingVariableStorageSize,
+ @retval EFI_UNSUPPORTED The attribute is not supported on this platform, and the
+ MaximumVariableStorageSize, RemainingVariableStorageSize,
MaximumVariableSize are undefined.
**/
diff --git a/MdeModulePkg/Universal/Variable/Pei/PeiVariable.uni b/MdeModulePkg/Universal/Variable/Pei/PeiVariable.uni index 65ca7d0..c27d694 100644 --- a/MdeModulePkg/Universal/Variable/Pei/PeiVariable.uni +++ b/MdeModulePkg/Universal/Variable/Pei/PeiVariable.uni @@ -3,13 +3,13 @@ //
// This module implements ReadOnly Variable Services required by PEIM and installs PEI ReadOnly Varaiable2 PPI.
//
-// Copyright (c) 2006 - 2015, Intel Corporation. All rights reserved.<BR>
+// Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>
//
// 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,
// WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
//
diff --git a/MdeModulePkg/Universal/Variable/Pei/PeiVariableExtra.uni b/MdeModulePkg/Universal/Variable/Pei/PeiVariableExtra.uni index 8b967d4..3d24f29 100644 --- a/MdeModulePkg/Universal/Variable/Pei/PeiVariableExtra.uni +++ b/MdeModulePkg/Universal/Variable/Pei/PeiVariableExtra.uni @@ -1,7 +1,7 @@ // /** @file
// PeiVariable Localized Strings and Content
//
-// Copyright (c) 2013 - 2014, Intel Corporation. All rights reserved.<BR>
+// Copyright (c) 2013 - 2018, Intel Corporation. All rights reserved.<BR>
//
// This program and the accompanying materials
// are licensed and made available under the terms and conditions of the BSD License
@@ -13,8 +13,8 @@ //
// **/
-#string STR_PROPERTIES_MODULE_NAME
-#language en-US
+#string STR_PROPERTIES_MODULE_NAME
+#language en-US
"Variable Access PEI Module"
diff --git a/MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxeExtra.uni b/MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxeExtra.uni index 2d8eaf2..b31790d 100644 --- a/MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxeExtra.uni +++ b/MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxeExtra.uni @@ -1,7 +1,7 @@ // /** @file
// VariableRuntimeDxe Localized Strings and Content
//
-// Copyright (c) 2013 - 2014, Intel Corporation. All rights reserved.<BR>
+// Copyright (c) 2013 - 2018, Intel Corporation. All rights reserved.<BR>
//
// This program and the accompanying materials
// are licensed and made available under the terms and conditions of the BSD License
@@ -12,8 +12,8 @@ //
// **/
-#string STR_PROPERTIES_MODULE_NAME
-#language en-US
+#string STR_PROPERTIES_MODULE_NAME
+#language en-US
"VariableRuntimeDxe module"
diff --git a/MdeModulePkg/Universal/Variable/RuntimeDxe/VariableSmmExtra.uni b/MdeModulePkg/Universal/Variable/RuntimeDxe/VariableSmmExtra.uni index 0de8776..089533a 100644 --- a/MdeModulePkg/Universal/Variable/RuntimeDxe/VariableSmmExtra.uni +++ b/MdeModulePkg/Universal/Variable/RuntimeDxe/VariableSmmExtra.uni @@ -1,7 +1,7 @@ // /** @file
// VariableSmm Localized Strings and Content
//
-// Copyright (c) 2013 - 2015, Intel Corporation. All rights reserved.<BR>
+// Copyright (c) 2013 - 2018, Intel Corporation. All rights reserved.<BR>
//
// This program and the accompanying materials
// are licensed and made available under the terms and conditions of the BSD License
@@ -12,8 +12,8 @@ //
// **/
-#string STR_PROPERTIES_MODULE_NAME
-#language en-US
+#string STR_PROPERTIES_MODULE_NAME
+#language en-US
"VariableSmm module"
diff --git a/MdeModulePkg/Universal/Variable/RuntimeDxe/VariableSmmRuntimeDxeExtra.uni b/MdeModulePkg/Universal/Variable/RuntimeDxe/VariableSmmRuntimeDxeExtra.uni index 674e201e..842ded5 100644 --- a/MdeModulePkg/Universal/Variable/RuntimeDxe/VariableSmmRuntimeDxeExtra.uni +++ b/MdeModulePkg/Universal/Variable/RuntimeDxe/VariableSmmRuntimeDxeExtra.uni @@ -1,7 +1,7 @@ // /** @file
// VariableSmmRuntimeDxe Localized Strings and Content
//
-// Copyright (c) 2013 - 2014, Intel Corporation. All rights reserved.<BR>
+// Copyright (c) 2013 - 2018, Intel Corporation. All rights reserved.<BR>
//
// This program and the accompanying materials
// are licensed and made available under the terms and conditions of the BSD License
@@ -12,8 +12,8 @@ //
// **/
-#string STR_PROPERTIES_MODULE_NAME
-#language en-US
+#string STR_PROPERTIES_MODULE_NAME
+#language en-US
"VariableSmmRuntimeDxe module"
diff --git a/MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimer.c b/MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimer.c index 6dedfbf..df8062a 100644 --- a/MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimer.c +++ b/MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimer.c @@ -1,7 +1,7 @@ /** @file
Implementation of Watchdog Timer Architectural Protocol using UEFI APIs.
-
-Copyright (c) 2006 - 2010, Intel Corporation. All rights reserved.<BR>
+
+Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>
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,7 +74,7 @@ WatchdogTimerDriverExpires ( if (mWatchdogTimerNotifyFunction != NULL) {
mWatchdogTimerNotifyFunction (mWatchdogTimerPeriod);
}
-
+
DEBUG ((EFI_D_ERROR, "Watchdog Timer resetting system\n"));
//
diff --git a/MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimer.h b/MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimer.h index e7bb0b2..3eec749 100644 --- a/MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimer.h +++ b/MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimer.h @@ -1,14 +1,14 @@ /** @file
- The internal include file for WatchDogTimer module.
-
-Copyright (c) 2006 - 2008, Intel Corporation. All rights reserved.<BR>
-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,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ The internal include file for WatchDogTimer module.
+
+Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>
+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,
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
**/
diff --git a/MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimer.inf b/MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimer.inf index bde8457..cd2daf3 100644 --- a/MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimer.inf +++ b/MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimer.inf @@ -1,7 +1,7 @@ ## @file
# Generic watchdog timer driver producing Watchdog Timer Architectural Protocol using UEFI APIs.
#
-# Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>
#
# This program and the accompanying materials
# are licensed and made available under the terms and conditions of the BSD License
@@ -53,4 +53,4 @@ #
[UserExtensions.TianoCore."ExtraFiles"]
- WatchdogTimerExtra.uni
\ No newline at end of file + WatchdogTimerExtra.uni
diff --git a/MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimerExtra.uni b/MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimerExtra.uni index 1d83d5e..836d68b 100644 --- a/MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimerExtra.uni +++ b/MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimerExtra.uni @@ -1,7 +1,7 @@ // /** @file
// WatchdogTimer Localized Strings and Content
//
-// Copyright (c) 2013 - 2014, Intel Corporation. All rights reserved.<BR>
+// Copyright (c) 2013 - 2018, Intel Corporation. All rights reserved.<BR>
//
// This program and the accompanying materials
// are licensed and made available under the terms and conditions of the BSD License
@@ -12,8 +12,8 @@ //
// **/
-#string STR_PROPERTIES_MODULE_NAME
-#language en-US
+#string STR_PROPERTIES_MODULE_NAME
+#language en-US
"Watchdog Timer DXE Driver"
|