retired PcdNtEmulatorEnable.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@7792 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/IntelFrameworkModulePkg/Bus/Isa/IsaSerialDxe/IsaSerialDxe.inf b/IntelFrameworkModulePkg/Bus/Isa/IsaSerialDxe/IsaSerialDxe.inf
index 122a7824f6afb6d730c6e1ee96cf6cd9e8dea8f8..b3cfdae0e31fd4b8d6bf635c2f7164d6fc791aff 100644 (file)
--- a/IntelFrameworkModulePkg/Bus/Isa/IsaSerialDxe/IsaSerialDxe.inf
+++ b/IntelFrameworkModulePkg/Bus/Isa/IsaSerialDxe/IsaSerialDxe.inf
@@ -62,9 +62,6 @@
   gEfiSerialIoProtocolGuid                      # PROTOCOL BY_START\r
   gEfiDevicePathProtocolGuid                    # PROTOCOL TO_START\r
 \r
-[FeaturePcd.common]\r
-  gEfiMdeModulePkgTokenSpaceGuid.PcdNtEmulatorEnable\r
-\r
 [FixedPcd.common]\r
   gEfiMdePkgTokenSpaceGuid.PcdUartDefaultBaudRate|115200\r
   gEfiMdePkgTokenSpaceGuid.PcdUartDefaultDataBits|8\r

