summaryrefslogtreecommitdiff
path: root/IntelFrameworkModulePkg
diff options
context:
space:
mode:
Diffstat (limited to 'IntelFrameworkModulePkg')
-rw-r--r--IntelFrameworkModulePkg/Bus/Isa/IsaSerialDxe/IsaSerialDxe.inf3
-rw-r--r--IntelFrameworkModulePkg/Bus/Isa/IsaSerialDxe/Serial.c16
-rw-r--r--IntelFrameworkModulePkg/IntelFrameworkModulePkg.dsc2
-rw-r--r--IntelFrameworkModulePkg/Universal/StatusCode/Pei/PeiStatusCode.c6
-rw-r--r--IntelFrameworkModulePkg/Universal/StatusCode/Pei/PeiStatusCode.inf1
5 files changed, 5 insertions, 23 deletions
diff --git a/IntelFrameworkModulePkg/Bus/Isa/IsaSerialDxe/IsaSerialDxe.inf b/IntelFrameworkModulePkg/Bus/Isa/IsaSerialDxe/IsaSerialDxe.inf
index 122a782..b3cfdae 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 f4c00bb..6a7713c 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 5e2ac13..9e0ae80 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 07b6b1a..f147291 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 5902d51..f8b20c0 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]