diff options
| -rw-r--r-- | IntelFrameworkModulePkg/Bus/Isa/IsaSerialDxe/IsaSerialDxe.inf | 3 | ||||
| -rw-r--r-- | IntelFrameworkModulePkg/Bus/Isa/IsaSerialDxe/Serial.c | 16 | ||||
| -rw-r--r-- | IntelFrameworkModulePkg/IntelFrameworkModulePkg.dsc | 2 | ||||
| -rw-r--r-- | IntelFrameworkModulePkg/Universal/StatusCode/Pei/PeiStatusCode.c | 6 | ||||
| -rw-r--r-- | IntelFrameworkModulePkg/Universal/StatusCode/Pei/PeiStatusCode.inf | 1 | ||||
| -rw-r--r-- | MdeModulePkg/MdeModulePkg.dec | 3 | ||||
| -rw-r--r-- | MdeModulePkg/Universal/DebugSupportDxe/DebugSupportDxe.inf | 6 | ||||
| -rw-r--r-- | MdeModulePkg/Universal/DebugSupportDxe/Ia32/PlDebugSupportIa32.c | 38 | ||||
| -rw-r--r-- | Nt32Pkg/Nt32Pkg.dsc | 2 | ||||
| -rw-r--r-- | UnixPkg/UnixPkg.dsc | 2 |
10 files changed, 25 insertions, 54 deletions
diff --git a/IntelFrameworkModulePkg/Bus/Isa/IsaSerialDxe/IsaSerialDxe.inf b/IntelFrameworkModulePkg/Bus/Isa/IsaSerialDxe/IsaSerialDxe.inf index 122a7824f6..b3cfdae0e3 100644 --- a/IntelFrameworkModulePkg/Bus/Isa/IsaSerialDxe/IsaSerialDxe.inf +++ b/IntelFrameworkModulePkg/Bus/Isa/IsaSerialDxe/IsaSerialDxe.inf @@ -62,9 +62,6 @@ gEfiSerialIoProtocolGuid # PROTOCOL BY_START
gEfiDevicePathProtocolGuid # PROTOCOL TO_START
-[FeaturePcd.common]
- gEfiMdeModulePkgTokenSpaceGuid.PcdNtEmulatorEnable
-
[FixedPcd.common]
gEfiMdePkgTokenSpaceGuid.PcdUartDefaultBaudRate|115200
gEfiMdePkgTokenSpaceGuid.PcdUartDefaultDataBits|8
diff --git a/IntelFrameworkModulePkg/Bus/Isa/IsaSerialDxe/Serial.c b/IntelFrameworkModulePkg/Bus/Isa/IsaSerialDxe/Serial.c index f4c00bb770..6a7713cdaf 100644 --- a/IntelFrameworkModulePkg/Bus/Isa/IsaSerialDxe/Serial.c +++ b/IntelFrameworkModulePkg/Bus/Isa/IsaSerialDxe/Serial.c @@ -805,14 +805,6 @@ IsaSerialReceiveTransmit ( do {
Lsr.Data = READ_LSR (SerialDevice->IsaIo, SerialDevice->BaseAddress);
- if (FeaturePcdGet (PcdNtEmulatorEnable)) {
- //
- // This is required for NT to avoid a forever-spin...
- // This would be better if READ_LSR was a polling operation
- // that would timeout.
- //
- Lsr.Bits.THRE = 1;
- }
//
// Flush incomming data to prevent a an overrun during a long write
//
@@ -1728,17 +1720,13 @@ IsaSerialPortPresent ( WRITE_SCR (SerialDevice->IsaIo, SerialDevice->BaseAddress, 0xAA);
if (READ_SCR (SerialDevice->IsaIo, SerialDevice->BaseAddress) != 0xAA) {
- if (!FeaturePcdGet (PcdNtEmulatorEnable)) {
- Status = FALSE;
- }
+ Status = FALSE;
}
WRITE_SCR (SerialDevice->IsaIo, SerialDevice->BaseAddress, 0x55);
if (READ_SCR (SerialDevice->IsaIo, SerialDevice->BaseAddress) != 0x55) {
- if (!FeaturePcdGet (PcdNtEmulatorEnable)) {
- Status = FALSE;
- }
+ Status = FALSE;
}
//
// Restore SCR
diff --git a/IntelFrameworkModulePkg/IntelFrameworkModulePkg.dsc b/IntelFrameworkModulePkg/IntelFrameworkModulePkg.dsc index 5e2ac13ea0..9e0ae806c3 100644 --- a/IntelFrameworkModulePkg/IntelFrameworkModulePkg.dsc +++ b/IntelFrameworkModulePkg/IntelFrameworkModulePkg.dsc @@ -154,7 +154,7 @@ gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdIsaBusSupportIsaMemory|TRUE
gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdPciCfgDisable|TRUE
gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdPciCfg2Disable|TRUE
- gEfiMdeModulePkgTokenSpaceGuid.PcdNtEmulatorEnable|FALSE
+
[PcdsFixedAtBuild.common]
gEfiMdePkgTokenSpaceGuid.PcdMaximumUnicodeStringLength|1000000
diff --git a/IntelFrameworkModulePkg/Universal/StatusCode/Pei/PeiStatusCode.c b/IntelFrameworkModulePkg/Universal/StatusCode/Pei/PeiStatusCode.c index 07b6b1af0c..f147291574 100644 --- a/IntelFrameworkModulePkg/Universal/StatusCode/Pei/PeiStatusCode.c +++ b/IntelFrameworkModulePkg/Universal/StatusCode/Pei/PeiStatusCode.c @@ -135,10 +135,8 @@ PeiStatusCodeDriverEntry ( // Install PeiStatusCodePpi.
// PeiServices use this Ppi to output status code.
// use library
- if (!FeaturePcdGet(PcdNtEmulatorEnable)) {
- Status = PeiServicesInstallPpi (&mStatusCodePpiDescriptor);
- ASSERT_EFI_ERROR (Status);
- }
+ Status = PeiServicesInstallPpi (&mStatusCodePpiDescriptor);
+ ASSERT_EFI_ERROR (Status);
return EFI_SUCCESS;
}
diff --git a/IntelFrameworkModulePkg/Universal/StatusCode/Pei/PeiStatusCode.inf b/IntelFrameworkModulePkg/Universal/StatusCode/Pei/PeiStatusCode.inf index 5902d51c1a..f8b20c01c7 100644 --- a/IntelFrameworkModulePkg/Universal/StatusCode/Pei/PeiStatusCode.inf +++ b/IntelFrameworkModulePkg/Universal/StatusCode/Pei/PeiStatusCode.inf @@ -69,7 +69,6 @@ gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdStatusCodeUseOEM
gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdStatusCodeUseMemory
gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdStatusCodeUseSerial
- gEfiMdeModulePkgTokenSpaceGuid.PcdNtEmulatorEnable
[Pcd.common]
diff --git a/MdeModulePkg/MdeModulePkg.dec b/MdeModulePkg/MdeModulePkg.dec index 882cdd3e95..deda06eede 100644 --- a/MdeModulePkg/MdeModulePkg.dec +++ b/MdeModulePkg/MdeModulePkg.dec @@ -229,9 +229,6 @@ # It can be disabled to save size.
gEfiMdeModulePkgTokenSpaceGuid.PcdDevicePathSupportDevicePathFromText|TRUE|BOOLEAN|0x00010038
- ## If this PCD is set as TRUE, the code specific to NT emulator will be enabled.
- gEfiMdeModulePkgTokenSpaceGuid.PcdNtEmulatorEnable|FALSE|BOOLEAN|0x0001003e
-
## If TRUE, track statistical information about variable usage stored in the EFI system table.
gEfiMdeModulePkgTokenSpaceGuid.PcdVariableCollectStatistics|FALSE|BOOLEAN|0x0001003f
diff --git a/MdeModulePkg/Universal/DebugSupportDxe/DebugSupportDxe.inf b/MdeModulePkg/Universal/DebugSupportDxe/DebugSupportDxe.inf index 44a8f0666c..301fcaaf61 100644 --- 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
# check for asynchronous commands form the host.
#
-# Copyright (c) 2006 - 2008, Intel Corporation
+# Copyright (c) 2006 - 2009, Intel Corporation
#
# All rights reserved. This program and the accompanying materials
# are licensed and made available under the terms and conditions of the BSD License
@@ -84,10 +84,6 @@ gEfiDebugSupportProtocolGuid ## PRODUCED
-[FeaturePcd.IA32]
- gEfiMdeModulePkgTokenSpaceGuid.PcdNtEmulatorEnable
-
-
[Depex]
TRUE
diff --git a/MdeModulePkg/Universal/DebugSupportDxe/Ia32/PlDebugSupportIa32.c b/MdeModulePkg/Universal/DebugSupportDxe/Ia32/PlDebugSupportIa32.c index 290fea69d5..b7c182f580 100644 --- a/MdeModulePkg/Universal/DebugSupportDxe/Ia32/PlDebugSupportIa32.c +++ b/MdeModulePkg/Universal/DebugSupportDxe/Ia32/PlDebugSupportIa32.c @@ -115,31 +115,29 @@ ManageIdtEntryTable ( Status = EFI_SUCCESS;
- if (!FeaturePcdGet (PcdNtEmulatorEnable)) {
- if (CompareMem (&IdtEntryTable[ExceptionType].NewDesc, &NullDesc, sizeof (IA32_IDT_GATE_DESCRIPTOR)) != 0) {
+ if (CompareMem (&IdtEntryTable[ExceptionType].NewDesc, &NullDesc, sizeof (IA32_IDT_GATE_DESCRIPTOR)) != 0) {
+ //
+ // we've already installed to this vector
+ //
+ if (NewCallback != NULL) {
//
- // we've already installed to this vector
+ // if the input handler is non-null, error
//
- if (NewCallback != NULL) {
- //
- // if the input handler is non-null, error
- //
- Status = EFI_ALREADY_STARTED;
- } else {
- UnhookEntry (ExceptionType);
- }
+ Status = EFI_ALREADY_STARTED;
} else {
+ UnhookEntry (ExceptionType);
+ }
+ } else {
+ //
+ // no user handler installed on this vector
+ //
+ if (NewCallback == NULL) {
//
- // no user handler installed on this vector
+ // if the input handler is null, error
//
- if (NewCallback == NULL) {
- //
- // if the input handler is null, error
- //
- Status = EFI_INVALID_PARAMETER;
- } else {
- HookEntry (ExceptionType, NewCallback);
- }
+ Status = EFI_INVALID_PARAMETER;
+ } else {
+ HookEntry (ExceptionType, NewCallback);
}
}
diff --git a/Nt32Pkg/Nt32Pkg.dsc b/Nt32Pkg/Nt32Pkg.dsc index abe90995de..033eada708 100644 --- a/Nt32Pkg/Nt32Pkg.dsc +++ b/Nt32Pkg/Nt32Pkg.dsc @@ -319,7 +319,7 @@ gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdStatusCodeReplayInOEM|FALSE
gEfiMdePkgTokenSpaceGuid.PcdComponentNameDisable|FALSE
gEfiMdePkgTokenSpaceGuid.PcdDriverDiagnosticsDisable|FALSE
- gEfiMdeModulePkgTokenSpaceGuid.PcdNtEmulatorEnable|TRUE
+ gEfiMdeModulePkgTokenSpaceGuid.PcdNtEmulatorEnable|FALSE
gEfiMdeModulePkgTokenSpaceGuid.PcdDevicePathSupportDevicePathToText|TRUE
gEfiMdeModulePkgTokenSpaceGuid.PcdDevicePathSupportDevicePathFromText|TRUE
gEfiMdePkgTokenSpaceGuid.PcdComponentName2Disable|FALSE
diff --git a/UnixPkg/UnixPkg.dsc b/UnixPkg/UnixPkg.dsc index 9ec73e2068..53fef6e706 100644 --- a/UnixPkg/UnixPkg.dsc +++ b/UnixPkg/UnixPkg.dsc @@ -299,7 +299,6 @@ gEfiEdkModulePkgTokenSpaceGuid.PcdSupportUpdateCapsuleReset|FALSE
gEfiMdePkgTokenSpaceGuid.PcdComponentNameDisable|FALSE
gEfiMdePkgTokenSpaceGuid.PcdDriverDiagnosticsDisable|FALSE
- gEfiEdkModulePkgTokenSpaceGuid.PcdNtEmulatorEnable|FALSE
gEfiEdkModulePkgTokenSpaceGuid.PcdDevicePathSupportDevicePathToText|TRUE
gEfiEdkModulePkgTokenSpaceGuid.PcdDevicePathSupportDevicePathFromText|TRUE
gEfiGenericPlatformTokenSpaceGuid.PcdPciIsaEnable|FALSE
@@ -335,7 +334,6 @@ gEfiMdeModulePkgTokenSpaceGuid.PcdSupportUpdateCapsuleReset|FALSE
gEfiMdePkgTokenSpaceGuid.PcdComponentNameDisable|FALSE
gEfiMdePkgTokenSpaceGuid.PcdDriverDiagnosticsDisable|FALSE
- gEfiMdeModulePkgTokenSpaceGuid.PcdNtEmulatorEnable|TRUE
gEfiMdeModulePkgTokenSpaceGuid.PcdDevicePathSupportDevicePathToText|TRUE
gEfiMdeModulePkgTokenSpaceGuid.PcdDevicePathSupportDevicePathFromText|TRUE
gEfiMdePkgTokenSpaceGuid.PcdComponentName2Disable|FALSE
|