From 86b024546709d0b3ead8df3bf16fb4c866c05921 Mon Sep 17 00:00:00 2001
From: Eric Dong <eric.dong@intel.com>
Date: Thu, 10 Jul 2014 01:25:41 +0000
Subject: Fixed one code error, should use & instead of |.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Eric Dong <eric.dong@intel.com>
Reviewed-by: Ruiyu Ni <ruiyu.ni@intel.com>




git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@15648 6f19259b-4bc3-4df7-8a09-765794883524
---
 DuetPkg/BiosVideoThunkDxe/LegacyBiosThunk.c | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

(limited to 'DuetPkg')

diff --git a/DuetPkg/BiosVideoThunkDxe/LegacyBiosThunk.c b/DuetPkg/BiosVideoThunkDxe/LegacyBiosThunk.c
index c1fab403a7..6dc453ff09 100644
--- a/DuetPkg/BiosVideoThunkDxe/LegacyBiosThunk.c
+++ b/DuetPkg/BiosVideoThunkDxe/LegacyBiosThunk.c
@@ -140,10 +140,10 @@ LegacyBiosInt86 (
   )
 {
   UINTN                 Status;
-  UINTN                 Eflags;
   IA32_REGISTER_SET     ThunkRegSet;
   BOOLEAN               Ret;
   UINT16                *Stack16;
+  BOOLEAN               Enabled;
   
   ZeroMem (&ThunkRegSet, sizeof (ThunkRegSet));
   ThunkRegSet.E.EFLAGS.Bits.Reserved_0 = 1;
@@ -169,10 +169,7 @@ LegacyBiosInt86 (
   //
   // The call to Legacy16 is a critical section to EFI
   //
-  Eflags = AsmReadEflags ();
-  if ((Eflags | EFI_CPU_EFLAGS_IF) != 0) {
-    DisableInterrupts ();
-  }
+  Enabled = SaveAndDisableInterrupts();
 
   //
   // Set Legacy16 state. 0x08, 0x70 is legacy 8259 vector bases.
@@ -199,9 +196,7 @@ LegacyBiosInt86 (
   //
   // End critical section
   //
-  if ((Eflags | EFI_CPU_EFLAGS_IF) != 0) {
-    EnableInterrupts ();
-  }
+  SetInterruptState (Enabled);
 
   Regs->E.EDI      = ThunkRegSet.E.EDI;      
   Regs->E.ESI      = ThunkRegSet.E.ESI;  
-- 
cgit v1.2.3