diff options
| author | Feng Tian <feng.tian@intel.com> | 2014-08-07 08:54:34 +0000 |
|---|---|---|
| committer | erictian <erictian@6f19259b-4bc3-4df7-8a09-765794883524> | 2014-08-07 08:54:34 +0000 |
| commit | 6e1e5405544724406f07344a5911298c3df44129 (patch) | |
| tree | 1f723606676a8f4fef5ac4aac1682c171ce21381 /MdeModulePkg/Universal/Acpi | |
| parent | e935092fa7e1401201e6faadb04b0ae239dd97a5 (diff) | |
| download | edk2-6e1e5405544724406f07344a5911298c3df44129.zip edk2-6e1e5405544724406f07344a5911298c3df44129.tar.gz edk2-6e1e5405544724406f07344a5911298c3df44129.tar.bz2 | |
1) Add type cast for better coding style.
2) replace StrCpy() usage in Variable driver with StrnCpy().
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Feng Tian <feng.tian@intel.com>
Reviewed-by: Eric Dong <eric.dong@intel.com>
git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@15770 6f19259b-4bc3-4df7-8a09-765794883524
Diffstat (limited to 'MdeModulePkg/Universal/Acpi')
| -rw-r--r-- | MdeModulePkg/Universal/Acpi/AcpiTableDxe/Aml.c | 8 | ||||
| -rw-r--r-- | MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/ScriptExecute.c | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/MdeModulePkg/Universal/Acpi/AcpiTableDxe/Aml.c b/MdeModulePkg/Universal/Acpi/AcpiTableDxe/Aml.c index a7b53e2..30f71bd 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 - 2012, Intel Corporation. All rights reserved. <BR>
+ Copyright (c) 2010 - 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
@@ -282,13 +282,13 @@ AmlGetPkgLength ( break;
case 2:
RealLength = *(Buffer + 1);
- RealLength |= (*(Buffer + 2)) << 8;
+ RealLength |= (UINTN)((*(Buffer + 2)) << 8);
RealLength = (RealLength << 4) | (LeadByte & 0xF);
break;
case 3:
RealLength = *(Buffer + 1);
- RealLength |= (*(Buffer + 2)) << 8;
- RealLength |= (*(Buffer + 3)) << 16;
+ RealLength |= (UINTN)((*(Buffer + 2)) << 8);
+ RealLength |= (UINTN)((*(Buffer + 3)) << 16);
RealLength = (RealLength << 4) | (LeadByte & 0xF);
break;
default:
diff --git a/MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/ScriptExecute.c b/MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/ScriptExecute.c index ab18587..6c1c304 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 - 2013, Intel Corporation. All rights reserved.<BR>
+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
@@ -280,7 +280,7 @@ ReadyToLockEventNotify ( // Align buffer on section boundry
//
ImageContext.ImageAddress += ImageContext.SectionAlignment - 1;
- ImageContext.ImageAddress &= ~(ImageContext.SectionAlignment - 1);
+ ImageContext.ImageAddress &= ~((EFI_PHYSICAL_ADDRESS)(ImageContext.SectionAlignment - 1));
//
// Load the image to our new buffer
//
|