diff --git a/IntelFrameworkModulePkg/Bus/Isa/IsaSerialDxe/Serial.c b/IntelFrameworkModulePkg/Bus/Isa/IsaSerialDxe/Serial.c
index f4c00bb77015a123105fb9201e2babca1ae11a1a..6a7713cdaf5f16b3a24d85d0bc2ec59ac0fa04d4 100644 (file)
--- a/IntelFrameworkModulePkg/Bus/Isa/IsaSerialDxe/Serial.c
+++ b/IntelFrameworkModulePkg/Bus/Isa/IsaSerialDxe/Serial.c
@@ -805,14 +805,6 @@ IsaSerialReceiveTransmit (
     do {\r
       Lsr.Data = READ_LSR (SerialDevice->IsaIo, SerialDevice->BaseAddress);\r
 \r
-      if (FeaturePcdGet (PcdNtEmulatorEnable)) {\r
-        //\r
-        // This is required for NT to avoid a forever-spin...\r
-        // This would be better if READ_LSR was a polling operation\r
-        // that would timeout.\r
-        //\r
-        Lsr.Bits.THRE = 1;\r
-      }\r
       //\r
       // Flush incomming data to prevent a an overrun during a long write\r
       //\r
@@ -1728,17 +1720,13 @@ IsaSerialPortPresent (
   WRITE_SCR (SerialDevice->IsaIo, SerialDevice->BaseAddress, 0xAA);\r
 \r
   if (READ_SCR (SerialDevice->IsaIo, SerialDevice->BaseAddress) != 0xAA) {\r
-    if (!FeaturePcdGet (PcdNtEmulatorEnable)) {\r
-      Status = FALSE;\r
-    }\r
+    Status = FALSE;\r
   }\r
 \r
   WRITE_SCR (SerialDevice->IsaIo, SerialDevice->BaseAddress, 0x55);\r
 \r
   if (READ_SCR (SerialDevice->IsaIo, SerialDevice->BaseAddress) != 0x55) {\r
-    if (!FeaturePcdGet (PcdNtEmulatorEnable)) {\r
-      Status = FALSE;\r
-    }\r
+    Status = FALSE;\r
   }\r
   //\r
   // Restore SCR\r

diff --git a/IntelFrameworkModulePkg/IntelFrameworkModulePkg.dsc b/IntelFrameworkModulePkg/IntelFrameworkModulePkg.dsc
index 5e2ac13ea0f0b0054632b579e22d73069300099c..9e0ae806c34be7014ddf5f42a37c0928bcc91df5 100644 (file)
--- a/IntelFrameworkModulePkg/IntelFrameworkModulePkg.dsc
+++ b/IntelFrameworkModulePkg/IntelFrameworkModulePkg.dsc
@@ -154,7 +154,7 @@
   gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdIsaBusSupportIsaMemory|TRUE\r
   gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdPciCfgDisable|TRUE\r
   gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdPciCfg2Disable|TRUE\r
-  gEfiMdeModulePkgTokenSpaceGuid.PcdNtEmulatorEnable|FALSE\r
+\r
 \r
 [PcdsFixedAtBuild.common]\r
   gEfiMdePkgTokenSpaceGuid.PcdMaximumUnicodeStringLength|1000000\r

diff --git a/IntelFrameworkModulePkg/Universal/StatusCode/Pei/PeiStatusCode.c b/IntelFrameworkModulePkg/Universal/StatusCode/Pei/PeiStatusCode.c
index 07b6b1af0c758e20a7e8e0e4f255ea9c3b7c69ee..f14729157432c65bb028fb4ecda9773ec382eee7 100644 (file)
--- a/IntelFrameworkModulePkg/Universal/StatusCode/Pei/PeiStatusCode.c
+++ b/IntelFrameworkModulePkg/Universal/StatusCode/Pei/PeiStatusCode.c
@@ -135,10 +135,8 @@ PeiStatusCodeDriverEntry (
   // Install PeiStatusCodePpi.\r
   // PeiServices use this Ppi to output status code.\r
   // use library\r
-  if (!FeaturePcdGet(PcdNtEmulatorEnable)) {\r
-    Status = PeiServicesInstallPpi (&mStatusCodePpiDescriptor);\r
-    ASSERT_EFI_ERROR (Status);\r
-  }\r
+  Status = PeiServicesInstallPpi (&mStatusCodePpiDescriptor);\r
+  ASSERT_EFI_ERROR (Status);\r
 \r
   return EFI_SUCCESS;\r
 }\r

diff --git a/IntelFrameworkModulePkg/Universal/StatusCode/Pei/PeiStatusCode.inf b/IntelFrameworkModulePkg/Universal/StatusCode/Pei/PeiStatusCode.inf
index 5902d51c1a92d529205718e6612075b3a26adf10..f8b20c01c78237b52eca93c04c11f9b01092d1d7 100644 (file)
--- a/IntelFrameworkModulePkg/Universal/StatusCode/Pei/PeiStatusCode.inf
+++ b/IntelFrameworkModulePkg/Universal/StatusCode/Pei/PeiStatusCode.inf
@@ -69,7 +69,6 @@
   gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdStatusCodeUseOEM\r
   gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdStatusCodeUseMemory\r
   gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdStatusCodeUseSerial\r
-  gEfiMdeModulePkgTokenSpaceGuid.PcdNtEmulatorEnable\r
 \r
 \r
 [Pcd.common]\r

diff --git a/MdeModulePkg/MdeModulePkg.dec b/MdeModulePkg/MdeModulePkg.dec
index 882cdd3e95140c45400d1889b3d777bcc72caa05..deda06eedec9b7c3fb6a06b793c9390516944965 100644 (file)
--- a/MdeModulePkg/MdeModulePkg.dec
+++ b/MdeModulePkg/MdeModulePkg.dec
@@ -229,9 +229,6 @@
   #  It can be disabled to save size.\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdDevicePathSupportDevicePathFromText|TRUE|BOOLEAN|0x00010038\r
     \r
-  ## If this PCD is set as TRUE, the code specific to NT emulator will be enabled.\r
-  gEfiMdeModulePkgTokenSpaceGuid.PcdNtEmulatorEnable|FALSE|BOOLEAN|0x0001003e\r
-  \r
   ## If TRUE, track statistical information about variable usage stored in the EFI system table.\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdVariableCollectStatistics|FALSE|BOOLEAN|0x0001003f\r
   \r

diff --git a/MdeModulePkg/Universal/DebugSupportDxe/DebugSupportDxe.inf b/MdeModulePkg/Universal/DebugSupportDxe/DebugSupportDxe.inf
index 44a8f0666c67f1e5370160054877476dbc444db1..301fcaaf6163da90ab255d8e7d6ddcda36224a4b 100644 (file)
--- a/MdeModulePkg/Universal/DebugSupportDxe/DebugSupportDxe.inf
+++ b/MdeModulePkg/Universal/DebugSupportDxe/DebugSupportDxe.inf
@@ -6,7 +6,7 @@
 # provides debug-agent to periodically gain control during operation of the machine to\r
 # check for asynchronous commands form the host.\r
 #\r
-# Copyright (c) 2006 - 2008, Intel Corporation\r
+# Copyright (c) 2006 - 2009, Intel Corporation\r
 #\r
 #  All rights reserved. This program and the accompanying materials\r
 #  are licensed and made available under the terms and conditions of the BSD License\r
@@ -84,10 +84,6 @@
   gEfiDebugSupportProtocolGuid                  ## PRODUCED\r
 \r
 \r
-[FeaturePcd.IA32]\r
-  gEfiMdeModulePkgTokenSpaceGuid.PcdNtEmulatorEnable\r
-\r
-\r
 [Depex]\r
   TRUE\r
 \r

diff --git a/MdeModulePkg/Universal/DebugSupportDxe/Ia32/PlDebugSupportIa32.c b/MdeModulePkg/Universal/DebugSupportDxe/Ia32/PlDebugSupportIa32.c
index 290fea69d5c12c9f50d809a3c3d26a1fec4f657c..b7c182f5808d43b7a6f7817def1af9fe32e4effe 100644 (file)
--- a/MdeModulePkg/Universal/DebugSupportDxe/Ia32/PlDebugSupportIa32.c
+++ b/MdeModulePkg/Universal/DebugSupportDxe/Ia32/PlDebugSupportIa32.c
@@ -115,31 +115,29 @@ ManageIdtEntryTable (
 \r
   Status = EFI_SUCCESS;\r
 \r
-  if (!FeaturePcdGet (PcdNtEmulatorEnable)) {\r
-    if (CompareMem (&IdtEntryTable[ExceptionType].NewDesc, &NullDesc, sizeof (IA32_IDT_GATE_DESCRIPTOR)) != 0) {\r
+  if (CompareMem (&IdtEntryTable[ExceptionType].NewDesc, &NullDesc, sizeof (IA32_IDT_GATE_DESCRIPTOR)) != 0) {\r
+    //\r
+    // we've already installed to this vector\r
+    //\r
+    if (NewCallback != NULL) {\r
       //\r
-      // we've already installed to this vector\r
+      // if the input handler is non-null, error\r
       //\r
-      if (NewCallback != NULL) {\r
-        //\r
-        // if the input handler is non-null, error\r
-        //\r
-        Status = EFI_ALREADY_STARTED;\r
-      } else {\r
-        UnhookEntry (ExceptionType);\r
-      }\r
+      Status = EFI_ALREADY_STARTED;\r
     } else {\r
+      UnhookEntry (ExceptionType);\r
+    }\r
+  } else {\r
+    //\r
+    // no user handler installed on this vector\r
+    //\r
+    if (NewCallback == NULL) {\r
       //\r
-      // no user handler installed on this vector\r
+      // if the input handler is null, error\r
       //\r
-      if (NewCallback == NULL) {\r
-        //\r
-        // if the input handler is null, error\r
-        //\r
-        Status = EFI_INVALID_PARAMETER;\r
-      } else {\r
-        HookEntry (ExceptionType, NewCallback);\r
-      }\r
+      Status = EFI_INVALID_PARAMETER;\r
+    } else {\r
+      HookEntry (ExceptionType, NewCallback);\r
     }\r
   }\r
 \r

diff --git a/Nt32Pkg/Nt32Pkg.dsc b/Nt32Pkg/Nt32Pkg.dsc
index abe90995de34247478cb212103d54e0c6f3970a5..033eada708ba8aa010c03f1c3371e700bc9a92aa 100644 (file)
--- a/Nt32Pkg/Nt32Pkg.dsc
+++ b/Nt32Pkg/Nt32Pkg.dsc
@@ -319,7 +319,7 @@
   gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdStatusCodeReplayInOEM|FALSE\r
   gEfiMdePkgTokenSpaceGuid.PcdComponentNameDisable|FALSE\r
   gEfiMdePkgTokenSpaceGuid.PcdDriverDiagnosticsDisable|FALSE\r
-  gEfiMdeModulePkgTokenSpaceGuid.PcdNtEmulatorEnable|TRUE\r
+  gEfiMdeModulePkgTokenSpaceGuid.PcdNtEmulatorEnable|FALSE\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdDevicePathSupportDevicePathToText|TRUE\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdDevicePathSupportDevicePathFromText|TRUE\r
   gEfiMdePkgTokenSpaceGuid.PcdComponentName2Disable|FALSE\r

diff --git a/UnixPkg/UnixPkg.dsc b/UnixPkg/UnixPkg.dsc
index 9ec73e2068349a6354979ab4e2edccdd26ed4b7a..53fef6e70610f18a70c1da655cfe40b4c61c64fd 100644 (file)
--- a/UnixPkg/UnixPkg.dsc
+++ b/UnixPkg/UnixPkg.dsc
@@ -299,7 +299,6 @@
   gEfiEdkModulePkgTokenSpaceGuid.PcdSupportUpdateCapsuleReset|FALSE\r
   gEfiMdePkgTokenSpaceGuid.PcdComponentNameDisable|FALSE\r
   gEfiMdePkgTokenSpaceGuid.PcdDriverDiagnosticsDisable|FALSE\r
-  gEfiEdkModulePkgTokenSpaceGuid.PcdNtEmulatorEnable|FALSE\r
   gEfiEdkModulePkgTokenSpaceGuid.PcdDevicePathSupportDevicePathToText|TRUE\r
   gEfiEdkModulePkgTokenSpaceGuid.PcdDevicePathSupportDevicePathFromText|TRUE\r
   gEfiGenericPlatformTokenSpaceGuid.PcdPciIsaEnable|FALSE\r
@@ -335,7 +334,6 @@
   gEfiMdeModulePkgTokenSpaceGuid.PcdSupportUpdateCapsuleReset|FALSE\r
   gEfiMdePkgTokenSpaceGuid.PcdComponentNameDisable|FALSE\r
   gEfiMdePkgTokenSpaceGuid.PcdDriverDiagnosticsDisable|FALSE\r
-  gEfiMdeModulePkgTokenSpaceGuid.PcdNtEmulatorEnable|TRUE\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdDevicePathSupportDevicePathToText|TRUE\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdDevicePathSupportDevicePathFromText|TRUE\r
   gEfiMdePkgTokenSpaceGuid.PcdComponentName2Disable|FALSE\r