MdeModulePkg: INF/DEC file updates to EDK II packages

[mirror_edk2.git] / MdeModulePkg / Universal / DebugSupportDxe / X64 / PlDebugSupportX64.c

diff --git a/MdeModulePkg/Universal/DebugSupportDxe/X64/PlDebugSupportX64.c b/MdeModulePkg/Universal/DebugSupportDxe/X64/PlDebugSupportX64.c
index 4d13ca38332ca27d9f6183bc796f71a8c9826c79..fa8869d287363d3d3c315c5d24e66c2c57f6c445 100644 (file)
--- a/MdeModulePkg/Universal/DebugSupportDxe/X64/PlDebugSupportX64.c
+++ b/MdeModulePkg/Universal/DebugSupportDxe/X64/PlDebugSupportX64.c
@@ -1,8 +1,8 @@
 /** @file\r
   X64 specific functions to support Debug Support protocol.\r
 \r
-Copyright (c) 2008 - 2009, Intel Corporation\r
-All rights reserved. This program and the accompanying materials\r
+Copyright (c) 2008 - 2010, Intel Corporation. All rights reserved.<BR>\r
+This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
 http://opensource.org/licenses/bsd-license.php\r
@@ -36,9 +36,9 @@ GetInterruptHandleFromIdt (
   // InterruptHandle 16-31 : OffsetHigh\r
   // InterruptHandle 32-63 : OffsetUpper\r
   //\r
-  ((UINT16 *) &InterruptHandle)[0] = (UINT16) IdtGateDecriptor->Bits.OffsetLow;\r
-  ((UINT16 *) &InterruptHandle)[1] = (UINT16) IdtGateDecriptor->Bits.OffsetHigh;\r
-  ((UINT32 *) &InterruptHandle)[1] = (UINT32) IdtGateDecriptor->Bits.OffsetUpper;\r
+  InterruptHandle = ((UINTN) IdtGateDecriptor->Bits.OffsetLow) |\r
+                    (((UINTN) IdtGateDecriptor->Bits.OffsetHigh)  << 16) |\r
+                    (((UINTN) IdtGateDecriptor->Bits.OffsetUpper) << 32) ;\r
 \r
   return InterruptHandle;\r
 }\r
@@ -108,7 +108,7 @@ CreateEntryStub (
 **/\r
 EFI_STATUS\r
 ManageIdtEntryTable (\r
-  VOID               (EFIAPI *NewCallback)(),\r
+  CALLBACK_FUNC      NewCallback,\r
   EFI_EXCEPTION_TYPE ExceptionType\r
   )\r
 {\r