diff options
author | Star Zeng <star.zeng@intel.com> | 2015-04-13 01:56:57 +0000 |
---|---|---|
committer | lzeng14 <lzeng14@Edk2> | 2015-04-13 01:56:57 +0000 |
commit | 0a4a5b7b5bf0e9fed3edc59f46cc1adffd998add (patch) | |
tree | b019dae138f4f09abc1faf12416dd8974b8d7878 /MdeModulePkg | |
parent | 185395a4a21dcb11bd59db256077a3b29d92ff55 (diff) | |
download | edk2-0a4a5b7b5bf0e9fed3edc59f46cc1adffd998add.zip edk2-0a4a5b7b5bf0e9fed3edc59f46cc1adffd998add.tar.gz edk2-0a4a5b7b5bf0e9fed3edc59f46cc1adffd998add.tar.bz2 |
MdeModulePkg PiDxeS3BootScriptLib: Initialize the EFI_BOOT_SCRIPT_TABLE_HEADER.Version.
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Star Zeng <star.zeng@intel.com>
Reviewed-by: Jiewen Yao <jiewen.yao@intel.com>
git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@17166 6f19259b-4bc3-4df7-8a09-765794883524
Diffstat (limited to 'MdeModulePkg')
3 files changed, 7 insertions, 3 deletions
diff --git a/MdeModulePkg/Library/PiDxeS3BootScriptLib/BootScriptExecute.c b/MdeModulePkg/Library/PiDxeS3BootScriptLib/BootScriptExecute.c index c326859..45dd581 100644 --- a/MdeModulePkg/Library/PiDxeS3BootScriptLib/BootScriptExecute.c +++ b/MdeModulePkg/Library/PiDxeS3BootScriptLib/BootScriptExecute.c @@ -1,7 +1,7 @@ /** @file
Interpret and execute the S3 data in S3 boot script.
- Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.<BR>
+ Copyright (c) 2006 - 2015, Intel Corporation. All rights reserved.<BR>
This program and the accompanying materials
are licensed and made available under the terms and conditions
@@ -1643,6 +1643,7 @@ S3BootScriptExecute ( AndMask = 0;
OrMask = 0;
+ DEBUG ((EFI_D_INFO, "TableHeader.Version - 0x%04x\n", (UINTN)TableHeader.Version));
DEBUG ((EFI_D_INFO, "TableHeader.TableLength - 0x%08x\n", (UINTN)TableLength));
while ((UINTN) Script < (UINTN) (StartAddress + TableLength)) {
diff --git a/MdeModulePkg/Library/PiDxeS3BootScriptLib/BootScriptInternalFormat.h b/MdeModulePkg/Library/PiDxeS3BootScriptLib/BootScriptInternalFormat.h index dce2a1c..99cb407 100644 --- a/MdeModulePkg/Library/PiDxeS3BootScriptLib/BootScriptInternalFormat.h +++ b/MdeModulePkg/Library/PiDxeS3BootScriptLib/BootScriptInternalFormat.h @@ -2,7 +2,7 @@ This file declares the internal Framework Boot Script format used by
the PI implementation of Script Saver and Executor.
- Copyright (c) 2006 - 2012, Intel Corporation. All rights reserved.<BR>
+ Copyright (c) 2006 - 2015, Intel Corporation. All rights reserved.<BR>
This program and the accompanying materials
are licensed and made available under the terms and conditions
@@ -183,4 +183,6 @@ typedef struct { #define BOOT_SCRIPT_NODE_MAX_LENGTH 1024
+#define BOOT_SCRIPT_TABLE_VERSION 0x0001
+
#endif
diff --git a/MdeModulePkg/Library/PiDxeS3BootScriptLib/BootScriptSave.c b/MdeModulePkg/Library/PiDxeS3BootScriptLib/BootScriptSave.c index 885b156..586a205 100644 --- a/MdeModulePkg/Library/PiDxeS3BootScriptLib/BootScriptSave.c +++ b/MdeModulePkg/Library/PiDxeS3BootScriptLib/BootScriptSave.c @@ -1,7 +1,7 @@ /** @file
Save the S3 data to S3 boot script.
- Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.<BR>
+ Copyright (c) 2006 - 2015, Intel Corporation. All rights reserved.<BR>
This program and the accompanying materials
are licensed and made available under the terms and conditions
@@ -423,6 +423,7 @@ S3BootScriptGetBootTimeEntryAddAddress ( ScriptTableInfo = (EFI_BOOT_SCRIPT_TABLE_HEADER*)(UINTN)S3TableBase;
ScriptTableInfo->OpCode = S3_BOOT_SCRIPT_LIB_TABLE_OPCODE;
ScriptTableInfo->Length = (UINT8) sizeof (EFI_BOOT_SCRIPT_TABLE_HEADER);
+ ScriptTableInfo->Version = BOOT_SCRIPT_TABLE_VERSION;
ScriptTableInfo->TableLength = 0; // will be calculate at CloseTable
mS3BootScriptTablePtr->TableLength = sizeof (EFI_BOOT_SCRIPT_TABLE_HEADER);
mS3BootScriptTablePtr->TableBase = (UINT8*)(UINTN)S3TableBase;
|